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

Update name of LoadMonPicForCredits

Browse Source
This commit is contained in:
PikalaxALT
2019-09-25 13:50:16 -04:00
parent 44f8d694ce
commit de31b97196
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokedex_screen.s
+1 -1
View File
@@ -4491,7 +4491,7 @@ sub_81049FC: @ 81049FC
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x8 movs r1, 0x8
movs r3, 0x1 movs r3, 0x1
bl LoadMonPicForCredits bl LoadMonPicInWindow
add sp, 0x8 add sp, 0x8
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
include/trainer_pokemon_sprites.h
+1 -1
View File
@@ -15,6 +15,6 @@ u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 palet
u16 FreeAndDestroyTrainerPicSprite(u16); u16 FreeAndDestroyTrainerPicSprite(u16);
u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass); u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId); u16 LoadMonPicInWindow(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
#endif // GUARD_TRAINER_POKEMON_SPRITES_H #endif // GUARD_TRAINER_POKEMON_SPRITES_H
src/credits.c
+4 -4
View File
@@ -1771,28 +1771,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));
LoadMonPicForCredits(SPECIES_CHARIZARD, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_CHARIZARD, 8, 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));
LoadMonPicForCredits(SPECIES_VENUSAUR, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_VENUSAUR, 8, 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));
LoadMonPicForCredits(SPECIES_BLASTOISE, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_BLASTOISE, 8, 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));
LoadMonPicForCredits(SPECIES_PIKACHU, 8, 0, TRUE, 10, 0); LoadMonPicInWindow(SPECIES_PIKACHU, 8, 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/trainer_pokemon_sprites.c
+1 -1
View File
@@ -278,7 +278,7 @@ u16 FreeAndDestroyMonPicSprite(u16 spriteId)
return FreeAndDestroyPicSpriteInternal(spriteId); return FreeAndDestroyPicSpriteInternal(spriteId);
} }
u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId) u16 LoadMonPicInWindow(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
{ {
return sub_810C0C0(species, otId, personality, isFrontPic, 0, 0, paletteSlot, windowId, FALSE); return sub_810C0C0(species, otId, personality, isFrontPic, 0, 0, paletteSlot, windowId, FALSE);
} }