From 7ea7ffbf4f0dda8f8393262a7d5bf47417da3b9c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jul 2024 09:36:55 -0400 Subject: [PATCH] documentation, 5 --- asm/include/launch_application.inc | 2 +- include/launch_application.h | 2 +- include/launch_application_internal.h | 6 ++--- include/party_menu.h | 4 ++-- include/party_menu_list_items.h | 4 ++-- src/launch_application.c | 23 ++++++++++--------- src/party_context_menu.c | 6 ++--- src/party_menu.c | 32 +++++++++++++-------------- src/party_menu_list_items.c | 8 +++---- src/scrcmd_c.c | 2 +- 10 files changed, 45 insertions(+), 44 deletions(-) diff --git a/asm/include/launch_application.inc b/asm/include/launch_application.inc index 91969650b..e5988c905 100644 --- a/asm/include/launch_application.inc +++ b/asm/include/launch_application.inc @@ -75,7 +75,7 @@ .public PartyMenu_LaunchApp_Unk4 .public sub_0203E5F8 .public sub_0203E600 -.public SelectPartyMonAndLearnMove +.public TaskManager_LaunchPartyMenu_UnionRoomBattleSelect .public PartyMenu_LaunchApp_Unk5 .public PokemonSummary_CreateArgs .public LearnForgetMove_LaunchApp diff --git a/include/launch_application.h b/include/launch_application.h index 0caa39e28..d04c7f813 100644 --- a/include/launch_application.h +++ b/include/launch_application.h @@ -112,7 +112,7 @@ UnownReportArgs *UnownReport_LaunchApp(FieldSystem *fieldSystem); PartyMenuArgs *PartyMenu_LaunchApp_Gracidea(FieldSystem *fieldSystem, HeapID heapId, u16 itemId); PartyMenuArgs *PartyMenu_LaunchApp_Unk2(HeapID heapId, FieldSystem *fieldSystem); //todo: party select screen PartyMenuArgs *PartyMenu_LaunchApp_Unk3(HeapID heapId, FieldSystem *fieldSystem); //todo: party trade screen -PartyMenuArgs *SelectPartyMonAndLearnMove(TaskManager *taskManager, HeapID heapId); //todo: union party select screen +PartyMenuArgs *TaskManager_LaunchPartyMenu_UnionRoomBattleSelect(TaskManager *taskManager, HeapID heapId); //todo: union party select screen int sub_0203E5C8(struct PartyMenuArgs *partyWork); int sub_0203E5F8(struct PartyMenuArgs *partyWork); void sub_0203F570(FieldSystem *fieldSystem, SaveData *saveData); diff --git a/include/launch_application_internal.h b/include/launch_application_internal.h index 02d5d2cc3..468cd359a 100644 --- a/include/launch_application_internal.h +++ b/include/launch_application_internal.h @@ -8,8 +8,8 @@ typedef enum PartyMenuMoveSelectState { PMMS_OPEN_PARTY_MENU, PMMS_WAIT_PARTY_MENU, - PMMS_OPEN_FORGET_MOVE, - PMMS_WAIT_FORGET_MOVE, + PMMS_OPEN_SUMMARY, + PMMS_WAIT_SUMMARY, PMMS_FREE, } PartyMenuMoveSelectState; @@ -149,7 +149,7 @@ typedef struct UnkStruct_0203E644 { } UnkStruct_0203E644; typedef struct PartyMenuMoveSelectData { - HeapID unk0; + HeapID heapId; UnkStruct_0203E644 *unk4; PokemonSummaryArgs *pokemonSummary; } PartyMenuMoveSelectData; diff --git a/include/party_menu.h b/include/party_menu.h index 5c0bbb21a..aa7f93678 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -75,7 +75,7 @@ typedef enum PartyMenuState { typedef enum PartyMenuContext { PARTY_MENU_CONTEXT_0, PARTY_MENU_CONTEXT_1, - PARTY_MENU_CONTEXT_2, + PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT, PARTY_MENU_CONTEXT_3, PARTY_MENU_CONTEXT_4, PARTY_MENU_CONTEXT_USE_ITEM, @@ -92,7 +92,7 @@ typedef enum PartyMenuContext { PARTY_MENU_CONTEXT_EVO_STONE, PARTY_MENU_CONTEXT_17, PARTY_MENU_CONTEXT_18, - PARTY_MENU_CONTEXT_19, + PARTY_MENU_CONTEXT_INGAME_TRADE, PARTY_MENU_CONTEXT_20, PARTY_MENU_CONTEXT_SPIN_TRADE, PARTY_MENU_CONTEXT_BATTLE_HALL, diff --git a/include/party_menu_list_items.h b/include/party_menu_list_items.h index 9f38803b4..5e8b06c37 100644 --- a/include/party_menu_list_items.h +++ b/include/party_menu_list_items.h @@ -8,8 +8,8 @@ int PartyMenu_Subtask_PrintTakeItemMessage(PartyMenuStruct *partyMenu); int PartyMenu_Subtask_PrintTakeGriseousOrbMessage(PartyMenuStruct *partyMenu); int PartyMenu_Subtask_WaitTakeGriseousOrbAnim(PartyMenuStruct *partyMenu); int PartyMenu_Subtask_AfterTakeMail(PartyMenuStruct *partyMenu); -int sub_0207FAA8(PartyMenuStruct *partyMenu); -int sub_0207FAD4(PartyMenuStruct *partyMenu); +int PartyMenu_ConfirmRemoveCapsuleYes(PartyMenuStruct *partyMenu); +int PartyMenu_ConfirmRemoveCapsuleNo(PartyMenuStruct *partyMenu); void sub_0207FBC8(PartyMenuStruct *partyMenu); void sub_0207FC1C(PartyMenuStruct *partyMenu); BOOL sub_0207FD6C(PartyMenuStruct *partyMenu); diff --git a/src/launch_application.c b/src/launch_application.c index 989a59265..740a5e225 100644 --- a/src/launch_application.c +++ b/src/launch_application.c @@ -68,7 +68,7 @@ #include "constants/flags.h" static PartyMenuArgs *PartyMenu_CreateArgs(HeapID heapId, FieldSystem *fieldSystem, int a2, PartyMenuContext context); -static BOOL Task_OpenPartyMenuThenMoveSelect(TaskManager *taskman); +static BOOL Task_OpenPartyMenuForUnionRoomBattleSelect(TaskManager *taskman); static BOOL sub_0203E878(TaskManager *taskman); static void PokegearPhone_LaunchApp_Impl(FieldSystem *fieldSystem, PokegearArgs *args); static void PokegearTownMap_LaunchApp_Impl(FieldSystem *fieldSystem, PokegearArgs *args); @@ -158,6 +158,7 @@ int BagView_SelectResult(BagView *bagView) { return result; } +// fixme: wrong name void PokemonSummary_LearnForget_LaunchApp(FieldSystem *fieldSystem, PokemonSummaryArgs *args) { FieldSystem_LaunchApplication(fieldSystem, &gOverlayTemplate_PokemonSummary, args); } @@ -191,7 +192,7 @@ PartyMenuArgs *PartyMenu_LaunchApp_Unk2(HeapID heapId, FieldSystem *fieldSystem) } PartyMenuArgs *PartyMenu_LaunchApp_Unk3(HeapID heapId, FieldSystem *fieldSystem) { - PartyMenuArgs *args = PartyMenu_CreateArgs(HEAP_ID_FIELD, fieldSystem, 0, PARTY_MENU_CONTEXT_19); + PartyMenuArgs *args = PartyMenu_CreateArgs(HEAP_ID_FIELD, fieldSystem, 0, PARTY_MENU_CONTEXT_INGAME_TRADE); FieldSystem_LaunchApplication(fieldSystem, &gOverlayTemplate_PartyMenu, args); return args; } @@ -215,7 +216,7 @@ u16 sub_0203E600(UnkStruct_0203E600 *a0) { return a0->unk14; } -static BOOL Task_OpenPartyMenuThenMoveSelect(TaskManager *taskman) { +static BOOL Task_OpenPartyMenuForUnionRoomBattleSelect(TaskManager *taskman) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); PartyMenuMoveSelectData *data = TaskManager_GetEnvironment(taskman); int *state = TaskManager_GetStatePtr(taskman); @@ -236,17 +237,17 @@ static BOOL Task_OpenPartyMenuThenMoveSelect(TaskManager *taskman) { *state = PMMS_FREE; break; default: - *state = PMMS_OPEN_FORGET_MOVE; + *state = PMMS_OPEN_SUMMARY; } } break; - case PMMS_OPEN_FORGET_MOVE: - data->pokemonSummary = PokemonSummary_CreateArgs(fieldSystem, data->unk0, 0); + case PMMS_OPEN_SUMMARY: + data->pokemonSummary = PokemonSummary_CreateArgs(fieldSystem, data->heapId, 0); data->pokemonSummary->partySlot = data->unk4->unk26; PokemonSummary_LearnForget_LaunchApp(fieldSystem, data->pokemonSummary); - *state = PMMS_WAIT_FORGET_MOVE; + *state = PMMS_WAIT_SUMMARY; break; - case PMMS_WAIT_FORGET_MOVE: + case PMMS_WAIT_SUMMARY: if (!FieldSystem_ApplicationIsRunning(fieldSystem)) { data->unk4->unk26 = data->pokemonSummary->partySlot; FreeToHeap(data->pokemonSummary); @@ -260,18 +261,18 @@ static BOOL Task_OpenPartyMenuThenMoveSelect(TaskManager *taskman) { return FALSE; } -PartyMenuArgs *SelectPartyMonAndLearnMove(TaskManager *taskman, HeapID heapId) { +PartyMenuArgs *TaskManager_LaunchPartyMenu_UnionRoomBattleSelect(TaskManager *taskman, HeapID heapId) { FieldSystem *fieldSystem = TaskManager_GetFieldSystem(taskman); UnkStruct_0203E6D4 *data = AllocFromHeap(heapId, sizeof(UnkStruct_0203E6D4)); data->heapId = heapId; - PartyMenuArgs *args = PartyMenu_CreateArgs(heapId, fieldSystem, 0, PARTY_MENU_CONTEXT_2); + PartyMenuArgs *args = PartyMenu_CreateArgs(heapId, fieldSystem, 0, PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT); args->minMonsToSelect = 2; args->maxMonsToSelect = 2; args->maxLevel = 30; args->unk_14 = NULL; data->partyMenu = args; - TaskManager_Call(taskman, Task_OpenPartyMenuThenMoveSelect, data); + TaskManager_Call(taskman, Task_OpenPartyMenuForUnionRoomBattleSelect, data); return args; } diff --git a/src/party_context_menu.c b/src/party_context_menu.c index 8ceed0855..1570a00ff 100644 --- a/src/party_context_menu.c +++ b/src/party_context_menu.c @@ -402,7 +402,7 @@ void PartyMenu_AddAllWindows(PartyMenuStruct *partyMenu) { AddWindow(partyMenu->bgConfig, &partyMenu->windows[PARTY_MENU_WINDOW_ID_37], &templates[45]); AddWindow(partyMenu->bgConfig, &partyMenu->windows[PARTY_MENU_WINDOW_ID_38], &templates[46]); AddWindow(partyMenu->bgConfig, &partyMenu->windows[PARTY_MENU_WINDOW_ID_39], &templates[47]); - if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { + if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { WindowTemplate template = sAdditionalWindowTemplates[0]; template.top = 22; AddWindow(partyMenu->bgConfig, &partyMenu->windows[PARTY_MENU_WINDOW_ID_31], &template); @@ -1090,7 +1090,7 @@ PartyMenuContextMenuCursor *PartyMenu_CreateContextMenuCursor(PartyMenuStruct *p sub_0207E358(partyMenu, &ret->menu, ret->menu.numItems, ret->prevSelection, ret->state); PartyMenu_SetBlendBrightness_ForYesNo(); Set2dSpriteVisibleFlag(partyMenu->sprites[PARTY_MENU_SPRITE_ID_9], FALSE); - if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { + if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { Set2dSpriteVisibleFlag(partyMenu->sprites[PARTY_MENU_SPRITE_ID_8], FALSE); } return ret; @@ -1104,7 +1104,7 @@ void PartyMenu_CloseContextMenu(PartyMenuStruct *partyMenu, PartyMenuContextMenu } else { Set2dSpriteVisibleFlag(partyMenu->sprites[PARTY_MENU_SPRITE_ID_9], TRUE); } - if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { + if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { Set2dSpriteVisibleFlag(partyMenu->sprites[PARTY_MENU_SPRITE_ID_8], TRUE); } } diff --git a/src/party_menu.c b/src/party_menu.c index 502198b57..6054c6301 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -125,7 +125,7 @@ static int PartyMenu_Subtask_PrintAskSwitchItems(PartyMenuStruct *partyMenu); static int PartyMenu_Subtask_SwitchItemsHandleYesNoInput(PartyMenuStruct *partyMenu); static int PartyMenu_SwitchItemsDeclined(PartyMenuStruct *partyMenu); static int sub_0207C908(PartyMenuStruct *partyMenu); -static int sub_0207CA30(PartyMenuStruct *partyMenu); +static int PartyMenu_HandleChooseMonForInGameTrade(PartyMenuStruct *partyMenu); const OVY_MGR_TEMPLATE gOverlayTemplate_PartyMenu = { PartyMenuApp_Init, @@ -258,7 +258,7 @@ static BOOL PartyMenuApp_Init(OVY_MANAGER *manager, int *pState) { PartyMenu_PrintMessageOnWindow32(partyMenu, msg_0300_00032, TRUE); } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_REPLACE_MOVE_TMHM || partyMenu->args->context == PARTY_MENU_CONTEXT_REPLACE_MOVE_LEVELUP || partyMenu->args->context == PARTY_MENU_CONTEXT_11 || partyMenu->args->context == PARTY_MENU_CONTEXT_12) { thunk_Sprite_SetPalIndex(partyMenu->sprites[PARTY_MENU_SPRITE_ID_CURSOR], 1); - } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17) { + } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17) { PartyMenu_PrintMessageOnWindow32(partyMenu, msg_0300_00035, TRUE); } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_ATTACH_CAPSULE) { PartyMenu_PrintMessageOnWindow32(partyMenu, msg_0300_00035, TRUE); @@ -479,8 +479,8 @@ static int PartyMenu_Subtask_MainNormal(PartyMenuStruct *partyMenu) { case PARTY_MENU_CONTEXT_GIVE_MAIL_FROM_MAILBOX: PartyMenu_HandleAttachMailFromMailbox(partyMenu); return PARTY_MENU_STATE_WAIT_TEXT_PRINTER; - case PARTY_MENU_CONTEXT_19: - return sub_0207CA30(partyMenu); + case PARTY_MENU_CONTEXT_INGAME_TRADE: + return PartyMenu_HandleChooseMonForInGameTrade(partyMenu); default: PartyMenu_SetTopScreenSelectionPanelVisibility(partyMenu, TRUE); return PARTY_MENU_STATE_HANDLE_CONTEXT_MENU_INPUT; @@ -949,7 +949,7 @@ PartyMenuStruct *sub_02079BD8(OVY_MANAGER *manager) { memset(ret, 0, sizeof(PartyMenuStruct)); ret->args = OverlayManager_GetArgs(manager); ret->bgConfig = BgConfig_Alloc(HEAP_ID_PARTY_MENU); - if (ret->args->context == PARTY_MENU_CONTEXT_2 && ret->args->unk_14 != NULL) { + if (ret->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT && ret->args->unk_14 != NULL) { ret->pokedex = sub_02074944(HEAP_ID_PARTY_MENU); } else { ret->pokedex = NULL; @@ -986,14 +986,14 @@ static void sub_02079D38(PartyMenuStruct *partyMenu) { u8 r4 = 3; if (partyMenu->args->unk_25 == 2) { partyMenu->unk_948 = _0210144C; - } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { + } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { partyMenu->unk_948 = _0210148C; } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_SPIN_TRADE) { partyMenu->unk_948 = _021014CC; } else { partyMenu->unk_948 = _0210140C; } - if (partyMenu->args->context != PARTY_MENU_CONTEXT_2 && partyMenu->args->context != PARTY_MENU_CONTEXT_17 && partyMenu->args->context != PARTY_MENU_CONTEXT_23 && partyMenu->args->context != PARTY_MENU_CONTEXT_BATTLE_HALL) { + if (partyMenu->args->context != PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT && partyMenu->args->context != PARTY_MENU_CONTEXT_17 && partyMenu->args->context != PARTY_MENU_CONTEXT_23 && partyMenu->args->context != PARTY_MENU_CONTEXT_BATTLE_HALL) { Set2dSpriteVisibleFlag(partyMenu->sprites[PARTY_MENU_SPRITE_ID_8], FALSE); Set2dSpriteAnimSeqNo(partyMenu->sprites[PARTY_MENU_SPRITE_ID_9], 0); s16 x, y; @@ -1138,7 +1138,7 @@ static void PartyMenu_DrawPanelsAndPush(PartyMenuStruct *partyMenu) { PartyMenu_DrawPanels_UseTMHM(partyMenu, r1); } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_SUPER_CONTEST) { PartyMenu_Setup_SuperContestEntry(partyMenu, r1); - } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { + } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { PartyMenu_DrawPanels_FrontierFacilityEntry(partyMenu, r1); } else { PartyMenu_DrawPanels_Default(partyMenu, r1); @@ -1358,7 +1358,7 @@ static BOOL PartyMenu_HandleDpadInput(PartyMenuStruct *partyMenu) { newSelection = PartyMenu_GetSelectionInDirection(partyMenu, &x, &y, direction); } } else if (newSelection == PARTY_MON_SELECTION_CONFIRM) { - if (partyMenu->args->context != PARTY_MENU_CONTEXT_2 && partyMenu->args->context != PARTY_MENU_CONTEXT_17 && partyMenu->args->context != PARTY_MENU_CONTEXT_23 && partyMenu->args->context != PARTY_MENU_CONTEXT_BATTLE_HALL && direction == DIR_NORTH) { + if (partyMenu->args->context != PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT && partyMenu->args->context != PARTY_MENU_CONTEXT_17 && partyMenu->args->context != PARTY_MENU_CONTEXT_23 && partyMenu->args->context != PARTY_MENU_CONTEXT_BATTLE_HALL && direction == DIR_NORTH) { newSelection = PartyMenu_GetNewSelectionFromTable(partyMenu, &x, &y, _021012CC[(partyMenu->unk_C66 & 1) + 2]); } else if (direction == DIR_SOUTH) { newSelection = PartyMenu_GetNewSelectionFromTable(partyMenu, &x, &y, _021012CC[partyMenu->unk_C66 & 1]); @@ -1448,7 +1448,7 @@ static int sub_0207AC70(PartyMenuStruct *partyMenu, BOOL a1) { sub_0207CB3C(partyMenu, a1); return 3; } - } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_3 || partyMenu->args->context == PARTY_MENU_CONTEXT_19) { + } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_3 || partyMenu->args->context == PARTY_MENU_CONTEXT_INGAME_TRADE) { PlaySE(SEQ_SE_DP_SELECT); return 0; } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_20 || partyMenu->args->context == PARTY_MENU_CONTEXT_GIVE_MAIL_FROM_MAILBOX) { @@ -1482,7 +1482,7 @@ static int sub_0207AC70(PartyMenuStruct *partyMenu, BOOL a1) { static int PartyMenu_GetTouchButtonInput(PartyMenuStruct *partyMenu) { int idx = 0; - if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { + if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { return TouchscreenHitbox_FindRectAtTouchNew(_02110104); } else { if (partyMenu->args->unk_25 == 2) { @@ -1577,7 +1577,7 @@ static void sub_0207AFC4(PartyMenuStruct *partyMenu) { case PARTY_MENU_CONTEXT_0: numItems = sub_0207B0B0(partyMenu, buf); break; - case PARTY_MENU_CONTEXT_2: + case PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT: case PARTY_MENU_CONTEXT_17: numItems = sub_0207B23C(partyMenu, buf); break; @@ -2150,7 +2150,7 @@ static BOOL PartyMenu_Subtask_HandleContextMenuInput(PartyMenuStruct *partyMenu, ClearFrameAndWindow2(&partyMenu->windows[PARTY_MENU_WINDOW_ID_33], TRUE); PartyMenu_DeleteContextMenuAndList(partyMenu); PartyMenu_DisableMainScreenBlend_AfterYesNo(); - if (partyMenu->args->context == PARTY_MENU_CONTEXT_2 || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { + if (partyMenu->args->context == PARTY_MENU_CONTEXT_UNION_ROOM_BATTLE_SELECT || partyMenu->args->context == PARTY_MENU_CONTEXT_17 || partyMenu->args->context == PARTY_MENU_CONTEXT_BATTLE_HALL || partyMenu->args->context == PARTY_MENU_CONTEXT_23) { PartyMenu_PrintMessageOnWindow32(partyMenu, msg_0300_00035, TRUE); } else if (partyMenu->args->context == PARTY_MENU_CONTEXT_SPIN_TRADE) { PartyMenu_PrintMessageOnWindow32(partyMenu, msg_0300_00184, TRUE); @@ -2654,15 +2654,15 @@ static int sub_0207C908(PartyMenuStruct *partyMenu) { return manipulateItemResult; } -static int sub_0207CA30(PartyMenuStruct *partyMenu) { +static int PartyMenu_HandleChooseMonForInGameTrade(PartyMenuStruct *partyMenu) { if (partyMenu->monsDrawState[partyMenu->partyMonIndex].capsule == 0) { partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_0; return PARTY_MENU_STATE_BEGIN_EXIT; } else { thunk_Sprite_SetPalIndex(partyMenu->sprites[PARTY_MENU_SPRITE_ID_CURSOR], 1); PartyMenu_PrintMessageOnWindow34(partyMenu, msg_0300_00179, TRUE); - partyMenu->yesCallback = sub_0207FAA8; - partyMenu->noCallback = sub_0207FAD4; + partyMenu->yesCallback = PartyMenu_ConfirmRemoveCapsuleYes; + partyMenu->noCallback = PartyMenu_ConfirmRemoveCapsuleNo; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_YES_NO_INIT; return PARTY_MENU_STATE_WAIT_TEXT_PRINTER; } diff --git a/src/party_menu_list_items.c b/src/party_menu_list_items.c index b7b715230..d324a38af 100644 --- a/src/party_menu_list_items.c +++ b/src/party_menu_list_items.c @@ -300,20 +300,20 @@ static void PartyMonContextMenuAction_Store(PartyMenuStruct *partyMenu, int *pSt *pState = PARTY_MENU_STATE_BEGIN_EXIT; } else { PartyMenu_PrintMessageOnWindow34(partyMenu, msg_0300_00179, TRUE); - partyMenu->yesCallback = sub_0207FAA8; - partyMenu->noCallback = sub_0207FAD4; + partyMenu->yesCallback = PartyMenu_ConfirmRemoveCapsuleYes; + partyMenu->noCallback = PartyMenu_ConfirmRemoveCapsuleNo; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_YES_NO_INIT; *pState = PARTY_MENU_STATE_WAIT_TEXT_PRINTER; } } -int sub_0207FAA8(PartyMenuStruct *partyMenu) { +int PartyMenu_ConfirmRemoveCapsuleYes(PartyMenuStruct *partyMenu) { Pokemon_RemoveCapsule(Party_GetMonByIndex(partyMenu->args->party, partyMenu->partyMonIndex)); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_0; return PARTY_MENU_STATE_BEGIN_EXIT; } -int sub_0207FAD4(PartyMenuStruct *partyMenu) { +int PartyMenu_ConfirmRemoveCapsuleNo(PartyMenuStruct *partyMenu) { G2_BlendNone(); ClearFrameAndWindow2(&partyMenu->windows[PARTY_MENU_WINDOW_ID_34], TRUE); PartyMenu_PrintMessageOnWindow32(partyMenu, msg_0300_00029, TRUE); diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index b2d38833a..e69dac473 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -1609,7 +1609,7 @@ BOOL ScrCmd_566(ScriptContext *ctx) { //todo: trade screen BOOL ScrCmd_350(ScriptContext *ctx) { //todo: union pokemon selection PartyMenuArgs **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); - *partyMenu = SelectPartyMonAndLearnMove(ctx->fieldSystem->taskman, HEAP_ID_32); + *partyMenu = TaskManager_LaunchPartyMenu_UnionRoomBattleSelect(ctx->fieldSystem->taskman, HEAP_ID_32); return TRUE; }