summaryrefslogtreecommitdiff
path: root/src/battle/anim
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim')
-rw-r--r--src/battle/anim/bottle.c2
-rw-r--r--src/battle/anim/copy_orb.c4
-rw-r--r--src/battle/anim/current.c2
-rw-r--r--src/battle/anim/dark.c6
-rw-r--r--src/battle/anim/dragon.c2
-rw-r--r--src/battle/anim/draw.c4
-rw-r--r--src/battle/anim/espeed.c8
-rw-r--r--src/battle/anim/flying.c18
-rw-r--r--src/battle/anim/ghost.c10
-rw-r--r--src/battle/anim/ground.c8
-rw-r--r--src/battle/anim/lunge.c2
-rw-r--r--src/battle/anim/normal.c8
-rw-r--r--src/battle/anim/note_spin.c2
-rw-r--r--src/battle/anim/psychic.c10
-rw-r--r--src/battle/anim/ring.c2
-rw-r--r--src/battle/anim/rock.c4
-rw-r--r--src/battle/anim/seed.c4
-rw-r--r--src/battle/anim/shield.c2
-rw-r--r--src/battle/anim/unused_2.c12
-rw-r--r--src/battle/anim/unused_7.c2
20 files changed, 56 insertions, 56 deletions
diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c
index 13a3d538e..d1cee94d9 100644
--- a/src/battle/anim/bottle.c
+++ b/src/battle/anim/bottle.c
@@ -126,7 +126,7 @@ static void sub_80CCF70(struct Sprite* sprite)
}
break;
case 3:
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->data[0]++;
break;
case 4:
diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c
index 9d078f440..b7b4239df 100644
--- a/src/battle/anim/copy_orb.c
+++ b/src/battle/anim/copy_orb.c
@@ -55,13 +55,13 @@ void sub_80CB4CC(struct Sprite* sprite)
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0];
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1];
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->data[0]++;
break;
}
case 1:
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
if (sprite->affineAnimEnded)
{
ChangeSpriteAffineAnim(sprite, 1);
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 12da95fa8..32d09ddf2 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -808,7 +808,7 @@ void sub_80D6E9C(u8 taskId)
}
break;
case 3:
- gSprites[task->data[15]].invisible = 0;
+ gSprites[task->data[15]].invisible = FALSE;
DestroyAnimVisualTask(taskId);
break;
}
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index 08aafe195..bae52d83f 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -233,7 +233,7 @@ static void sub_80DFC9C(u8 taskId)
gTasks[taskId].data[2] = 0;
if (r2 == 16)
{
- gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 1;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = TRUE;
DestroyAnimVisualTask(taskId);
}
}
@@ -797,12 +797,12 @@ void sub_80E0918(u8 taskId)
{
u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0;
MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2);
- gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 0;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = FALSE;
if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
{
MoveBattlerSpriteToBG(gBattleAnimAttacker ^ 2, toBG2 ^ 1);
- gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].invisible = FALSE;
}
DestroyAnimVisualTask(taskId);
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index 6ac0746a3..d49f83952 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -214,7 +214,7 @@ void sub_80DF5A0(struct Sprite *sprite)
sprite->data[1] = gBattleAnimArgs[3];
sprite->data[3] = gBattleAnimArgs[4];
sprite->data[5] = gBattleAnimArgs[5];
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix);
sprite->callback = sub_8078504;
}
diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c
index 34f661f6a..a42d8617f 100644
--- a/src/battle/anim/draw.c
+++ b/src/battle/anim/draw.c
@@ -144,7 +144,7 @@ static void sub_80D0E8C(struct Sprite* sprite)
}
if (++sprite->data[1] > 16)
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
sprite->data[0]++;
}
break;
@@ -184,7 +184,7 @@ static void sub_80D0E8C(struct Sprite* sprite)
}
if (++sprite->data[1] > 16)
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
DestroyAnimSprite(sprite);
}
break;
diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c
index cd3b70542..27dc47c21 100644
--- a/src/battle/anim/espeed.c
+++ b/src/battle/anim/espeed.c
@@ -73,7 +73,7 @@ void sub_80D15E0(u8 taskId)
if (RunAffineAnimFromTaskData(task) == 0)
{
gSprites[task->data[0]].pos2.y = 0;
- gSprites[task->data[0]].invisible = 1;
+ gSprites[task->data[0]].invisible = TRUE;
DestroyAnimVisualTask(taskId);
}
}
@@ -170,9 +170,9 @@ void sub_80D1808(u8 taskId)
{
task->data[1] = 0;
if (++task->data[2] & 1)
- gSprites[task->data[15]].invisible = 0;
+ gSprites[task->data[15]].invisible = FALSE;
else
- gSprites[task->data[15]].invisible = 1;
+ gSprites[task->data[15]].invisible = TRUE;
if (++task->data[3] >= task->data[13])
{
@@ -184,7 +184,7 @@ void sub_80D1808(u8 taskId)
}
else
{
- gSprites[task->data[15]].invisible = 0;
+ gSprites[task->data[15]].invisible = FALSE;
DestroyAnimVisualTask(taskId);
}
}
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index 50fc8ad87..422d748ee 100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
@@ -498,7 +498,7 @@ static void sub_80DA300(struct Sprite *sprite)
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3];
sprite->callback = sub_80DA348;
- gSprites[GetAnimBattlerSpriteId(0)].invisible = 1;
+ gSprites[GetAnimBattlerSpriteId(0)].invisible = TRUE;
}
static void sub_80DA348(struct Sprite *sprite)
@@ -558,7 +558,7 @@ static void sub_80DA410(struct Sprite *sprite)
//The below if statement relies on overflow when cast to unsigned whenver pos1.x and pos2.x add up to less than 32.
if ((u32) (sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160)
{
- gSprites[GetAnimBattlerSpriteId(0)].invisible = 0;
+ gSprites[GetAnimBattlerSpriteId(0)].invisible = FALSE;
DestroyAnimSprite(sprite);
}
}
@@ -1049,7 +1049,7 @@ static void sub_80DB194(struct Sprite *sprite)
{
case 0:
InitAnimSpritePos(sprite, 1);
- gSprites[GetAnimBattlerSpriteId(0)].invisible = 1;
+ gSprites[GetAnimBattlerSpriteId(0)].invisible = TRUE;
++sprite->data[0];
break;
case 1:
@@ -1080,7 +1080,7 @@ static void sub_80DB1F4(struct Sprite *sprite)
sprite->pos2.y -= 10;
if (sprite->pos1.y + sprite->pos2.y < -32)
{
- gSprites[GetAnimBattlerSpriteId(0)].invisible = 0;
+ gSprites[GetAnimBattlerSpriteId(0)].invisible = FALSE;
DestroyAnimSprite(sprite);
}
}
@@ -1092,7 +1092,7 @@ static void sub_80DB288(struct Sprite *sprite)
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3];
sprite->callback = sub_80DB2D0;
- gSprites[GetAnimBattlerSpriteId(0)].invisible = 1;
+ gSprites[GetAnimBattlerSpriteId(0)].invisible = TRUE;
}
static void sub_80DB2D0(struct Sprite *sprite)
@@ -1108,7 +1108,7 @@ static void sub_80DB2D0(struct Sprite *sprite)
}
else
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
if (sprite->data[3]++ > 20)
{
sprite->callback = sub_80DB330;
@@ -1122,7 +1122,7 @@ static void sub_80DB330(struct Sprite *sprite)
if (sprite->pos1.y + sprite->pos2.y > -32)
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
}
if (sprite->pos2.y > 0)
@@ -1329,12 +1329,12 @@ void unref_sub_80DB6E4(u8 taskId)
if (gBattleAnimArgs[0] == 0)
{
u8 spriteId = GetAnimBattlerSpriteId(0);
- gSprites[spriteId].invisible = 1;
+ gSprites[spriteId].invisible = TRUE;
}
else
{
u8 spriteId = GetAnimBattlerSpriteId(0);
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
}
DestroyAnimVisualTask(taskId);
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index eddf4aac0..ed5445c10 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -723,7 +723,7 @@ static void sub_80DE6B0(u8 taskId)
BlendPalette(task->data[4], 16, 0, RGB(13, 0, 15));
break;
case 2:
- gSprites[task->data[14]].invisible = 1;
+ gSprites[task->data[14]].invisible = TRUE;
obj_delete_but_dont_free_vram(&gSprites[task->data[0]]);
FreeSpritePaletteByTag(0x2771);
REG_BLDCNT = 0;
@@ -774,7 +774,7 @@ static void sub_80DE7B8(struct Sprite *sprite)
sprite->pos1.x = battler1X;
sprite->pos1.y = battler1Y;
sprite->callback = sub_80DE8D8;
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
}
static void sub_80DE8D8(struct Sprite *sprite)
@@ -1102,7 +1102,7 @@ static void sub_80DF018(struct Sprite *sprite)
REG_BLDALPHA = (16 - sprite->data[2]) | (sprite->data[2] << 8);
if (sprite->data[2] == 16)
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->callback = sub_80DF090;
}
}
@@ -1153,7 +1153,7 @@ static void sub_80DF0B8(struct Sprite *sprite)
sprite->data[6] = (coeffB << 8) | coeffA;
if (coeffB == 16 && coeffA == 0)
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->callback = sub_80DF18C;
}
}
@@ -1301,7 +1301,7 @@ static void sub_80DF3D8(struct Sprite *sprite)
static void sub_80DF49C(struct Sprite *sprite)
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker];
sprite->data[0] = 128;
sprite->data[1] = 10;
diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c
index 8d342a2f6..eebba4810 100644
--- a/src/battle/anim/ground.c
+++ b/src/battle/anim/ground.c
@@ -337,7 +337,7 @@ static void sub_80E1284(u8 taskId)
if (task->data[14] < 0)
task->data[14] = 0;
- gSprites[task->data[10]].invisible = 1;
+ gSprites[task->data[10]].invisible = TRUE;
task->data[0]++;
break;
case 1:
@@ -376,7 +376,7 @@ static void sub_80E1284(u8 taskId)
break;
case 4:
DestroyAnimVisualTask(taskId);
- gSprites[task->data[10]].invisible = 1;
+ gSprites[task->data[10]].invisible = TRUE;
break;
}
}
@@ -384,7 +384,7 @@ static void sub_80E1284(u8 taskId)
static void sub_80E143C(u8 taskId)
{
u8 spriteId = GetAnimBattlerSpriteId(0);
- gSprites[spriteId].invisible = 1;
+ gSprites[spriteId].invisible = TRUE;
gSprites[spriteId].pos2.x = 0;
gSprites[spriteId].pos2.y = 0;
@@ -416,7 +416,7 @@ static void sub_80E14DC(u8 taskId)
{
case 0:
task->data[10] = GetAnimBattlerSpriteId(0);
- gSprites[task->data[10]].invisible = 0;
+ gSprites[task->data[10]].invisible = FALSE;
gSprites[task->data[10]].pos2.x = 0;
gSprites[task->data[10]].pos2.y = 160 - gSprites[task->data[10]].pos1.y;
task->data[0]++;
diff --git a/src/battle/anim/lunge.c b/src/battle/anim/lunge.c
index f23b34efc..da3eda56a 100644
--- a/src/battle/anim/lunge.c
+++ b/src/battle/anim/lunge.c
@@ -49,7 +49,7 @@ const struct SpriteTemplate gSpriteTemplate_83D6DFC =
void sub_80CD774(struct Sprite* sprite)
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->data[0] = 0;
switch (gBattleAnimArgs[0])
{
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index 40aaba4b8..c3100a15d 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -355,7 +355,7 @@ static void AnimSimplePaletteBlend(struct Sprite *sprite)
{
u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
BeginNormalPaletteFade(selectedPalettes, gBattleAnimArgs[1], gBattleAnimArgs[2], gBattleAnimArgs[3], gBattleAnimArgs[4]);
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->callback = AnimSimplePaletteBlendStep;
}
@@ -401,7 +401,7 @@ static void sub_80E1E2C(struct Sprite *sprite)
selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]);
BlendPalettes(selectedPalettes, gBattleAnimArgs[4], gBattleAnimArgs[3]);
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->callback = sub_80E1E80;
}
@@ -724,7 +724,7 @@ static void sub_80E24B8(struct Sprite *sprite)
{
u16 var0;
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->data[0] = -gBattleAnimArgs[0];
sprite->data[1] = gBattleAnimArgs[1];
sprite->data[2] = gBattleAnimArgs[1];
@@ -1921,7 +1921,7 @@ void sub_80E4300(u8 taskId)
else
{
gTasks[taskId].data[0] = ewram17800[gBattleAnimAttacker].invisible;
- ewram17800[gBattleAnimAttacker].invisible = 1;
+ ewram17800[gBattleAnimAttacker].invisible = TRUE;
gTasks[taskId].func = sub_80E4368;
gAnimVisualTaskCount--;
}
diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c
index 165820cc1..c2b4e169c 100644
--- a/src/battle/anim/note_spin.c
+++ b/src/battle/anim/note_spin.c
@@ -69,7 +69,7 @@ void sub_80D2E68(struct Sprite *sprite)
if (sprite->data[0] == 0)
{
sprite->data[1] = 120 - gBattleAnimArgs[0];
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
}
if (++sprite->data[0] == sprite->data[1])
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 714f93030..8bff55f47 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -524,14 +524,14 @@ static void sub_80DB92C(struct Sprite *sprite)
u8 bank = bankCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
if (IsAnimBankSpriteVisible(bank))
- gSprites[gBattlerSpriteIds[bank]].invisible = 0;
+ gSprites[gBattlerSpriteIds[bank]].invisible = FALSE;
bank = bankCopy ^ 2;
if (IsAnimBankSpriteVisible(bank))
- gSprites[gBattlerSpriteIds[bank]].invisible = 0;
+ gSprites[gBattlerSpriteIds[bank]].invisible = FALSE;
}
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->callback = sub_80DB9E4;
}
}
@@ -721,7 +721,7 @@ static void sub_80DBD58(u8 taskId)
}
else
{
- gSprites[task->data[0]].invisible = 1;
+ gSprites[task->data[0]].invisible = TRUE;
gSprites[task->data[0]].pos1.x = 272;
sub_8078F40(task->data[0]);
DestroyAnimVisualTask(taskId);
@@ -1144,7 +1144,7 @@ void sub_80DC700(struct Sprite *sprite)
if (sprite->data[1] == 0)
{
sprite->data[0]++;
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
}
}
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 69e903921..999d10a59 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -432,7 +432,7 @@ static void sub_80D154C(struct Sprite* sprite)
{
if ((u16)gBattleAnimArgs[7] == 0xFFFF)
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
if (sprite->data[7] == 0)
sprite->callback = sub_80D158C;
else
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index 6f0ed4616..a16be68e5 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -782,12 +782,12 @@ void sub_80DD8E8(struct Sprite *sprite)
sprite->data[0] = 3;
sprite->data[1] = gBattleAnimArgs[3];
sprite->callback = sub_80DD928;
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
}
static void sub_80DD928(struct Sprite *sprite)
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
if (sprite->data[3] != 0)
{
sprite->pos2.y = sprite->data[2] + sprite->data[3];
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c
index 9b0d87eca..2f679a454 100644
--- a/src/battle/anim/seed.c
+++ b/src/battle/anim/seed.c
@@ -69,7 +69,7 @@ static void AnimLeechSeedStep(struct Sprite* sprite)
{
if (TranslateAnimArc(sprite))
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->data[0] = 10;
sprite->callback = WaitAnimForDuration;
StoreSpriteCallbackInData(sprite, AnimLeechSeedSprouts);
@@ -78,7 +78,7 @@ static void AnimLeechSeedStep(struct Sprite* sprite)
static void AnimLeechSeedSprouts(struct Sprite* sprite)
{
- sprite->invisible = 0;
+ sprite->invisible = FALSE;
StartSpriteAnim(sprite, 1);
sprite->data[0] = 60;
sprite->callback = WaitAnimForDuration;
diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c
index 6e601efa3..4babfee65 100644
--- a/src/battle/anim/shield.c
+++ b/src/battle/anim/shield.c
@@ -86,7 +86,7 @@ static void sub_80CCE0C(struct Sprite* sprite)
REG_BLDALPHA = (sprite->data[7] << 8) | (16 - sprite->data[7]);
if (sprite->data[7] == 16)
{
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
sprite->callback = sub_807861C;
}
}
diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c
index 0209823b8..a1c1a0785 100644
--- a/src/battle/anim/unused_2.c
+++ b/src/battle/anim/unused_2.c
@@ -105,15 +105,15 @@ void unref_sub_80CCB6C(struct Sprite* sprite)
{
if (sprite->data[3] & 1)
{
- sprite->invisible = 0;
- gSprites[sprite->data[0]].invisible = 0;
- gSprites[sprite->data[1]].invisible = 0;
+ sprite->invisible = FALSE;
+ gSprites[sprite->data[0]].invisible = FALSE;
+ gSprites[sprite->data[1]].invisible = FALSE;
}
else
{
- sprite->invisible = 1;
- gSprites[sprite->data[0]].invisible = 1;
- gSprites[sprite->data[1]].invisible = 1;
+ sprite->invisible = TRUE;
+ gSprites[sprite->data[0]].invisible = TRUE;
+ gSprites[sprite->data[1]].invisible = TRUE;
}
sprite->data[2] = 0;
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index 1ab6663f1..5b4781842 100644
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
@@ -60,5 +60,5 @@ void sub_80CF3C4(struct Sprite* sprite)
sprite->data[1] = gBattleAnimArgs[3];
sprite->data[2] = a;
sprite->callback = sub_80CF374;
- sprite->invisible = 1;
+ sprite->invisible = TRUE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 09:12:07 +0000