diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-25 08:09:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 08:09:14 -0600 |
| commit | d77ba3d41300d62756da0a9dba23b15263c99caf (patch) | |
| tree | 087c5dd14a21f770fff2643c46c8e28905587aec /src/party_menu.c | |
| parent | b3a7a1278abea55a2b4982c0dfc42d04c7981ba9 (diff) | |
| parent | 0c47744a63a324fe92e8dddcbc07c33292524635 (diff) | |
Merge pull request #581 from arantonitis/pokemon_summary
Documented/polished pokemon_summary_screen.c
Diffstat (limited to 'src/party_menu.c')
| -rwxr-xr-x | src/party_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index 15b5d24d8..645390aff 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3833,7 +3833,7 @@ static void sub_81B3828(void) static void sub_81B3894(void) { gPaletteFade.bufferTransferDisabled = TRUE; - gUnknown_0203CEC8.unk9 = gUnknown_0203CF20; + gUnknown_0203CEC8.unk9 = gLastViewedMonIndex; InitPartyMenu(gUnknown_0203CEC8.unk8_0, 0xFF, gUnknown_0203CEC8.unkB, 1, 21, sub_81B36FC, gUnknown_0203CEC8.exitCallback); } @@ -7319,9 +7319,9 @@ static void sub_81B97DC(struct Pokemon *mon, u8 slotTo, u8 slotFrom) u8 pp1 = GetMonData(mon, MON_DATA_PP1 + slotTo); u8 pp0 = GetMonData(mon, MON_DATA_PP1 + slotFrom); u8 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES); - u8 ppBonusMask1 = gUnknown_08329D22[slotTo]; + u8 ppBonusMask1 = gPPUpGetMask[slotTo]; u8 ppBonusMove1 = (ppBonuses & ppBonusMask1) >> (slotTo * 2); - u8 ppBonusMask2 = gUnknown_08329D22[slotFrom]; + u8 ppBonusMask2 = gPPUpGetMask[slotFrom]; u8 ppBonusMove2 = (ppBonuses & ppBonusMask2) >> (slotFrom * 2); ppBonuses &= ~ppBonusMask1; ppBonuses &= ~ppBonusMask2; |