Merge pull request #91 from ElectroDeoxys/anims

Anims
This commit is contained in:
Daniel Harding
2021-01-14 13:47:44 -06:00
committed by GitHub
9 changed files with 1140 additions and 1135 deletions
+100 -100
View File
@@ -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
+145 -145
View File
@@ -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
File diff suppressed because it is too large Load Diff
+328 -328
View File
File diff suppressed because it is too large Load Diff
+15 -12
View File
@@ -8299,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
@@ -8394,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
+4 -2
View File
@@ -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
+155 -155
View File
@@ -1460,7 +1460,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
@@ -1468,15 +1468,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
@@ -1484,15 +1484,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
@@ -1500,7 +1500,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
@@ -1508,7 +1508,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
@@ -1516,15 +1516,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
@@ -1532,7 +1532,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
@@ -1540,207 +1540,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
@@ -1748,207 +1748,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
@@ -1956,31 +1956,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
@@ -1988,7 +1988,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
@@ -1996,7 +1996,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
@@ -2004,7 +2004,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
@@ -2012,7 +2012,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
@@ -2020,7 +2020,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
@@ -2028,7 +2028,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
@@ -2036,7 +2036,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
@@ -2044,7 +2044,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
@@ -2052,15 +2052,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
@@ -2068,15 +2068,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
@@ -2084,7 +2084,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
@@ -2092,7 +2092,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
@@ -2100,7 +2100,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
@@ -2108,7 +2108,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
@@ -2116,7 +2116,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
@@ -2124,7 +2124,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
@@ -2132,7 +2132,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
@@ -2140,7 +2140,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
@@ -2148,7 +2148,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
@@ -2156,7 +2156,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
@@ -2164,7 +2164,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
@@ -2172,7 +2172,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
@@ -2180,7 +2180,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
@@ -2188,7 +2188,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
@@ -2196,7 +2196,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
@@ -2204,7 +2204,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
@@ -2212,7 +2212,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
@@ -2220,7 +2220,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
@@ -2228,7 +2228,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
+44 -44
View File
@@ -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
+3 -3
View File
@@ -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