Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use offsets from ANIM_* constants for wBattleAfterAnim (formerly wNumHits) (#1184)

Browse Source
This commit is contained in:
Rangi
2025-05-31 15:07:56 -04:00
committed by GitHub
parent b035d9fb89
commit efceed1338
10 changed files with 60 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/battle_anims/anim_commands.asm
View File

@@ -53,7 +53,7 @@ _PlayBattleAnim:
BattleAnimRunScript:
ld a, [wFXAnimID + 1]
and a
jr nz, .hi_byte
jr nz, .not_move
farcall CheckBattleScene
jr c, .disabled
@@ -75,20 +75,20 @@ BattleAnimRunScript:
call BattleAnimRestoreHuds
.disabled
ld a, [wNumHits]
ld a, [wBattleAfterAnim]
and a
jr z, .done
ld l, a
ld h, 0
ld de, ANIM_MISS
ld de, BATTLE_AFTERANIMS
add hl, de
ld a, l
ld [wFXAnimID], a
ld a, h
ld [wFXAnimID + 1], a
.hi_byte
.not_move
call WaitSFX
call PlayHitSound
call RunBattleAnimScript
@@ -1311,10 +1311,10 @@ endr
dw $0000, $0000
PlayHitSound:
ld a, [wNumHits]
cp BATTLEANIM_ENEMY_DAMAGE
ld a, [wBattleAfterAnim]
cp ANIM_ENEMY_DAMAGE - BATTLE_AFTERANIMS
jr z, .okay
cp BATTLEANIM_PLAYER_DAMAGE
cp ANIM_PLAYER_DAMAGE - BATTLE_AFTERANIMS
ret nz
.okay