diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
| commit | fba22dbd24a797a45345dbc7e0ff8fb520ecba19 (patch) | |
| tree | 961ec5145112e039542f50a79032a06481cf12a0 /src/diploma.c | |
| parent | 9b3b3244f7dad9c0a1d6335a8786da1fdfedd870 (diff) | |
| parent | 1a34a06758175b4d39ee0a81c3441ac958d005fd (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/diploma.c b/src/diploma.c index 517ee8aa0..e89bdc7d7 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -35,7 +35,7 @@ static void DiplomaBgInit(void); static void DiplomaPrintText(void); static u8 DiplomaLoadGfx(void); static void DiplomaVblankHandler(void); -static void CB2_DiplomaInit(void); +static void CB2_Diploma(void); static void Task_WaitForExit(u8); static void Task_DiplomaInit(u8); static void Task_DiplomaReturnToOverworld(u8); @@ -101,10 +101,10 @@ void CB2_ShowDiploma(void) gDiploma->callbackStep = 0; DiplomaBgInit(); CreateTask(Task_DiplomaInit, 0); - SetMainCallback2(CB2_DiplomaInit); + SetMainCallback2(CB2_Diploma); } -static void CB2_DiplomaInit(void) +static void CB2_Diploma(void) { RunTasks(); AnimateSprites(); @@ -134,7 +134,7 @@ static void Task_DiplomaInit(u8 taskId) case 4: if (HasAllKantoMons()) { - SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1); + SetGpuReg(REG_OFFSET_BG1HOFS, 0x100); } else { |