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

hot fix

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-21 12:36:23 +08:00
parent d4cc0e161b
commit a20ac0d7b0
2 changed files with 6 additions and 6 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 void DiplomaPrintText(void);
static u8 DiplomaLoadGfx(void); static u8 DiplomaLoadGfx(void);
static void DiplomaVblankHandler(void); static void DiplomaVblankHandler(void);
static void CB2_DiplomaInit(void); static void CB2_Diploma(void);
static void Task_WaitForExit(u8); static void Task_WaitForExit(u8);
static void Task_DiplomaInit(u8); static void Task_DiplomaInit(u8);
static void Task_DiplomaReturnToOverworld(u8); static void Task_DiplomaReturnToOverworld(u8);
@@ -101,10 +101,10 @@ void CB2_ShowDiploma(void)
gDiploma->callbackStep = 0; gDiploma->callbackStep = 0;
DiplomaBgInit(); DiplomaBgInit();
CreateTask(Task_DiplomaInit, 0); CreateTask(Task_DiplomaInit, 0);
SetMainCallback2(CB2_DiplomaInit); SetMainCallback2(CB2_Diploma);
} }
static void CB2_DiplomaInit(void) static void CB2_Diploma(void)
{ {
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
@@ -134,7 +134,7 @@ static void Task_DiplomaInit(u8 taskId)
case 4: case 4:
if (HasAllKantoMons()) if (HasAllKantoMons())
{ {
SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1); SetGpuReg(REG_OFFSET_BG1HOFS, 0x100);
} }
else else
{ {
src/pokemon.c
+2 -2
View File
@@ -1621,7 +1621,7 @@ const u16 gLinkPlayerFacilityClasses[] =
FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER, FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER,
}; };
const static struct OamData sOakSpeechNidoranFDummyOamData = static const struct OamData sOakSpeechNidoranFDummyOamData =
{ {
.y = 0, .y = 0,
.affineMode = 0, .affineMode = 0,
@@ -1637,7 +1637,7 @@ const static struct OamData sOakSpeechNidoranFDummyOamData =
.paletteNum = 0, .paletteNum = 0,
}; };
const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate = static const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate =
{ {
.tileTag = SPRITE_INVALID_TAG, .tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG,