diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 1d814a943..2f82ad095 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1490,7 +1490,7 @@ Tackle_MoveForward: .reached_limit call BattleBGEffects_IncrementJumptable .finish - call Functionc88a5 + call Rollout_FillLYOverridesBackup ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -1511,7 +1511,7 @@ Tackle_ReturnMove: jr nz, .move_back call BattleBGEffects_IncrementJumptable .move_back - call Functionc88a5 + call Rollout_FillLYOverridesBackup ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -1523,7 +1523,7 @@ Tackle_ReturnMove: ld [hl], a ret -Functionc88a5: +Rollout_FillLYOverridesBackup: push af ld a, [wFXAnimID + 1] or a @@ -2281,7 +2281,7 @@ BattleBGEffect_WobblePlayer: ret BattleBGEffect_Rollout: - call Functionc8d0b + call BattleBGEffects_GetShakeAmount jr c, .xor_a bit 7, a jr z, .okay @@ -2298,7 +2298,7 @@ BattleBGEffect_Rollout: ret BattleBGEffect_ShakeScreenX: - call Functionc8d0b + call BattleBGEffects_GetShakeAmount jr nc, .skip xor a .skip @@ -2306,14 +2306,14 @@ BattleBGEffect_ShakeScreenX: ret BattleBGEffect_ShakeScreenY: - call Functionc8d0b + call BattleBGEffects_GetShakeAmount jr nc, .skip xor a .skip ldh [hSCY], a ret -Functionc8d0b: +BattleBGEffects_GetShakeAmount: ld hl, BG_EFFECT_STRUCT_JT_INDEX add hl, bc ld a, [hl]