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/Route6.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/Route6.asm')
| -rw-r--r-- | data/maps/objects/Route6.asm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 33748f0f..461ccf27 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,3 +1,11 @@ + object_const_def + const ROUTE6_COOLTRAINER_M1 + const ROUTE6_COOLTRAINER_F1 + const ROUTE6_YOUNGSTER_1 + const ROUTE6_COOLTRAINER_M2 + const ROUTE6_COOLTRAINER_F2 + const ROUTE6_YOUNGSTER_2 + Route6_Object: db $f ; border block @@ -8,14 +16,14 @@ Route6_Object: warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events - bg_event 19, 15, 7 ; Route6Text7 + bg_event 19, 15, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN def_object_events - object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 - object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 - object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 - object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 - object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 - object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 + object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 4 + object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 2 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER_1, OPP_BUG_CATCHER, 10 + object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5 + object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3 + object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER_2, OPP_BUG_CATCHER, 11 def_warps_to ROUTE_6 |