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_1.c | |
| parent | dc3c2b72f26463e4368f51e0380b8605ec06c40a (diff) | |
Rename battle anim type files, remove unneeded ARG_RET_IDs
Diffstat (limited to 'src/battle_anim_effects_1.c')
| -rw-r--r-- | src/battle_anim_effects_1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index ffcf24b9b..516c58e55 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -2761,7 +2761,7 @@ static void AnimConstrictBinding_Step1(struct Sprite* sprite) { u8 spriteId; - if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) + if ((u16)gBattleAnimArgs[7] == 0xFFFF) { sprite->affineAnimPaused = 0; spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); @@ -2835,7 +2835,7 @@ static void AnimTask_DuplicateAndShrinkToPos_Step1(u8 taskId) static void AnimTask_DuplicateAndShrinkToPos_Step2(u8 taskId) { - if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) + if ((u16)gBattleAnimArgs[7] == 0xFFFF) { if (gTasks[taskId].data[0] == 0) { @@ -3655,7 +3655,7 @@ void AnimTask_CycleMagicalLeafPal(u8 taskId) break; } - if (gBattleAnimArgs[ARG_RET_ID] == -1) + if (gBattleAnimArgs[7] == -1) DestroyAnimVisualTask(taskId); } @@ -4355,7 +4355,7 @@ static void AnimLockOnTarget_Step4(struct Sprite* sprite) static void AnimLockOnTarget_Step5(struct Sprite* sprite) { - if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) + if ((u16)gBattleAnimArgs[7] == 0xFFFF) { sprite->data[1] = 0; sprite->data[0] = 0; @@ -4847,7 +4847,7 @@ static void AnimConversion(struct Sprite* sprite) sprite->data[0]++; } - if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) + if ((u16)gBattleAnimArgs[7] == 0xFFFF) DestroyAnimSprite(sprite); } @@ -4855,7 +4855,7 @@ void AnimTask_ConversionAlphaBlend(u8 taskId) { if (gTasks[taskId].data[2] == 1) { - gBattleAnimArgs[ARG_RET_ID] = 0xFFFF; + gBattleAnimArgs[7] = 0xFFFF; gTasks[taskId].data[2]++; } else if (gTasks[taskId].data[2] == 2) |