dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix main_menu goto

Browse Source
This commit is contained in:
Kurausukun
2021-05-09 01:38:57 -04:00
committed by huderlem
parent 2cc38acb84
commit e737f1f924
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main_menu.c
+7 -12
View File
@@ -1387,11 +1387,9 @@ static void Task_NewGameBirchSpeechSub_WaitForLotad(u8 taskId)
switch (tState) switch (tState)
{ {
case 0: case 0:
if (sprite->callback == SpriteCallbackDummy) if (sprite->callback != SpriteCallbackDummy)
{ return;
sprite->oam.affineMode = ST_OAM_AFFINE_OFF; sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
goto incrementStateAndTimer;
}
break; break;
case 1: case 1:
if (gTasks[sBirchSpeechMainTaskId].tTimer >= 96) if (gTasks[sBirchSpeechMainTaskId].tTimer >= 96)
@@ -1400,14 +1398,11 @@ static void Task_NewGameBirchSpeechSub_WaitForLotad(u8 taskId)
if (gTasks[sBirchSpeechMainTaskId].tTimer < 0x4000) if (gTasks[sBirchSpeechMainTaskId].tTimer < 0x4000)
gTasks[sBirchSpeechMainTaskId].tTimer++; gTasks[sBirchSpeechMainTaskId].tTimer++;
} }
break; return;
incrementStateAndTimer:
default:
tState++;
if (gTasks[sBirchSpeechMainTaskId].tTimer < 0x4000)
gTasks[sBirchSpeechMainTaskId].tTimer++;
break;
} }
tState++;
if (gTasks[sBirchSpeechMainTaskId].tTimer < 0x4000)
gTasks[sBirchSpeechMainTaskId].tTimer++;
} }
#undef tState #undef tState