diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
| commit | ea5ffa3375f58c3d859f48d220a8a67fcb56fa61 (patch) | |
| tree | e04cbfe52909f094f9b7a0b20e927d0f5851b201 /src/starter_choose.c | |
| parent | ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a (diff) | |
| parent | 07ef76277021d5cddf14004e37e785c31fcea69b (diff) | |
Merge with master
Diffstat (limited to 'src/starter_choose.c')
| -rw-r--r-- | src/starter_choose.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index b2160a5a6..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 LoadSav2WindowGfx(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 @@ -126,7 +125,7 @@ void CB2_ChooseStarter(void) InitWindows(gUnknown_085B1DCC); DeactivateAllTextPrinters(); - LoadSav2WindowGfx(0, 0x2A8, 0xD0); + LoadUserWindowBorderGfx(0, 0x2A8, 0xD0); clear_scheduled_bg_copies_to_vram(); ScanlineEffect_Stop(); ResetTasks(); @@ -140,7 +139,7 @@ void CB2_ChooseStarter(void) LoadCompressedObjectPic(&gUnknown_085B1ED8[0]); LoadCompressedObjectPic(&gUnknown_085B1EE8[0]); LoadSpritePalettes(gUnknown_085B1EF8); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); EnableInterrupts(DISPSTAT_VBLANK); SetVBlankCallback(VblankCB_StarterChoose); |