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/battle/init_battle.asm | |
| parent | 48dc6a8cf4da512273e79e49346b35dcc225f773 (diff) | |
| parent | f16f53096b39ccb5b9ab2345faa3e49434e19336 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle/init_battle.asm')
| -rw-r--r-- | engine/battle/init_battle.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/init_battle.asm b/engine/battle/init_battle.asm index d6ba51ed..6a6331b7 100644 --- a/engine/battle/init_battle.asm +++ b/engine/battle/init_battle.asm @@ -143,8 +143,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 |