diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/SafariZoneNorth.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
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..3433cd6d 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,3 +1,7 @@ + object_const_def + const_export SAFARIZONENORTH_PROTEIN + const_export 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 |