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/RocketHideoutB3F.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/RocketHideoutB3F.asm (renamed from data/mapObjects/rockethideout3.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/RocketHideoutB3F.asm index 690724b0..6169dbed 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/RocketHideoutB3F.asm @@ -1,9 +1,9 @@ -RocketHideout3Object: +RocketHideoutB3F_Object: db $2e ; border block db 2 ; warps - warp 25, 6, 1, ROCKET_HIDEOUT_2 - warp 19, 18, 0, ROCKET_HIDEOUT_4 + warp 25, 6, 1, ROCKET_HIDEOUT_B2F + warp 19, 18, 0, ROCKET_HIDEOUT_B4F db 0 ; signs @@ -14,5 +14,5 @@ RocketHideout3Object: object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY ; warp-to - warp_to 25, 6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_B4F + warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F |