diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-23 13:18:54 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-25 12:54:08 -0600 |
| commit | 51cd0ac08116674a8ebd258af0620c2f7de9dc0e (patch) | |
| tree | 27f125cc057a019049feccabc746ce09ac91a2f5 /src/battle_anim_effects_3.c | |
| parent | dc3c2b72f26463e4368f51e0380b8605ec06c40a (diff) | |
Rename battle anim type files, remove unneeded ARG_RET_IDs
Diffstat (limited to 'src/battle_anim_effects_3.c')
| -rwxr-xr-x | src/battle_anim_effects_3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index c414deb84..fd68bbd37 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -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; |