summaryrefslogtreecommitdiff
path: root/src/battle/reshow_battle_screen.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-09 19:19:22 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-09 19:19:22 -0500
commit68131de6fc09b0d9e6b6e0adc711fe0262aa37ad (patch)
treef439ba44f13fe3e102d654f8b6bbe151b4e88e7d /src/battle/reshow_battle_screen.c
parentfc66800520a28a6940cee922b60074da1d624157 (diff)
parent1877ba24ca489827f1093858ed58c38ff00a4576 (diff)
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'src/battle/reshow_battle_screen.c')
-rw-r--r--src/battle/reshow_battle_screen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index 6a6d7a137..42bb3ba7f 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -78,9 +78,9 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
{
case 0:
dp12_8087EA4();
- SetUpWindowConfig(&gWindowConfig_81E6C58);
+ Text_LoadWindowTemplate(&gWindowTemplate_81E6C58);
ResetPaletteFade();
- InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
+ Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
gBattle_BG1_X = 0;