diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:49:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:49:16 -0400 |
| commit | 0e217e22d8fa3e075416cb332435c3756548357e (patch) | |
| tree | 59ef21892a02c9d266f5cac36872458bdbe0de61 /src/trainer_pokemon_sprites.c | |
| parent | 2599dac8ac8c12268fca902910bfe1aab40a68ca (diff) | |
| parent | 6539884c8850aca6c2057017dba9c3d78ca15784 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/trainer_pokemon_sprites.c')
| -rw-r--r-- | src/trainer_pokemon_sprites.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 5f49173dc..6cec633c5 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 sub_810C228(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId) +u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId) { return sub_810C0C0(species, otId, personality, isFrontPic, 0, 0, paletteSlot, windowId, FALSE); } |