diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 19:39:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 19:39:43 -0400 |
| commit | 550333dd91f134795d9d2bd4702ea92812e277f5 (patch) | |
| tree | 05545e66bddf59fe4716e1f9f889c67cd9a25a31 /src/pokemon_3.c | |
| parent | eb778cac300608fbbed35f19123a6fb763cd85ce (diff) | |
| parent | a62fbd6ec1d34ccba25e117e0db60fd4100bfd8d (diff) | |
Merge pull request #349 from PikalaxALT/pokeblock
Pokeblock
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index f7ff98564..3d85a1c8f 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -48,7 +48,7 @@ extern u32 gTMHMLearnsets[][2]; extern u8 gBattleMonForms[]; extern const u8 BattleText_Wally[]; extern const u16 gHMMoves[]; -extern s8 gUnknown_083F7E28[]; +extern s8 gPokeblockFlavorCompatibilityTable[]; extern u8 gLastUsedAbility; extern const u8 BattleText_PreventedSwitch[]; extern u16 gBattlePartyID[]; @@ -1216,13 +1216,13 @@ bool8 sub_8040A3C(u16 species) s8 sub_8040A54(struct Pokemon *mon, u8 a2) { u8 nature = GetNature(mon); - return gUnknown_083F7E28[nature * 5 + a2]; + return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; } s8 sub_8040A7C(u32 personality, u8 a2) { u8 nature = GetNatureFromPersonality(personality); - return gUnknown_083F7E28[nature * 5 + a2]; + return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; } bool8 IsTradedMon(struct Pokemon *mon) |