From d3d725cc8398f306eb489dd0e6aa16b7e7564f39 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 11 Oct 2018 21:23:39 -0400 Subject: decompiled up to sub_81B0948 --- include/battle_main.h | 16 ++++++++++++++++ include/graphics.h | 5 +++++ 2 files changed, 21 insertions(+) (limited to 'include') diff --git a/include/battle_main.h b/include/battle_main.h index 5a61b5ef0..18bdde2f1 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -7,6 +7,20 @@ struct TrainerMoney u8 value; }; +struct UnknownPokemonStruct4 +{ + /*0x00*/ u16 species; + /*0x02*/ u16 heldItem; + /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x0F*/ u8 level; + /*0x10*/ u16 hp; + /*0x12*/ u16 maxhp; + /*0x14*/ u32 status; + /*0x18*/ u32 personality; + /*0x1C*/ u8 gender; + /*0x1D*/ u8 language; +}; + #define TYPE_NAME_LENGTH 6 #define ABILITY_NAME_LENGTH 12 @@ -70,6 +84,8 @@ void RunBattleScriptCommands_PopCallbacksStack(void); void RunBattleScriptCommands(void); bool8 TryRunFromBattle(u8 battlerId); +extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3]; + extern const u8 gTypeEffectiveness[336]; extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1]; extern const struct TrainerMoney gTrainerMoneyTable[]; diff --git a/include/graphics.h b/include/graphics.h index 4cbee1c34..a7bbc5b68 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3914,6 +3914,11 @@ extern const u16 gIntro2BrendanNoTurnPal[]; extern const u16 gIntro2FlygonPal[]; extern const u8 gIntro2FlygonGfx[]; +// party menu graphics +extern const u8 gPartyMenuMisc_Gfx[]; +extern const u16 gPartyMenuMisc_Tilemap[]; +extern const u8 gPartyMenuMisc_Pal[]; + // berry pics extern const u8 gBerryPic_Cheri[]; extern const u8 gBerryPalette_Cheri[]; -- cgit v1.2.3 From 65a0c48eec7d2184478841d232d1fb3c3350fa37 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Oct 2018 20:03:02 -0400 Subject: decompiled some more of the file --- include/contest.h | 1 + include/fldeff_softboiled.h | 6 ++++++ include/party_menu.h | 31 ++++++++++++++++++------------- 3 files changed, 25 insertions(+), 13 deletions(-) create mode 100755 include/fldeff_softboiled.h (limited to 'include') diff --git a/include/contest.h b/include/contest.h index d62d33ab7..f15a7310e 100644 --- a/include/contest.h +++ b/include/contest.h @@ -427,5 +427,6 @@ bool8 Contest_IsMonsTurnDisabled(u8 a); bool8 sub_80DE1E8(u8 a); void SetStartledString(u8 a, u8 b); s8 Contest_GetMoveExcitement(u16); +u8 sub_80DAE0C(struct Pokemon *); #endif //GUARD_CONTEST_H diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h new file mode 100755 index 000000000..8579c6cfe --- /dev/null +++ b/include/fldeff_softboiled.h @@ -0,0 +1,6 @@ +#ifndef GUARD_FLDEFF_SOFTBOILED_H +#define GUARD_FLDEFF_SOFTBOILED_H + +void sub_81615A8(u8 taskId); + +#endif // GUARD_FLDEFF_SOFTBOILED_H diff --git a/include/party_menu.h b/include/party_menu.h index b93b78544..a0a8bdbe6 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -10,7 +10,8 @@ enum AILMENT_PRZ, AILMENT_SLP, AILMENT_FRZ, - AILMENT_BRN + AILMENT_BRN, + AILMENT_FNT = 7 }; enum @@ -23,13 +24,17 @@ enum PARTY_GIVE_ITEM, }; -struct Struct203CEC8 -{ - u8 filler[0x9]; +struct Struct203CEC8 { + MainCallback unk0; + TaskFunc unk4; + u8 unk8_0:4; + u8 unk8_1:2; + u8 unk8_2:2; s8 unk9; s8 unkA; u8 unkB; - u8 filler2[0x2]; + u8 unkD; + u8 unkE; }; extern struct Struct203CEC8 gUnknown_0203CEC8; @@ -47,7 +52,7 @@ void sub_81B7F60(void); void sub_81B0FCC(u8 partyIdx, u8 a); void sub_81B1370(u8 taskId); -void display_pokemon_menu_message(u8 windowId); +void display_pokemon_menu_message(u32 windowId); void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); void sub_81B1B5C(void *a, u8 b); u8 sub_81B1BD4(); @@ -62,14 +67,14 @@ void sub_81B617C(void); u8 sub_81B6D14(u16 a); bool8 hm_add_c3_without_phase_2(void); -extern void dp05_ether(u8, u16, TaskFunc); -extern void dp05_pp_up(u8, u16, TaskFunc); -extern void dp05_rare_candy(u8, u16, TaskFunc); +extern void dp05_ether(u8, TaskFunc); +extern void dp05_pp_up(u8, TaskFunc); +extern void dp05_rare_candy(u8, TaskFunc); -extern void sub_81B67C8(u8, u16, TaskFunc); -extern void sub_81B79E8(u8, u16, TaskFunc); -extern void sub_81B6DC4(u8, u16, TaskFunc); -extern void sub_81B7C74(u8, u16, TaskFunc); +extern void sub_81B67C8(u8, TaskFunc); +extern void sub_81B79E8(u8, TaskFunc); +extern void sub_81B6DC4(u8, TaskFunc); +extern void sub_81B7C74(u8, TaskFunc); extern u16 ItemIdToBattleMoveId(u16); #endif // GUARD_PARTY_MENU_H -- cgit v1.2.3 From dded980cde81b1b71a636d8c2b7c15668e0a7b35 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Oct 2018 23:36:18 -0400 Subject: fix building --- include/party_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/party_menu.h b/include/party_menu.h index 0103099e4..bf0db514b 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,6 +1,7 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H +#include "main.h" #include "task.h" enum -- cgit v1.2.3 From ba3247d5cd27070c51e28437e8880dec72d973b5 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sat, 20 Oct 2018 20:25:28 -0400 Subject: decompiled more, stuck on sub_81B1760 --- include/party_menu.h | 2 +- include/strings.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/party_menu.h b/include/party_menu.h index bf0db514b..f2615dac5 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -55,7 +55,7 @@ void sub_81B0FCC(u8 partyIdx, u8 a); void sub_81B1370(u8 taskId); void display_pokemon_menu_message(u32 windowId); void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); -void sub_81B1B5C(void *a, u8 b); +u8 sub_81B1B5C(const u8 *a, u8 b); u8 sub_81B1BD4(void); void sub_81B8448(void); void sub_81B8518(u8 unused); diff --git a/include/strings.h b/include/strings.h index 4ea33635b..31b8f399d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -369,6 +369,7 @@ extern const u8 gText_ThreeDashes[]; // party menu text extern const u8 gText_PkmnHPRestoredByVar2[]; extern const u8 gText_CantBeUsedOnPkmn[]; +extern const u8 gText_CancelParticipation[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From 18124740a4d75ae95948f95ca6f63c320e51501c Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 6 Dec 2018 23:14:33 -0500 Subject: pushing so I can merge --- include/party_menu.h | 7 ++++--- include/rom_8011DC0.h | 1 + include/strings.h | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/party_menu.h b/include/party_menu.h index f2615dac5..30a86e162 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -12,7 +12,8 @@ enum AILMENT_SLP, AILMENT_FRZ, AILMENT_BRN, - AILMENT_FNT = 7 + AILMENT_PKRS, + AILMENT_FNT }; enum @@ -35,12 +36,12 @@ struct Struct203CEC8 { s8 unkA; u8 unkB; u8 unkD; - u8 unkE; + s16 unkE; }; extern struct Struct203CEC8 gUnknown_0203CEC8; -extern const u16 gUnknown_0861500C[]; +extern const u16 gUnknown_0861500C[]; // tutor table bool8 pokemon_has_move(struct Pokemon *, u16); void sub_81B58A8(void); diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index b6ca0e248..1aa663bc7 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -11,5 +11,6 @@ void sub_8018438(void); u16 mevent_081445C0(u8); void sub_801B990(u32, u32); u8 sub_8013F78(void); +bool32 sub_802C908(u16); #endif //GUARD_rom_8011DC0_H diff --git a/include/strings.h b/include/strings.h index 31b8f399d..d8b1f4f7c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -370,6 +370,12 @@ extern const u8 gText_ThreeDashes[]; extern const u8 gText_PkmnHPRestoredByVar2[]; extern const u8 gText_CantBeUsedOnPkmn[]; extern const u8 gText_CancelParticipation[]; +extern const u8 gText_PkmnWasGivenItem[]; +extern const u8 gText_RecievedItemFromPkmn[]; +extern const u8 gText_SwitchPkmnItem[]; +extern const u8 gText_SwitchedPkmnItem[]; +extern const u8 gText_BagFullCouldNotRemoveItem[]; +extern const u8 gText_PkmnCantParticipate[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From a6db7b2419e0130a7f9686edd998764dc205d449 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Mon, 10 Dec 2018 02:38:23 -0500 Subject: decompiled up to brm_cancel_1 --- include/menu.h | 3 +++ include/strings.h | 1 + 2 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index eb525efe9..60be8361f 100644 --- a/include/menu.h +++ b/include/menu.h @@ -90,5 +90,8 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo void sub_8197AE8(bool8 copyToVram); void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs); s8 Menu_ProcessInputGridLayout(void); +u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted); +s8 Menu_ProcessInputNoWrapAround_other(void); +void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); #endif // GUARD_MENU_H diff --git a/include/strings.h b/include/strings.h index 22ff75bc5..0ec3526ea 100644 --- a/include/strings.h +++ b/include/strings.h @@ -406,6 +406,7 @@ extern const u8 gText_SwitchPkmnItem[]; extern const u8 gText_SwitchedPkmnItem[]; extern const u8 gText_BagFullCouldNotRemoveItem[]; extern const u8 gText_PkmnCantParticipate[]; +extern const u8 gText_PkmnNotHolding[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From 2265d49ac2e8868e0b3362f8e7a4d22355eed202 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 12 Dec 2018 22:55:39 -0500 Subject: decompiled up to sub_81B5A8C --- include/easy_chat.h | 3 +++ include/fldeff_softboiled.h | 1 + include/item_menu.h | 1 + include/link_rfu.h | 1 + include/pokemon_icon.h | 2 ++ include/region_map.h | 1 + include/rom_8011DC0.h | 4 ++++ include/strings.h | 16 ++++++++++++++++ include/trade.h | 5 +++++ 9 files changed, 34 insertions(+) (limited to 'include') diff --git a/include/easy_chat.h b/include/easy_chat.h index 541fa6c1b..23fd9ed83 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -1,6 +1,8 @@ #ifndef GUARD_EASYCHAT_H #define GUARD_EASYCHAT_H +#include "main.h" + void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); @@ -12,5 +14,6 @@ u16 sub_811EE38(u16 group); u16 sub_811F01C(void); bool16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); +void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); #endif // GUARD_EASYCHAT_H diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h index 8579c6cfe..abb3c7913 100755 --- a/include/fldeff_softboiled.h +++ b/include/fldeff_softboiled.h @@ -2,5 +2,6 @@ #define GUARD_FLDEFF_SOFTBOILED_H void sub_81615A8(u8 taskId); +void sub_8161560(u8 taskId); #endif // GUARD_FLDEFF_SOFTBOILED_H diff --git a/include/item_menu.h b/include/item_menu.h index 649eb934c..6214c69fc 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -60,5 +60,6 @@ void CB2_BagMenuFromStartMenu(void); u8 sub_81ABB2C(u8 pocketId); bool8 UseRegisteredKeyItemOnField(void); void CB2_GoToSellMenu(void); +void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()); #endif //GUARD_item_menu_H diff --git a/include/link_rfu.h b/include/link_rfu.h index 426565e56..e394e2611 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -2,6 +2,7 @@ #define GUARD_LINK_RFU_H #include "librfu.h" +#include "link.h" // Exported type declarations diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index f1c8a3e61..17c7d5573 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -16,5 +16,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u u8 UpdateMonIconFrame(struct Sprite *sprite); void LoadMonIconPalette(u16 species); void sub_80D328C(struct Sprite *sprite); +void sub_80D3014(struct Sprite *sprite); +void sub_80D32C8(struct Sprite *sprite, u8 animNum); #endif // GUARD_POKEMON_ICON_H diff --git a/include/region_map.h b/include/region_map.h index 0c82232cf..ed1c1a201 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -107,6 +107,7 @@ u8 *sub_8124610(u8 *dest, u16 mapSecId); u16 CorrectSpecialMapSecId(u16 mapSecId); void sub_8122D88(struct RegionMap *regionMap); void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y); +void MCB2_FlyMap(void); extern const struct RegionMapLocation gRegionMapEntries[]; diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h index 1aa663bc7..c1bdbdf34 100644 --- a/include/rom_8011DC0.h +++ b/include/rom_8011DC0.h @@ -5,6 +5,10 @@ // Exported RAM declarations +extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; +extern u16 gUnknown_02022C3C; +extern u8 gUnknown_02022C3E; + // Exported ROM declarations void sub_8018438(void); diff --git a/include/strings.h b/include/strings.h index 0ec3526ea..f46554cc5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -407,6 +407,22 @@ extern const u8 gText_SwitchedPkmnItem[]; extern const u8 gText_BagFullCouldNotRemoveItem[]; extern const u8 gText_PkmnCantParticipate[]; extern const u8 gText_PkmnNotHolding[]; +extern const u8 gText_ThrowAwayItem[]; +extern const u8 gText_ItemThrownAway[]; +extern const u8 gText_SendMailToPC[]; +extern const u8 gText_MailSentToPC[]; +extern const u8 gText_PCMailboxFull[]; +extern const u8 gText_MailMessageWillBeLost[]; +extern const u8 gText_MailTakenFromPkmn[]; +extern const u8 gText_NoMoreThanVar1Pkmn[]; +extern const u8 gText_PkmnCantBeTradedNow[]; +extern const u8 gText_EggCantBeTradedNow[]; +extern const u8 gText_OnlyPkmnForBattle[]; +extern const u8 gJPText_PutVar1IntoSpinner[]; +extern const u8 gText_PauseUntilPress[]; +extern const u8 gText_CantUseUntilNewBadge[]; +extern const u8 gText_ReturnToHealingSpot[]; +extern const u8 gText_EscapeFromHere[]; //pokedex text extern const u8 gText_CryOf[]; diff --git a/include/trade.h b/include/trade.h index af4da0015..e3c18bffd 100644 --- a/include/trade.h +++ b/include/trade.h @@ -1,6 +1,8 @@ #ifndef GUARD_TRADE_H #define GUARD_TRADE_H +#include "link_rfu.h" + // Exported type declarations // Exported RAM declarations @@ -10,5 +12,8 @@ s32 sub_807A728(void); void sub_80773AC(void); void sub_807AE50(void); +int sub_807A8D0(u32 /* probably wrong */, u16, u16, u8); +int sub_807A7E0(u32 /* probably wrong */, u32 /* probably wrong */, u16, u16, u16, u16, u8); +int sub_807A918(struct Pokemon*, u16); #endif //GUARD_TRADE_H -- cgit v1.2.3 From 71a7a8a0759373a8dafcccee82fa2d37cb285b85 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Mon, 17 Dec 2018 02:39:17 -0500 Subject: decompiled up to sub_81B8A7C --- include/party_menu.h | 3 ++- include/player_pc.h | 1 + include/pokemon_summary_screen.h | 1 + include/pokenav.h | 2 ++ include/strings.h | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/party_menu.h b/include/party_menu.h index 147a53304..8b5423bb7 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -35,8 +35,9 @@ struct Struct203CEC8 { s8 unk9; s8 unkA; u8 unkB; - u8 unkD; + u16 unkC; s16 unkE; + s16 unk10; }; extern struct Struct203CEC8 gUnknown_0203CEC8; diff --git a/include/player_pc.h b/include/player_pc.h index bd060faa8..5a0b83683 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -84,5 +84,6 @@ extern const struct MenuAction gMailboxMailOptions[]; void ReshowPlayerPC(u8 taskId); void sub_816B31C(void); +void Mailbox_ReturnToMailListAfterDeposit(void); #endif //GUARD_PLAYER_PC_H diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 5dc37c70d..926e5ff53 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -4,6 +4,7 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void sub_81C4F98(u8, void(*)(void)); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16); +u8 sub_81C1B94(void); // The Pokemon Summary Screen can operate in different modes. Certain features, // such as move re-ordering, are available in the different modes. diff --git a/include/pokenav.h b/include/pokenav.h index 1fde8aa44..d8f0c9f97 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -36,5 +36,7 @@ u8 GetCurrentTrainerHillMapId(void); u8 sub_81D6490(void); const struct WarpEvent *sub_81D6120(void); const struct WarpEvent *sub_81D6134(u8); +void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); +void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); #endif //GUARD_POKENAV_H diff --git a/include/strings.h b/include/strings.h index f1f0e74ba..37a721471 100644 --- a/include/strings.h +++ b/include/strings.h @@ -423,6 +423,45 @@ extern const u8 gText_PauseUntilPress[]; extern const u8 gText_CantUseUntilNewBadge[]; extern const u8 gText_ReturnToHealingSpot[]; extern const u8 gText_EscapeFromHere[]; +extern const u8 gText_PkmnCuredOfPoison[]; +extern const u8 gText_PkmnWokeUp2[]; +extern const u8 gText_PkmnBurnHealed[]; +extern const u8 gText_PkmnThawedOut[]; +extern const u8 gText_PkmnCuredOfParalysis[]; +extern const u8 gText_PkmnGotOverInfatuation[]; +extern const u8 gText_PkmnBecameHealthy[]; +extern const u8 gText_HP3[]; +extern const u8 gText_SpAtk3[]; +extern const u8 gText_SpDef3[]; +extern const u8 gText_PkmnBaseVar2StatIncreased[]; +extern const u8 gText_MovesPPIncreased[]; +extern const u8 gText_PPWasRestored[]; +extern const u8 gText_WontHaveEffect[]; +extern const u8 gText_PkmnSnappedOutOfConfusion[]; +extern const u8 gText_PkmnFriendlyBaseVar2Fell[]; +extern const u8 gText_PkmnFriendlyBaseVar2CantFall[]; +extern const u8 gText_PkmnAdoresBaseVar2Fell[]; +extern const u8 gText_PkmnAlreadyKnows[]; +extern const u8 gText_PkmnCantLearnMove[]; +extern const u8 gText_PkmnNeedsToReplaceMove[]; +extern const u8 gText_PkmnLearnedMove3[]; +extern const u8 gText_WhichMoveToForget[]; +extern const u8 gText_12PoofForgotMove[]; +extern const u8 gText_StopLearningMove2[]; +extern const u8 gText_MoveNotLearned[]; +extern const u8 gText_PkmnElevatedToLvVar2[]; +extern const u8 gText_RemoveMailBeforeItem[]; +extern const u8 gText_PkmnHoldingItemCantHoldMail[]; +extern const u8 gText_MailTransferredFromMailbox[]; +extern const u8 gText_CancelBattle[]; +extern const u8 gText_ReturnToWaitingRoom[]; +extern const u8 gText_CancelChallenge[]; +extern const u8 gText_CantSwitchWithAlly[]; +extern const u8 gText_PkmnHasNoEnergy[]; +extern const u8 gText_EggCantBattle[]; +extern const u8 gText_PkmnAlreadySelected[]; +extern const u8 gText_PkmnAlreadyInBattle[]; +extern const u8 gText_PkmnCantSwitchOut[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From 8781d969ff0a702b21ed00529bf13baa4dd9bf6d Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 18 Dec 2018 05:38:08 -0500 Subject: finish party_menu --- include/party_menu.h | 4 ++-- include/pokemon_storage_system.h | 1 + include/pokemon_summary_screen.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/party_menu.h b/include/party_menu.h index 8b5423bb7..27a043cb6 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -27,10 +27,10 @@ enum }; struct Struct203CEC8 { - MainCallback unk0; + MainCallback exitCallback; TaskFunc unk4; u8 unk8_0:4; - u8 unk8_1:2; + u8 mode:2; u8 unk8_2:2; s8 unk9; s8 unkA; diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9b5358f06..7f618498b 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -84,5 +84,6 @@ u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request); bool8 CheckFreePokemonStorageSpace(void); u8 StorageGetCurrentBox(void); u8 sub_80D214C(struct BoxPokemon *a, u8 b, u8 c, u8 d); +bool32 sub_80D23A8(u16 move); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 926e5ff53..63d740949 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -1,6 +1,8 @@ #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H #define GUARD_POKEMON_SUMMARY_SCREEN_H +extern u8 gUnknown_0203CF20; + void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void sub_81C4F98(u8, void(*)(void)); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16); -- cgit v1.2.3