thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Label some attack animation functions

Browse source
This commit is contained in:
xCrystal 2015-03-31 21:09:43 +02:00
parent c73b5d73f4
commit e6185ac358
4 changed files with 49 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
engine/battle/animations.asm
View file

@ -446,7 +446,7 @@ ShareMoveAnimations: ; 78da6 (1e:4da6)
ret ret
Func_78dbd: ; 78dbd (1e:4dbd) Func_78dbd: ; 78dbd (1e:4dbd)
ld a,[wcc5b] ld a,[wAnimationType]
and a and a
ret z ret z
dec a dec a
@ -469,12 +469,12 @@ PointerTable_78dcf: ; 78dcf (1e:4dcf)
dw Func_78dfe dw Func_78dfe
Func_78ddb: ; 78ddb (1e:4ddb) Func_78ddb: ; 78ddb (1e:4ddb)
call Func_79e6a call PlayApplyingAttackSound
ld b, $8 ld b, $8
jp Func_79209 jp Func_79209
Func_78de3: ; 78de3 (1e:4de3) Func_78de3: ; 78de3 (1e:4de3)
call Func_79e6a call PlayApplyingAttackSound
ld b, $8 ld b, $8
jp Func_79210 jp Func_79210
@ -483,11 +483,11 @@ Func_78deb: ; 78deb (1e:4deb)
jr Func_78e01 jr Func_78e01
Func_78df0: ; 78df0 (1e:4df0) Func_78df0: ; 78df0 (1e:4df0)
call Func_79e6a call PlayApplyingAttackSound
jp AnimationBlinkEnemyMon jp AnimationBlinkEnemyMon
Func_78df6: ; 78df6 (1e:4df6) Func_78df6: ; 78df6 (1e:4df6)
call Func_79e6a call PlayApplyingAttackSound
ld b, $2 ld b, $2
jp Func_79210 jp Func_79210
@ -2929,7 +2929,9 @@ TossBallAnimation: ; 79e16 (1e:5e16)
ld [W_ANIMATIONID],a ld [W_ANIMATIONID],a
jp PlayAnimation jp PlayAnimation
Func_79e6a: ; 79e6a (1e:5e6a) PlayApplyingAttackSound: ; 79e6a (1e:5e6a)
; play a different sound depending if move is not very effective, neutral, or super-effective
; don't play any sound at all if move is ineffective
call WaitForSoundToFinish call WaitForSoundToFinish
ld a, [wDamageMultipliers] ld a, [wDamageMultipliers]
and $7f and $7f

73
engine/battle/core.asm
View file

@ -582,7 +582,7 @@ HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd)
.poisoned .poisoned
call PrintText call PrintText
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a,BURN_PSN_ANIM ld a,BURN_PSN_ANIM
call PlayMoveAnimation ; play burn/poison animation call PlayMoveAnimation ; play burn/poison animation
pop hl pop hl
@ -603,7 +603,7 @@ HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd)
xor $1 xor $1
ld [H_WHOSETURN], a ld [H_WHOSETURN], a
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a,ABSORB ld a,ABSORB
call PlayMoveAnimation ; play leech seed animation (from opposing mon) call PlayMoveAnimation ; play leech seed animation (from opposing mon)
pop af pop af
@ -3219,7 +3219,7 @@ asm_3d71e
ld b,BANK(Func_79747) ld b,BANK(Func_79747)
call nz,Bankswitch call nz,Bankswitch
pop af pop af
ld [wcc5b],a ld [wAnimationType],a
ld a,[W_PLAYERMOVENUM] ld a,[W_PLAYERMOVENUM]
call PlayMoveAnimation call PlayMoveAnimation
call HandleExplodingAnimation call HandleExplodingAnimation
@ -3241,7 +3241,7 @@ asm_3d74b
jr MirrorMoveCheck jr MirrorMoveCheck
.playAnim .playAnim
xor a xor a
ld [wcc5b],a ld [wAnimationType],a
ld a,STATUS_AFFECTED_ANIM ld a,STATUS_AFFECTED_ANIM
call PlayMoveAnimation call PlayMoveAnimation
MirrorMoveCheck MirrorMoveCheck
@ -3386,7 +3386,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854)
jr z,.WakeUp ; if the number of turns hit 0, wake up jr z,.WakeUp ; if the number of turns hit 0, wake up
; fast asleep ; fast asleep
xor a xor a
ld [wcc5b],a ld [wAnimationType],a
ld a,SLP_ANIM - 1 ld a,SLP_ANIM - 1
call PlayMoveAnimation call PlayMoveAnimation
ld hl,FastAsleepText ld hl,FastAsleepText
@ -3470,7 +3470,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854)
ld hl,IsConfusedText ld hl,IsConfusedText
call PrintText call PrintText
xor a xor a
ld [wcc5b],a ld [wAnimationType],a
ld a,CONF_ANIM - 1 ld a,CONF_ANIM - 1
call PlayMoveAnimation call PlayMoveAnimation
call BattleRandom call BattleRandom
@ -3519,7 +3519,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854)
.FlyOrChargeEffect .FlyOrChargeEffect
xor a xor a
ld [wcc5b],a ld [wAnimationType],a
ld a,STATUS_AFFECTED_ANIM ld a,STATUS_AFFECTED_ANIM
call PlayMoveAnimation call PlayMoveAnimation
.NotFlyOrChargeEffect .NotFlyOrChargeEffect
@ -3751,7 +3751,7 @@ HandleSelfConfusionDamage: ; 3daad (f:5aad)
pop af pop af
ld [hl], a ld [hl], a
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
inc a inc a
ld [H_WHOSETURN], a ld [H_WHOSETURN], a
call PlayMoveAnimation call PlayMoveAnimation
@ -5198,7 +5198,7 @@ ReloadMoveData: ; 3e329 (f:6329)
; function that picks a random move for metronome ; function that picks a random move for metronome
MetronomePickMove: ; 3e348 (f:6348) MetronomePickMove: ; 3e348 (f:6348)
xor a xor a
ld [wcc5b],a ld [wAnimationType],a
ld a,METRONOME ld a,METRONOME
call PlayMoveAnimation ; play Metronome's animation call PlayMoveAnimation ; play Metronome's animation
; values for player turn ; values for player turn
@ -5754,7 +5754,7 @@ asm_3e7a4: ; 3e7a4 (f:67a4)
ld b, BANK(Func_79747) ld b, BANK(Func_79747)
call nz, Bankswitch call nz, Bankswitch
pop af pop af
ld [wcc5b], a ld [wAnimationType], a
ld a, [W_ENEMYMOVENUM] ld a, [W_ENEMYMOVENUM]
call PlayMoveAnimation call PlayMoveAnimation
call HandleExplodingAnimation call HandleExplodingAnimation
@ -5778,7 +5778,7 @@ Func_3e7d1: ; 3e7d1 (f:67d1)
jr asm_3e7ef jr asm_3e7ef
.asm_3e7e6 .asm_3e7e6
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a,STATUS_AFFECTED_ANIM ld a,STATUS_AFFECTED_ANIM
call PlayMoveAnimation call PlayMoveAnimation
asm_3e7ef: ; 3e7ef (f:67ef) asm_3e7ef: ; 3e7ef (f:67ef)
@ -5870,7 +5870,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f)
ld hl, FastAsleepText ld hl, FastAsleepText
call PrintText call PrintText
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a,SLP_ANIM ld a,SLP_ANIM
call PlayMoveAnimation call PlayMoveAnimation
jr .next1 jr .next1
@ -5946,7 +5946,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f)
ld hl, IsConfusedText ld hl, IsConfusedText
call PrintText call PrintText
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a,CONF_ANIM ld a,CONF_ANIM
call PlayMoveAnimation call PlayMoveAnimation
call BattleRandom call BattleRandom
@ -5989,7 +5989,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f)
pop af pop af
ld [hl], a ld [hl], a
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld [H_WHOSETURN], a ld [H_WHOSETURN], a
ld a, POUND ld a, POUND
call PlayMoveAnimation call PlayMoveAnimation
@ -6030,7 +6030,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f)
jr .notFlyOrChargeEffect jr .notFlyOrChargeEffect
.flyOrChargeEffect .flyOrChargeEffect
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a, STATUS_AFFECTED_ANIM ld a, STATUS_AFFECTED_ANIM
call PlayMoveAnimation call PlayMoveAnimation
.notFlyOrChargeEffect .notFlyOrChargeEffect
@ -6803,7 +6803,7 @@ HandleExplodingAnimation: ; 3eed3 (f:6ed3)
and a and a
ret nz ret nz
ld a, 5 ld a, 5
ld [wcc5b], a ld [wAnimationType], a
PlayMoveAnimation: ; 3ef07 (f:6f07) PlayMoveAnimation: ; 3ef07 (f:6f07)
ld [W_ANIMATIONID],a ld [W_ANIMATIONID],a
@ -7239,7 +7239,7 @@ SleepEffect: ; 3f1fc (f:71fc)
and $7 and $7
jr z, .setSleepCounter jr z, .setSleepCounter
ld [de], a ld [de], a
call Func_3fb89 call StoreCurrentMoveAnimationIDAndType
ld hl, FellAsleepText ld hl, FellAsleepText
jp PrintText jp PrintText
.didntAffect .didntAffect
@ -7325,10 +7325,10 @@ PoisonEffect: ; 3f24f (f:724f)
cp POISON_EFFECT cp POISON_EFFECT
jr z, .asm_3f2cd jr z, .asm_3f2cd
ld a, b ld a, b
call Func_3fb96 call StoreAnimationIDAndType
jp PrintText jp PrintText
.asm_3f2cd .asm_3f2cd
call Func_3fb89 call StoreCurrentMoveAnimationIDAndType
jp PrintText jp PrintText
.noEffect .noEffect
ld a, [de] ld a, [de]
@ -7373,7 +7373,7 @@ ExplodeEffect: ; 3f2f1 (f:72f1)
FreezeBurnParalyzeEffect: ; 3f30c (f:730c) FreezeBurnParalyzeEffect: ; 3f30c (f:730c)
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag] call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag]
ret nz ; return if they have a substitute, can't effect them ret nz ; return if they have a substitute, can't effect them
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
@ -7854,7 +7854,7 @@ UpdateLoweredStatDone: ; 3f62c (f:762c)
ld a, [de] ld a, [de]
cp $44 cp $44
jr nc, .ApplyBadgeBoostsAndStatusPenalties jr nc, .ApplyBadgeBoostsAndStatusPenalties
call Func_3fb89 call StoreCurrentMoveAnimationIDAndType
.ApplyBadgeBoostsAndStatusPenalties .ApplyBadgeBoostsAndStatusPenalties
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
and a and a
@ -7977,7 +7977,7 @@ BideEffect: ; 3f6e5 (f:76e5)
ld [bc], a ; set Bide counter to 2 or 3 at random ld [bc], a ; set Bide counter to 2 or 3 at random
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
add XSTATITEM_ANIM add XSTATITEM_ANIM
jp Func_3fb96 jp StoreAnimationIDAndType
ThrashPetalDanceEffect: ; 3f717 (f:7717) ThrashPetalDanceEffect: ; 3f717 (f:7717)
ld hl, W_PLAYERBATTSTATUS1 ld hl, W_PLAYERBATTSTATUS1
@ -7996,7 +7996,7 @@ ThrashPetalDanceEffect: ; 3f717 (f:7717)
ld [de], a ; set thrash/petal dance counter to 2 or 3 at random ld [de], a ; set thrash/petal dance counter to 2 or 3 at random
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
add ANIM_B0 add ANIM_B0
jp Func_3fb96 jp StoreAnimationIDAndType
SwitchAndTeleportEffect: ; 3f739 (f:7739) SwitchAndTeleportEffect: ; 3f739 (f:7739)
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
@ -8030,7 +8030,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739)
.asm_3f76e .asm_3f76e
call ReadPlayerMonCurHPAndStatus call ReadPlayerMonCurHPAndStatus
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
inc a inc a
ld [wEscapedFromBattle], a ld [wEscapedFromBattle], a
ld a, [W_PLAYERMOVENUM] ld a, [W_PLAYERMOVENUM]
@ -8072,7 +8072,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739)
.asm_3f7c1 .asm_3f7c1
call ReadPlayerMonCurHPAndStatus call ReadPlayerMonCurHPAndStatus
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
inc a inc a
ld [wEscapedFromBattle], a ld [wEscapedFromBattle], a
ld a, [W_ENEMYMOVENUM] ld a, [W_ENEMYMOVENUM]
@ -8213,7 +8213,7 @@ ChargeEffect: ; 3f88c (f:788c)
ld b, ANIM_C0 ld b, ANIM_C0
.notDigOrFly .notDigOrFly
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a, b ld a, b
call PlayBattleAnimation call PlayBattleAnimation
ld a, [de] ld a, [de]
@ -8345,7 +8345,7 @@ ConfusionSideEffectSuccess: ; 3f96f (f:796f)
ld [bc], a ; confusion status will last 2-5 turns ld [bc], a ; confusion status will last 2-5 turns
pop af pop af
cp CONFUSION_SIDE_EFFECT cp CONFUSION_SIDE_EFFECT
call nz, Func_3fb89 call nz, StoreCurrentMoveAnimationIDAndType
ld hl, BecameConfusedText ld hl, BecameConfusedText
jp PrintText jp PrintText
@ -8550,7 +8550,7 @@ DisableEffect: ; 3fa8a (f:7a8a)
swap c swap c
add c add c
ld [de], a ld [de], a
call Func_3fb89 call StoreCurrentMoveAnimationIDAndType
ld hl, wccee ld hl, wccee
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
and a and a
@ -8658,7 +8658,8 @@ CheckTargetSubstitute: ; 3fb79 (f:7b79)
pop hl pop hl
ret ret
Func_3fb89: ; 3fb89 (f:7b89) StoreCurrentMoveAnimationIDAndType: ; 3fb89 (f:7b89)
; animation at MOVENUM will be played unless MOVENUM is 0
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
and a and a
ld a, [W_PLAYERMOVENUM] ld a, [W_PLAYERMOVENUM]
@ -8668,20 +8669,20 @@ Func_3fb89: ; 3fb89 (f:7b89)
and a and a
ret z ret z
Func_3fb96: ; 3fb96 (f:7b96) StoreAnimationIDAndType: ; 3fb96 (f:7b96)
ld [W_ANIMATIONID], a ld [W_ANIMATIONID], a
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
and a and a
ld a, $6 ld a, $6
jr z, .asm_3fba2 jr z, .storeAnimationType
ld a, $3 ld a, $3
.asm_3fba2 .storeAnimationType
ld [wcc5b], a ld [wAnimationType], a
jp Func_3fbbc jp PlayBattleAnimationGotID
PlayCurrentMoveAnimation: ; 3fba8 (f:7ba8) PlayCurrentMoveAnimation: ; 3fba8 (f:7ba8)
xor a xor a
ld [wcc5b], a ld [wAnimationType], a
ld a, [H_WHOSETURN] ld a, [H_WHOSETURN]
and a and a
ld a, [W_PLAYERMOVENUM] ld a, [W_PLAYERMOVENUM]
@ -8694,7 +8695,7 @@ PlayCurrentMoveAnimation: ; 3fba8 (f:7ba8)
PlayBattleAnimation: ; 3fbb9 (f:7bb9) PlayBattleAnimation: ; 3fbb9 (f:7bb9)
ld [W_ANIMATIONID], a ld [W_ANIMATIONID], a
Func_3fbbc: ; 3fbbc (f:7bbc) PlayBattleAnimationGotID: ; 3fbbc (f:7bbc)
push hl push hl
push de push de
push bc push bc

2
engine/items/items.asm
View file

@ -320,7 +320,7 @@ ItemUseBall: ; d687 (3:5687)
ld [W_ANIMATIONID],a ld [W_ANIMATIONID],a
xor a xor a
ld [$fff3],a ld [$fff3],a
ld [wcc5b],a ld [wAnimationType],a
ld [wDamageMultipliers],a ld [wDamageMultipliers],a
ld a,[wWhichPokemon] ld a,[wWhichPokemon]
push af push af

3
wram.asm
View file

@ -352,6 +352,9 @@ wNPCMovementScriptBank:: ; cc58
wHallOfFame:: ; cc5b wHallOfFame:: ; cc5b
wBoostExpByExpAll:: ; cc5b wBoostExpByExpAll:: ; cc5b
wAnimationType:: ; cc5b
; values between 0-6. Shake screen horizontally, shake screen vertically, blink Pokemon...
wcc5b:: ds 1 wcc5b:: ds 1
wcc5c:: ds 1 wcc5c:: ds 1
wcc5d:: ds 1 wcc5d:: ds 1