diff options
| author | dannye <33dannye@gmail.com> | 2020-12-15 11:05:12 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-12-15 11:05:12 -0600 |
| commit | 2654da5d157540d482790308f1c2948e1431fa46 (patch) | |
| tree | 265d64b9fb8f6e8bd580cb6a5ec3c59224e9fdeb /engine/overworld | |
| parent | 48dc6a8cf4da512273e79e49346b35dcc225f773 (diff) | |
| parent | f16f53096b39ccb5b9ab2345faa3e49434e19336 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/tilesets.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/update_map.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm index 686fa50c..21101e7b 100644 --- a/engine/overworld/tilesets.asm +++ b/engine/overworld/tilesets.asm @@ -14,7 +14,7 @@ LoadTilesetHeader: ld bc, $b call CopyData ld a, [hl] - ldh [hTilesetType], a + ldh [hTileAnimations], a xor a ldh [hMovingBGTilesCounter1], a pop hl diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm index 53a5592d..dbf28dae 100644 --- a/engine/overworld/update_map.asm +++ b/engine/overworld/update_map.asm @@ -52,11 +52,11 @@ RedrawMapView: ret z ldh a, [hAutoBGTransferEnabled] push af - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a ldh [hAutoBGTransferEnabled], a - ldh [hTilesetType], a ; no flower/water BG tile animations + ldh [hTileAnimations], a call LoadCurrentMapView call RunDefaultPaletteCommand ld hl, wMapViewVRAMPointer @@ -112,7 +112,7 @@ RedrawMapView: dec c jr nz, .redrawRowLoop pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a pop af ldh [hAutoBGTransferEnabled], a ret |