diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-29 02:39:41 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-31 07:58:07 +0800 |
| commit | 935f93a0752604f1375c79e6225baa6774b60280 (patch) | |
| tree | e4f35d322490ef19b6481e58327732faea810ff4 /src/trainer_pokemon_sprites.c | |
| parent | 37be39117ad0a02f67fbba2b5329dadbb87f2c6d (diff) | |
ported battle_gfx_sfx_util from pokeem
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 25a8d4515..5f49173dc 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -104,7 +104,7 @@ void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 palett if (paletteTag == 0xFFFF) { sCreatingSpriteTemplate.paletteTag = 0xFFFF; - LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); } else { @@ -130,7 +130,7 @@ void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 palett void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer) { if (!isTrainer) - LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), paletteSlot * 0x10, 0x20); + LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), paletteSlot * 0x10, 0x20); else LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20); } |