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/pokemon_storage_system.c | |
| parent | 54c635683c1d2573885987acc4e99728f38e5131 (diff) | |
| parent | 136da953d6888562e76b0694a98988888adcd6d8 (diff) | |
Merge branch 'master' into navdata
Diffstat (limited to 'src/pokemon_storage_system.c')
| -rw-r--r-- | src/pokemon_storage_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c5cd71d15..59ec8f4f1 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -6827,7 +6827,7 @@ static void SetCursorMonData(void *pokemon, u8 mode) sPSSData->cursorMonLevel = GetLevelFromBoxMonExp(boxMon); sPSSData->cursorMonMarkings = GetBoxMonData(boxMon, MON_DATA_MARKINGS); sPSSData->cursorMonPersonality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY); - sPSSData->cursorMonPalette = GetFrontSpritePalFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, otId, sPSSData->cursorMonPersonality); + sPSSData->cursorMonPalette = GetMonSpritePalFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, otId, sPSSData->cursorMonPersonality); gender = GetGenderFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, sPSSData->cursorMonPersonality); sPSSData->cursorMonItem = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM); } |