diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2020-04-15 12:52:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 12:52:43 -0700 |
| commit | 922a8de78d465e43b4fb2d26938e9cddc62386d6 (patch) | |
| tree | be6134b05e1bdea26d993fce883b8a1bdb54b6c9 /src | |
| parent | 6eefcb1f82dc28cdc626e86fda3a217d21315181 (diff) | |
| parent | 3ff8b0cb5cba49ced2f84687d02b2866638672dd (diff) | |
Merge pull request #1016 from PlatinumMaster/master
Split voicegroups and cry tables properly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/title_screen.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index c20e1ba70..600dd18c8 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -62,6 +62,8 @@ static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_scre static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("graphics/title_screen/logo_shine.4bpp.lz"); static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clouds.4bpp.lz"); + + const u16 gIntroWaterDropAlphaBlend[] = { BLDALPHA_BLEND(16, 0), @@ -744,7 +746,7 @@ static void Task_TitleScreenPhase3(u8 taskId) FadeOutBGM(4); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); SetMainCallback2(CB2_GoToBerryFixScreen); - } + } else { SetGpuReg(REG_OFFSET_BG2Y_L, 0); |