Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-03-21 17:34:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rangi42 2025-05-31 15:22:54 -04:00
parent 4be4d4708e
commit 9a798b0137
10 changed files with 59 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
constants/move_constants.asm
View File

@ -278,7 +278,8 @@ DEF CANNOT_MOVE EQU $ff
const ANIM_IN_SANDSTORM ; 10b
const ANIM_IN_NIGHTMARE ; 10c
const ANIM_IN_WHIRLPOOL ; 10d
; battle anims
; wBattleAfterAnim uses offsets from BATTLE_AFTERANIMS
DEF BATTLE_AFTERANIMS EQU const_value
const ANIM_MISS ; 10e
const ANIM_ENEMY_DAMAGE ; 10f
const ANIM_ENEMY_STAT_DOWN ; 110
@ -288,14 +289,3 @@ DEF CANNOT_MOVE EQU $ff
const ANIM_SHAKE ; 114
const ANIM_HIT_CONFUSION ; 115
DEF NUM_BATTLE_ANIMS EQU const_value - 1
; wNumHits uses offsets from ANIM_MISS
const_def
const BATTLEANIM_NONE
const BATTLEANIM_ENEMY_DAMAGE
const BATTLEANIM_ENEMY_STAT_DOWN
const BATTLEANIM_PLAYER_STAT_DOWN
const BATTLEANIM_PLAYER_DAMAGE
const BATTLEANIM_WOBBLE
const BATTLEANIM_SHAKE
const BATTLEANIM_HIT_CONFUSION

24
engine/battle/core.asm
View File

@ -367,7 +367,7 @@ HandleBerserkGene:
bit SUBSTATUS_CONFUSED, a
ret nz
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_CONFUSED
call Call_PlayBattleAnim_OnlyIfVisible
call SwitchTurnCore
@ -972,7 +972,7 @@ ResidualDamage:
pop de
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
call Call_PlayBattleAnim_OnlyIfVisible
call GetEighthMaxHP
ld de, wPlayerToxicCount
@ -1012,7 +1012,7 @@ ResidualDamage:
call SwitchTurnCore
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_SAP
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
@ -1037,7 +1037,7 @@ ResidualDamage:
bit SUBSTATUS_NIGHTMARE, [hl]
jr z, .not_nightmare
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP
@ -1055,7 +1055,7 @@ ResidualDamage:
jr z, .not_cursed
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP
@ -1197,7 +1197,7 @@ HandleWrap:
call SwitchTurnCore
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
predef PlayBattleAnim
call SwitchTurnCore
@ -1687,7 +1687,7 @@ HandleWeather:
call SwitchTurnCore
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_IN_SANDSTORM
call Call_PlayBattleAnim
call SwitchTurnCore
@ -3358,7 +3358,7 @@ ShowSetEnemyMonAndSendOutAnimation:
call GetEnemyMonFrontpic
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wBattleAnimParam], a
call SetEnemyTurn
ld de, ANIM_SEND_OUT_MON
@ -3815,7 +3815,7 @@ SendOutPlayerMon:
ld [wEnemyWrapCount], a
call SetPlayerTurn
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wBattleAnimParam], a
ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim
@ -3995,7 +3995,7 @@ RecallPlayerMon:
push af
xor a
ldh [hBattleTurn], a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_RETURN_MON
call Call_PlayBattleAnim
pop af
@ -4127,7 +4127,7 @@ ItemRecoveryAnim:
ld [wFXAnimID], a
call SwitchTurnCore
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
predef PlayBattleAnim
call SwitchTurnCore
@ -8700,7 +8700,7 @@ BattleStartMessage:
jr nc, .not_shiny
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld a, 1
ldh [hBattleTurn], a
ld a, 1

58
engine/battle/effect_commands.asm
View File

@ -167,7 +167,7 @@ BattleCommand_CheckTurn:
jr z, .woke_up
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_SLP
call FarPlayBattleAnimation
jr .fast_asleep
@ -267,7 +267,7 @@ BattleCommand_CheckTurn:
ld hl, IsConfusedText
call StdBattleTextbox
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
@ -295,7 +295,7 @@ BattleCommand_CheckTurn:
ld hl, InLoveWithText
call StdBattleTextbox
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation
@ -398,7 +398,7 @@ CheckEnemyTurn:
ld hl, FastAsleepText
call StdBattleTextbox
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_SLP
call FarPlayBattleAnimation
jr .fast_asleep
@ -496,7 +496,7 @@ CheckEnemyTurn:
call StdBattleTextbox
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
@ -519,7 +519,7 @@ CheckEnemyTurn:
call BattleCommand_LowerSub
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
@ -543,7 +543,7 @@ CheckEnemyTurn:
ld hl, InLoveWithText
call StdBattleTextbox
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation
@ -622,7 +622,7 @@ HitConfusion:
call BattleCommand_LowerSub
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
@ -1920,7 +1920,7 @@ BattleCommand_LowerSub:
jr c, .mimic_anims
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
inc a
ld [wBattleAnimParam], a
@ -1963,13 +1963,13 @@ BattleCommand_MoveAnimNoSub:
ldh a, [hBattleTurn]
and a
ld de, wPlayerRolloutCount
ld a, BATTLEANIM_ENEMY_DAMAGE
ld a, ANIM_ENEMY_DAMAGE - BATTLE_AFTERANIMS
jr z, .got_rollout_count
ld de, wEnemyRolloutCount
ld a, BATTLEANIM_PLAYER_DAMAGE
ld a, ANIM_PLAYER_DAMAGE - BATTLE_AFTERANIMS
.got_rollout_count
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_MULTI_HIT
@ -2016,7 +2016,7 @@ BattleCommand_MoveAnimNoSub:
pop af
jp z, PlayFXAnimID
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
jp PlayFXAnimID
BattleCommand_StatUpAnim:
@ -2034,14 +2034,14 @@ BattleCommand_StatDownAnim:
ldh a, [hBattleTurn]
and a
ld a, BATTLEANIM_ENEMY_STAT_DOWN
ld a, ANIM_ENEMY_STAT_DOWN - BATTLE_AFTERANIMS
jr z, BattleCommand_StatUpDownAnim
ld a, BATTLEANIM_WOBBLE
ld a, ANIM_WOBBLE - BATTLE_AFTERANIMS
; fallthrough
BattleCommand_StatUpDownAnim:
ld [wNumHits], a
ld [wBattleAfterAnim], a
xor a
ld [wBattleAnimParam], a
ld a, BATTLE_VARS_MOVE_ANIM
@ -2068,7 +2068,7 @@ BattleCommand_RaiseSub:
jp c, BattleCommand_RaiseSubNoAnim
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
ld a, $2
ld [wBattleAnimParam], a
@ -2401,7 +2401,7 @@ BattleCommand_CheckFaint:
call BattleCommand_SwitchTurn
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
inc a
ld [wBattleAnimParam], a
@ -3894,7 +3894,7 @@ SapHealth:
BattleCommand_BurnTarget:
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@ -3958,7 +3958,7 @@ Defrost:
BattleCommand_FreezeTarget:
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@ -4009,7 +4009,7 @@ BattleCommand_FreezeTarget:
BattleCommand_ParalyzeTarget:
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@ -4947,7 +4947,7 @@ BattleCommand_ForceSwitch:
.wild_force_flee
call UpdateBattleMonInParty
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
inc a ; TRUE
ld [wForcedSwitch], a
inc a ; DRAW
@ -5041,7 +5041,7 @@ BattleCommand_ForceSwitch:
.wild_succeed_playeristarget
call UpdateBattleMonInParty
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
inc a ; TRUE
ld [wForcedSwitch], a
inc a ; DRAW
@ -5453,7 +5453,7 @@ BattleCommand_Charge:
call BattleCommand_LowerSub
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
inc a
ld [wBattleAnimParam], a
call LoadMoveAnim
@ -6591,18 +6591,18 @@ PlayDamageAnim:
ldh a, [hBattleTurn]
and a
ld a, BATTLEANIM_ENEMY_DAMAGE
ld a, ANIM_ENEMY_DAMAGE - BATTLE_AFTERANIMS
jr z, .player
ld a, BATTLEANIM_PLAYER_DAMAGE
ld a, ANIM_PLAYER_DAMAGE - BATTLE_AFTERANIMS
.player
ld [wNumHits], a
ld [wBattleAfterAnim], a
jp PlayUserBattleAnim
LoadMoveAnim:
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
ld a, BATTLE_VARS_MOVE_ANIM
@ -6633,7 +6633,7 @@ PlayOpponentBattleAnim:
ld a, d
ld [wFXAnimID + 1], a
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
push hl
push de

4
engine/battle/move_effects/selfdestruct.asm
View File

@ -1,6 +1,6 @@
BattleCommand_Selfdestruct:
ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a
ld a, ANIM_PLAYER_DAMAGE - BATTLE_AFTERANIMS
ld [wBattleAfterAnim], a
ld c, 3
call DelayFrames
ld a, BATTLE_VARS_STATUS

2
engine/battle/move_effects/substitute.asm
View File

@ -60,7 +60,7 @@ BattleCommand_Substitute:
jr c, .no_anim
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
ld [wBattleAnimParam], a
ld a, SUBSTITUTE

2
engine/battle/move_effects/teleport.asm
View File

@ -75,7 +75,7 @@ BattleCommand_Teleport:
.run_away
call UpdateBattleMonInParty
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
inc a
ld [wForcedSwitch], a
; set battle draw

4
engine/battle/move_effects/transform.asm
View File

@ -7,7 +7,7 @@ BattleCommand_Transform:
call CheckHiddenOpponent
jp nz, BattleEffect_ButItFailed
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
ld a, $1
ld [wBattleAnimParam], a
@ -127,7 +127,7 @@ BattleCommand_Transform:
call BattleCommand_RaiseSubNoAnim
.after_anim
xor a
ld [wNumHits], a
ld [wBattleAfterAnim], a
ld [wFXAnimID + 1], a
ld a, $2
ld [wBattleAnimParam], a

14
engine/battle_anims/anim_commands.asm
View File

@ -33,7 +33,7 @@ PlayBattleAnim:
BattleAnimRunScript:
ld a, [wFXAnimID + 1]
and a
jr nz, .hi_byte
jr nz, .not_move
ld a, [wOptions]
bit BATTLE_SCENE, a
@ -53,20 +53,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
@ -1198,10 +1198,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

4
engine/items/item_effects.asm
View File

@ -407,7 +407,7 @@ PokeBallEffect:
xor a
ldh [hBattleTurn], a
ld [wThrownBallWobbleCount], a
ld [wNumHits], a
ld [wBattleAfterAnim], a
predef PlayBattleAnim
ld a, [wWildMon]
@ -2585,7 +2585,7 @@ UseBallInTrainerBattle:
xor a
ld [wBattleAnimParam], a
ldh [hBattleTurn], a
ld [wNumHits], a
ld [wBattleAfterAnim], a
predef PlayBattleAnim
ld hl, BallBlockedText
call PrintText

2
ram/wram.asm
View File

@ -1711,7 +1711,7 @@ wBGP:: db
wOBP0:: db
wOBP1:: db
wNumHits:: db
wBattleAfterAnim:: db
ds 1