aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/RedsHouse2F.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/RedsHouse2F.asm
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'scripts/RedsHouse2F.asm')
-rw-r--r--scripts/RedsHouse2F.asm12
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/RedsHouse2F.asm b/scripts/RedsHouse2F.asm
index b44b9f98..9b2575b7 100644
--- a/scripts/RedsHouse2F.asm
+++ b/scripts/RedsHouse2F.asm
@@ -5,21 +5,23 @@ RedsHouse2F_Script:
jp CallFunctionInTable
RedsHouse2F_ScriptPointers:
- dw RedsHouse2FScript0
- dw RedsHouse2FScript1
+ def_script_pointers
+ dw_const RedsHouse2FDefaultScript, SCRIPT_REDSHOUSE2F_DEFAULT
+ dw_const RedsHouse2FNoopScript, SCRIPT_REDSHOUSE2F_NOOP
-RedsHouse2FScript0:
+RedsHouse2FDefaultScript:
xor a
ldh [hJoyHeld], a
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
- ld a, 1
+ ld a, SCRIPT_REDSHOUSE2F_NOOP
ld [wRedsHouse2FCurScript], a
ret
-RedsHouse2FScript1:
+RedsHouse2FNoopScript:
ret
RedsHouse2F_TextPointers:
+ def_text_pointers
text_end ; unused