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/SafariZoneWest.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/SafariZoneWest.asm')
| -rw-r--r-- | data/maps/objects/SafariZoneWest.asm | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index dca3d3a8..284cd244 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFARIZONEWEST_MAX_POTION + const SAFARIZONEWEST_TM_DOUBLE_TEAM + const SAFARIZONEWEST_MAX_REVIVE + const SAFARIZONEWEST_GOLD_TEETH + SafariZoneWest_Object: db $0 ; border block @@ -12,15 +18,15 @@ SafariZoneWest_Object: warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 1 def_bg_events - bg_event 12, 12, 5 ; SafariZoneWestText5 - bg_event 17, 3, 6 ; SafariZoneWestText6 - bg_event 26, 4, 7 ; SafariZoneWestText7 - bg_event 24, 22, 8 ; SafariZoneWestText8 + bg_event 12, 12, TEXT_SAFARIZONEWEST_REST_HOUSE_SIGN + bg_event 17, 3, TEXT_SAFARIZONEWEST_FIND_WARDENS_TEETH_SIGN + bg_event 26, 4, TEXT_SAFARIZONEWEST_TRAINER_TIPS + bg_event 24, 22, TEXT_SAFARIZONEWEST_SIGN def_object_events - object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, 1, MAX_POTION - object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_DOUBLE_TEAM - object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE - object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH + object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_MAX_POTION, MAX_POTION + object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_TM_DOUBLE_TEAM, TM_DOUBLE_TEAM + object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_MAX_REVIVE, MAX_REVIVE + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_GOLD_TEETH, GOLD_TEETH def_warps_to SAFARI_ZONE_WEST |