diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-30 19:39:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 19:39:07 -0400 |
| commit | 1a34a06758175b4d39ee0a81c3441ac958d005fd (patch) | |
| tree | 6d45cd2c009eabf36e6a34550607bfa80cad5ed9 /src/diploma.c | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
| parent | d4ace1162fd85d0531da5bf2296102bf1f503073 (diff) | |
Merge pull request #84 from jiangzhengwenjz/battle_transition
battle_transition
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 { |