summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/berry_fix_program.c2
-rw-r--r--src/daycare.c6
-rw-r--r--src/help_system.c8
-rw-r--r--src/help_system_812B1E0.c8
-rw-r--r--src/link.c4
-rw-r--r--src/main.c3
-rw-r--r--src/main_menu.c795
-rw-r--r--src/menews_jisan.c2
-rw-r--r--src/mevent.c2
-rw-r--r--src/mystery_gift_menu.c68
-rw-r--r--src/new_game.c2
-rw-r--r--src/quest_log.c18
-rw-r--r--src/seagallop.c4
-rw-r--r--src/text_window_graphics.c2
-rw-r--r--src/title_screen.c6
15 files changed, 832 insertions, 98 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..3ebbcb9ec 100644
--- a/src/help_system.c
+++ b/src/help_system.c
@@ -16,6 +16,8 @@
extern u8 gGlyphInfo[];
+bool8 gHelpSystemEnabled;
+
struct HelpSystemVideoState
{
/*0x00*/ MainCallback savedVblankCb;
@@ -49,15 +51,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..9294c80ce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -104,7 +104,6 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7;
EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0};
EWRAM_DATA u16 gTrainerId = 0;
-extern bool8 gUnknown_3005ECC;
extern bool8 gWirelessCommType;
extern bool8 gUnknown_3005E88;
@@ -138,7 +137,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
new file mode 100644
index 000000000..4307e9696
--- /dev/null
+++ b/src/main_menu.c
@@ -0,0 +1,795 @@
+#include "global.h"
+#include "palette.h"
+#include "gpu_regs.h"
+#include "scanline_effect.h"
+#include "bg.h"
+#include "dma3.h"
+#include "task.h"
+#include "text.h"
+#include "save.h"
+#include "event_data.h"
+#include "window.h"
+#include "menu.h"
+#include "link.h"
+#include "oak_speech.h"
+#include "overworld.h"
+#include "quest_log.h"
+#include "mystery_gift_menu.h"
+#include "strings.h"
+#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"
+
+enum MainMenuType
+{
+ MAIN_MENU_NEWGAME = 0,
+ MAIN_MENU_CONTINUE,
+ MAIN_MENU_MYSTERYGIFT
+};
+
+enum MainMenuWindow
+{
+ MAIN_MENU_WINDOW_NEWGAME_ONLY = 0,
+ MAIN_MENU_WINDOW_CONTINUE,
+ MAIN_MENU_WINDOW_NEWGAME,
+ MAIN_MENU_WINDOW_MYSTERYGIFT,
+ MAIN_MENU_WINDOW_ERROR,
+ MAIN_MENU_WINDOW_COUNT
+};
+
+#define tMenuType data[0]
+#define tCursorPos data[1]
+
+#define tUnused8 data[8]
+#define tMGErrorMsgState data[9]
+#define tMGErrorType data[10]
+
+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 MainMenu_DrawWindow(const struct WindowTemplate * template);
+static void MainMenu_EraseWindow(const struct WindowTemplate * template);
+
+static const u8 sString_Dummy[] = _("");
+static const u8 sString_Newline[] = _("\n");
+
+static const struct WindowTemplate sWindowTemplate[] = {
+ [MAIN_MENU_WINDOW_NEWGAME_ONLY] = {
+ .bg = 0,
+ .tilemapLeft = 3,
+ .tilemapTop = 1,
+ .width = 24,
+ .height = 2,
+ .paletteNum = 15,
+ .baseBlock = 0x001
+ },
+ [MAIN_MENU_WINDOW_CONTINUE] = {
+ .bg = 0,
+ .tilemapLeft = 3,
+ .tilemapTop = 1,
+ .width = 24,
+ .height = 10,
+ .paletteNum = 15,
+ .baseBlock = 0x001
+ },
+ [MAIN_MENU_WINDOW_NEWGAME] = {
+ .bg = 0,
+ .tilemapLeft = 3,
+ .tilemapTop = 13,
+ .width = 24,
+ .height = 2,
+ .paletteNum = 15,
+ .baseBlock = 0x0f1
+ },
+ [MAIN_MENU_WINDOW_MYSTERYGIFT] = {
+ .bg = 0,
+ .tilemapLeft = 3,
+ .tilemapTop = 17,
+ .width = 24,
+ .height = 2,
+ .paletteNum = 15,
+ .baseBlock = 0x121
+ },
+ [MAIN_MENU_WINDOW_ERROR] = {
+ .bg = 0,
+ .tilemapLeft = 3,
+ .tilemapTop = 15,
+ .width = 24,
+ .height = 4,
+ .paletteNum = 15,
+ .baseBlock = 0x001
+ },
+ [MAIN_MENU_WINDOW_COUNT] = 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 sMenuCursorYMax[] = { 0, 1, 2 };
+
+static void CB2_MainMenu(void)
+{
+ RunTasks();
+ AnimateSprites();
+ BuildOamBuffer();
+ UpdatePaletteFade();
+}
+
+static void VBlankCB_MainMenu(void)
+{
+ LoadOam();
+ ProcessSpriteCopyRequests();
+ TransferPlttBuffer();
+}
+
+void CB2_InitMainMenu(void)
+{
+ MainMenuGpuInit(1);
+}
+
+static void CB2_InitMainMenu_2(void)
+{
+ MainMenuGpuInit(1);
+}
+
+static bool32 MainMenuGpuInit(u8 a0)
+{
+ u8 taskId;
+
+ SetVBlankCallback(NULL);
+ SetGpuReg(REG_OFFSET_DISPCNT, 0);
+ SetGpuReg(REG_OFFSET_BG2CNT, 0);
+ SetGpuReg(REG_OFFSET_BG1CNT, 0);
+ SetGpuReg(REG_OFFSET_BG0CNT, 0);
+ SetGpuReg(REG_OFFSET_BG2HOFS, 0);
+ SetGpuReg(REG_OFFSET_BG2VOFS, 0);
+ SetGpuReg(REG_OFFSET_BG1HOFS, 0);
+ SetGpuReg(REG_OFFSET_BG1VOFS, 0);
+ SetGpuReg(REG_OFFSET_BG0HOFS, 0);
+ SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+ DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE);
+ DmaFill32(3, 0, (void *)OAM, OAM_SIZE);
+ DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
+ ScanlineEffect_Stop();
+ ResetTasks();
+ ResetSpriteData();
+ FreeAllSpritePalettes();
+ ResetPaletteFade();
+ ResetBgsAndClearDma3BusyFlags(FALSE);
+ 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(sWindowTemplate);
+ DeactivateAllTextPrinters();
+ LoadPalette(sBgPal00, 0x00, 0x20);
+ LoadPalette(sBgPal15, 0xF0, 0x20);
+ SetGpuReg(REG_OFFSET_WIN0H, 0);
+ SetGpuReg(REG_OFFSET_WIN0V, 0);
+ SetGpuReg(REG_OFFSET_WININ, 0);
+ SetGpuReg(REG_OFFSET_WINOUT, 0);
+ SetGpuReg(REG_OFFSET_BLDCNT, 0);
+ SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+ SetGpuReg(REG_OFFSET_BLDY, 0);
+ SetMainCallback2(CB2_MainMenu);
+ SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON);
+ taskId = CreateTask(Task_SetWin0BldRegsAndCheckSaveFile, 0);
+ gTasks[taskId].tCursorPos = 0;
+ gTasks[taskId].tUnused8 = a0;
+ return FALSE;
+}
+
+/*
+ * The entire screen is darkened slightly except at WIN0 to indicate
+ * the player cursor position.
+ */
+
+static void Task_SetWin0BldRegsAndCheckSaveFile(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ SetGpuReg(REG_OFFSET_WIN0H, 0);
+ SetGpuReg(REG_OFFSET_WIN0V, 0);
+ SetGpuReg(REG_OFFSET_WININ, 0x0001);
+ SetGpuReg(REG_OFFSET_WINOUT, 0x0021);
+ SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN);
+ SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
+ SetGpuReg(REG_OFFSET_BLDY, 7);
+ switch (gSaveFileStatus)
+ {
+ case SAVE_STATUS_OK:
+ LoadUserFrameToBg(0);
+ if (Flag_0x839_IsSet() == TRUE)
+ {
+ gTasks[taskId].tMenuType = MAIN_MENU_MYSTERYGIFT;
+ }
+ else
+ {
+ gTasks[taskId].tMenuType = MAIN_MENU_CONTINUE;
+ }
+ gTasks[taskId].func = Task_SetWin0BldRegsNoSaveFileCheck;
+ break;
+ case SAVE_STATUS_INVALID:
+ SetStdFrame0OnBg(0);
+ gTasks[taskId].tMenuType = MAIN_MENU_NEWGAME;
+ PrintSaveErrorStatus(taskId, gText_SaveFileHasBeenDeleted);
+ break;
+ case SAVE_STATUS_ERROR:
+ SetStdFrame0OnBg(0);
+ gTasks[taskId].tMenuType = MAIN_MENU_CONTINUE;
+ PrintSaveErrorStatus(taskId, gText_SaveFileCorruptedPrevWillBeLoaded);
+ if (Flag_0x839_IsSet() == TRUE)
+ {
+ gTasks[taskId].tMenuType = MAIN_MENU_MYSTERYGIFT;
+ }
+ else
+ {
+ gTasks[taskId].tMenuType = MAIN_MENU_CONTINUE;
+ }
+ break;
+ case SAVE_STATUS_EMPTY:
+ default:
+ LoadUserFrameToBg(0);
+ gTasks[taskId].tMenuType = MAIN_MENU_NEWGAME;
+ gTasks[taskId].func = Task_SetWin0BldRegsNoSaveFileCheck;
+ break;
+ case SAVE_STATUS_NO_FLASH:
+ SetStdFrame0OnBg(0);
+ gTasks[taskId].tMenuType = MAIN_MENU_NEWGAME;
+ PrintSaveErrorStatus(taskId, gText_1MSubCircuitBoardNotInstalled);
+ break;
+ }
+ }
+}
+
+static void PrintSaveErrorStatus(u8 taskId, const u8 *str)
+{
+ PrintMessageOnWindow4(str);
+ gTasks[taskId].func = Task_SaveErrorStatus_RunPrinterThenWaitButton;
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF);
+ ShowBg(0);
+ SetVBlankCallback(VBlankCB_MainMenu);
+}
+
+static void Task_SaveErrorStatus_RunPrinterThenWaitButton(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ RunTextPrinters();
+ if (!IsTextPrinterActive(MAIN_MENU_WINDOW_ERROR) && JOY_NEW(A_BUTTON))
+ {
+ ClearWindowTilemap(MAIN_MENU_WINDOW_ERROR);
+ MainMenu_EraseWindow(&sWindowTemplate[MAIN_MENU_WINDOW_ERROR]);
+ LoadUserFrameToBg(0);
+ if (gTasks[taskId].tMenuType == MAIN_MENU_NEWGAME)
+ gTasks[taskId].func = Task_SetWin0BldRegsNoSaveFileCheck;
+ else
+ gTasks[taskId].func = Task_PrintMainMenuText;
+ }
+ }
+}
+
+static void Task_SetWin0BldRegsNoSaveFileCheck(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ SetGpuReg(REG_OFFSET_WIN0H, 0);
+ SetGpuReg(REG_OFFSET_WIN0V, 0);
+ SetGpuReg(REG_OFFSET_WININ, 0x0001);
+ SetGpuReg(REG_OFFSET_WINOUT, 0x0021);
+ SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN);
+ SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
+ SetGpuReg(REG_OFFSET_BLDY, 7);
+ if (gTasks[taskId].tMenuType == 0)
+ gTasks[taskId].func = Task_ExecuteMainMenuSelection;
+ else
+ gTasks[taskId].func = Task_WaitFadeAndPrintMainMenuText;
+ }
+}
+
+static void Task_WaitFadeAndPrintMainMenuText(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ Task_PrintMainMenuText(taskId);
+ }
+}
+
+static void Task_PrintMainMenuText(u8 taskId)
+{
+ u16 pal;
+ SetGpuReg(REG_OFFSET_WIN0H, 0);
+ SetGpuReg(REG_OFFSET_WIN0V, 0);
+ SetGpuReg(REG_OFFSET_WININ, 0x0001);
+ SetGpuReg(REG_OFFSET_WINOUT, 0x0021);
+ SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN);
+ SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
+ SetGpuReg(REG_OFFSET_BLDY, 7);
+ if (gSaveBlock2Ptr->playerGender == MALE)
+ pal = RGB(4, 16, 31);
+ else
+ pal = RGB(31, 3, 21);
+ LoadPalette(&pal, 0xF1, 2);
+ switch (gTasks[taskId].tMenuType)
+ {
+ case MAIN_MENU_NEWGAME:
+ default:
+ FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME_ONLY, PIXEL_FILL(10));
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, 2, 2, 2, sTextColor1, -1, gText_NewGame);
+ MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME_ONLY]);
+ PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME_ONLY);
+ CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, 3);
+ break;
+ case MAIN_MENU_CONTINUE:
+ FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10));
+ FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10));
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 2, sTextColor1, -1, gText_Continue);
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, 2, 2, 2, sTextColor1, -1, gText_NewGame);
+ PrintContinueStats();
+ MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]);
+ MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]);
+ PutWindowTilemap(MAIN_MENU_WINDOW_CONTINUE);
+ PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME);
+ CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, 2);
+ CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, 3);
+ break;
+ case MAIN_MENU_MYSTERYGIFT:
+ FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10));
+ FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10));
+ FillWindowPixelBuffer(MAIN_MENU_WINDOW_MYSTERYGIFT, PIXEL_FILL(10));
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 2, sTextColor1, -1, gText_Continue);
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, 2, 2, 2, sTextColor1, -1, gText_NewGame);
+ gTasks[taskId].tMGErrorType = 1;
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_MYSTERYGIFT, 2, 2, 2, sTextColor1, -1, gText_MysteryGift);
+ PrintContinueStats();
+ MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]);
+ MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]);
+ MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_MYSTERYGIFT]);
+ PutWindowTilemap(MAIN_MENU_WINDOW_CONTINUE);
+ PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME);
+ PutWindowTilemap(MAIN_MENU_WINDOW_MYSTERYGIFT);
+ CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, 2);
+ CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, 2);
+ CopyWindowToVram(MAIN_MENU_WINDOW_MYSTERYGIFT, 3);
+ break;
+ }
+ gTasks[taskId].func = Task_WaitDma3AndFadeIn;
+}
+
+static void Task_WaitDma3AndFadeIn(u8 taskId)
+{
+ if (CheckForSpaceForDma3Request(-1) != -1)
+ {
+ gTasks[taskId].func = Task_UpdateVisualSelection;
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF);
+ ShowBg(0);
+ SetVBlankCallback(VBlankCB_MainMenu);
+ }
+}
+
+static void Task_UpdateVisualSelection(u8 taskId)
+{
+ MoveWindowByMenuTypeAndCursorPos(gTasks[taskId].tMenuType, gTasks[taskId].tCursorPos);
+ gTasks[taskId].func = Task_HandleMenuInput;
+}
+
+static void Task_HandleMenuInput(u8 taskId)
+{
+ if (!gPaletteFade.active && HandleMenuInput(taskId))
+ {
+ gTasks[taskId].func = Task_UpdateVisualSelection;
+ }
+}
+
+static void Task_ExecuteMainMenuSelection(u8 taskId)
+{
+ s32 menuAction;
+ if (!gPaletteFade.active)
+ {
+ switch (gTasks[taskId].tMenuType)
+ {
+ default:
+ case MAIN_MENU_NEWGAME:
+ menuAction = MAIN_MENU_NEWGAME;
+ break;
+ case MAIN_MENU_CONTINUE:
+ switch (gTasks[taskId].tCursorPos)
+ {
+ default:
+ case 0:
+ menuAction = MAIN_MENU_CONTINUE;
+ break;
+ case 1:
+ menuAction = MAIN_MENU_NEWGAME;
+ break;
+ }
+ break;
+ case MAIN_MENU_MYSTERYGIFT:
+ switch (gTasks[taskId].tCursorPos)
+ {
+ default:
+ case 0:
+ menuAction = MAIN_MENU_CONTINUE;
+ break;
+ case 1:
+ menuAction = MAIN_MENU_NEWGAME;
+ break;
+ case 2:
+ if (!IsWirelessAdapterConnected())
+ {
+ SetStdFrame0OnBg(0);
+ gTasks[taskId].func = Task_MysteryGiftError;
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+ return;
+ }
+ else
+ {
+ menuAction = MAIN_MENU_MYSTERYGIFT;
+ }
+ break;
+ }
+ break;
+ }
+ switch (menuAction)
+ {
+ default:
+ case MAIN_MENU_NEWGAME:
+ gUnknown_2031DE0 = 0;
+ FreeAllWindowBuffers();
+ DestroyTask(taskId);
+ StartNewGameScene();
+ break;
+ case MAIN_MENU_CONTINUE:
+ gPlttBufferUnfaded[0] = RGB_BLACK;
+ gPlttBufferFaded[0] = RGB_BLACK;
+ gUnknown_2031DE0 = 0;
+ FreeAllWindowBuffers();
+ TrySetUpQuestLogScenes_ElseContinueFromSave(taskId);
+ break;
+ case MAIN_MENU_MYSTERYGIFT:
+ SetMainCallback2(c2_mystery_gift);
+ HelpSystem_Disable();
+ FreeAllWindowBuffers();
+ DestroyTask(taskId);
+ break;
+ }
+ }
+}
+
+static void Task_MysteryGiftError(u8 taskId)
+{
+ switch (gTasks[taskId].tMGErrorMsgState)
+ {
+ case 0:
+ FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
+ if (gTasks[taskId].tMGErrorType == 1)
+ PrintMessageOnWindow4(gText_WirelessAdapterIsNotConnected);
+ else
+ PrintMessageOnWindow4(gText_MysteryGiftCantBeUsedWhileWirelessAdapterIsAttached);
+ gTasks[taskId].tMGErrorMsgState++;
+ break;
+ case 1:
+ if (!gPaletteFade.active)
+ gTasks[taskId].tMGErrorMsgState++;
+ break;
+ case 2:
+ RunTextPrinters();
+ if (!IsTextPrinterActive(4))
+ gTasks[taskId].tMGErrorMsgState++;
+ break;
+ case 3:
+ if (JOY_NEW(A_BUTTON | B_BUTTON))
+ {
+ PlaySE(SE_SELECT);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+ gTasks[taskId].func = Task_ReturnToTileScreen;
+ }
+ break;
+ }
+}
+
+static void Task_ReturnToTileScreen(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ SetMainCallback2(CB2_InitTitleScreen);
+ DestroyTask(taskId);
+ }
+}
+
+static void MoveWindowByMenuTypeAndCursorPos(u8 menuType, u8 cursorPos)
+{
+ u16 win0vTop, win0vBot;
+ SetGpuReg(REG_OFFSET_WIN0H, 0x12DE);
+ switch (menuType)
+ {
+ default:
+ case MAIN_MENU_NEWGAME:
+ win0vTop = 0x00 << 8;
+ win0vBot = 0x20;
+ break;
+ case MAIN_MENU_CONTINUE:
+ case MAIN_MENU_MYSTERYGIFT:
+ switch (cursorPos)
+ {
+ default:
+ case 0: // CONTINUE
+ win0vTop = 0x00 << 8;
+ win0vBot = 0x60;
+ break;
+ case 1: // NEW GAME
+ win0vTop = 0x60 << 8;
+ win0vBot = 0x80;
+ break;
+ case 2: // MYSTERY GIFT
+ win0vTop = 0x80 << 8;
+ win0vBot = 0xA0;
+ break;
+ }
+ break;
+ }
+ SetGpuReg(REG_OFFSET_WIN0V, (win0vTop + (2 << 8)) | (win0vBot - 2));
+}
+
+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 = Task_ExecuteMainMenuSelection;
+ }
+ else if (JOY_NEW(B_BUTTON))
+ {
+ PlaySE(SE_SELECT);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+ SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
+ SetGpuReg(REG_OFFSET_WIN0V, 0xA0);
+ gTasks[taskId].func = Task_ReturnToTileScreen;
+ }
+ else if (JOY_NEW(DPAD_UP) && gTasks[taskId].tCursorPos > 0)
+ {
+ gTasks[taskId].tCursorPos--;
+ return TRUE;
+ }
+ else if (JOY_NEW(DPAD_DOWN) && gTasks[taskId].tCursorPos < sMenuCursorYMax[gTasks[taskId].tMenuType])
+ {
+ gTasks[taskId].tCursorPos++;
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void PrintMessageOnWindow4(const u8 *str)
+{
+ FillWindowPixelBuffer(MAIN_MENU_WINDOW_ERROR, PIXEL_FILL(10));
+ MainMenu_DrawWindow(&sWindowTemplate[4]);
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_ERROR, 2, 0, 2, sTextColor1, 2, str);
+ PutWindowTilemap(MAIN_MENU_WINDOW_ERROR);
+ CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, 2);
+ SetGpuReg(REG_OFFSET_WIN0H, 0x13DD);
+ SetGpuReg(REG_OFFSET_WIN0V, 0x739D);
+}
+
+static void PrintContinueStats(void)
+{
+ PrintPlayerName();
+ PrintDexCount();
+ PrintPlayTime();
+ PrintBadgeCount();
+}
+
+static void PrintPlayerName(void)
+{
+ s32 i;
+ u8 name[OT_NAME_LENGTH + 1];
+ u8 *ptr;
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 18, sTextColor2, -1, gText_Player);
+ ptr = name;
+ for (i = 0; i < OT_NAME_LENGTH; i++)
+ *ptr++ = gSaveBlock2Ptr->playerName[i];
+ *ptr = EOS;
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 62, 18, sTextColor2, -1, name);
+}
+
+static void PrintPlayTime(void)
+{
+ u8 strbuf[30];
+ u8 *ptr;
+
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 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(MAIN_MENU_WINDOW_CONTINUE, 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(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 50, sTextColor2, -1, gText_Pokedex);
+ ptr = ConvertIntToDecimalStringN(strbuf, dexcount, STR_CONV_MODE_LEFT_ALIGN, 3);
+ StringAppend(ptr, gTextJPDummy_Hiki);
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 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(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 66, sTextColor2, -1, gText_Badges);
+ ptr = ConvertIntToDecimalStringN(strbuf, nbadges, STR_CONV_MODE_LEADING_ZEROS, 1);
+ StringAppend(ptr, gTextJPDummy_Ko);
+ AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 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);
+ MainMenu_EraseWindow(&sWindowTemplate[MAIN_MENU_WINDOW_ERROR]);
+}
+
+static void SetStdFrame0OnBg(u8 bgId)
+{
+ TextWindow_SetStdFrame0_WithPal(MAIN_MENU_WINDOW_NEWGAME_ONLY, 0x1B1, 0x20);
+ MainMenu_EraseWindow(&sWindowTemplate[MAIN_MENU_WINDOW_ERROR]);
+}
+
+static void MainMenu_DrawWindow(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 MainMenu_EraseWindow(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 dbc685602..9c050810e 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -24,6 +24,7 @@
#include "mevent_server.h"
#include "menews_jisan.h"
#include "help_system.h"
+#include "strings.h"
#include "constants/songs.h"
EWRAM_DATA u8 sDownArrowCounterAndYCoordIdx[8] = {};
@@ -33,69 +34,6 @@ void task_add_00_mystery_gift(void);
void task00_mystery_gift(u8 taskId);
void task_add_00_ereader(void);
-extern const u8 gText_PickOKExit[];
-extern const u8 gText_PickOKCancel[];
-extern const u8 gText_MysteryGift[];
-extern const u8 gJPText_MysteryGift[];
-extern const u8 gJPText_DecideStop[];
-extern const u8 gText_WhatToDoWithCards[];
-extern const u8 gText_WhatToDoWithNews[];
-extern const u8 gText_OkayToDiscardNews[];
-extern const u8 gText_IfThrowAwayCardEventWontHappen[];
-extern const u8 gText_WonderCardThrownAway[];
-extern const u8 gText_WonderNewsThrownAway[];
-extern const u8 gText_DataWillBeSaved[];
-extern const u8 gText_SaveCompletedPressA[];
-extern const u8 gText_WonderCards[];
-extern const u8 gText_WonderNews[];
-extern const u8 gText_Exit3[];
-extern const u8 gText_WirelessCommunication[];
-extern const u8 gText_Friend2[];
-extern const u8 gFameCheckerText_Cancel[];
-extern const u8 gText_Receive[];
-extern const u8 gText_Send[];
-extern const u8 gText_Toss[];
-extern const u8 gText_VarietyOfEventsImportedWireless[];
-extern const u8 gText_WonderCardsInPossession[];
-extern const u8 gText_ReadNewsThatArrived[];
-extern const u8 gText_ReturnToTitle[];
-extern const u8 gText_NothingSentOver[];
-extern const u8 gText_RecordUploadedViaWireless[];
-extern const u8 gText_WonderCardReceived[];
-extern const u8 gText_WonderCardReceivedFrom[];
-extern const u8 gText_WonderNewsReceived[];
-extern const u8 gText_WonderNewsReceivedFrom[];
-extern const u8 gText_NewStampReceived[];
-extern const u8 gText_AlreadyHadCard[];
-extern const u8 gText_AlreadyHadStamp[];
-extern const u8 gText_AlreadyHadNews[];
-extern const u8 gText_NoMoreRoomForStamps[];
-extern const u8 gText_CommunicationCanceled[];
-extern const u8 gText_CantAcceptCardFromTrainer[];
-extern const u8 gText_CantAcceptNewsFromTrainer[];
-extern const u8 gText_CommunicationError[];
-extern const u8 gText_NewTrainerReceived[];
-extern const u8 gText_WonderCardSentTo[];
-extern const u8 gText_WonderNewsSentTo[];
-extern const u8 gText_StampSentTo[];
-extern const u8 gText_OtherTrainerHasCard[];
-extern const u8 gText_OtherTrainerHasStamp[];
-extern const u8 gText_OtherTrainerHasNews[];
-extern const u8 gText_OtherTrainerCanceled[];
-extern const u8 gText_GiftSentTo[];
-extern const u8 gText_CantSendGiftToTrainer[];
-extern const u8 gText_DontHaveCardNewOneInput[];
-extern const u8 gText_DontHaveNewsNewOneInput[];
-extern const u8 gText_WhereShouldCardBeAccessed[];
-extern const u8 gText_WhereShouldNewsBeAccessed[];
-extern const u8 gText_Communicating[];
-extern const u8 gText_ThrowAwayWonderCard[];
-extern const u8 gText_HaventReceivedCardsGift[];
-extern const u8 gText_CommunicationCompleted[];
-extern const u8 gText_HaventReceivedGiftOkayToDiscard[];
-extern const u8 gText_SendingWonderCard[];
-extern const u8 gText_SendingWonderNews[];
-
const u16 gUnkTextboxBorderPal[] = INCBIN_U16("graphics/interface/unk_textbox_border.gbapal");
const u32 gUnkTextboxBorderGfx[] = INCBIN_U32("graphics/interface/unk_textbox_border.4bpp.lz");
@@ -538,7 +476,7 @@ void PrintMysteryGiftOrEReaderTopMenu(bool8 mg_or_ereader, bool32 usePickOkCance
if (!mg_or_ereader)
{
src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel;
- AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gText_MysteryGift);
+ AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gText_MysteryGift2);
width = 222 - GetStringWidth(0, src, 0);
AddTextPrinterParameterized4(0, 0, width, 2, 0, 0, sMG_Ereader_TextColor_1, 0, src);
}
@@ -1742,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 065b42cef..71cab91a1 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -93,7 +93,7 @@ static struct UnkStruct_300201C * gUnknown_300201C;
static u16 gUnknown_3002020;
EWRAM_DATA u8 gUnknown_203ADF8 = 0;
-EWRAM_DATA u8 gUnknown_203ADF9 = 0;
+static EWRAM_DATA u8 sNumScenes = 0;
EWRAM_DATA u8 gUnknown_203ADFA = 0;
EWRAM_DATA u16 gUnknown_203ADFC = 0;
EWRAM_DATA u8 gUnknown_203ADFE[3] = {0};
@@ -840,21 +840,21 @@ bool8 sub_8110E68(struct UnkStruct_203AE98 * a0)
return TRUE;
}
-void sub_8110F14(u8 taskId)
+void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId)
{
u8 i;
sub_811381C();
- gUnknown_203ADF9 = 0;
+ sNumScenes = 0;
for (i = 0; i < 4; i++)
{
if (gSaveBlock1Ptr->questLog[i].unk_000)
- gUnknown_203ADF9++;
+ sNumScenes++;
}
- if (gUnknown_203ADF9 != 0)
+ if (sNumScenes != 0)
{
- gUnknown_3005ECC = FALSE;
+ gHelpSystemEnabled = FALSE;
sub_8110F90(taskId);
DestroyTask(taskId);
}
@@ -1221,7 +1221,7 @@ void sub_8111914(void)
ScriptContext2_Enable();
if (++gUnknown_203ADF8 < 4 && gSaveBlock1Ptr->questLog[gUnknown_203ADF8].unk_000)
{
- gUnknown_203ADF9--;
+ sNumScenes--;
sub_8111368();
}
else
@@ -1402,7 +1402,7 @@ bool8 sub_8111CD0(void)
void sub_8111CF0(void)
{
if (gUnknown_203ADFA == 2)
- sub_8111070(gUnknown_203ADF9);
+ sub_8111070(sNumScenes);
}
void sub_8111D10(void)
@@ -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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 04:33:44 +0000