diff options
Diffstat (limited to 'engine/battle/battle_transitions.asm')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 436e38b5..e4392a01 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -196,6 +196,9 @@ BattleTransition_BlackScreen: ld [rBGP], a ld [rOBP0], a ld [rOBP1], a + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ret ; for non-dungeon trainer battles @@ -359,6 +362,7 @@ BattleTransition_FlashScreen_: cp $1 jr z, .done ld [rBGP], a + call UpdateGBCPal_BGP ld c, 2 call DelayFrames jr .loop @@ -373,7 +377,7 @@ BattleTransition_FlashScreenPalettes: ; used for low level trainer dungeon battles BattleTransition_Shrink: - ld c, SCREEN_HEIGHT / 2 + ld c, 9 .loop push bc xor a @@ -407,7 +411,7 @@ BattleTransition_Shrink: ; used for high level trainer dungeon battles BattleTransition_Split: - ld c, SCREEN_HEIGHT / 2 + ld c, 9 xor a ld [H_AUTOBGTRANSFERENABLED], a .loop |