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 /home | |
| 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 'home')
| -rw-r--r-- | home/overworld.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 317459ce..66bf73a7 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -494,7 +494,7 @@ WarpFound2:: ld [wUnusedD366], a ; not read ld a, [hWarpDestinationMap] ld [wCurMap], a - cp ROCK_TUNNEL_1 + cp ROCK_TUNNEL_1F jr nz, .notRockTunnel ld a, $06 ld [wMapPalOffset], a @@ -718,15 +718,15 @@ CheckIfInOutsideMap:: ; sets carry if the check passes, otherwise clears carry ExtraWarpCheck:: ld a, [wCurMap] - cp SS_ANNE_3 + cp SS_ANNE_3F jr z, .useFunction1 - cp ROCKET_HIDEOUT_1 + cp ROCKET_HIDEOUT_B1F jr z, .useFunction2 - cp ROCKET_HIDEOUT_2 + cp ROCKET_HIDEOUT_B2F jr z, .useFunction2 - cp ROCKET_HIDEOUT_4 + cp ROCKET_HIDEOUT_B4F jr z, .useFunction2 - cp ROCK_TUNNEL_1 + cp ROCK_TUNNEL_1F jr z, .useFunction2 ld a, [wCurMapTileset] and a ; outside tileset (OVERWORLD) |