diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-01-13 17:10:10 +0000 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-01-13 17:10:10 +0000 |
| commit | 31335eb22dce889025037e0360c2e711e56a851d (patch) | |
| tree | 4a202dcf4d3f97072117b2239f595c0d859fff18 /src | |
| parent | b18df32ee69843f40035d0453919a6fbf8fd7837 (diff) | |
Identify duel animations
Diffstat (limited to 'src')
| -rw-r--r-- | src/constants/animation_constants.asm | 200 | ||||
| -rw-r--r-- | src/data/attack_animations.asm | 160 | ||||
| -rw-r--r-- | src/engine/bank07.asm | 108 |
3 files changed, 234 insertions, 234 deletions
diff --git a/src/constants/animation_constants.asm b/src/constants/animation_constants.asm index b7521d5..8b0ba37 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_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_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_17 ; $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_24 ; $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/data/attack_animations.asm b/src/data/attack_animations.asm index 0768a10..6c94735 100644 --- a/src/data/attack_animations.asm +++ b/src/data/attack_animations.asm @@ -31,10 +31,10 @@ PointerTable_AttackAnimation: dw AttackAnimation_ThunderShock ; ATK_ANIM_THUNDER
dw AttackAnimation_Thunderbolt ; ATK_ANIM_THUNDERBOLT
dw AttackAnimation_ThunderShock ; ATK_ANIM_9
- dw AttackAnimation_52f0 ; ATK_ANIM_THUNDER_WHOLE_SCREEN
- dw AttackAnimation_52f0 ; ATK_ANIM_11
- dw AttackAnimation_52f0 ; ATK_ANIM_THUNDERSTORM
- dw AttackAnimation_52f0 ; ATK_ANIM_CHAIN_LIGHTNING
+ 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
@@ -176,7 +176,7 @@ AttackAnimation_Hit: ; (6:52c6) AttackAnimation_BigHit:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_8
+ anim_opponent DUEL_ANIM_BIG_HIT
anim_normal DUEL_ANIM_SHAKE2
anim_opponent DUEL_ANIM_SHOW_DAMAGE
anim_end
@@ -191,17 +191,17 @@ AttackAnimation_ThunderShock: 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
@@ -209,7 +209,7 @@ AttackAnimation_52f0: 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
@@ -217,7 +217,7 @@ AttackAnimation_SmallFlame: 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
@@ -225,7 +225,7 @@ AttackAnimation_BigFlame: 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
@@ -241,7 +241,7 @@ AttackAnimation_531e: 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
@@ -249,7 +249,7 @@ AttackAnimation_WaterJets: 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
@@ -257,7 +257,7 @@ AttackAnimation_WaterGun: 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
@@ -265,8 +265,8 @@ AttackAnimation_Whirlpool: 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
@@ -274,7 +274,7 @@ AttackAnimation_DragonRage: 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
@@ -282,7 +282,7 @@ AttackAnimation_HydroPump: 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
@@ -290,7 +290,7 @@ AttackAnimation_Blizzard: 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
@@ -306,7 +306,7 @@ AttackAnimation_DarkMind: 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
@@ -314,7 +314,7 @@ AttackAnimation_Beam: 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
@@ -322,7 +322,7 @@ AttackAnimation_HyperBeam: 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
@@ -330,7 +330,7 @@ AttackAnimation_RockThrow: 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
@@ -338,7 +338,7 @@ AttackAnimation_StoneBarrage: 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
@@ -346,7 +346,7 @@ AttackAnimation_Punch: 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
@@ -354,7 +354,7 @@ AttackAnimation_Thunderpunch: 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
@@ -362,12 +362,12 @@ AttackAnimation_FirePunch: AttackAnimation_StretchKick:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_32
+ anim_player DUEL_ANIM_STRETCH_KICK
anim_end
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
@@ -375,7 +375,7 @@ AttackAnimation_Slash: 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
@@ -383,7 +383,7 @@ AttackAnimation_Whip: 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
@@ -399,7 +399,7 @@ AttackAnimation_MultipleSlash: 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
@@ -407,7 +407,7 @@ AttackAnimation_Drill: 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
@@ -415,7 +415,7 @@ AttackAnimation_PotSmash: 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
@@ -423,7 +423,7 @@ AttackAnimation_Bonemerang: 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
@@ -431,7 +431,7 @@ AttackAnimation_SeismicToss: 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
@@ -439,7 +439,7 @@ AttackAnimation_Needles: 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
@@ -447,7 +447,7 @@ AttackAnimation_WhiteGas: 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,12 +455,12 @@ AttackAnimation_Powder: AttackAnimation_544e:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_43
+ anim_opponent DUEL_ANIM_POWDER
anim_end
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
@@ -469,13 +469,13 @@ AttackAnimation_Goo: AttackAnimation_5460:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_44
+ anim_opponent DUEL_ANIM_GOO
anim_normal $66
anim_end
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
@@ -483,7 +483,7 @@ AttackAnimation_Bubbles: 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
@@ -491,7 +491,7 @@ AttackAnimation_StringShot: 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
@@ -499,14 +499,14 @@ AttackAnimation_Boyfriends: AttackAnimation_Lure:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_48
+ anim_player DUEL_ANIM_LURE
anim_normal $66
anim_end
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
@@ -515,7 +515,7 @@ AttackAnimation_Toxic: 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
@@ -523,17 +523,17 @@ AttackAnimation_ConfuseRay: AttackAnimation_Sing:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_51
+ anim_opponent DUEL_ANIM_SING
anim_end
AttackAnimation_Supersonic:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_52
+ anim_opponent DUEL_ANIM_SUPERSONIC
anim_end
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
@@ -541,17 +541,17 @@ AttackAnimation_PetalDance: AttackAnimation_Protect:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_54
+ anim_player DUEL_ANIM_PROTECT
anim_end
AttackAnimation_Barrier:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_55
+ anim_player DUEL_ANIM_BARRIER
anim_end
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
@@ -559,16 +559,16 @@ AttackAnimation_QuickAttack: AttackAnimation_54d3:
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_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
@@ -576,19 +576,19 @@ AttackAnimation_Whirlwind: 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_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_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
@@ -596,9 +596,9 @@ AttackAnimation_Selfdestruct: 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
@@ -610,7 +610,7 @@ AttackAnimation_Recover: 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
@@ -618,11 +618,11 @@ AttackAnimation_Drain: 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_GlowEffect:
@@ -704,7 +704,7 @@ AttackAnimation_PoisonFang: 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
@@ -712,12 +712,12 @@ AttackAnimation_558c: AttackAnimation_5597:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_51
+ anim_player DUEL_ANIM_SING
anim_end
AttackAnimation_559c:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_75
+ anim_player DUEL_ANIM_EXPAND
anim_end
AttackAnimation_CatPunch:
@@ -726,12 +726,12 @@ AttackAnimation_CatPunch: AttackAnimation_MagneticStorm:
anim_player DUEL_ANIM_GLOW
- anim_player DUEL_ANIM_77
+ anim_player DUEL_ANIM_THUNDER_WAVE
anim_end
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
@@ -739,7 +739,7 @@ AttackAnimation_PoisonWhip: 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
@@ -747,12 +747,12 @@ AttackAnimation_ThunderWave: AttackAnimation_Spore:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_43
+ anim_opponent DUEL_ANIM_POWDER
anim_end
AttackAnimation_Hypnosis:
anim_player DUEL_ANIM_GLOW
- anim_opponent DUEL_ANIM_23
+ anim_opponent DUEL_ANIM_PSYCHIC
anim_end
AttackAnimation_EnergyConversion:
@@ -763,7 +763,7 @@ AttackAnimation_EnergyConversion: AttackAnimation_55ce:
anim_player DUEL_ANIM_GLOW
anim_opponent DUEL_ANIM_24
- anim_opponent DUEL_ANIM_59
+ anim_opponent DUEL_ANIM_QUESTION_MARK
anim_end
AttackAnimation_55d5:
@@ -776,7 +776,7 @@ AttackAnimation_55d5: AttackAnimation_55e0:
anim_player DUEL_ANIM_GLOW
- anim_normal DUEL_ANIM_18
+ anim_normal DUEL_ANIM_WATER_JETS
anim_end
AttackAnimation_55e5:
@@ -822,11 +822,11 @@ AttackAnimation_5607: 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:
@@ -862,7 +862,7 @@ AttackAnimation_5632: AttackAnimation_5637:
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
@@ -871,7 +871,7 @@ AttackAnimation_5637: 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
@@ -894,12 +894,12 @@ AttackAnimation_5659: AttackAnimation_565e:
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
+ anim_opponent DUEL_ANIM_WHIRLWIND
anim_end
AttackAnimation_5668:
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index b1afcc7..1bbcc22 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -1519,7 +1519,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1543,7 +1543,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1551,7 +1551,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1559,7 +1559,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1567,7 +1567,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1575,7 +1575,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1583,7 +1583,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1599,7 +1599,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1607,7 +1607,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1615,7 +1615,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1623,7 +1623,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1631,7 +1631,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1639,7 +1639,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1655,7 +1655,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1663,7 +1663,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1671,7 +1671,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1679,7 +1679,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1687,7 +1687,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1695,7 +1695,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1703,7 +1703,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1711,7 +1711,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1719,7 +1719,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1727,7 +1727,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1735,7 +1735,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1751,7 +1751,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1759,7 +1759,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1767,7 +1767,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1775,7 +1775,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1783,7 +1783,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1791,7 +1791,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1799,7 +1799,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1807,7 +1807,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1815,7 +1815,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1823,7 +1823,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1831,7 +1831,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1839,7 +1839,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1847,7 +1847,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1855,7 +1855,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1863,7 +1863,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1871,7 +1871,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1879,7 +1879,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1887,7 +1887,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1895,7 +1895,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1903,7 +1903,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1911,7 +1911,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1919,7 +1919,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1927,7 +1927,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1935,7 +1935,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1943,7 +1943,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1959,7 +1959,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1967,7 +1967,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -1975,7 +1975,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -2055,7 +2055,7 @@ Animations: ; 1ce32 (7:4e32) 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 @@ -2071,7 +2071,7 @@ Animations: ; 1ce32 (7:4e32) 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 |