diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-03 09:42:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-03 09:42:19 -0500 |
| commit | d52f52fa734b856361b04ea5d70877a6f265df0c (patch) | |
| tree | 60444b7ba53b8e4c9030a694acb03c54e4144778 /src/egg_hatch.c | |
| parent | d4e8c20f840996049f269ffcd22d7e3feb489696 (diff) | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index b3cd88585..e262a8281 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -60,7 +60,7 @@ extern const u8 gText_NickHatchPrompt[]; extern u8 sav1_map_get_name(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 ScanlineEffect_Stop(void); @@ -459,7 +459,7 @@ void EggHatch(void) { ScriptContext2_Enable(); CreateTask(Task_EggHatch, 10); - fade_screen(1, 0); + FadeScreen(1, 0); } static void Task_EggHatch(u8 taskID) @@ -860,7 +860,7 @@ static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed) sEggHatchData->textColor.fgColor = 0; sEggHatchData->textColor.bgColor = 5; sEggHatchData->textColor.shadowColor = 6; - AddTextPrinterParametrized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string); + AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string); } u8 GetEggStepsToSubtract(void) |