summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/clear_save_data_menu.c4
-rw-r--r--src/engine/link.c8
-rw-r--r--src/engine/main_menu.c12
-rw-r--r--src/engine/mystery_event_menu.c4
-rw-r--r--src/engine/naming_screen.c22
-rw-r--r--src/engine/option_menu.c4
-rw-r--r--src/engine/reset_rtc_screen.c4
-rw-r--r--src/engine/save_failed_screen.c4
-rw-r--r--src/engine/text.c122
-rw-r--r--src/engine/trade.c40
10 files changed, 112 insertions, 112 deletions
diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c
index ae6c85180..6a597690a 100644
--- a/src/engine/clear_save_data_menu.c
+++ b/src/engine/clear_save_data_menu.c
@@ -133,8 +133,8 @@ static u8 InitClearSaveDataScreen(void)
ResetTasks();
ResetSpriteData();
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff);
ime = REG_IME;
diff --git a/src/engine/link.c b/src/engine/link.c
index a2df02b5f..d52d0bb7a 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -238,8 +238,8 @@ void LinkTestScreen(void)
FreeAllSpritePalettes();
ResetTasks();
SetVBlankCallback(VBlankCB_LinkTest);
- SetUpWindowConfig(&gWindowConfig_81E6CE4);
- InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
ResetBlockSend();
gLinkType = 0x1111;
OpenLink();
@@ -1236,8 +1236,8 @@ void CB2_LinkError(void)
FillPalette(0, 0, 2);
ResetTasks();
SetVBlankCallback(VBlankCB_LinkTest);
- SetUpWindowConfig(&gWindowConfig_81E7198);
- InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E7198);
+ SetUpWindowConfig(&gWindowTemplate_81E7198);
+ InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E7198);
Menu_EraseScreen();
REG_BLDALPHA = 0;
REG_BG0VOFS = 0;
diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c
index 623969802..723886664 100644
--- a/src/engine/main_menu.c
+++ b/src/engine/main_menu.c
@@ -233,8 +233,8 @@ u32 InitMainMenu(u8 a1)
ResetTasks();
ResetSpriteData();
FreeAllSpritePalettes();
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
if (a1)
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black
@@ -750,8 +750,8 @@ void PrintBadgeCount(void)
static void Task_NewGameSpeech1(u8 taskId)
{
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
REG_WIN0H = 0;
REG_WIN0V = 0;
REG_WININ = 0;
@@ -1373,8 +1373,8 @@ void CB_ContinueNewGameSpeechPart2()
FreeAllSpritePalettes();
AddBirchSpeechObjects(taskId);
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
if (gSaveBlock2.playerGender != MALE)
{
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index abb912938..278760233 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -45,8 +45,8 @@ void CB2_InitMysteryEventMenu(void)
FreeAllSpritePalettes();
ResetTasks();
SetVBlankCallback(VBlankCB);
- SetUpWindowConfig(&gWindowConfig_81E6CE4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
Menu_EraseScreen();
REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON;
REG_BLDCNT = 0;
diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c
index 5685584f5..880187dc0 100644
--- a/src/engine/naming_screen.c
+++ b/src/engine/naming_screen.c
@@ -325,8 +325,8 @@ static void NamingScreen_Init(void)
static void NamingScreen_SetUpWindow(void)
{
- SetUpWindowConfig(&gWindowConfig_81E6E88);
- InitMenuWindow(&gWindowConfig_81E6E88);
+ SetUpWindowConfig(&gWindowTemplate_81E6E88);
+ InitMenuWindow(&gWindowTemplate_81E6E88);
}
static void NamingScreen_ResetObjects(void)
@@ -1610,7 +1610,7 @@ static void DisplaySentToPCMessage(void)
{
StringCopy(gStringVar1, namingScreenDataPtr->destBuffer);
StringExpandPlaceholders(gStringVar4, gOtherText_SentToPC);
- BasicInitMenuWindow(&gWindowConfig_81E6E88);
+ BasicInitMenuWindow(&gWindowTemplate_81E6E88);
Menu_DisplayDialogueFrame();
MenuPrintMessageDefaultCoords(gStringVar4);
}
@@ -1760,16 +1760,16 @@ static void (*const gUnknown_083CE310[][2])(void) =
static const struct WindowTemplate *const gUnknown_083CE328[][2][2] =
{
{
- {&gWindowConfig_81E6EDC, &gWindowConfig_81E6EF8},
- {&gWindowConfig_81E6EA4, &gWindowConfig_81E6EC0},
+ {&gWindowTemplate_81E6EDC, &gWindowTemplate_81E6EF8},
+ {&gWindowTemplate_81E6EA4, &gWindowTemplate_81E6EC0},
},
{
- {&gWindowConfig_81E6EA4, &gWindowConfig_81E6EC0},
- {&gWindowConfig_81E6F14, &gWindowConfig_81E6F30},
+ {&gWindowTemplate_81E6EA4, &gWindowTemplate_81E6EC0},
+ {&gWindowTemplate_81E6F14, &gWindowTemplate_81E6F30},
},
{
- {&gWindowConfig_81E6F14, &gWindowConfig_81E6F30},
- {&gWindowConfig_81E6EDC, &gWindowConfig_81E6EF8},
+ {&gWindowTemplate_81E6F14, &gWindowTemplate_81E6F30},
+ {&gWindowTemplate_81E6EDC, &gWindowTemplate_81E6EF8},
},
};
@@ -1843,7 +1843,7 @@ static void PrintKeyboardCharacters(u8 page) //print letters on page
static void sub_80B78A8(void)
{
- BasicInitMenuWindow(&gWindowConfig_81E6F4C);
+ BasicInitMenuWindow(&gWindowTemplate_81E6F4C);
gUnknown_083CE358[namingScreenDataPtr->templateNum]();
gUnknown_083CE368[namingScreenDataPtr->template->unk3]();
Menu_PrintText(namingScreenDataPtr->template->title, 9, 2);
@@ -1886,7 +1886,7 @@ static void sub_80B7960(void)
string[5] = 1;
string += 6;
StringCopy(string, namingScreenDataPtr->textBuffer);
- BasicInitMenuWindow(&gWindowConfig_81E6F4C);
+ BasicInitMenuWindow(&gWindowTemplate_81E6F4C);
Menu_PrintText(gStringVar1, namingScreenDataPtr->unk2, 4);
}
diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c
index f35ed5b5a..2b9412e45 100644
--- a/src/engine/option_menu.c
+++ b/src/engine/option_menu.c
@@ -116,11 +116,11 @@ void CB2_InitOptionMenu(void)
gMain.state++;
break;
case 2:
- SetUpWindowConfig(&gWindowConfig_81E71B4);
+ SetUpWindowConfig(&gWindowTemplate_81E71B4);
gMain.state++;
break;
case 3:
- MultistepInitMenuWindowBegin(&gWindowConfig_81E71B4);
+ MultistepInitMenuWindowBegin(&gWindowTemplate_81E71B4);
gMain.state++;
break;
case 4:
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index eb823b84b..37b1c767e 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -443,8 +443,8 @@ void CB2_InitResetRtcScreen(void)
ResetSpriteData();
ResetTasks();
ResetPaletteFade();
- SetUpWindowConfig(&gWindowConfig_81E6CE4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
REG_DISPCNT = 4352;
SetVBlankCallback(VBlankCB_ResetRtcScreen);
SetMainCallback2(CB2_ResetRtcScreen);
diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c
index a4642d241..4609f3fd8 100644
--- a/src/engine/save_failed_screen.c
+++ b/src/engine/save_failed_screen.c
@@ -120,8 +120,8 @@ static void CB2_SaveFailedScreen(void)
ResetPaletteFade();
LoadPalette(&gBirchBagGrassPal, 0, sizeof(gBirchBagGrassPal));
LoadPalette(&gSaveFailedClockPal, 0x100, sizeof(gSaveFailedClockPal));
- SetUpWindowConfig(&gWindowConfig_81E6C3C);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
Menu_DrawStdWindowFrame(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window
Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // message window
Menu_PrintText(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1);
diff --git a/src/engine/text.c b/src/engine/text.c
index 2d6d95877..15a535ff0 100644
--- a/src/engine/text.c
+++ b/src/engine/text.c
@@ -492,7 +492,7 @@ static const ShiftGlyphTileShadowedFunc sShiftGlyphTileShadowedFuncs[] =
ShiftGlyphTile_ShadowedFont_Width8,
};
-const struct WindowTemplate gWindowConfig_81E6C3C =
+const struct WindowTemplate gWindowTemplate_81E6C3C =
{
0, // BG number
2, // BG character base block
@@ -513,7 +513,7 @@ const struct WindowTemplate gWindowConfig_81E6C3C =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6C58 =
+const struct WindowTemplate gWindowTemplate_81E6C58 =
{
0, // BG number
0, // BG character base block
@@ -534,7 +534,7 @@ const struct WindowTemplate gWindowConfig_81E6C58 =
BG_SCREEN_ADDR(24), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6C74 =
+const struct WindowTemplate gWindowTemplate_81E6C74 =
{
0, // BG number
0, // BG character base block
@@ -555,7 +555,7 @@ const struct WindowTemplate gWindowConfig_81E6C74 =
NULL, // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6C90 =
+const struct WindowTemplate gWindowTemplate_81E6C90 =
{
0, // BG number
1, // BG character base block
@@ -576,7 +576,7 @@ const struct WindowTemplate gWindowConfig_81E6C90 =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6CAC =
+const struct WindowTemplate gWindowTemplate_81E6CAC =
{
0, // BG number
0, // BG character base block
@@ -597,7 +597,7 @@ const struct WindowTemplate gWindowConfig_81E6CAC =
NULL, // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6CC8 =
+const struct WindowTemplate gWindowTemplate_81E6CC8 =
{
2, // BG number
2, // BG character base block
@@ -618,7 +618,7 @@ const struct WindowTemplate gWindowConfig_81E6CC8 =
BG_SCREEN_ADDR(15), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6CE4 =
+const struct WindowTemplate gWindowTemplate_81E6CE4 =
{
0, // BG number
2, // BG character base block
@@ -639,7 +639,7 @@ const struct WindowTemplate gWindowConfig_81E6CE4 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6D00 =
+const struct WindowTemplate gWindowTemplate_81E6D00 =
{
0, // BG number
0, // BG character base block
@@ -660,7 +660,7 @@ const struct WindowTemplate gWindowConfig_81E6D00 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6D1C =
+const struct WindowTemplate gWindowTemplate_81E6D1C =
{
1, // BG number
0, // BG character base block
@@ -681,7 +681,7 @@ const struct WindowTemplate gWindowConfig_81E6D1C =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6D38 =
+const struct WindowTemplate gWindowTemplate_81E6D38 =
{
0, // BG number
0, // BG character base block
@@ -702,7 +702,7 @@ const struct WindowTemplate gWindowConfig_81E6D38 =
NULL, // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6D54 =
+const struct WindowTemplate gWindowTemplate_81E6D54 =
{
3, // BG number
3, // BG character base block
@@ -723,7 +723,7 @@ const struct WindowTemplate gWindowConfig_81E6D54 =
BG_SCREEN_ADDR(15), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6D70 =
+const struct WindowTemplate gWindowTemplate_81E6D70 =
{
3, // BG number
3, // BG character base block
@@ -744,7 +744,7 @@ const struct WindowTemplate gWindowConfig_81E6D70 =
BG_SCREEN_ADDR(15), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6D8C =
+const struct WindowTemplate gWindowTemplate_81E6D8C =
{
1, // BG number
0, // BG character base block
@@ -765,7 +765,7 @@ const struct WindowTemplate gWindowConfig_81E6D8C =
BG_SCREEN_ADDR(14), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6DA8 =
+const struct WindowTemplate gWindowTemplate_81E6DA8 =
{
0, // BG number
0, // BG character base block
@@ -828,7 +828,7 @@ const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6DFC =
+const struct WindowTemplate gWindowTemplate_81E6DFC =
{
0, // BG number
2, // BG character base block
@@ -849,7 +849,7 @@ const struct WindowTemplate gWindowConfig_81E6DFC =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6E18 =
+const struct WindowTemplate gWindowTemplate_81E6E18 =
{
0, // BG number
2, // BG character base block
@@ -870,7 +870,7 @@ const struct WindowTemplate gWindowConfig_81E6E18 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6E34 =
+const struct WindowTemplate gWindowTemplate_81E6E34 =
{
1, // BG number
0, // BG character base block
@@ -891,7 +891,7 @@ const struct WindowTemplate gWindowConfig_81E6E34 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6E50 =
+const struct WindowTemplate gWindowTemplate_81E6E50 =
{
0, // BG number
2, // BG character base block
@@ -912,7 +912,7 @@ const struct WindowTemplate gWindowConfig_81E6E50 =
BG_SCREEN_ADDR(28), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6E6C =
+const struct WindowTemplate gWindowTemplate_81E6E6C =
{
0, // BG number
2, // BG character base block
@@ -933,7 +933,7 @@ const struct WindowTemplate gWindowConfig_81E6E6C =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6E88 =
+const struct WindowTemplate gWindowTemplate_81E6E88 =
{
0, // BG number
0, // BG character base block
@@ -954,7 +954,7 @@ const struct WindowTemplate gWindowConfig_81E6E88 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6EA4 =
+const struct WindowTemplate gWindowTemplate_81E6EA4 =
{
1, // BG number
0, // BG character base block
@@ -975,7 +975,7 @@ const struct WindowTemplate gWindowConfig_81E6EA4 =
BG_SCREEN_ADDR(28), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6EC0 =
+const struct WindowTemplate gWindowTemplate_81E6EC0 =
{
2, // BG number
2, // BG character base block
@@ -996,7 +996,7 @@ const struct WindowTemplate gWindowConfig_81E6EC0 =
BG_SCREEN_ADDR(29), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6EDC =
+const struct WindowTemplate gWindowTemplate_81E6EDC =
{
1, // BG number
0, // BG character base block
@@ -1017,7 +1017,7 @@ const struct WindowTemplate gWindowConfig_81E6EDC =
BG_SCREEN_ADDR(28), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6EF8 =
+const struct WindowTemplate gWindowTemplate_81E6EF8 =
{
2, // BG number
2, // BG character base block
@@ -1038,7 +1038,7 @@ const struct WindowTemplate gWindowConfig_81E6EF8 =
BG_SCREEN_ADDR(29), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6F14 =
+const struct WindowTemplate gWindowTemplate_81E6F14 =
{
1, // BG number
0, // BG character base block
@@ -1059,7 +1059,7 @@ const struct WindowTemplate gWindowConfig_81E6F14 =
BG_SCREEN_ADDR(28), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6F30 =
+const struct WindowTemplate gWindowTemplate_81E6F30 =
{
2, // BG number
2, // BG character base block
@@ -1080,7 +1080,7 @@ const struct WindowTemplate gWindowConfig_81E6F30 =
BG_SCREEN_ADDR(29), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6F4C =
+const struct WindowTemplate gWindowTemplate_81E6F4C =
{
3, // BG number
0, // BG character base block
@@ -1101,7 +1101,7 @@ const struct WindowTemplate gWindowConfig_81E6F4C =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6F68 =
+const struct WindowTemplate gWindowTemplate_81E6F68 =
{
0, // BG number
2, // BG character base block
@@ -1122,7 +1122,7 @@ const struct WindowTemplate gWindowConfig_81E6F68 =
BG_SCREEN_ADDR(13), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6F84 =
+const struct WindowTemplate gWindowTemplate_81E6F84 =
{
0, // BG number
2, // BG character base block
@@ -1143,7 +1143,7 @@ const struct WindowTemplate gWindowConfig_81E6F84 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6FA0 =
+const struct WindowTemplate gWindowTemplate_81E6FA0 =
{
1, // BG number
0, // BG character base block
@@ -1164,7 +1164,7 @@ const struct WindowTemplate gWindowConfig_81E6FA0 =
BG_SCREEN_ADDR(24), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6FBC =
+const struct WindowTemplate gWindowTemplate_81E6FBC =
{
0, // BG number
0, // BG character base block
@@ -1185,7 +1185,7 @@ const struct WindowTemplate gWindowConfig_81E6FBC =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6FD8 =
+const struct WindowTemplate gWindowTemplate_81E6FD8 =
{
0, // BG number
0, // BG character base block
@@ -1206,7 +1206,7 @@ const struct WindowTemplate gWindowConfig_81E6FD8 =
BG_SCREEN_ADDR(24), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E6FF4 =
+const struct WindowTemplate gWindowTemplate_81E6FF4 =
{
0, // BG number
0, // BG character base block
@@ -1227,7 +1227,7 @@ const struct WindowTemplate gWindowConfig_81E6FF4 =
BG_SCREEN_ADDR(24), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7010 =
+const struct WindowTemplate gWindowTemplate_81E7010 =
{
0, // BG number
0, // BG character base block
@@ -1248,7 +1248,7 @@ const struct WindowTemplate gWindowConfig_81E7010 =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E702C =
+const struct WindowTemplate gWindowTemplate_81E702C =
{
3, // BG number
2, // BG character base block
@@ -1269,7 +1269,7 @@ const struct WindowTemplate gWindowConfig_81E702C =
BG_SCREEN_ADDR(15), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7048 =
+const struct WindowTemplate gWindowTemplate_81E7048 =
{
2, // BG number
2, // BG character base block
@@ -1290,7 +1290,7 @@ const struct WindowTemplate gWindowConfig_81E7048 =
BG_SCREEN_ADDR(14), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7064 =
+const struct WindowTemplate gWindowTemplate_81E7064 =
{
2, // BG number
2, // BG character base block
@@ -1311,7 +1311,7 @@ const struct WindowTemplate gWindowConfig_81E7064 =
BG_SCREEN_ADDR(14), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7080 =
+const struct WindowTemplate gWindowTemplate_81E7080 =
{
3, // BG number
0, // BG character base block
@@ -1332,7 +1332,7 @@ const struct WindowTemplate gWindowConfig_81E7080 =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E709C =
+const struct WindowTemplate gWindowTemplate_81E709C =
{
0, // BG number
0, // BG character base block
@@ -1353,7 +1353,7 @@ const struct WindowTemplate gWindowConfig_81E709C =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E70B8 =
+const struct WindowTemplate gWindowTemplate_81E70B8 =
{
2, // BG number
0, // BG character base block
@@ -1374,7 +1374,7 @@ const struct WindowTemplate gWindowConfig_81E70B8 =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E70D4 =
+const struct WindowTemplate gWindowTemplate_81E70D4 =
{
3, // BG number
0, // BG character base block
@@ -1395,7 +1395,7 @@ const struct WindowTemplate gWindowConfig_81E70D4 =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E70F0 =
+const struct WindowTemplate gWindowTemplate_81E70F0 =
{
0, // BG number
0, // BG character base block
@@ -1416,7 +1416,7 @@ const struct WindowTemplate gWindowConfig_81E70F0 =
NULL, // tilemap
};
-const struct WindowTemplate gWindowConfig_81E710C =
+const struct WindowTemplate gWindowTemplate_81E710C =
{
0, // BG number
0, // BG character base block
@@ -1437,7 +1437,7 @@ const struct WindowTemplate gWindowConfig_81E710C =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7128 =
+const struct WindowTemplate gWindowTemplate_81E7128 =
{
0, // BG number
2, // BG character base block
@@ -1458,7 +1458,7 @@ const struct WindowTemplate gWindowConfig_81E7128 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7144 =
+const struct WindowTemplate gWindowTemplate_81E7144 =
{
0, // BG number
2, // BG character base block
@@ -1479,7 +1479,7 @@ const struct WindowTemplate gWindowConfig_81E7144 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7160 =
+const struct WindowTemplate gWindowTemplate_81E7160 =
{
1, // BG number
1, // BG character base block
@@ -1500,7 +1500,7 @@ const struct WindowTemplate gWindowConfig_81E7160 =
BG_SCREEN_ADDR(10), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E717C =
+const struct WindowTemplate gWindowTemplate_81E717C =
{
0, // BG number
3, // BG character base block
@@ -1521,7 +1521,7 @@ const struct WindowTemplate gWindowConfig_81E717C =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7198 =
+const struct WindowTemplate gWindowTemplate_81E7198 =
{
0, // BG number
2, // BG character base block
@@ -1542,7 +1542,7 @@ const struct WindowTemplate gWindowConfig_81E7198 =
BG_SCREEN_ADDR(15), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E71B4 =
+const struct WindowTemplate gWindowTemplate_81E71B4 =
{
0, // BG number
2, // BG character base block
@@ -1563,7 +1563,7 @@ const struct WindowTemplate gWindowConfig_81E71B4 =
BG_SCREEN_ADDR(15), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E71D0 =
+const struct WindowTemplate gWindowTemplate_81E71D0 =
{
1, // BG number
1, // BG character base block
@@ -1584,7 +1584,7 @@ const struct WindowTemplate gWindowConfig_81E71D0 =
BG_SCREEN_ADDR(28), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E71EC =
+const struct WindowTemplate gWindowTemplate_81E71EC =
{
2, // BG number
1, // BG character base block
@@ -1605,7 +1605,7 @@ const struct WindowTemplate gWindowConfig_81E71EC =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7208 =
+const struct WindowTemplate gWindowTemplate_81E7208 =
{
0, // BG number
2, // BG character base block
@@ -1626,7 +1626,7 @@ const struct WindowTemplate gWindowConfig_81E7208 =
BG_SCREEN_ADDR(28), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7224 =
+const struct WindowTemplate gWindowTemplate_81E7224 =
{
0, // BG number
0, // BG character base block
@@ -1647,7 +1647,7 @@ const struct WindowTemplate gWindowConfig_81E7224 =
BG_SCREEN_ADDR(31), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7240 =
+const struct WindowTemplate gWindowTemplate_81E7240 =
{
1, // BG number
2, // BG character base block
@@ -1668,7 +1668,7 @@ const struct WindowTemplate gWindowConfig_81E7240 =
BG_SCREEN_ADDR(30), // tilemap
};
-const struct WindowTemplate gWindowConfig_81E725C =
+const struct WindowTemplate gWindowTemplate_81E725C =
{
0, // BG number
0, // BG character base block
@@ -1689,7 +1689,7 @@ const struct WindowTemplate gWindowConfig_81E725C =
NULL, // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7278 =
+const struct WindowTemplate gWindowTemplate_81E7278 =
{
0, // BG number
0, // BG character base block
@@ -1710,7 +1710,7 @@ const struct WindowTemplate gWindowConfig_81E7278 =
NULL, // tilemap
};
-const struct WindowTemplate gWindowConfig_81E7294 =
+const struct WindowTemplate gWindowTemplate_81E7294 =
{
0, // BG number
0, // BG character base block
@@ -2364,24 +2364,24 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to
void sub_80034D4(u8 *tileData, const u8 *text)
{
- sub_8004E3C(&gWindowConfig_81E6C74, tileData, text);
+ sub_8004E3C(&gWindowTemplate_81E6C74, tileData, text);
}
u8 sub_80034EC(u8 *str)
{
- return Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6C74, str);
+ return Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowTemplate_81E6C74, str);
}
u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType)
{
- sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74;
+ sTempWindow.template = (struct WindowTemplate *)&gWindowTemplate_81E6C74;
Text_InitWindow(&sTempWindow, 0, 0, 0, 0);
return AlignInt2(&sTempWindow, dest, value, alignAmount, alignType);
}
u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType)
{
- sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74;
+ sTempWindow.template = (struct WindowTemplate *)&gWindowTemplate_81E6C74;
Text_InitWindow(&sTempWindow, src, 0, 0, 0);
return AlignString(&sTempWindow, dest, src, alignAmount, alignType);
}
diff --git a/src/engine/trade.c b/src/engine/trade.c
index d37b36f72..30e22b8d5 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -1016,10 +1016,10 @@ void sub_8047CD8(void)
static void sub_8047CE8(void)
{
u8 mpId;
- sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC);
+ sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC);
mpId = GetMultiplayerId();
- sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[3], gLinkPlayers[mpId ^ 1].name, 0xC);
- sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[6], gUnknown_0820C14C[0], 0x8);
+ sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[3], gLinkPlayers[mpId ^ 1].name, 0xC);
+ sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[6], gUnknown_0820C14C[0], 0x8);
sub_804ACD8(gUnknown_0820C14C[1], gUnknown_020296CC[8], 0x14);
nullsub_5(3, 0);
}
@@ -1087,9 +1087,9 @@ static void sub_8047EC0(void)
ResetTasks();
sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5));
SetVBlankCallback(sub_80489F4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
- SetUpWindowConfig(&gWindowConfig_81E6F84);
- Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6F84);
+ Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84);
gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20);
TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window);
Menu_EraseScreen();
@@ -1267,9 +1267,9 @@ static void sub_80484F4(void)
ResetTasks();
sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5));
SetVBlankCallback(sub_80489F4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
- SetUpWindowConfig(&gWindowConfig_81E6F84);
- Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84);
+ InitMenuWindow(&gWindowTemplate_81E6CE4);
+ SetUpWindowConfig(&gWindowTemplate_81E6F84);
+ Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84);
gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20);
TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window);
Menu_EraseScreen();
@@ -3010,7 +3010,7 @@ u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon)
GetMonGender(&gEnemyParty[whichPokemon]);
GetMonData(&gEnemyParty[whichPokemon], MON_DATA_LEVEL);
}
- return Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, a0);
+ return Text_GetStringWidthFromWindowTemplate(&gWindowTemplate_81E7294, a0);
}
#ifdef NONMATCHING
@@ -3067,7 +3067,7 @@ static void sub_804A41C(u8 whichParty)
GetMonData(pokemon, MON_DATA_NICKNAME, nickname);
StringCopy10(string + 6, nickname);
GetMonGender(pokemon);
- string[5] = (50 - Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, string + 6)) / 2;
+ string[5] = (50 - Text_GetStringWidthFromWindowTemplate(&gWindowTemplate_81E7294, string + 6)) / 2;
Text_InitWindowAndPrintText(&gUnknown_03004824->window, string, gUnknown_03004824->unk_007a + 22 * 6 * whichParty + 22 * i, gTradeMonSpriteCoords[i + 6 * whichParty][0], gTradeMonSpriteCoords[i + 6 * whichParty][1]);
}
}
@@ -3141,7 +3141,7 @@ static void sub_804A41C(u8 whichParty)
"\tbl GetMonGender\n"
"\tmov r1, sp\n"
"\tadds r1, 0x22\n"
- "\tldr r0, _0804A518 @ =gWindowConfig_81E7294\n"
+ "\tldr r0, _0804A518 @ =gWindowTemplate_81E7294\n"
"\tbl Text_GetStringWidthFromWindowTemplate\n"
"\tlsls r0, 24\n"
"\tlsrs r0, 24\n"
@@ -3198,7 +3198,7 @@ static void sub_804A41C(u8 whichParty)
"\tbx r0\n"
"\t.align 2, 0\n"
"_0804A514: .4byte gEnemyParty\n"
- "_0804A518: .4byte gWindowConfig_81E7294");
+ "_0804A518: .4byte gWindowTemplate_81E7294");
}
#endif
@@ -3523,7 +3523,7 @@ static bool8 sub_804ABF8(void)
static void sub_804ACD8(const u8 *src, u8 *dest, u8 a2)
{
- sub_804AFB8(&gWindowConfig_81E725C, dest, src, a2);
+ sub_804AFB8(&gWindowTemplate_81E725C, dest, src, a2);
}
#ifdef NONMATCHING
@@ -4028,8 +4028,8 @@ static void sub_804B41C(void)
FreeAllSpritePalettes();
SetVBlankCallback(sub_804B210);
sub_804B228();
- SetUpWindowConfig(&gWindowConfig_81E6F84);
- Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E6F84);
+ SetUpWindowConfig(&gWindowTemplate_81E6F84);
+ Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84);
gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2);
TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window);
Menu_EraseScreen();
@@ -4182,7 +4182,7 @@ static __attribute__((naked)) void sub_804B41C(void)
"\tldr r0, _0804B578 @ =sub_804B210\n"
"\tbl SetVBlankCallback\n"
"\tbl sub_804B228\n"
- "\tldr r4, _0804B57C @ =gWindowConfig_81E6F84\n"
+ "\tldr r4, _0804B57C @ =gWindowTemplate_81E6F84\n"
"\tadds r0, r4, 0\n"
"\tbl SetUpWindowConfig\n"
"\tldr r0, [r6]\n"
@@ -4279,7 +4279,7 @@ static __attribute__((naked)) void sub_804B41C(void)
"_0804B570: .4byte gUnknown_03004828\n"
"_0804B574: .4byte gSharedMem + 0x1F000\n"
"_0804B578: .4byte sub_804B210\n"
- "_0804B57C: .4byte gWindowConfig_81E6F84\n"
+ "_0804B57C: .4byte gWindowTemplate_81E6F84\n"
"_0804B580: .4byte gLinkType\n"
"_0804B584: .4byte 0x00001144\n"
"_0804B588: .4byte gMain\n"
@@ -4531,8 +4531,8 @@ static void sub_804B790(void)
FreeAllSpritePalettes();
SetVBlankCallback(sub_804B210);
sub_804B228();
- SetUpWindowConfig(&gWindowConfig_81E717C);
- Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E717C);
+ SetUpWindowConfig(&gWindowTemplate_81E717C);
+ Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E717C);
gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2);
TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window);
Menu_EraseScreen();
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 11:17:11 +0000