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/battle/core.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/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5ea60cb4..417516ae 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -51,7 +51,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ldh [hWY], a ldh [rWY], a xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hSCY], a dec a ld [wUpdateSpritesEnabled], a @@ -6275,7 +6275,7 @@ DoBattleTransitionAndInitBattleVariables: ldh [hAutoBGTransferEnabled], a ldh [hWY], a ldh [rWY], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld hl, wPlayerStatsToDouble ld [hli], a ld [hli], a @@ -6865,8 +6865,8 @@ _InitBattleCommon: ld [wLetterPrintingDelayFlags], a pop af ld [wMapPalOffset], a - ld a, [wSavedTilesetType] - ldh [hTilesetType], a + ld a, [wSavedTileAnimations] + ldh [hTileAnimations], a scf ret .emptyString |