diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
| commit | e92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch) | |
| tree | b3e357be8cec0c64a84773a7b63f54f97825cbaf /src/starter_choose.c | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/starter_choose.c')
| -rw-r--r-- | src/starter_choose.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index 14592dac1..b55b0fbc5 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -9,6 +9,7 @@ #include "main.h" #include "window.h" #include "text.h" +#include "text_window.h" #include "decompress.h" #include "menu.h" #include "sound.h" @@ -18,6 +19,7 @@ #include "data2.h" #include "international_string_util.h" #include "trig.h" +#include "scanline_effect.h" #define STARTER_MON_COUNT 3 @@ -46,13 +48,10 @@ extern const u8 gStarterChoose_LabelCoords[][2]; extern const u8 gUnknown_085B1E0C[]; extern const u8 gUnknown_085B1E28[][2]; -extern void LoadUserWindowBorderGfx(u8, u16, u8); -extern void ScanlineEffect_Stop(void); extern void clear_scheduled_bg_copies_to_vram(void); extern void dp13_810BB8C(void); extern void do_scheduled_bg_tilemap_copies_to_vram(void); extern u16 sub_818D820(u16); -extern const u16 *GetOverworldTextboxPalettePtr(void); extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16); // this file's functions |