more labeling

8 files changed, 51 insertions, 55 deletions

diff --git a/src/field_select.c b/src/field_select.c
index 40bfb2a..3aa304b 100644
--- a/src/field_select.c
+++ b/src/field_select.c
@@ -37,7 +37,7 @@ void FieldSelectMain(void)
 
 void LoadFieldSelectGraphics(void)
 {
-    sub_438();
+    ResetSomeGraphicsRelatedStuff();
 
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_FORCED_BLANK | DISPCNT_OBJ_ON;
 
diff --git a/src/main.c b/src/main.c
index de8d269..7ee8fdd 100755
--- a/src/main.c
+++ b/src/main.c
@@ -3,7 +3,7 @@
 #include "gbplayer.h"
 #include "m4a.h"
 
-static void sub_B54(void);
+static void InitGame(void);
 static void sub_B8C(void);
 static void InitIntrHandlers(void);
 static void ReadKeys(void);
@@ -14,7 +14,7 @@ void AgbMain(void)
     InitIntrHandlers();
     DmaCopy32(3, IntrMain, IntrMain_Buffer, sizeof(IntrMain_Buffer));
     INTR_VECTOR = IntrMain_Buffer;
-    sub_B54();
+    InitGame();
     InitGameBoyPlayer();
     while (1)
     {
@@ -45,7 +45,7 @@ void sub_9BC_Main(void)
     }
 }
 
-void HBlankIntr(void)
+void VBlankIntr(void)
 {
     m4aSoundVSync();
     INTR_CHECK |= INTR_FLAG_VBLANK;
@@ -122,7 +122,7 @@ void IntrDummy(void)
 {
 }
 
-static void sub_B54(void)
+static void InitGame(void)
 {
     REG_WAITCNT = WAITCNT_AGB
                 | WAITCNT_PREFETCH_ENABLE
@@ -139,7 +139,7 @@ static void sub_B54(void)
     sub_B8C();
     m4aSoundInit();
     m4aSoundVSyncOff();
-    sub_52A18();
+    SaveFile_LoadGameData();
 }
 
 static void sub_B8C(void)
@@ -155,8 +155,8 @@ static void sub_B8C(void)
     gMain.unk30 = 0;
     gMain.vCount = 144;
     gMain.unk2C = 0;
-    sub_1090C();
-    sub_438();
+    ClearSomeArray();
+    ResetSomeGraphicsRelatedStuff();
 }
 
 static void InitIntrHandlers(void)
@@ -166,11 +166,11 @@ static void InitIntrHandlers(void)
     for (i = 0; i < INTR_COUNT; i++)
         gIntrTable[i] = gIntrTableTemplate[i];
 
-    gUnknown_0200FB98 = &gIntrTable[2];
-    gUnknown_02019BE0 = &gIntrTable[4];
-    sub_8BC();
-    sub_8FC();
-    sub_940();
+    gVBlankIntrFuncPtr = &gIntrTable[2];
+    gVCountIntrFuncPtr = &gIntrTable[4];
+    ResetMainCallback();
+    ResetVBlankIntrFunc();
+    ResetVCountIntrFunc();
 }
 
 // The number 1103515245 comes from the example implementation of rand and srand
@@ -322,16 +322,16 @@ void sub_D10(void)
 
 void sub_D74(void)
 {
-    gUnknown_0200FB9C = gUnknown_02017BD4;
-    *gUnknown_0200FB98 = gUnknown_02017BD0;
-    *gUnknown_02019BE0 = gUnknown_0200FBA0;
-    if (gUnknown_0200FB9C)
-        gUnknown_0200FB9C();
+    gMainCallback = gUnknown_02017BD4;
+    *gVBlankIntrFuncPtr = gUnknown_02017BD0;
+    *gVCountIntrFuncPtr = gUnknown_0200FBA0;
+    if (gMainCallback)
+        gMainCallback();
 
     gMain.unk4C++;
 }
 
-void sub_DC4(void)
+void DefaultMainCallback(void)
 {
     if (REG_DISPSTAT & DISPSTAT_VBLANK_INTR)
     {
diff --git a/src/options.c b/src/options.c
index 4e03a7d..8e6b821 100644
--- a/src/options.c
+++ b/src/options.c
@@ -50,7 +50,7 @@ extern const u8 gUnknown_0852A048[];
 
 void sub_51240(void)
 {
-    sub_438();
+    ResetSomeGraphicsRelatedStuff();
 
     REG_DISPCNT = 0x1080;
     REG_BG0CNT = 4;
diff --git a/src/rom_1068C.c b/src/rom_1068C.c
index 4a5e619..35307ec 100644
--- a/src/rom_1068C.c
+++ b/src/rom_1068C.c
@@ -96,7 +96,7 @@ void sub_10860(void (*func)(void))
 
 #ifdef NONMATCHING
 // Like sub_C24, it matches except for that damn 'push {lr}/pop {lr}'
-void sub_1090C(void)
+void ClearSomeArray(void)
 {
     int i;
     
@@ -105,7 +105,7 @@ void sub_1090C(void)
 }
 #else
 NAKED
-void sub_1090C(void)
+void ClearSomeArray(void)
 {
     asm_unified("\n\
 	ldr r1, _08010920 @ =gUnknown_0201A500\n\
diff --git a/src/rom_528AC.c b/src/rom_528AC.c
index 6f33318..3b42c4a 100644
--- a/src/rom_528AC.c
+++ b/src/rom_528AC.c
@@ -96,7 +96,7 @@ static void sub_52940(u16 a, s8 b, s8 c, u8 d, int unused)
     }
 }
 
-void sub_52A18(void)
+void SaveFile_LoadGameData(void)
 {
     SetSramFastFunc();
     gMain.unkC = 0;
diff --git a/src/rom_850.c b/src/rom_850.c
index 56a4914..cd820e9 100755
--- a/src/rom_850.c
+++ b/src/rom_850.c
@@ -1,57 +1,53 @@
 #include "global.h"
 #include "main.h"
 
-u16 sub_850(void)
+u16 IsInVblank(void)
 {
-    if (REG_IME & INTR_FLAG_VBLANK
-     && REG_DISPSTAT & DISPSTAT_VBLANK_INTR
-     && REG_IE & INTR_FLAG_VBLANK
-     && !(REG_DISPCNT & DISPCNT_FORCED_BLANK))
-    {
-        return 1;
-    }
+    if ((REG_IME & 1)                           // Interrupts enabled
+     && (REG_DISPSTAT & DISPSTAT_VBLANK_INTR)   // In VBLANK
+     && (REG_IE & INTR_FLAG_VBLANK)             // VBlank interrupt enabled
+     && !(REG_DISPCNT & DISPCNT_FORCED_BLANK))  // Ignore VBlank interrupts during forced blank
+        return TRUE;
     else
-    {
-        return 0;
-    }
+        return FALSE;
 }
 
-void sub_898(void (*func)(void))
+void SetMainCallback(void (*func)(void))
 {
     gUnknown_02017BD4 = func;
-    if (!sub_850())
-        gUnknown_0200FB9C = func;
+    if (!IsInVblank())
+        gMainCallback = func;
 }
 
-void sub_8BC(void)
+void ResetMainCallback(void)
 {
-    gUnknown_0200FB9C = sub_DC4;
-    gUnknown_02017BD4 = sub_DC4;
+    gMainCallback = DefaultMainCallback;
+    gUnknown_02017BD4 = DefaultMainCallback;
 }
 
-void sub_8D4(void (*func)(void))
+void SetVBlankIntrFunc(void (*func)(void))
 {
     gUnknown_02017BD0 = func;
-    if (!sub_850())
-        *gUnknown_0200FB98 = func;
+    if (!IsInVblank())
+        *gVBlankIntrFuncPtr = func;
 }
 
-void sub_8FC(void)
+void ResetVBlankIntrFunc(void)
 {
-    *gUnknown_0200FB98 = HBlankIntr;
-    gUnknown_02017BD0 = HBlankIntr;
+    *gVBlankIntrFuncPtr = VBlankIntr;
+    gUnknown_02017BD0 = VBlankIntr;
 }
 
-void sub_918(void (*func)(void))
+void SetVCountIntrFunc(void (*func)(void))
 {
     gUnknown_0200FBA0 = func;
-    if (!sub_850())
-        *gUnknown_02019BE0 = func;
+    if (!IsInVblank())
+        *gVCountIntrFuncPtr = func;
 }
 
-void sub_940(void)
+void ResetVCountIntrFunc(void)
 {
-    *gUnknown_02019BE0 = VCountIntr;
+    *gVCountIntrFuncPtr = VCountIntr;
     gUnknown_0200FBA0 = VCountIntr;
 }
 
diff --git a/src/titlescreen.c b/src/titlescreen.c
index 8e19997..583ca5f 100755
--- a/src/titlescreen.c
+++ b/src/titlescreen.c
@@ -31,7 +31,7 @@ void LoadTitlescreenGraphics(void)
 {
     int autoDisplayMenu;
 
-    sub_438();
+    ResetSomeGraphicsRelatedStuff();
     REG_DISPCNT = DISPCNT_OBJ_ON| DISPCNT_FORCED_BLANK;
     REG_BG1CNT = BGCNT_256COLOR | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(0);
     REG_DISPCNT |= DISPCNT_BG1_ON;
diff --git a/src/util.c b/src/util.c
index eab2e9e..723e925 100755
--- a/src/util.c
+++ b/src/util.c
@@ -92,13 +92,13 @@ s16 LoadSpriteSets(const struct SpriteSet *const *spriteSets, u16 numSpriteSets,
     return loadedCount;
 }
 
-void sub_438(void)
+void ResetSomeGraphicsRelatedStuff(void)
 {
     gMain.unk16 |= DISPCNT_FORCED_BLANK;
     REG_DISPCNT |= DISPCNT_FORCED_BLANK;
     ClearGraphicsMemory();
     sub_518();
-    sub_578();
+    ClearSprites();
     gMain.unkF = 0;
     gMain.unk10 = 0;
     gMain.unk50 = 0;
@@ -146,7 +146,7 @@ void sub_518(void)
     }
 }
 
-void sub_578(void)
+void ClearSprites(void)
 {
     u16 i, j;