Skip to content

Commit

Permalink
documentation, 5
Browse files Browse the repository at this point in the history
  • Loading branch information
@PikalaxALT
PikalaxALT committed Jul 6, 2024
1 parent eb42b30 commit 7ea7ffb
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 44 deletions.
2 changes: 1 addition & 1 deletion asm/include/launch_application.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/launch_application.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions include/launch_application_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -149,7 +149,7 @@ typedef struct UnkStruct_0203E644 {
} UnkStruct_0203E644;

typedef struct PartyMenuMoveSelectData {
HeapID unk0;
HeapID heapId;
UnkStruct_0203E644 *unk4;
PokemonSummaryArgs *pokemonSummary;
} PartyMenuMoveSelectData;
Expand Down
4 changes: 2 additions & 2 deletions include/party_menu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions include/party_menu_list_items.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
23 changes: 12 additions & 11 deletions src/launch_application.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions src/party_context_menu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
}
Expand Down
32 changes: 16 additions & 16 deletions src/party_menu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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]);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down
Loading

0 comments on commit 7ea7ffb

Please sign in to comment.