diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-11-30 16:35:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 16:35:33 -0600 |
| commit | bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c (patch) | |
| tree | 7629f516fd4c09dbfb907c5d4154e0a58666a5a6 /engine/overworld/update_map.asm | |
| parent | Keep wGrassMons and wWaterMons together with a UNION (diff) | |
| parent | Fix reference to unused_fanfare.asm (diff) | |
| download | pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.tar.gz pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.tar.xz pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.zip | |
Merge pull request #304 from SatoMew/master
Rename *TilesetType to *TileAnimations
Diffstat (limited to 'engine/overworld/update_map.asm')
| -rw-r--r-- | engine/overworld/update_map.asm | 6 |
1 files changed, 3 insertions, 3 deletions
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 |