diff options
| author | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-21 16:54:31 +0200 |
|---|---|---|
| committer | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-21 16:54:31 +0200 |
| commit | 6ae0842c048610ee1c72f85c6a0e1c4d801ebe9a (patch) | |
| tree | d30f4c8e0e2c055f860accda7a1efdd7b2dcddbf /src/pokemon_3.c | |
| parent | 6421c90f26aeb1b31daf4acebbb48d546bfc2884 (diff) | |
| parent | e81986cd20dbe0d8a98da646d964310a066f1af5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into pokenav
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 3d85a1c8f..e449af0a1 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1219,7 +1219,7 @@ s8 sub_8040A54(struct Pokemon *mon, u8 a2) return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; } -s8 sub_8040A7C(u32 personality, u8 a2) +s8 GetPokeFlavourRelation(u32 personality, u8 a2) { u8 nature = GetNatureFromPersonality(personality); return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; |