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/Route16.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/Route16.asm')
| -rw-r--r-- | data/maps/objects/Route16.asm | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index b1e62651..0eff9b2e 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -1,3 +1,12 @@ + object_const_def + const ROUTE16_BIKER1 + const ROUTE16_BIKER2 + const ROUTE16_BIKER3 + const ROUTE16_BIKER4 + const ROUTE16_BIKER5 + const ROUTE16_BIKER6 + const ROUTE16_SNORLAX + Route16_Object: db $f ; border block @@ -13,16 +22,16 @@ Route16_Object: warp_event 7, 5, ROUTE_16_FLY_HOUSE, 1 def_bg_events - bg_event 27, 11, 8 ; Route16Text8 - bg_event 5, 17, 9 ; Route16Text9 + bg_event 27, 11, TEXT_ROUTE16_CYCLING_ROAD_SIGN + bg_event 5, 17, TEXT_ROUTE16_SIGN def_object_events - object_event 17, 12, SPRITE_BIKER, STAY, LEFT, 1, OPP_BIKER, 5 - object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 1 - object_event 11, 12, SPRITE_BIKER, STAY, UP, 3, OPP_CUE_BALL, 2 - object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6 - object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3 - object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7 - object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, 7 ; person + object_event 17, 12, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER1, OPP_BIKER, 5 + object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER2, OPP_CUE_BALL, 1 + object_event 11, 12, SPRITE_BIKER, STAY, UP, TEXT_ROUTE16_BIKER3, OPP_CUE_BALL, 2 + object_event 9, 11, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER4, OPP_BIKER, 6 + object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER5, OPP_CUE_BALL, 3 + object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER6, OPP_BIKER, 7 + object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, TEXT_ROUTE16_SNORLAX def_warps_to ROUTE_16 |