diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-31 00:02:16 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-31 00:02:16 +0100 |
| commit | 9fbedcc41c2c888b612efd1b3797c181ff7cb107 (patch) | |
| tree | 49dbac1e2b3aa0ff7e4451a0d64e9299ae030357 /src/egg_hatch.c | |
| parent | e6fb626c1fddb2f696b26219156d2591867295e7 (diff) | |
| parent | b3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff) | |
coord weather fix conflicts
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 435886638..e8f22e903 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -61,7 +61,7 @@ extern u8 sav1_map_get_name(void); extern s8 ProcessMenuInputNoWrap_(void); extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8); extern void sub_806A068(u16, u8); -extern void fade_screen(u8, u8); +extern void FadeScreen(u8, u8); extern void overworld_free_bg_tilemaps(void); extern void sub_80AF168(void); extern void AllocateMonSpritesGfx(void); @@ -465,7 +465,7 @@ void EggHatch(void) { ScriptContext2_Enable(); CreateTask(Task_EggHatch, 10); - fade_screen(1, 0); + FadeScreen(1, 0); } static void Task_EggHatch(u8 taskID) |