ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix strings coz they had the same name for some unknown to me reason

Browse Source
This commit is contained in:
DizzyEggg 2019-12-23 17:09:13 +01:00
parent 9e3d5672e6
commit 15d34c3513
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/battle_message.h
View File

@ -262,11 +262,6 @@ extern const u8 gText_BattleSwitchWhich2[];
extern const u8 gText_BattleSwitchWhich3[]; extern const u8 gText_BattleSwitchWhich3[];
extern const u8 gText_BattleSwitchWhich4[]; extern const u8 gText_BattleSwitchWhich4[];
extern const u8 gText_BattleSwitchWhich5[]; extern const u8 gText_BattleSwitchWhich5[];
extern const u8 gText_Attack[];
extern const u8 gText_Defense[];
extern const u8 gText_SpAtk[];
extern const u8 gText_SpDef[];
extern const u8 gText_Speed[];
extern const u8 gText_SafariBalls[]; extern const u8 gText_SafariBalls[];
extern const u8 gText_SafariBallLeft[]; extern const u8 gText_SafariBallLeft[];
extern const u8 gText_Sleep[]; extern const u8 gText_Sleep[];

18
src/battle_message.c
View File

@ -426,19 +426,13 @@ static const u8 sText_ExclamationMark2[] = _("!");
static const u8 sText_ExclamationMark3[] = _("!"); static const u8 sText_ExclamationMark3[] = _("!");
static const u8 sText_ExclamationMark4[] = _("!"); static const u8 sText_ExclamationMark4[] = _("!");
static const u8 sText_ExclamationMark5[] = _("!"); static const u8 sText_ExclamationMark5[] = _("!");
static const u8 sText_HP2[] = _("HP");
static const u8 sText_Attack2[] = _("ATTACK");
static const u8 sText_Defense2[] = _("DEFENSE");
const u8 gText_Speed[] = _("SPEED");
static const u8 sText_SpAtk2[] = _("SP. ATK");
static const u8 sText_SpDef2[] = _("SP. DEF");
static const u8 sText_Accuracy[] = _("accuracy"); static const u8 sText_Accuracy[] = _("accuracy");
static const u8 sText_Evasiveness[] = _("evasiveness"); static const u8 sText_Evasiveness[] = _("evasiveness");
const u8 * const gStatNamesTable[] = const u8 * const gStatNamesTable[] =
{ {
sText_HP2, sText_Attack2, sText_Defense2, gText_HP3, gText_Attack, gText_Defense,
gText_Speed, sText_SpAtk2, sText_SpDef2, gText_Speed, gText_SpAtk, gText_SpDef,
sText_Accuracy, sText_Evasiveness sText_Accuracy, sText_Evasiveness
}; };
@ -1532,15 +1526,9 @@ const u8 gText_BattleSwitchWhich3[] = _("{UP_ARROW}");
const u8 gText_BattleSwitchWhich4[] = _("{ESCAPE 4}"); const u8 gText_BattleSwitchWhich4[] = _("{ESCAPE 4}");
const u8 gText_BattleSwitchWhich5[] = _("-"); const u8 gText_BattleSwitchWhich5[] = _("-");
const u8 sText_HP[] = _("HP");
const u8 gText_Attack[] = _("ATTACK");
const u8 gText_Defense[] = _("DEFENSE");
const u8 gText_SpAtk[] = _("SP. ATK");
const u8 gText_SpDef[] = _("SP. DEF");
const u8 * const gStatNamesTable2[] = const u8 * const gStatNamesTable2[] =
{ {
sText_HP, gText_SpAtk, gText_Attack, gText_HP3, gText_SpAtk, gText_Attack,
gText_SpDef, gText_Defense, gText_Speed gText_SpDef, gText_Defense, gText_Speed
}; };