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_2.c | |
parent | 1ba12dc050aaeb36e0ba11160bb159280f95f28a (diff) |
Some battle anim review changes
Diffstat (limited to 'src/battle_anim_effects_2.c')
-rwxr-xr-x | src/battle_anim_effects_2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 0578feed2..deeb30540 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -2758,7 +2758,7 @@ static void AnimSoftBoiledEgg_Step3_Callback2(struct Sprite *sprite) static void AnimSoftBoiledEgg_Step4(struct Sprite *sprite) { - if ((u16)gBattleAnimArgs[7] == 0xFFFF) + if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) { sprite->invisible = 1; if (sprite->data[7] == 0) @@ -3001,7 +3001,7 @@ void AnimSpeedDust(struct Sprite *sprite) } } -void AnimTask_LoadMusicNotesPal(u8 taskId) +void AnimTask_LoadMusicNotesPals(u8 taskId) { int i; u8 paletteNums[NUM_MUSIC_NOTE_PAL_TAGS]; @@ -3019,7 +3019,7 @@ void AnimTask_LoadMusicNotesPal(u8 taskId) DestroyAnimVisualTask(taskId); } -void AnimTask_FreeMusicNotesPal(u8 taskId) +void AnimTask_FreeMusicNotesPals(u8 taskId) { int i; for (i = 0; i < NUM_MUSIC_NOTE_PAL_TAGS; i++) @@ -3441,7 +3441,7 @@ static void AnimOrbitFastStep(struct Sprite *sprite) break; } - if ((u16)gBattleAnimArgs[7] == 0xFFFF) + if ((u16)gBattleAnimArgs[ARG_RET_ID] == 0xFFFF) DestroyAnimSprite(sprite); } @@ -3814,12 +3814,12 @@ void AnimGuardRing(struct Sprite *sprite) void AnimTask_IsFuryCutterHitRight(u8 taskId) { - gBattleAnimArgs[7] = gAnimDisableStructPtr->furyCutterCounter & 1; + gBattleAnimArgs[ARG_RET_ID] = gAnimDisableStructPtr->furyCutterCounter & 1; DestroyAnimVisualTask(taskId); } void AnimTask_GetFuryCutterHitCount(u8 taskId) { - gBattleAnimArgs[7] = gAnimDisableStructPtr->furyCutterCounter; + gBattleAnimArgs[ARG_RET_ID] = gAnimDisableStructPtr->furyCutterCounter; DestroyAnimVisualTask(taskId); } |