diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-19 13:13:28 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-25 12:54:08 -0600 |
| commit | 0d651c7c9e2834229e14d60c00c203d7798d3890 (patch) | |
| tree | 04ee7fc9e538d3b89a94c6b69299e5c117c845ef /src/battle_anim_effects_1.c | |
| parent | 1ba12dc050aaeb36e0ba11160bb159280f95f28a (diff) | |
Some battle anim review changes
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 6bc6d5462..7f75cd7da 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -2759,7 +2759,7 @@ static void AnimConstrictBindingStep1(struct Sprite* sprite) { u8 spriteId; - if ((u16)gBattleAnimArgs[7] == 0xFFFF) + if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) { sprite->affineAnimPaused = 0; spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); @@ -2833,7 +2833,7 @@ static void AnimTask_DuplicateAndShrinkToPosStep1(u8 taskId) static void AnimTask_DuplicateAndShrinkToPosStep2(u8 taskId) { - if ((u16)gBattleAnimArgs[7] == 0xFFFF) + if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) { if (gTasks[taskId].data[0] == 0) { @@ -3653,7 +3653,7 @@ void AnimTask_CycleMagicalLeafPal(u8 taskId) break; } - if (gBattleAnimArgs[7] == -1) + if (gBattleAnimArgs[ARG_RET_ID] == -1) DestroyAnimVisualTask(taskId); } @@ -4353,7 +4353,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite) static void AnimLockOnTargetStep5(struct Sprite* sprite) { - if ((u16)gBattleAnimArgs[7] == 0xFFFF) + if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) { sprite->data[1] = 0; sprite->data[0] = 0; @@ -4845,7 +4845,7 @@ void AnimConversion(struct Sprite* sprite) sprite->data[0]++; } - if ((u16)gBattleAnimArgs[7] == 0xFFFF) + if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) DestroyAnimSprite(sprite); } @@ -4853,7 +4853,7 @@ void AnimTask_ConversionAlphaBlend(u8 taskId) { if (gTasks[taskId].data[2] == 1) { - gBattleAnimArgs[7] = 0xFFFF; + gBattleAnimArgs[ARG_RET_ID] = 0xFFFF; gTasks[taskId].data[2]++; } else if (gTasks[taskId].data[2] == 2) |