diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
| commit | 94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch) | |
| tree | e6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/RocketHideoutB4F.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Align `object_event` coordinates (diff) | |
| download | pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.gz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.xz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.zip | |
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index fd68b069..44ace42d 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -9,14 +9,14 @@ RocketHideoutB4F_Object: def_bg_events def_object_events - object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1 + 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 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 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 + 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 |