summaryrefslogtreecommitdiff
path: root/src/start_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/start_menu.c')
-rw-r--r--src/start_menu.c91
1 files changed, 43 insertions, 48 deletions
diff --git a/src/start_menu.c b/src/start_menu.c
index fcde176ac..a816f4f2f 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -83,7 +83,7 @@ EWRAM_DATA static u8 sBattlePyramidFloorWindowId = 0;
EWRAM_DATA static u8 sStartMenuCursorPos = 0;
EWRAM_DATA static u8 sNumStartMenuActions = 0;
EWRAM_DATA static u8 sCurrentStartMenuActions[9] = {0};
-EWRAM_DATA static u8 sUnknown_02037619[2] = {0};
+EWRAM_DATA static u8 sInitStartMenuData[2] = {0};
EWRAM_DATA static u8 (*sSaveDialogCallback)(void) = NULL;
EWRAM_DATA static u8 sSaveDialogTimer = 0;
@@ -135,9 +135,7 @@ static void StartMenuTask(u8 taskId);
static void SaveGameTask(u8 taskId);
static void sub_80A0550(u8 taskId);
static void sub_80A08A4(u8 taskId);
-
-// Some other callback
-static bool8 sub_809FA00(void);
+static bool8 FieldCB_ReturnToFieldStartMenu(void);
static const struct WindowTemplate sSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};
@@ -203,7 +201,7 @@ static void BuildLinkModeStartMenu(void);
static void BuildUnionRoomStartMenu(void);
static void BuildBattlePikeStartMenu(void);
static void BuildBattlePyramidStartMenu(void);
-static void BuildMultiBattleRoomStartMenu(void);
+static void BuildMultiPartnerRoomStartMenu(void);
static void ShowSafariBallsWindow(void);
static void ShowPyramidFloorWindow(void);
static void RemoveExtraStartMenuWindows(void);
@@ -258,9 +256,9 @@ static void BuildStartMenuActions(void)
{
BuildBattlePyramidStartMenu();
}
- else if (InMultiBattleRoom())
+ else if (InMultiPartnerRoom())
{
- BuildMultiBattleRoomStartMenu();
+ BuildMultiPartnerRoomStartMenu();
}
else
{
@@ -358,7 +356,7 @@ static void BuildBattlePyramidStartMenu(void)
AddStartMenuAction(MENU_ACTION_EXIT);
}
-static void BuildMultiBattleRoomStartMenu(void)
+static void BuildMultiPartnerRoomStartMenu(void)
{
AddStartMenuAction(MENU_ACTION_POKEMON);
AddStartMenuAction(MENU_ACTION_PLAYER);
@@ -440,33 +438,33 @@ static bool32 PrintStartMenuActions(s8 *pIndex, u32 count)
static bool32 InitStartMenuStep(void)
{
- s8 value = sUnknown_02037619[0];
+ s8 state = sInitStartMenuData[0];
- switch (value)
+ switch (state)
{
case 0:
- sUnknown_02037619[0]++;
+ sInitStartMenuData[0]++;
break;
case 1:
BuildStartMenuActions();
- sUnknown_02037619[0]++;
+ sInitStartMenuData[0]++;
break;
case 2:
sub_81973A4();
DrawStdWindowFrame(sub_81979C4(sNumStartMenuActions), FALSE);
- sUnknown_02037619[1] = 0;
- sUnknown_02037619[0]++;
+ sInitStartMenuData[1] = 0;
+ sInitStartMenuData[0]++;
break;
case 3:
if (GetSafariZoneFlag())
ShowSafariBallsWindow();
if (InBattlePyramid())
ShowPyramidFloorWindow();
- sUnknown_02037619[0]++;
+ sInitStartMenuData[0]++;
break;
case 4:
- if (PrintStartMenuActions(&sUnknown_02037619[1], 2))
- sUnknown_02037619[0]++;
+ if (PrintStartMenuActions(&sInitStartMenuData[1], 2))
+ sInitStartMenuData[0]++;
break;
case 5:
sStartMenuCursorPos = sub_81983AC(GetStartMenuWindowId(), 1, 0, 9, 16, sNumStartMenuActions, sStartMenuCursorPos);
@@ -479,8 +477,8 @@ static bool32 InitStartMenuStep(void)
static void InitStartMenu(void)
{
- sUnknown_02037619[0] = 0;
- sUnknown_02037619[1] = 0;
+ sInitStartMenuData[0] = 0;
+ sInitStartMenuData[1] = 0;
while (!InitStartMenuStep())
;
}
@@ -495,31 +493,31 @@ static void CreateStartMenuTask(TaskFunc followupFunc)
{
u8 taskId;
- sUnknown_02037619[0] = 0;
- sUnknown_02037619[1] = 0;
+ sInitStartMenuData[0] = 0;
+ sInitStartMenuData[1] = 0;
taskId = CreateTask(StartMenuTask, 0x50);
SetTaskFuncWithFollowupFunc(taskId, StartMenuTask, followupFunc);
}
-static bool8 sub_809FA00(void)
+static bool8 FieldCB_ReturnToFieldStartMenu(void)
{
if (InitStartMenuStep() == FALSE)
{
return FALSE;
}
- sub_80AF688();
+ ReturnToFieldOpenStartMenu();
return TRUE;
}
-void sub_809FA18(void) // Called from field_screen.s
+void ShowReturnToFieldStartMenu(void)
{
- sUnknown_02037619[0] = 0;
- sUnknown_02037619[1] = 0;
- gFieldCallback2 = sub_809FA00;
+ sInitStartMenuData[0] = 0;
+ sInitStartMenuData[1] = 0;
+ gFieldCallback2 = FieldCB_ReturnToFieldStartMenu;
}
-void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s
+void Task_ShowStartMenu(u8 taskId)
{
struct Task* task = &gTasks[taskId];
@@ -539,7 +537,7 @@ void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s
}
}
-void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s
+void ShowStartMenu(void)
{
if (!IsUpdateLinkStateCBActive())
{
@@ -547,7 +545,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s
sub_808B864();
sub_808BCF4();
}
- CreateStartMenuTask(sub_809FA34);
+ CreateStartMenuTask(Task_ShowStartMenu);
ScriptContext2_Enable();
}
@@ -570,7 +568,7 @@ static bool8 HandleStartMenuInput(void)
PlaySE(SE_SELECT);
if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void == StartMenuPokedexCallback)
{
- if (GetNationalPokedexCount(0) == 0)
+ if (GetNationalPokedexCount(FLAG_GET_SEEN) == 0)
return FALSE;
}
@@ -581,7 +579,7 @@ static bool8 HandleStartMenuInput(void)
&& gMenuCallback != StartMenuSafariZoneRetireCallback
&& gMenuCallback != StartMenuBattlePyramidRetireCallback)
{
- FadeScreen(1, 0);
+ FadeScreen(FADE_TO_BLACK, 0);
}
return FALSE;
@@ -743,11 +741,12 @@ static bool8 StartMenuBattlePyramidRetireCallback(void)
return FALSE;
}
-void sub_809FDD4(void)
+// Functionally unused
+void ShowBattlePyramidStartMenu(void)
{
ClearDialogWindowAndFrameToTransparent(0, FALSE);
ScriptUnfreezeEventObjects();
- CreateStartMenuTask(sub_809FA34);
+ CreateStartMenuTask(Task_ShowStartMenu);
ScriptContext2_Enable();
}
@@ -827,7 +826,7 @@ static bool8 BattlePyramidRetireCallback(void)
ClearDialogWindowAndFrameToTransparent(0, TRUE);
ScriptUnfreezeEventObjects();
ScriptContext2_Disable();
- ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88);
+ ScriptContext1_SetupScript(BattlePyramid_Retire);
return TRUE;
}
@@ -853,7 +852,7 @@ static u8 RunSaveCallback(void)
return sSaveDialogCallback();
}
-void SaveGame(void) // Called from cable_club.s
+void SaveGame(void)
{
InitSave();
CreateTask(SaveGameTask, 0x50);
@@ -967,8 +966,8 @@ static u8 SaveConfirmInputCallback(void)
case 0: // Yes
switch (gSaveFileStatus)
{
- case 0:
- case 2:
+ case SAVE_STATUS_EMPTY:
+ case SAVE_STATUS_CORRUPT:
if (gDifferentSaveFile == FALSE)
{
sSaveDialogCallback = SaveFileExistsCallback;
@@ -1048,7 +1047,7 @@ static u8 SaveDoSaveCallback(void)
u8 saveStatus;
IncrementGameStat(GAME_STAT_SAVED_GAME);
- sub_81A9E90();
+ PausePyramidChallenge();
if (gDifferentSaveFile == TRUE)
{
@@ -1060,14 +1059,10 @@ static u8 SaveDoSaveCallback(void)
saveStatus = TrySavingData(SAVE_NORMAL);
}
- if (saveStatus == 1) // Save succeded
- {
+ if (saveStatus == SAVE_STATUS_OK)
ShowSaveMessage(gText_PlayerSavedGame, SaveSuccessCallback);
- }
- else // Save error
- {
+ else
ShowSaveMessage(gText_SaveError, SaveErrorCallback);
- }
SaveStartTimer();
return SAVE_IN_PROGRESS;
@@ -1202,7 +1197,7 @@ static bool32 sub_80A03E4(u8 *par1)
return FALSE;
}
-void sub_80A0514(void) // Called from cable_club.s
+void sub_80A0514(void)
{
if (sub_80A03E4(&gMain.state))
{
@@ -1371,7 +1366,7 @@ static void sub_80A08A4(u8 taskId)
}
}
-void sub_80A08CC(void) // Referenced in data/specials.inc and data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
+void sub_80A08CC(void)
{
u8 taskId = CreateTask(sub_8153688, 0x5);
gTasks[taskId].data[2] = 1;
@@ -1386,7 +1381,7 @@ static void HideStartMenuWindow(void)
ScriptContext2_Disable();
}
-void HideStartMenu(void) // Called from map_name_popup.s
+void HideStartMenu(void)
{
PlaySE(SE_SELECT);
HideStartMenuWindow();
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:46:07 +0000