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/SilphCo11F.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/SilphCo11F.asm')
| -rw-r--r-- | data/maps/objects/SilphCo11F.asm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 9651c32b..1ee5ffe6 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,3 +1,10 @@ + object_const_def + const SILPHCO11F_SILPH_PRESIDENT + const SILPHCO11F_BEAUTY + const SILPHCO11F_GIOVANNI + const SILPHCO11F_ROCKET1 + const SILPHCO11F_ROCKET2 + SilphCo11F_Object: db $d ; border block @@ -10,10 +17,10 @@ SilphCo11F_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person - object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object_event 3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41 - object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40 + object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, TEXT_SILPHCO11F_SILPH_PRESIDENT + object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, TEXT_SILPHCO11F_BEAUTY + object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, TEXT_SILPHCO11F_GIOVANNI, OPP_GIOVANNI, 2 + object_event 3, 16, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO11F_ROCKET1, OPP_ROCKET, 41 + object_event 15, 9, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO11F_ROCKET2, OPP_ROCKET, 40 def_warps_to SILPH_CO_11F |