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/RockTunnel1F.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/RockTunnel1F.asm')
| -rw-r--r-- | data/maps/objects/RockTunnel1F.asm | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 385214a4..c61cbda4 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -1,3 +1,12 @@ + object_const_def + const_export ROCKTUNNEL1F_HIKER1 + const_export ROCKTUNNEL1F_HIKER2 + const_export ROCKTUNNEL1F_HIKER3 + const_export ROCKTUNNEL1F_SUPER_NERD + const_export ROCKTUNNEL1F_COOLTRAINER_F1 + const_export ROCKTUNNEL1F_COOLTRAINER_F2 + const_export ROCKTUNNEL1F_COOLTRAINER_F3 + RockTunnel1F_Object: db $3 ; border block @@ -12,15 +21,15 @@ RockTunnel1F_Object: warp_event 37, 17, ROCK_TUNNEL_B1F, 4 def_bg_events - bg_event 11, 29, 8 ; RockTunnel1Text8 + bg_event 11, 29, TEXT_ROCKTUNNEL1F_SIGN def_object_events - object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12 - object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13 - object_event 17, 15, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14 - object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7 - object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 - object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 - object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 + object_event 7, 5, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNEL1F_HIKER1, OPP_HIKER, 12 + object_event 5, 16, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNEL1F_HIKER2, OPP_HIKER, 13 + object_event 17, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROCKTUNNEL1F_HIKER3, OPP_HIKER, 14 + object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROCKTUNNEL1F_SUPER_NERD, OPP_POKEMANIAC, 7 + object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROCKTUNNEL1F_COOLTRAINER_F1, OPP_JR_TRAINER_F, 17 + object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROCKTUNNEL1F_COOLTRAINER_F2, OPP_JR_TRAINER_F, 18 + object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROCKTUNNEL1F_COOLTRAINER_F3, OPP_JR_TRAINER_F, 19 def_warps_to ROCK_TUNNEL_1F |