From 25434b517924ef88b09f800fe8d63f02855eb1e1 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Mon, 9 Dec 2019 11:09:57 -0500 Subject: [PATCH 1/3] Change move names to CamelCase To match with Gen 4 and 5. "Vicegrip" was changed to "Vice Grip" in Gen 6 and then "Vise Grip" in Gen 8, so I changed it to "Vise Grip". --- src/data/text/move_names.h | 50 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 31b1997ea..708bc2500 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -3,15 +3,15 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_NONE] = _("-"), [MOVE_POUND] = _("Pound"), [MOVE_KARATE_CHOP] = _("Karate Chop"), - [MOVE_DOUBLE_SLAP] = _("Doubleslap"), + [MOVE_DOUBLE_SLAP] = _("DoubleSlap"), [MOVE_COMET_PUNCH] = _("Comet Punch"), [MOVE_MEGA_PUNCH] = _("Mega Punch"), [MOVE_PAY_DAY] = _("Pay Day"), [MOVE_FIRE_PUNCH] = _("Fire Punch"), [MOVE_ICE_PUNCH] = _("Ice Punch"), - [MOVE_THUNDER_PUNCH] = _("Thunderpunch"), + [MOVE_THUNDER_PUNCH] = _("ThunderPunch"), [MOVE_SCRATCH] = _("Scratch"), - [MOVE_VICE_GRIP] = _("Vicegrip"), + [MOVE_VICE_GRIP] = _("Vise Grip"), [MOVE_GUILLOTINE] = _("Guillotine"), [MOVE_RAZOR_WIND] = _("Razor Wind"), [MOVE_SWORDS_DANCE] = _("Swords Dance"), @@ -49,7 +49,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ROAR] = _("Roar"), [MOVE_SING] = _("Sing"), [MOVE_SUPERSONIC] = _("Supersonic"), - [MOVE_SONIC_BOOM] = _("Sonicboom"), + [MOVE_SONIC_BOOM] = _("SonicBoom"), [MOVE_DISABLE] = _("Disable"), [MOVE_ACID] = _("Acid"), [MOVE_EMBER] = _("Ember"), @@ -61,7 +61,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ICE_BEAM] = _("Ice Beam"), [MOVE_BLIZZARD] = _("Blizzard"), [MOVE_PSYBEAM] = _("Psybeam"), - [MOVE_BUBBLE_BEAM] = _("Bubblebeam"), + [MOVE_BUBBLE_BEAM] = _("BubbleBeam"), [MOVE_AURORA_BEAM] = _("Aurora Beam"), [MOVE_HYPER_BEAM] = _("Hyper Beam"), [MOVE_PECK] = _("Peck"), @@ -76,7 +76,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_LEECH_SEED] = _("Leech Seed"), [MOVE_GROWTH] = _("Growth"), [MOVE_RAZOR_LEAF] = _("Razor Leaf"), - [MOVE_SOLAR_BEAM] = _("Solarbeam"), + [MOVE_SOLAR_BEAM] = _("SolarBeam"), [MOVE_POISON_POWDER] = _("Poisonpowder"), [MOVE_STUN_SPORE] = _("Stun Spore"), [MOVE_SLEEP_POWDER] = _("Sleep Powder"), @@ -84,7 +84,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_STRING_SHOT] = _("String Shot"), [MOVE_DRAGON_RAGE] = _("Dragon Rage"), [MOVE_FIRE_SPIN] = _("Fire Spin"), - [MOVE_THUNDER_SHOCK] = _("Thundershock"), + [MOVE_THUNDER_SHOCK] = _("ThunderShock"), [MOVE_THUNDERBOLT] = _("Thunderbolt"), [MOVE_THUNDER_WAVE] = _("Thunder Wave"), [MOVE_THUNDER] = _("Thunder"), @@ -108,7 +108,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_RECOVER] = _("Recover"), [MOVE_HARDEN] = _("Harden"), [MOVE_MINIMIZE] = _("Minimize"), - [MOVE_SMOKESCREEN] = _("Smokescreen"), + [MOVE_SMOKESCREEN] = _("SmokeScreen"), [MOVE_CONFUSE_RAY] = _("Confuse Ray"), [MOVE_WITHDRAW] = _("Withdraw"), [MOVE_DEFENSE_CURL] = _("Defense Curl"), @@ -223,9 +223,9 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_PAIN_SPLIT] = _("Pain Split"), [MOVE_SACRED_FIRE] = _("Sacred Fire"), [MOVE_MAGNITUDE] = _("Magnitude"), - [MOVE_DYNAMIC_PUNCH] = _("Dynamicpunch"), + [MOVE_DYNAMIC_PUNCH] = _("DynamicPunch"), [MOVE_MEGAHORN] = _("Megahorn"), - [MOVE_DRAGON_BREATH] = _("Dragonbreath"), + [MOVE_DRAGON_BREATH] = _("DragonBreath"), [MOVE_BATON_PASS] = _("Baton Pass"), [MOVE_ENCORE] = _("Encore"), [MOVE_PURSUIT] = _("Pursuit"), @@ -245,8 +245,8 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_CRUNCH] = _("Crunch"), [MOVE_MIRROR_COAT] = _("Mirror Coat"), [MOVE_PSYCH_UP] = _("Psych Up"), - [MOVE_EXTREME_SPEED] = _("Extremespeed"), - [MOVE_ANCIENT_POWER] = _("Ancientpower"), + [MOVE_EXTREME_SPEED] = _("ExtremeSpeed"), + [MOVE_ANCIENT_POWER] = _("AncientPower"), [MOVE_SHADOW_BALL] = _("Shadow Ball"), [MOVE_FUTURE_SIGHT] = _("Future Sight"), [MOVE_ROCK_SMASH] = _("Rock Smash"), @@ -265,7 +265,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_MEMENTO] = _("Memento"), [MOVE_FACADE] = _("Facade"), [MOVE_FOCUS_PUNCH] = _("Focus Punch"), - [MOVE_SMELLING_SALT] = _("Smellingsalt"), + [MOVE_SMELLING_SALT] = _("SmellingSalt"), [MOVE_FOLLOW_ME] = _("Follow Me"), [MOVE_NATURE_POWER] = _("Nature Power"), [MOVE_CHARGE] = _("Charge"), @@ -297,7 +297,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_TAIL_GLOW] = _("Tail Glow"), [MOVE_LUSTER_PURGE] = _("Luster Purge"), [MOVE_MIST_BALL] = _("Mist Ball"), - [MOVE_FEATHER_DANCE] = _("Featherdance"), + [MOVE_FEATHER_DANCE] = _("FeatherDance"), [MOVE_TEETER_DANCE] = _("Teeter Dance"), [MOVE_BLAZE_KICK] = _("Blaze Kick"), [MOVE_MUD_SPORT] = _("Mud Sport"), @@ -320,7 +320,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ROCK_TOMB] = _("Rock Tomb"), [MOVE_SILVER_WIND] = _("Silver Wind"), [MOVE_METAL_SOUND] = _("Metal Sound"), - [MOVE_GRASS_WHISTLE] = _("Grasswhistle"), + [MOVE_GRASS_WHISTLE] = _("GrassWhistle"), [MOVE_TICKLE] = _("Tickle"), [MOVE_COSMIC_POWER] = _("Cosmic Power"), [MOVE_WATER_SPOUT] = _("Water Spout"), @@ -557,7 +557,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ICE_BURN] = _("Ice Burn"), [MOVE_SNARL] = _("Snarl"), [MOVE_ICICLE_CRASH] = _("Icicle Crash"), - [MOVE_V_CREATE] = _("V Create"), + [MOVE_V_CREATE] = _("V-create"), [MOVE_FUSION_FLARE] = _("Fusion Flare"), [MOVE_FUSION_BOLT] = _("Fusion Bolt"), [MOVE_FLYING_PRESS] = _("Flying Press"), @@ -566,18 +566,18 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ROTOTILLER] = _("Rototiller"), [MOVE_STICKY_WEB] = _("Sticky Web"), [MOVE_FELL_STINGER] = _("Fell Stinger"), - [MOVE_PHANTOM_FORCE] = _("Phantom Forc"), + [MOVE_PHANTOM_FORCE] = _("PhantomForce"), [MOVE_TRICK_OR_TREAT] = _("Halloween"), [MOVE_NOBLE_ROAR] = _("Noble Roar"), [MOVE_ION_DELUGE] = _("Ion Deluge"), [MOVE_PARABOLIC_CHARGE] = _("Parabolic Ch"), - [MOVE_FOREST_S_CURSE] = _("Forests Curs"), + [MOVE_FOREST_S_CURSE] = _("ForestsCurse"), [MOVE_PETAL_BLIZZARD] = _("Petal Storm"), [MOVE_FREEZE_DRY] = _("Freeze Dry"), [MOVE_DISARMING_VOICE] = _("Disarming Vo"), [MOVE_PARTING_SHOT] = _("Parting Shot"), [MOVE_TOPSY_TURVY] = _("Topsy Turvy"), - [MOVE_DRAINING_KISS] = _("Draining Kis"), + [MOVE_DRAINING_KISS] = _("DrainingKiss"), [MOVE_CRAFTY_SHIELD] = _("CraftyShield"), [MOVE_FLOWER_SHIELD] = _("FlowerShield"), [MOVE_GRASSY_TERRAIN] = _("GrassTerrain"), @@ -595,14 +595,14 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_STEAM_ERUPTION] = _("Steam Erupt"), [MOVE_HYPERSPACE_HOLE] = _("Hyperspace H"), [MOVE_WATER_SHURIKEN] = _("Water Shuri"), - [MOVE_MYSTICAL_FIRE] = _("Mystical Fir"), + [MOVE_MYSTICAL_FIRE] = _("MysticalFire"), [MOVE_SPIKY_SHIELD] = _("Spiky Shield"), - [MOVE_AROMATIC_MIST] = _("Aromatic Mis"), + [MOVE_AROMATIC_MIST] = _("AromaticMist"), [MOVE_EERIE_IMPULSE] = _("EerieImpulse"), [MOVE_VENOM_DRENCH] = _("Venom Drench"), [MOVE_POWDER] = _("Powder"), [MOVE_GEOMANCY] = _("Geomancy"), - [MOVE_MAGNETIC_FLUX] = _("Magnetic Flu"), + [MOVE_MAGNETIC_FLUX] = _("MagneticFlux"), [MOVE_HAPPY_HOUR] = _("Happy Hour"), [MOVE_ELECTRIC_TERRAIN] = _("Electric Ter"), [MOVE_DAZZLING_GLEAM] = _("Dazzling Gle"), @@ -613,11 +613,11 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_HOLD_BACK] = _("Hold Back"), [MOVE_INFESTATION] = _("Infestation"), [MOVE_POWER_UP_PUNCH] = _("PowerUpPunch"), - [MOVE_OBLIVION_WING] = _("Oblivion Win"), + [MOVE_OBLIVION_WING] = _("OblivionWing"), [MOVE_THOUSAND_ARROWS] = _("Thousand Ar"), [MOVE_THOUSAND_WAVES] = _("Thousand Wav"), [MOVE_LAND_S_WRATH] = _("Lands Wrath"), - [MOVE_LIGHT_OF_RUIN] = _("Light Of Ru"), + [MOVE_LIGHT_OF_RUIN] = _("LightOfRuin"), [MOVE_ORIGIN_PULSE] = _("Origin Pulse"), [MOVE_PRECIPICE_BLADES] = _("Precipice Bl"), [MOVE_DRAGON_ASCENT] = _("DragonAscent"), @@ -672,5 +672,5 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_TEARFUL_LOOK] = _("Tearful Look"), [MOVE_ZING_ZAP] = _("Zing Zap"), [MOVE_NATURES_MADNESS] = _("Nature's Mad"), - [MOVE_MULTI_ATTACK] = _("Multi Attack"), + [MOVE_MULTI_ATTACK] = _("Multi-Attack"), }; From 2e7c21e5287ed8954c5b6677ea908fce03092700 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Sat, 14 Dec 2019 17:01:33 -0500 Subject: [PATCH 2/3] Vise Grip to Vice Grip The weird thing is "vice" is the British way of saying it and "vise" is the American way, but the change happened in games based on the UK. Now matches its Gen 7 name. --- src/data/text/move_names.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 708bc2500..95dafebd3 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -11,7 +11,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ICE_PUNCH] = _("Ice Punch"), [MOVE_THUNDER_PUNCH] = _("ThunderPunch"), [MOVE_SCRATCH] = _("Scratch"), - [MOVE_VICE_GRIP] = _("Vise Grip"), + [MOVE_VICE_GRIP] = _("Vice Grip"), [MOVE_GUILLOTINE] = _("Guillotine"), [MOVE_RAZOR_WIND] = _("Razor Wind"), [MOVE_SWORDS_DANCE] = _("Swords Dance"), From 98ce80d231e9f060f09011a8faadcf8e60fe8efe Mon Sep 17 00:00:00 2001 From: Fontbane <36677462+Fontbane@users.noreply.github.com> Date: Thu, 19 Dec 2019 13:47:31 -0500 Subject: [PATCH 3/3] Fix move names --- src/data/text/move_names.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 95dafebd3..25d7460a5 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -3,7 +3,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_NONE] = _("-"), [MOVE_POUND] = _("Pound"), [MOVE_KARATE_CHOP] = _("Karate Chop"), - [MOVE_DOUBLE_SLAP] = _("DoubleSlap"), + [MOVE_DOUBLE_SLAP] = _("Double Slap"), [MOVE_COMET_PUNCH] = _("Comet Punch"), [MOVE_MEGA_PUNCH] = _("Mega Punch"), [MOVE_PAY_DAY] = _("Pay Day"), @@ -49,7 +49,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ROAR] = _("Roar"), [MOVE_SING] = _("Sing"), [MOVE_SUPERSONIC] = _("Supersonic"), - [MOVE_SONIC_BOOM] = _("SonicBoom"), + [MOVE_SONIC_BOOM] = _("Sonic Boom"), [MOVE_DISABLE] = _("Disable"), [MOVE_ACID] = _("Acid"), [MOVE_EMBER] = _("Ember"), @@ -61,7 +61,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_ICE_BEAM] = _("Ice Beam"), [MOVE_BLIZZARD] = _("Blizzard"), [MOVE_PSYBEAM] = _("Psybeam"), - [MOVE_BUBBLE_BEAM] = _("BubbleBeam"), + [MOVE_BUBBLE_BEAM] = _("Bubble Beam"), [MOVE_AURORA_BEAM] = _("Aurora Beam"), [MOVE_HYPER_BEAM] = _("Hyper Beam"), [MOVE_PECK] = _("Peck"), @@ -76,8 +76,8 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_LEECH_SEED] = _("Leech Seed"), [MOVE_GROWTH] = _("Growth"), [MOVE_RAZOR_LEAF] = _("Razor Leaf"), - [MOVE_SOLAR_BEAM] = _("SolarBeam"), - [MOVE_POISON_POWDER] = _("Poisonpowder"), + [MOVE_SOLAR_BEAM] = _("Solar Beam"), + [MOVE_POISON_POWDER] = _("PoisonPowder"), [MOVE_STUN_SPORE] = _("Stun Spore"), [MOVE_SLEEP_POWDER] = _("Sleep Powder"), [MOVE_PETAL_DANCE] = _("Petal Dance"), @@ -581,7 +581,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_CRAFTY_SHIELD] = _("CraftyShield"), [MOVE_FLOWER_SHIELD] = _("FlowerShield"), [MOVE_GRASSY_TERRAIN] = _("GrassTerrain"), - [MOVE_MISTY_TERRAIN] = _("Mist Terrain"), + [MOVE_MISTY_TERRAIN] = _("MistyTerrain"), [MOVE_ELECTRIFY] = _("Electrify"), [MOVE_PLAY_ROUGH] = _("Play Rough"), [MOVE_FAIRY_WIND] = _("Fairy Wind"),