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/SilphCo7F.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/SilphCo7F.asm')
| -rw-r--r-- | data/maps/objects/SilphCo7F.asm | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index b7854e3c..2d5ed33c 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -1,3 +1,16 @@ + object_const_def + const SILPHCO7F_SILPH_WORKER_M1 + const SILPHCO7F_SILPH_WORKER_M2 + const SILPHCO7F_SILPH_WORKER_M3 + const SILPHCO7F_SILPH_WORKER_M4 + const SILPHCO7F_ROCKET1 + const SILPHCO7F_SCIENTIST + const SILPHCO7F_ROCKET2 + const SILPHCO7F_ROCKET3 + const SILPHCO7F_RIVAL + const SILPHCO7F_CALCIUM + const SILPHCO7F_TM_SWORDS_DANCE + SilphCo7F_Object: db $2e ; border block @@ -12,16 +25,16 @@ SilphCo7F_Object: def_bg_events def_object_events - object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 13, 13, SPRITE_SILPH_WORKER, STAY, UP, 2 ; person - object_event 7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person - object_event 10, 8, SPRITE_ERIKA, STAY, NONE, 4 ; person - object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32 - object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8 - object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33 - object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, 8, OPP_ROCKET, 34 - object_event 3, 7, SPRITE_BLUE, STAY, UP, 9 ; person - object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM - object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, 11, TM_SWORDS_DANCE + object_event 1, 5, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M1 + object_event 13, 13, SPRITE_SILPH_WORKER_M, STAY, UP, TEXT_SILPHCO7F_SILPH_WORKER_M2 + object_event 7, 10, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M3 + object_event 10, 8, SPRITE_SILPH_WORKER_F, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M4 + object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, TEXT_SILPHCO7F_ROCKET1, OPP_ROCKET, 32 + object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO7F_SCIENTIST, OPP_SCIENTIST, 8 + object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO7F_ROCKET2, OPP_ROCKET, 33 + object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO7F_ROCKET3, OPP_ROCKET, 34 + object_event 3, 7, SPRITE_BLUE, STAY, UP, TEXT_SILPHCO7F_RIVAL + object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO7F_CALCIUM, CALCIUM + object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO7F_TM_SWORDS_DANCE, TM_SWORDS_DANCE def_warps_to SILPH_CO_7F |