Merge branch 'master' into link

2018-01-18 12:53:31 -05:00
parent 3c2b1731ee 24e0edee9f
commit c6ff1a6ce3
3620 changed files with 632656 additions and 52484 deletions
--- a/src/main.c
+++ b/src/main.c
@@ -102,7 +102,7 @@ void AgbMain()
    ClearDma3Requests();
    ResetBgs();
    SetDefaultFontsPointer();
-    InitHeap(gHeap, 0x1C000);
+    InitHeap(gHeap, HEAP_SIZE);

    gSoftResetDisabled = FALSE;

@@ -312,7 +312,6 @@ void SetSerialCallback(IntrCallback callback)
 }

 extern void CopyBufferedValuesToGpuRegs(void);
-extern void ProcessDma3Requests(void);

 static void VBlankIntr(void)
 {