summaryrefslogtreecommitdiff
path: root/engine/battle/battle_transitions.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-10-12 13:05:36 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-10-12 13:05:36 -0400
commit2cf4efe15c50e84824bad8420b16009e6fa066c3 (patch)
tree116e2fb232f85208892d47360e044e6eccfb4c20 /engine/battle/battle_transitions.asm
parent9b2c58dfd3021bb0c4eedb9df1cfe5ca23060c17 (diff)
Rename some palette labels.
Also add replace.sh
Diffstat (limited to 'engine/battle/battle_transitions.asm')
-rw-r--r--engine/battle/battle_transitions.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 2ff681dd..c5c4ffbe 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -196,9 +196,9 @@ BattleTransition_BlackScreen: ; 70ad3 (1c:4ad3)
ld [rBGP], a
ld [rOBP0], a
ld [rOBP1], a
- call Func_3021
- call Func_3040
- call Func_3061
+ call UpdateGBCPal_BGP
+ call UpdateGBCPal_OBP0
+ call UpdateGBCPal_OBP1
ret
; for non-dungeon trainer battles
@@ -362,7 +362,7 @@ BattleTransition_FlashScreen_: ; 70be8 (1c:4be8)
cp $1
jr z, .done
ld [rBGP], a
- call Func_3021
+ call UpdateGBCPal_BGP
ld c, $2
call DelayFrames
jr .loop