diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/battle_factory_screen.c | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/battle_factory_screen.c')
| -rw-r--r-- | src/battle_factory_screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 42a9b579c..60b233daf 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -10,7 +10,7 @@ #include "palette.h" #include "task.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "gpu_regs.h" #include "string_util.h" |