3 files changed, 22 insertions, 22 deletions
diff --git a/include/functions.h b/include/functions.h
index c84637b..fb19977 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -20,7 +20,7 @@ void sub_1340(void);
 
 void AgbMain(void);
 void sub_9BC_Main(void);
-void HBlankIntr(void);
+void VBlankIntr(void);
 void VCountIntr(void);
 void SerialIntr(void);
 void Timer3Intr(void);
@@ -32,7 +32,7 @@ s16 sub_C74(u16 arg0);
 void sub_CBC(void);
 void sub_D10(void);
 void sub_D74(void);
-void sub_DC4(void);
+void DefaultMainCallback(void);
 
 // src/rom_3219C.c
 
@@ -41,13 +41,13 @@ void sub_3219C(void);
 
 // src/rom_850.c
 
-u16 sub_850(void);
-void sub_898(void (*func)(void));
-void sub_8BC(void);
-void sub_8D4(void (*func)(void));
-void sub_8FC(void);
-void sub_918(void (*func)(void));
-void sub_940(void);
+u16 IsInVblank(void);
+void SetMainCallback(void (*func)(void));
+void ResetMainCallback(void);
+void SetVBlankIntrFunc(void (*func)(void));
+void ResetVBlankIntrFunc(void);
+void SetVCountIntrFunc(void (*func)(void));
+void ResetVCountIntrFunc(void);
 
 // src/titlescreen.c
 
@@ -72,10 +72,10 @@ void SetMainGameState(u16 mainState);
 void sub_24C(void);
 void sub_2B4(void);
 s16 LoadSpriteSets(const struct SpriteSet *const *spriteSets, u16 numSpriteSets, struct SpriteGroup *spriteGroups);
-void sub_438(void);
+void ResetSomeGraphicsRelatedStuff(void);
 void ClearGraphicsMemory(void);
 void sub_518(void);
-void sub_578(void);
+void ClearSprites(void);
 void sub_678(u8 *arg0, s16 arg1, s16 arg2);
 void SetMatrixScale(s16 xScale, s16 yScale, s16 matrixNum);
 
@@ -393,7 +393,7 @@ extern void sub_10708(void *volatile, void *volatile, s16, s16);
 //extern ? sub_10750();
 //extern ? sub_10798();
 //extern ? sub_10860();
-extern void sub_1090C(void);
+extern void ClearSomeArray(void);
 
 // asm/rom_11B9C.s
 
@@ -775,7 +775,7 @@ extern void sub_1090C(void);
 //extern ? sub_528DC();
 //extern ? sub_5291C();
 //extern ? sub_52940();
-extern void sub_52A18(void);
+extern void SaveFile_LoadGameData(void);
 //extern ? LoadSaveDataFromSram();
 extern void SaveFile_WriteToSram(void);
 //extern ? SaveFile_SetPokedexFlags();
diff --git a/include/main.h b/include/main.h
index 752cc14..40446ee 100755
--- a/include/main.h
+++ b/include/main.h
@@ -74,8 +74,8 @@ extern struct Main gMain;
 extern struct SpriteGroup gUnknown_0200B3B8[];
 extern u32 IntrMain_Buffer[0x200];
 extern u32 IntrMain[];
-extern IntrFunc *gUnknown_0200FB98;
-extern IntrFunc *gUnknown_02019BE0;
+extern IntrFunc *gVBlankIntrFuncPtr;
+extern IntrFunc *gVCountIntrFuncPtr;
 extern int gUnknown_02019BE4;
 extern int gUnknown_02019BE8;
 extern int gUnknown_02019BEC;
@@ -91,7 +91,7 @@ extern u8 gUnknown_02019C10;
 extern u8 gUnknown_02002008[];
 #define INTR_COUNT 14
 extern IntrFunc gIntrTable[14];
-extern void (*gUnknown_0200FB9C)(void);
+extern void (*gMainCallback)(void);
 extern void (*gUnknown_0200FBA0)(void);
 extern void (*gUnknown_02017BD0)(void);
 extern void (*gUnknown_02017BD4)(void);
@@ -102,16 +102,16 @@ void sub_24C(void);
 void sub_2B4(void);
 void ClearGraphicsMemory(void);
 void sub_518(void);
-void sub_578(void);
+void ClearSprites(void);
 u32 Random(void);
-void HBlankIntr(void);
+void VBlankIntr(void);
 void VCountIntr(void);
 void SerialIntr(void);
 void Timer3Intr(void);
 void sub_CBC(void);
 void sub_D10(void);
 void sub_D74(void);
-void sub_DC4(void);
+void DefaultMainCallback(void);
 
 
 #endif // GUARD_MAIN_H
diff --git a/include/variables.h b/include/variables.h
index c1137b8..3cc1efd 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -40,13 +40,13 @@ extern u8 gUnknown_02002808[];
 //extern ? gIntrTable;
 //extern ? gMain;
 //extern ? gUnknown_0200B3B8;
-//extern ? gUnknown_0200FB98;
-//extern ? gUnknown_0200FB9C;
+//extern ? gVBlankIntrFuncPtr;
+//extern ? gMainCallback;
 //extern ? gUnknown_0200FBA0;
 //extern ? gUnknown_02017BD0;
 //extern ? gUnknown_02017BD4;
 //extern ? gUnknown_02017BE0;
-//extern ? gUnknown_02019BE0;
+//extern ? gVCountIntrFuncPtr;
 //extern ? gUnknown_02019BE4;
 //extern ? gUnknown_02019BE8;
 //extern ? gUnknown_02019BEC;