Merge branch 'master' into fldeff

2018-12-16 20:05:31 -05:00
parent 10237e8d13 d1e6e705cc
commit e292d0ca83
714 changed files with 111097 additions and 142352 deletions
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_controllers.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "pokemon.h"
 #include "event_data.h"
 #include "constants/abilities.h"