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/title.c | |
| parent | d71929c323af4457c657191e52f8a2abd2175d5d (diff) | |
| parent | d3c5ce50f0e973db16fda93552d4c412fe302551 (diff) | |
Merge pull request #487 from hatal175/fade
Add fade flags enum
Diffstat (limited to 'src/title.c')
| -rw-r--r-- | src/title.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/title.c b/src/title.c index 5868f50a..d96fdf1d 100644 --- a/src/title.c +++ b/src/title.c @@ -127,7 +127,7 @@ static u32 AdvanceIntroSequence(u32 transition) { gUI.lastState = transition; gMain.state = GAMETASK_MAIN; MemClear(&gIntroState, sizeof(gIntroState)); - SetFade(7, 8); + SetFade(FADE_IN_OUT | FADE_BLACK_WHITE | FADE_INSTANT, 8); } void TitleTask(void) { @@ -171,7 +171,7 @@ static void HandleNintendoCapcomLogos(void) { LoadPaletteGroup(paletteGroup); gScreen.lcd.displayControl |= DISPCNT_BG2_ON; gScreen.bg1.updated = 1; - SetFade(6, 8); + SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 8); advance = ADVANCE_NONE; #if defined(DEMO_USA) if (gUnk_02000010.listenForKeyPresses == 0) { @@ -246,7 +246,7 @@ static void HandleTitlescreen(void) { } InitSoundPlayingInfo(); SoundReq(BGM_TITLE_SCREEN); - SetFade(6, 8); + SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 8); break; case 1: if (gFadeControl.active) { @@ -355,7 +355,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) { gScreen.bg1.yOffset = 0; gScreen.bg1.control = BGCNT_SCREENBASE(12) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2); gFadeControl.mask = 0x00000040; - SetFade(6, 0x10); + SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 0x10); SoundReq(SFX_F8); } } @@ -403,7 +403,7 @@ static void HandleTitlescreenAnimationIntro(void) { gIntroState.swordBgScaleRatio = 0x100; gIntroState.timer = 40; gIntroState.subState++; - SetFade(6, 16); + SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 16); } UpdateSwordBgAffineData(); break; @@ -416,7 +416,7 @@ static void HandleTitlescreenAnimationIntro(void) { #endif gIntroState.subState++; CreateObject(OBJECT_BD, 0, 0); - SetFade(6, 16); + SetFade(FADE_BLACK_WHITE | FADE_INSTANT, 16); SoundReq(SFX_F8); } break; |