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/RocketHideoutB4F.asm | |
| parent | 45c039801916713e4066644086de4d4940d5fa1d (diff) | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/RocketHideoutB4F.asm')
| -rw-r--r-- | data/maps/objects/RocketHideoutB4F.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index 3541befc..fd68b069 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -1,22 +1,22 @@ RocketHideoutB4F_Object: db $2e ; border block - def_warps - warp 19, 10, 1, ROCKET_HIDEOUT_B3F - warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR - warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR + def_warp_events + warp_event 19, 10, ROCKET_HIDEOUT_B3F, 1 + warp_event 24, 15, ROCKET_HIDEOUT_ELEVATOR, 0 + warp_event 25, 15, ROCKET_HIDEOUT_ELEVATOR, 1 - def_signs + def_bg_events - def_objects - object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 - object SPRITE_JAMES, 25, 10, STAY, DOWN, 2 - object SPRITE_JESSIE, 24, 10, STAY, DOWN, 3 - object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 - object SPRITE_POKE_BALL, 10, 12, STAY, NONE, 5, HP_UP - object SPRITE_POKE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND - object SPRITE_POKE_BALL, 12, 20, STAY, NONE, 7, IRON - object SPRITE_POKE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE - object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY + def_object_events + object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1 + object_event 25, 10, SPRITE_JAMES, STAY, DOWN, 2 + object_event 24, 10, SPRITE_JESSIE, STAY, DOWN, 3 + object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18 + object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, 5, HP_UP + object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND + object_event 12, 20, SPRITE_POKE_BALL, STAY, NONE, 7, IRON + object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, 8, SILPH_SCOPE + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 9, LIFT_KEY def_warps_to ROCKET_HIDEOUT_B4F |