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/SafariZoneNorth.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/SafariZoneNorth.asm')
| -rw-r--r-- | data/maps/objects/SafariZoneNorth.asm | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 97dc0d55..2ee7b17a 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,3 +1,7 @@ + object_const_def + const SAFARIZONENORTH_PROTEIN + const SAFARIZONENORTH_TM_SKULL_BASH + SafariZoneNorth_Object: db $0 ; border block @@ -13,14 +17,14 @@ SafariZoneNorth_Object: warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 1 def_bg_events - bg_event 36, 4, 3 ; SafariZoneNorthText3 - bg_event 4, 25, 4 ; SafariZoneNorthText4 - bg_event 13, 31, 5 ; SafariZoneNorthText5 - bg_event 19, 33, 6 ; SafariZoneNorthText6 - bg_event 26, 28, 7 ; SafariZoneNorthText7 + bg_event 36, 4, TEXT_SAFARIZONENORTH_REST_HOUSE_SIGN + bg_event 4, 25, TEXT_SAFARIZONENORTH_TRAINER_TIPS_1 + bg_event 13, 31, TEXT_SAFARIZONENORTH_SIGN + bg_event 19, 33, TEXT_SAFARIZONENORTH_TRAINER_TIPS_2 + bg_event 26, 28, TEXT_SAFARIZONENORTH_TRAINER_TIPS_3 def_object_events - object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, 1, PROTEIN - object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_SKULL_BASH + object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONENORTH_PROTEIN, PROTEIN + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONENORTH_TM_SKULL_BASH, TM_SKULL_BASH def_warps_to SAFARI_ZONE_NORTH |