summaryrefslogtreecommitdiff
path: root/src/battle/battle_2.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-09 14:26:15 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-09 14:26:15 -0600
commit03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 (patch)
tree502c26ec51aa55df4eb1ff4324ab90c3b0a0610a /src/battle/battle_2.c
parent8869cbc98e2f8e761e9ff89182933643992e2bd7 (diff)
more text/menu renaming
Diffstat (limited to 'src/battle/battle_2.c')
-rw-r--r--src/battle/battle_2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 42cc0b538..249b67e0d 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -234,7 +234,7 @@ void InitBattle(void)
}
//sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
sub_80895F8(gUnknown_081F9674);
- SetUpWindowConfig(&gWindowTemplate_81E6C58);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E6C58);
ResetPaletteFade();
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
@@ -553,7 +553,7 @@ void sub_800F02C(void)
gUnknown_02023A00[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
gUnknown_02023A00[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
gUnknown_02023A00[i].gender = GetMonGender(&gPlayerParty[i]);
- StripExtCtrlCodes(nickname);
+ Text_StripExtCtrlCodes(nickname);
gUnknown_02023A00[i].language = GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE);
if (gUnknown_02023A00[i].language != 1)
PadNameString(nickname, 0);
@@ -1210,7 +1210,7 @@ void c2_8011A1C(void)
gUnknown_03004DE0[0][i] = 0xFF10;
gUnknown_03004DE0[1][i] = 0xFF10;
}
- SetUpWindowConfig(&gWindowTemplate_81E6C58);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E6C58);
ResetPaletteFade();
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;