summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
Diffstat (limited to 'src/field')
-rw-r--r--src/field/berry_tag_screen.c4
-rw-r--r--src/field/diploma.c4
-rw-r--r--src/field/field_effect.c8
-rw-r--r--src/field/field_message_box.c2
-rw-r--r--src/field/field_region_map.c4
-rw-r--r--src/field/field_screen_effect.c2
-rw-r--r--src/field/item_menu.c4
-rw-r--r--src/field/mauville_man.c2
-rw-r--r--src/field/overworld.c16
-rw-r--r--src/field/party_menu.c12
-rw-r--r--src/field/pokeblock.c24
-rw-r--r--src/field/region_map.c4
-rw-r--r--src/field/script_menu.c2
-rw-r--r--src/field/shop.c4
-rw-r--r--src/field/slot_machine.c8
-rw-r--r--src/field/start_menu.c6
-rw-r--r--src/field/starter_choose.c4
-rw-r--r--src/field/use_pokeblock.c14
-rw-r--r--src/field/wallclock.c4
19 files changed, 64 insertions, 64 deletions
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index f57face11..75e481f84 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -109,11 +109,11 @@ static bool8 sub_8146058(void)
gMain.state += 1;
break;
case 3:
- SetUpWindowConfig(&gWindowConfig_81E6E18);
+ SetUpWindowConfig(&gWindowTemplate_81E6E18);
gMain.state += 1;
break;
case 4:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E6E18);
+ MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E18);
gMain.state += 1;
break;
case 5:
diff --git a/src/field/diploma.c b/src/field/diploma.c
index b9cdb65df..8481589cb 100644
--- a/src/field/diploma.c
+++ b/src/field/diploma.c
@@ -68,8 +68,8 @@ void CB2_ShowDiploma(void)
ResetPaletteFade();
FreeAllSpritePalettes();
LoadPalette(gDiplomaPalettes, 0, 64);
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
DisplayDiplomaText();
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
diff --git a/src/field/field_effect.c b/src/field/field_effect.c
index 1e2aaa4ed..57d9072b1 100644
--- a/src/field/field_effect.c
+++ b/src/field/field_effect.c
@@ -2434,8 +2434,8 @@ void sub_8088380(struct Task *task)
IntrCallback callback;
LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback);
SetVBlankCallback(callback);
- SetUpWindowConfig(&gWindowConfig_81E6CE4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
FreeResourcesAndDestroySprite(&gSprites[task->data[15]]);
FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
DestroyTask(FindTaskIdByFunc(sub_8088120));
@@ -2557,8 +2557,8 @@ void sub_808862C(struct Task *task)
CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback);
SetVBlankCallback(intrCallback);
- SetUpWindowConfig(&gWindowConfig_81E6CE4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
FreeResourcesAndDestroySprite(&gSprites[task->data[15]]);
FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
DestroyTask(FindTaskIdByFunc(sub_808847C));
diff --git a/src/field/field_message_box.c b/src/field/field_message_box.c
index 284fdb3f0..5eec7a14b 100644
--- a/src/field/field_message_box.c
+++ b/src/field/field_message_box.c
@@ -20,7 +20,7 @@ void InitFieldMessageBox(void)
{
sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
TextWindow_SetDlgFrameBaseTileNum(gMenuTextWindowContentTileOffset);
- Text_InitWindowWithTemplate(&gFieldMessageBoxWindow, &gWindowConfig_81E6CE4);
+ Text_InitWindowWithTemplate(&gFieldMessageBoxWindow, &gWindowTemplate_81E6CE4);
}
static void Task_FieldMessageBox(u8 taskId)
diff --git a/src/field/field_region_map.c b/src/field/field_region_map.c
index af8e4ec8a..afbc25226 100644
--- a/src/field/field_region_map.c
+++ b/src/field/field_region_map.c
@@ -50,8 +50,8 @@ void CB2_FieldInitRegionMap(void)
InitRegionMap((void *)&ewram0_5.unk8, 0);
CreateRegionMapPlayerIcon(0, 0);
CreateRegionMapCursor(1, 1);
- SetUpWindowConfig(&gWindowConfig_81E709C);
- InitMenuWindow(&gWindowConfig_81E709C);
+ SetUpWindowConfig(&gWindowTemplate_81E709C);
+ InitMenuWindow(&gWindowTemplate_81E709C);
Menu_EraseScreen();
REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
Menu_DrawStdWindowFrame(21, 0, 29, 3);
diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c
index f123768e5..6e818ce68 100644
--- a/src/field/field_screen_effect.c
+++ b/src/field/field_screen_effect.c
@@ -265,7 +265,7 @@ static void sub_80816A8(u8 taskId)
break;
case 5:
Menu_EraseWindowRect(0, 0, 29, 19);
- LoadFontDefaultPalette(&gWindowConfig_81E6CE4);
+ LoadFontDefaultPalette(&gWindowTemplate_81E6CE4);
REG_WIN0H = 255;
REG_DISPCNT = data[6];
REG_BLDCNT = data[7];
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 0db48f55d..f58f42fb9 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -424,11 +424,11 @@ static bool8 SetupBagMultistep(void)
gMain.state++;
break;
case 7:
- SetUpWindowConfig(&gWindowConfig_81E6DFC);
+ SetUpWindowConfig(&gWindowTemplate_81E6DFC);
gMain.state++;
break;
case 8:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E6DFC);
+ MultistepInitMenuWindowBegin(&gWindowTemplate_81E6DFC);
gMain.state++;
break;
case 9:
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 82c6dffe3..c3a73e18b 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -858,7 +858,7 @@ static void Task_BardSong(u8 taskId)
{
case 0: // Initialize song
PrepareSongText();
- Text_InitWindowWithTemplate(gMenuWindowPtr, &gWindowConfig_81E6CE4);
+ Text_InitWindowWithTemplate(gMenuWindowPtr, &gWindowTemplate_81E6CE4);
Text_InitWindow8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15);
task->data[1] = 0;
task->data[2] = 0;
diff --git a/src/field/overworld.c b/src/field/overworld.c
index e239daec7..e91c8ae56 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -1456,8 +1456,8 @@ bool32 sub_805483C(u8 *a1)
case 4:
sub_8054814();
sub_8054C54();
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
(*a1)++;
break;
case 5:
@@ -1522,8 +1522,8 @@ bool32 sub_805493C(u8 *a1, u32 a2)
case 4:
sub_8054814();
sub_8054C54();
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
(*a1)++;
break;
case 5:
@@ -1612,8 +1612,8 @@ bool32 sub_8054A9C(u8 *a1)
case 3:
sub_8054814();
sub_8054C54();
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
(*a1)++;
break;
case 4:
@@ -1695,8 +1695,8 @@ void sub_8054C2C(void)
{
sub_8054814();
sub_8054C54();
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
mapdata_load_assets_to_gpu_and_full_redraw();
}
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index f589494f4..73a32d070 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -679,11 +679,11 @@ bool8 InitPartyMenu(void)
gMain.state++;
break;
case 7:
- SetUpWindowConfig(&gWindowConfig_81E6C90);
+ SetUpWindowConfig(&gWindowTemplate_81E6C90);
gMain.state++;
break;
case 8:
- Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C90);
+ Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C90);
MultistepInitWindowTileData(&gUnknown_03004210, 1);
gMain.state++;
break;
@@ -716,7 +716,7 @@ bool8 InitPartyMenu(void)
}
break;
case 13:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E6CC8);
+ MultistepInitMenuWindowBegin(&gWindowTemplate_81E6CC8);
gMain.state++;
break;
case 14:
@@ -3313,7 +3313,7 @@ void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer)
{
u32 var1 = 0;
CpuFastSet(&var1, gTileBuffer, 0x1000100);
- sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gTileBuffer, nameBuffer);
+ sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gTileBuffer, nameBuffer);
CpuFastSet(gTileBuffer, OBJ_VRAM1 + (monIndex * 0x400), 128);
}
@@ -3423,7 +3423,7 @@ void PartyMenuDoPrintLevel(u8 monIndex, u8 menuLayout, u8 level)
var1 = 0;
CpuFastSet(&var1, gUnknown_02039460, 0x1000020);
- sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
+ sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x200 + (monIndex * 0x400), 32);
}
@@ -3517,7 +3517,7 @@ void PartyMenuDoPrintHP(u8 monIndex, u8 b, u16 currentHP, u16 maxHP)
var = 0;
CpuFastSet(&var, gUnknown_02039460, 0x1000040);
- sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
+ sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x300 + (monIndex * 0x400), 64);
}
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 3ca359ef7..b238857fa 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -275,15 +275,15 @@ static bool8 sub_810B6C0(void)
gMain.state++;
break;
case 5:
- SetUpWindowConfig(&gWindowConfig_81E6E34);
+ SetUpWindowConfig(&gWindowTemplate_81E6E34);
gMain.state++;
break;
case 6:
- SetUpWindowConfig(&gWindowConfig_81E6E50);
+ SetUpWindowConfig(&gWindowTemplate_81E6E50);
gMain.state++;
break;
case 7:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E6E34);
+ MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E34);
gMain.state++;
break;
case 8:
@@ -293,7 +293,7 @@ static bool8 sub_810B6C0(void)
}
break;
case 9:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E6E50);
+ MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E50);
gMain.state++;
break;
case 10:
@@ -445,13 +445,13 @@ void debug_sub_8120F98(void)
static void sub_810BB0C(void)
{
- BasicInitMenuWindow(&gWindowConfig_81E6E34);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E34);
sub_8072BD8(ItemId_GetItem(ITEM_POKEBLOCK_CASE)->name, 2, 1, 0x48);
}
static void sub_810BB30(void)
{
- BasicInitMenuWindow(&gWindowConfig_81E6E34);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E34);
Menu_PrintText(gContestStatsText_Spicy, 2, 13);
Menu_PrintText(gContestStatsText_Dry, 2, 15);
Menu_PrintText(gContestStatsText_Sweet, 2, 17);
@@ -464,7 +464,7 @@ static void sub_810BB88(u8 a0)
u8 i;
u8 y;
u8 *buf;
- BasicInitMenuWindow(&gWindowConfig_81E6E34);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E34);
for (i=a0; i<=a0+8; i++)
{
y = (i - a0) << 1;
@@ -596,7 +596,7 @@ static void sub_810BDAC(bool8 flag)
gBGTilemapBuffers[2][v0 + 32] = 15;
}
}
- BasicInitMenuWindow(&gWindowConfig_81E6E34);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E34);
if (gUnknown_02039248.unk0 + gUnknown_02039248.unk1 != gUnknown_02039248.unk2)
{
sub_8072C14(gStringVar1, sub_810C9E8(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1]), 16, 1);
@@ -812,7 +812,7 @@ static void sub_810C368(u8 taskId)
v0 = 2;
sub_80F98A4(0);
sub_80F98A4(1);
- BasicInitMenuWindow(&gWindowConfig_81E6E50);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E50);
Menu_DrawStdWindowFrame(7, v0 + 4, 13, 11);
PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758);
InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5);
@@ -868,7 +868,7 @@ static void sub_810C508(u8 taskId)
static void sub_810C540(u8 taskId)
{
- BasicInitMenuWindow(&gWindowConfig_81E6E50);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E50);
HandleDestroyMenuCursors();
Menu_EraseWindowRect(7, 4, 13, 11);
StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1].color]);
@@ -906,7 +906,7 @@ static void sub_810C668(u8 taskId)
{
sub_80F979C(1, 0);
}
- BasicInitMenuWindow(&gWindowConfig_81E6E50);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E50);
Menu_EraseWindowRect(7, 6, 13, 11);
Menu_EraseWindowRect(0, 14, 29, 19);
gTasks[taskId].func = sub_810BF7C;
@@ -922,7 +922,7 @@ static void sub_810C6DC(u8 taskId)
static void sub_810C704(u8 taskId)
{
- BasicInitMenuWindow(&gWindowConfig_81E6E34);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E34);
sub_810BC84(gUnknown_02039248.unk1);
sub_80F979C(1, 1);
gTasks[taskId].func = sub_810C6DC;
diff --git a/src/field/region_map.c b/src/field/region_map.c
index 1eb57b803..f7db0a61e 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -1540,10 +1540,10 @@ void CB2_InitFlyRegionMap(void)
FreeAllSpritePalettes();
break;
case 1:
- SetUpWindowConfig(&gWindowConfig_81E7224);
+ SetUpWindowConfig(&gWindowTemplate_81E7224);
break;
case 2:
- InitMenuWindow(&gWindowConfig_81E7224);
+ InitMenuWindow(&gWindowTemplate_81E7224);
Menu_EraseScreen();
break;
case 3:
diff --git a/src/field/script_menu.c b/src/field/script_menu.c
index bf6e93e41..ee5843049 100644
--- a/src/field/script_menu.c
+++ b/src/field/script_menu.c
@@ -622,7 +622,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ig
static u16 GetStringWidthInTilesForScriptMenu(const u8 *str)
{
// each tile on screen is 8x8, so it needs the number of tiles and not pixels, hence the division by 8.
- return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6CE4, str) + 7) / 8;
+ return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowTemplate_81E6CE4, str) + 7) / 8;
}
static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress, u8 cursorPos)
diff --git a/src/field/shop.c b/src/field/shop.c
index 0d8bc83d1..cfd4818dc 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -285,8 +285,8 @@ void BuyMenuDrawGraphics(void)
ResetPaletteFade();
ResetSpriteData();
ResetTasks();
- SetUpWindowConfig(&gWindowConfig_81E6DFC);
- InitMenuWindow(&gWindowConfig_81E6DFC);
+ SetUpWindowConfig(&gWindowTemplate_81E6DFC);
+ InitMenuWindow(&gWindowTemplate_81E6DFC);
BuyMenuDrawMapGraphics();
gMartInfo.cursor = zero;
gMartInfo.choicesAbove = zero2;
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 3c13e004c..abf837daa 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -400,8 +400,8 @@ static void SlotMachineSetup_0_1(void)
static void SlotMachineSetup_3_0(void)
{
- SetUpWindowConfig(&gWindowConfig_81E7128);
- InitMenuWindow(&gWindowConfig_81E7128);
+ SetUpWindowConfig(&gWindowTemplate_81E7128);
+ InitMenuWindow(&gWindowTemplate_81E7128);
}
static void SlotMachineSetup_4_0(void)
@@ -2807,7 +2807,7 @@ static void sub_8104B80(struct Task *task)
{
sub_8104DA4();
sub_81065DC();
- BasicInitMenuWindow(&gWindowConfig_81E7144);
+ BasicInitMenuWindow(&gWindowTemplate_81E7144);
MenuPrint_PixelCoords(gOtherText_ReelTime, 10, 32, 1);
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
task->data[0]++;
@@ -2825,7 +2825,7 @@ static void sub_8104BC8(struct Task *task)
static void sub_8104BFC(struct Task *task)
{
Menu_EraseScreen();
- BasicInitMenuWindow(&gWindowConfig_81E7128);
+ BasicInitMenuWindow(&gWindowTemplate_81E7128);
sub_81064B8();
sub_8104CAC(task->data[1]);
sub_810423C(eSlotMachine->pikaPower);
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 6c2812039..8131e2511 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -271,7 +271,7 @@ void CreateStartMenuTask(void (*func)(u8))
{
u8 taskId;
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
taskId = CreateTask(Task_StartMenu, 0x50);
SetTaskFuncWithFollowupFunc(taskId, Task_StartMenu, func);
}
@@ -774,8 +774,8 @@ static bool32 sub_80719FC(u8 *step)
dp12_8087EA4();
break;
case 2:
- SetUpWindowConfig(&gWindowConfig_81E6CE4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
break;
case 3:
diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c
index d4994d701..9b644c6cb 100644
--- a/src/field/starter_choose.c
+++ b/src/field/starter_choose.c
@@ -294,8 +294,8 @@ void CB2_ChooseStarter(void)
LoadCompressedObjectPic(&gUnknown_083F7794[0]);
LoadCompressedObjectPic(&gUnknown_083F77A4[0]);
LoadSpritePalettes(gUnknown_083F77B4);
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
savedIme = REG_IME;
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c
index 6e71011b9..a4a36e40a 100644
--- a/src/field/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
@@ -228,11 +228,11 @@ static void sub_8136294(void)
gUnknown_02039304->unk50++;
break;
case 3:
- SetUpWindowConfig(&gWindowConfig_81E7080);
+ SetUpWindowConfig(&gWindowTemplate_81E7080);
gUnknown_02039304->unk50++;
break;
case 4:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E7080);
+ MultistepInitMenuWindowBegin(&gWindowTemplate_81E7080);
gUnknown_02039304->unk50++;
break;
case 5:
@@ -610,7 +610,7 @@ static void sub_8136BB8(void)
GetMonData(&gPlayerParty[sub_81370A4(gUnknown_083DFEC4->unk87DC)], MON_DATA_NICKNAME, gUnknown_02039304->stringBuffer);
StringGetEnd10(gUnknown_02039304->stringBuffer);
StringAppend(gUnknown_02039304->stringBuffer, gOtherText_GetsAPokeBlock);
- BasicInitMenuWindow(&gWindowConfig_81E709C);
+ BasicInitMenuWindow(&gWindowTemplate_81E709C);
Menu_DrawStdWindowFrame(0, 16, 29, 19);
Menu_PrintText(gUnknown_02039304->stringBuffer, 1, 17);
DisplayYesNoMenu(23, 10, 1);
@@ -623,14 +623,14 @@ static s8 sub_8136C40(void)
if ((u8)(retval + 1) < 3)
{
Menu_EraseScreen();
- BasicInitMenuWindow(&gWindowConfig_81E7080);
+ BasicInitMenuWindow(&gWindowTemplate_81E7080);
}
return retval;
}
static void sub_8136C6C(void)
{
- BasicInitMenuWindow(&gWindowConfig_81E709C);
+ BasicInitMenuWindow(&gWindowTemplate_81E709C);
Menu_DrawStdWindowFrame(0, 16, 29, 19);
for (gUnknown_02039304->unk53 = 0; gUnknown_02039304->unk53 < 5 && gUnknown_02039304->unk61[gUnknown_02039304->unk53] == 0; gUnknown_02039304->unk53++);
if (gUnknown_02039304->unk53 < 5)
@@ -667,7 +667,7 @@ static bool8 sub_8136D00(void)
static void sub_8136D60(void)
{
- BasicInitMenuWindow(&gWindowConfig_81E709C);
+ BasicInitMenuWindow(&gWindowTemplate_81E709C);
Menu_DrawStdWindowFrame(0, 16, 29, 19);
Menu_PrintText(gOtherText_WontEat, 1, 17);
}
@@ -675,7 +675,7 @@ static void sub_8136D60(void)
static void sub_8136D8C(void)
{
Menu_EraseScreen();
- BasicInitMenuWindow(&gWindowConfig_81E7080);
+ BasicInitMenuWindow(&gWindowTemplate_81E7080);
}
static void Pokeblock_MenuWindowTextPrint(const u8 *message)
diff --git a/src/field/wallclock.c b/src/field/wallclock.c
index 6d102715a..8620ad9f0 100644
--- a/src/field/wallclock.c
+++ b/src/field/wallclock.c
@@ -236,8 +236,8 @@ static void LoadWallClockGraphics(void)
FreeAllSpritePalettes();
LoadCompressedObjectPic(&gUnknown_083F7A90[0]);
LoadSpritePalettes(gUnknown_083F7AA0);
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
}
static void WallClockInit(void)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 12:01:47 +0000