From 0ac39546c69bbe3c2c6764cad9529ffab565ddfc Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 21 Oct 2020 22:51:16 -0400 Subject: Identify remaining two battle anim BG effect functions --- engine/battle_anims/bg_effects.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index e406653f..411b6347 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1451,7 +1451,7 @@ Tackle_MoveForward: .reached_limit call BattleBGEffects_IncrementJumptable .finish - call Functionc886e + call Rollout_FillLYOverridesBackup ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -1472,7 +1472,7 @@ Tackle_ReturnMove: jr nz, .move_back call BattleBGEffects_IncrementJumptable .move_back - call Functionc886e + call Rollout_FillLYOverridesBackup ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -1484,7 +1484,7 @@ Tackle_ReturnMove: ld [hl], a ret -Functionc886e: +Rollout_FillLYOverridesBackup: push af ld a, [wFXAnimID + 1] or a @@ -2242,7 +2242,7 @@ BattleBGEffect_WobblePlayer: ret BattleBGEffect_Rollout: - call Functionc8cd4 + call BattleBGEffects_GetShakeAmount jr c, .xor_a bit 7, a jr z, .okay @@ -2259,7 +2259,7 @@ BattleBGEffect_Rollout: ret BattleBGEffect_ShakeScreenX: - call Functionc8cd4 + call BattleBGEffects_GetShakeAmount jr nc, .skip xor a .skip @@ -2267,14 +2267,14 @@ BattleBGEffect_ShakeScreenX: ret BattleBGEffect_ShakeScreenY: - call Functionc8cd4 + call BattleBGEffects_GetShakeAmount jr nc, .skip xor a .skip ldh [hSCY], a ret -Functionc8cd4: +BattleBGEffects_GetShakeAmount: ld hl, BG_EFFECT_STRUCT_JT_INDEX add hl, bc ld a, [hl] -- cgit v1.2.3