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 /include/trainer_pokemon_sprites.h | |
parent | 2599dac8ac8c12268fca902910bfe1aab40a68ca (diff) | |
parent | 6539884c8850aca6c2057017dba9c3d78ca15784 (diff) |
Merge branch 'master' into battle
Diffstat (limited to 'include/trainer_pokemon_sprites.h')
-rw-r--r-- | include/trainer_pokemon_sprites.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h index 833268d48..a7ad603b4 100644 --- a/include/trainer_pokemon_sprites.h +++ b/include/trainer_pokemon_sprites.h @@ -15,5 +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); #endif // GUARD_TRAINER_POKEMON_SPRITES_H |