diff options
| author | yenatch <yenatch@gmail.com> | 2018-07-03 02:57:00 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-07-03 02:57:05 -0400 |
| commit | e04593b6aa311b5fa274e2361f2c6d006e21192e (patch) | |
| tree | 71efce725b52bd40fb3c0288153a2955dc4c640a /src/pokemon_2.c | |
| parent | ca9cdc306e13a5aff6885aec83b8e23131260d45 (diff) | |
label pp up masks
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 9c60ea108..1720159a2 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -44,8 +44,8 @@ extern const struct SpriteTemplate gSpriteTemplate_8208288[]; extern u8 gTrainerClassToPicIndex[]; extern u8 gTrainerClassToNameIndex[]; -extern const u8 gUnknown_08208238[]; -extern const u8 gUnknown_0820823C[]; +extern const u8 gPPUpReadMasks[]; +extern const u8 gPPUpWriteMasks[]; extern void sub_80105A0(struct Sprite *); extern void oac_poke_opponent(struct Sprite *); @@ -1169,19 +1169,19 @@ void GetSpeciesName(u8 *name, u16 species) u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex) { u8 basePP = gBattleMoves[move].pp; - return basePP + ((basePP * 20 * ((gUnknown_08208238[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); + return basePP + ((basePP * 20 * ((gPPUpReadMasks[moveIndex] & ppBonuses) >> (2 * moveIndex))) / 100); } void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex) { u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES, NULL); - ppBonuses &= gUnknown_0820823C[moveIndex]; + ppBonuses &= gPPUpWriteMasks[moveIndex]; SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses); } void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex) { - mon->ppBonuses &= gUnknown_0820823C[moveIndex]; + mon->ppBonuses &= gPPUpWriteMasks[moveIndex]; } void CopyPlayerPartyMonToBattleData(u8 battleIndex, u8 partyIndex) |