diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/credits.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/credits.c')
| -rw-r--r-- | src/credits.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/credits.c b/src/credits.c index 3be5c8fa5..e00587ff2 100644 --- a/src/credits.c +++ b/src/credits.c @@ -761,7 +761,7 @@ static void CreateCreditsWindow(void) sCreditsMgr->windowId = AddWindow(&sCreditsWindowTemplate); FillWindowPixelBuffer(sCreditsMgr->windowId, PIXEL_FILL(0)); PutWindowTilemap(sCreditsMgr->windowId); - CopyWindowToVram(sCreditsMgr->windowId, 3); + CopyWindowToVram(sCreditsMgr->windowId, COPYWIN_BOTH); sCreditsMgr->windowIsActive = TRUE; } @@ -931,7 +931,7 @@ static s32 RollCredits(void) sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY; return sCreditsMgr->canSpeedThrough; case CREDITSSCENE_PRINT_DELAY: - CopyWindowToVram(sCreditsMgr->windowId, 2); + CopyWindowToVram(sCreditsMgr->windowId, COPYWIN_GFX); sCreditsMgr->timer = sCreditsScript[sCreditsMgr->scrcmdidx].duration; sCreditsMgr->scrcmdidx++; BeginNormalPaletteFade(0x00008000, 0, 16, 0, RGB_BLACK); @@ -1781,9 +1781,9 @@ static void LoadCreditsMonPic(u8 whichMon) CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Pikachu, 0, 0); break; } - CopyWindowToVram(0, 2); - CopyWindowToVram(1, 2); - CopyWindowToVram(2, 2); + CopyWindowToVram(0, COPYWIN_GFX); + CopyWindowToVram(1, COPYWIN_GFX); + CopyWindowToVram(2, COPYWIN_GFX); } static u16 GetCreditsMonSpecies(u8 whichMon) |