diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-29 02:39:41 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-31 07:58:07 +0800 |
| commit | 935f93a0752604f1375c79e6225baa6774b60280 (patch) | |
| tree | e4f35d322490ef19b6481e58327732faea810ff4 /src/pokemon.c | |
| parent | 37be39117ad0a02f67fbba2b5329dadbb87f2c6d (diff) | |
ported battle_gfx_sfx_util from pokeem
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 6f1df249f..848f258be 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6962,10 +6962,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; |