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

Merge pull request #184 from jiangzhengwenjz/nonmatching

Browse Source 
fake match sub_804C728 & sub_804CF14; fix build with NONMATCHING defined
This commit is contained in:
PikalaxALT
2019-12-19 13:39:38 -05:00
committed by GitHub
parent af6ff9956d 84d9a1e723
commit 969efabaf5
6 changed files with 46 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/title_screen.c
+6 -6
View File
@@ -54,7 +54,7 @@ static void SetGpuRegsForTitleScreenRun(void);
static void SetTitleScreenScene_Restart(s16 * data);
static void SetTitleScreenScene_Cry(s16 * data);
static void Task_TitleScreen_SlideWin0(u8 taskId);
static void Task_TitleScreen_PaletteSomething(u8 taskId);
static void Task_TitleScreen_BlinkPressStart(u8 taskId);
static void SignalEndTitleScreenPaletteSomethingTask(void);
static void UpdateScanlineEffectRegBuffer(s16 a0);
static void ScheduleStopScanlineEffect(void);
@@ -516,7 +516,7 @@ static void SetTitleScreenScene_Run(s16 * data)
{
case 0:
HelpSystem_SetSomeVariable2(1);
CreateTask(Task_TitleScreen_PaletteSomething, 0);
CreateTask(Task_TitleScreen_BlinkPressStart, 0);
CreateTask(Task_FlameOrLeafSpawner, 5);
SetGpuRegsForTitleScreenRun();
data[6] = CreateSlashSprite();
@@ -576,7 +576,7 @@ static void SetTitleScreenScene_Restart(s16 * data)
case 2:
if (IsNotWaitingForBGMStop() && !gPaletteFade.active)
{
DestroyTask(FindTaskIdByFunc(Task_TitleScreen_PaletteSomething));
DestroyTask(FindTaskIdByFunc(Task_TitleScreen_BlinkPressStart));
data[2] = 0;
data[1]++;
}
@@ -585,7 +585,7 @@ static void SetTitleScreenScene_Restart(s16 * data)
data[2]++;
if (data[2] >= 20)
{
DestroyTask(FindTaskIdByFunc(Task_TitleScreen_PaletteSomething));
DestroyTask(FindTaskIdByFunc(Task_TitleScreen_BlinkPressStart));
data[1]++;
}
break;
@@ -699,7 +699,7 @@ static void Task_TitleScreen_SlideWin0(u8 taskId)
}
}
static void Task_TitleScreen_PaletteSomething(u8 taskId)
static void Task_TitleScreen_BlinkPressStart(u8 taskId)
{
s16 * data = gTasks[taskId].data;
s32 i;
@@ -745,7 +745,7 @@ static void Task_TitleScreen_PaletteSomething(u8 taskId)
static void SignalEndTitleScreenPaletteSomethingTask(void)
{
u8 taskId = FindTaskIdByFunc(Task_TitleScreen_PaletteSomething);
u8 taskId = FindTaskIdByFunc(Task_TitleScreen_BlinkPressStart);
gTasks[taskId].data[15] = TRUE;
}