diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/RockTunnel1F.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.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 | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index b3d4da48..2d3b0522 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -1,26 +1,26 @@ RockTunnel1F_Object: db $3 ; border block - def_warps - warp 15, 3, 1, LAST_MAP - warp 15, 0, 1, LAST_MAP - warp 15, 33, 2, LAST_MAP - warp 15, 35, 2, LAST_MAP - warp 37, 3, 0, ROCK_TUNNEL_B1F - warp 5, 3, 1, ROCK_TUNNEL_B1F - warp 17, 11, 2, ROCK_TUNNEL_B1F - warp 37, 17, 3, ROCK_TUNNEL_B1F + def_warp_events + warp_event 15, 3, LAST_MAP, 1 + warp_event 15, 0, LAST_MAP, 1 + warp_event 15, 33, LAST_MAP, 2 + warp_event 15, 35, LAST_MAP, 2 + warp_event 37, 3, ROCK_TUNNEL_B1F, 0 + warp_event 5, 3, ROCK_TUNNEL_B1F, 1 + warp_event 17, 11, ROCK_TUNNEL_B1F, 2 + warp_event 37, 17, ROCK_TUNNEL_B1F, 3 - def_signs - sign 11, 29, 8 ; RockTunnel1Text8 + def_bg_events + bg_event 11, 29, 8 ; RockTunnel1Text8 - def_objects - object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 - object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 - object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 - object SPRITE_SUPER_NERD, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 - object SPRITE_COOLTRAINER_F, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 - object SPRITE_COOLTRAINER_F, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 - object SPRITE_COOLTRAINER_F, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 + 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 def_warps_to ROCK_TUNNEL_1F |