From a094c58f1e80f31ea9cf02cc30dea455b65983ce Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 11 Feb 2020 13:46:05 +0100 Subject: [PATCH] Split up engine/events/misc_scripts_2.asm New files are: - engine/events/hidden_item.asm - engine/events/repel.asm --- engine/events/{misc_scripts_2.asm => hidden_item.asm} | 11 ----------- engine/events/repel.asm | 10 ++++++++++ main.asm | 3 ++- 3 files changed, 12 insertions(+), 12 deletions(-) rename engine/events/{misc_scripts_2.asm => hidden_item.asm} (79%) create mode 100644 engine/events/repel.asm diff --git a/engine/events/misc_scripts_2.asm b/engine/events/hidden_item.asm similarity index 79% rename from engine/events/misc_scripts_2.asm rename to engine/events/hidden_item.asm index 3d01c3250..b61a62054 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/hidden_item.asm @@ -1,14 +1,3 @@ -RepelWoreOffScript:: - opentext - writetext .RepelWoreOffText - waitbutton - closetext - end - -.RepelWoreOffText: - text_far _RepelWoreOffText - text_end - HiddenItemScript:: opentext readmem wHiddenItemID diff --git a/engine/events/repel.asm b/engine/events/repel.asm new file mode 100644 index 000000000..e324239cf --- /dev/null +++ b/engine/events/repel.asm @@ -0,0 +1,10 @@ +RepelWoreOffScript:: + opentext + writetext .RepelWoreOffText + waitbutton + closetext + end + +.RepelWoreOffText: + text_far _RepelWoreOffText + text_end diff --git a/main.asm b/main.asm index 8b0dcb5df..8973bad04 100644 --- a/main.asm +++ b/main.asm @@ -61,7 +61,8 @@ INCLUDE "engine/pokemon/mon_menu.asm" 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"