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/Route11Gate2F.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/Route11Gate2F.asm')
| -rw-r--r-- | data/maps/objects/Route11Gate2F.asm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index ad257fbb..3ad10346 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -1,3 +1,7 @@ + object_const_def + const_export ROUTE11GATE2F_YOUNGSTER + const_export ROUTE11GATE2F_OAKS_AIDE + Route11Gate2F_Object: db $a ; border block @@ -5,11 +9,11 @@ Route11Gate2F_Object: warp_event 7, 7, ROUTE_11_GATE_1F, 5 def_bg_events - bg_event 1, 2, 3 ; Route11GateUpstairsText3 - bg_event 6, 2, 4 ; Route11GateUpstairsText4 + bg_event 1, 2, TEXT_ROUTE11GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE11GATE2F_RIGHT_BINOCULARS def_object_events - object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person - object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, 2 ; person + object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE11GATE2F_YOUNGSTER + object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, TEXT_ROUTE11GATE2F_OAKS_AIDE def_warps_to ROUTE_11_GATE_2F |