diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 6 | ||||
| -rw-r--r-- | engine/battle/common_text.asm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index f5af6826..2ff681dd 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -355,7 +355,7 @@ BattleTransition_OutwardSpiral_: ; 70b6c (1c:4b6c) jr .done FlashScreen: -BattleTransition_FlashScreen_: ; 70be8 (1c:4be8s) +BattleTransition_FlashScreen_: ; 70be8 (1c:4be8) ld hl, BattleTransition_FlashScreenPalettes .loop ld a, [hli] @@ -377,6 +377,7 @@ BattleTransition_FlashScreenPalettes: ; 70be8 (1c:4be8) ; used for low level trainer dungeon battles BattleTransition_Shrink: ; 70bf4 (1c:4bf4) + ld c,9 .loop push bc xor a @@ -410,6 +411,7 @@ BattleTransition_Shrink: ; 70bf4 (1c:4bf4) ; used for high level trainer dungeon battles BattleTransition_Split: ; 70c40 (1c:4c40) + ld c,$9 xor a ld [H_AUTOBGTRANSFERENABLED], a .loop @@ -471,7 +473,7 @@ BattleTransition_CopyTiles1: ; 70c88 (1c:4c88) jr nz, .loop2 ret -BattleTransition_CopyTiles2: ; 70cb5 (1c:4c3f) +BattleTransition_CopyTiles2: ; 70cb5 (1c:4cb5) ld a, c ld [wBattleTransitionCopyTilesOffset], a ld a, b diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index e3c7e1fa..fcc00376 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -79,7 +79,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000) xor a ld [wFrequencyModifier], a ld a, $80 - ld [wc0f2], a + ld [wTempoModifier], a ld a, $e9 ; (SFX_08_77 - SFX_Headers_08) / 3 call PlaySound jp WaitForSoundToFinish |