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/frontier_util.c | |
| parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
| parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/frontier_util.c')
| -rw-r--r-- | src/frontier_util.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/frontier_util.c b/src/frontier_util.c index 5af7b3db7..2fc58241a 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -24,7 +24,7 @@ #include "data2.h" #include "record_mixing.h" #include "strings.h" -#include "malloc.h" +#include "alloc.h" #include "save.h" #include "load_save.h" #include "battle_dome.h" @@ -48,8 +48,6 @@ struct FrontierBrainMon u16 moves[4]; }; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; - extern void sub_81B8558(void); // This file's functions. |