diff options
author | garak <garakmon@gmail.com> | 2019-07-29 13:06:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-29 13:06:45 -0400 |
commit | 5b57c001f5fe653542b6289540e3b6c6b67a8cfe (patch) | |
tree | 26a9ba631960bc56d01daca1777164801d4e0075 /src/menu_specialized.c | |
parent | 54c635683c1d2573885987acc4e99728f38e5131 (diff) | |
parent | 136da953d6888562e76b0694a98988888adcd6d8 (diff) |
Merge branch 'master' into navdata
Diffstat (limited to 'src/menu_specialized.c')
-rw-r--r-- | src/menu_specialized.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 34dd1fe2b..d33d53707 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -1290,7 +1290,7 @@ void sub_81D3094(void *tilesDst, void *palDst, u16 boxId, u16 monId, u16 arg5, u u32 personality = GetBoxOrPartyMonData(boxId, monId, MON_DATA_PERSONALITY, NULL); LoadSpecialPokePic(&gMonFrontPicTable[species], tilesDst, species, personality, TRUE); - LZ77UnCompWram(GetFrontSpritePalFromSpeciesAndPersonality(species, trainerId, personality), palDst); + LZ77UnCompWram(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), palDst); } } |