Decompile even more pokenav

3 files changed, 52 insertions, 17 deletions

diff --git a/include/pokenav.h b/include/pokenav.h
index 0abed5c63..22fa0ac0c 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -29,37 +29,60 @@ struct UnkPokenavStruct_Sub1 {
     /*0x66*/ s16 unk66[5];
 };
 
-struct UnkPokenavStruct_Sub2 {
-    /*0x00*/ u8 filler_00[0x26];
-    /*0x26*/ u16 unk26;
-};
-
 struct UnkPokenavStruct_Sub3 {
     /*0x00*/s16 unk0;
 };
 
 struct UnkUsePokeblockSub {
     /*0x0*/ u8 unk0;
-    /*0x1*/ u8 filler1[1];
+    /*0x1*/ u8 unk1;
     /*0x2*/ u8 partyIdx:5;
     /*0x2*/ u16 unk2:9;
+    /*0x3*/ u8 unk4:1;
 };
 
 struct UnkPokenavStruct {
-    /*0x0000*/ u8 filler0000[0x306];
+    /*0x0000*/ u16 unk0[6][0x40];
+    /*0x0300*/ u8 filler0300[0x6];
     /*0x0306*/ u16 unk306;
     /*0x0306*/ u8 filler0308[0x4];
-    /*0x030C*/ union { // TODO: what?
-        u16 val;
-        struct UnkPokenavStruct_Sub3 unk030C;
-    } unk030C;
-    /*0x0310*/ u8 filler030E[0x6a90];
+    /*0x030C*/ s16 unk030C;
+    /*0x030E*/ s8 unk30E;
+    /*0x030F*/ u8 unk30F;
+    /*0x0310*/ u8 filler0310[0x1];
+    /*0x0311*/ u8 unk311;
+    /*0x0312*/ u16 unk312;
+    /*0x0314*/ u16 unk314[6];
+    /*0x0320*/ struct Sprite *unk320[6][4];
+    /*0x0380*/ struct SpriteSheet unk380;
+    /*0x0388*/ u8 unk388[0x1400];
+    /*0x1788*/ u8 unk1788[0xC00];
+    /*0x2388*/ u8 unk2388[0x1800];
+    /*0x3B88*/ struct Sprite *unk3B88[2];
+    /*0x3B90*/ struct Sprite *unk3B90[2];
+    /*0x3B98*/ u8 unk3B98[0x600];
+    /*0x4198*/ u8 unk4198[0x600];
+    /*0x4798*/ u8 unk4798[0x600];
+    /*0x4D98*/ u8 unk4D98[0x600];
+    /*0x5398*/ u8 unk5398[0xC00];
+    /*0x5F98*/ u8 unk5F98[0x200];
+    /*0x6198*/ u8 unk6198[0x200];
+    /*0x6398*/ u8 unk6398[0x200];
+    /*0x6598*/ u8 unk6598[0x200];
+    /*0x6798*/ u8 unk6798[0x200];
+    /*0x6998*/ u8 unk6998[0x200];
+    /*0x6B98*/ u8 unk6B98[0x200];
+    /*0x6D98*/ u8 filler6B98[0x4];
+    /*0x6D9C*/ struct Sprite *unk6D9C;
     /*0x6DA0*/ u16 unk6DA0;
     /*0x6DA2*/ u16 unk6DA2;
     /*0x6DA4*/ u16 taskId6DA4;
     /*0x6DA6*/ u8 filler6DA6[0x6];
     /*0x6DAC*/ u8 unk6DAC;
-    /*0x6DAD*/ u8 filler6DAD[0x6B];
+    /*0x6DAD*/ s8 unk6DAD;
+    /*0x6DAE*/ s8 unk6DAE;
+    /*0x6DAF*/ u8 filler6DAF[0x3];
+    /*0x6DB2*/ u8 unk6DB2[0x66];
     /*0x6E18*/ struct RegionMap regionMap;
     /*0x7698*/ u16 unk7698;
     /*0x769A*/ u16 unk769A;
@@ -70,7 +93,8 @@ struct UnkPokenavStruct {
     /*0x76AA*/ u8 unk76AA;
     /*0x76AB*/ u8 filler76AB[0x10b9];
     /*0x8764*/ u16 unk8764;
-    /*0x8768*/ struct UnkPokenavStruct_Sub2 *unk8768;
+    /*0x8766*/ s16 unk8766;
+    /*0x8768*/ struct Sprite *unk8768;
     /*0x876C*/ s16 unk876C;
     /*0x876E*/ s16 unk876E;
     /*0x8770*/ s16 unk8770;
@@ -89,7 +113,9 @@ struct UnkPokenavStruct {
     /*0x87C8*/ u8 unk87C8;
     /*0x87C9*/ u8 filler87C9;
     /*0x87CA*/ u8 unk87CA;
-    /*0x87CB*/ u8 filler87CB[0xF];
+    /*0x87CC*/ struct Sprite *unk87CC;
+    /*0x87D0*/ struct Sprite *unk87D0[2];
+    /*0x87D8*/ u8 filler87D8[0x2];
     /*0x87DA*/ s16 unk87DA;
     /*0x87DC*/ s16 unk87DC;
     /*0x87DE*/ s16 unk87DE;
@@ -124,18 +150,25 @@ struct UnkPokenavStruct {
     /*0xCE4E*/ u16 unkCE4E;
     /*0xCE50*/ u16 unkCE50;
     /*0xCE52*/ u16 palettesCE52[30];
-    /*0xCE8E*/ u16 palettesCE8E[0x2D];
+    /*0xCE8E*/ u16 palettesCE8E[0x21];
+    /*0xCED0*/ struct Sprite *unkCED0;
+    /*0xCED4*/ u8 fillerCED4[0x14];
     /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[69];
     /*0xD110*/ const u8 *trainerEyeDescriptionLines[4];
     /*0xD120*/ u8 fillerD114[0x18];
     /*0xD138*/ u8 unkD138[0x20];
     /*0xD158*/ u16 unkD158;
-    /*0xD15A*/ u8 fillerD15A[2];
+    /*0xD15A*/ u16 unkD15A;
     /*0xD15C*/ u16 unkD15C;
     /*0xD15E*/ u8 fillerD15E[2];
     /*0xD160*/ u16 unkD160;
     /*0xD162*/ u8 unkD162;
     /*0xD164*/ struct UnkPokenavStruct_Sub1 unkD164;
+    /*0xD1D4*/ u8 fillerD1D4[0x8];
+    /*0xD1DC*/ u16 unkD1DC;
+    /*0xD1DE*/ u16 unkD1DE;
+    /*0xD1E0*/ u8 *unkD1E0;
+    /*0xD1E4*/ u8 unkD1E4[2][0x2000];
 };
 
 extern struct UnkPokenavStruct *const gUnknown_083DFEC4;
diff --git a/include/region_map.h b/include/region_map.h
index 4c10d84cb..7ded72e49 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -78,6 +78,7 @@ const u8 *CopyLocationName(u8 *dest, u16 b);
 void CB2_InitFlyRegionMap(void);
 void debug_sub_8110F28(void);
 u16 GetRegionMapSectionAt_(u16 x, u16 y);
+void sub_80FBF94(void);
 
 extern const struct RegionMapLocation gRegionMapLocations[];
 
diff --git a/include/use_pokeblock.h b/include/use_pokeblock.h
index 978476d89..025a135a4 100644
--- a/include/use_pokeblock.h
+++ b/include/use_pokeblock.h
@@ -9,5 +9,6 @@ extern void *gUnknown_02030400;
 extern s16 gUnknown_02039312;
 
 void sub_8136130(struct Pokeblock *, MainCallback);
+u8 sub_8137124(u8);
 
 #endif //POKERUBY_USE_POKEBLOCK_H