Battle Anim Object struct constants

This commit is contained in:
PikalaxALT
2015-12-23 14:00:29 -05:00
parent ddc05ec8dd
commit 3893feb835
19 changed files with 1323 additions and 1254 deletions

View File

@@ -77,7 +77,7 @@ BattleAnimRunScript: ; cc11c
call BattleAnimRestoreHuds
.disabled
ld a, [wcfca]
ld a, [wNumHits]
and a
jr z, .done
@@ -92,7 +92,7 @@ BattleAnimRunScript: ; cc11c
.hi_byte
call WaitSFX
call Functioncc881
call PlayHitSound
call RunBattleAnimScript
.done
@@ -191,13 +191,13 @@ BattleAnimRequestPals: ; cc1e2
ld a, [rBGP]
ld b, a
ld a, [wcfc7]
ld a, [wBGP]
cp b
call nz, Functioncc91a
ld a, [rOBP0]
ld b, a
ld a, [wcfc8]
ld a, [wOBP0]
cp b
call nz, Functioncc94b
ret
@@ -625,6 +625,7 @@ endr
ret
BattleAnimCmd_Obj: ; cc41f (33:441f)
; index, ???, ???, ???
call GetBattleAnimByte
ld [BattleAnimTemps], a
call GetBattleAnimByte
@@ -650,17 +651,17 @@ BattleAnimCmd_BGEffect: ; cc43b (33:443b)
BattleAnimCmd_BGP: ; cc457 (33:4457)
call GetBattleAnimByte
ld [wcfc7], a
ld [wBGP], a
ret
BattleAnimCmd_OBP0: ; cc45e (33:445e)
call GetBattleAnimByte
ld [wcfc8], a
ld [wOBP0], a
ret
BattleAnimCmd_OBP1: ; cc465 (33:4465)
call GetBattleAnimByte
ld [wcfc9], a
ld [wOBP1], a
ret
BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
@@ -670,7 +671,7 @@ BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
jr z, .not_sgb
ld a, $f0
.not_sgb
ld [wcfc8], a
ld [wOBP0], a
ret
BattleAnimCmd_ClearObjs: ; cc479 (33:4479)
@@ -691,10 +692,10 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)
ld a, [BattleAnimByte]
and $f
ld c, a
ld hl, w5_d300
ld hl, wBattleAnimTileDict
xor a
ld [BattleAnimTemps], a
.asm_cc492
.loop
ld a, [BattleAnimTemps]
cp $4f
ret nc
@@ -719,7 +720,7 @@ endr
pop hl
pop bc
dec c
jr nz, .asm_cc492
jr nz, .loop
ret
BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
@@ -797,7 +798,7 @@ BattleAnimCmd_SetObj: ; cc506 (33:4506)
BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
ld hl, w5_d300
ld hl, wBattleAnimTileDict
.asm_cc52f
ld a, [hl]
and a
@@ -853,7 +854,7 @@ Functioncc561: ; cc561 (33:4561)
BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
ld hl, w5_d300
ld hl, wBattleAnimTileDict
.asm_cc581
ld a, [hl]
and a
@@ -1249,7 +1250,7 @@ BattleAnimCmd_Cry: ; cc807 (33:4807)
and 3
ld e, a
ld d, 0
ld hl, Datacc871
ld hl, .CryData
rept 4
add hl, de
endr
@@ -1266,14 +1267,14 @@ endr
ld a, $f0
ld [CryTracks], a ; CryTracks
ld a, [BattleMonSpecies] ; BattleMonSpecies
jr .asm_cc834
jr .done_cry_tracks
.enemy
ld a, $0f
ld [CryTracks], a ; CryTracks
ld a, [EnemyMonSpecies] ; EnemyMon
.asm_cc834
.done_cry_tracks
push hl
call LoadCryHeader
pop hl
@@ -1320,17 +1321,17 @@ endr
ret
; cc871 (33:4871)
Datacc871: ; cc871
.CryData: ; cc871
; +pitch, +length
dw 0, $c0
dw 0, $40
dw 0, $00
dw 0, $00
dw $0000, $00c0
dw $0000, $0040
dw $0000, $0000
dw $0000, $0000
; cc881
Functioncc881: ; cc881
ld a, [wcfca]
PlayHitSound: ; cc881
ld a, [wNumHits]
cp $1
jr z, .okay
cp $4
@@ -1366,17 +1367,17 @@ BattleAnimAssignPals: ; cc8a4
ld a, %11110000
.sgb
ld [wcfc8], a
ld [wOBP0], a
ld a, %11100100
ld [wcfc7], a
ld [wcfc9], a
ld [wBGP], a
ld [wOBP1], a
ret
.cgb
ld a, %11100100
ld [wcfc7], a
ld [wcfc8], a
ld [wcfc9], a
ld [wBGP], a
ld [wOBP0], a
ld [wOBP1], a
call DmgToCgbBGPals
lb de, %11100100, %11100100
call DmgToCgbObjPals
@@ -1412,9 +1413,9 @@ endr
Functioncc8f6: ; cc8f6
call WaitTop
ld a, %11100100
ld [wcfc7], a
ld [wcfc8], a
ld [wcfc9], a
ld [wBGP], a
ld [wOBP0], a
ld [wOBP1], a
call DmgToCgbBGPals
lb de, %11100100, %11100100
call DmgToCgbObjPals

File diff suppressed because it is too large Load Diff

View File

@@ -218,14 +218,14 @@ Functionc80fb: ; c80fb (32:40fb)
ld h, 0
add hl, de
ld a, [hl]
ld [wcfc7], a
ld [wBGP], a
ret
BattleBGEffect_WhiteHues: ; c812d (32:412d)
ld de, Unknown_c813d
call Functionc8d57
jr c, .asm_c8139
ld [wcfc7], a
ld [wBGP], a
ret
.asm_c8139
@@ -242,7 +242,7 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
ld de, Unknown_c8151
call Functionc8d57
jr c, .asm_c814d
ld [wcfc7], a
ld [wBGP], a
ret
.asm_c814d
@@ -259,8 +259,8 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
ld de, Unknown_c8168
call Functionc8d57
jr c, .asm_c8164
ld [wcfc7], a
ld [wcfc9], a
ld [wBGP], a
ld [wOBP1], a
ret
.asm_c8164
@@ -282,7 +282,7 @@ BattleBGEffect_06: ; c8171 (32:4171)
ld de, Unknown_c8188
.asm_c817e
call Functionc8d57
ld [wcfc8], a
ld [wOBP0], a
ret
; c8185 (32:4185)
@@ -304,7 +304,7 @@ BattleBGEffect_07: ; c818b (32:418b)
ld de, Unknown_c81a2
.asm_c8198
call Functionc8d57
ld [wcfc8], a
ld [wOBP0], a
ret
; c819f (32:419f)
@@ -320,7 +320,7 @@ Unknown_c81a2:
BattleBGEffect_08: ; c81a5 (32:41a5)
ld de, Unknown_c81af
call Functionc8d57
ld [wcfc7], a
ld [wBGP], a
ret
; c81af (32:41af)
@@ -412,7 +412,7 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
Functionc8223: ; c8223 (32:4223)
call Functionc9042
jr z, .asm_c8230
ld hl, w5_d40e
ld hl, wNumActiveBattleAnims
inc [hl]
call EndBattleBGEffect
ret
@@ -478,7 +478,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
Functionc8290: ; c8290 (32:4290)
call Functionc9042
jr z, .asm_c829d
ld hl, w5_d40e
ld hl, wNumActiveBattleAnims
inc [hl]
call EndBattleBGEffect
ret
@@ -2002,7 +2002,7 @@ Functionc8b22: ; c8b22 (32:4b22)
ld hl, Unknown_c8bd8
add hl, de
ld a, [hli]
ld [wcfc9], a
ld [wOBP1], a
ld d, a
ld e, [hl]
ld bc, $2f30
@@ -2013,7 +2013,7 @@ Functionc8b22: ; c8b22 (32:4b22)
ld d, [hl]
inc hl
ld a, [hl]
ld [wcfc9], a
ld [wOBP1], a
ld e, a
ld bc, $3728
.asm_c8b5b
@@ -2024,8 +2024,8 @@ Functionc8b22: ; c8b22 (32:4b22)
Functionc8b60: ; c8b60 (32:4b60)
call Functionc8f19
ld a, $e4
ld [wcfc7], a
ld [wcfc9], a
ld [wBGP], a
ld [wOBP1], a
ret
Functionc8b6c: ; c8b6c (32:4b6c)
@@ -2733,8 +2733,8 @@ Functionc8f19: ; c8f19 (32:4f19)
ld [hLCDStatCustom], a
ld a, $e4
ld [rBGP], a
ld [wcfc7], a
ld [wcfc9], a
ld [wBGP], a
ld [wOBP1], a
ld [hLCDStatCustom + 1], a
ld [hLCDStatCustom + 2], a
call Functionc8eca

View File

@@ -421,7 +421,7 @@ HandleBerserkGene: ; 3c27c
bit SUBSTATUS_CONFUSED, a
ret nz
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_CONFUSED
call Call_PlayBattleAnim_OnlyIfVisible
call SwitchTurnCore
@@ -1098,7 +1098,7 @@ ResidualDamage: ; 3c716
pop de
xor a
ld [wcfca], a
ld [wNumHits], a
call Call_PlayBattleAnim_OnlyIfVisible
call GetEighthMaxHP
ld de, PlayerToxicCount
@@ -1138,7 +1138,7 @@ ResidualDamage: ; 3c716
call SwitchTurnCore
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_SAP
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
@@ -1163,7 +1163,7 @@ ResidualDamage: ; 3c716
bit SUBSTATUS_NIGHTMARE, [hl]
jr z, .not_nightmare
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP
@@ -1181,7 +1181,7 @@ ResidualDamage: ; 3c716
jr z, .not_cursed
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP
@@ -1325,7 +1325,7 @@ HandleWrap: ; 3c874
call SwitchTurnCore
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
predef PlayBattleAnim
call SwitchTurnCore
@@ -1827,7 +1827,7 @@ HandleWeather: ; 3cb9e
call SwitchTurnCore
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_IN_SANDSTORM
call Call_PlayBattleAnim
call SwitchTurnCore
@@ -3761,7 +3761,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
call GetMonFrontpic
xor a
ld [wcfca], a
ld [wNumHits], a
ld [wKickCounter], a
call SetEnemyTurn
ld de, ANIM_SEND_OUT_MON
@@ -4267,7 +4267,7 @@ SendOutPlayerMon: ; 3db5f
ld [wEnemyWrapCount], a
call SetPlayerTurn
xor a
ld [wcfca], a
ld [wNumHits], a
ld [wKickCounter], a
ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim
@@ -4460,7 +4460,7 @@ Function3dce6: ; 3dce6
push af
xor a
ld [hBattleTurn], a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_RETURN_MON
call Call_PlayBattleAnim
pop af
@@ -4593,7 +4593,7 @@ ItemRecoveryAnim: ; 3ddc8
ld [FXAnimIDLo], a
call SwitchTurnCore
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
predef PlayBattleAnim
call SwitchTurnCore
@@ -8761,7 +8761,7 @@ CleanUpBattleRAM: ; 3f6d0
ld [wFailedToFlee], a
ld [wNumFleeAttempts], a
ld [wForcedSwitch], a
ld [wd0d8], a
ld [wPartyMenuCursor], a
ld [wKeyItemsPocketCursor], a
ld [wItemsPocketCursor], a
ld [wd0d2], a
@@ -9591,7 +9591,7 @@ BattleStartMessage: ; 3fc8b
jr nc, .not_shiny
xor a
ld [wcfca], a
ld [wNumHits], a
ld a, 1
ld [hBattleTurn], a
ld a, 1

View File

@@ -172,7 +172,7 @@ CheckPlayerTurn:
jr z, .woke_up
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_SLP
call FarPlayBattleAnimation
jr .fast_asleep
@@ -276,7 +276,7 @@ CheckPlayerTurn:
ld hl, IsConfusedText
call StdBattleTextBox
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
@@ -305,7 +305,7 @@ CheckPlayerTurn:
ld hl, InLoveWithText
call StdBattleTextBox
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation
@@ -420,7 +420,7 @@ CheckEnemyTurn: ; 3421f
ld hl, FastAsleepText
call StdBattleTextBox
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_SLP
call FarPlayBattleAnimation
jr .fast_asleep
@@ -521,7 +521,7 @@ CheckEnemyTurn: ; 3421f
call StdBattleTextBox
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
@@ -542,7 +542,7 @@ CheckEnemyTurn: ; 3421f
call BattleCommand_DamageCalc
call BattleCommand_LowerSub
xor a
ld [wcfca], a
ld [wNumHits], a
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
@@ -567,7 +567,7 @@ CheckEnemyTurn: ; 3421f
ld hl, InLoveWithText
call StdBattleTextBox
xor a
ld [wcfca], a
ld [wNumHits], a
ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation
@@ -656,7 +656,7 @@ HitConfusion: ; 343a5
call BattleCommand_LowerSub
xor a
ld [wcfca], a
ld [wNumHits], a
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
@@ -2071,7 +2071,7 @@ BattleCommand_LowerSub: ; 34eee
jr c, .mimic_anims
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
inc a
ld [wKickCounter], a
@@ -2125,7 +2125,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
ld a, BATTLEANIM_PLAYER_DAMAGE
.got_rollout_count
ld [wcfca], a
ld [wNumHits], a
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_MULTI_HIT
@@ -2177,7 +2177,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
pop af
jp z, PlayFXAnimID
xor a
ld [wcfca], a
ld [wNumHits], a
jp PlayFXAnimID
; 34fd1
@@ -2208,7 +2208,7 @@ BattleCommand_StatDownAnim: ; 34fdb
BattleCommand_StatUpDownAnim: ; 34feb
ld [wcfca], a
ld [wNumHits], a
xor a
ld [wKickCounter], a
ld a, BATTLE_VARS_MOVE_ANIM
@@ -2241,7 +2241,7 @@ BattleCommand_RaiseSub: ; 35004
jp c, BattleCommand_RaiseSubNoAnim
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, $2
ld [wKickCounter], a
@@ -2599,7 +2599,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
call BattleCommand_SwitchTurn
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
inc a
ld [wKickCounter], a
@@ -5254,7 +5254,7 @@ BattleCommand_BurnTarget: ; 3608c
; burntarget
xor a
ld [wcfca], a
ld [wNumHits], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@@ -5324,7 +5324,7 @@ BattleCommand_FreezeTarget: ; 36102
; freezetarget
xor a
ld [wcfca], a
ld [wNumHits], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@@ -5379,7 +5379,7 @@ BattleCommand_ParalyzeTarget: ; 36165
; paralyzetarget
xor a
ld [wcfca], a
ld [wNumHits], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@@ -6549,7 +6549,7 @@ BattleCommand_Teleport: ; 36778
.run_away
call UpdateBattleMonInParty
xor a
ld [wcfca], a
ld [wNumHits], a
inc a
ld [wForcedSwitch], a
ld [wKickCounter], a
@@ -6617,7 +6617,7 @@ BattleCommand_ForceSwitch: ; 3680f
.wild_force_flee
call UpdateBattleMonInParty
xor a
ld [wcfca], a
ld [wNumHits], a
inc a
ld [wForcedSwitch], a
call SetBattleDraw
@@ -6710,7 +6710,7 @@ BattleCommand_ForceSwitch: ; 3680f
.wild_succeed_playeristarget
call UpdateBattleMonInParty
xor a
ld [wcfca], a
ld [wNumHits], a
inc a
ld [wForcedSwitch], a
call SetBattleDraw
@@ -7141,7 +7141,7 @@ BattleCommand_Charge: ; 36b4d
call BattleCommand_LowerSub
xor a
ld [wcfca], a
ld [wNumHits], a
inc a
ld [wKickCounter], a
call LoadMoveAnim
@@ -7713,7 +7713,7 @@ endr
jr c, .mobile
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld [wKickCounter], a
ld a, SUBSTITUTE
@@ -8234,7 +8234,7 @@ BattleCommand_Transform: ; 371cd
call CheckHiddenOpponent
jp nz, Function372d2
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, $1
ld [wKickCounter], a
@@ -8352,7 +8352,7 @@ endr
call BattleCommand_RaiseSubNoAnim
.after_anim
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, $2
ld [wKickCounter], a
@@ -8546,7 +8546,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand_SelfDestruct: ; 37380
callba MobileFn_10610d
ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wcfca], a
ld [wNumHits], a
ld c, 3
call DelayFrames
ld a, BATTLE_VARS_STATUS
@@ -9773,7 +9773,7 @@ PlayDamageAnim: ; 37e19
ld a, BATTLEANIM_PLAYER_DAMAGE
.player
ld [wcfca], a
ld [wNumHits], a
jp PlayUserBattleAnim
; 37e36
@@ -9781,7 +9781,7 @@ PlayDamageAnim: ; 37e19
LoadMoveAnim: ; 37e36
xor a
ld [wcfca], a
ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, BATTLE_VARS_MOVE_ANIM
@@ -9819,7 +9819,7 @@ PlayOpponentBattleAnim: ; 37e54
ld a, d
ld [FXAnimIDHi], a
xor a
ld [wcfca], a
ld [wNumHits], a
push hl
push de