diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 8 | ||||
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 6 |
2 files changed, 7 insertions, 7 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 diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 719fcf0a..67ed3247 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -2,7 +2,7 @@ MarowakAnim: ; 7092b (1c:492b) ; animate the ghost being unveiled as a Marowak ld a, $e4 ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap coord hl, 12, 0 @@ -28,7 +28,7 @@ MarowakAnim: ; 7092b (1c:492b) sla a sla a ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 jr nz, .fadeOutGhostLoop call ClearSprites call CopyMonPicFromBGToSpriteVRAM ; copy Marowak pic from BG to sprite VRAM @@ -42,7 +42,7 @@ MarowakAnim: ; 7092b (1c:492b) srl b rra ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 ld a, b and a jr nz, .fadeInMarowakLoop |