From a094c58f1e80f31ea9cf02cc30dea455b65983ce Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 11 Feb 2020 13:46:05 +0100 Subject: Split up engine/events/misc_scripts_2.asm New files are: - engine/events/hidden_item.asm - engine/events/repel.asm --- engine/events/hidden_item.asm | 37 +++++++++++++++++++++++++++++++ engine/events/misc_scripts_2.asm | 48 ---------------------------------------- engine/events/repel.asm | 10 +++++++++ main.asm | 3 ++- 4 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 engine/events/hidden_item.asm delete mode 100644 engine/events/misc_scripts_2.asm create mode 100644 engine/events/repel.asm diff --git a/engine/events/hidden_item.asm b/engine/events/hidden_item.asm new file mode 100644 index 000000000..b61a62054 --- /dev/null +++ b/engine/events/hidden_item.asm @@ -0,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 diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm deleted file mode 100644 index 3d01c3250..000000000 --- a/engine/events/misc_scripts_2.asm +++ /dev/null @@ -1,48 +0,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 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" -- cgit v1.2.3