From 47259092e31145f2a2cc4a70f26a15bdfcfc40e2 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 14 Oct 2020 21:50:22 -0300 Subject: [PATCH 1/9] LGPE & Isle of Armor move data. --- data/battle_anim_scripts.s | 145 ++++++++- include/constants/moves.h | 113 ++++--- src/battle_debug.c | 2 +- src/data/battle_moves.h | 490 ++++++++++++++++++++++++++++++ src/data/text/move_descriptions.h | 180 ++++++++++- src/data/text/move_names.h | 35 +++ 6 files changed, 920 insertions(+), 45 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d7353fe6e..370fa78db 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -692,6 +692,19 @@ gBattleAnims_Moves:: .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_POW + .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 @@ -702,7 +715,7 @@ gBattleAnims_Moves:: .4byte Move_TAR_SHOT .4byte Move_MAGIC_POWDER .4byte Move_DRAGON_DARTS - .4byte Move_TEA_TIME + .4byte Move_TEATIME .4byte Move_OCTOLOCK .4byte Move_BOLT_BEAK .4byte Move_FISHIOUS_REND @@ -729,7 +742,29 @@ gBattleAnims_Moves:: .4byte Move_METEOR_ASSAULT .4byte Move_ETERNA_BEAM .4byte Move_STEEL_BEAM - .4byte Move_COUNT @ cannot be reached, because last move is Psycho Boost + .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_COUNT @ cannot be reached, because last move is Surging Strikes .align 2 gBattleAnims_StatusConditions:: @@ -13174,6 +13209,44 @@ PhotonGeyserBeam: launchtemplate gPhotonGeyserBeam 0x83, 0x6, 0, -77, ANIM_TARGET, 180, 2, 0 return +Move_ZIPPY_ZAP:: + end @to do: + +Move_SPLISHY_SPLASH:: + end @to do: + +Move_FLOATY_FALL:: + end @to do: + +Move_PIKA_POW:: + end @to do: + +Move_BOUNCY_BUBBLE:: + end @to do: + +Move_BUZZY_BUZZ:: + end @to do: + +Move_SIZZLY_SLIDE:: + end @to do: + +Move_GLITZY_GLOW:: + end @to do: + +Move_BADDY_BAD:: + end @to do: + +Move_SAPPY_SEED:: + end @to do: + +Move_FREEZY_FROST:: + end @to do: + +Move_SPARKLY_SWIRL:: + end @to do: + +Move_VEEVEE_VOLLEY:: + end @to do: Move_DOUBLE_IRON_BASH:: loadspritegfx ANIM_TAG_GUST @@ -13366,7 +13439,7 @@ Move_DRAGON_DARTS:: end -Move_TEA_TIME:: +Move_TEATIME:: goto Move_MILK_DRINK @@ -14048,6 +14121,72 @@ SteelBeamShards: launchtemplate gSteelBeamSpikeShardTemplate 0x80, 0x5 0xf 0xf 0x14 0xffec 0xfff6 delay 0x2 +Move_EXPANDING_FORCE:: + end @to do: + +Move_STEEL_ROLLER:: + end @to do: + +Move_SCALE_SHOT:: + end @to do: + +Move_METEOR_BEAM:: + end @to do: + +Move_SHELL_SIDE_ARM:: + end @to do: + +Move_MISTY_EXPLOSION:: + end @to do: + +Move_GRASSY_GLIDE:: + end @to do: + +Move_RISING_VOLTAGE:: + end @to do: + +Move_TERRAIN_PULSE:: + end @to do: + +Move_SKITTER_SMACK:: + end @to do: + +Move_BURNING_JEALOUSY:: + end @to do: + +Move_LASH_OUT:: + end @to do: + +Move_POLTERGEIST:: + end @to do: + +Move_CORROSIVE_GAS:: + end @to do: + +Move_COACHING:: + end @to do: + +Move_FLIP_TURN:: + end @to do: + +Move_TRIPLE_AXEL:: + end @to do: + +Move_DUAL_WINGBEAT:: + end @to do: + +Move_SCORCHING_SANDS:: + end @to do: + +Move_JUNGLE_HEALING:: + end @to do: + +Move_WICKED_BLOW:: + end @to do: + +Move_SURGING_STRIKES:: + end @to do: + @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@ Move_NONE: Move_MIRROR_MOVE: diff --git a/include/constants/moves.h b/include/constants/moves.h index e3438f5f2..a45392851 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -693,49 +693,84 @@ #define MOVE_MIND_BLOWN 673 #define MOVE_PLASMA_FISTS 674 #define MOVE_PHOTON_GEYSER 675 -#define MOVE_DOUBLE_IRON_BASH 676 +#define MOVE_ZIPPY_ZAP 676 +#define MOVE_SPLISHY_SPLASH 677 +#define MOVE_FLOATY_FALL 678 +#define MOVE_PIKA_POW 679 +#define MOVE_BOUNCY_BUBBLE 680 +#define MOVE_BUZZY_BUZZ 681 +#define MOVE_SIZZLY_SLIDE 682 +#define MOVE_GLITZY_GLOW 683 +#define MOVE_BADDY_BAD 684 +#define MOVE_SAPPY_SEED 685 +#define MOVE_FREEZY_FROST 686 +#define MOVE_SPARKLY_SWIRL 687 +#define MOVE_VEEVEE_VOLLEY 688 +#define MOVE_DOUBLE_IRON_BASH 689 -#define MOVES_COUNT_GEN7 677 +#define MOVES_COUNT_GEN7 690 // Gen 8 moves. -#define MOVE_DYNAMAX_CANNON (MOVES_COUNT_GEN7 + 0) -#define MOVE_SNIPE_SHOT (MOVES_COUNT_GEN7 + 1) -#define MOVE_JAW_LOCK (MOVES_COUNT_GEN7 + 2) -#define MOVE_STUFF_CHEEKS (MOVES_COUNT_GEN7 + 3) -#define MOVE_NO_RETREAT (MOVES_COUNT_GEN7 + 4) -#define MOVE_TAR_SHOT (MOVES_COUNT_GEN7 + 5) -#define MOVE_MAGIC_POWDER (MOVES_COUNT_GEN7 + 6) -#define MOVE_DRAGON_DARTS (MOVES_COUNT_GEN7 + 7) -#define MOVE_TEATIME (MOVES_COUNT_GEN7 + 8) -#define MOVE_OCTOLOCK (MOVES_COUNT_GEN7 + 9) -#define MOVE_BOLT_BEAK (MOVES_COUNT_GEN7 + 10) -#define MOVE_FISHIOUS_REND (MOVES_COUNT_GEN7 + 11) -#define MOVE_COURT_CHANGE (MOVES_COUNT_GEN7 + 12) -#define MOVE_CLANGOROUS_SOUL (MOVES_COUNT_GEN7 + 13) -#define MOVE_BODY_PRESS (MOVES_COUNT_GEN7 + 14) -#define MOVE_DECORATE (MOVES_COUNT_GEN7 + 15) -#define MOVE_DRUM_BEATING (MOVES_COUNT_GEN7 + 16) -#define MOVE_SNAP_TRAP (MOVES_COUNT_GEN7 + 17) -#define MOVE_PYRO_BALL (MOVES_COUNT_GEN7 + 18) -#define MOVE_BEHEMOTH_BLADE (MOVES_COUNT_GEN7 + 19) -#define MOVE_BEHEMOTH_BASH (MOVES_COUNT_GEN7 + 20) -#define MOVE_AURA_WHEEL (MOVES_COUNT_GEN7 + 21) -#define MOVE_BREAKING_SWIPE (MOVES_COUNT_GEN7 + 22) -#define MOVE_BRANCH_POKE (MOVES_COUNT_GEN7 + 23) -#define MOVE_OVERDRIVE (MOVES_COUNT_GEN7 + 24) -#define MOVE_APPLE_ACID (MOVES_COUNT_GEN7 + 25) -#define MOVE_GRAV_APPLE (MOVES_COUNT_GEN7 + 26) -#define MOVE_SPIRIT_BREAK (MOVES_COUNT_GEN7 + 27) -#define MOVE_STRANGE_STEAM (MOVES_COUNT_GEN7 + 28) -#define MOVE_LIFE_DEW (MOVES_COUNT_GEN7 + 29) -#define MOVE_OBSTRUCT (MOVES_COUNT_GEN7 + 30) -#define MOVE_FALSE_SURRENDER (MOVES_COUNT_GEN7 + 31) -#define MOVE_METEOR_ASSAULT (MOVES_COUNT_GEN7 + 32) -#define MOVE_ETERNABEAM (MOVES_COUNT_GEN7 + 33) -#define MOVE_STEEL_BEAM (MOVES_COUNT_GEN7 + 34) +#define MOVE_DYNAMAX_CANNON 690 +#define MOVE_SNIPE_SHOT 691 +#define MOVE_JAW_LOCK 692 +#define MOVE_STUFF_CHEEKS 693 +#define MOVE_NO_RETREAT 694 +#define MOVE_TAR_SHOT 695 +#define MOVE_MAGIC_POWDER 696 +#define MOVE_DRAGON_DARTS 697 +#define MOVE_TEATIME 698 +#define MOVE_OCTOLOCK 699 +#define MOVE_BOLT_BEAK 700 +#define MOVE_FISHIOUS_REND 701 +#define MOVE_COURT_CHANGE 702 +#define MOVE_CLANGOROUS_SOUL 703 +#define MOVE_BODY_PRESS 704 +#define MOVE_DECORATE 705 +#define MOVE_DRUM_BEATING 706 +#define MOVE_SNAP_TRAP 707 +#define MOVE_PYRO_BALL 708 +#define MOVE_BEHEMOTH_BLADE 709 +#define MOVE_BEHEMOTH_BASH 710 +#define MOVE_AURA_WHEEL 711 +#define MOVE_BREAKING_SWIPE 712 +#define MOVE_BRANCH_POKE 713 +#define MOVE_OVERDRIVE 714 +#define MOVE_APPLE_ACID 715 +#define MOVE_GRAV_APPLE 716 +#define MOVE_SPIRIT_BREAK 717 +#define MOVE_STRANGE_STEAM 718 +#define MOVE_LIFE_DEW 719 +#define MOVE_OBSTRUCT 720 +#define MOVE_FALSE_SURRENDER 721 +#define MOVE_METEOR_ASSAULT 722 +#define MOVE_ETERNABEAM 723 +#define MOVE_STEEL_BEAM 724 +#define MOVE_EXPANDING_FORCE 725 +#define MOVE_STEEL_ROLLER 726 +#define MOVE_SCALE_SHOT 727 +#define MOVE_METEOR_BEAM 728 +#define MOVE_SHELL_SIDE_ARM 729 +#define MOVE_MISTY_EXPLOSION 730 +#define MOVE_GRASSY_GLIDE 731 +#define MOVE_RISING_VOLTAGE 732 +#define MOVE_TERRAIN_PULSE 733 +#define MOVE_SKITTER_SMACK 734 +#define MOVE_BURNING_JEALOUSY 735 +#define MOVE_LASH_OUT 736 +#define MOVE_POLTERGEIST 737 +#define MOVE_CORROSIVE_GAS 738 +#define MOVE_COACHING 739 +#define MOVE_FLIP_TURN 740 +#define MOVE_TRIPLE_AXEL 741 +#define MOVE_DUAL_WINGBEAT 742 +#define MOVE_SCORCHING_SANDS 743 +#define MOVE_JUNGLE_HEALING 744 +#define MOVE_WICKED_BLOW 745 +#define MOVE_SURGING_STRIKES 746 -#define MOVES_COUNT_GEN8 (MOVES_COUNT_GEN7 + 35) +#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/battle_debug.c b/src/battle_debug.c index 4cfd9be54..f65fc9ba0 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -1456,7 +1456,7 @@ static void SetUpModifyArrows(struct BattleDebugMenu *data) break; case LIST_ITEM_MOVES: data->modifyArrows.minValue = 0; - data->modifyArrows.maxValue = MOVES_COUNT_GEN7 - 1; + data->modifyArrows.maxValue = MOVES_COUNT_GEN8 - 1; data->modifyArrows.maxDigits = 3; if (data->currentSecondaryListItemId == 4) { diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 2582272bb..12abc0881 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -9486,6 +9486,188 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .split = SPLIT_SPECIAL, }, + [MOVE_ZIPPY_ZAP] = + { + .effect = EFFECT_ALWAYS_CRIT, + .power = 50, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 2, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_SPLISHY_SPLASH] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 90, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_FLOATY_FALL] = + { + .effect = EFFECT_FLINCH_HIT, + .power = 90, + .type = TYPE_FLYING, + .accuracy = 90, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_PIKA_POW] = + { + .effect = EFFECT_RETURN, + .power = 1, + .type = TYPE_FLYING, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_BOUNCY_BUBBLE] = + { + .effect = EFFECT_ABSORB, + .power = 90, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_BUZZY_BUZZ] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 90, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_SIZZLY_SLIDE] = + { + .effect = EFFECT_BURN_HIT, + .power = 90, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_GLITZY_GLOW] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (Light Screen + Hit) + .power = 90, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_BADDY_BAD] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (Reflect + Hit) + .power = 90, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_SAPPY_SEED] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit) + .power = 90, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_FREEZY_FROST] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (Haze + Hit) + .power = 90, + .type = TYPE_ICE, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_SPARKLY_SWIRL] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (Heal Bell + Hit) + .power = 90, + .type = TYPE_FAIRY, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_VEEVEE_VOLLEY] = + { + .effect = EFFECT_RETURN, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + [MOVE_DOUBLE_IRON_BASH] = { .effect = EFFECT_FLINCH_HIT, @@ -9990,4 +10172,312 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, + + [MOVE_EXPANDING_FORCE] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 80, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_STEEL_ROLLER] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 130, + .type = TYPE_STEEL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_SCALE_SHOT] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (EFFECT_MULTI_HIT + ABILITY_WEAK_ARMOR, + .power = 25, + .type = TYPE_DRAGON, + .accuracy = 90, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_METEOR_BEAM] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 120, + .type = TYPE_ROCK, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_SHELL_SIDE_ARM] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 90, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_MISTY_EXPLOSION] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 100, + .type = TYPE_FAIRY, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_GRASSY_GLIDE] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 70, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_RISING_VOLTAGE] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 70, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_TERRAIN_PULSE] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 50, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_MEGA_LAUNCHER_BOOST, + .split = SPLIT_SPECIAL, + }, + + [MOVE_SKITTER_SMACK] = + { + .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, + .power = 70, + .type = TYPE_BUG, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_BURNING_JEALOUSY] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 70, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_LASH_OUT] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 75, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_POLTERGEIST] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 110, + .type = TYPE_GHOST, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_CORROSIVE_GAS] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 0, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .split = SPLIT_STATUS, + }, + + [MOVE_COACHING] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 0, + .type = TYPE_FIGHTING, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_ALLY, + .priority = 0, + .flags = FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_STATUS, + }, + + [MOVE_FLIP_TURN] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (U-Turn?) + .power = 60, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_TRIPLE_AXEL] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 20, + .type = TYPE_ICE, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_DUAL_WINGBEAT] = + { + .effect = EFFECT_DOUBLE_HIT, + .power = 40, + .type = TYPE_FLYING, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_SCORCHING_SANDS] = + { + .effect = EFFECT_SCALD, + .power = 70, + .type = TYPE_GROUND, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_SPECIAL, + }, + + [MOVE_JUNGLE_HEALING] = + { + .effect = EFFECT_PLACEHOLDER, //TODO + .power = 0, + .type = TYPE_GRASS, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .split = SPLIT_STATUS, + .argument = TRUE, // Protects the whole side. + }, + + [MOVE_WICKED_BLOW] = + { + .effect = EFFECT_ALWAYS_CRIT, + .power = 80, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, + + [MOVE_SURGING_STRIKES] = + { + .effect = EFFECT_PLACEHOLDER, //TODO (Multi hit + Always Crit) + .power = 25, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .split = SPLIT_PHYSICAL, + }, }; diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 573c8785f..8fa84f95d 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -2618,9 +2618,61 @@ static const u8 sPLASMA_FISTSDescription[] = _( "Normal moves become Electric."); static const u8 sPHOTON_GEYSERDescription[] = _( - "The foe's highest offensive\n" + "The user's highest offensive\n" "determines its category."); +static const u8 sZIPPY_ZAPDescription[] = _( + "An attack that is always goes\n" + "first with a critical hit."); + +static const u8 sSPLISHY_SPLASHDescription[] = _( + "A huge electrified wave that\n" + "may paralyze the foe."); + +static const u8 sFLOATY_FALLDescription[] = _( + "Floats in the air to fall as\n" + "an attack. May cause flinch."); + +static const u8 sPIKA_POWDescription[] = _( + "Pikachu's love increases its\n" + "power. It never misses."); + +static const u8 sBOUNCY_BUBBLEDescription[] = _( + "An attack that absorbs\n" + "half the damage inflicted."); + +static const u8 sBUZZY_BUZZDescription[] = _( + "Shoots a jolt of electricity\n" + "that always paralyzes."); + +static const u8 sSIZZLY_SLIDEDescription[] = _( + "Cloaks itself in fire to\n" + "charge, burning the target."); + +static const u8 sGLITZY_GLOWDescription[] = _( + "Creates a Light Screen after\n" + "a telekinetic attack."); + +static const u8 sBADDY_BADDescription[] = _( + "Creates a Reflect wall after\n" + "acting bad and attacking."); + +static const u8 sSAPPY_SEEDDescription[] = _( + "Grows a stalk that spreads\n" + "damaging Leech Seeds."); + +static const u8 sFREEZY_FROSTDescription[] = _( + "A frozen haze attack that\n" + "eliminates all stat changes."); + +static const u8 sSPARKLY_SWIRLDescription[] = _( + "Heals all status problems\n" + "with a whirlwind of scent."); + +static const u8 sVEEVEE_VOLLEYDescription[] = _( + "Eevee's love increases its\n" + "power. It never misses."); + static const u8 sDOUBLE_IRON_BASHDescription[] = _( "The user spins and hits with\n" "its arms. May cause flinch."); @@ -2766,10 +2818,97 @@ static const u8 sSTEEL_BEAMDescription[] = _( "Fires a beam of steel from\n" "its body. It hurts the user."); +static const u8 sEXPANDING_FORCEDescription[] = _( + "A Psychic attack that's more\n" + "powerful in Psychic Terrain."); + +static const u8 sSTEEL_ROLLERDescription[] = _( + "Destroys the current terrain." + "Otherwise, it fails."); + +static const u8 sSCALE_SHOTDescription[] = _( + "Shoots scales 2 to 5 times.\n" + "Ups Speed, lowers defense."); + +static const u8 sMETEOR_BEAMDescription[] = _( + "A 2-turn move that raises\n" + "Sp. Attack before attacking."); + +static const u8 sSHELL_SIDE_ARMDescription[] = _( + "Its category depends on\n" + "which one will damage more."); + +static const u8 sMISTY_EXPLOSIONDescription[] = _( + "Boosted by Misty Terrain, it\n" + "makes the user faint."); + +static const u8 sGRASSY_GLIDEDescription[] = _( + "On Grassy Terrain, the user\n" + "will always strike first."); + +static const u8 sRISING_VOLTAGEDescription[] = _( + "Its power doubles while\n" + "on Electric Terrain."); + +static const u8 sTERRAIN_PULSEDescription[] = _( + "Type changes depending on\n" + "terrain. Power also doubles."); + +static const u8 sSKITTER_SMACKDescription[] = _( + "User skitters behind target\n" + "to attack. Lowers Sp. Atk."); + +static const u8 sBURNING_JEALOUSYDescription[] = _( + "Burns whoever their stats\n" + "raised on the same turn."); + +static const u8 sLASH_OUTDescription[] = _( + "Power doubles if stats were\n" + "lowered on the same turn."); + +static const u8 sPOLTERGEISTDescription[] = _( + "Only works if the target\n" + "is holding an item."); + +static const u8 sCORROSIVE_GASDescription[] = _( + "Melts all surrounding items\n" + "with highly acidic gas."); + +static const u8 sCOACHINGDescription[] = _( + "The user coaches an ally to\n" + "raise their Atk. and Def."); + +static const u8 sFLIP_TURNDescription[] = _( + "Does damage then switches\n" + "out the user."); + +static const u8 sTRIPLE_AXELDescription[] = _( + "A 3-kick attack that gets\n" + "stronger on each hit."); + +static const u8 sDUAL_WINGBEATDescription[] = _( + "The user uses its wings to\n" + "slam the target twice."); + +static const u8 sSCORCHING_SANDSDescription[] = _( + "It throws scorching sand\n" + "that may burn the target."); + +static const u8 sJUNGLE_HEALINGDescription[] = _( + "Becomes one with the jungle\n" + "to heal the team's health."); + +static const u8 sWICKED_BLOWDescription[] = _( + "By mastering the Dark style,\n" + "always does a critical hit."); + +static const u8 sSURGING_STRIKESDescription[] = _( + "The Water style allows to\n" + "do 3 critical hits in a row."); + static const u8 sNotDoneYetDescription[] = _( "Not done yet."); - // MOVE_NONE is ignored in this table. Make sure to always subtract 1 before getting the right pointer. const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = { @@ -3448,7 +3587,21 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = [MOVE_MIND_BLOWN - 1] = sMIND_BLOWNDescription, [MOVE_PLASMA_FISTS - 1] = sPLASMA_FISTSDescription, [MOVE_PHOTON_GEYSER - 1] = sPHOTON_GEYSERDescription, + [MOVE_ZIPPY_ZAP - 1] = sZIPPY_ZAPDescription, + [MOVE_SPLISHY_SPLASH - 1] = sSPLISHY_SPLASHDescription, + [MOVE_FLOATY_FALL - 1] = sFLOATY_FALLDescription, + [MOVE_PIKA_POW - 1] = sPIKA_POWDescription, + [MOVE_BOUNCY_BUBBLE - 1] = sBOUNCY_BUBBLEDescription, + [MOVE_BUZZY_BUZZ - 1] = sBUZZY_BUZZDescription, + [MOVE_SIZZLY_SLIDE - 1] = sSIZZLY_SLIDEDescription, + [MOVE_GLITZY_GLOW - 1] = sGLITZY_GLOWDescription, + [MOVE_BADDY_BAD - 1] = sBADDY_BADDescription, + [MOVE_SAPPY_SEED - 1] = sSAPPY_SEEDDescription, + [MOVE_FREEZY_FROST - 1] = sFREEZY_FROSTDescription, + [MOVE_SPARKLY_SWIRL - 1] = sSPARKLY_SWIRLDescription, + [MOVE_VEEVEE_VOLLEY - 1] = sVEEVEE_VOLLEYDescription, [MOVE_DOUBLE_IRON_BASH - 1] = sDOUBLE_IRON_BASHDescription, + //GEN 8 [MOVE_DYNAMAX_CANNON - 1] = sDYNAMAX_CANNONDescription, [MOVE_SNIPE_SHOT - 1] = sSNIPE_SHOTDescription, @@ -3485,4 +3638,27 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = [MOVE_METEOR_ASSAULT - 1] = sMETEOR_ASSAULTDescription, [MOVE_ETERNABEAM - 1] = sETERNABEAMDescription, [MOVE_STEEL_BEAM - 1] = sSTEEL_BEAMDescription, + [MOVE_EXPANDING_FORCE - 1] = sEXPANDING_FORCEDescription, + [MOVE_STEEL_ROLLER - 1] = sSTEEL_ROLLERDescription, + [MOVE_SCALE_SHOT - 1] = sSCALE_SHOTDescription, + [MOVE_METEOR_BEAM - 1] = sMETEOR_BEAMDescription, + [MOVE_SHELL_SIDE_ARM - 1] = sSHELL_SIDE_ARMDescription, + [MOVE_MISTY_EXPLOSION - 1] = sMISTY_EXPLOSIONDescription, + [MOVE_GRASSY_GLIDE - 1] = sGRASSY_GLIDEDescription, + [MOVE_RISING_VOLTAGE - 1] = sRISING_VOLTAGEDescription, + [MOVE_TERRAIN_PULSE - 1] = sTERRAIN_PULSEDescription, + [MOVE_SKITTER_SMACK - 1] = sSKITTER_SMACKDescription, + [MOVE_BURNING_JEALOUSY - 1] = sBURNING_JEALOUSYDescription, + [MOVE_LASH_OUT - 1] = sLASH_OUTDescription, + [MOVE_POLTERGEIST - 1] = sPOLTERGEISTDescription, + [MOVE_CORROSIVE_GAS - 1] = sCORROSIVE_GASDescription, + [MOVE_COACHING - 1] = sCOACHINGDescription, + [MOVE_FLIP_TURN - 1] = sFLIP_TURNDescription, + [MOVE_TRIPLE_AXEL - 1] = sTRIPLE_AXELDescription, + [MOVE_DUAL_WINGBEAT - 1] = sDUAL_WINGBEATDescription, + [MOVE_SCORCHING_SANDS - 1] = sSCORCHING_SANDSDescription, + [MOVE_JUNGLE_HEALING - 1] = sJUNGLE_HEALINGDescription, + [MOVE_WICKED_BLOW - 1] = sWICKED_BLOWDescription, + [MOVE_SURGING_STRIKES - 1] = sSURGING_STRIKESDescription, + }; diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 2b56c0641..26be0f8e4 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -676,6 +676,19 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_MIND_BLOWN] = _("Mind Blown"), [MOVE_PLASMA_FISTS] = _("Plasma Fists"), [MOVE_PHOTON_GEYSER] = _("PhotonGeyser"), + [MOVE_ZIPPY_ZAP] = _("Zippy Zap"), + [MOVE_SPLISHY_SPLASH] = _("SplishSplash"), + [MOVE_FLOATY_FALL] = _("Floaty Fall"), + [MOVE_PIKA_POW] = _("Pika Pow"), + [MOVE_BOUNCY_BUBBLE] = _("BouncyBubble"), + [MOVE_BUZZY_BUZZ] = _("Buzzy Buzz"), + [MOVE_SIZZLY_SLIDE] = _("Sizzly Slide"), + [MOVE_GLITZY_GLOW] = _("Glitzy Glow"), + [MOVE_BADDY_BAD] = _("Baddy Bad"), + [MOVE_SAPPY_SEED] = _("Sappy Seed"), + [MOVE_FREEZY_FROST] = _("Freezy Frost"), + [MOVE_SPARKLY_SWIRL] = _("SparklySwirl"), + [MOVE_VEEVEE_VOLLEY] = _("VeeveeVolley"), [MOVE_DOUBLE_IRON_BASH] = _("D. Iron Bash"), //GEN 8 [MOVE_DYNAMAX_CANNON] = _("Dyna Cannon"), @@ -713,4 +726,26 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_METEOR_ASSAULT] = _("Meteor Ass."), [MOVE_ETERNABEAM] = _("Eternabeam"), [MOVE_STEEL_BEAM] = _("Steel Beam"), + [MOVE_EXPANDING_FORCE] = _("Expand Force"), + [MOVE_STEEL_ROLLER] = _("Steel Roller"), + [MOVE_SCALE_SHOT] = _("Scale Shot"), + [MOVE_METEOR_BEAM] = _("Meteor Beam"), + [MOVE_SHELL_SIDE_ARM] = _("Shell S. Arm"), + [MOVE_MISTY_EXPLOSION] = _("Misty Explos"), + [MOVE_GRASSY_GLIDE] = _("Grassy Glide"), + [MOVE_RISING_VOLTAGE] = _("Rise Voltage"), + [MOVE_TERRAIN_PULSE] = _("TerrainPulse"), + [MOVE_SKITTER_SMACK] = _("SkitterSmack"), + [MOVE_BURNING_JEALOUSY] = _("BurnJealousy"), + [MOVE_LASH_OUT] = _("Lash Out"), + [MOVE_POLTERGEIST] = _("Poltergeist"), + [MOVE_CORROSIVE_GAS] = _("CorrosiveGas"), + [MOVE_COACHING] = _("Coaching"), + [MOVE_FLIP_TURN] = _("Flip Turn"), + [MOVE_TRIPLE_AXEL] = _("Triple Axel"), + [MOVE_DUAL_WINGBEAT] = _("DualWingbeat"), + [MOVE_SCORCHING_SANDS] = _("Scorch Sands"), + [MOVE_JUNGLE_HEALING] = _("Jungle Heal"), + [MOVE_WICKED_BLOW] = _("Wicked Blow"), + [MOVE_SURGING_STRIKES] = _("SurgeStrikes"), }; From 8f9659f846433c81ae9413eefab50b3dadcd3650 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 19 Oct 2020 11:45:54 -0300 Subject: [PATCH 2/9] Fixed Pika Papow's name. --- data/battle_anim_scripts.s | 4 ++-- include/constants/moves.h | 2 +- src/data/battle_moves.h | 4 ++-- src/data/text/move_descriptions.h | 4 ++-- src/data/text/move_names.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 370fa78db..11bff94e5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -695,7 +695,7 @@ gBattleAnims_Moves:: .4byte Move_ZIPPY_ZAP .4byte Move_SPLISHY_SPLASH .4byte Move_FLOATY_FALL - .4byte Move_PIKA_POW + .4byte Move_PIKA_PAPOW .4byte Move_BOUNCY_BUBBLE .4byte Move_BUZZY_BUZZ .4byte Move_SIZZLY_SLIDE @@ -13218,7 +13218,7 @@ Move_SPLISHY_SPLASH:: Move_FLOATY_FALL:: end @to do: -Move_PIKA_POW:: +Move_PIKA_PAPOW:: end @to do: Move_BOUNCY_BUBBLE:: diff --git a/include/constants/moves.h b/include/constants/moves.h index a45392851..b40abf5c3 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -696,7 +696,7 @@ #define MOVE_ZIPPY_ZAP 676 #define MOVE_SPLISHY_SPLASH 677 #define MOVE_FLOATY_FALL 678 -#define MOVE_PIKA_POW 679 +#define MOVE_PIKA_PAPOW 679 #define MOVE_BOUNCY_BUBBLE 680 #define MOVE_BUZZY_BUZZ 681 #define MOVE_SIZZLY_SLIDE 682 diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 12abc0881..5f71bb317 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -9528,11 +9528,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .split = SPLIT_PHYSICAL, }, - [MOVE_PIKA_POW] = + [MOVE_PIKA_PAPOW] = { .effect = EFFECT_RETURN, .power = 1, - .type = TYPE_FLYING, + .type = TYPE_ELECTRIC, .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 8fa84f95d..b1925294c 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -2633,7 +2633,7 @@ static const u8 sFLOATY_FALLDescription[] = _( "Floats in the air to fall as\n" "an attack. May cause flinch."); -static const u8 sPIKA_POWDescription[] = _( +static const u8 sPIKA_PAPOWDescription[] = _( "Pikachu's love increases its\n" "power. It never misses."); @@ -3590,7 +3590,7 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = [MOVE_ZIPPY_ZAP - 1] = sZIPPY_ZAPDescription, [MOVE_SPLISHY_SPLASH - 1] = sSPLISHY_SPLASHDescription, [MOVE_FLOATY_FALL - 1] = sFLOATY_FALLDescription, - [MOVE_PIKA_POW - 1] = sPIKA_POWDescription, + [MOVE_PIKA_PAPOW - 1] = sPIKA_PAPOWDescription, [MOVE_BOUNCY_BUBBLE - 1] = sBOUNCY_BUBBLEDescription, [MOVE_BUZZY_BUZZ - 1] = sBUZZY_BUZZDescription, [MOVE_SIZZLY_SLIDE - 1] = sSIZZLY_SLIDEDescription, diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 26be0f8e4..3de2e6041 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -679,7 +679,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ZIPPY_ZAP] = _("Zippy Zap"), [MOVE_SPLISHY_SPLASH] = _("SplishSplash"), [MOVE_FLOATY_FALL] = _("Floaty Fall"), - [MOVE_PIKA_POW] = _("Pika Pow"), + [MOVE_PIKA_PAPOW] = _("Pika Papow"), [MOVE_BOUNCY_BUBBLE] = _("BouncyBubble"), [MOVE_BUZZY_BUZZ] = _("Buzzy Buzz"), [MOVE_SIZZLY_SLIDE] = _("Sizzly Slide"), From 5f7c01bd4132e429201dc5c511e072049e837dcb Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 19 Oct 2020 11:58:19 -0300 Subject: [PATCH 3/9] Replaced spaces to tabs. --- data/battle_anim_scripts.s | 722 ++++++++++++++++++------------------- 1 file changed, 361 insertions(+), 361 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 11bff94e5..8fb70c2fe 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -692,20 +692,20 @@ gBattleAnims_Moves:: .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 + .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 @@ -742,28 +742,28 @@ gBattleAnims_Moves:: .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_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_COUNT @ cannot be reached, because last move is Surging Strikes .align 2 @@ -815,14 +815,14 @@ gBattleAnims_General:: .align 2 gBattleAnims_Special:: - .4byte Special_LevelUp @ B_ANIM_LVL_UP - .4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON - .4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON - .4byte Special_BallThrow @ B_ANIM_BALL_THROW - .4byte Special_BallThrowWithTrainer @ B_ANIM_BALL_THROW_WITH_TRAINER - .4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON - .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE - .4byte Special_CriticalCaptureBallThrow @ B_ANIM_CRITICAL_CAPTURE_THROW + .4byte Special_LevelUp @ B_ANIM_LVL_UP + .4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON + .4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON + .4byte Special_BallThrow @ B_ANIM_BALL_THROW + .4byte Special_BallThrowWithTrainer @ B_ANIM_BALL_THROW_WITH_TRAINER + .4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON + .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE + .4byte Special_CriticalCaptureBallThrow @ B_ANIM_CRITICAL_CAPTURE_THROW Move_ROOST: loadspritegfx ANIM_TAG_WHITE_FEATHER @@ -2800,79 +2800,79 @@ Move_FIRE_FANG: end Move_SHADOW_SNEAK: - loadspritegfx ANIM_TAG_LICK - setalpha 0, 16 - delay 1 - createvisualtask AnimTask_InitMementoShadow, 2 - delay 1 - createvisualtask AnimTask_MoveAttackerMementoShadow, 5 - playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER - delay 48 - playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER - waitforvisualfinish - createvisualtask sub_8114470, 2 - setalpha 0, 16 - delay 1 - playsewithpan SE_M_LICK, SOUND_PAN_TARGET - createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0 - createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 - waitforvisualfinish - clearmonbg_23 ANIM_TARGET - delay 1 - blendoff - delay 1 - end + loadspritegfx ANIM_TAG_LICK + setalpha 0, 16 + delay 1 + createvisualtask AnimTask_InitMementoShadow, 2 + delay 1 + createvisualtask AnimTask_MoveAttackerMementoShadow, 5 + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER + delay 48 + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER + waitforvisualfinish + createvisualtask sub_8114470, 2 + setalpha 0, 16 + delay 1 + playsewithpan SE_M_LICK, SOUND_PAN_TARGET + createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 + waitforvisualfinish + clearmonbg_23 ANIM_TARGET + delay 1 + blendoff + delay 1 + end 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 - delay 5 - playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER - createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 - delay 5 - playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER - createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 - delay 5 - playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER - createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 - delay 11 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 - createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 27, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 27, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -27, 44, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, 39, -28, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -42, -42, 20 - playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET - delay 5 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 - createsprite gMudBombSplash, ANIM_TARGET, 2, 0, 40, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -8, -44, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -46, -28, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, 46, 9, 20 - playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET - delay 5 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 - createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 0, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -43, -12, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, 16, -46, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -16, 44, 20 - playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET - delay 5 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 - createsprite gMudBombSplash, ANIM_TARGET, 2, 0, 40, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -8, -44, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -46, -28, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, 46, 9, 20 - playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET - delay 5 - createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 - createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 0, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -43, -12, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, 16, -46, 20 - createsprite gMudBombSplash, ANIM_TARGET, 2, -16, 44, 20 - waitforvisualfinish - end + loadspritegfx ANIM_TAG_MUD_SAND + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER + createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 + delay 5 + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER + createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 + delay 5 + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER + createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 + delay 5 + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER + createsprite gMudBombToss, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 + delay 11 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 27, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 27, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -27, 44, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, 39, -28, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -42, -42, 20 + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET + delay 5 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createsprite gMudBombSplash, ANIM_TARGET, 2, 0, 40, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -8, -44, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -46, -28, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, 46, 9, 20 + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET + delay 5 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 0, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -43, -12, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, 16, -46, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -16, 44, 20 + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET + delay 5 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createsprite gMudBombSplash, ANIM_TARGET, 2, 0, 40, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -8, -44, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -46, -28, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, 46, 9, 20 + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET + delay 5 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createsprite gMudBombSplash, ANIM_TARGET, 2, 42, 0, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -43, -12, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, 16, -46, 20 + createsprite gMudBombSplash, ANIM_TARGET, 2, -16, 44, 20 + waitforvisualfinish + end Move_PSYCHO_CUT: loadspritegfx ANIM_TAG_SPIRAL @@ -3584,7 +3584,7 @@ Move_STONE_EDGE: delay 2 createsprite gStoneEdgeSpriteTemplate, 130, 7, 0, 33, 464, 30, 15, 49, 1 delay 2 - createsprite gBasicHitSplatSpriteTemplate, 131, 4, -32, -16, 1, 3 + createsprite gBasicHitSplatSpriteTemplate, 131, 4, -32, -16, 1, 3 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMonInPlace, 2, 5, 1, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 5, 3, 3, 0, 12, 1 @@ -3742,21 +3742,21 @@ Move_JUDGMENT: clearmonbg ANIM_TARGET end JudgmentOutwardSpikes: - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0xFF90, 16 @up - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 95, 0xFF9D, 16 @upper right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x73, 0, 16 @right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x4F, 0x37, 16 @lower right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0x53, 16 @down - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFB0, 0x43, 16 @lower left - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF60, 0, 16 @left - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFAA, 0xFF94, 16 @upper left + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0xFF90, 16 @up + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 95, 0xFF9D, 16 @upper right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x73, 0, 16 @right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x4F, 0x37, 16 @lower right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0x53, 16 @down + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFB0, 0x43, 16 @lower left + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF60, 0, 16 @left + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFAA, 0xFF94, 16 @upper left playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER return JudgmentOutwardSpikes2: createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x2D, 0xFF9D, 16 @between up and upper right createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xDF, 0xFF9D, 16 @between right and upper right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x9F, 0x37, 16 @between right and lower right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x1F, 0x37, 16 @between lower right and down + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x9F, 0x37, 16 @between right and lower right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x1F, 0x37, 16 @between lower right and down createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFE0, 0x43, 16 @between lower left and down createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF60, 0x43, 16 @between left and lower left createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF2A, 0xFFAA, 16 @between left and upper left @@ -3764,24 +3764,24 @@ JudgmentOutwardSpikes2: playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER return JudgmentInwardSpikes: - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0xFF90, 16 @up - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 95, 0xFF9D, 16 @upper right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x73, 0, 16 @right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x4F, 0x37, 16 @lower right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0x53, 16 @down - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFB0, 0x43, 16 @lower left - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0, 16 @left - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFAA, 0xFF94, 16 @upper left + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0xFF90, 16 @up + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 95, 0xFF9D, 16 @upper right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x73, 0, 16 @right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x4F, 0x37, 16 @lower right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0x53, 16 @down + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFB0, 0x43, 16 @lower left + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0, 16 @left + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFAA, 0xFF94, 16 @upper left return JudgmentInwardSpikes2: - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x2D, 0xFF9D, 16 @between up and upper right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xDF, 0xFF9D, 16 @between right and upper right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x9F, 0x37, 16 @between right and lower right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x1F, 0x37, 16 @between lower right and down - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFE0, 0x43, 16 @between lower left and down - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0x43, 16 @between left and lower left - 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 + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x2D, 0xFF9D, 16 @between up and upper right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xDF, 0xFF9D, 16 @between right and upper right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x9F, 0x37, 16 @between right and lower right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x1F, 0x37, 16 @between lower right and down + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFE0, 0x43, 16 @between lower left and down + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0x43, 16 @between left and lower left + 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: @@ -4144,7 +4144,7 @@ Move_ROAR_OF_TIME: Move_SPECIAL_REND: loadspritegfx ANIM_TAG_PUNISHMENT_BLADES - loadspritegfx ANIM_TAG_PINK_HEART_2 @ANIM_TAG_BERRY_EATEN + loadspritegfx ANIM_TAG_PINK_HEART_2 @ANIM_TAG_BERRY_EATEN monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 16, 0 @@ -4175,7 +4175,7 @@ Move_SPECIAL_REND: clearmonbg ANIM_ATK_PARTNER blendoff end - + Move_LUNAR_DANCE: loadspritegfx ANIM_TAG_MOON loadspritegfx ANIM_TAG_GREEN_SPARKLE @@ -4512,7 +4512,7 @@ HoneClawsAnim: delay 10 return - + Move_WIDE_GUARD: loadspritegfx ANIM_TAG_ICE_SPIKES @motion from icy wind loadspritegfx ANIM_TAG_PINK_PETAL @pink color @@ -4562,7 +4562,7 @@ Move_WIDE_GUARD: clearmonbg ANIM_ATTACKER blendoff end - + Move_GUARD_SPLIT:: loadspritegfx ANIM_TAG_BLUEGREEN_ORB @@ -4624,7 +4624,7 @@ Move_WONDER_ROOM:: waitbgfadein blendoff end - + Move_PSYSHOCK: monbg ANIM_TARGET @@ -4668,7 +4668,7 @@ Move_VENOSHOCK: delay 15 end - + Move_AUTOTOMIZE: loadspritegfx ANIM_TAG_METAL_BITS @Metal Bits setalpha 12, 8 @@ -4746,8 +4746,8 @@ Move_MAGIC_ROOM:: waitbgfadein blendoff end - - + + Move_SMACK_DOWN:: loadspritegfx ANIM_TAG_BLACK_BALL loadspritegfx ANIM_TAG_IMPACT @@ -4761,7 +4761,7 @@ Move_SMACK_DOWN:: createvisualtask AnimTask_StartSlidingBg, 5, 0x0, 0x0, 0x0, 0xffff createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 goto SeismicTossWeak - + Move_STORM_THROW: call StormThorwAnim @@ -4820,7 +4820,7 @@ Move_SLUDGE_WAVE: createvisualtask AnimTask_CreateSurfWave, 0x2, ANIM_SURF_PAL_SLUDGE_WAVE waitforvisualfinish end - + Move_QUIVER_DANCE: loadspritegfx ANIM_TAG_HOLLOW_ORB @@ -4913,7 +4913,7 @@ Move_SYCHRONOISE: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Move_ELECTRO_BALL: loadspritegfx ANIM_TAG_SPARK_2 @yelow @@ -5029,7 +5029,7 @@ Move_COIL: setarg 0x7 0xffff waitforvisualfinish end - + Move_LOW_SWEEP: loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -5091,7 +5091,7 @@ Move_FOUL_PLAY: clearmonbg ANIM_TARGET blendoff end - + Move_SIMPLE_BEAM: loadspritegfx ANIM_TAG_GOLD_RING @psybeam @@ -5139,7 +5139,7 @@ SimpleBeamWithRings: delay 0x2 return - + Move_ENTRAINMENT: createvisualtask AnimTask_TeeterDanceMovement, 5 playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER @@ -5155,7 +5155,7 @@ Move_ENTRAINMENT: waitforvisualfinish end - + Move_AFTER_YOU: loadspritegfx ANIM_TAG_ANGER @rage loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @green color @@ -5320,10 +5320,10 @@ Move_QUICK_GUARD: clearmonbg ANIM_ATTACKER end - + Move_ALLY_SWITCH: end - + Move_SCALD: loadspritegfx ANIM_TAG_WATER_ORB @@ -5366,7 +5366,7 @@ 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 @@ -5468,7 +5468,7 @@ Move_SHIFT_GEAR: waitforvisualfinish clearmonbg ANIM_ATTACKER end - + Move_CIRCLE_THROW: loadspritegfx ANIM_TAG_IMPACT @@ -5496,7 +5496,7 @@ Move_CIRCLE_THROW: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_INCINERATE: loadspritegfx ANIM_TAG_SMALL_EMBER @@ -5611,7 +5611,7 @@ Move_REFLECT_TYPE: clearmonbg ANIM_ATTACKER blendoff end - + Move_RETALITATE: loadspritegfx ANIM_TAG_CUT @Cut @@ -5633,7 +5633,7 @@ Move_RETALITATE: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_FINAL_GAMBIT: loadspritegfx ANIM_TAG_PINK_CLOUD @yawn animation @@ -5661,7 +5661,7 @@ Move_FINAL_GAMBIT: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xC 0x0 0x0 waitforvisualfinish end - + Move_BESTOW: monbg ANIM_TARGET @@ -5673,7 +5673,7 @@ Move_BESTOW: clearmonbg ANIM_TARGET end - + Move_INFERNO: loadspritegfx ANIM_TAG_SMALL_EMBER call SetImpactBackground @@ -6099,13 +6099,13 @@ 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 @@ -6144,7 +6144,7 @@ Move_FROST_BREATH: waitforvisualfinish call UnsetPsychicBg end - + Move_DRAGON_TAIL: loadspritegfx ANIM_TAG_ROCKS @@ -6181,7 +6181,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 @@ -6332,7 +6332,7 @@ Move_DRILL_RUN: waitforvisualfinish call UnsetPsychicBg end - + Move_DUAL_CHOP: loadspritegfx ANIM_TAG_HANDS_AND_FEET @hand @@ -6355,7 +6355,7 @@ Move_DUAL_CHOP: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_HEART_STAMP: loadspritegfx ANIM_TAG_HEART_STAMP @@ -6387,7 +6387,7 @@ Move_HORN_LEECH: call HealingEffect waitforvisualfinish end - + Move_SACRED_SWORD: loadspritegfx ANIM_TAG_CUT @Cut @@ -6414,7 +6414,7 @@ Move_SACRED_SWORD: blendoff waitforvisualfinish end - + Move_RAZOR_SHELL: loadspritegfx ANIM_TAG_RAZOR_SHELL @@ -6429,7 +6429,7 @@ Move_RAZOR_SHELL: clearmonbg ANIM_TARGET waitforvisualfinish end - + Move_HEAT_CRASH: loadspritegfx ANIM_TAG_IMPACT @@ -6454,7 +6454,7 @@ Move_HEAT_CRASH: clearmonbg ANIM_TARGET blendoff end - + Move_LEAF_TORNADO: loadspritegfx ANIM_TAG_GUST @Gust @@ -6486,7 +6486,7 @@ LeafTornadoVortex: launchtemplate gLeafTornadoVortexTemplate 0x82 0x7 0x0 0x21 0x1d0 0x1e 0xf 0xffce 0x1 delay 0x2 return - + Move_STEAMROLLER: loadspritegfx ANIM_TAG_IMPACT @@ -6543,7 +6543,7 @@ CottonSporesSpiralInward: launchtemplate gCottonGuardSporeTemplate 0x2 0x3 0x5 0xffd8 0xd delay 0x3 return - + Move_NIGHT_DAZE: loadspritegfx ANIM_TAG_THIN_RING @uproar @@ -6582,7 +6582,7 @@ Move_NIGHT_DAZE: launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xC 0x0 0x0 waitforvisualfinish end - + Move_PSYSTRIKE: monbg ANIM_TARGET @@ -6621,7 +6621,7 @@ TailSlapRight: TailSlapLeft: launchtemplate gTailSlapTemplate 0x2 0x4 0x8 0x0 0x1 0x0 goto TailSlapContinue - + Move_HURRICANE: loadspritegfx ANIM_TAG_GUST @@ -6655,7 +6655,7 @@ HurricaneGust: launchtemplate gPoisonBubbleSpriteTemplate 0x82, 2 0 0xfff0 launchtask AnimTask_AnimateGustTornadoPalette 5 2 1 0x46 return - + Move_HEAD_CHARGE: loadspritegfx ANIM_TAG_IMPACT @@ -6676,7 +6676,7 @@ Move_HEAD_CHARGE: restorebg waitbgfadeout end - + Move_GEAR_GRIND: loadspritegfx ANIM_TAG_IMPACT @@ -6700,7 +6700,7 @@ Move_GEAR_GRIND: clearmonbg ANIM_TARGET blendoff end - + Move_SEARING_SHOT: loadspritegfx ANIM_TAG_SPARK_2 @yellow color @@ -6787,7 +6787,7 @@ Move_SEARING_SHOT: clearmonbg ANIM_ATK_PARTNER blendoff end - + Move_TECHNO_BLAST: launchtask AnimTask_TechnoBlast 0x5 0x0 @@ -6895,7 +6895,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 +6973,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 +7093,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,7 +7251,7 @@ TechnoBlastIceChargeParticles: playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 0x4 return - + Move_RELIC_SONG: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE @@ -7261,7 +7261,7 @@ Move_RELIC_SONG: monbg ANIM_DEF_PARTNER launchtask AnimTask_MusicNotesRainbowBlend 0x2 0x0 waitforvisualfinish - panse_1B 0x1DF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 @ ??? + panse_1B 0x1DF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 @ ??? launchtask AnimTask_UproarDistortion 0x2 0x1 0x0 launchtemplate gUproarRingSpriteTemplate 0x3 0x6 0x0 0x0 0x0 0x0 0x1f 0x8 launchtemplate gJaggedMusicNoteSpriteTemplate 0x2 0x4 0x0 0x1d 0xfff4 0x0 @@ -7333,7 +7333,7 @@ Move_RELIC_SONG: launchtask AnimTask_MusicNotesClearRainbowBlend 0x2 0x0 waitforvisualfinish end - + Move_SECRET_SWORD: loadspritegfx ANIM_TAG_CUT @Cut @@ -7363,7 +7363,7 @@ Move_SECRET_SWORD: blendoff waitforvisualfinish end - + Move_GLACIATE: loadspritegfx ANIM_TAG_ICE_CRYSTALS @ice @@ -7395,7 +7395,7 @@ Move_GLACIATE: clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBg end - + Move_BOLT_STRIKE:: loadspritegfx ANIM_TAG_SPARK_2 @Electricity @@ -7439,8 +7439,8 @@ Move_BOLT_STRIKE:: blendoff waitforvisualfinish end - - + + Move_BLUE_FLARE:: loadspritegfx ANIM_TAG_SMALL_EMBER @Fire loadspritegfx ANIM_TAG_METAL_BITS @Blue Flare Colour @@ -7531,7 +7531,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 @@ -7685,7 +7685,7 @@ Move_SNARL:: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_ICICLE_CRASH:: loadspritegfx ANIM_TAG_ICICLE_SPEAR @Icicle @@ -7738,7 +7738,7 @@ LaunchIcicleCrashSpear: playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 0x2 return - + Move_V_CREATE:: loadspritegfx ANIM_TAG_SMALL_EMBER @fire blast flame @@ -7877,13 +7877,13 @@ 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 loadspritegfx ANIM_TAG_ELECTRICITY - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 0x0, 0x0, 0xE, 0x0 @@ -7959,8 +7959,8 @@ Move_FLYING_PRESS:: waitforvisualfinish blendoff end - - + + Move_MAT_BLOCK:: loadspritegfx ANIM_TAG_CONVERSION loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL @green color @@ -8043,7 +8043,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 @@ -8336,7 +8336,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 @@ -8488,8 +8488,8 @@ Move_FLOWER_SHIELD:: waitforvisualfinish blendoff end - - + + Move_GRASSY_TERRAIN:: loadspritegfx ANIM_TAG_ORBS @Recover Ball loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star @@ -8628,7 +8628,7 @@ Move_ELECTRIFY:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - + Move_PLAY_ROUGH:: loadspritegfx ANIM_TAG_IMPACT @@ -8685,8 +8685,8 @@ Move_PLAY_ROUGH:: blendoff waitforvisualfinish end - - + + Move_FAIRY_WIND:: loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_DEF_PARTNER @@ -8810,14 +8810,14 @@ 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 @@ -8907,7 +8907,7 @@ Move_DIAMOND_STORM:: clearmonbg ANIM_DEF_PARTNER blendoff end - + Move_STEAM_ERUPTION:: loadspritegfx ANIM_TAG_STEAM_ERUPTION @Steam Eruption Particle @@ -9110,8 +9110,8 @@ 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 @@ -9473,8 +9473,8 @@ Move_DAZZLING_GLEAM:: loadspritegfx ANIM_TAG_BLUE_STAR launchtemplate gSimplePaletteBlendSpriteTemplate 0x2 0x5 0x1 0x2 0x0 0xd 0x7fff playsewithpan SE_M_TWISTER, SOUND_PAN_ATTACKER - @call 0x081D56B3 -> middle of GrantingStarsEffect - createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 + @call 0x081D56B3 -> middle of GrantingStarsEffect + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 waitforvisualfinish launchtask AnimTask_BlendColorCycle 0x2 0x6 0x2 0x0 0x3 0x0 0x10 0x7fff @@ -9486,8 +9486,8 @@ Move_DAZZLING_GLEAM:: clearmonbg 0x0 blendoff end - - + + Move_CELEBRATE:: loadspritegfx ANIM_TAG_ITEM_BAG launchtemplate gCelebrateBagTemplate 0x2 0x1 0x0 @@ -9560,8 +9560,8 @@ Move_BABY_DOLL_EYES:: waitforvisualfinish blendoff end - - + + Move_NUZZLE:: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG @@ -9582,8 +9582,8 @@ Move_NUZZLE:: call ElectricityEffectNoSound waitforvisualfinish end - - + + Move_HOLD_BACK:: loadspritegfx ANIM_TAG_PAW_PRINT @ yellow/brown loadspritegfx ANIM_TAG_IMPACT @ hit @@ -9667,7 +9667,7 @@ Move_OBLIVION_WING:: loadspritegfx ANIM_TAG_HYDRO_PUMP loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_BLUE_STAR - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0x0, 0xC, 0xC, 0x289F @Pinkish Red + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0x0, 0xC, 0xC, 0x289F @Pinkish Red createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0x0, 0xD, 0xD, 0x289F @Pinkish Red playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER launchtemplate gFlyBallUpSpriteTemplate 0x2 0x4 0x0 0x0 0xd 0x150 @@ -9810,7 +9810,7 @@ Move_THOUSAND_WAVES:: launchtemplate gThousandWavesGreenWheelTemplate 0x2 0x1 0xaa launchtemplate gThousandWavesGreenWheelTemplate 0x2 0x1 0xd5 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER @I placed this one here, because it ruins the teleport animation + clearmonbg ANIM_ATK_PARTNER @I placed this one here, because it ruins the teleport animation loopsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 0x3, 0x15 call ThousandWavesRecover launchtemplate gThousandWavesGreenRecoverTemplate 0x2 0x3 0x28 0xfff6 0xd @@ -9895,7 +9895,7 @@ ThousandWavesRotatingImpact: delay 0x2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET launchtemplate gThousandWavesPoundImpactTemplate 0x82, 0x4, 0x1 0x0 0x0 0x3 - launchtemplate gThousandWavesRotatingImpactTemplate 0x82 0x7 0x23 0x20 0xf0 0x28 0xb 0xffd2 0x1 @2 + launchtemplate gThousandWavesRotatingImpactTemplate 0x82 0x7 0x23 0x20 0xf0 0x28 0xb 0xffd2 0x1 @2 launchtemplate gThousandWavesGreenWaveTemplate 0x28 0x4 0x0 0xb00 0x60 0x1 delay 0x2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET @@ -10100,7 +10100,7 @@ Move_ORIGIN_PULSE:: Move_PRECIPICE_BLADES:: loadspritegfx ANIM_TAG_LARGE_SPIKE loadspritegfx ANIM_TAG_FIRE_PLUME - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_LARGE_SPIKE, 0, 10, 10, 0x159F @Blood orange + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_LARGE_SPIKE, 0, 10, 10, 0x159F @Blood orange monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -10305,8 +10305,8 @@ Move_SHORE_UP:: call HealingEffect waitforvisualfinish end - - + + Move_FIRST_IMPRESSION:: loadspritegfx ANIM_TAG_SWEAT_BEAD @astonish loadspritegfx ANIM_TAG_IMPACT @pound hit @@ -10825,13 +10825,13 @@ Move_SPOTLIGHT:: waitforvisualfinish launchtask AnimTask_RemoveSpotlight 0x2 0x0 end - - + + Move_TOXIC_THREAD:: loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_STRING, 0, 0xA, 0xA, 0x6038 @Purple - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WEB_THREAD, 0x0, 0xA, 0xA, 0x6038 @Purple + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_STRING, 0, 0xA, 0xA, 0x6038 @Purple + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WEB_THREAD, 0x0, 0xA, 0xA, 0x6038 @Purple monbg ANIM_DEF_PARTNER delay 0x0 launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0x9 0x0 @@ -11093,8 +11093,8 @@ PollenPuffAlly: clearmonbg ANIM_TARGET blendoff end - - + + Move_ANCHOR_SHOT:: loadspritegfx ANIM_TAG_CHAIN_LINK loadspritegfx ANIM_TAG_ANCHOR @@ -11642,9 +11642,9 @@ Move_CORE_ENFORCER:: loadspritegfx ANIM_TAG_SNORE_Z loadspritegfx ANIM_TAG_EXPLOSION clearmonbg ANIM_ATTACKER - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 0xD, 0xD, 0x079F @Yellow - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 0xA, 0xA, 0x7501 @Royal Blue - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SNORE_Z, 0, 0xA, 0xA, 0x0688 @Green + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 0xD, 0xD, 0x079F @Yellow + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 0xA, 0xA, 0x7501 @Royal Blue + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SNORE_Z, 0, 0xA, 0xA, 0x0688 @Green delay 0x10 monbg ANIM_TARGET launchtask AnimTask_CreateSmallSolarbeamOrbs 0x5 0x0 @@ -11786,8 +11786,8 @@ 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 +11817,8 @@ 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 @@ -11852,7 +11852,7 @@ ClangingScalesMetalSound: Move_DRAGON_HAMMER:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_GRAY_SMOKE - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 12, 12, 0x7D7F @Pinkish purple + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 12, 12, 0x7D7F @Pinkish purple fadetobg BG_COSMIC waitbgfadeout launchtask AnimTask_StartSlidingBg 0x5 0x4 0x0, -500, 0x0 0xffff @@ -11887,8 +11887,8 @@ Move_DRAGON_HAMMER:: call UnsetPsychicBg blendoff end - - + + Move_BRUTAL_SWING:: loadspritegfx ANIM_TAG_IMPACT @hits loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color @@ -11948,8 +11948,8 @@ Move_AURORA_VEIL:: clearmonbg ANIM_ATK_PARTNER blendoff end - - + + Move_SHELL_TRAP:: ShellTrapChargeUp: loadspritegfx ANIM_TAG_SMALL_EMBER @@ -12252,8 +12252,8 @@ 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 @@ -12317,8 +12317,8 @@ Move_SHADOW_BONE:: clearmonbg 0x3 blendoff end - - + + Move_ACCELEROCK:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT @@ -12341,8 +12341,8 @@ Move_ACCELEROCK:: blendoff waitforvisualfinish end - - + + Move_LIQUIDATION:: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -12361,8 +12361,8 @@ 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 @@ -12468,7 +12468,7 @@ PrismaticLaserRain: delay 0x2 launchtemplate gPrismaticLaserGreenRainTemplate 0x82, 0x4, -30, 0x44, 4, ANIM_TARGET delay 0x2 - launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 27, 0x37, 4, ANIM_TARGET + launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 27, 0x37, 4, ANIM_TARGET delay 0x2 launchtemplate gPrismaticLaserVioletRainTemplate 0x82, 0x4, -20, 0x32, 4, ANIM_TARGET delay 0x2 @@ -12476,7 +12476,7 @@ PrismaticLaserRain: delay 0x2 launchtemplate gPrismaticLaserGreenRainTemplate 0x82, 0x4, -12, 0x3a, 4, ANIM_TARGET delay 0x2 - launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 19, 0x3c, 4, ANIM_TARGET + launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 19, 0x3c, 4, ANIM_TARGET delay 0x2 launchtemplate gPrismaticLaserVioletRainTemplate 0x82, 0x4, -38, 0x3a, 4, ANIM_TARGET delay 0x2 @@ -12619,7 +12619,7 @@ Move_SUNSTEEL_STRIKE:: launchtemplate gSunsteelStrikeBlackFlyBallTemplate 0x2 0x4 0x0 0x0 0xd 0x150 launchtask AnimTask_HorizontalShake 0x5 0x3 0x4 0x1 0x1A delay 0x18 - launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x0 @The rock particles mess up the fly animation + launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x0 @The rock particles mess up the fly animation launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x1 launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x2 launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x3 @@ -12740,11 +12740,11 @@ Move_MOONGEIST_BEAM:: launchtask AnimTask_MoonlightEndFade 0x2 0x0 end MoongeistBeamCharge: - launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 40, 0, 0, 0, 30, 10 @From right + launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 40, 0, 0, 0, 30, 10 @From right launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -40, 0, 0, 0, 30, -10 @From left launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -25, -40, 0, 0, 30, -20 @From top left launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 25, -40, 0, 0, 30, 20 @From top right - launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 25, 20, 0, 0, 30, 20 @From bottom right + launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 25, 20, 0, 0, 30, 20 @From bottom right launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -25, 40, 0, 0, 30, -20 @From bottom left delay 0x5 return @@ -12780,8 +12780,8 @@ Move_TEARFUL_LOOK:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - - + + Move_ZING_ZAP:: loadspritegfx ANIM_TAG_SPARK_2 @sparks loadspritegfx ANIM_TAG_YELLOW_BALL @ball @@ -12953,8 +12953,8 @@ 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 @@ -13165,7 +13165,7 @@ Move_PHOTON_GEYSER:: unloadspritegfx ANIM_TAG_YELLOW_BALL @confuse ray (for zap cannon) unloadspritegfx ANIM_TAG_BLACK_BALL_2 @zap cannon unloadspritegfx ANIM_TAG_AIR_WAVE_2 @white/gray color - @Shoot beam to the sky + @Shoot beam to the sky loadspritegfx ANIM_TAG_STRAIGHT_BEAM launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_DEF 0x6 0x0 0x10 0x43FF @Light yellow launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x4 0x0 0x60 0x1 @@ -13210,43 +13210,43 @@ PhotonGeyserBeam: return Move_ZIPPY_ZAP:: - end @to do: + end @to do: Move_SPLISHY_SPLASH:: - end @to do: + end @to do: Move_FLOATY_FALL:: - end @to do: + end @to do: Move_PIKA_PAPOW:: - end @to do: + end @to do: Move_BOUNCY_BUBBLE:: - end @to do: + end @to do: Move_BUZZY_BUZZ:: - end @to do: + end @to do: Move_SIZZLY_SLIDE:: - end @to do: + end @to do: Move_GLITZY_GLOW:: - end @to do: + end @to do: Move_BADDY_BAD:: - end @to do: + end @to do: Move_SAPPY_SEED:: - end @to do: + end @to do: Move_FREEZY_FROST:: - end @to do: + end @to do: Move_SPARKLY_SWIRL:: - end @to do: + end @to do: Move_VEEVEE_VOLLEY:: - end @to do: + end @to do: Move_DOUBLE_IRON_BASH:: loadspritegfx ANIM_TAG_GUST @@ -13280,9 +13280,9 @@ Move_DOUBLE_IRON_BASH:: @@@@@@@@@@@@@@@@@@@@@@@ GEN 8 @@@@@@@@@@@@@@@@@@@@@@@ Move_DYNAMAX_CANNON:: - goto Move_HYPER_BEAM - - + goto Move_HYPER_BEAM + + Move_SNIPE_SHOT:: loadspritegfx ANIM_TAG_IMPACT_2 loadspritegfx ANIM_TAG_LEER @@ -13374,7 +13374,7 @@ Move_NO_RETREAT:: Move_TAR_SHOT:: loadspritegfx ANIM_TAG_POISON_BUBBLE - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 15, 15, 0 @Black + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 15, 15, 0 @Black monbg ANIM_TARGET launchtemplate gAppleAcidLaunchTemplate 0x82, 0x6 0x14 0x0 0x28 0x1 0x0 0x0 playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER @@ -13395,8 +13395,8 @@ Move_TAR_SHOT:: waitforvisualfinish clearmonbg ANIM_TARGET end - - + + Move_MAGIC_POWDER:: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_WATER_GUN @@ -13442,10 +13442,10 @@ Move_DRAGON_DARTS:: 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 + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_TENDRILS, 0, 12, 12, 0x3D98 @Pinkish Red loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET 0x6 0x4 launchtemplate gConstrictBindingSpriteTemplate 0x84, 0x4, 0x0 0x10 0x0 0x2 delay 0x7 @@ -13469,7 +13469,7 @@ Move_BOLT_BEAK:: loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_ELECTRICITY createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HORN_HIT, 0, 12, 12, 0x079D @Yellow + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HORN_HIT, 0, 12, 12, 0x079D @Yellow call BoltBeakSparks waitforvisualfinish launchtask AnimTask_BlendColorCycle 0x2 0x6 0x3 0xffe1 0x1 0x0 0x0 0x5bff @@ -13574,8 +13574,8 @@ FishousRendBubbles: 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 +13612,7 @@ 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 +13629,12 @@ Move_BODY_PRESS:: launchtask AnimTask_SquishTarget 0x2 0x0 waitforvisualfinish end - - + + Move_DECORATE:: - end @to do: - - + end @to do: + + Move_DRUM_BEATING:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE @@ -13695,12 +13695,12 @@ Move_DRUM_BEATING:: clearmonbg ANIM_TARGET blendoff end - - + + Move_SNAP_TRAP:: - end @ to do: - - + end @ to do: + + Move_PYRO_BALL:: loadspritegfx ANIM_TAG_FLAT_ROCK loadspritegfx ANIM_TAG_SMALL_EMBER @@ -13731,11 +13731,11 @@ Move_PYRO_BALL:: Move_BEHEMOTH_BLADE:: - goto Move_SACRED_SWORD - - + goto Move_SACRED_SWORD + + Move_BEHEMOTH_BASH:: - goto Move_SUNSTEEL_STRIKE + goto Move_SUNSTEEL_STRIKE Move_AURA_WHEEL:: @@ -13816,8 +13816,8 @@ Move_BREAKING_SWIPE:: blendoff clearmonbg ANIM_TARGET end - - + + Move_BRANCH_POKE:: loadspritegfx ANIM_TAG_BRANCH loadspritegfx ANIM_TAG_IMPACT @@ -13834,15 +13834,15 @@ Move_OVERDRIVE:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_ELECTRICITY - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity call BoltBeakSparks waitforvisualfinish - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 12, 12, 0x17BF @Yellow Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 12, 12, 0x17BF @Yellow Electricity call OverdriveRings delay 0x8 call OverdriveRings delay 0x10 - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 0, 12, 0x76E1 @Blue Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 0, 12, 0x76E1 @Blue Electricity waitforvisualfinish end OverdriveRings: @@ -13855,8 +13855,8 @@ 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 @@ -13946,9 +13946,9 @@ SmallAppleShower: Move_SPIRIT_BREAK:: - goto Move_PSYCHIC - - + goto Move_PSYCHIC + + Move_STRANGE_STEAM:: loadspritegfx ANIM_TAG_PINK_CLOUD loadspritegfx ANIM_TAG_FINGER @@ -14013,7 +14013,7 @@ Move_OBSTRUCT:: loadspritegfx ANIM_TAG_PROTECT loadspritegfx ANIM_TAG_OBSTRUCT_CROSS createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_NOISE_LINE, 0, 10, 10, 0 @Black - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, 0 @Black + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, 0 @Black launchtask SoundTask_PlayDoubleCry 0x2 0x2 ANIM_ATTACKER 0xff call RoarEffect waitforvisualfinish @@ -14031,7 +14031,7 @@ Move_OBSTRUCT:: Move_FALSE_SURRENDER:: - goto Move_FEINT + goto Move_FEINT Move_METEOR_ASSAULT:: @@ -14039,7 +14039,7 @@ Move_METEOR_ASSAULT:: loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_EXPLOSION createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 12, 12, 0x0B1D @Light orange - createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_ATK, 1, 0, 9, 0x0B1D @Light orange + createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_ATK, 1, 0, 9, 0x0B1D @Light orange launchtask AnimTask_ElectricChargingParticles 0x2 0x4 0x0 0x30 0x0 0x4 playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER waitforvisualfinish @@ -14053,7 +14053,7 @@ Move_METEOR_ASSAULT:: call BasicExplosion waitforvisualfinish visible ANIM_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPal, 10, (ANIM_PAL_ATK | ANIM_PAL_BG), 1, 0x10, 0, 0x7FFF @Screen revert from white + createvisualtask AnimTask_BlendBattleAnimPal, 10, (ANIM_PAL_ATK | ANIM_PAL_BG), 1, 0x10, 0, 0x7FFF @Screen revert from white waitforvisualfinish end BasicExplosion: @@ -14072,12 +14072,12 @@ 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 - - + goto Move_HYPER_BEAM + + Move_STEEL_BEAM:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_GUST @@ -14109,7 +14109,7 @@ Move_STEEL_BEAM:: call SteelBeamShards waitforvisualfinish launchtemplate gSlideMonToOriginalPosSpriteTemplate 0x2 0x3 ANIM_TARGET 0x0 0x6 - launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xE 0x0 0x6B59 @From gray + launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xE 0x0 0x6B59 @From gray waitforvisualfinish end SteelBeamShards: @@ -14122,70 +14122,70 @@ SteelBeamShards: delay 0x2 Move_EXPANDING_FORCE:: - end @to do: + end @to do: Move_STEEL_ROLLER:: - end @to do: + end @to do: Move_SCALE_SHOT:: - end @to do: + end @to do: Move_METEOR_BEAM:: - end @to do: + end @to do: Move_SHELL_SIDE_ARM:: - end @to do: + end @to do: Move_MISTY_EXPLOSION:: - end @to do: + end @to do: Move_GRASSY_GLIDE:: - end @to do: + end @to do: Move_RISING_VOLTAGE:: - end @to do: + end @to do: Move_TERRAIN_PULSE:: - end @to do: + end @to do: Move_SKITTER_SMACK:: - end @to do: + end @to do: Move_BURNING_JEALOUSY:: - end @to do: + end @to do: Move_LASH_OUT:: - end @to do: + end @to do: Move_POLTERGEIST:: - end @to do: + end @to do: Move_CORROSIVE_GAS:: - end @to do: + end @to do: Move_COACHING:: - end @to do: + end @to do: Move_FLIP_TURN:: - end @to do: + end @to do: Move_TRIPLE_AXEL:: - end @to do: + end @to do: Move_DUAL_WINGBEAT:: - end @to do: + end @to do: Move_SCORCHING_SANDS:: - end @to do: + end @to do: Move_JUNGLE_HEALING:: - end @to do: + end @to do: Move_WICKED_BLOW:: - end @to do: + end @to do: Move_SURGING_STRIKES:: - end @to do: + end @to do: @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@ Move_NONE: @@ -23395,15 +23395,15 @@ Move_SKY_UPPERCUT: Move_SECRET_POWER: createvisualtask AnimTask_GetBattleTerrain, 5 - jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM - jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF - jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT - jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL - jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF - jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM - jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW - jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE - jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH + jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM + jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF + jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT + jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL + jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF + jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM + jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW + jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE + jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH goto Move_SLAM Move_TWISTER: @@ -24119,7 +24119,7 @@ General_TurnTrap: createvisualtask AnimTask_GetTrappedMoveAnimId, 5 jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whirlpool - jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp + jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap Status_BindWrap: @@ -24457,10 +24457,10 @@ General_SlideOffScreen: end General_MegaEvolution: - loadspritegfx ANIM_TAG_MEGA_STONE - loadspritegfx ANIM_TAG_MEGA_PARTICLES - loadspritegfx ANIM_TAG_MEGA_SYMBOL - monbg ANIM_ATTACKER + loadspritegfx ANIM_TAG_MEGA_STONE + loadspritegfx ANIM_TAG_MEGA_PARTICLES + loadspritegfx ANIM_TAG_MEGA_SYMBOL + monbg ANIM_ATTACKER setalpha 12, 8 loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 13, 3 createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) @@ -24481,7 +24481,7 @@ General_MegaEvolution: waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - end + end MegaEvolutionParticles: createsprite gMegaParticlesSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13 @@ -24603,5 +24603,5 @@ Special_CriticalCaptureBallThrow: createvisualtask AnimTask_ThrowBall, 2 createvisualtask AnimTask_IsBallBlockedByTrainer, 2 jumpreteq -1, BallThrowTrainerBlock - goto BallThrowEnd + goto BallThrowEnd From d0feac8fe4b30c924ccf98bcbc6687ad2877e5b5 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 19 Oct 2020 17:48:27 -0300 Subject: [PATCH 4/9] Fix comment identation. --- data/battle_anim_scripts.s | 158 ++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 8fb70c2fe..beaee4b91 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -815,14 +815,14 @@ gBattleAnims_General:: .align 2 gBattleAnims_Special:: - .4byte Special_LevelUp @ B_ANIM_LVL_UP - .4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON - .4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON - .4byte Special_BallThrow @ B_ANIM_BALL_THROW - .4byte Special_BallThrowWithTrainer @ B_ANIM_BALL_THROW_WITH_TRAINER - .4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON - .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE - .4byte Special_CriticalCaptureBallThrow @ B_ANIM_CRITICAL_CAPTURE_THROW + .4byte Special_LevelUp @ B_ANIM_LVL_UP + .4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON + .4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON + .4byte Special_BallThrow @ B_ANIM_BALL_THROW + .4byte Special_BallThrowWithTrainer @ B_ANIM_BALL_THROW_WITH_TRAINER + .4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON + .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE + .4byte Special_CriticalCaptureBallThrow @ B_ANIM_CRITICAL_CAPTURE_THROW Move_ROOST: loadspritegfx ANIM_TAG_WHITE_FEATHER @@ -2493,10 +2493,10 @@ Move_GIGA_IMPACT: delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 - @monbg ANIM_DEF_PARTNER - @setalpha 12, 8 - @createvisualtask AnimTask_WindUpLunge, 5, 7, 0, -18, 8, 23, 10, 40, 10 - @delay 35 + @monbg ANIM_DEF_PARTNER + @setalpha 12, 8 + @createvisualtask AnimTask_WindUpLunge, 5, 7, 0, -18, 8, 23, 10, 40, 10 + @delay 35 createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 31, 3, 1, 0, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, 4, 4, -10, 0, 1, 0 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET @@ -3742,14 +3742,14 @@ Move_JUDGMENT: clearmonbg ANIM_TARGET end JudgmentOutwardSpikes: - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0xFF90, 16 @up - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 95, 0xFF9D, 16 @upper right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x73, 0, 16 @right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x4F, 0x37, 16 @lower right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0x53, 16 @down - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFB0, 0x43, 16 @lower left - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF60, 0, 16 @left - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFAA, 0xFF94, 16 @upper left + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0xFF90, 16 @up + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 95, 0xFF9D, 16 @upper right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x73, 0, 16 @right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x4F, 0x37, 16 @lower right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0, 0x53, 16 @down + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFB0, 0x43, 16 @lower left + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF60, 0, 16 @left + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFAA, 0xFF94, 16 @upper left playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER return JudgmentOutwardSpikes2: @@ -3764,24 +3764,24 @@ JudgmentOutwardSpikes2: playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER return JudgmentInwardSpikes: - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0xFF90, 16 @up - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 95, 0xFF9D, 16 @upper right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x73, 0, 16 @right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x4F, 0x37, 16 @lower right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0x53, 16 @down - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFB0, 0x43, 16 @lower left - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0, 16 @left - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFAA, 0xFF94, 16 @upper left + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0xFF90, 16 @up + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 95, 0xFF9D, 16 @upper right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x73, 0, 16 @right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x4F, 0x37, 16 @lower right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0, 0x53, 16 @down + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFB0, 0x43, 16 @lower left + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0, 16 @left + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFAA, 0xFF94, 16 @upper left return JudgmentInwardSpikes2: - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x2D, 0xFF9D, 16 @between up and upper right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xDF, 0xFF9D, 16 @between right and upper right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x9F, 0x37, 16 @between right and lower right - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x1F, 0x37, 16 @between lower right and down - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFE0, 0x43, 16 @between lower left and down - createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0x43, 16 @between left and lower left - 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 + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x2D, 0xFF9D, 16 @between up and upper right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xDF, 0xFF9D, 16 @between right and upper right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x9F, 0x37, 16 @between right and lower right + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0x1F, 0x37, 16 @between lower right and down + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFFE0, 0x43, 16 @between lower left and down + createsprite gJudgmentGrayInwardOrbsTemplate, ANIM_TARGET, 2, 1, 0, 0xFF60, 0x43, 16 @between left and lower left + 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: @@ -4385,7 +4385,7 @@ Move_OMINOUS_WIND: playsewithpan 228, 0 delay 0 monbg ANIM_DEF_PARTNER - @bankBG_over_partnerBG + @bankBG_over_partnerBG delay 0 createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 5, 1, 0, 0, 0, 0 delay 0 @@ -4916,9 +4916,9 @@ Move_SYCHRONOISE: Move_ELECTRO_BALL: - loadspritegfx ANIM_TAG_SPARK_2 @yelow - loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge - loadspritegfx ANIM_TAG_FLASH_CANNON_BALL @ball + loadspritegfx ANIM_TAG_SPARK_2 @yelow + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge + loadspritegfx ANIM_TAG_FLASH_CANNON_BALL @ball monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER @@ -6235,7 +6235,7 @@ Move_ELECTROWEB: delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK - @ ElectricityEffect looks ugly against both opponents, to do later + @ ElectricityEffect looks ugly against both opponents, to do later jumpifdoublebattle Move_ELECTROWEB_Wait call ElectricityEffect @@ -6337,7 +6337,7 @@ Move_DRILL_RUN: Move_DUAL_CHOP: loadspritegfx ANIM_TAG_HANDS_AND_FEET @hand loadspritegfx ANIM_TAG_IMPACT @hit - loadspritegfx ANIM_TAG_POISON_BUBBLE @purple + loadspritegfx ANIM_TAG_POISON_BUBBLE @purple monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6345,8 +6345,8 @@ Move_DUAL_CHOP: launchtemplate gHorizontalLungeSpriteTemplate 0x2 0x2 0x4 0x4 delay 0x6 launchtask AnimTask_ShakeMon 0x2 0x5 0x1 0x5 0x0 0x6 0x1 - launchtemplate gKarateChopSpriteTemplate 0x2 0x8 0xffe0 0x0 0x0 0x0 0xa 0x1 0x3 0x0 @left - launchtemplate gKarateChopSpriteTemplate 0x2 0x8 0x0515 0x0 0x0 0x0 0xa 0x1 0x3 0x0 @right + launchtemplate gKarateChopSpriteTemplate 0x2 0x8 0xffe0 0x0 0x0 0x0 0xa 0x1 0x3 0x0 @left + launchtemplate gKarateChopSpriteTemplate 0x2 0x8 0x0515 0x0 0x0 0x0 0xa 0x1 0x3 0x0 @right waitforvisualfinish playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET launchtemplate gDualChopImpactTemplate 0x3 0x4 0x0 0x0 0x1 0x2 @@ -7772,7 +7772,7 @@ Move_V_CREATE:: loadspritegfx ANIM_TAG_EXPLOSION @explosion animation loadspritegfx ANIM_TAG_CLAW_SLASH @dragon claw animation clearmonbg ANIM_ATK_PARTNER - fadetobg BG_FIRE @Mr. DS Fire + fadetobg BG_FIRE @Mr. DS Fire waitbgfadeout launchtask AnimTask_StartSlidingBg 0x5 0x4 0xA00 0x0 0x1 0xffff waitbgfadein @@ -8887,7 +8887,7 @@ Move_DIAMOND_STORM:: launchtemplate gDiamondStormDiamondsTemplate 0x82 0x5 0x14 0xff 0xf 0x20 0x0 launchtemplate gDiamondStormDiamondsTemplate 0x82 0x5 0x6e 0xa 0x8 0x20 0x14 waitforvisualfinish - @this is the buffet part + @this is the buffet part launchtemplate gBasicHitSplatSpriteTemplate 0x83 0x4 0xffe0 0xfff0 0x1 0x3 playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET launchtask AnimTask_ShakeMonInPlace 0x2 0x5 0x1 0x3 0x0 0xc 0x1 @@ -9473,7 +9473,7 @@ Move_DAZZLING_GLEAM:: loadspritegfx ANIM_TAG_BLUE_STAR launchtemplate gSimplePaletteBlendSpriteTemplate 0x2 0x5 0x1 0x2 0x0 0xd 0x7fff playsewithpan SE_M_TWISTER, SOUND_PAN_ATTACKER - @call 0x081D56B3 -> middle of GrantingStarsEffect + @call 0x081D56B3 -> middle of GrantingStarsEffect createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 waitforvisualfinish @@ -9585,12 +9585,12 @@ Move_NUZZLE:: Move_HOLD_BACK:: - loadspritegfx ANIM_TAG_PAW_PRINT @ yellow/brown - loadspritegfx ANIM_TAG_IMPACT @ hit + loadspritegfx ANIM_TAG_PAW_PRINT @ yellow/brown + loadspritegfx ANIM_TAG_IMPACT @ hit loadspritegfx ANIM_TAG_PURPLE_SWIPE @ swipe - loadspritegfx ANIM_TAG_THIN_RING @ ring - loadspritegfx ANIM_TAG_DUCK @ dizzy punch - loadspritegfx ANIM_TAG_PAIN_SPLIT @ pain split + loadspritegfx ANIM_TAG_THIN_RING @ ring + loadspritegfx ANIM_TAG_DUCK @ dizzy punch + loadspritegfx ANIM_TAG_PAIN_SPLIT @ pain split monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET @@ -9667,7 +9667,7 @@ Move_OBLIVION_WING:: loadspritegfx ANIM_TAG_HYDRO_PUMP loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_BLUE_STAR - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0x0, 0xC, 0xC, 0x289F @Pinkish Red + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0x0, 0xC, 0xC, 0x289F @Pinkish Red createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0x0, 0xD, 0xD, 0x289F @Pinkish Red playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER launchtemplate gFlyBallUpSpriteTemplate 0x2 0x4 0x0 0x0 0xd 0x150 @@ -9810,7 +9810,7 @@ Move_THOUSAND_WAVES:: launchtemplate gThousandWavesGreenWheelTemplate 0x2 0x1 0xaa launchtemplate gThousandWavesGreenWheelTemplate 0x2 0x1 0xd5 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER @I placed this one here, because it ruins the teleport animation + clearmonbg ANIM_ATK_PARTNER @I placed this one here, because it ruins the teleport animation loopsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 0x3, 0x15 call ThousandWavesRecover launchtemplate gThousandWavesGreenRecoverTemplate 0x2 0x3 0x28 0xfff6 0xd @@ -9895,7 +9895,7 @@ ThousandWavesRotatingImpact: delay 0x2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET launchtemplate gThousandWavesPoundImpactTemplate 0x82, 0x4, 0x1 0x0 0x0 0x3 - launchtemplate gThousandWavesRotatingImpactTemplate 0x82 0x7 0x23 0x20 0xf0 0x28 0xb 0xffd2 0x1 @2 + launchtemplate gThousandWavesRotatingImpactTemplate 0x82 0x7 0x23 0x20 0xf0 0x28 0xb 0xffd2 0x1 @2 launchtemplate gThousandWavesGreenWaveTemplate 0x28 0x4 0x0 0xb00 0x60 0x1 delay 0x2 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET @@ -10830,8 +10830,8 @@ Move_SPOTLIGHT:: Move_TOXIC_THREAD:: loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_STRING, 0, 0xA, 0xA, 0x6038 @Purple - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WEB_THREAD, 0x0, 0xA, 0xA, 0x6038 @Purple + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_STRING, 0, 0xA, 0xA, 0x6038 @Purple + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WEB_THREAD, 0x0, 0xA, 0xA, 0x6038 @Purple monbg ANIM_DEF_PARTNER delay 0x0 launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0x9 0x0 @@ -11517,12 +11517,12 @@ Move_REVELATION_DANCE:: Move_CORE_ENFORCER:: - loadspritegfx ANIM_TAG_SPARK_2 @yellow color - loadspritegfx ANIM_TAG_LEAF @green color + loadspritegfx ANIM_TAG_SPARK_2 @yellow color + loadspritegfx ANIM_TAG_LEAF @green color loadspritegfx ANIM_TAG_RAZOR_LEAF @another green color - loadspritegfx ANIM_TAG_WATER_ORB @blue color - loadspritegfx ANIM_TAG_THIN_RING @rings - loadspritegfx ANIM_TAG_SHOCK_3 @circle from thunderbolt + loadspritegfx ANIM_TAG_WATER_ORB @blue color + loadspritegfx ANIM_TAG_THIN_RING @rings + loadspritegfx ANIM_TAG_SHOCK_3 @circle from thunderbolt monbg ANIM_ATTACKER setalpha 12, 8 fadetobg BG_COSMIC @@ -11642,9 +11642,9 @@ Move_CORE_ENFORCER:: loadspritegfx ANIM_TAG_SNORE_Z loadspritegfx ANIM_TAG_EXPLOSION clearmonbg ANIM_ATTACKER - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 0xD, 0xD, 0x079F @Yellow - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 0xA, 0xA, 0x7501 @Royal Blue - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SNORE_Z, 0, 0xA, 0xA, 0x0688 @Green + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 0xD, 0xD, 0x079F @Yellow + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 0xA, 0xA, 0x7501 @Royal Blue + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SNORE_Z, 0, 0xA, 0xA, 0x0688 @Green delay 0x10 monbg ANIM_TARGET launchtask AnimTask_CreateSmallSolarbeamOrbs 0x5 0x0 @@ -11852,7 +11852,7 @@ ClangingScalesMetalSound: Move_DRAGON_HAMMER:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_GRAY_SMOKE - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 12, 12, 0x7D7F @Pinkish purple + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 12, 12, 0x7D7F @Pinkish purple fadetobg BG_COSMIC waitbgfadeout launchtask AnimTask_StartSlidingBg 0x5 0x4 0x0, -500, 0x0 0xffff @@ -12744,7 +12744,7 @@ MoongeistBeamCharge: launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -40, 0, 0, 0, 30, -10 @From left launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -25, -40, 0, 0, 30, -20 @From top left launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 25, -40, 0, 0, 30, 20 @From top right - launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 25, 20, 0, 0, 30, 20 @From bottom right + launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 25, 20, 0, 0, 30, 20 @From bottom right launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -25, 40, 0, 0, 30, -20 @From bottom left delay 0x5 return @@ -13165,7 +13165,7 @@ Move_PHOTON_GEYSER:: unloadspritegfx ANIM_TAG_YELLOW_BALL @confuse ray (for zap cannon) unloadspritegfx ANIM_TAG_BLACK_BALL_2 @zap cannon unloadspritegfx ANIM_TAG_AIR_WAVE_2 @white/gray color - @Shoot beam to the sky + @Shoot beam to the sky loadspritegfx ANIM_TAG_STRAIGHT_BEAM launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_DEF 0x6 0x0 0x10 0x43FF @Light yellow launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x4 0x0 0x60 0x1 @@ -13260,8 +13260,8 @@ Move_DOUBLE_IRON_BASH:: loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 0x14, 0x2 launchtask AnimTask_TranslateMonElliptical 0x2 0x5 0x0 0xc 0x4 0x1 0x4 launchtask AnimTask_AnimateGustTornadoPalette 0x5 0x2 0x1 0x46 - launchtemplate gGustToTargetSpriteTemplate 0x2 0x5 0xffe7 0x0 0x0 0x0 0x0 @wing attack - launchtemplate gGustToTargetSpriteTemplate 0x2 0x5 0x19 0x0 0x0 0x0 0x0 @wing attack + launchtemplate gGustToTargetSpriteTemplate 0x2 0x5 0xffe7 0x0 0x0 0x0 0x0 @wing attack + launchtemplate gGustToTargetSpriteTemplate 0x2 0x5 0x19 0x0 0x0 0x0 0x0 @wing attack delay 0x18 launchtemplate gSlideMonToOffsetSpriteTemplate 0x2 0x5 ANIM_ATTACKER 0x18 0x0 0x0 0x9 delay 0x11 @@ -13374,7 +13374,7 @@ Move_NO_RETREAT:: Move_TAR_SHOT:: loadspritegfx ANIM_TAG_POISON_BUBBLE - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 15, 15, 0 @Black + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 15, 15, 0 @Black monbg ANIM_TARGET launchtemplate gAppleAcidLaunchTemplate 0x82, 0x6 0x14 0x0 0x28 0x1 0x0 0x0 playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER @@ -13445,7 +13445,7 @@ Move_TEATIME:: Move_OCTOLOCK:: loadspritegfx ANIM_TAG_TENDRILS - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_TENDRILS, 0, 12, 12, 0x3D98 @Pinkish Red + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_TENDRILS, 0, 12, 12, 0x3D98 @Pinkish Red loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET 0x6 0x4 launchtemplate gConstrictBindingSpriteTemplate 0x84, 0x4, 0x0 0x10 0x0 0x2 delay 0x7 @@ -13469,7 +13469,7 @@ Move_BOLT_BEAK:: loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_ELECTRICITY createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HORN_HIT, 0, 12, 12, 0x079D @Yellow + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HORN_HIT, 0, 12, 12, 0x079D @Yellow call BoltBeakSparks waitforvisualfinish launchtask AnimTask_BlendColorCycle 0x2 0x6 0x3 0xffe1 0x1 0x0 0x0 0x5bff @@ -13834,15 +13834,15 @@ Move_OVERDRIVE:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_ELECTRICITY - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity call BoltBeakSparks waitforvisualfinish - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 12, 12, 0x17BF @Yellow Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 12, 12, 0x17BF @Yellow Electricity call OverdriveRings delay 0x8 call OverdriveRings delay 0x10 - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 0, 12, 0x76E1 @Blue Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 0, 12, 0x76E1 @Blue Electricity waitforvisualfinish end OverdriveRings: @@ -14053,7 +14053,7 @@ Move_METEOR_ASSAULT:: call BasicExplosion waitforvisualfinish visible ANIM_ATTACKER - createvisualtask AnimTask_BlendBattleAnimPal, 10, (ANIM_PAL_ATK | ANIM_PAL_BG), 1, 0x10, 0, 0x7FFF @Screen revert from white + createvisualtask AnimTask_BlendBattleAnimPal, 10, (ANIM_PAL_ATK | ANIM_PAL_BG), 1, 0x10, 0, 0x7FFF @Screen revert from white waitforvisualfinish end BasicExplosion: @@ -14109,7 +14109,7 @@ Move_STEEL_BEAM:: call SteelBeamShards waitforvisualfinish launchtemplate gSlideMonToOriginalPosSpriteTemplate 0x2 0x3 ANIM_TARGET 0x0 0x6 - launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xE 0x0 0x6B59 @From gray + launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xE 0x0 0x6B59 @From gray waitforvisualfinish end SteelBeamShards: @@ -20616,7 +20616,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 From ae60ae8a2d1eb2e3938b1ac24ff819ac548f8a77 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 24 Oct 2020 03:07:45 -0300 Subject: [PATCH 5/9] Review changes. --- include/constants/moves.h | 12 ++++++++---- src/data/battle_moves.h | 4 ++-- src/data/text/move_descriptions.h | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/constants/moves.h b/include/constants/moves.h index b40abf5c3..4d25958c1 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -359,7 +359,7 @@ #define MOVES_COUNT_GEN3 355 -// Gen4 moves. +// Gen 4 moves. #define MOVE_ROOST 355 #define MOVE_GRAVITY 356 #define MOVE_MIRACLE_EYE 357 @@ -476,7 +476,7 @@ #define MOVES_COUNT_GEN4 468 -// Gen5 moves. +// Gen 5 moves. #define MOVE_HONE_CLAWS 468 #define MOVE_WIDE_GUARD 469 #define MOVE_GUARD_SPLIT 470 @@ -572,7 +572,7 @@ #define MOVES_COUNT_GEN5 560 -// Gen6 moves. +// Gen 6 moves. #define MOVE_FLYING_PRESS 560 #define MOVE_MAT_BLOCK 561 #define MOVE_BELCH 562 @@ -631,6 +631,7 @@ #define MOVE_THOUSAND_WAVES 615 #define MOVE_LANDS_WRATH 616 #define MOVE_LIGHT_OF_RUIN 617 +// ORAS Moves #define MOVE_ORIGIN_PULSE 618 #define MOVE_PRECIPICE_BLADES 619 #define MOVE_DRAGON_ASCENT 620 @@ -638,7 +639,7 @@ #define MOVES_COUNT_GEN6 622 -// Gen7 moves. +// Gen 7 moves. #define MOVE_SHORE_UP 622 #define MOVE_FIRST_IMPRESSION 623 #define MOVE_BANEFUL_BUNKER 624 @@ -690,9 +691,11 @@ #define MOVE_ZING_ZAP 670 #define MOVE_NATURES_MADNESS 671 #define MOVE_MULTI_ATTACK 672 +// USUM Moves #define MOVE_MIND_BLOWN 673 #define MOVE_PLASMA_FISTS 674 #define MOVE_PHOTON_GEYSER 675 +// LGPE Moves #define MOVE_ZIPPY_ZAP 676 #define MOVE_SPLISHY_SPLASH 677 #define MOVE_FLOATY_FALL 678 @@ -746,6 +749,7 @@ #define MOVE_METEOR_ASSAULT 722 #define MOVE_ETERNABEAM 723 #define MOVE_STEEL_BEAM 724 +// Isle of Armor Moves #define MOVE_EXPANDING_FORCE 725 #define MOVE_STEEL_ROLLER 726 #define MOVE_SCALE_SHOT 727 diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index f4d875dbc..d4d23a200 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10347,7 +10347,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_FLOATY_FALL] = { .effect = EFFECT_FLINCH_HIT, - .power = 90, + .power = 95, .type = TYPE_FLYING, .accuracy = 90, .pp = 15, @@ -10500,7 +10500,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_DOUBLE_IRON_BASH] = { - .effect = EFFECT_FLINCH_HIT, + .effect = EFFECT_PLACEHOLDER, //TODO (EFFECT_FLINCH_HIT + EFFECT_DOUBLE_HIT) .power = 60, .type = TYPE_STEEL, .accuracy = 100, diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 7d8315f76..fb24000b2 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -2823,8 +2823,8 @@ static const u8 sEXPANDING_FORCEDescription[] = _( "powerful in Psychic Terrain."); static const u8 sSTEEL_ROLLERDescription[] = _( - "Destroys the current terrain." - "Otherwise, it fails."); + "Destroys any active terrain.\n" + "Without one, it fails."); static const u8 sSCALE_SHOTDescription[] = _( "Shoots scales 2 to 5 times.\n" @@ -2903,8 +2903,8 @@ static const u8 sWICKED_BLOWDescription[] = _( "always does a critical hit."); static const u8 sSURGING_STRIKESDescription[] = _( - "The Water style allows to\n" - "do 3 critical hits in a row."); + "By mastering the Water style\n" + "it lands with 3 critical hits."); static const u8 sNotDoneYetDescription[] = _( "Not done yet."); From cb53c91b07af5c0af09d6bc8967ce5853e0a4368 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 25 Oct 2020 22:36:05 -0300 Subject: [PATCH 6/9] rip --- src/data/battle_moves.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index d4d23a200..e2c8bbbbb 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10347,9 +10347,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_FLOATY_FALL] = { .effect = EFFECT_FLINCH_HIT, - .power = 95, + .power = 90, .type = TYPE_FLYING, - .accuracy = 90, + .accuracy = 95, .pp = 15, .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, From 9eea1cc29607e5403b02daa80df9c37969437c6c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 13:34:38 -0300 Subject: [PATCH 7/9] Updated to use internal Gen 8 move data. --- src/data/battle_moves.h | 78 ++++++++++++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 13 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index e2c8bbbbb..11c46a195 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10318,6 +10318,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_ZIPPY_ZAP] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + #else + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, + #endif .effect = EFFECT_ALWAYS_CRIT, .power = 50, .type = TYPE_ELECTRIC, @@ -10326,12 +10331,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 2, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, .split = SPLIT_PHYSICAL, }, [MOVE_SPLISHY_SPLASH] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED, + #endif .effect = EFFECT_PARALYZE_HIT, .power = 90, .type = TYPE_WATER, @@ -10340,12 +10349,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_FLOATY_FALL] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + #else + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, + #endif .effect = EFFECT_FLINCH_HIT, .power = 90, .type = TYPE_FLYING, @@ -10354,12 +10367,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, .split = SPLIT_PHYSICAL, }, [MOVE_PIKA_PAPOW] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_RETURN, .power = 1, .type = TYPE_ELECTRIC, @@ -10368,12 +10385,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_BOUNCY_BUBBLE] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_ABSORB, .power = 90, .type = TYPE_WATER, @@ -10382,12 +10403,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_BUZZY_BUZZ] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_PARALYZE_HIT, .power = 90, .type = TYPE_ELECTRIC, @@ -10396,12 +10421,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_SIZZLY_SLIDE] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_BURN_HIT, .power = 90, .type = TYPE_FIRE, @@ -10410,12 +10439,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_PHYSICAL, }, [MOVE_GLITZY_GLOW] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_PLACEHOLDER, //TODO (Light Screen + Hit) .power = 90, .type = TYPE_PSYCHIC, @@ -10424,12 +10457,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_BADDY_BAD] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_PLACEHOLDER, //TODO (Reflect + Hit) .power = 90, .type = TYPE_DARK, @@ -10438,12 +10475,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_SAPPY_SEED] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED, + #endif .effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit) .power = 90, .type = TYPE_GRASS, @@ -10452,12 +10493,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED, .split = SPLIT_PHYSICAL, }, [MOVE_FREEZY_FROST] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_PLACEHOLDER, //TODO (Haze + Hit) .power = 90, .type = TYPE_ICE, @@ -10466,12 +10511,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_SPARKLY_SWIRL] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_PLACEHOLDER, //TODO (Heal Bell + Hit) .power = 90, .type = TYPE_FAIRY, @@ -10480,12 +10529,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, }, [MOVE_VEEVEE_VOLLEY] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #else + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + #endif .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -10494,7 +10547,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_PHYSICAL, }, From e87f0f1ddba2c5e53d9c1493f962c0288a599b32 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Fri, 13 Nov 2020 14:51:50 -0300 Subject: [PATCH 8/9] Review changes --- data/battle_anim_scripts.s | 70 +++++++------- include/constants/moves.h | 146 +++++++++++++++--------------- src/battle_util.c | 1 + src/data/battle_moves.h | 87 +++++++++++------- src/data/text/move_descriptions.h | 112 +++++++++++------------ src/data/text/move_names.h | 6 +- 6 files changed, 222 insertions(+), 200 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index a6a779f34..4580bd26b 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -370,6 +370,7 @@ gBattleAnims_Moves:: .4byte Move_WATER_PULSE .4byte Move_DOOM_DESIRE .4byte Move_PSYCHO_BOOST +@@@@@@@@@@@@ GEN 4 @@@@@@@@@@@@ .4byte Move_ROOST .4byte Move_GRAVITY .4byte Move_MIRACLE_EYE @@ -483,6 +484,7 @@ gBattleAnims_Moves:: .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 @@ -575,6 +577,7 @@ gBattleAnims_Moves:: .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 @@ -824,6 +827,7 @@ gBattleAnims_Special:: .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE .4byte Special_CriticalCaptureBallThrow @ B_ANIM_CRITICAL_CAPTURE_THROW +@@@@@@@@@@@@@@@@@@@@@@@ GEN 4 @@@@@@@@@@@@@@@@@@@@@@@ Move_ROOST: loadspritegfx ANIM_TAG_WHITE_FEATHER loadspritegfx ANIM_TAG_BLUE_STAR @@ -2493,10 +2497,10 @@ Move_GIGA_IMPACT: delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 - @monbg ANIM_DEF_PARTNER - @setalpha 12, 8 - @createvisualtask AnimTask_WindUpLunge, 5, 7, 0, -18, 8, 23, 10, 40, 10 - @delay 35 + @monbg ANIM_DEF_PARTNER + @setalpha 12, 8 + @createvisualtask AnimTask_WindUpLunge, 5, 7, 0, -18, 8, 23, 10, 40, 10 + @delay 35 createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 31, 3, 1, 0, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, 4, 4, -10, 0, 1, 0 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET @@ -3755,8 +3759,8 @@ JudgmentOutwardSpikes: JudgmentOutwardSpikes2: createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x2D, 0xFF9D, 16 @between up and upper right createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xDF, 0xFF9D, 16 @between right and upper right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x9F, 0x37, 16 @between right and lower right - createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x1F, 0x37, 16 @between lower right and down + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x9F, 0x37, 16 @between right and lower right + createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0x1F, 0x37, 16 @between lower right and down createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFFE0, 0x43, 16 @between lower left and down createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF60, 0x43, 16 @between left and lower left createsprite gJudgmentGrayOutwardSpikesTemplate, ANIM_TARGET, 2, 1, 1, 0xFF2A, 0xFFAA, 16 @between left and upper left @@ -4144,7 +4148,7 @@ Move_ROAR_OF_TIME: Move_SPECIAL_REND: loadspritegfx ANIM_TAG_PUNISHMENT_BLADES - loadspritegfx ANIM_TAG_PINK_HEART_2 @ANIM_TAG_BERRY_EATEN + loadspritegfx ANIM_TAG_PINK_HEART_2 @ANIM_TAG_BERRY_EATEN monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 16, 0 @@ -4175,7 +4179,7 @@ Move_SPECIAL_REND: clearmonbg ANIM_ATK_PARTNER blendoff end - + Move_LUNAR_DANCE: loadspritegfx ANIM_TAG_MOON loadspritegfx ANIM_TAG_GREEN_SPARKLE @@ -4385,7 +4389,7 @@ Move_OMINOUS_WIND: playsewithpan 228, 0 delay 0 monbg ANIM_DEF_PARTNER - @bankBG_over_partnerBG + @bankBG_over_partnerBG delay 0 createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 5, 1, 0, 0, 0, 0 delay 0 @@ -4491,6 +4495,7 @@ ShadowForceBg: waitbgfadein return +@@@@@@@@@@@@@@@@@@@@@@@ GEN 5 @@@@@@@@@@@@@@@@@@@@@@@ Move_HONE_CLAWS: loadspritegfx ANIM_TAG_SWIPE call HoneClawsAnim @@ -4512,7 +4517,6 @@ HoneClawsAnim: delay 10 return - Move_WIDE_GUARD: loadspritegfx ANIM_TAG_ICE_SPIKES @motion from icy wind loadspritegfx ANIM_TAG_PINK_PETAL @pink color @@ -4717,7 +4721,6 @@ RagePowderSprinkle: delay 0xc return - Move_TELEKINESIS:: loadspritegfx ANIM_TAG_SPARKLE_4 @detect createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 0x1, 0x0, 0x9, 0x0 @@ -4736,7 +4739,6 @@ Move_TELEKINESIS:: waitforvisualfinish end - Move_MAGIC_ROOM:: call InitRoomAnimation fadetobg BG_MAGIC_ROOM @@ -4746,8 +4748,7 @@ Move_MAGIC_ROOM:: waitbgfadein blendoff end - - + Move_SMACK_DOWN:: loadspritegfx ANIM_TAG_BLACK_BALL loadspritegfx ANIM_TAG_IMPACT @@ -4762,7 +4763,6 @@ Move_SMACK_DOWN:: createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 goto SeismicTossWeak - Move_STORM_THROW: call StormThorwAnim call StormThorwAnim @@ -7261,7 +7261,7 @@ Move_RELIC_SONG: monbg ANIM_DEF_PARTNER launchtask AnimTask_MusicNotesRainbowBlend 0x2 0x0 waitforvisualfinish - panse_1B 0x1DF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 @ ??? + panse_1B 0x1DF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 @ ??? launchtask AnimTask_UproarDistortion 0x2 0x1 0x0 launchtemplate gUproarRingSpriteTemplate 0x3 0x6 0x0 0x0 0x0 0x0 0x1f 0x8 launchtemplate gJaggedMusicNoteSpriteTemplate 0x2 0x4 0x0 0x1d 0xfff4 0x0 @@ -7883,7 +7883,7 @@ Move_FUSION_BOLT:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 0x0, 0x0, 0xE, 0x0 @@ -8887,7 +8887,7 @@ Move_DIAMOND_STORM:: launchtemplate gDiamondStormDiamondsTemplate 0x82 0x5 0x14 0xff 0xf 0x20 0x0 launchtemplate gDiamondStormDiamondsTemplate 0x82 0x5 0x6e 0xa 0x8 0x20 0x14 waitforvisualfinish - @this is the buffet part + @this is the buffet part launchtemplate gBasicHitSplatSpriteTemplate 0x83 0x4 0xffe0 0xfff0 0x1 0x3 playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET launchtask AnimTask_ShakeMonInPlace 0x2 0x5 0x1 0x3 0x0 0xc 0x1 @@ -9473,7 +9473,7 @@ Move_DAZZLING_GLEAM:: loadspritegfx ANIM_TAG_BLUE_STAR launchtemplate gSimplePaletteBlendSpriteTemplate 0x2 0x5 0x1 0x2 0x0 0xd 0x7fff playsewithpan SE_M_TWISTER, SOUND_PAN_ATTACKER - @call 0x081D56B3 -> middle of GrantingStarsEffect + @call 0x081D56B3 -> middle of GrantingStarsEffect createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 waitforvisualfinish @@ -10100,7 +10100,7 @@ Move_ORIGIN_PULSE:: Move_PRECIPICE_BLADES:: loadspritegfx ANIM_TAG_LARGE_SPIKE loadspritegfx ANIM_TAG_FIRE_PLUME - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_LARGE_SPIKE, 0, 10, 10, 0x159F @Blood orange + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_LARGE_SPIKE, 0, 10, 10, 0x159F @Blood orange monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -12468,7 +12468,7 @@ PrismaticLaserRain: delay 0x2 launchtemplate gPrismaticLaserGreenRainTemplate 0x82, 0x4, -30, 0x44, 4, ANIM_TARGET delay 0x2 - launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 27, 0x37, 4, ANIM_TARGET + launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 27, 0x37, 4, ANIM_TARGET delay 0x2 launchtemplate gPrismaticLaserVioletRainTemplate 0x82, 0x4, -20, 0x32, 4, ANIM_TARGET delay 0x2 @@ -12476,7 +12476,7 @@ PrismaticLaserRain: delay 0x2 launchtemplate gPrismaticLaserGreenRainTemplate 0x82, 0x4, -12, 0x3a, 4, ANIM_TARGET delay 0x2 - launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 19, 0x3c, 4, ANIM_TARGET + launchtemplate gPrismaticLaserRedRainTemplate 0x82, 0x4, 19, 0x3c, 4, ANIM_TARGET delay 0x2 launchtemplate gPrismaticLaserVioletRainTemplate 0x82, 0x4, -38, 0x3a, 4, ANIM_TARGET delay 0x2 @@ -12619,7 +12619,7 @@ Move_SUNSTEEL_STRIKE:: launchtemplate gSunsteelStrikeBlackFlyBallTemplate 0x2 0x4 0x0 0x0 0xd 0x150 launchtask AnimTask_HorizontalShake 0x5 0x3 0x4 0x1 0x1A delay 0x18 - launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x0 @The rock particles mess up the fly animation + launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x0 @The rock particles mess up the fly animation launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x1 launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x2 launchtemplate gSunsteelStrikeRocksTemplate 0x2 0x2 0x0 0x3 @@ -12740,7 +12740,7 @@ Move_MOONGEIST_BEAM:: launchtask AnimTask_MoonlightEndFade 0x2 0x0 end MoongeistBeamCharge: - launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 40, 0, 0, 0, 30, 10 @From right + launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 40, 0, 0, 0, 30, 10 @From right launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -40, 0, 0, 0, 30, -10 @From left launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, -25, -40, 0, 0, 30, -20 @From top left launchtemplate gMoongeistBeamChargeTemplate 0, 0x6, 25, -40, 0, 0, 30, 20 @From top right @@ -14013,7 +14013,7 @@ Move_OBSTRUCT:: loadspritegfx ANIM_TAG_PROTECT loadspritegfx ANIM_TAG_OBSTRUCT_CROSS createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_NOISE_LINE, 0, 10, 10, 0 @Black - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, 0 @Black + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, 0 @Black launchtask SoundTask_PlayDoubleCry 0x2 0x2 ANIM_ATTACKER 0xff call RoarEffect waitforvisualfinish @@ -23395,15 +23395,15 @@ Move_SKY_UPPERCUT: Move_SECRET_POWER: createvisualtask AnimTask_GetBattleTerrain, 5 - jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM - jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF - jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT - jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL - jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF - jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM - jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW - jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE - jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH + jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM + jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF + jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT + jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL + jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF + jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM + jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW + jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE + jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH goto Move_SLAM Move_TWISTER: @@ -24119,7 +24119,7 @@ General_TurnTrap: createvisualtask AnimTask_GetTrappedMoveAnimId, 5 jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whirlpool - jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp + jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap Status_BindWrap: diff --git a/include/constants/moves.h b/include/constants/moves.h index 4d25958c1..d41013701 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -696,84 +696,84 @@ #define MOVE_PLASMA_FISTS 674 #define MOVE_PHOTON_GEYSER 675 // LGPE Moves -#define MOVE_ZIPPY_ZAP 676 -#define MOVE_SPLISHY_SPLASH 677 -#define MOVE_FLOATY_FALL 678 -#define MOVE_PIKA_PAPOW 679 -#define MOVE_BOUNCY_BUBBLE 680 -#define MOVE_BUZZY_BUZZ 681 -#define MOVE_SIZZLY_SLIDE 682 -#define MOVE_GLITZY_GLOW 683 -#define MOVE_BADDY_BAD 684 -#define MOVE_SAPPY_SEED 685 -#define MOVE_FREEZY_FROST 686 -#define MOVE_SPARKLY_SWIRL 687 -#define MOVE_VEEVEE_VOLLEY 688 -#define MOVE_DOUBLE_IRON_BASH 689 +#define MOVE_ZIPPY_ZAP 676 +#define MOVE_SPLISHY_SPLASH 677 +#define MOVE_FLOATY_FALL 678 +#define MOVE_PIKA_PAPOW 679 +#define MOVE_BOUNCY_BUBBLE 680 +#define MOVE_BUZZY_BUZZ 681 +#define MOVE_SIZZLY_SLIDE 682 +#define MOVE_GLITZY_GLOW 683 +#define MOVE_BADDY_BAD 684 +#define MOVE_SAPPY_SEED 685 +#define MOVE_FREEZY_FROST 686 +#define MOVE_SPARKLY_SWIRL 687 +#define MOVE_VEEVEE_VOLLEY 688 +#define MOVE_DOUBLE_IRON_BASH 689 -#define MOVES_COUNT_GEN7 690 +#define MOVES_COUNT_GEN7 690 // Gen 8 moves. -#define MOVE_DYNAMAX_CANNON 690 -#define MOVE_SNIPE_SHOT 691 -#define MOVE_JAW_LOCK 692 -#define MOVE_STUFF_CHEEKS 693 -#define MOVE_NO_RETREAT 694 -#define MOVE_TAR_SHOT 695 -#define MOVE_MAGIC_POWDER 696 -#define MOVE_DRAGON_DARTS 697 -#define MOVE_TEATIME 698 -#define MOVE_OCTOLOCK 699 -#define MOVE_BOLT_BEAK 700 -#define MOVE_FISHIOUS_REND 701 -#define MOVE_COURT_CHANGE 702 -#define MOVE_CLANGOROUS_SOUL 703 -#define MOVE_BODY_PRESS 704 -#define MOVE_DECORATE 705 -#define MOVE_DRUM_BEATING 706 -#define MOVE_SNAP_TRAP 707 -#define MOVE_PYRO_BALL 708 -#define MOVE_BEHEMOTH_BLADE 709 -#define MOVE_BEHEMOTH_BASH 710 -#define MOVE_AURA_WHEEL 711 -#define MOVE_BREAKING_SWIPE 712 -#define MOVE_BRANCH_POKE 713 -#define MOVE_OVERDRIVE 714 -#define MOVE_APPLE_ACID 715 -#define MOVE_GRAV_APPLE 716 -#define MOVE_SPIRIT_BREAK 717 -#define MOVE_STRANGE_STEAM 718 -#define MOVE_LIFE_DEW 719 -#define MOVE_OBSTRUCT 720 -#define MOVE_FALSE_SURRENDER 721 -#define MOVE_METEOR_ASSAULT 722 -#define MOVE_ETERNABEAM 723 -#define MOVE_STEEL_BEAM 724 +#define MOVE_DYNAMAX_CANNON 690 +#define MOVE_SNIPE_SHOT 691 +#define MOVE_JAW_LOCK 692 +#define MOVE_STUFF_CHEEKS 693 +#define MOVE_NO_RETREAT 694 +#define MOVE_TAR_SHOT 695 +#define MOVE_MAGIC_POWDER 696 +#define MOVE_DRAGON_DARTS 697 +#define MOVE_TEATIME 698 +#define MOVE_OCTOLOCK 699 +#define MOVE_BOLT_BEAK 700 +#define MOVE_FISHIOUS_REND 701 +#define MOVE_COURT_CHANGE 702 +#define MOVE_CLANGOROUS_SOUL 703 +#define MOVE_BODY_PRESS 704 +#define MOVE_DECORATE 705 +#define MOVE_DRUM_BEATING 706 +#define MOVE_SNAP_TRAP 707 +#define MOVE_PYRO_BALL 708 +#define MOVE_BEHEMOTH_BLADE 709 +#define MOVE_BEHEMOTH_BASH 710 +#define MOVE_AURA_WHEEL 711 +#define MOVE_BREAKING_SWIPE 712 +#define MOVE_BRANCH_POKE 713 +#define MOVE_OVERDRIVE 714 +#define MOVE_APPLE_ACID 715 +#define MOVE_GRAV_APPLE 716 +#define MOVE_SPIRIT_BREAK 717 +#define MOVE_STRANGE_STEAM 718 +#define MOVE_LIFE_DEW 719 +#define MOVE_OBSTRUCT 720 +#define MOVE_FALSE_SURRENDER 721 +#define MOVE_METEOR_ASSAULT 722 +#define MOVE_ETERNABEAM 723 +#define MOVE_STEEL_BEAM 724 // Isle of Armor Moves -#define MOVE_EXPANDING_FORCE 725 -#define MOVE_STEEL_ROLLER 726 -#define MOVE_SCALE_SHOT 727 -#define MOVE_METEOR_BEAM 728 -#define MOVE_SHELL_SIDE_ARM 729 -#define MOVE_MISTY_EXPLOSION 730 -#define MOVE_GRASSY_GLIDE 731 -#define MOVE_RISING_VOLTAGE 732 -#define MOVE_TERRAIN_PULSE 733 -#define MOVE_SKITTER_SMACK 734 -#define MOVE_BURNING_JEALOUSY 735 -#define MOVE_LASH_OUT 736 -#define MOVE_POLTERGEIST 737 -#define MOVE_CORROSIVE_GAS 738 -#define MOVE_COACHING 739 -#define MOVE_FLIP_TURN 740 -#define MOVE_TRIPLE_AXEL 741 -#define MOVE_DUAL_WINGBEAT 742 -#define MOVE_SCORCHING_SANDS 743 -#define MOVE_JUNGLE_HEALING 744 -#define MOVE_WICKED_BLOW 745 -#define MOVE_SURGING_STRIKES 746 +#define MOVE_EXPANDING_FORCE 725 +#define MOVE_STEEL_ROLLER 726 +#define MOVE_SCALE_SHOT 727 +#define MOVE_METEOR_BEAM 728 +#define MOVE_SHELL_SIDE_ARM 729 +#define MOVE_MISTY_EXPLOSION 730 +#define MOVE_GRASSY_GLIDE 731 +#define MOVE_RISING_VOLTAGE 732 +#define MOVE_TERRAIN_PULSE 733 +#define MOVE_SKITTER_SMACK 734 +#define MOVE_BURNING_JEALOUSY 735 +#define MOVE_LASH_OUT 736 +#define MOVE_POLTERGEIST 737 +#define MOVE_CORROSIVE_GAS 738 +#define MOVE_COACHING 739 +#define MOVE_FLIP_TURN 740 +#define MOVE_TRIPLE_AXEL 741 +#define MOVE_DUAL_WINGBEAT 742 +#define MOVE_SCORCHING_SANDS 743 +#define MOVE_JUNGLE_HEALING 744 +#define MOVE_WICKED_BLOW 745 +#define MOVE_SURGING_STRIKES 746 -#define MOVES_COUNT_GEN8 747 +#define MOVES_COUNT_GEN8 747 #define MOVES_COUNT MOVES_COUNT_GEN8 diff --git a/src/battle_util.c b/src/battle_util.c index be45dcf7c..e15cea947 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1292,6 +1292,7 @@ static bool32 IsGravityPreventingMove(u32 move) case MOVE_SKY_DROP: case MOVE_SPLASH: case MOVE_TELEKINESIS: + case MOVE_FLOATY_FALL: return TRUE; default: return FALSE; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 11c46a195..33744a3cd 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -8921,8 +8921,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .target = MOVE_TARGET_SELECTED, .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - .split = SPLIT_SPECIAL, // restores 75% HP instead of 50% HP - .argument = 75, + .split = SPLIT_SPECIAL, + .argument = 75, // restores 75% HP instead of 50% HP }, [MOVE_CRAFTY_SHIELD] = @@ -10319,15 +10319,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_ZIPPY_ZAP] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 80, + .pp = 10, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, #else + .power = 50, + .pp = 15, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, #endif .effect = EFFECT_ALWAYS_CRIT, - .power = 50, .type = TYPE_ELECTRIC, .accuracy = 100, - .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 2, @@ -10391,33 +10393,38 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_BOUNCY_BUBBLE] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 60, + .pp = 20, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else + .power = 90, + .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_ABSORB, - .power = 90, .type = TYPE_WATER, .accuracy = 100, - .pp = 15, .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, + .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, + .argument = 100, // restores 100% HP instead of 50% HP }, [MOVE_BUZZY_BUZZ] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 60, + .pp = 20, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else + .power = 90, + .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_PARALYZE_HIT, - .power = 90, .type = TYPE_ELECTRIC, .accuracy = 100, - .pp = 15, .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -10427,15 +10434,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_SIZZLY_SLIDE] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 60, + .pp = 20, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else + .power = 90, + .pp = 15, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_BURN_HIT, - .power = 90, .type = TYPE_FIRE, .accuracy = 100, - .pp = 15, .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -10445,14 +10454,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_GLITZY_GLOW] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 80, + .accuracy = 95, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else + .power = 90, + .accuracy = 100, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_PLACEHOLDER, //TODO (Light Screen + Hit) - .power = 90, .type = TYPE_PSYCHIC, - .accuracy = 100, .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, @@ -10463,14 +10474,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_BADDY_BAD] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 80, + .accuracy = 95, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else + .power = 90, + .accuracy = 100, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_PLACEHOLDER, //TODO (Reflect + Hit) - .power = 90, .type = TYPE_DARK, - .accuracy = 100, .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, @@ -10481,15 +10494,18 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_SAPPY_SEED] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 100, + .accuracy = 90, + .pp = 10, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, #else + .power = 90, + .accuracy = 100, + .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED, #endif .effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit) - .power = 90, .type = TYPE_GRASS, - .accuracy = 100, - .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -10499,15 +10515,18 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_FREEZY_FROST] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 100, + .accuracy = 90, + .pp = 10, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else + .power = 90, + .accuracy = 100, + .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_PLACEHOLDER, //TODO (Haze + Hit) - .power = 90, .type = TYPE_ICE, - .accuracy = 100, - .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -10517,15 +10536,18 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_SPARKLY_SWIRL] = { #if B_UPDATED_MOVE_DATA >= GEN_8 + .power = 120, + .accuracy = 85, + .pp = 5, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, #else + .power = 90, + .accuracy = 100, + .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, #endif .effect = EFFECT_PLACEHOLDER, //TODO (Heal Bell + Hit) - .power = 90, .type = TYPE_FAIRY, - .accuracy = 100, - .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, @@ -10558,7 +10580,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .accuracy = 100, .pp = 5, .secondaryEffectChance = 30, - .target = MOVE_TARGET_FOES_AND_ALLY, + .target = MOVE_TARGET_SELECTED, .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST, .split = SPLIT_PHYSICAL, @@ -11171,7 +11193,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = { .effect = EFFECT_PLACEHOLDER, //TODO .power = 50, - .type = TYPE_ELECTRIC, + .type = TYPE_NORMAL, .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, @@ -11203,7 +11225,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .accuracy = 100, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, + .target = MOVE_TARGET_BOTH, .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .split = SPLIT_SPECIAL, @@ -11261,13 +11283,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALLY, .priority = 0, - .flags = FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = 0, .split = SPLIT_STATUS, }, [MOVE_FLIP_TURN] = { - .effect = EFFECT_PLACEHOLDER, //TODO (U-Turn?) + .effect = EFFECT_HIT_ESCAPE, .power = 60, .type = TYPE_WATER, .accuracy = 100, @@ -11281,7 +11303,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_TRIPLE_AXEL] = { - .effect = EFFECT_PLACEHOLDER, //TODO + .effect = EFFECT_TRIPLE_KICK, //TODO: Increase damage by 20 instead of 10 .power = 20, .type = TYPE_ICE, .accuracy = 90, @@ -11332,7 +11354,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .argument = TRUE, // Protects the whole side. }, [MOVE_WICKED_BLOW] = @@ -11345,7 +11366,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_IRON_FIST_BOOST, .split = SPLIT_PHYSICAL, }, @@ -11359,7 +11380,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_IRON_FIST_BOOST, .split = SPLIT_PHYSICAL, }, }; diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index fb24000b2..595de2e0d 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -2622,16 +2622,16 @@ static const u8 sPHOTON_GEYSERDescription[] = _( "determines its category."); static const u8 sZIPPY_ZAPDescription[] = _( - "An attack that is always goes\n" - "first with a critical hit."); + "Electric bursts always go\n" + "first and land a critical hit."); static const u8 sSPLISHY_SPLASHDescription[] = _( "A huge electrified wave that\n" "may paralyze the foe."); static const u8 sFLOATY_FALLDescription[] = _( - "Floats in the air to fall as\n" - "an attack. May cause flinch."); + "Floats in air and dives at\n" + "angle. May cause flinching."); static const u8 sPIKA_PAPOWDescription[] = _( "Pikachu's love increases its\n" @@ -2639,35 +2639,35 @@ static const u8 sPIKA_PAPOWDescription[] = _( static const u8 sBOUNCY_BUBBLEDescription[] = _( "An attack that absorbs\n" - "half the damage inflicted."); + "all the damage inflicted."); static const u8 sBUZZY_BUZZDescription[] = _( "Shoots a jolt of electricity\n" "that always paralyzes."); static const u8 sSIZZLY_SLIDEDescription[] = _( - "Cloaks itself in fire to\n" - "charge, burning the target."); + "User cloaked in fire charges.\n" + "Leaves the foe with a burn."); static const u8 sGLITZY_GLOWDescription[] = _( - "Creates a Light Screen after\n" - "a telekinetic attack."); + "Telekinetic force that sets\n" + "wall, lowering Sp. Atk damage."); static const u8 sBADDY_BADDescription[] = _( - "Creates a Reflect wall after\n" - "acting bad and attacking."); + "Acting badly, attacks. Sets\n" + "wall, lowering Attack damage."); static const u8 sSAPPY_SEEDDescription[] = _( - "Grows a stalk that spreads\n" - "damaging Leech Seeds."); + "Giant stalk scatters seeds\n" + "that drain HP every turn."); static const u8 sFREEZY_FROSTDescription[] = _( - "A frozen haze attack that\n" - "eliminates all stat changes."); + "Crystal from cold haze hits.\n" + "Eliminates all stat changes."); static const u8 sSPARKLY_SWIRLDescription[] = _( - "Heals all status problems\n" - "with a whirlwind of scent."); + "Wrap foe with whirlwind of\n" + "scent. Heals party's status."); static const u8 sVEEVEE_VOLLEYDescription[] = _( "Eevee's love increases its\n" @@ -2819,12 +2819,12 @@ static const u8 sSTEEL_BEAMDescription[] = _( "its body. It hurts the user."); static const u8 sEXPANDING_FORCEDescription[] = _( - "A Psychic attack that's more\n" - "powerful in Psychic Terrain."); + "Power goes up and damages\n" + "all foes on Psychic Terrain."); static const u8 sSTEEL_ROLLERDescription[] = _( - "Destroys any active terrain.\n" - "Without one, it fails."); + "Destroys terrain. Fails if\n" + "ground isn't terrain."); static const u8 sSCALE_SHOTDescription[] = _( "Shoots scales 2 to 5 times.\n" @@ -2835,76 +2835,76 @@ static const u8 sMETEOR_BEAMDescription[] = _( "Sp. Attack before attacking."); static const u8 sSHELL_SIDE_ARMDescription[] = _( - "Its category depends on\n" - "which one will damage more."); + "Uses higher of physical and \n" + "special damage. May poison."); static const u8 sMISTY_EXPLOSIONDescription[] = _( - "Boosted by Misty Terrain, it\n" - "makes the user faint."); + "Hit everything and faint.\n" + "Powers up on Misty Terrain."); static const u8 sGRASSY_GLIDEDescription[] = _( - "On Grassy Terrain, the user\n" - "will always strike first."); + "Gliding on ground, hits. Goes\n" + "first on Grassy Terrain."); static const u8 sRISING_VOLTAGEDescription[] = _( - "Its power doubles while\n" - "on Electric Terrain."); + "This move's power doubles\n" + "when on Electric Terrain."); static const u8 sTERRAIN_PULSEDescription[] = _( - "Type changes depending on\n" - "terrain. Power also doubles."); + "Type and power changes\n" + "depending on the terrain."); static const u8 sSKITTER_SMACKDescription[] = _( - "User skitters behind target\n" - "to attack. Lowers Sp. Atk."); + "User skitters behind foe to\n" + "attack. Lowers foe’s Sp. Atk."); static const u8 sBURNING_JEALOUSYDescription[] = _( - "Burns whoever their stats\n" - "raised on the same turn."); + "Foes that have stats upped\n" + "during the turn get burned."); static const u8 sLASH_OUTDescription[] = _( - "Power doubles if stats were\n" - "lowered on the same turn."); + "If stats lowered during this\n" + "turn, power is doubled."); static const u8 sPOLTERGEISTDescription[] = _( - "Only works if the target\n" - "is holding an item."); + "Control foe’s item to attack.\n" + "Fails if foe has no item."); static const u8 sCORROSIVE_GASDescription[] = _( - "Melts all surrounding items\n" - "with highly acidic gas."); + "Highly acidic gas melts items\n" + "held by surrounding Pokémon."); static const u8 sCOACHINGDescription[] = _( - "The user coaches an ally to\n" - "raise their Atk. and Def."); + "Properly coaches allies to\n" + "up their Attack and Defense."); static const u8 sFLIP_TURNDescription[] = _( - "Does damage then switches\n" - "out the user."); + "Attacks and rushes back to\n" + "switch with a party Pokémon."); static const u8 sTRIPLE_AXELDescription[] = _( "A 3-kick attack that gets\n" - "stronger on each hit."); + "more powerful with each hit."); static const u8 sDUAL_WINGBEATDescription[] = _( - "The user uses its wings to\n" - "slam the target twice."); + "User slams the target with\n" + "wings and hits twice in a row."); static const u8 sSCORCHING_SANDSDescription[] = _( - "It throws scorching sand\n" - "that may burn the target."); + "Throws scorching sand at\n" + "the target. May leave a burn."); static const u8 sJUNGLE_HEALINGDescription[] = _( - "Becomes one with the jungle\n" - "to heal the team's health."); + "Heals HP and status of\n" + "itself and allies in battle."); static const u8 sWICKED_BLOWDescription[] = _( - "By mastering the Dark style,\n" - "always does a critical hit."); + "Mastering the Dark style,\n" + "strikes with a critical hit."); static const u8 sSURGING_STRIKESDescription[] = _( - "By mastering the Water style\n" - "it lands with 3 critical hits."); + "Mastering the Water style,\n" + "strikes with 3 critical hits."); static const u8 sNotDoneYetDescription[] = _( "Not done yet."); diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index a42680e2c..1eaf3137d 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -689,7 +689,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_FREEZY_FROST] = _("Freezy Frost"), [MOVE_SPARKLY_SWIRL] = _("SparklySwirl"), [MOVE_VEEVEE_VOLLEY] = _("VeeveeVolley"), - [MOVE_DOUBLE_IRON_BASH] = _("D. Iron Bash"), + [MOVE_DOUBLE_IRON_BASH] = _("DublIronBash"), //GEN 8 [MOVE_DYNAMAX_CANNON] = _("Dyna Cannon"), [MOVE_SNIPE_SHOT] = _("Snipe Shot"), @@ -730,10 +730,10 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_STEEL_ROLLER] = _("Steel Roller"), [MOVE_SCALE_SHOT] = _("Scale Shot"), [MOVE_METEOR_BEAM] = _("Meteor Beam"), - [MOVE_SHELL_SIDE_ARM] = _("Shell S. Arm"), + [MOVE_SHELL_SIDE_ARM] = _("ShellSideArm"), [MOVE_MISTY_EXPLOSION] = _("Misty Explos"), [MOVE_GRASSY_GLIDE] = _("Grassy Glide"), - [MOVE_RISING_VOLTAGE] = _("Rise Voltage"), + [MOVE_RISING_VOLTAGE] = _("Rising Volts"), [MOVE_TERRAIN_PULSE] = _("TerrainPulse"), [MOVE_SKITTER_SMACK] = _("SkitterSmack"), [MOVE_BURNING_JEALOUSY] = _("BurnJealousy"), From f0154028ff8e48188e0e711895b093c6d16c89c8 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sat, 14 Nov 2020 09:01:43 -0300 Subject: [PATCH 9/9] Review changes 2 --- data/battle_anim_scripts.s | 704 +++++++++++------------------- include/constants/moves.h | 2 +- src/data/battle_moves.h | 14 +- src/data/text/move_descriptions.h | 10 +- 4 files changed, 274 insertions(+), 456 deletions(-) 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[] = _(