Decompile even even more pokenav

1 files changed, 33 insertions, 13 deletions

diff --git a/include/pokenav.h b/include/pokenav.h
index 57cd1552e..a72cea9c4 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -42,6 +42,11 @@ struct UnkUsePokeblockSub {
     /*0x3*/ u8 unk4:1;
 };
 
+struct UnkPokenav11 {
+    u16 unk0;
+    u16 unk2;
+};
+
 struct UnkPokenavStruct {
     /*0x0000*/ u16 unk0[6][0x40];
     /*0x0300*/ u8 filler0300[0x6];
@@ -115,13 +120,16 @@ struct UnkPokenavStruct {
     /*0x87C8*/ u8 unk87C8;
     /*0x87C9*/ u8 unk87C9;
     /*0x87CA*/ u8 unk87CA;
+    /*0x87CB*/ u8 unk87CB;
     /*0x87CC*/ struct Sprite *unk87CC;
     /*0x87D0*/ struct Sprite *unk87D0[2];
-    /*0x87D8*/ u8 filler87D8[0x2];
+    /*0x87D8*/ u8 unk87D8;
+    /*0x87D9*/ u8 filler87D9[0x1];
     /*0x87DA*/ s16 unk87DA;
     /*0x87DC*/ s16 unk87DC;
-    /*0x87DE*/ s16 unk87DE;
-    /*0x87E0*/ void *unk87E0;
+    /*0x87DE*/ u8 unk87DE;
+    /*0x87DF*/ u8 filler87DF[0x1];
+    /*0x87E0*/ bool8 (*unk87E0)(void);
     /*0x87E4*/ struct Sprite *unk87E4[7];
     /*0x8800*/ struct Sprite *unk8800[10];
     /*0x8828*/ u8 unk8828;
@@ -130,14 +138,25 @@ struct UnkPokenavStruct {
     /*0x8931*/ u8 unk8931[3];
     /*0x8934*/ u8 unk8934[3];
     /*0x8937*/ u8 unk8937[5];
-    /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1ab];
-    /*0x8fe8*/ u8 fil8fe8[1];
+    /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1AA];
+    /*0x8FE4*/ u16 unk8FE4;
+    /*0x8FE6*/ u8 unk8FE6;
+    /*0x8FE7*/ u8 unk8FE7;
+    /*0x8FE8*/ u8 filler8FE8[0x1];
     /*0x8fe9*/ s8 unk8fe9;
-    /*0x8fea*/ u8 fil8fea[6];
-    /*0x8ff0*/ u8 unk8ff0;
-    /*0x8ff1*/ u8 filler8ff1[0x13];
-    /*0x9004*/ u8 unk9004[3][20];
-    /*0x9040*/ u8 unk9040[0x304];
+    /*0x8fea*/ s8 unk8FEA;
+    /*0x8feb*/ s8 unk8FEB;
+    /*0x8fec*/ s8 unk8FEC;
+    /*0x8FED*/ u8 filler8FED[0x1];
+    /*0x8fee*/ u16 unk8FEE;
+    /*0x8ff0*/ u8 unk8ff0[4][5];
+    /*0x9004*/ struct UnkPokenav11 unk9004[3][5];
+    /*0x9040*/ struct UnkPokenav11 unk9040[5];
+    /*0x9054*/ struct UnkPokenav11 unk9054[9][5];
+    /*0x9108*/ u8 unk9108[0x14];
+    /*0x911C*/ struct UnkPokenav11 unk911C[5];
+    /*0x9130*/ u8 filler9130[0x212];
+    /*0x9342*/ u16 unk9342;
     /*0x9344*/ u8 unk9344;
     /*0x9345*/ u8 filler9345[3];
     /*0x9348*/ struct Sprite *unk9348;
@@ -174,7 +193,8 @@ struct UnkPokenavStruct {
     /*0xD160*/ u16 unkD160;
     /*0xD162*/ u8 unkD162;
     /*0xD164*/ struct UnkPokenavStruct_Sub1 unkD164;
-    /*0xD1D4*/ u8 fillerD1D4[0x8];
+    /*0xD1D4*/ u8 fillerD1D6[0x2];
+    /*0xD1D6*/ u16 unkD1D6[3];
     /*0xD1DC*/ u16 unkD1DC;
     /*0xD1DE*/ u16 unkD1DE;
     /*0xD1E0*/ u8 *unkD1E0;
@@ -196,7 +216,7 @@ void sub_80F33A8(void);
 void sub_80F3C94(void);
 void sub_80F3D00(void);
 void sub_80F4BD0(void);
-void sub_80F556C(void *);
+void sub_80F556C(struct UnkPokenav11*);
 void sub_80F567C(void *, void *);
 void sub_80F5B38(void);
 bool8 sub_80F5B50(void);
@@ -205,7 +225,7 @@ void sub_80EBA5C(void);
 void sub_80F5060(bool8);
 void move_anim_execute(void);
 bool8 gpu_sync_bg_show(void);
-void sub_80F5550(void *, void *);
+void sub_80F5550(struct UnkPokenav11*, struct UnkPokenav11*);
 bool8 sub_80F555C(void);
 void sub_80F7224(u8);
 void sub_80F5BDC(void);