diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-22 13:35:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 13:35:26 -0400 |
| commit | d2e33d58e2353895e2affe0ab803315ad5aef37b (patch) | |
| tree | 945ba8f5039c0914d7c94490d2b6146f9a9a441d /src/party_menu.c | |
| parent | aeeff84462973b267e62031a945603d96afed716 (diff) | |
| parent | 30793ff41bd0c289dc58fad13bb6251923296836 (diff) | |
Merge pull request #795 from PikalaxALT/common_fix
Fix compatibility with gcc-10
Diffstat (limited to 'src/party_menu.c')
| -rw-r--r-- | src/party_menu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index 2095db331..343541ac1 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -102,6 +102,8 @@ static void sub_806BF24(const u8 *a, u8 monIndex, u8 c, u8 d); static void sub_806BB9C(u8 a); static void sub_806BBEC(u8 a); +void (*gPokemonItemUseCallback)(u8 taskId, u16 itemId, TaskFunc taskFunc); + extern u16 Random(); EWRAM_DATA u8 gUnknown_0202E8F4 = 0; @@ -4111,7 +4113,7 @@ s16 sub_806F7E8(u8 taskId, struct BattleInterfaceStruct1 *b, s8 c) if (hpBarLevel < 2) b->unkC_0 = 6; vramPtr = gUnknown_08376858[IsDoubleBattle()][ewram1C000.primarySelectedMonIndex]; - return sub_80460C8(b, &ewram1C000.unkC, vramPtr, 0); + return sub_80460C8(b, (int *)&ewram1C000.unkC, vramPtr, 0); } void sub_806F8AC(u8 taskId) |