diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-08 10:31:33 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-08 10:31:33 -0400 |
commit | 99bd3d91547858203c84cdf7f4ec37effabc0385 (patch) | |
tree | 0474d1930129cd1943300d1be78b849061e3532f /src | |
parent | 0f67a952a396c80984236b45974407bcc8f6191d (diff) |
Finish main menu decomp
Diffstat (limited to 'src')
-rw-r--r-- | src/berry_fix_program.c | 2 | ||||
-rw-r--r-- | src/daycare.c | 6 | ||||
-rw-r--r-- | src/help_system.c | 6 | ||||
-rw-r--r-- | src/help_system_812B1E0.c | 8 | ||||
-rw-r--r-- | src/link.c | 4 | ||||
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/main_menu.c | 386 | ||||
-rw-r--r-- | src/menews_jisan.c | 2 | ||||
-rw-r--r-- | src/mevent.c | 2 | ||||
-rw-r--r-- | src/mystery_gift_menu.c | 2 | ||||
-rw-r--r-- | src/new_game.c | 2 | ||||
-rw-r--r-- | src/quest_log.c | 4 | ||||
-rw-r--r-- | src/seagallop.c | 4 | ||||
-rw-r--r-- | src/text_window_graphics.c | 2 | ||||
-rw-r--r-- | src/title_screen.c | 6 |
15 files changed, 290 insertions, 150 deletions
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index f224bbc47..7c7c452f3 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -95,7 +95,7 @@ void mb_berry_fix_serve(void) // noreturn ResetSpriteData(); ResetTasks(); ScanlineEffect_Stop(); - gUnknown_3005ECC = 0; + gHelpSystemEnabled = 0; taskId = CreateTask(mb_berry_fix_task, 0); gTasks[taskId].data[0] = 0; SetMainCallback2(mb_berry_fix_maincb); diff --git a/src/daycare.c b/src/daycare.c index c082b4298..1690953ee 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1795,7 +1795,7 @@ void EggHatch(void) ScriptContext2_Enable(); CreateTask(Task_EggHatch, 10); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - sub_812B478(); + HelpSystem_Disable(); } static void Task_EggHatch(u8 taskID) @@ -1901,7 +1901,7 @@ static void EggHatchSetMonNickname(void) SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar3); FreeMonSpritesGfx(); Free(sEggHatchData); - sub_812B484(); + HelpSystem_Enable(); SetMainCallback2(CB2_ReturnToField); } @@ -2024,7 +2024,7 @@ static void CB2_EggHatch_1(void) UnsetBgTilemapBuffer(1); Free(sEggHatchData); SetMainCallback2(CB2_ReturnToField); - sub_812B484(); + HelpSystem_Enable(); } break; } diff --git a/src/help_system.c b/src/help_system.c index 2d96ae9d6..7859961db 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -49,15 +49,15 @@ u8 RunHelpSystemCallback(void) { case 0: sInHelpSystem = 0; - if (gSaveBlock2Ptr->optionsButtonMode != OPTIONS_BUTTON_MODE_NORMAL) + if (gSaveBlock2Ptr->optionsButtonMode != OPTIONS_BUTTON_MODE_HELP) return 0; if (JOY_NEW(R_BUTTON) && gUnknown_203F175 == 1) return 0; if (JOY_NEW(L_BUTTON | R_BUTTON)) { - if (!sub_812B45C() || !gUnknown_3005ECC) + if (!sub_812B45C() || !gHelpSystemEnabled) { - PlaySE(SE_HELP_PAGE); + PlaySE(SE_HELP_ERR); return 0; } m4aMPlayStop(&gMPlayInfo_SE1); diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c index 024cfcf09..6fd069f1c 100644 --- a/src/help_system_812B1E0.c +++ b/src/help_system_812B1E0.c @@ -1005,16 +1005,16 @@ bool8 sub_812B45C(void) return TRUE; } -void sub_812B478(void) +void HelpSystem_Disable(void) { - gUnknown_3005ECC = 0; + gHelpSystemEnabled = 0; } -void sub_812B484(void) +void HelpSystem_Enable(void) { if (gUnknown_203ADFA != 2 && gUnknown_203ADFA != 3) { - gUnknown_3005ECC = 1; + gHelpSystemEnabled = 1; sub_812B4B8(); } } diff --git a/src/link.c b/src/link.c index 9d67c984e..c51ec80af 100644 --- a/src/link.c +++ b/src/link.c @@ -1577,7 +1577,7 @@ static void CB2_PrintErrorMessage(void) { if (JOY_NEW(A_BUTTON)) { - sub_812B484(); + HelpSystem_Enable(); PlaySE(SE_PIN); gWirelessCommType = 0; sLinkErrorBuffer.unk_06 = 0; @@ -1588,7 +1588,7 @@ static void CB2_PrintErrorMessage(void) { if (JOY_NEW(A_BUTTON)) { - sub_812B484(); + HelpSystem_Enable(); rfu_REQ_stopMode(); rfu_waitREQComplete(); DoSoftReset(); diff --git a/src/main.c b/src/main.c index 0d4e2ee1e..eb1625473 100644 --- a/src/main.c +++ b/src/main.c @@ -104,7 +104,7 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7; EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0}; EWRAM_DATA u16 gTrainerId = 0; -extern bool8 gUnknown_3005ECC; +extern bool8 gHelpSystemEnabled; extern bool8 gWirelessCommType; extern bool8 gUnknown_3005E88; @@ -138,7 +138,7 @@ void AgbMain() SetDefaultFontsPointer(); gSoftResetDisabled = FALSE; - gUnknown_3005ECC = FALSE; + gHelpSystemEnabled = FALSE; sub_80F50F4(); diff --git a/src/main_menu.c b/src/main_menu.c index 7be99ce2c..a4db5b1f5 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -19,43 +19,104 @@ #include "sound.h" #include "title_screen.h" #include "help_system.h" +#include "string_util.h" +#include "pokedex.h" +#include "text_window.h" +#include "text_window_graphics.h" #include "constants/songs.h" -bool32 sub_800C318(u8 a0); -void sub_800C4D0(u8 taskId); -void sub_800C634(u8 taskId, const u8 *str); -void sub_800C688(u8 taskId); -void sub_800C704(u8 taskId); -void sub_800C780(u8 taskId); -void sub_800C7A0(u8 taskId); -void sub_800C9CC(u8 taskId); -void sub_800CA28(u8 taskId); -void sub_800CA54(u8 taskId); -void sub_800CA94(u8 taskId); -void sub_800CB90(u8 taskId); -void sub_800CC68(u8 taskId); -void sub_800CC94(u8 menuType, u8 cursorPos); -bool8 sub_800CCF8(u8 taskId); -void sub_800CDF8(const u8 *str); -void sub_800CE58(void); -void sub_800CE70(void); -void sub_800CED4(void); -void sub_800CF3C(void); -void sub_800CFC4(void); -void sub_800D044(u8 a0); -void sub_800D094(u8 a0); -void sub_800D0B4(const struct WindowTemplate * template); -void sub_800D1E8(const struct WindowTemplate * template); - -extern const struct WindowTemplate gUnknown_8234618[]; -extern const u16 gUnknown_8234648[]; -extern const u16 gUnknown_8234668[]; -extern const u8 gUnknown_8234688[]; -extern const u8 gUnknown_823468B[]; -extern const struct BgTemplate gUnknown_8234690[1]; -extern const u8 gUnknown_8234694[]; - -void sub_800C2D4(void) +static bool32 MainMenuGpuInit(u8 a0); +static void Task_SetWin0BldRegsAndCheckSaveFile(u8 taskId); +static void PrintSaveErrorStatus(u8 taskId, const u8 *str); +static void Task_SaveErrorStatus_RunPrinterThenWaitButton(u8 taskId); +static void Task_SetWin0BldRegsNoSaveFileCheck(u8 taskId); +static void Task_WaitFadeAndPrintMainMenuText(u8 taskId); +static void Task_PrintMainMenuText(u8 taskId); +static void Task_WaitDma3AndFadeIn(u8 taskId); +static void Task_UpdateVisualSelection(u8 taskId); +static void Task_HandleMenuInput(u8 taskId); +static void Task_ExecuteMainMenuSelection(u8 taskId); +static void Task_MysteryGiftError(u8 taskId); +static void Task_ReturnToTileScreen(u8 taskId); +static void MoveWindowByMenuTypeAndCursorPos(u8 menuType, u8 cursorPos); +static bool8 HandleMenuInput(u8 taskId); +static void PrintMessageOnWindow4(const u8 *str); +static void PrintContinueStats(void); +static void PrintPlayerName(void); +static void PrintPlayTime(void); +static void PrintDexCount(void); +static void PrintBadgeCount(void); +static void LoadUserFrameToBg(u8 bgId); +static void SetStdFrame0OnBg(u8 bgId); +static void DrawBubbleBorder(const struct WindowTemplate * template); +static void DestroyWindowBubbleFrame(const struct WindowTemplate * template); + +static const u8 sString_Dummy[] = _(""); +static const u8 sString_Newline[] = _("\n"); + +static const struct WindowTemplate sWindowTemplate[] = { + { + .bg = 0, + .tilemapLeft = 3, + .tilemapTop = 1, + .width = 24, + .height = 2, + .paletteNum = 15, + .baseBlock = 0x001 + }, { + .bg = 0, + .tilemapLeft = 3, + .tilemapTop = 1, + .width = 24, + .height = 10, + .paletteNum = 15, + .baseBlock = 0x001 + }, { + .bg = 0, + .tilemapLeft = 3, + .tilemapTop = 13, + .width = 24, + .height = 2, + .paletteNum = 15, + .baseBlock = 0x0f1 + }, { + .bg = 0, + .tilemapLeft = 3, + .tilemapTop = 17, + .width = 24, + .height = 2, + .paletteNum = 15, + .baseBlock = 0x121 + }, { + .bg = 0, + .tilemapLeft = 3, + .tilemapTop = 15, + .width = 24, + .height = 4, + .paletteNum = 15, + .baseBlock = 0x001 + }, DUMMY_WIN_TEMPLATE +}; + +static const u16 sBgPal00[] = INCBIN_U16("data/main_menu/unk_8234648.gbapal"); +static const u16 sBgPal15[] = INCBIN_U16("data/main_menu/unk_8234668.gbapal"); + +static const u8 sTextColor1[] = { 10, 11, 12 }; + +static const u8 sTextColor2[] = { 10, 1, 12 }; + +static const struct BgTemplate sBgTemplate[] = { + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 30, + .priority = 0 + } +}; + +static const u8 gUnknown_8234694[] = { 0, 1, 2 }; + +static void CB2_MainMenu(void) { RunTasks(); AnimateSprites(); @@ -63,24 +124,24 @@ void sub_800C2D4(void) UpdatePaletteFade(); } -void sub_800C2EC(void) +static void VBlankCB_MainMenu(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -void sub_800C300(void) +void CB2_InitMainMenu(void) { - sub_800C318(1); + MainMenuGpuInit(1); } -void sub_800C30C(void) +static void CB2_InitMainMenu_2(void) { - sub_800C318(1); + MainMenuGpuInit(1); } -bool32 sub_800C318(u8 a0) +static bool32 MainMenuGpuInit(u8 a0) { u8 taskId; @@ -104,17 +165,17 @@ bool32 sub_800C318(u8 a0) FreeAllSpritePalettes(); ResetPaletteFade(); ResetBgsAndClearDma3BusyFlags(FALSE); - InitBgsFromTemplates(0, gUnknown_8234690, NELEMS(gUnknown_8234690)); + InitBgsFromTemplates(0, sBgTemplate, NELEMS(sBgTemplate)); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(1, 0, 0); ChangeBgY(1, 0, 0); ChangeBgX(2, 0, 0); ChangeBgY(2, 0, 0); - InitWindows(gUnknown_8234618); + InitWindows(sWindowTemplate); DeactivateAllTextPrinters(); - LoadPalette(gUnknown_8234648, 0x00, 0x20); - LoadPalette(gUnknown_8234668, 0xF0, 0x20); + LoadPalette(sBgPal00, 0x00, 0x20); + LoadPalette(sBgPal15, 0xF0, 0x20); SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); SetGpuReg(REG_OFFSET_WININ, 0); @@ -122,15 +183,15 @@ bool32 sub_800C318(u8 a0) SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); - SetMainCallback2(sub_800C2D4); + SetMainCallback2(CB2_MainMenu); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON); - taskId = CreateTask(sub_800C4D0, 0); + taskId = CreateTask(Task_SetWin0BldRegsAndCheckSaveFile, 0); gTasks[taskId].data[1] = 0; gTasks[taskId].data[8] = a0; return FALSE; } -void sub_800C4D0(u8 taskId) +static void Task_SetWin0BldRegsAndCheckSaveFile(u8 taskId) { if (!gPaletteFade.active) { @@ -144,8 +205,8 @@ void sub_800C4D0(u8 taskId) switch (gSaveFileStatus) { case 1: - sub_800D044(0); - if (sub_806E2BC() == TRUE) + LoadUserFrameToBg(0); + if (Flag_0x839_IsSet() == TRUE) { gTasks[taskId].data[0] = 2; } @@ -153,18 +214,18 @@ void sub_800C4D0(u8 taskId) { gTasks[taskId].data[0] = 1; } - gTasks[taskId].func = sub_800C704; + gTasks[taskId].func = Task_SetWin0BldRegsNoSaveFileCheck; break; case 2: - sub_800D094(0); + SetStdFrame0OnBg(0); gTasks[taskId].data[0] = 0; - sub_800C634(taskId, gText_SaveFileHasBeenDeleted); + PrintSaveErrorStatus(taskId, gText_SaveFileHasBeenDeleted); break; case 0xFF: - sub_800D094(0); + SetStdFrame0OnBg(0); gTasks[taskId].data[0] = 1; - sub_800C634(taskId, gText_SaveFileCorruptedPrevWillBeLoaded); - if (sub_806E2BC() == TRUE) + PrintSaveErrorStatus(taskId, gText_SaveFileCorruptedPrevWillBeLoaded); + if (Flag_0x839_IsSet() == TRUE) { gTasks[taskId].data[0] = 2; } @@ -175,29 +236,29 @@ void sub_800C4D0(u8 taskId) break; case 0: default: - sub_800D044(0); + LoadUserFrameToBg(0); gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_800C704; + gTasks[taskId].func = Task_SetWin0BldRegsNoSaveFileCheck; break; case 4: - sub_800D094(0); + SetStdFrame0OnBg(0); gTasks[taskId].data[0] = 0; - sub_800C634(taskId, gText_1MSubCircuitBoardNotInstalled); + PrintSaveErrorStatus(taskId, gText_1MSubCircuitBoardNotInstalled); break; } } } -void sub_800C634(u8 taskId, const u8 *str) +static void PrintSaveErrorStatus(u8 taskId, const u8 *str) { - sub_800CDF8(str); - gTasks[taskId].func = sub_800C688; + PrintMessageOnWindow4(str); + gTasks[taskId].func = Task_SaveErrorStatus_RunPrinterThenWaitButton; BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); ShowBg(0); - SetVBlankCallback(sub_800C2EC); + SetVBlankCallback(VBlankCB_MainMenu); } -void sub_800C688(u8 taskId) +static void Task_SaveErrorStatus_RunPrinterThenWaitButton(u8 taskId) { if (!gPaletteFade.active) { @@ -205,17 +266,17 @@ void sub_800C688(u8 taskId) if (!IsTextPrinterActive(4) && JOY_NEW(A_BUTTON)) { ClearWindowTilemap(4); - sub_800D1E8(&gUnknown_8234618[4]); - sub_800D044(0); + DestroyWindowBubbleFrame(&sWindowTemplate[4]); + LoadUserFrameToBg(0); if (gTasks[taskId].data[0] == 0) - gTasks[taskId].func = sub_800C704; + gTasks[taskId].func = Task_SetWin0BldRegsNoSaveFileCheck; else - gTasks[taskId].func = sub_800C7A0; + gTasks[taskId].func = Task_PrintMainMenuText; } } } -void sub_800C704(u8 taskId) +static void Task_SetWin0BldRegsNoSaveFileCheck(u8 taskId) { if (!gPaletteFade.active) { @@ -229,21 +290,21 @@ void sub_800C704(u8 taskId) SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0)); SetGpuReg(REG_OFFSET_BLDY, 7); if (gTasks[taskId].data[0] == 0) - gTasks[taskId].func = sub_800CA94; + gTasks[taskId].func = Task_ExecuteMainMenuSelection; else - gTasks[taskId].func = sub_800C780; + gTasks[taskId].func = Task_WaitFadeAndPrintMainMenuText; } } -void sub_800C780(u8 taskId) +static void Task_WaitFadeAndPrintMainMenuText(u8 taskId) { if (!gPaletteFade.active) { - sub_800C7A0(taskId); + Task_PrintMainMenuText(taskId); } } -void sub_800C7A0(u8 taskId) +static void Task_PrintMainMenuText(u8 taskId) { u16 pal; SetGpuReg(REG_OFFSET_WIN0H, 0); @@ -265,19 +326,19 @@ void sub_800C7A0(u8 taskId) case 0: default: FillWindowPixelBuffer(0, PIXEL_FILL(10)); - AddTextPrinterParameterized3(0, 2, 2, 2, gUnknown_8234688, -1, gText_NewGame); - sub_800D0B4(&gUnknown_8234618[0]); + AddTextPrinterParameterized3(0, 2, 2, 2, sTextColor1, -1, gText_NewGame); + DrawBubbleBorder(&sWindowTemplate[0]); PutWindowTilemap(0); CopyWindowToVram(0, 3); break; case 1: FillWindowPixelBuffer(1, PIXEL_FILL(10)); FillWindowPixelBuffer(2, PIXEL_FILL(10)); - AddTextPrinterParameterized3(1, 2, 2, 2, gUnknown_8234688, -1, gText_Continue); - AddTextPrinterParameterized3(2, 2, 2, 2, gUnknown_8234688, -1, gText_NewGame); - sub_800CE58(); - sub_800D0B4(&gUnknown_8234618[1]); - sub_800D0B4(&gUnknown_8234618[2]); + AddTextPrinterParameterized3(1, 2, 2, 2, sTextColor1, -1, gText_Continue); + AddTextPrinterParameterized3(2, 2, 2, 2, sTextColor1, -1, gText_NewGame); + PrintContinueStats(); + DrawBubbleBorder(&sWindowTemplate[1]); + DrawBubbleBorder(&sWindowTemplate[2]); PutWindowTilemap(1); PutWindowTilemap(2); CopyWindowToVram(1, 2); @@ -287,14 +348,14 @@ void sub_800C7A0(u8 taskId) FillWindowPixelBuffer(1, PIXEL_FILL(10)); FillWindowPixelBuffer(2, PIXEL_FILL(10)); FillWindowPixelBuffer(3, PIXEL_FILL(10)); - AddTextPrinterParameterized3(1, 2, 2, 2, gUnknown_8234688, -1, gText_Continue); - AddTextPrinterParameterized3(2, 2, 2, 2, gUnknown_8234688, -1, gText_NewGame); + AddTextPrinterParameterized3(1, 2, 2, 2, sTextColor1, -1, gText_Continue); + AddTextPrinterParameterized3(2, 2, 2, 2, sTextColor1, -1, gText_NewGame); gTasks[taskId].data[10] = 1; - AddTextPrinterParameterized3(3, 2, 2, 2, gUnknown_8234688, -1, gText_MysteryGift); - sub_800CE58(); - sub_800D0B4(&gUnknown_8234618[1]); - sub_800D0B4(&gUnknown_8234618[2]); - sub_800D0B4(&gUnknown_8234618[3]); + AddTextPrinterParameterized3(3, 2, 2, 2, sTextColor1, -1, gText_MysteryGift); + PrintContinueStats(); + DrawBubbleBorder(&sWindowTemplate[1]); + DrawBubbleBorder(&sWindowTemplate[2]); + DrawBubbleBorder(&sWindowTemplate[3]); PutWindowTilemap(1); PutWindowTilemap(2); PutWindowTilemap(3); @@ -303,35 +364,35 @@ void sub_800C7A0(u8 taskId) CopyWindowToVram(3, 3); break; } - gTasks[taskId].func = sub_800C9CC; + gTasks[taskId].func = Task_WaitDma3AndFadeIn; } -void sub_800C9CC(u8 taskId) +static void Task_WaitDma3AndFadeIn(u8 taskId) { if (CheckForSpaceForDma3Request(-1) != -1) { - gTasks[taskId].func = sub_800CA28; + gTasks[taskId].func = Task_UpdateVisualSelection; BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); ShowBg(0); - SetVBlankCallback(sub_800C2EC); + SetVBlankCallback(VBlankCB_MainMenu); } } -void sub_800CA28(u8 taskId) +static void Task_UpdateVisualSelection(u8 taskId) { - sub_800CC94(gTasks[taskId].data[0], gTasks[taskId].data[1]); - gTasks[taskId].func = sub_800CA54; + MoveWindowByMenuTypeAndCursorPos(gTasks[taskId].data[0], gTasks[taskId].data[1]); + gTasks[taskId].func = Task_HandleMenuInput; } -void sub_800CA54(u8 taskId) +static void Task_HandleMenuInput(u8 taskId) { - if (!gPaletteFade.active && sub_800CCF8(taskId)) + if (!gPaletteFade.active && HandleMenuInput(taskId)) { - gTasks[taskId].func = sub_800CA28; + gTasks[taskId].func = Task_UpdateVisualSelection; } } -void sub_800CA94(u8 taskId) +static void Task_ExecuteMainMenuSelection(u8 taskId) { s32 r0; if (!gPaletteFade.active) @@ -367,8 +428,8 @@ void sub_800CA94(u8 taskId) case 2: if (!IsWirelessAdapterConnected()) { - sub_800D094(0); - gTasks[taskId].func = sub_800CB90; + SetStdFrame0OnBg(0); + gTasks[taskId].func = Task_MysteryGiftError; BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); return; } @@ -398,7 +459,7 @@ void sub_800CA94(u8 taskId) break; case 2: SetMainCallback2(c2_mystery_gift); - sub_812B478(); + HelpSystem_Disable(); FreeAllWindowBuffers(); DestroyTask(taskId); break; @@ -406,16 +467,16 @@ void sub_800CA94(u8 taskId) } } -void sub_800CB90(u8 taskId) +static void Task_MysteryGiftError(u8 taskId) { switch (gTasks[taskId].data[9]) { case 0: FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20); if (gTasks[taskId].data[10] == 1) - sub_800CDF8(gText_WirelessAdapterIsNotConnected); + PrintMessageOnWindow4(gText_WirelessAdapterIsNotConnected); else - sub_800CDF8(gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached); + PrintMessageOnWindow4(gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached); gTasks[taskId].data[9]++; break; case 1: @@ -432,13 +493,13 @@ void sub_800CB90(u8 taskId) { PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - gTasks[taskId].func = sub_800CC68; + gTasks[taskId].func = Task_ReturnToTileScreen; } break; } } -void sub_800CC68(u8 taskId) +static void Task_ReturnToTileScreen(u8 taskId) { if (!gPaletteFade.active) { @@ -447,7 +508,7 @@ void sub_800CC68(u8 taskId) } } -void sub_800CC94(u8 menuType, u8 cursorPos) +static void MoveWindowByMenuTypeAndCursorPos(u8 menuType, u8 cursorPos) { u16 win0v1, win0v2; SetGpuReg(REG_OFFSET_WIN0H, 0x12DE); @@ -481,14 +542,14 @@ void sub_800CC94(u8 menuType, u8 cursorPos) SetGpuReg(REG_OFFSET_WIN0V, (win0v1 + (2 << 8)) | (win0v2 - 2)); } -bool8 sub_800CCF8(u8 taskId) +static bool8 HandleMenuInput(u8 taskId) { if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); IsWirelessAdapterConnected(); // called for its side effects only BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - gTasks[taskId].func = sub_800CA94; + gTasks[taskId].func = Task_ExecuteMainMenuSelection; } else if (JOY_NEW(B_BUTTON)) { @@ -496,7 +557,7 @@ bool8 sub_800CCF8(u8 taskId) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); SetGpuReg(REG_OFFSET_WIN0H, 0xF0); SetGpuReg(REG_OFFSET_WIN0V, 0xA0); - gTasks[taskId].func = sub_800CC68; + gTasks[taskId].func = Task_ReturnToTileScreen; } else if (JOY_NEW(DPAD_UP) && gTasks[taskId].data[1] > 0) { @@ -512,34 +573,113 @@ bool8 sub_800CCF8(u8 taskId) return FALSE; } -void sub_800CDF8(const u8 *str) +static void PrintMessageOnWindow4(const u8 *str) { FillWindowPixelBuffer(4, PIXEL_FILL(10)); - sub_800D0B4(&gUnknown_8234618[4]); - AddTextPrinterParameterized3(4, 2, 0, 2, gUnknown_8234688, 2, str); + DrawBubbleBorder(&sWindowTemplate[4]); + AddTextPrinterParameterized3(4, 2, 0, 2, sTextColor1, 2, str); PutWindowTilemap(4); CopyWindowToVram(4, 2); SetGpuReg(REG_OFFSET_WIN0H, 0x13DD); SetGpuReg(REG_OFFSET_WIN0V, 0x739D); } -void sub_800CE58(void) +static void PrintContinueStats(void) { - sub_800CE70(); - sub_800CF3C(); - sub_800CED4(); - sub_800CFC4(); + PrintPlayerName(); + PrintDexCount(); + PrintPlayTime(); + PrintBadgeCount(); } -void sub_800CE70(void) +static void PrintPlayerName(void) { s32 i; u8 name[OT_NAME_LENGTH + 1]; u8 *ptr; - AddTextPrinterParameterized3(1, 2, 2, 18, gUnknown_823468B, -1, gText_Player); + AddTextPrinterParameterized3(1, 2, 2, 18, sTextColor2, -1, gText_Player); ptr = name; for (i = 0; i < OT_NAME_LENGTH; i++) *ptr++ = gSaveBlock2Ptr->playerName[i]; *ptr = EOS; - AddTextPrinterParameterized3(1, 2, 62, 18, gUnknown_823468B, -1, name); + AddTextPrinterParameterized3(1, 2, 62, 18, sTextColor2, -1, name); +} + +static void PrintPlayTime(void) +{ + u8 strbuf[30]; + u8 *ptr; + + AddTextPrinterParameterized3(1, 2, 2, 34, sTextColor2, -1, gText_Time); + ptr = ConvertIntToDecimalStringN(strbuf, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3); + *ptr++ = CHAR_COLON; + ConvertIntToDecimalStringN(ptr, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); + AddTextPrinterParameterized3(1, 2, 62, 34, sTextColor2, -1, strbuf); +} + +static void PrintDexCount(void) +{ + u8 strbuf[30]; + u8 *ptr; + u16 dexcount; + if (FlagGet(FLAG_0x829) == TRUE) + { + if (IsNationalPokedexEnabled()) + dexcount = GetNationalPokedexCount(FLAG_GET_CAUGHT); + else + dexcount = GetKantoPokedexCount(FLAG_GET_CAUGHT); + AddTextPrinterParameterized3(1, 2, 2, 50, sTextColor2, -1, gText_Pokedex); + ptr = ConvertIntToDecimalStringN(strbuf, dexcount, STR_CONV_MODE_LEFT_ALIGN, 3); + StringAppend(ptr, gTextJPDummy_Hiki); + AddTextPrinterParameterized3(1, 2, 62, 50, sTextColor2, -1, strbuf); + } +} + +static void PrintBadgeCount(void) +{ + u8 strbuf[30]; + u8 *ptr; + u32 flagId; + u8 nbadges = 0; + for (flagId = FLAG_UNK820; flagId < FLAG_UNK820 + 8; flagId++) + { + if (FlagGet(flagId)) + nbadges++; + } + AddTextPrinterParameterized3(1, 2, 2, 66, sTextColor2, -1, gText_Badges); + ptr = ConvertIntToDecimalStringN(strbuf, nbadges, STR_CONV_MODE_LEADING_ZEROS, 1); + StringAppend(ptr, gTextJPDummy_Ko); + AddTextPrinterParameterized3(1, 2, 62, 66, sTextColor2, -1, strbuf); +} + +static void LoadUserFrameToBg(u8 bgId) +{ + LoadBgTiles(bgId, GetUserFrameGraphicsInfo(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, 0x1B1); + LoadPalette(GetUserFrameGraphicsInfo(gSaveBlock2Ptr->optionsWindowFrameType)->palette, 0x20, 0x20); + DestroyWindowBubbleFrame(&sWindowTemplate[4]); +} + +static void SetStdFrame0OnBg(u8 bgId) +{ + TextWindow_SetStdFrame0_WithPal(0, 0x1B1, 0x20); + DestroyWindowBubbleFrame(&sWindowTemplate[4]); +} + +static void DrawBubbleBorder(const struct WindowTemplate * windowTemplate) +{ + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B1, windowTemplate->tilemapLeft - 1, windowTemplate->tilemapTop - 1, 1, 1, 2); + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B2, windowTemplate->tilemapLeft, windowTemplate->tilemapTop - 1, windowTemplate->width, windowTemplate->height, 2); + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B3, windowTemplate->tilemapLeft + windowTemplate->width, windowTemplate->tilemapTop - 1, 1, 1, 2); + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B4, windowTemplate->tilemapLeft - 1, windowTemplate->tilemapTop, 1, windowTemplate->height, 2); + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B6, windowTemplate->tilemapLeft + windowTemplate->width, windowTemplate->tilemapTop, 1, windowTemplate->height, 2); + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B7, windowTemplate->tilemapLeft - 1, windowTemplate->tilemapTop + windowTemplate->height, 1, 1, 2); + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B8, windowTemplate->tilemapLeft, windowTemplate->tilemapTop + windowTemplate->height, windowTemplate->width, 1, 2); + FillBgTilemapBufferRect(windowTemplate->bg, 0x1B9, windowTemplate->tilemapLeft + windowTemplate->width, windowTemplate->tilemapTop + windowTemplate->height, 1, 1, 2); + CopyBgTilemapBufferToVram(windowTemplate->bg); +} + +static void DestroyWindowBubbleFrame(const struct WindowTemplate * windowTemplate) +{ + FillBgTilemapBufferRect(windowTemplate->bg, 0x000, windowTemplate->tilemapLeft - 1, windowTemplate->tilemapTop - 1, windowTemplate->tilemapLeft + windowTemplate->width + 1, windowTemplate->tilemapTop + windowTemplate->height + 1, 2); + CopyBgTilemapBufferToVram(windowTemplate->bg); } diff --git a/src/menews_jisan.c b/src/menews_jisan.c index 0d406e66a..2f6172bbc 100644 --- a/src/menews_jisan.c +++ b/src/menews_jisan.c @@ -59,7 +59,7 @@ u16 sub_8146CE8(void) struct MysteryEventStruct *r4 = sub_8143D94(); u16 r5; - if (!sub_806E2BC() || !ValidateReceivedWonderNews()) + if (!Flag_0x839_IsSet() || !ValidateReceivedWonderNews()) return 0; r5 = sub_8146E0C(r4); diff --git a/src/mevent.c b/src/mevent.c index af2006e14..a7115d2d4 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -475,7 +475,7 @@ void sub_8143910(u8 taskId) data->state = 0; break; case 26: - sub_812B484(); + HelpSystem_Enable(); Free(data->t10); DestroyTask(taskId); SetMainCallback2(MainCB_FreeAllBuffersAndReturnToInitTitleScreen); diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 39efed6eb..9c050810e 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -1680,7 +1680,7 @@ void task00_mystery_gift(u8 taskId) break; case 37: CloseLink(); - sub_812B484(); + HelpSystem_Enable(); Free(data->buffer); DestroyTask(taskId); SetMainCallback2(MainCB_FreeAllBuffersAndReturnToInitTitleScreen); diff --git a/src/new_game.c b/src/new_game.c index 58deac9b9..efeea13cc 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -66,7 +66,7 @@ static void SetDefaultOptions(void) gSaveBlock2Ptr->optionsBattleStyle = OPTIONS_BATTLE_STYLE_SHIFT; gSaveBlock2Ptr->optionsBattleSceneOff = FALSE; gSaveBlock2Ptr->regionMapZoom = FALSE; - gSaveBlock2Ptr->optionsButtonMode = OPTIONS_BUTTON_MODE_NORMAL; + gSaveBlock2Ptr->optionsButtonMode = OPTIONS_BUTTON_MODE_HELP; } static void ClearPokedexFlags(void) diff --git a/src/quest_log.c b/src/quest_log.c index f98357b32..71cab91a1 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -854,7 +854,7 @@ void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId) if (sNumScenes != 0) { - gUnknown_3005ECC = FALSE; + gHelpSystemEnabled = FALSE; sub_8110F90(taskId); DestroyTask(taskId); } @@ -1603,7 +1603,7 @@ void sub_81120AC(u8 taskId) gTextFlags.autoScroll = FALSE; gUnknown_2036E28 = 0; sub_8082740(0); - gUnknown_3005ECC = 1; + gHelpSystemEnabled = 1; DestroyTask(taskId); break; } diff --git a/src/seagallop.c b/src/seagallop.c index 5374f7bac..006a356e4 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -179,7 +179,7 @@ static const struct SpriteTemplate sWakeSpriteTemplate = { void ScrSpecial_SeaGallopFerry(void) { SetVBlankCallback(NULL); - sub_812B478(); + HelpSystem_Disable(); SetMainCallback2(CB2_SetUpSeaGallopScene); } @@ -306,7 +306,7 @@ static void Task_SeaGallop_2(u8 taskId) if (sub_8055FC4() && !gPaletteFade.active) { Task_SeaGallop_3(); - sub_812B484(); + HelpSystem_Enable(); DestroyTask(taskId); } } diff --git a/src/text_window_graphics.c b/src/text_window_graphics.c index e16037a34..0fb8b38f8 100644 --- a/src/text_window_graphics.c +++ b/src/text_window_graphics.c @@ -51,7 +51,7 @@ const struct TextWindowGraphics gUserFrames[] = { {gUnknown_84717CC, gUnknown_8471A2C} }; // NELEMS = 10 -const struct TextWindowGraphics * sub_8069788(u8 idx) +const struct TextWindowGraphics * GetUserFrameGraphicsInfo(u8 idx) { if (idx >= 20) // if (idx >= NELEMS(gUserFrames)) return &gUserFrames[0]; diff --git a/src/title_screen.c b/src/title_screen.c index f4086b2ff..26770b633 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -513,7 +513,7 @@ static void SetTitleScreenScene_Run(s16 * data) CreateTask(Task_FlameOrLeafSpawner, 5); SetGpuRegsForTitleScreenRun(); data[6] = CreateSlashSprite(); - sub_812B484(); + HelpSystem_Enable(); data[1]++; // fallthrough case 1: @@ -583,7 +583,7 @@ static void SetTitleScreenScene_Restart(s16 * data) } break; case 4: - sub_812B478(); + HelpSystem_Disable(); DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain)); SetMainCallback2(sub_80EC864); break; @@ -626,7 +626,7 @@ static void SetTitleScreenScene_Cry(s16 * data) Sav2_ClearSetDefault(); SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); InitHeap(gHeap, HEAP_SIZE); - SetMainCallback2(sub_800C300); + SetMainCallback2(CB2_InitMainMenu); DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain)); } break; |