diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
commit | 6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch) | |
tree | f6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /src/use_pokeblock.c | |
parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/use_pokeblock.c')
-rw-r--r-- | src/use_pokeblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 72c33100f..762019ecd 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -1,7 +1,7 @@ #include "global.h" #include "main.h" #include "pokeblock.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "pokenav.h" #include "scanline_effect.h" |