summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/constants/animation_constants.asm200
-rw-r--r--src/constants/attack_animation_constants.asm290
-rw-r--r--src/data/attack_animations.asm708
-rw-r--r--src/data/cards.asm656
-rw-r--r--src/engine/bank01.asm156
-rw-r--r--src/engine/bank06.asm6
-rw-r--r--src/engine/bank07.asm310
-rw-r--r--src/engine/effect_functions.asm88
-rw-r--r--src/engine/home.asm6
9 files changed, 1275 insertions, 1145 deletions
diff --git a/src/constants/animation_constants.asm b/src/constants/animation_constants.asm
index b7521d5..44faa75 100644
--- a/src/constants/animation_constants.asm
+++ b/src/constants/animation_constants.asm
@@ -15,106 +15,106 @@
const_def
; Normal animations
- const DUEL_ANIM_NONE ; $00
- const DUEL_ANIM_GLOW ; $01
- const DUEL_ANIM_2 ; $02
- const DUEL_ANIM_SLEEP ; $03
- const DUEL_ANIM_4 ; $04
- const DUEL_ANIM_POISON ; $05
- const DUEL_ANIM_6 ; $06
- const DUEL_ANIM_HIT ; $07
- const DUEL_ANIM_8 ; $08
- const DUEL_ANIM_SHOW_DAMAGE ; $09
- const DUEL_ANIM_THUNDER_SHOCK ; $0a
- const DUEL_ANIM_11 ; $0b
- const DUEL_ANIM_12 ; $0c
- const DUEL_ANIM_13 ; $0d
- const DUEL_ANIM_14 ; $0e
- const DUEL_ANIM_15 ; $0f
- const DUEL_ANIM_16 ; $10
- const DUEL_ANIM_17 ; $11
- const DUEL_ANIM_18 ; $12
- const DUEL_ANIM_19 ; $13
- const DUEL_ANIM_20 ; $14
- const DUEL_ANIM_21 ; $15
- const DUEL_ANIM_22 ; $16
- const DUEL_ANIM_23 ; $17
- const DUEL_ANIM_24 ; $18
- const DUEL_ANIM_25 ; $19
- const DUEL_ANIM_26 ; $1a
- const DUEL_ANIM_27 ; $1b
- const DUEL_ANIM_28 ; $1c
- const DUEL_ANIM_29 ; $1d
- const DUEL_ANIM_30 ; $1e
- const DUEL_ANIM_31 ; $1f
- const DUEL_ANIM_32 ; $20
- const DUEL_ANIM_33 ; $21
- const DUEL_ANIM_34 ; $22
- const DUEL_ANIM_35 ; $23
- const DUEL_ANIM_FURY_SWIPES ; $24
- const DUEL_ANIM_37 ; $25
- const DUEL_ANIM_38 ; $26
- const DUEL_ANIM_39 ; $27
- const DUEL_ANIM_40 ; $28
- const DUEL_ANIM_41 ; $29
- const DUEL_ANIM_42 ; $2a
- const DUEL_ANIM_43 ; $2b
- const DUEL_ANIM_44 ; $2c
- const DUEL_ANIM_45 ; $2d
- const DUEL_ANIM_46 ; $2e
- const DUEL_ANIM_47 ; $2f
- const DUEL_ANIM_48 ; $30
- const DUEL_ANIM_49 ; $31
- const DUEL_ANIM_50 ; $32
- const DUEL_ANIM_51 ; $33
- const DUEL_ANIM_52 ; $34
- const DUEL_ANIM_53 ; $35
- const DUEL_ANIM_54 ; $36
- const DUEL_ANIM_55 ; $37
- const DUEL_ANIM_56 ; $38
- const DUEL_ANIM_57 ; $39
- const DUEL_ANIM_58 ; $3a
- const DUEL_ANIM_59 ; $3b
- const DUEL_ANIM_60 ; $3c
- const DUEL_ANIM_61 ; $3d
- const DUEL_ANIM_HEAL ; $3e
- const DUEL_ANIM_63 ; $3f
- const DUEL_ANIM_64 ; $40
- const DUEL_ANIM_65 ; $41
- const DUEL_ANIM_66 ; $42
- const DUEL_ANIM_67 ; $43
- const DUEL_ANIM_68 ; $44
- const DUEL_ANIM_69 ; $45
- const DUEL_ANIM_70 ; $46
- const DUEL_ANIM_71 ; $47
- const DUEL_ANIM_72 ; $48
- const DUEL_ANIM_73 ; $49
- const DUEL_ANIM_74 ; $4a
- const DUEL_ANIM_75 ; $4b
- const DUEL_ANIM_76 ; $4c
- const DUEL_ANIM_77 ; $4d
- const DUEL_ANIM_78 ; $4e
- const DUEL_ANIM_79 ; $4f
- const DUEL_ANIM_80 ; $50
- const DUEL_ANIM_PLAYER_SHUFFLE ; $51
- const DUEL_ANIM_OPP_SHUFFLE ; $52
- const DUEL_ANIM_BOTH_SHUFFLE ; $53
- const DUEL_ANIM_84 ; $54
- const DUEL_ANIM_BOTH_DRAW ; $55
- const DUEL_ANIM_PLAYER_DRAW ; $56
- const DUEL_ANIM_OPP_DRAW ; $57
- const DUEL_ANIM_COIN_SPIN ; $58
- const DUEL_ANIM_COIN_TOSS1 ; $59
- const DUEL_ANIM_COIN_TOSS2 ; $5a
- const DUEL_ANIM_COIN_TAILS ; $5b
- const DUEL_ANIM_COIN_HEADS ; $5c
- const DUEL_ANIM_DUEL_WIN ; $5d
- const DUEL_ANIM_DUEL_LOSS ; $5e
- const DUEL_ANIM_DUEL_DRAW ; $5f
- const DUEL_ANIM_96 ; $60
+ const DUEL_ANIM_NONE ; $00
+ const DUEL_ANIM_GLOW ; $01
+ const DUEL_ANIM_PARALYSIS ; $02
+ const DUEL_ANIM_SLEEP ; $03
+ const DUEL_ANIM_CONFUSION ; $04
+ const DUEL_ANIM_POISON ; $05
+ const DUEL_ANIM_6 ; $06
+ const DUEL_ANIM_HIT ; $07
+ const DUEL_ANIM_BIG_HIT ; $08
+ const DUEL_ANIM_SHOW_DAMAGE ; $09
+ const DUEL_ANIM_THUNDER_SHOCK ; $0a
+ const DUEL_ANIM_LIGHTNING ; $0b
+ const DUEL_ANIM_BORDER_SPARK ; $0c
+ const DUEL_ANIM_BIG_LIGHTNING ; $0d
+ const DUEL_ANIM_SMALL_FLAME ; $0e
+ const DUEL_ANIM_BIG_FLAME ; $0f
+ const DUEL_ANIM_FIRE_SPIN ; $10
+ const DUEL_ANIM_DIVE_BOMB ; $11
+ const DUEL_ANIM_WATER_JETS ; $12
+ const DUEL_ANIM_WATER_GUN ; $13
+ const DUEL_ANIM_WHIRLPOOL ; $14
+ const DUEL_ANIM_HYDRO_PUMP ; $15
+ const DUEL_ANIM_BLIZZARD ; $16
+ const DUEL_ANIM_PSYCHIC ; $17
+ const DUEL_ANIM_GLARE ; $18
+ const DUEL_ANIM_BEAM ; $19
+ const DUEL_ANIM_HYPER_BEAM ; $1a
+ const DUEL_ANIM_ROCK_THROW ; $1b
+ const DUEL_ANIM_STONE_BARRAGE ; $1c
+ const DUEL_ANIM_PUNCH ; $1d
+ const DUEL_ANIM_THUNDERPUNCH ; $1e
+ const DUEL_ANIM_FIRE_PUNCH ; $1f
+ const DUEL_ANIM_STRETCH_KICK ; $20
+ const DUEL_ANIM_SLASH ; $21
+ const DUEL_ANIM_WHIP ; $22
+ const DUEL_ANIM_TEAR ; $23
+ const DUEL_ANIM_FURY_SWIPES ; $24
+ const DUEL_ANIM_DRILL ; $25
+ const DUEL_ANIM_POT_SMASH ; $26
+ const DUEL_ANIM_BONEMERANG ; $27
+ const DUEL_ANIM_SEISMIC_TOSS ; $28
+ const DUEL_ANIM_NEEDLES ; $29
+ const DUEL_ANIM_WHITE_GAS ; $2a
+ const DUEL_ANIM_POWDER ; $2b
+ const DUEL_ANIM_GOO ; $2c
+ const DUEL_ANIM_BUBBLES ; $2d
+ const DUEL_ANIM_STRING_SHOT ; $2e
+ const DUEL_ANIM_BOYFRIENDS ; $2f
+ const DUEL_ANIM_LURE ; $30
+ const DUEL_ANIM_TOXIC ; $31
+ const DUEL_ANIM_CONFUSE_RAY ; $32
+ const DUEL_ANIM_SING ; $33
+ const DUEL_ANIM_SUPERSONIC ; $34
+ const DUEL_ANIM_PETAL_DANCE ; $35
+ const DUEL_ANIM_PROTECT ; $36
+ const DUEL_ANIM_BARRIER ; $37
+ const DUEL_ANIM_QUICK_ATTACK ; $38
+ const DUEL_ANIM_WHIRLWIND ; $39
+ const DUEL_ANIM_CRY ; $3a
+ const DUEL_ANIM_QUESTION_MARK ; $3b
+ const DUEL_ANIM_SELFDESTRUCT ; $3c
+ const DUEL_ANIM_BIG_SELFDESTRUCT_1 ; $3d
+ const DUEL_ANIM_HEAL ; $3e
+ const DUEL_ANIM_DRAIN ; $3f
+ const DUEL_ANIM_DARK_GAS ; $40
+ const DUEL_ANIM_BIG_SELFDESTRUCT_2 ; $41
+ const DUEL_ANIM_66 ; $42
+ const DUEL_ANIM_67 ; $43
+ const DUEL_ANIM_68 ; $44
+ const DUEL_ANIM_69 ; $45
+ const DUEL_ANIM_70 ; $46
+ const DUEL_ANIM_71 ; $47
+ const DUEL_ANIM_72 ; $48
+ const DUEL_ANIM_73 ; $49
+ const DUEL_ANIM_74 ; $4a
+ const DUEL_ANIM_EXPAND ; $4b
+ const DUEL_ANIM_76 ; $4c
+ const DUEL_ANIM_THUNDER_WAVE ; $4d
+ const DUEL_ANIM_78 ; $4e
+ const DUEL_ANIM_79 ; $4f
+ const DUEL_ANIM_80 ; $50
+ const DUEL_ANIM_PLAYER_SHUFFLE ; $51
+ const DUEL_ANIM_OPP_SHUFFLE ; $52
+ const DUEL_ANIM_BOTH_SHUFFLE ; $53
+ const DUEL_ANIM_84 ; $54
+ const DUEL_ANIM_BOTH_DRAW ; $55
+ const DUEL_ANIM_PLAYER_DRAW ; $56
+ const DUEL_ANIM_OPP_DRAW ; $57
+ const DUEL_ANIM_COIN_SPIN ; $58
+ const DUEL_ANIM_COIN_TOSS1 ; $59
+ const DUEL_ANIM_COIN_TOSS2 ; $5a
+ const DUEL_ANIM_COIN_TAILS ; $5b
+ const DUEL_ANIM_COIN_HEADS ; $5c
+ const DUEL_ANIM_DUEL_WIN ; $5d
+ const DUEL_ANIM_DUEL_LOSS ; $5e
+ const DUEL_ANIM_DUEL_DRAW ; $5f
+ const DUEL_ANIM_96 ; $60
; Special animations
const_def $fa
- const DUEL_ANIM_SHAKE1 ; $fa
- const DUEL_ANIM_SHAKE2 ; $fb
- const DUEL_ANIM_SHAKE3 ; $fc
+ const DUEL_ANIM_SHAKE1 ; $fa
+ const DUEL_ANIM_SHAKE2 ; $fb
+ const DUEL_ANIM_SHAKE3 ; $fc
diff --git a/src/constants/attack_animation_constants.asm b/src/constants/attack_animation_constants.asm
index 281cd51..3f1f113 100644
--- a/src/constants/attack_animation_constants.asm
+++ b/src/constants/attack_animation_constants.asm
@@ -2,148 +2,148 @@
; these map to a sequence of duel animations
; (see src\data\attack_animations.asm)
const_def
- const ATK_ANIM_NONE ; $00
- const ATK_ANIM_1 ; $01
- const ATK_ANIM_2 ; $02
- const ATK_ANIM_3 ; $03
- const ATK_ANIM_4 ; $04
- const ATK_ANIM_5 ; $05
- const ATK_ANIM_6 ; $06
- const ATK_ANIM_7 ; $07
- const ATK_ANIM_8 ; $08
- const ATK_ANIM_9 ; $09
- const ATK_ANIM_10 ; $0a
- const ATK_ANIM_11 ; $0b
- const ATK_ANIM_12 ; $0c
- const ATK_ANIM_13 ; $0d
- const ATK_ANIM_14 ; $0e
- const ATK_ANIM_15 ; $0f
- const ATK_ANIM_16 ; $10
- const ATK_ANIM_17 ; $11
- const ATK_ANIM_18 ; $12
- const ATK_ANIM_19 ; $13
- const ATK_ANIM_20 ; $14
- const ATK_ANIM_21 ; $15
- const ATK_ANIM_22 ; $16
- const ATK_ANIM_23 ; $17
- const ATK_ANIM_24 ; $18
- const ATK_ANIM_25 ; $19
- const ATK_ANIM_26 ; $1a
- const ATK_ANIM_27 ; $1b
- const ATK_ANIM_28 ; $1c
- const ATK_ANIM_29 ; $1d
- const ATK_ANIM_30 ; $1e
- const ATK_ANIM_31 ; $1f
- const ATK_ANIM_32 ; $20
- const ATK_ANIM_33 ; $21
- const ATK_ANIM_34 ; $22
- const ATK_ANIM_35 ; $23
- const ATK_ANIM_36 ; $24
- const ATK_ANIM_37 ; $25
- const ATK_ANIM_38 ; $26
- const ATK_ANIM_39 ; $27
- const ATK_ANIM_40 ; $28
- const ATK_ANIM_41 ; $29
- const ATK_ANIM_42 ; $2a
- const ATK_ANIM_43 ; $2b
- const ATK_ANIM_44 ; $2c
- const ATK_ANIM_45 ; $2d
- const ATK_ANIM_46 ; $2e
- const ATK_ANIM_47 ; $2f
- const ATK_ANIM_48 ; $30
- const ATK_ANIM_49 ; $31
- const ATK_ANIM_50 ; $32
- const ATK_ANIM_51 ; $33
- const ATK_ANIM_52 ; $34
- const ATK_ANIM_53 ; $35
- const ATK_ANIM_54 ; $36
- const ATK_ANIM_55 ; $37
- const ATK_ANIM_56 ; $38
- const ATK_ANIM_57 ; $39
- const ATK_ANIM_58 ; $3a
- const ATK_ANIM_59 ; $3b
- const ATK_ANIM_60 ; $3c
- const ATK_ANIM_61 ; $3d
- const ATK_ANIM_62 ; $3e
- const ATK_ANIM_63 ; $3f
- const ATK_ANIM_64 ; $40
- const ATK_ANIM_65 ; $41
- const ATK_ANIM_66 ; $42
- const ATK_ANIM_67 ; $43
- const ATK_ANIM_68 ; $44
- const ATK_ANIM_69 ; $45
- const ATK_ANIM_70 ; $46
- const ATK_ANIM_71 ; $47
- const ATK_ANIM_72 ; $48
- const ATK_ANIM_73 ; $49
- const ATK_ANIM_74 ; $4a
- const ATK_ANIM_75 ; $4b
- const ATK_ANIM_76 ; $4c
- const ATK_ANIM_77 ; $4d
- const ATK_ANIM_78 ; $4e
- const ATK_ANIM_79 ; $4f
- const ATK_ANIM_80 ; $50
- const ATK_ANIM_81 ; $51
- const ATK_ANIM_82 ; $52
- const ATK_ANIM_83 ; $53
- const ATK_ANIM_84 ; $54
- const ATK_ANIM_85 ; $55
- const ATK_ANIM_86 ; $56
- const ATK_ANIM_87 ; $57
- const ATK_ANIM_88 ; $58
- const ATK_ANIM_89 ; $59
- const ATK_ANIM_90 ; $5a
- const ATK_ANIM_91 ; $5b
- const ATK_ANIM_92 ; $5c
- const ATK_ANIM_93 ; $5d
- const ATK_ANIM_94 ; $5e
- const ATK_ANIM_95 ; $5f
- const ATK_ANIM_96 ; $60
- const ATK_ANIM_97 ; $61
- const ATK_ANIM_98 ; $62
- const ATK_ANIM_99 ; $63
- const ATK_ANIM_100 ; $64
- const ATK_ANIM_101 ; $65
- const ATK_ANIM_102 ; $66
- const ATK_ANIM_103 ; $67
- const ATK_ANIM_104 ; $68
- const ATK_ANIM_105 ; $69
- const ATK_ANIM_106 ; $6a
- const ATK_ANIM_107 ; $6b
- const ATK_ANIM_108 ; $6c
- const ATK_ANIM_109 ; $6d
- const ATK_ANIM_110 ; $6e
- const ATK_ANIM_111 ; $6f
- const ATK_ANIM_112 ; $70
- const ATK_ANIM_113 ; $71
- const ATK_ANIM_114 ; $72
- const ATK_ANIM_115 ; $73
- const ATK_ANIM_116 ; $74
- const ATK_ANIM_117 ; $75
- const ATK_ANIM_118 ; $76
- const ATK_ANIM_119 ; $77
- const ATK_ANIM_120 ; $78
- const ATK_ANIM_121 ; $79
- const ATK_ANIM_122 ; $7a
- const ATK_ANIM_123 ; $7b
- const ATK_ANIM_124 ; $7c
- const ATK_ANIM_125 ; $7d
- const ATK_ANIM_126 ; $7e
- const ATK_ANIM_127 ; $7f
- const ATK_ANIM_128 ; $80
- const ATK_ANIM_129 ; $81
- const ATK_ANIM_130 ; $82
- const ATK_ANIM_131 ; $83
- const ATK_ANIM_132 ; $84
- const ATK_ANIM_133 ; $85
- const ATK_ANIM_134 ; $86
- const ATK_ANIM_135 ; $87
- const ATK_ANIM_136 ; $88
- const ATK_ANIM_137 ; $89
- const ATK_ANIM_138 ; $8a
- const ATK_ANIM_139 ; $8b
- const ATK_ANIM_140 ; $8c
- const ATK_ANIM_141 ; $8d
- const ATK_ANIM_142 ; $8e
- const ATK_ANIM_143 ; $8f
- const ATK_ANIM_144 ; $90
+ const ATK_ANIM_NONE ; $00
+ const ATK_ANIM_HIT ; $01
+ const ATK_ANIM_BIG_HIT ; $02
+ const ATK_ANIM_3 ; $03
+ const ATK_ANIM_HIT_RECOIL ; $04
+ const ATK_ANIM_HIT_EFFECT ; $05
+ const ATK_ANIM_THUNDERSHOCK ; $06
+ const ATK_ANIM_THUNDER ; $07
+ const ATK_ANIM_THUNDERBOLT ; $08
+ const ATK_ANIM_9 ; $09
+ const ATK_ANIM_THUNDER_WHOLE_SCREEN ; $0a
+ const ATK_ANIM_11 ; $0b
+ const ATK_ANIM_THUNDERSTORM ; $0c
+ const ATK_ANIM_CHAIN_LIGHTNING ; $0d
+ const ATK_ANIM_SMALL_FLAME ; $0e
+ const ATK_ANIM_BIG_FLAME ; $0f
+ const ATK_ANIM_FIRE_SPIN ; $10
+ const ATK_ANIM_DIVE_BOMB ; $11
+ const ATK_ANIM_WATER_JETS ; $12
+ const ATK_ANIM_WATER_GUN ; $13
+ const ATK_ANIM_WHIRLPOOL ; $14
+ const ATK_ANIM_DRAGON_RAGE ; $15
+ const ATK_ANIM_HYDRO_PUMP ; $16
+ const ATK_ANIM_23 ; $17
+ const ATK_ANIM_BLIZZARD ; $18
+ const ATK_ANIM_PSYCHIC_HIT ; $19
+ const ATK_ANIM_NIGHTMARE ; $1a
+ const ATK_ANIM_27 ; $1b
+ const ATK_ANIM_DARK_MIND ; $1c
+ const ATK_ANIM_BEAM ; $1d
+ const ATK_ANIM_HYPER_BEAM ; $1e
+ const ATK_ANIM_31 ; $1f
+ const ATK_ANIM_ROCK_THROW ; $20
+ const ATK_ANIM_STONE_BARRAGE ; $21
+ const ATK_ANIM_PUNCH ; $22
+ const ATK_ANIM_THUNDERPUNCH ; $23
+ const ATK_ANIM_FIRE_PUNCH ; $24
+ const ATK_ANIM_STRETCH_KICK ; $25
+ const ATK_ANIM_SLASH ; $26
+ const ATK_ANIM_WHIP ; $27
+ const ATK_ANIM_TEAR ; $28
+ const ATK_ANIM_MULTIPLE_SLASH ; $29
+ const ATK_ANIM_42 ; $2a
+ const ATK_ANIM_RAMPAGE ; $2b
+ const ATK_ANIM_DRILL ; $2c
+ const ATK_ANIM_POT_SMASH ; $2d
+ const ATK_ANIM_BONEMERANG ; $2e
+ const ATK_ANIM_SEISMIC_TOSS ; $2f
+ const ATK_ANIM_NEEDLES ; $30
+ const ATK_ANIM_49 ; $31
+ const ATK_ANIM_SMOG ; $32
+ const ATK_ANIM_51 ; $33
+ const ATK_ANIM_52 ; $34
+ const ATK_ANIM_FOUL_GAS ; $35
+ const ATK_ANIM_FOUL_ODOR ; $36
+ const ATK_ANIM_POWDER_EFFECT_CHANCE ; $37
+ const ATK_ANIM_POWDER_HIT_POISON ; $38
+ const ATK_ANIM_POISON_POWDER ; $39
+ const ATK_ANIM_58 ; $3a
+ const ATK_ANIM_59 ; $3b
+ const ATK_ANIM_60 ; $3c
+ const ATK_ANIM_GOO ; $3d
+ const ATK_ANIM_62 ; $3e
+ const ATK_ANIM_SPIT_POISON ; $3f
+ const ATK_ANIM_64 ; $40
+ const ATK_ANIM_BUBBLES ; $41
+ const ATK_ANIM_66 ; $42
+ const ATK_ANIM_STRING_SHOT ; $43
+ const ATK_ANIM_68 ; $44
+ const ATK_ANIM_BOYFRIENDS ; $45
+ const ATK_ANIM_LURE ; $46
+ const ATK_ANIM_TOXIC ; $47
+ const ATK_ANIM_CONFUSE_RAY ; $48
+ const ATK_ANIM_73 ; $49
+ const ATK_ANIM_SING ; $4a
+ const ATK_ANIM_LULLABY ; $4b
+ const ATK_ANIM_SUPERSONIC ; $4c
+ const ATK_ANIM_77 ; $4d
+ const ATK_ANIM_PETAL_DANCE ; $4e
+ const ATK_ANIM_PROTECT ; $4f
+ const ATK_ANIM_BARRIER ; $50
+ const ATK_ANIM_QUICK_ATTACK ; $51
+ const ATK_ANIM_AGILITY_PROTECT ; $52
+ const ATK_ANIM_WHIRLWIND ; $53
+ const ATK_ANIM_CRY ; $54
+ const ATK_ANIM_AMNESIA ; $55
+ const ATK_ANIM_SELFDESTRUCT ; $56
+ const ATK_ANIM_BIG_SELFDESTRUCTION ; $57
+ const ATK_ANIM_RECOVER ; $58
+ const ATK_ANIM_DRAIN ; $59
+ const ATK_ANIM_DARK_GAS ; $5a
+ const ATK_ANIM_GLOW_EFFECT ; $5b
+ const ATK_ANIM_MIRROR_MOVE ; $5c
+ const ATK_ANIM_DEVOLUTION_BEAM ; $5d
+ const ATK_ANIM_PKMN_POWER_1 ; $5e
+ const ATK_ANIM_FIREGIVER ; $5f
+ const ATK_ANIM_QUICKFREEZE ; $60
+ const ATK_ANIM_PEAL_OF_THUNDER ; $61
+ const ATK_ANIM_HEALING_WIND ; $62
+ const ATK_ANIM_WHIRLWIND_ZIGZAG ; $63
+ const ATK_ANIM_BIG_THUNDER ; $64
+ const ATK_ANIM_SOLAR_POWER ; $65
+ const ATK_ANIM_POISON_FANG ; $66
+ const ATK_ANIM_103 ; $67
+ const ATK_ANIM_104 ; $68
+ const ATK_ANIM_105 ; $69
+ const ATK_ANIM_FRIENDSHIP_SONG ; $6a
+ const ATK_ANIM_SCRUNCH ; $6b
+ const ATK_ANIM_CAT_PUNCH ; $6c
+ const ATK_ANIM_MAGNETIC_STORM ; $6d
+ const ATK_ANIM_POISON_WHIP ; $6e
+ const ATK_ANIM_THUNDER_WAVE ; $6f
+ const ATK_ANIM_112 ; $70
+ const ATK_ANIM_SPORE ; $71
+ const ATK_ANIM_HYPNOSIS ; $72
+ const ATK_ANIM_ENERGY_CONVERSION ; $73
+ const ATK_ANIM_LEER ; $74
+ const ATK_ANIM_CONFUSION_HIT ; $75
+ const ATK_ANIM_118 ; $76
+ const ATK_ANIM_119 ; $77
+ const ATK_ANIM_BENCH_HIT ; $78
+ const ATK_ANIM_HEAL ; $79
+ const ATK_ANIM_RECOIL_HIT ; $7a
+ const ATK_ANIM_POISON ; $7b
+ const ATK_ANIM_CONFUSION ; $7c
+ const ATK_ANIM_PARALYSIS ; $7d
+ const ATK_ANIM_SLEEP ; $7e
+ const ATK_ANIM_IMAKUNI_CONFUSION ; $7f
+ const ATK_ANIM_SLEEPING_GAS ; $80
+ const ATK_ANIM_129 ; $81
+ const ATK_ANIM_THUNDER_PLAY_AREA ; $82
+ const ATK_ANIM_CAT_PUNCH_PLAY_AREA ; $83
+ const ATK_ANIM_FIREGIVER_PLAYER ; $84
+ const ATK_ANIM_FIREGIVER_OPP ; $85
+ const ATK_ANIM_HEALING_WIND_PLAY_AREA ; $86
+ const ATK_ANIM_GALE ; $87
+ const ATK_ANIM_EXPAND ; $88
+ const ATK_ANIM_137 ; $89
+ const ATK_ANIM_FULL_HEAL ; $8a
+ const ATK_ANIM_139 ; $8b
+ const ATK_ANIM_SPIT_POISON_SUCCESS ; $8c
+ const ATK_ANIM_GUST_OF_WIND ; $8d
+ const ATK_ANIM_HEAL_BOTH_SIDES ; $8e
+ const ATK_ANIM_143 ; $8f
+ const ATK_ANIM_144 ; $90
diff --git a/src/data/attack_animations.asm b/src/data/attack_animations.asm
index c958af6..d0bc93b 100644
--- a/src/data/attack_animations.asm
+++ b/src/data/attack_animations.asm
@@ -21,167 +21,167 @@ anim_end2: MACRO
ENDM
PointerTable_AttackAnimation:
- dw NULL ; ATK_ANIM_NONE
- dw AttackAnimation_52c6 ; ATK_ANIM_1
- dw AttackAnimation_52cf ; ATK_ANIM_2
- dw AttackAnimation_52c6 ; ATK_ANIM_3
- dw AttackAnimation_52c6 ; ATK_ANIM_4
- dw AttackAnimation_52c6 ; ATK_ANIM_5
- dw AttackAnimation_52d8 ; ATK_ANIM_6
- dw AttackAnimation_52d8 ; ATK_ANIM_7
- dw AttackAnimation_52e3 ; ATK_ANIM_8
- dw AttackAnimation_52d8 ; ATK_ANIM_9
- dw AttackAnimation_52f0 ; ATK_ANIM_10
- dw AttackAnimation_52f0 ; ATK_ANIM_11
- dw AttackAnimation_52f0 ; ATK_ANIM_12
- dw AttackAnimation_52f0 ; ATK_ANIM_13
- dw AttackAnimation_52fd ; ATK_ANIM_14
- dw AttackAnimation_5308 ; ATK_ANIM_15
- dw AttackAnimation_5313 ; ATK_ANIM_16
- dw AttackAnimation_531e ; ATK_ANIM_17
- dw AttackAnimation_5329 ; ATK_ANIM_18
- dw AttackAnimation_5334 ; ATK_ANIM_19
- dw AttackAnimation_533f ; ATK_ANIM_20
- dw AttackAnimation_534a ; ATK_ANIM_21
- dw AttackAnimation_5357 ; ATK_ANIM_22
- dw AttackAnimation_5362 ; ATK_ANIM_23
- dw AttackAnimation_5362 ; ATK_ANIM_24
- dw AttackAnimation_536d ; ATK_ANIM_25
- dw AttackAnimation_536d ; ATK_ANIM_26
- dw AttackAnimation_536d ; ATK_ANIM_27
- dw AttackAnimation_5378 ; ATK_ANIM_28
- dw AttackAnimation_5383 ; ATK_ANIM_29
- dw AttackAnimation_538e ; ATK_ANIM_30
- dw AttackAnimation_5383 ; ATK_ANIM_31
- dw AttackAnimation_5399 ; ATK_ANIM_32
- dw AttackAnimation_53a4 ; ATK_ANIM_33
- dw AttackAnimation_53af ; ATK_ANIM_34
- dw AttackAnimation_53ba ; ATK_ANIM_35
- dw AttackAnimation_53c5 ; ATK_ANIM_36
- dw AttackAnimation_53d0 ; ATK_ANIM_37
- dw AttackAnimation_53d5 ; ATK_ANIM_38
- dw AttackAnimation_53e0 ; ATK_ANIM_39
- dw AttackAnimation_53eb ; ATK_ANIM_40
- dw AttackAnimation_53f6 ; ATK_ANIM_41
- dw AttackAnimation_53f6 ; ATK_ANIM_42
- dw AttackAnimation_53f6 ; ATK_ANIM_43
- dw AttackAnimation_5401 ; ATK_ANIM_44
- dw AttackAnimation_540c ; ATK_ANIM_45
- dw AttackAnimation_5417 ; ATK_ANIM_46
- dw AttackAnimation_5422 ; ATK_ANIM_47
- dw AttackAnimation_542d ; ATK_ANIM_48
- dw AttackAnimation_542d ; ATK_ANIM_49
- dw AttackAnimation_5438 ; ATK_ANIM_50
- dw AttackAnimation_5438 ; ATK_ANIM_51
- dw AttackAnimation_5438 ; ATK_ANIM_52
- dw AttackAnimation_5438 ; ATK_ANIM_53
- dw AttackAnimation_5438 ; ATK_ANIM_54
- dw AttackAnimation_5443 ; ATK_ANIM_55
- dw AttackAnimation_5443 ; ATK_ANIM_56
- dw AttackAnimation_544e ; ATK_ANIM_57
- dw AttackAnimation_5443 ; ATK_ANIM_58
- dw AttackAnimation_5443 ; ATK_ANIM_59
- dw AttackAnimation_5443 ; ATK_ANIM_60
- dw AttackAnimation_5453 ; ATK_ANIM_61
- dw AttackAnimation_5453 ; ATK_ANIM_62
- dw AttackAnimation_5460 ; ATK_ANIM_63
- dw AttackAnimation_5453 ; ATK_ANIM_64
- dw AttackAnimation_5467 ; ATK_ANIM_65
- dw AttackAnimation_5467 ; ATK_ANIM_66
- dw AttackAnimation_5472 ; ATK_ANIM_67
- dw AttackAnimation_5472 ; ATK_ANIM_68
- dw AttackAnimation_547d ; ATK_ANIM_69
- dw AttackAnimation_5488 ; ATK_ANIM_70
- dw AttackAnimation_548f ; ATK_ANIM_71
- dw AttackAnimation_549c ; ATK_ANIM_72
- dw AttackAnimation_549c ; ATK_ANIM_73
- dw AttackAnimation_54a9 ; ATK_ANIM_74
- dw AttackAnimation_54a9 ; ATK_ANIM_75
- dw AttackAnimation_54ae ; ATK_ANIM_76
- dw AttackAnimation_54ae ; ATK_ANIM_77
- dw AttackAnimation_54b3 ; ATK_ANIM_78
- dw AttackAnimation_54be ; ATK_ANIM_79
- dw AttackAnimation_54c3 ; ATK_ANIM_80
- dw AttackAnimation_54c8 ; ATK_ANIM_81
- dw AttackAnimation_54d3 ; ATK_ANIM_82
- dw AttackAnimation_54e0 ; ATK_ANIM_83
- dw AttackAnimation_54eb ; ATK_ANIM_84
- dw AttackAnimation_54f2 ; ATK_ANIM_85
- dw AttackAnimation_54f9 ; ATK_ANIM_86
- dw AttackAnimation_5504 ; ATK_ANIM_87
- dw AttackAnimation_5513 ; ATK_ANIM_88
- dw AttackAnimation_5516 ; ATK_ANIM_89
- dw AttackAnimation_5521 ; ATK_ANIM_90
- dw AttackAnimation_552e ; ATK_ANIM_91
- dw AttackAnimation_5533 ; ATK_ANIM_92
- dw AttackAnimation_553a ; ATK_ANIM_93
- dw AttackAnimation_5543 ; ATK_ANIM_94
- dw AttackAnimation_554a ; ATK_ANIM_95
- dw AttackAnimation_5555 ; ATK_ANIM_96
- dw AttackAnimation_555e ; ATK_ANIM_97
- dw AttackAnimation_556d ; ATK_ANIM_98
- dw AttackAnimation_5574 ; ATK_ANIM_99
- dw AttackAnimation_557b ; ATK_ANIM_100
- dw AttackAnimation_557e ; ATK_ANIM_101
- dw AttackAnimation_5583 ; ATK_ANIM_102
- dw AttackAnimation_5583 ; ATK_ANIM_103
- dw AttackAnimation_5583 ; ATK_ANIM_104
- dw AttackAnimation_558c ; ATK_ANIM_105
- dw AttackAnimation_5597 ; ATK_ANIM_106
- dw AttackAnimation_559c ; ATK_ANIM_107
- dw AttackAnimation_55a1 ; ATK_ANIM_108
- dw AttackAnimation_55a4 ; ATK_ANIM_109
- dw AttackAnimation_55a9 ; ATK_ANIM_110
- dw AttackAnimation_55b4 ; ATK_ANIM_111
- dw AttackAnimation_55b4 ; ATK_ANIM_112
- dw AttackAnimation_55bf ; ATK_ANIM_113
- dw AttackAnimation_55c4 ; ATK_ANIM_114
- dw AttackAnimation_55c9 ; ATK_ANIM_115
- dw AttackAnimation_55ce ; ATK_ANIM_116
- dw AttackAnimation_55d5 ; ATK_ANIM_117
- dw AttackAnimation_55e0 ; ATK_ANIM_118
- dw AttackAnimation_55e5 ; ATK_ANIM_119
- dw AttackAnimation_55e6 ; ATK_ANIM_120
- dw AttackAnimation_55ed ; ATK_ANIM_121
- dw AttackAnimation_55f2 ; ATK_ANIM_122
- dw AttackAnimation_55fb ; ATK_ANIM_123
- dw AttackAnimation_55fe ; ATK_ANIM_124
- dw AttackAnimation_5601 ; ATK_ANIM_125
- dw AttackAnimation_5604 ; ATK_ANIM_126
- dw AttackAnimation_5607 ; ATK_ANIM_127
- dw AttackAnimation_560a ; ATK_ANIM_128
- dw AttackAnimation_560f ; ATK_ANIM_129
- dw AttackAnimation_5612 ; ATK_ANIM_130
- dw AttackAnimation_561d ; ATK_ANIM_131
- dw AttackAnimation_5628 ; ATK_ANIM_132
- dw AttackAnimation_562d ; ATK_ANIM_133
- dw AttackAnimation_5632 ; ATK_ANIM_134
- dw AttackAnimation_5637 ; ATK_ANIM_135
- dw AttackAnimation_5644 ; ATK_ANIM_136
- dw AttackAnimation_564f ; ATK_ANIM_137
- dw AttackAnimation_5654 ; ATK_ANIM_138
- dw AttackAnimation_5659 ; ATK_ANIM_139
- dw AttackAnimation_565e ; ATK_ANIM_140
- dw AttackAnimation_5665 ; ATK_ANIM_141
- dw AttackAnimation_5668 ; ATK_ANIM_142
- dw AttackAnimation_5673 ; ATK_ANIM_143
- dw AttackAnimation_5673 ; ATK_ANIM_144
-
-AttackAnimation_52c6: ; (6:52c6)
- anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_HIT
- anim_normal DUEL_ANIM_SHAKE1
- anim_opponent DUEL_ANIM_SHOW_DAMAGE
- anim_end
-
-AttackAnimation_52cf:
- anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_8
+ dw NULL ; ATK_ANIM_NONE
+ dw AttackAnimation_Hit ; ATK_ANIM_HIT
+ dw AttackAnimation_BigHit ; ATK_ANIM_BIG_HIT
+ dw AttackAnimation_Hit ; ATK_ANIM_3
+ dw AttackAnimation_Hit ; ATK_ANIM_HIT_RECOIL
+ dw AttackAnimation_Hit ; ATK_ANIM_HIT_EFFECT
+ dw AttackAnimation_ThunderShock ; ATK_ANIM_THUNDERSHOCK
+ dw AttackAnimation_ThunderShock ; ATK_ANIM_THUNDER
+ dw AttackAnimation_Thunderbolt ; ATK_ANIM_THUNDERBOLT
+ dw AttackAnimation_ThunderShock ; ATK_ANIM_9
+ dw AttackAnimation_BigLightning ; ATK_ANIM_THUNDER_WHOLE_SCREEN
+ dw AttackAnimation_BigLightning ; ATK_ANIM_11
+ dw AttackAnimation_BigLightning ; ATK_ANIM_THUNDERSTORM
+ dw AttackAnimation_BigLightning ; ATK_ANIM_CHAIN_LIGHTNING
+ dw AttackAnimation_SmallFlame ; ATK_ANIM_SMALL_FLAME
+ dw AttackAnimation_BigFlame ; ATK_ANIM_BIG_FLAME
+ dw AttackAnimation_FireSpin ; ATK_ANIM_FIRE_SPIN
+ dw AttackAnimation_DiveBomb ; ATK_ANIM_DIVE_BOMB
+ dw AttackAnimation_WaterJets ; ATK_ANIM_WATER_JETS
+ dw AttackAnimation_WaterGun ; ATK_ANIM_WATER_GUN
+ dw AttackAnimation_Whirlpool ; ATK_ANIM_WHIRLPOOL
+ dw AttackAnimation_DragonRage ; ATK_ANIM_DRAGON_RAGE
+ dw AttackAnimation_HydroPump ; ATK_ANIM_HYDRO_PUMP
+ dw AttackAnimation_Blizzard ; ATK_ANIM_23
+ dw AttackAnimation_Blizzard ; ATK_ANIM_BLIZZARD
+ dw AttackAnimation_PsychicHit ; ATK_ANIM_PSYCHIC_HIT
+ dw AttackAnimation_PsychicHit ; ATK_ANIM_NIGHTMARE
+ dw AttackAnimation_PsychicHit ; ATK_ANIM_27
+ dw AttackAnimation_DarkMind ; ATK_ANIM_DARK_MIND
+ dw AttackAnimation_Beam ; ATK_ANIM_BEAM
+ dw AttackAnimation_HyperBeam ; ATK_ANIM_HYPER_BEAM
+ dw AttackAnimation_Beam ; ATK_ANIM_31
+ dw AttackAnimation_RockThrow ; ATK_ANIM_ROCK_THROW
+ dw AttackAnimation_StoneBarrage ; ATK_ANIM_STONE_BARRAGE
+ dw AttackAnimation_Punch ; ATK_ANIM_PUNCH
+ dw AttackAnimation_Thunderpunch ; ATK_ANIM_THUNDERPUNCH
+ dw AttackAnimation_FirePunch ; ATK_ANIM_FIRE_PUNCH
+ dw AttackAnimation_StretchKick ; ATK_ANIM_STRETCH_KICK
+ dw AttackAnimation_Slash ; ATK_ANIM_SLASH
+ dw AttackAnimation_Whip ; ATK_ANIM_WHIP
+ dw AttackAnimation_Tear ; ATK_ANIM_TEAR
+ dw AttackAnimation_MultipleSlash ; ATK_ANIM_MULTIPLE_SLASH
+ dw AttackAnimation_MultipleSlash ; ATK_ANIM_42
+ dw AttackAnimation_MultipleSlash ; ATK_ANIM_RAMPAGE
+ dw AttackAnimation_Drill ; ATK_ANIM_DRILL
+ dw AttackAnimation_PotSmash ; ATK_ANIM_POT_SMASH
+ dw AttackAnimation_Bonemerang ; ATK_ANIM_BONEMERANG
+ dw AttackAnimation_SeismicToss ; ATK_ANIM_SEISMIC_TOSS
+ dw AttackAnimation_Needles ; ATK_ANIM_NEEDLES
+ dw AttackAnimation_Needles ; ATK_ANIM_49
+ dw AttackAnimation_WhiteGas ; ATK_ANIM_SMOG
+ dw AttackAnimation_WhiteGas ; ATK_ANIM_51
+ dw AttackAnimation_WhiteGas ; ATK_ANIM_52
+ dw AttackAnimation_WhiteGas ; ATK_ANIM_FOUL_GAS
+ dw AttackAnimation_WhiteGas ; ATK_ANIM_FOUL_ODOR
+ dw AttackAnimation_Powder ; ATK_ANIM_POWDER_EFFECT_CHANCE
+ dw AttackAnimation_Powder ; ATK_ANIM_POWDER_HIT_POISON
+ dw AttackAnimation_544e ; ATK_ANIM_POISON_POWDER
+ dw AttackAnimation_Powder ; ATK_ANIM_58
+ dw AttackAnimation_Powder ; ATK_ANIM_59
+ dw AttackAnimation_Powder ; ATK_ANIM_60
+ dw AttackAnimation_Goo ; ATK_ANIM_GOO
+ dw AttackAnimation_Goo ; ATK_ANIM_62
+ dw AttackAnimation_SpitPoisonFail ; ATK_ANIM_SPIT_POISON
+ dw AttackAnimation_Goo ; ATK_ANIM_64
+ dw AttackAnimation_Bubbles ; ATK_ANIM_BUBBLES
+ dw AttackAnimation_Bubbles ; ATK_ANIM_66
+ dw AttackAnimation_StringShot ; ATK_ANIM_STRING_SHOT
+ dw AttackAnimation_StringShot ; ATK_ANIM_68
+ dw AttackAnimation_Boyfriends ; ATK_ANIM_BOYFRIENDS
+ dw AttackAnimation_Lure ; ATK_ANIM_LURE
+ dw AttackAnimation_Toxic ; ATK_ANIM_TOXIC
+ dw AttackAnimation_ConfuseRay ; ATK_ANIM_CONFUSE_RAY
+ dw AttackAnimation_ConfuseRay ; ATK_ANIM_73
+ dw AttackAnimation_Sing ; ATK_ANIM_SING
+ dw AttackAnimation_Sing ; ATK_ANIM_LULLABY
+ dw AttackAnimation_Supersonic ; ATK_ANIM_SUPERSONIC
+ dw AttackAnimation_Supersonic ; ATK_ANIM_77
+ dw AttackAnimation_PetalDance ; ATK_ANIM_PETAL_DANCE
+ dw AttackAnimation_Protect ; ATK_ANIM_PROTECT
+ dw AttackAnimation_Barrier ; ATK_ANIM_BARRIER
+ dw AttackAnimation_QuickAttack ; ATK_ANIM_QUICK_ATTACK
+ dw AttackAnimation_AgilityProtect ; ATK_ANIM_AGILITY_PROTECT
+ dw AttackAnimation_Whirlwind ; ATK_ANIM_WHIRLWIND
+ dw AttackAnimation_Cry ; ATK_ANIM_CRY
+ dw AttackAnimation_Amnesia ; ATK_ANIM_AMNESIA
+ dw AttackAnimation_Selfdestruct ; ATK_ANIM_SELFDESTRUCT
+ dw AttackAnimation_BigSelfdestruct ; ATK_ANIM_BIG_SELFDESTRUCTION
+ dw AttackAnimation_Recover ; ATK_ANIM_RECOVER
+ dw AttackAnimation_Drain ; ATK_ANIM_DRAIN
+ dw AttackAnimation_DarkGas ; ATK_ANIM_DARK_GAS
+ dw AttackAnimation_GlowEffect ; ATK_ANIM_GLOW_EFFECT
+ dw AttackAnimation_MirrorMove ; ATK_ANIM_MIRROR_MOVE
+ dw AttackAnimation_DevolutionBeam ; ATK_ANIM_DEVOLUTION_BEAM
+ dw AttackAnimation_5543 ; ATK_ANIM_PKMN_POWER_1
+ dw AttackAnimation_Firegiver ; ATK_ANIM_FIREGIVER
+ dw AttackAnimation_Quickfreeze ; ATK_ANIM_QUICKFREEZE
+ dw AttackAnimation_PealOfThunder ; ATK_ANIM_PEAL_OF_THUNDER
+ dw AttackAnimation_HealingWind ; ATK_ANIM_HEALING_WIND
+ dw AttackAnimation_WhirlwindZigzag ; ATK_ANIM_WHIRLWIND_ZIGZAG
+ dw AttackAnimation_BigThunder ; ATK_ANIM_BIG_THUNDER
+ dw AttackAnimation_SolarPower ; ATK_ANIM_SOLAR_POWER
+ dw AttackAnimation_PoisonFang ; ATK_ANIM_POISON_FANG
+ dw AttackAnimation_PoisonFang ; ATK_ANIM_103
+ dw AttackAnimation_PoisonFang ; ATK_ANIM_104
+ dw AttackAnimation_558c ; ATK_ANIM_105
+ dw AttackAnimation_FriendshipSong ; ATK_ANIM_FRIENDSHIP_SONG
+ dw AttackAnimation_Schrunch ; ATK_ANIM_SCRUNCH
+ dw AttackAnimation_CatPunch ; ATK_ANIM_CAT_PUNCH
+ dw AttackAnimation_MagneticStorm ; ATK_ANIM_MAGNETIC_STORM
+ dw AttackAnimation_PoisonWhip ; ATK_ANIM_POISON_WHIP
+ dw AttackAnimation_ThunderWave ; ATK_ANIM_THUNDER_WAVE
+ dw AttackAnimation_ThunderWave ; ATK_ANIM_112
+ dw AttackAnimation_Spore ; ATK_ANIM_SPORE
+ dw AttackAnimation_Hypnosis ; ATK_ANIM_HYPNOSIS
+ dw AttackAnimation_EnergyConversion ; ATK_ANIM_ENERGY_CONVERSION
+ dw AttackAnimation_Leer ; ATK_ANIM_LEER
+ dw AttackAnimation_ConfusionHit ; ATK_ANIM_CONFUSION_HIT
+ dw AttackAnimation_55e0 ; ATK_ANIM_118
+ dw AttackAnimation_55e5 ; ATK_ANIM_119
+ dw AttackAnimation_BenchHit ; ATK_ANIM_BENCH_HIT
+ dw AttackAnimation_Heal ; ATK_ANIM_HEAL
+ dw AttackAnimation_RecoilHit ; ATK_ANIM_RECOIL_HIT
+ dw AttackAnimation_Poison ; ATK_ANIM_POISON
+ dw AttackAnimation_Confusion ; ATK_ANIM_CONFUSION
+ dw AttackAnimation_Paralysis ; ATK_ANIM_PARALYSIS
+ dw AttackAnimation_Sleep ; ATK_ANIM_SLEEP
+ dw AttackAnimation_ImakuniConfusion ; ATK_ANIM_IMAKUNI_CONFUSION
+ dw AttackAnimation_SleepingGas ; ATK_ANIM_SLEEPING_GAS
+ dw AttackAnimation_560f ; ATK_ANIM_129
+ dw AttackAnimation_ThunderPlayArea ; ATK_ANIM_THUNDER_PLAY_AREA
+ dw AttackAnimation_CatPunchPlayArea ; ATK_ANIM_CAT_PUNCH_PLAY_AREA
+ dw AttackAnimation_FiregiverPlayer ; ATK_ANIM_FIREGIVER_PLAYER
+ dw AttackAnimation_FiregiverOpp ; ATK_ANIM_FIREGIVER_OPP
+ dw AttackAnimation_HealingWindPlayArea ; ATK_ANIM_HEALING_WIND_PLAY_AREA
+ dw AttackAnimation_Gale ; ATK_ANIM_GALE
+ dw AttackAnimation_Expand ; ATK_ANIM_EXPAND
+ dw AttackAnimation_564f ; ATK_ANIM_137
+ dw AttackAnimation_FullHeal ; ATK_ANIM_FULL_HEAL
+ dw AttackAnimation_5659 ; ATK_ANIM_139
+ dw AttackAnimation_SpitPoisonSuccess ; ATK_ANIM_SPIT_POISON_SUCCESS
+ dw AttackAnimation_GustOfWind ; ATK_ANIM_GUST_OF_WIND
+ dw AttackAnimation_HealBothSides ; ATK_ANIM_HEAL_BOTH_SIDES
+ dw AttackAnimation_5673 ; ATK_ANIM_143
+ dw AttackAnimation_5673 ; ATK_ANIM_144
+
+AttackAnimation_Hit: ; (6:52c6)
+ anim_player DUEL_ANIM_GLOW
+ anim_opponent DUEL_ANIM_HIT
+ anim_normal DUEL_ANIM_SHAKE1
+ anim_opponent DUEL_ANIM_SHOW_DAMAGE
+ anim_end
+
+AttackAnimation_BigHit:
+ anim_player DUEL_ANIM_GLOW
+ anim_opponent DUEL_ANIM_BIG_HIT
anim_normal DUEL_ANIM_SHAKE2
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_52d8:
+AttackAnimation_ThunderShock:
anim_player DUEL_ANIM_GLOW
anim_opponent DUEL_ANIM_THUNDER_SHOCK
anim_opponent DUEL_ANIM_HIT
@@ -189,207 +189,207 @@ AttackAnimation_52d8:
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_52e3:
+AttackAnimation_Thunderbolt:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_11
- anim_opponent DUEL_ANIM_12
+ anim_opponent DUEL_ANIM_LIGHTNING
+ anim_opponent DUEL_ANIM_BORDER_SPARK
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_52f0:
+AttackAnimation_BigLightning:
anim_player DUEL_ANIM_GLOW
anim_normal $65
- anim_normal DUEL_ANIM_13
+ anim_normal DUEL_ANIM_BIG_LIGHTNING
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_52fd:
+AttackAnimation_SmallFlame:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_14
+ anim_opponent DUEL_ANIM_SMALL_FLAME
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5308:
+AttackAnimation_BigFlame:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_15
+ anim_opponent DUEL_ANIM_BIG_FLAME
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5313:
+AttackAnimation_FireSpin:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_16
+ anim_normal DUEL_ANIM_FIRE_SPIN
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_531e:
+AttackAnimation_DiveBomb:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_17
+ anim_opponent DUEL_ANIM_DIVE_BOMB
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5329:
+AttackAnimation_WaterJets:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_18
+ anim_normal DUEL_ANIM_WATER_JETS
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5334:
+AttackAnimation_WaterGun:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_19
+ anim_opponent DUEL_ANIM_WATER_GUN
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_533f:
+AttackAnimation_Whirlpool:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_20
+ anim_normal DUEL_ANIM_WHIRLPOOL
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_534a:
+AttackAnimation_DragonRage:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_11
- anim_opponent DUEL_ANIM_19
+ anim_opponent DUEL_ANIM_LIGHTNING
+ anim_opponent DUEL_ANIM_WATER_GUN
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5357:
+AttackAnimation_HydroPump:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_21
+ anim_opponent DUEL_ANIM_HYDRO_PUMP
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5362:
+AttackAnimation_Blizzard:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_22
+ anim_normal DUEL_ANIM_BLIZZARD
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_536d:
+AttackAnimation_PsychicHit:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_23
+ anim_opponent DUEL_ANIM_PSYCHIC
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5378:
+AttackAnimation_DarkMind:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_24
+ anim_opponent DUEL_ANIM_GLARE
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5383:
+AttackAnimation_Beam:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_25
+ anim_opponent DUEL_ANIM_BEAM
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_538e:
+AttackAnimation_HyperBeam:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_26
+ anim_opponent DUEL_ANIM_HYPER_BEAM
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5399:
+AttackAnimation_RockThrow:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_27
+ anim_opponent DUEL_ANIM_ROCK_THROW
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53a4:
+AttackAnimation_StoneBarrage:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_28
+ anim_opponent DUEL_ANIM_STONE_BARRAGE
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53af:
+AttackAnimation_Punch:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_29
+ anim_opponent DUEL_ANIM_PUNCH
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53ba:
+AttackAnimation_Thunderpunch:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_30
+ anim_opponent DUEL_ANIM_THUNDERPUNCH
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53c5:
+AttackAnimation_FirePunch:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_31
+ anim_opponent DUEL_ANIM_FIRE_PUNCH
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53d0:
+AttackAnimation_StretchKick:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_32
+ anim_player DUEL_ANIM_STRETCH_KICK
anim_end
-AttackAnimation_53d5:
+AttackAnimation_Slash:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_33
+ anim_opponent DUEL_ANIM_SLASH
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53e0:
+AttackAnimation_Whip:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_34
+ anim_opponent DUEL_ANIM_WHIP
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53eb:
+AttackAnimation_Tear:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_35
+ anim_opponent DUEL_ANIM_TEAR
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_53f6:
+AttackAnimation_MultipleSlash:
anim_player DUEL_ANIM_GLOW
anim_opponent DUEL_ANIM_FURY_SWIPES
anim_opponent DUEL_ANIM_HIT
@@ -397,57 +397,57 @@ AttackAnimation_53f6:
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5401:
+AttackAnimation_Drill:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_37
+ anim_opponent DUEL_ANIM_DRILL
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_540c:
+AttackAnimation_PotSmash:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_38
+ anim_opponent DUEL_ANIM_POT_SMASH
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5417:
+AttackAnimation_Bonemerang:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_39
+ anim_opponent DUEL_ANIM_BONEMERANG
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5422:
+AttackAnimation_SeismicToss:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_40
+ anim_opponent DUEL_ANIM_SEISMIC_TOSS
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_542d:
+AttackAnimation_Needles:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_41
+ anim_opponent DUEL_ANIM_NEEDLES
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5438:
+AttackAnimation_WhiteGas:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_42
+ anim_opponent DUEL_ANIM_WHITE_GAS
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5443:
+AttackAnimation_Powder:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_43
+ anim_opponent DUEL_ANIM_POWDER
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
@@ -455,247 +455,247 @@ AttackAnimation_5443:
AttackAnimation_544e:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_43
+ anim_opponent DUEL_ANIM_POWDER
anim_end
-AttackAnimation_5453:
+AttackAnimation_Goo:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_44
+ anim_opponent DUEL_ANIM_GOO
anim_normal $66
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5460:
+AttackAnimation_SpitPoisonFail:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_44
+ anim_opponent DUEL_ANIM_GOO
anim_normal $66
anim_end
-AttackAnimation_5467:
+AttackAnimation_Bubbles:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_45
+ anim_opponent DUEL_ANIM_BUBBLES
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5472:
+AttackAnimation_StringShot:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_46
+ anim_opponent DUEL_ANIM_STRING_SHOT
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_547d:
+AttackAnimation_Boyfriends:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_47
+ anim_opponent DUEL_ANIM_BOYFRIENDS
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5488:
+AttackAnimation_Lure:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_48
+ anim_player DUEL_ANIM_LURE
anim_normal $66
anim_end
-AttackAnimation_548f:
+AttackAnimation_Toxic:
anim_player DUEL_ANIM_GLOW
anim_normal $66
- anim_opponent DUEL_ANIM_49
+ anim_opponent DUEL_ANIM_TOXIC
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_549c:
+AttackAnimation_ConfuseRay:
anim_player DUEL_ANIM_GLOW
anim_normal $65
- anim_opponent DUEL_ANIM_50
+ anim_opponent DUEL_ANIM_CONFUSE_RAY
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_54a9:
+AttackAnimation_Sing:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_51
+ anim_opponent DUEL_ANIM_SING
anim_end
-AttackAnimation_54ae:
+AttackAnimation_Supersonic:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_52
+ anim_opponent DUEL_ANIM_SUPERSONIC
anim_end
-AttackAnimation_54b3:
+AttackAnimation_PetalDance:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_53
+ anim_normal DUEL_ANIM_PETAL_DANCE
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_54be:
+AttackAnimation_Protect:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_54
+ anim_player DUEL_ANIM_PROTECT
anim_end
-AttackAnimation_54c3:
+AttackAnimation_Barrier:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_55
+ anim_player DUEL_ANIM_BARRIER
anim_end
-AttackAnimation_54c8:
+AttackAnimation_QuickAttack:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_56
+ anim_normal DUEL_ANIM_QUICK_ATTACK
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_54d3:
+AttackAnimation_AgilityProtect:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_56
+ anim_normal DUEL_ANIM_QUICK_ATTACK
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
- anim_player DUEL_ANIM_54
+ anim_player DUEL_ANIM_PROTECT
anim_end
-AttackAnimation_54e0:
+AttackAnimation_Whirlwind:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_57
+ anim_opponent DUEL_ANIM_WHIRLWIND
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_54eb:
+AttackAnimation_Cry:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_58
+ anim_player DUEL_ANIM_CRY
anim_normal DUEL_ANIM_SHAKE1
anim_end
-AttackAnimation_54f2:
+AttackAnimation_Amnesia:
anim_player DUEL_ANIM_GLOW
anim_normal DUEL_ANIM_SHAKE1
- anim_opponent DUEL_ANIM_59
+ anim_opponent DUEL_ANIM_QUESTION_MARK
anim_end
-AttackAnimation_54f9:
+AttackAnimation_Selfdestruct:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_60
+ anim_player DUEL_ANIM_SELFDESTRUCT
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5504:
+AttackAnimation_BigSelfdestruct:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_61
+ anim_player DUEL_ANIM_BIG_SELFDESTRUCT_1
anim_normal $65
- anim_player DUEL_ANIM_65
+ anim_player DUEL_ANIM_BIG_SELFDESTRUCT_2
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5513:
+AttackAnimation_Recover:
anim_player DUEL_ANIM_GLOW
anim_end
-AttackAnimation_5516:
+AttackAnimation_Drain:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_63
+ anim_opponent DUEL_ANIM_DRAIN
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5521:
+AttackAnimation_DarkGas:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_64
+ anim_opponent DUEL_ANIM_DARK_GAS
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
- anim_opponent DUEL_ANIM_59
+ anim_opponent DUEL_ANIM_QUESTION_MARK
anim_end
-AttackAnimation_552e:
+AttackAnimation_GlowEffect:
anim_player DUEL_ANIM_GLOW
anim_normal $65
anim_end
-AttackAnimation_5533:
+AttackAnimation_MirrorMove:
anim_player DUEL_ANIM_GLOW
anim_normal $65
anim_opponent DUEL_ANIM_GLOW
anim_end
-AttackAnimation_553a:
+AttackAnimation_DevolutionBeam:
anim_player DUEL_ANIM_GLOW
anim_normal $65
- anim_unknown DUEL_ANIM_4
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_70
anim_end
AttackAnimation_5543:
- anim_unknown DUEL_ANIM_4
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_70
anim_normal $65
anim_end
-AttackAnimation_554a:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_Firegiver:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_70
anim_normal $65
anim_unknown2 DUEL_ANIM_71
anim_unknown2 DUEL_ANIM_71
anim_end
-AttackAnimation_5555:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_Quickfreeze:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_70
anim_normal DUEL_ANIM_69
- anim_unknown DUEL_ANIM_GLOW
+ anim_unknown $01
anim_end
-AttackAnimation_555e:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_PealOfThunder:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_70
anim_unknown2 DUEL_ANIM_68
- anim_unknown DUEL_ANIM_4
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_unknown2 DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_556d:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_HealingWind:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_70
anim_unknown2 DUEL_ANIM_73
anim_end
-AttackAnimation_5574:
+AttackAnimation_WhirlwindZigzag:
anim_player DUEL_ANIM_GLOW
- anim_unknown DUEL_ANIM_4
+ anim_unknown $04
anim_normal DUEL_ANIM_74
anim_end
-AttackAnimation_557b:
+AttackAnimation_BigThunder:
anim_player DUEL_ANIM_GLOW
anim_end
-AttackAnimation_557e:
+AttackAnimation_SolarPower:
anim_player DUEL_ANIM_GLOW
anim_normal $65
anim_end
-AttackAnimation_5583:
+AttackAnimation_PoisonFang:
anim_player DUEL_ANIM_GLOW
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
@@ -704,71 +704,71 @@ AttackAnimation_5583:
AttackAnimation_558c:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_41
+ anim_opponent DUEL_ANIM_NEEDLES
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5597:
+AttackAnimation_FriendshipSong:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_51
+ anim_player DUEL_ANIM_SING
anim_end
-AttackAnimation_559c:
+AttackAnimation_Schrunch:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_75
+ anim_player DUEL_ANIM_EXPAND
anim_end
-AttackAnimation_55a1:
+AttackAnimation_CatPunch:
anim_player DUEL_ANIM_GLOW
anim_end
-AttackAnimation_55a4:
+AttackAnimation_MagneticStorm:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_77
+ anim_player DUEL_ANIM_THUNDER_WAVE
anim_end
-AttackAnimation_55a9:
+AttackAnimation_PoisonWhip:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_34
+ anim_opponent DUEL_ANIM_WHIP
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_55b4:
+AttackAnimation_ThunderWave:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_77
+ anim_player DUEL_ANIM_THUNDER_WAVE
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_55bf:
+AttackAnimation_Spore:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_43
+ anim_opponent DUEL_ANIM_POWDER
anim_end
-AttackAnimation_55c4:
+AttackAnimation_Hypnosis:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_23
+ anim_opponent DUEL_ANIM_PSYCHIC
anim_end
-AttackAnimation_55c9:
+AttackAnimation_EnergyConversion:
anim_player DUEL_ANIM_GLOW
anim_normal $65
anim_end
-AttackAnimation_55ce:
+AttackAnimation_Leer:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_24
- anim_opponent DUEL_ANIM_59
+ anim_opponent DUEL_ANIM_GLARE
+ anim_opponent DUEL_ANIM_QUESTION_MARK
anim_end
-AttackAnimation_55d5:
+AttackAnimation_ConfusionHit:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_4
+ anim_player DUEL_ANIM_CONFUSION
anim_player DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE3
anim_player DUEL_ANIM_SHOW_DAMAGE
@@ -776,102 +776,102 @@ AttackAnimation_55d5:
AttackAnimation_55e0:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_18
+ anim_normal DUEL_ANIM_WATER_JETS
anim_end
AttackAnimation_55e5:
anim_end
-AttackAnimation_55e6:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_BenchHit:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_6
anim_unknown2 DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_55ed:
+AttackAnimation_Heal:
anim_player DUEL_ANIM_HEAL
anim_player DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_55f2:
- anim_unknown DUEL_ANIM_GLOW
+AttackAnimation_RecoilHit:
+ anim_unknown $01
anim_player DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE3
anim_player DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_55fb:
+AttackAnimation_Poison:
anim_opponent DUEL_ANIM_POISON
anim_end
-AttackAnimation_55fe:
- anim_opponent DUEL_ANIM_4
+AttackAnimation_Confusion:
+ anim_opponent DUEL_ANIM_CONFUSION
anim_end
-AttackAnimation_5601:
- anim_opponent DUEL_ANIM_2
+AttackAnimation_Paralysis:
+ anim_opponent DUEL_ANIM_PARALYSIS
anim_end
-AttackAnimation_5604:
+AttackAnimation_Sleep:
anim_opponent DUEL_ANIM_SLEEP
anim_end
-AttackAnimation_5607:
- anim_player DUEL_ANIM_4
+AttackAnimation_ImakuniConfusion:
+ anim_player DUEL_ANIM_CONFUSION
anim_end
-AttackAnimation_560a:
+AttackAnimation_SleepingGas:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_42
+ anim_opponent DUEL_ANIM_WHITE_GAS
anim_end
AttackAnimation_560f:
- anim_opponent DUEL_ANIM_59
+ anim_opponent DUEL_ANIM_QUESTION_MARK
anim_end
-AttackAnimation_5612:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_ThunderPlayArea:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_68
anim_unknown2 DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_unknown2 DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_561d:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_CatPunchPlayArea:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_76
anim_unknown2 DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_unknown2 DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5628:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_FiregiverPlayer:
+ anim_unknown $04
anim_normal DUEL_ANIM_78
anim_end
-AttackAnimation_562d:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_FiregiverOpp:
+ anim_unknown $04
anim_normal DUEL_ANIM_79
anim_end
-AttackAnimation_5632:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_HealingWindPlayArea:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5637:
+AttackAnimation_Gale:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_57
+ anim_opponent DUEL_ANIM_WHIRLWIND
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_normal $65
anim_end
-AttackAnimation_5644:
+AttackAnimation_Expand:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_75
+ anim_player DUEL_ANIM_EXPAND
anim_opponent DUEL_ANIM_HIT
anim_normal DUEL_ANIM_SHAKE1
anim_opponent DUEL_ANIM_SHOW_DAMAGE
@@ -882,7 +882,7 @@ AttackAnimation_564f:
anim_player DUEL_ANIM_SHOW_DAMAGE
anim_end
-AttackAnimation_5654:
+AttackAnimation_FullHeal:
anim_player DUEL_ANIM_HEAL
anim_normal $98
anim_end
@@ -892,20 +892,20 @@ AttackAnimation_5659:
anim_normal $98
anim_end
-AttackAnimation_565e:
+AttackAnimation_SpitPoisonSuccess:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_44
+ anim_opponent DUEL_ANIM_GOO
anim_normal $66
anim_end
-AttackAnimation_5665:
- anim_opponent DUEL_ANIM_57
+AttackAnimation_GustOfWind:
+ anim_opponent DUEL_ANIM_WHIRLWIND
anim_end
-AttackAnimation_5668:
- anim_unknown DUEL_ANIM_4
+AttackAnimation_HealBothSides:
+ anim_unknown $04
anim_unknown2 DUEL_ANIM_70
- anim_unknown DUEL_ANIM_GLOW
+ anim_unknown $01
anim_player DUEL_ANIM_HEAL
anim_opponent DUEL_ANIM_HEAL
anim_end
diff --git a/src/data/cards.asm b/src/data/cards.asm
index 8f39bac..9c1ae11 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -256,7 +256,7 @@ BulbasaurCard: ; 30e28 (c:4e28)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 1
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
; move 2
energy 0 ; energies
@@ -307,7 +307,7 @@ IvysaurCard: ; 30e69 (c:4e69)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_39 ; animation
+ db ATK_ANIM_WHIP ; animation
; move 2
energy GRASS, 3 ; energies
@@ -321,7 +321,7 @@ IvysaurCard: ; 30e69 (c:4e69)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_56 ; animation
+ db ATK_ANIM_POWDER_HIT_POISON ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -358,7 +358,7 @@ Venusaur1Card: ; 30eaa (c:4eaa)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_101 ; animation
+ db ATK_ANIM_SOLAR_POWER ; animation
; move 2
energy GRASS, 4 ; energies
@@ -372,7 +372,7 @@ Venusaur1Card: ; 30eaa (c:4eaa)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -409,7 +409,7 @@ Venusaur2Card: ; 30eeb (c:4eeb)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy GRASS, 4 ; energies
@@ -423,7 +423,7 @@ Venusaur2Card: ; 30eeb (c:4eeb)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_29 ; animation
+ db ATK_ANIM_BEAM ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -460,7 +460,7 @@ CaterpieCard: ; 30f2c (c:4f2c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_67 ; animation
+ db ATK_ANIM_STRING_SHOT ; animation
; move 2
energy 0 ; energies
@@ -525,7 +525,7 @@ MetapodCard: ; 30f6d (c:4f6d)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_55 ; animation
+ db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -562,7 +562,7 @@ ButterfreeCard: ; 30fae (c:4fae)
db SWITCH_OPPONENT_POKEMON ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_83 ; animation
+ db ATK_ANIM_WHIRLWIND ; animation
; move 2
energy GRASS, 4 ; energies
@@ -576,7 +576,7 @@ ButterfreeCard: ; 30fae (c:4fae)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
db 0 ; retreat cost
db WR_FIRE ; weakness
@@ -613,7 +613,7 @@ WeedleCard: ; 30fef (c:4fef)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_48 ; animation
+ db ATK_ANIM_NEEDLES ; animation
; move 2
energy 0 ; energies
@@ -678,7 +678,7 @@ KakunaCard: ; 31030 (c:5030)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_55 ; animation
+ db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -715,7 +715,7 @@ BeedrillCard: ; 31071 (c:5071)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_48 ; animation
+ db ATK_ANIM_NEEDLES ; animation
; move 2
energy GRASS, 3 ; energies
@@ -729,7 +729,7 @@ BeedrillCard: ; 31071 (c:5071)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_48 ; animation
+ db ATK_ANIM_NEEDLES ; animation
db 0 ; retreat cost
db WR_FIRE ; weakness
@@ -766,7 +766,7 @@ EkansCard: ; 310b2 (c:50b2)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_63 ; animation
+ db ATK_ANIM_SPIT_POISON ; animation
; move 2
energy GRASS, 1, COLORLESS, 1 ; energies
@@ -780,7 +780,7 @@ EkansCard: ; 310b2 (c:50b2)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -817,7 +817,7 @@ ArbokCard: ; 310f3 (c:50f3)
db SWITCH_OPPONENT_POKEMON ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy GRASS, 2, COLORLESS, 1 ; energies
@@ -831,7 +831,7 @@ ArbokCard: ; 310f3 (c:50f3)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_102 ; animation
+ db ATK_ANIM_POISON_FANG ; animation
db 2 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -868,7 +868,7 @@ NidoranFCard: ; 31134 (c:5134)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_41 ; animation
+ db ATK_ANIM_MULTIPLE_SLASH ; animation
; move 2
energy GRASS, 2 ; energies
@@ -882,7 +882,7 @@ NidoranFCard: ; 31134 (c:5134)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -919,7 +919,7 @@ NidorinaCard: ; 31175 (c:5175)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_76 ; animation
+ db ATK_ANIM_SUPERSONIC ; animation
; move 2
energy GRASS, 1, COLORLESS, 2 ; energies
@@ -933,7 +933,7 @@ NidorinaCard: ; 31175 (c:5175)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -970,7 +970,7 @@ NidoqueenCard: ; 311b6 (c:51b6)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_69 ; animation
+ db ATK_ANIM_BOYFRIENDS ; animation
; move 2
energy GRASS, 2, COLORLESS, 2 ; energies
@@ -984,7 +984,7 @@ NidoqueenCard: ; 311b6 (c:51b6)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 3 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -1072,7 +1072,7 @@ NidorinoCard: ; 31238 (c:5238)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy GRASS, 2, COLORLESS, 2 ; energies
@@ -1086,7 +1086,7 @@ NidorinoCard: ; 31238 (c:5238)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_44 ; animation
+ db ATK_ANIM_DRILL ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -1123,7 +1123,7 @@ NidokingCard: ; 31279 (c:5279)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_41 ; animation
+ db ATK_ANIM_MULTIPLE_SLASH ; animation
; move 2
energy GRASS, 3 ; energies
@@ -1137,7 +1137,7 @@ NidokingCard: ; 31279 (c:5279)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_71 ; animation
+ db ATK_ANIM_TOXIC ; animation
db 3 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -1174,7 +1174,7 @@ ZubatCard: ; 312ba (c:52ba)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_76 ; animation
+ db ATK_ANIM_SUPERSONIC ; animation
; move 2
energy GRASS, 1, COLORLESS, 1 ; energies
@@ -1188,7 +1188,7 @@ ZubatCard: ; 312ba (c:52ba)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
db 0 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -1225,7 +1225,7 @@ GolbatCard: ; 312fb (c:52fb)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy GRASS, 2, COLORLESS, 1 ; energies
@@ -1239,7 +1239,7 @@ GolbatCard: ; 312fb (c:52fb)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
db 0 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -1276,7 +1276,7 @@ OddishCard: ; 3133c (c:533c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_55 ; animation
+ db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
; move 2
energy GRASS, 2 ; energies
@@ -1290,7 +1290,7 @@ OddishCard: ; 3133c (c:533c)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1327,7 +1327,7 @@ GloomCard: ; 3137d (c:537d)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_57 ; animation
+ db ATK_ANIM_POISON_POWDER ; animation
; move 2
energy GRASS, 2 ; energies
@@ -1341,7 +1341,7 @@ GloomCard: ; 3137d (c:537d)
db FLAG_2_BIT_7 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_54 ; animation
+ db ATK_ANIM_FOUL_ODOR ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1378,7 +1378,7 @@ VileplumeCard: ; 313be (c:53be)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 1
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy GRASS, 3 ; energies
@@ -1392,7 +1392,7 @@ VileplumeCard: ; 313be (c:53be)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_78 ; animation
+ db ATK_ANIM_PETAL_DANCE ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -1429,7 +1429,7 @@ ParasCard: ; 313ff (c:53ff)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
; move 2
energy GRASS, 2 ; energies
@@ -1443,7 +1443,7 @@ ParasCard: ; 313ff (c:53ff)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_113 ; animation
+ db ATK_ANIM_SPORE ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1480,7 +1480,7 @@ ParasectCard: ; 31440 (c:5440)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_113 ; animation
+ db ATK_ANIM_SPORE ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -1494,7 +1494,7 @@ ParasectCard: ; 31440 (c:5440)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1531,7 +1531,7 @@ VenonatCard: ; 31481 (c:5481)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_55 ; animation
+ db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
; move 2
energy GRASS, 1, COLORLESS, 1 ; energies
@@ -1545,7 +1545,7 @@ VenonatCard: ; 31481 (c:5481)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1582,7 +1582,7 @@ VenomothCard: ; 314c2 (c:54c2)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy GRASS, 2 ; energies
@@ -1596,7 +1596,7 @@ VenomothCard: ; 314c2 (c:54c2)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_55 ; animation
+ db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
db 0 ; retreat cost
db WR_FIRE ; weakness
@@ -1633,7 +1633,7 @@ BellsproutCard: ; 31503 (c:5503)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_39 ; animation
+ db ATK_ANIM_WHIP ; animation
; move 2
energy GRASS, 1 ; energies
@@ -1647,7 +1647,7 @@ BellsproutCard: ; 31503 (c:5503)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1684,7 +1684,7 @@ WeepinbellCard: ; 31544 (c:5544)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_55 ; animation
+ db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
; move 2
energy GRASS, 2 ; energies
@@ -1698,7 +1698,7 @@ WeepinbellCard: ; 31544 (c:5544)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_39 ; animation
+ db ATK_ANIM_WHIP ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1735,7 +1735,7 @@ VictreebelCard: ; 31585 (c:5585)
db SWITCH_OPPONENT_POKEMON ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_70 ; animation
+ db ATK_ANIM_LURE ; animation
; move 2
energy GRASS, 2 ; energies
@@ -1749,7 +1749,7 @@ VictreebelCard: ; 31585 (c:5585)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 1
- db ATK_ANIM_61 ; animation
+ db ATK_ANIM_GOO ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -1786,7 +1786,7 @@ GrimerCard: ; 315c6 (c:55c6)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_61 ; animation
+ db ATK_ANIM_GOO ; animation
; move 2
energy GRASS, 1 ; energies
@@ -1800,7 +1800,7 @@ GrimerCard: ; 315c6 (c:55c6)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_79 ; animation
+ db ATK_ANIM_PROTECT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -1837,7 +1837,7 @@ MukCard: ; 31607 (c:5607)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy GRASS, 3 ; energies
@@ -1851,7 +1851,7 @@ MukCard: ; 31607 (c:5607)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_61 ; animation
+ db ATK_ANIM_GOO ; animation
db 2 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -1888,7 +1888,7 @@ ExeggcuteCard: ; 31648 (c:5648)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_114 ; animation
+ db ATK_ANIM_HYPNOSIS ; animation
; move 2
energy GRASS, 2 ; energies
@@ -1902,7 +1902,7 @@ ExeggcuteCard: ; 31648 (c:5648)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 1
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -1939,7 +1939,7 @@ ExeggutorCard: ; 31689 (c:5689)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy COLORLESS, 1 ; energies
@@ -1953,7 +1953,7 @@ ExeggutorCard: ; 31689 (c:5689)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_NOT_LIMITED
- db ATK_ANIM_2 ; animation
+ db ATK_ANIM_BIG_HIT ; animation
db 3 ; retreat cost
db WR_FIRE ; weakness
@@ -1990,7 +1990,7 @@ KoffingCard: ; 316ca (c:56ca)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_53 ; animation
+ db ATK_ANIM_FOUL_GAS ; animation
; move 2
energy 0 ; energies
@@ -2041,7 +2041,7 @@ WeezingCard: ; 3170b (c:570b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_50 ; animation
+ db ATK_ANIM_SMOG ; animation
; move 2
energy GRASS, 2, COLORLESS, 1 ; energies
@@ -2055,7 +2055,7 @@ WeezingCard: ; 3170b (c:570b)
db NONE ; flags 2
db NONE ; flags 3
db 60
- db ATK_ANIM_86 ; animation
+ db ATK_ANIM_SELFDESTRUCT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -2092,7 +2092,7 @@ Tangela1Card: ; 3174c (c:574c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy GRASS, 3 ; energies
@@ -2106,7 +2106,7 @@ Tangela1Card: ; 3174c (c:574c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_56 ; animation
+ db ATK_ANIM_POWDER_HIT_POISON ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -2143,7 +2143,7 @@ Tangela2Card: ; 3178d (c:578d)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_55 ; animation
+ db ATK_ANIM_POWDER_EFFECT_CHANCE ; animation
; move 2
energy GRASS, 2, COLORLESS, 1 ; energies
@@ -2157,7 +2157,7 @@ Tangela2Card: ; 3178d (c:578d)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_110 ; animation
+ db ATK_ANIM_POISON_WHIP ; animation
db 2 ; retreat cost
db WR_FIRE ; weakness
@@ -2194,7 +2194,7 @@ ScytherCard: ; 317ce (c:57ce)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -2208,7 +2208,7 @@ ScytherCard: ; 317ce (c:57ce)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
db 0 ; retreat cost
db WR_FIRE ; weakness
@@ -2245,7 +2245,7 @@ PinsirCard: ; 3180f (c:580f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_5 ; animation
+ db ATK_ANIM_HIT_EFFECT ; animation
; move 2
energy GRASS, 2, COLORLESS, 2 ; energies
@@ -2259,7 +2259,7 @@ PinsirCard: ; 3180f (c:580f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_40 ; animation
+ db ATK_ANIM_TEAR ; animation
db 1 ; retreat cost
db WR_FIRE ; weakness
@@ -2296,7 +2296,7 @@ CharmanderCard: ; 31850 (c:5850)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
; move 2
energy FIRE, 1, COLORLESS, 1 ; energies
@@ -2310,7 +2310,7 @@ CharmanderCard: ; 31850 (c:5850)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_14 ; animation
+ db ATK_ANIM_SMALL_FLAME ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -2347,7 +2347,7 @@ CharmeleonCard: ; 31891 (c:5891)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
; move 2
energy FIRE, 2, COLORLESS, 1 ; energies
@@ -2361,7 +2361,7 @@ CharmeleonCard: ; 31891 (c:5891)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_15 ; animation
+ db ATK_ANIM_BIG_FLAME ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -2398,7 +2398,7 @@ CharizardCard: ; 318d2 (c:58d2)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy FIRE, 4 ; energies
@@ -2412,7 +2412,7 @@ CharizardCard: ; 318d2 (c:58d2)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 6
- db ATK_ANIM_16 ; animation
+ db ATK_ANIM_FIRE_SPIN ; animation
db 3 ; retreat cost
db WR_WATER ; weakness
@@ -2449,7 +2449,7 @@ VulpixCard: ; 31913 (c:5913)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_72 ; animation
+ db ATK_ANIM_CONFUSE_RAY ; animation
; move 2
energy 0 ; energies
@@ -2500,7 +2500,7 @@ Ninetails1Card: ; 31954 (c:5954)
db SWITCH_OPPONENT_POKEMON ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_70 ; animation
+ db ATK_ANIM_LURE ; animation
; move 2
energy FIRE, 4 ; energies
@@ -2514,7 +2514,7 @@ Ninetails1Card: ; 31954 (c:5954)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_16 ; animation
+ db ATK_ANIM_FIRE_SPIN ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -2551,7 +2551,7 @@ Ninetails2Card: ; 31995 (c:5995)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy FIRE, 3 ; energies
@@ -2565,7 +2565,7 @@ Ninetails2Card: ; 31995 (c:5995)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_16 ; animation
+ db ATK_ANIM_FIRE_SPIN ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -2602,7 +2602,7 @@ GrowlitheCard: ; 319d6 (c:59d6)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_14 ; animation
+ db ATK_ANIM_SMALL_FLAME ; animation
; move 2
energy 0 ; energies
@@ -2653,7 +2653,7 @@ Arcanine1Card: ; 31a17 (c:5a17)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
; move 2
energy FIRE, 2 ; energies
@@ -2667,7 +2667,7 @@ Arcanine1Card: ; 31a17 (c:5a17)
db DISCARD_ENERGY ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
db 6
- db ATK_ANIM_16 ; animation
+ db ATK_ANIM_FIRE_SPIN ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -2704,7 +2704,7 @@ Arcanine2Card: ; 31a58 (c:5a58)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_15 ; animation
+ db ATK_ANIM_BIG_FLAME ; animation
; move 2
energy FIRE, 2, COLORLESS, 2 ; energies
@@ -2718,7 +2718,7 @@ Arcanine2Card: ; 31a58 (c:5a58)
db NONE ; flags 2
db NONE ; flags 3
db 30
- db ATK_ANIM_4 ; animation
+ db ATK_ANIM_HIT_RECOIL ; animation
db 3 ; retreat cost
db WR_WATER ; weakness
@@ -2755,7 +2755,7 @@ PonytaCard: ; 31a99 (c:5a99)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy FIRE, 2 ; energies
@@ -2769,7 +2769,7 @@ PonytaCard: ; 31a99 (c:5a99)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_15 ; animation
+ db ATK_ANIM_BIG_FLAME ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -2806,7 +2806,7 @@ RapidashCard: ; 31ada (c:5ada)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy FIRE, 2, COLORLESS, 1 ; energies
@@ -2820,7 +2820,7 @@ RapidashCard: ; 31ada (c:5ada)
db NULLIFY_OR_WEAKEN_ATTACK | FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
db 0 ; retreat cost
db WR_WATER ; weakness
@@ -2857,7 +2857,7 @@ Magmar1Card: ; 31b1b (c:5b1b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_36 ; animation
+ db ATK_ANIM_FIRE_PUNCH ; animation
; move 2
energy FIRE, 2, COLORLESS, 1 ; energies
@@ -2871,7 +2871,7 @@ Magmar1Card: ; 31b1b (c:5b1b)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_15 ; animation
+ db ATK_ANIM_BIG_FLAME ; animation
db 2 ; retreat cost
db WR_WATER ; weakness
@@ -2908,7 +2908,7 @@ Magmar2Card: ; 31b5c (c:5b5c)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_90 ; animation
+ db ATK_ANIM_DARK_GAS ; animation
; move 2
energy FIRE, 2 ; energies
@@ -2922,7 +2922,7 @@ Magmar2Card: ; 31b5c (c:5b5c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_50 ; animation
+ db ATK_ANIM_SMOG ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -2959,7 +2959,7 @@ Flareon1Card: ; 31b9d (c:5b9d)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -2973,7 +2973,7 @@ Flareon1Card: ; 31b9d (c:5b9d)
db NONE ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -3010,7 +3010,7 @@ Flareon2Card: ; 31bde (c:5bde)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
; move 2
energy FIRE, 2, COLORLESS, 2 ; energies
@@ -3024,7 +3024,7 @@ Flareon2Card: ; 31bde (c:5bde)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_15 ; animation
+ db ATK_ANIM_BIG_FLAME ; animation
db 1 ; retreat cost
db WR_WATER ; weakness
@@ -3061,7 +3061,7 @@ Moltres1Card: ; 31c1f (c:5c1f)
db FLAG_2_BIT_5 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy FIRE, 4 ; energies
@@ -3112,7 +3112,7 @@ Moltres2Card: ; 31c60 (c:5c60)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_95 ; animation
+ db ATK_ANIM_FIREGIVER ; animation
; move 2
energy FIRE, 3 ; energies
@@ -3163,7 +3163,7 @@ SquirtleCard: ; 31ca1 (c:5ca1)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_65 ; animation
+ db ATK_ANIM_BUBBLES ; animation
; move 2
energy WATER, 1, COLORLESS, 1 ; energies
@@ -3228,7 +3228,7 @@ WartortleCard: ; 31ce2 (c:5ce2)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3265,7 +3265,7 @@ BlastoiseCard: ; 31d23 (c:5d23)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy WATER, 3 ; energies
@@ -3279,7 +3279,7 @@ BlastoiseCard: ; 31d23 (c:5d23)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_22 ; animation
+ db ATK_ANIM_HYDRO_PUMP ; animation
db 3 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3316,7 +3316,7 @@ PsyduckCard: ; 31d64 (c:5d64)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy WATER, 1 ; energies
@@ -3330,7 +3330,7 @@ PsyduckCard: ; 31d64 (c:5d64)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_41 ; animation
+ db ATK_ANIM_MULTIPLE_SLASH ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3367,7 +3367,7 @@ GolduckCard: ; 31da5 (c:5da5)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
; move 2
energy WATER, 2, COLORLESS, 1 ; energies
@@ -3381,7 +3381,7 @@ GolduckCard: ; 31da5 (c:5da5)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_30 ; animation
+ db ATK_ANIM_HYPER_BEAM ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3418,7 +3418,7 @@ PoliwagCard: ; 31de6 (c:5de6)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_19 ; animation
+ db ATK_ANIM_WATER_GUN ; animation
; move 2
energy 0 ; energies
@@ -3469,7 +3469,7 @@ PoliwhirlCard: ; 31e27 (c:5e27)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_85 ; animation
+ db ATK_ANIM_AMNESIA ; animation
; move 2
energy WATER, 2, COLORLESS, 1 ; energies
@@ -3483,7 +3483,7 @@ PoliwhirlCard: ; 31e27 (c:5e27)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -3520,7 +3520,7 @@ PoliwrathCard: ; 31e68 (c:5e68)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_19 ; animation
+ db ATK_ANIM_WATER_GUN ; animation
; move 2
energy WATER, 2, COLORLESS, 2 ; energies
@@ -3534,7 +3534,7 @@ PoliwrathCard: ; 31e68 (c:5e68)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_20 ; animation
+ db ATK_ANIM_WHIRLPOOL ; animation
db 3 ; retreat cost
db WR_GRASS ; weakness
@@ -3571,7 +3571,7 @@ TentacoolCard: ; 31ea9 (c:5ea9)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy WATER, 1 ; energies
@@ -3585,7 +3585,7 @@ TentacoolCard: ; 31ea9 (c:5ea9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_61 ; animation
+ db ATK_ANIM_GOO ; animation
db 0 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3622,7 +3622,7 @@ TentacruelCard: ; 31eea (c:5eea)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_76 ; animation
+ db ATK_ANIM_SUPERSONIC ; animation
; move 2
energy WATER, 2 ; energies
@@ -3636,7 +3636,7 @@ TentacruelCard: ; 31eea (c:5eea)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_41 ; animation
+ db ATK_ANIM_MULTIPLE_SLASH ; animation
db 0 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3673,7 +3673,7 @@ SeelCard: ; 31f2b (c:5f2b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -3724,7 +3724,7 @@ DewgongCard: ; 31f6c (c:5f6c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_29 ; animation
+ db ATK_ANIM_BEAM ; animation
; move 2
energy WATER, 2, COLORLESS, 2 ; energies
@@ -3738,7 +3738,7 @@ DewgongCard: ; 31f6c (c:5f6c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_29 ; animation
+ db ATK_ANIM_BEAM ; animation
db 3 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3775,7 +3775,7 @@ ShellderCard: ; 31fad (c:5fad)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_76 ; animation
+ db ATK_ANIM_SUPERSONIC ; animation
; move 2
energy WATER, 1 ; energies
@@ -3840,7 +3840,7 @@ CloysterCard: ; 31fee (c:5fee)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_48 ; animation
+ db ATK_ANIM_NEEDLES ; animation
db 2 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3877,7 +3877,7 @@ KrabbyCard: ; 3202f (c:602f)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy WATER, 1, COLORLESS, 1 ; energies
@@ -3891,7 +3891,7 @@ KrabbyCard: ; 3202f (c:602f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 2 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3928,7 +3928,7 @@ KinglerCard: ; 32070 (c:6070)
db NONE ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
db 0
- db ATK_ANIM_2 ; animation
+ db ATK_ANIM_BIG_HIT ; animation
; move 2
energy WATER, 2, COLORLESS, 1 ; energies
@@ -3942,7 +3942,7 @@ KinglerCard: ; 32070 (c:6070)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 3 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -3979,7 +3979,7 @@ HorseaCard: ; 320b1 (c:60b1)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_90 ; animation
+ db ATK_ANIM_DARK_GAS ; animation
; move 2
energy 0 ; energies
@@ -4030,7 +4030,7 @@ SeadraCard: ; 320f2 (c:60f2)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_19 ; animation
+ db ATK_ANIM_WATER_GUN ; animation
; move 2
energy WATER, 1, COLORLESS, 2 ; energies
@@ -4044,7 +4044,7 @@ SeadraCard: ; 320f2 (c:60f2)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -4081,7 +4081,7 @@ GoldeenCard: ; 32133 (c:6133)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -4132,7 +4132,7 @@ SeakingCard: ; 32174 (c:6174)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy WATER, 1, COLORLESS, 1 ; energies
@@ -4146,7 +4146,7 @@ SeakingCard: ; 32174 (c:6174)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_18 ; animation
+ db ATK_ANIM_WATER_JETS ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -4183,7 +4183,7 @@ StaryuCard: ; 321b5 (c:61b5)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -4234,7 +4234,7 @@ StarmieCard: ; 321f6 (c:61f6)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_88 ; animation
+ db ATK_ANIM_RECOVER ; animation
; move 2
energy WATER, 1, COLORLESS, 2 ; energies
@@ -4248,7 +4248,7 @@ StarmieCard: ; 321f6 (c:61f6)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_29 ; animation
+ db ATK_ANIM_BEAM ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -4285,7 +4285,7 @@ MagikarpCard: ; 32237 (c:6237)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy WATER, 1 ; energies
@@ -4299,7 +4299,7 @@ MagikarpCard: ; 32237 (c:6237)
db NONE ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
db 0
- db ATK_ANIM_2 ; animation
+ db ATK_ANIM_BIG_HIT ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -4336,7 +4336,7 @@ GyaradosCard: ; 32278 (c:6278)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_21 ; animation
+ db ATK_ANIM_DRAGON_RAGE ; animation
; move 2
energy WATER, 4 ; energies
@@ -4350,7 +4350,7 @@ GyaradosCard: ; 32278 (c:6278)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_65 ; animation
+ db ATK_ANIM_BUBBLES ; animation
db 3 ; retreat cost
db WR_GRASS ; weakness
@@ -4387,7 +4387,7 @@ LaprasCard: ; 322b9 (c:62b9)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_19 ; animation
+ db ATK_ANIM_WATER_GUN ; animation
; move 2
energy WATER, 2 ; energies
@@ -4401,7 +4401,7 @@ LaprasCard: ; 322b9 (c:62b9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_72 ; animation
+ db ATK_ANIM_CONFUSE_RAY ; animation
db 2 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -4438,7 +4438,7 @@ Vaporeon1Card: ; 322fa (c:62fa)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -4452,7 +4452,7 @@ Vaporeon1Card: ; 322fa (c:62fa)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -4489,7 +4489,7 @@ Vaporeon2Card: ; 3233b (c:633b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
; move 2
energy WATER, 2, COLORLESS, 1 ; energies
@@ -4503,7 +4503,7 @@ Vaporeon2Card: ; 3233b (c:633b)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_19 ; animation
+ db ATK_ANIM_WATER_GUN ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -4540,7 +4540,7 @@ OmanyteCard: ; 3237c (c:637c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy WATER, 1 ; energies
@@ -4554,7 +4554,7 @@ OmanyteCard: ; 3237c (c:637c)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_19 ; animation
+ db ATK_ANIM_WATER_GUN ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -4591,7 +4591,7 @@ OmastarCard: ; 323bd (c:63bd)
db ATTACHED_ENERGY_BOOST ; flags 2
db NONE ; flags 3
db MAX_ENERGY_BOOST_IS_LIMITED
- db ATK_ANIM_19 ; animation
+ db ATK_ANIM_WATER_GUN ; animation
; move 2
energy WATER, 2 ; energies
@@ -4605,7 +4605,7 @@ OmastarCard: ; 323bd (c:63bd)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_48 ; animation
+ db ATK_ANIM_NEEDLES ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -4642,7 +4642,7 @@ Articuno1Card: ; 323fe (c:63fe)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_29 ; animation
+ db ATK_ANIM_BEAM ; animation
; move 2
energy WATER, 4 ; energies
@@ -4656,7 +4656,7 @@ Articuno1Card: ; 323fe (c:63fe)
db NONE ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_24 ; animation
+ db ATK_ANIM_BLIZZARD ; animation
db 2 ; retreat cost
db NONE ; weakness
@@ -4693,7 +4693,7 @@ Articuno2Card: ; 3243f (c:643f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_96 ; animation
+ db ATK_ANIM_QUICKFREEZE ; animation
; move 2
energy WATER, 3 ; energies
@@ -4707,7 +4707,7 @@ Articuno2Card: ; 3243f (c:643f)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_99 ; animation
+ db ATK_ANIM_WHIRLWIND_ZIGZAG ; animation
db 2 ; retreat cost
db NONE ; weakness
@@ -4744,7 +4744,7 @@ Pikachu1Card: ; 32480 (c:6480)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy LIGHTNING, 1, COLORLESS, 1 ; energies
@@ -4758,7 +4758,7 @@ Pikachu1Card: ; 32480 (c:6480)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_6 ; animation
+ db ATK_ANIM_THUNDERSHOCK ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -4795,7 +4795,7 @@ Pikachu2Card: ; 324c1 (c:64c1)
db NONE ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_10 ; animation
+ db ATK_ANIM_THUNDER_WHOLE_SCREEN ; animation
; move 2
energy 0 ; energies
@@ -4846,7 +4846,7 @@ Pikachu3Card: ; 32502 (c:6502)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_76 ; animation
+ db ATK_ANIM_SUPERSONIC ; animation
; move 2
energy LIGHTNING, 2 ; energies
@@ -4860,7 +4860,7 @@ Pikachu3Card: ; 32502 (c:6502)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_6 ; animation
+ db ATK_ANIM_THUNDERSHOCK ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -4897,7 +4897,7 @@ Pikachu4Card: ; 32543 (c:6543)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_76 ; animation
+ db ATK_ANIM_SUPERSONIC ; animation
; move 2
energy LIGHTNING, 2 ; energies
@@ -4911,7 +4911,7 @@ Pikachu4Card: ; 32543 (c:6543)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_6 ; animation
+ db ATK_ANIM_THUNDERSHOCK ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -4948,7 +4948,7 @@ FlyingPikachuCard: ; 32584 (c:6584)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_6 ; animation
+ db ATK_ANIM_THUNDERSHOCK ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -4962,7 +4962,7 @@ FlyingPikachuCard: ; 32584 (c:6584)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
db 1 ; retreat cost
db NONE ; weakness
@@ -4999,7 +4999,7 @@ SurfingPikachu1Card: ; 325c5 (c:65c5)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_18 ; animation
+ db ATK_ANIM_WATER_JETS ; animation
; move 2
energy 0 ; energies
@@ -5050,7 +5050,7 @@ SurfingPikachu2Card: ; 32606 (c:6606)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_18 ; animation
+ db ATK_ANIM_WATER_JETS ; animation
; move 2
energy 0 ; energies
@@ -5101,7 +5101,7 @@ Raichu1Card: ; 32647 (c:6647)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
; move 2
energy LIGHTNING, 3, COLORLESS, 1 ; energies
@@ -5115,7 +5115,7 @@ Raichu1Card: ; 32647 (c:6647)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_7 ; animation
+ db ATK_ANIM_THUNDER ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5152,7 +5152,7 @@ Raichu2Card: ; 32688 (c:6688)
db NONE ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_10 ; animation
+ db ATK_ANIM_THUNDER_WHOLE_SCREEN ; animation
; move 2
energy 0 ; energies
@@ -5203,7 +5203,7 @@ Magnemite1Card: ; 326c9 (c:66c9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_111 ; animation
+ db ATK_ANIM_THUNDER_WAVE ; animation
; move 2
energy LIGHTNING, 1, COLORLESS, 1 ; energies
@@ -5217,7 +5217,7 @@ Magnemite1Card: ; 326c9 (c:66c9)
db NONE ; flags 2
db NONE ; flags 3
db 40
- db ATK_ANIM_86 ; animation
+ db ATK_ANIM_SELFDESTRUCT ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5254,7 +5254,7 @@ Magnemite2Card: ; 3270a (c:670a)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy LIGHTNING, 1, COLORLESS, 1 ; energies
@@ -5268,7 +5268,7 @@ Magnemite2Card: ; 3270a (c:670a)
db FLAG_2_BIT_5 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_109 ; animation
+ db ATK_ANIM_MAGNETIC_STORM ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5305,7 +5305,7 @@ Magneton1Card: ; 3274b (c:674b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_111 ; animation
+ db ATK_ANIM_THUNDER_WAVE ; animation
; move 2
energy LIGHTNING, 2, COLORLESS, 2 ; energies
@@ -5319,7 +5319,7 @@ Magneton1Card: ; 3274b (c:674b)
db NONE ; flags 2
db NONE ; flags 3
db 80
- db ATK_ANIM_87 ; animation
+ db ATK_ANIM_BIG_SELFDESTRUCTION ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5356,7 +5356,7 @@ Magneton2Card: ; 3278c (c:678c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_40 ; animation
+ db ATK_ANIM_TEAR ; animation
; move 2
energy LIGHTNING, 4 ; energies
@@ -5370,7 +5370,7 @@ Magneton2Card: ; 3278c (c:678c)
db NONE ; flags 2
db NONE ; flags 3
db 100
- db ATK_ANIM_87 ; animation
+ db ATK_ANIM_BIG_SELFDESTRUCTION ; animation
db 2 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5407,7 +5407,7 @@ VoltorbCard: ; 327cd (c:67cd)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -5458,7 +5458,7 @@ Electrode1Card: ; 3280e (c:680e)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_40 ; animation
+ db ATK_ANIM_TEAR ; animation
; move 2
energy LIGHTNING, 3 ; energies
@@ -5472,7 +5472,7 @@ Electrode1Card: ; 3280e (c:680e)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5509,7 +5509,7 @@ Electrode2Card: ; 3284f (c:684f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy LIGHTNING, 3 ; energies
@@ -5523,7 +5523,7 @@ Electrode2Card: ; 3284f (c:684f)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_13 ; animation
+ db ATK_ANIM_CHAIN_LIGHTNING ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5560,7 +5560,7 @@ Electabuzz1Card: ; 32890 (c:6890)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_80 ; animation
+ db ATK_ANIM_BARRIER ; animation
; move 2
energy COLORLESS, 2 ; energies
@@ -5574,7 +5574,7 @@ Electabuzz1Card: ; 32890 (c:6890)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
db 2 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5611,7 +5611,7 @@ Electabuzz2Card: ; 328d1 (c:68d1)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_6 ; animation
+ db ATK_ANIM_THUNDERSHOCK ; animation
; move 2
energy LIGHTNING, 1, COLORLESS, 1 ; energies
@@ -5625,7 +5625,7 @@ Electabuzz2Card: ; 328d1 (c:68d1)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_35 ; animation
+ db ATK_ANIM_THUNDERPUNCH ; animation
db 2 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5662,7 +5662,7 @@ Jolteon1Card: ; 32912 (c:6912)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 4 ; energies
@@ -5676,7 +5676,7 @@ Jolteon1Card: ; 32912 (c:6912)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_48 ; animation
+ db ATK_ANIM_NEEDLES ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5713,7 +5713,7 @@ Jolteon2Card: ; 32953 (c:6953)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
; move 2
energy LIGHTNING, 2, COLORLESS, 1 ; energies
@@ -5727,7 +5727,7 @@ Jolteon2Card: ; 32953 (c:6953)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_48 ; animation
+ db ATK_ANIM_NEEDLES ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -5764,7 +5764,7 @@ Zapdos1Card: ; 32994 (c:6994)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_12 ; animation
+ db ATK_ANIM_THUNDERSTORM ; animation
; move 2
energy 0 ; energies
@@ -5815,7 +5815,7 @@ Zapdos2Card: ; 329d5 (c:69d5)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_7 ; animation
+ db ATK_ANIM_THUNDER ; animation
; move 2
energy LIGHTNING, 4 ; energies
@@ -5829,7 +5829,7 @@ Zapdos2Card: ; 329d5 (c:69d5)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 9
- db ATK_ANIM_8 ; animation
+ db ATK_ANIM_THUNDERBOLT ; animation
db 3 ; retreat cost
db NONE ; weakness
@@ -5866,7 +5866,7 @@ Zapdos3Card: ; 32a16 (c:6a16)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_97 ; animation
+ db ATK_ANIM_PEAL_OF_THUNDER ; animation
; move 2
energy LIGHTNING, 3 ; energies
@@ -5880,7 +5880,7 @@ Zapdos3Card: ; 32a16 (c:6a16)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_100 ; animation
+ db ATK_ANIM_BIG_THUNDER ; animation
db 2 ; retreat cost
db NONE ; weakness
@@ -5917,7 +5917,7 @@ SandshrewCard: ; 32a57 (c:6a57)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_90 ; animation
+ db ATK_ANIM_DARK_GAS ; animation
; move 2
energy 0 ; energies
@@ -5968,7 +5968,7 @@ SandslashCard: ; 32a98 (c:6a98)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
; move 2
energy FIGHTING, 2 ; energies
@@ -5982,7 +5982,7 @@ SandslashCard: ; 32a98 (c:6a98)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_41 ; animation
+ db ATK_ANIM_MULTIPLE_SLASH ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -6019,7 +6019,7 @@ DiglettCard: ; 32ad9 (c:6ad9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy FIGHTING, 2 ; energies
@@ -6033,7 +6033,7 @@ DiglettCard: ; 32ad9 (c:6ad9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 0 ; retreat cost
db WR_GRASS ; weakness
@@ -6070,7 +6070,7 @@ DugtrioCard: ; 32b1a (c:6b1a)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
; move 2
energy FIGHTING, 4 ; energies
@@ -6084,7 +6084,7 @@ DugtrioCard: ; 32b1a (c:6b1a)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 2 ; retreat cost
db WR_GRASS ; weakness
@@ -6121,7 +6121,7 @@ MankeyCard: ; 32b5b (c:6b5b)
db FLAG_2_BIT_5 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy COLORLESS, 1 ; energies
@@ -6135,7 +6135,7 @@ MankeyCard: ; 32b5b (c:6b5b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
db 0 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -6172,7 +6172,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_41 ; animation
+ db ATK_ANIM_MULTIPLE_SLASH ; animation
; move 2
energy FIGHTING, 2, COLORLESS, 1 ; energies
@@ -6186,7 +6186,7 @@ PrimeapeCard: ; 32b9c (c:6b9c)
db FLAG_2_BIT_7 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_43 ; animation
+ db ATK_ANIM_RAMPAGE ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -6223,7 +6223,7 @@ MachopCard: ; 32bdd (c:6bdd)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -6274,7 +6274,7 @@ MachokeCard: ; 32c1e (c:6c1e)
db FLAG_2_BIT_7 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy FIGHTING, 2, COLORLESS, 2 ; energies
@@ -6288,7 +6288,7 @@ MachokeCard: ; 32c1e (c:6c1e)
db NONE ; flags 2
db NONE ; flags 3
db 20
- db ATK_ANIM_4 ; animation
+ db ATK_ANIM_HIT_RECOIL ; animation
db 3 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -6325,7 +6325,7 @@ MachampCard: ; 32c5f (c:6c5f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy FIGHTING, 3, COLORLESS, 1 ; energies
@@ -6339,7 +6339,7 @@ MachampCard: ; 32c5f (c:6c5f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_47 ; animation
+ db ATK_ANIM_SEISMIC_TOSS ; animation
db 3 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -6376,7 +6376,7 @@ GeodudeCard: ; 32ca0 (c:6ca0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_33 ; animation
+ db ATK_ANIM_STONE_BARRAGE ; animation
; move 2
energy 0 ; energies
@@ -6427,7 +6427,7 @@ GravelerCard: ; 32ce1 (c:6ce1)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_79 ; animation
+ db ATK_ANIM_PROTECT ; animation
; move 2
energy FIGHTING, 2, COLORLESS, 1 ; energies
@@ -6441,7 +6441,7 @@ GravelerCard: ; 32ce1 (c:6ce1)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_32 ; animation
+ db ATK_ANIM_ROCK_THROW ; animation
db 2 ; retreat cost
db WR_GRASS ; weakness
@@ -6478,7 +6478,7 @@ GolemCard: ; 32d22 (c:6d22)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_32 ; animation
+ db ATK_ANIM_ROCK_THROW ; animation
; move 2
energy FIGHTING, 4 ; energies
@@ -6492,7 +6492,7 @@ GolemCard: ; 32d22 (c:6d22)
db NONE ; flags 2
db NONE ; flags 3
db 100
- db ATK_ANIM_87 ; animation
+ db ATK_ANIM_BIG_SELFDESTRUCTION ; animation
db 4 ; retreat cost
db WR_GRASS ; weakness
@@ -6529,7 +6529,7 @@ OnixCard: ; 32d63 (c:6d63)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_32 ; animation
+ db ATK_ANIM_ROCK_THROW ; animation
; move 2
energy FIGHTING, 2 ; energies
@@ -6543,7 +6543,7 @@ OnixCard: ; 32d63 (c:6d63)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_79 ; animation
+ db ATK_ANIM_PROTECT ; animation
db 3 ; retreat cost
db WR_GRASS ; weakness
@@ -6580,7 +6580,7 @@ CuboneCard: ; 32da4 (c:6da4)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_84 ; animation
+ db ATK_ANIM_CRY ; animation
; move 2
energy FIGHTING, 2 ; energies
@@ -6594,7 +6594,7 @@ CuboneCard: ; 32da4 (c:6da4)
db NONE ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -6631,7 +6631,7 @@ Marowak1Card: ; 32de5 (c:6de5)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_46 ; animation
+ db ATK_ANIM_BONEMERANG ; animation
; move 2
energy FIGHTING, 2, COLORLESS, 1 ; energies
@@ -6645,7 +6645,7 @@ Marowak1Card: ; 32de5 (c:6de5)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -6682,7 +6682,7 @@ Marowak2Card: ; 32e26 (c:6e26)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_46 ; animation
+ db ATK_ANIM_BONEMERANG ; animation
; move 2
energy FIGHTING, 3 ; energies
@@ -6696,7 +6696,7 @@ Marowak2Card: ; 32e26 (c:6e26)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_84 ; animation
+ db ATK_ANIM_CRY ; animation
db 2 ; retreat cost
db WR_GRASS ; weakness
@@ -6733,7 +6733,7 @@ HitmonleeCard: ; 32e67 (c:6e67)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_37 ; animation
+ db ATK_ANIM_STRETCH_KICK ; animation
; move 2
energy FIGHTING, 3 ; energies
@@ -6747,7 +6747,7 @@ HitmonleeCard: ; 32e67 (c:6e67)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_34 ; animation
+ db ATK_ANIM_PUNCH ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -6784,7 +6784,7 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_34 ; animation
+ db ATK_ANIM_PUNCH ; animation
; move 2
energy FIGHTING, 2, COLORLESS, 1 ; energies
@@ -6798,7 +6798,7 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_34 ; animation
+ db ATK_ANIM_PUNCH ; animation
db 2 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -6849,7 +6849,7 @@ RhyhornCard: ; 32ee9 (c:6ee9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 3 ; retreat cost
db WR_GRASS ; weakness
@@ -6886,7 +6886,7 @@ RhydonCard: ; 32f2a (c:6f2a)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy FIGHTING, 4 ; energies
@@ -6900,7 +6900,7 @@ RhydonCard: ; 32f2a (c:6f2a)
db SWITCH_OPPONENT_POKEMON ; flags 2
db NONE ; flags 3
db 20
- db ATK_ANIM_4 ; animation
+ db ATK_ANIM_HIT_RECOIL ; animation
db 3 ; retreat cost
db WR_GRASS ; weakness
@@ -6937,7 +6937,7 @@ KabutoCard: ; 32f6b (c:6f6b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy COLORLESS, 1 ; energies
@@ -6951,7 +6951,7 @@ KabutoCard: ; 32f6b (c:6f6b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -6988,7 +6988,7 @@ KabutopsCard: ; 32fac (c:6fac)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_40 ; animation
+ db ATK_ANIM_TEAR ; animation
; move 2
energy FIGHTING, 4 ; energies
@@ -7002,7 +7002,7 @@ KabutopsCard: ; 32fac (c:6fac)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_89 ; animation
+ db ATK_ANIM_DRAIN ; animation
db 1 ; retreat cost
db WR_GRASS ; weakness
@@ -7039,7 +7039,7 @@ AerodactylCard: ; 32fed (c:6fed)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -7053,7 +7053,7 @@ AerodactylCard: ; 32fed (c:6fed)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 2 ; retreat cost
db WR_GRASS ; weakness
@@ -7090,7 +7090,7 @@ AbraCard: ; 3302e (c:702e)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
; move 2
energy 0 ; energies
@@ -7141,7 +7141,7 @@ KadabraCard: ; 3306f (c:706f)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_88 ; animation
+ db ATK_ANIM_RECOVER ; animation
; move 2
energy PSYCHIC, 2, COLORLESS, 1 ; energies
@@ -7155,7 +7155,7 @@ KadabraCard: ; 3306f (c:706f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 3 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7192,7 +7192,7 @@ AlakazamCard: ; 330b0 (c:70b0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy PSYCHIC, 3 ; energies
@@ -7206,7 +7206,7 @@ AlakazamCard: ; 330b0 (c:70b0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_72 ; animation
+ db ATK_ANIM_CONFUSE_RAY ; animation
db 3 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7243,7 +7243,7 @@ Slowpoke1Card: ; 330f1 (c:70f1)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy PSYCHIC, 2 ; energies
@@ -7257,7 +7257,7 @@ Slowpoke1Card: ; 330f1 (c:70f1)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_85 ; animation
+ db ATK_ANIM_AMNESIA ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7308,7 +7308,7 @@ Slowpoke2Card: ; 33132 (c:7132)
db DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7345,7 +7345,7 @@ SlowbroCard: ; 33173 (c:7173)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy PSYCHIC, 2 ; energies
@@ -7359,7 +7359,7 @@ SlowbroCard: ; 33173 (c:7173)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7396,7 +7396,7 @@ Gastly1Card: ; 331b4 (c:71b4)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_128 ; animation
+ db ATK_ANIM_SLEEPING_GAS ; animation
; move 2
energy PSYCHIC, 1, COLORLESS, 1 ; energies
@@ -7410,7 +7410,7 @@ Gastly1Card: ; 331b4 (c:71b4)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 3
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 0 ; retreat cost
db NONE ; weakness
@@ -7447,7 +7447,7 @@ Gastly2Card: ; 331f5 (c:71f5)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_61 ; animation
+ db ATK_ANIM_GOO ; animation
; move 2
energy PSYCHIC, 2 ; energies
@@ -7461,7 +7461,7 @@ Gastly2Card: ; 331f5 (c:71f5)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 10
- db ATK_ANIM_115 ; animation
+ db ATK_ANIM_ENERGY_CONVERSION ; animation
db 0 ; retreat cost
db NONE ; weakness
@@ -7498,7 +7498,7 @@ Haunter1Card: ; 33236 (c:7236)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy PSYCHIC, 1, COLORLESS, 1 ; energies
@@ -7512,7 +7512,7 @@ Haunter1Card: ; 33236 (c:7236)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_26 ; animation
+ db ATK_ANIM_NIGHTMARE ; animation
db 0 ; retreat cost
db NONE ; weakness
@@ -7549,7 +7549,7 @@ Haunter2Card: ; 33277 (c:7277)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_114 ; animation
+ db ATK_ANIM_HYPNOSIS ; animation
; move 2
energy PSYCHIC, 2 ; energies
@@ -7563,7 +7563,7 @@ Haunter2Card: ; 33277 (c:7277)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 1 ; retreat cost
db NONE ; weakness
@@ -7600,7 +7600,7 @@ GengarCard: ; 332b8 (c:72b8)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy PSYCHIC, 3 ; energies
@@ -7614,7 +7614,7 @@ GengarCard: ; 332b8 (c:72b8)
db NONE ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_28 ; animation
+ db ATK_ANIM_DARK_MIND ; animation
db 1 ; retreat cost
db NONE ; weakness
@@ -7651,7 +7651,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy PSYCHIC, 2 ; energies
@@ -7665,7 +7665,7 @@ DrowzeeCard: ; 332f9 (c:72f9)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_72 ; animation
+ db ATK_ANIM_CONFUSE_RAY ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7702,7 +7702,7 @@ HypnoCard: ; 3333a (c:733a)
db FLAG_2_BIT_5 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy PSYCHIC, 3 ; energies
@@ -7716,7 +7716,7 @@ HypnoCard: ; 3333a (c:733a)
db NONE ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_28 ; animation
+ db ATK_ANIM_DARK_MIND ; animation
db 2 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7753,7 +7753,7 @@ MrMimeCard: ; 3337b (c:737b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy PSYCHIC, 1, COLORLESS, 1 ; energies
@@ -7767,7 +7767,7 @@ MrMimeCard: ; 3337b (c:737b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7804,7 +7804,7 @@ JynxCard: ; 333bc (c:73bc)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy PSYCHIC, 2, COLORLESS, 1 ; energies
@@ -7818,7 +7818,7 @@ JynxCard: ; 333bc (c:73bc)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 2 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7855,7 +7855,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
; move 2
energy PSYCHIC, 2 ; energies
@@ -7869,7 +7869,7 @@ Mewtwo1Card: ; 333fd (c:73fd)
db NULLIFY_OR_WEAKEN_ATTACK | DISCARD_ENERGY ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_80 ; animation
+ db ATK_ANIM_BARRIER ; animation
db 3 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7906,7 +7906,7 @@ Mewtwo2Card: ; 3343e (c:743e)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy PSYCHIC, 2, COLORLESS, 1 ; energies
@@ -7920,7 +7920,7 @@ Mewtwo2Card: ; 3343e (c:743e)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 2 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -7957,7 +7957,7 @@ Mewtwo3Card: ; 3347f (c:747f)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy PSYCHIC, 2, COLORLESS, 1 ; energies
@@ -7971,7 +7971,7 @@ Mewtwo3Card: ; 3347f (c:747f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 2 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -8008,7 +8008,7 @@ Mew1Card: ; 334c0 (c:74c0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy PSYCHIC, 1 ; energies
@@ -8022,7 +8022,7 @@ Mew1Card: ; 334c0 (c:74c0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
db 1 ; retreat cost
db WR_PSYCHIC ; weakness
@@ -8059,7 +8059,7 @@ Mew2Card: ; 33501 (c:7501)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_5 ; animation
+ db ATK_ANIM_HIT_EFFECT ; animation
; move 2
energy 0 ; energies
@@ -8110,7 +8110,7 @@ Mew3Card: ; 33542 (c:7542)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_25 ; animation
+ db ATK_ANIM_PSYCHIC_HIT ; animation
; move 2
energy PSYCHIC, 2 ; energies
@@ -8161,7 +8161,7 @@ PidgeyCard: ; 33583 (c:7583)
db SWITCH_OPPONENT_POKEMON ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_83 ; animation
+ db ATK_ANIM_WHIRLWIND ; animation
; move 2
energy 0 ; energies
@@ -8212,7 +8212,7 @@ PidgeottoCard: ; 335c4 (c:75c4)
db SWITCH_OPPONENT_POKEMON ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_83 ; animation
+ db ATK_ANIM_WHIRLWIND ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8226,7 +8226,7 @@ PidgeottoCard: ; 335c4 (c:75c4)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_92 ; animation
+ db ATK_ANIM_MIRROR_MOVE ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -8263,7 +8263,7 @@ Pidgeot1Card: ; 33605 (c:7605)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_99 ; animation
+ db ATK_ANIM_WHIRLWIND_ZIGZAG ; animation
; move 2
energy COLORLESS, 4 ; energies
@@ -8277,7 +8277,7 @@ Pidgeot1Card: ; 33605 (c:7605)
db SWITCH_OPPONENT_POKEMON | FLAG_2_BIT_7 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -8314,7 +8314,7 @@ Pidgeot2Card: ; 33646 (c:7646)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8328,7 +8328,7 @@ Pidgeot2Card: ; 33646 (c:7646)
db FLAG_2_BIT_7 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_83 ; animation
+ db ATK_ANIM_WHIRLWIND ; animation
db 0 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -8365,7 +8365,7 @@ RattataCard: ; 33687 (c:7687)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -8416,7 +8416,7 @@ RaticateCard: ; 336c8 (c:76c8)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8430,7 +8430,7 @@ RaticateCard: ; 336c8 (c:76c8)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -8467,7 +8467,7 @@ SpearowCard: ; 33709 (c:7709)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8481,7 +8481,7 @@ SpearowCard: ; 33709 (c:7709)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_92 ; animation
+ db ATK_ANIM_MIRROR_MOVE ; animation
db 0 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -8518,7 +8518,7 @@ FearowCard: ; 3374a (c:774a)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
; move 2
energy COLORLESS, 4 ; energies
@@ -8532,7 +8532,7 @@ FearowCard: ; 3374a (c:774a)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_44 ; animation
+ db ATK_ANIM_DRILL ; animation
db 0 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -8569,7 +8569,7 @@ ClefairyCard: ; 3378b (c:778b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_74 ; animation
+ db ATK_ANIM_SING ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8634,7 +8634,7 @@ ClefableCard: ; 337cc (c:77cc)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 20
- db ATK_ANIM_79 ; animation
+ db ATK_ANIM_PROTECT ; animation
db 2 ; retreat cost
db WR_FIGHTING ; weakness
@@ -8671,7 +8671,7 @@ Jigglypuff1Card: ; 3380d (c:780d)
db HEAL_USER ; flags 2
db NONE ; flags 3
db 1
- db ATK_ANIM_88 ; animation
+ db ATK_ANIM_RECOVER ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8685,7 +8685,7 @@ Jigglypuff1Card: ; 3380d (c:780d)
db NONE ; flags 2
db NONE ; flags 3
db 20
- db ATK_ANIM_4 ; animation
+ db ATK_ANIM_HIT_RECOIL ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -8736,7 +8736,7 @@ Jigglypuff2Card: ; 3384e (c:784e)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_136 ; animation
+ db ATK_ANIM_EXPAND ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -8773,7 +8773,7 @@ Jigglypuff3Card: ; 3388f (c:788f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_75 ; animation
+ db ATK_ANIM_LULLABY ; animation
; move 2
energy COLORLESS, 2 ; energies
@@ -8787,7 +8787,7 @@ Jigglypuff3Card: ; 3388f (c:788f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -8824,7 +8824,7 @@ WigglytuffCard: ; 338d0 (c:78d0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_75 ; animation
+ db ATK_ANIM_LULLABY ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8838,7 +8838,7 @@ WigglytuffCard: ; 338d0 (c:78d0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 2 ; retreat cost
db WR_FIGHTING ; weakness
@@ -8875,7 +8875,7 @@ Meowth1Card: ; 33911 (c:7911)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 2
- db ATK_ANIM_108 ; animation
+ db ATK_ANIM_CAT_PUNCH ; animation
; move 2
energy 0 ; energies
@@ -8926,7 +8926,7 @@ Meowth2Card: ; 33952 (c:7952)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -8977,7 +8977,7 @@ PersianCard: ; 33993 (c:7993)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_38 ; animation
+ db ATK_ANIM_SLASH ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -8991,7 +8991,7 @@ PersianCard: ; 33993 (c:7993)
db NULLIFY_OR_WEAKEN_ATTACK ; flags 2
db NONE ; flags 3
db 10
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 0 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9028,7 +9028,7 @@ FarfetchdCard: ; 339d4 (c:79d4)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_39 ; animation
+ db ATK_ANIM_WHIP ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -9042,7 +9042,7 @@ FarfetchdCard: ; 339d4 (c:79d4)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_45 ; animation
+ db ATK_ANIM_POT_SMASH ; animation
db 1 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -9079,7 +9079,7 @@ DoduoCard: ; 33a15 (c:7a15)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_41 ; animation
+ db ATK_ANIM_MULTIPLE_SLASH ; animation
; move 2
energy 0 ; energies
@@ -9130,7 +9130,7 @@ DodrioCard: ; 33a56 (c:7a56)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_94 ; animation
+ db ATK_ANIM_PKMN_POWER_1 ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -9144,7 +9144,7 @@ DodrioCard: ; 33a56 (c:7a56)
db NONE ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
db 0
- db ATK_ANIM_2 ; animation
+ db ATK_ANIM_BIG_HIT ; animation
db 0 ; retreat cost
db WR_LIGHTNING ; weakness
@@ -9181,7 +9181,7 @@ LickitungCard: ; 33a97 (c:7a97)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_61 ; animation
+ db ATK_ANIM_GOO ; animation
; move 2
energy COLORLESS, 2 ; energies
@@ -9195,7 +9195,7 @@ LickitungCard: ; 33a97 (c:7a97)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_76 ; animation
+ db ATK_ANIM_SUPERSONIC ; animation
db 3 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9246,7 +9246,7 @@ ChanseyCard: ; 33ad8 (c:7ad8)
db NONE ; flags 2
db NONE ; flags 3
db 80
- db ATK_ANIM_4 ; animation
+ db ATK_ANIM_HIT_RECOIL ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9283,7 +9283,7 @@ KangaskhanCard: ; 33b19 (c:7b19)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy COLORLESS, 4 ; energies
@@ -9297,7 +9297,7 @@ KangaskhanCard: ; 33b19 (c:7b19)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_34 ; animation
+ db ATK_ANIM_PUNCH ; animation
db 3 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9334,7 +9334,7 @@ TaurosCard: ; 33b5a (c:7b5a)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 1
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -9348,7 +9348,7 @@ TaurosCard: ; 33b5a (c:7b5a)
db NONE ; flags 2
db BOOST_IF_TAKEN_DAMAGE ; flags 3
db 0
- db ATK_ANIM_43 ; animation
+ db ATK_ANIM_RAMPAGE ; animation
db 2 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9385,7 +9385,7 @@ DittoCard: ; 33b9b (c:7b9b)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -9399,7 +9399,7 @@ DittoCard: ; 33b9b (c:7b9b)
db FLAG_2_BIT_6 ; flags 2
db NONE ; flags 3
db 3
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9450,7 +9450,7 @@ EeveeCard: ; 33bdc (c:7bdc)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_81 ; animation
+ db ATK_ANIM_QUICK_ATTACK ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9487,7 +9487,7 @@ PorygonCard: ; 33c1d (c:7c1d)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy COLORLESS, 2 ; energies
@@ -9501,7 +9501,7 @@ PorygonCard: ; 33c1d (c:7c1d)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
db 1 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9538,7 +9538,7 @@ SnorlaxCard: ; 33c5e (c:7c5e)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy COLORLESS, 4 ; energies
@@ -9552,7 +9552,7 @@ SnorlaxCard: ; 33c5e (c:7c5e)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_2 ; animation
+ db ATK_ANIM_BIG_HIT ; animation
db 4 ; retreat cost
db WR_FIGHTING ; weakness
@@ -9589,7 +9589,7 @@ DratiniCard: ; 33c9f (c:7c9f)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy 0 ; energies
@@ -9640,7 +9640,7 @@ DragonairCard: ; 33ce0 (c:7ce0)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
; move 2
energy COLORLESS, 4 ; energies
@@ -9654,7 +9654,7 @@ DragonairCard: ; 33ce0 (c:7ce0)
db NONE ; flags 2
db FLAG_3_BIT_1 ; flags 3
db 0
- db ATK_ANIM_30 ; animation
+ db ATK_ANIM_HYPER_BEAM ; animation
db 2 ; retreat cost
db NONE ; weakness
@@ -9691,7 +9691,7 @@ Dragonite1Card: ; 33d21 (c:7d21)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_98 ; animation
+ db ATK_ANIM_HEALING_WIND ; animation
; move 2
energy COLORLESS, 3 ; energies
@@ -9705,7 +9705,7 @@ Dragonite1Card: ; 33d21 (c:7d21)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 2 ; retreat cost
db NONE ; weakness
@@ -9742,7 +9742,7 @@ Dragonite2Card: ; 33d62 (c:7d62)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_91 ; animation
+ db ATK_ANIM_GLOW_EFFECT ; animation
; move 2
energy COLORLESS, 4 ; energies
@@ -9756,7 +9756,7 @@ Dragonite2Card: ; 33d62 (c:7d62)
db NONE ; flags 2
db NONE ; flags 3
db 0
- db ATK_ANIM_1 ; animation
+ db ATK_ANIM_HIT ; animation
db 1 ; retreat cost
db NONE ; weakness
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 9da5dac..9cdb098 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -5694,10 +5694,135 @@ PrintPlayAreaCardAttachedEnergies: ; 63e6 (1:63e6)
ret
; 0x6423
- INCROM $6423, $6431
+Func_6423: ; 6423 (1:6423)
+ ld hl, wDefaultText
+ ld e, $08
+.asm_6428
+ ld a, [hli]
+ call JPWriteByteToBGMap0
+ inc b
+ dec e
+ jr nz, .asm_6428
+ ret
+; 0x6431
Func_6431: ; 6431 (1:6431)
- INCROM $6431, $6510
+ xor a
+ ld [wSelectedDuelSubMenuItem], a
+
+Func_6435:
+ call Func_64b0
+ ld hl, PlayAreaScreenMenuParameters_ActivePokemonIncluded
+ ld a, [wSelectedDuelSubMenuItem]
+ call InitializeMenuParameters
+ ld a, [wNumPlayAreaItems]
+ ld [wNumMenuItems], a
+.asm_6447
+ call DoFrame
+ call HandleMenuInput
+ ldh [hTempPlayAreaLocation_ff9d], a
+ ld [wHUDEnergyAndHPBarsX], a
+ jr nc, .asm_6447
+ cp $ff
+ jr z, .asm_649b
+ ld [wSelectedDuelSubMenuItem], a
+ ldh a, [hKeysPressed]
+ and START
+ jr nz, .asm_649d
+ ldh a, [hCurMenuItem]
+ add a
+ ld e, a
+ ld d, $00
+ ld hl, wDuelTempList + 1
+ add hl, de
+ ld a, [hld]
+ cp $04
+ jr nz, .asm_6447
+ ld a, [hl]
+ ldh [hTempCardIndex_ff98], a
+ ld d, a
+ ld e, $00
+ call CopyMoveDataAndDamage_FromDeckIndex
+ call DisplayUsePokemonPowerScreen
+ ld a, EFFECTCMDTYPE_INITIAL_EFFECT_1
+ call TryExecuteEffectCommandFunction
+ jr nc, .asm_648c
+ ldtx hl, PokemonPowerSelectNotRequiredText
+ call DrawWideTextBox_WaitForInput
+ jp Func_6435
+.asm_648c
+ ldtx hl, UseThisPokemonPowerText
+ call YesOrNoMenuWithText
+ jp c, Func_6435
+ ldh a, [hTempCardIndex_ff98]
+ ldh [hTemp_ffa0], a
+ or a
+ ret
+.asm_649b
+ scf
+ ret
+.asm_649d
+ ldh a, [hCurMenuItem]
+ add DUELVARS_ARENA_CARD
+ call GetTurnDuelistVariable
+ call GetCardIDFromDeckIndex
+ call LoadCardDataToBuffer1_FromCardID
+ call OpenCardPage_FromCheckPlayArea
+ jp Func_6435
+; 0x64b0
+
+Func_64b0: ; 64b0 (1:64b0)
+ call ZeroObjectPositionsAndToggleOAMCopy
+ call EmptyScreen
+ call LoadDuelCardSymbolTiles
+ call LoadDuelCheckPokemonScreenTiles
+ ld de, wDuelTempList
+ call SetListPointer
+ ld a, DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA
+ call GetTurnDuelistVariable
+ ld c, a
+ ld b, $00
+.asm_64ca
+ push hl
+ push bc
+ ld a, b
+ ld [wHUDEnergyAndHPBarsX], a
+ ld a, b
+ add a
+ add b
+ ld [wCurPlayAreaY], a
+ ld a, b
+ add DUELVARS_ARENA_CARD
+ call GetTurnDuelistVariable
+ call SetNextElementOfList
+ call PrintPlayAreaCardHeader
+ call PrintPlayAreaCardLocation
+ call Func_64fc
+ ld a, [wLoadedCard1Move1Category]
+ call SetNextElementOfList
+ pop bc
+ pop hl
+ inc b
+ dec c
+ jr nz, .asm_64ca
+ ld a, b
+ ld [wNumPlayAreaItems], a
+ call EnableLCD
+ ret
+; 0x64fc
+
+Func_64fc: ; 64fc (1:64fc)
+ ld a, [wLoadedCard1Move1Category]
+ cp POKEMON_POWER
+ ret nz
+ ld a, [wCurPlayAreaY]
+ inc a
+ ld e, a
+ ld d, $04
+ ld hl, wLoadedCard1Move1Name
+ call InitTextPrinting_ProcessTextFromPointerToID
+ ret
+; 0x6510
; display the screen that prompts the player to use the selected card's
; Pokemon Power. Includes the card's information above, and the Pokemon Power's
@@ -8174,25 +8299,25 @@ Func_741a: ; 741a (1:741a)
ld d, a
inc hl
ld a, [hli]
- ld e, $7e
+ ld e, ATK_ANIM_SLEEP
cp ASLEEP
jr z, .got_anim
- ld e, $7d
+ ld e, ATK_ANIM_PARALYSIS
cp PARALYZED
jr z, .got_anim
- ld e, $7b
+ ld e, ATK_ANIM_POISON
cp POISONED
jr z, .got_anim
- ld e, $7b
+ ld e, ATK_ANIM_POISON
cp DOUBLE_POISONED
jr z, .got_anim
- ld e, $7c
+ ld e, ATK_ANIM_CONFUSION
cp CONFUSED
jr nz, .loop
ldh a, [hWhoseTurn]
cp d
jr nz, .got_anim
- ld e, $7f
+ ld e, ATK_ANIM_IMAKUNI_CONFUSION
.got_anim
ld a, e
ld [wLoadedMoveAnimation], a
@@ -8269,15 +8394,18 @@ PlayMoveAnimation: ; 7494 (1:7494)
ld [hl], e
inc hl
ld [hl], d
+
+; if damage >= 70, ATK_ANIM_HIT becomes ATK_ANIM_BIG_HIT
ld a, [wLoadedMoveAnimation]
- cp $01
- jr nz, .asm_74d1
+ cp ATK_ANIM_HIT
+ jr nz, .got_anim
ld a, e
- cp $46
- jr c, .asm_74d1
- ld a, $02
+ cp 70
+ jr c, .got_anim
+ ld a, ATK_ANIM_BIG_HIT
ld [wLoadedMoveAnimation], a
-.asm_74d1
+
+.got_anim
farcall Func_18f9c
pop bc
pop de
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 1ab478f..f314b48 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -1218,6 +1218,7 @@ Func_1909d: ; 1909d (6:509d)
ld a, DUEL_ANIM_SCREEN_MAIN_SCENE
ld [wDuelAnimationScreen], a
ret
+
.asm_50ad
ld a, [wd4b0]
ld l, a
@@ -1304,10 +1305,11 @@ Func_190fb: ; 190fb (6:50fb)
push bc
push de
ld a, [wLoadedMoveAnimation]
- cp $79
+ cp ATK_ANIM_HEAL
jr z, .asm_5164
- cp $86
+ cp ATK_ANIM_HEALING_WIND_PLAY_AREA
jr z, .asm_5164
+
ld a, [wTempNonTurnDuelistCardID]
ld e, a
ld d, $00
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index ea6e432..81356d3 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -1462,7 +1462,7 @@ Animations: ; 1ce32 (7:4e32)
db $00 ; palette ID
db $00 ; anim ID
db $00 ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_GLOW
@@ -1470,15 +1470,15 @@ Animations: ; 1ce32 (7:4e32)
db $1f ; palette ID
db $47 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $11 ; sound FX ID
+ db SFX_11 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_2
+ ; DUEL_ANIM_PARALYSIS
db SPRITE_DUEL_1 ; sprite ID
db $20 ; palette ID
db $48 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $12 ; sound FX ID
+ db SFX_12 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_SLEEP
@@ -1486,15 +1486,15 @@ Animations: ; 1ce32 (7:4e32)
db $21 ; palette ID
db $49 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $13 ; sound FX ID
+ db SFX_13 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_4
+ ; DUEL_ANIM_CONFUSION
db SPRITE_DUEL_55 ; sprite ID
db $22 ; palette ID
db $4a ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $14 ; sound FX ID
+ db SFX_14 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_POISON
@@ -1502,7 +1502,7 @@ Animations: ; 1ce32 (7:4e32)
db $23 ; palette ID
db $4b ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $15 ; sound FX ID
+ db SFX_15 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_6
@@ -1510,7 +1510,7 @@ Animations: ; 1ce32 (7:4e32)
db $24 ; palette ID
db $4c ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $16 ; sound FX ID
+ db SFX_16 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_HIT
@@ -1518,15 +1518,15 @@ Animations: ; 1ce32 (7:4e32)
db $24 ; palette ID
db $4d ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $16 ; sound FX ID
+ db SFX_16 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_8
+ ; DUEL_ANIM_BIG_HIT
db SPRITE_DUEL_3 ; sprite ID
db $24 ; palette ID
db $4e ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $17 ; sound FX ID
+ db SFX_17 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_SHOW_DAMAGE
@@ -1534,7 +1534,7 @@ Animations: ; 1ce32 (7:4e32)
db $25 ; palette ID
db $00 ; anim ID
db $00 ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_THUNDER_SHOCK
@@ -1542,207 +1542,207 @@ Animations: ; 1ce32 (7:4e32)
db $26 ; palette ID
db $5c ; anim ID
db $00 ; anim flags
- db $18 ; sound FX ID
+ db SFX_18 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_11
+ ; DUEL_ANIM_LIGHTNING
db SPRITE_DUEL_6 ; sprite ID
db $27 ; palette ID
db $5e ; anim ID
db $00 ; anim flags
- db $19 ; sound FX ID
+ db SFX_19 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_12
+ ; DUEL_ANIM_BORDER_SPARK
db SPRITE_DUEL_59 ; sprite ID
db $28 ; palette ID
db $5f ; anim ID
db $00 ; anim flags
- db $1a ; sound FX ID
+ db SFX_1A ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_13
+ ; DUEL_ANIM_BIG_LIGHTNING
db SPRITE_DUEL_7 ; sprite ID
db $29 ; palette ID
db $60 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $1b ; sound FX ID
+ db SFX_1B ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_14
+ ; DUEL_ANIM_SMALL_FLAME
db SPRITE_DUEL_8 ; sprite ID
db $2a ; palette ID
db $61 ; anim ID
db $00 ; anim flags
- db $1c ; sound FX ID
+ db SFX_1C ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_15
+ ; DUEL_ANIM_BIG_FLAME
db SPRITE_DUEL_8 ; sprite ID
db $2a ; palette ID
db $62 ; anim ID
db $00 ; anim flags
- db $1d ; sound FX ID
+ db SFX_1D ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_16
+ ; DUEL_ANIM_FIRE_SPIN
db SPRITE_DUEL_9 ; sprite ID
db $2b ; palette ID
db $63 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $1e ; sound FX ID
+ db SFX_1E ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_17
+ ; DUEL_ANIM_DIVE_BOMB
db SPRITE_DUEL_10 ; sprite ID
db $2c ; palette ID
db $64 ; anim ID
db $00 ; anim flags
- db $1f ; sound FX ID
+ db SFX_1F ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_18
+ ; DUEL_ANIM_WATER_JETS
db SPRITE_DUEL_61 ; sprite ID
db $2d ; palette ID
db $69 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $20 ; sound FX ID
+ db SFX_20 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_19
+ ; DUEL_ANIM_WATER_GUN
db SPRITE_DUEL_11 ; sprite ID
db $2e ; palette ID
db $6a ; anim ID
db $00 ; anim flags
- db $21 ; sound FX ID
+ db SFX_21 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_20
+ ; DUEL_ANIM_WHIRLPOOL
db SPRITE_DUEL_12 ; sprite ID
db $2f ; palette ID
db $6b ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $22 ; sound FX ID
+ db SFX_22 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_21
+ ; DUEL_ANIM_HYDRO_PUMP
db SPRITE_DUEL_13 ; sprite ID
db $30 ; palette ID
db $6c ; anim ID
db $00 ; anim flags
- db $23 ; sound FX ID
+ db SFX_23 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_22
+ ; DUEL_ANIM_BLIZZARD
db SPRITE_DUEL_62 ; sprite ID
db $31 ; palette ID
db $6d ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $24 ; sound FX ID
+ db SFX_24 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_23
+ ; DUEL_ANIM_PSYCHIC
db SPRITE_DUEL_14 ; sprite ID
db $32 ; palette ID
db $6e ; anim ID
db $00 ; anim flags
- db $25 ; sound FX ID
+ db SFX_25 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_24
+ ; DUEL_ANIM_GLARE
db SPRITE_DUEL_15 ; sprite ID
db $33 ; palette ID
db $6f ; anim ID
db $00 ; anim flags
- db $26 ; sound FX ID
+ db SFX_26 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_25
+ ; DUEL_ANIM_BEAM
db SPRITE_DUEL_16 ; sprite ID
db $34 ; palette ID
db $70 ; anim ID
db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
- db $27 ; sound FX ID
+ db SFX_27 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_26
+ ; DUEL_ANIM_HYPER_BEAM
db SPRITE_DUEL_17 ; sprite ID
db $35 ; palette ID
db $71 ; anim ID
db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
- db $28 ; sound FX ID
+ db SFX_28 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_27
+ ; DUEL_ANIM_ROCK_THROW
db SPRITE_DUEL_18 ; sprite ID
db $36 ; palette ID
db $72 ; anim ID
db $00 ; anim flags
- db $29 ; sound FX ID
+ db SFX_29 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_28
+ ; DUEL_ANIM_STONE_BARRAGE
db SPRITE_DUEL_18 ; sprite ID
db $36 ; palette ID
db $73 ; anim ID
db $00 ; anim flags
- db $2a ; sound FX ID
+ db SFX_2A ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_29
+ ; DUEL_ANIM_PUNCH
db SPRITE_DUEL_19 ; sprite ID
db $37 ; palette ID
db $74 ; anim ID
db $00 ; anim flags
- db $2b ; sound FX ID
+ db SFX_2B ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_30
+ ; DUEL_ANIM_THUNDERPUNCH
db SPRITE_DUEL_19 ; sprite ID
db $37 ; palette ID
db $75 ; anim ID
db $00 ; anim flags
- db $52 ; sound FX ID
+ db SFX_52 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_31
+ ; DUEL_ANIM_FIRE_PUNCH
db SPRITE_DUEL_19 ; sprite ID
db $37 ; palette ID
db $76 ; anim ID
db $00 ; anim flags
- db $53 ; sound FX ID
+ db SFX_53 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_32
+ ; DUEL_ANIM_STRETCH_KICK
db SPRITE_DUEL_20 ; sprite ID
db $38 ; palette ID
db $77 ; anim ID
db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
- db $2c ; sound FX ID
+ db SFX_2C ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_33
+ ; DUEL_ANIM_SLASH
db SPRITE_DUEL_21 ; sprite ID
db $39 ; palette ID
db $78 ; anim ID
db $00 ; anim flags
- db $2d ; sound FX ID
+ db SFX_2D ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_34
+ ; DUEL_ANIM_WHIP
db SPRITE_DUEL_22 ; sprite ID
db $3a ; palette ID
db $7a ; anim ID
db $00 ; anim flags
- db $2d ; sound FX ID
+ db SFX_2D ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_35
+ ; DUEL_ANIM_TEAR
db SPRITE_DUEL_23 ; sprite ID
db $3b ; palette ID
db $7b ; anim ID
db $00 ; anim flags
- db $2e ; sound FX ID
+ db SFX_2E ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_FURY_SWIPES
@@ -1750,207 +1750,207 @@ Animations: ; 1ce32 (7:4e32)
db $39 ; palette ID
db $79 ; anim ID
db $00 ; anim flags
- db $2f ; sound FX ID
+ db SFX_2F ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_37
+ ; DUEL_ANIM_DRILL
db SPRITE_DUEL_24 ; sprite ID
db $3c ; palette ID
db $7c ; anim ID
db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
- db $30 ; sound FX ID
+ db SFX_30 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_38
+ ; DUEL_ANIM_POT_SMASH
db SPRITE_DUEL_25 ; sprite ID
db $3d ; palette ID
db $7d ; anim ID
db $00 ; anim flags
- db $31 ; sound FX ID
+ db SFX_31 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_39
+ ; DUEL_ANIM_BONEMERANG
db SPRITE_DUEL_26 ; sprite ID
db $3e ; palette ID
db $7e ; anim ID
db $00 ; anim flags
- db $32 ; sound FX ID
+ db SFX_32 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_40
+ ; DUEL_ANIM_SEISMIC_TOSS
db SPRITE_DUEL_27 ; sprite ID
db $3f ; palette ID
db $7f ; anim ID
db $00 ; anim flags
- db $33 ; sound FX ID
+ db SFX_33 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_41
+ ; DUEL_ANIM_NEEDLES
db SPRITE_DUEL_28 ; sprite ID
db $40 ; palette ID
db $80 ; anim ID
db $00 ; anim flags
- db $34 ; sound FX ID
+ db SFX_34 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_42
+ ; DUEL_ANIM_WHITE_GAS
db SPRITE_DUEL_29 ; sprite ID
db $41 ; palette ID
db $81 ; anim ID
db $00 ; anim flags
- db $35 ; sound FX ID
+ db SFX_35 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_43
+ ; DUEL_ANIM_POWDER
db SPRITE_DUEL_56 ; sprite ID
db $42 ; palette ID
db $82 ; anim ID
db $00 ; anim flags
- db $36 ; sound FX ID
+ db SFX_36 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_44
+ ; DUEL_ANIM_GOO
db SPRITE_DUEL_30 ; sprite ID
db $43 ; palette ID
db $83 ; anim ID
db $00 ; anim flags
- db $37 ; sound FX ID
+ db SFX_37 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_45
+ ; DUEL_ANIM_BUBBLES
db SPRITE_DUEL_31 ; sprite ID
db $44 ; palette ID
db $84 ; anim ID
db $00 ; anim flags
- db $38 ; sound FX ID
+ db SFX_38 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_46
+ ; DUEL_ANIM_STRING_SHOT
db SPRITE_DUEL_32 ; sprite ID
db $45 ; palette ID
db $85 ; anim ID
db $00 ; anim flags
- db $39 ; sound FX ID
+ db SFX_39 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_47
+ ; DUEL_ANIM_BOYFRIENDS
db SPRITE_DUEL_33 ; sprite ID
db $46 ; palette ID
db $86 ; anim ID
db $00 ; anim flags
- db $3a ; sound FX ID
+ db SFX_3A ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_48
+ ; DUEL_ANIM_LURE
db SPRITE_DUEL_34 ; sprite ID
db $47 ; palette ID
db $87 ; anim ID
db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
- db $3b ; sound FX ID
+ db SFX_3B ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_49
+ ; DUEL_ANIM_TOXIC
db SPRITE_DUEL_35 ; sprite ID
db $48 ; palette ID
db $88 ; anim ID
db $00 ; anim flags
- db $3c ; sound FX ID
+ db SFX_3C ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_50
+ ; DUEL_ANIM_CONFUSE_RAY
db SPRITE_DUEL_66 ; sprite ID
db $49 ; palette ID
db $89 ; anim ID
db $00 ; anim flags
- db $3d ; sound FX ID
+ db SFX_3D ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_51
+ ; DUEL_ANIM_SING
db SPRITE_DUEL_36 ; sprite ID
db $4a ; palette ID
db $8a ; anim ID
db $00 ; anim flags
- db $3e ; sound FX ID
+ db SFX_3E ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_52
+ ; DUEL_ANIM_SUPERSONIC
db SPRITE_DUEL_37 ; sprite ID
db $4b ; palette ID
db $8b ; anim ID
db $00 ; anim flags
- db $3f ; sound FX ID
+ db SFX_3F ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_53
+ ; DUEL_ANIM_PETAL_DANCE
db SPRITE_DUEL_57 ; sprite ID
db $4c ; palette ID
db $8c ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $40 ; sound FX ID
+ db SFX_40 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_54
+ ; DUEL_ANIM_PROTECT
db SPRITE_DUEL_38 ; sprite ID
db $4d ; palette ID
db $8d ; anim ID
db $00 ; anim flags
- db $41 ; sound FX ID
+ db SFX_41 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_55
+ ; DUEL_ANIM_BARRIER
db SPRITE_DUEL_39 ; sprite ID
db $4e ; palette ID
db $8e ; anim ID
db $00 ; anim flags
- db $42 ; sound FX ID
+ db SFX_42 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_56
+ ; DUEL_ANIM_QUICK_ATTACK
db SPRITE_DUEL_40 ; sprite ID
db $4f ; palette ID
db $8f ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $43 ; sound FX ID
+ db SFX_43 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_57
+ ; DUEL_ANIM_WHIRLWIND
db SPRITE_DUEL_41 ; sprite ID
db $50 ; palette ID
db $90 ; anim ID
db $00 ; anim flags
- db $44 ; sound FX ID
+ db SFX_44 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_58
+ ; DUEL_ANIM_CRY
db SPRITE_DUEL_42 ; sprite ID
db $51 ; palette ID
db $92 ; anim ID
db $00 ; anim flags
- db $45 ; sound FX ID
+ db SFX_45 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_59
+ ; DUEL_ANIM_QUESTION_MARK
db SPRITE_DUEL_43 ; sprite ID
db $52 ; palette ID
db $93 ; anim ID
db $00 ; anim flags
- db $46 ; sound FX ID
+ db SFX_46 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_60
+ ; DUEL_ANIM_SELFDESTRUCT
db SPRITE_DUEL_44 ; sprite ID
db $53 ; palette ID
db $94 ; anim ID
db $00 ; anim flags
- db $47 ; sound FX ID
+ db SFX_47 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_61
+ ; DUEL_ANIM_BIG_SELFDESTRUCT_1
db SPRITE_DUEL_44 ; sprite ID
db $53 ; palette ID
db $95 ; anim ID
db $00 ; anim flags
- db $48 ; sound FX ID
+ db SFX_48 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_HEAL
@@ -1958,31 +1958,31 @@ Animations: ; 1ce32 (7:4e32)
db $54 ; palette ID
db $97 ; anim ID
db $00 ; anim flags
- db $49 ; sound FX ID
+ db SFX_49 ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_63
+ ; DUEL_ANIM_DRAIN
db SPRITE_DUEL_64 ; sprite ID
db $55 ; palette ID
db $99 ; anim ID
db $00 ; anim flags
- db $4a ; sound FX ID
+ db SFX_4A ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_64
+ ; DUEL_ANIM_DARK_GAS
db SPRITE_DUEL_29 ; sprite ID
db $56 ; palette ID
db $81 ; anim ID
db $00 ; anim flags
- db $4b ; sound FX ID
+ db SFX_4B ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_65
+ ; DUEL_ANIM_BIG_SELFDESTRUCT_2
db SPRITE_DUEL_44 ; sprite ID
db $53 ; palette ID
db $96 ; anim ID
db $00 ; anim flags
- db $47 ; sound FX ID
+ db SFX_47 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_66
@@ -1990,7 +1990,7 @@ Animations: ; 1ce32 (7:4e32)
db $24 ; palette ID
db $4d ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $16 ; sound FX ID
+ db SFX_16 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_67
@@ -1998,7 +1998,7 @@ Animations: ; 1ce32 (7:4e32)
db $24 ; palette ID
db $4e ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $17 ; sound FX ID
+ db SFX_17 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_68
@@ -2006,7 +2006,7 @@ Animations: ; 1ce32 (7:4e32)
db $26 ; palette ID
db $5c ; anim ID
db $00 ; anim flags
- db $18 ; sound FX ID
+ db SFX_18 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_69
@@ -2014,7 +2014,7 @@ Animations: ; 1ce32 (7:4e32)
db $31 ; palette ID
db $6d ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $24 ; sound FX ID
+ db SFX_24 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_70
@@ -2022,7 +2022,7 @@ Animations: ; 1ce32 (7:4e32)
db $57 ; palette ID
db $9a ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
- db $11 ; sound FX ID
+ db SFX_11 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_71
@@ -2030,7 +2030,7 @@ Animations: ; 1ce32 (7:4e32)
db $2c ; palette ID
db $65 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $5c ; sound FX ID
+ db SFX_5C ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_72
@@ -2038,7 +2038,7 @@ Animations: ; 1ce32 (7:4e32)
db $2c ; palette ID
db $66 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_73
@@ -2046,7 +2046,7 @@ Animations: ; 1ce32 (7:4e32)
db $54 ; palette ID
db $98 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $4c ; sound FX ID
+ db SFX_4C ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_74
@@ -2054,15 +2054,15 @@ Animations: ; 1ce32 (7:4e32)
db $50 ; palette ID
db $91 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $4d ; sound FX ID
+ db SFX_4D ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_75
+ ; DUEL_ANIM_EXPAND
db SPRITE_DUEL_46 ; sprite ID
db $58 ; palette ID
db $9b ; anim ID
db $00 ; anim flags
- db $4e ; sound FX ID
+ db SFX_4E ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_76
@@ -2070,15 +2070,15 @@ Animations: ; 1ce32 (7:4e32)
db $59 ; palette ID
db $9c ; anim ID
db $00 ; anim flags
- db $4f ; sound FX ID
+ db SFX_4F ; sound FX ID
db $00 ; handler function
- ; DUEL_ANIM_77
+ ; DUEL_ANIM_THUNDER_WAVE
db SPRITE_DUEL_48 ; sprite ID
db $5a ; palette ID
db $9d ; anim ID
db $00 ; anim flags
- db $50 ; sound FX ID
+ db SFX_50 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_78
@@ -2086,7 +2086,7 @@ Animations: ; 1ce32 (7:4e32)
db $2c ; palette ID
db $67 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $51 ; sound FX ID
+ db SFX_51 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_79
@@ -2094,7 +2094,7 @@ Animations: ; 1ce32 (7:4e32)
db $2c ; palette ID
db $68 ; anim ID
db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $51 ; sound FX ID
+ db SFX_51 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_80
@@ -2102,7 +2102,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $9e ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_PLAYER_SHUFFLE
@@ -2110,7 +2110,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $9f ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $07 ; sound FX ID
+ db SFX_07 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_OPP_SHUFFLE
@@ -2118,7 +2118,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $a0 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $07 ; sound FX ID
+ db SFX_07 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_BOTH_SHUFFLE
@@ -2126,7 +2126,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $a1 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $07 ; sound FX ID
+ db SFX_07 ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_84
@@ -2134,7 +2134,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $a2 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_BOTH_DRAW
@@ -2142,7 +2142,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $a3 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_PLAYER_DRAW
@@ -2150,7 +2150,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $a4 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_OPP_DRAW
@@ -2158,7 +2158,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $a5 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_COIN_SPIN
@@ -2166,7 +2166,7 @@ Animations: ; 1ce32 (7:4e32)
db $5c ; palette ID
db $a7 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_COIN_TOSS1
@@ -2174,7 +2174,7 @@ Animations: ; 1ce32 (7:4e32)
db $5c ; palette ID
db $a8 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $0b ; sound FX ID
+ db SFX_0B ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_COIN_TOSS2
@@ -2182,7 +2182,7 @@ Animations: ; 1ce32 (7:4e32)
db $5c ; palette ID
db $a9 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $0b ; sound FX ID
+ db SFX_0B ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_COIN_TAILS
@@ -2190,7 +2190,7 @@ Animations: ; 1ce32 (7:4e32)
db $5c ; palette ID
db $aa ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_COIN_HEADS
@@ -2198,7 +2198,7 @@ Animations: ; 1ce32 (7:4e32)
db $5c ; palette ID
db $ab ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_DUEL_WIN
@@ -2206,7 +2206,7 @@ Animations: ; 1ce32 (7:4e32)
db $5d ; palette ID
db $ac ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_DUEL_LOSS
@@ -2214,7 +2214,7 @@ Animations: ; 1ce32 (7:4e32)
db $5d ; palette ID
db $ad ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_DUEL_DRAW
@@ -2222,7 +2222,7 @@ Animations: ; 1ce32 (7:4e32)
db $5d ; palette ID
db $ae ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; DUEL_ANIM_96
@@ -2230,7 +2230,7 @@ Animations: ; 1ce32 (7:4e32)
db $5b ; palette ID
db $a6 ; anim ID
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
- db $00 ; sound FX ID
+ db SFX_STOP ; sound FX ID
db $00 ; handler function
; 0x1d078
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 1394815..45e71a2 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -477,7 +477,7 @@ ApplyAndAnimateHPRecovery: ; 2c221 (b:4221)
; load correct animation
push de
- ld a, $79
+ ld a, ATK_ANIM_HEAL
ld [wLoadedMoveAnimation], a
ld bc, $01 ; arrow
bank1call PlayMoveAnimation
@@ -1466,7 +1466,7 @@ SpitPoison_Poison50PercentEffect: ; 2c6f8 (b:46f8)
ldtx de, PoisonCheckText
call TossCoin_BankB
jp c, PoisonEffect
- ld a, $8c
+ ld a, ATK_ANIM_SPIT_POISON_SUCCESS
ld [wLoadedMoveAnimation], a
call SetNoEffectFromStatus
ret
@@ -1590,7 +1590,7 @@ KakunaStiffenEffect: ; 2c7a0 (b:47a0)
ldtx de, IfHeadsNoDamageNextTurnText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $4f
+ ld a, ATK_ANIM_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_NO_DAMAGE_STIFFEN
call ApplySubstatus1ToDefendingCard
@@ -1699,7 +1699,7 @@ MetapodStiffenEffect: ; 2c836 (b:4836)
ldtx de, IfHeadsNoDamageNextTurnText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $4f
+ ld a, ATK_ANIM_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_NO_DAMAGE_STIFFEN
call ApplySubstatus1ToDefendingCard
@@ -2110,7 +2110,7 @@ HornHazard_NoDamage50PercentEffect: ; 2ca96 (b:4a96)
call SetWasUnsuccessful
ret
.heads
- ld a, $01
+ ld a, ATK_ANIM_HIT
ld [wLoadedMoveAnimation], a
ret
; 0x2caac
@@ -2797,7 +2797,7 @@ SolarPower_CheckUse: ; 2ce53 (b:4e53)
; 0x2ce82
SolarPower_RemoveStatusEffect: ; 2ce82 (b:4e82)
- ld a, $8e
+ ld a, ATK_ANIM_HEAL_BOTH_SIDES
ld [wLoadedMoveAnimation], a
bank1call Func_7415
ldh a, [hTempPlayAreaLocation_ff9d]
@@ -2940,7 +2940,7 @@ WartortleWithdrawEffect: ; 2cf32 (b:4f32)
ldtx de, IfHeadsNoDamageNextTurnText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $4f
+ ld a, ATK_ANIM_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_NO_DAMAGE_10
call ApplySubstatus1ToDefendingCard
@@ -3180,7 +3180,7 @@ SeadraAgilityEffect: ; 2d08b (b:508b)
ldtx de, IfHeadsDoNotReceiveDamageOrEffectText
call TossCoin_BankB
ret nc ; return if tails
- ld a, $52
+ ld a, ATK_ANIM_AGILITY_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_AGILITY
call ApplySubstatus1ToDefendingCard
@@ -3197,7 +3197,7 @@ HideInShellEffect: ; 2d0a4 (b:50a4)
ldtx de, IfHeadsNoDamageNextTurnText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $4f
+ ld a, ATK_ANIM_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_NO_DAMAGE_11
call ApplySubstatus1ToDefendingCard
@@ -3281,7 +3281,7 @@ SquirtleWithdrawEffect: ; 2d120 (b:5120)
ldtx de, IfHeadsNoDamageNextTurnText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $4f
+ ld a, ATK_ANIM_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_NO_DAMAGE_10
call ApplySubstatus1ToDefendingCard
@@ -3473,13 +3473,13 @@ PoliwagWaterGunEffect: ; 2d227 (b:5227)
; 0x2d22d
ClampEffect: ; 2d22d (b:522d)
- ld a, $05
+ ld a, ATK_ANIM_HIT_EFFECT
ld [wLoadedMoveAnimation], a
ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText
call TossCoin_BankB
jp c, ParalysisEffect
; unsuccessful
- xor a
+ xor a ; ATK_ANIM_NONE
ld [wLoadedMoveAnimation], a
call SetDefiniteDamage
call SetWasUnsuccessful
@@ -3816,7 +3816,7 @@ RapidashAgilityEffect: ; 2d413 (b:5413)
ldtx de, IfHeadsDoNotReceiveDamageOrEffectText
call TossCoin_BankB
ret nc ; return if tails
- ld a, $52
+ ld a, ATK_ANIM_AGILITY_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_AGILITY
call ApplySubstatus1ToDefendingCard
@@ -4043,7 +4043,7 @@ Moltres1DiveBomb_Success50PercentEffect: ; 2d52b (b:552b)
call SetWasUnsuccessful
ret
.heads
- ld a, $11
+ ld a, ATK_ANIM_DIVE_BOMB
ld [wLoadedMoveAnimation], a
ret
; 0x2d541
@@ -4403,14 +4403,14 @@ Firegiver_AddToHandEffect: ; 2d6c2 (b:56c2)
.ok
ldh [hCurSelectionItem], a
-; load correct Move animation depending
+; load correct attack animation depending
; on what side the effect is from.
- ld d, $84
+ ld d, ATK_ANIM_FIREGIVER_PLAYER
ld a, [wDuelistType]
cp DUELIST_TYPE_PLAYER
jr z, .player_1
; opponent
- ld d, $85
+ ld d, ATK_ANIM_FIREGIVER_OPP
.player_1
ld a, d
ld [wLoadedMoveAnimation], a
@@ -4433,7 +4433,7 @@ Firegiver_AddToHandEffect: ; 2d6c2 (b:56c2)
lb bc, 18, 7 ; x, y for hand number
ld e, 3 ; y for deck number
ld a, [wLoadedMoveAnimation]
- cp $84
+ cp ATK_ANIM_FIREGIVER_PLAYER
jr z, .player_2
lb bc, 4, 5 ; x, y for hand number
ld e, 10 ; y for deck number
@@ -4488,7 +4488,7 @@ Moltres2DiveBomb_Success50PercentEffect: ; 2d776 (b:5776)
call SetWasUnsuccessful
ret
.heads
- ld a, $11
+ ld a, ATK_ANIM_DIVE_BOMB
ld [wLoadedMoveAnimation], a
ret
; 0x2d78c
@@ -5492,7 +5492,7 @@ DevolutionBeam_AISelectEffect: ; 2dc9e (b:5c9e)
; 0x2dcb6
DevolutionBeam_LoadAnimation: ; 2dcb6 (b:5cb6)
- xor a
+ xor a ; ATK_ANIM_NONE
ld [wLoadedMoveAnimation], a
ret
; 0x2dcbb
@@ -5517,7 +5517,7 @@ DevolutionBeam_DevolveEffect: ; 2dcbb (b:5cbb)
ret
.DevolvePokemon
- ld a, $5d
+ ld a, ATK_ANIM_DEVOLUTION_BEAM
ld [wLoadedMoveAnimation], a
ldh a, [hTempPlayAreaLocation_ffa1]
ld b, a
@@ -5923,7 +5923,7 @@ SpacingOut_Success50PercentEffect: ; 2dee0 (b:5ee0)
call TossCoin_BankB
ldh [hTemp_ffa0], a
jp nc, SetWasUnsuccessful
- ld a, $58
+ ld a, ATK_ANIM_RECOVER
ld [wLoadedMoveAnimation], a
ret
; 0x2def1
@@ -6152,7 +6152,7 @@ MysteryAttack_RandomEffect: ; 2e009 (b:6009)
ret
.no_damage
- ld a, $5b
+ ld a, ATK_ANIM_GLOW_EFFECT
ld [wLoadedMoveAnimation], a
xor a
call SetDefiniteDamage
@@ -6234,7 +6234,7 @@ TantrumEffect: ; 2e099 (b:6099)
call TossCoin_BankB
ret c ; return if heads
; confuse Pokemon
- ld a, $29
+ ld a, ATK_ANIM_MULTIPLE_SLASH
ld [wLoadedMoveAnimation], a
call SwapTurn
call ConfusionEffect
@@ -6505,7 +6505,7 @@ LeerEffect: ; 2e21d (b:621d)
ldtx de, IfHeadsOpponentCannotAttackText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $74
+ ld a, ATK_ANIM_LEER
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS2_LEER
call ApplySubstatus2ToDefendingCard
@@ -7001,13 +7001,13 @@ Fly_Success50PercentEffect: ; 2e4fc (b:64fc)
ldtx de, SuccessCheckIfHeadsAttackIsSuccessfulText
call TossCoin_BankB
jr c, .heads
- xor a
+ xor a ; ATK_ANIM_NONE
ld [wLoadedMoveAnimation], a
call SetDefiniteDamage
call SetWasUnsuccessful
ret
.heads
- ld a, $52
+ ld a, ATK_ANIM_AGILITY_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_FLY
call ApplySubstatus1ToDefendingCard
@@ -7153,7 +7153,7 @@ RaichuAgilityEffect: ; 2e5dc (b:65dc)
ldtx de, IfHeadsDoNotReceiveDamageOrEffectText
call TossCoin_BankB
ret nc ; skip if got tails
- ld a, $52
+ ld a, ATK_ANIM_AGILITY_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_AGILITY
call ApplySubstatus1ToDefendingCard
@@ -7506,7 +7506,7 @@ RandomlyDamagePlayAreaPokemon: ; 2e78d (b:678d)
jr z, RandomlyDamagePlayAreaPokemon ; re-roll Pokemon to attack
.damage
- ld a, $82
+ ld a, ATK_ANIM_THUNDER_PLAY_AREA
ld [wLoadedMoveAnimation], a
call DealDamageToPlayAreaPokemon
ret
@@ -7818,7 +7818,7 @@ TailWagEffect: ; 2e94e (b:694e)
ldtx de, IfHeadsOpponentCannotAttackText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $46
+ ld a, ATK_ANIM_LURE
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS2_TAIL_WAG
call ApplySubstatus2ToDefendingCard
@@ -7964,7 +7964,7 @@ MirrorMoveEffects: ; 2e98c (b:698c)
ld [de], a
or [hl]
jr z, .no_damage
- ld a, $01
+ ld a, ATK_ANIM_HIT
ld [wLoadedMoveAnimation], a
.no_damage
inc hl
@@ -8094,7 +8094,7 @@ FearowAgilityEffect: ; 2eab8 (b:6ab8)
ldtx de, IfHeadsDoNotReceiveDamageOrEffectText
call TossCoin_BankB
ret nc
- ld a, $52
+ ld a, ATK_ANIM_AGILITY_PROTECT
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_AGILITY
call ApplySubstatus1ToDefendingCard
@@ -8890,7 +8890,7 @@ ScrunchEffect: ; 2eee7 (b:6ee7)
ldtx de, IfHeadsNoDamageNextTurnText
call TossCoin_BankB
jp nc, SetWasUnsuccessful
- ld a, $6b
+ ld a, ATK_ANIM_SCRUNCH
ld [wLoadedMoveAnimation], a
ld a, SUBSTATUS1_NO_DAMAGE_17
call ApplySubstatus1ToDefendingCard
@@ -8975,7 +8975,7 @@ HealingWind_PlayAreaHealEffect: ; 2ef53 (b:6f53)
ld h, a
bank1call PlayMoveAnimation
bank1call WaitMoveAnimation
- ld a, $86
+ ld a, ATK_ANIM_HEALING_WIND_PLAY_AREA
ld [wLoadedMoveAnimation], a
@@ -9078,7 +9078,7 @@ CatPunchEffect: ; 2efe0 (b:6fe0)
call SwapTurn
call PickRandomPlayAreaCard
ld b, a
- ld a, $83
+ ld a, ATK_ANIM_CAT_PUNCH_PLAY_AREA
ld [wLoadedMoveAnimation], a
ld de, 20
call DealDamageToPlayAreaPokemon
@@ -9234,7 +9234,7 @@ SlicingWindEffect: ; 2f0bf (b:70bf)
; 0x2f0d0
Gale_LoadAnimation: ; 2f0d0 (b:70d0)
- ld a, $87
+ ld a, ATK_ANIM_GALE
ld [wLoadedMoveAnimation], a
ret
; 0x2f0d6
@@ -9305,7 +9305,7 @@ FriendshipSong_AddToBench50PercentEffect: ; 2f119 (b:7119)
.successful
call PickRandomBasicCardFromDeck
jr nc, .put_in_bench
- ld a, $6a
+ ld a, ATK_ANIM_FRIENDSHIP_SONG
call Func_2c12e
call .none_came_text
call Func_2c0bd
@@ -9315,7 +9315,7 @@ FriendshipSong_AddToBench50PercentEffect: ; 2f119 (b:7119)
call SearchCardInDeckAndAddToHand
call AddCardToHand
call PutHandPokemonCardInPlayArea
- ld a, $6a
+ ld a, ATK_ANIM_FRIENDSHIP_SONG
call Func_2c12e
ldh a, [hTempCardIndex_ff98]
ldtx hl, CameToTheBenchText
@@ -9488,7 +9488,7 @@ ImakuniEffect: ; 2f216 (b:7216)
.failed
; play confusion animation and print failure text
- ld a, $7f
+ ld a, ATK_ANIM_IMAKUNI_CONFUSION
call Func_2fea9
ldtx hl, ThereWasNoEffectText
call DrawWideTextBox_WaitForInput
@@ -9496,7 +9496,7 @@ ImakuniEffect: ; 2f216 (b:7216)
.success
; play confusion animation and confuse card
- ld a, $7f
+ ld a, ATK_ANIM_IMAKUNI_CONFUSION
call Func_2fea9
ld a, DUELVARS_ARENA_CARD_STATUS
call GetTurnDuelistVariable
@@ -9936,7 +9936,7 @@ FullHeal_StatusCheck: ; 2f4c5 (b:74c5)
; 0x2f4d1
FullHeal_ClearStatusEffect: ; 2f4d1 (b:74d1)
- ld a, $8a
+ ld a, ATK_ANIM_FULL_HEAL
call Func_2fea9
ld a, DUELVARS_ARENA_CARD_STATUS
call GetTurnDuelistVariable
@@ -11739,7 +11739,7 @@ GustOfWind_PlayerSelection: ; 2fe79 (b:7e79)
GustOfWind_SwitchEffect: ; 2fe90 (b:7e90)
; play whirlwind animation
- ld a, $8d
+ ld a, ATK_ANIM_GUST_OF_WIND
call Func_2fea9
; switch Arena card
@@ -11755,7 +11755,7 @@ GustOfWind_SwitchEffect: ; 2fe90 (b:7e90)
; 0x2fea9
; input:
-; a = move animation to play
+; a = attack animation to play
Func_2fea9: ; 2fea9 (b:7ea9)
ld [wLoadedMoveAnimation], a
bank1call Func_7415
@@ -11780,7 +11780,7 @@ HealPlayAreaCardHP: ; 2febc (b:7ebc)
; play heal animation
push de
bank1call Func_7415
- ld a, $86
+ ld a, ATK_ANIM_HEALING_WIND_PLAY_AREA
ld [wLoadedMoveAnimation], a
ldh a, [hTempPlayAreaLocation_ff9d]
ld b, a
diff --git a/src/engine/home.asm b/src/engine/home.asm
index f255bb4..8e5233b 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -4529,7 +4529,7 @@ HandleConfusionDamageToSelf: ; 1828 (0:1828)
ld [wIsDamageToSelf], a
ldtx hl, DamageToSelfDueToConfusionText
call DrawWideTextBox_PrintText
- ld a, $75
+ ld a, ATK_ANIM_CONFUSION_HIT
ld [wLoadedMoveAnimation], a
ld a, 20 ; damage
call DealConfusionDamageToSelf
@@ -4700,7 +4700,7 @@ LoadNonPokemonCardEffectCommands: ; 1944 (0:1944)
; display recoil animation
DealRecoilDamageToSelf: ; 1955 (0:1955)
push af
- ld a, $7a
+ ld a, ATK_ANIM_RECOIL_HIT
ld [wLoadedMoveAnimation], a
pop af
; fallthrough
@@ -4977,7 +4977,7 @@ PrintKnockedOut: ; 1ad3 (0:1ad3)
; shows the defending player's play area screen when dealing the damage
; instead of the main duel interface with regular attack animation.
DealDamageToPlayAreaPokemon_RegularAnim: ; 1af3 (0:1af3)
- ld a, $78
+ ld a, ATK_ANIM_BENCH_HIT
ld [wLoadedMoveAnimation], a
; fallthrough
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 21:01:37 +0000