diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | engine/battle/init_battle_variables.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5ea60cb4..7957c552 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 @@ -6866,7 +6866,7 @@ _InitBattleCommon: pop af ld [wMapPalOffset], a ld a, [wSavedTilesetType] - ldh [hTilesetType], a + ldh [hTileAnimations], a scf ret .emptyString diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 0d403b55..703f5f07 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -1,5 +1,5 @@ InitBattleVariables: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] ld [wSavedTilesetType], a xor a ld [wActionResultOrTookBattleTurn], a |