diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-04-06 21:38:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 21:38:14 -0700 |
| commit | c4d18cf682acfd413201acb5b0630bb367d1298f (patch) | |
| tree | e7a0efc692ed68f9f531be3b895584f5b65a20b5 /src/menu | |
| parent | d71929c323af4457c657191e52f8a2abd2175d5d (diff) | |
| parent | d3c5ce50f0e973db16fda93552d4c412fe302551 (diff) | |
Merge pull request #487 from hatal175/fade
Add fade flags enum
Diffstat (limited to 'src/menu')
| -rw-r--r-- | src/menu/figurine_menu.c | 2 | ||||
| -rw-r--r-- | src/menu/kinstone_menu.c | 2 | ||||
| -rw-r--r-- | src/menu/pause_menu.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/menu/figurine_menu.c b/src/menu/figurine_menu.c index cd155de2..6e7ee26b 100644 --- a/src/menu/figurine_menu.c +++ b/src/menu/figurine_menu.c @@ -119,7 +119,7 @@ void FigurineMenu_080A4608(void) { r1 = 1; } gFigurineMenu.figure_idx = r1; - SetFade(4, 8); + SetFade(FADE_INSTANT, 8); } void FigurineMenu_080A46C0(void) { diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c index 67976f59..1a7816c1 100644 --- a/src/menu/kinstone_menu.c +++ b/src/menu/kinstone_menu.c @@ -128,7 +128,7 @@ void KinstoneMenu_Type0(void) { sub_0801E738(0); sub_080A70AC((void*)gUnk_081280DC); SetMenuType(1); - SetFade(6, 8); + SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 8); } const u8 gUnk_081280EE[] = { diff --git a/src/menu/pause_menu.c b/src/menu/pause_menu.c index 0eef154b..5c8ca6ad 100644 --- a/src/menu/pause_menu.c +++ b/src/menu/pause_menu.c @@ -87,7 +87,7 @@ void PauseMenu_Variant0(void) { gPauseMenuOptions.unk1 = r0; gPauseMenuOptions.unk14 = r0; sub_080A4DB8(r0); - SetFade(4, 0x20); + SetFade(FADE_INSTANT, 0x20); sub_080A4E90(1); } |