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.c | |
| parent | 54c635683c1d2573885987acc4e99728f38e5131 (diff) | |
| parent | 136da953d6888562e76b0694a98988888adcd6d8 (diff) | |
Merge branch 'master' into navdata
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 6ad47d346..2485caa50 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6321,10 +6321,10 @@ const u32 *GetMonFrontSpritePal(struct Pokemon *mon) u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); u32 otId = GetMonData(mon, MON_DATA_OT_ID, 0); u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, 0); - return GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality); + return GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality); } -const u32 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality) +const u32 *GetMonSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality) { u32 shinyValue; |