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/Route10.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/Route10.asm')
| -rw-r--r-- | data/maps/objects/Route10.asm | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 01eae9cf..031ae521 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -1,3 +1,11 @@ + object_const_def + const ROUTE10_SUPER_NERD1 + const ROUTE10_HIKER1 + const ROUTE10_SUPER_NERD2 + const ROUTE10_COOLTRAINER_F1 + const ROUTE10_HIKER2 + const ROUTE10_COOLTRAINER_F2 + Route10_Object: db $2c ; border block @@ -8,17 +16,17 @@ Route10_Object: warp_event 6, 39, POWER_PLANT, 1 def_bg_events - bg_event 7, 19, 7 ; Route10Text7 - bg_event 12, 19, 8 ; PokeCenterSignText - bg_event 9, 55, 9 ; Route10Text9 - bg_event 5, 41, 10 ; Route10Text10 + bg_event 7, 19, TEXT_ROUTE10_ROCKTUNNEL_NORTH_SIGN + bg_event 12, 19, TEXT_ROUTE10_POKECENTER_SIGN + bg_event 9, 55, TEXT_ROUTE10_ROCKTUNNEL_SOUTH_SIGN + bg_event 5, 41, TEXT_ROUTE10_POWERPLANT_SIGN def_object_events - object_event 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 - object_event 3, 57, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7 - object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2 - object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 - object_event 3, 61, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8 - object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 + object_event 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE10_SUPER_NERD1, OPP_POKEMANIAC, 1 + object_event 3, 57, SPRITE_HIKER, STAY, UP, TEXT_ROUTE10_HIKER1, OPP_HIKER, 7 + object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE10_SUPER_NERD2, OPP_POKEMANIAC, 2 + object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE10_COOLTRAINER_F1, OPP_JR_TRAINER_F, 7 + object_event 3, 61, SPRITE_HIKER, STAY, DOWN, TEXT_ROUTE10_HIKER2, OPP_HIKER, 8 + object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE10_COOLTRAINER_F2, OPP_JR_TRAINER_F, 8 def_warps_to ROUTE_10 |