diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/RocketHideoutB3F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
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 a8da69d2..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_2 - warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 + warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F |