diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
commit | 5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch) | |
tree | bf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /src/script_menu.c | |
parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/script_menu.c')
-rw-r--r-- | src/script_menu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/script_menu.c b/src/script_menu.c index d6e328eb4..23e8bf2d9 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1,6 +1,7 @@ #include "global.h" #include "script_menu.h" #include "event_data.h" +#include "field_effect.h" #include "menu.h" #include "palette.h" #include "script.h" @@ -573,10 +574,6 @@ extern u8 gPCText_WhichPCShouldBeAccessed[]; extern u16 gScriptResult; -// field_effect -extern void FreeResourcesAndDestroySprite(struct Sprite *sprite); -extern u8 CreateMonSprite_PicBox(u16, s16, s16, u8); - bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4) { if (FuncIsActiveTask(sub_80B52B4) == 1) |