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

Rename battle anim type files, remove unneeded ARG_RET_IDs

Browse Source
This commit is contained in:
GriffinR
2020-02-23 13:18:54 -05:00
committed by huderlem
parent dc3c2b72f2
commit 51cd0ac081
25 changed files with 115 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_effects_3.c
+5 -5
View File
@@ -1392,7 +1392,7 @@ static void SetPsychicBackground_Step(u8 taskId)
gTasks[taskId].data[5] = 0;
}
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
DestroyTask(taskId);
}
@@ -1423,7 +1423,7 @@ static void FadeScreenToWhite_Step(u8 taskId)
gTasks[taskId].data[5] = 0;
}
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
DestroyTask(taskId);
}
@@ -5092,7 +5092,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{
gTasks[taskId].data[14]++;
gBattleAnimArgs[ARG_RET_ID] = 0xFFFF;
gBattleAnimArgs[7] = 0xFFFF;
}
}
else
@@ -5100,7 +5100,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x > GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{
gTasks[taskId].data[14]++;
gBattleAnimArgs[ARG_RET_ID] = 0xFFFF;
gBattleAnimArgs[7] = 0xFFFF;
}
}
}
@@ -5150,7 +5150,7 @@ static void sub_815FE80(struct Sprite *sprite)
switch (sprite->data[7])
{
case 0:
if (gBattleAnimArgs[ARG_RET_ID] == -1)
if (gBattleAnimArgs[7] == -1)
{
PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63));
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;