shithub: pokecrystal

Download patch

ref: a094c58f1e80f31ea9cf02cc30dea455b65983ce
parent: 0d81f1c470339efeb1f136aa5caab56c389be30a
author: mid-kid <esteve.varela@gmail.com>
date: Tue Feb 11 08:46:05 EST 2020

Split up engine/events/misc_scripts_2.asm

New files are:
- engine/events/hidden_item.asm
- engine/events/repel.asm

--- /dev/null
+++ b/engine/events/hidden_item.asm
@@ -1,0 +1,37 @@
+HiddenItemScript::
+	opentext
+	readmem wHiddenItemID
+	getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
+	writetext .PlayerFoundItemText
+	giveitem ITEM_FROM_MEM
+	iffalse .bag_full
+	callasm SetMemEvent
+	specialsound
+	itemnotify
+	sjump .finish
+
+.bag_full
+	promptbutton
+	writetext .ButNoSpaceText
+	waitbutton
+
+.finish
+	closetext
+	end
+
+.PlayerFoundItemText:
+	text_far _PlayerFoundItemText
+	text_end
+
+.ButNoSpaceText:
+	text_far _ButNoSpaceText
+	text_end
+
+SetMemEvent:
+	ld hl, wHiddenItemEvent
+	ld a, [hli]
+	ld d, [hl]
+	ld e, a
+	ld b, SET_FLAG
+	call EventFlagAction
+	ret
--- a/engine/events/misc_scripts_2.asm
+++ /dev/null
@@ -1,48 +1,0 @@
-RepelWoreOffScript::
-	opentext
-	writetext .RepelWoreOffText
-	waitbutton
-	closetext
-	end
-
-.RepelWoreOffText:
-	text_far _RepelWoreOffText
-	text_end
-
-HiddenItemScript::
-	opentext
-	readmem wHiddenItemID
-	getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
-	writetext .PlayerFoundItemText
-	giveitem ITEM_FROM_MEM
-	iffalse .bag_full
-	callasm SetMemEvent
-	specialsound
-	itemnotify
-	sjump .finish
-
-.bag_full
-	promptbutton
-	writetext .ButNoSpaceText
-	waitbutton
-
-.finish
-	closetext
-	end
-
-.PlayerFoundItemText:
-	text_far _PlayerFoundItemText
-	text_end
-
-.ButNoSpaceText:
-	text_far _ButNoSpaceText
-	text_end
-
-SetMemEvent:
-	ld hl, wHiddenItemEvent
-	ld a, [hli]
-	ld d, [hl]
-	ld e, a
-	ld b, SET_FLAG
-	call EventFlagAction
-	ret
--- /dev/null
+++ b/engine/events/repel.asm
@@ -1,0 +1,10 @@
+RepelWoreOffScript::
+	opentext
+	writetext .RepelWoreOffText
+	waitbutton
+	closetext
+	end
+
+.RepelWoreOffText:
+	text_far _RepelWoreOffText
+	text_end
--- a/main.asm
+++ b/main.asm
@@ -61,7 +61,8 @@
 INCLUDE "engine/overworld/select_menu.asm"
 INCLUDE "engine/events/elevator.asm"
 INCLUDE "engine/events/bug_contest/contest.asm"
-INCLUDE "engine/events/misc_scripts_2.asm"
+INCLUDE "engine/events/repel.asm"
+INCLUDE "engine/events/hidden_item.asm"
 INCLUDE "engine/events/std_collision.asm"
 INCLUDE "engine/events/bug_contest/judging.asm"
 INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
--