diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-27 09:08:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 09:08:34 -0400 |
| commit | f1e1e1b9adb4650fcae7c55e2def8786bcb68a3d (patch) | |
| tree | 9098b8226999e2ead5a60dc160375be6de605ee1 | |
| parent | 9f0ca438d6e55a0bc03f75ac12c857970cff6919 (diff) | |
| parent | 7a062983ae7e1202bf732e73c070769d96d35a6b (diff) | |
Merge pull request #104 from jiangzhengwenjz/credit
closer RollCredits
| -rw-r--r-- | src/credits.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/credits.c b/src/credits.c index abb287194..f47cc79c4 100644 --- a/src/credits.c +++ b/src/credits.c @@ -828,7 +828,7 @@ static s32 RollCredits(void) { case CREDITSSCENE_INIT_WIN0: SwitchWin1OffWin0On(); - SetGpuReg(REG_OFFSET_WIN0H, 0x40); + SetGpuReg(REG_OFFSET_WIN0H, 0xF0); SetGpuReg(REG_OFFSET_WIN0V, 0x4F51); sCreditsMgr->mainseqno = CREDITSSCENE_SETUP_DARKEN_EFFECT; return 0; @@ -856,7 +856,7 @@ static s32 RollCredits(void) } return 0; case CREDITSSCENE_LOAD_PLAYER_SPRITE_AT_INDIGO: - if (sCreditsMgr->timer != 0) + if (sCreditsMgr->timer == 0) { LoadPlayerOrRivalSprite(0); sCreditsMgr->timer = 100; @@ -937,14 +937,14 @@ static s32 RollCredits(void) case CREDITSSCENE_PRINT_ADDPRINTER1: if (!gPaletteFade.active) { - win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_8; // unused - AddTextPrinterParameterized4(sCreditsMgr->windowId, 1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_0); + 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].param].unk_0); sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_ADDPRINTER2; } return sCreditsMgr->canSpeedThrough; case CREDITSSCENE_PRINT_ADDPRINTER2: - win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_8; - AddTextPrinterParameterized4(sCreditsMgr->windowId, 1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].unk1].unk_4); + win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; + AddTextPrinterParameterized4(sCreditsMgr->windowId, 2, 8, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_4); sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY; return sCreditsMgr->canSpeedThrough; case CREDITSSCENE_PRINT_DELAY: @@ -974,10 +974,11 @@ static s32 RollCredits(void) { DestroyCreditsWindow(); sCreditsMgr->subseqno = 0; - while (DoOverworldMapScrollScene(sCreditsMgr->whichMon)) + while (!DoOverworldMapScrollScene(sCreditsMgr->whichMon)) {} switch (sCreditsMgr->whichMon) { + case 3: default: win0v[0] = 1; break; |