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

Some battle anim review changes

Browse Source
This commit is contained in:
GriffinR
2020-02-19 13:13:28 -05:00
committed by huderlem
parent 1ba12dc050
commit 0d651c7c9e
14 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_effects_3.c
+20 -20
View File
@@ -1391,7 +1391,7 @@ static void SetPsychicBackground_Step(u8 taskId)
gTasks[taskId].data[5] = 0;
}
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
DestroyTask(taskId);
}
@@ -1422,7 +1422,7 @@ static void FadeScreenToWhite_Step(u8 taskId)
gTasks[taskId].data[5] = 0;
}
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF)
DestroyTask(taskId);
}
@@ -1522,9 +1522,9 @@ void AnimFang(struct Sprite *sprite)
void AnimTask_IsTargetPlayerSide(u8 taskId)
{
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
gBattleAnimArgs[7] = FALSE;
gBattleAnimArgs[ARG_RET_ID] = FALSE;
else
gBattleAnimArgs[7] = TRUE;
gBattleAnimArgs[ARG_RET_ID] = TRUE;
DestroyAnimVisualTask(taskId);
}
@@ -1532,9 +1532,9 @@ void AnimTask_IsTargetPlayerSide(u8 taskId)
void AnimTask_IsHealingMove(u8 taskId)
{
if (gAnimMoveDmg > 0)
gBattleAnimArgs[7] = FALSE;
gBattleAnimArgs[ARG_RET_ID] = FALSE;
else
gBattleAnimArgs[7] = TRUE;
gBattleAnimArgs[ARG_RET_ID] = TRUE;
DestroyAnimVisualTask(taskId);
}
@@ -2363,7 +2363,7 @@ void AnimTask_TransformMon(u8 taskId)
void AnimTask_IsMonInvisible(u8 taskId)
{
gBattleAnimArgs[7] = gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible;
gBattleAnimArgs[ARG_RET_ID] = gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible;
DestroyAnimVisualTask(taskId);
}
@@ -4984,15 +4984,15 @@ static void MoveOdorSleuthClone(struct Sprite *sprite)
void AnimTask_GetReturnPowerLevel(u8 taskId)
{
gBattleAnimArgs[7] = 0;
gBattleAnimArgs[ARG_RET_ID] = 0;
if (gAnimFriendship < 60)
gBattleAnimArgs[7] = 0;
gBattleAnimArgs[ARG_RET_ID] = 0;
if (gAnimFriendship > 60 && gAnimFriendship < 92)
gBattleAnimArgs[7] = 1;
gBattleAnimArgs[ARG_RET_ID] = 1;
if (gAnimFriendship > 91 && gAnimFriendship < 201)
gBattleAnimArgs[7] = 2;
gBattleAnimArgs[ARG_RET_ID] = 2;
if (gAnimFriendship > 200)
gBattleAnimArgs[7] = 3;
gBattleAnimArgs[ARG_RET_ID] = 3;
DestroyAnimVisualTask(taskId);
}
@@ -5091,7 +5091,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{
gTasks[taskId].data[14]++;
gBattleAnimArgs[7] = 0xFFFF;
gBattleAnimArgs[ARG_RET_ID] = 0xFFFF;
}
}
else
@@ -5099,7 +5099,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
if (x > GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X))
{
gTasks[taskId].data[14]++;
gBattleAnimArgs[7] = 0xFFFF;
gBattleAnimArgs[ARG_RET_ID] = 0xFFFF;
}
}
}
@@ -5149,7 +5149,7 @@ void sub_815FE80(struct Sprite *sprite)
switch (sprite->data[7])
{
case 0:
if (gBattleAnimArgs[7] == -1)
if (gBattleAnimArgs[ARG_RET_ID] == -1)
{
PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63));
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
@@ -5421,15 +5421,15 @@ static void AnimRecycleStep(struct Sprite *sprite)
void AnimTask_GetWeather(u8 taskId)
{
gBattleAnimArgs[7] = ANIM_WEATHER_NONE;
gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_NONE;
if (gWeatherMoveAnim & WEATHER_SUN_ANY)
gBattleAnimArgs[7] = ANIM_WEATHER_SUN;
gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SUN;
else if (gWeatherMoveAnim & WEATHER_RAIN_ANY)
gBattleAnimArgs[7] = ANIM_WEATHER_RAIN;
gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_RAIN;
else if (gWeatherMoveAnim & WEATHER_SANDSTORM_ANY)
gBattleAnimArgs[7] = ANIM_WEATHER_SANDSTORM;
gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SANDSTORM;
else if (gWeatherMoveAnim & WEATHER_HAIL_ANY)
gBattleAnimArgs[7] = ANIM_WEATHER_HAIL;
gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_HAIL;
DestroyAnimVisualTask(taskId);
}