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

Merge pull request #104 from jiangzhengwenjz/credit

Browse Source 
closer RollCredits
This commit is contained in:
PikalaxALT
2019-09-27 09:08:34 -04:00
committed by GitHub
parent 9f0ca438d6 7a062983ae
commit f1e1e1b9ad
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/credits.c
+8 -7
View File
@@ -828,7 +828,7 @@ static s32 RollCredits(void)
{ {
case CREDITSSCENE_INIT_WIN0: case CREDITSSCENE_INIT_WIN0:
SwitchWin1OffWin0On(); SwitchWin1OffWin0On();
SetGpuReg(REG_OFFSET_WIN0H, 0x40); SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
SetGpuReg(REG_OFFSET_WIN0V, 0x4F51); SetGpuReg(REG_OFFSET_WIN0V, 0x4F51);
sCreditsMgr->mainseqno = CREDITSSCENE_SETUP_DARKEN_EFFECT; sCreditsMgr->mainseqno = CREDITSSCENE_SETUP_DARKEN_EFFECT;
return 0; return 0;
@@ -856,7 +856,7 @@ static s32 RollCredits(void)
} }
return 0; return 0;
case CREDITSSCENE_LOAD_PLAYER_SPRITE_AT_INDIGO: case CREDITSSCENE_LOAD_PLAYER_SPRITE_AT_INDIGO:
if (sCreditsMgr->timer != 0) if (sCreditsMgr->timer == 0)
{ {
LoadPlayerOrRivalSprite(0); LoadPlayerOrRivalSprite(0);
sCreditsMgr->timer = 100; sCreditsMgr->timer = 100;
@@ -937,14 +937,14 @@ static s32 RollCredits(void)
case CREDITSSCENE_PRINT_ADDPRINTER1: case CREDITSSCENE_PRINT_ADDPRINTER1:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_8; // unused win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; // unused
AddTextPrinterParameterized4(sCreditsMgr->windowId, 1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_0); AddTextPrinterParameterized4(sCreditsMgr->windowId, 1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_0);
sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_ADDPRINTER2; sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_ADDPRINTER2;
} }
return sCreditsMgr->canSpeedThrough; return sCreditsMgr->canSpeedThrough;
case CREDITSSCENE_PRINT_ADDPRINTER2: case CREDITSSCENE_PRINT_ADDPRINTER2:
win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_8; win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8;
AddTextPrinterParameterized4(sCreditsMgr->windowId, 1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_4); AddTextPrinterParameterized4(sCreditsMgr->windowId, 2, 8, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_4);
sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY; sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY;
return sCreditsMgr->canSpeedThrough; return sCreditsMgr->canSpeedThrough;
case CREDITSSCENE_PRINT_DELAY: case CREDITSSCENE_PRINT_DELAY:
@@ -974,10 +974,11 @@ static s32 RollCredits(void)
{ {
DestroyCreditsWindow(); DestroyCreditsWindow();
sCreditsMgr->subseqno = 0; sCreditsMgr->subseqno = 0;
while (DoOverworldMapScrollScene(sCreditsMgr->whichMon)) while (!DoOverworldMapScrollScene(sCreditsMgr->whichMon))
{} {}
switch (sCreditsMgr->whichMon) switch (sCreditsMgr->whichMon)
{ {
case 3:
default: default:
win0v[0] = 1; win0v[0] = 1;
break; break;