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 /home/overworld.asm | |
| parent | b8954732a3eaa3a784a6e3eaaa68977a9ccd9816 (diff) | |
Sync with pokered
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 8b635aa5..8608cbfe 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -3,7 +3,7 @@ EnterMap:: ld a, $ff ld [wJoyIgnore], a call LoadMapData - callba ClearVariablesAfterLoadingMapData + callba ClearVariablesOnEnterMap ld hl, wd72c bit 0, [hl] ; has the player already made 3 steps since the last battle? jr z, .skipGivingThreeStepsOfNoRandomBattles @@ -467,7 +467,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 @@ -699,15 +699,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) @@ -871,7 +871,7 @@ LoadTilesetTilePatternData:: LoadTileBlockMap:: ; fill C6E8-CBFB with the background tile ld hl, wOverworldMap - ld bc, $0514 + ld bc, wOverworldMapEnd - wOverworldMap ld a, [wMapBackgroundTile] ; background tile number call FillMemory ; load tile map of current map (made of tile block IDs) @@ -1254,7 +1254,7 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc, .noCollision .collision - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry ld a, SFX_COLLISION @@ -1708,7 +1708,7 @@ CollisionCheckOnWater:: call IsTilePassable jr nc, .stopSurfing .collision - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry ld a, SFX_COLLISION @@ -1716,7 +1716,6 @@ CollisionCheckOnWater:: .setCarry scf jr .done - .checkIfVermilionDockTileset ld a, [wCurMapTileset] ; tileset cp SHIP_PORT ; Vermilion Dock tileset |