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/Route23.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/Route23.asm')
| -rw-r--r-- | data/maps/objects/Route23.asm | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index 4a9f65f6..b31aff42 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,3 +1,12 @@ + object_const_def + const_export ROUTE23_GUARD1 + const_export ROUTE23_GUARD2 + const_export ROUTE23_SWIMMER1 + const_export ROUTE23_SWIMMER2 + const_export ROUTE23_GUARD3 + const_export ROUTE23_GUARD4 + const_export ROUTE23_GUARD5 + Route23_Object: db $f ; border block @@ -8,15 +17,15 @@ Route23_Object: warp_event 14, 31, VICTORY_ROAD_2F, 2 def_bg_events - bg_event 3, 33, 8 ; Route23Text8 + bg_event 3, 33, TEXT_ROUTE23_VICTORY_ROAD_GATE_SIGN def_object_events - object_event 4, 35, SPRITE_GUARD, STAY, DOWN, 1 ; person - object_event 10, 56, SPRITE_GUARD, STAY, DOWN, 2 ; person - object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, 3 ; person - object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, 4 ; person - object_event 12, 105, SPRITE_GUARD, STAY, DOWN, 5 ; person - object_event 8, 119, SPRITE_GUARD, STAY, DOWN, 6 ; person - object_event 8, 136, SPRITE_GUARD, STAY, DOWN, 7 ; person + object_event 4, 35, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD1 + object_event 10, 56, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD2 + object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE23_SWIMMER1 + object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE23_SWIMMER2 + object_event 12, 105, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD3 + object_event 8, 119, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD4 + object_event 8, 136, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD5 def_warps_to ROUTE_23 |