dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

GetBattlerSpriteId -> GetAnimBattlerSpriteId

Browse Source
This commit is contained in:
camthesaxman
2018-02-06 14:00:01 -06:00
parent 6a4967689e
commit aba388d332
6 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle_anim.c
View File

@@ -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)