diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/RocketHideoutB4F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/RocketHideoutB4F.asm (renamed from data/mapObjects/rockethideout4.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/RocketHideoutB4F.asm index 60998c61..ba746951 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/RocketHideoutB4F.asm @@ -1,8 +1,8 @@ -RocketHideout4Object: +RocketHideoutB4F_Object: db $2e ; border block db 3 ; warps - warp 19, 10, 1, ROCKET_HIDEOUT_3 + warp 19, 10, 1, ROCKET_HIDEOUT_B3F warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR @@ -20,6 +20,6 @@ RocketHideout4Object: object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY ; warp-to - warp_to 19, 10, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 - warp_to 24, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 25, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F + warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR |