atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renaming the last two and fixing the merge conflict with PE.

Browse source
This commit is contained in:
surskitty 2021-01-10 15:48:57 -05:00
parent a0f1dcb9cf
commit f58539b602
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/constants/moves.h
View file

@ -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

4
src/data/text/move_names.h
View file

@ -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"),