From 242b2e05cf30bc47a53167baf6bd3134d1f47d18 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sun, 29 Nov 2020 20:17:29 +0000 Subject: Label and document hFFD7 more accurately --- engine/overworld/tilesets.asm | 2 +- engine/overworld/update_map.asm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/overworld') diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm index f40cbbc2..fa5cf626 100644 --- a/engine/overworld/tilesets.asm +++ b/engine/overworld/tilesets.asm @@ -23,7 +23,7 @@ LoadTilesetHeader: dec c jr nz, .copyTilesetHeaderLoop 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..26334733 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 ; no flower/water BG tile animations 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 -- cgit v1.2.3 From 5d9957293c28a4d1483a02d76020a895b23d36db Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sun, 29 Nov 2020 22:47:51 +0000 Subject: Delete unnecessary comment --- engine/overworld/update_map.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/overworld') diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm index 26334733..dbf28dae 100644 --- a/engine/overworld/update_map.asm +++ b/engine/overworld/update_map.asm @@ -56,7 +56,7 @@ RedrawMapView: push af xor a ldh [hAutoBGTransferEnabled], a - ldh [hTileAnimations], a ; no flower/water BG tile animations + ldh [hTileAnimations], a call LoadCurrentMapView call RunDefaultPaletteCommand ld hl, wMapViewVRAMPointer -- cgit v1.2.3