From be05a99cc16268338e272d9f8ad1b8abb87514d0 Mon Sep 17 00:00:00 2001 From: cawtds Date: Mon, 6 May 2024 17:47:41 +0200 Subject: [PATCH 1/8] fix getboxmondata for evolutiontracker if compiled with agbcc --- src/pokemon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pokemon.c b/src/pokemon.c index f1e82074705f..c32e5ff1ed2c 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2537,6 +2537,7 @@ u32 GetBoxMonData3(struct BoxPokemon *boxMon, s32 field, u8 *data) case MON_DATA_EVOLUTION_TRACKER: evoTracker.asField.a = substruct1->evolutionTracker1; evoTracker.asField.b = substruct1->evolutionTracker2; + evoTracker.asField.unused = 0; retVal = evoTracker.value; break; default: From 569c0c7965f75b0c01ef90fb08b83feebb65d57b Mon Sep 17 00:00:00 2001 From: cawtds Date: Sat, 1 Jun 2024 01:24:52 +0200 Subject: [PATCH 2/8] refactored move animation scripts as part of gMovesInfo --- data/battle_anim_scripts.s | 2190 ++++++++++----------------------- include/battle_anim_scripts.h | 940 ++++++++++++++ include/pokemon.h | 1 + src/battle_anim.c | 37 +- src/data/moves_info.h | 1928 +++++++++++++++++++++-------- 5 files changed, 3009 insertions(+), 2087 deletions(-) create mode 100644 include/battle_anim_scripts.h diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 8861dc514df5..90e9ff0eb476 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -18,956 +18,6 @@ gMovesWithQuietBGM:: .2byte MOVE_SING, MOVE_PERISH_SONG, MOVE_GRASS_WHISTLE, 0xFFFF - .align 2 -gBattleAnims_Moves:: - .4byte Move_NONE - .4byte Move_POUND - .4byte Move_KARATE_CHOP - .4byte Move_DOUBLE_SLAP - .4byte Move_COMET_PUNCH - .4byte Move_MEGA_PUNCH - .4byte Move_PAY_DAY - .4byte Move_FIRE_PUNCH - .4byte Move_ICE_PUNCH - .4byte Move_THUNDER_PUNCH - .4byte Move_SCRATCH - .4byte Move_VICE_GRIP - .4byte Move_GUILLOTINE - .4byte Move_RAZOR_WIND - .4byte Move_SWORDS_DANCE - .4byte Move_CUT - .4byte Move_GUST - .4byte Move_WING_ATTACK - .4byte Move_WHIRLWIND - .4byte Move_FLY - .4byte Move_BIND - .4byte Move_SLAM - .4byte Move_VINE_WHIP - .4byte Move_STOMP - .4byte Move_DOUBLE_KICK - .4byte Move_MEGA_KICK - .4byte Move_JUMP_KICK - .4byte Move_ROLLING_KICK - .4byte Move_SAND_ATTACK - .4byte Move_HEADBUTT - .4byte Move_HORN_ATTACK - .4byte Move_FURY_ATTACK - .4byte Move_HORN_DRILL - .4byte Move_TACKLE - .4byte Move_BODY_SLAM - .4byte Move_WRAP - .4byte Move_TAKE_DOWN - .4byte Move_THRASH - .4byte Move_DOUBLE_EDGE - .4byte Move_TAIL_WHIP - .4byte Move_POISON_STING - .4byte Move_TWINEEDLE - .4byte Move_PIN_MISSILE - .4byte Move_LEER - .4byte Move_BITE - .4byte Move_GROWL - .4byte Move_ROAR - .4byte Move_SING - .4byte Move_SUPERSONIC - .4byte Move_SONIC_BOOM - .4byte Move_DISABLE - .4byte Move_ACID - .4byte Move_EMBER - .4byte Move_FLAMETHROWER - .4byte Move_MIST - .4byte Move_WATER_GUN - .4byte Move_HYDRO_PUMP - .4byte Move_SURF - .4byte Move_ICE_BEAM - .4byte Move_BLIZZARD - .4byte Move_PSYBEAM - .4byte Move_BUBBLE_BEAM - .4byte Move_AURORA_BEAM - .4byte Move_HYPER_BEAM - .4byte Move_PECK - .4byte Move_DRILL_PECK - .4byte Move_SUBMISSION - .4byte Move_LOW_KICK - .4byte Move_COUNTER - .4byte Move_SEISMIC_TOSS - .4byte Move_STRENGTH - .4byte Move_ABSORB - .4byte Move_MEGA_DRAIN - .4byte Move_LEECH_SEED - .4byte Move_GROWTH - .4byte Move_RAZOR_LEAF - .4byte Move_SOLAR_BEAM - .4byte Move_POISON_POWDER - .4byte Move_STUN_SPORE - .4byte Move_SLEEP_POWDER - .4byte Move_PETAL_DANCE - .4byte Move_STRING_SHOT - .4byte Move_DRAGON_RAGE - .4byte Move_FIRE_SPIN - .4byte Move_THUNDER_SHOCK - .4byte Move_THUNDERBOLT - .4byte Move_THUNDER_WAVE - .4byte Move_THUNDER - .4byte Move_ROCK_THROW - .4byte Move_EARTHQUAKE - .4byte Move_FISSURE - .4byte Move_DIG - .4byte Move_TOXIC - .4byte Move_CONFUSION - .4byte Move_PSYCHIC - .4byte Move_HYPNOSIS - .4byte Move_MEDITATE - .4byte Move_AGILITY - .4byte Move_QUICK_ATTACK - .4byte Move_RAGE - .4byte Move_TELEPORT - .4byte Move_NIGHT_SHADE - .4byte Move_MIMIC - .4byte Move_SCREECH - .4byte Move_DOUBLE_TEAM - .4byte Move_RECOVER - .4byte Move_HARDEN - .4byte Move_MINIMIZE - .4byte Move_SMOKESCREEN - .4byte Move_CONFUSE_RAY - .4byte Move_WITHDRAW - .4byte Move_DEFENSE_CURL - .4byte Move_BARRIER - .4byte Move_LIGHT_SCREEN - .4byte Move_HAZE - .4byte Move_REFLECT - .4byte Move_FOCUS_ENERGY - .4byte Move_BIDE - .4byte Move_METRONOME - .4byte Move_MIRROR_MOVE @ doesnt have an actual animation - .4byte Move_SELF_DESTRUCT - .4byte Move_EGG_BOMB - .4byte Move_LICK - .4byte Move_SMOG - .4byte Move_SLUDGE - .4byte Move_BONE_CLUB - .4byte Move_FIRE_BLAST - .4byte Move_WATERFALL - .4byte Move_CLAMP - .4byte Move_SWIFT - .4byte Move_SKULL_BASH - .4byte Move_SPIKE_CANNON - .4byte Move_CONSTRICT - .4byte Move_AMNESIA - .4byte Move_KINESIS - .4byte Move_SOFT_BOILED - .4byte Move_HIGH_JUMP_KICK - .4byte Move_GLARE - .4byte Move_DREAM_EATER - .4byte Move_POISON_GAS - .4byte Move_BARRAGE - .4byte Move_LEECH_LIFE - .4byte Move_LOVELY_KISS - .4byte Move_SKY_ATTACK - .4byte Move_TRANSFORM - .4byte Move_BUBBLE - .4byte Move_DIZZY_PUNCH - .4byte Move_SPORE - .4byte Move_FLASH - .4byte Move_PSYWAVE - .4byte Move_SPLASH - .4byte Move_ACID_ARMOR - .4byte Move_CRABHAMMER - .4byte Move_EXPLOSION - .4byte Move_FURY_SWIPES - .4byte Move_BONEMERANG - .4byte Move_REST - .4byte Move_ROCK_SLIDE - .4byte Move_HYPER_FANG - .4byte Move_SHARPEN - .4byte Move_CONVERSION - .4byte Move_TRI_ATTACK - .4byte Move_SUPER_FANG - .4byte Move_SLASH - .4byte Move_SUBSTITUTE - .4byte Move_STRUGGLE - .4byte Move_SKETCH - .4byte Move_TRIPLE_KICK - .4byte Move_THIEF - .4byte Move_SPIDER_WEB - .4byte Move_MIND_READER - .4byte Move_NIGHTMARE - .4byte Move_FLAME_WHEEL - .4byte Move_SNORE - .4byte Move_CURSE - .4byte Move_FLAIL - .4byte Move_CONVERSION_2 - .4byte Move_AEROBLAST - .4byte Move_COTTON_SPORE - .4byte Move_REVERSAL - .4byte Move_SPITE - .4byte Move_POWDER_SNOW - .4byte Move_PROTECT - .4byte Move_MACH_PUNCH - .4byte Move_SCARY_FACE - .4byte Move_FAINT_ATTACK - .4byte Move_SWEET_KISS - .4byte Move_BELLY_DRUM - .4byte Move_SLUDGE_BOMB - .4byte Move_MUD_SLAP - .4byte Move_OCTAZOOKA - .4byte Move_SPIKES - .4byte Move_ZAP_CANNON - .4byte Move_FORESIGHT - .4byte Move_DESTINY_BOND - .4byte Move_PERISH_SONG - .4byte Move_ICY_WIND - .4byte Move_DETECT - .4byte Move_BONE_RUSH - .4byte Move_LOCK_ON - .4byte Move_OUTRAGE - .4byte Move_SANDSTORM - .4byte Move_GIGA_DRAIN - .4byte Move_ENDURE - .4byte Move_CHARM - .4byte Move_ROLLOUT - .4byte Move_FALSE_SWIPE - .4byte Move_SWAGGER - .4byte Move_MILK_DRINK - .4byte Move_SPARK - .4byte Move_FURY_CUTTER - .4byte Move_STEEL_WING - .4byte Move_MEAN_LOOK - .4byte Move_ATTRACT - .4byte Move_SLEEP_TALK - .4byte Move_HEAL_BELL - .4byte Move_RETURN - .4byte Move_PRESENT - .4byte Move_FRUSTRATION - .4byte Move_SAFEGUARD - .4byte Move_PAIN_SPLIT - .4byte Move_SACRED_FIRE - .4byte Move_MAGNITUDE - .4byte Move_DYNAMIC_PUNCH - .4byte Move_MEGAHORN - .4byte Move_DRAGON_BREATH - .4byte Move_BATON_PASS - .4byte Move_ENCORE - .4byte Move_PURSUIT - .4byte Move_RAPID_SPIN - .4byte Move_SWEET_SCENT - .4byte Move_IRON_TAIL - .4byte Move_METAL_CLAW - .4byte Move_VITAL_THROW - .4byte Move_MORNING_SUN - .4byte Move_SYNTHESIS - .4byte Move_MOONLIGHT - .4byte Move_HIDDEN_POWER - .4byte Move_CROSS_CHOP - .4byte Move_TWISTER - .4byte Move_RAIN_DANCE - .4byte Move_SUNNY_DAY - .4byte Move_CRUNCH - .4byte Move_MIRROR_COAT - .4byte Move_PSYCH_UP - .4byte Move_EXTREME_SPEED - .4byte Move_ANCIENT_POWER - .4byte Move_SHADOW_BALL - .4byte Move_FUTURE_SIGHT - .4byte Move_ROCK_SMASH - .4byte Move_WHIRLPOOL - .4byte Move_BEAT_UP - .4byte Move_FAKE_OUT - .4byte Move_UPROAR - .4byte Move_STOCKPILE - .4byte Move_SPIT_UP - .4byte Move_SWALLOW - .4byte Move_HEAT_WAVE - .4byte Move_HAIL - .4byte Move_TORMENT - .4byte Move_FLATTER - .4byte Move_WILL_O_WISP - .4byte Move_MEMENTO - .4byte Move_FACADE - .4byte Move_FOCUS_PUNCH - .4byte Move_SMELLING_SALTS - .4byte Move_FOLLOW_ME - .4byte Move_NATURE_POWER - .4byte Move_CHARGE - .4byte Move_TAUNT - .4byte Move_HELPING_HAND - .4byte Move_TRICK - .4byte Move_ROLE_PLAY - .4byte Move_WISH - .4byte Move_ASSIST - .4byte Move_INGRAIN - .4byte Move_SUPERPOWER - .4byte Move_MAGIC_COAT - .4byte Move_RECYCLE - .4byte Move_REVENGE - .4byte Move_BRICK_BREAK - .4byte Move_YAWN - .4byte Move_KNOCK_OFF - .4byte Move_ENDEAVOR - .4byte Move_ERUPTION - .4byte Move_SKILL_SWAP - .4byte Move_IMPRISON - .4byte Move_REFRESH - .4byte Move_GRUDGE - .4byte Move_SNATCH - .4byte Move_SECRET_POWER - .4byte Move_DIVE - .4byte Move_ARM_THRUST - .4byte Move_CAMOUFLAGE - .4byte Move_TAIL_GLOW - .4byte Move_LUSTER_PURGE - .4byte Move_MIST_BALL - .4byte Move_FEATHER_DANCE - .4byte Move_TEETER_DANCE - .4byte Move_BLAZE_KICK - .4byte Move_MUD_SPORT - .4byte Move_ICE_BALL - .4byte Move_NEEDLE_ARM - .4byte Move_SLACK_OFF - .4byte Move_HYPER_VOICE - .4byte Move_POISON_FANG - .4byte Move_CRUSH_CLAW - .4byte Move_BLAST_BURN - .4byte Move_HYDRO_CANNON - .4byte Move_METEOR_MASH - .4byte Move_ASTONISH - .4byte Move_WEATHER_BALL - .4byte Move_AROMATHERAPY - .4byte Move_FAKE_TEARS - .4byte Move_AIR_CUTTER - .4byte Move_OVERHEAT - .4byte Move_ODOR_SLEUTH - .4byte Move_ROCK_TOMB - .4byte Move_SILVER_WIND - .4byte Move_METAL_SOUND - .4byte Move_GRASS_WHISTLE - .4byte Move_TICKLE - .4byte Move_COSMIC_POWER - .4byte Move_WATER_SPOUT - .4byte Move_SIGNAL_BEAM - .4byte Move_SHADOW_PUNCH - .4byte Move_EXTRASENSORY - .4byte Move_SKY_UPPERCUT - .4byte Move_SAND_TOMB - .4byte Move_SHEER_COLD - .4byte Move_MUDDY_WATER - .4byte Move_BULLET_SEED - .4byte Move_AERIAL_ACE - .4byte Move_ICICLE_SPEAR - .4byte Move_IRON_DEFENSE - .4byte Move_BLOCK - .4byte Move_HOWL - .4byte Move_DRAGON_CLAW - .4byte Move_FRENZY_PLANT - .4byte Move_BULK_UP - .4byte Move_BOUNCE - .4byte Move_MUD_SHOT - .4byte Move_POISON_TAIL - .4byte Move_COVET - .4byte Move_VOLT_TACKLE - .4byte Move_MAGICAL_LEAF - .4byte Move_WATER_SPORT - .4byte Move_CALM_MIND - .4byte Move_LEAF_BLADE - .4byte Move_DRAGON_DANCE - .4byte Move_ROCK_BLAST - .4byte Move_SHOCK_WAVE - .4byte Move_WATER_PULSE - .4byte Move_DOOM_DESIRE - .4byte Move_PSYCHO_BOOST -@@@@@@@@@@@@ GEN 4 @@@@@@@@@@@@ - .4byte Move_ROOST - .4byte Move_GRAVITY - .4byte Move_MIRACLE_EYE - .4byte Move_WAKE_UP_SLAP - .4byte Move_HAMMER_ARM - .4byte Move_GYRO_BALL - .4byte Move_HEALING_WISH - .4byte Move_BRINE - .4byte Move_NATURAL_GIFT - .4byte Move_FEINT - .4byte Move_PLUCK - .4byte Move_TAILWIND - .4byte Move_ACUPRESSURE - .4byte Move_METAL_BURST - .4byte Move_U_TURN - .4byte Move_CLOSE_COMBAT - .4byte Move_PAYBACK - .4byte Move_ASSURANCE - .4byte Move_EMBARGO - .4byte Move_FLING - .4byte Move_PSYCHO_SHIFT - .4byte Move_TRUMP_CARD - .4byte Move_HEAL_BLOCK - .4byte Move_WRING_OUT - .4byte Move_POWER_TRICK - .4byte Move_GASTRO_ACID - .4byte Move_LUCKY_CHANT - .4byte Move_ME_FIRST - .4byte Move_COPYCAT - .4byte Move_POWER_SWAP - .4byte Move_GUARD_SWAP - .4byte Move_PUNISHMENT - .4byte Move_LAST_RESORT - .4byte Move_WORRY_SEED - .4byte Move_SUCKER_PUNCH - .4byte Move_TOXIC_SPIKES - .4byte Move_HEART_SWAP - .4byte Move_AQUA_RING - .4byte Move_MAGNET_RISE - .4byte Move_FLARE_BLITZ - .4byte Move_FORCE_PALM - .4byte Move_AURA_SPHERE - .4byte Move_ROCK_POLISH - .4byte Move_POISON_JAB - .4byte Move_DARK_PULSE - .4byte Move_NIGHT_SLASH - .4byte Move_AQUA_TAIL - .4byte Move_SEED_BOMB - .4byte Move_AIR_SLASH - .4byte Move_XSCISSOR - .4byte Move_BUG_BUZZ - .4byte Move_DRAGON_PULSE - .4byte Move_DRAGON_RUSH - .4byte Move_POWER_GEM - .4byte Move_DRAIN_PUNCH - .4byte Move_VACUUM_WAVE - .4byte Move_FOCUS_BLAST - .4byte Move_ENERGY_BALL - .4byte Move_BRAVE_BIRD - .4byte Move_EARTH_POWER - .4byte Move_SWITCHEROO - .4byte Move_GIGA_IMPACT - .4byte Move_NASTY_PLOT - .4byte Move_BULLET_PUNCH - .4byte Move_AVALANCHE - .4byte Move_ICE_SHARD - .4byte Move_SHADOW_CLAW - .4byte Move_THUNDER_FANG - .4byte Move_ICE_FANG - .4byte Move_FIRE_FANG - .4byte Move_SHADOW_SNEAK - .4byte Move_MUD_BOMB - .4byte Move_PSYCHO_CUT - .4byte Move_ZEN_HEADBUTT - .4byte Move_MIRROR_SHOT - .4byte Move_FLASH_CANNON - .4byte Move_ROCK_CLIMB - .4byte Move_DEFOG - .4byte Move_TRICK_ROOM - .4byte Move_DRACO_METEOR - .4byte Move_DISCHARGE - .4byte Move_LAVA_PLUME - .4byte Move_LEAF_STORM - .4byte Move_POWER_WHIP - .4byte Move_ROCK_WRECKER - .4byte Move_CROSS_POISON - .4byte Move_GUNK_SHOT - .4byte Move_IRON_HEAD - .4byte Move_MAGNET_BOMB - .4byte Move_STONE_EDGE - .4byte Move_CAPTIVATE - .4byte Move_STEALTH_ROCK - .4byte Move_GRASS_KNOT - .4byte Move_CHATTER - .4byte Move_JUDGMENT - .4byte Move_BUG_BITE - .4byte Move_CHARGE_BEAM - .4byte Move_WOOD_HAMMER - .4byte Move_AQUA_JET - .4byte Move_ATTACK_ORDER - .4byte Move_DEFEND_ORDER - .4byte Move_HEAL_ORDER - .4byte Move_HEAD_SMASH - .4byte Move_DOUBLE_HIT - .4byte Move_ROAR_OF_TIME - .4byte Move_SPACIAL_REND - .4byte Move_LUNAR_DANCE - .4byte Move_CRUSH_GRIP - .4byte Move_MAGMA_STORM - .4byte Move_DARK_VOID - .4byte Move_SEED_FLARE - .4byte Move_OMINOUS_WIND - .4byte Move_SHADOW_FORCE -@@@@@@@@@@@@ GEN 5 @@@@@@@@@@@@ - .4byte Move_HONE_CLAWS - .4byte Move_WIDE_GUARD - .4byte Move_GUARD_SPLIT - .4byte Move_POWER_SPLIT - .4byte Move_WONDER_ROOM - .4byte Move_PSYSHOCK - .4byte Move_VENOSHOCK - .4byte Move_AUTOTOMIZE - .4byte Move_RAGE_POWDER - .4byte Move_TELEKINESIS - .4byte Move_MAGIC_ROOM - .4byte Move_SMACK_DOWN - .4byte Move_STORM_THROW - .4byte Move_FLAME_BURST - .4byte Move_SLUDGE_WAVE - .4byte Move_QUIVER_DANCE - .4byte Move_HEAVY_SLAM - .4byte Move_SYCHRONOISE - .4byte Move_ELECTRO_BALL - .4byte Move_SOAK - .4byte Move_FLAME_CHARGE - .4byte Move_COIL - .4byte Move_LOW_SWEEP - .4byte Move_ACID_SPRAY - .4byte Move_FOUL_PLAY - .4byte Move_SIMPLE_BEAM - .4byte Move_ENTRAINMENT - .4byte Move_AFTER_YOU - .4byte Move_ROUND - .4byte Move_ECHOED_VOICE - .4byte Move_CHIP_AWAY - .4byte Move_CLEAR_SMOG - .4byte Move_STORED_POWER - .4byte Move_QUICK_GUARD - .4byte Move_ALLY_SWITCH - .4byte Move_SCALD - .4byte Move_SHELL_SMASH - .4byte Move_HEAL_PULSE - .4byte Move_HEX - .4byte Move_SKY_DROP - .4byte Move_SHIFT_GEAR - .4byte Move_CIRCLE_THROW - .4byte Move_INCINERATE - .4byte Move_QUASH - .4byte Move_ACROBATICS - .4byte Move_REFLECT_TYPE - .4byte Move_RETALIATE - .4byte Move_FINAL_GAMBIT - .4byte Move_BESTOW - .4byte Move_INFERNO - .4byte Move_WATER_PLEDGE - .4byte Move_FIRE_PLEDGE - .4byte Move_GRASS_PLEDGE - .4byte Move_VOLT_SWITCH - .4byte Move_STRUGGLE_BUG - .4byte Move_BULLDOZE - .4byte Move_FROST_BREATH - .4byte Move_DRAGON_TAIL - .4byte Move_WORK_UP - .4byte Move_ELECTROWEB - .4byte Move_WILD_CHARGE - .4byte Move_DRILL_RUN - .4byte Move_DUAL_CHOP - .4byte Move_HEART_STAMP - .4byte Move_HORN_LEECH - .4byte Move_SACRED_SWORD - .4byte Move_RAZOR_SHELL - .4byte Move_HEAT_CRASH - .4byte Move_LEAF_TORNADO - .4byte Move_STEAMROLLER - .4byte Move_COTTON_GUARD - .4byte Move_NIGHT_DAZE - .4byte Move_PSYSTRIKE - .4byte Move_TAIL_SLAP - .4byte Move_HURRICANE - .4byte Move_HEAD_CHARGE - .4byte Move_GEAR_GRIND - .4byte Move_SEARING_SHOT - .4byte Move_TECHNO_BLAST - .4byte Move_RELIC_SONG - .4byte Move_SECRET_SWORD - .4byte Move_GLACIATE - .4byte Move_BOLT_STRIKE - .4byte Move_BLUE_FLARE - .4byte Move_FIERY_DANCE - .4byte Move_FREEZE_SHOCK - .4byte Move_ICE_BURN - .4byte Move_SNARL - .4byte Move_ICICLE_CRASH - .4byte Move_V_CREATE - .4byte Move_FUSION_FLARE - .4byte Move_FUSION_BOLT -@@@@@@@@@@@@ GEN 6 @@@@@@@@@@@@ - .4byte Move_FLYING_PRESS - .4byte Move_MAT_BLOCK - .4byte Move_BELCH - .4byte Move_ROTOTILLER - .4byte Move_STICKY_WEB - .4byte Move_FELL_STINGER - .4byte Move_PHANTOM_FORCE - .4byte Move_TRICK_OR_TREAT - .4byte Move_NOBLE_ROAR - .4byte Move_ION_DELUGE - .4byte Move_PARABOLIC_CHARGE - .4byte Move_FORESTS_CURSE - .4byte Move_PETAL_BLIZZARD - .4byte Move_FREEZE_DRY - .4byte Move_DISARMING_VOICE - .4byte Move_PARTING_SHOT - .4byte Move_TOPSY_TURVY - .4byte Move_DRAINING_KISS - .4byte Move_CRAFTY_SHIELD - .4byte Move_FLOWER_SHIELD - .4byte Move_GRASSY_TERRAIN - .4byte Move_MISTY_TERRAIN - .4byte Move_ELECTRIFY - .4byte Move_PLAY_ROUGH - .4byte Move_FAIRY_WIND - .4byte Move_MOONBLAST - .4byte Move_BOOMBURST - .4byte Move_FAIRY_LOCK - .4byte Move_KINGS_SHIELD - .4byte Move_PLAY_NICE - .4byte Move_CONFIDE - .4byte Move_DIAMOND_STORM - .4byte Move_STEAM_ERUPTION - .4byte Move_HYPERSPACE_HOLE - .4byte Move_WATER_SHURIKEN - .4byte Move_MYSTICAL_FIRE - .4byte Move_SPIKY_SHIELD - .4byte Move_AROMATIC_MIST - .4byte Move_EERIE_IMPULSE - .4byte Move_VENOM_DRENCH - .4byte Move_POWDER - .4byte Move_GEOMANCY - .4byte Move_MAGNETIC_FLUX - .4byte Move_HAPPY_HOUR - .4byte Move_ELECTRIC_TERRAIN - .4byte Move_DAZZLING_GLEAM - .4byte Move_CELEBRATE - .4byte Move_HOLD_HANDS - .4byte Move_BABY_DOLL_EYES - .4byte Move_NUZZLE - .4byte Move_HOLD_BACK - .4byte Move_INFESTATION - .4byte Move_POWER_UP_PUNCH - .4byte Move_OBLIVION_WING - .4byte Move_THOUSAND_ARROWS - .4byte Move_THOUSAND_WAVES - .4byte Move_LANDS_WRATH - .4byte Move_LIGHT_OF_RUIN - .4byte Move_ORIGIN_PULSE - .4byte Move_PRECIPICE_BLADES - .4byte Move_DRAGON_ASCENT - .4byte Move_HYPERSPACE_FURY -@@@@@@@@@@@@ GEN 7 @@@@@@@@@@@@ - .4byte Move_SHORE_UP - .4byte Move_FIRST_IMPRESSION - .4byte Move_BANEFUL_BUNKER - .4byte Move_SPIRIT_SHACKLE - .4byte Move_DARKEST_LARIAT - .4byte Move_SPARKLING_ARIA - .4byte Move_ICE_HAMMER - .4byte Move_FLORAL_HEALING - .4byte Move_HIGH_HORSEPOWER - .4byte Move_STRENGTH_SAP - .4byte Move_SOLAR_BLADE - .4byte Move_LEAFAGE - .4byte Move_SPOTLIGHT - .4byte Move_TOXIC_THREAD - .4byte Move_LASER_FOCUS - .4byte Move_GEAR_UP - .4byte Move_THROAT_CHOP - .4byte Move_POLLEN_PUFF - .4byte Move_ANCHOR_SHOT - .4byte Move_PSYCHIC_TERRAIN - .4byte Move_LUNGE - .4byte Move_FIRE_LASH - .4byte Move_POWER_TRIP - .4byte Move_BURN_UP - .4byte Move_SPEED_SWAP - .4byte Move_SMART_STRIKE - .4byte Move_PURIFY - .4byte Move_REVELATION_DANCE - .4byte Move_CORE_ENFORCER - .4byte Move_TROP_KICK - .4byte Move_INSTRUCT - .4byte Move_BEAK_BLAST - .4byte Move_CLANGING_SCALES - .4byte Move_DRAGON_HAMMER - .4byte Move_BRUTAL_SWING - .4byte Move_AURORA_VEIL - .4byte Move_SHELL_TRAP - .4byte Move_FLEUR_CANNON - .4byte Move_PSYCHIC_FANGS - .4byte Move_STOMPING_TANTRUM - .4byte Move_SHADOW_BONE - .4byte Move_ACCELEROCK - .4byte Move_LIQUIDATION - .4byte Move_PRISMATIC_LASER - .4byte Move_SPECTRAL_THIEF - .4byte Move_SUNSTEEL_STRIKE - .4byte Move_MOONGEIST_BEAM - .4byte Move_TEARFUL_LOOK - .4byte Move_ZING_ZAP - .4byte Move_NATURES_MADNESS - .4byte Move_MULTI_ATTACK - .4byte Move_MIND_BLOWN - .4byte Move_PLASMA_FISTS - .4byte Move_PHOTON_GEYSER - .4byte Move_ZIPPY_ZAP - .4byte Move_SPLISHY_SPLASH - .4byte Move_FLOATY_FALL - .4byte Move_PIKA_PAPOW - .4byte Move_BOUNCY_BUBBLE - .4byte Move_BUZZY_BUZZ - .4byte Move_SIZZLY_SLIDE - .4byte Move_GLITZY_GLOW - .4byte Move_BADDY_BAD - .4byte Move_SAPPY_SEED - .4byte Move_FREEZY_FROST - .4byte Move_SPARKLY_SWIRL - .4byte Move_VEEVEE_VOLLEY - .4byte Move_DOUBLE_IRON_BASH -@@@@@@@@@@@@ GEN 8 @@@@@@@@@@@@ - .4byte Move_DYNAMAX_CANNON - .4byte Move_SNIPE_SHOT - .4byte Move_JAW_LOCK - .4byte Move_STUFF_CHEEKS - .4byte Move_NO_RETREAT - .4byte Move_TAR_SHOT - .4byte Move_MAGIC_POWDER - .4byte Move_DRAGON_DARTS - .4byte Move_TEATIME - .4byte Move_OCTOLOCK - .4byte Move_BOLT_BEAK - .4byte Move_FISHIOUS_REND - .4byte Move_COURT_CHANGE - .4byte Move_CLANGOROUS_SOUL - .4byte Move_BODY_PRESS - .4byte Move_DECORATE - .4byte Move_DRUM_BEATING - .4byte Move_SNAP_TRAP - .4byte Move_PYRO_BALL - .4byte Move_BEHEMOTH_BLADE - .4byte Move_BEHEMOTH_BASH - .4byte Move_AURA_WHEEL - .4byte Move_BREAKING_SWIPE - .4byte Move_BRANCH_POKE - .4byte Move_OVERDRIVE - .4byte Move_APPLE_ACID - .4byte Move_GRAV_APPLE - .4byte Move_SPIRIT_BREAK - .4byte Move_STRANGE_STEAM - .4byte Move_LIFE_DEW - .4byte Move_OBSTRUCT - .4byte Move_FALSE_SURRENDER - .4byte Move_METEOR_ASSAULT - .4byte Move_ETERNA_BEAM - .4byte Move_STEEL_BEAM - .4byte Move_EXPANDING_FORCE - .4byte Move_STEEL_ROLLER - .4byte Move_SCALE_SHOT - .4byte Move_METEOR_BEAM - .4byte Move_SHELL_SIDE_ARM - .4byte Move_MISTY_EXPLOSION - .4byte Move_GRASSY_GLIDE - .4byte Move_RISING_VOLTAGE - .4byte Move_TERRAIN_PULSE - .4byte Move_SKITTER_SMACK - .4byte Move_BURNING_JEALOUSY - .4byte Move_LASH_OUT - .4byte Move_POLTERGEIST - .4byte Move_CORROSIVE_GAS - .4byte Move_COACHING - .4byte Move_FLIP_TURN - .4byte Move_TRIPLE_AXEL - .4byte Move_DUAL_WINGBEAT - .4byte Move_SCORCHING_SANDS - .4byte Move_JUNGLE_HEALING - .4byte Move_WICKED_BLOW - .4byte Move_SURGING_STRIKES - .4byte Move_THUNDER_CAGE - .4byte Move_DRAGON_ENERGY - .4byte Move_FREEZING_GLARE - .4byte Move_FIERY_WRATH - .4byte Move_THUNDEROUS_KICK - .4byte Move_GLACIAL_LANCE - .4byte Move_ASTRAL_BARRAGE - .4byte Move_EERIE_SPELL -@@@@ LA MOVES - .4byte Move_DIRE_CLAW - .4byte Move_PSYSHIELD_BASH - .4byte Move_POWER_SHIFT - .4byte Move_STONE_AXE - .4byte Move_SPRINGTIDE_STORM - .4byte Move_MYSTICAL_POWER - .4byte Move_RAGING_FURY - .4byte Move_WAVE_CRASH - .4byte Move_CHLOROBLAST - .4byte Move_MOUNTAIN_GALE - .4byte Move_VICTORY_DANCE - .4byte Move_HEADLONG_RUSH - .4byte Move_BARB_BARRAGE - .4byte Move_ESPER_WING - .4byte Move_BITTER_MALICE - .4byte Move_SHELTER - .4byte Move_TRIPLE_ARROWS - .4byte Move_INFERNAL_PARADE - .4byte Move_CEASELESS_EDGE - .4byte Move_BLEAKWIND_STORM - .4byte Move_WILDBOLT_STORM - .4byte Move_SANDSEAR_STORM - .4byte Move_LUNAR_BLESSING - .4byte Move_TAKE_HEART -@@@@@@@@@@@@ GEN 9 @@@@@@@@@@@@ - .4byte Move_TERA_BLAST - .4byte Move_SILK_TRAP - .4byte Move_AXE_KICK - .4byte Move_LAST_RESPECTS - .4byte Move_LUMINA_CRASH - .4byte Move_ORDER_UP - .4byte Move_JET_PUNCH - .4byte Move_SPICY_EXTRACT - .4byte Move_SPIN_OUT - .4byte Move_POPULATION_BOMB - .4byte Move_ICE_SPINNER - .4byte Move_GLAIVE_RUSH - .4byte Move_REVIVAL_BLESSING - .4byte Move_SALT_CURE - .4byte Move_TRIPLE_DIVE - .4byte Move_MORTAL_SPIN - .4byte Move_DOODLE - .4byte Move_FILLET_AWAY - .4byte Move_KOWTOW_CLEAVE - .4byte Move_FLOWER_TRICK - .4byte Move_TORCH_SONG - .4byte Move_AQUA_STEP - .4byte Move_RAGING_BULL - .4byte Move_MAKE_IT_RAIN - .4byte Move_RUINATION - .4byte Move_COLLISION_COURSE - .4byte Move_ELECTRO_DRIFT - .4byte Move_SHED_TAIL - .4byte Move_CHILLY_RECEPTION - .4byte Move_TIDY_UP - .4byte Move_SNOWSCAPE - .4byte Move_POUNCE - .4byte Move_TRAILBLAZE - .4byte Move_CHILLING_WATER - .4byte Move_HYPER_DRILL - .4byte Move_TWIN_BEAM - .4byte Move_RAGE_FIST - .4byte Move_ARMOR_CANNON - .4byte Move_BITTER_BLADE - .4byte Move_DOUBLE_SHOCK - .4byte Move_GIGATON_HAMMER - .4byte Move_COMEUPPANCE - .4byte Move_AQUA_CUTTER - .4byte Move_BLAZING_TORQUE - .4byte Move_WICKED_TORQUE - .4byte Move_NOXIOUS_TORQUE - .4byte Move_COMBAT_TORQUE - .4byte Move_MAGICAL_TORQUE - .4byte Move_PSYBLADE - .4byte Move_HYDRO_STEAM - .4byte Move_BLOOD_MOON - .4byte Move_MATCHA_GOTCHA - .4byte Move_SYRUP_BOMB - .4byte Move_IVY_CUDGEL - .4byte Move_ELECTRO_SHOT - .4byte Move_TERA_STARSTORM - .4byte Move_FICKLE_BEAM - .4byte Move_BURNING_BULWARK - .4byte Move_THUNDERCLAP - .4byte Move_MIGHTY_CLEAVE - .4byte Move_TACHYON_CUTTER - .4byte Move_HARD_PRESS - .4byte Move_DRAGON_CHEER - .4byte Move_ALLURING_VOICE - .4byte Move_TEMPER_FLARE - .4byte Move_SUPERCELL_SLAM - .4byte Move_PSYCHIC_NOISE - .4byte Move_UPPER_HAND - .4byte Move_MALIGNANT_CHAIN -@@@@ Z MOVES - .4byte Move_BREAKNECK_BLITZ - .4byte Move_ALL_OUT_PUMMELING - .4byte Move_SUPERSONIC_SKYSTRIKE - .4byte Move_ACID_DOWNPOUR - .4byte Move_TECTONIC_RAGE - .4byte Move_CONTINENTAL_CRUSH - .4byte Move_SAVAGE_SPIN_OUT - .4byte Move_NEVER_ENDING_NIGHTMARE - .4byte Move_CORKSCREW_CRASH - .4byte Move_INFERNO_OVERDRIVE - .4byte Move_HYDRO_VORTEX - .4byte Move_BLOOM_DOOM - .4byte Move_GIGAVOLT_HAVOC - .4byte Move_SHATTERED_PSYCHE - .4byte Move_SUBZERO_SLAMMER - .4byte Move_DEVASTATING_DRAKE - .4byte Move_BLACK_HOLE_ECLIPSE - .4byte Move_TWINKLE_TACKLE - .4byte Move_CATASTROPIKA - .4byte Move_10000000_VOLT_THUNDERBOLT - .4byte Move_STOKED_SPARKSURFER - .4byte Move_EXTREME_EVOBOOST - .4byte Move_PULVERIZING_PANCAKE - .4byte Move_GENESIS_SUPERNOVA - .4byte Move_SINISTER_ARROW_RAID - .4byte Move_MALICIOUS_MOONSAULT - .4byte Move_OCEANIC_OPERETTA - .4byte Move_SPLINTERED_STORMSHARDS - .4byte Move_LETS_SNUGGLE_FOREVER - .4byte Move_CLANGOROUS_SOULBLAZE - .4byte Move_GUARDIAN_OF_ALOLA - .4byte Move_SEARING_SUNRAZE_SMASH - .4byte Move_MENACING_MOONRAZE_MAELSTROM - .4byte Move_LIGHT_THAT_BURNS_THE_SKY - .4byte Move_SOUL_STEALING_7_STAR_STRIKE -@@@@ MAX MOVES - .4byte Move_MAX_GUARD - .4byte Move_MAX_STRIKE - .4byte Move_MAX_KNUCKLE - .4byte Move_MAX_AIRSTREAM - .4byte Move_MAX_OOZE - .4byte Move_MAX_QUAKE - .4byte Move_MAX_ROCKFALL - .4byte Move_MAX_FLUTTERBY - .4byte Move_MAX_PHANTASM - .4byte Move_MAX_STEELSPIKE - .4byte Move_MAX_FLARE - .4byte Move_MAX_GEYSER - .4byte Move_MAX_OVERGROWTH - .4byte Move_MAX_LIGHTNING - .4byte Move_MAX_MINDSTORM - .4byte Move_MAX_HAILSTORM - .4byte Move_MAX_WYRMWIND - .4byte Move_MAX_DARKNESS - .4byte Move_MAX_STARFALL -@@@@ G-MAX MOVES - .4byte Move_G_MAX_VINE_LASH - .4byte Move_G_MAX_WILDFIRE - .4byte Move_G_MAX_CANNONADE - .4byte Move_G_MAX_BEFUDDLE - .4byte Move_G_MAX_VOLT_CRASH - .4byte Move_G_MAX_GOLD_RUSH - .4byte Move_G_MAX_CHI_STRIKE - .4byte Move_G_MAX_TERROR - .4byte Move_G_MAX_FOAM_BURST - .4byte Move_G_MAX_RESONANCE - .4byte Move_G_MAX_CUDDLE - .4byte Move_G_MAX_REPLENISH - .4byte Move_G_MAX_MALODOR - .4byte Move_G_MAX_MELTDOWN - .4byte Move_G_MAX_DRUM_SOLO - .4byte Move_G_MAX_FIREBALL - .4byte Move_G_MAX_HYDROSNIPE - .4byte Move_G_MAX_WIND_RAGE - .4byte Move_G_MAX_GRAVITAS - .4byte Move_G_MAX_STONESURGE - .4byte Move_G_MAX_VOLCALITH - .4byte Move_G_MAX_TARTNESS - .4byte Move_G_MAX_SWEETNESS - .4byte Move_G_MAX_SANDBLAST - .4byte Move_G_MAX_STUN_SHOCK - .4byte Move_G_MAX_CENTIFERNO - .4byte Move_G_MAX_SMITE - .4byte Move_G_MAX_SNOOZE - .4byte Move_G_MAX_FINALE - .4byte Move_G_MAX_STEELSURGE - .4byte Move_G_MAX_DEPLETION - .4byte Move_G_MAX_ONE_BLOW - .4byte Move_G_MAX_RAPID_FLOW -@@@ Last Move - cannot be reached - .4byte Move_COUNT - .align 2 gBattleAnims_StatusConditions:: .4byte Status_Poison @ B_ANIM_STATUS_PSN @@ -1045,7 +95,7 @@ gBattleAnims_Special:: .4byte Special_CriticalCaptureBallThrow @ B_ANIM_CRITICAL_CAPTURE_THROW @@@@@@@@@@@@@@@@@@@@@@@ GEN 4 @@@@@@@@@@@@@@@@@@@@@@@ -Move_ROOST: +Move_ROOST:: loadspritegfx ANIM_TAG_WHITE_FEATHER loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATTACKER @@ -1070,7 +120,7 @@ Move_ROOST: waitforvisualfinish end -Move_GRAVITY: +Move_GRAVITY:: fadetobg BG_COSMIC waitbgfadein createvisualtask AnimTask_SetAnimTargetToAttackerOpposite, 1 @@ -1091,7 +141,7 @@ Move_GRAVITY: waitforvisualfinish end -Move_MIRACLE_EYE: +Move_MIRACLE_EYE:: loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO @@ -1109,7 +159,7 @@ Move_MIRACLE_EYE: clearmonbg ANIM_DEF_PARTNER end -Move_WAKE_UP_SLAP: +Move_WAKE_UP_SLAP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT @@ -1129,7 +179,7 @@ Move_WAKE_UP_SLAP: blendoff end -Move_HAMMER_ARM: +Move_HAMMER_ARM:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_SLAM_HIT @@ -1153,7 +203,7 @@ Move_HAMMER_ARM: blendoff end -Move_GYRO_BALL: +Move_GYRO_BALL:: loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK @@ -1183,7 +233,7 @@ Move_GYRO_BALL: waitforvisualfinish end -Move_HEALING_WISH: +Move_HEALING_WISH:: loadspritegfx ANIM_TAG_GREEN_SPARKLE setalpha 0, 16 createvisualtask AnimTask_AlphaFadeIn, 3, 0, 16, 16, 0, 1 @@ -1203,7 +253,7 @@ Move_HEALING_WISH: waitforvisualfinish end -Move_BRINE: +Move_BRINE:: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -1217,7 +267,7 @@ Move_BRINE: blendoff end -Move_NATURAL_GIFT: +Move_NATURAL_GIFT:: loadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER @@ -1246,7 +296,7 @@ Move_NATURAL_GIFT: delay 1 end -Move_FEINT: +Move_FEINT:: loadspritegfx ANIM_TAG_FEINT createsprite gFeintSwipeSpriteTemplate, ANIM_ATTACKER, 10, -32, 0, 15 playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER @@ -1260,7 +310,7 @@ Move_FEINT: waitforvisualfinish end -Move_PLUCK: +Move_PLUCK:: loadspritegfx ANIM_TAG_SEED_BROWN loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER @@ -1286,7 +336,7 @@ Move_PLUCK: waitforvisualfinish end -Move_TAILWIND: +Move_TAILWIND:: loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER call SetHighSpeedBg @@ -1349,7 +399,7 @@ General_Tailwind: delay 1 end -Move_ACUPRESSURE: +Move_ACUPRESSURE:: loadspritegfx ANIM_TAG_ACUPRESSURE loadspritegfx ANIM_TAG_SPARK_2 createsprite gAcupressureSpriteTemplate, ANIM_ATTACKER, 40, 0, -40, 40 @@ -1357,7 +407,7 @@ Move_ACUPRESSURE: call ElectricityEffect end -Move_METAL_BURST: +Move_METAL_BURST:: loadspritegfx ANIM_TAG_ECLIPSING_ORB loadspritegfx ANIM_TAG_RED_ORB loopsewithpan SE_M_TRI_ATTACK, -64, 18, 3 @@ -1380,7 +430,7 @@ Move_METAL_BURST: waitforvisualfinish end -Move_U_TURN: +Move_U_TURN:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -1409,7 +459,7 @@ UTurnVisible: createsprite gFlyBallAttackSpriteTemplate, ANIM_ATTACKER, 2, 20, FALSE goto UTurnContinue -Move_CLOSE_COMBAT: +Move_CLOSE_COMBAT:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET call SetHighSpeedBg @@ -1445,7 +495,7 @@ Move_CLOSE_COMBAT: delay 1 end -Move_PAYBACK: +Move_PAYBACK:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK @@ -1477,7 +527,7 @@ Move_PAYBACK: waitbgfadein end -Move_ASSURANCE: +Move_ASSURANCE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE monbg ANIM_TARGET @@ -1496,7 +546,7 @@ Move_ASSURANCE: waitbgfadein end -Move_EMBARGO: +Move_EMBARGO:: loadspritegfx ANIM_TAG_RED_ORB monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -1518,7 +568,7 @@ EmbargoOrbs1: delay 12 return -Move_FLING: +Move_FLING:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BLACK_BALL monbg ANIM_DEF_PARTNER @@ -1534,7 +584,7 @@ Move_FLING: blendoff end -Move_PSYCHO_SHIFT: +Move_PSYCHO_SHIFT:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -1560,7 +610,7 @@ Move_PSYCHO_SHIFT: blendoff end -Move_TRUMP_CARD: +Move_TRUMP_CARD:: loadspritegfx ANIM_TAG_TRUMP_CARD loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_TRUMP_CARD_PARTICLES @@ -1604,7 +654,7 @@ Move_TRUMP_CARD: waitforvisualfinish end -Move_HEAL_BLOCK: +Move_HEAL_BLOCK:: loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET createsoundtask SoundTask_PlaySeChangingVolume, SE_M_ABSORB_2, SOUND_PAN_TARGET, 256, -16, 0, 2 @@ -1628,7 +678,7 @@ Move_HEAL_BLOCK: clearmonbg ANIM_TARGET end -Move_WRING_OUT: +Move_WRING_OUT:: loadspritegfx ANIM_TAG_WRING_OUT monbg ANIM_TARGET setalpha 12, 8 @@ -1649,7 +699,7 @@ Move_WRING_OUT: waitforvisualfinish end -Move_POWER_TRICK: +Move_POWER_TRICK:: loadspritegfx ANIM_TAG_POWER_TRICK loopsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET 0xa 0x3 createvisualtask AnimTask_UproarDistortion 0x2, 0x0 @@ -1661,7 +711,7 @@ Move_POWER_TRICK: waitforvisualfinish end -Move_GASTRO_ACID: +Move_GASTRO_ACID:: loadspritegfx ANIM_TAG_GREEN_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gGreenPoisonBubble, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0, FALSE @@ -1693,7 +743,7 @@ Move_GASTRO_ACID: clearmonbg ANIM_DEF_PARTNER end -Move_LUCKY_CHANT: +Move_LUCKY_CHANT:: loadspritegfx ANIM_TAG_GOLD_STARS monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -1720,10 +770,10 @@ Move_LUCKY_CHANT: unloadspritegfx ANIM_TAG_GOLD_STARS end -Move_ME_FIRST: +Move_ME_FIRST:: end -Move_COPYCAT: +Move_COPYCAT:: loadspritegfx ANIM_TAG_GRAY_ORB loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER @@ -1745,7 +795,7 @@ Move_COPYCAT: waitforvisualfinish end -Move_POWER_SWAP: +Move_POWER_SWAP:: loadspritegfx ANIM_TAG_COLORED_ORBS playsewithpan SE_M_DOUBLE_TEAM, 0 createsprite gPowerSwapGuardSwapSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 0, 42, -32 @@ -1787,7 +837,7 @@ Move_POWER_SWAP: waitforvisualfinish end -Move_GUARD_SWAP: +Move_GUARD_SWAP:: loadspritegfx ANIM_TAG_COLORED_ORBS playsewithpan SE_M_DOUBLE_TEAM, 0 createsprite gPowerSwapGuardSwapSpriteTemplate, ANIM_TARGET, 3, 0, 0, 2, 0, 42, -32 @@ -1829,7 +879,7 @@ Move_GUARD_SWAP: waitforvisualfinish end -Move_PUNISHMENT: +Move_PUNISHMENT:: loadspritegfx ANIM_TAG_SCRATCH loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET @@ -1852,7 +902,7 @@ Move_PUNISHMENT: blendoff end -Move_LAST_RESORT: +Move_LAST_RESORT:: fadetobg BG_COSMIC waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 2, 4, 0, 128, 0, -1 @@ -1890,7 +940,7 @@ Move_LAST_RESORT: call UnsetHighSpeedBg end -Move_WORRY_SEED: +Move_WORRY_SEED:: loadspritegfx ANIM_TAG_WORRY_SEED loadspritegfx ANIM_TAG_SMALL_CLOUD playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER @@ -1904,7 +954,7 @@ Move_WORRY_SEED: waitforvisualfinish end -Move_SUCKER_PUNCH: +Move_SUCKER_PUNCH:: loadspritegfx ANIM_TAG_POISON_JAB loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, 2, 5, 0, 20, 0, 0, 4 @@ -1917,7 +967,7 @@ Move_SUCKER_PUNCH: createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 3, 0, 1, 4 end -Move_TOXIC_SPIKES: +Move_TOXIC_SPIKES:: loadspritegfx ANIM_TAG_TOXIC_SPIKES loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER @@ -1937,10 +987,10 @@ Move_TOXIC_SPIKES: clearmonbg ANIM_DEF_PARTNER end -Move_HEART_SWAP: +Move_HEART_SWAP:: end -Move_AQUA_RING: +Move_AQUA_RING:: General_AquaRingHeal: loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -1989,7 +1039,7 @@ General_AquaRingHeal: blendoff end -Move_MAGNET_RISE: +Move_MAGNET_RISE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 @@ -2026,7 +1076,7 @@ Move_MAGNET_RISE: waitforvisualfinish end -Move_FLARE_BLITZ: +Move_FLARE_BLITZ:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER @@ -2103,7 +1153,7 @@ Move_FLARE_BLITZ: waitbgfadein end -Move_FORCE_PALM: +Move_FORCE_PALM:: loadspritegfx ANIM_TAG_SHADOW_BALL loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -2121,7 +1171,7 @@ Move_FORCE_PALM: blendoff end -Move_AURA_SPHERE: +Move_AURA_SPHERE:: loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATK_PARTNER @@ -2146,7 +1196,7 @@ SetAuraSphereBG: fadetobg BG_AURA_SPHERE goto SetHighSpeedBgFade -Move_ROCK_POLISH: +Move_ROCK_POLISH:: loadspritegfx ANIM_TAG_WHITE_STREAK loadspritegfx ANIM_TAG_SPARKLE_3 setalpha 12, 8 @@ -2213,7 +1263,7 @@ Move_ROCK_POLISH: blendoff end -Move_POISON_JAB: +Move_POISON_JAB:: loadspritegfx ANIM_TAG_PURPLE_JAB loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -2267,7 +1317,7 @@ Move_POISON_JAB: blendoff end -Move_DARK_PULSE: +Move_DARK_PULSE:: loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_TARGET fadetobg BG_DARK @@ -2295,7 +1345,7 @@ Move_DARK_PULSE: waitbgfadein end -Move_NIGHT_SLASH: +Move_NIGHT_SLASH:: loadspritegfx ANIM_TAG_SLASH createvisualtask AnimTask_BlendNightSlash, 2, ANIM_TARGET, 2, 0, 8, 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 3, 0, 12, RGB_BLACK @@ -2315,7 +1365,7 @@ Move_NIGHT_SLASH: waitforvisualfinish end -Move_AQUA_TAIL: +Move_AQUA_TAIL:: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -2369,7 +1419,7 @@ Move_AQUA_TAIL: blendoff end -Move_SEED_BOMB: +Move_SEED_BOMB:: loadspritegfx ANIM_TAG_SEED loadspritegfx ANIM_TAG_EXPLOSION createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 @@ -2418,7 +1468,7 @@ Move_SEED_BOMB: waitforvisualfinish end -Move_AIR_SLASH: +Move_AIR_SLASH:: loadspritegfx ANIM_TAG_SLASH call SetSkyBg createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 @@ -2431,7 +1481,7 @@ Move_AIR_SLASH: call UnsetSkyBg end -Move_XSCISSOR: +Move_X_SCISSOR:: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 @@ -2449,7 +1499,7 @@ Move_XSCISSOR: blendoff end -Move_BUG_BUZZ: +Move_BUG_BUZZ:: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_DEF_PARTNER @@ -2476,7 +1526,7 @@ Move_BUG_BUZZ: call UnsetBugBg end -Move_DRAGON_PULSE: +Move_DRAGON_PULSE:: loadspritegfx ANIM_TAG_DRAGON_PULSE monbg ANIM_TARGET setalpha 12, 8 @@ -2509,7 +1559,7 @@ DragonPulseParticle: delay 4 return -Move_DRAGON_RUSH: +Move_DRAGON_RUSH:: loadspritegfx ANIM_TAG_SLAM_HIT_2 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS @@ -2538,7 +1588,7 @@ Move_DRAGON_RUSH: blendoff end -Move_POWER_GEM: @ Copy of Hidden Power with background blackened +Move_POWER_GEM:: @ Copy of Hidden Power with background blackened loadspritegfx ANIM_TAG_POWER_GEM createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish @@ -2572,7 +1622,7 @@ Move_POWER_GEM: @ Copy of Hidden Power with background blackened waitforvisualfinish end -Move_DRAIN_PUNCH: +Move_DRAIN_PUNCH:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BLUE_STAR @@ -2593,7 +1643,7 @@ Move_DRAIN_PUNCH: blendoff end -Move_VACUUM_WAVE: +Move_VACUUM_WAVE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_THIN_RING @@ -2609,7 +1659,7 @@ Move_VACUUM_WAVE: blendoff end -Move_FOCUS_BLAST: +Move_FOCUS_BLAST:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_FLAT_ROCK @@ -2633,7 +1683,7 @@ SetFocusBlastBG: fadetobg BG_FOCUS_BLAST goto SetHighSpeedBgFade -Move_ENERGY_BALL: +Move_ENERGY_BALL:: loadspritegfx ANIM_TAG_ENERGY_BALL monbg ANIM_TARGET setalpha 12, 8 @@ -2651,7 +1701,7 @@ Move_ENERGY_BALL: blendoff end -Move_BRAVE_BIRD: +Move_BRAVE_BIRD:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BIRD call SetSkyBg @@ -2674,7 +1724,7 @@ Move_BRAVE_BIRD: call UnsetSkyBg end -Move_EARTH_POWER: +Move_EARTH_POWER:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME createvisualtask AnimTask_HorizontalShake, 3, ANIM_DEF_PARTNER, 10, 50 @@ -2703,7 +1753,7 @@ Move_EARTH_POWER: waitforvisualfinish end -Move_SWITCHEROO: +Move_SWITCHEROO:: fadetobg BG_DARK waitbgfadein loadspritegfx ANIM_TAG_ITEM_BAG @@ -2735,7 +1785,7 @@ Move_SWITCHEROO: waitbgfadein end -Move_GIGA_IMPACT: +Move_GIGA_IMPACT:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -2779,7 +1829,7 @@ GigaImpactContinuity: waitforvisualfinish end -Move_NASTY_PLOT: +Move_NASTY_PLOT:: loadspritegfx ANIM_TAG_AMNESIA fadetobg BG_DARK waitbgfadeout @@ -2794,7 +1844,7 @@ Move_NASTY_PLOT: call UnsetPsychicBg end -Move_BULLET_PUNCH: +Move_BULLET_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET @@ -2848,7 +1898,7 @@ Move_BULLET_PUNCH: blendoff end -Move_AVALANCHE: +Move_AVALANCHE:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_ICE_CHUNK monbg ANIM_DEF_PARTNER @@ -2899,7 +1949,7 @@ SnowSlide1: delay 2 return -Move_ICE_SHARD: +Move_ICE_SHARD:: monbg ANIM_TARGET splitbgprio ANIM_TARGET setalpha 12, 8 @@ -2935,7 +1985,7 @@ Move_ICE_SHARD: blendoff end -Move_SHADOW_CLAW: +Move_SHADOW_CLAW:: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_TORN_METAL @@ -2961,7 +2011,7 @@ Move_SHADOW_CLAW: clearmonbg ANIM_TARGET end -Move_THUNDER_FANG: +Move_THUNDER_FANG:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_LIGHTNING loadspritegfx ANIM_TAG_SHARP_TEETH @@ -2995,7 +2045,7 @@ Move_THUNDER_FANG: delay 1 end -Move_ICE_FANG: +Move_ICE_FANG:: monbg ANIM_TARGET setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -3032,7 +2082,7 @@ Move_ICE_FANG: delay 1 end -Move_FIRE_FANG: +Move_FIRE_FANG:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT @@ -3061,7 +2111,7 @@ Move_FIRE_FANG: delay 1 end -Move_SHADOW_SNEAK: +Move_SHADOW_SNEAK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @Black Colour @@ -3099,7 +2149,7 @@ ShadowSneakMovement: delay 0x4 return -Move_MUD_BOMB: +Move_MUD_BOMB:: loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 @@ -3150,7 +2200,7 @@ Move_MUD_BOMB: waitforvisualfinish end -Move_PSYCHO_CUT: +Move_PSYCHO_CUT:: loadspritegfx ANIM_TAG_SPIRAL loadspritegfx ANIM_TAG_PSYCHO_CUT loadspritegfx ANIM_TAG_CROSS_IMPACT @@ -3178,7 +2228,7 @@ Move_PSYCHO_CUT: waitforvisualfinish end -Move_ZEN_HEADBUTT: +Move_ZEN_HEADBUTT:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_ATTACKER @@ -3210,7 +2260,7 @@ Move_ZEN_HEADBUTT: delay 1 end -Move_MIRROR_SHOT: +Move_MIRROR_SHOT:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK waitforvisualfinish @@ -3244,7 +2294,7 @@ Move_MIRROR_SHOT: blendoff end -Move_FLASH_CANNON: +Move_FLASH_CANNON:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRIC_ORBS @@ -3281,7 +2331,7 @@ Move_FLASH_CANNON: clearmonbg ANIM_TARGET end -Move_ROCK_CLIMB: +Move_ROCK_CLIMB:: delay 8 loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish @@ -3316,7 +2366,7 @@ Move_ROCK_CLIMB: blendoff end -Move_DEFOG: +Move_DEFOG:: loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT monbg ANIM_ATTACKER setalpha 12, 8 @@ -3351,7 +2401,7 @@ InitRoomAnimation: return @ Credits to Skeli -Move_DRACO_METEOR: +Move_DRACO_METEOR:: loadspritegfx ANIM_TAG_ROCKS @Rocks loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS @Gray Colour loadspritegfx ANIM_TAG_WATER_GUN @Sparkles Trail @@ -3436,7 +2486,7 @@ DracoMeteor4: createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xffb0, 0xffc0, 0xFFF8, 0x20, 0x19 return -Move_DISCHARGE: +Move_DISCHARGE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 @@ -3541,7 +2591,7 @@ DischargeElectrify: createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_ATK_PARTNER return -Move_LAVA_PLUME: +Move_LAVA_PLUME:: loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan 152, SOUND_PAN_ATTACKER, 9, 2 createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_RED @@ -3561,7 +2611,7 @@ Move_LAVA_PLUME: waitforvisualfinish end -Move_LEAF_STORM: +Move_LEAF_STORM:: loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_LEAF @@ -3673,7 +2723,7 @@ Move_LEAF_STORM: clearmonbg ANIM_DEF_PARTNER end -Move_POWER_WHIP: +Move_POWER_WHIP:: loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 10 @@ -3687,7 +2737,7 @@ Move_POWER_WHIP: waitbgfadein end -Move_ROCK_WRECKER: +Move_ROCK_WRECKER:: jumpargeq 7, 1, RockWrecker_1 fadetobg BG_ROCK_WRECKER waitbgfadeout @@ -3733,7 +2783,7 @@ RockWrecker_2: call UnsetPsychicBg end -Move_CROSS_POISON: +Move_CROSS_POISON:: loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_TARGET @@ -3749,7 +2799,7 @@ Move_CROSS_POISON: blendoff end -Move_GUNK_SHOT: +Move_GUNK_SHOT:: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_WATER_IMPACT @@ -3806,7 +2856,7 @@ SetGunkShotBG: goto SetHighSpeedBgFade -Move_IRON_HEAD: +Move_IRON_HEAD:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 @@ -3828,7 +2878,7 @@ Move_IRON_HEAD: waitforvisualfinish end -Move_MAGNET_BOMB: +Move_MAGNET_BOMB:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 @@ -3893,7 +2943,7 @@ Move_MAGNET_BOMB: waitforvisualfinish end -Move_STONE_EDGE: +Move_STONE_EDGE:: loadspritegfx ANIM_TAG_STONE_EDGE loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET @@ -3952,7 +3002,7 @@ Move_STONE_EDGE: blendoff end -Move_CAPTIVATE: +Move_CAPTIVATE:: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_DEF_PARTNER, 0, 2, 0 @@ -3968,7 +3018,7 @@ Move_CAPTIVATE: waitforvisualfinish end -Move_STEALTH_ROCK: +Move_STEALTH_ROCK:: loadspritegfx ANIM_TAG_STEALTH_ROCK monbg ANIM_DEF_PARTNER playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER @@ -3985,7 +3035,7 @@ Move_STEALTH_ROCK: clearmonbg ANIM_DEF_PARTNER end -Move_GRASS_KNOT: +Move_GRASS_KNOT:: loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, 2, 5, 0, 20, 0, 0, 4 @@ -3998,7 +3048,7 @@ Move_GRASS_KNOT: createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 3, 0, 1, 4 end -Move_CHATTER: +Move_CHATTER:: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_MUSIC_NOTES @@ -4038,7 +3088,7 @@ Move_CHATTER: clearmonbg ANIM_DEF_PARTNER end -Move_JUDGMENT: +Move_JUDGMENT:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_GREEN_SPIKE @@ -4134,7 +3184,7 @@ JudgmentInwardSpikes2: createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFDA, 0xFF94, 16 @between up and upper left return -Move_BUG_BITE: +Move_BUG_BITE:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -4175,7 +3225,7 @@ Move_BUG_BITE: blendoff end -Move_CHARGE_BEAM: +Move_CHARGE_BEAM:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY @@ -4227,7 +3277,7 @@ SparkBeam: delay 1 return -Move_WOOD_HAMMER: +Move_WOOD_HAMMER:: loadspritegfx ANIM_TAG_WOOD_HAMMER loadspritegfx ANIM_TAG_WOOD_HAMMER_HAMMER loadspritegfx ANIM_TAG_IMPACT @@ -4256,7 +3306,7 @@ WoodHammerImpact: createsprite gWoodHammerSmallSpriteTemplate, ANIM_TARGET, 2, -5, 0, -20, -24, 20, 2 return -Move_AQUA_JET: +Move_AQUA_JET:: loadspritegfx ANIM_TAG_SPARKLE_6 loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_SPLASH @@ -4289,7 +3339,7 @@ Move_AQUA_JET: blendoff end -Move_ATTACK_ORDER: +Move_ATTACK_ORDER:: loadspritegfx ANIM_TAG_ATTACK_ORDER loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS @@ -4335,7 +3385,7 @@ Move_ATTACK_ORDER: blendoff end -Move_DEFEND_ORDER: +Move_DEFEND_ORDER:: loadspritegfx ANIM_TAG_ATTACK_ORDER loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS @@ -4372,7 +3422,7 @@ Move_DEFEND_ORDER: waitforvisualfinish end -Move_HEAL_ORDER: +Move_HEAL_ORDER:: loadspritegfx ANIM_TAG_ATTACK_ORDER loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS @@ -4409,7 +3459,7 @@ Move_HEAL_ORDER: waitforvisualfinish end -Move_HEAD_SMASH: +Move_HEAD_SMASH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS createvisualtask AnimTask_SkullBashPosition, 2, 0 @@ -4431,7 +3481,7 @@ Move_HEAD_SMASH: waitbgfadein end -Move_DOUBLE_HIT: +Move_DOUBLE_HIT:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 @@ -4453,7 +3503,7 @@ Move_DOUBLE_HIT: blendoff end -Move_ROAR_OF_TIME: +Move_ROAR_OF_TIME:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_WATER_GUN @@ -4494,7 +3544,7 @@ Move_ROAR_OF_TIME: waitforvisualfinish end -Move_SPACIAL_REND: +Move_SPACIAL_REND:: loadspritegfx ANIM_TAG_PUNISHMENT_BLADES loadspritegfx ANIM_TAG_PINK_HEART_2 @ANIM_TAG_BERRY_EATEN monbg ANIM_ATK_PARTNER @@ -4528,7 +3578,7 @@ Move_SPACIAL_REND: blendoff end -Move_LUNAR_DANCE: +Move_LUNAR_DANCE:: loadspritegfx ANIM_TAG_MOON loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_HOLLOW_ORB @@ -4569,7 +3619,7 @@ Move_LUNAR_DANCE: delay 1 end -Move_CRUSH_GRIP: +Move_CRUSH_GRIP:: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_ACUPRESSURE loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE @@ -4594,7 +3644,7 @@ Move_CRUSH_GRIP: blendoff end -Move_MAGMA_STORM: +Move_MAGMA_STORM:: loadspritegfx ANIM_TAG_SMALL_EMBER fadetobg BG_MAGMA_STORM @Add new bg waitbgfadeout @@ -4619,7 +3669,7 @@ Move_MAGMA_STORM: blendoff end -Move_DARK_VOID: +Move_DARK_VOID:: loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @Black Colour loadspritegfx ANIM_TAG_SPARKLE_2 @Healing Stars @@ -4646,7 +3696,7 @@ Move_DARK_VOID: visible ANIM_DEF_PARTNER end -Move_SEED_FLARE: +Move_SEED_FLARE:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge animation loadspritegfx ANIM_TAG_LEAF @green color loadspritegfx ANIM_TAG_RAZOR_LEAF @green color 2 @@ -4731,7 +3781,7 @@ Move_SEED_FLARE: blendoff end -Move_OMINOUS_WIND: +Move_OMINOUS_WIND:: loadspritegfx ANIM_TAG_SPARKLE_6 panse SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET 2, 0 playsewithpan 228, 0 @@ -4790,7 +3840,7 @@ OminousWindHit: waitbgfadein end -Move_SHADOW_FORCE: +Move_SHADOW_FORCE:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim ShadowForcePrep ShadowForceAttack @@ -4844,7 +3894,7 @@ ShadowForceBg: return @@@@@@@@@@@@@@@@@@@@@@@ GEN 5 @@@@@@@@@@@@@@@@@@@@@@@ -Move_HONE_CLAWS: +Move_HONE_CLAWS:: loadspritegfx ANIM_TAG_SWIPE call HoneClawsAnim createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SWIPE, 0, 6, 6, RGB_BLACK @@ -4865,7 +3915,7 @@ HoneClawsAnim: delay 10 return -Move_WIDE_GUARD: +Move_WIDE_GUARD:: loadspritegfx ANIM_TAG_ICE_SPIKES @motion from icy wind loadspritegfx ANIM_TAG_PINK_PETAL @pink color loadspritegfx ANIM_TAG_SMALL_EMBER @yellow color @@ -4976,7 +4026,7 @@ General_WonderRoom: blendoff end -Move_PSYSHOCK: +Move_PSYSHOCK:: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_POISON_JAB loadspritegfx ANIM_TAG_GRAY_SMOKE @@ -5053,7 +4103,7 @@ PsyshockConverge: delay 2 return -Move_VENOSHOCK: +Move_VENOSHOCK:: loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_TOXIC_BUBBLE createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1 @@ -5081,7 +4131,7 @@ Move_VENOSHOCK: delay 15 end -Move_AUTOTOMIZE: +Move_AUTOTOMIZE:: loadspritegfx ANIM_TAG_METAL_BITS @Metal Bits setalpha 12, 8 monbg ANIM_ATK_PARTNER @@ -5172,7 +4222,7 @@ Move_SMACK_DOWN:: createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 goto SeismicTossWeak -Move_STORM_THROW: +Move_STORM_THROW:: call StormThorwAnim call StormThorwAnim call StormThorwAnim @@ -5195,7 +4245,7 @@ StormThorwAnim: delay 8 return -Move_FLAME_BURST: +Move_FLAME_BURST:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER @@ -5228,13 +4278,13 @@ FlameBurstSpread: return -Move_SLUDGE_WAVE: +Move_SLUDGE_WAVE:: panse SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 createvisualtask AnimTask_CreateSurfWave, 2, ANIM_SURF_PAL_SLUDGE_WAVE waitforvisualfinish end -Move_QUIVER_DANCE: +Move_QUIVER_DANCE:: loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER call SetBugBg @@ -5257,7 +4307,7 @@ Move_QUIVER_DANCE: call UnsetBugBg end -Move_HEAVY_SLAM: +Move_HEAVY_SLAM:: loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 @@ -5287,7 +4337,7 @@ Move_HEAVY_SLAM: blendoff end -Move_SYCHRONOISE: +Move_SYNCHRONOISE:: loadspritegfx ANIM_TAG_THIN_RING @hypervoice ring loadspritegfx ANIM_TAG_SPARK_2 @yellow color loadspritegfx ANIM_TAG_WATER_ORB @blue color @@ -5326,7 +4376,7 @@ Move_SYCHRONOISE: clearmonbg ANIM_DEF_PARTNER end -Move_ELECTRO_BALL: +Move_ELECTRO_BALL:: loadspritegfx ANIM_TAG_SPARK_2 @yelow loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge loadspritegfx ANIM_TAG_FLASH_CANNON_BALL @ball @@ -5353,7 +4403,7 @@ Move_ELECTRO_BALL: blendoff end -Move_SOAK: +Move_SOAK:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_TARGET @@ -5388,7 +4438,7 @@ Move_SOAK: blendoff end -Move_FLAME_CHARGE: +Move_FLAME_CHARGE:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -5421,7 +4471,7 @@ FlameChargeSwirl: createsprite gFlameChargeEmberTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c return -Move_COIL: +Move_COIL:: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 0x6, 0x4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x10, 0x0, 0x2 @@ -5440,7 +4490,7 @@ Move_COIL: waitforvisualfinish end -Move_LOW_SWEEP: +Move_LOW_SWEEP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 @@ -5452,7 +4502,7 @@ Move_LOW_SWEEP: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end -Move_ACID_SPRAY: +Move_ACID_SPRAY:: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, -20, FALSE @@ -5478,7 +4528,7 @@ Move_ACID_SPRAY: clearmonbg ANIM_TARGET end -Move_FOUL_PLAY: +Move_FOUL_PLAY:: loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_IMPACT @@ -5501,7 +4551,7 @@ Move_FOUL_PLAY: blendoff end -Move_SIMPLE_BEAM: +Move_SIMPLE_BEAM:: loadspritegfx ANIM_TAG_GOLD_RING @psybeam loadspritegfx ANIM_TAG_ROCKS @brown color loadspritegfx ANIM_TAG_PINK_PETAL @pink color @@ -5547,7 +4597,7 @@ SimpleBeamWithRings: delay 0x2 return -Move_ENTRAINMENT: +Move_ENTRAINMENT:: createvisualtask AnimTask_TeeterDanceMovement, 5 playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 0x18 @@ -5562,7 +4612,7 @@ Move_ENTRAINMENT: waitforvisualfinish end -Move_AFTER_YOU: +Move_AFTER_YOU:: loadspritegfx ANIM_TAG_ANGER @rage loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @green color createvisualtask AnimTask_SwayMon, 5, 1, 15, 1536, 2, ANIM_ATTACKER @@ -5577,7 +4627,7 @@ Move_AFTER_YOU: waitforvisualfinish end -Move_ROUND: +Move_ROUND:: loadspritegfx ANIM_TAG_MUSIC_NOTES createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish @@ -5599,7 +4649,7 @@ Move_ROUND: waitforvisualfinish end -Move_ECHOED_VOICE: +Move_ECHOED_VOICE:: loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_DEF_PARTNER splitbgprio_foes ANIM_TARGET @@ -5619,7 +4669,7 @@ MetalSoundPlayNote: delay 0x2 return -Move_CHIP_AWAY: +Move_CHIP_AWAY:: loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x9, 0x7FFF waitforvisualfinish @@ -5637,7 +4687,7 @@ Move_CHIP_AWAY: blendoff end -Move_CLEAR_SMOG: +Move_CLEAR_SMOG:: loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_TARGET splitbgprio_all @@ -5665,7 +4715,7 @@ ClearSmogCloud: delay 7 return -Move_STORED_POWER: +Move_STORED_POWER:: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT call SetPsychicBackground @@ -5695,7 +4745,7 @@ Move_STORED_POWER: waitforvisualfinish end -Move_QUICK_GUARD: +Move_QUICK_GUARD:: loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @hand loadspritegfx ANIM_TAG_SPARKLE_4 @sparkles setalpha 12, 8 @@ -5725,7 +4775,7 @@ Move_QUICK_GUARD: clearmonbg ANIM_ATTACKER end -Move_ALLY_SWITCH: +Move_ALLY_SWITCH:: call SetPsychicBackground createvisualtask AnimTask_AllySwitchAttacker, 2 createvisualtask AnimTask_AllySwitchPartner, 2 @@ -5733,7 +4783,7 @@ Move_ALLY_SWITCH: call UnsetPsychicBg end -Move_SCALD: +Move_SCALD:: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -5779,7 +4829,7 @@ ScaldHitSplats: createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 1 return -Move_SHELL_SMASH: +Move_SHELL_SMASH:: loadspritegfx ANIM_TAG_SHELL_RIGHT loadspritegfx ANIM_TAG_SHELL_LEFT loadspritegfx ANIM_TAG_IMPACT @@ -5807,7 +4857,7 @@ Move_SHELL_SMASH: waitforvisualfinish end -Move_HEAL_PULSE: +Move_HEAL_PULSE:: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_THIN_RING @@ -5838,7 +4888,7 @@ Move_HEAL_PULSE: call HealingEffect2 end -Move_HEX: +Move_HEX:: loadspritegfx ANIM_TAG_PURPLE_FLAME loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x10, 0x4C4A @;Deep purple @@ -5859,7 +4909,7 @@ Move_HEX: waitforvisualfinish end -Move_SKY_DROP: +Move_SKY_DROP:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim SkyDropSetup SkyDropUnleash @@ -5892,7 +4942,7 @@ SkyDropUnleash: blendoff end -Move_SHIFT_GEAR: +Move_SHIFT_GEAR:: loadspritegfx ANIM_TAG_GEAR @Gear monbg ANIM_ATTACKER playsewithpan SE_ESCALATOR, SOUND_PAN_ATTACKER @@ -5902,7 +4952,7 @@ Move_SHIFT_GEAR: clearmonbg ANIM_ATTACKER end -Move_CIRCLE_THROW: +Move_CIRCLE_THROW:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_ICE_CHUNK @@ -5929,7 +4979,7 @@ Move_CIRCLE_THROW: blendoff end -Move_INCINERATE: +Move_INCINERATE:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET splitbgprio ANIM_TARGET @@ -5969,7 +5019,7 @@ Move_INCINERATE: blendoff end -Move_QUASH: +Move_QUASH:: loadspritegfx ANIM_TAG_ASSURANCE_HAND @hand fadetobg BG_DARK waitbgfadein @@ -5986,7 +5036,7 @@ Move_QUASH: waitbgfadein end -Move_ACROBATICS: +Move_ACROBATICS:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_WHITE_STREAK loadspritegfx ANIM_TAG_IMPACT @@ -6061,7 +5111,7 @@ AcrobaticsSlashes: delay 2 return -Move_REFLECT_TYPE: +Move_REFLECT_TYPE:: loadspritegfx ANIM_TAG_GUARD_RING @ring around user loadspritegfx ANIM_TAG_ICE_CHUNK @blue green color loadspritegfx ANIM_TAG_PURPLE_FLAME @violet color @@ -6099,7 +5149,7 @@ Move_REFLECT_TYPE: blendoff end -Move_RETALIATE: +Move_RETALIATE:: loadspritegfx ANIM_TAG_CUT @Cut monbg ANIM_DEF_PARTNER setalpha 9, 8 @@ -6120,7 +5170,7 @@ Move_RETALIATE: blendoff end -Move_FINAL_GAMBIT: +Move_FINAL_GAMBIT:: loadspritegfx ANIM_TAG_PINK_CLOUD @yawn animation loadspritegfx ANIM_TAG_WATER_IMPACT @blue colour loadspritegfx ANIM_TAG_EXPLOSION @explosion animation @@ -6147,7 +5197,7 @@ Move_FINAL_GAMBIT: waitforvisualfinish end -Move_BESTOW: +Move_BESTOW:: monbg ANIM_TARGET splitbgprio ANIM_TARGET panse SE_M_METRONOME, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 @@ -6157,7 +5207,7 @@ Move_BESTOW: clearmonbg ANIM_TARGET end -Move_INFERNO: +Move_INFERNO:: loadspritegfx ANIM_TAG_SMALL_EMBER call SetImpactBackground loopsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET, 40, 4 @@ -6201,7 +5251,7 @@ InfernoAnim: delay 1 return -Move_WATER_PLEDGE: +Move_WATER_PLEDGE:: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -6321,7 +5371,7 @@ Move_WATER_PLEDGE: blendoff end -Move_FIRE_PLEDGE: +Move_FIRE_PLEDGE:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -6420,7 +5470,7 @@ Move_FIRE_PLEDGE: blendoff end -Move_GRASS_PLEDGE: +Move_GRASS_PLEDGE:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_WHIP_HIT monbg ANIM_DEF_PARTNER @@ -6527,7 +5577,7 @@ GrassPledgeMiddleFountain: delay 4 return -Move_VOLT_SWITCH: +Move_VOLT_SWITCH:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_THIN_RING @@ -6566,7 +5616,7 @@ VoltSwitchAgainstPartner: createvisualtask AnimTask_SlideOffScreen, 5, ANIM_ATTACKER, 2 goto VoltSwitchContinue -Move_STRUGGLE_BUG: +Move_STRUGGLE_BUG:: loadspritegfx ANIM_TAG_MOVEMENT_WAVES loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -6592,12 +5642,12 @@ Move_STRUGGLE_BUG: blendoff end -Move_BULLDOZE: +Move_BULLDOZE:: createvisualtask AnimTask_Splash, 2, ANIM_ATTACKER, 3 delay 0x8 goto Move_EARTHQUAKE -Move_FROST_BREATH: +Move_FROST_BREATH:: loadspritegfx ANIM_TAG_ICE_CHUNK loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME @@ -6635,7 +5685,7 @@ Move_FROST_BREATH: call UnsetPsychicBg end -Move_DRAGON_TAIL: +Move_DRAGON_TAIL:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_SLAM_HIT loadspritegfx ANIM_TAG_IMPACT @@ -6671,7 +5721,7 @@ TailWhackDown: createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 12, 25, 4, 4 return -Move_WORK_UP: +Move_WORK_UP:: loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -28, 26, 2 @@ -6705,7 +5755,7 @@ Move_WORK_UP: waitforvisualfinish end -Move_ELECTROWEB: +Move_ELECTROWEB:: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD loadspritegfx ANIM_TAG_SPARK_2 @@ -6723,11 +5773,11 @@ Move_ELECTROWEB: delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK call ElectricityEffect_OnTargets -Move_ELECTROWEB_Wait: +Move_ELECTROWEB_Wait:: waitforvisualfinish end -Move_WILD_CHARGE: +Move_WILD_CHARGE:: loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_IMPACT @@ -6762,7 +5812,7 @@ ScreenFlash: createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x07FE return -Move_DRILL_RUN: +Move_DRILL_RUN:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT setalpha 12, 8 @@ -6817,7 +5867,7 @@ Move_DRILL_RUN: call UnsetPsychicBg end -Move_DUAL_CHOP: +Move_DUAL_CHOP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET @hand loadspritegfx ANIM_TAG_IMPACT @hit loadspritegfx ANIM_TAG_POISON_BUBBLE @purple @@ -6839,7 +5889,7 @@ Move_DUAL_CHOP: blendoff end -Move_HEART_STAMP: +Move_HEART_STAMP:: loadspritegfx ANIM_TAG_HEART_STAMP monbg ANIM_TARGET loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 0xc, 0x3 @@ -6852,7 +5902,7 @@ Move_HEART_STAMP: waitforvisualfinish end -Move_HORN_LEECH: +Move_HORN_LEECH:: loadspritegfx ANIM_TAG_HORN_LEECH @Horn loadspritegfx ANIM_TAG_IMPACT @hit loadspritegfx ANIM_TAG_ORBS @@ -6869,7 +5919,7 @@ Move_HORN_LEECH: waitforvisualfinish end -Move_SACRED_SWORD: +Move_SACRED_SWORD:: loadspritegfx ANIM_TAG_CUT @Cut loadspritegfx ANIM_TAG_SWORD @Sword loadspritegfx ANIM_TAG_HYDRO_PUMP @Blue Colour @@ -6895,7 +5945,7 @@ Move_SACRED_SWORD: waitforvisualfinish end -Move_RAZOR_SHELL: +Move_RAZOR_SHELL:: loadspritegfx ANIM_TAG_RAZOR_SHELL loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET @@ -6909,7 +5959,7 @@ Move_RAZOR_SHELL: waitforvisualfinish end -Move_HEAT_CRASH: +Move_HEAT_CRASH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WARM_ROCK loadspritegfx ANIM_TAG_ROCKS @@ -6933,7 +5983,7 @@ Move_HEAT_CRASH: blendoff end -Move_LEAF_TORNADO: +Move_LEAF_TORNADO:: loadspritegfx ANIM_TAG_GUST @Gust loadspritegfx ANIM_TAG_LEAF @Leaves monbg ANIM_DEF_PARTNER @@ -6964,7 +6014,7 @@ LeafTornadoVortex: delay 0x2 return -Move_STEAMROLLER: +Move_STEAMROLLER:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 @@ -6990,7 +6040,7 @@ Move_STEAMROLLER: blendoff end -Move_COTTON_GUARD: +Move_COTTON_GUARD:: loadspritegfx ANIM_TAG_SPORE monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -7020,7 +6070,7 @@ CottonSporesSpiralInward: delay 0x3 return -Move_NIGHT_DAZE: +Move_NIGHT_DAZE:: loadspritegfx ANIM_TAG_THIN_RING @uproar loadspritegfx ANIM_TAG_PURPLE_FLAME @dark violet color loadspritegfx ANIM_TAG_RED_ORB @circles @@ -7058,7 +6108,7 @@ Move_NIGHT_DAZE: waitforvisualfinish end -Move_PSYSTRIKE: +Move_PSYSTRIKE:: monbg ANIM_TARGET setalpha 8, 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 @@ -7075,7 +6125,7 @@ Move_PSYSTRIKE: blendoff end -Move_TAIL_SLAP: +Move_TAIL_SLAP:: loadspritegfx ANIM_TAG_IMPACT @Hit loadspritegfx ANIM_TAG_AIR_WAVE_2 @Aeroblast loadspritegfx ANIM_TAG_PUNISHMENT_BLADES @Punishment Blades @@ -7096,7 +6146,7 @@ TailSlapLeft: createsprite gTailSlapTemplate, ANIM_ATTACKER, 2, 0x8, 0x0, 0x1, 0x0 goto TailSlapContinue -Move_HURRICANE: +Move_HURRICANE:: loadspritegfx ANIM_TAG_GUST monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -7133,7 +6183,7 @@ HurricaneGustCentered: createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 return -Move_HEAD_CHARGE: +Move_HEAD_CHARGE:: loadspritegfx ANIM_TAG_IMPACT fadetobgfromset BG_GIGA_IMPACT_OPPONENT, BG_GIGA_IMPACT_PLAYER, BG_GIGA_IMPACT_OPPONENT waitbgfadein @@ -7153,7 +6203,7 @@ Move_HEAD_CHARGE: waitbgfadeout end -Move_GEAR_GRIND: +Move_GEAR_GRIND:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_GEAR @Gear monbg ANIM_TARGET @@ -7176,7 +6226,7 @@ Move_GEAR_GRIND: blendoff end -Move_SEARING_SHOT: +Move_SEARING_SHOT:: loadspritegfx ANIM_TAG_SPARK_2 @yellow color loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE @red color loadspritegfx ANIM_TAG_ELECTRIC_ORBS @charge @@ -7262,7 +6312,7 @@ Move_SEARING_SHOT: blendoff end -Move_TECHNO_BLAST: +Move_TECHNO_BLAST:: createvisualtask AnimTask_TechnoBlast, 0x5 jumpargeq 0x0, TYPE_FIRE, TechnoBlastFire jumpargeq 0x0, TYPE_WATER, TechnoBlastWater @@ -7725,7 +6775,7 @@ TechnoBlastIceChargeParticles: delay 0x4 return -Move_RELIC_SONG: +Move_RELIC_SONG:: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_MUSIC_NOTES @@ -7806,7 +6856,7 @@ Move_RELIC_SONG: waitforvisualfinish end -Move_SECRET_SWORD: +Move_SECRET_SWORD:: loadspritegfx ANIM_TAG_CUT @Cut loadspritegfx ANIM_TAG_SWORD @Sword loadspritegfx ANIM_TAG_HYDRO_PUMP @Blue Colour @@ -7835,7 +6885,7 @@ Move_SECRET_SWORD: waitforvisualfinish end -Move_GLACIATE: +Move_GLACIATE:: loadspritegfx ANIM_TAG_ICE_CRYSTALS @ice loadspritegfx ANIM_TAG_BLACK_SMOKE @smoke loadspritegfx ANIM_TAG_ICE_CHUNK @White Colour @@ -8499,7 +7549,7 @@ Move_ROTOTILLER:: waitforvisualfinish end -Move_STICKY_WEB: +Move_STICKY_WEB:: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER @@ -8537,7 +7587,7 @@ Move_STICKY_WEB: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end -Move_FELL_STINGER: +Move_FELL_STINGER:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -8558,7 +7608,7 @@ Move_FELL_STINGER: clearmonbg ANIM_TARGET end -Move_PHANTOM_FORCE: +Move_PHANTOM_FORCE:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim PhantomForcePrep PhantomForceAttack @@ -8630,7 +7680,7 @@ PhantomForceBg: waitbgfadein return -Move_TRICK_OR_TREAT: +Move_TRICK_OR_TREAT:: loadspritegfx ANIM_TAG_EYE_SPARKLE loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT fadetobg BG_NIGHTMARE @@ -8654,7 +7704,7 @@ Move_TRICK_OR_TREAT: waitbgfadein end -Move_NOBLE_ROAR: +Move_NOBLE_ROAR:: loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_ATTACKER splitbgprio ANIM_ATTACKER @@ -8675,10 +7725,10 @@ Move_NOBLE_ROAR: delay 20 end -Move_ION_DELUGE: +Move_ION_DELUGE:: end -Move_PARABOLIC_CHARGE: +Move_PARABOLIC_CHARGE:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK @@ -8733,7 +7783,7 @@ ParabolicChargeDouble: createvisualtask AnimTask_BlendBattleAnimPal, 5, 4 | 8 | 0x10, 0, 0, 0, RGB_BLACK goto ParabolicChargeHeal; -Move_FORESTS_CURSE: +Move_FORESTS_CURSE:: loadspritegfx ANIM_TAG_ROOTS @frenzy plant loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT @curse monbg ANIM_ATTACKER @@ -8870,7 +7920,7 @@ Move_DISARMING_VOICE:: waitforvisualfinish end -Move_PARTING_SHOT: +Move_PARTING_SHOT:: loadspritegfx ANIM_TAG_NOISE_LINE fadetobg BG_DARK waitbgfadein @@ -8888,7 +7938,7 @@ Move_PARTING_SHOT: waitbgfadein end -Move_TOPSY_TURVY: +Move_TOPSY_TURVY:: loadspritegfx ANIM_TAG_SWEAT_DROP setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate ANIM_TARGET, 2, 1, 2, 0, 4, RGB_BLACK @@ -8905,7 +7955,7 @@ Move_TOPSY_TURVY: blendoff end -Move_DRAINING_KISS: +Move_DRAINING_KISS:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT @@ -9241,7 +8291,7 @@ Move_FAIRY_WIND:: blendoff end -Move_MOONBLAST: +Move_MOONBLAST:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_MOON loadspritegfx ANIM_TAG_GREEN_SPARKLE @@ -9264,7 +8314,7 @@ Move_MOONBLAST: blendoff end -Move_BOOMBURST: +Move_BOOMBURST:: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_THIN_RING createvisualtask AnimTask_InvertScreenColor, 2, 0x1 | 0x4 | 0x8 | 0x10 @@ -10148,7 +9198,7 @@ InfestationVortex: delay 0x1 return -Move_POWER_UP_PUNCH: +Move_POWER_UP_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_BREATH @@ -14557,7 +13607,7 @@ BasicExplosion: createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, 0x1, 0x1 return -Move_ETERNA_BEAM:: +Move_ETERNABEAM:: goto Move_HYPER_BEAM Move_STEEL_BEAM:: @@ -14835,7 +13885,7 @@ Move_SHELL_SIDE_ARM:: createvisualtask AnimTask_ShellSideArm, 0x5 jumpargeq 0x0, TRUE, Move_SHELL_SIDE_ARM_PHYSICAL jumpargeq 0x0, FALSE, Move_SHELL_SIDE_ARM_SPECIAL -Move_SHELL_SIDE_ARM_PHYSICAL: @ Modified Body Slam, placeholder +Move_SHELL_SIDE_ARM_PHYSICAL:: @ Modified Body Slam, placeholder loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 6, 6, RGB_MAGENTA monbg ANIM_DEF_PARTNER @@ -14861,7 +13911,7 @@ Move_SHELL_SIDE_ARM_PHYSICAL: @ Modified Body Slam, placeholder clearmonbg ANIM_DEF_PARTNER blendoff end -Move_SHELL_SIDE_ARM_SPECIAL: @ Modified Snipe Shot, placeholder +Move_SHELL_SIDE_ARM_SPECIAL:: @ Modified Snipe Shot, placeholder loadspritegfx ANIM_TAG_IMPACT_2 loadspritegfx ANIM_TAG_LEER createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT_2, 0, 6, 6, RGB_MAGENTA @@ -16853,7 +15903,7 @@ Move_SYRUP_BOMB:: jumpargeq 0x0, TRUE, Move_SYRUP_BOMB_YELLOW @ Credits to Dat.H A -Move_SYRUP_BOMB_RED: +Move_SYRUP_BOMB_RED:: loadspritegfx ANIM_TAG_SYRUP_BLOB_RED loadspritegfx ANIM_TAG_SYRUP_SPLAT_RED loadspritegfx ANIM_TAG_SYRUP_SHELL_RED @@ -16891,7 +15941,7 @@ SyrupBombProjectileRed: delay 3 return -Move_SYRUP_BOMB_YELLOW: +Move_SYRUP_BOMB_YELLOW:: loadspritegfx ANIM_TAG_SYRUP_BLOB_YELLOW loadspritegfx ANIM_TAG_SYRUP_SPLAT_YELLOW loadspritegfx ANIM_TAG_SYRUP_SHELL_YELLOW @@ -17224,7 +16274,7 @@ Move_UPPER_HAND:: blendoff end -Move_JET_PUNCH: +Move_JET_PUNCH:: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -17889,9 +16939,9 @@ Move_MALIGNANT_CHAIN:: end @to do @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@ -Move_NONE: -Move_MIRROR_MOVE: -Move_POUND: +Move_NONE:: +Move_MIRROR_MOVE:: +Move_POUND:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 @@ -17903,7 +16953,7 @@ Move_POUND: blendoff end -Move_DOUBLE_SLAP: +Move_DOUBLE_SLAP:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 @@ -17922,7 +16972,7 @@ DoubleSlapRight: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, ANIM_TARGET, 2 goto DoubleSlapContinue -Move_POISON_POWDER: +Move_POISON_POWDER:: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 @@ -17947,7 +16997,7 @@ Move_POISON_POWDER: waitforvisualfinish end -Move_STUN_SPORE: +Move_STUN_SPORE:: loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 @@ -17971,7 +17021,7 @@ Move_STUN_SPORE: waitforvisualfinish end -Move_SLEEP_POWDER: +Move_SLEEP_POWDER:: loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 @@ -17995,7 +17045,7 @@ Move_SLEEP_POWDER: waitforvisualfinish end -Move_SWIFT: +Move_SWIFT:: loadspritegfx ANIM_TAG_YELLOW_STAR loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -18022,7 +17072,7 @@ Move_SWIFT: blendoff end -Move_STRENGTH: +Move_STRENGTH:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -18048,7 +17098,7 @@ Move_STRENGTH: blendoff end -Move_TACKLE: +Move_TACKLE:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 @@ -18062,7 +17112,7 @@ Move_TACKLE: blendoff end -Move_BODY_SLAM: +Move_BODY_SLAM:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -18088,7 +17138,7 @@ Move_BODY_SLAM: blendoff end -Move_SUPERSONIC: +Move_SUPERSONIC:: loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_ATK_PARTNER splitbgprio_foes ANIM_ATTACKER @@ -18110,7 +17160,7 @@ SupersonicRing: delay 2 return -Move_SCREECH: +Move_SCREECH:: loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 call ScreechRing @@ -18125,7 +17175,7 @@ ScreechRing: delay 2 return -Move_FLAME_WHEEL: +Move_FLAME_WHEEL:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER splitbgprio_foes ANIM_TARGET @@ -18167,7 +17217,7 @@ FlameWheel1: @ Unused delay 4 return -Move_PIN_MISSILE: +Move_PIN_MISSILE:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -18196,7 +17246,7 @@ Move_PIN_MISSILE: blendoff end -Move_ICICLE_SPEAR: +Move_ICICLE_SPEAR:: loadspritegfx ANIM_TAG_ICICLE_SPEAR loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -18225,7 +17275,7 @@ Move_ICICLE_SPEAR: blendoff end -Move_TAKE_DOWN: +Move_TAKE_DOWN:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -18248,7 +17298,7 @@ Move_TAKE_DOWN: blendoff end -Move_DOUBLE_EDGE: +Move_DOUBLE_EDGE:: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0 @@ -18281,7 +17331,7 @@ Move_DOUBLE_EDGE: waitforvisualfinish end -Move_POISON_STING: +Move_POISON_STING:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -18301,7 +17351,7 @@ Move_POISON_STING: blendoff end -Move_TWINEEDLE: +Move_TWINEEDLE:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -18321,7 +17371,7 @@ Move_TWINEEDLE: blendoff end -Move_FIRE_BLAST: +Move_FIRE_BLAST:: loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask SoundTask_FireBlast, SE_M_FLAME_WHEEL, SE_M_FLAME_WHEEL2 call FireBlastRing @@ -18369,7 +17419,7 @@ FireBlastCross: createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0, 0, 15, 2, 2 return -Move_LEECH_SEED: +Move_LEECH_SEED:: loadspritegfx ANIM_TAG_SEED playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 @@ -18384,7 +17434,7 @@ Move_LEECH_SEED: waitforvisualfinish end -Move_EMBER: +Move_EMBER:: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 5, 2 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 @@ -18423,7 +17473,7 @@ SetImpactContestsBG: changebg BG_IMPACT_CONTESTS goto SetImpactBackgroundRet -Move_MEGA_PUNCH: +Move_MEGA_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET @@ -18448,7 +17498,7 @@ Move_MEGA_PUNCH: waitbgfadein end -Move_MEGA_KICK: +Move_MEGA_KICK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET @@ -18473,7 +17523,7 @@ Move_MEGA_KICK: waitbgfadein end -Move_COMET_PUNCH: +Move_COMET_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET @@ -18495,7 +17545,7 @@ CometPunchRight: createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0 goto CometPunchContinue -Move_SONIC_BOOM: +Move_SONIC_BOOM:: loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -18520,7 +17570,7 @@ SonicBoomHit: delay 4 return -Move_THUNDER_SHOCK: +Move_THUNDER_SHOCK:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 6, RGB_BLACK @@ -18541,7 +17591,7 @@ Move_THUNDER_SHOCK: waitforvisualfinish end -Move_THUNDERBOLT: +Move_THUNDERBOLT:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SHOCK_3 loadspritegfx ANIM_TAG_SPARK_2 @@ -18590,7 +17640,7 @@ Move_THUNDERBOLT: waitforvisualfinish end -Move_THUNDER_WAVE: +Move_THUNDER_WAVE:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_SPARK_H @@ -18611,7 +17661,7 @@ Move_THUNDER_WAVE: waitforvisualfinish end -Move_BEAT_UP: +Move_BEAT_UP:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET @@ -18645,7 +17695,7 @@ BeatUpRight: playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto BeatUpContinue -Move_STOMP: +Move_STOMP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -18661,13 +17711,13 @@ Move_STOMP: blendoff end -Move_TAIL_WHIP: +Move_TAIL_WHIP:: loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end -Move_CUT: +Move_CUT:: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 @@ -18681,7 +17731,7 @@ Move_CUT: waitforvisualfinish end -Move_HIDDEN_POWER: +Move_HIDDEN_POWER:: loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 @@ -18711,7 +17761,7 @@ Move_HIDDEN_POWER: createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224 end -Move_REVERSAL: +Move_REVERSAL:: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -18739,7 +17789,7 @@ Move_REVERSAL: createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0 end -Move_PURSUIT: +Move_PURSUIT:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK @@ -18766,7 +17816,7 @@ PursuitOnSwitchout: createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 6, 1, 0 goto PursuitContinue -Move_SPIKE_CANNON: +Move_SPIKE_CANNON:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -18790,7 +17840,7 @@ Move_SPIKE_CANNON: blendoff end -Move_SWORDS_DANCE: +Move_SWORDS_DANCE:: loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 @@ -18805,7 +17855,7 @@ Move_SWORDS_DANCE: delay 1 end -Move_PSYCH_UP: +Move_PSYCH_UP:: loadspritegfx ANIM_TAG_SPIRAL monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendColorCycleExclude, 2, 1, 2, 6, 1, 11, RGB_BLACK @@ -18824,7 +17874,7 @@ Move_PSYCH_UP: waitforvisualfinish end -Move_DIZZY_PUNCH: +Move_DIZZY_PUNCH:: loadspritegfx ANIM_TAG_DUCK loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -18861,7 +17911,7 @@ DizzyPunchLunge: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 return -Move_FIRE_SPIN: +Move_FIRE_SPIN:: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 @@ -18886,7 +17936,7 @@ FireSpinEffect: delay 2 return -Move_FURY_CUTTER: +Move_FURY_CUTTER:: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 @@ -18924,7 +17974,7 @@ FuryCutterStrongest: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 3, 3, RGB(9, 8, 10), 4, RGB_BLACK, 0 goto FuryCutterContinue2 -Move_SELF_DESTRUCT: +Move_SELF_DESTRUCT:: loadspritegfx ANIM_TAG_EXPLOSION createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 9, RGB_RED createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 6, 0, 38, 1 @@ -18955,7 +18005,7 @@ SelfDestructExplode: delay 6 return -Move_SLAM: +Move_SLAM:: loadspritegfx ANIM_TAG_SLAM_HIT loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -18979,7 +18029,7 @@ Move_SLAM: blendoff end -Move_VINE_WHIP: +Move_VINE_WHIP:: loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -18990,7 +18040,7 @@ Move_VINE_WHIP: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 end -Move_DRILL_PECK: +Move_DRILL_PECK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -19009,7 +18059,7 @@ Move_DRILL_PECK: waitforvisualfinish end -Move_WATERFALL: +Move_WATERFALL:: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -19094,7 +18144,7 @@ RisingWaterHitEffect: createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, -20 return -Move_EXPLOSION: +Move_EXPLOSION:: loadspritegfx ANIM_TAG_EXPLOSION createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1 @@ -19127,7 +18177,7 @@ Explosion1: delay 6 return -Move_DEFENSE_CURL: +Move_DEFENSE_CURL:: loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, FALSE @@ -19139,7 +18189,7 @@ Move_DEFENSE_CURL: waitforvisualfinish end -Move_PROTECT: +Move_PROTECT:: loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER splitbgprio ANIM_ATTACKER @@ -19149,7 +18199,7 @@ Move_PROTECT: clearmonbg ANIM_ATK_PARTNER end -Move_DETECT: +Move_DETECT:: loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 0, 9, RGB_BLACK waitforvisualfinish @@ -19164,7 +18214,7 @@ Move_DETECT: waitforvisualfinish end -Move_FRUSTRATION: +Move_FRUSTRATION:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER @@ -19269,7 +18319,7 @@ Frustration_Weak: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 goto Frustration_Continue -Move_SAFEGUARD: +Move_SAFEGUARD:: loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 @@ -19287,7 +18337,7 @@ Move_SAFEGUARD: blendoff end -Move_PAIN_SPLIT: +Move_PAIN_SPLIT:: loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET @@ -19311,7 +18361,7 @@ Move_PAIN_SPLIT: createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2 end -Move_VICE_GRIP: +Move_VISE_GRIP:: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -19327,7 +18377,7 @@ Move_VICE_GRIP: blendoff end -Move_GUILLOTINE: +Move_GUILLOTINE:: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -19352,7 +18402,7 @@ Move_GUILLOTINE: waitbgfadein end -Move_PAY_DAY: +Move_PAY_DAY:: loadspritegfx ANIM_TAG_COIN loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -19370,7 +18420,7 @@ Move_PAY_DAY: blendoff end -Move_OUTRAGE: +Move_OUTRAGE:: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 8, 3 createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER | F_PAL_TARGET), 2, 5, 3, 8, RGB(14, 13, 0) @@ -19415,7 +18465,7 @@ OutrageFlames: createsprite gOutrageFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, -1280, -768, 3 return -Move_SPARK: +Move_SPARK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 @@ -19461,7 +18511,7 @@ Move_SPARK: waitforvisualfinish end -Move_ATTRACT: +Move_ATTRACT:: loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER @@ -19490,7 +18540,7 @@ Move_ATTRACT: createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 10, RGB(31, 25, 27) end -Move_GROWTH: +Move_GROWTH:: call GrowthEffect waitforvisualfinish call GrowthEffect @@ -19502,7 +18552,7 @@ GrowthEffect: createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return -Move_WHIRLWIND: +Move_WHIRLWIND:: loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, ANIM_TARGET, 60, 0 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 60, 1 @@ -19521,7 +18571,7 @@ Move_WHIRLWIND: waitforvisualfinish end -Move_CONFUSE_RAY: +Move_CONFUSE_RAY:: loadspritegfx ANIM_TAG_YELLOW_BALL monbg ANIM_DEF_PARTNER fadetobg BG_GHOST @@ -19541,7 +18591,7 @@ Move_CONFUSE_RAY: waitbgfadein end -Move_LOCK_ON: +Move_LOCK_ON:: loadspritegfx ANIM_TAG_LOCK_ON createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40 createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 1 @@ -19553,7 +18603,7 @@ Move_LOCK_ON: waitforvisualfinish end -Move_MEAN_LOOK: +Move_MEAN_LOOK:: loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER @@ -19568,7 +18618,7 @@ Move_MEAN_LOOK: waitforvisualfinish end -Move_ROCK_THROW: +Move_ROCK_THROW:: loadspritegfx ANIM_TAG_ROCKS createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0 @@ -19589,7 +18639,7 @@ Move_ROCK_THROW: waitforvisualfinish end -Move_ROCK_SLIDE: +Move_ROCK_SLIDE:: loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1 @@ -19640,7 +18690,7 @@ RockSlideRocks: delay 2 return -Move_THIEF: +Move_THIEF:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET delay 1 @@ -19660,7 +18710,7 @@ Move_THIEF: waitbgfadein end -Move_BUBBLE_BEAM: +Move_BUBBLE_BEAM:: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET @@ -19698,7 +18748,7 @@ BulbblebeamCreateBubbles: delay 3 return -Move_ICY_WIND: +Move_ICY_WIND:: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_ICE_SPIKES monbg ANIM_DEF_PARTNER @@ -19734,7 +18784,7 @@ IcyWindSwirlingSnowballs: createsprite gSwirlingSnowballSpriteTemplate, ANIM_TARGET, 40, 0, -5, 0, -5, 72, 1 return -Move_SMOKESCREEN: +Move_SMOKESCREEN:: loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER @@ -19758,7 +18808,7 @@ Move_SMOKESCREEN: waitforvisualfinish end -Move_CONVERSION: +Move_CONVERSION:: loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_ATK_PARTNER splitbgprio ANIM_ATTACKER @@ -19810,7 +18860,7 @@ Move_CONVERSION: blendoff end -Move_CONVERSION_2: +Move_CONVERSION_2:: loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_DEF_PARTNER splitbgprio_foes ANIM_TARGET @@ -19855,7 +18905,7 @@ Move_CONVERSION_2: blendoff end -Move_ROLLING_KICK: +Move_ROLLING_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -19877,7 +18927,7 @@ Move_ROLLING_KICK: blendoff end -Move_HEADBUTT: +Move_HEADBUTT:: loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER @@ -19893,7 +18943,7 @@ Move_HEADBUTT: waitforvisualfinish end -Move_HORN_ATTACK: +Move_HORN_ATTACK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -19911,7 +18961,7 @@ Move_HORN_ATTACK: waitforvisualfinish end -Move_FURY_ATTACK: +Move_FURY_ATTACK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, ANIM_ATTACKER, 2 @@ -19935,7 +18985,7 @@ FuryAttackLeft: playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto FuryAttackContinue -Move_HORN_DRILL: +Move_HORN_DRILL:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest HornDrillInContest @@ -20002,7 +19052,7 @@ HornDrillInContest: createvisualtask AnimTask_StartSlidingBg, 5, 2304, 768, 0, -1 goto HornDrillContinue -Move_THRASH: +Move_THRASH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask AnimTask_ThrashMoveMonHorizontal, 2 @@ -20020,7 +19070,7 @@ Move_THRASH: playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET end -Move_SING: +Move_SING:: loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_DEF_PARTNER createvisualtask AnimTask_MusicNotesRainbowBlend, 2 @@ -20056,7 +19106,7 @@ Move_SING: waitforvisualfinish end -Move_LOW_KICK: +Move_LOW_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 @@ -20069,7 +19119,7 @@ Move_LOW_KICK: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end -Move_EARTHQUAKE: +Move_EARTHQUAKE:: createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 10, 50 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 10, 50 playsewithpan SE_M_EARTHQUAKE, 0 @@ -20079,7 +19129,7 @@ Move_EARTHQUAKE: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 end -Move_FISSURE: +Move_FISSURE:: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_HorizontalShake, 3, ANIM_PLAYER_RIGHT, 10, 50 createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50 @@ -20122,7 +19172,7 @@ FissureDirtPlumeClose: playsewithpan SE_M_DIG, SOUND_PAN_TARGET return -Move_DIG: +Move_DIG:: choosetwoturnanim DigSetUp, DigUnleash DigEnd: end @@ -20170,7 +19220,7 @@ DigThrowDirt: delay 32 return -Move_MEDITATE: +Move_MEDITATE:: call SetPsychicBackground createvisualtask AnimTask_MeditateStretchAttacker, 2 playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER @@ -20180,7 +19230,7 @@ Move_MEDITATE: call UnsetPsychicBg end -Move_AGILITY: +Move_AGILITY:: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 @@ -20201,7 +19251,7 @@ Move_AGILITY: delay 1 end -Move_QUICK_ATTACK: +Move_QUICK_ATTACK:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -20218,7 +19268,7 @@ Move_QUICK_ATTACK: waitforvisualfinish end -Move_RAGE: +Move_RAGE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_TARGET @@ -20239,7 +19289,7 @@ Move_RAGE: clearmonbg ANIM_TARGET end -Move_TELEPORT: +Move_TELEPORT:: call SetPsychicBackground createvisualtask AnimTask_Teleport, 2 playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER @@ -20274,12 +19324,12 @@ DoubleTeamAnimRet: delay 1 return -Move_DOUBLE_TEAM: +Move_DOUBLE_TEAM:: createvisualtask AnimTask_DoubleTeam, 2 call DoubleTeamAnimRet end -Move_MINIMIZE: +Move_MINIMIZE:: setalpha 10, 8 createvisualtask AnimTask_Minimize, 2 loopsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 34, 3 @@ -20287,7 +19337,7 @@ Move_MINIMIZE: blendoff end -Move_METRONOME: +Move_METRONOME:: loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 @@ -20299,7 +19349,7 @@ Move_METRONOME: waitforvisualfinish end -Move_SKULL_BASH: +Move_SKULL_BASH:: choosetwoturnanim SkullBashSetUp, SkullBashAttack SkullBashEnd: end @@ -20332,7 +19382,7 @@ SkullBashAttack: createvisualtask AnimTask_SkullBashPosition, 2, 1 goto SkullBashEnd -Move_AMNESIA: +Move_AMNESIA:: loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 @@ -20344,7 +19394,7 @@ Move_AMNESIA: call UnsetPsychicBg end -Move_KINESIS: +Move_KINESIS:: loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER @@ -20363,7 +19413,7 @@ Move_KINESIS: call UnsetPsychicBg end -Move_GLARE: +Move_GLARE:: loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 @@ -20381,7 +19431,7 @@ Move_GLARE: createvisualtask AnimTask_BlendBattleAnimPal, 5, F_PAL_BG, 0, 16, 0, RGB_BLACK end -Move_BARRAGE: +Move_BARRAGE:: loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER @@ -20392,7 +19442,7 @@ Move_BARRAGE: loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2 end -Move_SKY_ATTACK: +Move_SKY_ATTACK:: choosetwoturnanim SkyAttackSetUp, SkyAttackUnleash SkyAttackEnd: end @@ -20458,20 +19508,20 @@ SkyAttackUnleash: call UnsetSkyBg goto SkyAttackEnd -Move_FLASH: +Move_FLASH:: playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask AnimTask_Flash, 2 waitforvisualfinish end -Move_SPLASH: +Move_SPLASH:: createvisualtask AnimTask_Splash, 2, ANIM_ATTACKER, 3 delay 8 loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end -Move_ACID_ARMOR: +Move_ACID_ARMOR:: monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER @@ -20482,13 +19532,13 @@ Move_ACID_ARMOR: delay 1 end -Move_SHARPEN: +Move_SHARPEN:: loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish end -Move_SUPER_FANG: +Move_SUPER_FANG:: loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER @@ -20508,7 +19558,7 @@ Move_SUPER_FANG: blendoff end -Move_SLASH: +Move_SLASH:: loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET @@ -20519,7 +19569,7 @@ Move_SLASH: waitforvisualfinish end -Move_STRUGGLE: +Move_STRUGGLE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg ANIM_TARGET @@ -20537,7 +19587,7 @@ Move_STRUGGLE: blendoff end -Move_SKETCH: +Move_SKETCH:: loadspritegfx ANIM_TAG_PENCIL monbg ANIM_TARGET createvisualtask AnimTask_SketchDrawMon, 2 @@ -20548,7 +19598,7 @@ Move_SKETCH: loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 2 end -Move_NIGHTMARE: +Move_NIGHTMARE:: fadetobg BG_GHOST waitbgfadein jumpifcontest NightmareInContest @@ -20570,7 +19620,7 @@ NightmareInContest: waitbgfadein end -Move_FLAIL: +Move_FLAIL:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 @@ -20585,7 +19635,7 @@ Move_FLAIL: blendoff end -Move_SPITE: +Move_SPITE:: fadetobg BG_GHOST playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein @@ -20619,7 +19669,7 @@ UnsetHighSpeedBg: waitbgfadein return -Move_MACH_PUNCH: +Move_MACH_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_ATK_PARTNER @@ -20639,7 +19689,7 @@ Move_MACH_PUNCH: call UnsetHighSpeedBg end -Move_FORESIGHT: +Move_FORESIGHT:: loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -20658,7 +19708,7 @@ Move_FORESIGHT: clearmonbg ANIM_DEF_PARTNER end -Move_DESTINY_BOND: +Move_DESTINY_BOND:: loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER @@ -20678,7 +19728,7 @@ Move_DESTINY_BOND: clearmonbg 5 end -Move_ENDURE: +Move_ENDURE:: loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect @@ -20703,7 +19753,7 @@ EndureEffect: createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -12, 0, 1 return -Move_CHARM: +Move_CHARM:: loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 @@ -20717,7 +19767,7 @@ Move_CHARM: waitforvisualfinish end -Move_ROLLOUT: +Move_ROLLOUT:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_ROCKS @@ -20734,7 +19784,7 @@ Move_ROLLOUT: blendoff end -Move_FALSE_SWIPE: +Move_FALSE_SWIPE:: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2 @@ -20761,7 +19811,7 @@ Move_FALSE_SWIPE: playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end -Move_SWAGGER: +Move_SWAGGER:: loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2 @@ -20779,7 +19829,7 @@ Move_SWAGGER: waitforvisualfinish end -Move_MILK_DRINK: +Move_MILK_DRINK:: loadspritegfx ANIM_TAG_MILK_BOTTLE loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR @@ -20800,7 +19850,7 @@ Move_MILK_DRINK: waitforvisualfinish end -Move_MAGNITUDE: +Move_MAGNITUDE:: createvisualtask AnimTask_IsPowerOver99, 2 waitforvisualfinish jumpreteq FALSE, MagnitudeRegular @@ -20822,7 +19872,7 @@ MagnitudeIntense: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 goto MagnitudeEnd -Move_RAPID_SPIN: +Move_RAPID_SPIN:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_RAPID_SPIN monbg ANIM_ATTACKER @@ -20841,7 +19891,7 @@ Move_RAPID_SPIN: clearmonbg ANIM_ATTACKER end -Move_MOONLIGHT: +Move_MOONLIGHT:: loadspritegfx ANIM_TAG_MOON loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR @@ -20868,7 +19918,7 @@ Move_MOONLIGHT: waitforvisualfinish end -Move_EXTREME_SPEED: +Move_EXTREME_SPEED:: loadspritegfx ANIM_TAG_SPEED_DUST loadspritegfx ANIM_TAG_IMPACT call SetHighSpeedBg @@ -20904,7 +19954,7 @@ Move_EXTREME_SPEED: delay 1 end -Move_UPROAR: +Move_UPROAR:: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_DEF_PARTNER @@ -20929,7 +19979,7 @@ Move_UPROAR: clearmonbg ANIM_DEF_PARTNER end -Move_HEAT_WAVE: +Move_HEAT_WAVE:: loadspritegfx ANIM_TAG_FLYING_DIRT createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLYING_DIRT, 0, 6, 6, RGB_RED createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE @@ -20954,7 +20004,7 @@ Move_HEAT_WAVE: end @ Also used by Hail weather -Move_HAIL: +Move_HAIL:: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 0, 6, RGB_BLACK @@ -20965,7 +20015,7 @@ Move_HAIL: createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 6, 0, RGB_BLACK end -Move_TORMENT: +Move_TORMENT:: loadspritegfx ANIM_TAG_ANGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask AnimTask_TormentAttacker, 2 @@ -20978,7 +20028,7 @@ Move_TORMENT: playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end -Move_MEMENTO: +Move_MEMENTO:: setalpha 0, 16 delay 1 createvisualtask AnimTask_InitMementoShadow, 2 @@ -21002,14 +20052,14 @@ Move_MEMENTO: delay 1 end -Move_FACADE: +Move_FACADE:: loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3 createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72 loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 24, 3 end -Move_SMELLING_SALTS: +Move_SMELLING_SALTS:: loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 2 @@ -21024,7 +20074,7 @@ Move_SMELLING_SALTS: loopsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET, 16, 3 end -Move_FOLLOW_ME: +Move_FOLLOW_ME:: loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER @@ -21034,7 +20084,7 @@ Move_FOLLOW_ME: loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 end -Move_CHARGE: +Move_CHARGE:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY @@ -21069,7 +20119,7 @@ Move_CHARGE: blendoff end -Move_TAUNT: +Move_TAUNT:: loadspritegfx ANIM_TAG_FINGER_2 loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER @@ -21089,7 +20139,7 @@ Move_TAUNT: playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end -Move_HELPING_HAND: +Move_HELPING_HAND:: loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_HelpingHandAttackerMovement, 5 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 @@ -21106,7 +20156,7 @@ Move_HELPING_HAND: createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 end -Move_ASSIST: +Move_ASSIST:: loadspritegfx ANIM_TAG_PAW_PRINT createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 @@ -21123,7 +20173,7 @@ Move_ASSIST: playsewithpan SE_M_SCRATCH, 0 end -Move_SUPERPOWER: +Move_SUPERPOWER:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_FLAT_ROCK @@ -21157,7 +20207,7 @@ Move_SUPERPOWER: delay 1 end -Move_RECYCLE: +Move_RECYCLE:: loadspritegfx ANIM_TAG_RECYCLE monbg ANIM_ATTACKER setalpha 0, 16 @@ -21173,7 +20223,7 @@ Move_RECYCLE: delay 1 end -Move_BRICK_BREAK: +Move_BRICK_BREAK:: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -21237,7 +20287,7 @@ BrickBreakShatteredWall: clearmonbg ANIM_TARGET end -Move_YAWN: +Move_YAWN:: loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER @@ -21253,7 +20303,7 @@ Move_YAWN: playsewithpan SE_M_YAWN, SOUND_PAN_TARGET end -Move_ENDEAVOR: +Move_ENDEAVOR:: loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2 @@ -21269,7 +20319,7 @@ Move_ENDEAVOR: playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end -Move_ERUPTION: +Move_ERUPTION:: loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 2, 0, 4, RGB_RED waitforvisualfinish @@ -21294,7 +20344,7 @@ Move_ERUPTION: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, F_PAL_BG | F_PAL_BATTLERS, 4, 4, 0, RGB_RED end -Move_SKILL_SWAP: +Move_SKILL_SWAP:: loadspritegfx ANIM_TAG_BLUEGREEN_ORB call SetPsychicBackground createvisualtask AnimTask_SkillSwap, 3, ANIM_TARGET @@ -21307,7 +20357,7 @@ Move_SKILL_SWAP: call UnsetPsychicBg end -Move_IMPRISON: +Move_IMPRISON:: loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground @@ -21324,7 +20374,7 @@ Move_IMPRISON: call UnsetPsychicBg end -Move_GRUDGE: +Move_GRUDGE:: loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_ATTACKER splitbgprio_all @@ -21342,7 +20392,7 @@ Move_GRUDGE: clearmonbg ANIM_ATTACKER end -Move_CAMOUFLAGE: +Move_CAMOUFLAGE:: monbg ANIM_ATK_PARTNER splitbgprio ANIM_ATTACKER setalpha 16, 0 @@ -21360,7 +20410,7 @@ Move_CAMOUFLAGE: clearmonbg ANIM_ATK_PARTNER end -Move_TAIL_GLOW: +Move_TAIL_GLOW:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATTACKER setalpha 12, 8 @@ -21376,7 +20426,7 @@ Move_TAIL_GLOW: delay 1 end -Move_LUSTER_PURGE: +Move_LUSTER_PURGE:: loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_IMPACT fadetobg BG_PSYCHIC @@ -21419,7 +20469,7 @@ Move_LUSTER_PURGE: call UnsetPsychicBg end -Move_MIST_BALL: +Move_MIST_BALL:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 @@ -21439,7 +20489,7 @@ Move_MIST_BALL: createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 16, 0, RGB_WHITE end -Move_FEATHER_DANCE: +Move_FEATHER_DANCE:: loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER splitbgprio_all @@ -21461,7 +20511,7 @@ Move_FEATHER_DANCE: clearmonbg ANIM_DEF_PARTNER end -Move_TEETER_DANCE: +Move_TEETER_DANCE:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5 @@ -21481,7 +20531,7 @@ Move_TEETER_DANCE: playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER end -Move_MUD_SPORT: +Move_MUD_SPORT:: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_Splash, 2, ANIM_ATTACKER, 6 delay 24 @@ -21528,7 +20578,7 @@ Move_MUD_SPORT: waitplaysewithpan SE_M_BUBBLE2, 0, 10 end -Move_NEEDLE_ARM: +Move_NEEDLE_ARM:: loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -21571,7 +20621,7 @@ Move_NEEDLE_ARM: createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -17, -17, 10 end -Move_SLACK_OFF: +Move_SLACK_OFF:: loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER @@ -21580,7 +20630,7 @@ Move_SLACK_OFF: waitforvisualfinish end -Move_CRUSH_CLAW: +Move_CRUSH_CLAW:: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_TORN_METAL @@ -21601,7 +20651,7 @@ Move_CRUSH_CLAW: clearmonbg ANIM_TARGET end -Move_AROMATHERAPY: +Move_AROMATHERAPY:: playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING @@ -21640,7 +20690,7 @@ Move_AROMATHERAPY: waitforvisualfinish end -Move_FAKE_TEARS: +Move_FAKE_TEARS:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_MUSIC_NOTES @@ -21663,7 +20713,7 @@ Move_FAKE_TEARS: waitforvisualfinish end -Move_AIR_CUTTER: +Move_AIR_CUTTER:: loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT @@ -21684,7 +20734,7 @@ Move_AIR_CUTTER: delay 0 end -Move_ODOR_SLEUTH: +Move_ODOR_SLEUTH:: monbg ANIM_TARGET createvisualtask AnimTask_OdorSleuthMovement, 5 delay 24 @@ -21700,7 +20750,7 @@ Move_ODOR_SLEUTH: playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER end -Move_GRASS_WHISTLE: +Move_GRASS_WHISTLE:: loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish @@ -21737,7 +20787,7 @@ Move_GRASS_WHISTLE: waitforvisualfinish end -Move_TICKLE: +Move_TICKLE:: loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 0, 0, 16, RGB_BLACK waitforvisualfinish @@ -21755,7 +20805,7 @@ Move_TICKLE: waitforvisualfinish end -Move_WATER_SPOUT: +Move_WATER_SPOUT:: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -21772,7 +20822,7 @@ Move_WATER_SPOUT: blendoff end -Move_SHADOW_PUNCH: +Move_SHADOW_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg BG_GHOST @@ -21793,7 +20843,7 @@ Move_SHADOW_PUNCH: waitbgfadein end -Move_EXTRASENSORY: +Move_EXTRASENSORY:: call SetPsychicBackground monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -21814,7 +20864,7 @@ Move_EXTRASENSORY: call UnsetPsychicBg end -Move_AERIAL_ACE: +Move_AERIAL_ACE:: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 @@ -21831,20 +20881,20 @@ Move_AERIAL_ACE: blendoff end -Move_IRON_DEFENSE: +Move_IRON_DEFENSE:: loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 2, RGB_WHITEALPHA, 14, RGB_WHITEALPHA, 0 waitforvisualfinish end -Move_BLOCK: +Move_BLOCK:: loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66 playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET end -Move_HOWL: +Move_HOWL:: loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER delay 12 @@ -21854,7 +20904,7 @@ Move_HOWL: delay 30 end -Move_BULK_UP: +Move_BULK_UP:: loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2 playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER @@ -21864,7 +20914,7 @@ Move_BULK_UP: waitforvisualfinish end -Move_COVET: +Move_COVET:: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0 @@ -21881,7 +20931,7 @@ Move_COVET: loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 4, 3 end -Move_VOLT_TACKLE: +Move_VOLT_TACKLE:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY @@ -21928,7 +20978,7 @@ Move_VOLT_TACKLE: waitforvisualfinish end -Move_WATER_SPORT: +Move_WATER_SPORT:: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask AnimTask_WaterSport, 5 delay 8 @@ -21941,7 +20991,7 @@ Move_WATER_SPORT: panse SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 end -Move_CALM_MIND: +Move_CALM_MIND:: loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, ANIM_ATTACKER, 0, 0, 16, RGB_BLACK @@ -21964,7 +21014,7 @@ Move_CALM_MIND: clearmonbg ANIM_ATK_PARTNER end -Move_LEAF_BLADE: +Move_LEAF_BLADE:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask AnimTask_LeafBlade, 5 @@ -21989,7 +21039,7 @@ Move_LEAF_BLADE: blendoff end -Move_DRAGON_DANCE: +Move_DRAGON_DANCE:: loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER splitbgprio ANIM_ATTACKER @@ -22013,7 +21063,7 @@ Move_DRAGON_DANCE: delay 1 end -Move_SHOCK_WAVE: +Move_SHOCK_WAVE:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK @@ -22043,13 +21093,13 @@ Move_SHOCK_WAVE: blendoff end -Move_HARDEN: +Move_HARDEN:: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK waitforvisualfinish end -Move_BELLY_DRUM: +Move_BELLY_DRUM:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask AnimTask_MusicNotesRainbowBlend, 2 @@ -22092,7 +21142,7 @@ BellyDrumRight: createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return -Move_MIND_READER: +Move_MIND_READER:: loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO @@ -22132,7 +21182,7 @@ MindReaderEyeSpikeEffect: delay 2 return -Move_ICE_PUNCH: +Move_ICE_PUNCH:: monbg ANIM_DEF_PARTNER setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -22169,7 +21219,7 @@ Move_ICE_PUNCH: blendoff end -Move_REST: +Move_REST:: playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -22180,7 +21230,7 @@ Move_REST: waitforvisualfinish end -Move_CONFUSION: +Move_CONFUSION:: monbg ANIM_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 @@ -22197,7 +21247,7 @@ Move_CONFUSION: call UnsetPsychicBg end -Move_PSYCHIC: +Move_PSYCHIC:: monbg ANIM_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 @@ -22214,7 +21264,7 @@ Move_PSYCHIC: call UnsetPsychicBg end -Move_FUTURE_SIGHT: +Move_FUTURE_SIGHT:: goto FutureSight FutureSightContinue: waitforvisualfinish @@ -22234,7 +21284,7 @@ FutureSight: blendoff goto FutureSightContinue -Move_THUNDER: +Move_THUNDER:: loadspritegfx ANIM_TAG_LIGHTNING fadetobg BG_THUNDER waitbgfadeout @@ -22292,7 +21342,7 @@ Move_THUNDER: waitbgfadein end -Move_THUNDER_PUNCH: +Move_THUNDER_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_LIGHTNING @@ -22325,7 +21375,7 @@ Move_THUNDER_PUNCH: blendoff end -Move_SACRED_FIRE: +Move_SACRED_FIRE:: loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER, 7, 5 @@ -22382,7 +21432,7 @@ Move_SACRED_FIRE: waitforvisualfinish end -Move_SCRATCH: +Move_SCRATCH:: loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_TARGET setalpha 12, 8 @@ -22395,7 +21445,7 @@ Move_SCRATCH: waitforvisualfinish end -Move_DRAGON_BREATH: +Move_DRAGON_BREATH:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -22429,7 +21479,7 @@ Move_DRAGON_BREATH: clearmonbg ANIM_DEF_PARTNER end -Move_ROAR: +Move_ROAR:: loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_ATTACKER splitbgprio ANIM_ATTACKER @@ -22457,7 +21507,7 @@ RoarEffect: createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1 return -Move_GROWL: +Move_GROWL:: loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL call RoarEffect @@ -22469,7 +21519,7 @@ Move_GROWL: waitforvisualfinish end -Move_SNORE: +Move_SNORE:: loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_ATK_PARTNER setalpha 8, 8 @@ -22490,7 +21540,7 @@ SnoreEffect: createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 return -Move_LIGHT_SCREEN: +Move_LIGHT_SCREEN:: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 @@ -22517,7 +21567,7 @@ SpecialScreenSparkle: createsprite gSpecialScreenSparkleSpriteTemplate, ANIM_ATTACKER, 2, 10, 18, ANIM_ATTACKER, TRUE return -Move_MIRROR_COAT: +Move_MIRROR_COAT:: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 @@ -22530,7 +21580,7 @@ Move_MIRROR_COAT: blendoff end -Move_REFLECT: +Move_REFLECT:: loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 @@ -22547,7 +21597,7 @@ Move_REFLECT: blendoff end -Move_BARRIER: +Move_BARRIER:: loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 @@ -22557,7 +21607,7 @@ Move_BARRIER: blendoff end -Move_BUBBLE: +Move_BUBBLE:: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET @@ -22593,7 +21643,7 @@ Move_BUBBLE: blendoff end -Move_SMOG: +Move_SMOG:: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_DEF_PARTNER splitbgprio_all @@ -22620,7 +21670,7 @@ SmogCloud: delay 7 return -Move_FAINT_ATTACK: +Move_FEINT_ATTACK:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATTACKER fadetobg BG_DARK @@ -22656,7 +21706,7 @@ Move_FAINT_ATTACK: waitbgfadein end -Move_SAND_ATTACK: +Move_SAND_ATTACK:: loadspritegfx ANIM_TAG_MUD_SAND monbg ANIM_ATK_PARTNER splitbgprio ANIM_ATTACKER @@ -22684,7 +21734,7 @@ SandAttackDirt: delay 2 return -Move_MUD_SLAP: +Move_MUD_SLAP:: loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 @@ -22707,7 +21757,7 @@ MudSlapMud: delay 2 return -Move_DRAGON_RAGE: +Move_DRAGON_RAGE:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER @@ -22739,7 +21789,7 @@ Move_DRAGON_RAGE: waitforvisualfinish end -Move_RAIN_DANCE: +Move_RAIN_DANCE:: loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB_BLACK @@ -22753,7 +21803,7 @@ Move_RAIN_DANCE: waitforvisualfinish end -Move_BITE: +Move_BITE:: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -22770,7 +21820,7 @@ Move_BITE: delay 1 end -Move_CRUNCH: +Move_CRUNCH:: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -22798,7 +21848,7 @@ Move_CRUNCH: waitbgfadein end -Move_CLAMP: +Move_CLAMP:: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -22815,7 +21865,7 @@ Move_CLAMP: waitforvisualfinish end -Move_ICE_BEAM: +Move_ICE_BEAM:: monbg ANIM_TARGET splitbgprio ANIM_TARGET setalpha 12, 8 @@ -22859,13 +21909,13 @@ IceBeamCreateCrystals: delay 1 return -Move_WITHDRAW: +Move_WITHDRAW:: playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createvisualtask AnimTask_Withdraw, 5 waitforvisualfinish end -Move_AURORA_BEAM: +Move_AURORA_BEAM:: loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORA waitbgfadein @@ -22901,7 +21951,7 @@ AuroraBeamCreateRings: delay 1 return -Move_SOLAR_BEAM: +Move_SOLAR_BEAM:: loadspritegfx ANIM_TAG_ORBS choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash SolarBeamEnd: @@ -22990,7 +22040,7 @@ SolarBeamUnleash1: delay 4 return -Move_BLIZZARD: +Move_BLIZZARD:: loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER call SetHighSpeedBg @@ -23030,7 +22080,7 @@ BlizzardIceCrystals: delay 3 return -Move_POWDER_SNOW: +Move_POWDER_SNOW:: loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 1, 0, 3, RGB_BLACK @@ -23064,7 +22114,7 @@ PowderSnowSnowballs: delay 3 return -Move_HYDRO_PUMP: +Move_HYDRO_PUMP:: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -23111,7 +22161,7 @@ HydroPumpHitSplats: createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, -15, ANIM_TARGET, 1 return -Move_SIGNAL_BEAM: +Move_SIGNAL_BEAM:: loadspritegfx ANIM_TAG_GLOWY_RED_ORB loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB loadspritegfx ANIM_TAG_DUCK @@ -23152,7 +22202,7 @@ SignalBeamOrbs: delay 1 return -Move_ABSORB: +Move_ABSORB:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT @@ -23205,7 +22255,7 @@ AbsorbEffect: delay 4 return -Move_MEGA_DRAIN: +Move_MEGA_DRAIN:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT @@ -23266,7 +22316,7 @@ MegaDrainAbsorbEffect: delay 4 return -Move_GIGA_DRAIN: +Move_GIGA_DRAIN:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT @@ -23335,7 +22385,7 @@ GigaDrainAbsorbEffect: delay 4 return -Move_LEECH_LIFE: +Move_LEECH_LIFE:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_ORBS delay 1 @@ -23365,7 +22415,7 @@ Move_LEECH_LIFE: blendoff end -Move_SYNTHESIS: +Move_SYNTHESIS:: loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER @@ -23378,7 +22428,7 @@ Move_SYNTHESIS: waitforvisualfinish end -Move_TOXIC: +Move_TOXIC:: loadspritegfx ANIM_TAG_TOXIC_BUBBLE loadspritegfx ANIM_TAG_POISON_BUBBLE call ToxicBubbles @@ -23403,7 +22453,7 @@ ToxicBubbles: delay 15 return -Move_SLUDGE: +Move_SLUDGE:: loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 @@ -23414,7 +22464,7 @@ Move_SLUDGE: waitforvisualfinish end -Move_SLUDGE_BOMB: +Move_SLUDGE_BOMB:: loadspritegfx ANIM_TAG_POISON_BUBBLE call SludgeBombProjectile call SludgeBombProjectile @@ -23457,7 +22507,7 @@ SludgeBombProjectile: delay 3 return -Move_ACID: +Move_ACID:: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0, TRUE @@ -23490,7 +22540,7 @@ Move_ACID: clearmonbg ANIM_DEF_PARTNER end -Move_BONEMERANG: +Move_BONEMERANG:: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23510,7 +22560,7 @@ Move_BONEMERANG: blendoff end -Move_BONE_CLUB: +Move_BONE_CLUB:: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23528,7 +22578,7 @@ Move_BONE_CLUB: blendoff end -Move_BONE_RUSH: +Move_BONE_RUSH:: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23544,7 +22594,7 @@ Move_BONE_RUSH: blendoff end -Move_SPIKES: +Move_SPIKES:: loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER @@ -23561,7 +22611,7 @@ Move_SPIKES: clearmonbg ANIM_DEF_PARTNER end -Move_MEGAHORN: +Move_MEGAHORN:: loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23604,7 +22654,7 @@ MegahornInContest: createvisualtask AnimTask_StartSlidingBg, 5, 2304, 768, 0, -1 goto MegahornContinue -Move_GUST: +Move_GUST:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23622,7 +22672,7 @@ Move_GUST: blendoff end -Move_WING_ATTACK: +Move_WING_ATTACK:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23646,7 +22696,7 @@ Move_WING_ATTACK: blendoff end -Move_PECK: +Move_PECK:: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, ANIM_TARGET, 2 @@ -23654,7 +22704,7 @@ Move_PECK: waitforvisualfinish end -Move_AEROBLAST: +Move_AEROBLAST:: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23695,7 +22745,7 @@ AeroblastBeam: delay 3 return -Move_WATER_GUN: +Move_WATER_GUN:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -23719,7 +22769,7 @@ Move_WATER_GUN: blendoff end -Move_CRABHAMMER: +Move_CRABHAMMER:: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -23756,14 +22806,14 @@ Move_CRABHAMMER: blendoff end -Move_SURF: +Move_SURF:: createvisualtask AnimTask_CreateSurfWave, 2, ANIM_SURF_PAL_SURF delay 24 panse SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 waitforvisualfinish end -Move_FLAMETHROWER: +Move_FLAMETHROWER:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -23797,7 +22847,7 @@ FlamethrowerCreateFlames: return @ Also used by Sandstorm weather -Move_SANDSTORM: +Move_SANDSTORM:: loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_M_SANDSTORM, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE @@ -23817,7 +22867,7 @@ Move_SANDSTORM: createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 0 end -Move_WHIRLPOOL: +Move_WHIRLPOOL:: loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -23850,7 +22900,7 @@ WhirlpoolEffect: delay 2 return -Move_FLY: +Move_FLY:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim FlySetUp, FlyUnleash @@ -23877,7 +22927,7 @@ FlyUnleash: blendoff goto FlyEnd -Move_BOUNCE: +Move_BOUNCE:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim BounceSetUp, BounceUnleash @@ -23903,7 +22953,7 @@ BounceUnleash: blendoff goto BounceEnd -Move_KARATE_CHOP: +Move_KARATE_CHOP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23920,7 +22970,7 @@ Move_KARATE_CHOP: blendoff end -Move_CROSS_CHOP: +Move_CROSS_CHOP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER @@ -23938,7 +22988,7 @@ Move_CROSS_CHOP: blendoff end -Move_JUMP_KICK: +Move_JUMP_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23956,7 +23006,7 @@ Move_JUMP_KICK: blendoff end -Move_HIGH_JUMP_KICK: +Move_HIGH_JUMP_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23982,7 +23032,7 @@ Move_HIGH_JUMP_KICK: blendoff end -Move_DOUBLE_KICK: +Move_DOUBLE_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -23995,7 +23045,7 @@ Move_DOUBLE_KICK: blendoff end -Move_TRIPLE_KICK: +Move_TRIPLE_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -24028,7 +23078,7 @@ TripleKickCenter: createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 goto TripleKickContinue -Move_DYNAMIC_PUNCH: +Move_DYNAMIC_PUNCH:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_EXPLOSION @@ -24062,7 +23112,7 @@ Move_DYNAMIC_PUNCH: blendoff end -Move_COUNTER: +Move_COUNTER:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER @@ -24094,7 +23144,7 @@ Move_COUNTER: blendoff end -Move_VITAL_THROW: +Move_VITAL_THROW:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -24117,7 +23167,7 @@ Move_VITAL_THROW: blendoff end -Move_ROCK_SMASH: +Move_ROCK_SMASH:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -24144,7 +23194,7 @@ Move_ROCK_SMASH: blendoff end -Move_SUBMISSION: +Move_SUBMISSION:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -24178,7 +23228,7 @@ SubmissionHit: return @ Also used by Sunny weather -Move_SUNNY_DAY: +Move_SUNNY_DAY:: loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_ATK_PARTNER setalpha 13, 3 @@ -24201,7 +23251,7 @@ SunnyDayLightRay: delay 6 return -Move_COTTON_SPORE: +Move_COTTON_SPORE:: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -24222,7 +23272,7 @@ CreateCottonSpores: delay 12 return -Move_SPORE: +Move_SPORE:: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -24246,7 +23296,7 @@ CreateSpore: delay 12 return -Move_PETAL_DANCE: +Move_PETAL_DANCE:: loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -24284,7 +23334,7 @@ Move_PETAL_DANCE: blendoff end -Move_RAZOR_LEAF: +Move_RAZOR_LEAF:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT @@ -24324,10 +23374,10 @@ Move_RAZOR_LEAF: blendoff end -Move_NATURE_POWER: +Move_NATURE_POWER:: @ No actual animation, uses the animation of a move from sNaturePowerMoves instead -Move_ANCIENT_POWER: +Move_ANCIENT_POWER:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -24360,7 +23410,7 @@ Move_ANCIENT_POWER: blendoff end -Move_OCTAZOOKA: +Move_OCTAZOOKA:: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER @@ -24377,7 +23427,7 @@ Move_OCTAZOOKA: waitforvisualfinish end -Move_MIST: +Move_MIST:: loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -24401,7 +23451,7 @@ MistCloud: delay 7 return -Move_HAZE: +Move_HAZE:: waitforvisualfinish playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_HazeScrollingFog, 5 @@ -24411,7 +23461,7 @@ Move_HAZE: createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 1, 16, 0, RGB_BLACK end -Move_FIRE_PUNCH: +Move_FIRE_PUNCH:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT @@ -24447,7 +23497,7 @@ FireSpreadEffect: createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 112, -128, 40 return -Move_LEER: +Move_LEER:: loadspritegfx ANIM_TAG_LEER monbg ANIM_ATTACKER splitbgprio ANIM_ATTACKER @@ -24466,7 +23516,7 @@ Move_LEER: waitforvisualfinish end -Move_DREAM_EATER: +Move_DREAM_EATER:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER @@ -24533,7 +23583,7 @@ DreamEaterAbsorb: delay 4 return -Move_POISON_GAS: +Move_POISON_GAS:: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 @@ -24571,7 +23621,7 @@ Move_POISON_GAS: delay 0 end -Move_BIND: +Move_BIND:: createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_ATTACKER goto BindWrap @@ -24586,11 +23636,11 @@ BindWrapSqueezeTarget: delay 16 return -Move_WRAP: +Move_WRAP:: createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 6, 4, 2, 4 goto BindWrap -Move_PSYBEAM: +Move_PSYBEAM:: loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground @@ -24617,7 +23667,7 @@ PsybeamRings: delay 4 return -Move_HYPNOSIS: +Move_HYPNOSIS:: loadspritegfx ANIM_TAG_GOLD_RING call SetPsychicBackground call HypnosisRings @@ -24635,7 +23685,7 @@ HypnosisRings: delay 6 return -Move_PSYWAVE: +Move_PSYWAVE:: loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground @@ -24659,7 +23709,7 @@ PsywaveRings: delay 4 return -Move_ZAP_CANNON: +Move_ZAP_CANNON:: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER @@ -24680,7 +23730,7 @@ Move_ZAP_CANNON: waitforvisualfinish end -Move_STEEL_WING: +Move_STEEL_WING:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 @@ -24707,7 +23757,7 @@ Move_STEEL_WING: blendoff end -Move_IRON_TAIL: +Move_IRON_TAIL:: loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK @@ -24726,7 +23776,7 @@ Move_IRON_TAIL: waitforvisualfinish end -Move_POISON_TAIL: +Move_POISON_TAIL:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 @@ -24747,7 +23797,7 @@ Move_POISON_TAIL: waitforvisualfinish end -Move_METAL_CLAW: +Move_METAL_CLAW:: loadspritegfx ANIM_TAG_CLAW_SLASH loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK @@ -24768,7 +23818,7 @@ Move_METAL_CLAW: waitforvisualfinish end -Move_NIGHT_SHADE: +Move_NIGHT_SHADE:: monbg ANIM_ATTACKER splitbgprio ANIM_ATTACKER playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER @@ -24787,7 +23837,7 @@ Move_NIGHT_SHADE: waitbgfadein end -Move_EGG_BOMB: +Move_EGG_BOMB:: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER @@ -24812,7 +23862,7 @@ Move_EGG_BOMB: waitforvisualfinish end -Move_SHADOW_BALL: +Move_SHADOW_BALL:: loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg BG_GHOST waitbgfadein @@ -24827,7 +23877,7 @@ Move_SHADOW_BALL: waitbgfadein end -Move_LICK: +Move_LICK:: loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_M_LICK, SOUND_PAN_TARGET @@ -24836,7 +23886,7 @@ Move_LICK: waitforvisualfinish end -Move_FOCUS_ENERGY: +Move_FOCUS_ENERGY:: loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect @@ -24849,7 +23899,7 @@ Move_FOCUS_ENERGY: waitforvisualfinish end -Move_BIDE: +Move_BIDE:: choosetwoturnanim BideSetUp, BideUnleash end BideSetUp: @@ -24889,7 +23939,7 @@ BideUnleash: blendoff end -Move_STRING_SHOT: +Move_STRING_SHOT:: loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER @@ -24934,7 +23984,7 @@ StringShotThread: delay 1 return -Move_SPIDER_WEB: +Move_SPIDER_WEB:: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER @@ -24971,7 +24021,7 @@ SpiderWebThread: delay 1 return -Move_RAZOR_WIND: +Move_RAZOR_WIND:: choosetwoturnanim RazorWindSetUp, RazorWindUnleash RazorWindEnd: waitforvisualfinish @@ -25009,7 +24059,7 @@ RazorWindUnleash: blendoff goto RazorWindEnd -Move_DISABLE: +Move_DISABLE:: loadspritegfx ANIM_TAG_SPARKLE_4 monbg ANIM_TARGET splitbgprio ANIM_TARGET @@ -25025,7 +24075,7 @@ Move_DISABLE: blendoff end -Move_RECOVER: +Move_RECOVER:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER @@ -25060,7 +24110,7 @@ RecoverAbsorbEffect: delay 3 return -Move_MIMIC: +Move_MIMIC:: loadspritegfx ANIM_TAG_ORBS setalpha 11, 5 monbg_static ANIM_DEF_PARTNER @@ -25079,7 +24129,7 @@ Move_MIMIC: blendoff end -Move_CONSTRICT: +Move_CONSTRICT:: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 @@ -25096,7 +24146,7 @@ Move_CONSTRICT: waitforvisualfinish end -Move_CURSE: +Move_CURSE:: choosetwoturnanim CurseGhost, CurseStats CurseGhost: loadspritegfx ANIM_TAG_NAIL @@ -25141,7 +24191,7 @@ CurseStats1: createvisualtask AnimTask_BlendColorCycle, 5, F_PAL_ATTACKER, 4, 2, 0, 10, RGB_RED return -Move_SOFT_BOILED: +Move_SOFT_BOILED:: loadspritegfx ANIM_TAG_BREAKING_EGG loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR @@ -25164,7 +24214,7 @@ Move_SOFT_BOILED: call HealingEffect2 end -Move_HEAL_BELL: +Move_HEAL_BELL:: loadspritegfx ANIM_TAG_BELL loadspritegfx ANIM_TAG_MUSIC_NOTES_2 loadspritegfx ANIM_TAG_THIN_RING @@ -25216,7 +24266,7 @@ HealBellRing: playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER return -Move_FAKE_OUT: +Move_FAKE_OUT:: playsewithpan SE_M_FLATTER, 0 createvisualtask AnimTask_FakeOut, 5 waitforvisualfinish @@ -25227,7 +24277,7 @@ Move_FAKE_OUT: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 16, 0, RGB_WHITE end -Move_SCARY_FACE: +Move_SCARY_FACE:: loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, (F_PAL_BG | F_PAL_ATK_SIDE | F_PAL_DEF_PARTNER), 3, 0, 16, RGB_BLACK playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER @@ -25245,7 +24295,7 @@ Move_SCARY_FACE: waitforvisualfinish end -Move_SWEET_KISS: +Move_SWEET_KISS:: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 @@ -25264,7 +24314,7 @@ Move_SWEET_KISS: createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 end -Move_LOVELY_KISS: +Move_LOVELY_KISS:: loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 @@ -25277,7 +24327,7 @@ Move_LOVELY_KISS: createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -128, -22 end -Move_FURY_SWIPES: +Move_FURY_SWIPES:: loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 @@ -25292,7 +24342,7 @@ Move_FURY_SWIPES: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end -Move_INGRAIN: +Move_INGRAIN:: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 @@ -25322,7 +24372,7 @@ Move_INGRAIN: waitforvisualfinish end -Move_PRESENT: +Move_PRESENT:: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 @@ -25382,14 +24432,14 @@ PresentHeal: call HealingEffect2 end -Move_BATON_PASS: +Move_BATON_PASS:: loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_M_BATON_PASS, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_BATTLERS), 1, 2, 0, 11, RGB(31, 22, 30) createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2 end -Move_PERISH_SONG: +Move_PERISH_SONG:: loadspritegfx ANIM_TAG_MUSIC_NOTES_2 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 0 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 1, 1, 16 @@ -25425,7 +24475,7 @@ Move_PERISH_SONG: waitforvisualfinish end -Move_SLEEP_TALK: +Move_SLEEP_TALK:: loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER delay 20 @@ -25452,7 +24502,7 @@ Move_SLEEP_TALK: waitforvisualfinish end -Move_HYPER_FANG: +Move_HYPER_FANG:: loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 1 @@ -25483,7 +24533,7 @@ HyperFangInContest: fadetobg BG_IMPACT_CONTESTS goto HyperFangContinue -Move_TRI_ATTACK: +Move_TRI_ATTACK:: loadspritegfx ANIM_TAG_TRI_ATTACK_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER @@ -25532,7 +24582,7 @@ Move_TRI_ATTACK: waitforvisualfinish end -Move_WILL_O_WISP: +Move_WILL_O_WISP:: loadspritegfx ANIM_TAG_WISP_FIRE loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER @@ -25563,7 +24613,7 @@ Move_WILL_O_WISP: clearmonbg ANIM_DEF_PARTNER end -Move_ENCORE: +Move_ENCORE:: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_CreateSpotlight, 2 @@ -25583,7 +24633,7 @@ Move_ENCORE: createvisualtask AnimTask_RemoveSpotlight, 2 end -Move_TRICK: +Move_TRICK:: loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_SPEED_DUST createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 @@ -25611,7 +24661,7 @@ Move_TRICK: waitforvisualfinish end -Move_WISH: +Move_WISH:: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 0, 10, RGB_BLACK @@ -25627,7 +24677,7 @@ Move_WISH: waitforvisualfinish end -Move_STOCKPILE: +Move_STOCKPILE:: loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 8, 1, 0, 12, RGB_WHITE @@ -25656,7 +24706,7 @@ StockpileAbsorb: delay 1 return -Move_SPIT_UP: +Move_SPIT_UP:: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER @@ -25703,7 +24753,7 @@ SpitUpStrongest: createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 240 goto SpitUpContinue -Move_SWALLOW: +Move_SWALLOW:: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER @@ -25739,7 +24789,7 @@ SwallowBest: call SwallowEffect goto SwallowContinue -Move_TRANSFORM: +Move_TRANSFORM:: monbg ANIM_ATTACKER playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 @@ -25748,7 +24798,7 @@ Move_TRANSFORM: clearmonbg ANIM_ATTACKER end -Move_MORNING_SUN: +Move_MORNING_SUN:: loadspritegfx ANIM_TAG_GREEN_STAR loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_MorningSunLightBeam, 5 @@ -25780,7 +24830,7 @@ MorningSunStar: delay 5 return -Move_SWEET_SCENT: +Move_SWEET_SCENT:: loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 @@ -25818,7 +24868,7 @@ SweetScentEffect: delay 2 return -Move_HYPER_BEAM: +Move_HYPER_BEAM:: loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 4, 0, 16, RGB_BLACK waitforvisualfinish @@ -25868,7 +24918,7 @@ HyperBeamOrbs: delay 1 return -Move_FLATTER: +Move_FLATTER:: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_CONFETTI createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET @@ -25913,7 +24963,7 @@ CreateFlatterConfetti: createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_TARGET return -Move_ROLE_PLAY: +Move_ROLE_PLAY:: monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 0, 10, RGB_BLACK @@ -25928,7 +24978,7 @@ Move_ROLE_PLAY: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 10, 0, RGB_BLACK end -Move_REFRESH: +Move_REFRESH:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER @@ -25942,7 +24992,7 @@ Move_REFRESH: createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end -Move_BLAZE_KICK: +Move_BLAZE_KICK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER @@ -25963,7 +25013,7 @@ Move_BLAZE_KICK: blendoff end -Move_HYPER_VOICE: +Move_HYPER_VOICE:: loadspritegfx ANIM_TAG_THIN_RING createvisualtask SoundTask_PlayCryWithEcho, 5, FALSE call HyperVoiceEffect @@ -25984,7 +25034,7 @@ HyperVoiceEffect: createvisualtask SoundTask_WaitForCry, 5 return -Move_SAND_TOMB: +Move_SAND_TOMB:: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_TARGET, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 @@ -26012,7 +25062,7 @@ SandTombSwirlingDirt: delay 2 return -Move_SHEER_COLD: +Move_SHEER_COLD:: fadetobg BG_ICE waitbgfadeout playsewithpan SE_M_ICY_WIND, 0 @@ -26030,7 +25080,7 @@ Move_SHEER_COLD: waitbgfadein end -Move_ARM_THRUST: +Move_ARM_THRUST:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT splitbgprio ANIM_TARGET @@ -26057,13 +25107,13 @@ ArmThrustLeft: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 0, ANIM_TARGET, 2 goto ArmThrustContinue -Move_MUDDY_WATER: +Move_MUDDY_WATER:: panse SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_CreateSurfWave, 2, ANIM_SURF_PAL_MUDDY_WATER waitforvisualfinish end -Move_BULLET_SEED: +Move_BULLET_SEED:: loadspritegfx ANIM_TAG_SEED createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 @@ -26088,7 +25138,7 @@ Move_BULLET_SEED: waitforvisualfinish end -Move_DRAGON_CLAW: +Move_DRAGON_CLAW:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_ATTACKER @@ -26148,7 +25198,7 @@ DragonClawFireSpiral: return end -Move_MUD_SHOT: +Move_MUD_SHOT:: loadspritegfx ANIM_TAG_BROWN_ORB monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -26180,7 +25230,7 @@ MudShotOrbs: delay 2 return -Move_METEOR_MASH: +Move_METEOR_MASH:: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -26205,7 +25255,7 @@ Move_METEOR_MASH: waitforvisualfinish end -Move_REVENGE: +Move_REVENGE:: loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_TARGET setalpha 12, 8 @@ -26234,7 +25284,7 @@ Move_REVENGE: blendoff end -Move_POISON_FANG: +Move_POISON_FANG:: loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_M_BITE, SOUND_PAN_TARGET @@ -26247,12 +25297,12 @@ Move_POISON_FANG: waitforvisualfinish end -Move_SUBSTITUTE: +Move_SUBSTITUTE:: playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER createvisualtask AnimTask_MonToSubstitute, 2 end -Move_FRENZY_PLANT: +Move_FRENZY_PLANT:: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -26312,7 +25362,7 @@ Move_FRENZY_PLANT: blendoff end -Move_METAL_SOUND: +Move_METAL_SOUND:: loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_DEF_PARTNER splitbgprio_foes ANIM_TARGET @@ -26332,7 +25382,7 @@ MetalSoundRings: delay 2 return -Move_FOCUS_PUNCH: +Move_FOCUS_PUNCH:: goto FocusPunch FocusPunchEnd: waitforvisualfinish @@ -26380,7 +25430,7 @@ FocusPunchInContest: fadetobg BG_IMPACT_CONTESTS goto FocusPunchContinue -Move_RETURN: +Move_RETURN:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -26517,7 +25567,7 @@ ReturnStrongestHit: waitforvisualfinish return -Move_COSMIC_POWER: +Move_COSMIC_POWER:: loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_COSMIC_POWER, 0 playsewithpan SE_M_COSMIC_POWER, 0 @@ -26542,7 +25592,7 @@ Move_COSMIC_POWER: waitforvisualfinish end -Move_BLAST_BURN: +Move_BLAST_BURN:: loadspritegfx ANIM_TAG_FIRE_PLUME loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -26587,7 +25637,7 @@ Move_BLAST_BURN: blendoff end -Move_ROCK_TOMB: +Move_ROCK_TOMB:: loadspritegfx ANIM_TAG_X_SIGN loadspritegfx ANIM_TAG_ROCKS createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1 @@ -26645,7 +25695,7 @@ UnsetBugBg: waitbgfadein return -Move_SILVER_WIND: +Move_SILVER_WIND:: loadspritegfx ANIM_TAG_SPARKLE_6 panse SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_M_MORNING_SUN, 0 @@ -26684,12 +25734,12 @@ Move_SILVER_WIND: call UnsetBugBg end -Move_SNATCH: +Move_SNATCH:: playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 end -Move_DIVE: +Move_DIVE:: loadspritegfx ANIM_TAG_SPLASH loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim DiveSetUp, DiveAttack @@ -26734,7 +25784,7 @@ DiveAttackWaterDroplets: createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 return -Move_ROCK_BLAST: +Move_ROCK_BLAST:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -26752,7 +25802,7 @@ Move_ROCK_BLAST: waitforvisualfinish end -Move_OVERHEAT: +Move_OVERHEAT:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -26833,7 +25883,7 @@ Move_OVERHEAT: waitforvisualfinish end -Move_HYDRO_CANNON: +Move_HYDRO_CANNON:: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -26875,7 +25925,7 @@ HydroCannonBeam: createsprite gHydroCannonBeamSpriteTemplate, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 return -Move_ASTONISH: +Move_ASTONISH:: loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_M_ENCORE, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -26888,7 +25938,7 @@ Move_ASTONISH: waitforvisualfinish end -Move_SEISMIC_TOSS: +Move_SEISMIC_TOSS:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 @@ -26955,7 +26005,7 @@ SeismicTossRockScatter2: createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 12, 30, 4, 3 return -Move_MAGIC_COAT: +Move_MAGIC_COAT:: loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 @@ -26965,7 +26015,7 @@ Move_MAGIC_COAT: blendoff end -Move_WATER_PULSE: +Move_WATER_PULSE:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_TARGET @@ -26996,7 +26046,7 @@ Move_WATER_PULSE: clearmonbg ANIM_DEF_PARTNER end -Move_PSYCHO_BOOST: +Move_PSYCHO_BOOST:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC @@ -27023,7 +26073,7 @@ Move_PSYCHO_BOOST: call UnsetPsychicBg end -Move_KNOCK_OFF: +Move_KNOCK_OFF:: loadspritegfx ANIM_TAG_SLAM_HIT_2 loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -27044,7 +26094,7 @@ Move_KNOCK_OFF: waitforvisualfinish end -Move_DOOM_DESIRE: +Move_DOOM_DESIRE:: createvisualtask GetIsDoomDesireHitTurn, 2 delay 1 monbg ANIM_ATK_PARTNER @@ -27063,7 +26113,7 @@ Move_DOOM_DESIRE: blendoff end -Move_SKY_UPPERCUT: +Move_SKY_UPPERCUT:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER splitbgprio ANIM_TARGET @@ -27107,7 +26157,7 @@ Move_SKY_UPPERCUT: waitbgfadein end -Move_SECRET_POWER: +Move_SECRET_POWER:: createvisualtask AnimTask_GetFieldTerrain, 5 jumpargeq 0, STATUS_FIELD_MISTY_TERRAIN, Move_FAIRY_WIND jumpargeq 0, STATUS_FIELD_GRASSY_TERRAIN, Move_NEEDLE_ARM @@ -27152,7 +26202,7 @@ Move_SECRET_POWER: goto Move_SLAM .endif -Move_TWISTER: +Move_TWISTER:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS @@ -27198,7 +26248,7 @@ Move_TWISTER: blendoff end -Move_MAGICAL_LEAF: +Move_MAGICAL_LEAF:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT @@ -27242,7 +26292,7 @@ Move_MAGICAL_LEAF: blendoff end -Move_ICE_BALL: +Move_ICE_BALL:: loadspritegfx ANIM_TAG_ICE_CHUNK loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_GetIceBallCounter, 5, 0 @@ -27332,7 +26382,7 @@ IceBallImpactShard: createsprite gIceBallImpactShardSpriteTemplate, ANIM_TARGET, 4, -12, -16 return -Move_WEATHER_BALL: +Move_WEATHER_BALL:: loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER delay 8 @@ -27427,7 +26477,7 @@ WeatherBallIce: waitforvisualfinish end -Move_COUNT: +Move_COUNT:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 @@ -28770,7 +27820,7 @@ Move_BREAKNECK_BLITZ:: end -Move_ALL_OUT_PUMMELING: +Move_ALL_OUT_PUMMELING:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_METEOR @@ -28860,7 +27910,7 @@ Move_ALL_OUT_PUMMELING: end -Move_SUPERSONIC_SKYSTRIKE: +Move_SUPERSONIC_SKYSTRIKE:: loadspritegfx ANIM_TAG_ROUND_SHADOW @ fly loadspritegfx ANIM_TAG_MUD_SAND @ dig loadspritegfx ANIM_TAG_FOCUS_ENERGY @ focus energy @@ -28933,7 +27983,7 @@ FinishSupersonicSkystrike: end -Move_ACID_DOWNPOUR: +Move_ACID_DOWNPOUR:: loadspritegfx ANIM_TAG_BLUE_ORB @ reversal loadspritegfx ANIM_TAG_POISON_JAB @ poison jab loadspritegfx ANIM_TAG_POISON_BUBBLE @ poison bubbles @@ -29019,7 +28069,7 @@ AcidDownpourFlareOnAttacker: return -Move_TECTONIC_RAGE: +Move_TECTONIC_RAGE:: loadspritegfx ANIM_TAG_DIRT_MOUND @ dig loadspritegfx ANIM_TAG_MUD_SAND @ rollout small rocks loadspritegfx ANIM_TAG_ROCKS @ rollout @@ -34326,163 +33376,163 @@ General_SetWeather:: jumpreteq 4, General_Hail end -Move_MAX_GUARD: +Move_MAX_GUARD:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_PROTECT end -Move_MAX_STRIKE: -Move_G_MAX_REPLENISH: +Move_MAX_STRIKE:: +Move_G_MAX_REPLENISH:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_GIGA_IMPACT end -Move_MAX_AIRSTREAM: -Move_G_MAX_WIND_RAGE: +Move_MAX_AIRSTREAM:: +Move_G_MAX_WIND_RAGE:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_AEROBLAST end -Move_MAX_OOZE: -Move_G_MAX_MALODOR: +Move_MAX_OOZE:: +Move_G_MAX_MALODOR:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_GUNK_SHOT end -Move_G_MAX_WILDFIRE: -Move_G_MAX_FIREBALL: -Move_G_MAX_CENTIFERNO: -Move_MAX_FLARE: +Move_G_MAX_WILDFIRE:: +Move_G_MAX_FIREBALL:: +Move_G_MAX_CENTIFERNO:: +Move_MAX_FLARE:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_BLAST_BURN end -Move_G_MAX_CANNONADE: -Move_G_MAX_HYDROSNIPE: -Move_G_MAX_FOAM_BURST: -Move_MAX_GEYSER: +Move_G_MAX_CANNONADE:: +Move_G_MAX_HYDROSNIPE:: +Move_G_MAX_FOAM_BURST:: +Move_MAX_GEYSER:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_HYDRO_CANNON end -Move_G_MAX_VINE_LASH: -Move_G_MAX_DRUM_SOLO: -Move_G_MAX_TARTNESS: -Move_G_MAX_SWEETNESS: -Move_MAX_OVERGROWTH: +Move_G_MAX_VINE_LASH:: +Move_G_MAX_DRUM_SOLO:: +Move_G_MAX_TARTNESS:: +Move_G_MAX_SWEETNESS:: +Move_MAX_OVERGROWTH:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_FRENZY_PLANT end -Move_MAX_LIGHTNING: -Move_G_MAX_STUN_SHOCK: +Move_MAX_LIGHTNING:: +Move_G_MAX_STUN_SHOCK:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_ZAP_CANNON end -Move_G_MAX_CHI_STRIKE: -Move_G_MAX_ONE_BLOW: -Move_G_MAX_RAPID_FLOW: -Move_MAX_KNUCKLE: +Move_G_MAX_CHI_STRIKE:: +Move_G_MAX_ONE_BLOW:: +Move_G_MAX_RAPID_FLOW:: +Move_MAX_KNUCKLE:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_CLOSE_COMBAT end -Move_G_MAX_RESONANCE: -Move_MAX_HAILSTORM: +Move_G_MAX_RESONANCE:: +Move_MAX_HAILSTORM:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_SHEER_COLD end -Move_G_MAX_SANDBLAST: -Move_MAX_QUAKE: +Move_G_MAX_SANDBLAST:: +Move_MAX_QUAKE:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_FISSURE end -Move_G_MAX_BEFUDDLE: -Move_MAX_FLUTTERBY: +Move_G_MAX_BEFUDDLE:: +Move_MAX_FLUTTERBY:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_BUG_BUZZ end -Move_G_MAX_STEELSURGE: -Move_G_MAX_MELTDOWN: -Move_MAX_STEELSPIKE: +Move_G_MAX_STEELSURGE:: +Move_G_MAX_MELTDOWN:: +Move_MAX_STEELSPIKE:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_HEAVY_SLAM end -Move_G_MAX_TERROR: -Move_MAX_PHANTASM: +Move_G_MAX_TERROR:: +Move_MAX_PHANTASM:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_PHANTOM_FORCE end -Move_G_MAX_GRAVITAS: -Move_MAX_MINDSTORM: +Move_G_MAX_GRAVITAS:: +Move_MAX_MINDSTORM:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_PSYCHO_BOOST end -Move_G_MAX_SMITE: -Move_G_MAX_FINALE: -Move_MAX_STARFALL: +Move_G_MAX_SMITE:: +Move_G_MAX_FINALE:: +Move_MAX_STARFALL:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_MOONBLAST end -Move_G_MAX_STONESURGE: -Move_G_MAX_VOLCALITH: -Move_MAX_ROCKFALL: +Move_G_MAX_STONESURGE:: +Move_G_MAX_VOLCALITH:: +Move_MAX_ROCKFALL:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_ROCK_WRECKER end -Move_G_MAX_DEPLETION: -Move_MAX_WYRMWIND: +Move_G_MAX_DEPLETION:: +Move_MAX_WYRMWIND:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_SPACIAL_REND end -Move_G_MAX_SNOOZE: -Move_MAX_DARKNESS: +Move_G_MAX_SNOOZE:: +Move_MAX_DARKNESS:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_DARK_PULSE end -Move_G_MAX_CUDDLE: +Move_G_MAX_CUDDLE:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_COVET end -Move_G_MAX_VOLT_CRASH: +Move_G_MAX_VOLT_CRASH:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_VOLT_TACKLE end -Move_G_MAX_GOLD_RUSH: +Move_G_MAX_GOLD_RUSH:: createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1 waitforvisualfinish goto Move_PAY_DAY diff --git a/include/battle_anim_scripts.h b/include/battle_anim_scripts.h new file mode 100644 index 000000000000..d97aaa421df6 --- /dev/null +++ b/include/battle_anim_scripts.h @@ -0,0 +1,940 @@ +#ifndef GUARD_BATTLE_ANIM_SCRIPTS_H +#define GUARD_BATTLE_ANIM_SCRIPTS_H + +extern const u8 Move_NONE[]; +extern const u8 Move_POUND[]; +extern const u8 Move_KARATE_CHOP[]; +extern const u8 Move_DOUBLE_SLAP[]; +extern const u8 Move_COMET_PUNCH[]; +extern const u8 Move_MEGA_PUNCH[]; +extern const u8 Move_PAY_DAY[]; +extern const u8 Move_FIRE_PUNCH[]; +extern const u8 Move_ICE_PUNCH[]; +extern const u8 Move_THUNDER_PUNCH[]; +extern const u8 Move_SCRATCH[]; +extern const u8 Move_VISE_GRIP[]; +extern const u8 Move_GUILLOTINE[]; +extern const u8 Move_RAZOR_WIND[]; +extern const u8 Move_SWORDS_DANCE[]; +extern const u8 Move_CUT[]; +extern const u8 Move_GUST[]; +extern const u8 Move_WING_ATTACK[]; +extern const u8 Move_WHIRLWIND[]; +extern const u8 Move_FLY[]; +extern const u8 Move_BIND[]; +extern const u8 Move_SLAM[]; +extern const u8 Move_VINE_WHIP[]; +extern const u8 Move_STOMP[]; +extern const u8 Move_DOUBLE_KICK[]; +extern const u8 Move_MEGA_KICK[]; +extern const u8 Move_JUMP_KICK[]; +extern const u8 Move_ROLLING_KICK[]; +extern const u8 Move_SAND_ATTACK[]; +extern const u8 Move_HEADBUTT[]; +extern const u8 Move_HORN_ATTACK[]; +extern const u8 Move_FURY_ATTACK[]; +extern const u8 Move_HORN_DRILL[]; +extern const u8 Move_TACKLE[]; +extern const u8 Move_BODY_SLAM[]; +extern const u8 Move_WRAP[]; +extern const u8 Move_TAKE_DOWN[]; +extern const u8 Move_THRASH[]; +extern const u8 Move_DOUBLE_EDGE[]; +extern const u8 Move_TAIL_WHIP[]; +extern const u8 Move_POISON_STING[]; +extern const u8 Move_TWINEEDLE[]; +extern const u8 Move_PIN_MISSILE[]; +extern const u8 Move_LEER[]; +extern const u8 Move_BITE[]; +extern const u8 Move_GROWL[]; +extern const u8 Move_ROAR[]; +extern const u8 Move_SING[]; +extern const u8 Move_SUPERSONIC[]; +extern const u8 Move_SONIC_BOOM[]; +extern const u8 Move_DISABLE[]; +extern const u8 Move_ACID[]; +extern const u8 Move_EMBER[]; +extern const u8 Move_FLAMETHROWER[]; +extern const u8 Move_MIST[]; +extern const u8 Move_WATER_GUN[]; +extern const u8 Move_HYDRO_PUMP[]; +extern const u8 Move_SURF[]; +extern const u8 Move_ICE_BEAM[]; +extern const u8 Move_BLIZZARD[]; +extern const u8 Move_PSYBEAM[]; +extern const u8 Move_BUBBLE_BEAM[]; +extern const u8 Move_AURORA_BEAM[]; +extern const u8 Move_HYPER_BEAM[]; +extern const u8 Move_PECK[]; +extern const u8 Move_DRILL_PECK[]; +extern const u8 Move_SUBMISSION[]; +extern const u8 Move_LOW_KICK[]; +extern const u8 Move_COUNTER[]; +extern const u8 Move_SEISMIC_TOSS[]; +extern const u8 Move_STRENGTH[]; +extern const u8 Move_ABSORB[]; +extern const u8 Move_MEGA_DRAIN[]; +extern const u8 Move_LEECH_SEED[]; +extern const u8 Move_GROWTH[]; +extern const u8 Move_RAZOR_LEAF[]; +extern const u8 Move_SOLAR_BEAM[]; +extern const u8 Move_POISON_POWDER[]; +extern const u8 Move_STUN_SPORE[]; +extern const u8 Move_SLEEP_POWDER[]; +extern const u8 Move_PETAL_DANCE[]; +extern const u8 Move_STRING_SHOT[]; +extern const u8 Move_DRAGON_RAGE[]; +extern const u8 Move_FIRE_SPIN[]; +extern const u8 Move_THUNDER_SHOCK[]; +extern const u8 Move_THUNDERBOLT[]; +extern const u8 Move_THUNDER_WAVE[]; +extern const u8 Move_THUNDER[]; +extern const u8 Move_ROCK_THROW[]; +extern const u8 Move_EARTHQUAKE[]; +extern const u8 Move_FISSURE[]; +extern const u8 Move_DIG[]; +extern const u8 Move_TOXIC[]; +extern const u8 Move_CONFUSION[]; +extern const u8 Move_PSYCHIC[]; +extern const u8 Move_HYPNOSIS[]; +extern const u8 Move_MEDITATE[]; +extern const u8 Move_AGILITY[]; +extern const u8 Move_QUICK_ATTACK[]; +extern const u8 Move_RAGE[]; +extern const u8 Move_TELEPORT[]; +extern const u8 Move_NIGHT_SHADE[]; +extern const u8 Move_MIMIC[]; +extern const u8 Move_SCREECH[]; +extern const u8 Move_DOUBLE_TEAM[]; +extern const u8 Move_RECOVER[]; +extern const u8 Move_HARDEN[]; +extern const u8 Move_MINIMIZE[]; +extern const u8 Move_SMOKESCREEN[]; +extern const u8 Move_CONFUSE_RAY[]; +extern const u8 Move_WITHDRAW[]; +extern const u8 Move_DEFENSE_CURL[]; +extern const u8 Move_BARRIER[]; +extern const u8 Move_LIGHT_SCREEN[]; +extern const u8 Move_HAZE[]; +extern const u8 Move_REFLECT[]; +extern const u8 Move_FOCUS_ENERGY[]; +extern const u8 Move_BIDE[]; +extern const u8 Move_METRONOME[]; +extern const u8 Move_MIRROR_MOVE[]; +extern const u8 Move_SELF_DESTRUCT[]; +extern const u8 Move_EGG_BOMB[]; +extern const u8 Move_LICK[]; +extern const u8 Move_SMOG[]; +extern const u8 Move_SLUDGE[]; +extern const u8 Move_BONE_CLUB[]; +extern const u8 Move_FIRE_BLAST[]; +extern const u8 Move_WATERFALL[]; +extern const u8 Move_CLAMP[]; +extern const u8 Move_SWIFT[]; +extern const u8 Move_SKULL_BASH[]; +extern const u8 Move_SPIKE_CANNON[]; +extern const u8 Move_CONSTRICT[]; +extern const u8 Move_AMNESIA[]; +extern const u8 Move_KINESIS[]; +extern const u8 Move_SOFT_BOILED[]; +extern const u8 Move_HIGH_JUMP_KICK[]; +extern const u8 Move_GLARE[]; +extern const u8 Move_DREAM_EATER[]; +extern const u8 Move_POISON_GAS[]; +extern const u8 Move_BARRAGE[]; +extern const u8 Move_LEECH_LIFE[]; +extern const u8 Move_LOVELY_KISS[]; +extern const u8 Move_SKY_ATTACK[]; +extern const u8 Move_TRANSFORM[]; +extern const u8 Move_BUBBLE[]; +extern const u8 Move_DIZZY_PUNCH[]; +extern const u8 Move_SPORE[]; +extern const u8 Move_FLASH[]; +extern const u8 Move_PSYWAVE[]; +extern const u8 Move_SPLASH[]; +extern const u8 Move_ACID_ARMOR[]; +extern const u8 Move_CRABHAMMER[]; +extern const u8 Move_EXPLOSION[]; +extern const u8 Move_FURY_SWIPES[]; +extern const u8 Move_BONEMERANG[]; +extern const u8 Move_REST[]; +extern const u8 Move_ROCK_SLIDE[]; +extern const u8 Move_HYPER_FANG[]; +extern const u8 Move_SHARPEN[]; +extern const u8 Move_CONVERSION[]; +extern const u8 Move_TRI_ATTACK[]; +extern const u8 Move_SUPER_FANG[]; +extern const u8 Move_SLASH[]; +extern const u8 Move_SUBSTITUTE[]; +extern const u8 Move_STRUGGLE[]; +extern const u8 Move_SKETCH[]; +extern const u8 Move_TRIPLE_KICK[]; +extern const u8 Move_THIEF[]; +extern const u8 Move_SPIDER_WEB[]; +extern const u8 Move_MIND_READER[]; +extern const u8 Move_NIGHTMARE[]; +extern const u8 Move_FLAME_WHEEL[]; +extern const u8 Move_SNORE[]; +extern const u8 Move_CURSE[]; +extern const u8 Move_FLAIL[]; +extern const u8 Move_CONVERSION_2[]; +extern const u8 Move_AEROBLAST[]; +extern const u8 Move_COTTON_SPORE[]; +extern const u8 Move_REVERSAL[]; +extern const u8 Move_SPITE[]; +extern const u8 Move_POWDER_SNOW[]; +extern const u8 Move_PROTECT[]; +extern const u8 Move_MACH_PUNCH[]; +extern const u8 Move_SCARY_FACE[]; +extern const u8 Move_FEINT_ATTACK[]; +extern const u8 Move_SWEET_KISS[]; +extern const u8 Move_BELLY_DRUM[]; +extern const u8 Move_SLUDGE_BOMB[]; +extern const u8 Move_MUD_SLAP[]; +extern const u8 Move_OCTAZOOKA[]; +extern const u8 Move_SPIKES[]; +extern const u8 Move_ZAP_CANNON[]; +extern const u8 Move_FORESIGHT[]; +extern const u8 Move_DESTINY_BOND[]; +extern const u8 Move_PERISH_SONG[]; +extern const u8 Move_ICY_WIND[]; +extern const u8 Move_DETECT[]; +extern const u8 Move_BONE_RUSH[]; +extern const u8 Move_LOCK_ON[]; +extern const u8 Move_OUTRAGE[]; +extern const u8 Move_SANDSTORM[]; +extern const u8 Move_GIGA_DRAIN[]; +extern const u8 Move_ENDURE[]; +extern const u8 Move_CHARM[]; +extern const u8 Move_ROLLOUT[]; +extern const u8 Move_FALSE_SWIPE[]; +extern const u8 Move_SWAGGER[]; +extern const u8 Move_MILK_DRINK[]; +extern const u8 Move_SPARK[]; +extern const u8 Move_FURY_CUTTER[]; +extern const u8 Move_STEEL_WING[]; +extern const u8 Move_MEAN_LOOK[]; +extern const u8 Move_ATTRACT[]; +extern const u8 Move_SLEEP_TALK[]; +extern const u8 Move_HEAL_BELL[]; +extern const u8 Move_RETURN[]; +extern const u8 Move_PRESENT[]; +extern const u8 Move_FRUSTRATION[]; +extern const u8 Move_SAFEGUARD[]; +extern const u8 Move_PAIN_SPLIT[]; +extern const u8 Move_SACRED_FIRE[]; +extern const u8 Move_MAGNITUDE[]; +extern const u8 Move_DYNAMIC_PUNCH[]; +extern const u8 Move_MEGAHORN[]; +extern const u8 Move_DRAGON_BREATH[]; +extern const u8 Move_BATON_PASS[]; +extern const u8 Move_ENCORE[]; +extern const u8 Move_PURSUIT[]; +extern const u8 Move_RAPID_SPIN[]; +extern const u8 Move_SWEET_SCENT[]; +extern const u8 Move_IRON_TAIL[]; +extern const u8 Move_METAL_CLAW[]; +extern const u8 Move_VITAL_THROW[]; +extern const u8 Move_MORNING_SUN[]; +extern const u8 Move_SYNTHESIS[]; +extern const u8 Move_MOONLIGHT[]; +extern const u8 Move_HIDDEN_POWER[]; +extern const u8 Move_CROSS_CHOP[]; +extern const u8 Move_TWISTER[]; +extern const u8 Move_RAIN_DANCE[]; +extern const u8 Move_SUNNY_DAY[]; +extern const u8 Move_CRUNCH[]; +extern const u8 Move_MIRROR_COAT[]; +extern const u8 Move_PSYCH_UP[]; +extern const u8 Move_EXTREME_SPEED[]; +extern const u8 Move_ANCIENT_POWER[]; +extern const u8 Move_SHADOW_BALL[]; +extern const u8 Move_FUTURE_SIGHT[]; +extern const u8 Move_ROCK_SMASH[]; +extern const u8 Move_WHIRLPOOL[]; +extern const u8 Move_BEAT_UP[]; +extern const u8 Move_FAKE_OUT[]; +extern const u8 Move_UPROAR[]; +extern const u8 Move_STOCKPILE[]; +extern const u8 Move_SPIT_UP[]; +extern const u8 Move_SWALLOW[]; +extern const u8 Move_HEAT_WAVE[]; +extern const u8 Move_HAIL[]; +extern const u8 Move_TORMENT[]; +extern const u8 Move_FLATTER[]; +extern const u8 Move_WILL_O_WISP[]; +extern const u8 Move_MEMENTO[]; +extern const u8 Move_FACADE[]; +extern const u8 Move_FOCUS_PUNCH[]; +extern const u8 Move_SMELLING_SALTS[]; +extern const u8 Move_FOLLOW_ME[]; +extern const u8 Move_NATURE_POWER[]; +extern const u8 Move_CHARGE[]; +extern const u8 Move_TAUNT[]; +extern const u8 Move_HELPING_HAND[]; +extern const u8 Move_TRICK[]; +extern const u8 Move_ROLE_PLAY[]; +extern const u8 Move_WISH[]; +extern const u8 Move_ASSIST[]; +extern const u8 Move_INGRAIN[]; +extern const u8 Move_SUPERPOWER[]; +extern const u8 Move_MAGIC_COAT[]; +extern const u8 Move_RECYCLE[]; +extern const u8 Move_REVENGE[]; +extern const u8 Move_BRICK_BREAK[]; +extern const u8 Move_YAWN[]; +extern const u8 Move_KNOCK_OFF[]; +extern const u8 Move_ENDEAVOR[]; +extern const u8 Move_ERUPTION[]; +extern const u8 Move_SKILL_SWAP[]; +extern const u8 Move_IMPRISON[]; +extern const u8 Move_REFRESH[]; +extern const u8 Move_GRUDGE[]; +extern const u8 Move_SNATCH[]; +extern const u8 Move_SECRET_POWER[]; +extern const u8 Move_DIVE[]; +extern const u8 Move_ARM_THRUST[]; +extern const u8 Move_CAMOUFLAGE[]; +extern const u8 Move_TAIL_GLOW[]; +extern const u8 Move_LUSTER_PURGE[]; +extern const u8 Move_MIST_BALL[]; +extern const u8 Move_FEATHER_DANCE[]; +extern const u8 Move_TEETER_DANCE[]; +extern const u8 Move_BLAZE_KICK[]; +extern const u8 Move_MUD_SPORT[]; +extern const u8 Move_ICE_BALL[]; +extern const u8 Move_NEEDLE_ARM[]; +extern const u8 Move_SLACK_OFF[]; +extern const u8 Move_HYPER_VOICE[]; +extern const u8 Move_POISON_FANG[]; +extern const u8 Move_CRUSH_CLAW[]; +extern const u8 Move_BLAST_BURN[]; +extern const u8 Move_HYDRO_CANNON[]; +extern const u8 Move_METEOR_MASH[]; +extern const u8 Move_ASTONISH[]; +extern const u8 Move_WEATHER_BALL[]; +extern const u8 Move_AROMATHERAPY[]; +extern const u8 Move_FAKE_TEARS[]; +extern const u8 Move_AIR_CUTTER[]; +extern const u8 Move_OVERHEAT[]; +extern const u8 Move_ODOR_SLEUTH[]; +extern const u8 Move_ROCK_TOMB[]; +extern const u8 Move_SILVER_WIND[]; +extern const u8 Move_METAL_SOUND[]; +extern const u8 Move_GRASS_WHISTLE[]; +extern const u8 Move_TICKLE[]; +extern const u8 Move_COSMIC_POWER[]; +extern const u8 Move_WATER_SPOUT[]; +extern const u8 Move_SIGNAL_BEAM[]; +extern const u8 Move_SHADOW_PUNCH[]; +extern const u8 Move_EXTRASENSORY[]; +extern const u8 Move_SKY_UPPERCUT[]; +extern const u8 Move_SAND_TOMB[]; +extern const u8 Move_SHEER_COLD[]; +extern const u8 Move_MUDDY_WATER[]; +extern const u8 Move_BULLET_SEED[]; +extern const u8 Move_AERIAL_ACE[]; +extern const u8 Move_ICICLE_SPEAR[]; +extern const u8 Move_IRON_DEFENSE[]; +extern const u8 Move_BLOCK[]; +extern const u8 Move_HOWL[]; +extern const u8 Move_DRAGON_CLAW[]; +extern const u8 Move_FRENZY_PLANT[]; +extern const u8 Move_BULK_UP[]; +extern const u8 Move_BOUNCE[]; +extern const u8 Move_MUD_SHOT[]; +extern const u8 Move_POISON_TAIL[]; +extern const u8 Move_COVET[]; +extern const u8 Move_VOLT_TACKLE[]; +extern const u8 Move_MAGICAL_LEAF[]; +extern const u8 Move_WATER_SPORT[]; +extern const u8 Move_CALM_MIND[]; +extern const u8 Move_LEAF_BLADE[]; +extern const u8 Move_DRAGON_DANCE[]; +extern const u8 Move_ROCK_BLAST[]; +extern const u8 Move_SHOCK_WAVE[]; +extern const u8 Move_WATER_PULSE[]; +extern const u8 Move_DOOM_DESIRE[]; +extern const u8 Move_PSYCHO_BOOST[]; +extern const u8 Move_ROOST[]; +extern const u8 Move_GRAVITY[]; +extern const u8 Move_MIRACLE_EYE[]; +extern const u8 Move_WAKE_UP_SLAP[]; +extern const u8 Move_HAMMER_ARM[]; +extern const u8 Move_GYRO_BALL[]; +extern const u8 Move_HEALING_WISH[]; +extern const u8 Move_BRINE[]; +extern const u8 Move_NATURAL_GIFT[]; +extern const u8 Move_FEINT[]; +extern const u8 Move_PLUCK[]; +extern const u8 Move_TAILWIND[]; +extern const u8 Move_ACUPRESSURE[]; +extern const u8 Move_METAL_BURST[]; +extern const u8 Move_U_TURN[]; +extern const u8 Move_CLOSE_COMBAT[]; +extern const u8 Move_PAYBACK[]; +extern const u8 Move_ASSURANCE[]; +extern const u8 Move_EMBARGO[]; +extern const u8 Move_FLING[]; +extern const u8 Move_PSYCHO_SHIFT[]; +extern const u8 Move_TRUMP_CARD[]; +extern const u8 Move_HEAL_BLOCK[]; +extern const u8 Move_WRING_OUT[]; +extern const u8 Move_POWER_TRICK[]; +extern const u8 Move_GASTRO_ACID[]; +extern const u8 Move_LUCKY_CHANT[]; +extern const u8 Move_ME_FIRST[]; +extern const u8 Move_COPYCAT[]; +extern const u8 Move_POWER_SWAP[]; +extern const u8 Move_GUARD_SWAP[]; +extern const u8 Move_PUNISHMENT[]; +extern const u8 Move_LAST_RESORT[]; +extern const u8 Move_WORRY_SEED[]; +extern const u8 Move_SUCKER_PUNCH[]; +extern const u8 Move_TOXIC_SPIKES[]; +extern const u8 Move_HEART_SWAP[]; +extern const u8 Move_AQUA_RING[]; +extern const u8 Move_MAGNET_RISE[]; +extern const u8 Move_FLARE_BLITZ[]; +extern const u8 Move_FORCE_PALM[]; +extern const u8 Move_AURA_SPHERE[]; +extern const u8 Move_ROCK_POLISH[]; +extern const u8 Move_POISON_JAB[]; +extern const u8 Move_DARK_PULSE[]; +extern const u8 Move_NIGHT_SLASH[]; +extern const u8 Move_AQUA_TAIL[]; +extern const u8 Move_SEED_BOMB[]; +extern const u8 Move_AIR_SLASH[]; +extern const u8 Move_X_SCISSOR[]; +extern const u8 Move_BUG_BUZZ[]; +extern const u8 Move_DRAGON_PULSE[]; +extern const u8 Move_DRAGON_RUSH[]; +extern const u8 Move_POWER_GEM[]; +extern const u8 Move_DRAIN_PUNCH[]; +extern const u8 Move_VACUUM_WAVE[]; +extern const u8 Move_FOCUS_BLAST[]; +extern const u8 Move_ENERGY_BALL[]; +extern const u8 Move_BRAVE_BIRD[]; +extern const u8 Move_EARTH_POWER[]; +extern const u8 Move_SWITCHEROO[]; +extern const u8 Move_GIGA_IMPACT[]; +extern const u8 Move_NASTY_PLOT[]; +extern const u8 Move_BULLET_PUNCH[]; +extern const u8 Move_AVALANCHE[]; +extern const u8 Move_ICE_SHARD[]; +extern const u8 Move_SHADOW_CLAW[]; +extern const u8 Move_THUNDER_FANG[]; +extern const u8 Move_ICE_FANG[]; +extern const u8 Move_FIRE_FANG[]; +extern const u8 Move_SHADOW_SNEAK[]; +extern const u8 Move_MUD_BOMB[]; +extern const u8 Move_PSYCHO_CUT[]; +extern const u8 Move_ZEN_HEADBUTT[]; +extern const u8 Move_MIRROR_SHOT[]; +extern const u8 Move_FLASH_CANNON[]; +extern const u8 Move_ROCK_CLIMB[]; +extern const u8 Move_DEFOG[]; +extern const u8 Move_TRICK_ROOM[]; +extern const u8 Move_DRACO_METEOR[]; +extern const u8 Move_DISCHARGE[]; +extern const u8 Move_LAVA_PLUME[]; +extern const u8 Move_LEAF_STORM[]; +extern const u8 Move_POWER_WHIP[]; +extern const u8 Move_ROCK_WRECKER[]; +extern const u8 Move_CROSS_POISON[]; +extern const u8 Move_GUNK_SHOT[]; +extern const u8 Move_IRON_HEAD[]; +extern const u8 Move_MAGNET_BOMB[]; +extern const u8 Move_STONE_EDGE[]; +extern const u8 Move_CAPTIVATE[]; +extern const u8 Move_STEALTH_ROCK[]; +extern const u8 Move_GRASS_KNOT[]; +extern const u8 Move_CHATTER[]; +extern const u8 Move_JUDGMENT[]; +extern const u8 Move_BUG_BITE[]; +extern const u8 Move_CHARGE_BEAM[]; +extern const u8 Move_WOOD_HAMMER[]; +extern const u8 Move_AQUA_JET[]; +extern const u8 Move_ATTACK_ORDER[]; +extern const u8 Move_DEFEND_ORDER[]; +extern const u8 Move_HEAL_ORDER[]; +extern const u8 Move_HEAD_SMASH[]; +extern const u8 Move_DOUBLE_HIT[]; +extern const u8 Move_ROAR_OF_TIME[]; +extern const u8 Move_SPACIAL_REND[]; +extern const u8 Move_LUNAR_DANCE[]; +extern const u8 Move_CRUSH_GRIP[]; +extern const u8 Move_MAGMA_STORM[]; +extern const u8 Move_DARK_VOID[]; +extern const u8 Move_SEED_FLARE[]; +extern const u8 Move_OMINOUS_WIND[]; +extern const u8 Move_SHADOW_FORCE[]; +extern const u8 Move_HONE_CLAWS[]; +extern const u8 Move_WIDE_GUARD[]; +extern const u8 Move_GUARD_SPLIT[]; +extern const u8 Move_POWER_SPLIT[]; +extern const u8 Move_WONDER_ROOM[]; +extern const u8 Move_PSYSHOCK[]; +extern const u8 Move_VENOSHOCK[]; +extern const u8 Move_AUTOTOMIZE[]; +extern const u8 Move_RAGE_POWDER[]; +extern const u8 Move_TELEKINESIS[]; +extern const u8 Move_MAGIC_ROOM[]; +extern const u8 Move_SMACK_DOWN[]; +extern const u8 Move_STORM_THROW[]; +extern const u8 Move_FLAME_BURST[]; +extern const u8 Move_SLUDGE_WAVE[]; +extern const u8 Move_QUIVER_DANCE[]; +extern const u8 Move_HEAVY_SLAM[]; +extern const u8 Move_SYNCHRONOISE[]; +extern const u8 Move_ELECTRO_BALL[]; +extern const u8 Move_SOAK[]; +extern const u8 Move_FLAME_CHARGE[]; +extern const u8 Move_COIL[]; +extern const u8 Move_LOW_SWEEP[]; +extern const u8 Move_ACID_SPRAY[]; +extern const u8 Move_FOUL_PLAY[]; +extern const u8 Move_SIMPLE_BEAM[]; +extern const u8 Move_ENTRAINMENT[]; +extern const u8 Move_AFTER_YOU[]; +extern const u8 Move_ROUND[]; +extern const u8 Move_ECHOED_VOICE[]; +extern const u8 Move_CHIP_AWAY[]; +extern const u8 Move_CLEAR_SMOG[]; +extern const u8 Move_STORED_POWER[]; +extern const u8 Move_QUICK_GUARD[]; +extern const u8 Move_ALLY_SWITCH[]; +extern const u8 Move_SCALD[]; +extern const u8 Move_SHELL_SMASH[]; +extern const u8 Move_HEAL_PULSE[]; +extern const u8 Move_HEX[]; +extern const u8 Move_SKY_DROP[]; +extern const u8 Move_SHIFT_GEAR[]; +extern const u8 Move_CIRCLE_THROW[]; +extern const u8 Move_INCINERATE[]; +extern const u8 Move_QUASH[]; +extern const u8 Move_ACROBATICS[]; +extern const u8 Move_REFLECT_TYPE[]; +extern const u8 Move_RETALIATE[]; +extern const u8 Move_FINAL_GAMBIT[]; +extern const u8 Move_BESTOW[]; +extern const u8 Move_INFERNO[]; +extern const u8 Move_WATER_PLEDGE[]; +extern const u8 Move_FIRE_PLEDGE[]; +extern const u8 Move_GRASS_PLEDGE[]; +extern const u8 Move_VOLT_SWITCH[]; +extern const u8 Move_STRUGGLE_BUG[]; +extern const u8 Move_BULLDOZE[]; +extern const u8 Move_FROST_BREATH[]; +extern const u8 Move_DRAGON_TAIL[]; +extern const u8 Move_WORK_UP[]; +extern const u8 Move_ELECTROWEB[]; +extern const u8 Move_WILD_CHARGE[]; +extern const u8 Move_DRILL_RUN[]; +extern const u8 Move_DUAL_CHOP[]; +extern const u8 Move_HEART_STAMP[]; +extern const u8 Move_HORN_LEECH[]; +extern const u8 Move_SACRED_SWORD[]; +extern const u8 Move_RAZOR_SHELL[]; +extern const u8 Move_HEAT_CRASH[]; +extern const u8 Move_LEAF_TORNADO[]; +extern const u8 Move_STEAMROLLER[]; +extern const u8 Move_COTTON_GUARD[]; +extern const u8 Move_NIGHT_DAZE[]; +extern const u8 Move_PSYSTRIKE[]; +extern const u8 Move_TAIL_SLAP[]; +extern const u8 Move_HURRICANE[]; +extern const u8 Move_HEAD_CHARGE[]; +extern const u8 Move_GEAR_GRIND[]; +extern const u8 Move_SEARING_SHOT[]; +extern const u8 Move_TECHNO_BLAST[]; +extern const u8 Move_RELIC_SONG[]; +extern const u8 Move_SECRET_SWORD[]; +extern const u8 Move_GLACIATE[]; +extern const u8 Move_BOLT_STRIKE[]; +extern const u8 Move_BLUE_FLARE[]; +extern const u8 Move_FIERY_DANCE[]; +extern const u8 Move_FREEZE_SHOCK[]; +extern const u8 Move_ICE_BURN[]; +extern const u8 Move_SNARL[]; +extern const u8 Move_ICICLE_CRASH[]; +extern const u8 Move_V_CREATE[]; +extern const u8 Move_FUSION_FLARE[]; +extern const u8 Move_FUSION_BOLT[]; +extern const u8 Move_FLYING_PRESS[]; +extern const u8 Move_MAT_BLOCK[]; +extern const u8 Move_BELCH[]; +extern const u8 Move_ROTOTILLER[]; +extern const u8 Move_STICKY_WEB[]; +extern const u8 Move_FELL_STINGER[]; +extern const u8 Move_PHANTOM_FORCE[]; +extern const u8 Move_TRICK_OR_TREAT[]; +extern const u8 Move_NOBLE_ROAR[]; +extern const u8 Move_ION_DELUGE[]; +extern const u8 Move_PARABOLIC_CHARGE[]; +extern const u8 Move_FORESTS_CURSE[]; +extern const u8 Move_PETAL_BLIZZARD[]; +extern const u8 Move_FREEZE_DRY[]; +extern const u8 Move_DISARMING_VOICE[]; +extern const u8 Move_PARTING_SHOT[]; +extern const u8 Move_TOPSY_TURVY[]; +extern const u8 Move_DRAINING_KISS[]; +extern const u8 Move_CRAFTY_SHIELD[]; +extern const u8 Move_FLOWER_SHIELD[]; +extern const u8 Move_GRASSY_TERRAIN[]; +extern const u8 Move_MISTY_TERRAIN[]; +extern const u8 Move_ELECTRIFY[]; +extern const u8 Move_PLAY_ROUGH[]; +extern const u8 Move_FAIRY_WIND[]; +extern const u8 Move_MOONBLAST[]; +extern const u8 Move_BOOMBURST[]; +extern const u8 Move_FAIRY_LOCK[]; +extern const u8 Move_KINGS_SHIELD[]; +extern const u8 Move_PLAY_NICE[]; +extern const u8 Move_CONFIDE[]; +extern const u8 Move_DIAMOND_STORM[]; +extern const u8 Move_STEAM_ERUPTION[]; +extern const u8 Move_HYPERSPACE_HOLE[]; +extern const u8 Move_WATER_SHURIKEN[]; +extern const u8 Move_MYSTICAL_FIRE[]; +extern const u8 Move_SPIKY_SHIELD[]; +extern const u8 Move_AROMATIC_MIST[]; +extern const u8 Move_EERIE_IMPULSE[]; +extern const u8 Move_VENOM_DRENCH[]; +extern const u8 Move_POWDER[]; +extern const u8 Move_GEOMANCY[]; +extern const u8 Move_MAGNETIC_FLUX[]; +extern const u8 Move_HAPPY_HOUR[]; +extern const u8 Move_ELECTRIC_TERRAIN[]; +extern const u8 Move_DAZZLING_GLEAM[]; +extern const u8 Move_CELEBRATE[]; +extern const u8 Move_HOLD_HANDS[]; +extern const u8 Move_BABY_DOLL_EYES[]; +extern const u8 Move_NUZZLE[]; +extern const u8 Move_HOLD_BACK[]; +extern const u8 Move_INFESTATION[]; +extern const u8 Move_POWER_UP_PUNCH[]; +extern const u8 Move_OBLIVION_WING[]; +extern const u8 Move_THOUSAND_ARROWS[]; +extern const u8 Move_THOUSAND_WAVES[]; +extern const u8 Move_LANDS_WRATH[]; +extern const u8 Move_LIGHT_OF_RUIN[]; +extern const u8 Move_ORIGIN_PULSE[]; +extern const u8 Move_PRECIPICE_BLADES[]; +extern const u8 Move_DRAGON_ASCENT[]; +extern const u8 Move_HYPERSPACE_FURY[]; +extern const u8 Move_SHORE_UP[]; +extern const u8 Move_FIRST_IMPRESSION[]; +extern const u8 Move_BANEFUL_BUNKER[]; +extern const u8 Move_SPIRIT_SHACKLE[]; +extern const u8 Move_DARKEST_LARIAT[]; +extern const u8 Move_SPARKLING_ARIA[]; +extern const u8 Move_ICE_HAMMER[]; +extern const u8 Move_FLORAL_HEALING[]; +extern const u8 Move_HIGH_HORSEPOWER[]; +extern const u8 Move_STRENGTH_SAP[]; +extern const u8 Move_SOLAR_BLADE[]; +extern const u8 Move_LEAFAGE[]; +extern const u8 Move_SPOTLIGHT[]; +extern const u8 Move_TOXIC_THREAD[]; +extern const u8 Move_LASER_FOCUS[]; +extern const u8 Move_GEAR_UP[]; +extern const u8 Move_THROAT_CHOP[]; +extern const u8 Move_POLLEN_PUFF[]; +extern const u8 Move_ANCHOR_SHOT[]; +extern const u8 Move_PSYCHIC_TERRAIN[]; +extern const u8 Move_LUNGE[]; +extern const u8 Move_FIRE_LASH[]; +extern const u8 Move_POWER_TRIP[]; +extern const u8 Move_BURN_UP[]; +extern const u8 Move_SPEED_SWAP[]; +extern const u8 Move_SMART_STRIKE[]; +extern const u8 Move_PURIFY[]; +extern const u8 Move_REVELATION_DANCE[]; +extern const u8 Move_CORE_ENFORCER[]; +extern const u8 Move_TROP_KICK[]; +extern const u8 Move_INSTRUCT[]; +extern const u8 Move_BEAK_BLAST[]; +extern const u8 Move_CLANGING_SCALES[]; +extern const u8 Move_DRAGON_HAMMER[]; +extern const u8 Move_BRUTAL_SWING[]; +extern const u8 Move_AURORA_VEIL[]; +extern const u8 Move_SHELL_TRAP[]; +extern const u8 Move_FLEUR_CANNON[]; +extern const u8 Move_PSYCHIC_FANGS[]; +extern const u8 Move_STOMPING_TANTRUM[]; +extern const u8 Move_SHADOW_BONE[]; +extern const u8 Move_ACCELEROCK[]; +extern const u8 Move_LIQUIDATION[]; +extern const u8 Move_PRISMATIC_LASER[]; +extern const u8 Move_SPECTRAL_THIEF[]; +extern const u8 Move_SUNSTEEL_STRIKE[]; +extern const u8 Move_MOONGEIST_BEAM[]; +extern const u8 Move_TEARFUL_LOOK[]; +extern const u8 Move_ZING_ZAP[]; +extern const u8 Move_NATURES_MADNESS[]; +extern const u8 Move_MULTI_ATTACK[]; +extern const u8 Move_MIND_BLOWN[]; +extern const u8 Move_PLASMA_FISTS[]; +extern const u8 Move_PHOTON_GEYSER[]; +extern const u8 Move_ZIPPY_ZAP[]; +extern const u8 Move_SPLISHY_SPLASH[]; +extern const u8 Move_FLOATY_FALL[]; +extern const u8 Move_PIKA_PAPOW[]; +extern const u8 Move_BOUNCY_BUBBLE[]; +extern const u8 Move_BUZZY_BUZZ[]; +extern const u8 Move_SIZZLY_SLIDE[]; +extern const u8 Move_GLITZY_GLOW[]; +extern const u8 Move_BADDY_BAD[]; +extern const u8 Move_SAPPY_SEED[]; +extern const u8 Move_FREEZY_FROST[]; +extern const u8 Move_SPARKLY_SWIRL[]; +extern const u8 Move_VEEVEE_VOLLEY[]; +extern const u8 Move_DOUBLE_IRON_BASH[]; +extern const u8 Move_DYNAMAX_CANNON[]; +extern const u8 Move_SNIPE_SHOT[]; +extern const u8 Move_JAW_LOCK[]; +extern const u8 Move_STUFF_CHEEKS[]; +extern const u8 Move_NO_RETREAT[]; +extern const u8 Move_TAR_SHOT[]; +extern const u8 Move_MAGIC_POWDER[]; +extern const u8 Move_DRAGON_DARTS[]; +extern const u8 Move_TEATIME[]; +extern const u8 Move_OCTOLOCK[]; +extern const u8 Move_BOLT_BEAK[]; +extern const u8 Move_FISHIOUS_REND[]; +extern const u8 Move_COURT_CHANGE[]; +extern const u8 Move_CLANGOROUS_SOUL[]; +extern const u8 Move_BODY_PRESS[]; +extern const u8 Move_DECORATE[]; +extern const u8 Move_DRUM_BEATING[]; +extern const u8 Move_SNAP_TRAP[]; +extern const u8 Move_PYRO_BALL[]; +extern const u8 Move_BEHEMOTH_BLADE[]; +extern const u8 Move_BEHEMOTH_BASH[]; +extern const u8 Move_AURA_WHEEL[]; +extern const u8 Move_BREAKING_SWIPE[]; +extern const u8 Move_BRANCH_POKE[]; +extern const u8 Move_OVERDRIVE[]; +extern const u8 Move_APPLE_ACID[]; +extern const u8 Move_GRAV_APPLE[]; +extern const u8 Move_SPIRIT_BREAK[]; +extern const u8 Move_STRANGE_STEAM[]; +extern const u8 Move_LIFE_DEW[]; +extern const u8 Move_OBSTRUCT[]; +extern const u8 Move_FALSE_SURRENDER[]; +extern const u8 Move_METEOR_ASSAULT[]; +extern const u8 Move_ETERNABEAM[]; +extern const u8 Move_STEEL_BEAM[]; +extern const u8 Move_EXPANDING_FORCE[]; +extern const u8 Move_STEEL_ROLLER[]; +extern const u8 Move_SCALE_SHOT[]; +extern const u8 Move_METEOR_BEAM[]; +extern const u8 Move_SHELL_SIDE_ARM[]; +extern const u8 Move_MISTY_EXPLOSION[]; +extern const u8 Move_GRASSY_GLIDE[]; +extern const u8 Move_RISING_VOLTAGE[]; +extern const u8 Move_TERRAIN_PULSE[]; +extern const u8 Move_SKITTER_SMACK[]; +extern const u8 Move_BURNING_JEALOUSY[]; +extern const u8 Move_LASH_OUT[]; +extern const u8 Move_POLTERGEIST[]; +extern const u8 Move_CORROSIVE_GAS[]; +extern const u8 Move_COACHING[]; +extern const u8 Move_FLIP_TURN[]; +extern const u8 Move_TRIPLE_AXEL[]; +extern const u8 Move_DUAL_WINGBEAT[]; +extern const u8 Move_SCORCHING_SANDS[]; +extern const u8 Move_JUNGLE_HEALING[]; +extern const u8 Move_WICKED_BLOW[]; +extern const u8 Move_SURGING_STRIKES[]; +extern const u8 Move_THUNDER_CAGE[]; +extern const u8 Move_DRAGON_ENERGY[]; +extern const u8 Move_FREEZING_GLARE[]; +extern const u8 Move_FIERY_WRATH[]; +extern const u8 Move_THUNDEROUS_KICK[]; +extern const u8 Move_GLACIAL_LANCE[]; +extern const u8 Move_ASTRAL_BARRAGE[]; +extern const u8 Move_EERIE_SPELL[]; +extern const u8 Move_DIRE_CLAW[]; +extern const u8 Move_PSYSHIELD_BASH[]; +extern const u8 Move_POWER_SHIFT[]; +extern const u8 Move_STONE_AXE[]; +extern const u8 Move_SPRINGTIDE_STORM[]; +extern const u8 Move_MYSTICAL_POWER[]; +extern const u8 Move_RAGING_FURY[]; +extern const u8 Move_WAVE_CRASH[]; +extern const u8 Move_CHLOROBLAST[]; +extern const u8 Move_MOUNTAIN_GALE[]; +extern const u8 Move_VICTORY_DANCE[]; +extern const u8 Move_HEADLONG_RUSH[]; +extern const u8 Move_BARB_BARRAGE[]; +extern const u8 Move_ESPER_WING[]; +extern const u8 Move_BITTER_MALICE[]; +extern const u8 Move_SHELTER[]; +extern const u8 Move_TRIPLE_ARROWS[]; +extern const u8 Move_INFERNAL_PARADE[]; +extern const u8 Move_CEASELESS_EDGE[]; +extern const u8 Move_BLEAKWIND_STORM[]; +extern const u8 Move_WILDBOLT_STORM[]; +extern const u8 Move_SANDSEAR_STORM[]; +extern const u8 Move_LUNAR_BLESSING[]; +extern const u8 Move_TAKE_HEART[]; +extern const u8 Move_TERA_BLAST[]; +extern const u8 Move_SILK_TRAP[]; +extern const u8 Move_AXE_KICK[]; +extern const u8 Move_LAST_RESPECTS[]; +extern const u8 Move_LUMINA_CRASH[]; +extern const u8 Move_ORDER_UP[]; +extern const u8 Move_JET_PUNCH[]; +extern const u8 Move_SPICY_EXTRACT[]; +extern const u8 Move_SPIN_OUT[]; +extern const u8 Move_POPULATION_BOMB[]; +extern const u8 Move_ICE_SPINNER[]; +extern const u8 Move_GLAIVE_RUSH[]; +extern const u8 Move_REVIVAL_BLESSING[]; +extern const u8 Move_SALT_CURE[]; +extern const u8 Move_TRIPLE_DIVE[]; +extern const u8 Move_MORTAL_SPIN[]; +extern const u8 Move_DOODLE[]; +extern const u8 Move_FILLET_AWAY[]; +extern const u8 Move_KOWTOW_CLEAVE[]; +extern const u8 Move_FLOWER_TRICK[]; +extern const u8 Move_TORCH_SONG[]; +extern const u8 Move_AQUA_STEP[]; +extern const u8 Move_RAGING_BULL[]; +extern const u8 Move_MAKE_IT_RAIN[]; +extern const u8 Move_RUINATION[]; +extern const u8 Move_COLLISION_COURSE[]; +extern const u8 Move_ELECTRO_DRIFT[]; +extern const u8 Move_SHED_TAIL[]; +extern const u8 Move_CHILLY_RECEPTION[]; +extern const u8 Move_TIDY_UP[]; +extern const u8 Move_SNOWSCAPE[]; +extern const u8 Move_POUNCE[]; +extern const u8 Move_TRAILBLAZE[]; +extern const u8 Move_CHILLING_WATER[]; +extern const u8 Move_HYPER_DRILL[]; +extern const u8 Move_TWIN_BEAM[]; +extern const u8 Move_RAGE_FIST[]; +extern const u8 Move_ARMOR_CANNON[]; +extern const u8 Move_BITTER_BLADE[]; +extern const u8 Move_DOUBLE_SHOCK[]; +extern const u8 Move_GIGATON_HAMMER[]; +extern const u8 Move_COMEUPPANCE[]; +extern const u8 Move_AQUA_CUTTER[]; +extern const u8 Move_BLAZING_TORQUE[]; +extern const u8 Move_WICKED_TORQUE[]; +extern const u8 Move_NOXIOUS_TORQUE[]; +extern const u8 Move_COMBAT_TORQUE[]; +extern const u8 Move_MAGICAL_TORQUE[]; +extern const u8 Move_PSYBLADE[]; +extern const u8 Move_HYDRO_STEAM[]; +extern const u8 Move_BLOOD_MOON[]; +extern const u8 Move_MATCHA_GOTCHA[]; +extern const u8 Move_SYRUP_BOMB[]; +extern const u8 Move_IVY_CUDGEL[]; +extern const u8 Move_ELECTRO_SHOT[]; +extern const u8 Move_TERA_STARSTORM[]; +extern const u8 Move_FICKLE_BEAM[]; +extern const u8 Move_BURNING_BULWARK[]; +extern const u8 Move_THUNDERCLAP[]; +extern const u8 Move_MIGHTY_CLEAVE[]; +extern const u8 Move_TACHYON_CUTTER[]; +extern const u8 Move_HARD_PRESS[]; +extern const u8 Move_DRAGON_CHEER[]; +extern const u8 Move_ALLURING_VOICE[]; +extern const u8 Move_TEMPER_FLARE[]; +extern const u8 Move_SUPERCELL_SLAM[]; +extern const u8 Move_PSYCHIC_NOISE[]; +extern const u8 Move_UPPER_HAND[]; +extern const u8 Move_MALIGNANT_CHAIN[]; +extern const u8 Move_BREAKNECK_BLITZ[]; +extern const u8 Move_ALL_OUT_PUMMELING[]; +extern const u8 Move_SUPERSONIC_SKYSTRIKE[]; +extern const u8 Move_ACID_DOWNPOUR[]; +extern const u8 Move_TECTONIC_RAGE[]; +extern const u8 Move_CONTINENTAL_CRUSH[]; +extern const u8 Move_SAVAGE_SPIN_OUT[]; +extern const u8 Move_NEVER_ENDING_NIGHTMARE[]; +extern const u8 Move_CORKSCREW_CRASH[]; +extern const u8 Move_INFERNO_OVERDRIVE[]; +extern const u8 Move_HYDRO_VORTEX[]; +extern const u8 Move_BLOOM_DOOM[]; +extern const u8 Move_GIGAVOLT_HAVOC[]; +extern const u8 Move_SHATTERED_PSYCHE[]; +extern const u8 Move_SUBZERO_SLAMMER[]; +extern const u8 Move_DEVASTATING_DRAKE[]; +extern const u8 Move_BLACK_HOLE_ECLIPSE[]; +extern const u8 Move_TWINKLE_TACKLE[]; +extern const u8 Move_CATASTROPIKA[]; +extern const u8 Move_10000000_VOLT_THUNDERBOLT[]; +extern const u8 Move_STOKED_SPARKSURFER[]; +extern const u8 Move_EXTREME_EVOBOOST[]; +extern const u8 Move_PULVERIZING_PANCAKE[]; +extern const u8 Move_GENESIS_SUPERNOVA[]; +extern const u8 Move_SINISTER_ARROW_RAID[]; +extern const u8 Move_MALICIOUS_MOONSAULT[]; +extern const u8 Move_OCEANIC_OPERETTA[]; +extern const u8 Move_SPLINTERED_STORMSHARDS[]; +extern const u8 Move_LETS_SNUGGLE_FOREVER[]; +extern const u8 Move_CLANGOROUS_SOULBLAZE[]; +extern const u8 Move_GUARDIAN_OF_ALOLA[]; +extern const u8 Move_SEARING_SUNRAZE_SMASH[]; +extern const u8 Move_MENACING_MOONRAZE_MAELSTROM[]; +extern const u8 Move_LIGHT_THAT_BURNS_THE_SKY[]; +extern const u8 Move_SOUL_STEALING_7_STAR_STRIKE[]; +extern const u8 Move_MAX_GUARD[]; +extern const u8 Move_MAX_FLARE[]; +extern const u8 Move_MAX_FLUTTERBY[]; +extern const u8 Move_MAX_LIGHTNING[]; +extern const u8 Move_MAX_STRIKE[]; +extern const u8 Move_MAX_KNUCKLE[]; +extern const u8 Move_MAX_PHANTASM[]; +extern const u8 Move_MAX_HAILSTORM[]; +extern const u8 Move_MAX_OOZE[]; +extern const u8 Move_MAX_GEYSER[]; +extern const u8 Move_MAX_AIRSTREAM[]; +extern const u8 Move_MAX_STARFALL[]; +extern const u8 Move_MAX_WYRMWIND[]; +extern const u8 Move_MAX_MINDSTORM[]; +extern const u8 Move_MAX_ROCKFALL[]; +extern const u8 Move_MAX_QUAKE[]; +extern const u8 Move_MAX_DARKNESS[]; +extern const u8 Move_MAX_OVERGROWTH[]; +extern const u8 Move_MAX_STEELSPIKE[]; +extern const u8 Move_G_MAX_VINE_LASH[]; +extern const u8 Move_G_MAX_WILDFIRE[]; +extern const u8 Move_G_MAX_CANNONADE[]; +extern const u8 Move_G_MAX_BEFUDDLE[]; +extern const u8 Move_G_MAX_VOLT_CRASH[]; +extern const u8 Move_G_MAX_GOLD_RUSH[]; +extern const u8 Move_G_MAX_CHI_STRIKE[]; +extern const u8 Move_G_MAX_TERROR[]; +extern const u8 Move_G_MAX_FOAM_BURST[]; +extern const u8 Move_G_MAX_RESONANCE[]; +extern const u8 Move_G_MAX_CUDDLE[]; +extern const u8 Move_G_MAX_REPLENISH[]; +extern const u8 Move_G_MAX_MALODOR[]; +extern const u8 Move_G_MAX_MELTDOWN[]; +extern const u8 Move_G_MAX_DRUM_SOLO[]; +extern const u8 Move_G_MAX_FIREBALL[]; +extern const u8 Move_G_MAX_HYDROSNIPE[]; +extern const u8 Move_G_MAX_WIND_RAGE[]; +extern const u8 Move_G_MAX_GRAVITAS[]; +extern const u8 Move_G_MAX_STONESURGE[]; +extern const u8 Move_G_MAX_VOLCALITH[]; +extern const u8 Move_G_MAX_TARTNESS[]; +extern const u8 Move_G_MAX_SWEETNESS[]; +extern const u8 Move_G_MAX_SANDBLAST[]; +extern const u8 Move_G_MAX_STUN_SHOCK[]; +extern const u8 Move_G_MAX_CENTIFERNO[]; +extern const u8 Move_G_MAX_SMITE[]; +extern const u8 Move_G_MAX_SNOOZE[]; +extern const u8 Move_G_MAX_FINALE[]; +extern const u8 Move_G_MAX_STEELSURGE[]; +extern const u8 Move_G_MAX_DEPLETION[]; +extern const u8 Move_G_MAX_ONE_BLOW[]; +extern const u8 Move_G_MAX_RAPID_FLOW[]; + +#endif // GUARD_BATTLE_ANIM_SCRIPTS_H diff --git a/include/pokemon.h b/include/pokemon.h index a4a7ad47a006..2a705dcbfb27 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -526,6 +526,7 @@ struct MoveInfo u8 contestCategory:3; u8 contestComboStarterId; u8 contestComboMoves[MAX_COMBO_MOVES]; + const u8 *battleAnimScript; }; #define EFFECTS_ARR(...) (const struct AdditionalEffect[]) {__VA_ARGS__} diff --git a/src/battle_anim.c b/src/battle_anim.c index af1a5a262a80..bb29769371ee 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -30,7 +30,6 @@ extern const u16 gMovesWithQuietBGM[]; extern const u8 *const gBattleAnims_General[]; -extern const u8 *const gBattleAnims_Moves[]; extern const u8 *const gBattleAnims_Special[]; extern const u8 *const gBattleAnims_StatusConditions[]; @@ -232,7 +231,6 @@ static void Nop(void) void LaunchBattleAnimation(u32 animType, u32 animId) { s32 i; - const u8 *const *animsTable; if (gTestRunnerEnabled) { @@ -247,23 +245,6 @@ void LaunchBattleAnimation(u32 animType, u32 animId) } } - switch (animType) - { - case ANIM_TYPE_GENERAL: - default: - animsTable = gBattleAnims_General; - break; - case ANIM_TYPE_MOVE: - animsTable = gBattleAnims_Moves; - break; - case ANIM_TYPE_STATUS: - animsTable = gBattleAnims_StatusConditions; - break; - case ANIM_TYPE_SPECIAL: - animsTable = gBattleAnims_Special; - break; - } - sAnimHideHpBoxes = !(animType == ANIM_TYPE_MOVE && animId == MOVE_TRANSFORM); if (animType != ANIM_TYPE_MOVE) { @@ -319,7 +300,23 @@ void LaunchBattleAnimation(u32 animType, u32 animId) sMonAnimTaskIdArray[0] = TASK_NONE; sMonAnimTaskIdArray[1] = TASK_NONE; - sBattleAnimScriptPtr = animsTable[animId]; + + switch (animType) + { + case ANIM_TYPE_GENERAL: + default: + sBattleAnimScriptPtr = gBattleAnims_General[animId]; + break; + case ANIM_TYPE_MOVE: + sBattleAnimScriptPtr = gMovesInfo[animId].battleAnimScript; + break; + case ANIM_TYPE_STATUS: + sBattleAnimScriptPtr = gBattleAnims_StatusConditions[animId]; + break; + case ANIM_TYPE_SPECIAL: + sBattleAnimScriptPtr = gBattleAnims_Special[animId]; + break; + } gAnimScriptActive = TRUE; sAnimFramesToWait = 0; gAnimScriptCallback = RunAnimScriptCommand; diff --git a/src/data/moves_info.h b/src/data/moves_info.h index 35672537a6da..82cf224fad62 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -1,4 +1,5 @@ #include "battle_dynamax.h" +#include "battle_anim_scripts.h" #include "constants/battle.h" #include "constants/battle_move_effects.h" #include "constants/battle_script_commands.h" @@ -133,6 +134,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = TRUE, .sketchBanned = TRUE, .assistBanned = TRUE, + .battleAnimScript = Move_NONE, }, [MOVE_POUND] = @@ -154,7 +156,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_POUND, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POUND, }, [MOVE_KARATE_CHOP] = @@ -177,6 +180,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_KARATE_CHOP, }, [MOVE_DOUBLE_SLAP] = @@ -198,6 +202,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_POUND}, + .battleAnimScript = Move_DOUBLE_SLAP, }, [MOVE_COMET_PUNCH] = @@ -219,7 +224,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COMET_PUNCH, }, [MOVE_MEGA_PUNCH] = @@ -242,6 +248,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_MEGA_PUNCH, }, [MOVE_PAY_DAY] = @@ -264,7 +271,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PAY_DAY, }, [MOVE_FIRE_PUNCH] = @@ -291,6 +299,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_FIRE_PUNCH, .contestComboMoves = {COMBO_STARTER_ICE_PUNCH, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH}, + .battleAnimScript = Move_FIRE_PUNCH, }, [MOVE_ICE_PUNCH] = @@ -321,6 +330,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_ICE_PUNCH, .contestComboMoves = {COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_THUNDER_PUNCH}, + .battleAnimScript = Move_ICE_PUNCH, }, [MOVE_THUNDER_PUNCH] = @@ -347,6 +357,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_THUNDER_PUNCH, .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH}, + .battleAnimScript = Move_THUNDER_PUNCH, }, [MOVE_SCRATCH] = @@ -368,6 +379,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SCRATCH, .contestComboMoves = {COMBO_STARTER_LEER}, + .battleAnimScript = Move_SCRATCH, }, [MOVE_VISE_GRIP] = @@ -388,7 +400,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_VICE_GRIP, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_VISE_GRIP, }, [MOVE_GUILLOTINE] = @@ -410,6 +423,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_VICE_GRIP}, + .battleAnimScript = Move_GUILLOTINE, }, [MOVE_RAZOR_WIND] = @@ -434,7 +448,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RAZOR_WIND, }, [MOVE_SWORDS_DANCE] = @@ -457,7 +472,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SWORDS_DANCE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SWORDS_DANCE, }, [MOVE_CUT] = @@ -480,6 +496,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, + .battleAnimScript = Move_CUT, }, [MOVE_GUST] = @@ -502,7 +519,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GUST, }, [MOVE_WING_ATTACK] = @@ -523,7 +541,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WING_ATTACK, }, [MOVE_WHIRLWIND] = @@ -550,7 +569,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WHIRLWIND, }, [MOVE_FLY] = @@ -576,7 +596,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLY, }, [MOVE_BIND] = @@ -602,6 +623,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_VICE_GRIP}, + .battleAnimScript = Move_BIND, }, [MOVE_SLAM] = @@ -624,6 +646,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_POUND}, + .battleAnimScript = Move_SLAM, }, [MOVE_VINE_WHIP] = @@ -651,6 +674,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_VINE_WHIP, }, [MOVE_STOMP] = @@ -678,6 +702,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_LEER}, + .battleAnimScript = Move_STOMP, }, [MOVE_DOUBLE_KICK] = @@ -699,7 +724,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DOUBLE_KICK, }, [MOVE_MEGA_KICK] = @@ -721,6 +747,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_MEGA_KICK, }, [MOVE_JUMP_KICK] = @@ -749,6 +776,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_JUMP_KICK, }, [MOVE_ROLLING_KICK] = @@ -774,7 +802,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROLLING_KICK, }, [MOVE_SAND_ATTACK] = @@ -797,6 +826,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_SAND_ATTACK, .contestComboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM}, + .battleAnimScript = Move_SAND_ATTACK, }, [MOVE_HEADBUTT] = @@ -822,6 +852,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_HEADBUTT, }, [MOVE_HORN_ATTACK] = @@ -843,6 +874,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_HORN_ATTACK, .contestComboMoves = {COMBO_STARTER_LEER}, + .battleAnimScript = Move_HORN_ATTACK, }, [MOVE_FURY_ATTACK] = @@ -864,6 +896,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK}, + .battleAnimScript = Move_FURY_ATTACK, }, [MOVE_HORN_DRILL] = @@ -885,6 +918,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HORN_ATTACK}, + .battleAnimScript = Move_HORN_DRILL, }, [MOVE_TACKLE] = @@ -912,6 +946,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN, COMBO_STARTER_LEER}, + .battleAnimScript = Move_TACKLE, }, [MOVE_BODY_SLAM] = @@ -938,7 +973,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BODY_SLAM, }, [MOVE_WRAP] = @@ -962,7 +998,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WRAP, }, [MOVE_TAKE_DOWN] = @@ -985,6 +1022,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, + .battleAnimScript = Move_TAKE_DOWN, }, [MOVE_THRASH] = @@ -1011,6 +1049,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAGE}, + .battleAnimScript = Move_THRASH, }, [MOVE_DOUBLE_EDGE] = @@ -1033,6 +1072,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, + .battleAnimScript = Move_DOUBLE_EDGE, }, [MOVE_TAIL_WHIP] = @@ -1055,6 +1095,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARM}, + .battleAnimScript = Move_TAIL_WHIP, }, [MOVE_POISON_STING] = @@ -1078,7 +1119,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POISON_STING, }, [MOVE_TWINEEDLE] = @@ -1104,7 +1146,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TWINEEDLE, }, [MOVE_PIN_MISSILE] = @@ -1124,7 +1167,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PIN_MISSILE, }, [MOVE_LEER] = @@ -1147,6 +1191,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_LEER, .contestComboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE}, + .battleAnimScript = Move_LEER, }, [MOVE_BITE] = @@ -1173,6 +1218,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE}, + .battleAnimScript = Move_BITE, }, [MOVE_GROWL] = @@ -1197,6 +1243,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARM}, + .battleAnimScript = Move_GROWL, }, [MOVE_ROAR] = @@ -1223,7 +1270,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROAR, }, [MOVE_SING] = @@ -1247,7 +1295,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_SING, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SING, }, [MOVE_SUPERSONIC] = @@ -1271,7 +1320,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SUPERSONIC, }, [MOVE_SONIC_BOOM] = @@ -1292,7 +1342,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SONIC_BOOM, }, [MOVE_DISABLE] = @@ -1321,7 +1372,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DISABLE, }, [MOVE_ACID] = @@ -1349,7 +1401,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ACID, }, [MOVE_EMBER] = @@ -1374,6 +1427,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_EMBER, }, [MOVE_FLAMETHROWER] = @@ -1398,6 +1452,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_FLAMETHROWER, }, [MOVE_MIST] = @@ -1421,7 +1476,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MIST, }, [MOVE_WATER_GUN] = @@ -1442,6 +1498,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT}, + .battleAnimScript = Move_WATER_GUN, }, [MOVE_HYDRO_PUMP] = @@ -1462,6 +1519,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_HYDRO_PUMP, }, [MOVE_SURF] = @@ -1484,6 +1542,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SURF, .contestComboMoves = {COMBO_STARTER_DIVE, COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_SURF, }, [MOVE_ICE_BEAM] = @@ -1514,6 +1573,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_ICE_BEAM, }, [MOVE_BLIZZARD] = @@ -1543,6 +1603,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_POWDER_SNOW}, + .battleAnimScript = Move_BLIZZARD, }, [MOVE_PSYBEAM] = @@ -1567,6 +1628,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_PSYBEAM, }, [MOVE_BUBBLE_BEAM] = @@ -1591,6 +1653,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_BUBBLE_BEAM, }, [MOVE_AURORA_BEAM] = @@ -1615,6 +1678,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_AURORA_BEAM, }, [MOVE_HYPER_BEAM] = @@ -1637,7 +1701,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HYPER_BEAM, }, [MOVE_PECK] = @@ -1658,7 +1723,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_PECK, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PECK, }, [MOVE_DRILL_PECK] = @@ -1680,6 +1746,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_PECK}, + .battleAnimScript = Move_DRILL_PECK, }, [MOVE_SUBMISSION] = @@ -1702,6 +1769,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_SUBMISSION, }, [MOVE_LOW_KICK] = @@ -1722,7 +1790,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LOW_KICK, }, [MOVE_COUNTER] = @@ -1749,6 +1818,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_TAUNT}, + .battleAnimScript = Move_COUNTER, }, [MOVE_SEISMIC_TOSS] = @@ -1771,6 +1841,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FAKE_OUT}, + .battleAnimScript = Move_SEISMIC_TOSS, }, [MOVE_STRENGTH] = @@ -1791,7 +1862,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STRENGTH, }, [MOVE_ABSORB] = @@ -1814,6 +1886,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_ABSORB, }, [MOVE_MEGA_DRAIN] = @@ -1835,6 +1908,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_MEGA_DRAIN, }, [MOVE_LEECH_SEED] = @@ -1857,6 +1931,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_LEECH_SEED, .contestComboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_WORRY_SEED}, + .battleAnimScript = Move_LEECH_SEED, }, [MOVE_GROWTH] = @@ -1880,7 +1955,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_GROWTH, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GROWTH, }, [MOVE_RAZOR_LEAF] = @@ -1903,6 +1979,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_RAZOR_LEAF, }, [MOVE_SOLAR_BEAM] = @@ -1926,6 +2003,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_SOLAR_BEAM, }, [MOVE_POISON_POWDER] = @@ -1949,6 +2027,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, + .battleAnimScript = Move_POISON_POWDER, }, [MOVE_STUN_SPORE] = @@ -1972,6 +2051,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, + .battleAnimScript = Move_STUN_SPORE, }, [MOVE_SLEEP_POWDER] = @@ -1995,6 +2075,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, + .battleAnimScript = Move_SLEEP_POWDER, }, [MOVE_PETAL_DANCE] = @@ -2028,6 +2109,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_PETAL_DANCE, }, [MOVE_STRING_SHOT] = @@ -2049,7 +2131,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_STRING_SHOT, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STRING_SHOT, }, [MOVE_DRAGON_RAGE] = @@ -2072,6 +2155,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_RAGE, .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, + .battleAnimScript = Move_DRAGON_RAGE, }, [MOVE_FIRE_SPIN] = @@ -2096,6 +2180,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_FIRE_SPIN, }, [MOVE_THUNDER_SHOCK] = @@ -2120,6 +2205,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_THUNDER_SHOCK, }, [MOVE_THUNDERBOLT] = @@ -2144,6 +2230,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_THUNDERBOLT, }, [MOVE_THUNDER_WAVE] = @@ -2166,6 +2253,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_THUNDER_WAVE, }, [MOVE_THUNDER] = @@ -2191,6 +2279,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_LOCK_ON, COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_THUNDER, }, [MOVE_ROCK_THROW] = @@ -2210,7 +2299,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_ROCK_THROW, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROCK_THROW, }, [MOVE_EARTHQUAKE] = @@ -2233,7 +2323,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_EARTHQUAKE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EARTHQUAKE, }, [MOVE_FISSURE] = @@ -2256,6 +2347,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_EARTHQUAKE}, + .battleAnimScript = Move_FISSURE, }, [MOVE_DIG] = @@ -2281,7 +2373,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DIG, }, [MOVE_TOXIC] = @@ -2303,7 +2396,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_TOXIC, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TOXIC, }, [MOVE_CONFUSION] = @@ -2328,6 +2422,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_CONFUSION, .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, + .battleAnimScript = Move_CONFUSION, }, [MOVE_PSYCHIC] = @@ -2352,6 +2447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_PSYCHIC, .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_CONFUSION, COMBO_STARTER_KINESIS}, + .battleAnimScript = Move_PSYCHIC, }, [MOVE_HYPNOSIS] = @@ -2373,7 +2469,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_HYPNOSIS, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HYPNOSIS, }, [MOVE_MEDITATE] = @@ -2398,6 +2495,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_MEDITATE, }, [MOVE_AGILITY] = @@ -2422,6 +2520,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_DOUBLE_TEAM}, + .battleAnimScript = Move_AGILITY, }, [MOVE_QUICK_ATTACK] = @@ -2443,6 +2542,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_DOUBLE_TEAM}, + .battleAnimScript = Move_QUICK_ATTACK, }, [MOVE_RAGE] = @@ -2463,7 +2563,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_RAGE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RAGE, }, [MOVE_TELEPORT] = @@ -2487,6 +2588,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CONFUSION, COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, + .battleAnimScript = Move_TELEPORT, }, [MOVE_NIGHT_SHADE] = @@ -2506,7 +2608,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NIGHT_SHADE, }, [MOVE_MIMIC] = @@ -2535,7 +2638,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MIMIC, }, [MOVE_SCREECH] = @@ -2559,7 +2663,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SCREECH, }, [MOVE_DOUBLE_TEAM] = @@ -2583,7 +2688,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DOUBLE_TEAM, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DOUBLE_TEAM, }, [MOVE_RECOVER] = @@ -2614,7 +2720,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RECOVER, }, [MOVE_HARDEN] = @@ -2638,7 +2745,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_HARDEN, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HARDEN, }, [MOVE_MINIMIZE] = @@ -2662,7 +2770,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MINIMIZE, }, [MOVE_SMOKESCREEN] = @@ -2685,6 +2794,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SMOG}, + .battleAnimScript = Move_SMOKESCREEN, }, [MOVE_CONFUSE_RAY] = @@ -2706,7 +2816,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CONFUSE_RAY, }, [MOVE_WITHDRAW] = @@ -2731,6 +2842,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_WITHDRAW, }, [MOVE_DEFENSE_CURL] = @@ -2754,7 +2866,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_DEFENSE_CURL, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DEFENSE_CURL, }, [MOVE_BARRIER] = @@ -2778,7 +2891,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BARRIER, }, [MOVE_LIGHT_SCREEN] = @@ -2803,6 +2917,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_LIGHT_SCREEN, }, [MOVE_HAZE] = @@ -2827,6 +2942,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_HAZE, }, [MOVE_REFLECT] = @@ -2851,6 +2967,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_REFLECT, }, [MOVE_FOCUS_ENERGY] = @@ -2875,7 +2992,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_FOCUS_ENERGY, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FOCUS_ENERGY, }, [MOVE_BIDE] = @@ -2899,7 +3017,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BIDE, }, [MOVE_METRONOME] = @@ -2928,7 +3047,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_METRONOME, }, [MOVE_MIRROR_MOVE] = @@ -2956,7 +3076,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MIRROR_MOVE, }, [MOVE_SELF_DESTRUCT] = @@ -2977,7 +3098,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SELF_DESTRUCT, }, [MOVE_EGG_BOMB] = @@ -2999,6 +3121,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SOFT_BOILED}, + .battleAnimScript = Move_EGG_BOMB, }, [MOVE_LICK] = @@ -3023,7 +3146,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LICK, }, [MOVE_SMOG] = @@ -3047,7 +3171,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SMOG, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SMOG, }, [MOVE_SLUDGE] = @@ -3072,6 +3197,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SLUDGE, .contestComboMoves = {COMBO_STARTER_SLUDGE_BOMB}, + .battleAnimScript = Move_SLUDGE, }, [MOVE_BONE_CLUB] = @@ -3096,6 +3222,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_BONE_CLUB, .contestComboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH, COMBO_STARTER_SHADOW_BONE}, + .battleAnimScript = Move_BONE_CLUB, }, [MOVE_FIRE_BLAST] = @@ -3120,6 +3247,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_FIRE_BLAST, }, [MOVE_WATERFALL] = @@ -3147,6 +3275,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_WATERFALL, }, [MOVE_CLAMP] = @@ -3172,6 +3301,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_CLAMP, }, [MOVE_SWIFT] = @@ -3191,7 +3321,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SWIFT, }, [MOVE_SKULL_BASH] = @@ -3220,7 +3351,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SKULL_BASH, }, [MOVE_SPIKE_CANNON] = @@ -3240,7 +3372,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPIKE_CANNON, }, [MOVE_CONSTRICT] = @@ -3265,7 +3398,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CONSTRICT, }, [MOVE_AMNESIA] = @@ -3289,7 +3423,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AMNESIA, }, [MOVE_KINESIS] = @@ -3312,6 +3447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_KINESIS, .contestComboMoves = {COMBO_STARTER_CONFUSION, COMBO_STARTER_PSYCHIC}, + .battleAnimScript = Move_KINESIS, }, [MOVE_SOFT_BOILED] = @@ -3336,7 +3472,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SOFT_BOILED, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SOFT_BOILED, }, [MOVE_HIGH_JUMP_KICK] = @@ -3365,6 +3502,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_HIGH_JUMP_KICK, }, [MOVE_GLARE] = @@ -3393,6 +3531,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_LEER}, + .battleAnimScript = Move_GLARE, }, [MOVE_DREAM_EATER] = @@ -3414,6 +3553,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_HYPNOSIS}, + .battleAnimScript = Move_DREAM_EATER, }, [MOVE_POISON_GAS] = @@ -3441,7 +3581,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POISON_GAS, }, [MOVE_BARRAGE] = @@ -3462,7 +3603,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BARRAGE, }, [MOVE_LEECH_LIFE] = @@ -3485,7 +3627,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LEECH_LIFE, }, [MOVE_LOVELY_KISS] = @@ -3507,7 +3650,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LOVELY_KISS, }, [MOVE_SKY_ATTACK] = @@ -3537,7 +3681,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SKY_ATTACK, }, [MOVE_TRANSFORM] = @@ -3566,7 +3711,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TRANSFORM, }, [MOVE_BUBBLE] = @@ -3591,6 +3737,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_BUBBLE, }, [MOVE_DIZZY_PUNCH] = @@ -3616,7 +3763,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DIZZY_PUNCH, }, [MOVE_SPORE] = @@ -3639,7 +3787,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPORE, }, [MOVE_FLASH] = @@ -3661,7 +3810,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLASH, }, [MOVE_PSYWAVE] = @@ -3682,6 +3832,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_PSYWAVE, }, [MOVE_SPLASH] = @@ -3705,7 +3856,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPLASH, }, [MOVE_ACID_ARMOR] = @@ -3729,7 +3881,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ACID_ARMOR, }, [MOVE_CRABHAMMER] = @@ -3752,6 +3905,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE}, + .battleAnimScript = Move_CRABHAMMER, }, [MOVE_EXPLOSION] = @@ -3772,7 +3926,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EXPLOSION, }, [MOVE_FURY_SWIPES] = @@ -3794,6 +3949,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SCRATCH}, + .battleAnimScript = Move_FURY_SWIPES, }, [MOVE_BONEMERANG] = @@ -3815,6 +3971,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_BONEMERANG, .contestComboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH, COMBO_STARTER_SHADOW_BONE}, + .battleAnimScript = Move_BONEMERANG, }, [MOVE_REST] = @@ -3840,6 +3997,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_REST, .contestComboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN}, + .battleAnimScript = Move_REST, }, [MOVE_ROCK_SLIDE] = @@ -3864,6 +4022,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_ROCK_THROW}, + .battleAnimScript = Move_ROCK_SLIDE, }, [MOVE_HYPER_FANG] = @@ -3889,7 +4048,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HYPER_FANG, }, [MOVE_SHARPEN] = @@ -3913,7 +4073,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHARPEN, }, [MOVE_CONVERSION] = @@ -3937,7 +4098,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CONVERSION, }, [MOVE_TRI_ATTACK] = @@ -3962,6 +4124,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_LOCK_ON}, + .battleAnimScript = Move_TRI_ATTACK, }, [MOVE_SUPER_FANG] = @@ -3984,6 +4147,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SCARY_FACE}, + .battleAnimScript = Move_SUPER_FANG, }, [MOVE_SLASH] = @@ -4007,6 +4171,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SCRATCH, COMBO_STARTER_SWORDS_DANCE}, + .battleAnimScript = Move_SLASH, }, [MOVE_SUBSTITUTE] = @@ -4031,7 +4196,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SUBSTITUTE, }, [MOVE_STRUGGLE] = @@ -4069,6 +4235,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .encoreBanned = TRUE, .assistBanned = TRUE, .sketchBanned = TRUE, + .battleAnimScript = Move_STRUGGLE, }, [MOVE_SKETCH] = @@ -4100,7 +4267,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SKETCH, }, [MOVE_TRIPLE_KICK] = @@ -4123,6 +4291,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_TRIPLE_KICK, }, [MOVE_THIEF] = @@ -4151,7 +4320,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_THIEF, }, [MOVE_SPIDER_WEB] = @@ -4175,6 +4345,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_STRING_SHOT}, + .battleAnimScript = Move_SPIDER_WEB, }, [MOVE_MIND_READER] = @@ -4195,7 +4366,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_MIND_READER, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MIND_READER, }, [MOVE_NIGHTMARE] = @@ -4217,7 +4389,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NIGHTMARE, }, [MOVE_FLAME_WHEEL] = @@ -4244,6 +4417,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_FLAME_WHEEL, }, [MOVE_SNORE] = @@ -4271,6 +4445,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_REST}, + .battleAnimScript = Move_SNORE, }, [MOVE_CURSE] = @@ -4294,7 +4469,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_CURSE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CURSE, }, [MOVE_FLAIL] = @@ -4316,6 +4492,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_ENDURE}, + .battleAnimScript = Move_FLAIL, }, [MOVE_CONVERSION_2] = @@ -4339,7 +4516,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CONVERSION_2, }, [MOVE_AEROBLAST] = @@ -4361,7 +4539,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AEROBLAST, }, [MOVE_COTTON_SPORE] = @@ -4384,7 +4563,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COTTON_SPORE, }, [MOVE_REVERSAL] = @@ -4406,6 +4586,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_ENDURE}, + .battleAnimScript = Move_REVERSAL, }, [MOVE_SPITE] = @@ -4429,6 +4610,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CURSE}, + .battleAnimScript = Move_SPITE, }, [MOVE_POWDER_SNOW] = @@ -4457,6 +4639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_POWDER_SNOW, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_POWDER_SNOW, }, [MOVE_PROTECT] = @@ -4481,6 +4664,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HARDEN}, + .battleAnimScript = Move_PROTECT, }, [MOVE_MACH_PUNCH] = @@ -4502,7 +4686,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MACH_PUNCH, }, [MOVE_SCARY_FACE] = @@ -4525,6 +4710,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SCARY_FACE, .contestComboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_RAGE}, + .battleAnimScript = Move_SCARY_FACE, }, [MOVE_FEINT_ATTACK] = @@ -4544,6 +4730,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND}, + .battleAnimScript = Move_FEINT_ATTACK, }, [MOVE_SWEET_KISS] = @@ -4566,6 +4753,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARM}, + .battleAnimScript = Move_SWEET_KISS, }, [MOVE_BELLY_DRUM] = @@ -4589,7 +4777,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_BELLY_DRUM, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BELLY_DRUM, }, [MOVE_SLUDGE_BOMB] = @@ -4615,6 +4804,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SLUDGE_BOMB, .contestComboMoves = {COMBO_STARTER_SLUDGE}, + .battleAnimScript = Move_SLUDGE_BOMB, }, [MOVE_MUD_SLAP] = @@ -4639,6 +4829,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_MUD_SLAP, .contestComboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_SANDSTORM}, + .battleAnimScript = Move_MUD_SLAP, }, [MOVE_OCTAZOOKA] = @@ -4664,6 +4855,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_LOCK_ON, COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_OCTAZOOKA, }, [MOVE_SPIKES] = @@ -4689,7 +4881,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPIKES, }, [MOVE_ZAP_CANNON] = @@ -4715,6 +4908,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_LOCK_ON}, + .battleAnimScript = Move_ZAP_CANNON, }, [MOVE_FORESIGHT] = @@ -4737,7 +4931,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FORESIGHT, }, [MOVE_DESTINY_BOND] = @@ -4765,6 +4960,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, COMBO_STARTER_MEAN_LOOK}, + .battleAnimScript = Move_DESTINY_BOND, }, [MOVE_PERISH_SONG] = @@ -4790,6 +4986,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, + .battleAnimScript = Move_PERISH_SONG, }, [MOVE_ICY_WIND] = @@ -4815,6 +5012,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_ICY_WIND, }, [MOVE_DETECT] = @@ -4841,6 +5039,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_TAUNT}, + .battleAnimScript = Move_DETECT, }, [MOVE_BONE_RUSH] = @@ -4861,6 +5060,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_BONE_RUSH, .contestComboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_SHADOW_BONE}, + .battleAnimScript = Move_BONE_RUSH, }, [MOVE_LOCK_ON] = @@ -4881,7 +5081,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_LOCK_ON, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LOCK_ON, }, [MOVE_OUTRAGE] = @@ -4907,7 +5108,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_OUTRAGE, }, [MOVE_SANDSTORM] = @@ -4931,7 +5133,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SANDSTORM, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SANDSTORM, }, [MOVE_GIGA_DRAIN] = @@ -4954,6 +5157,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_GIGA_DRAIN, }, [MOVE_ENDURE] = @@ -4979,7 +5183,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_ENDURE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ENDURE, }, [MOVE_CHARM] = @@ -5001,7 +5206,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_CHARM, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CHARM, }, [MOVE_ROLLOUT] = @@ -5025,6 +5231,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN}, + .battleAnimScript = Move_ROLLOUT, }, [MOVE_FALSE_SWIPE] = @@ -5044,6 +5251,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, + .battleAnimScript = Move_FALSE_SWIPE, }, [MOVE_SWAGGER] = @@ -5065,7 +5273,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SWAGGER, }, [MOVE_MILK_DRINK] = @@ -5090,7 +5299,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MILK_DRINK, }, [MOVE_SPARK] = @@ -5116,6 +5326,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_SPARK, }, [MOVE_FURY_CUTTER] = @@ -5144,6 +5355,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, + .battleAnimScript = Move_FURY_CUTTER, }, [MOVE_STEEL_WING] = @@ -5169,7 +5381,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STEEL_WING, }, [MOVE_MEAN_LOOK] = @@ -5193,6 +5406,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_MEAN_LOOK, .contestComboMoves = {COMBO_STARTER_CURSE}, + .battleAnimScript = Move_MEAN_LOOK, }, [MOVE_ATTRACT] = @@ -5215,7 +5429,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ATTRACT, }, [MOVE_SLEEP_TALK] = @@ -5246,6 +5461,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_REST}, + .battleAnimScript = Move_SLEEP_TALK, }, [MOVE_HEAL_BELL] = @@ -5272,6 +5488,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_HEAL_BELL, .contestComboMoves = {COMBO_STARTER_LUCKY_CHANT}, + .battleAnimScript = Move_HEAL_BELL, }, [MOVE_RETURN] = @@ -5292,7 +5509,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RETURN, }, [MOVE_PRESENT] = @@ -5313,7 +5531,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PRESENT, }, [MOVE_FRUSTRATION] = @@ -5334,7 +5553,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FRUSTRATION, }, [MOVE_SAFEGUARD] = @@ -5358,7 +5578,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SAFEGUARD, }, [MOVE_PAIN_SPLIT] = @@ -5380,6 +5601,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_ENDURE}, + .battleAnimScript = Move_PAIN_SPLIT, }, [MOVE_SACRED_FIRE] = @@ -5405,6 +5627,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_SACRED_FIRE, }, [MOVE_MAGNITUDE] = @@ -5426,7 +5649,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAGNITUDE, }, [MOVE_DYNAMIC_PUNCH] = @@ -5453,6 +5677,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_DYNAMIC_PUNCH, }, [MOVE_MEGAHORN] = @@ -5473,7 +5698,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MEGAHORN, }, [MOVE_DRAGON_BREATH] = @@ -5499,6 +5725,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_BREATH, .contestComboMoves = {COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, + .battleAnimScript = Move_DRAGON_BREATH, }, [MOVE_BATON_PASS] = @@ -5521,7 +5748,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BATON_PASS, }, [MOVE_ENCORE] = @@ -5545,7 +5773,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ENCORE, }, [MOVE_PURSUIT] = @@ -5567,7 +5796,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PURSUIT, }, [MOVE_RAPID_SPIN] = @@ -5600,7 +5830,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RAPID_SPIN, }, [MOVE_SWEET_SCENT] = @@ -5622,7 +5853,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_SWEET_SCENT, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SWEET_SCENT, }, [MOVE_IRON_TAIL] = @@ -5647,7 +5879,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_IRON_TAIL, }, [MOVE_METAL_CLAW] = @@ -5674,6 +5907,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_METAL_SOUND}, + .battleAnimScript = Move_METAL_CLAW, }, [MOVE_VITAL_THROW] = @@ -5695,6 +5929,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FAKE_OUT}, + .battleAnimScript = Move_VITAL_THROW, }, [MOVE_MORNING_SUN] = @@ -5720,6 +5955,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_MORNING_SUN, }, [MOVE_SYNTHESIS] = @@ -5745,6 +5981,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_SYNTHESIS, }, [MOVE_MOONLIGHT] = @@ -5770,6 +6007,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_MOONLIGHT, }, [MOVE_HIDDEN_POWER] = @@ -5789,7 +6027,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HIDDEN_POWER, }, [MOVE_CROSS_CHOP] = @@ -5812,6 +6051,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_CROSS_CHOP, }, [MOVE_TWISTER] = @@ -5837,7 +6077,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TWISTER, }, [MOVE_RAIN_DANCE] = @@ -5860,7 +6101,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_RAIN_DANCE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RAIN_DANCE, }, [MOVE_SUNNY_DAY] = @@ -5883,7 +6125,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_SUNNY_DAY, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SUNNY_DAY, }, [MOVE_CRUNCH] = @@ -5918,6 +6161,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SCARY_FACE}, + .battleAnimScript = Move_CRUNCH, }, [MOVE_MIRROR_COAT] = @@ -5942,6 +6186,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_TAUNT}, + .battleAnimScript = Move_MIRROR_COAT, }, [MOVE_PSYCH_UP] = @@ -5966,7 +6211,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PSYCH_UP, }, [MOVE_EXTREME_SPEED] = @@ -5987,7 +6233,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EXTREME_SPEED, }, [MOVE_ANCIENT_POWER] = @@ -6013,7 +6260,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ANCIENT_POWER, }, [MOVE_SHADOW_BALL] = @@ -6038,7 +6286,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHADOW_BALL, }, [MOVE_FUTURE_SIGHT] = @@ -6067,6 +6316,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_CONFUSION, COMBO_STARTER_KINESIS, COMBO_STARTER_PSYCHIC}, + .battleAnimScript = Move_FUTURE_SIGHT, }, [MOVE_ROCK_SMASH] = @@ -6091,7 +6341,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROCK_SMASH, }, [MOVE_WHIRLPOOL] = @@ -6116,6 +6367,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_WHIRLPOOL, }, [MOVE_BEAT_UP] = @@ -6135,7 +6387,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BEAT_UP, }, [MOVE_FAKE_OUT] = @@ -6160,7 +6413,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_FAKE_OUT, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FAKE_OUT, }, [MOVE_UPROAR] = @@ -6192,7 +6446,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_UPROAR, }, [MOVE_STOCKPILE] = @@ -6216,7 +6471,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_STOCKPILE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STOCKPILE, }, [MOVE_SPIT_UP] = @@ -6238,6 +6494,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_STOCKPILE}, + .battleAnimScript = Move_SPIT_UP, }, [MOVE_SWALLOW] = @@ -6263,6 +6520,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_STOCKPILE}, + .battleAnimScript = Move_SWALLOW, }, [MOVE_HEAT_WAVE] = @@ -6288,6 +6546,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_HEAT_WAVE, }, [MOVE_HAIL] = @@ -6310,7 +6569,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_HAIL, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HAIL, }, [MOVE_TORMENT] = @@ -6329,11 +6589,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, - .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TORMENT, }, [MOVE_FLATTER] = @@ -6356,6 +6616,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARM}, + .battleAnimScript = Move_FLATTER, }, [MOVE_WILL_O_WISP] = @@ -6378,6 +6639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_WILL_O_WISP, }, [MOVE_MEMENTO] = @@ -6398,7 +6660,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MEMENTO, }, [MOVE_FACADE] = @@ -6420,6 +6683,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_FACADE, }, [MOVE_FOCUS_PUNCH] = @@ -6449,6 +6713,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_FOCUS_PUNCH, }, [MOVE_SMELLING_SALTS] = @@ -6473,7 +6738,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SMELLING_SALTS, }, [MOVE_FOLLOW_ME] = @@ -6499,7 +6765,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FOLLOW_ME, }, [MOVE_NATURE_POWER] = @@ -6526,7 +6793,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NATURE_POWER, }, [MOVE_CHARGE] = @@ -6550,7 +6818,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_CHARGE, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CHARGE, }, [MOVE_TAUNT] = @@ -6573,7 +6842,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_TAUNT, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TAUNT, }, [MOVE_HELPING_HAND] = @@ -6600,7 +6870,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HELPING_HAND, }, [MOVE_TRICK] = @@ -6624,7 +6895,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TRICK, }, [MOVE_ROLE_PLAY] = @@ -6648,7 +6920,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROLE_PLAY, }, [MOVE_WISH] = @@ -6673,7 +6946,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WISH, }, [MOVE_ASSIST] = @@ -6702,7 +6976,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ASSIST, }, [MOVE_INGRAIN] = @@ -6727,7 +7002,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_INGRAIN, }, [MOVE_SUPERPOWER] = @@ -6753,6 +7029,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_LOCK_ON, COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_SUPERPOWER, }, [MOVE_MAGIC_COAT] = @@ -6775,7 +7052,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAGIC_COAT, }, [MOVE_RECYCLE] = @@ -6799,7 +7077,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RECYCLE, }, [MOVE_REVENGE] = @@ -6819,6 +7098,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_REVENGE, .contestComboMoves = {COMBO_STARTER_PAYBACK}, + .battleAnimScript = Move_REVENGE, }, [MOVE_BRICK_BREAK] = @@ -6840,6 +7120,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_BRICK_BREAK, }, [MOVE_YAWN] = @@ -6861,7 +7142,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_YAWN, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_YAWN, }, [MOVE_KNOCK_OFF] = @@ -6886,6 +7168,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FAKE_OUT}, + .battleAnimScript = Move_KNOCK_OFF, }, [MOVE_ENDEAVOR] = @@ -6908,6 +7191,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_ENDURE}, + .battleAnimScript = Move_ENDEAVOR, }, [MOVE_ERUPTION] = @@ -6928,6 +7212,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_ENDURE, COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_ERUPTION, }, [MOVE_SKILL_SWAP] = @@ -6949,7 +7234,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SKILL_SWAP, }, [MOVE_IMPRISON] = @@ -6975,7 +7261,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_IMPRISON, }, [MOVE_REFRESH] = @@ -7000,6 +7287,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SING, COMBO_STARTER_WATER_SPORT}, + .battleAnimScript = Move_REFRESH, }, [MOVE_GRUDGE] = @@ -7024,6 +7312,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CURSE}, + .battleAnimScript = Move_GRUDGE, }, [MOVE_SNATCH] = @@ -7049,7 +7338,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SNATCH, }, [MOVE_SECRET_POWER] = @@ -7073,7 +7363,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SECRET_POWER, }, [MOVE_DIVE] = @@ -7100,6 +7391,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_DIVE, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF}, + .battleAnimScript = Move_DIVE, }, [MOVE_ARM_THRUST] = @@ -7121,6 +7413,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_ARM_THRUST, }, [MOVE_CAMOUFLAGE] = @@ -7144,7 +7437,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CAMOUFLAGE, }, [MOVE_TAIL_GLOW] = @@ -7168,7 +7462,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TAIL_GLOW, }, [MOVE_LUSTER_PURGE] = @@ -7193,6 +7488,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_LUSTER_PURGE, }, [MOVE_MIST_BALL] = @@ -7218,6 +7514,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_MIST_BALL, }, [MOVE_FEATHER_DANCE] = @@ -7240,7 +7537,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FEATHER_DANCE, }, [MOVE_TEETER_DANCE] = @@ -7263,7 +7561,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TEETER_DANCE, }, [MOVE_BLAZE_KICK] = @@ -7290,6 +7589,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_BLAZE_KICK, }, [MOVE_MUD_SPORT] = @@ -7314,6 +7614,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_MUD_SPORT, .contestComboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM, COMBO_STARTER_WATER_SPORT}, + .battleAnimScript = Move_MUD_SPORT, }, [MOVE_ICE_BALL] = @@ -7338,6 +7639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_ICE_BALL, }, [MOVE_NEEDLE_ARM] = @@ -7363,7 +7665,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NEEDLE_ARM, }, [MOVE_SLACK_OFF] = @@ -7388,7 +7691,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SLACK_OFF, }, [MOVE_HYPER_VOICE] = @@ -7410,7 +7714,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HYPER_VOICE, }, [MOVE_POISON_FANG] = @@ -7436,7 +7741,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POISON_FANG, }, [MOVE_CRUSH_CLAW] = @@ -7462,6 +7768,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, + .battleAnimScript = Move_CRUSH_CLAW, }, [MOVE_BLAST_BURN] = @@ -7486,6 +7793,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_BLAST_BURN, }, [MOVE_HYDRO_CANNON] = @@ -7510,6 +7818,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_HYDRO_CANNON, }, [MOVE_METEOR_MASH] = @@ -7536,7 +7845,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_METEOR_MASH, }, [MOVE_ASTONISH] = @@ -7562,7 +7872,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ASTONISH, }, [MOVE_WEATHER_BALL] = @@ -7585,6 +7896,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SANDSTORM, COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_WEATHER_BALL, }, [MOVE_AROMATHERAPY] = @@ -7608,7 +7920,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AROMATHERAPY, }, [MOVE_FAKE_TEARS] = @@ -7630,7 +7943,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FAKE_TEARS, }, [MOVE_AIR_CUTTER] = @@ -7653,7 +7967,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AIR_CUTTER, }, [MOVE_OVERHEAT] = @@ -7679,6 +7994,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_OVERHEAT, }, [MOVE_ODOR_SLEUTH] = @@ -7701,7 +8017,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ODOR_SLEUTH, }, [MOVE_ROCK_TOMB] = @@ -7726,6 +8043,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_ROCK_THROW}, + .battleAnimScript = Move_ROCK_TOMB, }, [MOVE_SILVER_WIND] = @@ -7751,7 +8069,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SILVER_WIND, }, [MOVE_METAL_SOUND] = @@ -7775,7 +8094,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_METAL_SOUND, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_METAL_SOUND, }, [MOVE_GRASS_WHISTLE] = @@ -7799,7 +8119,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GRASS_WHISTLE, }, [MOVE_TICKLE] = @@ -7821,7 +8142,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TICKLE, }, [MOVE_COSMIC_POWER] = @@ -7845,7 +8167,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COSMIC_POWER, }, [MOVE_WATER_SPOUT] = @@ -7866,6 +8189,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_WATER_SPOUT, }, [MOVE_SIGNAL_BEAM] = @@ -7889,7 +8213,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SIGNAL_BEAM, }, [MOVE_SHADOW_PUNCH] = @@ -7911,7 +8236,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHADOW_PUNCH, }, [MOVE_EXTRASENSORY] = @@ -7936,7 +8262,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EXTRASENSORY, }, [MOVE_SKY_UPPERCUT] = @@ -7960,6 +8287,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_SKY_UPPERCUT, }, [MOVE_SAND_TOMB] = @@ -7983,6 +8311,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SANDSTORM}, + .battleAnimScript = Move_SAND_TOMB, }, [MOVE_SHEER_COLD] = @@ -8003,6 +8332,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_SHEER_COLD, }, [MOVE_MUDDY_WATER] = @@ -8028,6 +8358,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_MUDDY_WATER, }, [MOVE_BULLET_SEED] = @@ -8049,6 +8380,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_BULLET_SEED, }, [MOVE_AERIAL_ACE] = @@ -8070,7 +8402,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AERIAL_ACE, }, [MOVE_ICICLE_SPEAR] = @@ -8090,7 +8423,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ICICLE_SPEAR, }, [MOVE_IRON_DEFENSE] = @@ -8114,7 +8448,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_IRON_DEFENSE, }, [MOVE_BLOCK] = @@ -8137,7 +8472,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BLOCK, }, [MOVE_HOWL] = @@ -8162,7 +8498,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HOWL, }, [MOVE_DRAGON_CLAW] = @@ -8184,6 +8521,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, + .battleAnimScript = Move_DRAGON_CLAW, }, [MOVE_FRENZY_PLANT] = @@ -8209,6 +8547,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_FRENZY_PLANT, }, [MOVE_BULK_UP] = @@ -8232,7 +8571,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BULK_UP, }, [MOVE_BOUNCE] = @@ -8262,7 +8602,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BOUNCE, }, [MOVE_MUD_SHOT] = @@ -8287,6 +8628,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SANDSTORM}, + .battleAnimScript = Move_MUD_SHOT, }, [MOVE_POISON_TAIL] = @@ -8312,7 +8654,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POISON_TAIL, }, [MOVE_COVET] = @@ -8340,7 +8683,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COVET, }, [MOVE_VOLT_TACKLE] = @@ -8368,7 +8712,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_VOLT_TACKLE, }, [MOVE_MAGICAL_LEAF] = @@ -8389,6 +8734,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_MAGICAL_LEAF, }, [MOVE_WATER_SPORT] = @@ -8413,6 +8759,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_WATER_SPORT, .contestComboMoves = {COMBO_STARTER_MUD_SPORT, COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_WATER_SPORT, }, [MOVE_CALM_MIND] = @@ -8436,7 +8783,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_CALM_MIND, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CALM_MIND, }, [MOVE_LEAF_BLADE] = @@ -8459,7 +8807,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LEAF_BLADE, }, [MOVE_DRAGON_DANCE] = @@ -8485,6 +8834,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_DANCE, .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, + .battleAnimScript = Move_DRAGON_DANCE, }, [MOVE_ROCK_BLAST] = @@ -8505,7 +8855,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROCK_BLAST, }, [MOVE_SHOCK_WAVE] = @@ -8526,6 +8877,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_SHOCK_WAVE, }, [MOVE_WATER_PULSE] = @@ -8551,6 +8903,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_WATER_PULSE, }, [MOVE_DOOM_DESIRE] = @@ -8572,7 +8925,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DOOM_DESIRE, }, [MOVE_PSYCHO_BOOST] = @@ -8597,6 +8951,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CALM_MIND}, + .battleAnimScript = Move_PSYCHO_BOOST, }, [MOVE_ROOST] = @@ -8622,6 +8977,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_BRAVE_BIRD}, + .battleAnimScript = Move_ROOST, }, [MOVE_GRAVITY] = @@ -8645,7 +9001,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GRAVITY, }, [MOVE_MIRACLE_EYE] = @@ -8668,7 +9025,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MIRACLE_EYE, }, [MOVE_WAKE_UP_SLAP] = @@ -8693,7 +9051,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WAKE_UP_SLAP, }, [MOVE_HAMMER_ARM] = @@ -8720,6 +9079,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_HAMMER_ARM, }, [MOVE_GYRO_BALL] = @@ -8741,7 +9101,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GYRO_BALL, }, [MOVE_HEALING_WISH] = @@ -8763,7 +9124,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEALING_WISH, }, [MOVE_BRINE] = @@ -8784,6 +9146,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_BRINE, }, [MOVE_NATURAL_GIFT] = @@ -8803,7 +9166,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NATURAL_GIFT, }, [MOVE_FEINT] = @@ -8831,7 +9195,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FEINT, }, [MOVE_PLUCK] = @@ -8853,7 +9218,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PLUCK, }, [MOVE_TAILWIND] = @@ -8878,7 +9244,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TAILWIND, }, [MOVE_ACUPRESSURE] = @@ -8902,7 +9269,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ACUPRESSURE, }, [MOVE_METAL_BURST] = @@ -8924,6 +9292,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_METAL_SOUND}, + .battleAnimScript = Move_METAL_BURST, }, [MOVE_U_TURN] = @@ -8942,7 +9311,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_U_TURN, }, [MOVE_CLOSE_COMBAT] = @@ -8966,6 +9336,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + .battleAnimScript = Move_CLOSE_COMBAT, }, [MOVE_PAYBACK] = @@ -8987,6 +9358,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_PAYBACK, .contestComboMoves = {COMBO_STARTER_REVENGE}, + .battleAnimScript = Move_PAYBACK, }, [MOVE_ASSURANCE] = @@ -9008,6 +9380,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_PAYBACK, COMBO_STARTER_REVENGE}, + .battleAnimScript = Move_ASSURANCE, }, [MOVE_EMBARGO] = @@ -9029,7 +9402,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EMBARGO, }, [MOVE_FLING] = @@ -9050,7 +9424,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLING, }, [MOVE_PSYCHO_SHIFT] = @@ -9071,7 +9446,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PSYCHO_SHIFT, }, [MOVE_TRUMP_CARD] = @@ -9092,7 +9468,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TRUMP_CARD, }, [MOVE_HEAL_BLOCK] = @@ -9114,7 +9491,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEAL_BLOCK, }, [MOVE_WRING_OUT] = @@ -9134,7 +9512,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WRING_OUT, }, [MOVE_POWER_TRICK] = @@ -9158,7 +9537,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POWER_TRICK, }, [MOVE_GASTRO_ACID] = @@ -9180,7 +9560,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GASTRO_ACID, }, [MOVE_LUCKY_CHANT] = @@ -9205,6 +9586,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_LUCKY_CHANT, .contestComboMoves = {COMBO_STARTER_HEAL_BELL}, + .battleAnimScript = Move_LUCKY_CHANT, }, [MOVE_ME_FIRST] = @@ -9235,7 +9617,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ME_FIRST, }, [MOVE_COPYCAT] = @@ -9265,7 +9648,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COPYCAT, }, [MOVE_POWER_SWAP] = @@ -9287,7 +9671,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POWER_SWAP, }, [MOVE_GUARD_SWAP] = @@ -9309,7 +9694,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GUARD_SWAP, }, [MOVE_PUNISHMENT] = @@ -9330,7 +9716,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PUNISHMENT, }, [MOVE_LAST_RESORT] = @@ -9351,7 +9738,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LAST_RESORT, }, [MOVE_WORRY_SEED] = @@ -9374,6 +9762,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_WORRY_SEED, .contestComboMoves = {COMBO_STARTER_LEECH_SEED}, + .battleAnimScript = Move_WORRY_SEED, }, [MOVE_SUCKER_PUNCH] = @@ -9392,7 +9781,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SUCKER_PUNCH, }, [MOVE_TOXIC_SPIKES] = @@ -9418,7 +9808,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TOXIC_SPIKES, }, [MOVE_HEART_SWAP] = @@ -9440,7 +9831,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEART_SWAP, }, [MOVE_AQUA_RING] = @@ -9464,7 +9856,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AQUA_RING, }, [MOVE_MAGNET_RISE] = @@ -9489,7 +9882,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAGNET_RISE, }, [MOVE_FLARE_BLITZ] = @@ -9517,6 +9911,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_FLARE_BLITZ, }, [MOVE_FORCE_PALM] = @@ -9541,7 +9936,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FORCE_PALM, }, [MOVE_AURA_SPHERE] = @@ -9563,7 +9959,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AURA_SPHERE, }, [MOVE_ROCK_POLISH] = @@ -9587,7 +9984,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROCK_POLISH, }, [MOVE_POISON_JAB] = @@ -9612,7 +10010,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POISON_JAB, }, [MOVE_DARK_PULSE] = @@ -9637,7 +10036,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DARK_PULSE, }, [MOVE_NIGHT_SLASH] = @@ -9660,7 +10060,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NIGHT_SLASH, }, [MOVE_AQUA_TAIL] = @@ -9682,6 +10083,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_AQUA_TAIL, }, [MOVE_SEED_BOMB] = @@ -9702,7 +10104,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SEED_BOMB, }, [MOVE_AIR_SLASH] = @@ -9727,7 +10130,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AIR_SLASH, }, [MOVE_X_SCISSOR] = @@ -9750,6 +10154,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SWORDS_DANCE}, + .battleAnimScript = Move_X_SCISSOR, }, [MOVE_BUG_BUZZ] = @@ -9775,7 +10180,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BUG_BUZZ, }, [MOVE_DRAGON_PULSE] = @@ -9796,7 +10202,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DRAGON_PULSE, }, [MOVE_DRAGON_RUSH] = @@ -9823,6 +10230,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_RUSH, .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_TAIL}, + .battleAnimScript = Move_DRAGON_RUSH, }, [MOVE_POWER_GEM] = @@ -9842,7 +10250,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POWER_GEM, }, [MOVE_DRAIN_PUNCH] = @@ -9864,6 +10273,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_DRAIN_PUNCH, }, [MOVE_VACUUM_WAVE] = @@ -9883,7 +10293,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_VACUUM_WAVE, }, [MOVE_FOCUS_BLAST] = @@ -9909,6 +10320,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + .battleAnimScript = Move_FOCUS_BLAST, }, [MOVE_ENERGY_BALL] = @@ -9934,6 +10346,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_ENERGY_BALL, }, [MOVE_BRAVE_BIRD] = @@ -9955,7 +10368,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_BRAVE_BIRD, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BRAVE_BIRD, }, [MOVE_EARTH_POWER] = @@ -9980,7 +10394,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EARTH_POWER, }, [MOVE_SWITCHEROO] = @@ -10004,7 +10419,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SWITCHEROO, }, [MOVE_GIGA_IMPACT] = @@ -10027,7 +10443,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GIGA_IMPACT, }, [MOVE_NASTY_PLOT] = @@ -10051,7 +10468,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NASTY_PLOT, }, [MOVE_BULLET_PUNCH] = @@ -10073,7 +10491,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BULLET_PUNCH, }, [MOVE_AVALANCHE] = @@ -10092,7 +10511,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AVALANCHE, }, [MOVE_ICE_SHARD] = @@ -10112,7 +10532,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ICE_SHARD, }, [MOVE_SHADOW_CLAW] = @@ -10134,7 +10555,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHADOW_CLAW, }, [MOVE_THUNDER_FANG] = @@ -10165,6 +10587,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_THUNDER_FANG, .contestComboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_FANG, COMBO_STARTER_ICE_FANG}, + .battleAnimScript = Move_THUNDER_FANG, }, [MOVE_ICE_FANG] = @@ -10199,6 +10622,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_ICE_FANG, .contestComboMoves = {COMBO_STARTER_FIRE_FANG, COMBO_STARTER_THUNDER_FANG}, + .battleAnimScript = Move_ICE_FANG, }, [MOVE_FIRE_FANG] = @@ -10229,6 +10653,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_FIRE_FANG, .contestComboMoves = {COMBO_STARTER_ICE_FANG, COMBO_STARTER_THUNDER_FANG}, + .battleAnimScript = Move_FIRE_FANG, }, [MOVE_SHADOW_SNEAK] = @@ -10249,7 +10674,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHADOW_SNEAK, }, [MOVE_MUD_BOMB] = @@ -10274,7 +10700,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MUD_BOMB, }, [MOVE_PSYCHO_CUT] = @@ -10296,7 +10723,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PSYCHO_CUT, }, [MOVE_ZEN_HEADBUTT] = @@ -10321,7 +10749,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ZEN_HEADBUTT, }, [MOVE_MIRROR_SHOT] = @@ -10345,7 +10774,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MIRROR_SHOT, }, [MOVE_FLASH_CANNON] = @@ -10369,7 +10799,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLASH_CANNON, }, [MOVE_ROCK_CLIMB] = @@ -10394,7 +10825,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROCK_CLIMB, }, [MOVE_DEFOG] = @@ -10412,12 +10844,13 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, - .ignoresSubstitute = B_UPDATED_MOVE_FLAGS == GEN_4, + //.ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DEFOG, }, [MOVE_TRICK_ROOM] = @@ -10439,7 +10872,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TRICK_ROOM, }, [MOVE_DRACO_METEOR] = @@ -10463,7 +10897,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DRACO_METEOR, }, [MOVE_DISCHARGE] = @@ -10488,6 +10923,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_DISCHARGE, }, [MOVE_LAVA_PLUME] = @@ -10510,6 +10946,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_LAVA_PLUME, }, [MOVE_LEAF_STORM] = @@ -10533,7 +10970,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LEAF_STORM, }, [MOVE_POWER_WHIP] = @@ -10555,6 +10993,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_POWER_WHIP, }, [MOVE_ROCK_WRECKER] = @@ -10577,7 +11016,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROCK_WRECKER, }, [MOVE_CROSS_POISON] = @@ -10604,7 +11044,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CROSS_POISON, }, [MOVE_GUNK_SHOT] = @@ -10628,7 +11069,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GUNK_SHOT, }, [MOVE_IRON_HEAD] = @@ -10653,7 +11095,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_IRON_HEAD, }, [MOVE_MAGNET_BOMB] = @@ -10674,7 +11117,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAGNET_BOMB, }, [MOVE_STONE_EDGE] = @@ -10695,7 +11139,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STONE_EDGE, }, [MOVE_CAPTIVATE] = @@ -10718,6 +11163,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARM}, + .battleAnimScript = Move_CAPTIVATE, }, [MOVE_STEALTH_ROCK] = @@ -10742,7 +11188,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STEALTH_ROCK, }, [MOVE_GRASS_KNOT] = @@ -10764,7 +11211,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GRASS_KNOT, }, [MOVE_CHATTER] = @@ -10803,7 +11251,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CHATTER, }, [MOVE_JUDGMENT] = @@ -10824,7 +11273,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_JUDGMENT, }, [MOVE_BUG_BITE] = @@ -10846,7 +11296,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BUG_BITE, }, [MOVE_CHARGE_BEAM] = @@ -10872,6 +11323,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_CHARGE_BEAM, }, [MOVE_WOOD_HAMMER] = @@ -10893,7 +11345,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WOOD_HAMMER, }, [MOVE_AQUA_JET] = @@ -10915,6 +11368,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_AQUA_JET, }, [MOVE_ATTACK_ORDER] = @@ -10936,6 +11390,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_ATTACK_ORDER, .contestComboMoves = {COMBO_STARTER_DEFEND_ORDER, COMBO_STARTER_HEAL_ORDER}, + .battleAnimScript = Move_ATTACK_ORDER, }, [MOVE_DEFEND_ORDER] = @@ -10960,6 +11415,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_DEFEND_ORDER, .contestComboMoves = {COMBO_STARTER_ATTACK_ORDER, COMBO_STARTER_HEAL_ORDER}, + .battleAnimScript = Move_DEFEND_ORDER, }, [MOVE_HEAL_ORDER] = @@ -10985,6 +11441,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_HEAL_ORDER, .contestComboMoves = {COMBO_STARTER_ATTACK_ORDER, COMBO_STARTER_DEFEND_ORDER}, + .battleAnimScript = Move_HEAL_ORDER, }, [MOVE_HEAD_SMASH] = @@ -11006,7 +11463,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEAD_SMASH, }, [MOVE_DOUBLE_HIT] = @@ -11028,7 +11486,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DOUBLE_HIT, }, [MOVE_ROAR_OF_TIME] = @@ -11052,7 +11511,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROAR_OF_TIME, }, [MOVE_SPACIAL_REND] = @@ -11073,7 +11533,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPACIAL_REND, }, [MOVE_LUNAR_DANCE] = @@ -11096,7 +11557,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LUNAR_DANCE, }, [MOVE_CRUSH_GRIP] = @@ -11116,7 +11578,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CRUSH_GRIP, }, [MOVE_MAGMA_STORM] = @@ -11140,6 +11603,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_MAGMA_STORM, }, [MOVE_DARK_VOID] = @@ -11162,7 +11626,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DARK_VOID, }, [MOVE_SEED_FLARE] = @@ -11186,7 +11651,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SEED_FLARE, }, [MOVE_OMINOUS_WIND] = @@ -11212,7 +11678,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_OMINOUS_WIND, }, [MOVE_SHADOW_FORCE] = @@ -11240,7 +11707,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHADOW_FORCE, }, [MOVE_HONE_CLAWS] = @@ -11264,7 +11732,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HONE_CLAWS, }, [MOVE_WIDE_GUARD] = @@ -11290,7 +11759,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WIDE_GUARD, }, [MOVE_GUARD_SPLIT] = @@ -11312,7 +11782,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GUARD_SPLIT, }, [MOVE_POWER_SPLIT] = @@ -11334,7 +11805,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POWER_SPLIT, }, [MOVE_WONDER_ROOM] = @@ -11356,7 +11828,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WONDER_ROOM, }, [MOVE_PSYSHOCK] = @@ -11374,7 +11847,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PSYSHOCK, }, [MOVE_VENOSHOCK] = @@ -11396,6 +11870,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_TOXIC}, + .battleAnimScript = Move_VENOSHOCK, }, [MOVE_AUTOTOMIZE] = @@ -11419,7 +11894,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AUTOTOMIZE, }, [MOVE_RAGE_POWDER] = @@ -11446,7 +11922,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RAGE_POWDER, }, [MOVE_TELEKINESIS] = @@ -11469,7 +11946,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TELEKINESIS, }, [MOVE_MAGIC_ROOM] = @@ -11491,7 +11969,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAGIC_ROOM, }, [MOVE_SMACK_DOWN] = @@ -11516,7 +11995,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SMACK_DOWN, }, [MOVE_STORM_THROW] = @@ -11536,7 +12016,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STORM_THROW, }, [MOVE_FLAME_BURST] = @@ -11560,7 +12041,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLAME_BURST, }, [MOVE_SLUDGE_WAVE] = @@ -11584,7 +12066,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SLUDGE_WAVE, }, [MOVE_QUIVER_DANCE] = @@ -11609,7 +12092,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_QUIVER_DANCE, }, [MOVE_HEAVY_SLAM] = @@ -11630,7 +12114,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEAVY_SLAM, }, [MOVE_SYNCHRONOISE] = @@ -11650,7 +12135,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SYNCHRONOISE, }, [MOVE_ELECTRO_BALL] = @@ -11671,7 +12157,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ELECTRO_BALL, }, [MOVE_SOAK] = @@ -11693,7 +12180,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SOAK, }, [MOVE_FLAME_CHARGE] = @@ -11719,7 +12207,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLAME_CHARGE, }, [MOVE_COIL] = @@ -11743,7 +12232,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COIL, }, [MOVE_LOW_SWEEP] = @@ -11768,7 +12258,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LOW_SWEEP, }, [MOVE_ACID_SPRAY] = @@ -11793,7 +12284,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ACID_SPRAY, }, [MOVE_FOUL_PLAY] = @@ -11814,7 +12306,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FOUL_PLAY, }, [MOVE_SIMPLE_BEAM] = @@ -11836,7 +12329,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SIMPLE_BEAM, }, [MOVE_ENTRAINMENT] = @@ -11858,7 +12352,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ENTRAINMENT, }, [MOVE_AFTER_YOU] = @@ -11883,7 +12378,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AFTER_YOU, }, [MOVE_ROUND] = @@ -11908,7 +12404,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROUND, }, [MOVE_ECHOED_VOICE] = @@ -11930,7 +12427,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ECHOED_VOICE, }, [MOVE_CHIP_AWAY] = @@ -11950,7 +12448,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CHIP_AWAY, }, [MOVE_CLEAR_SMOG] = @@ -11973,7 +12472,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CLEAR_SMOG, }, [MOVE_STORED_POWER] = @@ -11993,7 +12493,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STORED_POWER, }, [MOVE_QUICK_GUARD] = @@ -12019,7 +12520,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_QUICK_GUARD, }, [MOVE_ALLY_SWITCH] = @@ -12042,7 +12544,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ALLY_SWITCH, }, [MOVE_SCALD] = @@ -12067,7 +12570,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SCALD, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SCALD, }, [MOVE_SHELL_SMASH] = @@ -12091,7 +12595,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHELL_SMASH, }, [MOVE_HEAL_PULSE] = @@ -12116,7 +12621,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEAL_PULSE, }, [MOVE_HEX] = @@ -12139,6 +12645,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_TOXIC}, + .battleAnimScript = Move_HEX, }, [MOVE_SKY_DROP] = @@ -12164,7 +12671,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SKY_DROP, }, [MOVE_SHIFT_GEAR] = @@ -12188,7 +12696,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHIFT_GEAR, }, [MOVE_CIRCLE_THROW] = @@ -12209,7 +12718,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CIRCLE_THROW, }, [MOVE_INCINERATE] = @@ -12232,7 +12742,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_INCINERATE, }, [MOVE_QUASH] = @@ -12254,7 +12765,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_QUASH, }, [MOVE_ACROBATICS] = @@ -12275,7 +12787,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ACROBATICS, }, [MOVE_REFLECT_TYPE] = @@ -12298,7 +12811,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_REFLECT_TYPE, }, [MOVE_RETALIATE] = @@ -12319,7 +12833,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RETALIATE, }, [MOVE_FINAL_GAMBIT] = @@ -12341,7 +12856,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FINAL_GAMBIT, }, [MOVE_BESTOW] = @@ -12367,7 +12883,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BESTOW, }, [MOVE_INFERNO] = @@ -12391,7 +12908,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_INFERNO, }, [MOVE_WATER_PLEDGE] = @@ -12412,7 +12930,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WATER_PLEDGE, }, [MOVE_FIRE_PLEDGE] = @@ -12433,7 +12952,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FIRE_PLEDGE, }, [MOVE_GRASS_PLEDGE] = @@ -12454,7 +12974,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GRASS_PLEDGE, }, [MOVE_VOLT_SWITCH] = @@ -12472,7 +12993,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_VOLT_SWITCH, }, [MOVE_STRUGGLE_BUG] = @@ -12496,7 +13018,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STRUGGLE_BUG, }, [MOVE_BULLDOZE] = @@ -12521,7 +13044,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BULLDOZE, }, [MOVE_FROST_BREATH] = @@ -12540,7 +13064,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FROST_BREATH, }, [MOVE_DRAGON_TAIL] = @@ -12562,6 +13087,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = COMBO_STARTER_DRAGON_TAIL, .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH}, + .battleAnimScript = Move_DRAGON_TAIL, }, [MOVE_WORK_UP] = @@ -12585,7 +13111,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WORK_UP, }, [MOVE_ELECTROWEB] = @@ -12609,7 +13136,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ELECTROWEB, }, [MOVE_WILD_CHARGE] = @@ -12631,7 +13159,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WILD_CHARGE, }, [MOVE_DRILL_RUN] = @@ -12653,7 +13182,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DRILL_RUN, }, [MOVE_DUAL_CHOP] = @@ -12675,7 +13205,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DUAL_CHOP, }, [MOVE_HEART_STAMP] = @@ -12700,7 +13231,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEART_STAMP, }, [MOVE_HORN_LEECH] = @@ -12720,7 +13252,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HORN_LEECH, }, [MOVE_SACRED_SWORD] = @@ -12741,7 +13274,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SACRED_SWORD, }, [MOVE_RAZOR_SHELL] = @@ -12767,7 +13301,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RAZOR_SHELL, }, [MOVE_HEAT_CRASH] = @@ -12787,7 +13322,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEAT_CRASH, }, [MOVE_LEAF_TORNADO] = @@ -12812,7 +13348,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LEAF_TORNADO, }, [MOVE_STEAMROLLER] = @@ -12838,7 +13375,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STEAMROLLER, }, [MOVE_COTTON_GUARD] = @@ -12862,7 +13400,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COTTON_GUARD, }, [MOVE_NIGHT_DAZE] = @@ -12886,7 +13425,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NIGHT_DAZE, }, [MOVE_PSYSTRIKE] = @@ -12904,7 +13444,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PSYSTRIKE, }, [MOVE_TAIL_SLAP] = @@ -12925,7 +13466,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TAIL_SLAP, }, [MOVE_HURRICANE] = @@ -12951,7 +13493,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HURRICANE, }, [MOVE_HEAD_CHARGE] = @@ -12973,7 +13516,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HEAD_CHARGE, }, [MOVE_GEAR_GRIND] = @@ -12996,7 +13540,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GEAR_GRIND, }, [MOVE_SEARING_SHOT] = @@ -13019,7 +13564,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SEARING_SHOT, }, [MOVE_TECHNO_BLAST] = @@ -13041,7 +13587,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TECHNO_BLAST, }, [MOVE_RELIC_SONG] = @@ -13069,7 +13616,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_RELIC_SONG, }, [MOVE_SECRET_SWORD] = @@ -13091,7 +13639,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SECRET_SWORD, }, [MOVE_GLACIATE] = @@ -13115,7 +13664,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GLACIATE, }, [MOVE_BOLT_STRIKE] = @@ -13140,7 +13690,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BOLT_STRIKE, }, [MOVE_BLUE_FLARE] = @@ -13164,7 +13715,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BLUE_FLARE, }, [MOVE_FIERY_DANCE] = @@ -13190,7 +13742,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FIERY_DANCE, }, [MOVE_FREEZE_SHOCK] = @@ -13218,7 +13771,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FREEZE_SHOCK, }, [MOVE_ICE_BURN] = @@ -13246,7 +13800,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ICE_BURN, }, [MOVE_SNARL] = @@ -13273,7 +13828,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SNARL, }, [MOVE_ICICLE_CRASH] = @@ -13297,7 +13853,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ICICLE_CRASH, }, [MOVE_V_CREATE] = @@ -13324,7 +13881,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_V_CREATE, }, [MOVE_FUSION_FLARE] = @@ -13345,7 +13903,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FUSION_FLARE, }, [MOVE_FUSION_BOLT] = @@ -13365,7 +13924,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FUSION_BOLT, }, [MOVE_FLYING_PRESS] = @@ -13391,7 +13951,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLYING_PRESS, }, [MOVE_MAT_BLOCK] = @@ -13420,7 +13981,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAT_BLOCK, }, [MOVE_BELCH] = @@ -13448,7 +14010,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BELCH, }, [MOVE_ROTOTILLER] = @@ -13472,7 +14035,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ROTOTILLER, }, [MOVE_STICKY_WEB] = @@ -13497,7 +14061,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STICKY_WEB, }, [MOVE_FELL_STINGER] = @@ -13518,7 +14083,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FELL_STINGER, }, [MOVE_PHANTOM_FORCE] = @@ -13546,7 +14112,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PHANTOM_FORCE, }, [MOVE_TRICK_OR_TREAT] = @@ -13569,7 +14136,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TRICK_OR_TREAT, }, [MOVE_NOBLE_ROAR] = @@ -13593,7 +14161,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NOBLE_ROAR, }, [MOVE_ION_DELUGE] = @@ -13616,7 +14185,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ION_DELUGE, }, [MOVE_PARABOLIC_CHARGE] = @@ -13637,7 +14207,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PARABOLIC_CHARGE, }, [MOVE_FORESTS_CURSE] = @@ -13660,7 +14231,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FORESTS_CURSE, }, [MOVE_PETAL_BLIZZARD] = @@ -13681,7 +14253,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PETAL_BLIZZARD, }, [MOVE_FREEZE_DRY] = @@ -13709,7 +14282,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FREEZE_DRY, }, [MOVE_DISARMING_VOICE] = @@ -13731,7 +14305,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DISARMING_VOICE, }, [MOVE_PARTING_SHOT] = @@ -13755,7 +14330,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PARTING_SHOT, }, [MOVE_TOPSY_TURVY] = @@ -13777,7 +14353,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TOPSY_TURVY, }, [MOVE_DRAINING_KISS] = @@ -13798,7 +14375,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DRAINING_KISS, }, [MOVE_CRAFTY_SHIELD] = @@ -13823,7 +14401,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CRAFTY_SHIELD, }, [MOVE_FLOWER_SHIELD] = @@ -13846,7 +14425,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLOWER_SHIELD, }, [MOVE_GRASSY_TERRAIN] = @@ -13870,7 +14450,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_GRASSY_TERRAIN, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GRASSY_TERRAIN, }, [MOVE_MISTY_TERRAIN] = @@ -13894,7 +14475,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = COMBO_STARTER_MISTY_TERRAIN, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MISTY_TERRAIN, }, [MOVE_ELECTRIFY] = @@ -13915,7 +14497,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ELECTRIFY, }, [MOVE_PLAY_ROUGH] = @@ -13940,7 +14523,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PLAY_ROUGH, }, [MOVE_FAIRY_WIND] = @@ -13961,7 +14545,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FAIRY_WIND, }, [MOVE_MOONBLAST] = @@ -13985,7 +14570,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MOONBLAST, }, [MOVE_BOOMBURST] = @@ -14007,7 +14593,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BOOMBURST, }, [MOVE_FAIRY_LOCK] = @@ -14030,7 +14617,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FAIRY_LOCK, }, [MOVE_KINGS_SHIELD] = @@ -14057,7 +14645,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_KINGS_SHIELD, }, [MOVE_PLAY_NICE] = @@ -14081,7 +14670,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PLAY_NICE, }, [MOVE_CONFIDE] = @@ -14106,7 +14696,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CONFIDE, }, [MOVE_DIAMOND_STORM] = @@ -14131,7 +14722,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DIAMOND_STORM, }, [MOVE_STEAM_ERUPTION] = @@ -14158,6 +14750,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SCALD}, + .battleAnimScript = Move_STEAM_ERUPTION, }, [MOVE_HYPERSPACE_HOLE] = @@ -14182,6 +14775,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_HYPERSPACE_HOLE, .contestComboMoves = {COMBO_STARTER_HYPERSPACE_FURY}, + .battleAnimScript = Move_HYPERSPACE_HOLE, }, [MOVE_WATER_SHURIKEN] = @@ -14201,7 +14795,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WATER_SHURIKEN, }, [MOVE_MYSTICAL_FIRE] = @@ -14225,7 +14820,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MYSTICAL_FIRE, }, [MOVE_SPIKY_SHIELD] = @@ -14251,7 +14847,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPIKY_SHIELD, }, [MOVE_AROMATIC_MIST] = @@ -14275,7 +14872,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AROMATIC_MIST, }, [MOVE_EERIE_IMPULSE] = @@ -14297,7 +14895,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EERIE_IMPULSE, }, [MOVE_VENOM_DRENCH] = @@ -14320,6 +14919,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_TOXIC}, + .battleAnimScript = Move_VENOM_DRENCH, }, [MOVE_POWDER] = @@ -14339,11 +14939,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .powderMove = TRUE, .magicCoatAffected = TRUE, - .ignoresSubstitute = TRUE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POWDER, }, [MOVE_GEOMANCY] = @@ -14368,7 +14968,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GEOMANCY, }, [MOVE_MAGNETIC_FLUX] = @@ -14393,7 +14994,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAGNETIC_FLUX, }, [MOVE_HAPPY_HOUR] = @@ -14416,7 +15018,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HAPPY_HOUR, }, [MOVE_ELECTRIC_TERRAIN] = @@ -14440,7 +15043,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = COMBO_STARTER_ELECTRIC_TERRAIN, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ELECTRIC_TERRAIN, }, [MOVE_DAZZLING_GLEAM] = @@ -14460,7 +15064,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DAZZLING_GLEAM, }, [MOVE_CELEBRATE] = @@ -14489,7 +15094,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CELEBRATE, }, [MOVE_HOLD_HANDS] = @@ -14518,7 +15124,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HOLD_HANDS, }, [MOVE_BABY_DOLL_EYES] = @@ -14540,7 +15147,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BABY_DOLL_EYES, }, [MOVE_NUZZLE] = @@ -14565,7 +15173,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NUZZLE, }, [MOVE_HOLD_BACK] = @@ -14584,7 +15193,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HOLD_BACK, }, [MOVE_INFESTATION] = @@ -14608,7 +15218,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_INFESTATION, }, [MOVE_POWER_UP_PUNCH] = @@ -14635,7 +15246,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POWER_UP_PUNCH, }, [MOVE_OBLIVION_WING] = @@ -14655,7 +15267,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_OBLIVION_WING, }, [MOVE_THOUSAND_ARROWS] = @@ -14683,6 +15296,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_THOUSAND_ARROWS, .contestComboMoves = {COMBO_STARTER_THOUSAND_WAVES}, + .battleAnimScript = Move_THOUSAND_ARROWS, }, [MOVE_THOUSAND_WAVES] = @@ -14708,6 +15322,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_THOUSAND_WAVES, .contestComboMoves = {COMBO_STARTER_THOUSAND_ARROWS}, + .battleAnimScript = Move_THOUSAND_WAVES, }, [MOVE_LANDS_WRATH] = @@ -14728,7 +15343,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LANDS_WRATH, }, [MOVE_LIGHT_OF_RUIN] = @@ -14747,6 +15363,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, + .battleAnimScript = Move_LIGHT_OF_RUIN, }, [MOVE_ORIGIN_PULSE] = @@ -14768,7 +15385,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ORIGIN_PULSE, }, [MOVE_PRECIPICE_BLADES] = @@ -14789,7 +15407,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PRECIPICE_BLADES, }, [MOVE_DRAGON_ASCENT] = @@ -14813,7 +15432,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DRAGON_ASCENT, }, [MOVE_HYPERSPACE_FURY] = @@ -14841,6 +15461,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_HYPERSPACE_FURY, .contestComboMoves = {COMBO_STARTER_HYPERSPACE_HOLE}, + .battleAnimScript = Move_HYPERSPACE_FURY, }, [MOVE_SHORE_UP] = @@ -14865,7 +15486,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {COMBO_STARTER_SANDSTORM} + .contestComboMoves = {COMBO_STARTER_SANDSTORM}, + .battleAnimScript = Move_SHORE_UP, }, [MOVE_FIRST_IMPRESSION] = @@ -14887,7 +15509,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FIRST_IMPRESSION, }, [MOVE_BANEFUL_BUNKER] = @@ -14913,7 +15536,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BANEFUL_BUNKER, }, [MOVE_SPIRIT_SHACKLE] = @@ -14937,7 +15561,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPIRIT_SHACKLE, }, [MOVE_DARKEST_LARIAT] = @@ -14959,7 +15584,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DARKEST_LARIAT, }, [MOVE_SPARKLING_ARIA] = @@ -14987,6 +15613,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SCALD}, + .battleAnimScript = Move_SPARKLING_ARIA, }, [MOVE_ICE_HAMMER] = @@ -15013,6 +15640,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_ICE_HAMMER, }, [MOVE_FLORAL_HEALING] = @@ -15037,7 +15665,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLORAL_HEALING, }, [MOVE_HIGH_HORSEPOWER] = @@ -15058,7 +15687,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_HIGH_HORSEPOWER, }, [MOVE_STRENGTH_SAP] = @@ -15081,7 +15711,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STRENGTH_SAP, }, [MOVE_SOLAR_BLADE] = @@ -15107,6 +15738,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_SOLAR_BLADE, }, [MOVE_LEAFAGE] = @@ -15127,6 +15759,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_GROWTH}, + .battleAnimScript = Move_LEAFAGE, }, [MOVE_SPOTLIGHT] = @@ -15152,7 +15785,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPOTLIGHT, }, [MOVE_TOXIC_THREAD] = @@ -15175,6 +15809,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_TOXIC}, + .battleAnimScript = Move_TOXIC_THREAD, }, [MOVE_LASER_FOCUS] = @@ -15198,7 +15833,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LASER_FOCUS, }, [MOVE_GEAR_UP] = @@ -15223,7 +15859,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_GEAR_UP, }, [MOVE_THROAT_CHOP] = @@ -15248,7 +15885,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_THROAT_CHOP, }, [MOVE_POLLEN_PUFF] = @@ -15269,7 +15907,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POLLEN_PUFF, }, [MOVE_ANCHOR_SHOT] = @@ -15294,7 +15933,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ANCHOR_SHOT, }, [MOVE_PSYCHIC_TERRAIN] = @@ -15317,7 +15957,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = COMBO_STARTER_PSYCHIC_TERRAIN, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PSYCHIC_TERRAIN, }, [MOVE_LUNGE] = @@ -15342,7 +15983,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LUNGE, }, [MOVE_FIRE_LASH] = @@ -15368,6 +16010,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_FIRE_LASH, }, [MOVE_POWER_TRIP] = @@ -15388,7 +16031,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_POWER_TRIP, }, [MOVE_BURN_UP] = @@ -15415,6 +16059,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, + .battleAnimScript = Move_BURN_UP, }, [MOVE_SPEED_SWAP] = @@ -15436,7 +16081,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPEED_SWAP, }, [MOVE_SMART_STRIKE] = @@ -15457,7 +16103,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SMART_STRIKE, }, [MOVE_PURIFY] = @@ -15481,7 +16128,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PURIFY, }, [MOVE_REVELATION_DANCE] = @@ -15502,7 +16150,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_REVELATION_DANCE, }, [MOVE_CORE_ENFORCER] = @@ -15526,7 +16175,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CORE_ENFORCER, }, [MOVE_TROP_KICK] = @@ -15551,7 +16201,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TROP_KICK, }, [MOVE_INSTRUCT] = @@ -15576,7 +16227,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_INSTRUCT, }, [MOVE_BEAK_BLAST] = @@ -15604,7 +16256,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BEAK_BLAST, }, [MOVE_CLANGING_SCALES] = @@ -15630,7 +16283,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CLANGING_SCALES, }, [MOVE_DRAGON_HAMMER] = @@ -15652,6 +16306,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_DRAGON_TAIL}, + .battleAnimScript = Move_DRAGON_HAMMER, }, [MOVE_BRUTAL_SWING] = @@ -15672,7 +16327,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BRUTAL_SWING, }, [MOVE_AURORA_VEIL] = @@ -15697,6 +16353,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_HAIL}, + .battleAnimScript = Move_AURORA_VEIL, }, [MOVE_SHELL_TRAP] = @@ -15723,7 +16380,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHELL_TRAP, }, [MOVE_FLEUR_CANNON] = @@ -15748,7 +16406,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLEUR_CANNON, }, [MOVE_PSYCHIC_FANGS] = @@ -15770,7 +16429,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PSYCHIC_FANGS, }, [MOVE_STOMPING_TANTRUM] = @@ -15792,7 +16452,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STOMPING_TANTRUM, }, [MOVE_SHADOW_BONE] = @@ -15817,6 +16478,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = COMBO_STARTER_SHADOW_BONE, .contestComboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH}, + .battleAnimScript = Move_SHADOW_BONE, }, [MOVE_ACCELEROCK] = @@ -15837,7 +16499,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ACCELEROCK, }, [MOVE_LIQUIDATION] = @@ -15863,6 +16526,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE}, + .battleAnimScript = Move_LIQUIDATION, }, [MOVE_PRISMATIC_LASER] = @@ -15886,7 +16550,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PRISMATIC_LASER, }, [MOVE_SPECTRAL_THIEF] = @@ -15912,7 +16577,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPECTRAL_THIEF, }, [MOVE_SUNSTEEL_STRIKE] = @@ -15935,7 +16601,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SUNSTEEL_STRIKE, }, [MOVE_MOONGEIST_BEAM] = @@ -15957,7 +16624,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MOONGEIST_BEAM, }, [MOVE_TEARFUL_LOOK] = @@ -15980,7 +16648,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TEARFUL_LOOK, }, [MOVE_ZING_ZAP] = @@ -16006,6 +16675,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_CHARGE}, + .battleAnimScript = Move_ZING_ZAP, }, [MOVE_NATURES_MADNESS] = @@ -16026,7 +16696,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NATURES_MADNESS, }, [MOVE_MULTI_ATTACK] = @@ -16048,7 +16719,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MULTI_ATTACK, }, [MOVE_MIND_BLOWN] = @@ -16069,7 +16741,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MIND_BLOWN, }, [MOVE_PLASMA_FISTS] = @@ -16092,7 +16765,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PLASMA_FISTS, }, [MOVE_PHOTON_GEYSER] = @@ -16114,7 +16788,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PHOTON_GEYSER, }, [MOVE_ZIPPY_ZAP] = @@ -16141,6 +16816,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .chance = 100, }), #endif + .battleAnimScript = Move_ZIPPY_ZAP, }, [MOVE_SPLISHY_SPLASH] = @@ -16163,6 +16839,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + .battleAnimScript = Move_SPLISHY_SPLASH, }, [MOVE_FLOATY_FALL] = @@ -16187,6 +16864,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + .battleAnimScript = Move_FLOATY_FALL, }, [MOVE_PIKA_PAPOW] = @@ -16205,6 +16883,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, + .battleAnimScript = Move_PIKA_PAPOW, }, [MOVE_BOUNCY_BUBBLE] = @@ -16229,6 +16908,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, .healingMove = B_HEAL_BLOCKING >= GEN_6, + .battleAnimScript = Move_BOUNCY_BUBBLE, }, [MOVE_BUZZY_BUZZ] = @@ -16251,6 +16931,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 100, }), + .battleAnimScript = Move_BUZZY_BUZZ, }, [MOVE_SIZZLY_SLIDE] = @@ -16275,6 +16956,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 100, }), + .battleAnimScript = Move_SIZZLY_SLIDE, }, [MOVE_GLITZY_GLOW] = @@ -16293,6 +16975,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, + .battleAnimScript = Move_GLITZY_GLOW, }, [MOVE_BADDY_BAD] = @@ -16311,6 +16994,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, + .battleAnimScript = Move_BADDY_BAD, }, [MOVE_SAPPY_SEED] = @@ -16330,6 +17014,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_SAPPY_SEED, }, [MOVE_FREEZY_FROST] = @@ -16348,6 +17033,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, + .battleAnimScript = Move_FREEZY_FROST, }, [MOVE_SPARKLY_SWIRL] = @@ -16366,6 +17052,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, + .battleAnimScript = Move_SPARKLY_SWIRL, }, [MOVE_VEEVEE_VOLLEY] = @@ -16385,6 +17072,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, + .battleAnimScript = Move_VEEVEE_VOLLEY, }, [MOVE_DOUBLE_IRON_BASH] = @@ -16413,7 +17101,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DOUBLE_IRON_BASH, }, [MOVE_DYNAMAX_CANNON] = @@ -16443,6 +17132,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_DYNAMAX_CANNON, }, [MOVE_SNIPE_SHOT] = @@ -16463,7 +17153,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SNIPE_SHOT, }, [MOVE_JAW_LOCK] = @@ -16488,7 +17179,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_JAW_LOCK, }, [MOVE_STUFF_CHEEKS] = @@ -16511,7 +17203,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STUFF_CHEEKS, }, [MOVE_NO_RETREAT] = @@ -16534,7 +17227,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_NO_RETREAT, }, [MOVE_TAR_SHOT] = @@ -16555,7 +17249,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TAR_SHOT, }, [MOVE_MAGIC_POWDER] = @@ -16578,7 +17273,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_MAGIC_POWDER, }, [MOVE_DRAGON_DARTS] = @@ -16601,6 +17297,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_DRAGON_DARTS, }, [MOVE_TEATIME] = @@ -16624,6 +17321,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_TEATIME, }, [MOVE_OCTOLOCK] = @@ -16643,7 +17341,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_OCTOLOCK, }, [MOVE_BOLT_BEAK] = @@ -16664,7 +17363,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BOLT_BEAK, }, [MOVE_FISHIOUS_REND] = @@ -16686,7 +17386,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FISHIOUS_REND, }, [MOVE_COURT_CHANGE] = @@ -16707,7 +17408,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COURT_CHANGE, }, [MOVE_CLANGOROUS_SOUL] = @@ -16733,7 +17435,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CLANGOROUS_SOUL, }, [MOVE_BODY_PRESS] = @@ -16756,7 +17459,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BODY_PRESS, }, [MOVE_DECORATE] = @@ -16779,7 +17483,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DECORATE, }, [MOVE_DRUM_BEATING] = @@ -16804,7 +17509,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DRUM_BEATING, }, [MOVE_SNAP_TRAP] = @@ -16830,7 +17536,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SNAP_TRAP, }, [MOVE_PYRO_BALL] = @@ -16857,7 +17564,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_PYRO_BALL, }, [MOVE_BEHEMOTH_BLADE] = @@ -16884,6 +17592,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_BEHEMOTH_BLADE, }, [MOVE_BEHEMOTH_BASH] = @@ -16909,6 +17618,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_BEHEMOTH_BASH, }, [MOVE_AURA_WHEEL] = @@ -16934,7 +17644,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_AURA_WHEEL, }, [MOVE_BREAKING_SWIPE] = @@ -16961,6 +17672,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_BREAKING_SWIPE, }, [MOVE_BRANCH_POKE] = @@ -16982,7 +17694,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BRANCH_POKE, }, [MOVE_OVERDRIVE] = @@ -17006,6 +17719,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_OVERDRIVE, }, [MOVE_APPLE_ACID] = @@ -17030,7 +17744,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_APPLE_ACID, }, [MOVE_GRAV_APPLE] = @@ -17056,6 +17771,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_GRAV_APPLE, }, [MOVE_SPIRIT_BREAK] = @@ -17081,7 +17797,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SPIRIT_BREAK, }, [MOVE_STRANGE_STEAM] = @@ -17106,7 +17823,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STRANGE_STEAM, }, [MOVE_LIFE_DEW] = @@ -17132,7 +17850,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LIFE_DEW, }, [MOVE_OBSTRUCT] = @@ -17157,6 +17876,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_OBSTRUCT, }, [MOVE_FALSE_SURRENDER] = @@ -17178,7 +17898,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_FIRST, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FALSE_SURRENDER, }, [MOVE_METEOR_ASSAULT] = @@ -17204,7 +17925,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_METEOR_ASSAULT, }, [MOVE_ETERNABEAM] = @@ -17229,7 +17951,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_ETERNABEAM, }, [MOVE_STEEL_BEAM] = @@ -17250,7 +17973,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_STEEL_BEAM, }, [MOVE_EXPANDING_FORCE] = @@ -17270,7 +17994,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {COMBO_STARTER_PSYCHIC_TERRAIN} + .contestComboMoves = {COMBO_STARTER_PSYCHIC_TERRAIN}, + .battleAnimScript = Move_EXPANDING_FORCE, }, [MOVE_STEEL_ROLLER] = @@ -17294,6 +18019,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_STEEL_ROLLER, }, [MOVE_SCALE_SHOT] = @@ -17315,6 +18041,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_SCALE_SHOT, }, [MOVE_METEOR_BEAM] = @@ -17342,6 +18069,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_METEOR_BEAM, }, [MOVE_SHELL_SIDE_ARM] = @@ -17365,7 +18093,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SHELL_SIDE_ARM, }, [MOVE_MISTY_EXPLOSION] = @@ -17385,7 +18114,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {COMBO_STARTER_MISTY_TERRAIN} + .contestComboMoves = {COMBO_STARTER_MISTY_TERRAIN}, + .battleAnimScript = Move_MISTY_EXPLOSION, }, [MOVE_GRASSY_GLIDE] = @@ -17407,7 +18137,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {COMBO_STARTER_GRASSY_TERRAIN} + .contestComboMoves = {COMBO_STARTER_GRASSY_TERRAIN}, + .battleAnimScript = Move_GRASSY_GLIDE, }, [MOVE_RISING_VOLTAGE] = @@ -17427,7 +18158,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN} + .contestComboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN}, + .battleAnimScript = Move_RISING_VOLTAGE, }, [MOVE_TERRAIN_PULSE] = @@ -17449,6 +18181,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, .contestComboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN, COMBO_STARTER_MISTY_TERRAIN, COMBO_STARTER_GRASSY_TERRAIN, COMBO_STARTER_PSYCHIC_TERRAIN}, + .battleAnimScript = Move_TERRAIN_PULSE, }, [MOVE_SKITTER_SMACK] = @@ -17473,7 +18206,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SKITTER_SMACK, }, [MOVE_BURNING_JEALOUSY] = @@ -17498,7 +18232,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_BURNING_JEALOUSY, }, [MOVE_LASH_OUT] = @@ -17519,7 +18254,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MON, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_LASH_OUT, }, [MOVE_POLTERGEIST] = @@ -17540,6 +18276,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_POLTERGEIST, }, [MOVE_CORROSIVE_GAS] = @@ -17560,7 +18297,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_CORROSIVE_GAS, }, [MOVE_COACHING] = @@ -17583,7 +18321,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_COACHING, }, [MOVE_FLIP_TURN] = @@ -17604,7 +18343,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FLIP_TURN, }, [MOVE_TRIPLE_AXEL] = @@ -17626,7 +18366,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_TRIPLE_AXEL, }, [MOVE_DUAL_WINGBEAT] = @@ -17649,6 +18390,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_DUAL_WINGBEAT, }, [MOVE_SCORCHING_SANDS] = @@ -17673,7 +18415,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SCORCHING_SANDS, }, [MOVE_JUNGLE_HEALING] = @@ -17699,6 +18442,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_JUNGLE_HEALING, }, [MOVE_WICKED_BLOW] = @@ -17722,7 +18466,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_WICKED_BLOW, }, [MOVE_SURGING_STRIKES] = @@ -17747,7 +18492,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_SURGING_STRIKES, }, [MOVE_THUNDER_CAGE] = @@ -17771,7 +18517,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_THUNDER_CAGE, }, [MOVE_DRAGON_ENERGY] = @@ -17792,7 +18539,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_COOL, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_DRAGON_ENERGY, }, [MOVE_FREEZING_GLARE] = @@ -17821,7 +18569,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_FREEZING_GLARE, }, [MOVE_FIERY_WRATH] = @@ -17847,6 +18596,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_FIERY_WRATH, }, [MOVE_THUNDEROUS_KICK] = @@ -17873,6 +18623,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_TOUGH, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_THUNDEROUS_KICK, }, [MOVE_GLACIAL_LANCE] = @@ -17894,6 +18645,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_BEAUTY, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_GLACIAL_LANCE, }, [MOVE_ASTRAL_BARRAGE] = @@ -17915,6 +18667,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, .contestComboMoves = {0}, + .battleAnimScript = Move_ASTRAL_BARRAGE, }, [MOVE_EERIE_SPELL] = @@ -17936,7 +18689,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .contestEffect = CONTEST_EFFECT_BETTER_WHEN_LATER, .contestCategory = CONTEST_CATEGORY_SMART, .contestComboStarterId = 0, - .contestComboMoves = {0} + .contestComboMoves = {0}, + .battleAnimScript = Move_EERIE_SPELL, }, [MOVE_DIRE_CLAW] = @@ -17958,6 +18712,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DIRE_CLAW, .chance = 50, }), + .battleAnimScript = Move_DIRE_CLAW, }, [MOVE_PSYSHIELD_BASH] = @@ -17980,6 +18735,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + .battleAnimScript = Move_PSYSHIELD_BASH, }, [MOVE_POWER_SHIFT] = @@ -18000,6 +18756,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_POWER_SHIFT, }, [MOVE_STONE_AXE] = @@ -18022,6 +18779,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_STEALTH_ROCK, .chance = 100, }), + .battleAnimScript = Move_STONE_AXE, }, [MOVE_SPRINGTIDE_STORM] = @@ -18044,6 +18802,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 30, }), + .battleAnimScript = Move_SPRINGTIDE_STORM, }, [MOVE_MYSTICAL_POWER] = @@ -18065,6 +18824,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + .battleAnimScript = Move_MYSTICAL_POWER, }, [MOVE_RAGING_FURY] = @@ -18086,6 +18846,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_THRASH, .self = TRUE, }), + .battleAnimScript = Move_RAGING_FURY, }, [MOVE_WAVE_CRASH] = @@ -18105,6 +18866,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + .battleAnimScript = Move_WAVE_CRASH, }, [MOVE_CHLOROBLAST] = @@ -18121,6 +18883,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, + .battleAnimScript = Move_CHLOROBLAST, }, [MOVE_MOUNTAIN_GALE] = @@ -18141,6 +18904,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + .battleAnimScript = Move_MOUNTAIN_GALE, }, [MOVE_VICTORY_DANCE] = @@ -18161,6 +18925,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + .battleAnimScript = Move_VICTORY_DANCE, }, [MOVE_HEADLONG_RUSH] = @@ -18183,6 +18948,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, .self = TRUE, }), + .battleAnimScript = Move_HEADLONG_RUSH, }, [MOVE_BARB_BARRAGE] = @@ -18204,6 +18970,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 50, }), + .battleAnimScript = Move_BARB_BARRAGE, }, [MOVE_ESPER_WING] = @@ -18226,6 +18993,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + .battleAnimScript = Move_ESPER_WING, }, [MOVE_BITTER_MALICE] = @@ -18246,6 +19014,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), + .battleAnimScript = Move_BITTER_MALICE, }, [MOVE_SHELTER] = @@ -18265,6 +19034,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + .battleAnimScript = Move_SHELTER, }, [MOVE_TRIPLE_ARROWS] = @@ -18290,6 +19060,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 30, }), + .battleAnimScript = Move_TRIPLE_ARROWS, }, [MOVE_INFERNAL_PARADE] = @@ -18311,6 +19082,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + .battleAnimScript = Move_INFERNAL_PARADE, }, [MOVE_CEASELESS_EDGE] = @@ -18333,6 +19105,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPIKES, .chance = 100, }), + .battleAnimScript = Move_CEASELESS_EDGE, }, [MOVE_BLEAKWIND_STORM] = @@ -18354,6 +19127,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 30, }), + .battleAnimScript = Move_BLEAKWIND_STORM, }, [MOVE_WILDBOLT_STORM] = @@ -18375,6 +19149,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 20, }), + .battleAnimScript = Move_WILDBOLT_STORM, }, [MOVE_SANDSEAR_STORM] = @@ -18396,6 +19171,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 20, }), + .battleAnimScript = Move_SANDSEAR_STORM, }, [MOVE_LUNAR_BLESSING] = @@ -18416,6 +19192,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .healingMove = TRUE, + .battleAnimScript = Move_LUNAR_BLESSING, }, [MOVE_TAKE_HEART] = @@ -18435,6 +19212,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, + .battleAnimScript = Move_TAKE_HEART, }, [MOVE_TERA_BLAST] = @@ -18452,6 +19230,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .forcePressure = TRUE, + .battleAnimScript = Move_TERA_BLAST, }, [MOVE_SILK_TRAP] = @@ -18471,6 +19250,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_SILK_TRAP, }, [MOVE_AXE_KICK] = @@ -18492,6 +19272,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 30, }), + .battleAnimScript = Move_AXE_KICK, }, [MOVE_LAST_RESPECTS] = @@ -18509,6 +19290,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, // Only since it isn't implemented yet + .battleAnimScript = Move_LAST_RESPECTS, }, [MOVE_LUMINA_CRASH] = @@ -18529,6 +19311,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_DEF_MINUS_2, .chance = 100, }), + .battleAnimScript = Move_LUMINA_CRASH, }, [MOVE_ORDER_UP] = @@ -18547,6 +19330,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_ORDER_UP, }, [MOVE_JET_PUNCH] = @@ -18566,6 +19350,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_JET_PUNCH, }, [MOVE_SPICY_EXTRACT] = @@ -18584,6 +19369,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_STATUS, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_SPICY_EXTRACT, }, [MOVE_SPIN_OUT] = @@ -18606,6 +19392,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_2, .self = TRUE, }), + .battleAnimScript = Move_SPIN_OUT, }, [MOVE_POPULATION_BOMB] = @@ -18626,6 +19413,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .slicingMove = TRUE, .metronomeBanned = TRUE, .strikeCount = 10, + .battleAnimScript = Move_POPULATION_BOMB, }, [MOVE_ICE_SPINNER] = @@ -18645,6 +19433,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + .battleAnimScript = Move_ICE_SPINNER, }, [MOVE_GLAIVE_RUSH] = @@ -18662,6 +19451,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, + .battleAnimScript = Move_GLAIVE_RUSH, }, [MOVE_REVIVAL_BLESSING] = @@ -18683,6 +19473,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .healingMove = TRUE, .sketchBanned = (B_SKETCH_BANS >= GEN_9), + .battleAnimScript = Move_REVIVAL_BLESSING, }, [MOVE_SALT_CURE] = @@ -18700,6 +19491,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, + .battleAnimScript = Move_SALT_CURE, }, [MOVE_TRIPLE_DIVE] = @@ -18718,6 +19510,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, + .battleAnimScript = Move_TRIPLE_DIVE, }, [MOVE_MORTAL_SPIN] = @@ -18743,6 +19536,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 100, }), + .battleAnimScript = Move_MORTAL_SPIN, }, [MOVE_DOODLE] = @@ -18762,6 +19556,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_DOODLE, }, [MOVE_FILLET_AWAY] = @@ -18783,6 +19578,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_FILLET_AWAY, }, [MOVE_KOWTOW_CLEAVE] = @@ -18801,6 +19597,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + .battleAnimScript = Move_KOWTOW_CLEAVE, }, [MOVE_FLOWER_TRICK] = @@ -18818,6 +19615,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .alwaysCriticalHit = TRUE, + .battleAnimScript = Move_FLOWER_TRICK, }, [MOVE_TORCH_SONG] = @@ -18841,6 +19639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + .battleAnimScript = Move_TORCH_SONG, }, [MOVE_AQUA_STEP] = @@ -18864,6 +19663,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + .battleAnimScript = Move_AQUA_STEP, }, [MOVE_RAGING_BULL] = @@ -18882,6 +19682,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_RAGING_BULL, }, [MOVE_MAKE_IT_RAIN] = @@ -18906,6 +19707,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SP_ATK_MINUS_1, .self = TRUE, }), + .battleAnimScript = Move_MAKE_IT_RAIN, }, [MOVE_RUINATION] = @@ -18923,6 +19725,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, + .battleAnimScript = Move_RUINATION, }, [MOVE_COLLISION_COURSE] = @@ -18941,6 +19744,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_COLLISION_COURSE, }, [MOVE_ELECTRO_DRIFT] = @@ -18959,6 +19763,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .makesContact = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_ELECTRO_DRIFT, }, [MOVE_SHED_TAIL] = @@ -18979,6 +19784,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_SHED_TAIL, }, [MOVE_CHILLY_RECEPTION] = @@ -18999,6 +19805,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_CHILLY_RECEPTION, }, [MOVE_TIDY_UP] = @@ -19018,6 +19825,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_TIDY_UP, }, [MOVE_SNOWSCAPE] = @@ -19038,6 +19846,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_SNOWSCAPE, }, [MOVE_POUNCE] = @@ -19060,6 +19869,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SPD_MINUS_1, .chance = 100, }), + .battleAnimScript = Move_POUNCE, }, [MOVE_TRAILBLAZE] = @@ -19083,6 +19893,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + .battleAnimScript = Move_TRAILBLAZE, }, [MOVE_CHILLING_WATER] = @@ -19104,6 +19915,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_ATK_MINUS_1, .chance = 100, }), + .battleAnimScript = Move_CHILLING_WATER, }, [MOVE_HYPER_DRILL] = @@ -19123,6 +19935,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresProtect = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_HYPER_DRILL, }, [MOVE_TWIN_BEAM] = @@ -19141,6 +19954,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .strikeCount = 2, .metronomeBanned = TRUE, + .battleAnimScript = Move_TWIN_BEAM, }, [MOVE_RAGE_FIST] = @@ -19160,6 +19974,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_RAGE_FIST, }, [MOVE_ARMOR_CANNON] = @@ -19181,6 +19996,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_DEF_SPDEF_DOWN, .self = TRUE, }), + .battleAnimScript = Move_ARMOR_CANNON, }, [MOVE_BITTER_BLADE] = @@ -19200,6 +20016,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .slicingMove = TRUE, .healingMove = TRUE, + .battleAnimScript = Move_BITTER_BLADE, }, [MOVE_DOUBLE_SHOCK] = @@ -19223,6 +20040,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_REMOVE_ARG_TYPE, .self = TRUE, }), + .battleAnimScript = Move_DOUBLE_SHOCK, }, [MOVE_GIGATON_HAMMER] = @@ -19240,6 +20058,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .cantUseTwice = TRUE, + .battleAnimScript = Move_GIGATON_HAMMER, }, [MOVE_COMEUPPANCE] = @@ -19259,6 +20078,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, + .battleAnimScript = Move_COMEUPPANCE, }, [MOVE_AQUA_CUTTER] = @@ -19277,6 +20097,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .slicingMove = TRUE, + .battleAnimScript = Move_AQUA_CUTTER, }, [MOVE_BLAZING_TORQUE] = @@ -19305,6 +20126,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 30, }), + .battleAnimScript = Move_BLAZING_TORQUE, }, [MOVE_WICKED_TORQUE] = @@ -19333,6 +20155,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SLEEP, .chance = 10, }), + .battleAnimScript = Move_WICKED_TORQUE, }, [MOVE_NOXIOUS_TORQUE] = @@ -19361,6 +20184,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_POISON, .chance = 30, }), + .battleAnimScript = Move_NOXIOUS_TORQUE, }, [MOVE_COMBAT_TORQUE] = @@ -19389,6 +20213,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 30, }), + .battleAnimScript = Move_COMBAT_TORQUE, }, [MOVE_MAGICAL_TORQUE] = @@ -19417,6 +20242,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_CONFUSION, .chance = 30, }), + .battleAnimScript = Move_MAGICAL_TORQUE, }, [MOVE_PSYBLADE] = @@ -19435,6 +20261,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, + .battleAnimScript = Move_PSYBLADE, }, [MOVE_HYDRO_STEAM] = @@ -19452,6 +20279,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .thawsUser = TRUE, + .battleAnimScript = Move_HYDRO_STEAM, }, [MOVE_BLOOD_MOON] = @@ -19469,6 +20297,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .cantUseTwice = TRUE, + .battleAnimScript = Move_BLOOD_MOON, }, [MOVE_MATCHA_GOTCHA] = @@ -19492,6 +20321,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_BURN, .chance = 20, }), + .battleAnimScript = Move_MATCHA_GOTCHA, }, [MOVE_SYRUP_BOMB] = @@ -19514,6 +20344,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_SYRUP_BOMB, .chance = 100, }), + .battleAnimScript = Move_SYRUP_BOMB, }, [MOVE_IVY_CUDGEL] = @@ -19532,6 +20363,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, + .battleAnimScript = Move_IVY_CUDGEL, }, [MOVE_ELECTRO_SHOT] = @@ -19554,6 +20386,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .onChargeTurnOnly = TRUE, }, SHEER_FORCE_HACK), + .battleAnimScript = Move_ELECTRO_SHOT, }, [MOVE_TERA_STARSTORM] = @@ -19574,6 +20407,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .copycatBanned = TRUE, .mimicBanned = TRUE, .sketchBanned = (B_SKETCH_BANS >= GEN_9), + .battleAnimScript = Move_TERA_STARSTORM, }, [MOVE_FICKLE_BEAM] = @@ -19590,6 +20424,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, + .battleAnimScript = Move_FICKLE_BEAM, }, [MOVE_BURNING_BULWARK] = @@ -19612,6 +20447,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, + .battleAnimScript = Move_BURNING_BULWARK, }, [MOVE_THUNDERCLAP] = @@ -19626,6 +20462,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .category = DAMAGE_CATEGORY_SPECIAL, + .battleAnimScript = Move_THUNDERCLAP, }, [MOVE_MIGHTY_CLEAVE] = @@ -19643,6 +20480,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .makesContact = TRUE, .ignoresProtect = TRUE, .slicingMove = TRUE, + .battleAnimScript = Move_MIGHTY_CLEAVE, }, [MOVE_TACHYON_CUTTER] = @@ -19661,6 +20499,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_SPECIAL, .strikeCount = 2, .slicingMove = TRUE, + .battleAnimScript = Move_TACHYON_CUTTER, }, [MOVE_HARD_PRESS] = @@ -19677,6 +20516,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .argument = 100, .makesContact = TRUE, + .battleAnimScript = Move_HARD_PRESS, }, [MOVE_DRAGON_CHEER] = @@ -19694,6 +20534,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_STATUS, .ignoresSubstitute = TRUE, + .battleAnimScript = Move_DRAGON_CHEER, }, [MOVE_ALLURING_VOICE] = @@ -19717,6 +20558,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .onlyIfTargetRaisedStats = TRUE, .chance = 100, }), + .battleAnimScript = Move_ALLURING_VOICE, }, [MOVE_TEMPER_FLARE] = @@ -19734,6 +20576,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, + .battleAnimScript = Move_TEMPER_FLARE, }, [MOVE_SUPERCELL_SLAM] = @@ -19751,6 +20594,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .makesContact = TRUE, + .battleAnimScript = Move_SUPERCELL_SLAM, }, [MOVE_PSYCHIC_NOISE] = @@ -19773,6 +20617,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PSYCHIC_NOISE, .chance = 100, }), + .battleAnimScript = Move_PSYCHIC_NOISE, }, [MOVE_UPPER_HAND] = @@ -19794,6 +20639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_FLINCH, .chance = 100, }), + .battleAnimScript = Move_UPPER_HAND, }, [MOVE_MALIGNANT_CHAIN] = @@ -19814,6 +20660,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_TOXIC, .chance = 50, }), + .battleAnimScript = Move_MALIGNANT_CHAIN, }, // Z-Moves @@ -19829,6 +20676,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, //determined from move type + .battleAnimScript = Move_BREAKNECK_BLITZ, }, [MOVE_ALL_OUT_PUMMELING] = { @@ -19842,6 +20690,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_ALL_OUT_PUMMELING, }, [MOVE_SUPERSONIC_SKYSTRIKE] = { @@ -19855,6 +20704,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_SUPERSONIC_SKYSTRIKE, }, [MOVE_ACID_DOWNPOUR] = { @@ -19868,6 +20718,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_ACID_DOWNPOUR, }, [MOVE_TECTONIC_RAGE] = { @@ -19882,6 +20733,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + .battleAnimScript = Move_TECTONIC_RAGE, }, [MOVE_CONTINENTAL_CRUSH] = { @@ -19895,6 +20747,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_CONTINENTAL_CRUSH, }, [MOVE_SAVAGE_SPIN_OUT] = { @@ -19908,6 +20761,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_SAVAGE_SPIN_OUT, }, [MOVE_NEVER_ENDING_NIGHTMARE] = { @@ -19921,6 +20775,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_NEVER_ENDING_NIGHTMARE, }, [MOVE_CORKSCREW_CRASH] = { @@ -19934,6 +20789,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_CORKSCREW_CRASH, }, [MOVE_INFERNO_OVERDRIVE] = { @@ -19947,6 +20803,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_INFERNO_OVERDRIVE, }, [MOVE_HYDRO_VORTEX] = { @@ -19960,6 +20817,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_HYDRO_VORTEX, }, [MOVE_BLOOM_DOOM] = { @@ -19973,6 +20831,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_BLOOM_DOOM, }, [MOVE_GIGAVOLT_HAVOC] = { @@ -19986,6 +20845,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_GIGAVOLT_HAVOC, }, [MOVE_SHATTERED_PSYCHE] = { @@ -19999,6 +20859,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_SHATTERED_PSYCHE, }, [MOVE_SUBZERO_SLAMMER] = { @@ -20012,6 +20873,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_SUBZERO_SLAMMER, }, [MOVE_DEVASTATING_DRAKE] = { @@ -20025,6 +20887,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_DEVASTATING_DRAKE, }, [MOVE_BLACK_HOLE_ECLIPSE] = { @@ -20038,6 +20901,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_BLACK_HOLE_ECLIPSE, }, [MOVE_TWINKLE_TACKLE] = { @@ -20051,6 +20915,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_TWINKLE_TACKLE, }, [MOVE_CATASTROPIKA] = { @@ -20064,6 +20929,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_CATASTROPIKA, }, [MOVE_10000000_VOLT_THUNDERBOLT] = { @@ -20078,6 +20944,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, + .battleAnimScript = Move_10000000_VOLT_THUNDERBOLT, }, [MOVE_STOKED_SPARKSURFER] = { @@ -20095,6 +20962,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .moveEffect = MOVE_EFFECT_PARALYSIS, .chance = 100, }), + .battleAnimScript = Move_STOKED_SPARKSURFER, }, [MOVE_EXTREME_EVOBOOST] = { @@ -20108,6 +20976,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .category = DAMAGE_CATEGORY_STATUS, + .battleAnimScript = Move_EXTREME_EVOBOOST, }, [MOVE_PULVERIZING_PANCAKE] = { @@ -20121,6 +20990,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_PULVERIZING_PANCAKE, }, [MOVE_GENESIS_SUPERNOVA] = { @@ -20135,6 +21005,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .argument = ARG_SET_PSYCHIC_TERRAIN, // Set Psychic Terrain. If there's a different field terrain active, overwrite it. + .battleAnimScript = Move_GENESIS_SUPERNOVA, }, [MOVE_SINISTER_ARROW_RAID] = { @@ -20148,6 +21019,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_SINISTER_ARROW_RAID, }, [MOVE_MALICIOUS_MOONSAULT] = { @@ -20161,6 +21033,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_MALICIOUS_MOONSAULT, }, [MOVE_OCEANIC_OPERETTA] = { @@ -20174,6 +21047,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, + .battleAnimScript = Move_OCEANIC_OPERETTA, }, [MOVE_SPLINTERED_STORMSHARDS] = { @@ -20188,6 +21062,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. + .battleAnimScript = Move_SPLINTERED_STORMSHARDS, }, [MOVE_LETS_SNUGGLE_FOREVER] = { @@ -20201,6 +21076,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_LETS_SNUGGLE_FOREVER, }, [MOVE_CLANGOROUS_SOULBLAZE] = { @@ -20221,6 +21097,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .self = TRUE, .chance = 100, }), + .battleAnimScript = Move_CLANGOROUS_SOULBLAZE, }, [MOVE_GUARDIAN_OF_ALOLA] = { @@ -20234,6 +21111,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, + .battleAnimScript = Move_GUARDIAN_OF_ALOLA, }, [MOVE_SEARING_SUNRAZE_SMASH] = { @@ -20248,6 +21126,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .ignoresTargetAbility = TRUE, + .battleAnimScript = Move_SEARING_SUNRAZE_SMASH, }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { @@ -20262,6 +21141,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, + .battleAnimScript = Move_MENACING_MOONRAZE_MAELSTROM, }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { @@ -20276,6 +21156,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, + .battleAnimScript = Move_LIGHT_THAT_BURNS_THE_SKY, }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { @@ -20289,6 +21170,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, + .battleAnimScript = Move_SOUL_STEALING_7_STAR_STRIKE, }, [MOVE_MAX_GUARD] = @@ -20303,6 +21185,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 4, .category = DAMAGE_CATEGORY_STATUS, + .battleAnimScript = Move_MAX_GUARD, }, [MOVE_MAX_FLARE] = @@ -20318,6 +21201,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SUN, + .battleAnimScript = Move_MAX_FLARE, }, [MOVE_MAX_FLUTTERBY] = @@ -20333,6 +21217,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SP_ATK, + .battleAnimScript = Move_MAX_FLUTTERBY, }, [MOVE_MAX_LIGHTNING] = @@ -20348,6 +21233,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_ELECTRIC_TERRAIN, + .battleAnimScript = Move_MAX_LIGHTNING, }, [MOVE_MAX_STRIKE] = @@ -20363,6 +21249,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SPEED, + .battleAnimScript = Move_MAX_STRIKE, }, [MOVE_MAX_KNUCKLE] = @@ -20378,6 +21265,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_ATTACK, + .battleAnimScript = Move_MAX_KNUCKLE, }, [MOVE_MAX_PHANTASM] = @@ -20393,6 +21281,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_DEFENSE, + .battleAnimScript = Move_MAX_PHANTASM, }, [MOVE_MAX_HAILSTORM] = @@ -20408,6 +21297,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_HAIL, + .battleAnimScript = Move_MAX_HAILSTORM, }, [MOVE_MAX_OOZE] = @@ -20423,6 +21313,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SP_ATK, + .battleAnimScript = Move_MAX_OOZE, }, [MOVE_MAX_GEYSER] = @@ -20438,6 +21329,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAIN, + .battleAnimScript = Move_MAX_GEYSER, }, [MOVE_MAX_AIRSTREAM] = @@ -20453,6 +21345,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SPEED, + .battleAnimScript = Move_MAX_AIRSTREAM, }, [MOVE_MAX_STARFALL] = @@ -20468,6 +21361,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_MISTY_TERRAIN, + .battleAnimScript = Move_MAX_STARFALL, }, [MOVE_MAX_WYRMWIND] = @@ -20483,6 +21377,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_ATTACK, + .battleAnimScript = Move_MAX_WYRMWIND, }, [MOVE_MAX_MINDSTORM] = @@ -20498,6 +21393,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_PSYCHIC_TERRAIN, + .battleAnimScript = Move_MAX_MINDSTORM, }, [MOVE_MAX_ROCKFALL] = @@ -20513,6 +21409,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SANDSTORM, + .battleAnimScript = Move_MAX_ROCKFALL, }, [MOVE_MAX_QUAKE] = @@ -20529,6 +21426,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SP_DEF, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, + .battleAnimScript = Move_MAX_QUAKE, }, [MOVE_MAX_DARKNESS] = @@ -20544,6 +21442,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SP_DEF, + .battleAnimScript = Move_MAX_DARKNESS, }, [MOVE_MAX_OVERGROWTH] = @@ -20559,6 +21458,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_GRASSY_TERRAIN, + .battleAnimScript = Move_MAX_OVERGROWTH, }, [MOVE_MAX_STEELSPIKE] = @@ -20574,6 +21474,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_DEFENSE, + .battleAnimScript = Move_MAX_STEELSPIKE, }, [MOVE_G_MAX_VINE_LASH] = @@ -20589,6 +21490,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_VINE_LASH, + .battleAnimScript = Move_G_MAX_VINE_LASH, }, [MOVE_G_MAX_WILDFIRE] = @@ -20604,6 +21506,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_WILDFIRE, + .battleAnimScript = Move_G_MAX_WILDFIRE, }, [MOVE_G_MAX_CANNONADE] = @@ -20619,6 +21522,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CANNONADE, + .battleAnimScript = Move_G_MAX_CANNONADE, }, [MOVE_G_MAX_BEFUDDLE] = @@ -20634,6 +21538,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_EFFECT_SPORE_FOES, + .battleAnimScript = Move_G_MAX_BEFUDDLE, }, [MOVE_G_MAX_VOLT_CRASH] = @@ -20649,6 +21554,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_PARALYZE_FOES, + .battleAnimScript = Move_G_MAX_VOLT_CRASH, }, [MOVE_G_MAX_GOLD_RUSH] = @@ -20664,6 +21570,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES_PAY_DAY, + .battleAnimScript = Move_G_MAX_GOLD_RUSH, }, [MOVE_G_MAX_CHI_STRIKE] = @@ -20679,6 +21586,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CRIT_PLUS, + .battleAnimScript = Move_G_MAX_CHI_STRIKE, }, [MOVE_G_MAX_TERROR] = @@ -20694,6 +21602,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_MEAN_LOOK, + .battleAnimScript = Move_G_MAX_TERROR, }, [MOVE_G_MAX_FOAM_BURST] = @@ -20709,6 +21618,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SPEED_2_FOES, + .battleAnimScript = Move_G_MAX_FOAM_BURST, }, [MOVE_G_MAX_RESONANCE] = @@ -20724,6 +21634,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_AURORA_VEIL, + .battleAnimScript = Move_G_MAX_RESONANCE, }, [MOVE_G_MAX_CUDDLE] = @@ -20739,6 +21650,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_INFATUATE_FOES, + .battleAnimScript = Move_G_MAX_CUDDLE, }, [MOVE_G_MAX_REPLENISH] = @@ -20754,6 +21666,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RECYCLE_BERRIES, + .battleAnimScript = Move_G_MAX_REPLENISH, }, [MOVE_G_MAX_MALODOR] = @@ -20769,6 +21682,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_POISON_FOES, + .battleAnimScript = Move_G_MAX_MALODOR, }, [MOVE_G_MAX_MELTDOWN] = @@ -20784,6 +21698,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, + .battleAnimScript = Move_G_MAX_MELTDOWN, }, [MOVE_G_MAX_DRUM_SOLO] = @@ -20800,6 +21715,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, + .battleAnimScript = Move_G_MAX_DRUM_SOLO, }, [MOVE_G_MAX_FIREBALL] = @@ -20816,6 +21732,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, + .battleAnimScript = Move_G_MAX_FIREBALL, }, [MOVE_G_MAX_HYDROSNIPE] = @@ -20832,6 +21749,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, + .battleAnimScript = Move_G_MAX_HYDROSNIPE, }, [MOVE_G_MAX_WIND_RAGE] = @@ -20847,6 +21765,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_DEFOG, + .battleAnimScript = Move_G_MAX_WIND_RAGE, }, [MOVE_G_MAX_GRAVITAS] = @@ -20862,6 +21781,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_GRAVITY, + .battleAnimScript = Move_G_MAX_GRAVITAS, }, [MOVE_G_MAX_STONESURGE] = @@ -20877,6 +21797,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_STEALTH_ROCK, + .battleAnimScript = Move_G_MAX_STONESURGE, }, [MOVE_G_MAX_VOLCALITH] = @@ -20892,6 +21813,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_VOLCALITH, + .battleAnimScript = Move_G_MAX_VOLCALITH, }, [MOVE_G_MAX_TARTNESS] = @@ -20907,6 +21829,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_EVASIVENESS_FOES, + .battleAnimScript = Move_G_MAX_TARTNESS, }, [MOVE_G_MAX_SWEETNESS] = @@ -20922,6 +21845,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_AROMATHERAPY, + .battleAnimScript = Move_G_MAX_SWEETNESS, }, [MOVE_G_MAX_SANDBLAST] = @@ -20937,6 +21861,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SANDBLAST_FOES, + .battleAnimScript = Move_G_MAX_SANDBLAST, }, [MOVE_G_MAX_STUN_SHOCK] = @@ -20952,6 +21877,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_POISON_PARALYZE_FOES, + .battleAnimScript = Move_G_MAX_STUN_SHOCK, }, [MOVE_G_MAX_CENTIFERNO] = @@ -20967,6 +21893,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIRE_SPIN_FOES, + .battleAnimScript = Move_G_MAX_CENTIFERNO, }, [MOVE_G_MAX_SMITE] = @@ -20982,6 +21909,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES, + .battleAnimScript = Move_G_MAX_SMITE, }, @@ -20998,6 +21926,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_YAWN_FOE, + .battleAnimScript = Move_G_MAX_SNOOZE, }, [MOVE_G_MAX_FINALE] = @@ -21013,6 +21942,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_HEAL_TEAM, + .battleAnimScript = Move_G_MAX_FINALE, }, [MOVE_G_MAX_STEELSURGE] = @@ -21028,6 +21958,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_STEELSURGE, + .battleAnimScript = Move_G_MAX_STEELSURGE, }, [MOVE_G_MAX_DEPLETION] = @@ -21043,6 +21974,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SPITE, + .battleAnimScript = Move_G_MAX_DEPLETION, }, [MOVE_G_MAX_ONE_BLOW] = @@ -21058,6 +21990,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO + .battleAnimScript = Move_G_MAX_ONE_BLOW, }, [MOVE_G_MAX_RAPID_FLOW] = @@ -21073,6 +22006,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .priority = 0, .category = DAMAGE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO + .battleAnimScript = Move_G_MAX_RAPID_FLOW, }, }; From 97d1dd6dabc8076ac4472e4e2043ad2f0d2aacc0 Mon Sep 17 00:00:00 2001 From: cawtds Date: Sat, 1 Jun 2024 11:35:51 +0200 Subject: [PATCH 3/8] migration script for move anims --- .../battle_anim_moves_refactor.py | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 migration_scripts/battle_anim_moves_refactor.py diff --git a/migration_scripts/battle_anim_moves_refactor.py b/migration_scripts/battle_anim_moves_refactor.py new file mode 100644 index 000000000000..ef7366ee5b00 --- /dev/null +++ b/migration_scripts/battle_anim_moves_refactor.py @@ -0,0 +1,54 @@ +import re + +def IsCommaMissing(line: str): + sanitized_line = line.removesuffix('\n').strip() + if sanitized_line.endswith('{') or sanitized_line.endswith('(') or sanitized_line.endswith(','): + return False + if not re.search(r'\.[A-Za-z0-9_]+', sanitized_line): + return False + return True + +input_file = open('./src/data/moves_info.h', 'r') +lines = input_file.readlines() +input_file.close() + + +battle_anim_lines = [] +moves_info_lines = [] + +move = None +bracketCount = 0 +for line in lines: + m = re.search(r'\[MOVE_([A-Za-z0-9_]+)\] =', line) + if m: + move = m.group(1) + bracketCount = 0 + battle_anim_lines.append('extern const u8 Move_' + move + '[];\n') + + if move and re.search(r'\{', line): + bracketCount = bracketCount + 1 + + if move and re.search(r'\}', line): + if (bracketCount == 1): + moves_info_lines.append(8 * ' ' + '.battleAnimScript = Move_' + move + ',\n') + move = None + bracketCount = bracketCount - 1 + + comment_split = line.split('//') + if move and IsCommaMissing(comment_split[0]): + line = comment_split[0].removesuffix('\n') + ',' + line[len(comment_split[0]):-1] + '\n' + + + moves_info_lines.append(line) + +output_file_mi = open('./src/data/moves_info.h', 'w') +output_file_mi.writelines(moves_info_lines) +output_file_mi.close() + +output_file_bas = open('./include/battle_anim_scripts.h', 'w') +output_file_bas.writelines('#ifndef GUARD_BATTLE_ANIM_SCRIPTS_H\n') +output_file_bas.writelines('#define GUARD_BATTLE_ANIM_SCRIPTS_H\n\n') +output_file_bas.writelines(battle_anim_lines) +output_file_bas.writelines('\n#endif // GUARD_BATTLE_ANIM_SCRIPTS_H\n') +output_file_bas.close() + From 96836e311f37fd309d77e0099e9e594eedc515c2 Mon Sep 17 00:00:00 2001 From: cawtds Date: Sat, 1 Jun 2024 13:10:55 +0200 Subject: [PATCH 4/8] default animation, migration for battle_anim_scripts.s --- include/pokemon.h | 1 + migration_scripts/battle_anim_moves_refactor.py | 10 ++++++++++ src/battle_anim.c | 2 +- src/pokemon.c | 7 +++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/pokemon.h b/include/pokemon.h index 2a705dcbfb27..58ef690a50fd 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -805,5 +805,6 @@ u16 GetSpeciesPreEvolution(u16 species); void HealPokemon(struct Pokemon *mon); void HealBoxPokemon(struct BoxPokemon *boxMon); const u8 *GetMoveName(u16 moveId); +const u8 *GetMoveAnimationScript(u16 moveId); #endif // GUARD_POKEMON_H diff --git a/migration_scripts/battle_anim_moves_refactor.py b/migration_scripts/battle_anim_moves_refactor.py index ef7366ee5b00..aa2b2db53b32 100644 --- a/migration_scripts/battle_anim_moves_refactor.py +++ b/migration_scripts/battle_anim_moves_refactor.py @@ -52,3 +52,13 @@ def IsCommaMissing(line: str): output_file_bas.writelines('\n#endif // GUARD_BATTLE_ANIM_SCRIPTS_H\n') output_file_bas.close() +b_anim_scripts_s = open('./data/battle_anim_scripts.s', 'r') +lines = b_anim_scripts_s.read() +b_anim_scripts_s.close() + +lines = re.sub(r'(Move_[A-Za-z0-9_]*)([:]+)', r'\1::', lines) + +b_anim_scripts_s = open('./data/battle_anim_scripts.s', 'w') +b_anim_scripts_s.write(lines) +b_anim_scripts_s.close() + diff --git a/src/battle_anim.c b/src/battle_anim.c index bb29769371ee..2f1b88a6de78 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -308,7 +308,7 @@ void LaunchBattleAnimation(u32 animType, u32 animId) sBattleAnimScriptPtr = gBattleAnims_General[animId]; break; case ANIM_TYPE_MOVE: - sBattleAnimScriptPtr = gMovesInfo[animId].battleAnimScript; + sBattleAnimScriptPtr = GetMoveAnimationScript(animId); break; case ANIM_TYPE_STATUS: sBattleAnimScriptPtr = gBattleAnims_StatusConditions[animId]; diff --git a/src/pokemon.c b/src/pokemon.c index daa02077ce14..6ced72d53271 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6567,3 +6567,10 @@ const u8 *GetMoveName(u16 moveId) { return gMovesInfo[moveId].name; } + +const u8 *GetMoveAnimationScript(u16 moveId) +{ + if (gMovesInfo[moveId].battleAnimScript == NULL) + return Move_TACKLE; + return gMovesInfo[moveId].battleAnimScript; +} From 7a79f2478530e1069738fefba06a01960b3d30fa Mon Sep 17 00:00:00 2001 From: cawtds Date: Sat, 1 Jun 2024 13:19:11 +0200 Subject: [PATCH 5/8] added warning for missing animation --- src/pokemon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pokemon.c b/src/pokemon.c index 6ced72d53271..5ce1e9014b05 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6571,6 +6571,9 @@ const u8 *GetMoveName(u16 moveId) const u8 *GetMoveAnimationScript(u16 moveId) { if (gMovesInfo[moveId].battleAnimScript == NULL) + { + DebugPrintfLevel(MGBA_LOG_WARN, "No animation for moveId=%u", moveId); return Move_TACKLE; + } return gMovesInfo[moveId].battleAnimScript; } From ccae911a14aa73825212d8b3e069e7d6dd2073ce Mon Sep 17 00:00:00 2001 From: cawtds Date: Sat, 1 Jun 2024 17:41:33 +0200 Subject: [PATCH 6/8] add include to migration --- migration_scripts/battle_anim_moves_refactor.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration_scripts/battle_anim_moves_refactor.py b/migration_scripts/battle_anim_moves_refactor.py index aa2b2db53b32..8be94b6314b5 100644 --- a/migration_scripts/battle_anim_moves_refactor.py +++ b/migration_scripts/battle_anim_moves_refactor.py @@ -41,6 +41,8 @@ def IsCommaMissing(line: str): moves_info_lines.append(line) +moves_info_lines.insert(1, '#include "battle_anim_scripts.h"\n') + output_file_mi = open('./src/data/moves_info.h', 'w') output_file_mi.writelines(moves_info_lines) output_file_mi.close() From db193522148c2c682305d6fa3a375217f6d966ac Mon Sep 17 00:00:00 2001 From: cawtds Date: Sat, 1 Jun 2024 18:51:54 +0200 Subject: [PATCH 7/8] add struct member in migration script --- .../battle_anim_moves_refactor.py | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/migration_scripts/battle_anim_moves_refactor.py b/migration_scripts/battle_anim_moves_refactor.py index 8be94b6314b5..904597f7de74 100644 --- a/migration_scripts/battle_anim_moves_refactor.py +++ b/migration_scripts/battle_anim_moves_refactor.py @@ -64,3 +64,28 @@ def IsCommaMissing(line: str): b_anim_scripts_s.write(lines) b_anim_scripts_s.close() + +pokemon_h = open('./include/pokemon.h', 'r') +lines = pokemon_h.readlines() +pokemon_h.close() + +pokemon_h_lines = [] +isMoveInfo = False +bracketCount = 0 +for line in lines: + if re.search(r'struct MoveInfo\n', line): + isMoveInfo = True + + if isMoveInfo and re.search(r'\{', line): + bracketCount = bracketCount + 1 + + if isMoveInfo and re.search(r'\}', line): + if (bracketCount == 1): + pokemon_h_lines.append(4 * ' ' + 'const u8 *battleAnimScript;\n') + isMoveInfo = False + bracketCount = bracketCount - 1 + pokemon_h_lines.append(line) + +pokemon_h = open('./include/pokemon.h', 'w') +pokemon_h.writelines(pokemon_h_lines) +pokemon_h.close() From a2ca59ac4541b4477ab0682ce93239546c0474c0 Mon Sep 17 00:00:00 2001 From: cawtds Date: Sat, 1 Jun 2024 18:56:50 +0200 Subject: [PATCH 8/8] removed include and struct member from migration script --- .../battle_anim_moves_refactor.py | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/migration_scripts/battle_anim_moves_refactor.py b/migration_scripts/battle_anim_moves_refactor.py index 904597f7de74..116d3964c0e2 100644 --- a/migration_scripts/battle_anim_moves_refactor.py +++ b/migration_scripts/battle_anim_moves_refactor.py @@ -41,8 +41,6 @@ def IsCommaMissing(line: str): moves_info_lines.append(line) -moves_info_lines.insert(1, '#include "battle_anim_scripts.h"\n') - output_file_mi = open('./src/data/moves_info.h', 'w') output_file_mi.writelines(moves_info_lines) output_file_mi.close() @@ -63,29 +61,3 @@ def IsCommaMissing(line: str): b_anim_scripts_s = open('./data/battle_anim_scripts.s', 'w') b_anim_scripts_s.write(lines) b_anim_scripts_s.close() - - -pokemon_h = open('./include/pokemon.h', 'r') -lines = pokemon_h.readlines() -pokemon_h.close() - -pokemon_h_lines = [] -isMoveInfo = False -bracketCount = 0 -for line in lines: - if re.search(r'struct MoveInfo\n', line): - isMoveInfo = True - - if isMoveInfo and re.search(r'\{', line): - bracketCount = bracketCount + 1 - - if isMoveInfo and re.search(r'\}', line): - if (bracketCount == 1): - pokemon_h_lines.append(4 * ' ' + 'const u8 *battleAnimScript;\n') - isMoveInfo = False - bracketCount = bracketCount - 1 - pokemon_h_lines.append(line) - -pokemon_h = open('./include/pokemon.h', 'w') -pokemon_h.writelines(pokemon_h_lines) -pokemon_h.close()