diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
| commit | ed90bf2430290853bd9376d53c70055fa07634be (patch) | |
| tree | 39f67b5cbd0c0ef9e1a4763a052fd07924349940 /src/diploma.c | |
| parent | bbc7c6ccfc7d59f61f406849f752fdd5038a6a80 (diff) | |
| parent | d58bf398b2b83a326d23d14d531de7f45a1058bb (diff) | |
Merge branch 'master' into pokedex_2
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 e32d7592f..7fa140430 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 (HasAllMons()) { - SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1); + SetGpuReg(REG_OFFSET_BG1HOFS, 0x100); } else { |