party_menu fourth quarter

8 files changed, 27 insertions, 15 deletions

diff --git a/include/battle_tower.h b/include/battle_tower.h
index 9bb93f1c2..e9425e76f 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -25,6 +25,8 @@ struct BattleTowerPokemonTemplate
     u8 nature;
 };
 
+extern const u16 gBattleTowerBannedSpecies[];
+
 u16 sub_8164FCC(u8, u8);
 void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *);
 void ValidateEReaderTrainer(void);
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index 5c084ee6e..9b5660f6f 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -58,7 +58,7 @@
 #define PARTY_ACTION_USE_ITEM           3
 #define PARTY_ACTION_ABILITY_PREVENTS   4
 #define PARTY_ACTION_GIVE_ITEM          5  
-#define PARTY_ACTION_GIVE_PC_ITEM       6   // TODO: rename this one if necessary. Used for quest log. 
+#define PARTY_ACTION_GIVE_PC_ITEM       6 // TODO: rename this one if necessary. Used for quest log. 
 #define PARTY_ACTION_GIVE_MAILBOX_MAIL  7
 #define PARTY_ACTION_SWITCH             8
 #define PARTY_ACTION_SWITCHING          9
@@ -66,7 +66,7 @@
 #define PARTY_ACTION_CHOOSE_AND_CLOSE   11
 #define PARTY_ACTION_MOVE_TUTOR         12
 #define PARTY_ACTION_MINIGAME           13
-#define PARTY_ACTION_REUSABLE_ITEM      14  // Unused. The only reusable items are handled separately
+#define PARTY_ACTION_REUSABLE_ITEM      14
 
 // IDs for DisplayPartyMenuStdMessage, to display the message at the bottom of the party menu
 #define PARTY_MSG_CHOOSE_MON                0
diff --git a/include/item.h b/include/item.h
index ccc9cd3bb..01d2a55e5 100644
--- a/include/item.h
+++ b/include/item.h
@@ -43,7 +43,6 @@ void ClearItemSlots(struct ItemSlot *itemSlots, u8 b);
 u8 CountUsedPCItemSlots(void);
 bool8 CheckPCHasItem(u16 itemId, u16 count);
 bool8 AddPCItem(u16 itemId, u16 count);
-void RemovePCItem(u8 index, u16 count);
 void SwapRegisteredBike(void);
 const u8 *ItemId_GetName(u16 itemId);
 u16 ItemId_GetId(u16 itemId);
@@ -75,7 +74,7 @@ u16 GetPcItemQuantity(u16 *);
 void SetBagPocketsPointers(void);
 
 void ItemPcCompaction(void);
-void RemoveItemFromPC(u16 itemId, u16 quantity);
+void RemovePCItem(u16 itemId, u16 quantity);
 void SortAndCompactBagPocket(struct BagPocket * pocket);
 u8 CountItemsInPC(void);
 void ApplyNewEncryptionKeyToBagItems_(u32 newKey);
diff --git a/include/party_menu.h b/include/party_menu.h
index b100097df..edd5efc92 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -25,7 +25,7 @@ extern u8 gPartyMenuUseExitCallback;
 extern u8 gSelectedMonPartyId;
 extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2];
 extern void (*gItemUseCB)(u8 taskId, TaskFunc func);
-extern u8 gSelectedOrderFromParty[4];
+extern u8 gSelectedOrderFromParty[3];
 
 bool8 FieldCallback_PrepareFadeInFromMenu(void);
 bool8 MonKnowsMove(struct Pokemon *, u16);
@@ -47,16 +47,16 @@ u8 *GetMonNickname(struct Pokemon *mon, u8 *dest);
 u8 DisplayPartyMenuMessage(const u8 * src, u8 a1);
 bool8 IsPartyMenuTextPrinterActive(void);
 void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
-void sub_81252D0(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc);
 void ItemUseCB_PPRecovery(u8 taskId, TaskFunc followUpFunc);
 void ItemUseCB_PPUp(u8 taskId, TaskFunc followUpFunc);
-void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc);
-void sub_8126B60(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_RareCandy(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc followUpFunc);
 void ItemUseCB_SacredAsh(u8 taskId, TaskFunc followUpFunc);
 void sub_81279E0(void);
-void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc);
+void ItemUseCB_MedicineStep(u8 taskId, TaskFunc followUpFunc);
 u8 GetItemEffectType(u16 itemId);
-u8 pokemon_order_func(u8);
+u8 GetPartyIdFromBattlePartyId(u8);
 void BufferBattlePartyCurrentOrder(void);
 void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 multiplayerFlag);
 void OpenPartyMenuInBattle(void);
diff --git a/include/player_pc.h b/include/player_pc.h
index a1ebcddaa..f62835911 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -8,8 +8,8 @@
 
 struct PlayerPCItemPageStruct
 {
-    u16 selectedRow;
-    u16 scrollOffset;
+    u16 cursorPos;
+    u16 itemsAbove;
     u8 pageItems;
     u8 count;
     u8 filler_6[3];
@@ -25,5 +25,6 @@ extern struct PlayerPCItemPageStruct gPlayerPcMenuManager;
 
 void sub_816B060(u8 taskId);
 void NewGameInitPCItems(void);
+void Mailbox_ReturnToMailListAfterDeposit(void);
 
 #endif //GUARD_PLAYER_PC_H
diff --git a/include/pokemon.h b/include/pokemon.h
index c5ad89f41..7bc1239f1 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -582,7 +582,7 @@ void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex);
 void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex);
 bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
 bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e);
-bool8 PokemonUseItemEffects2(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
+bool8 PokemonItemUseNoEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
 u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit);
 const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId);
 u8 GetNature(struct Pokemon *mon);
@@ -593,7 +593,7 @@ u16 HoennToNationalOrder(u16 hoennNum);
 u16 SpeciesToCryId(u16 species);
 void DrawSpindaSpots(u16 species, u32 personality, u8 *dest, u8 a4);
 void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
-bool8 sub_80435E0(void);
+bool8 GetPlayerFlankId(void);
 bool16 GetLinkTrainerFlankId(u8 linkPlayerId);
 s32 GetBattlerMultiplayerId(u16 a1);
 u8 GetTrainerEncounterMusicId(u16 trainer);
diff --git a/include/pokemon_special_anim.h b/include/pokemon_special_anim.h
index d2580552d..5cc567580 100644
--- a/include/pokemon_special_anim.h
+++ b/include/pokemon_special_anim.h
@@ -5,7 +5,7 @@
 
 void sub_811E5B8(u16, u16, u16, u16, u16, u16);
 bool8 sub_811E680(void);
-void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *currStats);
+void BufferMonStatsToTaskData(struct Pokemon *mon, u16 *currStats);
 void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bgClr, u8 fgClr, u8 shadowClr);
 void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 shadowClr);
 void sub_811C540(u8 slotId, u16 itemId, MainCallback callback);
diff --git a/include/strings.h b/include/strings.h
index 8c082ccb4..4b80c1308 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -388,6 +388,16 @@ 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_PkmnHoldingItemCantHoldMail[];
+extern const u8 gText_MailTransferredFromMailbox[];
+extern const u8 gText_RemoveMailBeforeItem[];
+extern const u8 gText_CantSwitchWithAlly[];
+extern const u8 gText_PkmnHasNoEnergy[];
+extern const u8 gText_PkmnAlreadyInBattle[];
+extern const u8 gText_EggCantBattle[];
+extern const u8 gText_PkmnAlreadySelected[];
+extern const u8 gText_PkmnCantSwitchOut[];
 
 // credits
 extern const u8 gString_Dummy[];