diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-25 13:50:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-25 13:50:16 -0400 |
| commit | de31b97196972501f0a492547a598781e76db595 (patch) | |
| tree | b32a1af37409932e7705b2c761b7af01d850dcda | |
| parent | 44f8d694ce5760fba5272936cfe3ab1fe48537a8 (diff) | |
Update name of LoadMonPicForCredits
| -rw-r--r-- | asm/pokedex_screen.s | 2 | ||||
| -rw-r--r-- | include/trainer_pokemon_sprites.h | 2 | ||||
| -rw-r--r-- | src/credits.c | 8 | ||||
| -rw-r--r-- | src/trainer_pokemon_sprites.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 9394675c6..1a7cd0a2e 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -4491,7 +4491,7 @@ sub_81049FC: @ 81049FC adds r0, r5, 0 movs r1, 0x8 movs r3, 0x1 - bl LoadMonPicForCredits + bl LoadMonPicInWindow add sp, 0x8 pop {r4-r6} pop {r0} diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h index a7ad603b4..a267737f5 100644 --- a/include/trainer_pokemon_sprites.h +++ b/include/trainer_pokemon_sprites.h @@ -15,6 +15,6 @@ u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 palet u16 FreeAndDestroyTrainerPicSprite(u16); 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 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 diff --git a/src/credits.c b/src/credits.c index 997c1ea16..abb287194 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1771,28 +1771,28 @@ static void LoadCreditsMonPic(u8 whichMon) case CREDITSMON_CHARIZARD: InitWindows(sWindowTemplates_Charizard); 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(2, (const void *)sWindow2Map_Charizard, 0, 0); break; case CREDITSMON_VENUSAUR: InitWindows(sWindowTemplates_Venusaur); 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(2, (const void *)sWindow2Map_Venusaur, 0, 0); break; case CREDITSMON_BLASTOISE: InitWindows(sWindowTemplates_Blastoise); 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(2, (const void *)sWindow2Map_Blastoise, 0, 0); break; case CREDITSMON_PIKACHU: InitWindows(sWindowTemplates_Pikachu); 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(2, (const void *)sWindow2Map_Pikachu, 0, 0); break; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 6cec633c5..2ef5e02f0 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -278,7 +278,7 @@ u16 FreeAndDestroyMonPicSprite(u16 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); } |