Merge pull request #429 from nullableVoidPtr/master

Various fixes and cleanups
2018-12-08 21:44:12 -06:00
parent 88ffb09765 cceb8ac331
commit 0b91d2948a
125 changed files with 29614 additions and 25811 deletions
@@ -2,7 +2,7 @@
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "field_camera.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "random.h"
 #include "roulette_util.h"
 #include "script.h"