Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions include/applications/party_menu/defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,33 @@ enum PartyMenuType {
PARTY_MENU_TYPE_MULTI_BATTLE,
};

enum PartyMenuExitCodes {
PARTY_MENU_EXIT_CODE_DONE = 0,
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)

enum PartyMenuWindow {
Expand Down
28 changes: 14 additions & 14 deletions include/applications/party_menu/unk_02083370.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions include/start_menu.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *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 sub_0203C558(FieldTask *param0);
BOOL StartMenu_ExitMail(FieldTask *taskMan);
BOOL sub_0203C710(FieldTask *param0);
BOOL sub_0203C750(FieldTask *param0);
BOOL sub_0203C784(FieldTask *param0);
Expand Down
30 changes: 15 additions & 15 deletions src/applications/party_menu/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,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);
Expand All @@ -527,11 +527,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);
Expand All @@ -550,7 +550,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;
}

Expand All @@ -565,7 +565,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;
}

Expand Down Expand Up @@ -650,13 +650,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_GetString(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;
}

Expand Down Expand Up @@ -2222,7 +2222,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;
}
Expand Down Expand Up @@ -2384,7 +2384,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);
Expand Down Expand Up @@ -2655,7 +2655,7 @@ static int ApplyItemEffectOnPokemon(PartyMenuApplication *app)
Pokemon *mon = Party_GetPokemonBySlotIndex(app->partyMenu->party, app->currPartySlot);

app->partyMenu->evoTargetSpecies = Pokemon_GetEvolutionTargetSpecies(NULL, mon, EVO_CLASS_BY_ITEM, app->partyMenu->usedItemID, &app->partyMenu->evoType);
app->partyMenu->menuSelectionResult = 8;
app->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_EVOLVE_BY_ITEM;
Heap_Free(itemData);
return 32;
}
Expand Down Expand Up @@ -2719,7 +2719,7 @@ static int ProcessItemApplication(PartyMenuApplication *application)
switch (CheckItemUsageValidity(application)) {
case 0:
if (Item_IsMail(application->partyMenu->usedItemID) == TRUE) {
application->partyMenu->menuSelectionResult = 6;
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_MAIL;
return 32;
}

Expand Down Expand Up @@ -2854,7 +2854,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, mon, v4, v5);
application->partyMenu->menuSelectionResult = 6;
application->partyMenu->menuSelectionResult = PARTY_MENU_EXIT_CODE_MAIL;
return 32;
}

Expand Down Expand Up @@ -2885,13 +2885,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;
}

Expand Down Expand Up @@ -2940,7 +2940,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;
}

Expand Down
Loading