diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-03-04 14:11:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 14:11:26 -0600 |
| commit | 29e51811f411dfeae825e6c0c259ffa3f9ac08b2 (patch) | |
| tree | d6e48a855ac49f1b7f0257e2de405b627f48a3bf /src/berry_blender.c | |
| parent | 0a9f0d80f5f3d1cf02ae26a7bad1d771f8dedc52 (diff) | |
| parent | 1f052cc08d224e8e397a2aed23aa2f05f50e474f (diff) | |
Merge pull request #225 from DizzyEggg/clear_battle_files
Clean some battle files
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 1ac52dd6c..9e6a0fef7 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -29,6 +29,7 @@ #include "pokeblock.h" #include "trig.h" #include "tv.h" +#include "item_menu.h" #define BLENDER_SCORE_BEST 0 #define BLENDER_SCORE_GOOD 1 @@ -128,7 +129,6 @@ struct BerryBlenderData extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern u16 gSpecialVar_ItemId; extern u8 gInGameOpponentsNo; extern u8 gUnknown_020322D5; extern u8 gResultsWindowId; @@ -155,13 +155,11 @@ extern void sub_81978B0(u16); extern void sub_800A418(void); extern u8 sub_800A9D8(void); extern bool8 sub_800A4D8(u8); -extern void sub_8197DF8(u8 windowId, bool8 copyToVram); extern void sub_809882C(u8, u16, u8); extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); extern void ClearLinkCallback(void); -extern void CB2_ReturnToFieldContinueScript(void); extern void sub_8153430(void); extern bool8 sub_8153474(void); extern void sub_80EECEC(void); |