5 files changed, 100 insertions, 4 deletions
diff --git a/include/main.h b/include/main.h
index e0cb09370..ff9bb89c7 100644
--- a/include/main.h
+++ b/include/main.h
@@ -46,8 +46,8 @@ struct Main
 extern u8 gLinkTransferringData;
 extern struct Main gMain;
 extern bool8 gSoftResetDisabled;
-extern bool8 gLinkVSyncDisabled;
 
+extern bool8 gLinkVSyncDisabled;
 extern const u8 gGameVersion;
 extern const u8 gGameLanguage;
 
diff --git a/include/pokeblock_feed.h b/include/pokeblock_feed.h
new file mode 100644
index 000000000..65d0d1dc9
--- /dev/null
+++ b/include/pokeblock_feed.h
@@ -0,0 +1,10 @@
+//
+// Created by Scott Norton on 6/28/17.
+//
+
+#ifndef POKERUBY_POKEBLOCK_FEED_H
+#define POKERUBY_POKEBLOCK_FEED_H
+
+void sub_8147ADC(void);
+
+#endif //POKERUBY_POKEBLOCK_FEED_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 2f8a57d38..c69fb87e0 100755
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -574,6 +574,7 @@ void sub_8040B8C(void);
 void SetWildMonHeldItem(void);
 u8 *sub_8040D08();
 bool32 sub_8040D3C(u16 species, u8 *name, u8 language);
+s8 sub_8040A54(struct Pokemon *, u8);
 u16 GetMonEVCount(struct Pokemon *);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/pokenav.h b/include/pokenav.h
index ccea77a57..70cc4135f 100644..100755
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -6,14 +6,96 @@ struct UnkPokenavStruct_Sub {
     /*0x2*/ u8 filler2[6];
 };
 
+struct UnkPokenavStruct_Sub1 {
+    /*0x00*/ void (*unk0)(void);
+    /*0x04*/ MainCallback callback;
+    /*0x08*/ struct Pokeblock *pokeblock;
+    /*0x0C*/ struct Pokemon *pokemon;
+    /*0x10*/ u8 stringBuffer[0x40];
+    /*0x50*/ u8 unk50;
+    /*0x51*/ u8 unk51;
+    /*0x52*/ u8 unk52;
+    /*0x53*/ u8 unk53;
+    /*0x54*/ u8 unk54;
+    /*0x55*/ u8 unk55;
+    /*0x56*/ u8 unk56;
+    /*0x57*/ u8 unk57[5];
+    /*0x5c*/ u8 unk5c[5];
+    /*0x61*/ u8 unk61[5];
+    /*0x66*/ s16 unk66[5];
+};
+
+struct UnkPokenavStruct_Sub2 {
+    /*0x00*/ u8 filler_00[0x26];
+    /*0x26*/ u16 unk26;
+};
+
+struct UnkUsePokeblockSub {
+    /*0*/ u8 fil0[2];
+    /*2*/ u8 partyIdx:5;
+};
+
 struct UnkPokenavStruct {
-    /*0x0000*/ u8 filler0000[0xCEE8];
+    /*0x0000*/ u8 filler0000[0x30c];
+    /*0x0000*/ u16 unk030C;
+    /*0x0000*/ u8 filler030E[0x6a9e];
+    /*0x6DAC*/ u8 unk6DAC;
+    /*0x6DAD*/ u8 filler6DAD[0x8fd];
+    /*0x76AA*/ u8 unk76AA;
+    /*0x76AB*/ u8 filler76AB[0x10bd];
+    /*0x8768*/ struct UnkPokenavStruct_Sub2 *unk8768;
+    /*0x876C*/ u8 filler876C[0x6e];
+    /*0x87DA*/ s16 unk87DA;
+    /*0x87DC*/ s16 unk87DC;
+    /*0x87DE*/ s16 unk87DE;
+    /*0x87E0*/ void *unk87E0;
+    /*0x87E4*/ u8 filler87E4[0x44];
+    /*0x8828*/ u8 unk8828;
+    /*0x8829*/ u8 filler8829[0x113];
+    /*0x893C*/ struct UnkUsePokeblockSub unk893c[0x1ab];
+    /*0x8fe8*/ u8 fil8fe8[1];
+    /*0x8fe9*/ s8 unk8fe9;
+    /*0x8fea*/ u8 fil8fea[6];
+    /*0x8ff0*/ u8 unk8ff0;
+    /*0x8ff1*/ u8 filler8ff1[0x13];
+    /*0x9004*/ u8 unk9004[3][20];
+    /*0x9040*/ u8 unk9040[0x304];
+    /*0x9344*/ u8 unk9344;
+    /*0x9345*/ u8 filler9345[0x3ba3];
     /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[78];
     /*0xD158*/ u16 unkD158;
+    /*0xD15A*/ u8 fillerD15A[6];
+    /*0xD162*/ u16 unkD160;
+    /*0xD162*/ u8 unkD162[2];
+    /*0xD164*/ struct UnkPokenavStruct_Sub1 unkD164;
 };
 
-extern struct UnkPokenavStruct *gUnknown_083DFEC4;
+extern struct UnkPokenavStruct *const gUnknown_083DFEC4;
 
+bool8 sub_80F170C(void);
+bool8 sub_80F1778(void);
+void sub_80F1934(void);
+void sub_80F2C80(u8);
+void sub_80F2688(void);
+bool8 sub_80F26BC(void);
+bool8 sub_80F2CBC(u8);
+void sub_80F2E18(u8);
+void sub_80F33A8(void);
+void sub_80F3C94(void);
+void sub_80F3D00(void);
+void sub_80F4BD0(void);
+void sub_80F556C(void *);
+void sub_80F567C(void *, void *);
+void sub_80F5B38(void);
+bool8 sub_80F5B50(void);
+void sub_80F5CDC(u8);
 void sub_80EBA5C(void);
+void sub_80F5060(bool8);
+void move_anim_execute(void);
+bool8 gpu_sync_bg_show(void);
+void sub_80F5550(void *, void *);
+bool8 sub_80F555C(void);
+void sub_80F7224(u8);
+void sub_80F5BDC(void);
 
 #endif // GUARD_POKENAV_H
diff --git a/include/use_pokeblock.h b/include/use_pokeblock.h
index 41cf66665..978476d89 100644..100755
--- a/include/use_pokeblock.h
+++ b/include/use_pokeblock.h
@@ -1,10 +1,13 @@
 //
-// Created by Scott Norton on 6/28/17.
+// Created by Scott Norton on 5/31/17.
 //
 
 #ifndef POKERUBY_USE_POKEBLOCK_H
 #define POKERUBY_USE_POKEBLOCK_H
 
+extern void *gUnknown_02030400;
+extern s16 gUnknown_02039312;
+
 void sub_8136130(struct Pokeblock *, MainCallback);
 
 #endif //POKERUBY_USE_POKEBLOCK_H