summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-01-14 22:19:26 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-01-14 22:19:26 +0100
commit05aba58d5d5783cb3942349b0a1cc7a19a871d8d (patch)
tree8d7e4308d231420bdceb40a565af2fe10b4f58f6 /src/main.c
parentbc1a957674e84daf181c508afd2b623304de121d (diff)
parentd1630d481a0ff611fda2d70a100eed5046982cec (diff)
fix battle transition conflicts
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 07ce07f1c..07b7d9147 100644
--- a/src/main.c
+++ b/src/main.c
@@ -122,7 +122,7 @@ void AgbMain()
ClearDma3Requests();
ResetBgs();
SetDefaultFontsPointer();
- InitHeap(gHeap, 0x1C000);
+ InitHeap(gHeap, HEAP_SIZE);
gSoftResetDisabled = FALSE;
@@ -332,7 +332,6 @@ void SetSerialCallback(IntrCallback callback)
}
extern void CopyBufferedValuesToGpuRegs(void);
-extern void ProcessDma3Requests(void);
static void VBlankIntr(void)
{