Skip to content

Commit

Permalink
Identify remaining two battle anim BG effect functions
Browse files Browse the repository at this point in the history
  • Loading branch information
Rangi42 committed Oct 22, 2020
1 parent f954c61 commit 3a2932c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions engine/battle_anims/bg_effects.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -1523,7 +1523,7 @@ Tackle_ReturnMove:
ld [hl], a
ret

Functionc88a5:
Rollout_FillLYOverridesBackup:
push af
ld a, [wFXAnimID + 1]
or a
Expand Down Expand Up @@ -2281,7 +2281,7 @@ BattleBGEffect_WobblePlayer:
ret

BattleBGEffect_Rollout:
call Functionc8d0b
call BattleBGEffects_GetShakeAmount
jr c, .xor_a
bit 7, a
jr z, .okay
Expand All @@ -2298,22 +2298,22 @@ BattleBGEffect_Rollout:
ret

BattleBGEffect_ShakeScreenX:
call Functionc8d0b
call BattleBGEffects_GetShakeAmount
jr nc, .skip
xor a
.skip
ldh [hSCX], a
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]
Expand Down

0 comments on commit 3a2932c

Please sign in to comment.