From b8d3542b46621299bc2056b53209fc22646bef2f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 18 Dec 2016 11:52:33 -0800 Subject: move functions from start_menu.c to menu.c --- src/start_menu.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index f02665ad1..850f610e3 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -832,18 +832,3 @@ static void Task_8071B64(u8 taskId) } } } - -void sub_8071C20(void) -{ - PlaySE(SE_SELECT); - MenuZeroFillScreen(); - sub_8064E2C(); - ScriptContext2_Disable(); - sub_8072DEC(); -} - -void AppendToList(u8 *list, u8 *pindex, u32 value) -{ - list[*pindex] = value; - (*pindex)++; -} -- cgit v1.2.3 From 145e90483b2a30698f917f62e585aa7fa4794588 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 00:41:28 -0800 Subject: event_data.c --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 850f610e3..eebdd27fc 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -2,7 +2,7 @@ #include "start_menu.h" #include "asm.h" #include "field_player_avatar.h" -#include "flag.h" +#include "event_data.h" #include "load_save.h" #include "main.h" #include "map_obj_lock.h" -- cgit v1.2.3 From bb2c7f3e07fe9fe9ae72b361b93f106af1259124 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 2 Jan 2017 22:58:06 -0800 Subject: name functions and split data more --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index eebdd27fc..1e828eed1 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -280,7 +280,7 @@ void sub_8071310(void) { if(!is_c1_link_related_active()) { - player_bitmagic(); + FreezeMapObjects(); sub_80594C0(); sub_80597F4(); } -- cgit v1.2.3 From 41d2b112ebdf91da3d85b4495ceb95e69d69ef0a Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 4 Jan 2017 16:32:45 -0600 Subject: almost finish decompiling matsuda_debug_menu.c (#158) * almost finish decompiling matsuda_debug_menu.c * rename sub_8071C20 to CloseMenu --- src/start_menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 1e828eed1..0d9e8af2c 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -317,7 +317,7 @@ static u8 StartMenu_InputProcessCallback(void) } if(gMain.newKeys & (START_BUTTON | B_BUTTON)) { - sub_8071C20(); + CloseMenu(); return 1; } return 0; @@ -408,14 +408,14 @@ u8 StartMenu_OptionCallback(void) //When player selects EXIT u8 StartMenu_ExitCallback(void) { - sub_8071C20(); + CloseMenu(); return 1; } //When player selects RETIRE u8 StartMenu_RetireCallback(void) { - sub_8071C20(); + CloseMenu(); SafariZoneRetirePrompt(); return 1; } -- cgit v1.2.3 From 3dc2f8992446b2fffa0f7da16351e1445856f190 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 5 Jan 2017 02:53:34 -0800 Subject: field_8 -> savedCallback --- src/start_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 0d9e8af2c..d0e552591 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -399,7 +399,7 @@ u8 StartMenu_OptionCallback(void) { PlayRainSoundEffect(); SetMainCallback2(CB2_InitOptionMenu); - gMain.field_8 = sub_805469C; + gMain.savedCallback = sub_805469C; return 1; } return 0; @@ -826,7 +826,7 @@ static void Task_8071B64(u8 taskId) (*step)++; break; case 4: - SetMainCallback2(gMain.field_8); + SetMainCallback2(gMain.savedCallback); DestroyTask(taskId); break; } -- cgit v1.2.3 From 9b0872d1b84d6b4ed4e36a576049b3f409674b95 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 5 Jan 2017 04:24:19 -0800 Subject: define some menu data in C --- src/start_menu.c | 62 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 14 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index d0e552591..4c5e30c8a 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -51,7 +51,6 @@ extern u16 gSaveFileStatus; extern u16 gScriptResult; extern u8 (*gCallback_03004AE8)(void); extern u8 gUnknown_03004860; -extern struct MenuItem gStartMenuItems[]; extern u8 gNumSafariBalls; EWRAM_DATA static u8 sStartMenuCursorPos = 0; @@ -67,6 +66,41 @@ extern u8 gSaveText_ThereIsAlreadyAFile[]; extern u8 gSaveText_ThereIsADifferentFile[]; extern u8 gSaveText_WouldYouLikeToSave[]; extern u8 gOtherText_SafariStock[]; +extern u8 SystemText_Pokedex[]; +extern u8 SystemText_Pokemon[]; +extern u8 SystemText_BAG[]; +extern u8 SystemText_Pokenav[]; +extern u8 SystemText_Player[]; +extern u8 SystemText_Save[]; +extern u8 SystemText_Option[]; +extern u8 SystemText_Exit[]; +extern u8 SystemText_Retire[]; +extern u8 SystemText_Player[]; + +static u8 StartMenu_PokedexCallback(void); +static u8 StartMenu_PokemonCallback(void); +static u8 StartMenu_BagCallback(void); +static u8 StartMenu_PokenavCallback(void); +static u8 StartMenu_PlayerCallback(void); +static u8 StartMenu_SaveCallback(void); +static u8 StartMenu_OptionCallback(void); +static u8 StartMenu_ExitCallback(void); +static u8 StartMenu_RetireCallback(void); +static u8 StartMenu_PlayerLinkCallback(void); + +static const struct MenuItem sStartMenuItems[] = +{ + { SystemText_Pokedex, StartMenu_PokedexCallback }, + { SystemText_Pokemon, StartMenu_PokemonCallback }, + { SystemText_BAG, StartMenu_BagCallback }, + { SystemText_Pokenav, StartMenu_PokenavCallback }, + { SystemText_Player, StartMenu_PlayerCallback }, + { SystemText_Save, StartMenu_SaveCallback }, + { SystemText_Option, StartMenu_OptionCallback }, + { SystemText_Exit, StartMenu_ExitCallback }, + { SystemText_Retire, StartMenu_RetireCallback }, + { SystemText_Player, StartMenu_PlayerLinkCallback }, +}; //Private functions static void BuildStartMenuActions(void); @@ -180,7 +214,7 @@ static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n) do { - MenuPrint(gStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2); + MenuPrint(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2); _index++; if(_index >= sNumStartMenuActions) { @@ -303,12 +337,12 @@ static u8 StartMenu_InputProcessCallback(void) if(gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if(gStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback == StartMenu_PokedexCallback) + if(sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback == StartMenu_PokedexCallback) { if(GetNationalPokedexCount(0) == 0) return 0; } - gCallback_03004AE8 = gStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback; + gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback; if(gCallback_03004AE8 != StartMenu_SaveCallback && gCallback_03004AE8 != StartMenu_ExitCallback && gCallback_03004AE8 != StartMenu_RetireCallback) @@ -324,7 +358,7 @@ static u8 StartMenu_InputProcessCallback(void) } //When player selects POKEDEX -u8 StartMenu_PokedexCallback(void) +static u8 StartMenu_PokedexCallback(void) { if(!gPaletteFade.active) { @@ -337,7 +371,7 @@ u8 StartMenu_PokedexCallback(void) } //When player selects POKEMON -u8 StartMenu_PokemonCallback(void) +static u8 StartMenu_PokemonCallback(void) { if(!gPaletteFade.active) { @@ -349,7 +383,7 @@ u8 StartMenu_PokemonCallback(void) } //When player selects BAG -u8 StartMenu_BagCallback(void) +static u8 StartMenu_BagCallback(void) { if(!gPaletteFade.active) { @@ -361,7 +395,7 @@ u8 StartMenu_BagCallback(void) } //When player selects POKENAV -u8 StartMenu_PokenavCallback(void) +static u8 StartMenu_PokenavCallback(void) { if(!gPaletteFade.active) { @@ -373,7 +407,7 @@ u8 StartMenu_PokenavCallback(void) } //When player selects his/her name -u8 StartMenu_PlayerCallback(void) +static u8 StartMenu_PlayerCallback(void) { if(!gPaletteFade.active) { @@ -385,7 +419,7 @@ u8 StartMenu_PlayerCallback(void) } //When player selects SAVE -u8 StartMenu_SaveCallback(void) +static u8 StartMenu_SaveCallback(void) { sub_8072DEC(); gCallback_03004AE8 = SaveCallback1; @@ -393,7 +427,7 @@ u8 StartMenu_SaveCallback(void) } //When player selects OPTION -u8 StartMenu_OptionCallback(void) +static u8 StartMenu_OptionCallback(void) { if(!gPaletteFade.active) { @@ -406,14 +440,14 @@ u8 StartMenu_OptionCallback(void) } //When player selects EXIT -u8 StartMenu_ExitCallback(void) +static u8 StartMenu_ExitCallback(void) { CloseMenu(); return 1; } //When player selects RETIRE -u8 StartMenu_RetireCallback(void) +static u8 StartMenu_RetireCallback(void) { CloseMenu(); SafariZoneRetirePrompt(); @@ -421,7 +455,7 @@ u8 StartMenu_RetireCallback(void) } //When player selects their name in multiplayer mode -u8 StartMenu_PlayerLinkCallback(void) +static u8 StartMenu_PlayerLinkCallback(void) { if(!gPaletteFade.active) { -- cgit v1.2.3 From 76c493831831410f98222c15526a09ac968059ce Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 5 Jan 2017 04:33:10 -0800 Subject: get rid of MenuItem struct --- src/start_menu.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 4c5e30c8a..87cb3f593 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -37,11 +37,6 @@ enum { MENU_ACTION_PLAYER_LINK }; -struct MenuItem { - u8 *text; - u8 (*callback)(void); -}; - static u8 (*saveDialogCallback)(void); static u8 saveDialogTimer; //Number of frames to keep the window on screen after save was completed static bool8 savingComplete; @@ -88,7 +83,7 @@ static u8 StartMenu_ExitCallback(void); static u8 StartMenu_RetireCallback(void); static u8 StartMenu_PlayerLinkCallback(void); -static const struct MenuItem sStartMenuItems[] = +static const struct MenuAction sStartMenuItems[] = { { SystemText_Pokedex, StartMenu_PokedexCallback }, { SystemText_Pokemon, StartMenu_PokemonCallback }, @@ -337,12 +332,12 @@ static u8 StartMenu_InputProcessCallback(void) if(gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if(sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback == StartMenu_PokedexCallback) + if(sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) { if(GetNationalPokedexCount(0) == 0) return 0; } - gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback; + gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func; if(gCallback_03004AE8 != StartMenu_SaveCallback && gCallback_03004AE8 != StartMenu_ExitCallback && gCallback_03004AE8 != StartMenu_RetireCallback) -- cgit v1.2.3 From 94fb9ab2a9ed111c72a80693d8f29ea4bc531898 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 5 Jan 2017 22:50:45 -0500 Subject: more labels (#165) * more labels and match sub_810745C * formatting * move BattleStruct to battle.h and combine both loose structs * oops * more labels for rom4.c --- src/start_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 87cb3f593..31ba31766 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -357,7 +357,7 @@ static u8 StartMenu_PokedexCallback(void) { if(!gPaletteFade.active) { - sav12_xor_increment(0x29); + IncrementGameStat(0x29); PlayRainSoundEffect(); SetMainCallback2(CB2_InitPokedex); return 1; @@ -679,7 +679,7 @@ static u8 SaveDialogCB_DoSave(void) { u8 a; - sav12_xor_increment(0); + IncrementGameStat(0); if(gUnknown_020297EC == TRUE) { a = sub_8125D44(4); -- cgit v1.2.3 From f88eeb607409528dadbf841f2cb8e805d6e86deb Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 10 Jan 2017 23:17:43 -0500 Subject: more labels and finish decompiling battle_ai.c except for unk_24 (#184) * labels for save_menu_util.c * formatting, i suck at it * fix sub_80712B4 to not use MyTask struct * pls don't kill me * current changes * decompile BattleAICmd_if_damage_bonus * formatting * label thinking struct unk8 * decompile BattleAICMd_if_status_not_in_party * decompile more battle_ai.c functions * Began decompilation of a random file * decompile BattleAICmd_if_can_faint and BattleAICmd_if_cant_faint * decompile unk_3F and unk_40 * decompile if_move_effect and if_not_move_effect * formatting, silly * decompile if_last_move_did_damage and if_encored * decompile unk_45 if_random_2 and unk_47 * decompile get_hold_effect and get_gender * decompile is_first_turn and get_stockpile_count * decompile unk_4C and get_item * decompile unk_4E unk_4F and unk_50 * decompile get_protect_count and the remaining stub macros * decompile call jump and unk_5A * decompile if_level_cond * decompile the last AI macros besides unk_24 * finish decompiling battle_ai.c except for unk_24 --- src/start_menu.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 31ba31766..8ef3a9d2b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -281,22 +281,15 @@ void CreateStartMenuTask(void (*func)(u8)) SetTaskFuncWithFollowupFunc(taskId, Task_StartMenu, func); } -struct MyTask { - TaskFunc func; - bool8 isActive; - u8 prev; - u8 next; - u8 priority; - s16 var1; -}; - void sub_80712B4(u8 taskId) { - switch(((struct MyTask *)&gTasks[taskId])->var1) + struct Task *task = &gTasks[taskId]; + + switch(task->data[0]) { case 0: gCallback_03004AE8 = StartMenu_InputProcessCallback; - ((struct MyTask *)&gTasks[taskId])->var1++; + task->data[0]++; break; case 1: if(gCallback_03004AE8() == 1) @@ -554,7 +547,7 @@ static void Task_SaveDialog(u8 taskId) static void sub_8071700(void) { - sub_80946C8(0, 0); + HandleCloseSaveWindow(0, 0); } static void HideSaveDialog(void) -- cgit v1.2.3 From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 8ef3a9d2b..7db6a11eb 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,8 +1,8 @@ #include "global.h" #include "start_menu.h" #include "asm.h" -#include "field_player_avatar.h" #include "event_data.h" +#include "field_player_avatar.h" #include "load_save.h" #include "main.h" #include "map_obj_lock.h" -- cgit v1.2.3 From 801877553db80267a62c0c3c0b2805b6716d1ef9 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:38:44 +0100 Subject: Remove trailing whitespace --- src/start_menu.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 7db6a11eb..ee6582553 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -191,7 +191,7 @@ static void BuildStartMenuActions_Link(void) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); - AddStartMenuAction(MENU_ACTION_EXIT); + AddStartMenuAction(MENU_ACTION_EXIT); } //Show number of safari balls left @@ -206,7 +206,7 @@ static void DisplaySafariBallsWindow(void) static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n) { int _index = *index; - + do { MenuPrint(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2); @@ -258,7 +258,7 @@ static void InitStartMenu(void) { s16 step = 0; s16 index = 0; - + while(InitStartMenuMultistep(&step, &index) == FALSE) ; } @@ -275,7 +275,7 @@ static void Task_StartMenu(u8 taskId) void CreateStartMenuTask(void (*func)(u8)) { u8 taskId; - + InitMenuWindow(&gWindowConfig_81E6CE4); taskId = CreateTask(Task_StartMenu, 0x50); SetTaskFuncWithFollowupFunc(taskId, Task_StartMenu, func); @@ -490,7 +490,7 @@ static u8 SaveCallback2(void) return TRUE; } return FALSE; -} +} static void sub_807160C(void) { @@ -528,13 +528,13 @@ static void DisplaySaveMessageWithCallback(u8 *ptr, u8 (*func)(void)) static void Task_SaveDialog(u8 taskId) { u8 status = RunSaveDialogCallback(); - + switch(status) { case SAVE_CANCELED: case SAVE_ERROR: gScriptResult = 0; - break; + break; case SAVE_SUCCESS: gScriptResult = status; break; @@ -671,7 +671,7 @@ static u8 SaveDialogCB_DisplaySavingMessage(void) static u8 SaveDialogCB_DoSave(void) { u8 a; - + IncrementGameStat(0); if(gUnknown_020297EC == TRUE) { @@ -682,7 +682,7 @@ static u8 SaveDialogCB_DoSave(void) { a = sub_8125D44(0); } - + if(a == 1) { //"(Player) saved the game." @@ -693,7 +693,7 @@ static u8 SaveDialogCB_DoSave(void) //"Save error. Please exchange the backup memory." DisplaySaveMessageWithCallback(gSystemText_SaveErrorExchangeBackup, SaveDialogCB_SaveError); } - + SaveDialogStartTimeout(); return SAVE_IN_PROGRESS; } @@ -753,7 +753,7 @@ static bool32 sub_80719FC(u8 *step) { u8 *addr; u32 size; - + REG_DISPCNT = 0; SetVBlankCallback(NULL); remove_some_task(); @@ -787,7 +787,7 @@ static bool32 sub_80719FC(u8 *step) case 3: { u32 savedIme; - + BlendPalettes(-1, 0x10, 0); SetVBlankCallback(sub_80719F0); savedIme = REG_IME; @@ -821,7 +821,7 @@ static void sub_8071B54(void) static void Task_8071B64(u8 taskId) { s16 *step = gTasks[taskId].data; - + if(!gPaletteFade.active) { switch(*step) @@ -850,7 +850,7 @@ static void Task_8071B64(u8 taskId) case 4: SetMainCallback2(gMain.savedCallback); DestroyTask(taskId); - break; + break; } } } -- cgit v1.2.3 From bcaab977727ded65c9eeaef9dbef9e9441d26fb7 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 21 Jan 2017 16:48:06 -0800 Subject: formatting --- src/start_menu.c | 110 +++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index ee6582553..8a56b6c33 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -141,11 +141,11 @@ static void Task_8071B64(u8 taskId); static void BuildStartMenuActions(void) { sNumStartMenuActions = 0; - if(is_c1_link_related_active() == TRUE) + if (is_c1_link_related_active() == TRUE) BuildStartMenuActions_Link(); else { - if(GetSafariZoneFlag() == TRUE) + if (GetSafariZoneFlag() == TRUE) BuildStartMenuActions_SafariZone(); else BuildStartMenuActions_Normal(); @@ -159,12 +159,12 @@ static void AddStartMenuAction(u8 action) static void BuildStartMenuActions_Normal(void) { - if(FlagGet(SYS_POKEDEX_GET) == TRUE) + if (FlagGet(SYS_POKEDEX_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEDEX); - if(FlagGet(SYS_POKEMON_GET) == TRUE) + if (FlagGet(SYS_POKEMON_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if(FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); @@ -187,7 +187,7 @@ static void BuildStartMenuActions_Link(void) { AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if(FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); @@ -211,20 +211,20 @@ static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n) { MenuPrint(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2); _index++; - if(_index >= sNumStartMenuActions) + if (_index >= sNumStartMenuActions) { *index = _index; return TRUE; } } - while(--n != 0); + while (--n != 0); *index = _index; return FALSE; } static bool32 InitStartMenuMultistep(s16 *step, s16 *index) { - switch(*step) + switch (*step) { case 1: BuildStartMenuActions(); @@ -236,12 +236,12 @@ static bool32 InitStartMenuMultistep(s16 *step, s16 *index) (*step)++; break; case 3: - if(GetSafariZoneFlag()) + if (GetSafariZoneFlag()) DisplaySafariBallsWindow(); (*step)++; break; case 4: - if(PrintStartMenuItemsMultistep(index, 2)) + if (PrintStartMenuItemsMultistep(index, 2)) (*step)++; break; case 0: @@ -259,13 +259,13 @@ static void InitStartMenu(void) s16 step = 0; s16 index = 0; - while(InitStartMenuMultistep(&step, &index) == FALSE) + while (InitStartMenuMultistep(&step, &index) == FALSE) ; } static void Task_StartMenu(u8 taskId) { - if(InitStartMenuMultistep(gTasks[taskId].data, gTasks[taskId].data + 1) == TRUE) + if (InitStartMenuMultistep(gTasks[taskId].data, gTasks[taskId].data + 1) == TRUE) { *gTasks[taskId].data = 0; SwitchTaskToFollowupFunc(taskId); @@ -285,14 +285,14 @@ void sub_80712B4(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch(task->data[0]) + switch (task->data[0]) { case 0: gCallback_03004AE8 = StartMenu_InputProcessCallback; task->data[0]++; break; case 1: - if(gCallback_03004AE8() == 1) + if (gCallback_03004AE8() == 1) DestroyTask(taskId); break; } @@ -300,7 +300,7 @@ void sub_80712B4(u8 taskId) void sub_8071310(void) { - if(!is_c1_link_related_active()) + if (!is_c1_link_related_active()) { FreezeMapObjects(); sub_80594C0(); @@ -312,32 +312,32 @@ void sub_8071310(void) static u8 StartMenu_InputProcessCallback(void) { - if(gMain.newKeys & DPAD_UP) + if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(-1); } - if(gMain.newKeys & DPAD_DOWN) + if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(1); } - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if(sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) + if (sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func == StartMenu_PokedexCallback) { - if(GetNationalPokedexCount(0) == 0) + if (GetNationalPokedexCount(0) == 0) return 0; } gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func; - if(gCallback_03004AE8 != StartMenu_SaveCallback && + if (gCallback_03004AE8 != StartMenu_SaveCallback && gCallback_03004AE8 != StartMenu_ExitCallback && gCallback_03004AE8 != StartMenu_RetireCallback) fade_screen(1, 0); return 0; } - if(gMain.newKeys & (START_BUTTON | B_BUTTON)) + if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { CloseMenu(); return 1; @@ -348,7 +348,7 @@ static u8 StartMenu_InputProcessCallback(void) //When player selects POKEDEX static u8 StartMenu_PokedexCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { IncrementGameStat(0x29); PlayRainSoundEffect(); @@ -361,7 +361,7 @@ static u8 StartMenu_PokedexCallback(void) //When player selects POKEMON static u8 StartMenu_PokemonCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(sub_8089A70); @@ -373,7 +373,7 @@ static u8 StartMenu_PokemonCallback(void) //When player selects BAG static u8 StartMenu_BagCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(sub_80A53F8); @@ -385,7 +385,7 @@ static u8 StartMenu_BagCallback(void) //When player selects POKENAV static u8 StartMenu_PokenavCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(sub_80EBA5C); @@ -397,7 +397,7 @@ static u8 StartMenu_PokenavCallback(void) //When player selects his/her name static u8 StartMenu_PlayerCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); sub_8093110(sub_805469C); @@ -417,7 +417,7 @@ static u8 StartMenu_SaveCallback(void) //When player selects OPTION static u8 StartMenu_OptionCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); SetMainCallback2(CB2_InitOptionMenu); @@ -445,7 +445,7 @@ static u8 StartMenu_RetireCallback(void) //When player selects their name in multiplayer mode static u8 StartMenu_PlayerLinkCallback(void) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { PlayRainSoundEffect(); sub_8093130(gUnknown_03004860, sub_805469C); @@ -472,7 +472,7 @@ static u8 SaveCallback1(void) static u8 SaveCallback2(void) { - switch(RunSaveDialogCallback()) + switch (RunSaveDialogCallback()) { case SAVE_IN_PROGRESS: return FALSE; @@ -501,9 +501,9 @@ static void sub_807160C(void) static u8 RunSaveDialogCallback(void) { - if(savingComplete) + if (savingComplete) { - if(!MenuUpdateWindowText()) + if (!MenuUpdateWindowText()) return 0; } savingComplete = FALSE; @@ -529,7 +529,7 @@ static void Task_SaveDialog(u8 taskId) { u8 status = RunSaveDialogCallback(); - switch(status) + switch (status) { case SAVE_CANCELED: case SAVE_ERROR: @@ -563,21 +563,21 @@ static void SaveDialogStartTimeout(void) static bool8 SaveDialogCheckForTimeoutOrKeypress(void) { saveDialogTimer--; - if(gMain.heldKeys & A_BUTTON) + if (gMain.heldKeys & A_BUTTON) { PlaySE(SE_SELECT); return TRUE; } - else if(saveDialogTimer == 0) + else if (saveDialogTimer == 0) return TRUE; return FALSE; } static bool8 SaveDialogCheckForTimeoutAndKeypress(void) { - if(saveDialogTimer != 0) + if (saveDialogTimer != 0) saveDialogTimer--; - else if(gMain.heldKeys & A_BUTTON) + else if (gMain.heldKeys & A_BUTTON) return TRUE; return FALSE; } @@ -600,15 +600,15 @@ static u8 SaveDialogCB_DisplayConfirmYesNoMenu(void) static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void) { - switch(ProcessMenuInputNoWrap_()) + switch (ProcessMenuInputNoWrap_()) { case 0: //YES HideSaveDialog(); - switch(gSaveFileStatus) + switch (gSaveFileStatus) { case 0: case 2: - if(gUnknown_020297EC == FALSE) + if (gUnknown_020297EC == FALSE) { saveDialogCallback = SaveDialogCB_SaveFileExists; return SAVE_IN_PROGRESS; @@ -646,7 +646,7 @@ static u8 SaveDialogCB_DisplayOverwriteYesNoMenu(void) static u8 SaveDialogCB_ProcessOverwriteYesNoMenu(void) { - switch(ProcessMenuInputNoWrap_()) + switch (ProcessMenuInputNoWrap_()) { case 0: //YES HideSaveDialog(); @@ -673,7 +673,7 @@ static u8 SaveDialogCB_DoSave(void) u8 a; IncrementGameStat(0); - if(gUnknown_020297EC == TRUE) + if (gUnknown_020297EC == TRUE) { a = sub_8125D44(4); gUnknown_020297EC = FALSE; @@ -683,7 +683,7 @@ static u8 SaveDialogCB_DoSave(void) a = sub_8125D44(0); } - if(a == 1) + if (a == 1) { //"(Player) saved the game." DisplaySaveMessageWithCallback(gSaveText_PlayerSavedTheGame, SaveDialogCB_SaveSuccess); @@ -700,7 +700,7 @@ static u8 SaveDialogCB_DoSave(void) static u8 SaveDialogCB_SaveSuccess(void) { - if(MenuUpdateWindowText()) + if (MenuUpdateWindowText()) { PlaySE(SE_SAVE); saveDialogCallback = SaveDialogCB_ReturnSuccess; @@ -710,7 +710,7 @@ static u8 SaveDialogCB_SaveSuccess(void) static u8 SaveDialogCB_ReturnSuccess(void) { - if(!IsSEPlaying() && SaveDialogCheckForTimeoutOrKeypress()) + if (!IsSEPlaying() && SaveDialogCheckForTimeoutOrKeypress()) { sub_8071700(); return SAVE_SUCCESS; @@ -721,7 +721,7 @@ static u8 SaveDialogCB_ReturnSuccess(void) static u8 SaveDialogCB_SaveError(void) { - if(MenuUpdateWindowText()) + if (MenuUpdateWindowText()) { PlaySE(SE_BOO); saveDialogCallback = SaveDialogCB_ReturnError; @@ -731,7 +731,7 @@ static u8 SaveDialogCB_SaveError(void) static u8 SaveDialogCB_ReturnError(void) { - if(!SaveDialogCheckForTimeoutAndKeypress()) + if (!SaveDialogCheckForTimeoutAndKeypress()) return SAVE_IN_PROGRESS; else { @@ -747,7 +747,7 @@ static void sub_80719F0(void) static bool32 sub_80719FC(u8 *step) { - switch(*step) + switch (*step) { case 0: { @@ -760,12 +760,12 @@ static bool32 sub_80719FC(u8 *step) DmaClear16(3, PLTT, PLTT_SIZE); addr = (void *)VRAM; size = 0x18000; - while(1) + while (1) { DmaFill16(3, 0, addr, 0x1000); addr += 0x1000; size -= 0x1000; - if(size <= 0x1000) + if (size <= 0x1000) { DmaFill16(3, 0, addr, size); break; @@ -805,7 +805,7 @@ static bool32 sub_80719FC(u8 *step) void sub_8071B28(void) { - if(sub_80719FC(&gMain.state)) + if (sub_80719FC(&gMain.state)) { CreateTask(Task_8071B64, 0x50); SetMainCallback2(sub_8071B54); @@ -822,9 +822,9 @@ static void Task_8071B64(u8 taskId) { s16 *step = gTasks[taskId].data; - if(!gPaletteFade.active) + if (!gPaletteFade.active) { - switch(*step) + switch (*step) { case 0: MenuDisplayMessageBox(); @@ -838,7 +838,7 @@ static void Task_8071B64(u8 taskId) (*step)++; break; case 2: - if(!sub_8125E6C()) + if (!sub_8125E6C()) break; ClearSecretBase2Field_9_2(); (*step)++; -- cgit v1.2.3 From ed8f49d5e1418309cbc4f705a242d073258c8639 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 28 Jan 2017 13:51:14 -0800 Subject: tabs to spaces --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 8a56b6c33..9c10c4cae 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -283,7 +283,7 @@ void CreateStartMenuTask(void (*func)(u8)) void sub_80712B4(u8 taskId) { - struct Task *task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- src/start_menu.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 9c10c4cae..d1344ce90 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -22,6 +22,7 @@ #include "task.h" #include "trainer_card.h" #include "weather.h" +#include "field_map_obj_helpers.h" //Menu actions enum { @@ -41,7 +42,7 @@ static u8 (*saveDialogCallback)(void); static u8 saveDialogTimer; //Number of frames to keep the window on screen after save was completed static bool8 savingComplete; -extern bool8 gUnknown_020297EC; +extern bool8 gDifferentSaveFile; extern u16 gSaveFileStatus; extern u16 gScriptResult; extern u8 (*gCallback_03004AE8)(void); @@ -586,7 +587,6 @@ static u8 SaveDialogCB_DisplayConfirmMessage(void) { MenuZeroFillScreen(); HandleDrawSaveWindowInfo(0, 0); - //"Would you like to save the game?" DisplaySaveMessageWithCallback(gSaveText_WouldYouLikeToSave, SaveDialogCB_DisplayConfirmYesNoMenu); return SAVE_IN_PROGRESS; } @@ -608,7 +608,7 @@ static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void) { case 0: case 2: - if (gUnknown_020297EC == FALSE) + if (gDifferentSaveFile == FALSE) { saveDialogCallback = SaveDialogCB_SaveFileExists; return SAVE_IN_PROGRESS; @@ -632,7 +632,7 @@ static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void) static u8 SaveDialogCB_SaveFileExists(void) { DisplaySaveMessageWithCallback( - gUnknown_020297EC == TRUE ? gSaveText_ThereIsADifferentFile : gSaveText_ThereIsAlreadyAFile, + gDifferentSaveFile == TRUE ? gSaveText_ThereIsADifferentFile : gSaveText_ThereIsAlreadyAFile, SaveDialogCB_DisplayOverwriteYesNoMenu); return SAVE_IN_PROGRESS; } @@ -670,20 +670,20 @@ static u8 SaveDialogCB_DisplaySavingMessage(void) static u8 SaveDialogCB_DoSave(void) { - u8 a; + bool8 saveSucceeded; IncrementGameStat(0); - if (gUnknown_020297EC == TRUE) + if (gDifferentSaveFile == TRUE) { - a = sub_8125D44(4); - gUnknown_020297EC = FALSE; + saveSucceeded = TrySavingData(DIFFERENT_FILE_SAVE); + gDifferentSaveFile = FALSE; } else { - a = sub_8125D44(0); + saveSucceeded = TrySavingData(NORMAL_SAVE); } - if (a == 1) + if (saveSucceeded == TRUE) { //"(Player) saved the game." DisplaySaveMessageWithCallback(gSaveText_PlayerSavedTheGame, SaveDialogCB_SaveSuccess); -- cgit v1.2.3 From 83d7f52f2cadd4232ee674947a93e93fc18e483a Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 9 Apr 2017 01:05:20 +0000 Subject: finish decompiling item_use.c (#244) * nonmatching sub_80C9720 and decompile sub_80C9838 * finish decompiling Itemfinder functions. * decompile ItemUseOutOfBattle_PokeblockCase and ItemUseOutOfBattle_CoinCase * rename field_doortransition * rename weather file * decompile more of item_use.c * decompile up to repel code * decompile up to stat increase code * finish decompiling item_use.c * remove item_use from ld_script --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index d1344ce90..1fc9b6363 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -21,7 +21,7 @@ #include "string_util.h" #include "task.h" #include "trainer_card.h" -#include "weather.h" +#include "field_screeneffect.h" #include "field_map_obj_helpers.h" //Menu actions -- cgit v1.2.3 From ddc846fa6a0d9a13cfba6f52488a66f6f4562a2d Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 27 Apr 2017 15:43:31 +0200 Subject: Sort includes --- src/start_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 1fc9b6363..48217219d 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -2,7 +2,9 @@ #include "start_menu.h" #include "asm.h" #include "event_data.h" +#include "field_map_obj_helpers.h" #include "field_player_avatar.h" +#include "field_screeneffect.h" #include "load_save.h" #include "main.h" #include "map_obj_lock.h" @@ -21,8 +23,6 @@ #include "string_util.h" #include "task.h" #include "trainer_card.h" -#include "field_screeneffect.h" -#include "field_map_obj_helpers.h" //Menu actions enum { -- cgit v1.2.3 From ca3da9a99901a20aa1b32a2bd9063fb49bb8612a Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 03:46:55 -0700 Subject: file renaming --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 48217219d..4a3bcbbd3 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -4,7 +4,7 @@ #include "event_data.h" #include "field_map_obj_helpers.h" #include "field_player_avatar.h" -#include "field_screeneffect.h" +#include "field_weather.h" #include "load_save.h" #include "main.h" #include "map_obj_lock.h" -- cgit v1.2.3 From fbebe08ae94b8e165ba120d71959554765307ce3 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 9 May 2017 12:52:39 -0500 Subject: use macros to set DISPCNT and BG*CNT registers (#286) * use macros to set DISPCNT and BG*CNT registers * add a few more --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 4a3bcbbd3..37d361c0b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -782,7 +782,7 @@ static bool32 sub_80719FC(u8 *step) case 2: SetUpWindowConfig(&gWindowConfig_81E6CE4); InitMenuWindow(&gWindowConfig_81E6CE4); - REG_DISPCNT = 0x100; + REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON; break; case 3: { -- cgit v1.2.3 From 010eb456d63b0d644285f263f310d73bfb9646b2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 20 May 2017 17:49:54 +0200 Subject: Decrease indentation level of switches --- src/start_menu.c | 306 +++++++++++++++++++++++++++---------------------------- 1 file changed, 153 insertions(+), 153 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 37d361c0b..8d7e50ea5 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -227,30 +227,30 @@ static bool32 InitStartMenuMultistep(s16 *step, s16 *index) { switch (*step) { - case 1: - BuildStartMenuActions(); + case 1: + BuildStartMenuActions(); + (*step)++; + break; + case 2: + MenuDrawTextWindow(22, 0, 29, sNumStartMenuActions * 2 + 3); + *index = 0; + (*step)++; + break; + case 3: + if (GetSafariZoneFlag()) + DisplaySafariBallsWindow(); + (*step)++; + break; + case 4: + if (PrintStartMenuItemsMultistep(index, 2)) (*step)++; - break; - case 2: - MenuDrawTextWindow(22, 0, 29, sNumStartMenuActions * 2 + 3); - *index = 0; - (*step)++; - break; - case 3: - if (GetSafariZoneFlag()) - DisplaySafariBallsWindow(); - (*step)++; - break; - case 4: - if (PrintStartMenuItemsMultistep(index, 2)) - (*step)++; - break; - case 0: - (*step)++; - break; - case 5: - sStartMenuCursorPos = InitMenu(0, 0x17, 2, sNumStartMenuActions, sStartMenuCursorPos, 6); - return TRUE; + break; + case 0: + (*step)++; + break; + case 5: + sStartMenuCursorPos = InitMenu(0, 0x17, 2, sNumStartMenuActions, sStartMenuCursorPos, 6); + return TRUE; } return FALSE; } @@ -288,14 +288,14 @@ void sub_80712B4(u8 taskId) switch (task->data[0]) { - case 0: - gCallback_03004AE8 = StartMenu_InputProcessCallback; - task->data[0]++; - break; - case 1: - if (gCallback_03004AE8() == 1) - DestroyTask(taskId); - break; + case 0: + gCallback_03004AE8 = StartMenu_InputProcessCallback; + task->data[0]++; + break; + case 1: + if (gCallback_03004AE8() == 1) + DestroyTask(taskId); + break; } } @@ -475,20 +475,20 @@ static u8 SaveCallback2(void) { switch (RunSaveDialogCallback()) { - case SAVE_IN_PROGRESS: - return FALSE; - case SAVE_CANCELED: - //Go back to start menu - MenuZeroFillScreen(); - InitStartMenu(); - gCallback_03004AE8 = StartMenu_InputProcessCallback; - return FALSE; - case SAVE_SUCCESS: - case SAVE_ERROR: - MenuZeroFillScreen(); - sub_8064E2C(); - ScriptContext2_Disable(); - return TRUE; + case SAVE_IN_PROGRESS: + return FALSE; + case SAVE_CANCELED: + //Go back to start menu + MenuZeroFillScreen(); + InitStartMenu(); + gCallback_03004AE8 = StartMenu_InputProcessCallback; + return FALSE; + case SAVE_SUCCESS: + case SAVE_ERROR: + MenuZeroFillScreen(); + sub_8064E2C(); + ScriptContext2_Disable(); + return TRUE; } return FALSE; } @@ -532,15 +532,15 @@ static void Task_SaveDialog(u8 taskId) switch (status) { - case SAVE_CANCELED: - case SAVE_ERROR: - gScriptResult = 0; - break; - case SAVE_SUCCESS: - gScriptResult = status; - break; - case SAVE_IN_PROGRESS: - return; + case SAVE_CANCELED: + case SAVE_ERROR: + gScriptResult = 0; + break; + case SAVE_SUCCESS: + gScriptResult = status; + break; + case SAVE_IN_PROGRESS: + return; } DestroyTask(taskId); EnableBothScriptContexts(); @@ -602,29 +602,29 @@ static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void) { switch (ProcessMenuInputNoWrap_()) { - case 0: //YES - HideSaveDialog(); - switch (gSaveFileStatus) + case 0: //YES + HideSaveDialog(); + switch (gSaveFileStatus) + { + case 0: + case 2: + if (gDifferentSaveFile == FALSE) { - case 0: - case 2: - if (gDifferentSaveFile == FALSE) - { - saveDialogCallback = SaveDialogCB_SaveFileExists; - return SAVE_IN_PROGRESS; - } - saveDialogCallback = SaveDialogCB_DisplaySavingMessage; - return SAVE_IN_PROGRESS; - default: - saveDialogCallback = SaveDialogCB_SaveFileExists; - return SAVE_IN_PROGRESS; + saveDialogCallback = SaveDialogCB_SaveFileExists; + return SAVE_IN_PROGRESS; } - break; - case -1: //B button - case 1: //NO - HideSaveDialog(); - sub_8071700(); - return SAVE_CANCELED; + saveDialogCallback = SaveDialogCB_DisplaySavingMessage; + return SAVE_IN_PROGRESS; + default: + saveDialogCallback = SaveDialogCB_SaveFileExists; + return SAVE_IN_PROGRESS; + } + break; + case -1: //B button + case 1: //NO + HideSaveDialog(); + sub_8071700(); + return SAVE_CANCELED; } return SAVE_IN_PROGRESS; } @@ -648,15 +648,15 @@ static u8 SaveDialogCB_ProcessOverwriteYesNoMenu(void) { switch (ProcessMenuInputNoWrap_()) { - case 0: //YES - HideSaveDialog(); - saveDialogCallback = SaveDialogCB_DisplaySavingMessage; - break; - case -1: //B button - case 1: //NO - HideSaveDialog(); - sub_8071700(); - return SAVE_CANCELED; + case 0: //YES + HideSaveDialog(); + saveDialogCallback = SaveDialogCB_DisplaySavingMessage; + break; + case -1: //B button + case 1: //NO + HideSaveDialog(); + sub_8071700(); + return SAVE_CANCELED; } return SAVE_IN_PROGRESS; } @@ -749,55 +749,55 @@ static bool32 sub_80719FC(u8 *step) { switch (*step) { - case 0: + case 0: + { + u8 *addr; + u32 size; + + REG_DISPCNT = 0; + SetVBlankCallback(NULL); + remove_some_task(); + DmaClear16(3, PLTT, PLTT_SIZE); + addr = (void *)VRAM; + size = 0x18000; + while (1) { - u8 *addr; - u32 size; - - REG_DISPCNT = 0; - SetVBlankCallback(NULL); - remove_some_task(); - DmaClear16(3, PLTT, PLTT_SIZE); - addr = (void *)VRAM; - size = 0x18000; - while (1) + DmaFill16(3, 0, addr, 0x1000); + addr += 0x1000; + size -= 0x1000; + if (size <= 0x1000) { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } + DmaFill16(3, 0, addr, size); + break; } - break; } - case 1: - ResetSpriteData(); - ResetTasks(); - ResetPaletteFade(); - dp12_8087EA4(); - break; - case 2: - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); - REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON; - break; - case 3: - { - u32 savedIme; - - BlendPalettes(-1, 0x10, 0); - SetVBlankCallback(sub_80719F0); - savedIme = REG_IME; - REG_IME = 0; - REG_IE |= 1; - REG_IME = savedIme; - break; - } - case 4: - return TRUE; + break; + } + case 1: + ResetSpriteData(); + ResetTasks(); + ResetPaletteFade(); + dp12_8087EA4(); + break; + case 2: + SetUpWindowConfig(&gWindowConfig_81E6CE4); + InitMenuWindow(&gWindowConfig_81E6CE4); + REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON; + break; + case 3: + { + u32 savedIme; + + BlendPalettes(-1, 0x10, 0); + SetVBlankCallback(sub_80719F0); + savedIme = REG_IME; + REG_IME = 0; + REG_IE |= 1; + REG_IME = savedIme; + break; + } + case 4: + return TRUE; } (*step)++; return FALSE; @@ -826,31 +826,31 @@ static void Task_8071B64(u8 taskId) { switch (*step) { - case 0: - MenuDisplayMessageBox(); - MenuPrint(gSystemText_Saving, 2, 15); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); - (*step)++; - break; - case 1: - SetSecretBase2Field_9_AndHideBG(); - sub_8125E2C(); - (*step)++; - break; - case 2: - if (!sub_8125E6C()) - break; - ClearSecretBase2Field_9_2(); - (*step)++; - break; - case 3: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); - (*step)++; - break; - case 4: - SetMainCallback2(gMain.savedCallback); - DestroyTask(taskId); + case 0: + MenuDisplayMessageBox(); + MenuPrint(gSystemText_Saving, 2, 15); + BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + (*step)++; + break; + case 1: + SetSecretBase2Field_9_AndHideBG(); + sub_8125E2C(); + (*step)++; + break; + case 2: + if (!sub_8125E6C()) break; + ClearSecretBase2Field_9_2(); + (*step)++; + break; + case 3: + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + (*step)++; + break; + case 4: + SetMainCallback2(gMain.savedCallback); + DestroyTask(taskId); + break; } } } -- cgit v1.2.3 From 7c4f99560812cd5a8eedb124a9bc99c3f4243438 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 21 May 2017 11:37:35 +0200 Subject: Remove duplicate strings.h declarations --- src/start_menu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 37d361c0b..c95c8b3f0 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -21,6 +21,7 @@ #include "sound.h" #include "sprite.h" #include "string_util.h" +#include "strings.h" #include "task.h" #include "trainer_card.h" @@ -54,10 +55,8 @@ EWRAM_DATA static u8 sNumStartMenuActions = 0; EWRAM_DATA static u8 sCurrentStartMenuActions[10] = {0}; //Text strings -extern u8 gSystemText_Saving[]; extern u8 gSaveText_PlayerSavedTheGame[]; extern u8 gSaveText_DontTurnOff[]; -extern u8 gSystemText_SaveErrorExchangeBackup[]; extern u8 gSaveText_ThereIsAlreadyAFile[]; extern u8 gSaveText_ThereIsADifferentFile[]; extern u8 gSaveText_WouldYouLikeToSave[]; @@ -113,7 +112,7 @@ static u8 SaveCallback1(void); static u8 SaveCallback2(void); static void sub_807160C(void); static u8 RunSaveDialogCallback(void); -static void DisplaySaveMessageWithCallback(u8 *ptr, u8 (*func)(void)); +static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void)); static void Task_SaveDialog(u8 taskId); static void sub_8071700(void); static void HideSaveDialog(void); @@ -517,7 +516,7 @@ void InitSaveDialog(void) CreateTask(Task_SaveDialog, 0x50); } -static void DisplaySaveMessageWithCallback(u8 *ptr, u8 (*func)(void)) +static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void)) { StringExpandPlaceholders(gStringVar4, ptr); MenuDisplayMessageBox(); -- cgit v1.2.3 From d35dc5bd698b8e359669ac0e5bc74b2df0e58bd8 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 21 May 2017 12:46:28 +0200 Subject: Add strings2.h --- src/start_menu.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index c95c8b3f0..fb9013f7c 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -22,6 +22,7 @@ #include "sprite.h" #include "string_util.h" #include "strings.h" +#include "strings2.h" #include "task.h" #include "trainer_card.h" @@ -60,17 +61,6 @@ extern u8 gSaveText_DontTurnOff[]; extern u8 gSaveText_ThereIsAlreadyAFile[]; extern u8 gSaveText_ThereIsADifferentFile[]; extern u8 gSaveText_WouldYouLikeToSave[]; -extern u8 gOtherText_SafariStock[]; -extern u8 SystemText_Pokedex[]; -extern u8 SystemText_Pokemon[]; -extern u8 SystemText_BAG[]; -extern u8 SystemText_Pokenav[]; -extern u8 SystemText_Player[]; -extern u8 SystemText_Save[]; -extern u8 SystemText_Option[]; -extern u8 SystemText_Exit[]; -extern u8 SystemText_Retire[]; -extern u8 SystemText_Player[]; static u8 StartMenu_PokedexCallback(void); static u8 StartMenu_PokemonCallback(void); -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/start_menu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index a3258bab1..6c3b411bc 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,6 +1,10 @@ +#include "item_menu.h" +#include "pokenav.h" +#include "pokemon_menu.h" +#include "unknown_task.h" +#include "fieldmap.h" #include "global.h" #include "start_menu.h" -#include "asm.h" #include "event_data.h" #include "field_map_obj_helpers.h" #include "field_player_avatar.h" @@ -49,7 +53,6 @@ extern u16 gSaveFileStatus; extern u16 gScriptResult; extern u8 (*gCallback_03004AE8)(void); extern u8 gUnknown_03004860; -extern u8 gNumSafariBalls; EWRAM_DATA static u8 sStartMenuCursorPos = 0; EWRAM_DATA static u8 sNumStartMenuActions = 0; -- cgit v1.2.3 From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:01:42 +0200 Subject: Sort includes --- src/start_menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 6c3b411bc..f6d50db71 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,14 +1,11 @@ -#include "item_menu.h" -#include "pokenav.h" -#include "pokemon_menu.h" -#include "unknown_task.h" -#include "fieldmap.h" #include "global.h" #include "start_menu.h" #include "event_data.h" #include "field_map_obj_helpers.h" #include "field_player_avatar.h" #include "field_weather.h" +#include "fieldmap.h" +#include "item_menu.h" #include "load_save.h" #include "main.h" #include "map_obj_lock.h" @@ -16,6 +13,8 @@ #include "option_menu.h" #include "palette.h" #include "pokedex.h" +#include "pokemon_menu.h" +#include "pokenav.h" #include "rom4.h" #include "safari_zone.h" #include "save.h" @@ -29,6 +28,7 @@ #include "strings2.h" #include "task.h" #include "trainer_card.h" +#include "unknown_task.h" //Menu actions enum { -- cgit v1.2.3 From f5b7921fa3b4356c2d79a117858fc543fd2cf15f Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 9 Jun 2017 02:43:39 -0400 Subject: cleanup player_pc.c --- src/start_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/start_menu.c') diff --git a/src/start_menu.c b/src/start_menu.c index 37d361c0b..be489bd1f 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -410,7 +410,7 @@ static u8 StartMenu_PlayerCallback(void) //When player selects SAVE static u8 StartMenu_SaveCallback(void) { - sub_8072DEC(); + HandleDestroyMenuCursors(); gCallback_03004AE8 = SaveCallback1; return 0; } -- cgit v1.2.3