From 12e8b9c9951aec44fa5e5162a91bd3edf62e6e2f Mon Sep 17 00:00:00 2001 From: Naramo <62239403+SevenSpiders@users.noreply.github.com> Date: Tue, 2 Dec 2025 15:07:11 +0100 Subject: [PATCH 1/4] Document StartMenu_ExitPartyMenu and PartyMenu actions Rename PARTY_MENU_RESULTS -> PARTY_MENU_EXIT_CODE Finish up enums StartMenu Actions sub_0202D79C -> SaveData_GetRibbons Documenting Startmenu sub_0203B674 -> StartMenu_Run sub_0203B78C -> StartMenu_OpenPartyMenu sub_0203B7C0-> StartMenu_ExitPartyMenu sub_0203BC5C -> StartMenu_ExitBag PartyMenuApplication *param0 -> application --- include/applications/party_menu/defs.h | 26 + .../applications/party_menu/unk_02083370.h | 28 +- include/start_menu.h | 6 +- include/unk_0202D778.h | 2 +- src/applications/party_menu/main.c | 32 +- src/applications/party_menu/unk_02083370.c | 956 +++++++++--------- src/applications/party_menu/unk_02084B70.c | 30 +- src/applications/party_menu/windows.c | 4 +- src/applications/pc_boxes/box_app_manager.c | 2 +- src/field_move_tasks.c | 2 +- src/item_use_functions.c | 20 +- src/overlay088/ov88_0223B140.c | 4 +- src/overlay094/screens/pokemon_summary.c | 2 +- src/overlay104/ov104_02239C58.c | 2 +- src/overlay118/ov118_021D0D80.c | 2 +- src/scrcmd_mystery_gift.c | 2 +- src/start_menu.c | 166 +-- src/unk_0202D778.c | 2 +- src/unk_0203D1B8.c | 6 +- src/unk_0204F13C.c | 2 +- src/unk_0204FAB4.c | 2 +- src/unk_0205003C.c | 2 +- src/unk_0205A0D8.c | 2 +- src/unk_0206B9D8.c | 2 +- src/unk_02095CD4.c | 2 +- 25 files changed, 666 insertions(+), 640 deletions(-) diff --git a/include/applications/party_menu/defs.h b/include/applications/party_menu/defs.h index 6bb456a995..b7b59b5b68 100644 --- a/include/applications/party_menu/defs.h +++ b/include/applications/party_menu/defs.h @@ -70,6 +70,32 @@ enum PartyMenuType { PARTY_MENU_TYPE_MULTI_BATTLE, }; +enum PartyMenuSelectionResults { + PARTY_MENU_EXIT_CODE_DONE = 0, + PARTY_MENU_EXIT_CODE_SUMMARY = 1, + PARTY_MENU_EXIT_CODE_2 = 2, // unused + PARTY_MENU_EXIT_CODE_GIVE_ITEM = 3, + PARTY_MENU_EXIT_CODE_LEARNED_MOVE = 4, + PARTY_MENU_EXIT_CODE_FORGET_MOVE = 5, + PARTY_MENU_EXIT_CODE_MAIL = 6, + PARTY_MENU_EXIT_CODE_READ_MAIL = 7, + PARTY_MENU_EXIT_CODE_EVOLVE_BY_ITEM = 8, + PARTY_MENU_EXIT_CODE_EVOLVE_BY_LEVEL = 9, + PARTY_MENU_EXIT_CODE_RETURN_TO_BAG = 10, // after use of item + PARTY_MENU_EXIT_CODE_CUT = 11 + FIELD_MOVE_CUT, + PARTY_MENU_EXIT_CODE_FLY = 11 + FIELD_MOVE_FLY, + PARTY_MENU_EXIT_CODE_SURF = 11 + FIELD_MOVE_SURF, + PARTY_MENU_EXIT_CODE_STRENGTH = 11 + FIELD_MOVE_STRENGTH, + PARTY_MENU_EXIT_CODE_DEFOG = 11 + FIELD_MOVE_DEFOG + PARTY_MENU_EXIT_CODE_ROCK_SMASH = 11 + FIELD_MOVE_ROCK_SMASH, + PARTY_MENU_EXIT_CODE_WATERFALL = 11 + FIELD_MOVE_WATERFALL, + PARTY_MENU_EXIT_CODE_ROCK_CLIMB = 11 + FIELD_MOVE_ROCK_CLIMB + PARTY_MENU_EXIT_CODE_FLASH = 11 + FIELD_MOVE_FLASH, + PARTY_MENU_EXIT_CODE_TELEPORT = 11 + FIELD_MOVE_FLASH + 1, + PARTY_MENU_EXIT_CODE_DIG = 11 + FIELD_MOVE_FLASH + 2, + PARTY_MENU_EXIT_CODE_SWEET_SCENT = 11 + FIELD_MOVE_FLASH + 3, + PARTY_MENU_EXIT_CODE_CHATTER = 11 + FIELD_MOVE_FLASH + 4 +} #define PARTY_MENU_MODE_HIDE_CANCEL_FLAG (1 << 7) enum PartyMenuWindow { diff --git a/include/applications/party_menu/unk_02083370.h b/include/applications/party_menu/unk_02083370.h index d30083d4ed..450be108e5 100644 --- a/include/applications/party_menu/unk_02083370.h +++ b/include/applications/party_menu/unk_02083370.h @@ -3,19 +3,19 @@ #include "applications/party_menu/defs.h" -u32 sub_02083370(u8 param0); -void sub_0208337C(PartyMenuApplication *param0); -int sub_02083658(PartyMenuApplication *param0); -int sub_020836A8(PartyMenuApplication *param0); -int sub_020836E4(PartyMenuApplication *param0); -int sub_020839BC(PartyMenuApplication *param0); -int sub_02083A78(void *param0); -int sub_02083AA4(void *param0); -void sub_02083B88(PartyMenuApplication *param0); -void sub_02083BD4(PartyMenuApplication *param0); -BOOL sub_02083D1C(PartyMenuApplication *param0); -int sub_020845A8(PartyMenuApplication *param0); -int sub_02084780(PartyMenuApplication *param0); -int sub_02084B34(PartyMenuApplication *param0); +u32 PartyMenu_GetAction(u8 action); +void PartyMenu_ClearContextWindow(PartyMenuApplication *application); +int sub_02083658(PartyMenuApplication *application); +int sub_020836A8(PartyMenuApplication *application); +int sub_020836E4(PartyMenuApplication *application); +int sub_020839BC(PartyMenuApplication *application); +int sub_02083A78(void *applicationPtr); +int sub_02083AA4(void *applicationPtr); +void sub_02083B88(PartyMenuApplication *application); +void sub_02083BD4(PartyMenuApplication *application); +BOOL sub_02083D1C(PartyMenuApplication *application); +int sub_020845A8(PartyMenuApplication *application); +int sub_02084780(PartyMenuApplication *application); +int sub_02084B34(PartyMenuApplication *application); #endif // POKEPLATINUM_UNK_02083370_H diff --git a/include/start_menu.h b/include/start_menu.h index 446cad05a1..4799914c9b 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -12,13 +12,13 @@ void StartMenu_Init(struct FieldSystem_t *fieldSystem); void sub_0203AA78(struct FieldSystem_t *fieldSystem); void sub_0203AABC(FieldSystem *fieldSystem); void StartMenu_Open(FieldSystem *fieldSystem); -void sub_0203B674(StartMenu *param0, void *param1); -BOOL sub_0203B7C0(FieldTask *param0); +void StartMenu_SetCallback(StartMenu *param0, void *param1); +BOOL StartMenu_ExitPartyMenu(FieldTask *param0); BOOL sub_0203C3F4(FieldTask *param0); BOOL sub_0203C434(FieldTask *param0); BOOL sub_0203C50C(FieldTask *param0); void *sub_0203C540(u16 param0, u8 param1, u8 param2); -BOOL sub_0203C558(FieldTask *param0); +BOOL StartMenu_ExitMail(FieldTask *param0); BOOL sub_0203C710(FieldTask *param0); BOOL sub_0203C750(FieldTask *param0); BOOL sub_0203C784(FieldTask *param0); diff --git a/include/unk_0202D778.h b/include/unk_0202D778.h index 49eaeefb34..2e803031f2 100644 --- a/include/unk_0202D778.h +++ b/include/unk_0202D778.h @@ -5,6 +5,6 @@ int Ribbons_SaveSize(void); void Ribbons_Init(u8 *param0); -u8 *sub_0202D79C(SaveData *saveData); +u8 *SaveData_GetRibbons(SaveData *saveData); #endif // POKEPLATINUM_UNK_0202D778_H diff --git a/src/applications/party_menu/main.c b/src/applications/party_menu/main.c index b59d322bc6..9fe2c869b9 100644 --- a/src/applications/party_menu/main.c +++ b/src/applications/party_menu/main.c @@ -516,7 +516,7 @@ static int sub_0207E518(PartyMenuApplication *application) if (v0 == 0) { if ((application->partyMenu->mode == PARTY_MENU_MODE_SELECT_NO_PROMPT) || (application->partyMenu->mode == PARTY_MENU_MODE_FEED_POFFIN)) { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } else if (application->partyMenu->mode == PARTY_MENU_MODE_MAILBOX) { sub_020868B0(application); @@ -529,11 +529,11 @@ static int sub_0207E518(PartyMenuApplication *application) } else if (v0 == 4) { return HandleGameWindowEvent(application); } else if (v0 == 3) { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } else if (v0 == 2) { if (application->partyMenu->mode != 15) { - application->partyMenu->menuSelectionResult = 1; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_SUMMARY; return 32; } else { Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 1); @@ -552,7 +552,7 @@ static int sub_0207E5B4(PartyMenuApplication *application) Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 1); return ApplyItemEffectOnPokemon(application); } else if (v0 == 3) { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } @@ -567,7 +567,7 @@ static int sub_0207E5F4(PartyMenuApplication *application) Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 1); return ProcessItemApplication(application); } else if (v0 == 3) { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } @@ -652,13 +652,13 @@ static int sub_0207E750(PartyMenuApplication *application) return sub_0208615C(application); } else { PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; MessageLoader_GetStrbuf(application->messageLoader, pl_msg_00000453_00105, application->tmpString); return 24; } } else if (v0 == 3) { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } @@ -2224,7 +2224,7 @@ static int HandleGameWindowEvent(PartyMenuApplication *application) } } - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; Sound_PlayEffect(SEQ_SE_CONFIRM); return 32; } @@ -2386,7 +2386,7 @@ static u8 HandleWindowInputEvent(PartyMenuApplication *application, int *param1) break; case 0xfffffffe: Window_EraseMessageBox(&application->windows[33], 1); - sub_0208337C(application); + PartyMenu_ClearContextWindow(application); if ((application->partyMenu->mode == PARTY_MENU_MODE_SELECT_CONFIRM) || (application->partyMenu->mode == PARTY_MENU_MODE_BATTLE_TOWER) || (application->partyMenu->mode == PARTY_MENU_MODE_BATTLE_CASTLE) || (application->partyMenu->mode == PARTY_MENU_MODE_BATTLE_HALL)) { PartyMenu_PrintShortMessage(application, pl_msg_00000453_00034, TRUE); @@ -2652,11 +2652,11 @@ static int ApplyItemEffectOnPokemon(PartyMenuApplication *application) if (Party_CheckItemEffectsOnMember(application->partyMenu->party, application->partyMenu->usedItemID, application->currPartySlot, 0, 12) == 1) { Bag_TryRemoveItem(application->partyMenu->bag, application->partyMenu->usedItemID, 1, HEAP_ID_PARTY_MENU); - if (Item_Get(v0, 26) != 0) { + if (Item_Get(v0, ITEM_PARAM_EVOLVE) != 0) { Pokemon *v1 = Party_GetPokemonBySlotIndex(application->partyMenu->party, application->currPartySlot); application->partyMenu->evoTargetSpecies = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_ITEM, application->partyMenu->usedItemID, &application->partyMenu->evoType); - application->partyMenu->menuSelectionResult = 8; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_EVOLVE_BY_ITEM; Heap_Free(v0); return 32; } @@ -2720,7 +2720,7 @@ static int ProcessItemApplication(PartyMenuApplication *application) switch (CheckItemUsageValidity(application)) { case 0: if (Item_IsMail(application->partyMenu->usedItemID) == 1) { - application->partyMenu->menuSelectionResult = 6; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_MAIL; return 32; } @@ -2857,7 +2857,7 @@ static int ProcessPokemonItemSwap(PartyMenuApplication *application) if (Item_IsMail(application->partyMenu->usedItemID) == 1) { Bag_TryRemoveItem(application->partyMenu->bag, (u16)v5, 1, HEAP_ID_PARTY_MENU); SwapPokemonItem(application, v2, v4, v5); - application->partyMenu->menuSelectionResult = 6; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_MAIL; return 32; } @@ -2888,13 +2888,13 @@ static int ResetWindowOnInput(PartyMenuApplication *application) { if (application->partyMenu->mode == PARTY_MENU_MODE_GIVE_ITEM_DONE) { Window_EraseMessageBox(&application->windows[34], 1); - PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); // "Choose a Pokémon." Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); application->partyMenu->mode = PARTY_MENU_MODE_FIELD; return 1; } - application->partyMenu->menuSelectionResult = 10; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_RETURN_TO_BAG; return 32; } @@ -2943,7 +2943,7 @@ static int UpdatePokemonFormWithItem(PartyMenuApplication *application) static int CheckForItemApplication(PartyMenuApplication *application) { if (application->partyMembers[application->currPartySlot].ballSeal == 0) { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } diff --git a/src/applications/party_menu/unk_02083370.c b/src/applications/party_menu/unk_02083370.c index 4a1fa622af..da3aab1116 100644 --- a/src/applications/party_menu/unk_02083370.c +++ b/src/applications/party_menu/unk_02083370.c @@ -33,110 +33,110 @@ #include "res/text/bank/party_menu.h" -static void sub_02083AD0(PartyMenuApplication *param0, int *param1); -static void sub_0208472C(PartyMenuApplication *param0, int *param1); -static void sub_02084808(PartyMenuApplication *param0, int *param1); -static void sub_02083E8C(PartyMenuApplication *param0, u8 param1); -static void sub_02083FDC(PartyMenuApplication *param0, u8 param1, u8 param2); -static void sub_02084134(PartyMenuApplication *param0); -static void sub_02084420(PartyMenuApplication *param0, u8 param1); -static void sub_020848A8(PartyMenuApplication *param0, int *param1); -static void sub_020848C0(PartyMenuApplication *param0, int *param1); -static void sub_020848D8(PartyMenuApplication *param0, int *param1); -static void sub_020848F0(PartyMenuApplication *param0, int *param1); -static void sub_02084908(PartyMenuApplication *param0, int *param1); -static void sub_02084920(PartyMenuApplication *param0, int *param1); -static void sub_02084938(PartyMenuApplication *param0, int *param1); -static void sub_02084950(PartyMenuApplication *param0, int *param1); -static void sub_02084968(PartyMenuApplication *param0, int *param1); -static void sub_02084980(PartyMenuApplication *param0, int *param1); -static void sub_02084998(PartyMenuApplication *param0, int *param1); -static void sub_020849B0(PartyMenuApplication *param0, int *param1); -static void sub_020849C8(PartyMenuApplication *param0, int *param1); -static void sub_020849E0(PartyMenuApplication *param0, int *param1); -static void sub_020849FC(PartyMenuApplication *param0, int *param1); -static int sub_02084A18(PartyMenuApplication *param0); -static void sub_02084760(PartyMenuApplication *param0, int *param1); -static void sub_020833BC(PartyMenuApplication *param0, int *param1); -static void sub_0208347C(PartyMenuApplication *param0, int *param1); -static void sub_020834B0(PartyMenuApplication *param0, int *param1); -static void sub_02083700(PartyMenuApplication *param0, int *param1); -static void sub_020837C0(PartyMenuApplication *param0, int *param1); -static void sub_020837F4(PartyMenuApplication *param0, int *param1); -static int sub_0208384C(void *param0); -static int sub_020838C4(void *param0); -static int sub_020838F4(void *param0); -static int sub_02083990(void *param0); -static void sub_020846CC(PartyMenuApplication *param0, int *param1); -static void sub_020844B0(PartyMenuApplication *param0, int *param1); -static void sub_020845E8(PartyMenuApplication *param0, int *param1); -static void sub_020846FC(PartyMenuApplication *param0, int *param1); -static void sub_020839FC(PartyMenuApplication *param0, int *param1); - -static const u32 Unk_020F2458[] = { - (const u32)sub_02083AD0, - (const u32)sub_0208472C, - (const u32)sub_020833BC, - (const u32)sub_0208347C, - (const u32)sub_020834B0, - (const u32)sub_02083700, - (const u32)sub_020837C0, - (const u32)sub_020837F4, - (const u32)sub_020839FC, +static void PartyMenu_SelectSwitch(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectSummary(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectFieldMove(PartyMenuApplication *application, int *param1); +static void sub_02083E8C(PartyMenuApplication *application, u8 param1); +static void sub_02083FDC(PartyMenuApplication *application, u8 param1, u8 param2); +static void sub_02084134(PartyMenuApplication *application); +static void sub_02084420(PartyMenuApplication *application, u8 param1); +static void PartyMenu_SelectCut(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectRockSmash(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectStrength(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectSurf(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectDefog(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectRockClimb(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectFly(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectWaterfall(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectFlash(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectTeleport(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectDig(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectSweetScent(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectChatter(PartyMenuApplication *application, int *param1); +static void sub_020849E0(PartyMenuApplication *application, int *param1); +static void sub_020849FC(PartyMenuApplication *application, int *param1); +static int sub_02084A18(PartyMenuApplication *application); +static void sub_02084760(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectItem(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectItemGive(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectItemTake(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectMail(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectMailRead(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectMailTake(PartyMenuApplication *application, int *param1); +static int sub_0208384C(void *applicationPtr); +static int sub_020838C4(void *applicationPtr); +static int sub_020838F4(void *applicationPtr); +static int sub_02083990(void *applicationPtr); +static void sub_020846CC(PartyMenuApplication *application, int *param1); +static void sub_020844B0(PartyMenuApplication *application, int *param1); +static void sub_020845E8(PartyMenuApplication *application, int *param1); +static void sub_020846FC(PartyMenuApplication *application, int *param1); +static void PartyMenu_SelectBallSeal(PartyMenuApplication *application, int *param1); + +static const u32 sPartyMenuActions[] = { + (const u32)PartyMenu_SelectSwitch, + (const u32)PartyMenu_SelectSummary, + (const u32)PartyMenu_SelectItem, + (const u32)PartyMenu_SelectItemGive, + (const u32)PartyMenu_SelectItemTake, + (const u32)PartyMenu_SelectMail, + (const u32)PartyMenu_SelectMailRead, + (const u32)PartyMenu_SelectMailTake, + (const u32)PartyMenu_SelectBallSeal, 0xFFFFFFFE, 0xFFFFFFFE, - (const u32)sub_020844B0, - (const u32)sub_020845E8, - (const u32)sub_020846CC, - (const u32)sub_02084760, - (const u32)sub_020846FC, - (const u32)sub_020848A8, - (const u32)sub_02084938, - (const u32)sub_020848F0, - (const u32)sub_020848D8, - (const u32)sub_02084908, - (const u32)sub_020848C0, - (const u32)sub_02084950, - (const u32)sub_02084920, - (const u32)sub_02084968, - (const u32)sub_02084980, - (const u32)sub_02084998, - (const u32)sub_020849B0, - (const u32)sub_020849C8, - (const u32)sub_020849E0, - (const u32)sub_020849FC, + (const u32)sub_020844B0, // select pokemon? + (const u32)sub_020845E8, // select pokemon? + (const u32)sub_020846CC, // cancel? + (const u32)sub_02084760, // clear screen? + (const u32)sub_020846FC, // cancel2 + (const u32)PartyMenu_SelectCut, + (const u32)PartyMenu_SelectFly, + (const u32)PartyMenu_SelectSurf, + (const u32)PartyMenu_SelectStrength, + (const u32)PartyMenu_SelectDefog, + (const u32)PartyMenu_SelectRockSmash, + (const u32)PartyMenu_SelectWaterfall, + (const u32)PartyMenu_SelectRockClimb, + (const u32)PartyMenu_SelectFlash, + (const u32)PartyMenu_SelectTeleport, + (const u32)PartyMenu_SelectDig, + (const u32)PartyMenu_SelectSweetScent, + (const u32)PartyMenu_SelectChatter, + (const u32)sub_020849E0, // transfer HP + (const u32)sub_020849FC, // transfer HP2 0xFFFFFFFE }; -u32 sub_02083370(u8 param0) +u32 PartyMenu_GetAction(u8 action) // table { - return Unk_020F2458[param0]; + return sPartyMenuActions[action]; } -void sub_0208337C(PartyMenuApplication *param0) +void PartyMenu_ClearContextWindow(PartyMenuApplication *application) { - Window_EraseStandardFrame(¶m0->menuWindows[0], 1); - Window_ClearAndScheduleCopyToVRAM(¶m0->menuWindows[0]); - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); - Window_Remove(¶m0->menuWindows[0]); + Window_EraseStandardFrame(&application->menuWindows[0], 1); + Window_ClearAndScheduleCopyToVRAM(&application->menuWindows[0]); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); + Window_Remove(&application->menuWindows[0]); } -static void sub_020833BC(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectItem(PartyMenuApplication *application, int *param1) { MenuTemplate v0; - sub_0208337C(param0); - PartyMenu_PrintMediumMessage(param0, pl_msg_00000453_00038, FALSE); + PartyMenu_ClearContextWindow(application); + PartyMenu_PrintMediumMessage(application, pl_msg_00000453_00038, FALSE); - param0->contextMenuChoices = StringList_New(3, HEAP_ID_PARTY_MENU); + application->contextMenuChoices = StringList_New(3, HEAP_ID_PARTY_MENU); - StringList_AddFromStrbuf(param0->contextMenuChoices, param0->menuStrings[3], sub_02083370(3)); - StringList_AddFromStrbuf(param0->contextMenuChoices, param0->menuStrings[4], sub_02083370(4)); - StringList_AddFromStrbuf(param0->contextMenuChoices, param0->menuStrings[9], sub_02083370(9)); + StringList_AddFromStrbuf(application->contextMenuChoices, application->menuStrings[3], PartyMenu_GetAction(3)); + StringList_AddFromStrbuf(application->contextMenuChoices, application->menuStrings[4], PartyMenu_GetAction(4)); + StringList_AddFromStrbuf(application->contextMenuChoices, application->menuStrings[9], PartyMenu_GetAction(9)); - v0.choices = param0->contextMenuChoices; - v0.window = ¶m0->windows[35]; + v0.choices = application->contextMenuChoices; + v0.window = &application->windows[35]; v0.fontID = FONT_SYSTEM; v0.xSize = 1; v0.ySize = 3; @@ -144,43 +144,43 @@ static void sub_020833BC(PartyMenuApplication *param0, int *param1) v0.suppressCursor = FALSE; v0.loopAround = FALSE; - Window_DrawStandardFrame(¶m0->windows[35], 1, 1, 14); + Window_DrawStandardFrame(&application->windows[35], 1, 1, 14); - param0->contextMenu = Menu_NewAndCopyToVRAM(&v0, 8, 0, 0, 12, PAD_BUTTON_B); + application->contextMenu = Menu_NewAndCopyToVRAM(&v0, 8, 0, 0, 12, PAD_BUTTON_B); *param1 = 15; } -static void sub_0208347C(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectItemGive(PartyMenuApplication *application, int *param1) { - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); - param0->partyMenu->menuSelectionResult = 3; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_GIVE_ITEM; *param1 = 32; } -static void sub_020834B0(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectItemTake(PartyMenuApplication *application, int *param1) { Pokemon *mon; int v1; int v2 = 17; FieldSystem *fieldSystem; - Window_EraseStandardFrame(¶m0->windows[35], 1); - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); + Window_EraseStandardFrame(&application->windows[35], 1); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); - fieldSystem = param0->partyMenu->fieldSystem; + fieldSystem = application->partyMenu->fieldSystem; - if (param0->partyMembers[param0->currPartySlot].heldItem == ITEM_NONE) { - mon = Party_GetPokemonBySlotIndex(param0->partyMenu->party, param0->currPartySlot); - MessageLoader_GetStrbuf(param0->messageLoader, pl_msg_00000453_00081, param0->tmpFormat); - StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(mon)); - StringTemplate_Format(param0->template, param0->tmpString, param0->tmpFormat); - } else if (Bag_TryAddItem(param0->partyMenu->bag, param0->partyMembers[param0->currPartySlot].heldItem, 1, HEAP_ID_PARTY_MENU) == TRUE) { + if (application->partyMembers[application->currPartySlot].heldItem == ITEM_NONE) { + mon = Party_GetPokemonBySlotIndex(application->partyMenu->party, application->currPartySlot); + MessageLoader_GetStrbuf(application->messageLoader, pl_msg_00000453_00081, application->tmpFormat); + StringTemplate_SetNickname(application->template, 0, Pokemon_GetBoxPokemon(mon)); + StringTemplate_Format(application->template, application->tmpString, application->tmpFormat); + } else if (Bag_TryAddItem(application->partyMenu->bag, application->partyMembers[application->currPartySlot].heldItem, 1, HEAP_ID_PARTY_MENU) == TRUE) { u32 v4; - mon = Party_GetPokemonBySlotIndex(param0->partyMenu->party, param0->currPartySlot); + mon = Party_GetPokemonBySlotIndex(application->partyMenu->party, application->currPartySlot); v4 = 0; Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &v4); @@ -189,37 +189,37 @@ static void sub_020834B0(PartyMenuApplication *param0, int *param1) if ((fieldSystem == NULL) || (fieldSystem->location->mapId < 573) || (fieldSystem->location->mapId > 583)) { v1 = Pokemon_SetGiratinaFormByHeldItem(mon); - if ((param0->partyMembers[param0->currPartySlot].heldItem == ITEM_GRISEOUS_ORB) && (v1 == 0)) { + if ((application->partyMembers[application->currPartySlot].heldItem == ITEM_GRISEOUS_ORB) && (v1 == 0)) { v2 = 18; } } - MessageLoader_GetStrbuf(param0->messageLoader, pl_msg_00000453_00082, param0->tmpFormat); - StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(mon)); - StringTemplate_SetItemName(param0->template, 1, param0->partyMembers[param0->currPartySlot].heldItem); - StringTemplate_Format(param0->template, param0->tmpString, param0->tmpFormat); + MessageLoader_GetStrbuf(application->messageLoader, pl_msg_00000453_00082, application->tmpFormat); + StringTemplate_SetNickname(application->template, 0, Pokemon_GetBoxPokemon(mon)); + StringTemplate_SetItemName(application->template, 1, application->partyMembers[application->currPartySlot].heldItem); + StringTemplate_Format(application->template, application->tmpString, application->tmpFormat); - param0->partyMembers[param0->currPartySlot].heldItem = ITEM_NONE; + application->partyMembers[application->currPartySlot].heldItem = ITEM_NONE; - PartyMenu_DrawMemberHeldItem(param0, param0->currPartySlot, param0->partyMembers[param0->currPartySlot].heldItem); + PartyMenu_DrawMemberHeldItem(application, application->currPartySlot, application->partyMembers[application->currPartySlot].heldItem); } else { - MessageLoader_GetStrbuf(param0->messageLoader, pl_msg_00000453_00083, param0->tmpString); + MessageLoader_GetStrbuf(application->messageLoader, pl_msg_00000453_00083, application->tmpString); } - Window_DrawMessageBoxWithScrollCursor(¶m0->windows[34], 1, (1 + 9), 15); - Window_FillTilemap(¶m0->windows[34], 15); - PartyMenu_AddLongMessagePrinter(param0); + Window_DrawMessageBoxWithScrollCursor(&application->windows[34], 1, (1 + 9), 15); + Window_FillTilemap(&application->windows[34], 15); + PartyMenu_AddLongMessagePrinter(application); *param1 = v2; } -int sub_02083658(PartyMenuApplication *param0) +int sub_02083658(PartyMenuApplication *application) { - if (Text_IsPrinterActive(param0->textPrinterID) == 0) { + if (Text_IsPrinterActive(application->textPrinterID) == 0) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(¶m0->windows[34], 1); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00029, TRUE); - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Window_EraseMessageBox(&application->windows[34], 1); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; } } @@ -227,12 +227,12 @@ int sub_02083658(PartyMenuApplication *param0) return 17; } -int sub_020836A8(PartyMenuApplication *param0) +int sub_020836A8(PartyMenuApplication *application) { - if (Text_IsPrinterActive(param0->textPrinterID) == 0) { + if (Text_IsPrinterActive(application->textPrinterID) == 0) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(¶m0->windows[34], 1); - LoadOverlay118(param0); + Window_EraseMessageBox(&application->windows[34], 1); + LoadOverlay118(application); return 19; } } @@ -240,31 +240,31 @@ int sub_020836A8(PartyMenuApplication *param0) return 18; } -int sub_020836E4(PartyMenuApplication *param0) +int sub_020836E4(PartyMenuApplication *application) { - if (ov118_021D0DBC(param0) == 1) { - UnloadOverlay118(param0); + if (ov118_021D0DBC(application) == 1) { + UnloadOverlay118(application); return 17; } return 19; } -static void sub_02083700(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectMail(PartyMenuApplication *application, int *param1) { MenuTemplate v0; - sub_0208337C(param0); - PartyMenu_PrintMediumMessage(param0, pl_msg_00000453_00039, FALSE); + PartyMenu_ClearContextWindow(application); + PartyMenu_PrintMediumMessage(application, pl_msg_00000453_00039, FALSE); - param0->contextMenuChoices = StringList_New(3, HEAP_ID_PARTY_MENU); + application->contextMenuChoices = StringList_New(3, HEAP_ID_PARTY_MENU); - StringList_AddFromStrbuf(param0->contextMenuChoices, param0->menuStrings[6], sub_02083370(6)); - StringList_AddFromStrbuf(param0->contextMenuChoices, param0->menuStrings[7], sub_02083370(7)); - StringList_AddFromStrbuf(param0->contextMenuChoices, param0->menuStrings[9], sub_02083370(9)); + StringList_AddFromStrbuf(application->contextMenuChoices, application->menuStrings[6], PartyMenu_GetAction(6)); + StringList_AddFromStrbuf(application->contextMenuChoices, application->menuStrings[7], PartyMenu_GetAction(7)); + StringList_AddFromStrbuf(application->contextMenuChoices, application->menuStrings[9], PartyMenu_GetAction(9)); - v0.choices = param0->contextMenuChoices; - v0.window = ¶m0->windows[35]; + v0.choices = application->contextMenuChoices; + v0.window = &application->windows[35]; v0.fontID = FONT_SYSTEM; v0.xSize = 1; v0.ySize = 3; @@ -272,240 +272,240 @@ static void sub_02083700(PartyMenuApplication *param0, int *param1) v0.suppressCursor = FALSE; v0.loopAround = FALSE; - Window_DrawStandardFrame(¶m0->windows[35], 1, 1, 14); + Window_DrawStandardFrame(&application->windows[35], 1, 1, 14); - param0->contextMenu = Menu_NewAndCopyToVRAM(&v0, 8, 0, 0, 12, PAD_BUTTON_B); + application->contextMenu = Menu_NewAndCopyToVRAM(&v0, 8, 0, 0, 12, PAD_BUTTON_B); *param1 = 15; } -static void sub_020837C0(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectMailRead(PartyMenuApplication *application, int *param1) { - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); - param0->partyMenu->menuSelectionResult = 7; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_READ_MAIL; *param1 = 32; } -static void sub_020837F4(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectMailTake(PartyMenuApplication *application, int *param1) { - Window_EraseStandardFrame(¶m0->windows[35], 1); - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00043, TRUE); - - param0->unk_B04.unk_00 = sub_0208384C; - param0->unk_B04.unk_04 = sub_020838C4; - param0->unk_B0E = 26; + Window_EraseStandardFrame(&application->windows[35], 1); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00043, TRUE); + + application->unk_B04.unk_00 = sub_0208384C; + application->unk_B04.unk_04 = sub_020838C4; + application->unk_B0E = 26; *param1 = 24; } -static int sub_0208384C(void *param0) +static int sub_0208384C(void *applicationPtr) { - PartyMenuApplication *v0 = param0; + PartyMenuApplication *application = applicationPtr; Pokemon *v1; - v0 = param0; - v1 = Party_GetPokemonBySlotIndex(v0->partyMenu->party, v0->currPartySlot); + application = applicationPtr; + v1 = Party_GetPokemonBySlotIndex(application->partyMenu->party, application->currPartySlot); - if (sub_02097788(v0->partyMenu->mailbox, v1, HEAP_ID_PARTY_MENU) != 0xFFFFFFFF) { - v0->partyMembers[v0->currPartySlot].heldItem = ITEM_NONE; - PartyMenu_DrawMemberHeldItem(v0, v0->currPartySlot, v0->partyMembers[v0->currPartySlot].heldItem); - PartyMenu_PrintLongMessage(v0, pl_msg_00000453_00046, FALSE); + if (sub_02097788(application->partyMenu->mailbox, v1, HEAP_ID_PARTY_MENU) != 0xFFFFFFFF) { + application->partyMembers[application->currPartySlot].heldItem = ITEM_NONE; + PartyMenu_DrawMemberHeldItem(application, application->currPartySlot, application->partyMembers[application->currPartySlot].heldItem); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00046, FALSE); } else { - PartyMenu_PrintLongMessage(v0, pl_msg_00000453_00050, FALSE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00050, FALSE); } - v0->unk_B0E = 20; + application->unk_B0E = 20; return 24; } -static int sub_020838C4(void *param0) +static int sub_020838C4(void *applicationPtr) { - PartyMenuApplication *v0 = param0; + PartyMenuApplication *application = applicationPtr; - PartyMenu_PrintLongMessage(v0, pl_msg_00000453_00047, FALSE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00047, FALSE); - v0->unk_B04.unk_00 = sub_020838F4; - v0->unk_B04.unk_04 = sub_02083990; - v0->unk_B0E = 26; + application->unk_B04.unk_00 = sub_020838F4; + application->unk_B04.unk_04 = sub_02083990; + application->unk_B0E = 26; return 24; } -static int sub_020838F4(void *param0) +static int sub_020838F4(void *applicationPtr) { - PartyMenuApplication *v0 = param0; + PartyMenuApplication *application = applicationPtr; - if (Bag_TryAddItem(v0->partyMenu->bag, v0->partyMembers[v0->currPartySlot].heldItem, 1, HEAP_ID_PARTY_MENU) == TRUE) { + if (Bag_TryAddItem(application->partyMenu->bag, application->partyMembers[application->currPartySlot].heldItem, 1, HEAP_ID_PARTY_MENU) == TRUE) { Pokemon *mon; u32 item; - mon = Party_GetPokemonBySlotIndex(v0->partyMenu->party, v0->currPartySlot); + mon = Party_GetPokemonBySlotIndex(application->partyMenu->party, application->currPartySlot); item = 0; Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &item); Pokemon_SetArceusForm(mon); Pokemon_SetGiratinaFormByHeldItem(mon); - v0->partyMembers[v0->currPartySlot].heldItem = ITEM_NONE; + application->partyMembers[application->currPartySlot].heldItem = ITEM_NONE; - PartyMenu_DrawMemberHeldItem(v0, v0->currPartySlot, v0->partyMembers[v0->currPartySlot].heldItem); - PartyMenu_PrintLongMessage(v0, pl_msg_00000453_00051, FALSE); + PartyMenu_DrawMemberHeldItem(application, application->currPartySlot, application->partyMembers[application->currPartySlot].heldItem); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00051, FALSE); } else { - PartyMenu_PrintLongMessage(v0, pl_msg_00000453_00083, FALSE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00083, FALSE); } - v0->unk_B0E = 20; + application->unk_B0E = 20; return 24; } -static int sub_02083990(void *param0) +static int sub_02083990(void *applicationPtr) { - PartyMenuApplication *v0 = param0; + PartyMenuApplication *application = applicationPtr; - Window_EraseMessageBox(&v0->windows[34], 1); - PartyMenu_PrintShortMessage(v0, pl_msg_00000453_00029, TRUE); - Sprite_SetExplicitPalette2(v0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Window_EraseMessageBox(&application->windows[34], 1); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; } -int sub_020839BC(PartyMenuApplication *param0) +int sub_020839BC(PartyMenuApplication *application) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(¶m0->windows[34], 1); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00029, TRUE); - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Window_EraseMessageBox(&application->windows[34], 1); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; } return 20; } -static void sub_020839FC(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectBallSeal(PartyMenuApplication *application, int *param1) { - if (param0->partyMembers[param0->currPartySlot].ballSeal == 0) { - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); - param0->partyMenu->menuSelectionResult = 0; + if (application->partyMembers[application->currPartySlot].ballSeal == 0) { + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; *param1 = 32; return; } - sub_0208337C(param0); - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00195, TRUE); + PartyMenu_ClearContextWindow(application); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00195, TRUE); - param0->unk_B04.unk_00 = sub_02083A78; - param0->unk_B04.unk_04 = sub_02083AA4; - param0->unk_B0E = 26; + application->unk_B04.unk_00 = sub_02083A78; + application->unk_B04.unk_04 = sub_02083AA4; + application->unk_B0E = 26; *param1 = 24; } -int sub_02083A78(void *param0) +int sub_02083A78(void *applicationPtr) { - PartyMenuApplication *v0 = param0; - Pokemon *v1 = Party_GetPokemonBySlotIndex(v0->partyMenu->party, v0->currPartySlot); + PartyMenuApplication *application = applicationPtr; + Pokemon *v1 = Party_GetPokemonBySlotIndex(application->partyMenu->party, application->currPartySlot); Pokemon_ClearBallCapsuleData(v1); - v0->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } -int sub_02083AA4(void *param0) +int sub_02083AA4(void *applicationPtr) { - PartyMenuApplication *v0 = param0; + PartyMenuApplication *application = applicationPtr; - Window_EraseMessageBox(&v0->windows[34], 1); - PartyMenu_PrintShortMessage(v0, pl_msg_00000453_00029, TRUE); - Sprite_SetExplicitPalette2(v0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Window_EraseMessageBox(&application->windows[34], 1); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; } -static void sub_02083AD0(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectSwitch(PartyMenuApplication *application, int *param1) { s16 v0, v1; - param0->inSwitchMode = 1; - param0->switchTargetSlot = param0->currPartySlot; + application->inSwitchMode = 1; + application->switchTargetSlot = application->currPartySlot; - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); - Sprite_GetPositionXY(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], &v0, &v1); - Sprite_SetPositionXY(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], v0, v1); - Sprite_SetAnim(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], PartyMenu_GetMemberPanelAnim(param0->partyMenu->type, param0->switchTargetSlot) + 2); - Sprite_SetDrawFlag(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], TRUE); - PartyMenu_UpdateSlotPalette(param0, param0->switchTargetSlot); - Window_EraseMessageBox(¶m0->windows[33], 1); - sub_0208337C(param0); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00030, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Sprite_GetPositionXY(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], &v0, &v1); + Sprite_SetPositionXY(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], v0, v1); + Sprite_SetAnim(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], PartyMenu_GetMemberPanelAnim(application->partyMenu->type, application->switchTargetSlot) + 2); + Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], TRUE); + PartyMenu_UpdateSlotPalette(application, application->switchTargetSlot); + Window_EraseMessageBox(&application->windows[33], 1); + PartyMenu_ClearContextWindow(application); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00030, TRUE); *param1 = 28; } -void sub_02083B88(PartyMenuApplication *param0) +void sub_02083B88(PartyMenuApplication *application) { - param0->inSwitchMode = 0; - Sprite_SetDrawFlag(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], FALSE); + application->inSwitchMode = 0; + Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], FALSE); - if (param0->currPartySlot < 6) { - PartyMenu_UpdateSlotPalette(param0, param0->currPartySlot); + if (application->currPartySlot < 6) { + PartyMenu_UpdateSlotPalette(application, application->currPartySlot); } - PartyMenu_UpdateSlotPalette(param0, param0->switchTargetSlot); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00029, TRUE); + PartyMenu_UpdateSlotPalette(application, application->switchTargetSlot); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); } -void sub_02083BD4(PartyMenuApplication *param0) +void sub_02083BD4(PartyMenuApplication *application) { u16 *v0; u16 *v1; s8 v2, v3, v4, v5; u16 v6; - param0->orderSwitch.slots[0] = param0->currPartySlot; - param0->orderSwitch.slots[1] = param0->switchTargetSlot; - param0->orderSwitch.inProgress = TRUE; - param0->orderSwitch.unk_306 = 0; - param0->orderSwitch.unk_305 = 0; + application->orderSwitch.slots[0] = application->currPartySlot; + application->orderSwitch.slots[1] = application->switchTargetSlot; + application->orderSwitch.inProgress = TRUE; + application->orderSwitch.unk_306 = 0; + application->orderSwitch.unk_305 = 0; - if (param0->orderSwitch.slots[0] & 1) { - param0->orderSwitch.unk_302[0] = 1; + if (application->orderSwitch.slots[0] & 1) { + application->orderSwitch.unk_302[0] = 1; } else { - param0->orderSwitch.unk_302[0] = 0; + application->orderSwitch.unk_302[0] = 0; } - if (param0->orderSwitch.slots[1] & 1) { - param0->orderSwitch.unk_302[1] = 1; + if (application->orderSwitch.slots[1] & 1) { + application->orderSwitch.unk_302[1] = 1; } else { - param0->orderSwitch.unk_302[1] = 0; + application->orderSwitch.unk_302[1] = 0; } - v0 = (u16 *)Bg_GetTilemapBuffer(param0->bgConfig, 2); - v1 = (u16 *)Bg_GetTilemapBuffer(param0->bgConfig, 1); + v0 = (u16 *)Bg_GetTilemapBuffer(application->bgConfig, 2); + v1 = (u16 *)Bg_GetTilemapBuffer(application->bgConfig, 1); - v2 = param0->partyMembers[param0->orderSwitch.slots[0]].panelXPos; - v3 = param0->partyMembers[param0->orderSwitch.slots[0]].panelYPos; - v4 = param0->partyMembers[param0->orderSwitch.slots[1]].panelXPos; - v5 = param0->partyMembers[param0->orderSwitch.slots[1]].panelYPos; + v2 = application->partyMembers[application->orderSwitch.slots[0]].panelXPos; + v3 = application->partyMembers[application->orderSwitch.slots[0]].panelYPos; + v4 = application->partyMembers[application->orderSwitch.slots[1]].panelXPos; + v5 = application->partyMembers[application->orderSwitch.slots[1]].panelYPos; for (v6 = 0; v6 < 6; v6++) { - memcpy(¶m0->orderSwitch.unk_00[0][v6 * 16], &v0[v2 + (v3 + v6) * 32], 16 * 2); - memcpy(¶m0->orderSwitch.unk_180[0][v6 * 16], &v1[v2 + (v3 + v6) * 32], 16 * 2); - memcpy(¶m0->orderSwitch.unk_00[1][v6 * 16], &v0[v4 + (v5 + v6) * 32], 16 * 2); - memcpy(¶m0->orderSwitch.unk_180[1][v6 * 16], &v1[v4 + (v5 + v6) * 32], 16 * 2); + memcpy(&application->orderSwitch.unk_00[0][v6 * 16], &v0[v2 + (v3 + v6) * 32], 16 * 2); + memcpy(&application->orderSwitch.unk_180[0][v6 * 16], &v1[v2 + (v3 + v6) * 32], 16 * 2); + memcpy(&application->orderSwitch.unk_00[1][v6 * 16], &v0[v4 + (v5 + v6) * 32], 16 * 2); + memcpy(&application->orderSwitch.unk_180[1][v6 * 16], &v1[v4 + (v5 + v6) * 32], 16 * 2); } - Sprite_SetDrawFlag(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], FALSE); - Sprite_SetDrawFlag(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], FALSE); + Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], FALSE); + Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], FALSE); } -BOOL sub_02083D1C(PartyMenuApplication *param0) +BOOL sub_02083D1C(PartyMenuApplication *application) { - PartyOrderSwitchData *v0 = ¶m0->orderSwitch; + PartyOrderSwitchData *v0 = &application->orderSwitch; switch (v0->unk_305) { case 0: @@ -515,31 +515,31 @@ BOOL sub_02083D1C(PartyMenuApplication *param0) case 1: v0->unk_306 += 1; - sub_02083E8C(param0, 0); - sub_02083E8C(param0, 1); - sub_02083FDC(param0, 0, v0->unk_302[0]); - sub_02083FDC(param0, 1, v0->unk_302[1]); - Bg_ScheduleTilemapTransfer(param0->bgConfig, 2); - Bg_ScheduleTilemapTransfer(param0->bgConfig, 1); + sub_02083E8C(application, 0); + sub_02083E8C(application, 1); + sub_02083FDC(application, 0, v0->unk_302[0]); + sub_02083FDC(application, 1, v0->unk_302[1]); + Bg_ScheduleTilemapTransfer(application->bgConfig, 2); + Bg_ScheduleTilemapTransfer(application->bgConfig, 1); if (v0->unk_306 == 16) { v0->unk_305 = 2; } break; case 2: - sub_02084134(param0); + sub_02084134(application); Sound_PlayEffect(SEQ_SE_DP_POKELIST_001); v0->unk_305 = 3; break; case 3: v0->unk_306 -= 1; - sub_02083E8C(param0, 0); - sub_02083E8C(param0, 1); - sub_02083FDC(param0, 0, v0->unk_302[0] ^ 1); - sub_02083FDC(param0, 1, v0->unk_302[1] ^ 1); - Bg_ScheduleTilemapTransfer(param0->bgConfig, 2); - Bg_ScheduleTilemapTransfer(param0->bgConfig, 1); + sub_02083E8C(application, 0); + sub_02083E8C(application, 1); + sub_02083FDC(application, 0, v0->unk_302[0] ^ 1); + sub_02083FDC(application, 1, v0->unk_302[1] ^ 1); + Bg_ScheduleTilemapTransfer(application->bgConfig, 2); + Bg_ScheduleTilemapTransfer(application->bgConfig, 1); if (v0->unk_306 == 0) { v0->unk_305 = 4; @@ -548,15 +548,15 @@ BOOL sub_02083D1C(PartyMenuApplication *param0) break; case 4: - Party_SwapSlots(param0->partyMenu->party, v0->slots[0], v0->slots[1]); - Sprite_SetDrawFlag(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], TRUE); + Party_SwapSlots(application->partyMenu->party, v0->slots[0], v0->slots[1]); + Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], TRUE); v0->inProgress = FALSE; - param0->inSwitchMode = 0; + application->inSwitchMode = 0; - PartyMenu_UpdateSlotPalette(param0, param0->currPartySlot); - PartyMenu_UpdateSlotPalette(param0, param0->switchTargetSlot); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00029, FALSE); + PartyMenu_UpdateSlotPalette(application, application->currPartySlot); + PartyMenu_UpdateSlotPalette(application, application->switchTargetSlot); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, FALSE); return 1; } @@ -564,124 +564,124 @@ BOOL sub_02083D1C(PartyMenuApplication *param0) return 0; } -static void sub_02083E8C(PartyMenuApplication *param0, u8 param1) +static void sub_02083E8C(PartyMenuApplication *application, u8 param1) { PartyOrderSwitchData *v0; s8 v1, v2; u8 v3; - v0 = ¶m0->orderSwitch; - v1 = param0->partyMembers[v0->slots[param1]].panelXPos; - v2 = param0->partyMembers[v0->slots[param1]].panelYPos; + v0 = &application->orderSwitch; + v1 = application->partyMembers[v0->slots[param1]].panelXPos; + v2 = application->partyMembers[v0->slots[param1]].panelYPos; - Bg_FillTilemapRect(param0->bgConfig, 2, 0, v1, v2, 16, 6, 16); - Bg_FillTilemapRect(param0->bgConfig, 1, 0, v1, v2, 16, 6, 16); + Bg_FillTilemapRect(application->bgConfig, 2, 0, v1, v2, 16, 6, 16); + Bg_FillTilemapRect(application->bgConfig, 1, 0, v1, v2, 16, 6, 16); if (v0->unk_302[param1] == 0) { - Bg_CopyToTilemapRect(param0->bgConfig, 2, v1, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], v0->unk_306, 0, 16, 6); - Bg_CopyToTilemapRect(param0->bgConfig, 1, v1, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], v0->unk_306, 0, 16, 6); + Bg_CopyToTilemapRect(application->bgConfig, 2, v1, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], v0->unk_306, 0, 16, 6); + Bg_CopyToTilemapRect(application->bgConfig, 1, v1, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], v0->unk_306, 0, 16, 6); } else { - Bg_CopyToTilemapRect(param0->bgConfig, 2, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], 0, 0, 16, 6); - Bg_CopyToTilemapRect(param0->bgConfig, 1, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], 0, 0, 16, 6); + Bg_CopyToTilemapRect(application->bgConfig, 2, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_00[param1], 0, 0, 16, 6); + Bg_CopyToTilemapRect(application->bgConfig, 1, v1 + v0->unk_306, v2, 16 - v0->unk_306, 6, &v0->unk_180[param1], 0, 0, 16, 6); } } -static void sub_02083FDC(PartyMenuApplication *param0, u8 param1, u8 param2) +static void sub_02083FDC(PartyMenuApplication *application, u8 param1, u8 param2) { PartyOrderSwitchData *v0; s16 v1, v2; - v0 = ¶m0->orderSwitch; + v0 = &application->orderSwitch; - Sprite_GetPositionXY(param0->sprites[0 + v0->slots[param1]], &v1, &v2); + Sprite_GetPositionXY(application->sprites[0 + v0->slots[param1]], &v1, &v2); if (param2 == 0) { - param0->partyMembers[v0->slots[param1]].spriteXDelta -= 8; - param0->partyMembers[v0->slots[param1]].statusXPos -= 8; - param0->partyMembers[v0->slots[param1]].itemXPos -= 8; + application->partyMembers[v0->slots[param1]].spriteXDelta -= 8; + application->partyMembers[v0->slots[param1]].statusXPos -= 8; + application->partyMembers[v0->slots[param1]].itemXPos -= 8; v1 -= 8; } else { - param0->partyMembers[v0->slots[param1]].spriteXDelta += 8; - param0->partyMembers[v0->slots[param1]].statusXPos += 8; - param0->partyMembers[v0->slots[param1]].itemXPos += 8; + application->partyMembers[v0->slots[param1]].spriteXDelta += 8; + application->partyMembers[v0->slots[param1]].statusXPos += 8; + application->partyMembers[v0->slots[param1]].itemXPos += 8; v1 += 8; } - Sprite_SetPositionXY(param0->partyMembers[v0->slots[param1]].sprite, param0->partyMembers[v0->slots[param1]].spriteXDelta, param0->partyMembers[v0->slots[param1]].spriteYDelta); - Sprite_SetPositionXY(param0->sprites[10 + v0->slots[param1]], param0->partyMembers[v0->slots[param1]].statusXPos, param0->partyMembers[v0->slots[param1]].statusYPos); - Sprite_SetPositionXY(param0->sprites[16 + v0->slots[param1]], param0->partyMembers[v0->slots[param1]].itemXPos, param0->partyMembers[v0->slots[param1]].itemYPos); - Sprite_SetPositionXY(param0->sprites[22 + v0->slots[param1]], param0->partyMembers[v0->slots[param1]].itemXPos + 8, param0->partyMembers[v0->slots[param1]].itemYPos); - Sprite_SetPositionXY(param0->sprites[0 + v0->slots[param1]], v1, v2); + Sprite_SetPositionXY(application->partyMembers[v0->slots[param1]].sprite, application->partyMembers[v0->slots[param1]].spriteXDelta, application->partyMembers[v0->slots[param1]].spriteYDelta); + Sprite_SetPositionXY(application->sprites[10 + v0->slots[param1]], application->partyMembers[v0->slots[param1]].statusXPos, application->partyMembers[v0->slots[param1]].statusYPos); + Sprite_SetPositionXY(application->sprites[16 + v0->slots[param1]], application->partyMembers[v0->slots[param1]].itemXPos, application->partyMembers[v0->slots[param1]].itemYPos); + Sprite_SetPositionXY(application->sprites[22 + v0->slots[param1]], application->partyMembers[v0->slots[param1]].itemXPos + 8, application->partyMembers[v0->slots[param1]].itemYPos); + Sprite_SetPositionXY(application->sprites[0 + v0->slots[param1]], v1, v2); } -static void sub_02084134(PartyMenuApplication *param0) +static void sub_02084134(PartyMenuApplication *application) { PartyMenuMember *v0; PartyOrderSwitchData *v1; ManagedSprite *v2; s16 v3; - v1 = ¶m0->orderSwitch; + v1 = &application->orderSwitch; v0 = Heap_Alloc(HEAP_ID_PARTY_MENU, sizeof(PartyMenuMember)); - *v0 = param0->partyMembers[v1->slots[0]]; + *v0 = application->partyMembers[v1->slots[0]]; - param0->partyMembers[v1->slots[0]] = param0->partyMembers[v1->slots[1]]; - param0->partyMembers[v1->slots[1]] = *v0; + application->partyMembers[v1->slots[0]] = application->partyMembers[v1->slots[1]]; + application->partyMembers[v1->slots[1]] = *v0; Heap_FreeExplicit(HEAP_ID_PARTY_MENU, v0); - v3 = param0->partyMembers[v1->slots[0]].spriteXDelta; - param0->partyMembers[v1->slots[0]].spriteXDelta = param0->partyMembers[v1->slots[1]].spriteXDelta; - param0->partyMembers[v1->slots[1]].spriteXDelta = v3; + v3 = application->partyMembers[v1->slots[0]].spriteXDelta; + application->partyMembers[v1->slots[0]].spriteXDelta = application->partyMembers[v1->slots[1]].spriteXDelta; + application->partyMembers[v1->slots[1]].spriteXDelta = v3; - v3 = param0->partyMembers[v1->slots[0]].spriteYDelta; - param0->partyMembers[v1->slots[0]].spriteYDelta = param0->partyMembers[v1->slots[1]].spriteYDelta; - param0->partyMembers[v1->slots[1]].spriteYDelta = v3; + v3 = application->partyMembers[v1->slots[0]].spriteYDelta; + application->partyMembers[v1->slots[0]].spriteYDelta = application->partyMembers[v1->slots[1]].spriteYDelta; + application->partyMembers[v1->slots[1]].spriteYDelta = v3; - v3 = param0->partyMembers[v1->slots[0]].statusXPos; - param0->partyMembers[v1->slots[0]].statusXPos = param0->partyMembers[v1->slots[1]].statusXPos; - param0->partyMembers[v1->slots[1]].statusXPos = v3; + v3 = application->partyMembers[v1->slots[0]].statusXPos; + application->partyMembers[v1->slots[0]].statusXPos = application->partyMembers[v1->slots[1]].statusXPos; + application->partyMembers[v1->slots[1]].statusXPos = v3; - v3 = param0->partyMembers[v1->slots[0]].statusYPos; - param0->partyMembers[v1->slots[0]].statusYPos = param0->partyMembers[v1->slots[1]].statusYPos; - param0->partyMembers[v1->slots[1]].statusYPos = v3; + v3 = application->partyMembers[v1->slots[0]].statusYPos; + application->partyMembers[v1->slots[0]].statusYPos = application->partyMembers[v1->slots[1]].statusYPos; + application->partyMembers[v1->slots[1]].statusYPos = v3; - v3 = param0->partyMembers[v1->slots[0]].itemXPos; - param0->partyMembers[v1->slots[0]].itemXPos = param0->partyMembers[v1->slots[1]].itemXPos; - param0->partyMembers[v1->slots[1]].itemXPos = v3; + v3 = application->partyMembers[v1->slots[0]].itemXPos; + application->partyMembers[v1->slots[0]].itemXPos = application->partyMembers[v1->slots[1]].itemXPos; + application->partyMembers[v1->slots[1]].itemXPos = v3; - v3 = param0->partyMembers[v1->slots[0]].itemYPos; - param0->partyMembers[v1->slots[0]].itemYPos = param0->partyMembers[v1->slots[1]].itemYPos; - param0->partyMembers[v1->slots[1]].itemYPos = v3; + v3 = application->partyMembers[v1->slots[0]].itemYPos; + application->partyMembers[v1->slots[0]].itemYPos = application->partyMembers[v1->slots[1]].itemYPos; + application->partyMembers[v1->slots[1]].itemYPos = v3; - v3 = param0->partyMembers[v1->slots[0]].panelXPos; - param0->partyMembers[v1->slots[0]].panelXPos = param0->partyMembers[v1->slots[1]].panelXPos; - param0->partyMembers[v1->slots[1]].panelXPos = v3; + v3 = application->partyMembers[v1->slots[0]].panelXPos; + application->partyMembers[v1->slots[0]].panelXPos = application->partyMembers[v1->slots[1]].panelXPos; + application->partyMembers[v1->slots[1]].panelXPos = v3; - v3 = param0->partyMembers[v1->slots[0]].panelYPos; - param0->partyMembers[v1->slots[0]].panelYPos = param0->partyMembers[v1->slots[1]].panelYPos; - param0->partyMembers[v1->slots[1]].panelYPos = v3; + v3 = application->partyMembers[v1->slots[0]].panelYPos; + application->partyMembers[v1->slots[0]].panelYPos = application->partyMembers[v1->slots[1]].panelYPos; + application->partyMembers[v1->slots[1]].panelYPos = v3; - PartyMenu_DrawMemberPanelData(param0, v1->slots[0]); - PartyMenu_DrawMemberPanelData(param0, v1->slots[1]); - PartyMenu_CopyMemberWindowToVRAM(param0, v1->slots[0]); - PartyMenu_CopyMemberWindowToVRAM(param0, v1->slots[1]); + PartyMenu_DrawMemberPanelData(application, v1->slots[0]); + PartyMenu_DrawMemberPanelData(application, v1->slots[1]); + PartyMenu_CopyMemberWindowToVRAM(application, v1->slots[0]); + PartyMenu_CopyMemberWindowToVRAM(application, v1->slots[1]); - sub_02084420(param0, 0); - sub_02084420(param0, 1); + sub_02084420(application, 0); + sub_02084420(application, 1); - PartyMenu_DrawMemberStatusCondition(param0, v1->slots[0], param0->partyMembers[v1->slots[0]].statusIcon); - PartyMenu_DrawMemberStatusCondition(param0, v1->slots[1], param0->partyMembers[v1->slots[1]].statusIcon); + PartyMenu_DrawMemberStatusCondition(application, v1->slots[0], application->partyMembers[v1->slots[0]].statusIcon); + PartyMenu_DrawMemberStatusCondition(application, v1->slots[1], application->partyMembers[v1->slots[1]].statusIcon); - PartyMenu_DrawMemberHeldItem(param0, v1->slots[0], param0->partyMembers[v1->slots[0]].heldItem); - PartyMenu_DrawMemberHeldItem(param0, v1->slots[1], param0->partyMembers[v1->slots[1]].heldItem); + PartyMenu_DrawMemberHeldItem(application, v1->slots[0], application->partyMembers[v1->slots[0]].heldItem); + PartyMenu_DrawMemberHeldItem(application, v1->slots[1], application->partyMembers[v1->slots[1]].heldItem); - PartyMenu_DrawMemberBallSeal(param0, v1->slots[0]); - PartyMenu_DrawMemberBallSeal(param0, v1->slots[1]); + PartyMenu_DrawMemberBallSeal(application, v1->slots[0]); + PartyMenu_DrawMemberBallSeal(application, v1->slots[1]); } -static void sub_02084420(PartyMenuApplication *param0, u8 param1) +static void sub_02084420(PartyMenuApplication *application, u8 param1) { PartyOrderSwitchData *v0; const u16 *v1; @@ -689,11 +689,11 @@ static void sub_02084420(PartyMenuApplication *param0, u8 param1) u16 v3; u16 v4; - v0 = ¶m0->orderSwitch; + v0 = &application->orderSwitch; v2 = v0->unk_00[param1]; - v1 = sub_0207F248(param0); + v1 = sub_0207F248(application); - if (param0->partyMembers[v0->slots[param1]].isEgg == TRUE) { + if (application->partyMembers[v0->slots[param1]].isEgg == TRUE) { for (v4 = 0; v4 < 9; v4++) { v3 = v2[3 * 16 + 6 + v4] & 0xf000; v2[3 * 16 + 6 + v4] = v3 | 0x17; @@ -706,330 +706,330 @@ static void sub_02084420(PartyMenuApplication *param0, u8 param1) } } -static void sub_020844B0(PartyMenuApplication *param0, int *param1) +static void sub_020844B0(PartyMenuApplication *application, int *param1) { u8 v0; - Window_EraseMessageBox(¶m0->windows[33], 1); - sub_0208337C(param0); + Window_EraseMessageBox(&application->windows[33], 1); + PartyMenu_ClearContextWindow(application); - for (v0 = 0; v0 < param0->partyMenu->maxSelectionSlots; v0++) { - if (param0->partyMenu->selectionOrder[v0] != 0) { + for (v0 = 0; v0 < application->partyMenu->maxSelectionSlots; v0++) { + if (application->partyMenu->selectionOrder[v0] != 0) { continue; } - param0->partyMenu->selectionOrder[v0] = param0->currPartySlot + 1; + application->partyMenu->selectionOrder[v0] = application->currPartySlot + 1; - PartyMenu_PrintSelectionEligibility(param0, param0->currPartySlot); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00034, TRUE); - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + PartyMenu_PrintSelectionEligibility(application, application->currPartySlot); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00034, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); - if (v0 == param0->partyMenu->maxSelectionSlots - 1) { - sub_0207FD68(param0, 6); + if (v0 == application->partyMenu->maxSelectionSlots - 1) { + sub_0207FD68(application, 6); } *param1 = 1; return; } - switch (param0->partyMenu->maxSelectionSlots) { + switch (application->partyMenu->maxSelectionSlots) { case 1: - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00123, TRUE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00123, TRUE); break; case 2: - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00100, TRUE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00100, TRUE); break; case 3: - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00124, TRUE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00124, TRUE); break; case 4: - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00125, TRUE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00125, TRUE); break; case 5: - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00126, TRUE); + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00126, TRUE); break; } - param0->unk_B0E = 23; + application->unk_B0E = 23; *param1 = 24; } -int sub_020845A8(PartyMenuApplication *param0) +int sub_020845A8(PartyMenuApplication *application) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(¶m0->windows[34], 1); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00034, TRUE); - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Window_EraseMessageBox(&application->windows[34], 1); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00034, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; } return 23; } -static void sub_020845E8(PartyMenuApplication *param0, int *param1) +static void sub_020845E8(PartyMenuApplication *application, int *param1) { u8 v0; - for (v0 = 0; v0 < param0->partyMenu->maxSelectionSlots; v0++) { - if (param0->partyMenu->selectionOrder[v0] == param0->currPartySlot + 1) { - param0->partyMenu->selectionOrder[v0] = 0; + for (v0 = 0; v0 < application->partyMenu->maxSelectionSlots; v0++) { + if (application->partyMenu->selectionOrder[v0] == application->currPartySlot + 1) { + application->partyMenu->selectionOrder[v0] = 0; - for (v0 = v0; v0 < param0->partyMenu->maxSelectionSlots - 1; v0++) { - param0->partyMenu->selectionOrder[v0] = param0->partyMenu->selectionOrder[v0 + 1]; - param0->partyMenu->selectionOrder[v0 + 1] = 0; + for (v0 = v0; v0 < application->partyMenu->maxSelectionSlots - 1; v0++) { + application->partyMenu->selectionOrder[v0] = application->partyMenu->selectionOrder[v0 + 1]; + application->partyMenu->selectionOrder[v0 + 1] = 0; } break; } } for (v0 = 0; v0 < 6; v0++) { - if (param0->partyMembers[v0].isPresent == FALSE) { + if (application->partyMembers[v0].isPresent == FALSE) { continue; } - PartyMenu_PrintSelectionEligibility(param0, v0); + PartyMenu_PrintSelectionEligibility(application, v0); } - Window_EraseMessageBox(¶m0->windows[33], 1); - sub_0208337C(param0); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00029, TRUE); - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Window_EraseMessageBox(&application->windows[33], 1); + PartyMenu_ClearContextWindow(application); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); *param1 = 1; } -static void sub_020846CC(PartyMenuApplication *param0, int *param1) +static void sub_020846CC(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); *param1 = 32; } -static void sub_020846FC(PartyMenuApplication *param0, int *param1) +static void sub_020846FC(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); *param1 = 32; } -static void sub_0208472C(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectSummary(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 1; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_SUMMARY; - Menu_Free(param0->contextMenu, NULL); - StringList_Free(param0->contextMenuChoices); + Menu_Free(application->contextMenu, NULL); + StringList_Free(application->contextMenuChoices); *param1 = 32; } -static void sub_02084760(PartyMenuApplication *param0, int *param1) +static void sub_02084760(PartyMenuApplication *application, int *param1) { - sub_0208337C(param0); - Window_EraseMessageBox(¶m0->windows[33], 1); + PartyMenu_ClearContextWindow(application); + Window_EraseMessageBox(&application->windows[33], 1); - *param1 = sub_02084780(param0); + *param1 = sub_02084780(application); } -int sub_02084780(PartyMenuApplication *param0) +int sub_02084780(PartyMenuApplication *application) { - Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->partyMenu->party, param0->currPartySlot); + Pokemon *v0 = Party_GetPokemonBySlotIndex(application->partyMenu->party, application->currPartySlot); if (Pokemon_GetValue(v0, MON_DATA_BALL_CAPSULE_ID, NULL) == 0) { - MessageLoader_GetStrbuf(param0->messageLoader, pl_msg_00000453_00129, param0->tmpString); - Sprite_SetDrawFlag(param0->sprites[22 + param0->currPartySlot], TRUE); + MessageLoader_GetStrbuf(application->messageLoader, pl_msg_00000453_00129, application->tmpString); + Sprite_SetDrawFlag(application->sprites[22 + application->currPartySlot], TRUE); } else { - MessageLoader_GetStrbuf(param0->messageLoader, pl_msg_00000453_00130, param0->tmpString); - param0->currPartySlot = 7; + MessageLoader_GetStrbuf(application->messageLoader, pl_msg_00000453_00130, application->tmpString); + application->currPartySlot = 7; } - PartyMenu_PrintLongMessage(param0, PRINT_MESSAGE_PRELOADED, TRUE); + PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE); - param0->partyMenu->menuSelectionResult = 0; - param0->unk_B0E = 25; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; + application->unk_B0E = 25; return 24; } -static void sub_02084808(PartyMenuApplication *windowLayout, int *param1) +static void PartyMenu_SelectFieldMove(PartyMenuApplication *windowLayout, int *result) { FieldMoveErrContext fieldMoveErrorCtx; - u32 v1; - u32 v2; + u32 fieldMoveResult; + u32 msgID; fieldMoveErrorCtx = (FieldMoveErrContext)FieldMove_GetTaskOrError(FIELD_MOVE_ERROR, windowLayout->partyMenu->menuSelectionResult - 11); if (fieldMoveErrorCtx != NULL) { - v1 = fieldMoveErrorCtx(windowLayout->partyMenu->fieldMoveContext); + fieldMoveResult = fieldMoveErrorCtx(windowLayout->partyMenu->fieldMoveContext); } else { - v1 = 1; + fieldMoveResult = 1; } - switch (v1) { + switch (fieldMoveResult) { case 0: Menu_Free(windowLayout->contextMenu, NULL); StringList_Free(windowLayout->contextMenuChoices); - *param1 = 32; + *result = 32; return; case 1: - v2 = 104; + msgID = 104; // pl_msg_00000453_00104: You can’t use that here. break; case 2: - v2 = 76; + msgID = 76; // pl_msg_00000453_00076: This can’t be used until a new Badge is obtained break; case 3: - v2 = 196; + msgID = 196; // pl_msg_00000453_00196: You can’t use that when you have someone with you break; case 4: - v2 = 102; + msgID = 102; // pl_msg_00000453_00102: You're already surfing break; } Window_EraseMessageBox(&windowLayout->windows[33], 1); - sub_0208337C(windowLayout); - PartyMenu_PrintLongMessage(windowLayout, v2, TRUE); + PartyMenu_ClearContextWindow(windowLayout); + PartyMenu_PrintLongMessage(windowLayout, msgID, TRUE); windowLayout->unk_B0E = 3; - *param1 = 24; + *result = 24; } -static void sub_020848A8(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectCut(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 11; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_CUT; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_020848C0(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectRockSmash(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 16; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_ROCK_SMASH; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_020848D8(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectStrength(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 14; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_STRENGTH; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_020848F0(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectSurf(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 13; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_SURF; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_02084908(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectDefog(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 15; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DEFOG; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_02084920(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectRockClimb(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 18; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_ROCK_CLIMB; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_02084938(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectFly(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 12; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_FLY; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_02084950(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectWaterfall(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 17; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_WATERFALL; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_02084968(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectFlash(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 19; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_FLASH; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_02084980(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectTeleport(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 20; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_TELEPORT; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_02084998(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectDig(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 21; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DIG; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_020849B0(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectSweetScent(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 22; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_SWEET_SCENT; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_020849C8(PartyMenuApplication *param0, int *param1) +static void PartyMenu_SelectChatter(PartyMenuApplication *application, int *param1) { - param0->partyMenu->menuSelectionResult = 23; - sub_02084808(param0, param1); + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_CHATTER; + PartyMenu_SelectFieldMove(application, param1); } -static void sub_020849E0(PartyMenuApplication *param0, int *param1) +static void sub_020849E0(PartyMenuApplication *application, int *param1) { - *param1 = sub_02084A18(param0); + *param1 = sub_02084A18(application); if (*param1 == 30) { - param0->monStats[3] = 24 - 11; + application->monStats[3] = 24 - 11; } } -static void sub_020849FC(PartyMenuApplication *param0, int *param1) +static void sub_020849FC(PartyMenuApplication *application, int *param1) { - *param1 = sub_02084A18(param0); + *param1 = sub_02084A18(application); if (*param1 == 30) { - param0->monStats[3] = 25 - 11; + application->monStats[3] = 25 - 11; } } -static int sub_02084A18(PartyMenuApplication *param0) +static int sub_02084A18(PartyMenuApplication *application) { - Window_EraseMessageBox(¶m0->windows[33], 1); - sub_0208337C(param0); + Window_EraseMessageBox(&application->windows[33], 1); + PartyMenu_ClearContextWindow(application); - param0->monStats[0] = param0->partyMembers[param0->currPartySlot].maxHP / 5; + application->monStats[0] = application->partyMembers[application->currPartySlot].maxHP / 5; - if (param0->partyMembers[param0->currPartySlot].curHP <= param0->monStats[0]) { - PartyMenu_PrintLongMessage(param0, pl_msg_00000453_00138, TRUE); - param0->unk_B0E = 3; + if (application->partyMembers[application->currPartySlot].curHP <= application->monStats[0]) { + PartyMenu_PrintLongMessage(application, pl_msg_00000453_00138, TRUE); + application->unk_B0E = 3; return 24; } else { s16 v0, v1; - param0->inSwitchMode = 1; - param0->switchTargetSlot = param0->currPartySlot; + application->inSwitchMode = 1; + application->switchTargetSlot = application->currPartySlot; - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); - Sprite_GetPositionXY(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], &v0, &v1); - Sprite_SetPositionXY(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], v0, v1); - Sprite_SetAnim(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], PartyMenu_GetMemberPanelAnim(param0->partyMenu->type, param0->switchTargetSlot) + 2); - Sprite_SetDrawFlag(param0->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], TRUE); - PartyMenu_UpdateSlotPalette(param0, param0->switchTargetSlot); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00036, TRUE); + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Sprite_GetPositionXY(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], &v0, &v1); + Sprite_SetPositionXY(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], v0, v1); + Sprite_SetAnim(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], PartyMenu_GetMemberPanelAnim(application->partyMenu->type, application->switchTargetSlot) + 2); + Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], TRUE); + PartyMenu_UpdateSlotPalette(application, application->switchTargetSlot); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00036, TRUE); - param0->monStats[1] = 0; + application->monStats[1] = 0; return 30; } } -int sub_02084B34(PartyMenuApplication *param0) +int sub_02084B34(PartyMenuApplication *application) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(¶m0->windows[34], 1); - PartyMenu_PrintShortMessage(param0, pl_msg_00000453_00029, TRUE); - Sprite_SetExplicitPalette2(param0->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); + Window_EraseMessageBox(&application->windows[34], 1); + PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); // Choose a Pokémon. + Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; } diff --git a/src/applications/party_menu/unk_02084B70.c b/src/applications/party_menu/unk_02084B70.c index 7bba5b6246..82a18b13ba 100644 --- a/src/applications/party_menu/unk_02084B70.c +++ b/src/applications/party_menu/unk_02084B70.c @@ -412,7 +412,7 @@ int sub_02085348(void *param0) } if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 32; } @@ -649,7 +649,7 @@ int sub_02085804(PartyMenuApplication *application) application->unk_B0E = 1; } else { Bag_TryRemoveItem(application->partyMenu->bag, application->partyMenu->usedItemID, 1, HEAP_ID_PARTY_MENU); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->currPartySlot = 7; return 32; } @@ -684,7 +684,7 @@ static int sub_02085A70(void *applicationPtr) application->partyMembers[application->currPartySlot].curHP = Pokemon_GetValue(mon, MON_DATA_HP, NULL); application->partyMembers[application->currPartySlot].maxHP = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL); - strBuf = MessageLoader_GetNewStrbuf(application->messageLoader, 193); + strBuf = MessageLoader_GetNewStrbuf(application->messageLoader, 193); // pl_msg_00000453_00193: StringTemplate_SetNickname(application->template, 0, Pokemon_GetBoxPokemon(mon)); StringTemplate_SetNumber(application->template, 1, application->partyMembers[application->currPartySlot].level, 3, 0, 1); @@ -816,9 +816,9 @@ static int sub_02085C50(void *applicationPtr) application->partyMenu->evoTargetSpecies = Pokemon_GetEvolutionTargetSpecies(application->partyMenu->party, mon, EVO_CLASS_BY_LEVEL, v5, &application->partyMenu->evoType); if (application->partyMenu->evoTargetSpecies != 0) { - application->partyMenu->menuSelectionResult = 9; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_EVOLVE_BY_LEVEL; } else { - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; } } return 32; @@ -858,13 +858,13 @@ int sub_02085EF4(PartyMenuApplication *application) static int sub_02085FB4(void *applicationPtr) { PartyMenuApplication *application = applicationPtr; - Strbuf *strBuf = MessageLoader_GetNewStrbuf(application->messageLoader, 59); + Strbuf *strBuf = MessageLoader_GetNewStrbuf(application->messageLoader, 59); // Which move should be forgotten? StringTemplate_Format(application->template, application->tmpString, strBuf); Strbuf_Free(strBuf); PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE); - application->partyMenu->menuSelectionResult = 5; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_FORGET_MOVE; application->unk_B0E = 25; return 24; @@ -966,7 +966,7 @@ int sub_0208615C(PartyMenuApplication *application) StringTemplate_Format(application->template, application->tmpString, strBuf); Strbuf_Free(strBuf); PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; break; case 0xfd: @@ -974,7 +974,7 @@ int sub_0208615C(PartyMenuApplication *application) StringTemplate_Format(application->template, application->tmpString, strBuf); Strbuf_Free(strBuf); PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; break; case 0xfe: @@ -993,7 +993,7 @@ int sub_0208615C(PartyMenuApplication *application) Strbuf_Free(strBuf); PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; break; } @@ -1039,7 +1039,7 @@ int sub_020863A0(PartyMenuApplication *application) Strbuf_Free(strBuf); PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; return 24; @@ -1057,7 +1057,7 @@ static int sub_02086438(void *applicationPtr) Strbuf_Free(strBuf); PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE); - application->partyMenu->menuSelectionResult = 4; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_LEARNED_MOVE; application->unk_B0E = 25; return 24; @@ -1088,7 +1088,7 @@ static int sub_020864E4(void *applicationPtr) Strbuf_Free(strBuf); PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; return 24; @@ -1220,7 +1220,7 @@ int sub_02086774(PartyMenuApplication *application) PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; return 24; @@ -1243,7 +1243,7 @@ void sub_020868B0(PartyMenuApplication *application) PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE); - application->partyMenu->menuSelectionResult = 0; + application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; application->unk_B0E = 25; } diff --git a/src/applications/party_menu/windows.c b/src/applications/party_menu/windows.c index a8daeb86f4..e91a00f020 100644 --- a/src/applications/party_menu/windows.c +++ b/src/applications/party_menu/windows.c @@ -782,13 +782,13 @@ void PartyMenu_DrawContextMenu(PartyMenuApplication *application, const u8 *entr StringList_AddFromStrbuf( application->contextMenuChoices, application->menuStrings[PARTY_MENU_STR_MOVE0 + numFieldMoves], - sub_02083370(entries[i])); + PartyMenu_GetAction(entries[i])); numFieldMoves++; } else { StringList_AddFromStrbuf( application->contextMenuChoices, application->menuStrings[entries[i]], - sub_02083370(entries[i])); + PartyMenu_GetAction(entries[i])); } } diff --git a/src/applications/pc_boxes/box_app_manager.c b/src/applications/pc_boxes/box_app_manager.c index 29451e57ab..2202d7d051 100644 --- a/src/applications/pc_boxes/box_app_manager.c +++ b/src/applications/pc_boxes/box_app_manager.c @@ -865,7 +865,7 @@ static void BoxAppMan_InitSummary(BoxApplicationManager *boxAppMan) boxAppMan->monSummary.chatotCry = NULL; boxAppMan->monSummary.dexMode = SaveData_GetDexMode(boxAppMan->saveData); boxAppMan->monSummary.showContest = PokemonSummaryScreen_ShowContestData(boxAppMan->saveData); - boxAppMan->monSummary.specialRibbons = sub_0202D79C(boxAppMan->saveData); + boxAppMan->monSummary.specialRibbons = SaveData_GetRibbons(boxAppMan->saveData); PokemonSummaryScreen_FlagVisiblePages(&boxAppMan->monSummary, summaryPages); PokemonSummaryScreen_SetPlayerProfile(&boxAppMan->monSummary, SaveData_GetTrainerInfo(boxAppMan->saveData)); diff --git a/src/field_move_tasks.c b/src/field_move_tasks.c index 556dc08557..cb07cf9d20 100644 --- a/src/field_move_tasks.c +++ b/src/field_move_tasks.c @@ -350,7 +350,7 @@ static void FieldMoves_SetFlyTask(FieldMovePokemon *fieldMoveMon, const FieldMov TownMapContext_Init(fieldSystem, menu->taskData, TOWN_MAP_MODE_FLY); FieldSystem_OpenTownMap(fieldSystem, menu->taskData); - sub_0203B674(menu, sub_0203C434); + StartMenu_SetCallback(menu, sub_0203C434); } static enum FieldMoveError FieldMoves_CheckSurf(const FieldMoveContext *fieldMoveContext) diff --git a/src/item_use_functions.c b/src/item_use_functions.c index 8bd4f1b1f5..3eaea12edf 100644 --- a/src/item_use_functions.c +++ b/src/item_use_functions.c @@ -319,7 +319,7 @@ static void UseHealingItemFromMenu(ItemMenuUseContext *usageContext, const ItemU FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMenu); menu->taskData = partyMenu; - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } static void UseTownMapFromMenu(ItemMenuUseContext *usageContext, const ItemUseContext *additionalContext) @@ -328,7 +328,7 @@ static void UseTownMapFromMenu(ItemMenuUseContext *usageContext, const ItemUseCo StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask); menu->taskData = FieldSystem_OpenTownMapItem(fieldSystem); - sub_0203B674(menu, sub_0203C3F4); + StartMenu_SetCallback(menu, sub_0203C3F4); } static BOOL UseTownMapInField(ItemFieldUseContext *usageContext) @@ -516,7 +516,7 @@ static void UseJournalFromMenu(ItemMenuUseContext *usageContext, const ItemUseCo StartMenu *v1 = FieldTask_GetEnv(usageContext->fieldTask); sub_0203D30C(fieldSystem, NULL); - sub_0203B674(v1, sub_0203C50C); + StartMenu_SetCallback(v1, sub_0203C50C); } static BOOL UseJournalInField(ItemFieldUseContext *usageContext) @@ -553,7 +553,7 @@ static void UseTMHMFromMenu(ItemMenuUseContext *usageContext, const ItemUseConte FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMenu); menu->taskData = partyMenu; - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } static void UseMailFromMenu(ItemMenuUseContext *usageContext, const ItemUseContext *additionalContext) @@ -565,7 +565,7 @@ static void UseMailFromMenu(ItemMenuUseContext *usageContext, const ItemUseConte menu->unk_260 = sub_0203C540(usageContext->item, 3, 0); menu->taskData = v2; - sub_0203B674(menu, sub_0203C558); + StartMenu_SetCallback(menu, StartMenu_ExitMail); } static enum ItemUseCheckResult CanUseBerry(const ItemUseContext *usageContext) @@ -605,7 +605,7 @@ static void UsePoffinCaseFromMenu(ItemMenuUseContext *usageContext, const ItemUs UnkStruct_0203D9B8 *v2 = sub_0203D9B8(fieldSystem, HEAP_ID_FIELD2); menu->taskData = v2; - sub_0203B674(menu, sub_0203C710); + StartMenu_SetCallback(menu, sub_0203C710); } static BOOL UsePoffinCaseInField(ItemFieldUseContext *usageContext) @@ -626,7 +626,7 @@ static void UsePalPadFromMenu(ItemMenuUseContext *usageContext, const ItemUseCon sub_0203DE78(fieldSystem, fieldSystem->saveData); menu->taskData = NULL; - sub_0203B674(menu, sub_0203C750); + StartMenu_SetCallback(menu, sub_0203C750); } static BOOL UsePalPadInField(ItemFieldUseContext *usageContext) @@ -929,7 +929,7 @@ static void UseEvoStoneFromMenu(ItemMenuUseContext *usageContext, const ItemUseC FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMenu); menu->taskData = partyMenu; - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } static void UseEscapeRopeFromMenu(ItemMenuUseContext *usageContext, const ItemUseContext *additionalContext) @@ -1009,7 +1009,7 @@ static void UseVsRecorderFromMenu(ItemMenuUseContext *usageContext, const ItemUs sub_0203DE88(fieldSystem, fieldSystem->saveData); menu->taskData = NULL; - sub_0203B674(menu, sub_0203C784); + StartMenu_SetCallback(menu, sub_0203C784); } static BOOL UseVsRecorderInField(ItemFieldUseContext *usageContext) @@ -1032,7 +1032,7 @@ static void UseGracideaFromMenu(ItemMenuUseContext *usageContext, const ItemUseC StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask); menu->taskData = FieldSystem_OpenPartyMenu_SelectForItemUsage(fieldSystem, HEAP_ID_FIELD2, ITEM_GRACIDEA); - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } static BOOL UseGracideaInField(ItemFieldUseContext *usageContext) diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index df6cf09989..f3509e6b72 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -1632,7 +1632,7 @@ void ov88_0223D098(int param0, Party *param1, int param2) static void ov88_0223D0C0(SaveData *saveData) { - u8 *v0 = sub_0202D79C(saveData); + u8 *v0 = SaveData_GetRibbons(saveData); int v1; CommSys_SendData(32, v0, 14); @@ -1725,7 +1725,7 @@ static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1) param0->unk_0C.showContest = PokemonSummaryScreen_ShowContestData(param0->unk_08->saveData); param0->unk_0C.dexMode = param0->unk_08->unk_30; param0->unk_0C.options = param0->unk_08->options; - param0->unk_0C.specialRibbons = sub_0202D79C(param0->unk_08->saveData); + param0->unk_0C.specialRibbons = SaveData_GetRibbons(param0->unk_08->saveData); PokemonSummaryScreen_FlagVisiblePages(¶m0->unk_0C, Unk_ov88_0223F13C); diff --git a/src/overlay094/screens/pokemon_summary.c b/src/overlay094/screens/pokemon_summary.c index a9adb8497d..0bd6e2d265 100644 --- a/src/overlay094/screens/pokemon_summary.c +++ b/src/overlay094/screens/pokemon_summary.c @@ -37,7 +37,7 @@ int GTSApplication_PokemonSummary_Init(GTSApplicationState *appState, int unused appState->pokemonSummary.showContest = PokemonSummaryScreen_ShowContestData(appState->playerData->saveData); appState->pokemonSummary.dexMode = appState->playerData->dexMode; appState->pokemonSummary.options = appState->playerData->options; - appState->pokemonSummary.specialRibbons = sub_0202D79C(appState->playerData->saveData); + appState->pokemonSummary.specialRibbons = SaveData_GetRibbons(appState->playerData->saveData); PokemonSummaryScreen_FlagVisiblePages(&appState->pokemonSummary, sGTSPokemonSummaryPages); PokemonSummaryScreen_SetPlayerProfile(&appState->pokemonSummary, appState->playerData->trainerInfo); diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c index c6cca37ec0..fa59d38e05 100644 --- a/src/overlay104/ov104_02239C58.c +++ b/src/overlay104/ov104_02239C58.c @@ -206,7 +206,7 @@ static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param param1->unk_AC->monMax = (u8)Party_GetCurrentCount(param1->unk_AC->monData); param1->unk_AC->move = 0; param1->unk_AC->mode = SUMMARY_MODE_NORMAL; - param1->unk_AC->specialRibbons = sub_0202D79C(param1->saveData); + param1->unk_AC->specialRibbons = SaveData_GetRibbons(param1->saveData); PokemonSummaryScreen_FlagVisiblePages(param1->unk_AC, v0); PokemonSummaryScreen_SetPlayerProfile(param1->unk_AC, SaveData_GetTrainerInfo(param1->saveData)); diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index 3715841bb4..3c56e7dabd 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -150,7 +150,7 @@ int ov118_021D0DBC(PartyMenuApplication *param0) case 10: if (Text_IsPrinterActive(param0->textPrinterID) == 0) { ov118_021D0F70(param0); - param0->partyMenu->menuSelectionResult = 0; + param0->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE; return 1; } diff --git a/src/scrcmd_mystery_gift.c b/src/scrcmd_mystery_gift.c index 57dde9122e..78f781e930 100644 --- a/src/scrcmd_mystery_gift.c +++ b/src/scrcmd_mystery_gift.c @@ -230,7 +230,7 @@ static void GivePokemon(FieldSystem *fieldSystem, GiftData *dummy) Pokemon_SetValue(pokemon, MON_DATA_SPDEF_IV, &personality); } - u8 *specialRibbons = sub_0202D79C(fieldSystem->saveData); + u8 *specialRibbons = SaveData_GetRibbons(fieldSystem->saveData); if (Pokemon_GetValue(pokemon, MON_DATA_RED_RIBBON, NULL)) { specialRibbons[Ribbon_TryGetSpecialDescriptionID(RIBBON_RED)] = giftSpecialRibbons[0]; diff --git a/src/start_menu.c b/src/start_menu.c index 3cd9e26d85..65d9906ab7 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -156,7 +156,7 @@ static void StartMenu_ApplicationStart(FieldTask *taskMan); static void StartMenu_ApplicationRun(FieldTask *taskMan); static BOOL StartMenu_SelectPokedex(FieldTask *taskMan); static BOOL StartMenu_OpenPokedex(FieldTask *taskMan); -static BOOL StartMenu_PokedexEnd(FieldTask *taskMan); +static BOOL StartMenu_ExitPokedex(FieldTask *taskMan); static BOOL StartMenu_SelectTrainerCard(FieldTask *taskMan); static BOOL StartMenu_TrainerCard(FieldTask *taskMan); static BOOL sub_0203BF00(FieldTask *taskMan); @@ -167,14 +167,14 @@ static BOOL StartMenu_SelectChat(FieldTask *taskMan); static BOOL sub_0203C0A0(FieldTask *taskMan); static BOOL sub_0203C0F8(FieldTask *taskMan); static BOOL StartMenu_SelectPokemon(FieldTask *taskMan); -static BOOL sub_0203B78C(FieldTask *taskMan); +static BOOL StartMenu_OpenPartyMenu(FieldTask *taskMan); static BOOL StartMenu_SelectBag(FieldTask *taskMan); static BOOL StartMenu_Bag(FieldTask *taskMan); -static BOOL sub_0203BC5C(FieldTask *taskMan); +static BOOL StartMenu_ExitBag(FieldTask *taskMan); static BOOL StartMenu_SelectSave(FieldTask *taskMan); static void StartMenu_SaveWait(FieldTask *taskMan); static void StartMenu_Save(FieldTask *taskMan); -static BOOL sub_0203C1C8(FieldTask *taskMan); +static BOOL StartMenu_ExitSummary(FieldTask *taskMan); static void sub_0203C2D8(FieldTask *taskMan, u16 param1); static BOOL sub_0203C390(FieldTask *taskMan); BOOL sub_0203C434(FieldTask *taskMan); @@ -922,7 +922,7 @@ static void StartMenu_ApplicationRun(FieldTask *taskMan) menu->callback(taskMan); } -void sub_0203B674(StartMenu *menu, void *callback) +void StartMenu_SetCallback(StartMenu *menu, void *callback) { menu->callback = callback; menu->state = START_MENU_STATE_APP_RUN; @@ -961,12 +961,12 @@ static BOOL StartMenu_OpenPokedex(FieldTask *taskMan) sub_0203E0AC(fieldSystem, pokedexArgs); menu->taskData = pokedexArgs; - menu->callback = StartMenu_PokedexEnd; + menu->callback = StartMenu_ExitPokedex; return FALSE; } -static BOOL StartMenu_PokedexEnd(FieldTask *taskMan) +static BOOL StartMenu_ExitPokedex(FieldTask *taskMan) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); StartMenu *menu = FieldTask_GetEnv(taskMan); @@ -988,24 +988,24 @@ static BOOL StartMenu_SelectPokemon(FieldTask *taskMan) FieldMap_FadeScreen(FADE_TYPE_BRIGHTNESS_OUT); - menu->callback = sub_0203B78C; + menu->callback = StartMenu_OpenPartyMenu; menu->state = START_MENU_STATE_APP_START; return TRUE; } -static BOOL sub_0203B78C(FieldTask *taskMan) +static BOOL StartMenu_OpenPartyMenu(FieldTask *taskMan) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); StartMenu *menu = FieldTask_GetEnv(taskMan); menu->taskData = FieldSystem_OpenPartyMenu(fieldSystem, &menu->fieldMoveContext, 0); - menu->callback = sub_0203B7C0; + menu->callback = StartMenu_ExitPartyMenu; return 0; } -BOOL sub_0203B7C0(FieldTask *taskMan) +BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); StartMenu *menu = FieldTask_GetEnv(taskMan); @@ -1015,7 +1015,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan) Heap_Free(menu->taskData); switch (partyMenu->menuSelectionResult) { - case 1: { + case PARTY_MENU_EXIT_CODE_SUMMARY: { PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary)); summary->monData = SaveData_GetParty(fieldSystem->saveData); @@ -1025,7 +1025,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan) summary->monMax = Party_GetCurrentCount(summary->monData); summary->move = 0; summary->mode = SUMMARY_MODE_NORMAL; - summary->specialRibbons = sub_0202D79C(fieldSystem->saveData); + summary->specialRibbons = SaveData_GetRibbons(fieldSystem->saveData); summary->dexMode = SaveData_GetDexMode(fieldSystem->saveData); summary->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData); summary->chatotCry = NULL; @@ -1035,9 +1035,9 @@ BOOL sub_0203B7C0(FieldTask *taskMan) FieldSystem_OpenSummaryScreen(fieldSystem, summary); menu->taskData = summary; - sub_0203B674(menu, sub_0203C1C8); + StartMenu_SetCallback(menu, StartMenu_ExitSummary); } break; - case 4: { + case PARTY_MENU_EXIT_CODE_LEARNED_MOVE: { PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary)); summary->monData = SaveData_GetParty(fieldSystem->saveData); @@ -1057,14 +1057,14 @@ BOOL sub_0203B7C0(FieldTask *taskMan) UnkStruct_0203C1C8 *v5 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C1C8)); - v5->unk_00 = partyMenu->usedItemID; + v5->unk_00 = partyMenu->usedItemID; // TMHM v5->unk_02 = 0; menu->unk_260 = v5; menu->taskData = summary; - sub_0203B674(menu, sub_0203C1C8); + StartMenu_SetCallback(menu, StartMenu_ExitSummary); } break; - case 5: { + case PARTY_MENU_EXIT_CODE_FORGET_MOVE: { // called after level up PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary)); summary->monData = SaveData_GetParty(fieldSystem->saveData); @@ -1089,9 +1089,9 @@ BOOL sub_0203B7C0(FieldTask *taskMan) menu->unk_260 = v7; menu->taskData = summary; - sub_0203B674(menu, sub_0203C1C8); + StartMenu_SetCallback(menu, StartMenu_ExitSummary); } break; - case 6: { + case PARTY_MENU_EXIT_CODE_MAIL: { UnkStruct_02097728 *v8; v8 = sub_0203D920(fieldSystem, 2, partyMenu->selectedMonSlot, Item_MailNumber(partyMenu->usedItemID), HEAP_ID_FIELD2); @@ -1105,9 +1105,9 @@ BOOL sub_0203B7C0(FieldTask *taskMan) partyMenu->usedItemID, 1, partyMenu->selectedMonSlot); } - sub_0203B674(menu, sub_0203C558); + StartMenu_SetCallback(menu, StartMenu_ExitMail); } break; - case 7: { + case PARTY_MENU_EXIT_CODE_READ_MAIL: { UnkStruct_02097728 *v9; Pokemon *v10; @@ -1117,9 +1117,9 @@ BOOL sub_0203B7C0(FieldTask *taskMan) menu->taskData = v9; menu->unk_260 = sub_0203C540(partyMenu->usedItemID, 2, partyMenu->selectedMonSlot); - sub_0203B674(menu, sub_0203C558); + StartMenu_SetCallback(menu, StartMenu_ExitMail); } break; - case 3: { + case PARTY_MENU_EXIT_CODE_GIVE_ITEM: { //give item u32 *v13 = (u32 *)Heap_Alloc(HEAP_ID_FIELD2, 4); *v13 = partyMenu->selectedMonSlot; menu->unk_260 = (void *)v13; @@ -1131,9 +1131,9 @@ BOOL sub_0203B7C0(FieldTask *taskMan) BagContext_Init(menu->taskData, fieldSystem->saveData, 1, fieldSystem->bagCursor); sub_0203D1E4(fieldSystem, menu->taskData); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); } break; - case 8: { + case PARTY_MENU_EXIT_CODE_EVOLVE_BY_ITEM: { UnkStruct_0203C7B8 *v14 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C7B8)); v14->unk_02 = partyMenu->usedItemID; @@ -1145,7 +1145,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan) menu->taskData = v14; menu->state = START_MENU_STATE_EVOLVE_INIT; } break; - case 9: { + case PARTY_MENU_EXIT_CODE_EVOLVE_BY_LEVEL: { UnkStruct_0203C7B8 *v15 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C7B8)); v15->unk_02 = MapHeader_GetMapEvolutionMethod(fieldSystem->location->mapId); @@ -1156,19 +1156,19 @@ BOOL sub_0203B7C0(FieldTask *taskMan) menu->taskData = v15; menu->state = START_MENU_STATE_EVOLVE_INIT; } break; - case 16: - case 11: - case 12: - case 15: - case 14: - case 13: - case 18: - case 17: - case 19: - case 20: - case 21: - case 22: - case 23: + case PARTY_MENU_EXIT_CODE_ROCK_SMASH: // fieldMoveTaskOrError: + case PARTY_MENU_EXIT_CODE_CUT: + case PARTY_MENU_EXIT_CODE_FLY: + case PARTY_MENU_EXIT_CODE_DEFOG: + case PARTY_MENU_EXIT_CODE_STRENGTH: + case PARTY_MENU_EXIT_CODE_SURF: + case PARTY_MENU_EXIT_CODE_ROCK_CLIMB: + case PARTY_MENU_EXIT_CODE_WATERFALL: + case PARTY_MENU_EXIT_CODE_FLASH: + case PARTY_MENU_EXIT_CODE_TELEPORT: + case PARTY_MENU_EXIT_CODE_DIG: + case PARTY_MENU_EXIT_CODE_SWEET_SCENT: + case PARTY_MENU_EXIT_CODE_CHATTER: FieldMoveTaskContext v16; FieldMovePokemon fieldMoveMon; @@ -1179,11 +1179,11 @@ BOOL sub_0203B7C0(FieldTask *taskMan) v16 = (FieldMoveTaskContext)FieldMove_GetTaskOrError(FIELD_MOVE_TASK, fieldMoveMon.fieldMove); v16(&fieldMoveMon, &menu->fieldMoveContext); break; - case 10: + case PARTY_MENU_EXIT_CODE_RETURN_TO_BAG: menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); break; - default: + default: // PARTY_MENU_EXIT_CODE_0 if ((partyMenu->mode == PARTY_MENU_MODE_USE_ITEM) || (partyMenu->mode == PARTY_MENU_MODE_TEACH_MOVE) || (partyMenu->mode == PARTY_MENU_MODE_TEACH_MOVE_DONE) || (partyMenu->mode == PARTY_MENU_MODE_USE_EVO_ITEM) || (partyMenu->mode == PARTY_MENU_MODE_LEVEL_MOVE_DONE)) { menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); @@ -1193,10 +1193,10 @@ BOOL sub_0203B7C0(FieldTask *taskMan) BagContext_SetSelectedMonSlot(menu->taskData, partyMenu->selectedMonSlot); } - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); } else if (partyMenu->mode == PARTY_MENU_MODE_GIVE_ITEM) { menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); } else { FieldSystem_StartFieldMap(fieldSystem); menu->state = START_MENU_STATE_12; @@ -1227,39 +1227,39 @@ static BOOL StartMenu_Bag(FieldTask *taskMan) menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); BagContext_SetSelectedMonSlot(menu->taskData, 0); - menu->callback = sub_0203BC5C; + menu->callback = StartMenu_ExitBag; FieldSystem_SaveStateIfCommunicationOff(fieldSystem); return FALSE; } -static BOOL sub_0203BC5C(FieldTask *taskMan) +static BOOL StartMenu_ExitBag(FieldTask *taskMan) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); StartMenu *menu = FieldTask_GetEnv(taskMan); - BagContext *v2 = BagContext_New(HEAP_ID_FIELD2); + BagContext *bagCtx = BagContext_New(HEAP_ID_FIELD2); - memcpy(v2, menu->taskData, BagContext_GetSize()); + memcpy(bagCtx, menu->taskData, BagContext_GetSize()); Heap_Free(menu->taskData); - switch (BagContext_GetExitCode(v2)) { - case 0: { + switch (BagContext_GetExitCode(bagCtx)) { + case BAG_EXIT_CODE_USE_ITEM: { ItemMenuUseFunc v3; ItemMenuUseContext v4; s32 v5; - v4.item = BagContext_GetItem(v2); - v4.selectedMonSlot = BagContext_GetSelectedMonSlot(v2); + v4.item = BagContext_GetItem(bagCtx); + v4.selectedMonSlot = BagContext_GetSelectedMonSlot(bagCtx); v4.fieldTask = taskMan; v5 = Item_LoadParam(v4.item, ITEM_PARAM_FIELD_USE_FUNC, HEAP_ID_FIELD2); v3 = (ItemMenuUseFunc)GetItemUseFunction(USE_ITEM_TASK_MENU, v5); v3(&v4, &menu->unk_230); } break; - case 1: - sub_0203C2D8(taskMan, BagContext_GetItem(v2)); + case BAG_EXIT_CODE_SHOW_BERRY_DATA: + sub_0203C2D8(taskMan, BagContext_GetItem(bagCtx)); break; - case 2: { + case BAG_EXIT_CODE_GIVE_ITEM: { PartyMenu *partyMenu = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyMenu)); memset(partyMenu, 0, sizeof(PartyMenu)); @@ -1270,17 +1270,17 @@ static BOOL sub_0203BC5C(FieldTask *taskMan) partyMenu->fieldMoveContext = &menu->fieldMoveContext; partyMenu->type = PARTY_MENU_TYPE_BASIC; partyMenu->mode = PARTY_MENU_MODE_GIVE_ITEM; - partyMenu->usedItemID = BagContext_GetItem(v2); + partyMenu->usedItemID = BagContext_GetItem(bagCtx); partyMenu->fieldSystem = fieldSystem; FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMenu); menu->taskData = partyMenu; - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } break; - case 4: { + case BAG_EXIT_CODE_GIVE_FROM_MON_MENU: { Party *party = SaveData_GetParty(fieldSystem->saveData); u32 v9 = *(u32 *)menu->unk_260; - u16 item = BagContext_GetItem(v2); + u16 item = BagContext_GetItem(bagCtx); Pokemon *v8 = Party_GetPokemonBySlotIndex(party, v9); Heap_Free(menu->unk_260); @@ -1292,7 +1292,7 @@ static BOOL sub_0203BC5C(FieldTask *taskMan) v11 = sub_0203D920(fieldSystem, 2, v9, Item_MailNumber(item), HEAP_ID_FIELD2); menu->taskData = v11; menu->unk_260 = sub_0203C540(item, 0, (u8)v9); - sub_0203B674(menu, sub_0203C558); + StartMenu_SetCallback(menu, StartMenu_ExitMail); } else { PartyMenu *partyMenu = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyMenu)); memset(partyMenu, 0, sizeof(PartyMenu)); @@ -1303,7 +1303,7 @@ static BOOL sub_0203BC5C(FieldTask *taskMan) partyMenu->options = SaveData_GetOptions(fieldSystem->saveData); partyMenu->fieldMoveContext = &menu->fieldMoveContext; partyMenu->type = PARTY_MENU_TYPE_BASIC; - partyMenu->usedItemID = BagContext_GetItem(v2); + partyMenu->usedItemID = BagContext_GetItem(bagCtx); partyMenu->selectedMonSlot = v9; // Maybe selected slot? partyMenu->fieldSystem = fieldSystem; @@ -1315,16 +1315,16 @@ static BOOL sub_0203BC5C(FieldTask *taskMan) FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMenu); menu->taskData = partyMenu; - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } } break; - case 5: + case BAG_EXIT_CODE_DONE: default: FieldSystem_StartFieldMap(fieldSystem); menu->state = START_MENU_STATE_12; } - Heap_Free(v2); + Heap_Free(bagCtx); return 0; } @@ -1537,7 +1537,7 @@ static BOOL StartMenu_SelectRetire(FieldTask *taskMan) return 0; } -static BOOL sub_0203C1C8(FieldTask *taskMan) +static BOOL StartMenu_ExitSummary(FieldTask *taskMan) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); StartMenu *menu = FieldTask_GetEnv(taskMan); @@ -1577,11 +1577,11 @@ static BOOL sub_0203C1C8(FieldTask *taskMan) FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMenu); Heap_Free(menu->unk_260); menu->taskData = partyMenu; - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } break; default: menu->taskData = FieldSystem_OpenPartyMenu(fieldSystem, &menu->fieldMoveContext, v2->monIndex); - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } Heap_Free(v2); @@ -1615,7 +1615,7 @@ static void sub_0203C2D8(FieldTask *taskMan, u16 item) sub_0209733C(menu->taskData, v4, v5, v6 + 3); sub_0203D2E4(fieldSystem, menu->taskData); - sub_0203B674(menu, sub_0203C390); + StartMenu_SetCallback(menu, sub_0203C390); } static BOOL sub_0203C390(FieldTask *taskMan) @@ -1632,7 +1632,7 @@ static BOOL sub_0203C390(FieldTask *taskMan) Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); return 0; } @@ -1644,7 +1644,7 @@ BOOL sub_0203C3F4(FieldTask *taskMan) Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); return 0; } @@ -1667,7 +1667,7 @@ BOOL sub_0203C434(FieldTask *taskMan) if (!(v2->flyLocationSelected)) { Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData); menu->taskData = FieldSystem_OpenPartyMenu(fieldSystem, &menu->fieldMoveContext, v3); - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } else { Pokemon *mon; void *v5; @@ -1695,7 +1695,7 @@ BOOL sub_0203C50C(FieldTask *taskMan) StartMenu *menu = FieldTask_GetEnv(taskMan); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); return 0; } @@ -1713,7 +1713,7 @@ void *sub_0203C540(u16 fieldSystem, u8 param1, u8 param2) return (void *)v0; } -BOOL sub_0203C558(FieldTask *taskMan) +BOOL StartMenu_ExitMail(FieldTask *taskMan) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); StartMenu *menu = FieldTask_GetEnv(taskMan); @@ -1723,12 +1723,12 @@ BOOL sub_0203C558(FieldTask *taskMan) case 3: sub_02097770(menu->taskData); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); break; case 2: sub_02097770(menu->taskData); menu->taskData = FieldSystem_OpenPartyMenu(fieldSystem, &menu->fieldMoveContext, v2->unk_02); - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); break; case 0: if (sub_02097728(menu->taskData) == 1) { @@ -1736,7 +1736,7 @@ BOOL sub_0203C558(FieldTask *taskMan) } else { sub_02097770(menu->taskData); menu->taskData = FieldSystem_OpenPartyMenu(fieldSystem, &menu->fieldMoveContext, v2->unk_02); - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } break; case 1: @@ -1745,7 +1745,7 @@ BOOL sub_0203C558(FieldTask *taskMan) } else { sub_02097770(menu->taskData); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); } break; } @@ -1776,7 +1776,7 @@ static void sub_0203C668(FieldSystem *fieldSystem, StartMenu *menu, u8 mode) // FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMenu); menu->taskData = partyMenu; - sub_0203B674(menu, sub_0203B7C0); + StartMenu_SetCallback(menu, StartMenu_ExitPartyMenu); } BOOL sub_0203C710(FieldTask *taskMan) @@ -1787,7 +1787,7 @@ BOOL sub_0203C710(FieldTask *taskMan) sub_02098AF0(menu->taskData); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); return 0; } @@ -1798,7 +1798,7 @@ BOOL sub_0203C750(FieldTask *taskMan) StartMenu *menu = FieldTask_GetEnv(taskMan); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); return 0; } @@ -1809,7 +1809,7 @@ BOOL sub_0203C784(FieldTask *taskMan) StartMenu *menu = FieldTask_GetEnv(taskMan); menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); return 0; } @@ -1873,6 +1873,6 @@ static void StartMenu_Evolve(FieldTask *taskMan) Heap_Free(menu->unk_260); } - sub_0203B674(menu, sub_0203BC5C); + StartMenu_SetCallback(menu, StartMenu_ExitBag); } } diff --git a/src/unk_0202D778.c b/src/unk_0202D778.c index 321d7b2709..8c915d4656 100644 --- a/src/unk_0202D778.c +++ b/src/unk_0202D778.c @@ -15,7 +15,7 @@ void Ribbons_Init(u8 *param0) memset(param0, 0, 14); } -u8 *sub_0202D79C(SaveData *saveData) +u8 *SaveData_GetRibbons(SaveData *saveData) { return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_RIBBONS); } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index dcd630c2a5..7e8cd55b95 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -527,7 +527,7 @@ void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2) v0->monMax = Party_GetCurrentCount(v0->monData); v0->move = 0; v0->mode = SUMMARY_MODE_NORMAL; - v0->specialRibbons = sub_0202D79C(fieldSystem->saveData); + v0->specialRibbons = SaveData_GetRibbons(fieldSystem->saveData); v0->dexMode = SaveData_GetDexMode(fieldSystem->saveData); v0->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData); v0->chatotCry = NULL; @@ -570,7 +570,7 @@ PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int heapID, int mode) v0->mode = mode; v0->dexMode = SaveData_GetDexMode(saveData); v0->showContest = PokemonSummaryScreen_ShowContestData(saveData); - v0->specialRibbons = sub_0202D79C(saveData); + v0->specialRibbons = SaveData_GetRibbons(saveData); PokemonSummaryScreen_FlagVisiblePages(v0, v2); PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(saveData)); @@ -1754,7 +1754,7 @@ void *FieldSystem_OpenSummaryScreenTeachMove(int unused, FieldSystem *fieldSyste summary->monMax = 1; summary->move = move; summary->mode = SUMMARY_MODE_SELECT_MOVE; - summary->specialRibbons = sub_0202D79C(fieldSystem->saveData); + summary->specialRibbons = SaveData_GetRibbons(fieldSystem->saveData); summary->dexMode = SaveData_GetDexMode(fieldSystem->saveData); summary->showContest = SystemFlag_CheckContestHallVisited(SaveData_GetVarsFlags(fieldSystem->saveData)); summary->chatotCry = NULL; diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index bc77ca8330..ba8bc392aa 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -422,7 +422,7 @@ static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, in v0->monMax = Party_GetCurrentCount(v0->monData); v0->move = 0; v0->mode = SUMMARY_MODE_NORMAL; - v0->specialRibbons = sub_0202D79C(saveData); + v0->specialRibbons = SaveData_GetRibbons(saveData); PokemonSummaryScreen_FlagVisiblePages(v0, v2); PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(saveData)); diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index 952f3c7557..73a28221a2 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -333,7 +333,7 @@ static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, in v0->monMax = Party_GetCurrentCount(v0->monData); v0->move = 0; v0->mode = SUMMARY_MODE_NORMAL; - v0->specialRibbons = sub_0202D79C(saveData); + v0->specialRibbons = SaveData_GetRibbons(saveData); PokemonSummaryScreen_FlagVisiblePages(v0, v2); PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(saveData)); diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index ec5a045268..e9a7bf3214 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -321,7 +321,7 @@ static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, in v0->monMax = (u8)Party_GetCurrentCount(v0->monData); v0->move = 0; v0->mode = SUMMARY_MODE_NORMAL; - v0->specialRibbons = sub_0202D79C(saveData); + v0->specialRibbons = SaveData_GetRibbons(saveData); PokemonSummaryScreen_FlagVisiblePages(v0, v2); PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(saveData)); diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 1bd78ebe2f..670598e0b8 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -137,7 +137,7 @@ static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, P v0->monMax = Party_GetCurrentCount(v0->monData); v0->move = 0; v0->mode = param4; - v0->specialRibbons = sub_0202D79C(saveData); + v0->specialRibbons = SaveData_GetRibbons(saveData); PokemonSummaryScreen_FlagVisiblePages(v0, v2); FieldSystem_StartChildProcess(fieldSystem, &gPokemonSummaryScreenApp, v0); diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c index a34ac146af..3e7983533d 100644 --- a/src/unk_0206B9D8.c +++ b/src/unk_0206B9D8.c @@ -146,7 +146,7 @@ static int sub_0206BAE0(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, in v0->monMax = Party_GetCurrentCount(v0->monData); v0->move = 0; v0->mode = param0->unk_09; - v0->specialRibbons = sub_0202D79C(saveData); + v0->specialRibbons = SaveData_GetRibbons(saveData); PokemonSummaryScreen_FlagVisiblePages(v0, v2); PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(saveData)); diff --git a/src/unk_02095CD4.c b/src/unk_02095CD4.c index bc82e34562..0c7fd2dc46 100644 --- a/src/unk_02095CD4.c +++ b/src/unk_02095CD4.c @@ -134,7 +134,7 @@ void sub_02095DCC(int param0, int param1, void *param2, void *param3) { FieldSystem *fieldSystem = (FieldSystem *)param3; int v1; - u8 *v2 = sub_0202D79C(fieldSystem->saveData); + u8 *v2 = SaveData_GetRibbons(fieldSystem->saveData); u8 *v3 = (u8 *)param2; if (CommSys_CurNetId() == param0) { From 0aa5664c78291042e127a1dbfed16230142dc2b3 Mon Sep 17 00:00:00 2001 From: SevenSpiders <62239403+SevenSpiders@users.noreply.github.com> Date: Tue, 2 Dec 2025 23:45:19 +0100 Subject: [PATCH 2/4] syntax fixes --- include/applications/party_menu/defs.h | 11 ++++++----- src/start_menu.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/applications/party_menu/defs.h b/include/applications/party_menu/defs.h index b7b59b5b68..2d218f2573 100644 --- a/include/applications/party_menu/defs.h +++ b/include/applications/party_menu/defs.h @@ -70,7 +70,7 @@ enum PartyMenuType { PARTY_MENU_TYPE_MULTI_BATTLE, }; -enum PartyMenuSelectionResults { +enum PartyMenuExitCodes { PARTY_MENU_EXIT_CODE_DONE = 0, PARTY_MENU_EXIT_CODE_SUMMARY = 1, PARTY_MENU_EXIT_CODE_2 = 2, // unused @@ -86,16 +86,17 @@ enum PartyMenuSelectionResults { PARTY_MENU_EXIT_CODE_FLY = 11 + FIELD_MOVE_FLY, PARTY_MENU_EXIT_CODE_SURF = 11 + FIELD_MOVE_SURF, PARTY_MENU_EXIT_CODE_STRENGTH = 11 + FIELD_MOVE_STRENGTH, - PARTY_MENU_EXIT_CODE_DEFOG = 11 + FIELD_MOVE_DEFOG + PARTY_MENU_EXIT_CODE_DEFOG = 11 + FIELD_MOVE_DEFOG, PARTY_MENU_EXIT_CODE_ROCK_SMASH = 11 + FIELD_MOVE_ROCK_SMASH, PARTY_MENU_EXIT_CODE_WATERFALL = 11 + FIELD_MOVE_WATERFALL, - PARTY_MENU_EXIT_CODE_ROCK_CLIMB = 11 + FIELD_MOVE_ROCK_CLIMB + PARTY_MENU_EXIT_CODE_ROCK_CLIMB = 11 + FIELD_MOVE_ROCK_CLIMB, PARTY_MENU_EXIT_CODE_FLASH = 11 + FIELD_MOVE_FLASH, PARTY_MENU_EXIT_CODE_TELEPORT = 11 + FIELD_MOVE_FLASH + 1, PARTY_MENU_EXIT_CODE_DIG = 11 + FIELD_MOVE_FLASH + 2, PARTY_MENU_EXIT_CODE_SWEET_SCENT = 11 + FIELD_MOVE_FLASH + 3, - PARTY_MENU_EXIT_CODE_CHATTER = 11 + FIELD_MOVE_FLASH + 4 -} + PARTY_MENU_EXIT_CODE_CHATTER = 11 + FIELD_MOVE_FLASH + 4, +}; + #define PARTY_MENU_MODE_HIDE_CANCEL_FLAG (1 << 7) enum PartyMenuWindow { diff --git a/src/start_menu.c b/src/start_menu.c index 65d9906ab7..31105e5e6a 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -17,6 +17,7 @@ #include "struct_defs/struct_020708E0.h" #include "struct_defs/struct_02097728.h" +#include "applications/bag/application.h" #include "applications/party_menu/defs.h" #include "applications/party_menu/main.h" #include "applications/pokedex/pokedex_main.h" From c00e53409d21afca8878b2c4929475406efadce1 Mon Sep 17 00:00:00 2001 From: SevenSpiders <62239403+SevenSpiders@users.noreply.github.com> Date: Wed, 3 Dec 2025 01:04:42 +0100 Subject: [PATCH 3/4] Clang format fixes --- include/applications/party_menu/defs.h | 36 +++++++++++----------- src/applications/party_menu/unk_02084B70.c | 2 +- src/start_menu.c | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/applications/party_menu/defs.h b/include/applications/party_menu/defs.h index 2d218f2573..f76eb170db 100644 --- a/include/applications/party_menu/defs.h +++ b/include/applications/party_menu/defs.h @@ -71,30 +71,30 @@ enum PartyMenuType { }; enum PartyMenuExitCodes { - PARTY_MENU_EXIT_CODE_DONE = 0, - PARTY_MENU_EXIT_CODE_SUMMARY = 1, - PARTY_MENU_EXIT_CODE_2 = 2, // unused - PARTY_MENU_EXIT_CODE_GIVE_ITEM = 3, + PARTY_MENU_EXIT_CODE_DONE = 0, + PARTY_MENU_EXIT_CODE_SUMMARY = 1, + PARTY_MENU_EXIT_CODE_2 = 2, // unused + PARTY_MENU_EXIT_CODE_GIVE_ITEM = 3, PARTY_MENU_EXIT_CODE_LEARNED_MOVE = 4, PARTY_MENU_EXIT_CODE_FORGET_MOVE = 5, - PARTY_MENU_EXIT_CODE_MAIL = 6, - PARTY_MENU_EXIT_CODE_READ_MAIL = 7, + PARTY_MENU_EXIT_CODE_MAIL = 6, + PARTY_MENU_EXIT_CODE_READ_MAIL = 7, PARTY_MENU_EXIT_CODE_EVOLVE_BY_ITEM = 8, PARTY_MENU_EXIT_CODE_EVOLVE_BY_LEVEL = 9, PARTY_MENU_EXIT_CODE_RETURN_TO_BAG = 10, // after use of item - PARTY_MENU_EXIT_CODE_CUT = 11 + FIELD_MOVE_CUT, - PARTY_MENU_EXIT_CODE_FLY = 11 + FIELD_MOVE_FLY, - PARTY_MENU_EXIT_CODE_SURF = 11 + FIELD_MOVE_SURF, - PARTY_MENU_EXIT_CODE_STRENGTH = 11 + FIELD_MOVE_STRENGTH, - PARTY_MENU_EXIT_CODE_DEFOG = 11 + FIELD_MOVE_DEFOG, - PARTY_MENU_EXIT_CODE_ROCK_SMASH = 11 + FIELD_MOVE_ROCK_SMASH, - PARTY_MENU_EXIT_CODE_WATERFALL = 11 + FIELD_MOVE_WATERFALL, - PARTY_MENU_EXIT_CODE_ROCK_CLIMB = 11 + FIELD_MOVE_ROCK_CLIMB, - PARTY_MENU_EXIT_CODE_FLASH = 11 + FIELD_MOVE_FLASH, - PARTY_MENU_EXIT_CODE_TELEPORT = 11 + FIELD_MOVE_FLASH + 1, - PARTY_MENU_EXIT_CODE_DIG = 11 + FIELD_MOVE_FLASH + 2, + PARTY_MENU_EXIT_CODE_CUT = 11 + FIELD_MOVE_CUT, + PARTY_MENU_EXIT_CODE_FLY = 11 + FIELD_MOVE_FLY, + PARTY_MENU_EXIT_CODE_SURF = 11 + FIELD_MOVE_SURF, + PARTY_MENU_EXIT_CODE_STRENGTH = 11 + FIELD_MOVE_STRENGTH, + PARTY_MENU_EXIT_CODE_DEFOG = 11 + FIELD_MOVE_DEFOG, + PARTY_MENU_EXIT_CODE_ROCK_SMASH = 11 + FIELD_MOVE_ROCK_SMASH, + PARTY_MENU_EXIT_CODE_WATERFALL = 11 + FIELD_MOVE_WATERFALL, + PARTY_MENU_EXIT_CODE_ROCK_CLIMB = 11 + FIELD_MOVE_ROCK_CLIMB, + PARTY_MENU_EXIT_CODE_FLASH = 11 + FIELD_MOVE_FLASH, + PARTY_MENU_EXIT_CODE_TELEPORT = 11 + FIELD_MOVE_FLASH + 1, + PARTY_MENU_EXIT_CODE_DIG = 11 + FIELD_MOVE_FLASH + 2, PARTY_MENU_EXIT_CODE_SWEET_SCENT = 11 + FIELD_MOVE_FLASH + 3, - PARTY_MENU_EXIT_CODE_CHATTER = 11 + FIELD_MOVE_FLASH + 4, + PARTY_MENU_EXIT_CODE_CHATTER = 11 + FIELD_MOVE_FLASH + 4, }; #define PARTY_MENU_MODE_HIDE_CANCEL_FLAG (1 << 7) diff --git a/src/applications/party_menu/unk_02084B70.c b/src/applications/party_menu/unk_02084B70.c index 82a18b13ba..d9d3399cef 100644 --- a/src/applications/party_menu/unk_02084B70.c +++ b/src/applications/party_menu/unk_02084B70.c @@ -684,7 +684,7 @@ static int sub_02085A70(void *applicationPtr) application->partyMembers[application->currPartySlot].curHP = Pokemon_GetValue(mon, MON_DATA_HP, NULL); application->partyMembers[application->currPartySlot].maxHP = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL); - strBuf = MessageLoader_GetNewStrbuf(application->messageLoader, 193); // pl_msg_00000453_00193: + strBuf = MessageLoader_GetNewStrbuf(application->messageLoader, 193); // pl_msg_00000453_00193: StringTemplate_SetNickname(application->template, 0, Pokemon_GetBoxPokemon(mon)); StringTemplate_SetNumber(application->template, 1, application->partyMembers[application->currPartySlot].level, 3, 0, 1); diff --git a/src/start_menu.c b/src/start_menu.c index 31105e5e6a..8c39ebcec8 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1120,7 +1120,7 @@ BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan) StartMenu_SetCallback(menu, StartMenu_ExitMail); } break; - case PARTY_MENU_EXIT_CODE_GIVE_ITEM: { //give item + case PARTY_MENU_EXIT_CODE_GIVE_ITEM: { // give item u32 *v13 = (u32 *)Heap_Alloc(HEAP_ID_FIELD2, 4); *v13 = partyMenu->selectedMonSlot; menu->unk_260 = (void *)v13; @@ -1157,7 +1157,7 @@ BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan) menu->taskData = v15; menu->state = START_MENU_STATE_EVOLVE_INIT; } break; - case PARTY_MENU_EXIT_CODE_ROCK_SMASH: // fieldMoveTaskOrError: + case PARTY_MENU_EXIT_CODE_ROCK_SMASH: // fieldMoveTaskOrError: case PARTY_MENU_EXIT_CODE_CUT: case PARTY_MENU_EXIT_CODE_FLY: case PARTY_MENU_EXIT_CODE_DEFOG: From 02e3d7c9fab9d4d0c79def4b5173e6b348e17cf2 Mon Sep 17 00:00:00 2001 From: Viperio Date: Wed, 11 Feb 2026 18:03:23 +0100 Subject: [PATCH 4/4] address #846 feedback --- include/applications/party_menu/defs.h | 46 +++++++++---------- include/start_menu.h | 6 +-- src/applications/party_menu/unk_02083370.c | 52 +++++++++++----------- src/start_menu.c | 10 ++--- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/include/applications/party_menu/defs.h b/include/applications/party_menu/defs.h index 2f4c089cba..f820139364 100644 --- a/include/applications/party_menu/defs.h +++ b/include/applications/party_menu/defs.h @@ -72,29 +72,29 @@ enum PartyMenuType { enum PartyMenuExitCodes { PARTY_MENU_EXIT_CODE_DONE = 0, - PARTY_MENU_EXIT_CODE_SUMMARY = 1, - PARTY_MENU_EXIT_CODE_2 = 2, // unused - PARTY_MENU_EXIT_CODE_GIVE_ITEM = 3, - PARTY_MENU_EXIT_CODE_LEARNED_MOVE = 4, - PARTY_MENU_EXIT_CODE_FORGET_MOVE = 5, - PARTY_MENU_EXIT_CODE_MAIL = 6, - PARTY_MENU_EXIT_CODE_READ_MAIL = 7, - PARTY_MENU_EXIT_CODE_EVOLVE_BY_ITEM = 8, - PARTY_MENU_EXIT_CODE_EVOLVE_BY_LEVEL = 9, - PARTY_MENU_EXIT_CODE_RETURN_TO_BAG = 10, // after use of item - PARTY_MENU_EXIT_CODE_CUT = 11 + FIELD_MOVE_CUT, - PARTY_MENU_EXIT_CODE_FLY = 11 + FIELD_MOVE_FLY, - PARTY_MENU_EXIT_CODE_SURF = 11 + FIELD_MOVE_SURF, - PARTY_MENU_EXIT_CODE_STRENGTH = 11 + FIELD_MOVE_STRENGTH, - PARTY_MENU_EXIT_CODE_DEFOG = 11 + FIELD_MOVE_DEFOG, - PARTY_MENU_EXIT_CODE_ROCK_SMASH = 11 + FIELD_MOVE_ROCK_SMASH, - PARTY_MENU_EXIT_CODE_WATERFALL = 11 + FIELD_MOVE_WATERFALL, - PARTY_MENU_EXIT_CODE_ROCK_CLIMB = 11 + FIELD_MOVE_ROCK_CLIMB, - PARTY_MENU_EXIT_CODE_FLASH = 11 + FIELD_MOVE_FLASH, - PARTY_MENU_EXIT_CODE_TELEPORT = 11 + FIELD_MOVE_FLASH + 1, - PARTY_MENU_EXIT_CODE_DIG = 11 + FIELD_MOVE_FLASH + 2, - PARTY_MENU_EXIT_CODE_SWEET_SCENT = 11 + FIELD_MOVE_FLASH + 3, - PARTY_MENU_EXIT_CODE_CHATTER = 11 + FIELD_MOVE_FLASH + 4, + PARTY_MENU_EXIT_CODE_SUMMARY, + PARTY_MENU_EXIT_CODE_2, + PARTY_MENU_EXIT_CODE_GIVE_ITEM, + PARTY_MENU_EXIT_CODE_LEARNED_MOVE, + PARTY_MENU_EXIT_CODE_FORGET_MOVE, + PARTY_MENU_EXIT_CODE_MAIL, + PARTY_MENU_EXIT_CODE_READ_MAIL, + PARTY_MENU_EXIT_CODE_EVOLVE_BY_ITEM, + PARTY_MENU_EXIT_CODE_EVOLVE_BY_LEVEL, + PARTY_MENU_EXIT_CODE_RETURN_TO_BAG, + PARTY_MENU_EXIT_CODE_CUT, + PARTY_MENU_EXIT_CODE_FLY, + PARTY_MENU_EXIT_CODE_SURF, + PARTY_MENU_EXIT_CODE_STRENGTH, + PARTY_MENU_EXIT_CODE_DEFOG, + PARTY_MENU_EXIT_CODE_ROCK_SMASH, + PARTY_MENU_EXIT_CODE_WATERFALL, + PARTY_MENU_EXIT_CODE_ROCK_CLIMB, + PARTY_MENU_EXIT_CODE_FLASH, + PARTY_MENU_EXIT_CODE_TELEPORT, + PARTY_MENU_EXIT_CODE_DIG, + PARTY_MENU_EXIT_CODE_SWEET_SCENT, + PARTY_MENU_EXIT_CODE_CHATTER }; #define PARTY_MENU_MODE_HIDE_CANCEL_FLAG (1 << 7) diff --git a/include/start_menu.h b/include/start_menu.h index 4799914c9b..3d9afe06c4 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -12,13 +12,13 @@ void StartMenu_Init(struct FieldSystem_t *fieldSystem); void sub_0203AA78(struct FieldSystem_t *fieldSystem); void sub_0203AABC(FieldSystem *fieldSystem); void StartMenu_Open(FieldSystem *fieldSystem); -void StartMenu_SetCallback(StartMenu *param0, void *param1); -BOOL StartMenu_ExitPartyMenu(FieldTask *param0); +void StartMenu_SetCallback(StartMenu *menu, void *callback); +BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan); BOOL sub_0203C3F4(FieldTask *param0); BOOL sub_0203C434(FieldTask *param0); BOOL sub_0203C50C(FieldTask *param0); void *sub_0203C540(u16 param0, u8 param1, u8 param2); -BOOL StartMenu_ExitMail(FieldTask *param0); +BOOL StartMenu_ExitMail(FieldTask *taskMan); BOOL sub_0203C710(FieldTask *param0); BOOL sub_0203C750(FieldTask *param0); BOOL sub_0203C784(FieldTask *param0); diff --git a/src/applications/party_menu/unk_02083370.c b/src/applications/party_menu/unk_02083370.c index 199f800b69..2fd075df05 100644 --- a/src/applications/party_menu/unk_02083370.c +++ b/src/applications/party_menu/unk_02083370.c @@ -131,12 +131,12 @@ static void PartyMenu_SelectItem(PartyMenuApplication *application, int *param1) application->contextMenuChoices = StringList_New(3, HEAP_ID_PARTY_MENU); - StringList_AddFromString(application->contextMenuChoices, application->menuStrings[3], PartyMenu_GetAction(3)); - StringList_AddFromString(application->contextMenuChoices, application->menuStrings[4], PartyMenu_GetAction(4)); - StringList_AddFromString(application->contextMenuChoices, application->menuStrings[9], PartyMenu_GetAction(9)); + StringList_AddFromString(application->contextMenuChoices, application->menuStrings[PARTY_MENU_STR_ITEM_GIVE], PartyMenu_GetAction(3)); + StringList_AddFromString(application->contextMenuChoices, application->menuStrings[PARTY_MENU_STR_ITEM_TAKE], PartyMenu_GetAction(4)); + StringList_AddFromString(application->contextMenuChoices, application->menuStrings[PARTY_MENU_STR_CANCEL], PartyMenu_GetAction(9)); v0.choices = application->contextMenuChoices; - v0.window = &application->windows[35]; + v0.window = &application->windows[PARTY_MENU_WIN_GIVE_ITEM_OR_MAIL]; v0.fontID = FONT_SYSTEM; v0.xSize = 1; v0.ySize = 3; @@ -144,7 +144,7 @@ static void PartyMenu_SelectItem(PartyMenuApplication *application, int *param1) v0.suppressCursor = FALSE; v0.loopAround = FALSE; - Window_DrawStandardFrame(&application->windows[35], 1, 1, 14); + Window_DrawStandardFrame(&application->windows[PARTY_MENU_WIN_GIVE_ITEM_OR_MAIL], 1, 1, 14); application->contextMenu = Menu_NewAndCopyToVRAM(&v0, 8, 0, 0, 12, PAD_BUTTON_B); *param1 = 15; @@ -166,7 +166,7 @@ static void PartyMenu_SelectItemTake(PartyMenuApplication *application, int *par int v2 = 17; FieldSystem *fieldSystem; - Window_EraseStandardFrame(&application->windows[35], 1); + Window_EraseStandardFrame(&application->windows[PARTY_MENU_WIN_GIVE_ITEM_OR_MAIL], 1); Menu_Free(application->contextMenu, NULL); StringList_Free(application->contextMenuChoices); @@ -208,8 +208,8 @@ static void PartyMenu_SelectItemTake(PartyMenuApplication *application, int *par MessageLoader_GetString(application->messageLoader, pl_msg_00000453_00083, application->tmpString); } - Window_DrawMessageBoxWithScrollCursor(&application->windows[34], 1, (1 + 9), 15); - Window_FillTilemap(&application->windows[34], 15); + Window_DrawMessageBoxWithScrollCursor(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1, (1 + 9), 15); + Window_FillTilemap(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 15); PartyMenu_AddLongMessagePrinter(application); *param1 = v2; @@ -219,7 +219,7 @@ int sub_02083658(PartyMenuApplication *application) { if (Text_IsPrinterActive(application->textPrinterID) == 0) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(&application->windows[34], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; @@ -233,7 +233,7 @@ int sub_020836A8(PartyMenuApplication *application) { if (Text_IsPrinterActive(application->textPrinterID) == 0) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(&application->windows[34], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1); PartyMenu_SetupFormChangeAnim(application); return 19; } @@ -261,12 +261,12 @@ static void PartyMenu_SelectMail(PartyMenuApplication *application, int *param1) application->contextMenuChoices = StringList_New(3, HEAP_ID_PARTY_MENU); - StringList_AddFromString(application->contextMenuChoices, application->menuStrings[6], PartyMenu_GetAction(6)); - StringList_AddFromString(application->contextMenuChoices, application->menuStrings[7], PartyMenu_GetAction(7)); - StringList_AddFromString(application->contextMenuChoices, application->menuStrings[9], PartyMenu_GetAction(9)); + StringList_AddFromString(application->contextMenuChoices, application->menuStrings[PARTY_MENU_STR_MAIL_READ], PartyMenu_GetAction(6)); + StringList_AddFromString(application->contextMenuChoices, application->menuStrings[PARTY_MENU_STR_MAIL_TAKE], PartyMenu_GetAction(7)); + StringList_AddFromString(application->contextMenuChoices, application->menuStrings[PARTY_MENU_STR_CANCEL], PartyMenu_GetAction(9)); v0.choices = application->contextMenuChoices; - v0.window = &application->windows[35]; + v0.window = &application->windows[PARTY_MENU_WIN_GIVE_ITEM_OR_MAIL]; v0.fontID = FONT_SYSTEM; v0.xSize = 1; v0.ySize = 3; @@ -274,7 +274,7 @@ static void PartyMenu_SelectMail(PartyMenuApplication *application, int *param1) v0.suppressCursor = FALSE; v0.loopAround = FALSE; - Window_DrawStandardFrame(&application->windows[35], 1, 1, 14); + Window_DrawStandardFrame(&application->windows[PARTY_MENU_WIN_GIVE_ITEM_OR_MAIL], 1, 1, 14); application->contextMenu = Menu_NewAndCopyToVRAM(&v0, 8, 0, 0, 12, PAD_BUTTON_B); *param1 = 15; @@ -291,7 +291,7 @@ static void PartyMenu_SelectMailRead(PartyMenuApplication *application, int *par static void PartyMenu_SelectMailTake(PartyMenuApplication *application, int *param1) { - Window_EraseStandardFrame(&application->windows[35], 1); + Window_EraseStandardFrame(&application->windows[PARTY_MENU_WIN_GIVE_ITEM_OR_MAIL], 1); Menu_Free(application->contextMenu, NULL); StringList_Free(application->contextMenuChoices); PartyMenu_PrintLongMessage(application, pl_msg_00000453_00043, TRUE); @@ -368,7 +368,7 @@ static int sub_02083990(void *applicationPtr) { PartyMenuApplication *application = applicationPtr; - Window_EraseMessageBox(&application->windows[34], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); @@ -378,7 +378,7 @@ static int sub_02083990(void *applicationPtr) int sub_020839BC(PartyMenuApplication *application) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(&application->windows[34], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; @@ -421,7 +421,7 @@ int sub_02083AA4(void *applicationPtr) { PartyMenuApplication *application = applicationPtr; - Window_EraseMessageBox(&application->windows[34], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); @@ -441,7 +441,7 @@ static void PartyMenu_SelectSwitch(PartyMenuApplication *application, int *param Sprite_SetAnim(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], PartyMenu_GetMemberPanelAnim(application->partyMenu->type, application->switchTargetSlot) + 2); Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], TRUE); PartyMenu_UpdateSlotPalette(application, application->switchTargetSlot); - Window_EraseMessageBox(&application->windows[33], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_MEDIUM_MESSAGE], 1); PartyMenu_ClearContextWindow(application); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00030, TRUE); @@ -712,7 +712,7 @@ static void sub_020844B0(PartyMenuApplication *application, int *param1) { u8 v0; - Window_EraseMessageBox(&application->windows[33], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_MEDIUM_MESSAGE], 1); PartyMenu_ClearContextWindow(application); for (v0 = 0; v0 < application->partyMenu->maxSelectionSlots; v0++) { @@ -759,7 +759,7 @@ static void sub_020844B0(PartyMenuApplication *application, int *param1) int sub_020845A8(PartyMenuApplication *application) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(&application->windows[34], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00034, TRUE); Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; @@ -792,7 +792,7 @@ static void sub_020845E8(PartyMenuApplication *application, int *param1) PartyMenu_PrintSelectionEligibility(application, v0); } - Window_EraseMessageBox(&application->windows[33], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_MEDIUM_MESSAGE], 1); PartyMenu_ClearContextWindow(application); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); @@ -833,7 +833,7 @@ static void PartyMenu_SelectSummary(PartyMenuApplication *application, int *para static void sub_02084760(PartyMenuApplication *application, int *param1) { PartyMenu_ClearContextWindow(application); - Window_EraseMessageBox(&application->windows[33], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_MEDIUM_MESSAGE], 1); *param1 = sub_02084780(application); } @@ -998,7 +998,7 @@ static void sub_020849FC(PartyMenuApplication *application, int *param1) static int sub_02084A18(PartyMenuApplication *application) { - Window_EraseMessageBox(&application->windows[33], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_MEDIUM_MESSAGE], 1); PartyMenu_ClearContextWindow(application); application->monStats[0] = application->partyMembers[application->currPartySlot].maxHP / 5; @@ -1029,7 +1029,7 @@ static int sub_02084A18(PartyMenuApplication *application) int sub_02084B34(PartyMenuApplication *application) { if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - Window_EraseMessageBox(&application->windows[34], 1); + Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1); PartyMenu_PrintShortMessage(application, pl_msg_00000453_00029, TRUE); // Choose a Pokémon. Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0); return 1; diff --git a/src/start_menu.c b/src/start_menu.c index 9a4b835146..147be94688 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1058,14 +1058,14 @@ BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan) UnkStruct_0203C1C8 *v5 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C1C8)); - v5->unk_00 = partyMenu->usedItemID; // TMHM + v5->unk_00 = partyMenu->usedItemID; v5->unk_02 = 0; menu->unk_260 = v5; menu->taskData = summary; StartMenu_SetCallback(menu, StartMenu_ExitSummary); } break; - case PARTY_MENU_EXIT_CODE_FORGET_MOVE: { // called after level up + case PARTY_MENU_EXIT_CODE_FORGET_MOVE: { PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary)); summary->monData = SaveData_GetParty(fieldSystem->saveData); @@ -1120,7 +1120,7 @@ BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan) StartMenu_SetCallback(menu, StartMenu_ExitMail); } break; - case PARTY_MENU_EXIT_CODE_GIVE_ITEM: { // give item + case PARTY_MENU_EXIT_CODE_GIVE_ITEM: { u32 *v13 = (u32 *)Heap_Alloc(HEAP_ID_FIELD2, 4); *v13 = partyMenu->selectedMonSlot; menu->unk_260 = (void *)v13; @@ -1157,7 +1157,7 @@ BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan) menu->taskData = v15; menu->state = START_MENU_STATE_EVOLVE_INIT; } break; - case PARTY_MENU_EXIT_CODE_ROCK_SMASH: // fieldMoveTaskOrError: + case PARTY_MENU_EXIT_CODE_ROCK_SMASH: case PARTY_MENU_EXIT_CODE_CUT: case PARTY_MENU_EXIT_CODE_FLY: case PARTY_MENU_EXIT_CODE_DEFOG: @@ -1184,7 +1184,7 @@ BOOL StartMenu_ExitPartyMenu(FieldTask *taskMan) menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230); StartMenu_SetCallback(menu, StartMenu_ExitBag); break; - default: // PARTY_MENU_EXIT_CODE_0 + default: if ((partyMenu->mode == PARTY_MENU_MODE_USE_ITEM) || (partyMenu->mode == PARTY_MENU_MODE_TEACH_MOVE) || (partyMenu->mode == PARTY_MENU_MODE_TEACH_MOVE_DONE) || (partyMenu->mode == PARTY_MENU_MODE_USE_EVO_ITEM) || (partyMenu->mode == PARTY_MENU_MODE_LEVEL_MOVE_DONE)) { menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230);