diff options
| author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
|---|---|---|
| committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
| commit | 864a69f9bf050eaaa062c8346cd6a5032e617139 (patch) | |
| tree | bd8b133710c813b11becf602067495526c849b6a /src/script_pokemon_util_80F99CC.c | |
| parent | 47bcba3e1b5140cef7f04edcda3759818408726a (diff) | |
merge conflicts are soooooooooo fun
Diffstat (limited to 'src/script_pokemon_util_80F99CC.c')
| -rw-r--r-- | src/script_pokemon_util_80F99CC.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index b292265a6..87ef2517b 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -19,7 +19,7 @@ #include "text.h" #include "ewram.h" -extern const u8 gUnknown_08208238[]; +extern const u8 gPPUpReadMasks[]; extern u8 gPlayerPartyCount; extern u16 gSpecialVar_0x8004; @@ -307,11 +307,11 @@ void sub_80F9FDC(struct Pokemon *pkmn, u8 moveIndex1, u8 moveIndex2) u8 pp2 = GetMonData(pkmn, MON_DATA_PP1 + moveIndex2); u8 bonuses = GetMonData(pkmn, MON_DATA_PP_BONUSES); - u8 r2 = (bonuses & gUnknown_08208238[moveIndex1]) >> (moveIndex1 * 2); - u8 r1 = (bonuses & gUnknown_08208238[moveIndex2]) >> (moveIndex2 * 2); + u8 r2 = (bonuses & gPPUpReadMasks[moveIndex1]) >> (moveIndex1 * 2); + u8 r1 = (bonuses & gPPUpReadMasks[moveIndex2]) >> (moveIndex2 * 2); - bonuses &= ~gUnknown_08208238[moveIndex1]; - bonuses &= ~gUnknown_08208238[moveIndex2]; + bonuses &= ~gPPUpReadMasks[moveIndex1]; + bonuses &= ~gPPUpReadMasks[moveIndex2]; bonuses |= (r2 << (moveIndex2 * 2)) + (r1 << (moveIndex1 * 2)); SetMonData(pkmn, MON_DATA_MOVE1 + moveIndex1, &move2); |