diff options
| -rw-r--r-- | constants/move_constants.asm | 2 | ||||
| -rw-r--r-- | main.asm | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/constants/move_constants.asm b/constants/move_constants.asm index dd287fde..524e7814 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -165,7 +165,9 @@ SUBSTITUTE EQU $A4 STRUGGLE EQU $A5 ; these do double duty as animation identifiers SHOWPIC_ANIM EQU $A6 ; redraw monster pic +STATUS_AFFECTED_ANIM EQU $A7 ; effect when monster receives a status aliment XSTATITEM_ANIM EQU $AE ; use X Attack/Defense/Speed/Special +BURN_PSN_ANIM EQU $BA ; Plays when a monster is burned or poisoned SLP_ANIM EQU $BD ; sleeping monster CONF_ANIM EQU $BF ; confused monster TOSS_ANIM EQU $C1 ; toss Poké Ball @@ -56741,7 +56741,7 @@ HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd) call PrintText xor a ld [$cc5b], a - ld a, $ba + ld a,BURN_PSN_ANIM call PlayMoveAnimation ; play burn/poison animation pop hl call HandlePoisonBurnLeechSeed_DecreaseOwnHP @@ -56762,7 +56762,7 @@ HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd) ld [H_WHOSETURN], a ; $FF00+$f3 xor a ld [$cc5b], a - ld a, $47 + ld a,ABSORB call PlayMoveAnimation ; play leech seed animation (from opposing mon) pop af ld [H_WHOSETURN], a ; $FF00+$f3 @@ -57971,7 +57971,7 @@ Func_3cca4: ; 3cca4 (f:4ca4) res 5, [hl] ld a, $1 ld [H_WHOSETURN], a ; $FF00+$f3 - ld a, $c3 + ld a, POOF_ANIM call PlayMoveAnimation FuncCoord 4, 11 ; $c480 ld hl, Coord @@ -59389,7 +59389,7 @@ asm_3d74b .next5 xor a ld [$CC5B],a - ld a,$A7 + ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation asm_3d766 ld a,[W_PLAYERMOVEEFFECT] @@ -59657,7 +59657,7 @@ HyperBeamCheck: ; 3d8c2 (f:58c2) .next8 xor a ld [$CC5B],a - ld a,$A7 + ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation .next9 ld hl,Func_3d80a ; $580a @@ -61938,7 +61938,7 @@ Func_3e7d1: ; 3e7d1 (f:67d1) .asm_3e7e6 xor a ld [$cc5b], a - ld a, $a7 + ld a,STATUS_AFFECTED_ANIM call PlayMoveAnimation asm_3e7ef: ; 3e7ef (f:67ef) ld a, [W_ENEMYMOVEEFFECT] ; $cfcd @@ -62030,7 +62030,7 @@ Func_3e88f: ; 3e88f (f:688f) call PrintText xor a ld [$cc5b], a - ld a, $bd + ld a,SLP_ANIM call PlayMoveAnimation jr .asm_3e8b5 .asm_3e8af @@ -62108,7 +62108,7 @@ Func_3e8fd: ; 3e8fd (f:68fd) call PrintText xor a ld [$cc5b], a - ld a, $bf + ld a,CONF_ANIM call PlayMoveAnimation call GenRandomInBattle cp $80 @@ -62152,7 +62152,7 @@ Func_3e8fd: ; 3e8fd (f:68fd) xor a ld [$cc5b], a ld [H_WHOSETURN], a ; $FF00+$f3 - ld a, $1 + ld a, POUND call PlayMoveAnimation ld a, $1 ld [H_WHOSETURN], a ; $FF00+$f3 @@ -62192,7 +62192,7 @@ asm_3e9d3: ; 3e9d3 (f:69d3) .asm_3e9e7 xor a ld [$cc5b], a - ld a, $a7 + ld a, STATUS_AFFECTED_ANIM call PlayMoveAnimation .asm_3e9f0 ld hl, Func_3e88c ; $688c |