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

Added missing SHINY_ODDS replacements (#502)

Browse Source
This commit is contained in:
lioniac
2022-05-10 00:04:35 -03:00
committed by GitHub
parent dca627c6bf
commit 6cf06255c0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/credits.c
+4 -4
View File
@@ -1040,28 +1040,28 @@ static void LoadCreditsMonPic(u8 whichMon)
case CREDITSMON_CHARIZARD: case CREDITSMON_CHARIZARD:
InitWindows(sWindowTemplates_Charizard); InitWindows(sWindowTemplates_Charizard);
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
LoadMonPicInWindow(SPECIES_CHARIZARD, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_CHARIZARD, SHINY_ODDS, 0, TRUE, 10, 0);
CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Charizard, 0, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Charizard, 0, 0);
CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Charizard, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Charizard, 0, 0);
break; break;
case CREDITSMON_VENUSAUR: case CREDITSMON_VENUSAUR:
InitWindows(sWindowTemplates_Venusaur); InitWindows(sWindowTemplates_Venusaur);
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
LoadMonPicInWindow(SPECIES_VENUSAUR, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_VENUSAUR, SHINY_ODDS, 0, TRUE, 10, 0);
CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Venusaur, 0, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Venusaur, 0, 0);
CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Venusaur, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Venusaur, 0, 0);
break; break;
case CREDITSMON_BLASTOISE: case CREDITSMON_BLASTOISE:
InitWindows(sWindowTemplates_Blastoise); InitWindows(sWindowTemplates_Blastoise);
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
LoadMonPicInWindow(SPECIES_BLASTOISE, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_BLASTOISE, SHINY_ODDS, 0, TRUE, 10, 0);
CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Blastoise, 0, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Blastoise, 0, 0);
CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Blastoise, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Blastoise, 0, 0);
break; break;
case CREDITSMON_PIKACHU: case CREDITSMON_PIKACHU:
InitWindows(sWindowTemplates_Pikachu); InitWindows(sWindowTemplates_Pikachu);
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
LoadMonPicInWindow(SPECIES_PIKACHU, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_PIKACHU, SHINY_ODDS, 0, TRUE, 10, 0);
CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Pikachu, 0, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Pikachu, 0, 0);
CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Pikachu, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Pikachu, 0, 0);
break; break;
src/pokedex_screen.c
+1 -1
View File
@@ -2205,7 +2205,7 @@ static u32 DexScreen_GetDefaultPersonality(int species)
static void DexScreen_LoadMonPicInWindow(u8 windowId, u16 species, u16 paletteOffset) static void DexScreen_LoadMonPicInWindow(u8 windowId, u16 species, u16 paletteOffset)
{ {
LoadMonPicInWindow(species, 8, DexScreen_GetDefaultPersonality(species), TRUE, paletteOffset >> 4, windowId); LoadMonPicInWindow(species, SHINY_ODDS, DexScreen_GetDefaultPersonality(species), TRUE, paletteOffset >> 4, windowId);
} }
static void DexScreen_PrintMonDexNo(u8 windowId, u8 fontId, u16 species, u8 x, u8 y) static void DexScreen_PrintMonDexNo(u8 windowId, u8 fontId, u16 species, u8 x, u8 y)