Deprecate MMBN Names (#5240)

* Removed HANDLE_EXPANDED_MOVE_NAME * Removed HANDLE_EXPANDED_TYPE_NAME * Removed HANDLE_EXPANDED_ITEM_NAME * Removed HANDLE_EXPANDED_SPECIES_NAME * Removed I_EXPANDED_ITEM_NAMES * Removed B_EXPANDED_MOVE_NAMES * Removed B_EXPANDED_TYPE_NAMES * Removed B_EXPANDED_ABILITY_NAMES * Removed B_EXPANDED_ABILITY_NAMES * Added documentation of names * Github markdown spacing is silly * Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339 * Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
2024-08-29 13:33:25 -07:00 · 2024-08-29 13:33:25 -07:00 · 4f39354185
commit 4f39354185
parent 2ab0dd77de
16 changed files with 609 additions and 543 deletions
--- a/docs/mmbn_style_names.md
+++ b/docs/mmbn_style_names.md
@ -0,0 +1,300 @@
 # Megaman Battle Network Style Names
 Prior to 1.10, names in expansion that were too long for the game's UIs were truncated to fit using the naming conventions from the [Megaman Battle Network](<https://www.therockmanexezone.com/wiki/The_Rockman_EXE_Zone_Wiki>) series.
 These were removed as part of https://github.com/rh-hideout/pokeemerald-expansion/pull/5240. They are stored here for users that may want to refer back to them or restore them.
 # Table
 Attribute | MMBN | Official
 -- | -- | --
 Item | PewtrCrnches | Pewter Crunchies
 Item | RageCandyBar | Rage Candy Bar
 Item | LumioseGlete | Lumiose Galette
 Item | ShalourSable | Shalour Sable
 Item | HealthFeather | Health Feather
 Item | MuscleFeather | Muscle Feather
 Item | ResistFeather | Resist Feather
 Item | GeniusFeather | Genius Feather
 Item | CleverFeather | Clever Feather
 Item | SwiftFeather | Swift Feather
 Item | AbilityCapsle | Ability Capsule
 Item | AbilityPatch | Ability Patch
 Item | AbilityPatches | Ability Patches
 Item | Exp.Candy XS | Exp. Candy XS
 Item | Exp.Candies XS | Exp. Candies XS
 Item | Exp.Candy S | Exp. Candy S
 Item | Exp.Candies S | Exp. Candies S
 Item | Exp.Candy M | Exp. Candy M
 Item | Exp.Candies M | Exp. Candies M
 Item | Exp.Candy L | Exp. Candy L
 Item | Exp.Candies L | Exp. Candies L
 Item | Exp.Candy XL | Exp. Candy XL
 Item | Exp.Candies XL | Exp. Candies XL
 Item | DynamaxCandy | Dynamax Candy
 Item | DynamaxCandies | Dynamax Candies
 Item | MaxMushrooms | Max Mushrooms
 Item | GoldBottlCap | Gold Bottle Cap
 Item | PrettyFeather | Pretty Feather
 Item | StrngeSouvnr | Strange Souvenir
 Item | FosslzedBird | Fossilized Bird
 Item | FosslzedFish | Fossilized Fish
 Item | FosslzedFishes | Fossilized Fishes
 Item | FosslzedDrke | Fossilized Drake
 Item | FosslzedDino | Fossilized Dino
 Item | SurprseMulch | Surprise Mulch
 Item | YellwApricorn | Yellow Apricorn
 Item | GreenApricorn | Green Apricorn
 Item | WhiteApricorn | White Apricorn
 Item | BlackApricorn | Black Apricorn
 Item | WishingPiece | Wishing Piece
 Item | GalaricaTwig | Galarica Twig
 Item | GalaricaCuff | Galarica Cuff
 Item | GalrcaWreath | Galarica Wreath
 Item | GalrcaWreathes | Galarica Wreathes
 Item | StrwbrySweet | Strawberry Sweet
 Item | ElectrcMemory | Electric Memory
 Item | ElectrcMemories | Electric Memories
 Item | FightngMemory | Fighting Memory
 Item | FightngMemories | Fighting Memories
 Item | PsychicMemory | Psychic Memory
 Item | PsychicMemories | Psychic Memories
 Item | RustedSword | Rusted Sword
 Item | RustedShield | Rusted Shield
 Item | CharizarditeX | Charizardite X
 Item | CharizarditeY | Charizardite Y
 Item | U-Necrozium Z | Ultranecrozium Z
 Item | DeepSeaScale | Deep Sea Scale
 Item | DeepSeaTooth | Deep Sea Tooth
 Item | Never-MeltIce | Never-Melt Ice
 Item | WeaknssPolicy | Weakness Policy
 Item | WeaknssPolicies | Weakness Policies
 Item | SafetyGoggles | Safety Goggles
 Item | AdrenalineOrb | Adrenaline Orb
 Item | TerainExtendr | Terrain Extender
 Item | ProtectvePads | Protective Pads
 Item | Heavy-DtyBts | Heavy-Duty Boots
 Item | BlundrPolicy | Blunder Policy
 Item | BlundrPolicies | Blunder Policies
 Item | UtltyUmbrlla | Utility Umbrella
 Item | CatchngCharm | Catching Charm
 Item | RotomCatalog | Rotom Catalog
 Item | ReinsOfUnity | Reins of Unity
 Item | Dowsing MCHN | Dowsing Machine
 Item | AbilityShield | Ability Shield
 Item | PunchingGlove | Punching Glove
 Item | AuspciousArmr | Auspicious Armor
 Item | BoosterEnergy | Booster Energy
 Item | BoosterEnergies | Booster Energies
 Item | BigBmbooShoot | Big Bamboo Shoot
 Item | GimighoulCoin | Gimmighoul Coin
 Item | Leader'sCrest | Leader's Crest
 Item | MaliciousArmr | Malicious Armor
 Item | ScrllOfDrknss | Scroll of Darkness
 Item | ScrllsOfDrknss | Scrolls of Darkness
 Item | ScrollOfWatrs | Scroll of Waters
 Item | ScrollsOfWatrs | Scrolls of Waters
 Item | TinyBmbooShot | Tiny Bamboo Shoot
 Item | Bug TeraShard | Bug Tera Shard
 Item | DarkTeraShard | Dark Tera Shard
 Item | DragnTeraShrd | Dragon Tera Shard
 Item | EltrcTeraShrd | Electric Tera Shard
 Item | FairyTeraShrd | Fairy Tera Shard
 Item | FghtngTerShrd | Fighting Tera Shard
 Item | FireTeraShard | Fire Tera Shard
 Item | FlyngTeraShrd | Flying Tera Shard
 Item | GhostTeraShrd | Ghost Tera Shard
 Item | GrassTeraShrd | Grass Tera Shard
 Item | GrondTeraShrd | Ground Tera Shard
 Item | Ice TeraShard | Ice Tera Shard
 Item | NormlTeraShrd | Normal Tera Shard
 Item | PoisnTeraShrd | Poison Tera Shard
 Item | PschcTeraShrd | Psychic Tera Shard
 Item | RockTeraShard | Rock Tera Shard
 Item | SteelTeraShrd | Steel Tera Shard
 Item | WaterTeraShrd | Water Tera Shard
 Item | AdamantCrystl | Adamant Crystal
 Item | LustrousGlobe | Lustrous Globe
 Item | BlackAugurite | Black Augurite
 Item | UnrmkblTeacup | Unremarkable Teacup
 Item | MstrpceTeacup | Masterpiece Teacup
 Item | CornrstneMask | Cornerstone Mask
 Item | WellsprngMask | Wellspring Mask
 Item | HrthflameMask | Hearthflame Mask
 Item | FrshStrtMochi | Fresh Start Mochi
 Item | GlmmringCharm | Glimmering Charm
 Item | StllrTeraShrd | Stellar Tera Shard
 Item | JublifeMuffin | Jubilife Muffin
 Item | AuxPowerguard | Aux Powerguard
 Item | ChoiceDumplng | Choice Dumpling
 Item | 2xSpicedRadsh | Twice-Spiced Radish
 Move | ThunderPunch | Thunder Punch
 Move | PoisonPowder | Poison Powder
 Move | ThunderShock | Thunder Shock
 Move | SelfDestruct | Self-Destruct
 Move | HighJumpKick | High Jump Kick
 Move | DynamicPunch | Dynamic Punch
 Move | DragonBreath | Dragon Breath
 Move | ExtremeSpeed | Extreme Speed
 Move | AncientPower | Ancient Power
 Move | SmellngSalts | Smelling Salts
 Move | FeatherDance | Feather Dance
 Move | GrassWhistle | Grass Whistle
 Move | PhantomForce | Phantom Force
 Move | TrickOrTreat | Trick-or-Treat
 Move | ParabolcChrg | Parabolic Charge
 Move | Forest'sCurs | Forest's Curse
 Move | PetalBlizzrd | Petal Blizzard
 Move | DisrmngVoice | Disarming Voice
 Move | DrainingKiss | Draining Kiss
 Move | CraftyShield | Crafty Shield
 Move | FlowerShield | Flower Shield
 Move | GrssyTerrain | Grassy Terrain
 Move | MistyTerrain | Misty Terrain
 Move | King'sShield | King's Shield
 Move | DiamondStorm | Diamond Storm
 Move | SteamErption | Steam Eruption
 Move | HyprspceHole | Hyperspace Hole
 Move | WatrShuriken | Water Shuriken
 Move | MysticalFire | Mystical Fire
 Move | AromaticMist | Aromatic Mist
 Move | EerieImpulse | Eerie Impulse
 Move | MagneticFlux | Magnetic Flux
 Move | ElctrcTrrain | Electric Terrain
 Move | DazzlngGleam | Dazzling Gleam
 Move | BabyDollEyes | Baby-Doll Eyes
 Move | PowerUpPunch | Power-Up Punch
 Move | OblivionWing | Oblivion Wing
 Move | ThousndArrws | Thousand Arrows
 Move | ThousndWaves | Thousand Waves
 Move | LightOfRuin | Light Of Ruin
 Move | PrcipceBldes | Precipice Blades
 Move | DragonAscent | Dragon Ascent
 Move | HyprspceFury | Hyperspace Fury
 Move | FrstImpressn | First Impression
 Move | BanefulBunkr | Baneful Bunker
 Move | SpiritShackl | Spirit Shackle
 Move | DarkstLariat | Darkest Lariat
 Move | SparklngAria | Sparkling Aria
 Move | FloralHealng | Floral Healing
 Move | HighHorsepwr | High Horsepower
 Move | PsychcTrrain | Psychic Terrain
 Move | RvlationDnce | Revelation Dance
 Move | CoreEnforcer | Core Enforcer
 Move | ClngngScales | Clanging Scales
 Move | DragonHammer | Dragon Hammer
 Move | PsychicFangs | Psychic Fangs
 Move | StmpngTantrm | Stomping Tantrum
 Move | PrsmaticLasr | Prismatic Laser
 Move | SpectrlThief | Spectral Thief
 Move | SnsteelStrke | Sunsteel Strike
 Move | MoongestBeam | Moongeist Beam
 Move | Natur'sMadns | Nature's Madness
 Move | PhotonGeyser | Photon Geyser
 Move | SplishySplsh | Splishy Splash
 Move | BouncyBubble | Bouncy Bubble
 Move | SparklySwirl | Sparkly Swirl
 Move | VeeveeVolley | Veevee Volley
 Move | DublIronBash | Double Iron Bash
 Move | DynamxCannon | Dynamax Cannon
 Move | FishiousRend | Fishious Rend
 Move | ClngrousSoul | Clangorous Soul
 Move | BehemthBlade | Behemoth Blade
 Move | BehemothBash | Behemoth Bash
 Move | BreakngSwipe | Breaking Swipe
 Move | StrangeSteam | Strange Steam
 Move | FalsSurrendr | False Surrender
 Move | MeteorAssalt | Meteor Assault
 Move | ExpandngForc | Expanding Force
 Move | ShellSideArm | Shell Side Arm
 Move | MstyExplsion | Misty Explosion
 Move | RisngVoltage | Rising Voltage
 Move | TerrainPulse | Terrain Pulse
 Move | SkitterSmack | Skitter Smack
 Move | BrningJelosy | Burning Jealousy
 Move | CorrosiveGas | Corrosive Gas
 Move | DualWingbeat | Dual Wingbeat
 Move | ScorchngSnds | Scorching Sands
 Move | JungleHealng | Jungle Healing
 Move | SurgngStrkes | Surging Strikes
 Move | DragonEnergy | Dragon Energy
 Move | FreezngGlare | Freezing Glare
 Move | ThnderusKick | Thunderous Kick
 Move | GlacialLance | Glacial Lance
 Move | AstrlBarrage | Astral Barrage
 Move | PsyshieldBsh | Psyshield Bash
 Move | SprngtdeStrm | Springtide Storm
 Move | MystcalPower | Mystical Power
 Move | MountainGale | Mountain Gale
 Move | VictoryDance | Victory Dance
 Move | HeadlongRush | Headlong Rush
 Move | BitterMalice | Bitter Malice
 Move | TripleArrows | Triple Arrows
 Move | InfrnlParade | Infernal Parade
 Move | CeaslessEdge | Ceaseless Edge
 Move | BlekwndStorm | Bleakwind Storm
 Move | WildbltStorm | Wildbolt Storm
 Move | SndsearStorm | Sandsear Storm
 Move | LunarBlessng | Lunar Blessing
 Move | LastRespects | Last Respects
 Move | SpicyExtract | Spicy Extract
 Move | PoplatinBomb | Population Bomb
 Move | RevivlBlesng | Revival Blessing
 Move | KowtowCleave | Kowtow Cleave
 Move | ColisinCours | Collision Course
 Move | ElectroDrift | Electro Drift
 Move | ChilReceptin | Chilly Reception
 Move | ChillingWatr | Chilling Water
 Move | GigatonHammr | Gigaton Hammer
 Move | BlazngTorque | Blazing Torque
 Move | WickedTorque | Wicked Torque
 Move | NoxiusTorque | Noxious Torque
 Move | CombatTorque | Combat Torque
 Move | MagiclTorque | Magical Torque
 Move | MatchaGotcha | Matcha Gotcha
 Move | TeraStarstrm | Tera Starstorm
 Move | BurnngBulwrk | Burning Bulwark
 Move | MightyCleave | Mighty Cleave
 Move | TachyonCuttr | Tachyon Cutter
 Move | AllurngVoice | Alluring Voice
 Move | SuprcellSlam | Supercell Slam
 Move | PsychicNoise | Psychic Noise
 Move | MalignntChan | Malignant Chain
 Species | Dudunsprce | Dudunsparce
 Species | Corvisquir | Corvisquire
 Species | Corviknigh | Corviknight
 Species | Barraskewd | Barraskewda
 Species | Centiskorc | Centiskorch
 Species | Polteageis | Polteageist
 Species | Stonjourne | Stonjourner
 Species | Meowscarad | Meowscarada
 Species | Sqawkabily | Squawkabilly
 Species | Kilowatrel | Kilowattrel
 Species | Brmblghast | Brambleghast
 Species | ScreamTail | Scream Tail
 Species | BruteBonet | Brute Bonnet
 Species | FluttrMane | Flutter Mane
 Species | SlithrWing | Slither Wing
 Species | SndyShocks | Sandy Shocks
 Species | IronTreads | Iron Treads
 Species | IronBundle | Iron Bundle
 Species | IronJuguls | Iron Jugulis
 Species | IronThorns | Iron Thorns
 Species | RoarngMoon | Roaring Moon
 Species | IronVliant | Iron Valiant
 Species | WalkngWake | Walking Wake
 Species | IronLeaves | Iron Leaves
 Species | Ptchageist | Poltchageist
 Species | Fezndipiti | Fezandipiti
 Species | GouginFire | Gouging Fire
 Species | RagingBolt | Raging Bolt
 Species | IronBouldr | Iron Boulder
 Species | Crabminabl | Crabominable
 Species | Blacephaln | Blacephalon
 Species | Bsculegion | Basculegion
 Species | Flechinder | Fletchinder
 Type | Fight | Fighting
 Type | Electr | Electric
 Type | Psychc | Psychic
 Type | Stellr | Stellar
--- a/include/config/battle.h
+++ b/include/config/battle.h
@ -39,7 +39,6 @@
 #define B_MULTIPLE_TARGETS_DMG      GEN_LATEST // In Gen4+, damage dealt by moves that hit multiple targets at once is reduced to 75%. Before, it was 50%.
 // Type settings
 #define B_EXPANDED_TYPE_NAMES       TRUE       // If TRUE, type names are increased from 6 characters to 8 characters.
 #define B_GHOSTS_ESCAPE             GEN_LATEST // In Gen6+, abilities like Shadow Tag or moves like Mean Look fail on Ghost-type Pokémon. They can also escape any Wild Battle.
 #define B_PARALYZE_ELECTRIC         GEN_LATEST // In Gen6+, Electric-type Pokémon can't be paralyzed.
 #define B_POWDER_GRASS              GEN_LATEST // In Gen6+, Grass-type Pokémon are immune to powder and spore moves.
@ -124,7 +123,6 @@
 #define B_CHARGE                    GEN_LATEST // In Gen8-, Charge status is lost regardless of the typing of the next move.
 // Ability settings
 #define B_EXPANDED_ABILITY_NAMES    TRUE       // If TRUE, ability names are increased from 12 characters to 16 characters.
 #define B_ABILITY_WEATHER           GEN_LATEST // In Gen6+, ability-induced weather lasts 5 turns. Before, it lasted until the battle ended or until it was changed by a move or a different weather-affecting ability.
 #define B_GALE_WINGS                GEN_LATEST // In Gen7+ requires full HP to trigger.
 #define B_STANCE_CHANGE_FAIL        GEN_LATEST // In Gen7+, Stance Change fails if the Pokémon is unable to use a move because of confusion, paralysis, etc. In Gen6, it doesn't.
@ -222,7 +220,6 @@
 #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_CATEGORY_ICON        TRUE  // If set to TRUE, it will show an icon in the summary and move relearner showing the move's category.
 #define B_HIDE_HEALTHBOX_IN_ANIMS   TRUE  // If set to TRUE, hides healthboxes during move animations.
 #define B_EXPANDED_MOVE_NAMES       TRUE  // If set to FALSE, move names are decreased from 16 characters to 12 characters.
 #define B_WAIT_TIME_MULTIPLIER      16    // This determines how long text pauses in battle last. Vanilla is 16. Lower values result in faster battles.
 #define B_QUICK_MOVE_CURSOR_TO_RUN  FALSE // If set to TRUE, pushing B in the battle options against a wild encounter will move the cursor to the run option
 #define B_MOVE_DESCRIPTION_BUTTON   L_BUTTON // If set to a button other than B_LAST_USED_BALL_BUTTON, pressing this button will open the move description menu
--- a/include/config/item.h
+++ b/include/config/item.h
@ -2,7 +2,6 @@
 #define GUARD_CONFIG_ITEM_H
 // Item config
 #define I_EXPANDED_ITEM_NAMES           TRUE        // If set to FALSE, item names are decreased from 20 characters to 14 characters.
 #define I_SHINY_CHARM_ADDITIONAL_ROLLS  2           // Amount of additional shiny rolls if the player has the Shiny Charm. Set it to 0 to disable Shiny Charm's effects.
 #define I_KEY_FOSSILS                   GEN_LATEST  // In Gen4+, all Gen 3 fossils became regular items.
 #define I_KEY_ESCAPE_ROPE               GEN_LATEST  // In Gen8, Escape Rope became a Key Item. Keep in mind, this will make it free to buy in marts.
--- a/include/config/test.h
+++ b/include/config/test.h
@ -1,14 +1,8 @@
 #ifndef GUARD_CONFIG_TEST_H
 #define GUARD_CONFIG_TEST_H
 #undef B_EXPANDED_MOVE_NAMES
 #define B_EXPANDED_MOVE_NAMES TRUE
 #undef I_EXPANDED_ITEM_NAMES
 #define I_EXPANDED_ITEM_NAMES TRUE
 #undef POKEMON_NAME_LENGTH
 #define POKEMON_NAME_LENGTH 12
 #undef B_EXPANDED_TYPE_NAMES
 #define B_EXPANDED_TYPE_NAMES TRUE
 #undef P_MEGA_EVOLUTIONS
 #define P_MEGA_EVOLUTIONS                TRUE
--- a/include/constants/global.h
+++ b/include/constants/global.h
@ -103,7 +103,7 @@
 #define CONTEST_CATEGORIES_COUNT  5
 // string lengths
-#define ITEM_NAME_LENGTH ((I_EXPANDED_ITEM_NAMES == TRUE) ? 20 : 14)
+#define ITEM_NAME_LENGTH 20
 #define ITEM_NAME_PLURAL_LENGTH ITEM_NAME_LENGTH + 2 // 2 is used for the instance where a word's suffix becomes y->ies
 #define POKEMON_NAME_LENGTH 12
 #define VANILLA_POKEMON_NAME_LENGTH 10
@ -111,15 +111,15 @@
 #define PLAYER_NAME_LENGTH 7
 #define MAIL_WORDS_COUNT 9
 #define EASY_CHAT_BATTLE_WORDS_COUNT 6
-#define MOVE_NAME_LENGTH ((B_EXPANDED_MOVE_NAMES == TRUE) ? 16 : 12)
+#define MOVE_NAME_LENGTH 16
 #define NUM_QUESTIONNAIRE_WORDS 4
 #define QUIZ_QUESTION_LEN 9
 #define WONDER_CARD_TEXT_LENGTH 40
 #define WONDER_NEWS_TEXT_LENGTH 40
 #define WONDER_CARD_BODY_TEXT_LINES 4
 #define WONDER_NEWS_BODY_TEXT_LINES 10
-#define TYPE_NAME_LENGTH ((B_EXPANDED_TYPE_NAMES == TRUE) ? 8 : 6)
+#define TYPE_NAME_LENGTH 8
-#define ABILITY_NAME_LENGTH ((B_EXPANDED_ABILITY_NAMES == TRUE) ? 16 : 12)
+#define ABILITY_NAME_LENGTH 16
 #define TRAINER_NAME_LENGTH 10
 #define MAX_STAMP_CARD_STAMPS 7
--- a/src/data/abilities.h
+++ b/src/data/abilities.h
@ -110,11 +110,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_COMPOUND_EYES] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Compound Eyes"),
    #else
        .name = _("CompoundEyes"),
    #endif
        .description = COMPOUND_STRING("Raises accuracy."),
        .aiRating = 7,
    },
@ -244,11 +240,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_LIGHTNING_ROD] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Lightning Rod"),
    #else
        .name = _("LightningRod"),
    #endif
        .description = COMPOUND_STRING("Draws electrical moves."),
        .aiRating = 7,
        .breakable = TRUE,
@ -1328,11 +1320,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_STANCE_CHANGE] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Stance Change"),
    #else
        .name = _("StanceChange"),
    #endif
        .description = COMPOUND_STRING("Transforms as it battles."),
        .aiRating = 10,
        .cantBeCopied = TRUE,
@ -1351,11 +1339,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_MEGA_LAUNCHER] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Mega Launcher"),
    #else
        .name = _("MegaLauncher"),
    #endif
        .description = COMPOUND_STRING("Boosts pulse moves."),
        .aiRating = 7,
    },
@ -1405,11 +1389,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_PARENTAL_BOND] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Parental Bond"),
    #else
        .name = _("ParentalBond"),
    #endif
        .description = COMPOUND_STRING("Moves hit twice."),
        .aiRating = 10,
    },
@ -1437,22 +1417,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_PRIMORDIAL_SEA] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Primordial Sea"),
    #else
        .name = _("PrimrdialSea"),
    #endif
        .description = COMPOUND_STRING("Summons heavy rain."),
        .aiRating = 10,
    },
    [ABILITY_DESOLATE_LAND] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Desolate Land"),
    #else
        .name = _("DesolateLand"),
    #endif
        .description = COMPOUND_STRING("Summons intense sunlight."),
        .aiRating = 10,
    },
@ -1480,22 +1452,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_EMERGENCY_EXIT] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Emergency Exit"),
    #else
        .name = _("EmergncyExit"),
    #endif
        .description = COMPOUND_STRING("Flees at half HP."),
        .aiRating = 3,
    },
    [ABILITY_WATER_COMPACTION] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Water Compaction"),
    #else
        .name = _("WtrCmpaction"),
    #endif
        .description = COMPOUND_STRING("Water boosts Defense."),
        .aiRating = 4,
    },
@ -1629,11 +1593,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_POWER_CONSTRUCT] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Power Construct"),
    #else
        .name = _("PwrConstruct"),
    #endif
        .description = COMPOUND_STRING("Cells aid it when weakened."),
        .aiRating = 10,
        .cantBeCopied = TRUE,
@ -1664,11 +1624,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_QUEENLY_MAJESTY] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Queenly Majesty"),
    #else
        .name = _("QueenlyMjsty"),
    #endif
        .description = COMPOUND_STRING("Protects from priority."),
        .aiRating = 6,
        .breakable = TRUE,
@ -1720,11 +1676,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_TANGLING_HAIR] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Tangling Hair"),
    #else
        .name = _("TanglingHair"),
    #endif
        .description = COMPOUND_STRING("Lowers Speed on contact."),
        .aiRating = 5,
    },
@ -1740,11 +1692,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_POWER_OF_ALCHEMY] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Power Of Alchemy"),
    #else
        .name = _("PwrOfAlchemy"),
    #endif
        .description = COMPOUND_STRING("Copies ally's ability."),
        .aiRating = 0,
        .cantBeCopied = TRUE,
@ -1772,22 +1720,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_ELECTRIC_SURGE] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Electric Surge"),
    #else
        .name = _("ElectrcSurge"),
    #endif
        .description = COMPOUND_STRING("Field becomes Electric."),
        .aiRating = 8,
    },
    [ABILITY_PSYCHIC_SURGE] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Psychic Surge"),
    #else
        .name = _("PsychicSurge"),
    #endif
        .description = COMPOUND_STRING("Field becomes weird."),
        .aiRating = 8,
    },
@ -1808,22 +1748,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_FULL_METAL_BODY] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Full Metal Body"),
    #else
        .name = _("FullMetalBdy"),
    #endif
        .description = COMPOUND_STRING("Prevents stat reduction."),
        .aiRating = 4,
    },
    [ABILITY_SHADOW_SHIELD] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Shadow Shield"),
    #else
        .name = _("ShadowShield"),
    #endif
        .description = COMPOUND_STRING("Halves damage at full HP."),
        .aiRating = 8,
    },
@ -1844,22 +1776,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_INTREPID_SWORD] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Intrepid Sword"),
    #else
        .name = _("IntrepidSwrd"),
    #endif
        .description = COMPOUND_STRING("Ups Attack on entry."),
        .aiRating = 3,
    },
    [ABILITY_DAUNTLESS_SHIELD] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Dauntless Shield"),
    #else
        .name = _("DauntlssShld"),
    #endif
        .description = COMPOUND_STRING("Ups Defense on entry."),
        .aiRating = 3,
    },
@ -1886,11 +1810,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_PROPELLER_TAIL] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Propeller Tail"),
    #else
        .name = _("PropellrTail"),
    #endif
        .description = COMPOUND_STRING("Ignores foe's redirection."),
        .aiRating = 2,
    },
@ -1988,22 +1908,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_SCREEN_CLEANER] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Screen Cleaner"),
    #else
        .name = _("ScreenCleanr"),
    #endif
        .description = COMPOUND_STRING("Removes walls of light."),
        .aiRating = 3,
    },
    [ABILITY_STEELY_SPIRIT] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Steely Spirit"),
    #else
        .name = _("SteelySpirit"),
    #endif
        .description = COMPOUND_STRING("Boosts ally's Steel moves."),
        .aiRating = 2,
    },
@ -2017,33 +1929,21 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_WANDERING_SPIRIT] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Wandering Spirit"),
    #else
        .name = _("WandrngSprit"),
    #endif
        .description = COMPOUND_STRING("Trade abilities on contact."),
        .aiRating = 2,
    },
    [ABILITY_GORILLA_TACTICS] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Gorilla Tactics"),
    #else
        .name = _("GorillaTacti"),
    #endif
        .description = COMPOUND_STRING("Ups Attack and locks move."),
        .aiRating = 4,
    },
    [ABILITY_NEUTRALIZING_GAS] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Neutralizing Gas"),
    #else
        .name = _("NeutrlzngGas"),
    #endif
        .description = COMPOUND_STRING("All Abilities are nullified."),
        .aiRating = 5,
        .cantBeCopied = TRUE,
@ -2062,11 +1962,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_HUNGER_SWITCH] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Hunger Switch"),
    #else
        .name = _("HungerSwitch"),
    #endif
        .description = COMPOUND_STRING("Changes form each turn."),
        .aiRating = 2,
        .cantBeCopied = TRUE,
@ -2091,11 +1987,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_CURIOUS_MEDICINE] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Curious Medicine"),
    #else
        .name = _("CuriusMedicn"),
    #endif
        .description = COMPOUND_STRING("Remove ally's stat changes."),
        .aiRating = 3,
    },
@ -2116,11 +2008,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_CHILLING_NEIGH] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Chilling Neigh"),
    #else
        .name = _("ChillngNeigh"),
    #endif
        .description = COMPOUND_STRING("KOs boost Attack stat."),
        .aiRating = 7,
    },
@ -2158,11 +2046,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_LINGERING_AROMA] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Lingering Aroma"),
    #else
        .name = _("LngerngAroma"),
    #endif
        .description = COMPOUND_STRING("Spreads with contact."),
        .aiRating = 5,
    },
@ -2176,11 +2060,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_THERMAL_EXCHANGE] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Thermal Exchange"),
    #else
        .name = _("ThrmlExchnge"),
    #endif
        .description = COMPOUND_STRING("Fire hits up Attack."),
        .aiRating = 4,
        .breakable = TRUE,
@ -2195,11 +2075,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_PURIFYING_SALT] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Purifying Salt"),
    #else
        .name = _("PurfyingSalt"),
    #endif
        .description = COMPOUND_STRING("Protected by pure salts."),
        .aiRating = 6,
        .breakable = TRUE,
@ -2207,11 +2083,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_WELL_BAKED_BODY] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Well-Baked Body"),
    #else
        .name = _("WellBakedBdy"),
    #endif
        .description = COMPOUND_STRING("Strengthened by Fire."),
        .aiRating = 5,
        .breakable = TRUE,
@ -2235,11 +2107,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_ROCKY_PAYLOAD] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Rocky Payload"),
    #else
        .name = _("RockyPayload"),
    #endif
        .description = COMPOUND_STRING("Powers up Rock moves."),
        .aiRating = 6,
    },
@ -2277,22 +2145,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_ELECTROMORPHOSIS] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Electromorphosis"),
    #else
        .name = _("Elecmrphosis"),
    #endif
        .description = COMPOUND_STRING("Gets Charged when hit."),
        .aiRating = 5,
    },
    [ABILITY_PROTOSYNTHESIS] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Protosynthesis"),
    #else
        .name = _("Protosnthsis"),
    #endif
        .description = COMPOUND_STRING("Sun boosts best stat."),
        .aiRating = 7,
        .cantBeCopied = TRUE,
@ -2322,11 +2182,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_VESSEL_OF_RUIN] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Vessel of Ruin"),
    #else
        .name = _("VesselOfRuin"),
    #endif
        .description = COMPOUND_STRING("Lowers foes' sp. damage."),
        .aiRating = 5,
        .breakable = TRUE,
@ -2334,11 +2190,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_SWORD_OF_RUIN] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Sword of Ruin"),
    #else
        .name = _("SwordOfRuin"),
    #endif
        .description = COMPOUND_STRING("Lowers foes' Defense."),
        .aiRating = 5,
        .breakable = TRUE,
@ -2346,11 +2198,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_TABLETS_OF_RUIN] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Tablets of Ruin"),
    #else
        .name = _("TabltsOfRuin"),
    #endif
        .description = COMPOUND_STRING("Lowers foes' damage."),
        .aiRating = 5,
        .breakable = TRUE,
@ -2358,11 +2206,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_BEADS_OF_RUIN] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Beads of Ruin"),
    #else
        .name = _("BeadsOfRuin"),
    #endif
        .description = COMPOUND_STRING("Lowers foes' Sp. Defense."),
        .aiRating = 5,
        .breakable = TRUE,
@ -2370,22 +2214,14 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_ORICHALCUM_PULSE] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Orichalcum Pulse"),
    #else
        .name = _("OrchlcumPlse"),
    #endif
        .description = COMPOUND_STRING("Summons sunlight in battle."),
        .aiRating = 8,
    },
    [ABILITY_HADRON_ENGINE] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Hadron Engine"),
    #else
        .name = _("HadronEngine"),
    #endif
        .description = COMPOUND_STRING("Field becomes Electric."),
        .aiRating = 8,
    },
@ -2413,11 +2249,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_SUPREME_OVERLORD] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Supreme Overlord"),
    #else
        .name = _("SuprmeOvrlrd"),
    #endif
        .description = COMPOUND_STRING("Inherits fallen's strength."),
        .aiRating = 6,
    },
@ -2454,11 +2286,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_MYCELIUM_MIGHT] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Mycelium Might"),
    #else
        .name = _("MceliumMight"),
    #endif
        .description = COMPOUND_STRING("Status moves never fail."),
        .aiRating = 2,
    },
@ -2480,11 +2308,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_EMBODY_ASPECT_TEAL_MASK] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Embody Aspect"),
    #else
        .name = _("EmbodyAspect"),
    #endif
        .description = COMPOUND_STRING("Raises Speed."),
        .aiRating = 6,
        .cantBeCopied = TRUE,
@ -2495,11 +2319,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Embody Aspect"),
    #else
        .name = _("EmbodyAspect"),
    #endif
        .description = COMPOUND_STRING("Raises Attack."),
        .aiRating = 6,
        .cantBeCopied = TRUE,
@ -2510,11 +2330,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_EMBODY_ASPECT_WELLSPRING_MASK] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Embody Aspect"),
    #else
        .name = _("EmbodyAspect"),
    #endif
        .description = COMPOUND_STRING("Raises Sp. Def."),
        .aiRating = 6,
        .cantBeCopied = TRUE,
@ -2525,11 +2341,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Embody Aspect"),
    #else
        .name = _("EmbodyAspect"),
    #endif
        .description = COMPOUND_STRING("Raises Defense."),
        .aiRating = 6,
        .cantBeCopied = TRUE,
@ -2547,11 +2359,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_SUPERSWEET_SYRUP] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Supersweet Syrup"),
    #else
        .name = _("SuprswtSyrup"),
    #endif
        .description = COMPOUND_STRING("Lowers the foe's Evasion."),
        .aiRating = 5,
    },
@ -2582,11 +2390,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_TERAFORM_ZERO] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Teraform Zero"),
    #else
        .name = _("TeraformZero"),
    #endif
        .description = COMPOUND_STRING("Removes weather and terrain."),
        .aiRating = 10,
        .cantBeCopied = TRUE,
@ -2596,11 +2400,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
    [ABILITY_POISON_PUPPETEER] =
    {
    #if B_EXPANDED_ABILITY_NAMES == TRUE
        .name = _("Poison Puppeteer"),
    #else
        .name = _("PoisnPuppter"),
    #endif
        .description = COMPOUND_STRING("Confuses poisoned foes."),
        .aiRating = 8,
        .cantBeCopied = TRUE,
--- a/src/data/items.h
+++ b/src/data/items.h
@ -1,9 +1,3 @@
 #if I_EXPANDED_ITEM_NAMES == TRUE
 #define HANDLE_EXPANDED_ITEM_NAME(_name, ...) _(DEFAULT(_name, __VA_ARGS__))
 #else
 #define HANDLE_EXPANDED_ITEM_NAME(_name, ...) _(_name)
 #endif
 #if I_USE_EVO_HELD_ITEMS_FROM_BAG == TRUE
    #define EVO_HELD_ITEM_TYPE ITEM_USE_PARTY_MENU
    #define EVO_HELD_ITEM_FIELD_FUNC ItemUseOutOfBattle_EvolutionStone
@ -1159,8 +1153,8 @@ const struct Item gItemsInfo[] =
    [ITEM_PEWTER_CRUNCHIES] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("PewtrCrnches", "Pewter Crunchies"),
+        .name = _("Pewter Crunchies"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("PewtrCrnches", "Pewter Crunchies"),
+        .pluralName = _("Pewter Crunchies"),
        .price = 250,
        .description = sFullHealDesc,
        .pocket = POCKET_ITEMS,
@ -1175,7 +1169,7 @@ const struct Item gItemsInfo[] =
    [ITEM_RAGE_CANDY_BAR] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("RageCandyBar", "Rage Candy Bar"),
+        .name = _("Rage Candy Bar"),
        .price = (I_PRICE >= GEN_7) ? 350 : 300,
        .description = sFullHealDesc,
        .pocket = POCKET_ITEMS,
@ -1239,7 +1233,7 @@ const struct Item gItemsInfo[] =
    [ITEM_LUMIOSE_GALETTE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("LumioseGlete", "Lumiose Galette"),
+        .name = _("Lumiose Galette"),
        .price = (I_PRICE >= GEN_7) ? 350 : 200,
        .description = sFullHealDesc,
        .pocket = POCKET_ITEMS,
@ -1254,7 +1248,7 @@ const struct Item gItemsInfo[] =
    [ITEM_SHALOUR_SABLE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ShalourSable", "Shalour Sable"),
+        .name = _("Shalour Sable"),
        .price = (I_PRICE >= GEN_7) ? 350 : 200,
        .description = sFullHealDesc,
        .pocket = POCKET_ITEMS,
@ -1425,7 +1419,7 @@ const struct Item gItemsInfo[] =
    [ITEM_HEALTH_FEATHER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("HealthFeather", "Health Feather"),
+        .name = _("Health Feather"),
        .price = (I_PRICE >= GEN_7) ? 300 : 3000,
        .description = sHealthFeatherDesc,
        .pocket = POCKET_ITEMS,
@ -1439,7 +1433,7 @@ const struct Item gItemsInfo[] =
    [ITEM_MUSCLE_FEATHER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("MuscleFeather", "Muscle Feather"),
+        .name = _("Muscle Feather"),
        .price = (I_PRICE >= GEN_7) ? 300 : 3000,
        .description = sMuscleFeatherDesc,
        .pocket = POCKET_ITEMS,
@ -1453,7 +1447,7 @@ const struct Item gItemsInfo[] =
    [ITEM_RESIST_FEATHER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ResistFeather", "Resist Feather"),
+        .name = _("Resist Feather"),
        .price = (I_PRICE >= GEN_7) ? 300 : 3000,
        .description = sResistFeatherDesc,
        .pocket = POCKET_ITEMS,
@ -1467,7 +1461,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GENIUS_FEATHER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GeniusFeather", "Genius Feather"),
+        .name = _("Genius Feather"),
        .price = (I_PRICE >= GEN_7) ? 300 : 3000,
        .description = sGeniusFeatherDesc,
        .pocket = POCKET_ITEMS,
@ -1481,7 +1475,7 @@ const struct Item gItemsInfo[] =
    [ITEM_CLEVER_FEATHER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("CleverFeather", "Clever Feather"),
+        .name = _("Clever Feather"),
        .price = (I_PRICE >= GEN_7) ? 300 : 3000,
        .description = sCleverFeatherDesc,
        .pocket = POCKET_ITEMS,
@ -1495,7 +1489,7 @@ const struct Item gItemsInfo[] =
    [ITEM_SWIFT_FEATHER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("SwiftFeather", "Swift Feather"),
+        .name = _("Swift Feather"),
        .price = (I_PRICE >= GEN_7) ? 300 : 3000,
        .description = sSwiftFeatherDesc,
        .pocket = POCKET_ITEMS,
@ -1511,7 +1505,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ABILITY_CAPSULE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("AbilityCapsle", "Ability Capsule"),
+        .name = _("Ability Capsule"),
        .price = (I_PRICE < GEN_7) ? 1000 : ((I_PRICE < GEN_9) ? 10000 : 100000),
        .holdEffectParam = 0,
        .description = COMPOUND_STRING(
@ -1526,8 +1520,8 @@ const struct Item gItemsInfo[] =
    [ITEM_ABILITY_PATCH] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("AbilityPatch", "Ability Patch"),
+        .name = _("Ability Patch"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("AbilityPatches", "Ability Patches"),
+        .pluralName = _("Ability Patches"),
        .price = (I_PRICE >= GEN_9) ? 250000 : 20,
        .holdEffectParam = 0,
        .description = COMPOUND_STRING(
@ -1922,8 +1916,8 @@ const struct Item gItemsInfo[] =
    [ITEM_EXP_CANDY_XS] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy XS", "Exp. Candy XS"),
+        .name = _("Exp. Candy XS"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies XS", "Exp. Candies XS"),
+        .pluralName = _("Exp. Candies XS"),
        .price = 20,
        .holdEffectParam = EXP_100,
        .description = COMPOUND_STRING(
@ -1941,8 +1935,8 @@ const struct Item gItemsInfo[] =
    [ITEM_EXP_CANDY_S] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy S", "Exp. Candy S"),
+        .name = _("Exp. Candy S"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies S", "Exp. Candies S"),
+        .pluralName = _("Exp. Candies S"),
        .price = 240,
        .holdEffectParam = EXP_800,
        .description = COMPOUND_STRING(
@ -1960,8 +1954,8 @@ const struct Item gItemsInfo[] =
    [ITEM_EXP_CANDY_M] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy M", "Exp. Candy M"),
+        .name = _("Exp. Candy M"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies M", "Exp. Candies M"),
+        .pluralName = _("Exp. Candies M"),
        .price = 1000,
        .holdEffectParam = EXP_3000,
        .description = COMPOUND_STRING(
@ -1979,8 +1973,8 @@ const struct Item gItemsInfo[] =
    [ITEM_EXP_CANDY_L] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy L", "Exp. Candy L"),
+        .name = _("Exp. Candy L"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies L", "Exp. Candies L"),
+        .pluralName = _("Exp. Candies L"),
        .price = 3000,
        .holdEffectParam = EXP_10000,
        .description = COMPOUND_STRING(
@ -1998,8 +1992,8 @@ const struct Item gItemsInfo[] =
    [ITEM_EXP_CANDY_XL] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy XL", "Exp. Candy XL"),
+        .name = _("Exp. Candy XL"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies XL", "Exp. Candies XL"),
+        .pluralName = _("Exp. Candies XL"),
        .price = 10000,
        .holdEffectParam = EXP_30000,
        .description = COMPOUND_STRING(
@ -2017,8 +2011,8 @@ const struct Item gItemsInfo[] =
    [ITEM_DYNAMAX_CANDY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("DynamaxCandy", "Dynamax Candy"),
+        .name = _("Dynamax Candy"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("DynamaxCandies", "Dynamax Candies"),
+        .pluralName = _("Dynamax Candies"),
        .price = 0,
        .description = COMPOUND_STRING(
            "Raises the Dynamax\n"
@ -2486,8 +2480,8 @@ const struct Item gItemsInfo[] =
    [ITEM_MAX_MUSHROOMS] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("MaxMushrooms", "Max Mushrooms"),
+        .name = _("Max Mushrooms"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("MaxMushrooms", "Max Mushrooms"),
+        .pluralName = _("Max Mushrooms"),
        .price = 8000,
        .description = COMPOUND_STRING(
            "Raises every stat\n"
@ -2522,7 +2516,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GOLD_BOTTLE_CAP] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GoldBottlCap", "Gold Bottle Cap"),
+        .name = _("Gold Bottle Cap"),
        .price = (I_PRICE >= GEN_9) ? 60000 : 10000,
        .description = COMPOUND_STRING(
            "A beautiful bottle\n"
@ -2859,7 +2853,7 @@ const struct Item gItemsInfo[] =
    [ITEM_PRETTY_FEATHER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("PrettyFeather", "Pretty Feather"),
+        .name = _("Pretty Feather"),
        .price = (I_PRICE >= GEN_7) ? 1000 * TREASURE_FACTOR: 200,
        .description = COMPOUND_STRING(
            "A beautiful yet\n"
@ -2987,7 +2981,7 @@ const struct Item gItemsInfo[] =
    [ITEM_STRANGE_SOUVENIR] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("StrngeSouvnr", "Strange Souvenir"),
+        .name = _("Strange Souvenir"),
        .price = (I_PRICE >= GEN_7) ? 3000 : 10,
        .description = COMPOUND_STRING(
            "An ornament that\n"
@ -3205,7 +3199,7 @@ const struct Item gItemsInfo[] =
    [ITEM_FOSSILIZED_BIRD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedBird", "Fossilized Bird"),
+        .name = _("Fossilized Bird"),
        .price = 5000,
        .description = COMPOUND_STRING(
            "A fossil of an\n"
@ -3221,8 +3215,8 @@ const struct Item gItemsInfo[] =
    [ITEM_FOSSILIZED_FISH] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedFish", "Fossilized Fish"),
+        .name = _("Fossilized Fish"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("FosslzedFishes", "Fossilized Fishes"),
+        .pluralName = _("Fossilized Fishes"),
        .price = 5000,
        .description = sFossilizedFishDesc,
        .pocket = POCKET_ITEMS,
@ -3235,7 +3229,7 @@ const struct Item gItemsInfo[] =
    [ITEM_FOSSILIZED_DRAKE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedDrke", "Fossilized Drake"),
+        .name = _("Fossilized Drake"),
        .price = 5000,
        .description = COMPOUND_STRING(
            "A fossil of an\n"
@ -3251,7 +3245,7 @@ const struct Item gItemsInfo[] =
    [ITEM_FOSSILIZED_DINO] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedDino", "Fossilized Dino"),
+        .name = _("Fossilized Dino"),
        .price = 5000,
        .description = sFossilizedFishDesc,
        .pocket = POCKET_ITEMS,
@ -3376,8 +3370,8 @@ const struct Item gItemsInfo[] =
    [ITEM_SURPRISE_MULCH] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("SurprseMulch", "Surprise Mulch"),
+        .name = _("Surprise Mulch"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("SurprseMulch", "Surprise Mulch"),
+        .pluralName = _("Surprise Mulch"),
        .price = 200,
 #if OW_BERRY_MULCH_USAGE == TRUE
        .description = COMPOUND_STRING(
@ -3474,7 +3468,7 @@ const struct Item gItemsInfo[] =
    [ITEM_YELLOW_APRICORN] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("YellwApricorn", "Yellow Apricorn"),
+        .name = _("Yellow Apricorn"),
        .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200),
        .description = COMPOUND_STRING(
            "A yellow apricorn.\n"
@ -3489,7 +3483,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GREEN_APRICORN] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GreenApricorn", "Green Apricorn"),
+        .name = _("Green Apricorn"),
        .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200),
        .description = COMPOUND_STRING(
            "A green apricorn.\n"
@ -3519,7 +3513,7 @@ const struct Item gItemsInfo[] =
    [ITEM_WHITE_APRICORN] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("WhiteApricorn", "White Apricorn"),
+        .name = _("White Apricorn"),
        .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200),
        .description = COMPOUND_STRING(
            "A white apricorn.\n"
@ -3534,7 +3528,7 @@ const struct Item gItemsInfo[] =
    [ITEM_BLACK_APRICORN] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("BlackApricorn", "Black Apricorn"),
+        .name = _("Black Apricorn"),
        .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200),
        .description = COMPOUND_STRING(
            "A black apricorn.\n"
@ -3549,7 +3543,7 @@ const struct Item gItemsInfo[] =
    [ITEM_WISHING_PIECE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("WishingPiece", "Wishing Piece"),
+        .name = _("Wishing Piece"),
        .price = 20,
        .description = COMPOUND_STRING(
            "Throw into a\n"
@ -3565,7 +3559,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GALARICA_TWIG] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GalaricaTwig", "Galarica Twig"),
+        .name = _("Galarica Twig"),
        .price = 20 * TREASURE_FACTOR,
        .description = COMPOUND_STRING(
            "A twig from a tree\n"
@ -4025,7 +4019,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GALARICA_CUFF] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GalaricaCuff", "Galarica Cuff"),
+        .name = _("Galarica Cuff"),
        .price = (I_PRICE >= GEN_9) ? 3000 : 6000,
        .description = COMPOUND_STRING(
            "A cuff from Galar\n"
@ -4042,8 +4036,8 @@ const struct Item gItemsInfo[] =
    [ITEM_GALARICA_WREATH] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GalrcaWreath", "Galarica Wreath"),
+        .name = _("Galarica Wreath"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("GalrcaWreathes", "Galarica Wreathes"),
+        .pluralName = _("Galarica Wreathes"),
        .price = (I_PRICE >= GEN_9) ? 3000 : 6000,
        .description = COMPOUND_STRING(
            "A wreath made in\n"
@ -4251,7 +4245,7 @@ const struct Item gItemsInfo[] =
    [ITEM_STRAWBERRY_SWEET] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("StrwbrySweet", "Strawberry Sweet"),
+        .name = _("Strawberry Sweet"),
        .price = 500 * TREASURE_FACTOR,
        .description = COMPOUND_STRING(
            "Strawberry-shaped\n"
@ -4879,8 +4873,8 @@ const struct Item gItemsInfo[] =
    [ITEM_ELECTRIC_MEMORY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ElectrcMemory", "Electric Memory"),
+        .name = _("Electric Memory"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("ElectrcMemories", "Electric Memories"),
+        .pluralName = _("Electric Memories"),
        .price = 1000,
        .holdEffect = HOLD_EFFECT_MEMORY,
        .holdEffectParam = 0,
@ -4939,8 +4933,8 @@ const struct Item gItemsInfo[] =
    [ITEM_FIGHTING_MEMORY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FightngMemory", "Fighting Memory"),
+        .name = _("Fighting Memory"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("FightngMemories", "Fighting Memories"),
+        .pluralName = _("Fighting Memories"),
        .price = 1000,
        .holdEffect = HOLD_EFFECT_MEMORY,
        .holdEffectParam = 0,
@ -5019,8 +5013,8 @@ const struct Item gItemsInfo[] =
    [ITEM_PSYCHIC_MEMORY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("PsychicMemory", "Psychic Memory"),
+        .name = _("Psychic Memory"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("PsychicMemories", "Psychic Memories"),
+        .pluralName = _("Psychic Memories"),
        .price = 1000,
        .holdEffect = HOLD_EFFECT_MEMORY,
        .holdEffectParam = 0,
@ -5179,7 +5173,7 @@ const struct Item gItemsInfo[] =
    [ITEM_RUSTED_SWORD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("RustedSword", "Rusted Sword"),
+        .name = _("Rusted Sword"),
        .price = 0,
        .description = COMPOUND_STRING(
            "A rusty sword. A\n"
@ -5194,7 +5188,7 @@ const struct Item gItemsInfo[] =
    [ITEM_RUSTED_SHIELD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("RustedShield", "Rusted Shield"),
+        .name = _("Rusted Shield"),
        .price = 0,
        .description = COMPOUND_STRING(
            "A rusty shield. A\n"
@ -5262,7 +5256,7 @@ const struct Item gItemsInfo[] =
    [ITEM_CHARIZARDITE_X] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("CharizarditeX", "Charizardite X"),
+        .name = _("Charizardite X"),
        .pluralName = _("Charizardites X"),
        .price = 0,
        .holdEffect = HOLD_EFFECT_MEGA_STONE,
@ -5277,7 +5271,7 @@ const struct Item gItemsInfo[] =
    [ITEM_CHARIZARDITE_Y] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("CharizarditeY", "Charizardite Y"),
+        .name = _("Charizardite Y"),
        .pluralName = _("Charizardites Y"),
        .price = 0,
        .holdEffect = HOLD_EFFECT_MEGA_STONE,
@ -6942,7 +6936,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ULTRANECROZIUM_Z] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("U-Necrozium Z", "Ultranecrozium Z"),
+        .name = _("Ultranecrozium Z"),
        .price = 0,
        .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
        .description = COMPOUND_STRING(
@ -7066,7 +7060,7 @@ const struct Item gItemsInfo[] =
    [ITEM_DEEP_SEA_SCALE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("DeepSeaScale", "Deep Sea Scale"),
+        .name = _("Deep Sea Scale"),
        .price = (I_PRICE >= GEN_7) ? 2000 : 200,
        .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE,
        .description = COMPOUND_STRING(
@ -7084,7 +7078,7 @@ const struct Item gItemsInfo[] =
    [ITEM_DEEP_SEA_TOOTH] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("DeepSeaTooth", "Deep Sea Tooth"),
+        .name = _("Deep Sea Tooth"),
        .pluralName = _("Deep Sea Teeth"),
        .price = (I_PRICE >= GEN_7) ? 2000 : 200,
        .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH,
@ -7631,8 +7625,8 @@ const struct Item gItemsInfo[] =
    [ITEM_NEVER_MELT_ICE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Never-MeltIce", "Never-Melt Ice"),
+        .name = _("Never-Melt Ice"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("Never-MeltIce", "Never-Melt Ice"),
+        .pluralName = _("Never-Melt Ice"),
        .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100),
        .holdEffect = HOLD_EFFECT_ICE_POWER,
        .holdEffectParam = TYPE_BOOST_PARAM,
@ -8921,8 +8915,8 @@ const struct Item gItemsInfo[] =
    [ITEM_WEAKNESS_POLICY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("WeaknssPolicy", "Weakness Policy"),
+        .name = _("Weakness Policy"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("WeaknssPolicies", "Weakness Policies"),
+        .pluralName = _("Weakness Policies"),
        .price = (I_PRICE >= GEN_9) ? 50000 : 1000,
        .holdEffect = HOLD_EFFECT_WEAKNESS_POLICY,
        .holdEffectParam = 0,
@ -8958,8 +8952,8 @@ const struct Item gItemsInfo[] =
    [ITEM_SAFETY_GOGGLES] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("SafetyGoggles", "Safety Goggles"),
+        .name = _("Safety Goggles"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("SafetyGoggles", "Safety Goggles"),
+        .pluralName = _("Safety Goggles"),
        .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 1000),
        .holdEffect = HOLD_EFFECT_SAFETY_GOGGLES,
        .description = COMPOUND_STRING(
@ -8976,7 +8970,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ADRENALINE_ORB] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("AdrenalineOrb", "Adrenaline Orb"),
+        .name = _("Adrenaline Orb"),
        .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_8) ? 4000 : 300),
        .holdEffect = HOLD_EFFECT_ADRENALINE_ORB,
        .description = COMPOUND_STRING(
@ -8993,7 +8987,7 @@ const struct Item gItemsInfo[] =
    [ITEM_TERRAIN_EXTENDER] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("TerainExtendr", "Terrain Extender"),
+        .name = _("Terrain Extender"),
        .price = (I_PRICE >= GEN_9) ? 15000 : 4000,
        .holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER,
        .description = COMPOUND_STRING(
@ -9010,8 +9004,8 @@ const struct Item gItemsInfo[] =
    [ITEM_PROTECTIVE_PADS] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ProtectvePads", "Protective Pads"),
+        .name = _("Protective Pads"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("ProtectvePads", "Protective Pads"),
+        .pluralName = _("Protective Pads"),
        .price = (I_PRICE >= GEN_9) ? 15000 : 4000,
        .holdEffect = HOLD_EFFECT_PROTECTIVE_PADS,
        .description = COMPOUND_STRING(
@ -9062,8 +9056,8 @@ const struct Item gItemsInfo[] =
    [ITEM_HEAVY_DUTY_BOOTS] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Heavy-DtyBts", "Heavy-Duty Boots"),
+        .name = _("Heavy-Duty Boots"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("Heavy-DtyBts", "Heavy-Duty Boots"),
+        .pluralName = _("Heavy-Duty Boots"),
        .price = (I_PRICE >= GEN_9) ? 20000 : 4000,
        .holdEffect = HOLD_EFFECT_HEAVY_DUTY_BOOTS,
        .description = COMPOUND_STRING(
@ -9080,8 +9074,8 @@ const struct Item gItemsInfo[] =
    [ITEM_BLUNDER_POLICY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("BlundrPolicy", "Blunder Policy"),
+        .name = _("Blunder Policy"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("BlundrPolicies", "Blunder Policies"),
+        .pluralName = _("Blunder Policies"),
        .price = (I_PRICE >= GEN_9) ? 30000 : 4000,
        .holdEffect = HOLD_EFFECT_BLUNDER_POLICY,
        .description = COMPOUND_STRING(
@ -9115,7 +9109,7 @@ const struct Item gItemsInfo[] =
    [ITEM_UTILITY_UMBRELLA] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("UtltyUmbrlla", "Utility Umbrella"),
+        .name = _("Utility Umbrella"),
        .price = (I_PRICE >= GEN_9) ? 15000 : 4000,
        .holdEffect = HOLD_EFFECT_UTILITY_UMBRELLA,
        .description = COMPOUND_STRING(
@ -11910,7 +11904,7 @@ const struct Item gItemsInfo[] =
    [ITEM_CATCHING_CHARM] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("CatchngCharm", "Catching Charm"),
+        .name = _("Catching Charm"),
        .price = 0,
        .importance = 1,
        .description = COMPOUND_STRING(
@ -11944,7 +11938,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ROTOM_CATALOG] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("RotomCatalog", "Rotom Catalog"),
+        .name = _("Rotom Catalog"),
        .price = 0,
        .importance = 1,
        .description = COMPOUND_STRING(
@ -12074,8 +12068,8 @@ const struct Item gItemsInfo[] =
    [ITEM_REINS_OF_UNITY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ReinsOfUnity", "Reins of Unity"),
+        .name = _("Reins of Unity"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("ReinsOfUnity", "Reins of Unity"),
+        .pluralName = _("Reins of Unity"),
        .price = 0,
        .importance = 1,
        .description = COMPOUND_STRING(
@ -12243,7 +12237,7 @@ const struct Item gItemsInfo[] =
    [ITEM_DOWSING_MACHINE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Dowsing MCHN", "Dowsing Machine"),
+        .name = _("Dowsing Machine"),
        .price = 0,
        .description = COMPOUND_STRING(
            "A device that\n"
@ -12985,7 +12979,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ABILITY_SHIELD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("AbilityShield", "Ability Shield"),
+        .name = _("Ability Shield"),
        .price = 20000,
        .holdEffect = HOLD_EFFECT_ABILITY_SHIELD,
        .description = COMPOUND_STRING(
@ -13021,7 +13015,7 @@ const struct Item gItemsInfo[] =
    [ITEM_PUNCHING_GLOVE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("PunchingGlove", "Punching Glove"),
+        .name = _("Punching Glove"),
        .price = 15000,
        .holdEffect = HOLD_EFFECT_PUNCHING_GLOVE,
        .description = COMPOUND_STRING(
@ -13073,7 +13067,7 @@ const struct Item gItemsInfo[] =
    [ITEM_AUSPICIOUS_ARMOR] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("AuspciousArmr", "Auspicious Armor"),
+        .name = _("Auspicious Armor"),
        .price = 3000,
        .description = COMPOUND_STRING(
            "Armor inhabited by\n"
@ -13090,8 +13084,8 @@ const struct Item gItemsInfo[] =
    [ITEM_BOOSTER_ENERGY] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("BoosterEnergy", "Booster Energy"),
+        .name = _("Booster Energy"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("BoosterEnergies", "Booster Energies"),
+        .pluralName = _("Booster Energies"),
        .price = 0,
        .holdEffect = HOLD_EFFECT_BOOSTER_ENERGY,
        .description = COMPOUND_STRING(
@ -13108,7 +13102,7 @@ const struct Item gItemsInfo[] =
    [ITEM_BIG_BAMBOO_SHOOT] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("BigBmbooShoot", "Big Bamboo Shoot"),
+        .name = _("Big Bamboo Shoot"),
        .price = 3000,
        .description = COMPOUND_STRING(
            "A large and rare\n"
@ -13124,7 +13118,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GIMMIGHOUL_COIN] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GimighoulCoin", "Gimmighoul Coin"),
+        .name = _("Gimmighoul Coin"),
        .price = 400,
        .description = COMPOUND_STRING(
            "Gimmighoul hoard\n"
@ -13139,7 +13133,7 @@ const struct Item gItemsInfo[] =
    [ITEM_LEADERS_CREST] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Leader'sCrest", "Leader's Crest"),
+        .name = _("Leader's Crest"),
        .price = 3000,
        .description = COMPOUND_STRING(
            "A shard of an old\n"
@ -13154,7 +13148,7 @@ const struct Item gItemsInfo[] =
    [ITEM_MALICIOUS_ARMOR] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("MaliciousArmr", "Malicious Armor"),
+        .name = _("Malicious Armor"),
        .price = 3000,
        .description = COMPOUND_STRING(
            "Armor inhabited by\n"
@ -13188,8 +13182,8 @@ const struct Item gItemsInfo[] =
    [ITEM_SCROLL_OF_DARKNESS] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ScrllOfDrknss", "Scroll of Darkness"),
+        .name = _("Scroll of Darkness"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("ScrllsOfDrknss", "Scrolls of Darkness"),
+        .pluralName = _("Scrolls of Darkness"),
        .price = 0,
        .description = COMPOUND_STRING(
            "A peculiar scroll\n"
@ -13206,8 +13200,8 @@ const struct Item gItemsInfo[] =
    [ITEM_SCROLL_OF_WATERS] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ScrollOfWatrs", "Scroll of Waters"),
+        .name = _("Scroll of Waters"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("ScrollsOfWatrs", "Scrolls of Waters"),
+        .pluralName = _("Scrolls of Waters"),
        .price = 0,
        .description = COMPOUND_STRING(
            "A peculiar scroll\n"
@ -13240,7 +13234,7 @@ const struct Item gItemsInfo[] =
    [ITEM_TINY_BAMBOO_SHOOT] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("TinyBmbooShot", "Tiny Bamboo Shoot"),
+        .name = _("Tiny Bamboo Shoot"),
        .price = 750,
        .description = COMPOUND_STRING(
            "A small and rare\n"
@ -13256,7 +13250,7 @@ const struct Item gItemsInfo[] =
    [ITEM_BUG_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Bug TeraShard", "Bug Tera Shard"),
+        .name = _("Bug Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13268,7 +13262,7 @@ const struct Item gItemsInfo[] =
    [ITEM_DARK_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("DarkTeraShard", "Dark Tera Shard"),
+        .name = _("Dark Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13280,7 +13274,7 @@ const struct Item gItemsInfo[] =
    [ITEM_DRAGON_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("DragnTeraShrd", "Dragon Tera Shard"),
+        .name = _("Dragon Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13292,7 +13286,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ELECTRIC_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("EltrcTeraShrd", "Electric Tera Shard"),
+        .name = _("Electric Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13304,7 +13298,7 @@ const struct Item gItemsInfo[] =
    [ITEM_FAIRY_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FairyTeraShrd", "Fairy Tera Shard"),
+        .name = _("Fairy Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13316,7 +13310,7 @@ const struct Item gItemsInfo[] =
    [ITEM_FIGHTING_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FghtngTerShrd", "Fighting Tera Shard"),
+        .name = _("Fighting Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13328,7 +13322,7 @@ const struct Item gItemsInfo[] =
    [ITEM_FIRE_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FireTeraShard", "Fire Tera Shard"),
+        .name = _("Fire Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13340,7 +13334,7 @@ const struct Item gItemsInfo[] =
    [ITEM_FLYING_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FlyngTeraShrd", "Flying Tera Shard"),
+        .name = _("Flying Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13352,7 +13346,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GHOST_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GhostTeraShrd", "Ghost Tera Shard"),
+        .name = _("Ghost Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13364,7 +13358,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GRASS_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GrassTeraShrd", "Grass Tera Shard"),
+        .name = _("Grass Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13376,7 +13370,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GROUND_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GrondTeraShrd", "Ground Tera Shard"),
+        .name = _("Ground Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13388,7 +13382,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ICE_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("Ice TeraShard", "Ice Tera Shard"),
+        .name = _("Ice Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13400,7 +13394,7 @@ const struct Item gItemsInfo[] =
    [ITEM_NORMAL_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("NormlTeraShrd", "Normal Tera Shard"),
+        .name = _("Normal Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13412,7 +13406,7 @@ const struct Item gItemsInfo[] =
    [ITEM_POISON_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("PoisnTeraShrd", "Poison Tera Shard"),
+        .name = _("Poison Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13424,7 +13418,7 @@ const struct Item gItemsInfo[] =
    [ITEM_PSYCHIC_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("PschcTeraShrd", "Psychic Tera Shard"),
+        .name = _("Psychic Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13436,7 +13430,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ROCK_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("RockTeraShard", "Rock Tera Shard"),
+        .name = _("Rock Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13448,7 +13442,7 @@ const struct Item gItemsInfo[] =
    [ITEM_STEEL_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("SteelTeraShrd", "Steel Tera Shard"),
+        .name = _("Steel Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13460,7 +13454,7 @@ const struct Item gItemsInfo[] =
    [ITEM_WATER_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("WaterTeraShrd", "Water Tera Shard"),
+        .name = _("Water Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13472,7 +13466,7 @@ const struct Item gItemsInfo[] =
    [ITEM_ADAMANT_CRYSTAL] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("AdamantCrystl", "Adamant Crystal"),
+        .name = _("Adamant Crystal"),
        .price = 0,
        .description = COMPOUND_STRING(
            "A large, glowing gem\n"
@ -13504,7 +13498,7 @@ const struct Item gItemsInfo[] =
    [ITEM_LUSTROUS_GLOBE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("LustrousGlobe", "Lustrous Globe"),
+        .name = _("Lustrous Globe"),
        .price = 0,
        .description = COMPOUND_STRING(
            "A large, glowing gem\n"
@ -13520,7 +13514,7 @@ const struct Item gItemsInfo[] =
    [ITEM_BLACK_AUGURITE] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("BlackAugurite", "Black Augurite"),
+        .name = _("Black Augurite"),
        .price = 8000,
        .description = COMPOUND_STRING(
            "A black stone that\n"
@ -13623,7 +13617,7 @@ const struct Item gItemsInfo[] =
    [ITEM_UNREMARKABLE_TEACUP] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("UnrmkblTeacup", "Unremarkable Teacup"),
+        .name = _("Unremarkable Teacup"),
        .price = 1600,
        .description = COMPOUND_STRING(
            "A cracked teacup\n"
@ -13640,7 +13634,7 @@ const struct Item gItemsInfo[] =
    [ITEM_MASTERPIECE_TEACUP] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("MstrpceTeacup", "Masterpiece Teacup"),
+        .name = _("Masterpiece Teacup"),
        .price = 38000,
        .description = COMPOUND_STRING(
            "A chipped teacup\n"
@ -13657,7 +13651,7 @@ const struct Item gItemsInfo[] =
    [ITEM_CORNERSTONE_MASK] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("CornrstneMask", "Cornerstone Mask"),
+        .name = _("Cornerstone Mask"),
        .price = 0,
        .description = COMPOUND_STRING(
            "Allows Ogerpon to\n"
@ -13672,7 +13666,7 @@ const struct Item gItemsInfo[] =
    [ITEM_WELLSPRING_MASK] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("WellsprngMask", "Wellspring Mask"),
+        .name = _("Wellspring Mask"),
        .price = 0,
        .description = COMPOUND_STRING(
            "Allows Ogerpon to\n"
@ -13687,7 +13681,7 @@ const struct Item gItemsInfo[] =
    [ITEM_HEARTHFLAME_MASK] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("HrthflameMask", "Hearthflame Mask"),
+        .name = _("Hearthflame Mask"),
        .price = 0,
        .description = COMPOUND_STRING(
            "Allows Ogerpon to\n"
@ -13792,8 +13786,8 @@ const struct Item gItemsInfo[] =
    [ITEM_FRESH_START_MOCHI] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("FrshStrtMochi", "Fresh Start Mochi"),
+        .name = _("Fresh Start Mochi"),
-        .pluralName = HANDLE_EXPANDED_ITEM_NAME("FrshStrtMochi", "Fresh Start Mochi"),
+        .pluralName = _("Fresh Start Mochi"),
        .price = 300,
        .description = COMPOUND_STRING(
            "An item that resets\n"
@ -13810,7 +13804,7 @@ const struct Item gItemsInfo[] =
    [ITEM_GLIMMERING_CHARM] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("GlmmringCharm", "Glimmering Charm"),
+        .name = _("Glimmering Charm"),
        .price = 0,
        .importance = 1,
        .description = COMPOUND_STRING(
@ -13842,7 +13836,7 @@ const struct Item gItemsInfo[] =
    [ITEM_STELLAR_TERA_SHARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("StllrTeraShrd", "Stellar Tera Shard"),
+        .name = _("Stellar Tera Shard"),
        .price = 0,
        .description = sTeraShardDesc,
        .pocket = POCKET_ITEMS,
@ -13854,7 +13848,7 @@ const struct Item gItemsInfo[] =
    [ITEM_JUBILIFE_MUFFIN] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("JublifeMuffin", "Jubilife Muffin"),
+        .name = _("Jubilife Muffin"),
        .price = 250,
        .description = sFullHealDesc,
        .pocket = POCKET_ITEMS,
@ -13996,7 +13990,7 @@ const struct Item gItemsInfo[] =
    [ITEM_AUX_POWERGUARD] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("AuxPowerguard", "Aux Powerguard"),
+        .name = _("Aux Powerguard"),
        .price = 1200,
        .holdEffectParam = X_ITEM_STAGES,
        .description = COMPOUND_STRING(
@ -14019,7 +14013,7 @@ const struct Item gItemsInfo[] =
    [ITEM_CHOICE_DUMPLING] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("ChoiceDumplng", "Choice Dumpling"),
+        .name = _("Choice Dumpling"),
        .price = 1200,
        .description = sQuestionMarksDesc,
        .pocket = POCKET_ITEMS,
@ -14045,7 +14039,7 @@ const struct Item gItemsInfo[] =
    [ITEM_TWICE_SPICED_RADISH] =
    {
-        .name = HANDLE_EXPANDED_ITEM_NAME("2xSpicedRadsh", "Twice-Spiced Radish"),
+        .name = _("Twice-Spiced Radish"),
        .price = 1600,
        .description = sQuestionMarksDesc,
        .pocket = POCKET_ITEMS,
--- a/src/data/moves_info.h
+++ b/src/data/moves_info.h
--- a/src/data/pokemon/species_info.h
+++ b/src/data/pokemon/species_info.h
@ -60,12 +60,6 @@
 #define FLIP    0
 #define NO_FLIP 1
 #if POKEMON_NAME_LENGTH >= 12
 #define HANDLE_EXPANDED_SPECIES_NAME(_name, ...) _(DEFAULT(_name, __VA_ARGS__))
 #else
 #define HANDLE_EXPANDED_SPECIES_NAME(_name, ...) _(_name)
 #endif
 const struct SpeciesInfo gSpeciesInfo[] =
 {
    [SPECIES_NONE] =
--- a/src/data/pokemon/species_info/gen_2_families.h
+++ b/src/data/pokemon/species_info/gen_2_families.h
@ -3913,7 +3913,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
        .abilities = { ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED },
        .bodyColor = BODY_COLOR_YELLOW,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Dudunsprce", "Dudunsparce"),
+        .speciesName = _("Dudunsparce"),
        .cryId = CRY_DUDUNSPARCE,
        .natDexNum = NATIONAL_DEX_DUDUNSPARCE,
        .categoryName = _("Land Snake"),
@ -3966,7 +3966,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD),
        .abilities = { ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED },
        .bodyColor = BODY_COLOR_YELLOW,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Dudunsprce", "Dudunsparce"),
+        .speciesName = _("Dudunsparce"),
        .cryId = CRY_DUDUNSPARCE,
        .natDexNum = NATIONAL_DEX_DUDUNSPARCE,
        .categoryName = _("Land Snake"),
--- a/src/data/pokemon/species_info/gen_5_families.h
+++ b/src/data/pokemon/species_info/gen_5_families.h
@ -3989,7 +3989,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2),
        .abilities = { ABILITY_SWIFT_SWIM, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Bsculegion", "Basculegion"),
+        .speciesName = _("Basculegion"),
        .cryId = CRY_BASCULEGION,
        .natDexNum = NATIONAL_DEX_BASCULEGION,
        .categoryName = _("Big Fish"),
@ -4051,7 +4051,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2),
        .abilities = { ABILITY_SWIFT_SWIM, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Bsculegion", "Basculegion"),
+        .speciesName = _("Basculegion"),
        .cryId = CRY_BASCULEGION,
        .natDexNum = NATIONAL_DEX_BASCULEGION,
        .categoryName = _("Big Fish"),
--- a/src/data/pokemon/species_info/gen_6_families.h
+++ b/src/data/pokemon/species_info/gen_6_families.h
@ -876,7 +876,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
        .abilities = { ABILITY_FLAME_BODY, ABILITY_NONE, ABILITY_GALE_WINGS },
        .bodyColor = BODY_COLOR_RED,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Flechinder", "Fletchinder"),
+        .speciesName = _("Fletchinder"),
        .cryId = CRY_FLETCHINDER,
        .natDexNum = NATIONAL_DEX_FLETCHINDER,
        .categoryName = _("Ember"),
--- a/src/data/pokemon/species_info/gen_7_families.h
+++ b/src/data/pokemon/species_info/gen_7_families.h
@ -1327,7 +1327,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_3),
        .abilities = { ABILITY_HYPER_CUTTER, ABILITY_IRON_FIST, ABILITY_ANGER_POINT },
        .bodyColor = BODY_COLOR_WHITE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Crabminabl", "Crabominable"),
+        .speciesName = _("Crabominable"),
        .cryId = CRY_CRABOMINABLE,
        .natDexNum = NATIONAL_DEX_CRABOMINABLE,
        .categoryName = _("Woolly Crab"),
@ -6778,7 +6778,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
        .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_WHITE,
        .noFlip = TRUE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Blacephaln", "Blacephalon"),
+        .speciesName = _("Blacephalon"),
        .cryId = CRY_BLACEPHALON,
        .natDexNum = NATIONAL_DEX_BLACEPHALON,
        .categoryName = _("Fireworks"),
--- a/src/data/pokemon/species_info/gen_8_families.h
+++ b/src/data/pokemon/species_info/gen_8_families.h
@ -938,7 +938,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
        .abilities = { ABILITY_KEEN_EYE, ABILITY_UNNERVE, ABILITY_BIG_PECKS },
        .bodyColor = BODY_COLOR_BLUE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Corvisquir", "Corvisquire"),
+        .speciesName = _("Corvisquire"),
        .cryId = CRY_CORVISQUIRE,
        .natDexNum = NATIONAL_DEX_CORVISQUIRE,
        .categoryName = _("Raven"),
@ -1000,7 +1000,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
        .abilities = { ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR },
        .bodyColor = BODY_COLOR_PURPLE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Corviknigh", "Corviknight"),
+        .speciesName = _("Corviknight"),
        .cryId = CRY_CORVIKNIGHT,
        .natDexNum = NATIONAL_DEX_CORVIKNIGHT,
        .categoryName = _("Raven"),
@ -3117,7 +3117,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2),
        .abilities = { ABILITY_SWIFT_SWIM, ABILITY_NONE, ABILITY_PROPELLER_TAIL },
        .bodyColor = BODY_COLOR_BROWN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Barraskewd", "Barraskewda"),
+        .speciesName = _("Barraskewda"),
        .cryId = CRY_BARRASKEWDA,
        .natDexNum = NATIONAL_DEX_BARRASKEWDA,
        .categoryName = _("Skewer"),
@ -3542,7 +3542,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG),
        .abilities = { ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY },
        .bodyColor = BODY_COLOR_RED,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Centiskorc", "Centiskorch"),
+        .speciesName = _("Centiskorch"),
        .cryId = CRY_CENTISKORCH,
        .natDexNum = NATIONAL_DEX_CENTISKORCH,
        .categoryName = _("Radiator"),
@ -3911,7 +3911,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),
        .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY },
        .bodyColor = BODY_COLOR_PURPLE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Polteageis", "Polteageist"),
+        .speciesName = _("Polteageist"),
        .cryId = CRY_POLTEAGEIST,
        .natDexNum = NATIONAL_DEX_POLTEAGEIST,
        .categoryName = _("Black Tea"),
@ -3972,7 +3972,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),
        .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY },
        .bodyColor = BODY_COLOR_PURPLE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Polteageis", "Polteageist"),
+        .speciesName = _("Polteageist"),
        .cryId = CRY_POLTEAGEIST,
        .natDexNum = NATIONAL_DEX_POLTEAGEIST,
        .categoryName = _("Black Tea"),
@ -5007,7 +5007,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL),
        .abilities = { ABILITY_POWER_SPOT, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_GRAY,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Stonjourne", "Stonjourner"),
+        .speciesName = _("Stonjourner"),
        .cryId = CRY_STONJOURNER,
        .natDexNum = NATIONAL_DEX_STONJOURNER,
        .categoryName = _("Big Rock"),
--- a/src/data/pokemon/species_info/gen_9_families.h
+++ b/src/data/pokemon/species_info/gen_9_families.h
@ -130,7 +130,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_GRASS),
        .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_PROTEAN },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Meowscarad", "Meowscarada"),
+        .speciesName = _("Meowscarada"),
        .cryId = CRY_MEOWSCARADA,
        .natDexNum = NATIONAL_DEX_MEOWSCARADA,
        .categoryName = _("Magician"),
@ -1476,7 +1476,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
        .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Sqawkabily", "Squawkabilly"),
+        .speciesName = _("Squawkabilly"),
        .cryId = CRY_SQUAWKABILLY,
        .natDexNum = NATIONAL_DEX_SQUAWKABILLY,
        .categoryName = _("Parrot"),
@ -1530,7 +1530,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
        .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS },
        .bodyColor = BODY_COLOR_BLUE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Sqawkabily", "Squawkabilly"),
+        .speciesName = _("Squawkabilly"),
        .cryId = CRY_SQUAWKABILLY,
        .natDexNum = NATIONAL_DEX_SQUAWKABILLY,
        .categoryName = _("Parrot"),
@ -1584,7 +1584,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
        .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE },
        .bodyColor = BODY_COLOR_YELLOW,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Sqawkabily", "Squawkabilly"),
+        .speciesName = _("Squawkabilly"),
        .cryId = CRY_SQUAWKABILLY,
        .natDexNum = NATIONAL_DEX_SQUAWKABILLY,
        .categoryName = _("Parrot"),
@ -1638,7 +1638,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING),
        .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE },
        .bodyColor = BODY_COLOR_WHITE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Sqawkabily", "Squawkabilly"),
+        .speciesName = _("Squawkabilly"),
        .cryId = CRY_SQUAWKABILLY,
        .natDexNum = NATIONAL_DEX_SQUAWKABILLY,
        .categoryName = _("Parrot"),
@ -2179,7 +2179,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING),
        .abilities = { ABILITY_WIND_POWER, ABILITY_VOLT_ABSORB, ABILITY_COMPETITIVE },
        .bodyColor = BODY_COLOR_YELLOW,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Kilowatrel", "Kilowattrel"),
+        .speciesName = _("Kilowattrel"),
        .cryId = CRY_KILOWATTREL,
        .natDexNum = NATIONAL_DEX_KILOWATTREL,
        .categoryName = _("Frigatebird"),
@ -2503,7 +2503,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS),
        .abilities = { ABILITY_WIND_RIDER, ABILITY_NONE, ABILITY_INFILTRATOR },
        .bodyColor = BODY_COLOR_BROWN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Brmblghast", "Brambleghast"),
+        .speciesName = _("Brambleghast"),
        .cryId = CRY_BRAMBLEGHAST,
        .natDexNum = NATIONAL_DEX_BRAMBLEGHAST,
        .categoryName = _("Tumbleweed"),
@ -4464,7 +4464,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_PINK,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("ScreamTail", "Scream Tail"),
+        .speciesName = _("Scream Tail"),
        .cryId = CRY_SCREAM_TAIL,
        .natDexNum = NATIONAL_DEX_SCREAM_TAIL,
        .categoryName = _("Paradox"),
@ -4520,7 +4520,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_WHITE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("BruteBonet", "Brute Bonnet"),
+        .speciesName = _("Brute Bonnet"),
        .cryId = CRY_BRUTE_BONNET,
        .natDexNum = NATIONAL_DEX_BRUTE_BONNET,
        .categoryName = _("Paradox"),
@ -4578,7 +4578,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_GRAY,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("FluttrMane", "Flutter Mane"),
+        .speciesName = _("Flutter Mane"),
        .cryId = CRY_FLUTTER_MANE,
        .natDexNum = NATIONAL_DEX_FLUTTER_MANE,
        .categoryName = _("Paradox"),
@ -4635,7 +4635,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_WHITE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("SlithrWing", "Slither Wing"),
+        .speciesName = _("Slither Wing"),
        .cryId = CRY_SLITHER_WING,
        .natDexNum = NATIONAL_DEX_SLITHER_WING,
        .categoryName = _("Paradox"),
@ -4690,7 +4690,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_GRAY,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("SndyShocks", "Sandy Shocks"),
+        .speciesName = _("Sandy Shocks"),
        .cryId = CRY_SANDY_SHOCKS,
        .natDexNum = NATIONAL_DEX_SANDY_SHOCKS,
        .categoryName = _("Paradox"),
@ -4746,7 +4746,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_GRAY,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("IronTreads", "Iron Treads"),
+        .speciesName = _("Iron Treads"),
        .cryId = CRY_IRON_TREADS,
        .natDexNum = NATIONAL_DEX_IRON_TREADS,
        .categoryName = _("Paradox"),
@ -4802,7 +4802,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_RED,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("IronBundle", "Iron Bundle"),
+        .speciesName = _("Iron Bundle"),
        .cryId = CRY_IRON_BUNDLE,
        .natDexNum = NATIONAL_DEX_IRON_BUNDLE,
        .categoryName = _("Paradox"),
@ -4914,7 +4914,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_BLUE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("IronJuguls", "Iron Jugulis"),
+        .speciesName = _("Iron Jugulis"),
        .cryId = CRY_IRON_JUGULIS,
        .natDexNum = NATIONAL_DEX_IRON_JUGULIS,
        .categoryName = _("Paradox"),
@ -5028,7 +5028,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("IronThorns", "Iron Thorns"),
+        .speciesName = _("Iron Thorns"),
        .cryId = CRY_IRON_THORNS,
        .natDexNum = NATIONAL_DEX_IRON_THORNS,
        .categoryName = _("Paradox"),
@ -5632,7 +5632,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_BLUE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("RoarngMoon", "Roaring Moon"),
+        .speciesName = _("Roaring Moon"),
        .cryId = CRY_ROARING_MOON,
        .natDexNum = NATIONAL_DEX_ROARING_MOON,
        .categoryName = _("Paradox"),
@ -5689,7 +5689,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_WHITE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("IronVliant", "Iron Valiant"),
+        .speciesName = _("Iron Valiant"),
        .cryId = CRY_IRON_VALIANT,
        .natDexNum = NATIONAL_DEX_IRON_VALIANT,
        .categoryName = _("Paradox"),
@ -5858,7 +5858,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_BLUE,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("WalkngWake", "Walking Wake"),
+        .speciesName = _("Walking Wake"),
        .cryId = CRY_WALKING_WAKE,
        .natDexNum = NATIONAL_DEX_WALKING_WAKE,
        .categoryName = _("Paradox"),
@ -5913,7 +5913,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("IronLeaves", "Iron Leaves"),
+        .speciesName = _("Iron Leaves"),
        .cryId = CRY_IRON_LEAVES,
        .natDexNum = NATIONAL_DEX_IRON_LEAVES,
        .categoryName = _("Paradox"),
@ -5967,7 +5967,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),
        .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Ptchageist", "Poltchageist"),
+        .speciesName = _("Poltchageist"),
        .cryId = CRY_POLTCHAGEIST,
        .natDexNum = NATIONAL_DEX_POLTCHAGEIST,
        .categoryName = _("Matcha"),
@ -6020,7 +6020,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),
        .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF },
        .bodyColor = BODY_COLOR_GREEN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Ptchageist", "Poltchageist"),
+        .speciesName = _("Poltchageist"),
        .cryId = CRY_POLTCHAGEIST,
        .natDexNum = NATIONAL_DEX_POLTCHAGEIST,
        .categoryName = _("Matcha"),
@ -6293,7 +6293,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_TOXIC_CHAIN, ABILITY_NONE, ABILITY_TECHNICIAN },
        .bodyColor = BODY_COLOR_BLACK,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("Fezndipiti", "Fezandipiti"),
+        .speciesName = _("Fezandipiti"),
        .cryId = CRY_FEZANDIPITI,
        .natDexNum = NATIONAL_DEX_FEZANDIPITI,
        .categoryName = _("Retainer"),
@ -6418,7 +6418,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_BROWN,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("GouginFire", "Gouging Fire"),
+        .speciesName = _("Gouging Fire"),
        .cryId = CRY_GOUGING_FIRE,
        .natDexNum = NATIONAL_DEX_GOUGING_FIRE,
        .categoryName = _("Paradox"),
@ -6474,7 +6474,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_YELLOW,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("RagingBolt", "Raging Bolt"),
+        .speciesName = _("Raging Bolt"),
        .cryId = CRY_RAGING_BOLT,
        .natDexNum = NATIONAL_DEX_RAGING_BOLT,
        .categoryName = _("Paradox"),
@ -6530,7 +6530,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
        .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED),
        .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE, ABILITY_NONE },
        .bodyColor = BODY_COLOR_GRAY,
-        .speciesName = HANDLE_EXPANDED_SPECIES_NAME("IronBouldr", "Iron Boulder"),
+        .speciesName = _("Iron Boulder"),
        .cryId = CRY_IRON_BOULDER,
        .natDexNum = NATIONAL_DEX_IRON_BOULDER,
        .categoryName = _("Paradox"),
--- a/src/data/types_info.h
+++ b/src/data/types_info.h
@ -40,12 +40,6 @@ const uq4_12_t gTypeEffectivenessTable[NUMBER_OF_MON_TYPES][NUMBER_OF_MON_TYPES]
 #undef ______
 #undef X
 #if B_EXPANDED_TYPE_NAMES == TRUE
 #define HANDLE_EXPANDED_TYPE_NAME(_name, ...) _(DEFAULT(_name, __VA_ARGS__))
 #else
 #define HANDLE_EXPANDED_TYPE_NAME(_name, ...) _(_name)
 #endif
 // .generic is large enough that the text for TYPE_ELECTRIC will exceed TEXT_BUFF_ARRAY_COUNT.
 // In this array there's commented-out data such as references to type-resist berries that would otherwise would go unused.
 // However, we figured this information would be useful for users that want to add their own types as a reminder of
@ -84,7 +78,7 @@ const struct TypeInfo gTypesInfo[NUMBER_OF_MON_TYPES] =
    },
    [TYPE_FIGHTING] =
    {
-        .name = HANDLE_EXPANDED_TYPE_NAME("Fight", "Fighting"),
+        .name = _("Fighting"),
        .generic = _("a FIGHTING move"),
        .palette = 13,
        .zMove = MOVE_ALL_OUT_PUMMELING,
@ -325,7 +319,7 @@ const struct TypeInfo gTypesInfo[NUMBER_OF_MON_TYPES] =
    },
    [TYPE_ELECTRIC] =
    {
-        .name = HANDLE_EXPANDED_TYPE_NAME("Electr", "Electric"),
+        .name = _("Electric"),
        .generic = _("an ELECTRIC move"),
        .palette = 13,
        .zMove = MOVE_GIGAVOLT_HAVOC,
@ -346,7 +340,7 @@ const struct TypeInfo gTypesInfo[NUMBER_OF_MON_TYPES] =
    },
    [TYPE_PSYCHIC] =
    {
-        .name = HANDLE_EXPANDED_TYPE_NAME("Psychc", "Psychic"),
+        .name = _("Psychic"),
        .generic = _("a PSYCHIC move"),
        .palette = 14,
        .zMove = MOVE_SHATTERED_PSYCHE,
@ -451,7 +445,7 @@ const struct TypeInfo gTypesInfo[NUMBER_OF_MON_TYPES] =
    },
    [TYPE_STELLAR] =
    {
-        .name = HANDLE_EXPANDED_TYPE_NAME("Stellr", "Stellar"),
+        .name = _("Stellar"),
        .generic = _("a STELLAR move"),
        .palette = 15,
        .zMove = MOVE_BREAKNECK_BLITZ,