diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 4580bd26b..3239cff8b 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -781,7 +781,7 @@ gBattleAnims_StatusConditions:: .4byte Status_Curse .4byte Status_Nightmare .4byte Status_Powder - + .align 2 gBattleAnims_General:: .4byte General_CastformChange @@ -852,7 +852,7 @@ Move_ROOST: call HealingEffect waitforvisualfinish end - + Move_GRAVITY: fadetobg BG_COSMIC waitbgfadein @@ -872,7 +872,7 @@ Move_GRAVITY: waitbgfadein waitforvisualfinish end - + Move_MIRACLE_EYE: loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE @@ -890,7 +890,7 @@ Move_MIRACLE_EYE: call UnsetPsychicBg clearmonbg ANIM_DEF_PARTNER end - + Move_WAKE_UP_SLAP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -910,7 +910,7 @@ Move_WAKE_UP_SLAP: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_HAMMER_ARM: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS @@ -934,7 +934,7 @@ Move_HAMMER_ARM: clearmonbg ANIM_TARGET blendoff end - + Move_GYRO_BALL: loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 @@ -964,7 +964,7 @@ Move_GYRO_BALL: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 waitforvisualfinish end - + Move_HEALING_WISH: loadspritegfx ANIM_TAG_GREEN_SPARKLE setalpha 0, 16 @@ -984,7 +984,7 @@ Move_HEALING_WISH: createvisualtask AnimTask_MoonlightEndFade, 2 waitforvisualfinish end - + Move_BRINE: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB loadspritegfx ANIM_TAG_WATER_IMPACT @@ -998,7 +998,7 @@ Move_BRINE: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_NATURAL_GIFT: loadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_HOLLOW_ORB @@ -1027,7 +1027,7 @@ Move_NATURAL_GIFT: clearmonbg ANIM_ATTACKER delay 1 end - + Move_FEINT: loadspritegfx ANIM_TAG_FEINT createsprite gFeintSwipeSpriteTemplate, ANIM_ATTACKER, 10, -32, 0, 15 @@ -1041,7 +1041,7 @@ Move_FEINT: playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish end - + Move_PLUCK: loadspritegfx ANIM_TAG_SEED_BROWN loadspritegfx ANIM_TAG_IMPACT @@ -1067,7 +1067,7 @@ Move_PLUCK: createsprite gPluckParticleSpriteTemplate, ANIM_ATTACKER, 40, 4, -4, 25, 1, 2 waitforvisualfinish end - + Move_TAILWIND: loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER @@ -1101,7 +1101,7 @@ Move_TAILWIND: blendoff delay 1 end - + Move_ACUPRESSURE: loadspritegfx ANIM_TAG_ACCUPRESSURE loadspritegfx ANIM_TAG_SPARK_2 @@ -1109,7 +1109,7 @@ Move_ACUPRESSURE: waitforvisualfinish call ElectricityEffect end - + Move_METAL_BURST: loadspritegfx ANIM_TAG_ECLIPSING_ORB loadspritegfx ANIM_TAG_RED_ORB @@ -1132,7 +1132,7 @@ Move_METAL_BURST: createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 waitforvisualfinish end - + Move_U_TURN: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT @@ -1197,7 +1197,7 @@ Move_CLOSE_COMBAT: setarg 7, 0x1000 delay 1 end - + Move_PAYBACK: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -1229,7 +1229,7 @@ Move_PAYBACK: restorebg waitbgfadein end - + Move_ASSURANCE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE @@ -1248,7 +1248,7 @@ Move_ASSURANCE: restorebg waitbgfadein end - + Move_EMBARGO: loadspritegfx ANIM_TAG_RED_ORB monbg ANIM_DEF_PARTNER @@ -1270,7 +1270,7 @@ EmbargoOrbs1: createsprite gPowerOrbs_Float, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 delay 12 return - + Move_FLING: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BLACK_BALL @@ -1286,7 +1286,7 @@ Move_FLING: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_PSYCHO_SHIFT: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_HOLLOW_ORB @@ -1312,7 +1312,7 @@ Move_PSYCHO_SHIFT: clearmonbg ANIM_ATTACKER blendoff end - + Move_TRUMP_CARD: loadspritegfx ANIM_TAG_TRUMP_CARD loadspritegfx ANIM_TAG_CUT @@ -1356,7 +1356,7 @@ Move_TRUMP_CARD: blendoff waitforvisualfinish end - + Move_HEAL_BLOCK: loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET @@ -1380,7 +1380,7 @@ Move_HEAL_BLOCK: waitforvisualfinish clearmonbg ANIM_TARGET end - + Move_WRING_OUT: loadspritegfx ANIM_TAG_WRING_OUT monbg ANIM_TARGET @@ -1401,7 +1401,7 @@ Move_WRING_OUT: blendoff waitforvisualfinish end - + Move_POWER_TRICK: loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_ATK_PARTNER @@ -1419,7 +1419,7 @@ Move_POWER_TRICK: waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end - + Move_GASTRO_ACID: loadspritegfx ANIM_TAG_GREEN_POISON_BUBBLE monbg ANIM_DEF_PARTNER @@ -1451,7 +1451,7 @@ Move_GASTRO_ACID: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Move_LUCKY_CHANT: loadspritegfx ANIM_TAG_GOLD_STARS monbg ANIM_DEF_PARTNER @@ -1478,10 +1478,10 @@ Move_LUCKY_CHANT: blendoff unloadspritegfx ANIM_TAG_GOLD_STARS end - + Move_ME_FIRST: end - + Move_COPYCAT: loadspritegfx ANIM_TAG_GRAY_ORB loadspritegfx ANIM_TAG_THIN_RING @@ -1503,7 +1503,7 @@ Move_COPYCAT: playsewithpan SE_M_SUPERSONIC, -64 waitforvisualfinish end - + Move_POWER_SWAP: loadspritegfx ANIM_TAG_COLORED_ORBS playsewithpan SE_M_DOUBLE_TEAM, 0 @@ -1545,7 +1545,7 @@ Move_POWER_SWAP: delay 2 waitforvisualfinish end - + Move_GUARD_SWAP: loadspritegfx ANIM_TAG_COLORED_ORBS playsewithpan SE_M_DOUBLE_TEAM, 0 @@ -1587,7 +1587,7 @@ Move_GUARD_SWAP: delay 2 waitforvisualfinish end - + Move_PUNISHMENT: loadspritegfx ANIM_TAG_SCRATCH loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -1610,7 +1610,7 @@ Move_PUNISHMENT: clearmonbg ANIM_TARGET blendoff end - + Move_LAST_RESORT: fadetobg BG_COSMIC waitbgfadeout @@ -1648,7 +1648,7 @@ Move_LAST_RESORT: waitforvisualfinish call UnsetHighSpeedBg end - + Move_WORRY_SEED: loadspritegfx ANIM_TAG_WORRY_SEED loadspritegfx ANIM_TAG_SMALL_CLOUD @@ -1662,7 +1662,7 @@ Move_WORRY_SEED: createsprite gSmallCloudTemplate, ANIM_ATTACKER, 3, 3, -2, 1, -1, -2 waitforvisualfinish end - + Move_SUCKER_PUNCH: loadspritegfx ANIM_TAG_POISON_JAB loadspritegfx ANIM_TAG_IMPACT @@ -1675,7 +1675,7 @@ Move_SUCKER_PUNCH: waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 3, 0, 1, 4 end - + Move_TOXIC_SPIKES: loadspritegfx ANIM_TAG_TOXIC_SPIKES loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -1695,10 +1695,10 @@ Move_TOXIC_SPIKES: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Move_HEART_SWAP: end - + Move_AQUA_RING: loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -1748,7 +1748,7 @@ Move_AQUA_RING: call HealingEffect waitforvisualfinish end - + Move_MAGNET_RISE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 @@ -1785,7 +1785,7 @@ Move_MAGNET_RISE: createvisualtask AnimTask_BlendColorCycle, 2, 31, -31, 1, 0, 0, RGB(31, 31, 20) waitforvisualfinish end - + Move_FLARE_BLITZ: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -1862,7 +1862,7 @@ Move_FLARE_BLITZ: restorebg waitbgfadein end - + Move_FORCE_PALM: loadspritegfx ANIM_TAG_SHADOW_BALL loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -1880,7 +1880,7 @@ Move_FORCE_PALM: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_AURA_SPHERE: loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -1901,7 +1901,7 @@ Move_AURA_SPHERE: blendoff delay 1 end - + Move_ROCK_POLISH: loadspritegfx ANIM_TAG_WHITE_STREAK loadspritegfx ANIM_TAG_SPARKLE_3 @@ -1968,7 +1968,7 @@ Move_ROCK_POLISH: waitforvisualfinish blendoff end - + Move_POISON_JAB: loadspritegfx ANIM_TAG_PURPLE_JAB loadspritegfx ANIM_TAG_IMPACT @@ -2022,7 +2022,7 @@ Move_POISON_JAB: waitforvisualfinish blendoff end - + Move_DARK_PULSE: loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_TARGET @@ -2050,7 +2050,7 @@ Move_DARK_PULSE: restorebg waitbgfadein end - + Move_NIGHT_SLASH: loadspritegfx ANIM_TAG_SLASH createvisualtask AnimTask_BlendNightSlash, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -2070,7 +2070,7 @@ Move_NIGHT_SLASH: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 3, 12, 0, RGB_BLACK waitforvisualfinish end - + Move_AQUA_TAIL: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -2124,7 +2124,7 @@ Move_AQUA_TAIL: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_SEED_BOMB: loadspritegfx ANIM_TAG_SEED loadspritegfx ANIM_TAG_EXPLOSION @@ -2173,7 +2173,7 @@ Move_SEED_BOMB: createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0 waitforvisualfinish end - + Move_AIR_SLASH: loadspritegfx ANIM_TAG_SLASH call SetSkyBg @@ -2186,7 +2186,7 @@ Move_AIR_SLASH: waitforvisualfinish call UnsetSkyBg end - + Move_XSCISSOR: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET @@ -2204,7 +2204,7 @@ Move_XSCISSOR: clearmonbg ANIM_TARGET blendoff end - + Move_BUG_BUZZ: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING @@ -2231,7 +2231,7 @@ Move_BUG_BUZZ: clearmonbg ANIM_DEF_PARTNER call UnsetBugBg end - + Move_DRAGON_PULSE: loadspritegfx ANIM_TAG_DRAGON_PULSE monbg ANIM_TARGET @@ -2264,7 +2264,7 @@ DragonPulseParticle: createsprite gDragonPulseSpriteTemplate, 130, 6, 16, 0, 0, 0, 13, 0 delay 4 return - + Move_DRAGON_RUSH: loadspritegfx ANIM_TAG_SLAM_HIT_2 loadspritegfx ANIM_TAG_IMPACT @@ -2293,7 +2293,7 @@ Move_DRAGON_RUSH: clearmonbg ANIM_DEF_PARTNER blendoff end - + 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 @@ -2327,7 +2327,7 @@ Move_POWER_GEM: @ Copy of Hidden Power with background blackened createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 1, 7, 0, RGB_BLACK waitforvisualfinish end - + Move_DRAIN_PUNCH: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -2348,7 +2348,7 @@ Move_DRAIN_PUNCH: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_VACUUM_WAVE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -2364,7 +2364,7 @@ Move_VACUUM_WAVE: clearmonbg ANIM_TARGET blendoff end - + Move_FOCUS_BLAST: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_METEOR @@ -2384,7 +2384,7 @@ Move_FOCUS_BLAST: blendoff delay 1 end - + Move_ENERGY_BALL: loadspritegfx ANIM_TAG_ENERGY_BALL monbg ANIM_TARGET @@ -2402,7 +2402,7 @@ Move_ENERGY_BALL: clearmonbg ANIM_TARGET blendoff end - + Move_BRAVE_BIRD: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BIRD @@ -2425,7 +2425,7 @@ Move_BRAVE_BIRD: clearmonbg ANIM_ATTACKER call UnsetSkyBg end - + Move_EARTH_POWER: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME @@ -2454,7 +2454,7 @@ Move_EARTH_POWER: createsprite gSlideMonToOriginalPosSpriteTemplate, 194, 3, 0, 0, 4 waitforvisualfinish end - + Move_SWITCHEROO: fadetobg BG_DARK waitbgfadein @@ -2486,7 +2486,7 @@ Move_SWITCHEROO: restorebg waitbgfadein end - + Move_GIGA_IMPACT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -2520,7 +2520,7 @@ Move_GIGA_IMPACT: restorebg waitbgfadein end - + Move_NASTY_PLOT: loadspritegfx ANIM_TAG_AMNESIA fadetobg BG_DARK @@ -2535,7 +2535,7 @@ Move_NASTY_PLOT: waitforvisualfinish call UnsetPsychicBg end - + Move_BULLET_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -2589,7 +2589,7 @@ Move_BULLET_PUNCH: clearmonbg ANIM_TARGET blendoff end - + Move_AVALANCHE: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_ICE_CHUNK @@ -2676,7 +2676,7 @@ Move_ICE_SHARD: clearmonbg ANIM_TARGET blendoff end - + Move_SHADOW_CLAW: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH @@ -2702,7 +2702,7 @@ Move_SHADOW_CLAW: blendoff clearmonbg ANIM_TARGET end - + Move_THUNDER_FANG: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_LIGHTNING @@ -2736,7 +2736,7 @@ Move_THUNDER_FANG: blendoff delay 1 end - + Move_ICE_FANG: monbg ANIM_TARGET setalpha 12, 8 @@ -2773,7 +2773,7 @@ Move_ICE_FANG: blendoff delay 1 end - + Move_FIRE_FANG: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_SHARP_TEETH @@ -2802,7 +2802,7 @@ Move_FIRE_FANG: blendoff delay 1 end - + Move_SHADOW_SNEAK: loadspritegfx ANIM_TAG_LICK setalpha 0, 16 @@ -2900,7 +2900,7 @@ Move_PSYCHO_CUT: blendoff waitforvisualfinish end - + Move_ZEN_HEADBUTT: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_WATER_IMPACT @@ -2932,7 +2932,7 @@ Move_ZEN_HEADBUTT: blendoff delay 1 end - + Move_MIRROR_SHOT: loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 @@ -2966,7 +2966,7 @@ Move_MIRROR_SHOT: clearmonbg ANIM_ATTACKER blendoff end - + Move_FLASH_CANNON: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -3003,7 +3003,7 @@ Move_FLASH_CANNON: waitforvisualfinish clearmonbg ANIM_TARGET end - + Move_ROCK_CLIMB: createvisualtask AnimTask_Splash, 2, 2, ANIM_ATTACKER, 3 delay 8 @@ -3039,7 +3039,7 @@ Move_ROCK_CLIMB: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_DEFOG: loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT monbg ANIM_ATTACKER @@ -3057,7 +3057,7 @@ Move_DEFOG: clearmonbg ANIM_ATTACKER blendoff end - + Move_TRICK_ROOM:: call InitRoomAnimation fadetobg BG_TRICK_ROOM @@ -3072,7 +3072,7 @@ InitRoomAnimation: playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET launchtask AnimTask_ScaleMonAndRestore 5 5 0xfffa 0xfffa 15, 1 1 return - + Move_DRACO_METEOR: loadspritegfx ANIM_TAG_WARM_ROCK loadspritegfx ANIM_TAG_GOLD_STARS @@ -3095,7 +3095,7 @@ Move_DRACO_METEOR: waitbgfadein waitforvisualfinish end - + Move_DISCHARGE: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 @@ -3200,7 +3200,7 @@ DischargeElectrify: createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_DEF_PARTNER createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_ATK_PARTNER return - + Move_LAVA_PLUME: loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan 152, SOUND_PAN_ATTACKER, 9, 2 @@ -3220,7 +3220,7 @@ Move_LAVA_PLUME: playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER waitforvisualfinish end - + Move_LEAF_STORM: loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT @@ -3332,7 +3332,7 @@ Move_LEAF_STORM: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Move_POWER_WHIP: loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER @@ -3346,7 +3346,7 @@ Move_POWER_WHIP: restorebg waitbgfadein end - + Move_ROCK_WRECKER: jumpargeq 7, 1, RockWrecker_1 fadetobg BG_ROCK_WRECKER @@ -3392,7 +3392,7 @@ RockWrecker_2: waitforvisualfinish call UnsetPsychicBg end - + Move_CROSS_POISON: loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_CROSS_IMPACT @@ -3408,7 +3408,7 @@ Move_CROSS_POISON: clearmonbg ANIM_TARGET blendoff end - + Move_GUNK_SHOT: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -3459,7 +3459,7 @@ GunkShotImpact: createsprite gGunkShotImpactSpriteTemplate, 4, 4, 0, 15, 1, 1 createsprite gGunkShotImpactSpriteTemplate, 4, 4, 0, -15, 1, 1 return - + Move_IRON_HEAD: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT @@ -3481,7 +3481,7 @@ Move_IRON_HEAD: createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 waitforvisualfinish end - + Move_MAGNET_BOMB: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 @@ -3546,7 +3546,7 @@ Move_MAGNET_BOMB: createsprite gOctazookaSmokeSpriteTemplate, 130, 4, -8, 8, 1, 0 waitforvisualfinish end - + Move_STONE_EDGE: loadspritegfx ANIM_TAG_STONE_EDGE loadspritegfx ANIM_TAG_IMPACT @@ -3605,7 +3605,7 @@ Move_STONE_EDGE: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_CAPTIVATE: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_SPARKLE_2 @@ -3638,7 +3638,7 @@ Move_STEALTH_ROCK: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Move_GRASS_KNOT: loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT @@ -3651,7 +3651,7 @@ Move_GRASS_KNOT: waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 3, 0, 1, 4 end - + Move_CHATTER: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING @@ -3691,7 +3691,7 @@ Move_CHATTER: createsprite gChatterSingNotesTemplate, ANIM_TARGET, 2, 20, 2, 0 clearmonbg ANIM_DEF_PARTNER end - + Move_JUDGMENT: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -3787,7 +3787,7 @@ JudgmentInwardSpikes2: createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF2A, 0xFFAA, 16 @between left and upper left createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFDA, 0xFF94, 16 @between up and upper left return - + Move_BUG_BITE: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT @@ -3828,7 +3828,7 @@ Move_BUG_BITE: clearmonbg ANIM_TARGET blendoff end - + Move_CHARGE_BEAM: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 @@ -3881,7 +3881,7 @@ Move_CHARGE_BEAM: call ElectricityEffect waitforvisualfinish end - + Move_WOOD_HAMMER: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -3907,7 +3907,7 @@ Move_WOOD_HAMMER: clearmonbg ANIM_TARGET blendoff end - + Move_AQUA_JET: loadspritegfx ANIM_TAG_SPARKLE_6 loadspritegfx ANIM_TAG_ROUND_SHADOW @@ -3940,7 +3940,7 @@ Move_AQUA_JET: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_ATTACK_ORDER: loadspritegfx ANIM_TAG_ATTACK_ORDER loadspritegfx ANIM_TAG_IMPACT @@ -3986,7 +3986,7 @@ Move_ATTACK_ORDER: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_DEFEND_ORDER: loadspritegfx ANIM_TAG_ATTACK_ORDER loadspritegfx ANIM_TAG_IMPACT @@ -4023,7 +4023,7 @@ Move_DEFEND_ORDER: call BideSetUp waitforvisualfinish end - + Move_HEAL_ORDER: loadspritegfx ANIM_TAG_ATTACK_ORDER loadspritegfx ANIM_TAG_IMPACT @@ -4060,7 +4060,7 @@ Move_HEAL_ORDER: call HealingEffect waitforvisualfinish end - + Move_HEAD_SMASH: loadspritegfx ANIM_TAG_IMPACT call SetImpactBackground @@ -4082,7 +4082,7 @@ Move_HEAD_SMASH: restorebg waitbgfadein end - + Move_DOUBLE_HIT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -4104,7 +4104,7 @@ Move_DOUBLE_HIT: clearmonbg ANIM_TARGET blendoff end - + Move_ROAR_OF_TIME: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_EXPLOSION @@ -4220,7 +4220,7 @@ Move_LUNAR_DANCE: clearmonbg ANIM_ATTACKER delay 1 end - + Move_CRUSH_GRIP: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_ACCUPRESSURE @@ -4245,7 +4245,7 @@ Move_CRUSH_GRIP: waitforvisualfinish blendoff end - + Move_MAGMA_STORM: loadspritegfx ANIM_TAG_SMALL_EMBER fadetobg BG_MAGMA_STORM @Add new bg @@ -4270,7 +4270,7 @@ Move_MAGMA_STORM: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_DARK_VOID: loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @Black Colour @@ -4297,7 +4297,7 @@ Move_DARK_VOID: visible ANIM_TARGET visible ANIM_DEF_PARTNER end - + Move_SEED_FLARE: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge animation loadspritegfx ANIM_TAG_LEAF @green color @@ -4382,7 +4382,7 @@ Move_SEED_FLARE: clearmonbg ANIM_ATTACKER blendoff end - + Move_OMINOUS_WIND: loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B 132, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET 2, 0 @@ -4441,7 +4441,7 @@ OminousWindHit: setarg 7, -1 waitbgfadein end - + Move_SHADOW_FORCE: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT @@ -4494,7 +4494,7 @@ ShadowForceBg: createvisualtask AnimTask_FadeScreenToWhite, 5 waitbgfadein return - + @@@@@@@@@@@@@@@@@@@@@@@ GEN 5 @@@@@@@@@@@@@@@@@@@@@@@ Move_HONE_CLAWS: loadspritegfx ANIM_TAG_SWIPE @@ -4516,7 +4516,7 @@ HoneClawsAnim: createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0 delay 10 return - + Move_WIDE_GUARD: loadspritegfx ANIM_TAG_ICE_SPIKES @motion from icy wind loadspritegfx ANIM_TAG_PINK_PETAL @pink color @@ -4566,8 +4566,7 @@ Move_WIDE_GUARD: clearmonbg ANIM_ATTACKER blendoff end - - + Move_GUARD_SPLIT:: loadspritegfx ANIM_TAG_BLUEGREEN_ORB createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 0x1, 0x0, 0xC, 0x0 @@ -4592,7 +4591,6 @@ GuardSplitLaunch: delay 0x5 return - Move_POWER_SPLIT:: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_BLUEGREEN_ORB @@ -4618,7 +4616,6 @@ PowerSplitLaunch: delay 5 return - Move_WONDER_ROOM:: call InitRoomAnimation fadetobg BG_WONDER_ROOM @@ -4628,8 +4625,7 @@ Move_WONDER_ROOM:: waitbgfadein blendoff end - - + Move_PSYSHOCK: monbg ANIM_TARGET setalpha 8, 8 @@ -4671,8 +4667,7 @@ Move_VENOSHOCK: waitforvisualfinish delay 15 end - - + Move_AUTOTOMIZE: loadspritegfx ANIM_TAG_METAL_BITS @Metal Bits setalpha 12, 8 @@ -4698,7 +4693,6 @@ Move_AUTOTOMIZE: blendoff end - Move_RAGE_POWDER:: loadspritegfx ANIM_TAG_SPORE @Powder loadspritegfx ANIM_TAG_HEART_STAMP @Red Colour @@ -4762,7 +4756,7 @@ Move_SMACK_DOWN:: createvisualtask AnimTask_StartSlidingBg, 5, 0x0, 0x0, 0x0, 0xffff createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 goto SeismicTossWeak - + Move_STORM_THROW: call StormThorwAnim call StormThorwAnim @@ -4785,7 +4779,7 @@ StormThorwAnim: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 delay 8 return - + Move_FLAME_BURST: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_EXPLOSION @@ -4814,14 +4808,13 @@ Move_FLAME_BURST: playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET waitforvisualfinish end - + Move_SLUDGE_WAVE: panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 createvisualtask AnimTask_CreateSurfWave, 0x2, ANIM_SURF_PAL_SLUDGE_WAVE waitforvisualfinish end - - + Move_QUIVER_DANCE: loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER @@ -4844,7 +4837,7 @@ Move_QUIVER_DANCE: clearmonbg ANIM_ATTACKER call UnsetBugBg end - + Move_HEAVY_SLAM: loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_IMPACT @@ -4874,7 +4867,7 @@ Move_HEAVY_SLAM: clearmonbg ANIM_TARGET blendoff end - + Move_SYCHRONOISE: loadspritegfx ANIM_TAG_THIN_RING @hypervoice ring loadspritegfx ANIM_TAG_SPARK_2 @yellow color @@ -4913,8 +4906,7 @@ Move_SYCHRONOISE: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - - + Move_ELECTRO_BALL: loadspritegfx ANIM_TAG_SPARK_2 @yelow loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge @@ -4941,7 +4933,7 @@ Move_ELECTRO_BALL: clearmonbg ANIM_TARGET blendoff end - + Move_SOAK: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WATER_IMPACT @@ -4976,7 +4968,7 @@ Move_SOAK: clearmonbg ANIM_TARGET blendoff end - + Move_FLAME_CHARGE: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT @@ -5010,7 +5002,6 @@ FlameChargeSwirl: launchtemplate gFlameChargeEmberTemplate 0x2 0x4 0x0 0xffe8 0x8 0x8c return - Move_COIL: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 0x6, 0x4 @@ -5029,8 +5020,7 @@ Move_COIL: setarg 0x7 0xffff waitforvisualfinish end - - + Move_LOW_SWEEP: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -5042,7 +5032,7 @@ Move_LOW_SWEEP: waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end - + Move_ACID_SPRAY: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET @@ -5068,7 +5058,7 @@ Move_ACID_SPRAY: waitforvisualfinish clearmonbg ANIM_TARGET end - + Move_FOUL_PLAY: loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_THIN_RING @@ -5091,8 +5081,7 @@ Move_FOUL_PLAY: clearmonbg ANIM_TARGET blendoff end - - + Move_SIMPLE_BEAM: loadspritegfx ANIM_TAG_GOLD_RING @psybeam loadspritegfx ANIM_TAG_ROCKS @brown color @@ -5138,8 +5127,7 @@ SimpleBeamWithRings: launchtemplate gSimpleBeamPinkRingTemplate 0x3 0x6 0x0 0x0 0x1 0x0 0x1F 0x8 delay 0x2 return - - + Move_ENTRAINMENT: createvisualtask AnimTask_TeeterDanceMovement, 5 playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER @@ -5154,8 +5142,7 @@ Move_ENTRAINMENT: launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x3 0x0 0x1f 0x1 waitforvisualfinish end - - + Move_AFTER_YOU: loadspritegfx ANIM_TAG_ANGER @rage loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @green color @@ -5171,7 +5158,6 @@ Move_AFTER_YOU: waitforvisualfinish end - Move_ROUND: loadspritegfx ANIM_TAG_MUSIC_NOTES createvisualtask AnimTask_MusicNotesRainbowBlend, 2 @@ -5193,7 +5179,7 @@ Move_ROUND: createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2 waitforvisualfinish end - + Move_ECHOED_VOICE: loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_DEF_PARTNER @@ -5213,7 +5199,7 @@ MetalSoundPlayNote: launchtemplate gMetalSoundSpriteTemplate 0x82 0x6 0x10 0x0 0x0 0x0 0x1e 0x0 delay 0x2 return - + Move_CHIP_AWAY: loadspritegfx ANIM_TAG_IMPACT launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_ATK 0x2 0x0 0x9 0x7FFF @@ -5231,7 +5217,7 @@ Move_CHIP_AWAY: waitforvisualfinish blendoff end - + Move_CLEAR_SMOG: loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_TARGET @@ -5259,7 +5245,7 @@ ClearSmogCloud: createsprite gMistCloudSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 48, 240, 1, 0 delay 7 return - + Move_STORED_POWER: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT @@ -5289,7 +5275,7 @@ Move_STORED_POWER: call UnsetPsychicBg waitforvisualfinish end - + Move_QUICK_GUARD: loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @hand loadspritegfx ANIM_TAG_SPARKLE_4 @sparkles @@ -5319,12 +5305,10 @@ Move_QUICK_GUARD: blendoff clearmonbg ANIM_ATTACKER end - - + Move_ALLY_SWITCH: end - - + Move_SCALD: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT @@ -5366,14 +5350,14 @@ ScaldBeams: createsprite gHydroPumpOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, 0 delay 1 return - + ScaldHitSplats: createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 1 return - + Move_SHELL_SMASH: end - + Move_HEAL_PULSE: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR @@ -5404,7 +5388,7 @@ Move_HEAL_PULSE: waitsound call HealingEffect2 end - + Move_HEX: loadspritegfx ANIM_TAG_PURPLE_FLAME loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT @@ -5425,7 +5409,7 @@ Move_HEX: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x0 0x10 0x0 0x4C4A @;Deep purple waitforvisualfinish end - + Move_SKY_DROP: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT @@ -5458,7 +5442,7 @@ SkyDropUnleash: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_SHIFT_GEAR: loadspritegfx ANIM_TAG_GEAR @Gear monbg ANIM_ATTACKER @@ -5468,8 +5452,7 @@ Move_SHIFT_GEAR: waitforvisualfinish clearmonbg ANIM_ATTACKER end - - + Move_CIRCLE_THROW: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_THIN_RING @@ -5496,8 +5479,7 @@ Move_CIRCLE_THROW: clearmonbg ANIM_DEF_PARTNER blendoff end - - + Move_INCINERATE: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET @@ -5537,7 +5519,7 @@ Move_INCINERATE: clearmonbg ANIM_TARGET blendoff end - + Move_QUASH: loadspritegfx ANIM_TAG_ASSURANCE_HAND @hand fadetobg BG_DARK @@ -5554,7 +5536,7 @@ Move_QUASH: restorebg waitbgfadein end - + Move_ACROBATICS: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT @@ -5573,7 +5555,7 @@ Move_ACROBATICS: clearmonbg ANIM_TARGET blendoff end - + Move_REFLECT_TYPE: loadspritegfx ANIM_TAG_GUARD_RING @ring around user loadspritegfx ANIM_TAG_ICE_CHUNK @blue green color @@ -5611,8 +5593,7 @@ Move_REFLECT_TYPE: clearmonbg ANIM_ATTACKER blendoff end - - + Move_RETALITATE: loadspritegfx ANIM_TAG_CUT @Cut monbg ANIM_DEF_PARTNER @@ -5633,8 +5614,7 @@ Move_RETALITATE: clearmonbg ANIM_DEF_PARTNER blendoff end - - + Move_FINAL_GAMBIT: loadspritegfx ANIM_TAG_PINK_CLOUD @yawn animation loadspritegfx ANIM_TAG_WATER_IMPACT @blue colour @@ -5661,8 +5641,7 @@ Move_FINAL_GAMBIT: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xC 0x0 0x0 waitforvisualfinish end - - + Move_BESTOW: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -5672,8 +5651,7 @@ Move_BESTOW: unloadspritegfx ANIM_TAG_ITEM_BAG @;The generated item sprite uses this tag clearmonbg ANIM_TARGET end - - + Move_INFERNO: loadspritegfx ANIM_TAG_SMALL_EMBER call SetImpactBackground @@ -5717,7 +5695,7 @@ InfernoAnim: createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0, 28, 528, 30, 13, 25, 1 delay 1 return - + Move_WATER_PLEDGE: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT @@ -5738,14 +5716,14 @@ Move_WATER_PLEDGE: delay 4 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1 - + createsprite gWaterPledgeOrbSpriteTemplate, ANIM_TARGET, 3, -24, 10, -40, 2 delay 4 createsprite gWaterPledgeOrbSpriteTemplate, ANIM_TARGET, 3, -24, 10, -40, 2 delay 4 createsprite gWaterPledgeOrbSpriteTemplate, ANIM_TARGET, 3, -24, 10, -40, 2 delay 4 - + createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1 createsprite gWaterPledgeOrbSpriteTemplate, ANIM_TARGET, 3, -24, 10, -40, 2 @@ -5837,7 +5815,7 @@ Move_WATER_PLEDGE: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_FIRE_PLEDGE: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER @@ -5936,7 +5914,7 @@ Move_FIRE_PLEDGE: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_GRASS_PLEDGE: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_WHIP_HIT @@ -6039,7 +6017,7 @@ Move_GRASS_PLEDGE: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_VOLT_SWITCH: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 @@ -6078,7 +6056,7 @@ VoltSwitchLast: VoltSwitchAgainstPartner: createvisualtask AnimTask_SlideOffScreen, 5, ANIM_ATTACKER, +2 goto VoltSwitchContinue - + Move_STRUGGLE_BUG: loadspritegfx ANIM_TAG_MOVEMENT_WAVES loadspritegfx ANIM_TAG_IMPACT @@ -6099,14 +6077,12 @@ Move_STRUGGLE_BUG: clearmonbg ANIM_TARGET blendoff end - - + Move_BULLDOZE: launchtask AnimTask_Splash 0x2 0x2 0x0 0x3 delay 0x8 goto Move_EARTHQUAKE - - + Move_FROST_BREATH: loadspritegfx ANIM_TAG_ICE_CHUNK loadspritegfx ANIM_TAG_SMALL_EMBER @@ -6144,8 +6120,7 @@ Move_FROST_BREATH: waitforvisualfinish call UnsetPsychicBg end - - + Move_DRAGON_TAIL: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_SLAM_HIT @@ -6181,8 +6156,7 @@ TailWhackDown: launchtemplate gRockScatterSpriteTemplate, 0x82, 4, -4, 30, 2, 3 launchtemplate gRockScatterSpriteTemplate, 0x82, 4, 12, 25, 4, 4 return - - + Move_WORK_UP: loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER @@ -6216,7 +6190,7 @@ Move_WORK_UP: createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, 12, 26, 3 waitforvisualfinish end - + Move_ELECTROWEB: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD @@ -6234,15 +6208,15 @@ Move_ELECTROWEB: clearmonbg ANIM_DEF_PARTNER delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK - + @ ElectricityEffect looks ugly against both opponents, to do later jumpifdoublebattle Move_ELECTROWEB_Wait - + call ElectricityEffect Move_ELECTROWEB_Wait: waitforvisualfinish end - + Move_WILD_CHARGE: loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -6277,7 +6251,7 @@ Move_WILD_CHARGE: ScreenFlash: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xC 0x0 0x07FE return - + Move_DRILL_RUN: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT @@ -6332,8 +6306,7 @@ Move_DRILL_RUN: waitforvisualfinish call UnsetPsychicBg end - - + Move_DUAL_CHOP: loadspritegfx ANIM_TAG_HANDS_AND_FEET @hand loadspritegfx ANIM_TAG_IMPACT @hit @@ -6355,8 +6328,7 @@ Move_DUAL_CHOP: clearmonbg ANIM_DEF_PARTNER blendoff end - - + Move_HEART_STAMP: loadspritegfx ANIM_TAG_HEART_STAMP monbg ANIM_TARGET @@ -6370,7 +6342,6 @@ Move_HEART_STAMP: waitforvisualfinish end - Move_HORN_LEECH: loadspritegfx ANIM_TAG_HORN_LEECH @Horn loadspritegfx ANIM_TAG_IMPACT @hit @@ -6387,8 +6358,7 @@ Move_HORN_LEECH: call HealingEffect waitforvisualfinish end - - + Move_SACRED_SWORD: loadspritegfx ANIM_TAG_CUT @Cut loadspritegfx ANIM_TAG_SWORD @Sword @@ -6414,8 +6384,7 @@ Move_SACRED_SWORD: blendoff waitforvisualfinish end - - + Move_RAZOR_SHELL: loadspritegfx ANIM_TAG_RAZOR_SHELL loadspritegfx ANIM_TAG_CUT @@ -6429,8 +6398,7 @@ Move_RAZOR_SHELL: clearmonbg ANIM_TARGET waitforvisualfinish end - - + Move_HEAT_CRASH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WARM_ROCK @@ -6454,8 +6422,7 @@ Move_HEAT_CRASH: clearmonbg ANIM_TARGET blendoff end - - + Move_LEAF_TORNADO: loadspritegfx ANIM_TAG_GUST @Gust loadspritegfx ANIM_TAG_LEAF @Leaves @@ -6486,8 +6453,7 @@ LeafTornadoVortex: launchtemplate gLeafTornadoVortexTemplate 0x82 0x7 0x0 0x21 0x1d0 0x1e 0xf 0xffce 0x1 delay 0x2 return - - + Move_STEAMROLLER: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET @@ -6513,7 +6479,7 @@ Move_STEAMROLLER: clearmonbg ANIM_TARGET blendoff end - + Move_COTTON_GUARD: loadspritegfx ANIM_TAG_SPORE monbg ANIM_ATK_PARTNER @@ -6543,8 +6509,7 @@ CottonSporesSpiralInward: launchtemplate gCottonGuardSporeTemplate 0x2 0x3 0x5 0xffd8 0xd delay 0x3 return - - + Move_NIGHT_DAZE: loadspritegfx ANIM_TAG_THIN_RING @uproar loadspritegfx ANIM_TAG_PURPLE_FLAME @dark violet color @@ -6582,8 +6547,7 @@ Move_NIGHT_DAZE: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xC 0x0 0x0 waitforvisualfinish end - - + Move_PSYSTRIKE: monbg ANIM_TARGET setalpha 8, 8 @@ -6600,7 +6564,7 @@ Move_PSYSTRIKE: clearmonbg ANIM_TARGET blendoff end - + Move_TAIL_SLAP: loadspritegfx ANIM_TAG_IMPACT @Hit loadspritegfx ANIM_TAG_AIR_WAVE_2 @Aeroblast @@ -6621,8 +6585,7 @@ TailSlapRight: TailSlapLeft: launchtemplate gTailSlapTemplate 0x2 0x4 0x8 0x0 0x1 0x0 goto TailSlapContinue - - + Move_HURRICANE: loadspritegfx ANIM_TAG_GUST monbg ANIM_DEF_PARTNER @@ -6655,8 +6618,7 @@ HurricaneGust: launchtemplate gPoisonBubbleSpriteTemplate 0x82, 2 0 0xfff0 launchtask AnimTask_AnimateGustTornadoPalette 5 2 1 0x46 return - - + Move_HEAD_CHARGE: loadspritegfx ANIM_TAG_IMPACT fadetobgfromset BG_GIGA_IMPACT_OPPONENT, BG_GIGA_IMPACT_PLAYER, BG_GIGA_IMPACT_OPPONENT @@ -6676,8 +6638,7 @@ Move_HEAD_CHARGE: restorebg waitbgfadeout end - - + Move_GEAR_GRIND: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_GEAR @Gear @@ -6700,8 +6661,7 @@ Move_GEAR_GRIND: clearmonbg ANIM_TARGET blendoff end - - + Move_SEARING_SHOT: loadspritegfx ANIM_TAG_SPARK_2 @yellow color loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE @red color @@ -6787,8 +6747,7 @@ Move_SEARING_SHOT: clearmonbg ANIM_ATK_PARTNER blendoff end - - + Move_TECHNO_BLAST: launchtask AnimTask_TechnoBlast 0x5 0x0 jumpargeq 0x0, 10, TechnoBlastFire @@ -6895,7 +6854,7 @@ TechnoBlastWhiteCircles: launchtemplate gTechnoBlastWhiteCircleTemplate 0x2 0x3 0xffd8 0xffec 0x10 delay 0x2 return - + TechnoBlastElectric: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge animation loadspritegfx ANIM_TAG_ORBS @circles @@ -6973,7 +6932,7 @@ TechnoBlastCharging2: delay 0x0 launchtemplate gSparkElectricitySpriteTemplate 0x0 0x7 0xee 0x18 0xa5 0xa 0x0 0x1 0x1 return - + TechnoBlastWater: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge animation loadspritegfx ANIM_TAG_WATER_ORB @blue color @@ -7093,7 +7052,7 @@ TechnoBlastWater: blendoff clearmonbg ANIM_ATTACKER end - + TechnoBlastFire: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE @red color loadspritegfx ANIM_TAG_SMALL_RED_EYE @another red color @@ -7251,8 +7210,7 @@ TechnoBlastIceChargeParticles: playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 0x4 return - - + Move_RELIC_SONG: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING @@ -7333,8 +7291,7 @@ Move_RELIC_SONG: launchtask AnimTask_MusicNotesClearRainbowBlend 0x2 0x0 waitforvisualfinish end - - + Move_SECRET_SWORD: loadspritegfx ANIM_TAG_CUT @Cut loadspritegfx ANIM_TAG_SWORD @Sword @@ -7363,8 +7320,7 @@ Move_SECRET_SWORD: blendoff waitforvisualfinish end - - + Move_GLACIATE: loadspritegfx ANIM_TAG_ICE_CRYSTALS @ice loadspritegfx ANIM_TAG_BLACK_SMOKE @smoke @@ -7395,8 +7351,7 @@ Move_GLACIATE: clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBg end - - + Move_BOLT_STRIKE:: loadspritegfx ANIM_TAG_SPARK_2 @Electricity loadspritegfx ANIM_TAG_IMPACT @Hit @@ -7439,8 +7394,7 @@ Move_BOLT_STRIKE:: blendoff waitforvisualfinish end - - + Move_BLUE_FLARE:: loadspritegfx ANIM_TAG_SMALL_EMBER @Fire loadspritegfx ANIM_TAG_METAL_BITS @Blue Flare Colour @@ -7511,7 +7465,6 @@ BlueFlareFlameSpreadEffect: launchtemplate gBlueFlareBurnTemplate 0x81 0x5 0x0 0xa 0x70 0xff80 0x28 return - Move_FIERY_DANCE:: loadspritegfx ANIM_TAG_SMALL_EMBER launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0xc 0x14be @@ -7531,8 +7484,7 @@ Move_FIERY_DANCE:: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xc 0x0 0x14be waitforvisualfinish end - - + Move_FREEZE_SHOCK:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 @@ -7574,7 +7526,6 @@ FreezeShockAttack: waitforvisualfinish end - Move_ICE_BURN:: loadspritegfx ANIM_TAG_BLACK_SMOKE @smoke loadspritegfx ANIM_TAG_ICE_CHUNK @white color @@ -7641,7 +7592,6 @@ IceBurnUnleash: clearmonbg ANIM_TARGET end - Move_SNARL:: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING @@ -7685,8 +7635,7 @@ Move_SNARL:: clearmonbg ANIM_DEF_PARTNER blendoff end - - + Move_ICICLE_CRASH:: loadspritegfx ANIM_TAG_ICICLE_SPEAR @Icicle fadetobg BG_ICE @@ -7738,7 +7687,6 @@ LaunchIcicleCrashSpear: playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 0x2 return - Move_V_CREATE:: loadspritegfx ANIM_TAG_SMALL_EMBER @fire blast flame @@ -7818,8 +7766,6 @@ VCreateFlames: delay 0x3 return - - Move_FUSION_FLARE:: loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @ball @@ -7877,8 +7823,7 @@ FusionFlareBuff: delay 0x4 launchtemplate gEndureEnergySpriteTemplate 0x2 0x4 0x0 0xfff4 0x0 0x1 return - - + Move_FUSION_BOLT:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -7925,7 +7870,6 @@ Move_FUSION_BOLT:: waitforvisualfinish end - @@@@@@@@@@@@@@@@@@@@@@@ GEN 6 @@@@@@@@@@@@@@@@@@@@@@@ Move_FLYING_PRESS:: loadspritegfx ANIM_TAG_ROUND_SHADOW @fly/bounce @@ -7959,8 +7903,7 @@ Move_FLYING_PRESS:: waitforvisualfinish blendoff end - - + Move_MAT_BLOCK:: loadspritegfx ANIM_TAG_CONVERSION loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL @green color @@ -7991,7 +7934,6 @@ Move_MAT_BLOCK:: blendoff end - Move_BELCH:: loadspritegfx ANIM_TAG_BERRY_NORMAL loadspritegfx ANIM_TAG_EXPLOSION @Explosion @@ -8024,7 +7966,6 @@ Move_BELCH:: blendoff end - Move_ROTOTILLER:: loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_DIRT_MOUND @@ -8043,8 +7984,7 @@ Move_ROTOTILLER:: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x10 0x0 0x112C waitforvisualfinish end - - + Move_STICKY_WEB: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD @@ -8082,7 +8022,7 @@ Move_STICKY_WEB: delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end - + Move_FELL_STINGER: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT @@ -8103,7 +8043,7 @@ Move_FELL_STINGER: waitbgfadein clearmonbg ANIM_TARGET end - + Move_PHANTOM_FORCE: choosetwoturnanim PhantomForceSetUp, PhantomForceUnleash PhantomForceEnd: @@ -8114,10 +8054,10 @@ PhantomForceSetUp: PhantomForceUnleash: visible ANIM_ATTACKER goto PhantomForceEnd - + Move_TRICK_OR_TREAT: end - + Move_NOBLE_ROAR: loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_ATTACKER @@ -8138,10 +8078,10 @@ Move_NOBLE_ROAR: waitforvisualfinish delay 20 end - + Move_ION_DELUGE: end - + Move_PARABOLIC_CHARGE: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -8196,7 +8136,7 @@ ParabolicChargeDouble: delay 4 createvisualtask AnimTask_BlendBattleAnimPal, 5, 4 | 8 | 0x10, 0, 0, 0, RGB_BLACK goto ParabolicChargeHeal; - + Move_FORESTS_CURSE: loadspritegfx ANIM_TAG_ROOTS @frenzy plant loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT @curse @@ -8235,7 +8175,6 @@ Move_FORESTS_CURSE: clearmonbg ANIM_ATTACKER end - Move_PETAL_BLIZZARD:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_IMPACT @@ -8283,7 +8222,6 @@ Move_PETAL_BLIZZARD:: blendoff end - Move_FREEZE_DRY:: monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -8320,7 +8258,6 @@ Move_FREEZE_DRY:: blendoff end - Move_DISARMING_VOICE:: loadspritegfx ANIM_TAG_NOISE_LINE launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0x8 0x6e7d @@ -8336,8 +8273,7 @@ Move_DISARMING_VOICE:: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x8 0x0 0x6e7d waitforvisualfinish end - - + Move_PARTING_SHOT: loadspritegfx ANIM_TAG_NOISE_LINE fadetobg BG_DARK @@ -8355,7 +8291,7 @@ Move_PARTING_SHOT: restorebg waitbgfadein end - + Move_TOPSY_TURVY: loadspritegfx ANIM_TAG_SWEAT_DROP setalpha 12, 8 @@ -8372,7 +8308,7 @@ Move_TOPSY_TURVY: waitforvisualfinish blendoff end - + Move_DRAINING_KISS: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR @@ -8402,7 +8338,7 @@ Move_DRAINING_KISS: call HealingEffect waitforvisualfinish end - + Move_CRAFTY_SHIELD:: loadspritegfx ANIM_TAG_CRAFTY_SHIELD monbg ANIM_ATK_PARTNER @@ -8458,7 +8394,6 @@ Move_CRAFTY_SHIELD:: blendoff end - Move_FLOWER_SHIELD:: loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_IMPACT @@ -8488,8 +8423,7 @@ Move_FLOWER_SHIELD:: waitforvisualfinish blendoff end - - + Move_GRASSY_TERRAIN:: loadspritegfx ANIM_TAG_ORBS @Recover Ball loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star @@ -8526,7 +8460,7 @@ Move_GRASSY_TERRAIN:: createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 4, 0, RGB(31, 24, 31) waitforvisualfinish end - + Move_MISTY_TERRAIN:: loadspritegfx ANIM_TAG_ORBS @Recover Ball loadspritegfx ANIM_TAG_WATER_GUN @Light Blue Colour @@ -8565,7 +8499,6 @@ Move_MISTY_TERRAIN:: waitforvisualfinish end - Move_ELECTRIFY:: loadspritegfx ANIM_TAG_GUARD_RING @ring around user loadspritegfx ANIM_TAG_SPARK_2 @yellow color @@ -8628,8 +8561,7 @@ Move_ELECTRIFY:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - - + Move_PLAY_ROUGH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_PINK_HEART @@ -8685,8 +8617,7 @@ Move_PLAY_ROUGH:: blendoff waitforvisualfinish end - - + Move_FAIRY_WIND:: loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_DEF_PARTNER @@ -8714,7 +8645,6 @@ Move_FAIRY_WIND:: blendoff end - Move_MOONBLAST: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_MOON @@ -8737,7 +8667,7 @@ Move_MOONBLAST: waitforvisualfinish blendoff end - + Move_BOOMBURST: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_THIN_RING @@ -8788,7 +8718,7 @@ Boomburst_Doubles: playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 goto Boomburst_Last - + Move_FAIRY_LOCK:: loadspritegfx ANIM_TAG_CHAIN_LINK @Chain Colour loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS @Fairy Lock Chain @@ -8810,14 +8740,12 @@ Move_FAIRY_LOCK:: clearmonbg ANIM_ATK_PARTNER blendoff end - - + Move_KINGS_SHIELD:: loadspritegfx ANIM_TAG_PROTECT @protect createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0x0, 0xC, 0xC, 0x318C @Gray goto Move_PROTECT - - + Move_PLAY_NICE:: loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_M_SANDSTORM, SOUND_PAN_ATTACKER, 0xc, 0x3 @@ -8825,7 +8753,7 @@ Move_PLAY_NICE:: delay 0xF launchtemplate gRedHeartProjectileSpriteTemplate 0x83 0x2 0x14 0xfff8 end - + Move_CONFIDE:: loadspritegfx ANIM_TAG_CONFIDE @Confide Bubble launchtask AnimTask_Splash 0x2 0x2 ANIM_ATTACKER 0x3 @@ -8834,7 +8762,6 @@ Move_CONFIDE:: waitforvisualfinish end - Move_DIAMOND_STORM:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -8907,8 +8834,7 @@ Move_DIAMOND_STORM:: clearmonbg ANIM_DEF_PARTNER blendoff end - - + Move_STEAM_ERUPTION:: loadspritegfx ANIM_TAG_STEAM_ERUPTION @Steam Eruption Particle launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0x7 0x043D @@ -8949,7 +8875,6 @@ SteamEruptionBreath: delay 0x1 return - Move_HYPERSPACE_HOLE:: loadspritegfx ANIM_TAG_IMPACT @Hits loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond @@ -9003,7 +8928,6 @@ HyperspaceHoleMovement: delay 0x4 return - Move_WATER_SHURIKEN:: loadspritegfx ANIM_TAG_WATER_ORB @blue color loadspritegfx ANIM_TAG_YELLOW_STAR @swift @@ -9026,7 +8950,7 @@ Move_WATER_SHURIKEN:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Move_MYSTICAL_FIRE:: call SetPsychicBackground loadspritegfx ANIM_TAG_FIRE @@ -9057,7 +8981,6 @@ Move_MYSTICAL_FIRE:: call UnsetPsychicBg end - Move_SPIKY_SHIELD:: loadspritegfx ANIM_TAG_PROTECT loadspritegfx ANIM_TAG_GREEN_SPIKE @@ -9093,7 +9016,6 @@ Move_SPIKY_SHIELD:: clearmonbg ANIM_ATK_PARTNER end - Move_AROMATIC_MIST:: loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER @@ -9110,8 +9032,7 @@ Move_AROMATIC_MIST:: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x8 0x0 0x6E7D waitforvisualfinish end - - + Move_EERIE_IMPULSE:: loadspritegfx ANIM_TAG_THIN_RING @hypervoice circle loadspritegfx ANIM_TAG_SPARK @electric particles @@ -9157,7 +9078,6 @@ Move_EERIE_IMPULSE:: clearmonbg ANIM_DEF_PARTNER end - Move_VENOM_DRENCH:: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER @@ -9205,7 +9125,6 @@ AcidDrench: delay 0x2 return - Move_POWDER:: loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color loadspritegfx ANIM_TAG_SPORE @powder @@ -9227,7 +9146,6 @@ POWDER_SPORE: delay 0xc return - Move_GEOMANCY:: loadspritegfx ANIM_TAG_ZYGARDE_HEXES @Hex loadspritegfx ANIM_TAG_GUARD_RING @safeguard @@ -9358,7 +9276,6 @@ GeomancyRageBuff: delay 0x1 return - Move_MAGNETIC_FLUX:: loadspritegfx ANIM_TAG_THIN_RING @uproar loadspritegfx ANIM_TAG_SPARK_2 @ElectricityEffect @@ -9393,7 +9310,6 @@ MagneticFluxSparks2: launchtemplate gSparkElectricitySpriteTemplate 0x0 0x7 0xee 0x18 0xa5 0xa 0x0 0x1 0x1 return - Move_HAPPY_HOUR:: loadspritegfx ANIM_TAG_COIN monbg ANIM_ATTACKER @@ -9430,7 +9346,6 @@ CoinShower: delay 0x2 return - Move_ELECTRIC_TERRAIN:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER @@ -9467,7 +9382,6 @@ Move_ELECTRIC_TERRAIN:: waitforvisualfinish end - Move_DAZZLING_GLEAM:: loadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_BLUE_STAR @@ -9486,8 +9400,7 @@ Move_DAZZLING_GLEAM:: clearmonbg 0x0 blendoff end - - + Move_CELEBRATE:: loadspritegfx ANIM_TAG_ITEM_BAG launchtemplate gCelebrateBagTemplate 0x2 0x1 0x0 @@ -9498,7 +9411,6 @@ Move_CELEBRATE:: loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER 0x16 0x3 end - Move_HOLD_HANDS:: loadspritegfx ANIM_TAG_TAG_HAND @hand loadspritegfx ANIM_TAG_MAGENTA_HEART @charm @@ -9540,7 +9452,6 @@ Move_HOLD_HANDS:: launchtask AnimTask_BlendMonInAndOut 0x2 0x5 0x2 0x3ff 0xc 0x1 0x1 end - Move_BABY_DOLL_EYES:: loadspritegfx ANIM_TAG_LEER loadspritegfx ANIM_TAG_PINK_CLOUD @@ -9560,8 +9471,7 @@ Move_BABY_DOLL_EYES:: waitforvisualfinish blendoff end - - + Move_NUZZLE:: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG @@ -9582,8 +9492,7 @@ Move_NUZZLE:: call ElectricityEffectNoSound waitforvisualfinish end - - + Move_HOLD_BACK:: loadspritegfx ANIM_TAG_PAW_PRINT @ yellow/brown loadspritegfx ANIM_TAG_IMPACT @ hit @@ -9611,7 +9520,6 @@ Move_HOLD_BACK:: blendoff end - Move_INFESTATION:: loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color loadspritegfx ANIM_TAG_SMALL_BUBBLES @circle particles @@ -9645,7 +9553,6 @@ InfestationVortex: delay 0x1 return - Move_POWER_UP_PUNCH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -9662,7 +9569,7 @@ Move_POWER_UP_PUNCH: clearmonbg ANIM_TARGET blendoff end - + Move_OBLIVION_WING:: loadspritegfx ANIM_TAG_HYDRO_PUMP loadspritegfx ANIM_TAG_ROUND_SHADOW @@ -9703,7 +9610,6 @@ OblivionWingBeam: delay 0x2 return - Move_THOUSAND_ARROWS:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge animation loadspritegfx ANIM_TAG_ELECTRICITY @charge animation @@ -9792,7 +9698,6 @@ ThousandArrowsDown: playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER return - Move_THOUSAND_WAVES:: loadspritegfx ANIM_TAG_ZYGARDE_HEXES @Hex loadspritegfx ANIM_TAG_FLYING_DIRT @heat wave animation @@ -9922,7 +9827,6 @@ ThousandWavesRotatingImpact: launchtemplate gThousandWavesPoundImpactTemplate 0x82, 0x4, 0x1 0xfffa 0x0 0x3 return - Move_LANDS_WRATH:: loadspritegfx ANIM_TAG_WATER_ORB @whirl motion loadspritegfx ANIM_TAG_SPARK_2 @yellow color @@ -9962,7 +9866,6 @@ LandsWrathVortex: delay 0x2 return - Move_LIGHT_OF_RUIN:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge loadspritegfx ANIM_TAG_ELECTRIC_ORBS @launchtask particles @@ -10024,7 +9927,6 @@ LightOfRuinBeam: delay 0x1 return - Move_ORIGIN_PULSE:: loadspritegfx ANIM_TAG_THIN_RING @uproar loadspritegfx ANIM_TAG_WATER_ORB @blue color @@ -10096,7 +9998,6 @@ Move_ORIGIN_PULSE:: blendoff end - Move_PRECIPICE_BLADES:: loadspritegfx ANIM_TAG_LARGE_SPIKE loadspritegfx ANIM_TAG_FIRE_PLUME @@ -10153,7 +10054,6 @@ PrecipiceBladesOpponent: launchtemplate gPrecipiceBladesSpikeTemplate 0x45, 0x5, ANIM_ATTACKER, 0, -17, 120 0x0 goto PrecipiceBladesContinue - Move_DRAGON_ASCENT:: loadspritegfx ANIM_TAG_DRAGON_ASCENT loadspritegfx ANIM_TAG_IMPACT @@ -10194,7 +10094,6 @@ Move_DRAGON_ASCENT:: call UnsetPsychicBg end - Move_HYPERSPACE_FURY:: loadspritegfx ANIM_TAG_HOOPA_HAND @Hoopa Hand loadspritegfx ANIM_TAG_HOOPA_RING @Hoopa Ring @@ -10281,7 +10180,6 @@ HyperspaceFuryRandomImpact: launchtemplate gHyperspaceFuryImpactTemplate 0x83 0x2 0x1 0x1 return - @@@@@@@@@@@@@@@@@@@@@@@ GEN 7 @@@@@@@@@@@@@@@@@@@@@@@ Move_SHORE_UP:: loadspritegfx ANIM_TAG_FLYING_DIRT @sandstorm @@ -10305,8 +10203,7 @@ Move_SHORE_UP:: call HealingEffect waitforvisualfinish end - - + Move_FIRST_IMPRESSION:: loadspritegfx ANIM_TAG_SWEAT_BEAD @astonish loadspritegfx ANIM_TAG_IMPACT @pound hit @@ -10337,7 +10234,6 @@ Move_FIRST_IMPRESSION:: clearmonbg ANIM_TARGET end - Move_BANEFUL_BUNKER:: loadspritegfx ANIM_TAG_PROTECT @protect loadspritegfx ANIM_TAG_POISON_BUBBLE @poison @@ -10364,7 +10260,6 @@ Move_BANEFUL_BUNKER:: clearmonbg ANIM_ATK_PARTNER end - Move_SPIRIT_SHACKLE:: loadspritegfx ANIM_TAG_SPIRIT_ARROW @Arrow loadspritegfx ANIM_TAG_CHAIN_LINK @Chain @@ -10391,7 +10286,6 @@ Move_SPIRIT_SHACKLE:: blendoff end - Move_DARKEST_LARIAT:: fadetobg BG_DARK waitbgfadeout @@ -10430,7 +10324,6 @@ DarkestLariatImpact: delay 0x8 return - Move_SPARKLING_ARIA:: loadspritegfx ANIM_TAG_WATER_ORB @blue color loadspritegfx ANIM_TAG_BUBBLE @circles @@ -10523,7 +10416,6 @@ SparklingAriaCharge: delay 0x4 return - Move_ICE_HAMMER:: loadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST @punch loadspritegfx ANIM_TAG_ICE_CRYSTALS @ice @@ -10555,7 +10447,6 @@ Move_ICE_HAMMER:: blendoff end - Move_FLORAL_HEALING:: loadspritegfx ANIM_TAG_SPARKLE_2 @heal loadspritegfx ANIM_TAG_FLOWER @flowers @@ -10661,7 +10552,6 @@ CIRCLES_LEAVES: delay 0x2 return - Move_HIGH_HORSEPOWER:: loadspritegfx ANIM_TAG_IMPACT @hit loadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST @horseshoe @@ -10687,7 +10577,6 @@ Move_HIGH_HORSEPOWER:: waitbgfadein end - Move_STRENGTH_SAP:: loadspritegfx ANIM_TAG_GRAY_SMOKE @smoke loadspritegfx ANIM_TAG_TEAL_ALERT @inward @@ -10756,7 +10645,6 @@ Move_STRENGTH_SAP:: clearmonbg ANIM_DEF_PARTNER end - Move_SOLAR_BLADE:: loadspritegfx ANIM_TAG_ORBS choosetwoturnanim SolarBeamSetUp SolarBladeUnleash @@ -10795,7 +10683,6 @@ SolarBladeSunRays: delay 0x6 return - Move_LEAFAGE:: loadspritegfx ANIM_TAG_RAZOR_LEAF @leaf loadspritegfx ANIM_TAG_IMPACT @hit @@ -10811,7 +10698,6 @@ Move_LEAFAGE:: clearmonbg ANIM_DEF_PARTNER end - Move_SPOTLIGHT:: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_TAG_HAND @@ -10826,7 +10712,6 @@ Move_SPOTLIGHT:: launchtask AnimTask_RemoveSpotlight 0x2 0x0 end - Move_TOXIC_THREAD:: loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD @@ -10869,7 +10754,6 @@ Move_TOXIC_THREAD:: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x9 0x0 0x0 end - Move_LASER_FOCUS:: loadspritegfx ANIM_TAG_EYE_SPARKLE @red loadspritegfx ANIM_TAG_OPENING_EYE @eyes @@ -10887,7 +10771,6 @@ Move_LASER_FOCUS:: clearmonbg ANIM_ATTACKER end - Move_GEAR_UP:: loadspritegfx ANIM_TAG_GEAR loadspritegfx ANIM_TAG_SPARK_2 @sparks @@ -10941,7 +10824,6 @@ GearUpSparks: delay 0xF return - Move_THROAT_CHOP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET @karate chop loadspritegfx ANIM_TAG_IMPACT @hit @@ -10977,7 +10859,6 @@ Move_THROAT_CHOP:: blendoff end - Move_POLLEN_PUFF:: launchtask AnimTask_IsTargetSameSide 0x5 0x0 jumpargeq 0x0, 0x1, PollenPuffAlly @@ -11093,8 +10974,7 @@ PollenPuffAlly: clearmonbg ANIM_TARGET blendoff end - - + Move_ANCHOR_SHOT:: loadspritegfx ANIM_TAG_CHAIN_LINK loadspritegfx ANIM_TAG_ANCHOR @@ -11117,7 +10997,6 @@ Move_ANCHOR_SHOT:: clearmonbg ANIM_TARGET end - Move_PSYCHIC_TERRAIN:: loadspritegfx ANIM_TAG_ORBS @Recover Ball loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star @@ -11208,7 +11087,6 @@ Move_LUNGE:: clearmonbg ANIM_DEF_PARTNER end - Move_FIRE_LASH:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER @@ -11252,7 +11130,6 @@ Move_FIRE_LASH:: clearmonbg ANIM_DEF_PARTNER end - Move_POWER_TRIP:: loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color @@ -11294,7 +11171,6 @@ PowerTripBuffUp: launchtemplate gPowerTripFocusEnergyTemplate 0x2 0x4 0x0 0xfff4 0x0 0x1 return - Move_BURN_UP:: loadspritegfx ANIM_TAG_THIN_RING @ring loadspritegfx ANIM_TAG_SMALL_RED_EYE @red color @@ -11355,7 +11231,6 @@ Move_BURN_UP:: blendoff end - Move_SPEED_SWAP:: loadspritegfx ANIM_TAG_THIN_RING @ring loadspritegfx ANIM_TAG_ICE_CHUNK @blue green @@ -11390,7 +11265,6 @@ Move_SPEED_SWAP:: clearmonbg ANIM_TARGET end - Move_SMART_STRIKE:: loadspritegfx ANIM_TAG_POWER_GEM @gem loadspritegfx ANIM_TAG_AIR_WAVE @sonicboom @@ -11430,7 +11304,6 @@ Move_SMART_STRIKE:: waitforvisualfinish end - Move_PURIFY:: loadspritegfx ANIM_TAG_FLASH_CANNON_BALL @Ball loadspritegfx ANIM_TAG_BLACK_SMOKE @smoke @@ -11459,7 +11332,6 @@ Move_PURIFY:: blendoff end - Move_REVELATION_DANCE:: loadspritegfx ANIM_TAG_ORBS @circles loadspritegfx ANIM_TAG_FLOWER @particles @@ -11515,7 +11387,6 @@ Move_REVELATION_DANCE:: clearmonbg ANIM_TARGET end - Move_CORE_ENFORCER:: loadspritegfx ANIM_TAG_SPARK_2 @yellow color loadspritegfx ANIM_TAG_LEAF @green color @@ -11734,7 +11605,6 @@ Move_CORE_ENFORCER:: blendoff end - Move_TROP_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET @kick loadspritegfx ANIM_TAG_LEAF @leaves @@ -11756,7 +11626,6 @@ Move_TROP_KICK:: clearmonbg ANIM_DEF_PARTNER end - Move_INSTRUCT:: loadspritegfx ANIM_TAG_FINGER @finger loadspritegfx ANIM_TAG_SPOTLIGHT @spotlight @@ -11786,8 +11655,7 @@ Move_INSTRUCT:: clearmonbg ANIM_TARGET blendoff end - - + Move_BEAK_BLAST:: loadspritegfx ANIM_TAG_SMALL_EMBER @Fire playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER @@ -11817,8 +11685,7 @@ BeakBlastUnleash: launchtask AnimTask_BlendBattleAnimPal 0xA 0x5 ANIM_PAL_ATK 0x2 0x9 0x0 0x1F waitforvisualfinish end - - + Move_CLANGING_SCALES:: loadspritegfx ANIM_TAG_METAL_SOUND_WAVES @metal sound loadspritegfx ANIM_TAG_POISON_BUBBLE @purple color @@ -11848,7 +11715,6 @@ ClangingScalesMetalSound: delay 0x2 return - Move_DRAGON_HAMMER:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_GRAY_SMOKE @@ -11887,8 +11753,7 @@ Move_DRAGON_HAMMER:: call UnsetPsychicBg blendoff end - - + Move_BRUTAL_SWING:: loadspritegfx ANIM_TAG_IMPACT @hits loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color @@ -11924,7 +11789,6 @@ Move_BRUTAL_SWING:: clearmonbg ANIM_TARGET end - Move_AURORA_VEIL:: loadspritegfx ANIM_TAG_GUARD_RING fadetobg BG_AURORA @@ -11948,8 +11812,7 @@ Move_AURORA_VEIL:: clearmonbg ANIM_ATK_PARTNER blendoff end - - + Move_SHELL_TRAP:: ShellTrapChargeUp: loadspritegfx ANIM_TAG_SMALL_EMBER @@ -12143,7 +12006,6 @@ ShellTrapFireLaunch2: delay 0x3 return - Move_FLEUR_CANNON:: loadspritegfx ANIM_TAG_ORBS @beam particles loadspritegfx ANIM_TAG_ELECTRICITY @discharge @@ -12199,7 +12061,6 @@ FleurCannonBeam: delay 0x1 return - Move_PSYCHIC_FANGS:: loadspritegfx ANIM_TAG_SHARP_TEETH @Teeth loadspritegfx ANIM_TAG_IMPACT @Hit @@ -12252,8 +12113,7 @@ PsychicFangsDestroyWall: launchtask AnimTask_ShakeMon 0x5 0x5 ANIM_TARGET 0x0 0x8 0x4 0x2 delay 0x10 goto PsychicFangsEnd - - + Move_STOMPING_TANTRUM:: loadspritegfx ANIM_TAG_ROCKS @rock colour loadspritegfx ANIM_TAG_SMALL_ROCK @small rock @@ -12291,7 +12151,6 @@ StompingTantrumImpact: launchtemplate gRandomPosHitSplatSpriteTemplate 0x83 0x2 0x1 0x1 return - Move_SHADOW_BONE:: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT @@ -12317,8 +12176,7 @@ Move_SHADOW_BONE:: clearmonbg 0x3 blendoff end - - + Move_ACCELEROCK:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT @@ -12341,8 +12199,7 @@ Move_ACCELEROCK:: blendoff waitforvisualfinish end - - + Move_LIQUIDATION:: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -12361,8 +12218,7 @@ Move_LIQUIDATION:: clearmonbg ANIM_DEF_PARTNER blendoff end - - + Move_PRISMATIC_LASER:: loadspritegfx ANIM_TAG_ICE_CHUNK @blue green color loadspritegfx ANIM_TAG_SPARK_H @yellow color @@ -12485,7 +12341,6 @@ PrismaticLaserRain: launchtemplate gPrismaticLaserGreenRainTemplate 0x82, 0x4, -23, 0x28, 4, ANIM_TARGET return - Move_SPECTRAL_THIEF:: choosetwoturnanim SpectralThiefSteal SpectralThiefUnleash SpectralThiefUnleash: @@ -12607,7 +12462,6 @@ SpectralThiefBuffUp: launchtemplate gSpectralThiefBlackBuffTemplate 0x2 0x4 0x0 0xfff4 0x0 0x1 return - Move_SUNSTEEL_STRIKE:: loadspritegfx ANIM_TAG_ROUND_SHADOW @fly loadspritegfx ANIM_TAG_AIR_WAVE_2 @black color @@ -12672,7 +12526,6 @@ SunsteelStrikeBeam: delay 0x1 return - Move_MOONGEIST_BEAM:: loadspritegfx ANIM_TAG_MOON loadspritegfx ANIM_TAG_ELECTRIC_ORBS @@ -12754,7 +12607,6 @@ MoongeistBeamOrbs: delay 0x1 return - Move_TEARFUL_LOOK:: loadspritegfx ANIM_TAG_SMALL_BUBBLES @tears loadspritegfx ANIM_TAG_OPENING_EYE @eye @@ -12780,8 +12632,7 @@ Move_TEARFUL_LOOK:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - - + Move_ZING_ZAP:: loadspritegfx ANIM_TAG_SPARK_2 @sparks loadspritegfx ANIM_TAG_YELLOW_BALL @ball @@ -12834,7 +12685,6 @@ ZingZapSparks2: launchtemplate gSparkElectricitySpriteTemplate 0x0 0x7 0xee 0x18 0xa5 0xa 0x0 0x1 0x1 return - Move_NATURES_MADNESS:: loadspritegfx ANIM_TAG_ICE_CRYSTALS @small circles loadspritegfx ANIM_TAG_THIN_RING @ring @@ -12916,7 +12766,6 @@ Move_NATURES_MADNESS:: blendoff end - Move_MULTI_ATTACK:: loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy loadspritegfx ANIM_TAG_CUT @cut @@ -12953,8 +12802,7 @@ MultiAttackBuff: delay 0x4 launchtemplate gEndureEnergySpriteTemplate 0x2 0x4 0x0 0xfff4 0x0 0x1 return - - + Move_MIND_BLOWN:: loadspritegfx ANIM_TAG_PINK_HEART @pink color loadspritegfx ANIM_TAG_SMALL_BUBBLES @blue color @@ -13012,7 +12860,6 @@ MindBlownPinkOrbs: launchtemplate gMindBlownPinkOrbsTemplate 0x82 0x5 0x1 0x1 0xFFDA 0xFF94 0x8 @between up and upper left return - Move_PLASMA_FISTS:: loadspritegfx ANIM_TAG_SHOCK_3 @charge loadspritegfx ANIM_TAG_SPARK_2 @ElectricityEffect @@ -13098,7 +12945,6 @@ PlasmaFistsImpact: launchtemplate gBasicHitSplatSpriteTemplate 0x3 0x4 0x0 0x0 0x1 0x2 return - Move_PHOTON_GEYSER:: loadspritegfx ANIM_TAG_SHOCK_3 @charge loadspritegfx ANIM_TAG_SPARK_2 @ElectricityEffect @@ -13281,8 +13127,7 @@ Move_DOUBLE_IRON_BASH:: @@@@@@@@@@@@@@@@@@@@@@@ GEN 8 @@@@@@@@@@@@@@@@@@@@@@@ Move_DYNAMAX_CANNON:: goto Move_HYPER_BEAM - - + Move_SNIPE_SHOT:: loadspritegfx ANIM_TAG_IMPACT_2 loadspritegfx ANIM_TAG_LEER @@ -13301,7 +13146,6 @@ Move_SNIPE_SHOT:: waitforvisualfinish end - Move_JAW_LOCK:: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT @@ -13322,7 +13166,6 @@ Move_JAW_LOCK:: delay 0x1 end - Move_STUFF_CHEEKS:: loadspritegfx ANIM_TAG_BERRY_NORMAL loadspritegfx ANIM_TAG_SHARP_TEETH @@ -13361,7 +13204,6 @@ BiteOpponent: launchtemplate gSharpTeethSpriteTemplate 2 0x6 0xffDF 0x10 0x4 0x0 0xfccd 0xa return - Move_NO_RETREAT:: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER 0x7 0x12 @@ -13371,7 +13213,6 @@ Move_NO_RETREAT:: waitforvisualfinish end - Move_TAR_SHOT:: loadspritegfx ANIM_TAG_POISON_BUBBLE createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 15, 15, 0 @Black @@ -13395,8 +13236,7 @@ Move_TAR_SHOT:: waitforvisualfinish clearmonbg ANIM_TARGET end - - + Move_MAGIC_POWDER:: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_WATER_GUN @@ -13425,7 +13265,6 @@ Move_MAGIC_POWDER:: waitforvisualfinish end - Move_DRAGON_DARTS:: loadspritegfx ANIM_TAG_DREEPY loadspritegfx ANIM_TAG_EXPLOSION @@ -13438,11 +13277,9 @@ Move_DRAGON_DARTS:: waitforvisualfinish end - Move_TEATIME:: goto Move_MILK_DRINK - Move_OCTOLOCK:: loadspritegfx ANIM_TAG_TENDRILS createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_TENDRILS, 0, 12, 12, 0x3D98 @Pinkish Red @@ -13462,7 +13299,6 @@ Move_OCTOLOCK:: waitforvisualfinish end - Move_BOLT_BEAK:: loadspritegfx ANIM_TAG_HORN_HIT loadspritegfx ANIM_TAG_IMPACT @@ -13516,7 +13352,6 @@ BoltBeakSparks: delay 0x4 return - Move_FISHIOUS_REND:: loadspritegfx ANIM_TAG_SHARP_TEETH @Teeth loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -13571,11 +13406,9 @@ FishousRendBubbles: launchtemplate gSmallDriftingBubblesSpriteTemplate 0x4 0x2 0xA 0x0 return - Move_COURT_CHANGE:: goto Move_TRICK_ROOM - - + Move_CLANGOROUS_SOUL:: loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy loadspritegfx ANIM_TAG_WATER_ORB @blue @@ -13612,7 +13445,6 @@ ClangorousSoulStarBuffEffect: launchtemplate gGrantingStarsSpriteTemplate 0x2 0x6 0xc 0xfffb 0x0 0x0 0x20 0x3c return - Move_BODY_PRESS:: loadspritegfx ANIM_TAG_ROUND_SHADOW @fly and bounce animation loadspritegfx ANIM_TAG_GRAY_SMOKE @smoke @@ -13629,12 +13461,10 @@ Move_BODY_PRESS:: launchtask AnimTask_SquishTarget 0x2 0x0 waitforvisualfinish end - - + Move_DECORATE:: end @to do: - - + Move_DRUM_BEATING:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE @@ -13695,12 +13525,10 @@ Move_DRUM_BEATING:: clearmonbg ANIM_TARGET blendoff end - - + Move_SNAP_TRAP:: end @ to do: - - + Move_PYRO_BALL:: loadspritegfx ANIM_TAG_FLAT_ROCK loadspritegfx ANIM_TAG_SMALL_EMBER @@ -13729,15 +13557,12 @@ Move_PYRO_BALL:: waitforvisualfinish end - Move_BEHEMOTH_BLADE:: goto Move_SACRED_SWORD - - + Move_BEHEMOTH_BASH:: goto Move_SUNSTEEL_STRIKE - Move_AURA_WHEEL:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK @@ -13786,7 +13611,6 @@ Move_AURA_WHEEL:: blendoff end - Move_BREAKING_SWIPE:: loadspritegfx ANIM_TAG_IMPACT @hits loadspritegfx ANIM_TAG_SPARK_2 @@ -13816,8 +13640,7 @@ Move_BREAKING_SWIPE:: blendoff clearmonbg ANIM_TARGET end - - + Move_BRANCH_POKE:: loadspritegfx ANIM_TAG_BRANCH loadspritegfx ANIM_TAG_IMPACT @@ -13855,8 +13678,7 @@ OverdriveRings: launchtask AnimTask_ShakeBattleTerrain 0x2 0x4 0x1 0x0 0x6 0x1 launchtask SoundTask_WaitForCry 0x5 0x0 return - - + Move_APPLE_ACID:: loadspritegfx ANIM_TAG_APPLE loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -13893,7 +13715,6 @@ Move_APPLE_ACID:: clearmonbg ANIM_TARGET end - Move_GRAV_APPLE:: loadspritegfx ANIM_TAG_APPLE fadetobg BG_IN_AIR @@ -13944,11 +13765,9 @@ SmallAppleShower: delay 0x2 return - Move_SPIRIT_BREAK:: goto Move_PSYCHIC - - + Move_STRANGE_STEAM:: loadspritegfx ANIM_TAG_PINK_CLOUD loadspritegfx ANIM_TAG_FINGER @@ -14007,7 +13826,6 @@ Move_LIFE_DEW:: clearmonbg ANIM_ATK_PARTNER end - Move_OBSTRUCT:: loadspritegfx ANIM_TAG_NOISE_LINE @growl loadspritegfx ANIM_TAG_PROTECT @@ -14029,11 +13847,9 @@ Move_OBSTRUCT:: clearmonbg ANIM_ATK_PARTNER end - Move_FALSE_SURRENDER:: goto Move_FEINT - Move_METEOR_ASSAULT:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_METEOR @@ -14072,12 +13888,10 @@ BasicExplosion: playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET launchtemplate gExplosionSpriteTemplate, 0x83, 0x4 0x10 0x10 0x1 0x1 return - - + Move_ETERNA_BEAM:: goto Move_HYPER_BEAM - - + Move_STEEL_BEAM:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_GUST @@ -16889,7 +16703,7 @@ Move_SPITE: waitbgfadein clearmonbg ANIM_TARGET end - + SetHighSpeedBg: createvisualtask AnimTask_GetAttackerSide, 2 jumprettrue SetHighSpeedBgPlayer @@ -16902,7 +16716,7 @@ SetHighSpeedBgFade: createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein return - + UnsetHighSpeedBg: restorebg waitbgfadeout @@ -20616,7 +20430,7 @@ Move_RAZOR_LEAF: end Move_NATURE_POWER: - @ No actual animation, uses the animation of a move from sNaturePowerMoves instead + @ No actual animation, uses the animation of a move from sNaturePowerMoves instead Move_ANCIENT_POWER: loadspritegfx ANIM_TAG_ROCKS @@ -22904,7 +22718,7 @@ Move_ROCK_TOMB: createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1 waitforvisualfinish end - + SetBugBg: createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 1, 0, 0, 4, RGB_BLACK createvisualtask AnimTask_GetAttackerSide, 2 @@ -22922,7 +22736,7 @@ SetBugBgFade: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein return - + UnsetBugBg: restorebg waitbgfadeout @@ -24055,7 +23869,7 @@ Status_Nightmare: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Status_Powder: end @@ -24434,21 +24248,21 @@ General_WishHeal: waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK end - + General_IllusionOff: monbg ANIM_TARGET createvisualtask AnimTask_TransformMon, 2, 0, 1 waitforvisualfinish clearmonbg ANIM_TARGET end - + General_FormChange: monbg ANIM_ATTACKER createvisualtask AnimTask_TransformMon, 2, 0, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER end - + General_SlideOffScreen: createvisualtask AnimTask_SlideOffScreen, 5, ANIM_TARGET, +3 waitforvisualfinish @@ -24482,7 +24296,7 @@ General_MegaEvolution: clearmonbg ANIM_ATK_PARTNER blendoff end - + MegaEvolutionParticles: createsprite gMegaParticlesSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13 delay 3 @@ -24499,16 +24313,16 @@ MegaEvolutionParticles: createsprite gMegaParticlesSpriteTemplate, ANIM_ATTACKER, 2, 5, -40, 13 delay 3 return - + General_TerrainMisty: end - + General_TerrainGrassy: end - + General_TerrainElectric: end - + General_TerrainPsychic: end diff --git a/include/constants/moves.h b/include/constants/moves.h index d41013701..711aa3023 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -775,6 +775,6 @@ #define MOVES_COUNT_GEN8 747 -#define MOVES_COUNT MOVES_COUNT_GEN8 +#define MOVES_COUNT MOVES_COUNT_GEN8 #endif // GUARD_CONSTANTS_MOVES_H diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 33744a3cd..e82a5911c 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10321,11 +10321,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = #if B_UPDATED_MOVE_DATA >= GEN_8 .power = 80, .pp = 10, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else .power = 50, .pp = 15, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_ALWAYS_CRIT, .type = TYPE_ELECTRIC, @@ -10339,9 +10339,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_SPLISHY_SPLASH] = { #if B_UPDATED_MOVE_DATA >= GEN_8 - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else - .flags = FLAG_PROTECT_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_PARALYZE_HIT, .power = 90, @@ -10396,6 +10396,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .power = 60, .pp = 20, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .argument = 100, // restores 100% HP instead of 50% HP #else .power = 90, .pp = 15, @@ -10408,7 +10409,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .argument = 100, // restores 100% HP instead of 50% HP }, [MOVE_BUZZY_BUZZ] = @@ -10497,12 +10497,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .power = 100, .accuracy = 90, .pp = 10, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else .power = 90, .accuracy = 100, .pp = 15, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit) .type = TYPE_GRASS, diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 595de2e0d..f1a5ba4fd 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -2639,7 +2639,11 @@ static const u8 sPIKA_PAPOWDescription[] = _( static const u8 sBOUNCY_BUBBLEDescription[] = _( "An attack that absorbs\n" +#if B_UPDATED_MOVE_DATA >= GEN_8 "all the damage inflicted."); +#else + "half the damage inflicted."); +#endif static const u8 sBUZZY_BUZZDescription[] = _( "Shoots a jolt of electricity\n" @@ -2835,7 +2839,7 @@ static const u8 sMETEOR_BEAMDescription[] = _( "Sp. Attack before attacking."); static const u8 sSHELL_SIDE_ARMDescription[] = _( - "Uses higher of physical and \n" + "Uses higher of physical and\n" "special damage. May poison."); static const u8 sMISTY_EXPLOSIONDescription[] = _( @@ -2856,7 +2860,7 @@ static const u8 sTERRAIN_PULSEDescription[] = _( static const u8 sSKITTER_SMACKDescription[] = _( "User skitters behind foe to\n" - "attack. Lowers foe’s Sp. Atk."); + "attack. Lowers foe's Sp. Atk."); static const u8 sBURNING_JEALOUSYDescription[] = _( "Foes that have stats upped\n" @@ -2867,7 +2871,7 @@ static const u8 sLASH_OUTDescription[] = _( "turn, power is doubled."); static const u8 sPOLTERGEISTDescription[] = _( - "Control foe’s item to attack.\n" + "Control foe's item to attack.\n" "Fails if foe has no item."); static const u8 sCORROSIVE_GASDescription[] = _(