Merge branch 'master' into master

1 files changed, 38 insertions, 6 deletions

diff --git a/include/pokenav.h b/include/pokenav.h
index 0d46f04f3..69a9f1f58 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -3,8 +3,21 @@
 
 #include "bg.h"
 #include "main.h"
+#include "pokemon_storage_system.h"
 
-typedef u32 (*LoopedTask)(int state);
+typedef u32 (*LoopedTask)(s32 state);
+
+struct PokenavSub18
+{
+    u16 unk0;
+    u16 unk2;
+    struct
+    {
+        u8 boxId;
+        u8 monId;
+        u16 unk6;
+    } unk4[TOTAL_BOXES_COUNT * IN_BOX_COUNT + PARTY_SIZE];
+};
 
 // Return values of LoopedTask functions.
 #define LT_INC_AND_PAUSE 0
@@ -43,7 +56,7 @@ enum
 
 // pokenav.c
 void sub_81C7694(u32);
-u16 sub_81C76AC(void);
+u32 sub_81C76AC(void);
 
 void CB2_InitPokeNav(void);
 u32 CreateLoopedTask(LoopedTask loopedTask, u32 priority);
@@ -94,7 +107,7 @@ void sub_81C8234(void);
 
 // pokenav_match_call_data.c
 bool32 sub_81D17E8(u32 idx);
-u8 sub_81D16DC(u32 idx);
+u8 MatchCallMapSecGetByIndex(u32 idx);
 bool32 sub_81D1BF8(u32 idx);
 bool32 MatchCallFlagGetByIndex(u32 idx);
 u32 MatchCall_GetRematchTableIdx(u32 idx);
@@ -111,7 +124,7 @@ void sub_81C7850(u32 a0);
 u32 sub_81C786C(void);
 void LoadLeftHeaderGfxForIndex(u32 arg0);
 void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2);
-void sub_81C7AC0(int a0);
+void sub_81C7AC0(s32 a0);
 bool32 sub_81C8010(void);
 void InitBgTemplates(const struct BgTemplate *templates, int count);
 bool32 IsPaletteFadeActive(void);
@@ -125,6 +138,7 @@ void sub_81C7B40(void);
 struct Sprite *PauseSpinningPokenavSprite(void);
 void ResumeSpinningPokenavSprite(void);
 void sub_81C7E14(u32 arg0);
+void sub_81C7990(u32 a0, u16 a1);
 
 // pokenav_unk_1.c
 bool32 sub_81C9298(void);
@@ -162,7 +176,7 @@ const u8 *sub_81CAFD8(int index, int textType);
 u16 sub_81CB01C(void);
 u16 sub_81CB02C(int arg0);
 void sub_81CB050(u32 arg0, u8 *str);
-int sub_81CB0C8(int rematchIndex);
+u8 sub_81CB0C8(int rematchIndex);
 int sub_81CB0E4(int index);
 bool32 sub_81CAE08(int);
 int sub_81CB128(int index);
@@ -183,4 +197,22 @@ void sub_81CC62C(int);
 u32 sub_81CC65C(void);
 void sub_81CC670(void);
 
-#endif //GUARD_POKENAV_H
+// pokenav_unk_6.c
+bool32 sub_81CD3C4(void);
+bool32 sub_81CDD5C(void);
+struct UnknownStruct_81D1ED4 *sub_81CDC70(void);
+u16 sub_81CDC60(void);
+u16 sub_81CDC50(void);
+u8 sub_81CDDB0(void);
+bool32 sub_81CD548(u8 arg0);
+u8 sub_81CDD7C(void);
+u8 *sub_81CDD04(u8 id);
+u8 *sub_81CDD24(u8 id);
+u16 sub_81CDD48(void);
+void *sub_81CDCB4(u8 id);
+void *sub_81CDCD4(u8 id);
+
+// pokenav_unk_7.c
+u8 sub_81CEF14(void);
+
+#endif // GUARD_POKENAV_H