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 /engine/overworld/player_state.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 'engine/overworld/player_state.asm')
| -rw-r--r-- | engine/overworld/player_state.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index b8d734f2..73c55da2 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -55,14 +55,14 @@ CheckForceBikeOrSurf: cp c ;compare x-coord jr nz, .loop ; incorrect x-coord, check next item ld a, [wCurMap] - cp SEAFOAM_ISLANDS_4 + cp SEAFOAM_ISLANDS_B3F ld a, $2 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a jr z, .forceSurfing ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 + cp SEAFOAM_ISLANDS_B4F ld a, $2 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a jr z, .forceSurfing ;force bike riding ld hl, wd732 @@ -156,7 +156,7 @@ IsWarpTileInFrontOfPlayer: push bc call _GetTileAndCoordsInFrontOfPlayer ld a, [wCurMap] - cp SS_ANNE_5 + cp SS_ANNE_BOW jr z, .ssAnne5 ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction srl a @@ -237,7 +237,7 @@ PrintSafariZoneSteps: ld a, [wCurMap] cp SAFARI_ZONE_EAST ret c - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F ret nc coord hl, 0, 0 ld b, 3 |