diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
| commit | f6527d12428c8a8bd2561c3da50ebb36968e061c (patch) | |
| tree | 1882d862a18e61ddddf94dee1f9b4dae43336538 /src/scene/title_screen.c | |
| parent | cbd3aa95d12bab05042025bd143a2a7cacf0b86d (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'src/scene/title_screen.c')
| -rw-r--r-- | src/scene/title_screen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index f158500fe..26fe088d5 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -41,8 +41,8 @@ extern u8 gReservedSpritePaletteCount; extern struct MusicPlayerInfo gMPlay_BGM; -extern u16 gUnknown_030041B4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG1_X; extern const u8 gUnknown_08E9D8CC[]; extern const u16 gUnknown_08E9F624[]; extern const u8 gUnknown_08E9F7E4[]; @@ -602,7 +602,7 @@ static void VBlankCB(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - REG_BG1VOFS = gUnknown_030041B4; + REG_BG1VOFS = gBattle_BG1_Y; } @@ -836,8 +836,8 @@ static void Task_TitleScreenPhase3(u8 taskId) if (gTasks[taskId].tCounter & 1) { gTasks[taskId].data[4]++; - gUnknown_030041B4 = gTasks[taskId].data[4]; - gUnknown_030042C0 = 0; + gBattle_BG1_Y = gTasks[taskId].data[4]; + gBattle_BG1_X = 0; } UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); if ((gMPlay_BGM.status & 0xFFFF) == 0) |