diff options
author | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
commit | 708f128568816f2c1efc14c5565a32240f83f171 (patch) | |
tree | 62e58d7344f8c1ac83a21a86dc3c27d5867edbc0 /src/script.c | |
parent | 2136187c113be3c1bc0627c23915f88e0c8a6fc7 (diff) | |
parent | d7a9fcb9755cd06e4e0245b848e44f4ff75e22cb (diff) |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/script.c')
-rw-r--r-- | src/script.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/script.c b/src/script.c index c95a1141f..91690dd33 100644 --- a/src/script.c +++ b/src/script.c @@ -1,6 +1,7 @@ #include "global.h" #include "script.h" #include "event_data.h" +#include "mevent.h" #include "util.h" #include "constants/map_scripts.h" @@ -8,8 +9,6 @@ extern const u8* gUnknown_020375C0; -extern bool32 sub_801B27C(void); - // ewram bss IWRAM_DATA static u8 sScriptContext1Status; IWRAM_DATA static u32 sUnusedVariable1; |