summaryrefslogtreecommitdiff
path: root/src/main_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/main_menu.c')
-rw-r--r--src/main_menu.c294
1 files changed, 162 insertions, 132 deletions
diff --git a/src/main_menu.c b/src/main_menu.c
index 3d8d5acc2..7e84ae7ec 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -131,85 +131,115 @@ const u8 gUnknown_082FEEF0[] = INCBIN_U8("graphics/birch_speech/map.bin.lz");
const u16 gUnknown_082FF018[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal");
const u16 gUnknown_082FF028[] = {0, 0, 0, 0, 0, 0, 0, 0};
-const struct WindowTemplate sWindowTemplates_NoSavedGame[] =
-{
+#define MENU_LEFT 2
+#define MENU_TOP_WIN0 1
+#define MENU_TOP_WIN1 5
+#define MENU_TOP_WIN2 1
+#define MENU_TOP_WIN3 9
+#define MENU_TOP_WIN4 13
+#define MENU_TOP_WIN5 17
+#define MENU_TOP_WIN6 21
+#define MENU_WIDTH 26
+#define MENU_HEIGHT_WIN0 2
+#define MENU_HEIGHT_WIN1 2
+#define MENU_HEIGHT_WIN2 6
+#define MENU_HEIGHT_WIN3 2
+#define MENU_HEIGHT_WIN4 2
+#define MENU_HEIGHT_WIN5 2
+#define MENU_HEIGHT_WIN6 2
+
+#define MENU_LEFT_ERROR 2
+#define MENU_TOP_ERROR 15
+#define MENU_WIDTH_ERROR 26
+#define MENU_HEIGHT_ERROR 4
+
+#define MENU_SHADOW_PADDING 1
+
+#define MENU_WIN_HCOORDS WIN_RANGE(((MENU_LEFT - 1) * 8) + MENU_SHADOW_PADDING, (MENU_LEFT + MENU_WIDTH + 1) * 8 - MENU_SHADOW_PADDING)
+#define MENU_WIN_VCOORDS(n) WIN_RANGE(((MENU_TOP_WIN##n - 1) * 8) + MENU_SHADOW_PADDING, (MENU_TOP_WIN##n + MENU_HEIGHT_WIN##n + 1) * 8 - MENU_SHADOW_PADDING)
+#define MENU_SCROLL_SHIFT WIN_RANGE(32, 32)
+
+const struct WindowTemplate sWindowTemplates_MainMenu[] =
+{
+ // No saved game
+ // NEW GAME
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 1,
- .width = 26,
- .height = 2,
+ .tilemapLeft = MENU_LEFT,
+ .tilemapTop = MENU_TOP_WIN0,
+ .width = MENU_WIDTH,
+ .height = MENU_HEIGHT_WIN0,
.paletteNum = 15,
.baseBlock = 1
},
+ // OPTIONS
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 5,
- .width = 26,
- .height = 2,
+ .tilemapLeft = MENU_LEFT,
+ .tilemapTop = MENU_TOP_WIN1,
+ .width = MENU_WIDTH,
+ .height = MENU_HEIGHT_WIN1,
.paletteNum = 15,
.baseBlock = 0x35
- }
-};
-
-const struct WindowTemplate sWindowTemplates_HasSavedGame[] =
-{
+ },
+ // Has saved game
+ // CONTINUE
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 1,
- .width = 26,
- .height = 6,
+ .tilemapLeft = MENU_LEFT,
+ .tilemapTop = MENU_TOP_WIN2,
+ .width = MENU_WIDTH,
+ .height = MENU_HEIGHT_WIN2,
.paletteNum = 15,
.baseBlock = 1
},
+ // NEW GAME
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 9,
- .width = 26,
- .height = 2,
+ .tilemapLeft = MENU_LEFT,
+ .tilemapTop = MENU_TOP_WIN3,
+ .width = MENU_WIDTH,
+ .height = MENU_HEIGHT_WIN3,
.paletteNum = 15,
.baseBlock = 0x9D
},
+ // OPTION / MYSTERY GIFT
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 13,
- .width = 26,
- .height = 2,
+ .tilemapLeft = MENU_LEFT,
+ .tilemapTop = MENU_TOP_WIN4,
+ .width = MENU_WIDTH,
+ .height = MENU_HEIGHT_WIN4,
.paletteNum = 15,
.baseBlock = 0xD1
},
+ // OPTION / MYSTERY EVENTS
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 17,
- .width = 26,
- .height = 2,
+ .tilemapLeft = MENU_LEFT,
+ .tilemapTop = MENU_TOP_WIN5,
+ .width = MENU_WIDTH,
+ .height = MENU_HEIGHT_WIN5,
.paletteNum = 15,
.baseBlock = 0x105
},
+ // OPTION
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 21,
- .width = 26,
- .height = 2,
+ .tilemapLeft = MENU_LEFT,
+ .tilemapTop = MENU_TOP_WIN6,
+ .width = MENU_WIDTH,
+ .height = MENU_HEIGHT_WIN6,
.paletteNum = 15,
.baseBlock = 0x139
- }
-};
-
-const struct WindowTemplate sWindowTemplate_ErrorWindow[] =
-{
+ },
+ // Error message window
{
.priority = 0,
- .tilemapLeft = 2,
- .tilemapTop = 15,
- .width = 26,
- .height = 4,
+ .tilemapLeft = MENU_LEFT_ERROR,
+ .tilemapTop = MENU_TOP_ERROR,
+ .width = MENU_WIDTH_ERROR,
+ .height = MENU_HEIGHT_ERROR,
.paletteNum = 15,
.baseBlock = 0x16D
},
@@ -351,14 +381,14 @@ enum
{
HAS_NO_SAVED_GAME, //NEW GAME, OPTION
HAS_SAVED_GAME, //CONTINUE, NEW GAME, OPTION
- HAS_MYSTERY_GIFT, //CONTINUE, NEW GAME, MYSTERY EVENTS, OPTION
- HAS_MYSTERY_EVENTS,
+ HAS_MYSTERY_GIFT, //CONTINUE, NEW GAME, MYSTERY GIFT, OPTION
+ HAS_MYSTERY_EVENTS, //CONTINUE, NEW GAME, MYSTERY GIFT, MYSTERY EVENTS, OPTION
};
enum {
ACTION_NEW_GAME,
ACTION_CONTINUE,
- ACTION_OPTIONS,
+ ACTION_OPTION,
ACTION_MYSTERY_GIFT,
ACTION_MYSTERY_EVENTS,
ACTION_UNKNOWN, // TODO: change when rom_8011DC0 decompiled
@@ -423,12 +453,12 @@ u32 InitMainMenu(bool8 returningFromOptionsMenu)
else
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); // fade to white
ResetBgsAndClearDma3BusyFlags(0);
- InitBgsFromTemplates(0, gUnknown_082FF0E8, 2);
+ InitBgsFromTemplates(0, gUnknown_082FF0E8, ARRAY_COUNT(gUnknown_082FF0E8));
ChangeBgX(0, 0, 0);
ChangeBgY(0, 0, 0);
ChangeBgX(1, 0, 0);
ChangeBgY(1, 0, 0);
- InitWindows(sWindowTemplates_NoSavedGame);
+ InitWindows(sWindowTemplates_MainMenu);
DeactivateAllTextPrinters();
LoadMainMenuWindowFrameTiles(0, MAIN_MENU_BORDER_TILE);
@@ -535,7 +565,7 @@ void Task_WaitForSaveFileErrorWindow(u8 taskId)
if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON))
{
ClearWindowTilemap(7);
- ClearMainMenuWindowTilemap(sWindowTemplate_ErrorWindow);
+ ClearMainMenuWindowTilemap(&sWindowTemplates_MainMenu[7]);
gTasks[taskId].func = Task_MainMenuCheckBattery;
}
}
@@ -570,7 +600,7 @@ void Task_WaitForBatteryDryErrorWindow(u8 taskId)
if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON))
{
ClearWindowTilemap(7);
- ClearMainMenuWindowTilemap(sWindowTemplate_ErrorWindow);
+ ClearMainMenuWindowTilemap(&sWindowTemplates_MainMenu[7]);
gTasks[taskId].func = Task_DisplayMainMenu;
}
}
@@ -619,22 +649,22 @@ void Task_DisplayMainMenu(u8 taskId)
default:
FillWindowPixelBuffer(0, 0xAA);
FillWindowPixelBuffer(1, 0xAA);
- box_print(0, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
- box_print(1, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
+ AddTextPrinterParameterized3(0, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
+ AddTextPrinterParameterized3(1, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
PutWindowTilemap(0);
PutWindowTilemap(1);
CopyWindowToVram(0, 2);
CopyWindowToVram(1, 2);
- DrawMainMenuWindowBorder(&sWindowTemplates_NoSavedGame[0], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_NoSavedGame[1], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[0], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[1], MAIN_MENU_BORDER_TILE);
break;
case HAS_SAVED_GAME:
FillWindowPixelBuffer(2, 0xAA);
FillWindowPixelBuffer(3, 0xAA);
FillWindowPixelBuffer(4, 0xAA);
- box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
- box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
- box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
+ AddTextPrinterParameterized3(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
+ AddTextPrinterParameterized3(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
+ AddTextPrinterParameterized3(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
fmt_savegame();
PutWindowTilemap(2);
PutWindowTilemap(3);
@@ -642,19 +672,19 @@ void Task_DisplayMainMenu(u8 taskId)
CopyWindowToVram(2, 2);
CopyWindowToVram(3, 2);
CopyWindowToVram(4, 2);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[0], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[2], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[3], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[4], MAIN_MENU_BORDER_TILE);
break;
case HAS_MYSTERY_GIFT:
FillWindowPixelBuffer(2, 0xAA);
FillWindowPixelBuffer(3, 0xAA);
FillWindowPixelBuffer(4, 0xAA);
FillWindowPixelBuffer(5, 0xAA);
- box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
- box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
- box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift);
- box_print(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
+ AddTextPrinterParameterized3(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
+ AddTextPrinterParameterized3(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
+ AddTextPrinterParameterized3(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift);
+ AddTextPrinterParameterized3(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
fmt_savegame();
PutWindowTilemap(2);
PutWindowTilemap(3);
@@ -664,10 +694,10 @@ void Task_DisplayMainMenu(u8 taskId)
CopyWindowToVram(3, 2);
CopyWindowToVram(4, 2);
CopyWindowToVram(5, 2);
- DrawMainMenuWindowBorder(sWindowTemplates_HasSavedGame, MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[3], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[2], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[3], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[4], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[5], MAIN_MENU_BORDER_TILE);
break;
case HAS_MYSTERY_EVENTS:
FillWindowPixelBuffer(2, 0xAA);
@@ -675,11 +705,11 @@ void Task_DisplayMainMenu(u8 taskId)
FillWindowPixelBuffer(4, 0xAA);
FillWindowPixelBuffer(5, 0xAA);
FillWindowPixelBuffer(6, 0xAA);
- box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
- box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
- box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift2);
- box_print(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryEvents);
- box_print(6, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
+ AddTextPrinterParameterized3(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
+ AddTextPrinterParameterized3(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
+ AddTextPrinterParameterized3(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift2);
+ AddTextPrinterParameterized3(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryEvents);
+ AddTextPrinterParameterized3(6, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
fmt_savegame();
PutWindowTilemap(2);
PutWindowTilemap(3);
@@ -691,11 +721,11 @@ void Task_DisplayMainMenu(u8 taskId)
CopyWindowToVram(4, 2);
CopyWindowToVram(5, 2);
CopyWindowToVram(6, 2);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[0], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[3], MAIN_MENU_BORDER_TILE);
- DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[4], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[2], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[3], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[4], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[5], MAIN_MENU_BORDER_TILE);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[6], MAIN_MENU_BORDER_TILE);
tScrollArrowTaskId = AddScrollIndicatorArrowPair(&sScrollArrowsTemplate_MainMenu, &sCurrItemAndOptionMenuCheck);
gTasks[tScrollArrowTaskId].func = Task_ScrollIndicatorArrowPairOnMainMenu;
if (sCurrItemAndOptionMenuCheck == 4)
@@ -732,8 +762,8 @@ bool8 HandleMainMenuInput(u8 taskId)
{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA);
- SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
- SetGpuReg(REG_OFFSET_WIN0V, 0xA0);
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240));
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 160));
gTasks[taskId].func = Task_HandleMainMenuBPressed;
}
else if ((gMain.newKeys & DPAD_UP) && tCurrItem > 0)
@@ -798,7 +828,7 @@ void Task_HandleMainMenuAPressed(u8 taskId)
action = ACTION_NEW_GAME;
break;
case 1:
- action = ACTION_OPTIONS;
+ action = ACTION_OPTION;
break;
}
break;
@@ -813,7 +843,7 @@ void Task_HandleMainMenuAPressed(u8 taskId)
action = ACTION_NEW_GAME;
break;
case 2:
- action = ACTION_OPTIONS;
+ action = ACTION_OPTION;
break;
}
break;
@@ -832,11 +862,11 @@ void Task_HandleMainMenuAPressed(u8 taskId)
if (!wirelessAdapterConnected)
{
action = ACTION_INVALID;
- gTasks[taskId].tMenuType = 0;
+ gTasks[taskId].tMenuType = HAS_NO_SAVED_GAME;
}
break;
case 3:
- action = ACTION_OPTIONS;
+ action = ACTION_OPTION;
break;
}
break;
@@ -857,13 +887,13 @@ void Task_HandleMainMenuAPressed(u8 taskId)
if (!wirelessAdapterConnected)
{
action = ACTION_INVALID;
- gTasks[taskId].tMenuType = 0;
+ gTasks[taskId].tMenuType = HAS_NO_SAVED_GAME;
}
}
else if (wirelessAdapterConnected)
{
action = ACTION_INVALID;
- gTasks[taskId].tMenuType = 1;
+ gTasks[taskId].tMenuType = HAS_SAVED_GAME;
}
else
{
@@ -874,7 +904,7 @@ void Task_HandleMainMenuAPressed(u8 taskId)
if (wirelessAdapterConnected)
{
action = ACTION_INVALID;
- gTasks[taskId].tMenuType = 2;
+ gTasks[taskId].tMenuType = HAS_MYSTERY_GIFT;
}
else
{
@@ -882,7 +912,7 @@ void Task_HandleMainMenuAPressed(u8 taskId)
}
break;
case 4:
- action = ACTION_OPTIONS;
+ action = ACTION_OPTION;
break;
}
break;
@@ -903,7 +933,7 @@ void Task_HandleMainMenuAPressed(u8 taskId)
SetMainCallback2(CB2_ContinueSavedGame);
DestroyTask(taskId);
break;
- case ACTION_OPTIONS:
+ case ACTION_OPTION:
gMain.savedCallback = CB2_ReinitMainMenu;
SetMainCallback2(CB2_InitOptionMenu);
DestroyTask(taskId);
@@ -935,7 +965,7 @@ void Task_HandleMainMenuAPressed(u8 taskId)
return;
}
FreeAllWindowBuffers();
- if (action != ACTION_OPTIONS)
+ if (action != ACTION_OPTION)
sCurrItemAndOptionMenuCheck = 0;
else
sCurrItemAndOptionMenuCheck |= 0x8000; // entering the options menu
@@ -1005,7 +1035,7 @@ void Task_DisplayMainMenuInvalidActionError(u8 taskId)
void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 isScrolled)
{
- SetGpuReg(REG_OFFSET_WIN0H, WINHV_COORDS(9, 231));
+ SetGpuReg(REG_OFFSET_WIN0H, MENU_WIN_HCOORDS);
switch (menuType)
{
@@ -1015,10 +1045,10 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 isScrol
{
case 0:
default:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 31));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(0));
break;
case 1:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(33, 63));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(1));
break;
}
break;
@@ -1027,13 +1057,13 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 isScrol
{
case 0:
default:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(2));
break;
case 1:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(3));
break;
case 2:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(4));
break;
}
break;
@@ -1042,16 +1072,16 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 isScrol
{
case 0:
default:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(2));
break;
case 1:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(3));
break;
case 2:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(4));
break;
case 3:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(5));
break;
}
break;
@@ -1060,28 +1090,28 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 isScrol
{
case 0:
default:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(2));
break;
case 1:
if (isScrolled)
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(33, 63));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(3) - MENU_SCROLL_SHIFT);
else
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(3));
break;
case 2:
if (isScrolled)
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(4) - MENU_SCROLL_SHIFT);
else
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(4));
break;
case 3:
if (isScrolled)
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(5) - MENU_SCROLL_SHIFT);
else
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(5));
break;
case 4:
- SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159));
+ SetGpuReg(REG_OFFSET_WIN0V, MENU_WIN_VCOORDS(6) - MENU_SCROLL_SHIFT);
break;
}
break;
@@ -1134,7 +1164,7 @@ void task_new_game_prof_birch_speech_2(u8 taskId)
spriteId = gTasks[taskId].data[8];
gSprites[spriteId].pos1.x = 0x88;
gSprites[spriteId].pos1.y = 0x3C;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = 1;
sub_8031BAC(taskId, 10);
sub_8031D34(taskId, 20);
@@ -1195,7 +1225,7 @@ void sub_8030A70(u8 taskId)
gSprites[spriteId].pos1.x = 0x64;
gSprites[spriteId].pos1.y = 0x4B;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].data[0] = 0;
CreatePokeballSpriteToReleaseMon(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0xFFFF, SPECIES_LOTAD);
@@ -1276,8 +1306,8 @@ void task_new_game_prof_birch_speech_9(u8 taskId)
{
if (gTasks[taskId].data[5])
{
- gSprites[gTasks[taskId].data[8]].invisible = 1;
- gSprites[gTasks[taskId].data[9]].invisible = 1;
+ gSprites[gTasks[taskId].data[8]].invisible = TRUE;
+ gSprites[gTasks[taskId].data[9]].invisible = TRUE;
if (gTasks[taskId].data[7])
{
gTasks[taskId].data[7]--;
@@ -1288,7 +1318,7 @@ void task_new_game_prof_birch_speech_9(u8 taskId)
gSprites[spriteId].pos1.x = 0xB4;
gSprites[spriteId].pos1.y = 0x3C;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = 1;
gTasks[taskId].data[2] = spriteId;
gTasks[taskId].data[6] = 0;
@@ -1364,14 +1394,14 @@ void sub_8030ED4(u8 taskId)
}
else
{
- gSprites[spriteId].invisible = 1;
+ gSprites[spriteId].invisible = TRUE;
if (gTasks[taskId].data[6])
spriteId = gTasks[taskId].data[11];
else
spriteId = gTasks[taskId].data[10];
gSprites[spriteId].pos1.x = 0xF0;
gSprites[spriteId].pos1.y = 0x3C;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gTasks[taskId].data[2] = spriteId;
gSprites[spriteId].oam.objMode = 1;
sub_8031BAC(taskId, 0);
@@ -1532,8 +1562,8 @@ void task_new_game_prof_birch_speech_part2_8(u8 taskId)
if (gTasks[taskId].data[5])
{
- gSprites[gTasks[taskId].data[8]].invisible = 1;
- gSprites[gTasks[taskId].data[9]].invisible = 1;
+ gSprites[gTasks[taskId].data[8]].invisible = TRUE;
+ gSprites[gTasks[taskId].data[9]].invisible = TRUE;
if (gTasks[taskId].data[7])
{
gTasks[taskId].data[7]--;
@@ -1545,7 +1575,7 @@ void task_new_game_prof_birch_speech_part2_8(u8 taskId)
spriteId = gTasks[taskId].data[10];
gSprites[spriteId].pos1.x = 0x78;
gSprites[spriteId].pos1.y = 0x3C;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = 1;
gTasks[taskId].data[2] = spriteId;
sub_8031BAC(taskId, 2);
@@ -1662,7 +1692,7 @@ void new_game_prof_birch_speech_part2_start(void)
}
gSprites[spriteId].pos1.x = 0xB4;
gSprites[spriteId].pos1.y = 0x3C;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gTasks[taskId].data[2] = spriteId;
SetGpuReg(REG_OFFSET_BG1HOFS, -60);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
@@ -1912,12 +1942,12 @@ void set_default_player_name(u8 nameId)
void CreateMainMenuErrorWindow(const u8* str)
{
FillWindowPixelBuffer(7, 17);
- PrintTextOnWindow(7, 1, str, 0, 1, 2, 0);
+ AddTextPrinterParameterized(7, 1, str, 0, 1, 2, 0);
PutWindowTilemap(7);
CopyWindowToVram(7, 2);
- DrawMainMenuWindowBorder(sWindowTemplate_ErrorWindow, MAIN_MENU_BORDER_TILE);
- SetGpuReg(REG_OFFSET_WIN0H, 0x9E7);
- SetGpuReg(REG_OFFSET_WIN0V, 0x719F);
+ DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[7], MAIN_MENU_BORDER_TILE);
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(9, 231));
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(113, 159));
}
void fmt_savegame(void)
@@ -1931,8 +1961,8 @@ void fmt_savegame(void)
void fmt_time(void)
{
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPlayer);
- box_print(2, 1, 0, 17, gUnknown_082FF0E3, -1, gStringVar4);
- box_print(2, 1, GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 100), 17, gUnknown_082FF0E3, -1, gSaveBlock2Ptr->playerName);
+ AddTextPrinterParameterized3(2, 1, 0, 17, gUnknown_082FF0E3, -1, gStringVar4);
+ AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 100), 17, gUnknown_082FF0E3, -1, gSaveBlock2Ptr->playerName);
}
void fmt_player(void)
@@ -1941,11 +1971,11 @@ void fmt_player(void)
u8* ptr;
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuTime);
- box_print(2, 1, 0x6C, 17, gUnknown_082FF0E3, -1, gStringVar4);
+ AddTextPrinterParameterized3(2, 1, 0x6C, 17, gUnknown_082FF0E3, -1, gStringVar4);
ptr = ConvertIntToDecimalStringN(str, gSaveBlock2Ptr->playTimeHours, 0, 3);
*ptr = 0xF0;
ConvertIntToDecimalStringN(ptr + 1, gSaveBlock2Ptr->playTimeMinutes, 2, 2);
- box_print(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 17, gUnknown_082FF0E3, -1, str);
+ AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 17, gUnknown_082FF0E3, -1, str);
}
void fmt_pokedex(void)
@@ -1960,9 +1990,9 @@ void fmt_pokedex(void)
else
dexCount = GetHoennPokedexCount(1);
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuPokedex);
- box_print(2, 1, 0, 33, gUnknown_082FF0E3, -1, gStringVar4);
+ AddTextPrinterParameterized3(2, 1, 0, 33, gUnknown_082FF0E3, -1, gStringVar4);
ConvertIntToDecimalStringN(str, dexCount, 0, 3);
- box_print(2, 1, GetStringRightAlignXOffset(1, str, 100), 33, gUnknown_082FF0E3, -1, str);
+ AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 100), 33, gUnknown_082FF0E3, -1, str);
}
}
@@ -1978,9 +2008,9 @@ void fmt_badges(void)
badgeCount++;
}
StringExpandPlaceholders(gStringVar4, gText_ContinueMenuBadges);
- box_print(2, 1, 0x6C, 33, gUnknown_082FF0E3, -1, gStringVar4);
+ AddTextPrinterParameterized3(2, 1, 0x6C, 33, gUnknown_082FF0E3, -1, gStringVar4);
ConvertIntToDecimalStringN(str, badgeCount, 2, 1);
- box_print(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 33, gUnknown_082FF0E3, -1, str);
+ AddTextPrinterParameterized3(2, 1, GetStringRightAlignXOffset(1, str, 0xD0), 33, gUnknown_082FF0E3, -1, str);
}
void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-11 00:58:04 +0000