diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/SilphCo9F.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-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 'data/maps/objects/SilphCo9F.asm')
| -rw-r--r-- | data/maps/objects/SilphCo9F.asm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 261df23c..59cb2c5b 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -1,3 +1,9 @@ + object_const_def + const SILPHCO9F_NURSE + const SILPHCO9F_ROCKET1 + const SILPHCO9F_SCIENTIST + const SILPHCO9F_ROCKET2 + SilphCo9F_Object: db $2e ; border block @@ -11,9 +17,9 @@ SilphCo9F_Object: def_bg_events def_object_events - object_event 3, 14, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 2, 4, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 37 - object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 10 - object_event 13, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 38 + object_event 3, 14, SPRITE_NURSE, STAY, DOWN, TEXT_SILPHCO9F_NURSE + object_event 2, 4, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO9F_ROCKET1, OPP_ROCKET, 37 + object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO9F_SCIENTIST, OPP_SCIENTIST, 10 + object_event 13, 16, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO9F_ROCKET2, OPP_ROCKET, 38 def_warps_to SILPH_CO_9F |