diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:56:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-25 13:56:50 -0400 |
commit | 1d4234bd7e295c553485b7d676d42c838e4762c4 (patch) | |
tree | 67ac4179d9978baf4e989ef55245e4be0d777c04 /include/trainer_pokemon_sprites.h | |
parent | 7f6d86a8bf2afe349135d502debc2237bafafff5 (diff) | |
parent | 931bf4ce4b4fd7ea63d00f36adfd2bf720831a80 (diff) |
Merge branch 'master' into PIE2
Diffstat (limited to 'include/trainer_pokemon_sprites.h')
-rw-r--r-- | include/trainer_pokemon_sprites.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/trainer_pokemon_sprites.h b/include/trainer_pokemon_sprites.h index 2a520715f..a267737f5 100644 --- a/include/trainer_pokemon_sprites.h +++ b/include/trainer_pokemon_sprites.h @@ -14,5 +14,7 @@ u8 sub_818D97C(u8 a0, u8 a1); u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); 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 LoadMonPicInWindow(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId); #endif // GUARD_TRAINER_POKEMON_SPRITES_H |