diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-22 16:12:27 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-22 16:12:27 -0600 |
commit | ebbe826133661d3faabc17f9167fa565b405514a (patch) | |
tree | 52687e79258567b4d88c184b6692e035d0ff3e14 /src/trainer_pokemon_sprites.c | |
parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
parent | c805bab48324f946845e1f81002035e4bdb07e62 (diff) |
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
Diffstat (limited to 'src/trainer_pokemon_sprites.c')
-rw-r--r-- | src/trainer_pokemon_sprites.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index f5354a1e8..5ddae218b 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -115,7 +115,7 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 else { sCreatingSpriteTemplate.paletteTag = paletteTag; - LoadCompressedObjectPalette(GetMonSpritePalStructFromOtIdPersonality(species, otId, personality)); + LoadCompressedSpritePalette(GetMonSpritePalStructFromOtIdPersonality(species, otId, personality)); } } else @@ -128,7 +128,7 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 else { sCreatingSpriteTemplate.paletteTag = paletteTag; - LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[species]); + LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[species]); } } } |