dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pokedex_2

Browse Source
This commit is contained in:
ultima-soul
2019-08-04 15:23:09 -07:00
parent bbc7c6ccfc d58bf398b2
commit ed90bf2430
114 changed files with 8784 additions and 14915 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/diploma.c
+4 -4
View File
@@ -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
{