diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /include/battle_main.h | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'include/battle_main.h')
| -rw-r--r-- | include/battle_main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_main.h b/include/battle_main.h index 27e61c8fc..5a61b5ef0 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -35,7 +35,7 @@ void CB2_QuitRecordedBattle(void); void sub_8038528(struct Sprite* sprite); void sub_8038A04(void); // unused void VBlankCB_Battle(void); -void nullsub_17(void); +void nullsub_17(struct Sprite *sprite); void sub_8038B74(struct Sprite *sprite); void sub_8038D64(void); u32 sub_80391E0(u8 arrayId, u8 caseId); |