From bd7c251859e614e060e1f6407de1f0bba22685c3 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 18 Dec 2018 20:15:59 -0600 Subject: Fix compressed palette alignment --- include/battle_anim.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index b25822992..65bd6a393 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -122,7 +122,7 @@ s16 CloneBattlerSpriteWithBlend(u8); void obj_delete_but_dont_free_vram(struct Sprite*); u8 sub_80A89C8(int, u8, int); void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); -void sub_80A6CC0(u32, const void*, u32); +void sub_80A6CC0(u32, const u32*, u32); void sub_80A6DAC(bool8); void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *); void sub_80A653C(struct Sprite *); @@ -190,7 +190,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, // battle_anim_utility_funcs.s void sub_8116EB4(u8); -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); u32 UnpackSelectedBattleAnimPalettes(s16); -- cgit v1.2.3 From 052d458f48e53c7a8305a50791397bc9e3a4ffc6 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 21 Dec 2018 12:20:28 -0600 Subject: sub_80796B4 is a pain --- include/battle_anim.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/battle_anim.h') diff --git a/include/battle_anim.h b/include/battle_anim.h index 65bd6a393..3a6679414 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -149,6 +149,7 @@ u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority void sub_80A749C(struct Sprite *sprite); void sub_80A6814(u8 taskId); void sub_80A8610(struct Sprite *sprite); +void sub_80A6DEC(struct Sprite *sprite); enum { -- cgit v1.2.3