Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge

include/constants/battle_config.h

@@ -284,6 +284,7 @@
 #define B_SHOW_TARGETS              TRUE  // If set to TRUE, all available targets, for moves hitting 2 or 3 Pokémon, will be shown before selecting a move.
 #define B_SHOW_SPLIT_ICON           TRUE  // If set to TRUE, it will show an icon in the summary showing the move's category split.
 #define B_HIDE_HEALTHBOX_IN_ANIMS   TRUE  // If set to TRUE, hides healthboxes during move animations.
+#define B_EXPANDED_MOVE_NAMES       FALSE // If set to TRUE, move names are increased from 12 characters to 16 characters.
 
 // Catching settings
 #define B_SEMI_INVULNERABLE_CATCH   GEN_7    // In Gen4+, you cannot throw a ball against a Pokemon that is in a semi-invulnerable state (dig/fly/etc)

include/constants/global.h

@@ -1,5 +1,8 @@
 #ifndef GUARD_CONSTANTS_GLOBAL_H
 #define GUARD_CONSTANTS_GLOBAL_H
+
+#include "constants/battle_config.h"
+
 // Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen.
 // In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen.
 // In Gen 4 only, migrated Pokemon with Diamond, Pearl, or Platinum's ID show as "----------".
@@ -94,7 +97,11 @@
 #define PLAYER_NAME_LENGTH 7
 #define MAIL_WORDS_COUNT 9
 #define EASY_CHAT_BATTLE_WORDS_COUNT 6
+#if B_EXPANDED_MOVE_NAMES == TRUE
+#define MOVE_NAME_LENGTH 16
+#else
 #define MOVE_NAME_LENGTH 12
+#endif
 #define NUM_QUESTIONNAIRE_WORDS 4
 #define QUIZ_QUESTION_LEN 9
 #define WONDER_CARD_TEXT_LENGTH 40

src/battle_ai_main.c

@@ -4393,10 +4393,13 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
         break;
     case EFFECT_RELIC_SONG:
         #if (defined SPECIES_MELOETTA && defined SPECIES_MELOETTA_PIROUETTE)
-        if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA && gBattleMons[battlerDef].defense < gBattleMons[battlerDef].spDefense)
+        if (!(gBattleMons[battlerAtk].status2 & STATUS2_TRANSFORMED)) // Don't try to change form if it's transformed.
-            score += 3; // Change to pirouette if can do more damage
+        {
-        else if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA_PIROUETTE && gBattleMons[battlerDef].spDefense < gBattleMons[battlerDef].defense)
+            if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA && gBattleMons[battlerDef].defense < gBattleMons[battlerDef].spDefense)
-            score += 3; // Change to Aria if can do more damage
+                score += 3; // Change to Pirouette if can do more damage
+            else if (gBattleMons[battlerAtk].species == SPECIES_MELOETTA_PIROUETTE && gBattleMons[battlerDef].spDefense < gBattleMons[battlerDef].defense)
+                score += 3; // Change to Aria if can do more damage
+        }
         #endif
         break;
     case EFFECT_ELECTRIC_TERRAIN:

src/battle_controller_opponent.c

@@ -1578,24 +1578,19 @@ static void OpponentHandleChooseMove(void)
                 BtlController_EmitTwoReturnValues(BUFFER_B, 15, gBattlerTarget);
                 break;
             default:
-                if (GetBattlerMoveTargetType(gActiveBattler, moveInfo->moves[chosenMoveId]) & (MOVE_TARGET_USER_OR_SELECTED | MOVE_TARGET_USER))
-                    gBattlerTarget = gActiveBattler;
-                if (GetBattlerMoveTargetType(gActiveBattler, moveInfo->moves[chosenMoveId]) & MOVE_TARGET_BOTH)
                 {
                     u16 chosenMove = moveInfo->moves[chosenMoveId];
-                        
+
-                    if (gBattleMoves[chosenMove].target & (MOVE_TARGET_USER_OR_SELECTED | MOVE_TARGET_USER))
+                    if (GetBattlerMoveTargetType(gActiveBattler, chosenMove) & (MOVE_TARGET_USER_OR_SELECTED | MOVE_TARGET_USER))
                         gBattlerTarget = gActiveBattler;
-                    if (gBattleMoves[chosenMove].target & MOVE_TARGET_BOTH)
+                    if (GetBattlerMoveTargetType(gActiveBattler, chosenMove) & MOVE_TARGET_BOTH)
                     {
                         gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
                         if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
                             gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
-                    }
+                    }                    
-                    
                     if (ShouldUseZMove(gActiveBattler, gBattlerTarget, chosenMove))
-                        QueueZMove(gActiveBattler, chosenMove);
+                        QueueZMove(gActiveBattler, chosenMove);                    
-                    
                     if (CanMegaEvolve(gActiveBattler)) // If opponent can mega evolve, do it.
                         BtlController_EmitTwoReturnValues(BUFFER_B, 10, (chosenMoveId) | (RET_MEGA_EVOLUTION) | (gBattlerTarget << 8));
                     else

src/battle_script_commands.c

@@ -3494,7 +3494,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
                 }
                 break;
             case MOVE_EFFECT_RELIC_SONG:
-                if (GetBattlerAbility(gBattlerAttacker) != ABILITY_SHEER_FORCE)
+                if (GetBattlerAbility(gBattlerAttacker) != ABILITY_SHEER_FORCE && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED))
                 {
                     if (gBattleMons[gBattlerAttacker].species == SPECIES_MELOETTA)
                     {
@@ -13843,6 +13843,16 @@ static void Cmd_handleballthrow(void)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             else
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+
+            #ifdef ITEM_EXPANSION
+            if (gLastUsedItem == ITEM_HEAL_BALL)
+            {
+                MonRestorePP(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]);
+                HealStatusConditions(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], gBattlerPartyIndexes[gBattlerTarget], STATUS1_ANY, gBattlerTarget);
+                gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP;
+                SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_HP, &gBattleMons[gBattlerTarget].hp);
+            }
+            #endif
         }
         else // mon may be caught, calculate shakes
         {

src/battle_util.c

@@ -4071,6 +4071,9 @@ static bool32 ShouldChangeFormHpBased(u32 battler)
     u32 i;
     u16 battlerAbility = GetBattlerAbility(battler);
 
+    if (gBattleMons[battler].status2 & STATUS2_TRANSFORMED)
+        return FALSE;
+
     for (i = 0; i < ARRAY_COUNT(forms); i++)
     {
         if (battlerAbility == forms[i][0])

src/data/text/move_names.h

@@ -1,3 +1,765 @@
+#if B_EXPANDED_MOVE_NAMES == TRUE
+// 16 letters
+const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
+{
+    [MOVE_NONE] = _("-"),
+    [MOVE_POUND] = _("Pound"),
+    [MOVE_KARATE_CHOP] = _("Karate Chop"),
+    [MOVE_DOUBLE_SLAP] = _("Double Slap"),
+    [MOVE_COMET_PUNCH] = _("Comet Punch"),
+    [MOVE_MEGA_PUNCH] = _("Mega Punch"),
+    [MOVE_PAY_DAY] = _("Pay Day"),
+    [MOVE_FIRE_PUNCH] = _("Fire Punch"),
+    [MOVE_ICE_PUNCH] = _("Ice Punch"),
+    [MOVE_THUNDER_PUNCH] = _("Thunder Punch"),
+    [MOVE_SCRATCH] = _("Scratch"),
+    [MOVE_VISE_GRIP] = _("Vise Grip"),
+    [MOVE_GUILLOTINE] = _("Guillotine"),
+    [MOVE_RAZOR_WIND] = _("Razor Wind"),
+    [MOVE_SWORDS_DANCE] = _("Swords Dance"),
+    [MOVE_CUT] = _("Cut"),
+    [MOVE_GUST] = _("Gust"),
+    [MOVE_WING_ATTACK] = _("Wing Attack"),
+    [MOVE_WHIRLWIND] = _("Whirlwind"),
+    [MOVE_FLY] = _("Fly"),
+    [MOVE_BIND] = _("Bind"),
+    [MOVE_SLAM] = _("Slam"),
+    [MOVE_VINE_WHIP] = _("Vine Whip"),
+    [MOVE_STOMP] = _("Stomp"),
+    [MOVE_DOUBLE_KICK] = _("Double Kick"),
+    [MOVE_MEGA_KICK] = _("Mega Kick"),
+    [MOVE_JUMP_KICK] = _("Jump Kick"),
+    [MOVE_ROLLING_KICK] = _("Rolling Kick"),
+    [MOVE_SAND_ATTACK] = _("Sand Attack"),
+    [MOVE_HEADBUTT] = _("Headbutt"),
+    [MOVE_HORN_ATTACK] = _("Horn Attack"),
+    [MOVE_FURY_ATTACK] = _("Fury Attack"),
+    [MOVE_HORN_DRILL] = _("Horn Drill"),
+    [MOVE_TACKLE] = _("Tackle"),
+    [MOVE_BODY_SLAM] = _("Body Slam"),
+    [MOVE_WRAP] = _("Wrap"),
+    [MOVE_TAKE_DOWN] = _("Take Down"),
+    [MOVE_THRASH] = _("Thrash"),
+    [MOVE_DOUBLE_EDGE] = _("Double-Edge"),
+    [MOVE_TAIL_WHIP] = _("Tail Whip"),
+    [MOVE_POISON_STING] = _("Poison Sting"),
+    [MOVE_TWINEEDLE] = _("Twineedle"),
+    [MOVE_PIN_MISSILE] = _("Pin Missile"),
+    [MOVE_LEER] = _("Leer"),
+    [MOVE_BITE] = _("Bite"),
+    [MOVE_GROWL] = _("Growl"),
+    [MOVE_ROAR] = _("Roar"),
+    [MOVE_SING] = _("Sing"),
+    [MOVE_SUPERSONIC] = _("Supersonic"),
+    [MOVE_SONIC_BOOM] = _("Sonic Boom"),
+    [MOVE_DISABLE] = _("Disable"),
+    [MOVE_ACID] = _("Acid"),
+    [MOVE_EMBER] = _("Ember"),
+    [MOVE_FLAMETHROWER] = _("Flamethrower"),
+    [MOVE_MIST] = _("Mist"),
+    [MOVE_WATER_GUN] = _("Water Gun"),
+    [MOVE_HYDRO_PUMP] = _("Hydro Pump"),
+    [MOVE_SURF] = _("Surf"),
+    [MOVE_ICE_BEAM] = _("Ice Beam"),
+    [MOVE_BLIZZARD] = _("Blizzard"),
+    [MOVE_PSYBEAM] = _("Psybeam"),
+    [MOVE_BUBBLE_BEAM] = _("Bubble Beam"),
+    [MOVE_AURORA_BEAM] = _("Aurora Beam"),
+    [MOVE_HYPER_BEAM] = _("Hyper Beam"),
+    [MOVE_PECK] = _("Peck"),
+    [MOVE_DRILL_PECK] = _("Drill Peck"),
+    [MOVE_SUBMISSION] = _("Submission"),
+    [MOVE_LOW_KICK] = _("Low Kick"),
+    [MOVE_COUNTER] = _("Counter"),
+    [MOVE_SEISMIC_TOSS] = _("Seismic Toss"),
+    [MOVE_STRENGTH] = _("Strength"),
+    [MOVE_ABSORB] = _("Absorb"),
+    [MOVE_MEGA_DRAIN] = _("Mega Drain"),
+    [MOVE_LEECH_SEED] = _("Leech Seed"),
+    [MOVE_GROWTH] = _("Growth"),
+    [MOVE_RAZOR_LEAF] = _("Razor Leaf"),
+    [MOVE_SOLAR_BEAM] = _("Solar Beam"),
+    [MOVE_POISON_POWDER] = _("Poison Powder"),
+    [MOVE_STUN_SPORE] = _("Stun Spore"),
+    [MOVE_SLEEP_POWDER] = _("Sleep Powder"),
+    [MOVE_PETAL_DANCE] = _("Petal Dance"),
+    [MOVE_STRING_SHOT] = _("String Shot"),
+    [MOVE_DRAGON_RAGE] = _("Dragon Rage"),
+    [MOVE_FIRE_SPIN] = _("Fire Spin"),
+    [MOVE_THUNDER_SHOCK] = _("Thunder Shock"),
+    [MOVE_THUNDERBOLT] = _("Thunderbolt"),
+    [MOVE_THUNDER_WAVE] = _("Thunder Wave"),
+    [MOVE_THUNDER] = _("Thunder"),
+    [MOVE_ROCK_THROW] = _("Rock Throw"),
+    [MOVE_EARTHQUAKE] = _("Earthquake"),
+    [MOVE_FISSURE] = _("Fissure"),
+    [MOVE_DIG] = _("Dig"),
+    [MOVE_TOXIC] = _("Toxic"),
+    [MOVE_CONFUSION] = _("Confusion"),
+    [MOVE_PSYCHIC] = _("Psychic"),
+    [MOVE_HYPNOSIS] = _("Hypnosis"),
+    [MOVE_MEDITATE] = _("Meditate"),
+    [MOVE_AGILITY] = _("Agility"),
+    [MOVE_QUICK_ATTACK] = _("Quick Attack"),
+    [MOVE_RAGE] = _("Rage"),
+    [MOVE_TELEPORT] = _("Teleport"),
+    [MOVE_NIGHT_SHADE] = _("Night Shade"),
+    [MOVE_MIMIC] = _("Mimic"),
+    [MOVE_SCREECH] = _("Screech"),
+    [MOVE_DOUBLE_TEAM] = _("Double Team"),
+    [MOVE_RECOVER] = _("Recover"),
+    [MOVE_HARDEN] = _("Harden"),
+    [MOVE_MINIMIZE] = _("Minimize"),
+    [MOVE_SMOKESCREEN] = _("Smokescreen"),
+    [MOVE_CONFUSE_RAY] = _("Confuse Ray"),
+    [MOVE_WITHDRAW] = _("Withdraw"),
+    [MOVE_DEFENSE_CURL] = _("Defense Curl"),
+    [MOVE_BARRIER] = _("Barrier"),
+    [MOVE_LIGHT_SCREEN] = _("Light Screen"),
+    [MOVE_HAZE] = _("Haze"),
+    [MOVE_REFLECT] = _("Reflect"),
+    [MOVE_FOCUS_ENERGY] = _("Focus Energy"),
+    [MOVE_BIDE] = _("Bide"),
+    [MOVE_METRONOME] = _("Metronome"),
+    [MOVE_MIRROR_MOVE] = _("Mirror Move"),
+    [MOVE_SELF_DESTRUCT] = _("Self-Destruct"),
+    [MOVE_EGG_BOMB] = _("Egg Bomb"),
+    [MOVE_LICK] = _("Lick"),
+    [MOVE_SMOG] = _("Smog"),
+    [MOVE_SLUDGE] = _("Sludge"),
+    [MOVE_BONE_CLUB] = _("Bone Club"),
+    [MOVE_FIRE_BLAST] = _("Fire Blast"),
+    [MOVE_WATERFALL] = _("Waterfall"),
+    [MOVE_CLAMP] = _("Clamp"),
+    [MOVE_SWIFT] = _("Swift"),
+    [MOVE_SKULL_BASH] = _("Skull Bash"),
+    [MOVE_SPIKE_CANNON] = _("Spike Cannon"),
+    [MOVE_CONSTRICT] = _("Constrict"),
+    [MOVE_AMNESIA] = _("Amnesia"),
+    [MOVE_KINESIS] = _("Kinesis"),
+    [MOVE_SOFT_BOILED] = _("Soft-Boiled"),
+    [MOVE_HIGH_JUMP_KICK] = _("High Jump Kick"),
+    [MOVE_GLARE] = _("Glare"),
+    [MOVE_DREAM_EATER] = _("Dream Eater"),
+    [MOVE_POISON_GAS] = _("Poison Gas"),
+    [MOVE_BARRAGE] = _("Barrage"),
+    [MOVE_LEECH_LIFE] = _("Leech Life"),
+    [MOVE_LOVELY_KISS] = _("Lovely Kiss"),
+    [MOVE_SKY_ATTACK] = _("Sky Attack"),
+    [MOVE_TRANSFORM] = _("Transform"),
+    [MOVE_BUBBLE] = _("Bubble"),
+    [MOVE_DIZZY_PUNCH] = _("Dizzy Punch"),
+    [MOVE_SPORE] = _("Spore"),
+    [MOVE_FLASH] = _("Flash"),
+    [MOVE_PSYWAVE] = _("Psywave"),
+    [MOVE_SPLASH] = _("Splash"),
+    [MOVE_ACID_ARMOR] = _("Acid Armor"),
+    [MOVE_CRABHAMMER] = _("Crabhammer"),
+    [MOVE_EXPLOSION] = _("Explosion"),
+    [MOVE_FURY_SWIPES] = _("Fury Swipes"),
+    [MOVE_BONEMERANG] = _("Bonemerang"),
+    [MOVE_REST] = _("Rest"),
+    [MOVE_ROCK_SLIDE] = _("Rock Slide"),
+    [MOVE_HYPER_FANG] = _("Hyper Fang"),
+    [MOVE_SHARPEN] = _("Sharpen"),
+    [MOVE_CONVERSION] = _("Conversion"),
+    [MOVE_TRI_ATTACK] = _("Tri Attack"),
+    [MOVE_SUPER_FANG] = _("Super Fang"),
+    [MOVE_SLASH] = _("Slash"),
+    [MOVE_SUBSTITUTE] = _("Substitute"),
+    [MOVE_STRUGGLE] = _("Struggle"),
+    [MOVE_SKETCH] = _("Sketch"),
+    [MOVE_TRIPLE_KICK] = _("Triple Kick"),
+    [MOVE_THIEF] = _("Thief"),
+    [MOVE_SPIDER_WEB] = _("Spider Web"),
+    [MOVE_MIND_READER] = _("Mind Reader"),
+    [MOVE_NIGHTMARE] = _("Nightmare"),
+    [MOVE_FLAME_WHEEL] = _("Flame Wheel"),
+    [MOVE_SNORE] = _("Snore"),
+    [MOVE_CURSE] = _("Curse"),
+    [MOVE_FLAIL] = _("Flail"),
+    [MOVE_CONVERSION_2] = _("Conversion 2"),
+    [MOVE_AEROBLAST] = _("Aeroblast"),
+    [MOVE_COTTON_SPORE] = _("Cotton Spore"),
+    [MOVE_REVERSAL] = _("Reversal"),
+    [MOVE_SPITE] = _("Spite"),
+    [MOVE_POWDER_SNOW] = _("Powder Snow"),
+    [MOVE_PROTECT] = _("Protect"),
+    [MOVE_MACH_PUNCH] = _("Mach Punch"),
+    [MOVE_SCARY_FACE] = _("Scary Face"),
+    [MOVE_FEINT_ATTACK] = _("Feint Attack"),
+    [MOVE_SWEET_KISS] = _("Sweet Kiss"),
+    [MOVE_BELLY_DRUM] = _("Belly Drum"),
+    [MOVE_SLUDGE_BOMB] = _("Sludge Bomb"),
+    [MOVE_MUD_SLAP] = _("Mud-Slap"),
+    [MOVE_OCTAZOOKA] = _("Octazooka"),
+    [MOVE_SPIKES] = _("Spikes"),
+    [MOVE_ZAP_CANNON] = _("Zap Cannon"),
+    [MOVE_FORESIGHT] = _("Foresight"),
+    [MOVE_DESTINY_BOND] = _("Destiny Bond"),
+    [MOVE_PERISH_SONG] = _("Perish Song"),
+    [MOVE_ICY_WIND] = _("Icy Wind"),
+    [MOVE_DETECT] = _("Detect"),
+    [MOVE_BONE_RUSH] = _("Bone Rush"),
+    [MOVE_LOCK_ON] = _("Lock-On"),
+    [MOVE_OUTRAGE] = _("Outrage"),
+    [MOVE_SANDSTORM] = _("Sandstorm"),
+    [MOVE_GIGA_DRAIN] = _("Giga Drain"),
+    [MOVE_ENDURE] = _("Endure"),
+    [MOVE_CHARM] = _("Charm"),
+    [MOVE_ROLLOUT] = _("Rollout"),
+    [MOVE_FALSE_SWIPE] = _("False Swipe"),
+    [MOVE_SWAGGER] = _("Swagger"),
+    [MOVE_MILK_DRINK] = _("Milk Drink"),
+    [MOVE_SPARK] = _("Spark"),
+    [MOVE_FURY_CUTTER] = _("Fury Cutter"),
+    [MOVE_STEEL_WING] = _("Steel Wing"),
+    [MOVE_MEAN_LOOK] = _("Mean Look"),
+    [MOVE_ATTRACT] = _("Attract"),
+    [MOVE_SLEEP_TALK] = _("Sleep Talk"),
+    [MOVE_HEAL_BELL] = _("Heal Bell"),
+    [MOVE_RETURN] = _("Return"),
+    [MOVE_PRESENT] = _("Present"),
+    [MOVE_FRUSTRATION] = _("Frustration"),
+    [MOVE_SAFEGUARD] = _("Safeguard"),
+    [MOVE_PAIN_SPLIT] = _("Pain Split"),
+    [MOVE_SACRED_FIRE] = _("Sacred Fire"),
+    [MOVE_MAGNITUDE] = _("Magnitude"),
+    [MOVE_DYNAMIC_PUNCH] = _("Dynamic Punch"),
+    [MOVE_MEGAHORN] = _("Megahorn"),
+    [MOVE_DRAGON_BREATH] = _("Dragon Breath"),
+    [MOVE_BATON_PASS] = _("Baton Pass"),
+    [MOVE_ENCORE] = _("Encore"),
+    [MOVE_PURSUIT] = _("Pursuit"),
+    [MOVE_RAPID_SPIN] = _("Rapid Spin"),
+    [MOVE_SWEET_SCENT] = _("Sweet Scent"),
+    [MOVE_IRON_TAIL] = _("Iron Tail"),
+    [MOVE_METAL_CLAW] = _("Metal Claw"),
+    [MOVE_VITAL_THROW] = _("Vital Throw"),
+    [MOVE_MORNING_SUN] = _("Morning Sun"),
+    [MOVE_SYNTHESIS] = _("Synthesis"),
+    [MOVE_MOONLIGHT] = _("Moonlight"),
+    [MOVE_HIDDEN_POWER] = _("Hidden Power"),
+    [MOVE_CROSS_CHOP] = _("Cross Chop"),
+    [MOVE_TWISTER] = _("Twister"),
+    [MOVE_RAIN_DANCE] = _("Rain Dance"),
+    [MOVE_SUNNY_DAY] = _("Sunny Day"),
+    [MOVE_CRUNCH] = _("Crunch"),
+    [MOVE_MIRROR_COAT] = _("Mirror Coat"),
+    [MOVE_PSYCH_UP] = _("Psych Up"),
+    [MOVE_EXTREME_SPEED] = _("Extreme Speed"),
+    [MOVE_ANCIENT_POWER] = _("Ancient Power"),
+    [MOVE_SHADOW_BALL] = _("Shadow Ball"),
+    [MOVE_FUTURE_SIGHT] = _("Future Sight"),
+    [MOVE_ROCK_SMASH] = _("Rock Smash"),
+    [MOVE_WHIRLPOOL] = _("Whirlpool"),
+    [MOVE_BEAT_UP] = _("Beat Up"),
+    [MOVE_FAKE_OUT] = _("Fake Out"),
+    [MOVE_UPROAR] = _("Uproar"),
+    [MOVE_STOCKPILE] = _("Stockpile"),
+    [MOVE_SPIT_UP] = _("Spit Up"),
+    [MOVE_SWALLOW] = _("Swallow"),
+    [MOVE_HEAT_WAVE] = _("Heat Wave"),
+    [MOVE_HAIL] = _("Hail"),
+    [MOVE_TORMENT] = _("Torment"),
+    [MOVE_FLATTER] = _("Flatter"),
+    [MOVE_WILL_O_WISP] = _("Will-o-Wisp"),
+    [MOVE_MEMENTO] = _("Memento"),
+    [MOVE_FACADE] = _("Facade"),
+    [MOVE_FOCUS_PUNCH] = _("Focus Punch"),
+    [MOVE_SMELLING_SALTS] = _("Smelling Salts"),
+    [MOVE_FOLLOW_ME] = _("Follow Me"),
+    [MOVE_NATURE_POWER] = _("Nature Power"),
+    [MOVE_CHARGE] = _("Charge"),
+    [MOVE_TAUNT] = _("Taunt"),
+    [MOVE_HELPING_HAND] = _("Helping Hand"),
+    [MOVE_TRICK] = _("Trick"),
+    [MOVE_ROLE_PLAY] = _("Role Play"),
+    [MOVE_WISH] = _("Wish"),
+    [MOVE_ASSIST] = _("Assist"),
+    [MOVE_INGRAIN] = _("Ingrain"),
+    [MOVE_SUPERPOWER] = _("Superpower"),
+    [MOVE_MAGIC_COAT] = _("Magic Coat"),
+    [MOVE_RECYCLE] = _("Recycle"),
+    [MOVE_REVENGE] = _("Revenge"),
+    [MOVE_BRICK_BREAK] = _("Brick Break"),
+    [MOVE_YAWN] = _("Yawn"),
+    [MOVE_KNOCK_OFF] = _("Knock Off"),
+    [MOVE_ENDEAVOR] = _("Endeavor"),
+    [MOVE_ERUPTION] = _("Eruption"),
+    [MOVE_SKILL_SWAP] = _("Skill Swap"),
+    [MOVE_IMPRISON] = _("Imprison"),
+    [MOVE_REFRESH] = _("Refresh"),
+    [MOVE_GRUDGE] = _("Grudge"),
+    [MOVE_SNATCH] = _("Snatch"),
+    [MOVE_SECRET_POWER] = _("Secret Power"),
+    [MOVE_DIVE] = _("Dive"),
+    [MOVE_ARM_THRUST] = _("Arm Thrust"),
+    [MOVE_CAMOUFLAGE] = _("Camouflage"),
+    [MOVE_TAIL_GLOW] = _("Tail Glow"),
+    [MOVE_LUSTER_PURGE] = _("Luster Purge"),
+    [MOVE_MIST_BALL] = _("Mist Ball"),
+    [MOVE_FEATHER_DANCE] = _("Feather Dance"),
+    [MOVE_TEETER_DANCE] = _("Teeter Dance"),
+    [MOVE_BLAZE_KICK] = _("Blaze Kick"),
+    [MOVE_MUD_SPORT] = _("Mud Sport"),
+    [MOVE_ICE_BALL] = _("Ice Ball"),
+    [MOVE_NEEDLE_ARM] = _("Needle Arm"),
+    [MOVE_SLACK_OFF] = _("Slack Off"),
+    [MOVE_HYPER_VOICE] = _("Hyper Voice"),
+    [MOVE_POISON_FANG] = _("Poison Fang"),
+    [MOVE_CRUSH_CLAW] = _("Crush Claw"),
+    [MOVE_BLAST_BURN] = _("Blast Burn"),
+    [MOVE_HYDRO_CANNON] = _("Hydro Cannon"),
+    [MOVE_METEOR_MASH] = _("Meteor Mash"),
+    [MOVE_ASTONISH] = _("Astonish"),
+    [MOVE_WEATHER_BALL] = _("Weather Ball"),
+    [MOVE_AROMATHERAPY] = _("Aromatherapy"),
+    [MOVE_FAKE_TEARS] = _("Fake Tears"),
+    [MOVE_AIR_CUTTER] = _("Air Cutter"),
+    [MOVE_OVERHEAT] = _("Overheat"),
+    [MOVE_ODOR_SLEUTH] = _("Odor Sleuth"),
+    [MOVE_ROCK_TOMB] = _("Rock Tomb"),
+    [MOVE_SILVER_WIND] = _("Silver Wind"),
+    [MOVE_METAL_SOUND] = _("Metal Sound"),
+    [MOVE_GRASS_WHISTLE] = _("Grass Whistle"),
+    [MOVE_TICKLE] = _("Tickle"),
+    [MOVE_COSMIC_POWER] = _("Cosmic Power"),
+    [MOVE_WATER_SPOUT] = _("Water Spout"),
+    [MOVE_SIGNAL_BEAM] = _("Signal Beam"),
+    [MOVE_SHADOW_PUNCH] = _("Shadow Punch"),
+    [MOVE_EXTRASENSORY] = _("Extrasensory"),
+    [MOVE_SKY_UPPERCUT] = _("Sky Uppercut"),
+    [MOVE_SAND_TOMB] = _("Sand Tomb"),
+    [MOVE_SHEER_COLD] = _("Sheer Cold"),
+    [MOVE_MUDDY_WATER] = _("Muddy Water"),
+    [MOVE_BULLET_SEED] = _("Bullet Seed"),
+    [MOVE_AERIAL_ACE] = _("Aerial Ace"),
+    [MOVE_ICICLE_SPEAR] = _("Icicle Spear"),
+    [MOVE_IRON_DEFENSE] = _("Iron Defense"),
+    [MOVE_BLOCK] = _("Block"),
+    [MOVE_HOWL] = _("Howl"),
+    [MOVE_DRAGON_CLAW] = _("Dragon Claw"),
+    [MOVE_FRENZY_PLANT] = _("Frenzy Plant"),
+    [MOVE_BULK_UP] = _("Bulk Up"),
+    [MOVE_BOUNCE] = _("Bounce"),
+    [MOVE_MUD_SHOT] = _("Mud Shot"),
+    [MOVE_POISON_TAIL] = _("Poison Tail"),
+    [MOVE_COVET] = _("Covet"),
+    [MOVE_VOLT_TACKLE] = _("Volt Tackle"),
+    [MOVE_MAGICAL_LEAF] = _("Magical Leaf"),
+    [MOVE_WATER_SPORT] = _("Water Sport"),
+    [MOVE_CALM_MIND] = _("Calm Mind"),
+    [MOVE_LEAF_BLADE] = _("Leaf Blade"),
+    [MOVE_DRAGON_DANCE] = _("Dragon Dance"),
+    [MOVE_ROCK_BLAST] = _("Rock Blast"),
+    [MOVE_SHOCK_WAVE] = _("Shock Wave"),
+    [MOVE_WATER_PULSE] = _("Water Pulse"),
+    [MOVE_DOOM_DESIRE] = _("Doom Desire"),
+    [MOVE_PSYCHO_BOOST] = _("Psycho Boost"),
+    [MOVE_ROOST] = _("Roost"),
+    [MOVE_GRAVITY] = _("Gravity"),
+    [MOVE_MIRACLE_EYE] = _("Miracle Eye"),
+    [MOVE_WAKE_UP_SLAP] = _("Wake-Up Slap"),
+    [MOVE_HAMMER_ARM] = _("Hammer Arm"),
+    [MOVE_GYRO_BALL] = _("Gyro Ball"),
+    [MOVE_HEALING_WISH] = _("Healing Wish"),
+    [MOVE_BRINE] = _("Brine"),
+    [MOVE_NATURAL_GIFT] = _("Natural Gift"),
+    [MOVE_FEINT] = _("Feint"),
+    [MOVE_PLUCK] = _("Pluck"),
+    [MOVE_TAILWIND] = _("Tailwind"),
+    [MOVE_ACUPRESSURE] = _("Acupressure"),
+    [MOVE_METAL_BURST] = _("Metal Burst"),
+    [MOVE_U_TURN] = _("U-turn"),
+    [MOVE_CLOSE_COMBAT] = _("Close Combat"),
+    [MOVE_PAYBACK] = _("Payback"),
+    [MOVE_ASSURANCE] = _("Assurance"),
+    [MOVE_EMBARGO] = _("Embargo"),
+    [MOVE_FLING] = _("Fling"),
+    [MOVE_PSYCHO_SHIFT] = _("Psycho Shift"),
+    [MOVE_TRUMP_CARD] = _("Trump Card"),
+    [MOVE_HEAL_BLOCK] = _("Heal Block"),
+    [MOVE_WRING_OUT] = _("Wring Out"),
+    [MOVE_POWER_TRICK] = _("Power Trick"),
+    [MOVE_GASTRO_ACID] = _("Gastro Acid"),
+    [MOVE_LUCKY_CHANT] = _("Lucky Chant"),
+    [MOVE_ME_FIRST] = _("Me First"),
+    [MOVE_COPYCAT] = _("Copycat"),
+    [MOVE_POWER_SWAP] = _("Power Swap"),
+    [MOVE_GUARD_SWAP] = _("Guard Swap"),
+    [MOVE_PUNISHMENT] = _("Punishment"),
+    [MOVE_LAST_RESORT] = _("Last Resort"),
+    [MOVE_WORRY_SEED] = _("Worry Seed"),
+    [MOVE_SUCKER_PUNCH] = _("Sucker Punch"),
+    [MOVE_TOXIC_SPIKES] = _("Toxic Spikes"),
+    [MOVE_HEART_SWAP] = _("Heart Swap"),
+    [MOVE_AQUA_RING] = _("Aqua Ring"),
+    [MOVE_MAGNET_RISE] = _("Magnet Rise"),
+    [MOVE_FLARE_BLITZ] = _("Flare Blitz"),
+    [MOVE_FORCE_PALM] = _("Force Palm"),
+    [MOVE_AURA_SPHERE] = _("Aura Sphere"),
+    [MOVE_ROCK_POLISH] = _("Rock Polish"),
+    [MOVE_POISON_JAB] = _("Poison Jab"),
+    [MOVE_DARK_PULSE] = _("Dark Pulse"),
+    [MOVE_NIGHT_SLASH] = _("Night Slash"),
+    [MOVE_AQUA_TAIL] = _("Aqua Tail"),
+    [MOVE_SEED_BOMB] = _("Seed Bomb"),
+    [MOVE_AIR_SLASH] = _("Air Slash"),
+    [MOVE_X_SCISSOR] = _("X-Scissor"),
+    [MOVE_BUG_BUZZ] = _("Bug Buzz"),
+    [MOVE_DRAGON_PULSE] = _("Dragon Pulse"),
+    [MOVE_DRAGON_RUSH] = _("Dragon Rush"),
+    [MOVE_POWER_GEM] = _("Power Gem"),
+    [MOVE_DRAIN_PUNCH] = _("Drain Punch"),
+    [MOVE_VACUUM_WAVE] = _("Vacuum Wave"),
+    [MOVE_FOCUS_BLAST] = _("Focus Blast"),
+    [MOVE_ENERGY_BALL] = _("Energy Ball"),
+    [MOVE_BRAVE_BIRD] = _("Brave Bird"),
+    [MOVE_EARTH_POWER] = _("Earth Power"),
+    [MOVE_SWITCHEROO] = _("Switcheroo"),
+    [MOVE_GIGA_IMPACT] = _("Giga Impact"),
+    [MOVE_NASTY_PLOT] = _("Nasty Plot"),
+    [MOVE_BULLET_PUNCH] = _("Bullet Punch"),
+    [MOVE_AVALANCHE] = _("Avalanche"),
+    [MOVE_ICE_SHARD] = _("Ice Shard"),
+    [MOVE_SHADOW_CLAW] = _("Shadow Claw"),
+    [MOVE_THUNDER_FANG] = _("Thunder Fang"),
+    [MOVE_ICE_FANG] = _("Ice Fang"),
+    [MOVE_FIRE_FANG] = _("Fire Fang"),
+    [MOVE_SHADOW_SNEAK] = _("Shadow Sneak"),
+    [MOVE_MUD_BOMB] = _("Mud Bomb"),
+    [MOVE_PSYCHO_CUT] = _("Psycho Cut"),
+    [MOVE_ZEN_HEADBUTT] = _("Zen Headbutt"),
+    [MOVE_MIRROR_SHOT] = _("Mirror Shot"),
+    [MOVE_FLASH_CANNON] = _("Flash Cannon"),
+    [MOVE_ROCK_CLIMB] = _("Rock Climb"),
+    [MOVE_DEFOG] = _("Defog"),
+    [MOVE_TRICK_ROOM] = _("Trick Room"),
+    [MOVE_DRACO_METEOR] = _("Draco Meteor"),
+    [MOVE_DISCHARGE] = _("Discharge"),
+    [MOVE_LAVA_PLUME] = _("Lava Plume"),
+    [MOVE_LEAF_STORM] = _("Leaf Storm"),
+    [MOVE_POWER_WHIP] = _("Power Whip"),
+    [MOVE_ROCK_WRECKER] = _("Rock Wrecker"),
+    [MOVE_CROSS_POISON] = _("Cross Poison"),
+    [MOVE_GUNK_SHOT] = _("Gunk Shot"),
+    [MOVE_IRON_HEAD] = _("Iron Head"),
+    [MOVE_MAGNET_BOMB] = _("Magnet Bomb"),
+    [MOVE_STONE_EDGE] = _("Stone Edge"),
+    [MOVE_CAPTIVATE] = _("Captivate"),
+    [MOVE_STEALTH_ROCK] = _("Stealth Rock"),
+    [MOVE_GRASS_KNOT] = _("Grass Knot"),
+    [MOVE_CHATTER] = _("Chatter"),
+    [MOVE_JUDGMENT] = _("Judgment"),
+    [MOVE_BUG_BITE] = _("Bug Bite"),
+    [MOVE_CHARGE_BEAM] = _("Charge Beam"),
+    [MOVE_WOOD_HAMMER] = _("Wood Hammer"),
+    [MOVE_AQUA_JET] = _("Aqua Jet"),
+    [MOVE_ATTACK_ORDER] = _("Attack Order"),
+    [MOVE_DEFEND_ORDER] = _("Defend Order"),
+    [MOVE_HEAL_ORDER] = _("Heal Order"),
+    [MOVE_HEAD_SMASH] = _("Head Smash"),
+    [MOVE_DOUBLE_HIT] = _("Double Hit"),
+    [MOVE_ROAR_OF_TIME] = _("Roar of Time"),
+    [MOVE_SPACIAL_REND] = _("Spacial Rend"),
+    [MOVE_LUNAR_DANCE] = _("Lunar Dance"),
+    [MOVE_CRUSH_GRIP] = _("Crush Grip"),
+    [MOVE_MAGMA_STORM] = _("Magma Storm"),
+    [MOVE_DARK_VOID] = _("Dark Void"),
+    [MOVE_SEED_FLARE] = _("Seed Flare"),
+    [MOVE_OMINOUS_WIND] = _("Ominous Wind"),
+    [MOVE_SHADOW_FORCE] = _("Shadow Force"),
+    [MOVE_HONE_CLAWS] = _("Hone Claws"),
+    [MOVE_WIDE_GUARD] = _("Wide Guard"),
+    [MOVE_GUARD_SPLIT] = _("Guard Split"),
+    [MOVE_POWER_SPLIT] = _("Power Split"),
+    [MOVE_WONDER_ROOM] = _("Wonder Room"),
+    [MOVE_PSYSHOCK] = _("Psyshock"),
+    [MOVE_VENOSHOCK] = _("Venoshock"),
+    [MOVE_AUTOTOMIZE] = _("Autotomize"),
+    [MOVE_RAGE_POWDER] = _("Rage Powder"),
+    [MOVE_TELEKINESIS] = _("Telekinesis"),
+    [MOVE_MAGIC_ROOM] = _("Magic Room"),
+    [MOVE_SMACK_DOWN] = _("Smack Down"),
+    [MOVE_STORM_THROW] = _("Storm Throw"),
+    [MOVE_FLAME_BURST] = _("Flame Burst"),
+    [MOVE_SLUDGE_WAVE] = _("Sludge Wave"),
+    [MOVE_QUIVER_DANCE] = _("Quiver Dance"),
+    [MOVE_HEAVY_SLAM] = _("Heavy Slam"),
+    [MOVE_SYNCHRONOISE] = _("Synchronoise"),
+    [MOVE_ELECTRO_BALL] = _("Electro Ball"),
+    [MOVE_SOAK] = _("Soak"),
+    [MOVE_FLAME_CHARGE] = _("Flame Charge"),
+    [MOVE_COIL] = _("Coil"),
+    [MOVE_LOW_SWEEP] = _("Low Sweep"),
+    [MOVE_ACID_SPRAY] = _("Acid Spray"),
+    [MOVE_FOUL_PLAY] = _("Foul Play"),
+    [MOVE_SIMPLE_BEAM] = _("Simple Beam"),
+    [MOVE_ENTRAINMENT] = _("Entrainment"),
+    [MOVE_AFTER_YOU] = _("After You"),
+    [MOVE_ROUND] = _("Round"),
+    [MOVE_ECHOED_VOICE] = _("Echoed Voice"),
+    [MOVE_CHIP_AWAY] = _("Chip Away"),
+    [MOVE_CLEAR_SMOG] = _("Clear Smog"),
+    [MOVE_STORED_POWER] = _("Stored Power"),
+    [MOVE_QUICK_GUARD] = _("Quick Guard"),
+    [MOVE_ALLY_SWITCH] = _("Ally Switch"),
+    [MOVE_SCALD] = _("Scald"),
+    [MOVE_SHELL_SMASH] = _("Shell Smash"),
+    [MOVE_HEAL_PULSE] = _("Heal Pulse"),
+    [MOVE_HEX] = _("Hex"),
+    [MOVE_SKY_DROP] = _("Sky Drop"),
+    [MOVE_SHIFT_GEAR] = _("Shift Gear"),
+    [MOVE_CIRCLE_THROW] = _("Circle Throw"),
+    [MOVE_INCINERATE] = _("Incinerate"),
+    [MOVE_QUASH] = _("Quash"),
+    [MOVE_ACROBATICS] = _("Acrobatics"),
+    [MOVE_REFLECT_TYPE] = _("Reflect Type"),
+    [MOVE_RETALIATE] = _("Retaliate"),
+    [MOVE_FINAL_GAMBIT] = _("Final Gambit"),
+    [MOVE_BESTOW] = _("Bestow"),
+    [MOVE_INFERNO] = _("Inferno"),
+    [MOVE_WATER_PLEDGE] = _("Water Pledge"),
+    [MOVE_FIRE_PLEDGE] = _("Fire Pledge"),
+    [MOVE_GRASS_PLEDGE] = _("Grass Pledge"),
+    [MOVE_VOLT_SWITCH] = _("Volt Switch"),
+    [MOVE_STRUGGLE_BUG] = _("Struggle Bug"),
+    [MOVE_BULLDOZE] = _("Bulldoze"),
+    [MOVE_FROST_BREATH] = _("Frost Breath"),
+    [MOVE_DRAGON_TAIL] = _("Dragon Tail"),
+    [MOVE_WORK_UP] = _("Work Up"),
+    [MOVE_ELECTROWEB] = _("Electroweb"),
+    [MOVE_WILD_CHARGE] = _("Wild Charge"),
+    [MOVE_DRILL_RUN] = _("Drill Run"),
+    [MOVE_DUAL_CHOP] = _("Dual Chop"),
+    [MOVE_HEART_STAMP] = _("Heart Stamp"),
+    [MOVE_HORN_LEECH] = _("Horn Leech"),
+    [MOVE_SACRED_SWORD] = _("Sacred Sword"),
+    [MOVE_RAZOR_SHELL] = _("Razor Shell"),
+    [MOVE_HEAT_CRASH] = _("Heat Crash"),
+    [MOVE_LEAF_TORNADO] = _("Leaf Tornado"),
+    [MOVE_STEAMROLLER] = _("Steamroller"),
+    [MOVE_COTTON_GUARD] = _("Cotton Guard"),
+    [MOVE_NIGHT_DAZE] = _("Night Daze"),
+    [MOVE_PSYSTRIKE] = _("Psystrike"),
+    [MOVE_TAIL_SLAP] = _("Tail Slap"),
+    [MOVE_HURRICANE] = _("Hurricane"),
+    [MOVE_HEAD_CHARGE] = _("Head Charge"),
+    [MOVE_GEAR_GRIND] = _("Gear Grind"),
+    [MOVE_SEARING_SHOT] = _("Searing Shot"),
+    [MOVE_TECHNO_BLAST] = _("Techno Blast"),
+    [MOVE_RELIC_SONG] = _("Relic Song"),
+    [MOVE_SECRET_SWORD] = _("Secret Sword"),
+    [MOVE_GLACIATE] = _("Glaciate"),
+    [MOVE_BOLT_STRIKE] = _("Bolt Strike"),
+    [MOVE_BLUE_FLARE] = _("Blue Flare"),
+    [MOVE_FIERY_DANCE] = _("Fiery Dance"),
+    [MOVE_FREEZE_SHOCK] = _("Freeze Shock"),
+    [MOVE_ICE_BURN] = _("Ice Burn"),
+    [MOVE_SNARL] = _("Snarl"),
+    [MOVE_ICICLE_CRASH] = _("Icicle Crash"),
+    [MOVE_V_CREATE] = _("V-create"),
+    [MOVE_FUSION_FLARE] = _("Fusion Flare"),
+    [MOVE_FUSION_BOLT] = _("Fusion Bolt"),
+    [MOVE_FLYING_PRESS] = _("Flying Press"),
+    [MOVE_MAT_BLOCK] = _("Mat Block"),
+    [MOVE_BELCH] = _("Belch"),
+    [MOVE_ROTOTILLER] = _("Rototiller"),
+    [MOVE_STICKY_WEB] = _("Sticky Web"),
+    [MOVE_FELL_STINGER] = _("Fell Stinger"),
+    [MOVE_PHANTOM_FORCE] = _("Phantom Force"),
+    [MOVE_TRICK_OR_TREAT] = _("Trick-Or-Treat"),
+    [MOVE_NOBLE_ROAR] = _("Noble Roar"),
+    [MOVE_ION_DELUGE] = _("Ion Deluge"),
+    [MOVE_PARABOLIC_CHARGE] = _("Parabolic Charge"),
+    [MOVE_FORESTS_CURSE] = _("Forest's Curse"),
+    [MOVE_PETAL_BLIZZARD] = _("Petal Blizzard"),
+    [MOVE_FREEZE_DRY] = _("Freeze-Dry"),
+    [MOVE_DISARMING_VOICE] = _("Disarming Voice"),
+    [MOVE_PARTING_SHOT] = _("Parting Shot"),
+    [MOVE_TOPSY_TURVY] = _("Topsy-Turvy"),
+    [MOVE_DRAINING_KISS] = _("Draining Kiss"),
+    [MOVE_CRAFTY_SHIELD] = _("Crafty Shield"),
+    [MOVE_FLOWER_SHIELD] = _("Flower Shield"),
+    [MOVE_GRASSY_TERRAIN] = _("Grassy Terrain"),
+    [MOVE_MISTY_TERRAIN] = _("Misty Terrain"),
+    [MOVE_ELECTRIFY] = _("Electrify"),
+    [MOVE_PLAY_ROUGH] = _("Play Rough"),
+    [MOVE_FAIRY_WIND] = _("Fairy Wind"),
+    [MOVE_MOONBLAST] = _("Moonblast"),
+    [MOVE_BOOMBURST] = _("Boomburst"),
+    [MOVE_FAIRY_LOCK] = _("Fairy Lock"),
+    [MOVE_KINGS_SHIELD] = _("King's Shield"),
+    [MOVE_PLAY_NICE] = _("Play Nice"),
+    [MOVE_CONFIDE] = _("Confide"),
+    [MOVE_DIAMOND_STORM] = _("Diamond Storm"),
+    [MOVE_STEAM_ERUPTION] = _("Steam Eruption"),
+    [MOVE_HYPERSPACE_HOLE] = _("Hyprspace Hole"),
+    [MOVE_WATER_SHURIKEN] = _("Water Shuriken"),
+    [MOVE_MYSTICAL_FIRE] = _("Mystical Fire"),
+    [MOVE_SPIKY_SHIELD] = _("Spiky Shield"),
+    [MOVE_AROMATIC_MIST] = _("Aromatic Mist"),
+    [MOVE_EERIE_IMPULSE] = _("Eerie Impulse"),
+    [MOVE_VENOM_DRENCH] = _("Venom Drench"),
+    [MOVE_POWDER] = _("Powder"),
+    [MOVE_GEOMANCY] = _("Geomancy"),
+    [MOVE_MAGNETIC_FLUX] = _("Magnetic Flux"),
+    [MOVE_HAPPY_HOUR] = _("Happy Hour"),
+    [MOVE_ELECTRIC_TERRAIN] = _("Electric Terrain"),
+    [MOVE_DAZZLING_GLEAM] = _("Dazzling Gleam"),
+    [MOVE_CELEBRATE] = _("Celebrate"),
+    [MOVE_HOLD_HANDS] = _("Hold Hands"),
+    [MOVE_BABY_DOLL_EYES] = _("Baby-Doll Eyes"),
+    [MOVE_NUZZLE] = _("Nuzzle"),
+    [MOVE_HOLD_BACK] = _("Hold Back"),
+    [MOVE_INFESTATION] = _("Infestation"),
+    [MOVE_POWER_UP_PUNCH] = _("Power-Up Punch"),
+    [MOVE_OBLIVION_WING] = _("Oblivion Wing"),
+    [MOVE_THOUSAND_ARROWS] = _("Thousand Arrows"),
+    [MOVE_THOUSAND_WAVES] = _("Thousand Waves"),
+    [MOVE_LANDS_WRATH] = _("Land's Wrath"),
+    [MOVE_LIGHT_OF_RUIN] = _("Light Of Ruin"),
+    [MOVE_ORIGIN_PULSE] = _("Origin Pulse"),
+    [MOVE_PRECIPICE_BLADES] = _("Precipice Blades"),
+    [MOVE_DRAGON_ASCENT] = _("Dragon Ascent"),
+    [MOVE_HYPERSPACE_FURY] = _("Hyperspace Fury"),
+    [MOVE_SHORE_UP] = _("Shore Up"),
+    [MOVE_FIRST_IMPRESSION] = _("First Impression"),
+    [MOVE_BANEFUL_BUNKER] = _("Baneful Bunker"),
+    [MOVE_SPIRIT_SHACKLE] = _("Spirit Shackle"),
+    [MOVE_DARKEST_LARIAT] = _("Darkest Lariat"),
+    [MOVE_SPARKLING_ARIA] = _("Sparkling Aria"),
+    [MOVE_ICE_HAMMER] = _("Ice Hammer"),
+    [MOVE_FLORAL_HEALING] = _("Floral Healng"),
+    [MOVE_HIGH_HORSEPOWER] = _("High Horsepower"),
+    [MOVE_STRENGTH_SAP] = _("Strength Sap"),
+    [MOVE_SOLAR_BLADE] = _("Solar Blade"),
+    [MOVE_LEAFAGE] = _("Leafage"),
+    [MOVE_SPOTLIGHT] = _("Spotlight"),
+    [MOVE_TOXIC_THREAD] = _("Toxic Thread"),
+    [MOVE_LASER_FOCUS] = _("Laser Focus"),
+    [MOVE_GEAR_UP] = _("Gear Up"),
+    [MOVE_THROAT_CHOP] = _("Throat Chop"),
+    [MOVE_POLLEN_PUFF] = _("Pollen Puff"),
+    [MOVE_ANCHOR_SHOT] = _("Anchor Shot"),
+    [MOVE_PSYCHIC_TERRAIN] = _("Psychic Terrain"),
+    [MOVE_LUNGE] = _("Lunge"),
+    [MOVE_FIRE_LASH] = _("Fire Lash"),
+    [MOVE_POWER_TRIP] = _("Power Trip"),
+    [MOVE_BURN_UP] = _("Burn Up"),
+    [MOVE_SPEED_SWAP] = _("Speed Swap"),
+    [MOVE_SMART_STRIKE] = _("Smart Strike"),
+    [MOVE_PURIFY] = _("Purify"),
+    [MOVE_REVELATION_DANCE] = _("Revelation Dance"),
+    [MOVE_CORE_ENFORCER] = _("Core Enforcer"),
+    [MOVE_TROP_KICK] = _("Trop Kick"),
+    [MOVE_INSTRUCT] = _("Instruct"),
+    [MOVE_BEAK_BLAST] = _("Beak Blast"),
+    [MOVE_CLANGING_SCALES] = _("Clanging Scales"),
+    [MOVE_DRAGON_HAMMER] = _("Dragon Hammer"),
+    [MOVE_BRUTAL_SWING] = _("Brutal Swing"),
+    [MOVE_AURORA_VEIL] = _("Aurora Veil"),
+    [MOVE_SHELL_TRAP] = _("Shell Trap"),
+    [MOVE_FLEUR_CANNON] = _("Fleur Cannon"),
+    [MOVE_PSYCHIC_FANGS] = _("Psychic Fangs"),
+    [MOVE_STOMPING_TANTRUM] = _("Stomping Tantrum"),
+    [MOVE_SHADOW_BONE] = _("Shadow Bone"),
+    [MOVE_ACCELEROCK] = _("Accelerock"),
+    [MOVE_LIQUIDATION] = _("Liquidation"),
+    [MOVE_PRISMATIC_LASER] = _("Prismatic Laser"),
+    [MOVE_SPECTRAL_THIEF] = _("Spectral Thief"),
+    [MOVE_SUNSTEEL_STRIKE] = _("Sunsteel Strike"),
+    [MOVE_MOONGEIST_BEAM] = _("Moongeist Beam"),
+    [MOVE_TEARFUL_LOOK] = _("Tearful Look"),
+    [MOVE_ZING_ZAP] = _("Zing Zap"),
+    [MOVE_NATURES_MADNESS] = _("Nature's Madness"),
+    [MOVE_MULTI_ATTACK] = _("Multi-Attack"),
+    [MOVE_MIND_BLOWN] = _("Mind Blown"),
+    [MOVE_PLASMA_FISTS] = _("Plasma Fists"),
+    [MOVE_PHOTON_GEYSER] = _("Photon Geyser"),
+    [MOVE_ZIPPY_ZAP] = _("Zippy Zap"),
+    [MOVE_SPLISHY_SPLASH] = _("Splishy Splash"),
+    [MOVE_FLOATY_FALL] = _("Floaty Fall"),
+    [MOVE_PIKA_PAPOW] = _("Pika Papow"),
+    [MOVE_BOUNCY_BUBBLE] = _("Bouncy Bubble"),
+    [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] = _("Sparkly Swirl"),
+    [MOVE_VEEVEE_VOLLEY] = _("Veevee Volley"),
+    [MOVE_DOUBLE_IRON_BASH] = _("Double Iron Bash"),
+    [MOVE_DYNAMAX_CANNON] = _("Dynamax Cannon"),
+    [MOVE_SNIPE_SHOT] = _("Snipe Shot"),
+    [MOVE_JAW_LOCK] = _("Jaw Lock"),
+    [MOVE_STUFF_CHEEKS] = _("Stuff Cheeks"),
+    [MOVE_NO_RETREAT] = _("No Retreat"),
+    [MOVE_TAR_SHOT] = _("Tar Shot"),
+    [MOVE_MAGIC_POWDER] = _("Magic Powder"),
+    [MOVE_DRAGON_DARTS] = _("Dragon Darts"),
+    [MOVE_TEATIME] = _("Teatime"),
+    [MOVE_OCTOLOCK] = _("Octolock"),
+    [MOVE_BOLT_BEAK] = _("Bolt Beak"),
+    [MOVE_FISHIOUS_REND] = _("Fishious Rend"),
+    [MOVE_COURT_CHANGE] = _("Court Change"),
+    [MOVE_CLANGOROUS_SOUL] = _("Clangorous Soul"),
+    [MOVE_BODY_PRESS] = _("Body Press"),
+    [MOVE_DECORATE] = _("Decorate"),
+    [MOVE_DRUM_BEATING] = _("Drum Beating"),
+    [MOVE_SNAP_TRAP] = _("Snap Trap"),
+    [MOVE_PYRO_BALL] = _("Pyro Ball"),
+    [MOVE_BEHEMOTH_BLADE] = _("Behemoth Blade"),
+    [MOVE_BEHEMOTH_BASH] = _("Behemoth Bash"),
+    [MOVE_AURA_WHEEL] = _("Aura Wheel"),
+    [MOVE_BREAKING_SWIPE] = _("Breaking Swipe"),
+    [MOVE_BRANCH_POKE] = _("Branch Poke"),
+    [MOVE_OVERDRIVE] = _("Overdrive"),
+    [MOVE_APPLE_ACID] = _("Apple Acid"),
+    [MOVE_GRAV_APPLE] = _("Grav Apple"),
+    [MOVE_SPIRIT_BREAK] = _("Spirit Break"),
+    [MOVE_STRANGE_STEAM] = _("Strange Steam"),
+    [MOVE_LIFE_DEW] = _("Life Dew"),
+    [MOVE_OBSTRUCT] = _("Obstruct"),
+    [MOVE_FALSE_SURRENDER] = _("False Surrender"),
+    [MOVE_METEOR_ASSAULT] = _("Meteor Assault"),
+    [MOVE_ETERNABEAM] = _("Eternabeam"),
+    [MOVE_STEEL_BEAM] = _("Steel Beam"),
+    [MOVE_EXPANDING_FORCE] = _("Expanding Force"),
+    [MOVE_STEEL_ROLLER] = _("Steel Roller"),
+    [MOVE_SCALE_SHOT] = _("Scale Shot"),
+    [MOVE_METEOR_BEAM] = _("Meteor Beam"),
+    [MOVE_SHELL_SIDE_ARM] = _("Shell Side Arm"),
+    [MOVE_MISTY_EXPLOSION] = _("Misty Explosion"),
+    [MOVE_GRASSY_GLIDE] = _("Grassy Glide"),
+    [MOVE_RISING_VOLTAGE] = _("Rising Voltage"),
+    [MOVE_TERRAIN_PULSE] = _("Terrain Pulse"),
+    [MOVE_SKITTER_SMACK] = _("Skitter Smack"),
+    [MOVE_BURNING_JEALOUSY] = _("Burning Jealousy"),
+    [MOVE_LASH_OUT] = _("Lash Out"),
+    [MOVE_POLTERGEIST] = _("Poltergeist"),
+    [MOVE_CORROSIVE_GAS] = _("Corrosive Gas"),
+    [MOVE_COACHING] = _("Coaching"),
+    [MOVE_FLIP_TURN] = _("Flip Turn"),
+    [MOVE_TRIPLE_AXEL] = _("Triple Axel"),
+    [MOVE_DUAL_WINGBEAT] = _("Dual Wingbeat"),
+    [MOVE_SCORCHING_SANDS] = _("Scorching Sands"),
+    [MOVE_JUNGLE_HEALING] = _("Jungle Healng"),
+    [MOVE_WICKED_BLOW] = _("Wicked Blow"),
+    [MOVE_SURGING_STRIKES] = _("Surging Strikes"),
+    [MOVE_THUNDER_CAGE] = _("Thunder Cage"),
+    [MOVE_DRAGON_ENERGY] = _("Dragon Energy"),
+    [MOVE_FREEZING_GLARE] = _("Freezing Glare"),
+    [MOVE_FIERY_WRATH] = _("Fiery Wrath"),
+    [MOVE_THUNDEROUS_KICK] = _("Thunderous Kick"),
+    [MOVE_GLACIAL_LANCE] = _("Glacial Lance"),
+    [MOVE_ASTRAL_BARRAGE] = _("Astral Barrage"),
+    [MOVE_EERIE_SPELL] = _("Eerie Spell"),
+};
+#else
+// 12 letters
 const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
 {
     [MOVE_NONE] = _("-"),
@@ -690,7 +1452,6 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
     [MOVE_SPARKLY_SWIRL] = _("SparklySwirl"),
     [MOVE_VEEVEE_VOLLEY] = _("VeeveeVolley"),
     [MOVE_DOUBLE_IRON_BASH] = _("DublIronBash"),
-    //GEN 8
     [MOVE_DYNAMAX_CANNON] = _("DynamxCannon"),
     [MOVE_SNIPE_SHOT] = _("Snipe Shot"),
     [MOVE_JAW_LOCK] = _("Jaw Lock"),
@@ -757,6 +1518,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
     [MOVE_ASTRAL_BARRAGE] = _("AstrlBarrage"),
     [MOVE_EERIE_SPELL] = _("Eerie Spell"),
 };
+#endif
 
 static const u8 sText_Breakneck_Blitz[] = _("Breakneck Blitz");
 static const u8 sText_All_Out_Pummeling[] = _("All Out Pummeling");