diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
commit | cd876292d126c339bfc31c717d5bec6fe1b63f80 (patch) | |
tree | e7e3666bc80640d9b946f79c07e8d0858600598b /src/pokedex.c | |
parent | a08cbaee0a5f06f2e6d11ceb958e36430175f220 (diff) | |
parent | fa5bfc16279fe6c8c38392612796448495da896f (diff) |
Merge branch 'master' into pokenav_unk_2
Diffstat (limited to 'src/pokedex.c')
-rw-r--r-- | src/pokedex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index 2588e2b73..da3f06bf1 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -3855,7 +3855,7 @@ void blockset_load_palette_to_gpu(u8 taskId) otId = ((u16)gTasks[taskId].data[13] << 16) | (u16)gTasks[taskId].data[12]; personality = ((u16)gTasks[taskId].data[15] << 16) | (u16)gTasks[taskId].data[14]; paletteNum = gSprites[gTasks[taskId].data[3]].oam.paletteNum; - lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality); + lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality); LoadCompressedPalette(lzPaletteData, 0x100 | paletteNum * 16, 32); DestroyTask(taskId); } |