summaryrefslogtreecommitdiff
path: root/src/battle/battle_anim.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-06 16:24:35 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-06 16:24:35 -0700
commitc36715e3b692ac116a5f8d32b5c2bde7d5ce8f8e (patch)
tree23e6352ca5c60b10723b152aa08cdae799393767 /src/battle/battle_anim.c
parent818801cf5ab0c696f2460922753f921726aac6bb (diff)
Use 'battler' instead of 'bank'
Diffstat (limited to 'src/battle/battle_anim.c')
-rw-r--r--src/battle/battle_anim.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index ca2431f15..a3360096a 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -1679,7 +1679,7 @@ static void ScriptCmd_createsprite(void)
if (subpriority < 3)
subpriority = 3;
- CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority);
+ CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gAnimBankTarget, 2), GetBattlerSpriteCoord(gAnimBankTarget, 3), subpriority);
gAnimVisualTaskCount++;
}
@@ -3097,7 +3097,7 @@ static void ScriptCmd_invisible(void)
{
u8 spriteId;
- spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
+ spriteId = GetAnimBattlerSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
if (spriteId != 0xFF)
gSprites[spriteId].invisible = TRUE;
@@ -3108,7 +3108,7 @@ static void ScriptCmd_visible(void)
{
u8 spriteId;
- spriteId = GetAnimBankSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
+ spriteId = GetAnimBattlerSpriteId(T1_READ_8(sBattleAnimScriptPtr + 1));
if (spriteId != 0xFF)
gSprites[spriteId].invisible = FALSE;
@@ -3129,12 +3129,12 @@ static void ScriptCmd_doublebattle_2D(void)
if (wantedBank == 0)
{
r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
- spriteId = GetAnimBankSpriteId(0);
+ spriteId = GetAnimBattlerSpriteId(0);
}
else
{
r4 = GetBattlerPosition_permutated(gAnimBankTarget);
- spriteId = GetAnimBankSpriteId(1);
+ spriteId = GetAnimBattlerSpriteId(1);
}
if (spriteId != 0xFF)
{
@@ -3163,12 +3163,12 @@ static void ScriptCmd_doublebattle_2E(void)
if (wantedBank == 0)
{
r4 = GetBattlerPosition_permutated(gAnimBankAttacker);
- spriteId = GetAnimBankSpriteId(0);
+ spriteId = GetAnimBattlerSpriteId(0);
}
else
{
r4 = GetBattlerPosition_permutated(gAnimBankTarget);
- spriteId = GetAnimBankSpriteId(1);
+ spriteId = GetAnimBattlerSpriteId(1);
}
if (spriteId != 0xFF && r4 == 2)
{