Skip to content

Commit f8cd24f

Browse files
committed
Write our screen state to wBattleAnimParam for brick break
1 parent eacb2a7 commit f8cd24f

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

engine/battle/effect_commands.asm

+10-2
Original file line numberDiff line numberDiff line change
@@ -3920,16 +3920,24 @@ GetOpponentActiveScreens:
39203920
ld a, BATTLE_VARS_MOVE_EFFECT
39213921
call GetBattleVar
39223922
xor EFFECT_BRICK_BREAK
3923-
ret z
3923+
jr nz, .no_brick_break
39243924

3925+
; Set move anim param to notify that we are breaking screens.
3926+
call .GetScreen
3927+
ld [wBattleAnimParam], a
3928+
xor a
3929+
ret
3930+
3931+
.no_brick_break
39253932
call GetTrueUserAbility
39263933
xor INFILTRATOR
39273934
ret z
39283935

39293936
ld a, [wCriticalHit]
39303937
dec a ; cp TRUE
39313938
ret z
3932-
3939+
; fallthrough
3940+
.GetScreen:
39333941
ldh a, [hBattleTurn]
39343942
and a
39353943
ld a, [wEnemyScreens]

0 commit comments

Comments
 (0)