diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/RockTunnel1F.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
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 |