diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-27 14:55:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-27 14:55:00 -0400 |
| commit | 136da953d6888562e76b0694a98988888adcd6d8 (patch) | |
| tree | e795f5d204d2adbb6748091c87e566112144c577 /src/pokemon.c | |
| parent | bb07f06fc66cd018ffdadcb8ae4c3df9b652f1ef (diff) | |
| parent | 9ff4c0695e137867d1a1a63a7a9c7e5e80be23a2 (diff) | |
Merge pull request #753 from DizzyEggg/pokenav7
Decompile some pokenav
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; |