summaryrefslogtreecommitdiff
path: root/src/battle_anim_utility_funcs.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-11-30 17:29:55 -0600
committerGitHub <noreply@github.com>2018-11-30 17:29:55 -0600
commit0e32a3adf3e333f2271957379b568284da1a552d (patch)
treea1113bf613c1aa27b45007df5acb3aad8aa83f72 /src/battle_anim_utility_funcs.c
parent8e24a49b780294284ff48d2c9add60ac058a6800 (diff)
Decompile normal.c (#414)
Diffstat (limited to 'src/battle_anim_utility_funcs.c')
-rw-r--r--src/battle_anim_utility_funcs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index 11cf46ab5..6dfebe77f 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -47,7 +47,7 @@ const u8 gUnknown_0859741E[] = {0x08, 0x0a, 0x0c, 0x0e};
void sub_8116620(u8 taskId)
{
- u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]);
+ u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
selectedPalettes |= sub_80A76C4((gBattleAnimArgs[0] >> 7) & 1,
(gBattleAnimArgs[0] >> 8) & 1,
(gBattleAnimArgs[0] >> 9) & 1,
@@ -62,7 +62,7 @@ void sub_8116664(u8 taskId)
u8 animBattlers[2];
animBattlers[1] = 0xFF;
- selectedPalettes = sub_811583C(1);
+ selectedPalettes = UnpackSelectedBattleAnimPalettes(1);
switch (gBattleAnimArgs[0])
{
case 2:
@@ -105,7 +105,7 @@ void sub_8116664(u8 taskId)
void AnimTask_SetCamouflageBlend(u8 taskId)
{
- u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]);
+ u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
switch (gBattleTerrain)
{
case BATTLE_TERRAIN_GRASS: