mirror of
https://github.com/pret/pokeplatinum.git
synced 2026-04-27 00:57:12 -05:00
Document party menu inputs and some party menu states
This commit is contained in:
parent
8ea427f09b
commit
bb80491f6a
|
|
@ -11,19 +11,28 @@
|
|||
#define PARTY_MENU_SELECTION_ELIGIBLE 1
|
||||
#define PARTY_MENU_SELECTION_ENTERED 2
|
||||
|
||||
enum PartyMenuInputs {
|
||||
PARTY_MENU_INPUT_CONFIRM,
|
||||
PARTY_MENU_INPUT_DIRECTION_PAD,
|
||||
PARTY_MENU_INPUT_TOUCH_SCREEN,
|
||||
PARTY_MENU_INPUT_CANCEL,
|
||||
PARTY_MENU_INPUT_4,
|
||||
PARTY_MENU_INPUT_NONE
|
||||
};
|
||||
|
||||
enum PartyMenuStates {
|
||||
PARTY_MENU_STATE_0,
|
||||
PARTY_MENU_STATE_1,
|
||||
PARTY_MENU_STATE_2,
|
||||
PARTY_MENU_STATE_INIT,
|
||||
PARTY_MENU_STATE_DEFAULT,
|
||||
PARTY_MENU_STATE_HANDLE_PARTY_MENU_ACTION,
|
||||
PARTY_MENU_STATE_3,
|
||||
PARTY_MENU_STATE_4,
|
||||
PARTY_MENU_STATE_USE_ITEM,
|
||||
PARTY_MENU_STATE_5,
|
||||
PARTY_MENU_STATE_6,
|
||||
PARTY_MENU_STATE_7,
|
||||
PARTY_MENU_STATE_8,
|
||||
PARTY_MENU_STATE_9,
|
||||
PARTY_MENU_STATE_10,
|
||||
PARTY_MENU_STATE_11,
|
||||
PARTY_MENU_STATE_USE_SACRED_ASH,
|
||||
PARTY_MENU_STATE_GIVE_ITEM,
|
||||
PARTY_MENU_STATE_SHOW_ITEM_SWAP_CONFIRMATION,
|
||||
PARTY_MENU_STATE_HELD_ITEM_SWAP,
|
||||
PARTY_MENU_STATE_CONFIRM_ITEM_UPDATE,
|
||||
PARTY_MENU_STATE_12,
|
||||
PARTY_MENU_STATE_13,
|
||||
PARTY_MENU_STATE_14,
|
||||
|
|
@ -33,16 +42,16 @@ enum PartyMenuStates {
|
|||
PARTY_MENU_STATE_18,
|
||||
PARTY_MENU_STATE_19,
|
||||
PARTY_MENU_STATE_20,
|
||||
PARTY_MENU_STATE_21,
|
||||
PARTY_MENU_STATE_TEACH_MOVE,
|
||||
PARTY_MENU_STATE_22,
|
||||
PARTY_MENU_STATE_23,
|
||||
PARTY_MENU_STATE_24,
|
||||
PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE,
|
||||
PARTY_MENU_STATE_25,
|
||||
PARTY_MENU_STATE_26,
|
||||
PARTY_MENU_STATE_27,
|
||||
PARTY_MENU_STATE_28,
|
||||
PARTY_MENU_STATE_29,
|
||||
PARTY_MENU_STATE_30,
|
||||
PARTY_MENU_STATE_HP_TRANSFER_FIELD_MOVE,
|
||||
PARTY_MENU_STATE_31,
|
||||
PARTY_MENU_STATE_32,
|
||||
PARTY_MENU_STATE_33
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ 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 PartyMenu_ResetCursor(PartyMenuApplication *application);
|
||||
void sub_02083BD4(PartyMenuApplication *application);
|
||||
BOOL sub_02083D1C(PartyMenuApplication *application);
|
||||
int sub_020845A8(PartyMenuApplication *application);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -222,7 +222,7 @@ int sub_02083658(PartyMenuApplication *application)
|
|||
Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1);
|
||||
PartyMenu_PrintShortMessage(application, PartyMenu_Text_ChooseAPokemon, TRUE);
|
||||
Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0);
|
||||
return PARTY_MENU_STATE_1;
|
||||
return PARTY_MENU_STATE_DEFAULT;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -298,8 +298,8 @@ static void PartyMenu_SelectMailTake(PartyMenuApplication *application, int *par
|
|||
|
||||
application->unk_B04.unk_00 = sub_0208384C;
|
||||
application->unk_B04.unk_04 = sub_020838C4;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
*partyMenuState = PARTY_MENU_STATE_24;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
*partyMenuState = PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
static int sub_0208384C(void *applicationPtr)
|
||||
|
|
@ -318,9 +318,9 @@ static int sub_0208384C(void *applicationPtr)
|
|||
PartyMenu_PrintLongMessage(application, PartyMenu_Text_MailboxIsFull, FALSE);
|
||||
}
|
||||
|
||||
application->unk_B0E = PARTY_MENU_STATE_20;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_20;
|
||||
|
||||
return 24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
static int sub_020838C4(void *applicationPtr)
|
||||
|
|
@ -331,9 +331,9 @@ static int sub_020838C4(void *applicationPtr)
|
|||
|
||||
application->unk_B04.unk_00 = sub_020838F4;
|
||||
application->unk_B04.unk_04 = sub_02083990;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
|
||||
return 24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
static int sub_020838F4(void *applicationPtr)
|
||||
|
|
@ -359,9 +359,9 @@ static int sub_020838F4(void *applicationPtr)
|
|||
PartyMenu_PrintLongMessage(application, PartyMenu_Text_BagIsFull, FALSE);
|
||||
}
|
||||
|
||||
application->unk_B0E = PARTY_MENU_STATE_20;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_20;
|
||||
|
||||
return 24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
static int sub_02083990(void *applicationPtr)
|
||||
|
|
@ -381,7 +381,7 @@ int sub_020839BC(PartyMenuApplication *application)
|
|||
Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1);
|
||||
PartyMenu_PrintShortMessage(application, PartyMenu_Text_ChooseAPokemon, TRUE);
|
||||
Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0);
|
||||
return PARTY_MENU_STATE_1;
|
||||
return PARTY_MENU_STATE_DEFAULT;
|
||||
}
|
||||
|
||||
return PARTY_MENU_STATE_20;
|
||||
|
|
@ -402,8 +402,8 @@ static void PartyMenu_SelectBallSeal(PartyMenuApplication *application, int *par
|
|||
|
||||
application->unk_B04.unk_00 = sub_02083A78;
|
||||
application->unk_B04.unk_04 = sub_02083AA4;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
*partyMenuState = PARTY_MENU_STATE_24;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
*partyMenuState = PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
int sub_02083A78(void *applicationPtr)
|
||||
|
|
@ -430,17 +430,17 @@ int sub_02083AA4(void *applicationPtr)
|
|||
|
||||
static void PartyMenu_SelectSwitch(PartyMenuApplication *application, int *partyMenuState)
|
||||
{
|
||||
s16 v0, v1;
|
||||
s16 x, y;
|
||||
|
||||
application->inSwitchMode = 1;
|
||||
application->switchTargetSlot = application->currPartySlot;
|
||||
application->inTargetSlotMode = 1;
|
||||
application->selectTargetSlot = application->currPartySlot;
|
||||
|
||||
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_GetPositionXY(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], &x, &y);
|
||||
Sprite_SetPositionXY(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], x, y);
|
||||
Sprite_SetAnim(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], PartyMenu_GetMemberPanelAnim(application->partyMenu->type, application->selectTargetSlot) + 2);
|
||||
Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], TRUE);
|
||||
PartyMenu_UpdateSlotPalette(application, application->switchTargetSlot);
|
||||
PartyMenu_UpdateSlotPalette(application, application->selectTargetSlot);
|
||||
Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_MEDIUM_MESSAGE], 1);
|
||||
PartyMenu_ClearContextWindow(application);
|
||||
PartyMenu_PrintShortMessage(application, PartyMenu_MoveToWhere, TRUE);
|
||||
|
|
@ -448,16 +448,16 @@ static void PartyMenu_SelectSwitch(PartyMenuApplication *application, int *party
|
|||
*partyMenuState = PARTY_MENU_STATE_28;
|
||||
}
|
||||
|
||||
void sub_02083B88(PartyMenuApplication *application)
|
||||
void PartyMenu_ResetCursor(PartyMenuApplication *application)
|
||||
{
|
||||
application->inSwitchMode = 0;
|
||||
application->inTargetSlotMode = FALSE;
|
||||
Sprite_SetDrawFlag(application->sprites[PARTY_MENU_SPRITE_CURSOR_SWITCH], FALSE);
|
||||
|
||||
if (application->currPartySlot < 6) {
|
||||
if (application->currPartySlot < MAX_PARTY_SIZE) {
|
||||
PartyMenu_UpdateSlotPalette(application, application->currPartySlot);
|
||||
}
|
||||
|
||||
PartyMenu_UpdateSlotPalette(application, application->switchTargetSlot);
|
||||
PartyMenu_UpdateSlotPalette(application, application->selectTargetSlot);
|
||||
PartyMenu_PrintShortMessage(application, PartyMenu_Text_ChooseAPokemon, TRUE);
|
||||
}
|
||||
|
||||
|
|
@ -730,7 +730,7 @@ static void sub_020844B0(PartyMenuApplication *application, int *partyMenuState)
|
|||
sub_0207FD68(application, 6);
|
||||
}
|
||||
|
||||
*partyMenuState = PARTY_MENU_STATE_1;
|
||||
*partyMenuState = PARTY_MENU_STATE_DEFAULT;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -752,8 +752,8 @@ static void sub_020844B0(PartyMenuApplication *application, int *partyMenuState)
|
|||
break;
|
||||
}
|
||||
|
||||
application->unk_B0E = PARTY_MENU_STATE_23;
|
||||
*partyMenuState = PARTY_MENU_STATE_24;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_23;
|
||||
*partyMenuState = PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
int sub_020845A8(PartyMenuApplication *application)
|
||||
|
|
@ -762,7 +762,7 @@ int sub_020845A8(PartyMenuApplication *application)
|
|||
Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1);
|
||||
PartyMenu_PrintShortMessage(application, Partymenu_Text_ChooseMonAndConfirm, TRUE);
|
||||
Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0);
|
||||
return PARTY_MENU_STATE_1;
|
||||
return PARTY_MENU_STATE_DEFAULT;
|
||||
}
|
||||
|
||||
return PARTY_MENU_STATE_23;
|
||||
|
|
@ -797,7 +797,7 @@ static void sub_020845E8(PartyMenuApplication *application, int *partyMenuState)
|
|||
PartyMenu_PrintShortMessage(application, PartyMenu_Text_ChooseAPokemon, TRUE);
|
||||
Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0);
|
||||
|
||||
*partyMenuState = PARTY_MENU_STATE_1;
|
||||
*partyMenuState = PARTY_MENU_STATE_DEFAULT;
|
||||
}
|
||||
|
||||
static void sub_020846CC(PartyMenuApplication *application, int *partyMenuState)
|
||||
|
|
@ -853,9 +853,9 @@ int sub_02084780(PartyMenuApplication *application)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
|
||||
return PARTY_MENU_STATE_24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
static void PartyMenu_SelectFieldMove(PartyMenuApplication *windowLayout, int *partyMenuState)
|
||||
|
|
@ -896,8 +896,8 @@ static void PartyMenu_SelectFieldMove(PartyMenuApplication *windowLayout, int *p
|
|||
PartyMenu_ClearContextWindow(windowLayout);
|
||||
PartyMenu_PrintLongMessage(windowLayout, msgID, TRUE);
|
||||
|
||||
windowLayout->unk_B0E = PARTY_MENU_STATE_3;
|
||||
*partyMenuState = PARTY_MENU_STATE_24;
|
||||
windowLayout->stateAfterMessage = PARTY_MENU_STATE_3;
|
||||
*partyMenuState = PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
static void PartyMenu_SelectCut(PartyMenuApplication *application, int *partyMenuState)
|
||||
|
|
@ -982,7 +982,7 @@ static void sub_020849E0(PartyMenuApplication *application, int *partyMenuState)
|
|||
{
|
||||
*partyMenuState = sub_02084A18(application);
|
||||
|
||||
if (*partyMenuState == PARTY_MENU_STATE_30) {
|
||||
if (*partyMenuState == PARTY_MENU_STATE_HP_TRANSFER_FIELD_MOVE) {
|
||||
application->monStats[3] = 24 - 11;
|
||||
}
|
||||
}
|
||||
|
|
@ -991,7 +991,7 @@ static void sub_020849FC(PartyMenuApplication *application, int *partyMenuState)
|
|||
{
|
||||
*partyMenuState = sub_02084A18(application);
|
||||
|
||||
if (*partyMenuState == PARTY_MENU_STATE_30) {
|
||||
if (*partyMenuState == PARTY_MENU_STATE_HP_TRANSFER_FIELD_MOVE) {
|
||||
application->monStats[3] = 25 - 11;
|
||||
}
|
||||
}
|
||||
|
|
@ -1006,7 +1006,7 @@ static int sub_02084A18(PartyMenuApplication *application)
|
|||
if (application->partyMembers[application->currPartySlot].curHP <= application->monStats[0]) {
|
||||
PartyMenu_PrintLongMessage(application, PartyMenu_Text_NotEnoughHP, TRUE);
|
||||
application->unk_B0E = PARTY_MENU_STATE_3;
|
||||
return PARTY_MENU_STATE_24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
} else {
|
||||
s16 v0, v1;
|
||||
|
||||
|
|
@ -1022,17 +1022,17 @@ static int sub_02084A18(PartyMenuApplication *application)
|
|||
PartyMenu_PrintShortMessage(application, PartyMenu_Text_UseOnWhichPokemon, TRUE);
|
||||
|
||||
application->monStats[1] = 0;
|
||||
return PARTY_MENU_STATE_30;
|
||||
return PARTY_MENU_STATE_HP_TRANSFER_FIELD_MOVE;
|
||||
}
|
||||
}
|
||||
|
||||
int sub_02084B34(PartyMenuApplication *application)
|
||||
{
|
||||
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
|
||||
if (JOY_NEW(PAD_BUTTON_A | PAD_BUTTON_B)) {
|
||||
Window_EraseMessageBox(&application->windows[PARTY_MENU_WIN_LONG_MESSAGE], 1);
|
||||
PartyMenu_PrintShortMessage(application, PartyMenu_Text_ChooseAPokemon, TRUE);
|
||||
Sprite_SetExplicitPalette2(application->sprites[PARTY_MENU_SPRITE_CURSOR_NORMAL], 0);
|
||||
return PARTY_MENU_STATE_1;
|
||||
return PARTY_MENU_STATE_DEFAULT;
|
||||
}
|
||||
|
||||
return PARTY_MENU_STATE_3;
|
||||
|
|
|
|||
|
|
@ -657,7 +657,7 @@ int sub_02085804(PartyMenuApplication *application)
|
|||
break;
|
||||
}
|
||||
|
||||
return PARTY_MENU_STATE_7;
|
||||
return PARTY_MENU_STATE_USE_SACRED_ASH;
|
||||
}
|
||||
|
||||
static int sub_02085A70(void *applicationPtr)
|
||||
|
|
@ -765,7 +765,7 @@ static int sub_02085C50(void *applicationPtr)
|
|||
|
||||
application->unk_B04.unk_00 = sub_02085FB4;
|
||||
application->unk_B04.unk_04 = sub_02086008;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
|
||||
return 24;
|
||||
case 0xfffe:
|
||||
|
|
@ -849,10 +849,10 @@ int sub_02085EF4(PartyMenuApplication *application)
|
|||
String_Free(string);
|
||||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
|
||||
application->unk_B0E = PARTY_MENU_STATE_5;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_5;
|
||||
application->unk_B13 = 5;
|
||||
|
||||
return PARTY_MENU_STATE_24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
static int sub_02085FB4(void *applicationPtr)
|
||||
|
|
@ -865,7 +865,7 @@ static int sub_02085FB4(void *applicationPtr)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_OVERWRITE_MOVE_LEVEL_UP;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
|
||||
return 24;
|
||||
}
|
||||
|
|
@ -881,7 +881,7 @@ static int sub_02086008(void *applicationPtr)
|
|||
|
||||
application->unk_B04.unk_00 = sub_02086060;
|
||||
application->unk_B04.unk_04 = sub_020860AC;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
|
||||
return 24;
|
||||
}
|
||||
|
|
@ -895,7 +895,7 @@ static int sub_02086060(void *applicationPtr)
|
|||
String_Free(string);
|
||||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE);
|
||||
|
||||
application->unk_B0E = PARTY_MENU_STATE_5;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_5;
|
||||
application->unk_B13 = 4;
|
||||
|
||||
return 24;
|
||||
|
|
@ -912,7 +912,7 @@ static int sub_020860AC(void *applicationPtr)
|
|||
|
||||
application->unk_B04.unk_00 = sub_02085FB4;
|
||||
application->unk_B04.unk_04 = sub_02086008;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
|
||||
return 24;
|
||||
}
|
||||
|
|
@ -967,7 +967,7 @@ int sub_0208615C(PartyMenuApplication *application)
|
|||
String_Free(string);
|
||||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
break;
|
||||
case 0xfd:
|
||||
string = MessageLoader_GetNewString(application->messageLoader, PartyMenu_Text_MonAlreadyKnowsMove);
|
||||
|
|
@ -975,7 +975,7 @@ int sub_0208615C(PartyMenuApplication *application)
|
|||
String_Free(string);
|
||||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
break;
|
||||
case 0xfe:
|
||||
string = MessageLoader_GetNewString(application->messageLoader, PartyMenu_Text_MonWantsToLearnMove);
|
||||
|
|
@ -985,7 +985,7 @@ int sub_0208615C(PartyMenuApplication *application)
|
|||
|
||||
application->unk_B04.unk_00 = sub_02086438;
|
||||
application->unk_B04.unk_04 = sub_0208648C;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
break;
|
||||
case 0xff:
|
||||
string = MessageLoader_GetNewString(application->messageLoader, PartyMenu_Text_MonAndMoveAreNotCompatible);
|
||||
|
|
@ -994,7 +994,7 @@ int sub_0208615C(PartyMenuApplication *application)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1020,8 +1020,8 @@ int sub_020862F8(PartyMenuApplication *application)
|
|||
String_Free(string);
|
||||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
|
||||
application->unk_B0E = PARTY_MENU_STATE_22;
|
||||
return PARTY_MENU_STATE_24;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_22;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
int sub_020863A0(PartyMenuApplication *application)
|
||||
|
|
@ -1040,9 +1040,9 @@ int sub_020863A0(PartyMenuApplication *application)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
|
||||
return PARTY_MENU_STATE_24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
return PARTY_MENU_STATE_22;
|
||||
|
|
@ -1058,7 +1058,7 @@ static int sub_02086438(void *applicationPtr)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_OVERWRITE_MOVE_TM_HM;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
|
||||
return 24;
|
||||
}
|
||||
|
|
@ -1074,7 +1074,7 @@ static int sub_0208648C(void *applicationPtr)
|
|||
|
||||
application->unk_B04.unk_00 = sub_020864E4;
|
||||
application->unk_B04.unk_04 = sub_02086538;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
|
||||
return 24;
|
||||
}
|
||||
|
|
@ -1089,7 +1089,7 @@ static int sub_020864E4(void *applicationPtr)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, FALSE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
|
||||
return 24;
|
||||
}
|
||||
|
|
@ -1105,7 +1105,7 @@ static int sub_02086538(void *applicationPtr)
|
|||
|
||||
application->unk_B04.unk_00 = sub_02086438;
|
||||
application->unk_B04.unk_04 = sub_0208648C;
|
||||
application->unk_B0E = PARTY_MENU_STATE_26;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_26;
|
||||
|
||||
return 24;
|
||||
}
|
||||
|
|
@ -1202,7 +1202,7 @@ int sub_02086774(PartyMenuApplication *application)
|
|||
Menu_Free(application->contextMenu, NULL);
|
||||
StringList_Free(application->contextMenuChoices);
|
||||
PartyMenu_PrintShortMessage(application, Partymenu_Text_UseOnWhichMon, TRUE);
|
||||
return PARTY_MENU_STATE_4;
|
||||
return PARTY_MENU_STATE_USE_ITEM;
|
||||
default:
|
||||
Window_EraseMessageBox(&application->windows[33], 1);
|
||||
Window_EraseStandardFrame(&application->windows[36], 1);
|
||||
|
|
@ -1221,9 +1221,9 @@ int sub_02086774(PartyMenuApplication *application)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
|
||||
return PARTY_MENU_STATE_24;
|
||||
return PARTY_MENU_STATE_PRINT_MESSAGE_THEN_NEXT_STATE;
|
||||
}
|
||||
|
||||
return PARTY_MENU_STATE_6;
|
||||
|
|
@ -1244,7 +1244,7 @@ void sub_020868B0(PartyMenuApplication *application)
|
|||
PartyMenu_PrintLongMessage(application, PRINT_MESSAGE_PRELOADED, TRUE);
|
||||
|
||||
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_DONE;
|
||||
application->unk_B0E = PARTY_MENU_STATE_25;
|
||||
application->stateAfterMessage = PARTY_MENU_STATE_25;
|
||||
}
|
||||
|
||||
static u16 GetCurrentMapLabel(PartyMenuApplication *application)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user