summaryrefslogtreecommitdiff
path: root/src/pokemon_animation.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokemon_animation.c')
-rw-r--r--src/pokemon_animation.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index c50aa4a75..e75f2eeba 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -938,14 +938,14 @@ void StartMonSummaryAnimation(struct Sprite *sprite, u8 frontAnimId)
void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet)
{
- u8 nature, taskId, animId, bank;
+ u8 nature, taskId, animId, battlerId;
taskId = CreateTask(Task_HandleMonAnimation, 128);
gTasks[taskId].tPtrLO = (u32)(sprite) >> 0x10;
gTasks[taskId].tPtrHI = (u32)(sprite);
- bank = sprite->data[0];
- nature = GetNature(&gPlayerParty[gBattlerPartyIndexes[bank]]);
+ battlerId = sprite->data[0];
+ nature = GetNature(&gPlayerParty[gBattlerPartyIndexes[battlerId]]);
animId = 3 * backAnimSet + sBackAnimNatureModTable[nature];
gTasks[taskId].tAnimId = sBackAnimationIds[animId];
@@ -2347,7 +2347,7 @@ static void pokemonanimfunc_27(struct Sprite *sprite)
sprite->invisible = sprite->data[4];
if (++sprite->data[2] > 19)
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
sprite->data[3] = 2;
@@ -3069,17 +3069,17 @@ static void pokemonanimfunc_35(struct Sprite *sprite)
{
sprite->data[7] = 0;
sprite->data[2]++;
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
}
else
{
sprite->data[7]++;
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
}
if (sprite->data[2] > 10)
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
sprite->callback = SpriteCB_SetDummyOnAnimEnd;
}
}