diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-19 23:39:22 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-19 23:39:22 -0500 |
| commit | a97a040dc17e05c2ad8ede7c2192173ac3724632 (patch) | |
| tree | caf44c64eb985bae96864e5e8fe8cd4bd025ae76 /src/item_use.c | |
| parent | 87bd7f4484dcccd2f87791d9c4654b52216675ca (diff) | |
| parent | 102f5b1e15e7295e30a3cebfbbad3c8af4cc1d37 (diff) | |
merge upstream
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/item_use.c b/src/item_use.c index 269c847a5..a92161e9a 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -43,12 +43,12 @@ extern void (* gUnknown_03004AE4)(u8, u16, TaskFunc); extern u8 gUnknown_02038561; extern u8 gLastFieldPokeMenuOpened; -extern u8 gUnknown_02024E6C; +extern u8 gBankInMenu; extern u8 gUnknown_081A1654[]; extern u8 gUnknown_081A168F[]; -extern u16 gUnknown_02024A6A[]; +extern u16 gBattlePartyID[]; extern u16 gScriptItemId; extern u16 gBattleTypeFlags; @@ -1043,7 +1043,7 @@ void sub_80CA2BC(u8 taskId) void ItemUseInBattle_StatIncrease(u8 taskId) { - u16 partyId = gUnknown_02024A6A[gUnknown_02024E6C]; + u16 partyId = gBattlePartyID[gBankInMenu]; MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); |