From f58539b602d4eb4ec2fd922d7b02989968a3ea09 Mon Sep 17 00:00:00 2001 From: surskitty Date: Sun, 10 Jan 2021 15:48:57 -0500 Subject: [PATCH] Renaming the last two and fixing the merge conflict with PE. --- include/constants/moves.h | 6 ++++++ src/data/text/move_names.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/constants/moves.h b/include/constants/moves.h index dcec99da1c..4e1865003f 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -787,3 +787,9 @@ #define MOVES_COUNT MOVES_COUNT_GEN8 #endif // GUARD_CONSTANTS_MOVES_H + +// moves renamed in BE +#define MOVE FAINT_ATTACK MOVE_FEINT_ATTACK +#define MOVE_HI_JUMP_KICK MOVE_HIGH_JUMP_KICK +#define MOVE_SMELLING_SALT MOVE_SMELLING_SALTS +#define MOVE_VICE_GRIP MOVE_VISE_GRIP diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index 154a30d20b..a5b9f4e75e 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -623,7 +623,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_DRAGON_ASCENT] = _("DragonAscent"), [MOVE_HYPERSPACE_FURY] = _("HyprspceFury"), [MOVE_SHORE_UP] = _("Shore Up"), - [MOVE_FIRST_IMPRESSION] = _("First Impres"), + [MOVE_FIRST_IMPRESSION] = _("FrstImpressn"), [MOVE_BANEFUL_BUNKER] = _("BanefulBunkr"), [MOVE_SPIRIT_SHACKLE] = _("SpiritShackl"), [MOVE_DARKEST_LARIAT] = _("DarkstLariat"), @@ -654,7 +654,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = [MOVE_TROP_KICK] = _("Trop Kick"), [MOVE_INSTRUCT] = _("Instruct"), [MOVE_BEAK_BLAST] = _("Beak Blast"), - [MOVE_CLANGING_SCALES] = _("Clanging Sca"), + [MOVE_CLANGING_SCALES] = _("ClngngScales"), [MOVE_DRAGON_HAMMER] = _("DragonHammer"), [MOVE_BRUTAL_SWING] = _("Brutal Swing"), [MOVE_AURORA_VEIL] = _("Aurora Veil"),