diff options
Diffstat (limited to 'engine/battle/battle_transitions.asm')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 9e02c56f..a4871837 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -1,5 +1,5 @@ BattleTransition: - ld a, 1 + ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a @@ -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,7 +362,8 @@ BattleTransition_FlashScreen_: cp $1 jr z, .done ld [rBGP], a - ld c, 2 + call UpdateGBCPal_BGP + ld c, $2 call DelayFrames jr .loop .done @@ -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 @@ -628,7 +632,7 @@ BattleTransition_Circle_Sub1: ret BattleTransition_TransferDelay3: - ld a, 1 + ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a |