diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-03 19:18:55 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-03 19:18:55 -0400 |
| commit | 8f74dda3e443d561b21d6b267aa71d14aed05031 (patch) | |
| tree | 2cf658101a7a4dc40d5b586900491b30d51f3f34 /src/intro.c | |
| parent | 898bd244386da9be97b128128384117080792440 (diff) | |
Minor cleanup
Diffstat (limited to 'src/intro.c')
| -rw-r--r-- | src/intro.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/intro.c b/src/intro.c index c9db2e70c..ec15d7473 100644 --- a/src/intro.c +++ b/src/intro.c @@ -462,7 +462,9 @@ static const struct SpritePalette sFightSceneSpritePalettes[] = { {sSpritePals_Grass, 8}, {sSpritePals_GengarSwipe, 10}, {sSpritePals_NidorinoRecoilDust, 11}, - // {0} +#ifdef BUGFIX + {0} +#endif }; static void VBlankCB_Copyright(void) @@ -511,7 +513,8 @@ static bool8 RunCopyrightScreen(void) ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); - FreeAllSpritePalettes();BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); + FreeAllSpritePalettes(); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(7)); EnableInterrupts(INTR_FLAG_VBLANK); SetVBlankCallback(VBlankCB_Copyright); @@ -602,8 +605,8 @@ static void CB2_SetUpIntro(void) DmaFill16(3, 0, VRAM, VRAM_SIZE); DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - FillPalette(0, 0, 0x400); - ResetBgsAndClearDma3BusyFlags(0); + FillPalette(RGB_BLACK, 0, 0x400); + ResetBgsAndClearDma3BusyFlags(FALSE); InitBgsFromTemplates(0, sBgTemplates_GameFreakScene, NELEMS(sBgTemplates_GameFreakScene)); break; case 1: @@ -688,7 +691,7 @@ static void IntroCB_Init(struct IntroSequenceData * this) LZ77UnCompWram(sBlit_GameFreakText, this->gamefreakTextBitmap); LZ77UnCompWram(sSpriteTiles_GameFreakLogoArt, this->gamefreakLogoArtSpriteTiles); FillBgTilemapBufferRect(2, 0x000, 0, 0, 32, 32, 0x11); - FillWindowPixelBuffer(0, 0x00); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); BlitBitmapToWindow(0, this->gamefreakTextBitmap, 0, 40, 144, 16); PutWindowTilemap(0); CopyWindowToVram(0, 3); |