diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-31 02:34:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 02:34:42 -0600 |
| commit | 935a098843b1176db8e4b4f8f82f70086a0ed92f (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /src/battle_anim_utility_funcs.c | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
| parent | d004ce065c9cc6425df6f567dff39eb831f84875 (diff) | |
Merge pull request #456 from Diegoisawesome/trade
trade.c
Diffstat (limited to 'src/battle_anim_utility_funcs.c')
| -rw-r--r-- | src/battle_anim_utility_funcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index f99b1aeac..c9d9bb99c 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -767,7 +767,7 @@ void sub_81177E4(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette) +void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette) { u16 species; u8 spriteId, spriteId2; |