From ae7cbc2aa1d38ae17fdcb24231f1d5d4b8a18d9b Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Thu, 27 Oct 2022 20:38:40 -0700 Subject: [PATCH] merged physical and special max moves --- data/battle_anim_scripts.s | 108 ++--- include/constants/moves.h | 157 +++---- src/data/battle_moves.h | 940 ++++--------------------------------- src/data/text/move_names.h | 306 ++++-------- 4 files changed, 276 insertions(+), 1235 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 64fe5fbdbc..96928560e4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -843,42 +843,24 @@ gBattleAnims_Moves:: .4byte Move_SOUL_STEALING_7_STAR_STRIKE @@@@ MAX MOVES .4byte Move_MAX_GUARD - .4byte Move_MAX_STRIKE_P - .4byte Move_MAX_STRIKE_S - .4byte Move_MAX_KNUCKLE_P - .4byte Move_MAX_KNUCKLE_S - .4byte Move_MAX_AIRSTREAM_P - .4byte Move_MAX_AIRSTREAM_S - .4byte Move_MAX_OOZE_P - .4byte Move_MAX_OOZE_S - .4byte Move_MAX_QUAKE_P - .4byte Move_MAX_QUAKE_S - .4byte Move_MAX_ROCKFALL_P - .4byte Move_MAX_ROCKFALL_S - .4byte Move_MAX_FLUTTERBY_P - .4byte Move_MAX_FLUTTERBY_S - .4byte Move_MAX_PHANTASM_P - .4byte Move_MAX_PHANTASM_S - .4byte Move_MAX_STEELSPIKE_P - .4byte Move_MAX_STEELSPIKE_S - .4byte Move_MAX_FLARE_P - .4byte Move_MAX_FLARE_S - .4byte Move_MAX_GEYSER_P - .4byte Move_MAX_GEYSER_S - .4byte Move_MAX_OVERGROWTH_P - .4byte Move_MAX_OVERGROWTH_S - .4byte Move_MAX_LIGHTNING_P - .4byte Move_MAX_LIGHTNING_S - .4byte Move_MAX_HAILSTORM_P - .4byte Move_MAX_HAILSTORM_S - .4byte Move_MAX_MINDSTORM_P - .4byte Move_MAX_MINDSTORM_S - .4byte Move_MAX_WYRMWIND_P - .4byte Move_MAX_WYRMWIND_S - .4byte Move_MAX_DARKNESS_P - .4byte Move_MAX_DARKNESS_S - .4byte Move_MAX_STARFALL_P - .4byte Move_MAX_STARFALL_S + .4byte Move_MAX_STRIKE + .4byte Move_MAX_KNUCKLE + .4byte Move_MAX_AIRSTREAM + .4byte Move_MAX_OOZE + .4byte Move_MAX_QUAKE + .4byte Move_MAX_ROCKFALL + .4byte Move_MAX_FLUTTERBY + .4byte Move_MAX_PHANTASM + .4byte Move_MAX_STEELSPIKE + .4byte Move_MAX_FLARE + .4byte Move_MAX_GEYSER + .4byte Move_MAX_OVERGROWTH + .4byte Move_MAX_LIGHTNING + .4byte Move_MAX_HAILSTORM + .4byte Move_MAX_MINDSTORM + .4byte Move_MAX_WYRMWIND + .4byte Move_MAX_DARKNESS + .4byte Move_MAX_STARFALL @@@ Last Move - cannot be reached .4byte Move_COUNT @@ -30673,40 +30655,22 @@ SoulStealingSevenStarStrikeExplosion: @@@@@@@@@@ MAX MOVES @@@@@@@@@@ Move_MAX_GUARD: -Move_MAX_KNUCKLE_P:: -Move_MAX_KNUCKLE_S:: -Move_MAX_QUAKE_P:: -Move_MAX_QUAKE_S:: -Move_MAX_ROCKFALL_P:: -Move_MAX_ROCKFALL_S:: -Move_MAX_FLUTTERBY_P:: -Move_MAX_FLUTTERBY_S:: -Move_MAX_PHANTASM_P:: -Move_MAX_PHANTASM_S:: -Move_MAX_STEELSPIKE_P:: -Move_MAX_STEELSPIKE_S:: -Move_MAX_HAILSTORM_P:: -Move_MAX_HAILSTORM_S:: -Move_MAX_MINDSTORM_P:: -Move_MAX_MINDSTORM_S:: -Move_MAX_WYRMWIND_P:: -Move_MAX_WYRMWIND_S:: -Move_MAX_DARKNESS_P:: -Move_MAX_DARKNESS_S:: -Move_MAX_STARFALL_P:: -Move_MAX_STARFALL_S:: -Move_MAX_STRIKE_P:: -Move_MAX_STRIKE_S:: -Move_MAX_AIRSTREAM_P:: -Move_MAX_AIRSTREAM_S:: -Move_MAX_OOZE_P:: -Move_MAX_OOZE_S:: -Move_MAX_FLARE_P:: -Move_MAX_FLARE_S:: -Move_MAX_GEYSER_P:: -Move_MAX_GEYSER_S:: -Move_MAX_OVERGROWTH_P:: -Move_MAX_OVERGROWTH_S:: -Move_MAX_LIGHTNING_P:: -Move_MAX_LIGHTNING_S:: +Move_MAX_STRIKE: +Move_MAX_KNUCKLE: +Move_MAX_AIRSTREAM: +Move_MAX_OOZE: +Move_MAX_QUAKE: +Move_MAX_ROCKFALL: +Move_MAX_FLUTTERBY: +Move_MAX_PHANTASM: +Move_MAX_STEELSPIKE: +Move_MAX_FLARE: +Move_MAX_GEYSER: +Move_MAX_OVERGROWTH: +Move_MAX_LIGHTNING: +Move_MAX_HAILSTORM: +Move_MAX_MINDSTORM: +Move_MAX_WYRMWIND: +Move_MAX_DARKNESS: +Move_MAX_STARFALL: end diff --git a/include/constants/moves.h b/include/constants/moves.h index 4025584477..7a971a00aa 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -856,113 +856,62 @@ #define MOVES_COUNT_Z (LAST_Z_MOVE + 1) //Max Moves -#define MOVE_MAX_GUARD (FIRST_MAX_MOVE + 0) -#define MOVE_MAX_STRIKE_P (FIRST_MAX_MOVE + 1) -#define MOVE_MAX_STRIKE_S (FIRST_MAX_MOVE + 2) -#define MOVE_MAX_KNUCKLE_P (FIRST_MAX_MOVE + 3) -#define MOVE_MAX_KNUCKLE_S (FIRST_MAX_MOVE + 4) -#define MOVE_MAX_AIRSTREAM_P (FIRST_MAX_MOVE + 5) -#define MOVE_MAX_AIRSTREAM_S (FIRST_MAX_MOVE + 6) -#define MOVE_MAX_OOZE_P (FIRST_MAX_MOVE + 7) -#define MOVE_MAX_OOZE_S (FIRST_MAX_MOVE + 8) -#define MOVE_MAX_QUAKE_P (FIRST_MAX_MOVE + 9) -#define MOVE_MAX_QUAKE_S (FIRST_MAX_MOVE + 10) -#define MOVE_MAX_ROCKFALL_P (FIRST_MAX_MOVE + 11) -#define MOVE_MAX_ROCKFALL_S (FIRST_MAX_MOVE + 12) -#define MOVE_MAX_FLUTTERBY_P (FIRST_MAX_MOVE + 13) -#define MOVE_MAX_FLUTTERBY_S (FIRST_MAX_MOVE + 14) -#define MOVE_MAX_PHANTASM_P (FIRST_MAX_MOVE + 15) -#define MOVE_MAX_PHANTASM_S (FIRST_MAX_MOVE + 16) -#define MOVE_MAX_STEELSPIKE_P (FIRST_MAX_MOVE + 17) -#define MOVE_MAX_STEELSPIKE_S (FIRST_MAX_MOVE + 18) -#define MOVE_MAX_FLARE_P (FIRST_MAX_MOVE + 19) -#define MOVE_MAX_FLARE_S (FIRST_MAX_MOVE + 20) -#define MOVE_MAX_GEYSER_P (FIRST_MAX_MOVE + 21) -#define MOVE_MAX_GEYSER_S (FIRST_MAX_MOVE + 22) -#define MOVE_MAX_OVERGROWTH_P (FIRST_MAX_MOVE + 23) -#define MOVE_MAX_OVERGROWTH_S (FIRST_MAX_MOVE + 24) -#define MOVE_MAX_LIGHTNING_P (FIRST_MAX_MOVE + 25) -#define MOVE_MAX_LIGHTNING_S (FIRST_MAX_MOVE + 26) -#define MOVE_MAX_MINDSTORM_P (FIRST_MAX_MOVE + 27) -#define MOVE_MAX_MINDSTORM_S (FIRST_MAX_MOVE + 28) -#define MOVE_MAX_HAILSTORM_P (FIRST_MAX_MOVE + 29) -#define MOVE_MAX_HAILSTORM_S (FIRST_MAX_MOVE + 30) -#define MOVE_MAX_WYRMWIND_P (FIRST_MAX_MOVE + 31) -#define MOVE_MAX_WYRMWIND_S (FIRST_MAX_MOVE + 32) -#define MOVE_MAX_DARKNESS_P (FIRST_MAX_MOVE + 33) -#define MOVE_MAX_DARKNESS_S (FIRST_MAX_MOVE + 34) -#define MOVE_MAX_STARFALL_P (FIRST_MAX_MOVE + 35) -#define MOVE_MAX_STARFALL_S (FIRST_MAX_MOVE + 36) +#define MOVE_MAX_GUARD (FIRST_MAX_MOVE + 0) +#define MOVE_MAX_STRIKE (FIRST_MAX_MOVE + 1) +#define MOVE_MAX_KNUCKLE (FIRST_MAX_MOVE + 2) +#define MOVE_MAX_AIRSTREAM (FIRST_MAX_MOVE + 3) +#define MOVE_MAX_OOZE (FIRST_MAX_MOVE + 4) +#define MOVE_MAX_QUAKE (FIRST_MAX_MOVE + 5) +#define MOVE_MAX_ROCKFALL (FIRST_MAX_MOVE + 6) +#define MOVE_MAX_FLUTTERBY (FIRST_MAX_MOVE + 7) +#define MOVE_MAX_PHANTASM (FIRST_MAX_MOVE + 8) +#define MOVE_MAX_STEELSPIKE (FIRST_MAX_MOVE + 9) +#define MOVE_MAX_FLARE (FIRST_MAX_MOVE + 10) +#define MOVE_MAX_GEYSER (FIRST_MAX_MOVE + 11) +#define MOVE_MAX_OVERGROWTH (FIRST_MAX_MOVE + 12) +#define MOVE_MAX_LIGHTNING (FIRST_MAX_MOVE + 13) +#define MOVE_MAX_MINDSTORM (FIRST_MAX_MOVE + 14) +#define MOVE_MAX_HAILSTORM (FIRST_MAX_MOVE + 15) +#define MOVE_MAX_WYRMWIND (FIRST_MAX_MOVE + 16) +#define MOVE_MAX_DARKNESS (FIRST_MAX_MOVE + 17) +#define MOVE_MAX_STARFALL (FIRST_MAX_MOVE + 18) // Gigantamax Moves -#define MOVE_G_MAX_VINE_LASH_P (FIRST_MAX_MOVE + 37) -#define MOVE_G_MAX_VINE_LASH_S (FIRST_MAX_MOVE + 38) -#define MOVE_G_MAX_WILDFIRE_P (FIRST_MAX_MOVE + 39) -#define MOVE_G_MAX_WILDFIRE_S (FIRST_MAX_MOVE + 40) -#define MOVE_G_MAX_CANNONADE_P (FIRST_MAX_MOVE + 41) -#define MOVE_G_MAX_CANNONADE_S (FIRST_MAX_MOVE + 42) -#define MOVE_G_MAX_BEFUDDLE_P (FIRST_MAX_MOVE + 43) -#define MOVE_G_MAX_BEFUDDLE_S (FIRST_MAX_MOVE + 44) -#define MOVE_G_MAX_VOLT_CRASH_P (FIRST_MAX_MOVE + 45) -#define MOVE_G_MAX_VOLT_CRASH_S (FIRST_MAX_MOVE + 46) -#define MOVE_G_MAX_GOLD_RUSH_P (FIRST_MAX_MOVE + 47) -#define MOVE_G_MAX_GOLD_RUSH_S (FIRST_MAX_MOVE + 48) -#define MOVE_G_MAX_CHI_STRIKE_P (FIRST_MAX_MOVE + 49) -#define MOVE_G_MAX_CHI_STRIKE_S (FIRST_MAX_MOVE + 50) -#define MOVE_G_MAX_TERROR_P (FIRST_MAX_MOVE + 51) -#define MOVE_G_MAX_TERROR_S (FIRST_MAX_MOVE + 52) -#define MOVE_G_MAX_FOAM_BURST_P (FIRST_MAX_MOVE + 53) -#define MOVE_G_MAX_FOAM_BURST_S (FIRST_MAX_MOVE + 54) -#define MOVE_G_MAX_RESONANCE_P (FIRST_MAX_MOVE + 55) -#define MOVE_G_MAX_RESONANCE_S (FIRST_MAX_MOVE + 56) -#define MOVE_G_MAX_CUDDLE_P (FIRST_MAX_MOVE + 57) -#define MOVE_G_MAX_CUDDLE_S (FIRST_MAX_MOVE + 58) -#define MOVE_G_MAX_REPLENISH_P (FIRST_MAX_MOVE + 59) -#define MOVE_G_MAX_REPLENISH_S (FIRST_MAX_MOVE + 60) -#define MOVE_G_MAX_MALODOR_P (FIRST_MAX_MOVE + 61) -#define MOVE_G_MAX_MALODOR_S (FIRST_MAX_MOVE + 62) -#define MOVE_G_MAX_MELTDOWN_P (FIRST_MAX_MOVE + 63) -#define MOVE_G_MAX_MELTDOWN_S (FIRST_MAX_MOVE + 64) -#define MOVE_G_MAX_DRUM_SOLO_P (FIRST_MAX_MOVE + 65) -#define MOVE_G_MAX_DRUM_SOLO_S (FIRST_MAX_MOVE + 66) -#define MOVE_G_MAX_FIREBALL_P (FIRST_MAX_MOVE + 67) -#define MOVE_G_MAX_FIREBALL_S (FIRST_MAX_MOVE + 68) -#define MOVE_G_MAX_HYDROSNIPE_P (FIRST_MAX_MOVE + 69) -#define MOVE_G_MAX_HYDROSNIPE_S (FIRST_MAX_MOVE + 70) -#define MOVE_G_MAX_WIND_RAGE_P (FIRST_MAX_MOVE + 71) -#define MOVE_G_MAX_WIND_RAGE_S (FIRST_MAX_MOVE + 72) -#define MOVE_G_MAX_GRAVITAS_P (FIRST_MAX_MOVE + 73) -#define MOVE_G_MAX_GRAVITAS_S (FIRST_MAX_MOVE + 74) -#define MOVE_G_MAX_STONESURGE_P (FIRST_MAX_MOVE + 75) -#define MOVE_G_MAX_STONESURGE_S (FIRST_MAX_MOVE + 76) -#define MOVE_G_MAX_VOLCALITH_P (FIRST_MAX_MOVE + 77) -#define MOVE_G_MAX_VOLCALITH_S (FIRST_MAX_MOVE + 78) -#define MOVE_G_MAX_TARTNESS_P (FIRST_MAX_MOVE + 79) -#define MOVE_G_MAX_TARTNESS_S (FIRST_MAX_MOVE + 80) -#define MOVE_G_MAX_SWEETNESS_P (FIRST_MAX_MOVE + 81) -#define MOVE_G_MAX_SWEETNESS_S (FIRST_MAX_MOVE + 82) -#define MOVE_G_MAX_SANDBLAST_P (FIRST_MAX_MOVE + 83) -#define MOVE_G_MAX_SANDBLAST_S (FIRST_MAX_MOVE + 84) -#define MOVE_G_MAX_STUN_SHOCK_P (FIRST_MAX_MOVE + 85) -#define MOVE_G_MAX_STUN_SHOCK_S (FIRST_MAX_MOVE + 86) -#define MOVE_G_MAX_CENTIFERNO_P (FIRST_MAX_MOVE + 87) -#define MOVE_G_MAX_CENTIFERNO_S (FIRST_MAX_MOVE + 88) -#define MOVE_G_MAX_SMITE_P (FIRST_MAX_MOVE + 89) -#define MOVE_G_MAX_SMITE_S (FIRST_MAX_MOVE + 90) -#define MOVE_G_MAX_SNOOZE_P (FIRST_MAX_MOVE + 91) -#define MOVE_G_MAX_SNOOZE_S (FIRST_MAX_MOVE + 92) -#define MOVE_G_MAX_FINALE_P (FIRST_MAX_MOVE + 93) -#define MOVE_G_MAX_FINALE_S (FIRST_MAX_MOVE + 94) -#define MOVE_G_MAX_STEELSURGE_P (FIRST_MAX_MOVE + 95) -#define MOVE_G_MAX_STEELSURGE_S (FIRST_MAX_MOVE + 96) -#define MOVE_G_MAX_DEPLETION_P (FIRST_MAX_MOVE + 97) -#define MOVE_G_MAX_DEPLETION_S (FIRST_MAX_MOVE + 98) -#define MOVE_G_MAX_ONE_BLOW_P (FIRST_MAX_MOVE + 99) -#define MOVE_G_MAX_ONE_BLOW_S (FIRST_MAX_MOVE + 100) -#define MOVE_G_MAX_RAPID_FLOW_P (FIRST_MAX_MOVE + 101) -#define MOVE_G_MAX_RAPID_FLOW_S (FIRST_MAX_MOVE + 102) +#define MOVE_G_MAX_VINE_LASH (FIRST_MAX_MOVE + 19) +#define MOVE_G_MAX_WILDFIRE (FIRST_MAX_MOVE + 20) +#define MOVE_G_MAX_CANNONADE (FIRST_MAX_MOVE + 21) +#define MOVE_G_MAX_BEFUDDLE (FIRST_MAX_MOVE + 22) +#define MOVE_G_MAX_VOLT_CRASH (FIRST_MAX_MOVE + 23) +#define MOVE_G_MAX_GOLD_RUSH (FIRST_MAX_MOVE + 24) +#define MOVE_G_MAX_CHI_STRIKE (FIRST_MAX_MOVE + 25) +#define MOVE_G_MAX_TERROR (FIRST_MAX_MOVE + 26) +#define MOVE_G_MAX_FOAM_BURST (FIRST_MAX_MOVE + 27) +#define MOVE_G_MAX_RESONANCE (FIRST_MAX_MOVE + 28) +#define MOVE_G_MAX_CUDDLE (FIRST_MAX_MOVE + 29) +#define MOVE_G_MAX_REPLENISH (FIRST_MAX_MOVE + 30) +#define MOVE_G_MAX_MALODOR (FIRST_MAX_MOVE + 31) +#define MOVE_G_MAX_MELTDOWN (FIRST_MAX_MOVE + 32) +#define MOVE_G_MAX_DRUM_SOLO (FIRST_MAX_MOVE + 33) +#define MOVE_G_MAX_FIREBALL (FIRST_MAX_MOVE + 34) +#define MOVE_G_MAX_HYDROSNIPE (FIRST_MAX_MOVE + 35) +#define MOVE_G_MAX_WIND_RAGE (FIRST_MAX_MOVE + 36) +#define MOVE_G_MAX_GRAVITAS (FIRST_MAX_MOVE + 37) +#define MOVE_G_MAX_STONESURGE (FIRST_MAX_MOVE + 38) +#define MOVE_G_MAX_VOLCALITH (FIRST_MAX_MOVE + 39) +#define MOVE_G_MAX_TARTNESS (FIRST_MAX_MOVE + 40) +#define MOVE_G_MAX_SWEETNESS (FIRST_MAX_MOVE + 41) +#define MOVE_G_MAX_SANDBLAST (FIRST_MAX_MOVE + 42) +#define MOVE_G_MAX_STUN_SHOCK (FIRST_MAX_MOVE + 43) +#define MOVE_G_MAX_CENTIFERNO (FIRST_MAX_MOVE + 44) +#define MOVE_G_MAX_SMITE (FIRST_MAX_MOVE + 45) +#define MOVE_G_MAX_SNOOZE (FIRST_MAX_MOVE + 46) +#define MOVE_G_MAX_FINALE (FIRST_MAX_MOVE + 47) +#define MOVE_G_MAX_STEELSURGE (FIRST_MAX_MOVE + 48) +#define MOVE_G_MAX_DEPLETION (FIRST_MAX_MOVE + 49) +#define MOVE_G_MAX_ONE_BLOW (FIRST_MAX_MOVE + 50) +#define MOVE_G_MAX_RAPID_FLOW (FIRST_MAX_MOVE + 51) #define FIRST_MAX_MOVE MOVES_COUNT_Z -#define LAST_MAX_MOVE MOVE_G_MAX_RAPID_FLOW_S +#define LAST_MAX_MOVE MOVE_G_MAX_RAPID_FLOW #define MOVES_COUNT_DYNAMAX (LAST_MAX_MOVE + 1) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index f8fa922a42..46fb13335e 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -14161,7 +14161,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_STATUS, }, - [MOVE_MAX_FLARE_P] = + [MOVE_MAX_FLARE] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14176,22 +14176,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_SUN, }, - [MOVE_MAX_FLARE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_SUN, - }, - - [MOVE_MAX_FLUTTERBY_P] = + [MOVE_MAX_FLUTTERBY] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14206,22 +14191,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_LOWER_SP_ATK, }, - [MOVE_MAX_FLUTTERBY_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_BUG, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_LOWER_SP_ATK, - }, - - [MOVE_MAX_LIGHTNING_P] = + [MOVE_MAX_LIGHTNING] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14236,22 +14206,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_ELECTRIC_TERRAIN, }, - [MOVE_MAX_LIGHTNING_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_ELECTRIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_ELECTRIC_TERRAIN, - }, - - [MOVE_MAX_STRIKE_P] = + [MOVE_MAX_STRIKE] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14266,22 +14221,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_LOWER_SPEED, }, - [MOVE_MAX_STRIKE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_LOWER_SPEED, - }, - - [MOVE_MAX_KNUCKLE_P] = + [MOVE_MAX_KNUCKLE] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14296,22 +14236,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_RAISE_TEAM_ATTACK, }, - [MOVE_MAX_KNUCKLE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FIGHTING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_RAISE_TEAM_ATTACK, - }, - - [MOVE_MAX_PHANTASM_P] = + [MOVE_MAX_PHANTASM] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14326,22 +14251,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_LOWER_DEFENSE, }, - [MOVE_MAX_PHANTASM_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_GHOST, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_LOWER_DEFENSE, - }, - - [MOVE_MAX_HAILSTORM_P] = + [MOVE_MAX_HAILSTORM] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14356,22 +14266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_HAIL, }, - [MOVE_MAX_HAILSTORM_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_ICE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_HAIL, - }, - - [MOVE_MAX_OOZE_P] = + [MOVE_MAX_OOZE] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14386,22 +14281,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_RAISE_TEAM_SP_ATK, }, - [MOVE_MAX_OOZE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_POISON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_RAISE_TEAM_SP_ATK, - }, - - [MOVE_MAX_GEYSER_P] = + [MOVE_MAX_GEYSER] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14416,22 +14296,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_RAIN, }, - [MOVE_MAX_GEYSER_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_RAIN, - }, - - [MOVE_MAX_AIRSTREAM_P] = + [MOVE_MAX_AIRSTREAM] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14446,22 +14311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_RAISE_TEAM_SPEED, }, - [MOVE_MAX_AIRSTREAM_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FLYING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_RAISE_TEAM_SPEED, - }, - - [MOVE_MAX_STARFALL_P] = + [MOVE_MAX_STARFALL] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14476,22 +14326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_MISTY_TERRAIN, }, - [MOVE_MAX_STARFALL_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_FAIRY, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_MISTY_TERRAIN, - }, - - [MOVE_MAX_WYRMWIND_P] = + [MOVE_MAX_WYRMWIND] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14506,22 +14341,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .argument = MAX_EFFECT_LOWER_ATTACK, }, - [MOVE_MAX_WYRMWIND_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_DRAGON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_LOWER_ATTACK, - }, - - [MOVE_MAX_MINDSTORM_P] = + [MOVE_MAX_MINDSTORM] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14535,23 +14355,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_PSYCHIC_TERRAIN, }, - - [MOVE_MAX_MINDSTORM_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_PSYCHIC_TERRAIN, - }, - - [MOVE_MAX_ROCKFALL_P] = + [MOVE_MAX_ROCKFALL] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14565,23 +14369,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_SANDSTORM, }, - - [MOVE_MAX_ROCKFALL_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_ROCK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_SANDSTORM, - }, - - [MOVE_MAX_QUAKE_P] = + [MOVE_MAX_QUAKE] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14595,23 +14383,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SP_DEF, }, - - [MOVE_MAX_QUAKE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_GROUND, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_RAISE_TEAM_SP_DEF, - }, - - [MOVE_MAX_DARKNESS_P] = + [MOVE_MAX_DARKNESS] = { .effect = EFFECT_MAX_MOVE, .power = 1, @@ -14625,23 +14397,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_LOWER_SP_DEF, }, - - [MOVE_MAX_DARKNESS_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 1, - .type = TYPE_DARK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_LOWER_SP_DEF, - }, - - [MOVE_MAX_OVERGROWTH_P] = + [MOVE_MAX_OVERGROWTH] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14655,23 +14411,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_GRASSY_TERRAIN, }, - - [MOVE_MAX_OVERGROWTH_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_GRASSY_TERRAIN, - }, - - [MOVE_MAX_STEELSPIKE_P] = + [MOVE_MAX_STEELSPIKE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14685,23 +14425,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_DEFENSE, }, - - [MOVE_MAX_STEELSPIKE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_STEEL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_RAISE_TEAM_DEFENSE, - }, - - [MOVE_G_MAX_VINE_LASH_P] = + + [MOVE_G_MAX_VINE_LASH] = { //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14715,23 +14440,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_VINE_LASH, }, - - [MOVE_G_MAX_VINE_LASH_S] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_VINE_LASH, - }, - - [MOVE_G_MAX_WILDFIRE_P] = + + [MOVE_G_MAX_WILDFIRE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14745,23 +14455,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_WILDFIRE, }, - - [MOVE_G_MAX_WILDFIRE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_WILDFIRE, - }, - - [MOVE_G_MAX_CANNONADE_P] = + + [MOVE_G_MAX_CANNONADE] = { //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14775,23 +14470,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_CANNONADE, }, - - [MOVE_G_MAX_CANNONADE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_CANNONADE, - }, - - [MOVE_G_MAX_BEFUDDLE_P] = + + [MOVE_G_MAX_BEFUDDLE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14805,23 +14485,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_EFFECT_SPORE_FOES, }, - - [MOVE_G_MAX_BEFUDDLE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_BUG, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_EFFECT_SPORE_FOES, - }, - - [MOVE_G_MAX_VOLT_CRASH_P] = + + [MOVE_G_MAX_VOLT_CRASH] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14835,23 +14500,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_PARALYZE_FOES, }, - - [MOVE_G_MAX_VOLT_CRASH_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ELECTRIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_PARALYZE_FOES, - }, - - [MOVE_G_MAX_GOLD_RUSH_P] = + + [MOVE_G_MAX_GOLD_RUSH] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14865,24 +14515,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES_PAY_DAY, }, - - [MOVE_G_MAX_GOLD_RUSH_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - //.z_move_power = 100, - .argument = MAX_EFFECT_CONFUSE_FOES_PAY_DAY, - }, - - [MOVE_G_MAX_CHI_STRIKE_P] = + + [MOVE_G_MAX_CHI_STRIKE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14896,23 +14530,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_CRIT_PLUS, }, - - [MOVE_G_MAX_CHI_STRIKE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIGHTING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_CRIT_PLUS, - }, - - [MOVE_G_MAX_TERROR_P] = + + [MOVE_G_MAX_TERROR] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14926,23 +14545,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_MEAN_LOOK, }, - - [MOVE_G_MAX_TERROR_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GHOST, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_MEAN_LOOK, - }, - - [MOVE_G_MAX_FOAM_BURST_P] = + + [MOVE_G_MAX_FOAM_BURST] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14956,23 +14560,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_LOWER_SPEED_2_FOES, }, - - [MOVE_G_MAX_FOAM_BURST_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_LOWER_SPEED_2_FOES, - }, - - [MOVE_G_MAX_RESONANCE_P] = + + [MOVE_G_MAX_RESONANCE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -14986,23 +14575,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_AURORA_VEIL, }, - - [MOVE_G_MAX_RESONANCE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ICE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_AURORA_VEIL, - }, - - [MOVE_G_MAX_CUDDLE_P] = + + [MOVE_G_MAX_CUDDLE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15016,23 +14590,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_INFATUATE_FOES, }, - - [MOVE_G_MAX_CUDDLE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_INFATUATE_FOES, - }, - - [MOVE_G_MAX_REPLENISH_P] = + + [MOVE_G_MAX_REPLENISH] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15046,23 +14605,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_RECYCLE_BERRIES, }, - - [MOVE_G_MAX_REPLENISH_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_RECYCLE_BERRIES, - }, - - [MOVE_G_MAX_MALODOR_P] = + + [MOVE_G_MAX_MALODOR] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15076,23 +14620,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_POISON_FOES, }, - - [MOVE_G_MAX_MALODOR_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_POISON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_POISON_FOES, - }, - - [MOVE_G_MAX_MELTDOWN_P] = + + [MOVE_G_MAX_MELTDOWN] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15106,23 +14635,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, }, - - [MOVE_G_MAX_MELTDOWN_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_STEEL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_TORMENT_FOES, - }, - - [MOVE_G_MAX_DRUM_SOLO_P] = + + [MOVE_G_MAX_DRUM_SOLO] = { //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15136,23 +14650,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO }, - - [MOVE_G_MAX_DRUM_SOLO_S] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO - }, - - [MOVE_G_MAX_FIREBALL_P] = + + [MOVE_G_MAX_FIREBALL] = { //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15166,23 +14665,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO }, - - [MOVE_G_MAX_FIREBALL_S] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO - }, - - [MOVE_G_MAX_HYDROSNIPE_P] = + + [MOVE_G_MAX_HYDROSNIPE] = { //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15196,23 +14680,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO }, - - [MOVE_G_MAX_HYDROSNIPE_S] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO - }, - - [MOVE_G_MAX_WIND_RAGE_P] = + + [MOVE_G_MAX_WIND_RAGE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15226,23 +14695,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_DEFOG, }, - - [MOVE_G_MAX_WIND_RAGE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FLYING, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_DEFOG, - }, - - [MOVE_G_MAX_GRAVITAS_P] = + + [MOVE_G_MAX_GRAVITAS] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15256,23 +14710,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_GRAVITY, }, - - [MOVE_G_MAX_GRAVITAS_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_GRAVITY, - }, - - [MOVE_G_MAX_STONESURGE_P] = + + [MOVE_G_MAX_STONESURGE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15286,23 +14725,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_STEALTH_ROCK, }, - - [MOVE_G_MAX_STONESURGE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_STEALTH_ROCK, - }, - - [MOVE_G_MAX_VOLCALITH_P] = + + [MOVE_G_MAX_VOLCALITH] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15316,23 +14740,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_VOLCAITH_FOES, }, - - [MOVE_G_MAX_VOLCALITH_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ROCK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_VOLCAITH_FOES, - }, - - [MOVE_G_MAX_TARTNESS_P] = + + [MOVE_G_MAX_TARTNESS] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15346,23 +14755,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_LOWER_EVASIVENESS_FOES, }, - - [MOVE_G_MAX_TARTNESS_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_LOWER_EVASIVENESS_FOES, - }, - - [MOVE_G_MAX_SWEETNESS_P] = + + [MOVE_G_MAX_SWEETNESS] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15376,23 +14770,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_AROMATHERAPY, }, - - [MOVE_G_MAX_SWEETNESS_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_AROMATHERAPY, - }, - - [MOVE_G_MAX_SANDBLAST_P] = + + [MOVE_G_MAX_SANDBLAST] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15406,23 +14785,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_SANDBLAST_FOES, }, - - [MOVE_G_MAX_SANDBLAST_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_GROUND, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_SANDBLAST_FOES, - }, - - [MOVE_G_MAX_STUN_SHOCK_P] = + + [MOVE_G_MAX_STUN_SHOCK] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15436,23 +14800,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_POISON_PARALYZE_FOES, }, - - [MOVE_G_MAX_STUN_SHOCK_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_ELECTRIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_POISON_PARALYZE_FOES, - }, - - [MOVE_G_MAX_CENTIFERNO_P] = + + [MOVE_G_MAX_CENTIFERNO] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15466,23 +14815,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_FIRE_SPIN_FOES, }, - - [MOVE_G_MAX_CENTIFERNO_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_FIRE_SPIN_FOES, - }, - - [MOVE_G_MAX_SMITE_P] = + + [MOVE_G_MAX_SMITE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15496,24 +14830,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES, }, + - [MOVE_G_MAX_SMITE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FAIRY, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_CONFUSE_FOES, - }, - - - [MOVE_G_MAX_SNOOZE_P] = + [MOVE_G_MAX_SNOOZE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15527,23 +14846,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_YAWN_FOE, }, - - [MOVE_G_MAX_SNOOZE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_DARK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_YAWN_FOE, - }, - - [MOVE_G_MAX_FINALE_P] = + + [MOVE_G_MAX_FINALE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15557,23 +14861,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_HEAL_TEAM, }, - - [MOVE_G_MAX_FINALE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_FAIRY, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_HEAL_TEAM, - }, - - [MOVE_G_MAX_STEELSURGE_P] = + + [MOVE_G_MAX_STEELSURGE] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15587,23 +14876,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_STEELSURGE, }, - - [MOVE_G_MAX_STEELSURGE_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_STEEL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_STEELSURGE, - }, - - [MOVE_G_MAX_DEPLETION_P] = + + [MOVE_G_MAX_DEPLETION] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15617,23 +14891,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_SPITE, }, - - [MOVE_G_MAX_DEPLETION_S] = - { - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_DRAGON, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_SPITE, - }, - - [MOVE_G_MAX_ONE_BLOW_P] = + + [MOVE_G_MAX_ONE_BLOW] = { .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15647,23 +14906,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO }, - - [MOVE_G_MAX_ONE_BLOW_S] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_DARK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO - }, - - [MOVE_G_MAX_RAPID_FLOW_P] = + + [MOVE_G_MAX_RAPID_FLOW] = { //ANIM TODO .effect = EFFECT_MAX_MOVE, .power = 10, @@ -15677,21 +14921,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .split = SPLIT_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO }, - - [MOVE_G_MAX_RAPID_FLOW_S] = - { //ANIM TODO - .effect = EFFECT_MAX_MOVE, - .power = 10, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - .split = SPLIT_SPECIAL, - .argument = MAX_EFFECT_TORMENT_FOES, //EFFECT TODO - }, + }; const u8 gDynamaxMovePowers[MOVES_COUNT] = diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 7f5a1685e6..d319900a16 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -783,109 +783,58 @@ const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] = [MOVE_TAKE_HEART] = _("Take Heart"), // Max Moves [MOVE_MAX_GUARD] = _("Max Guard"), - [MOVE_MAX_STRIKE_P] = _("Max Strike"), - [MOVE_MAX_STRIKE_S] = _("Max Strike"), - [MOVE_MAX_KNUCKLE_P] = _("Max Knuckle"), - [MOVE_MAX_KNUCKLE_S] = _("Max Knuckle"), - [MOVE_MAX_AIRSTREAM_P] = _("Max Airstream"), - [MOVE_MAX_AIRSTREAM_S] = _("Max Airstream"), - [MOVE_MAX_OOZE_P] = _("Max Ooze"), - [MOVE_MAX_OOZE_S] = _("Max Ooze"), - [MOVE_MAX_QUAKE_P] = _("Max Quake"), - [MOVE_MAX_QUAKE_S] = _("Max Quake"), - [MOVE_MAX_ROCKFALL_P] = _("Max Rockfall"), - [MOVE_MAX_ROCKFALL_S] = _("Max Rockfall"), - [MOVE_MAX_FLUTTERBY_P] = _("Max Flutterby"), - [MOVE_MAX_FLUTTERBY_S] = _("Max Flutterby"), - [MOVE_MAX_PHANTASM_P] = _("Max Phantasm"), - [MOVE_MAX_PHANTASM_S] = _("Max Phantasm"), - [MOVE_MAX_STEELSPIKE_P] = _("Max Steelspike"), - [MOVE_MAX_STEELSPIKE_S] = _("Max Steelspike"), - [MOVE_MAX_FLARE_P] = _("Max Flare"), - [MOVE_MAX_FLARE_S] = _("Max Flare"), - [MOVE_MAX_GEYSER_P] = _("Max Geyser"), - [MOVE_MAX_GEYSER_S] = _("Max Geyser"), - [MOVE_MAX_OVERGROWTH_P] = _("Max Overgrowth"), - [MOVE_MAX_OVERGROWTH_S] = _("Max Overgrowth"), - [MOVE_MAX_LIGHTNING_P] = _("Max Lightning"), - [MOVE_MAX_LIGHTNING_S] = _("Max Lightning"), - [MOVE_MAX_HAILSTORM_P] = _("Max Hailstorm"), - [MOVE_MAX_HAILSTORM_S] = _("Max Hailstorm"), - [MOVE_MAX_MINDSTORM_P] = _("Max Mindstorm"), - [MOVE_MAX_MINDSTORM_S] = _("Max Mindstorm"), - [MOVE_MAX_WYRMWIND_P] = _("Max Wyrmwind"), - [MOVE_MAX_WYRMWIND_S] = _("Max Wyrmwind"), - [MOVE_MAX_DARKNESS_P] = _("Max Darkness"), - [MOVE_MAX_DARKNESS_S] = _("Max Darkness"), - [MOVE_MAX_STARFALL_P] = _("Max Starfall"), - [MOVE_MAX_STARFALL_S] = _("Max Starfall"), + [MOVE_MAX_STRIKE] = _("Max Strike"), + [MOVE_MAX_KNUCKLE] = _("Max Knuckle"), + [MOVE_MAX_AIRSTREAM] = _("Max Airstream"), + [MOVE_MAX_OOZE] = _("Max Ooze"), + [MOVE_MAX_QUAKE] = _("Max Quake"), + [MOVE_MAX_ROCKFALL] = _("Max Rockfall"), + [MOVE_MAX_FLUTTERBY] = _("Max Flutterby"), + [MOVE_MAX_PHANTASM] = _("Max Phantasm"), + [MOVE_MAX_STEELSPIKE] = _("Max Steelspike"), + [MOVE_MAX_FLARE] = _("Max Flare"), + [MOVE_MAX_GEYSER] = _("Max Geyser"), + [MOVE_MAX_OVERGROWTH] = _("Max Overgrowth"), + [MOVE_MAX_LIGHTNING] = _("Max Lightning"), + [MOVE_MAX_HAILSTORM] = _("Max Hailstorm"), + [MOVE_MAX_MINDSTORM] = _("Max Mindstorm"), + [MOVE_MAX_WYRMWIND] = _("Max Wyrmwind"), + [MOVE_MAX_DARKNESS] = _("Max Darkness"), + [MOVE_MAX_STARFALL] = _("Max Starfall"), // Gigantamax Moves - [MOVE_G_MAX_VINE_LASH_P] = _("Gmax Vine Lash"), - [MOVE_G_MAX_VINE_LASH_S] = _("Gmax Vine Lash"), - [MOVE_G_MAX_WILDFIRE_P] = _("Gmax Wildfire"), - [MOVE_G_MAX_WILDFIRE_S] = _("Gmax Wildfire"), - [MOVE_G_MAX_CANNONADE_P] = _("Gmax Cannonade"), - [MOVE_G_MAX_CANNONADE_S] = _("Gmax Cannonade"), - [MOVE_G_MAX_BEFUDDLE_P] = _("Gmax Befuddle"), - [MOVE_G_MAX_BEFUDDLE_S] = _("Gmax Befuddle"), - [MOVE_G_MAX_VOLT_CRASH_P] = _("Gmax Volt Crash"), - [MOVE_G_MAX_VOLT_CRASH_S] = _("Gmax Volt Crash"), - [MOVE_G_MAX_GOLD_RUSH_P] = _("Gmax Gold Rush"), - [MOVE_G_MAX_GOLD_RUSH_S] = _("Gmax Gold Rush"), - [MOVE_G_MAX_CHI_STRIKE_P] = _("Gmax Chi Strike"), - [MOVE_G_MAX_CHI_STRIKE_S] = _("Gmax Chi Strike"), - [MOVE_G_MAX_TERROR_P] = _("Gmax Terror"), - [MOVE_G_MAX_TERROR_S] = _("Gmax Terror"), - [MOVE_G_MAX_FOAM_BURST_P] = _("Gmax Foam Burst"), - [MOVE_G_MAX_FOAM_BURST_S] = _("Gmax Foam Burst"), - [MOVE_G_MAX_RESONANCE_P] = _("Gmax Resonance"), - [MOVE_G_MAX_RESONANCE_S] = _("Gmax Resonance"), - [MOVE_G_MAX_CUDDLE_P] = _("Gmax Cuddle"), - [MOVE_G_MAX_CUDDLE_S] = _("Gmax Cuddle"), - [MOVE_G_MAX_REPLENISH_P] = _("Gmax Replenish"), - [MOVE_G_MAX_REPLENISH_S] = _("Gmax Replenish"), - [MOVE_G_MAX_MALODOR_P] = _("Gmax Malodor"), - [MOVE_G_MAX_MALODOR_S] = _("Gmax Malodor"), - [MOVE_G_MAX_MELTDOWN_P] = _("Gmax Meltdown"), - [MOVE_G_MAX_MELTDOWN_S] = _("Gmax Meltdown"), - [MOVE_G_MAX_DRUM_SOLO_P] = _("Gmax Drum Solo"), - [MOVE_G_MAX_DRUM_SOLO_S] = _("Gmax Drum Solo"), - [MOVE_G_MAX_FIREBALL_P] = _("Gmax Fireball"), - [MOVE_G_MAX_FIREBALL_S] = _("Gmax Fireball"), - [MOVE_G_MAX_HYDROSNIPE_P] = _("Gmax Hydrosnipe"), - [MOVE_G_MAX_HYDROSNIPE_S] = _("Gmax Hydrosnipe"), - [MOVE_G_MAX_WIND_RAGE_P] = _("Gmax Wind Rage"), - [MOVE_G_MAX_WIND_RAGE_S] = _("Gmax Wind Rage"), - [MOVE_G_MAX_GRAVITAS_P] = _("Gmax Gravitas"), - [MOVE_G_MAX_GRAVITAS_S] = _("Gmax Gravitas"), - [MOVE_G_MAX_STONESURGE_P] = _("Gmax Stonesurge"), - [MOVE_G_MAX_STONESURGE_S] = _("Gmax Stonesurge"), - [MOVE_G_MAX_VOLCALITH_P] = _("Gmax Volcalith"), - [MOVE_G_MAX_VOLCALITH_S] = _("Gmax Volcalith"), - [MOVE_G_MAX_TARTNESS_P] = _("Gmax Tartness"), - [MOVE_G_MAX_TARTNESS_S] = _("Gmax Tartness"), - [MOVE_G_MAX_SWEETNESS_P] = _("Gmax Sweetness"), - [MOVE_G_MAX_SWEETNESS_S] = _("Gmax Sweetness"), - [MOVE_G_MAX_SANDBLAST_P] = _("Gmax Sandblast"), - [MOVE_G_MAX_SANDBLAST_S] = _("Gmax Sandblast"), - [MOVE_G_MAX_STUN_SHOCK_P] = _("Gmax Stun Shock"), - [MOVE_G_MAX_STUN_SHOCK_S] = _("Gmax Stun Shock"), - [MOVE_G_MAX_CENTIFERNO_P] = _("Gmax Centiferno"), - [MOVE_G_MAX_CENTIFERNO_S] = _("Gmax Centiferno"), - [MOVE_G_MAX_SMITE_P] = _("Gmax Smite"), - [MOVE_G_MAX_SMITE_S] = _("Gmax Smite"), - [MOVE_G_MAX_SNOOZE_P] = _("Gmax Snooze"), - [MOVE_G_MAX_SNOOZE_S] = _("Gmax Snooze"), - [MOVE_G_MAX_FINALE_P] = _("Gmax Finale"), - [MOVE_G_MAX_FINALE_S] = _("Gmax Finale"), - [MOVE_G_MAX_STEELSURGE_P] = _("Gmax Steelsurge"), - [MOVE_G_MAX_STEELSURGE_S] = _("Gmax Steelsurge"), - [MOVE_G_MAX_DEPLETION_P] = _("Gmax Depletion"), - [MOVE_G_MAX_DEPLETION_S] = _("Gmax Depletion"), - [MOVE_G_MAX_ONE_BLOW_P] = _("Gmax One Blow"), - [MOVE_G_MAX_ONE_BLOW_S] = _("Gmax One Blow"), - [MOVE_G_MAX_RAPID_FLOW_P] = _("Gmax Rapid Flow"), - [MOVE_G_MAX_RAPID_FLOW_S] = _("Gmax Rapid Flow"), + [MOVE_G_MAX_VINE_LASH] = _("Gmax Vine Lash"), + [MOVE_G_MAX_WILDFIRE] = _("Gmax Wildfire"), + [MOVE_G_MAX_CANNONADE] = _("Gmax Cannonade"), + [MOVE_G_MAX_BEFUDDLE] = _("Gmax Befuddle"), + [MOVE_G_MAX_VOLT_CRASH] = _("Gmax Volt Crash"), + [MOVE_G_MAX_GOLD_RUSH] = _("Gmax Gold Rush"), + [MOVE_G_MAX_CHI_STRIKE] = _("Gmax Chi Strike"), + [MOVE_G_MAX_TERROR] = _("Gmax Terror"), + [MOVE_G_MAX_FOAM_BURST] = _("Gmax Foam Burst"), + [MOVE_G_MAX_RESONANCE] = _("Gmax Resonance"), + [MOVE_G_MAX_CUDDLE] = _("Gmax Cuddle"), + [MOVE_G_MAX_REPLENISH] = _("Gmax Replenish"), + [MOVE_G_MAX_MALODOR] = _("Gmax Malodor"), + [MOVE_G_MAX_MELTDOWN] = _("Gmax Meltdown"), + [MOVE_G_MAX_DRUM_SOLO] = _("Gmax Drum Solo"), + [MOVE_G_MAX_FIREBALL] = _("Gmax Fireball"), + [MOVE_G_MAX_HYDROSNIPE] = _("Gmax Hydrosnipe"), + [MOVE_G_MAX_WIND_RAGE] = _("Gmax Wind Rage"), + [MOVE_G_MAX_GRAVITAS] = _("Gmax Gravitas"), + [MOVE_G_MAX_STONESURGE] = _("Gmax Stonesurge"), + [MOVE_G_MAX_VOLCALITH] = _("Gmax Volcalith"), + [MOVE_G_MAX_TARTNESS] = _("Gmax Tartness"), + [MOVE_G_MAX_SWEETNESS] = _("Gmax Sweetness"), + [MOVE_G_MAX_SANDBLAST] = _("Gmax Sandblast"), + [MOVE_G_MAX_STUN_SHOCK] = _("Gmax Stun Shock"), + [MOVE_G_MAX_CENTIFERNO] = _("Gmax Centiferno"), + [MOVE_G_MAX_SMITE] = _("Gmax Smite"), + [MOVE_G_MAX_SNOOZE] = _("Gmax Snooze"), + [MOVE_G_MAX_FINALE] = _("Gmax Finale"), + [MOVE_G_MAX_STEELSURGE] = _("Gmax Steelsurge"), + [MOVE_G_MAX_DEPLETION] = _("Gmax Depletion"), + [MOVE_G_MAX_ONE_BLOW] = _("Gmax One Blow"), + [MOVE_G_MAX_RAPID_FLOW] = _("Gmax Rapid Flow"), }; #else // 12 letters @@ -1672,109 +1621,58 @@ const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] = [MOVE_TAKE_HEART] = _("Take Heart"), // Max Moves [MOVE_MAX_GUARD] = _("M-Guard"), - [MOVE_MAX_STRIKE_P] = _("M-Strike"), - [MOVE_MAX_STRIKE_S] = _("M-Strike"), - [MOVE_MAX_KNUCKLE_P] = _("M-Knuckle"), - [MOVE_MAX_KNUCKLE_S] = _("M-Knuckle"), - [MOVE_MAX_AIRSTREAM_P] = _("M-Airstream"), - [MOVE_MAX_AIRSTREAM_S] = _("M-Airstream"), - [MOVE_MAX_OOZE_P] = _("M-Ooze"), - [MOVE_MAX_OOZE_S] = _("M-Ooze"), - [MOVE_MAX_QUAKE_P] = _("M-Quake"), - [MOVE_MAX_QUAKE_S] = _("M-Quake"), - [MOVE_MAX_ROCKFALL_P] = _("M-Rockfall"), - [MOVE_MAX_ROCKFALL_S] = _("M-Rockfall"), - [MOVE_MAX_FLUTTERBY_P] = _("M-Flutterby"), - [MOVE_MAX_FLUTTERBY_S] = _("M-Flutterby"), - [MOVE_MAX_PHANTASM_P] = _("M-Phantasm"), - [MOVE_MAX_PHANTASM_S] = _("M-Phantasm"), - [MOVE_MAX_STEELSPIKE_P] = _("M-Steelspike"), - [MOVE_MAX_STEELSPIKE_S] = _("M-Steelspike"), - [MOVE_MAX_FLARE_P] = _("M-Flare"), - [MOVE_MAX_FLARE_S] = _("M-Flare"), - [MOVE_MAX_GEYSER_P] = _("M-Geyser"), - [MOVE_MAX_GEYSER_S] = _("M-Geyser"), - [MOVE_MAX_OVERGROWTH_P] = _("M-Overgrowth"), - [MOVE_MAX_OVERGROWTH_S] = _("M-Overgrowth"), - [MOVE_MAX_LIGHTNING_P] = _("M-Lightning"), - [MOVE_MAX_LIGHTNING_S] = _("M-Lightning"), - [MOVE_MAX_HAILSTORM_P] = _("M-Hailstorm"), - [MOVE_MAX_HAILSTORM_S] = _("M-Hailstorm"), - [MOVE_MAX_MINDSTORM_P] = _("M-Mindstorm"), - [MOVE_MAX_MINDSTORM_S] = _("M-Mindstorm"), - [MOVE_MAX_WYRMWIND_P] = _("M-Wyrmwind"), - [MOVE_MAX_WYRMWIND_S] = _("M-Wyrmwind"), - [MOVE_MAX_DARKNESS_P] = _("M-Darkness"), - [MOVE_MAX_DARKNESS_S] = _("M-Darkness"), - [MOVE_MAX_STARFALL_P] = _("M-Starfall"), - [MOVE_MAX_STARFALL_S] = _("M-Starfall"), + [MOVE_MAX_STRIKE] = _("M-Strike"), + [MOVE_MAX_KNUCKLE] = _("M-Knuckle"), + [MOVE_MAX_AIRSTREAM] = _("M-Airstream"), + [MOVE_MAX_OOZE] = _("M-Ooze"), + [MOVE_MAX_QUAKE] = _("M-Quake"), + [MOVE_MAX_ROCKFALL] = _("M-Rockfall"), + [MOVE_MAX_FLUTTERBY] = _("M-Flutterby"), + [MOVE_MAX_PHANTASM] = _("M-Phantasm"), + [MOVE_MAX_STEELSPIKE] = _("M-Steelspike"), + [MOVE_MAX_FLARE] = _("M-Flare"), + [MOVE_MAX_GEYSER] = _("M-Geyser"), + [MOVE_MAX_OVERGROWTH] = _("M-Overgrowth"), + [MOVE_MAX_LIGHTNING] = _("M-Lightning"), + [MOVE_MAX_HAILSTORM] = _("M-Hailstorm"), + [MOVE_MAX_MINDSTORM] = _("M-Mindstorm"), + [MOVE_MAX_WYRMWIND] = _("M-Wyrmwind"), + [MOVE_MAX_DARKNESS] = _("M-Darkness"), + [MOVE_MAX_STARFALL] = _("M-Starfall"), // Gigantamax Moves - [MOVE_G_MAX_VINE_LASH_P] = _("G-Vine Lash"), - [MOVE_G_MAX_VINE_LASH_S] = _("G-Vine Lash"), - [MOVE_G_MAX_WILDFIRE_P] = _("G-Wildfire"), - [MOVE_G_MAX_WILDFIRE_S] = _("G-Wildfire"), - [MOVE_G_MAX_CANNONADE_P] = _("G-Cannonade"), - [MOVE_G_MAX_CANNONADE_S] = _("G-Cannonade"), - [MOVE_G_MAX_BEFUDDLE_P] = _("G-Befuddle"), - [MOVE_G_MAX_BEFUDDLE_S] = _("G-Befuddle"), - [MOVE_G_MAX_VOLT_CRASH_P] = _("G-VoltCrash"), - [MOVE_G_MAX_VOLT_CRASH_S] = _("G-VoltCrash"), - [MOVE_G_MAX_GOLD_RUSH_P] = _("G-Gold Rush"), - [MOVE_G_MAX_GOLD_RUSH_S] = _("G-Gold Rush"), - [MOVE_G_MAX_CHI_STRIKE_P] = _("G-ChiStrike"), - [MOVE_G_MAX_CHI_STRIKE_S] = _("G-ChiStrike"), - [MOVE_G_MAX_TERROR_P] = _("G-Terror"), - [MOVE_G_MAX_TERROR_S] = _("G-Terror"), - [MOVE_G_MAX_FOAM_BURST_P] = _("G-FoamBurst"), - [MOVE_G_MAX_FOAM_BURST_S] = _("G-FoamBurst"), - [MOVE_G_MAX_RESONANCE_P] = _("G-Resonance"), - [MOVE_G_MAX_RESONANCE_S] = _("G-Resonance"), - [MOVE_G_MAX_CUDDLE_P] = _("G-Cuddle"), - [MOVE_G_MAX_CUDDLE_S] = _("G-Cuddle"), - [MOVE_G_MAX_REPLENISH_P] = _("G-Replenish"), - [MOVE_G_MAX_REPLENISH_S] = _("G-Replenish"), - [MOVE_G_MAX_MALODOR_P] = _("G-Malodor"), - [MOVE_G_MAX_MALODOR_S] = _("G-Malodor"), - [MOVE_G_MAX_MELTDOWN_P] = _("G-Meltdown"), - [MOVE_G_MAX_MELTDOWN_S] = _("G-Meltdown"), - [MOVE_G_MAX_DRUM_SOLO_P] = _("G-Drum Solo"), - [MOVE_G_MAX_DRUM_SOLO_S] = _("G-Drum Solo"), - [MOVE_G_MAX_FIREBALL_P] = _("G-Fireball"), - [MOVE_G_MAX_FIREBALL_S] = _("G-Fireball"), - [MOVE_G_MAX_HYDROSNIPE_P] = _("G-Hydrsnipe"), - [MOVE_G_MAX_HYDROSNIPE_S] = _("G-Hydrsnipe"), - [MOVE_G_MAX_WIND_RAGE_P] = _("G-Wind Rage"), - [MOVE_G_MAX_WIND_RAGE_S] = _("G-Wind Rage"), - [MOVE_G_MAX_GRAVITAS_P] = _("G-Gravitas"), - [MOVE_G_MAX_GRAVITAS_S] = _("G-Gravitas"), - [MOVE_G_MAX_STONESURGE_P] = _("G-Stonesrge"), - [MOVE_G_MAX_STONESURGE_S] = _("G-Stonesrge"), - [MOVE_G_MAX_VOLCALITH_P] = _("G-Volcalith"), - [MOVE_G_MAX_VOLCALITH_S] = _("G-Volcalith"), - [MOVE_G_MAX_TARTNESS_P] = _("G-Tartness"), - [MOVE_G_MAX_TARTNESS_S] = _("G-Tartness"), - [MOVE_G_MAX_SWEETNESS_P] = _("G-Sweetness"), - [MOVE_G_MAX_SWEETNESS_S] = _("G-Sweetness"), - [MOVE_G_MAX_SANDBLAST_P] = _("G-Sandblast"), - [MOVE_G_MAX_SANDBLAST_S] = _("G-Sandblast"), - [MOVE_G_MAX_STUN_SHOCK_P] = _("G-StunShock"), - [MOVE_G_MAX_STUN_SHOCK_S] = _("G-StunShock"), - [MOVE_G_MAX_CENTIFERNO_P] = _("G-Centiferno"), - [MOVE_G_MAX_CENTIFERNO_S] = _("G-Centiferno"), - [MOVE_G_MAX_SMITE_P] = _("G-Smite"), - [MOVE_G_MAX_SMITE_S] = _("G-Smite"), - [MOVE_G_MAX_SNOOZE_P] = _("G-Snooze"), - [MOVE_G_MAX_SNOOZE_S] = _("G-Snooze"), - [MOVE_G_MAX_FINALE_P] = _("G-Finale"), - [MOVE_G_MAX_FINALE_S] = _("G-Finale"), - [MOVE_G_MAX_STEELSURGE_P] = _("G-Steelsrge"), - [MOVE_G_MAX_STEELSURGE_S] = _("G-Steelsrge"), - [MOVE_G_MAX_DEPLETION_P] = _("G-Depletion"), - [MOVE_G_MAX_DEPLETION_S] = _("G-Depletion"), - [MOVE_G_MAX_ONE_BLOW_P] = _("G-One Blow"), - [MOVE_G_MAX_ONE_BLOW_S] = _("G-One Blow"), - [MOVE_G_MAX_RAPID_FLOW_P] = _("G-Rapid Flow"), - [MOVE_G_MAX_RAPID_FLOW_S] = _("G-Rapid Flow"), + [MOVE_G_MAX_VINE_LASH] = _("G-Vine Lash"), + [MOVE_G_MAX_WILDFIRE] = _("G-Wildfire"), + [MOVE_G_MAX_CANNONADE] = _("G-Cannonade"), + [MOVE_G_MAX_BEFUDDLE] = _("G-Befuddle"), + [MOVE_G_MAX_VOLT_CRASH] = _("G-VoltCrash"), + [MOVE_G_MAX_GOLD_RUSH] = _("G-Gold Rush"), + [MOVE_G_MAX_CHI_STRIKE] = _("G-ChiStrike"), + [MOVE_G_MAX_TERROR] = _("G-Terror"), + [MOVE_G_MAX_FOAM_BURST] = _("G-FoamBurst"), + [MOVE_G_MAX_RESONANCE] = _("G-Resonance"), + [MOVE_G_MAX_CUDDLE] = _("G-Cuddle"), + [MOVE_G_MAX_REPLENISH] = _("G-Replenish"), + [MOVE_G_MAX_MALODOR] = _("G-Malodor"), + [MOVE_G_MAX_MELTDOWN] = _("G-Meltdown"), + [MOVE_G_MAX_DRUM_SOLO] = _("G-Drum Solo"), + [MOVE_G_MAX_FIREBALL] = _("G-Fireball"), + [MOVE_G_MAX_HYDROSNIPE] = _("G-Hydrsnipe"), + [MOVE_G_MAX_WIND_RAGE] = _("G-Wind Rage"), + [MOVE_G_MAX_GRAVITAS] = _("G-Gravitas"), + [MOVE_G_MAX_STONESURGE] = _("G-Stonesrge"), + [MOVE_G_MAX_VOLCALITH] = _("G-Volcalith"), + [MOVE_G_MAX_TARTNESS] = _("G-Tartness"), + [MOVE_G_MAX_SWEETNESS] = _("G-Sweetness"), + [MOVE_G_MAX_SANDBLAST] = _("G-Sandblast"), + [MOVE_G_MAX_STUN_SHOCK] = _("G-StunShock"), + [MOVE_G_MAX_CENTIFERNO] = _("G-Centiferno"), + [MOVE_G_MAX_SMITE] = _("G-Smite"), + [MOVE_G_MAX_SNOOZE] = _("G-Snooze"), + [MOVE_G_MAX_FINALE] = _("G-Finale"), + [MOVE_G_MAX_STEELSURGE] = _("G-Steelsrge"), + [MOVE_G_MAX_DEPLETION] = _("G-Depletion"), + [MOVE_G_MAX_ONE_BLOW] = _("G-One Blow"), + [MOVE_G_MAX_RAPID_FLOW] = _("G-Rapid Flow"), }; #endif