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/SeafoamIslandsB4F.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/SeafoamIslandsB4F.asm')
| -rw-r--r-- | data/maps/objects/SeafoamIslandsB4F.asm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index c6e769e0..b80685fe 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -1,3 +1,8 @@ + object_const_def + const_export SEAFOAMISLANDSB4F_BOULDER1 + const_export SEAFOAMISLANDSB4F_BOULDER2 + const_export SEAFOAMISLANDSB4F_ARTICUNO + SeafoamIslandsB4F_Object: db $7d ; border block @@ -8,12 +13,12 @@ SeafoamIslandsB4F_Object: warp_event 25, 4, SEAFOAM_ISLANDS_B3F, 3 def_bg_events - bg_event 9, 15, 4 ; SeafoamIslands5Text4 - bg_event 23, 1, 5 ; SeafoamIslands5Text5 + bg_event 9, 15, TEXT_SEAFOAMISLANDSB4F_BOULDERS_SIGN + bg_event 23, 1, TEXT_SEAFOAMISLANDSB4F_DANGER_SIGN def_object_events - object_event 4, 15, SPRITE_BOULDER, STAY, NONE, 1 ; person - object_event 5, 15, SPRITE_BOULDER, STAY, NONE, 2 ; person - object_event 6, 1, SPRITE_BIRD, STAY, DOWN, 3, ARTICUNO, 50 + object_event 4, 15, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB4F_BOULDER1 + object_event 5, 15, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB4F_BOULDER2 + object_event 6, 1, SPRITE_BIRD, STAY, DOWN, TEXT_SEAFOAMISLANDSB4F_ARTICUNO, ARTICUNO, 50 def_warps_to SEAFOAM_ISLANDS_B4F |