summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-02-06 14:00:01 -0600
committercamthesaxman <cameronghall@cox.net>2018-02-06 14:00:01 -0600
commitaba388d3322806467a5ef1adb4e3159cf1793db1 (patch)
tree32be0c0c500deed96f98454797b85fd88ed70b20 /src
parent6a4967689e62e6a3276bbe2372e8066cdfacb6fd (diff)
GetBattlerSpriteId -> GetAnimBattlerSpriteId
Diffstat (limited to 'src')
-rw-r--r--src/battle_anim.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c
index f5de56610..ab9569dcf 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1751,7 +1751,7 @@ static void ScriptCmd_invisible(void)
{
u8 spriteId;
- spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]);
+ spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
if (spriteId != 0xFF)
gSprites[spriteId].invisible = 1;
@@ -1762,7 +1762,7 @@ static void ScriptCmd_visible(void)
{
u8 spriteId;
- spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]);
+ spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
if (spriteId != 0xFF)
gSprites[spriteId].invisible = 0;
@@ -1783,12 +1783,12 @@ static void ScriptCmd_doublebattle_2D(void)
if (wantedBank == ANIM_ATTACKER)
{
r4 = sub_80A8364(gBattleAnimAttacker);
- spriteId = GetBattlerSpriteId(ANIM_ATTACKER);
+ spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
}
else
{
r4 = sub_80A8364(gBattleAnimTarget);
- spriteId = GetBattlerSpriteId(ANIM_TARGET);
+ spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
}
if (spriteId != 0xFF)
{
@@ -1818,12 +1818,12 @@ static void ScriptCmd_doublebattle_2E(void)
if (wantedBank == ANIM_ATTACKER)
{
r4 = sub_80A8364(gBattleAnimAttacker);
- spriteId = GetBattlerSpriteId(ANIM_ATTACKER);
+ spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
}
else
{
r4 = sub_80A8364(gBattleAnimTarget);
- spriteId = GetBattlerSpriteId(ANIM_TARGET);
+ spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
}
if (spriteId != 0xFF && r4 == 2)