diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-13 21:24:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 21:24:20 -0600 |
| commit | 047c282763fc41eefa712b2244b478816036cd1a (patch) | |
| tree | b1f161e3f11360dee7aa6ff98202d0164b376cbd /src/title_screen.c | |
| parent | aa5d5fa34acd9a58bee01a75d0188e1c14e28742 (diff) | |
| parent | e7d02681436900d901d4667e525d5d5a99ad2ba1 (diff) | |
Merge pull request #548 from Phlosioneer/intro-movie-state-machine
Document the intro movie state machine
Diffstat (limited to 'src/title_screen.c')
| -rw-r--r-- | src/title_screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index 48571ff96..06bb066bb 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -64,7 +64,7 @@ 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 gUnknown_0853FF70[] = +const u16 gIntroWaterDropData[] = { 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, @@ -324,7 +324,7 @@ static void SpriteCB_VersionBannerLeft(struct Sprite *sprite) sprite->pos1.y++; if (sprite->data[0] != 0) sprite->data[0]--; - SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[sprite->data[0]]); + SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[sprite->data[0]]); } } @@ -542,7 +542,7 @@ void CB2_InitTitleScreen(void) gMain.state = 4; break; case 4: - sub_816F2A8(0x78, 0x50, 0x100, 0); + PanFadeAndZoomScreen(0x78, 0x50, 0x100, 0); SetGpuReg(REG_OFFSET_BG2X_L, -29 * 256); SetGpuReg(REG_OFFSET_BG2X_H, -1); SetGpuReg(REG_OFFSET_BG2Y_L, -32 * 256); |