Merge branch 'master' into field_map_obj

2017-09-13 19:29:19 -04:00
parent c2e31f0618 78009a835f
commit 64ffa8f963
221 changed files with 152332 additions and 152431 deletions
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -1,7 +1,5 @@
 #include "global.h"

-EWRAM_DATA u8 gHeap[0x1C000] = {0};
-
 static void *sHeapStart;
 static u32 sHeapSize;