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/Route4.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/Route4.asm')
| -rw-r--r-- | data/maps/objects/Route4.asm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 2917de1f..b34c913d 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -1,3 +1,8 @@ + object_const_def + const ROUTE4_COOLTRAINER_F1 + const ROUTE4_COOLTRAINER_F2 + const ROUTE4_TM_WHIRLWIND + Route4_Object: db $2c ; border block @@ -7,13 +12,13 @@ Route4_Object: warp_event 24, 5, MT_MOON_B1F, 8 def_bg_events - bg_event 12, 5, 4 ; PokeCenterSignText - bg_event 17, 7, 5 ; Route4Text5 - bg_event 27, 7, 6 ; Route4Text6 + bg_event 12, 5, TEXT_ROUTE4_POKECENTER_SIGN + bg_event 17, 7, TEXT_ROUTE4_MT_MOON_SIGN + bg_event 27, 7, TEXT_ROUTE4_SIGN def_object_events - object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person - object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4 - object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND + object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, TEXT_ROUTE4_COOLTRAINER_F1 + object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE4_COOLTRAINER_F2, OPP_LASS, 4 + object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE4_TM_WHIRLWIND, TM_WHIRLWIND def_warps_to ROUTE_4 |