decompile pokemon_menu

6 files changed, 71 insertions, 36 deletions

diff --git a/include/braille_puzzles.h b/include/braille_puzzles.h
index 2b0e2bb96..e9d1f5d7c 100644
--- a/include/braille_puzzles.h
+++ b/include/braille_puzzles.h
@@ -2,6 +2,7 @@
 #define GUARD_BRAILLEPUZZLES_H
 
 bool8 ShouldDoBrailleStrengthEffect(void);
+bool8 ShouldDoBrailleFlyEffect(void);
 void DoBrailleStrengthEffect(void);
 void UseFlyAncientTomb_Callback(void);
 void UseFlyAncientTomb_Finish(void);
@@ -10,5 +11,6 @@ bool32 BrailleWait_CheckButtonPress(void);
 void SealedChamberShakingEffect(u8 taskId);
 bool8 ShouldDoBrailleDigEffect(void);
 void DoBrailleDigEffect(void);
+void DoBrailleFlyEffect(void);
 
 #endif
diff --git a/include/data2.h b/include/data2.h
index 2837a4451..7a58e3a8e 100644
--- a/include/data2.h
+++ b/include/data2.h
@@ -44,7 +44,7 @@ extern u8 gEnemyMonElevation[];
 extern const u8 gTrainerClassNames[][13];
 extern const struct Trainer gTrainers[];
 extern u8 gSpeciesNames[][11];
-extern u8 gMoveNames[][13];
+extern const u8 gMoveNames[][13];
 extern const u8 gAbilityNames[][13];
 extern const u8 gTypeNames[][7];
 extern const struct UnknownStructD2 gUnknown_081F9674;
diff --git a/include/item_use.h b/include/item_use.h
index 1558f7691..aae2b017a 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -49,5 +49,6 @@ void ItemUseInBattle_Escape(u8);
 void ItemUseOutOfBattle_EnigmaBerry(u8);
 void ItemUseInBattle_EnigmaBerry(u8);
 void ItemUseOutOfBattle_CannotUse(u8);
+u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
 
 #endif // GUARD_ITEM_USE_H
diff --git a/include/menu.h b/include/menu.h
index e1bb4f1e4..24ac39762 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -59,7 +59,7 @@ void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32);
 s8 sub_80727CC(void);
 u8 sub_807288C(u8);
 void PrintMenuItems(u8, u8, u8, const struct MenuAction[]);
-void PrintMenuItemsReordered(u8, u8, u8, const struct MenuAction[], const u8*);
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order);
 void InitYesNoMenu(u8, u8, u8);
 void DisplayYesNoMenu(u8, u8, u32);
 s8 ProcessMenuInputNoWrap_(void);
diff --git a/include/party_menu.h b/include/party_menu.h
index 9ce476869..5250486bb 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -53,38 +53,55 @@ struct Struct201B000
     u16 unk282;
 };
 
+struct Unk2001000
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 unk5;
+    u8 unk6;
+    u8 unk7;
+    u8 unk8;
+    u8 unk9;
+    u8 unkA;
+    u8 unkB;
+    void* unkC;
+    u16 array[53561];
+};
+
 extern u8 ewram[];
+#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000))
 #define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000))
 #define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000))
 #define EWRAM_1B000 ewram1B000_alt
 
 void sub_806AEDC(void);
-void sub_806AF4C();
+void sub_806AF4C(u8 arg0, u8 arg1, void* arg2, u8 arg3);
 void OpenPartyMenu(u8, u8);
 void OpenPartyMenu();
-u8 sub_806B124(void);
+bool8 sub_806B124(void);
 u8 IsLinkDoubleBattle(void);
 u8 sub_806B58C(u8);
 u8 sub_806B58C(u8);
 void sub_806BC3C(u8, u8);
 u8 sub_806BD58(u8, u8);
 u8 sub_806BD58(u8, u8);
-u16 sub_806BD80(); // undefined args in battle_party_menu.c
+u16 sub_806BD80(u8);
 void task_pc_turn_off();
-void sub_806BF74();
-void sub_806C994();
-u8 sub_806CA38(u8);
+void sub_806BF74(u8 arg0, u8 arg1);
+void sub_806C994(u8 arg0, u8 arg1);
+u8 sub_806CA38(u8 taskID);
 void sub_806CB74(u8 taskId);
 void sub_806CCE4(void);
 void sub_806CD44(u8 taskId);
-void sub_806D538();
-void sub_806D538();
-void sub_806D538();
+void sub_806D538(u8 arg0, u8 arg1);
 void sub_806D5A4(void);
 void SetMonIconAnim();
 void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *);
 void LoadHeldItemIconGraphics(void);
-void LoadHeldItemIconGraphics(void);
+void PartyMenuTryGiveMonHeldItem(u8 taskId, u16 newItem, TaskFunc c);
 void CreateHeldItemIcons_806DC34(); // undefined args
 void CreateHeldItemIcons_806DC34();
 u8 GetMonIconSpriteId_maybe();
@@ -151,5 +168,13 @@ void DoRareCandyItemEffect(u8, u16, TaskFunc);
 void Task_RareCandy1(u8);
 void Task_RareCandy2(u8);
 void sub_8070848(u8 taskId);
+void sub_806CA60(u8 taskId);
+void sub_806CD5C(u8 taskId);
+void DoTakeMail(u8 taskId, TaskFunc func);
+void PartyMenuTryGiveMonHeldItem_806ECE8(u8 taskId, TaskFunc func);
+void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func);
+void sub_806D668(u8 partyID);
+void TaughtMove(u8 taskId);
+void StopTryingToTeachMove_806F588(u8 taskId);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon_menu.h b/include/pokemon_menu.h
index 841e62035..7dfa1c183 100644
--- a/include/pokemon_menu.h
+++ b/include/pokemon_menu.h
@@ -5,36 +5,43 @@
 
 enum
 {
-    POKEMENU_SUMMARY,       // 0
-    POKEMENU_SWITCH,        // 1
-    POKEMENU_ITEM,          // 2
-    POKEMENU_CANCEL,        // 3
-    POKEMENU_MAIL = 7,
-    POKEMENU_CUT = 10,
-	POKEMENU_FLASH,
-	POKEMENU_ROCK_SMASH,
-	POKEMENU_STRENGTH,
-	POKEMENU_SURF,
-	POKEMENU_FLY,
-	POKEMENU_DIVE,
-	POKEMENU_WATERFALL,
-	POKEMENU_TELEPORT,
-	POKEMENU_DIG,
-	POKEMENU_SECRET_POWER,
-	POKEMENU_MILK_DRINK,
-	POKEMENU_SOFT_BOILED,
-	POKEMENU_SWEET_SCENT,
+    POKEMENU_SUMMARY,           // 0
+    POKEMENU_SWITCH,            // 1
+    POKEMENU_ITEM,              // 2
+    POKEMENU_CANCEL,            // 3
+    POKEMENU_GIVE_ITEM,         // 4
+    POKEMENU_TAKE_ITEM,         // 5
+    POKEMENU_TAKE_MAIL,         // 6
+    POKEMENU_MAIL,              // 7
+    POKEMENU_READ_MAIL,         // 8
+    POKEMENU_CANCEL_SUBMENU,    // 9
+    POKEMENU_CUT,               // 10
+	POKEMENU_FLASH,             // 11
+	POKEMENU_ROCK_SMASH,        // 12
+	POKEMENU_STRENGTH,          // 13
+	POKEMENU_SURF,              // 14
+	POKEMENU_FLY,               // 15
+	POKEMENU_DIVE,              // 16
+	POKEMENU_WATERFALL,         // 17
+	POKEMENU_TELEPORT,          // 18
+	POKEMENU_DIG,               // 19
+	POKEMENU_SECRET_POWER,      // 20
+	POKEMENU_MILK_DRINK,        // 21
+	POKEMENU_SOFT_BOILED,       // 22
+	POKEMENU_SWEET_SCENT,       // 23
 };
 
+extern u8 gLastFieldPokeMenuOpened;
+extern void (*gUnknown_03005CE4)(void);
+
+void sub_808B5B4(u32 taskID);
 void sub_8089A70(void);
-void sub_808A004();
-void sub_808AB90(void);
-void sub_808AB90(void); // unknown args
+void sub_808A004(u8 taskID);
 void sub_808AB90(void);
 void sub_808AD58(void);
 void sub_808B020(void);
-void sub_808B0C0(u8);
+void sub_808B0C0(u8 taskID);
 void sub_808B508(u8);
-void sub_808B564();
+void sub_808B564(void);
 
 #endif // GUARD_POKEMON_MENU_H