diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 02:00:02 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-28 02:00:02 +0800 |
| commit | 6e570a107f6425068902e4ad077ab8c7b6e15ed3 (patch) | |
| tree | 1c6063b3578146df4807ca336dd9802a6f27b771 /src/trainer_pokemon_sprites.c | |
| parent | 9260240931d7584a8a2007f0f24a33ba9d82140c (diff) | |
| parent | c27f8d2d9ee63deaf9de9f7c3689e072400ab5c3 (diff) | |
Merge branch 'decompress' into misc
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 ecd889d80..25a8d4515 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -109,7 +109,7 @@ void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 palett else { sCreatingSpriteTemplate.paletteTag = paletteTag; - LoadCompressedObjectPalette(GetMonSpritePalStructFromOtIdPersonality(species, otId, personality)); + LoadCompressedSpritePalette(GetMonSpritePalStructFromOtIdPersonality(species, otId, personality)); } } else @@ -122,7 +122,7 @@ void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 palett else { sCreatingSpriteTemplate.paletteTag = paletteTag; - LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[species]); + LoadCompressedSpritePalette(&gTrainerFrontPicPaletteTable[species]); } } } |