diff options
Diffstat (limited to 'src')
38 files changed, 188 insertions, 197 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; } diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index d4589beb5..881f13c97 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1235,7 +1235,7 @@ static void sub_812C268(struct Sprite *sprite) REG_BLDALPHA = ((16 - sprite->data[1]) << 8) | sprite->data[1]; if (--sprite->data[1] < 0) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812C2A4; } } @@ -1295,7 +1295,7 @@ static void sub_812C380(struct Sprite *sprite) REG_BLDALPHA = 0; StartSpriteAffineAnim(sprite, 1); sprite->data[2] = 0; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->affineAnimPaused = 1; sprite->callback = sub_812C40C; } @@ -1305,7 +1305,7 @@ static void sub_812C40C(struct Sprite *sprite) { if (sprite->data[2]++ > 9) { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->affineAnimPaused = 0; if (sprite->affineAnimEnded) sprite->callback = sub_812C450; @@ -1362,7 +1362,7 @@ static void sub_812C4FC(struct Sprite *sprite) } if (sprite->data[0] == 0) - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->data[0] < 0) { @@ -1560,7 +1560,7 @@ static void sub_812C990(struct Sprite *sprite) sub_8078764(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812CA04; } @@ -1569,7 +1569,7 @@ static void sub_812CA04(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->affineAnimEnded) sprite->data[0]++; break; @@ -1599,7 +1599,7 @@ static void sub_812CA04(struct Sprite *sprite) case 5: if (sprite->affineAnimEnded) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812CAD0; } break; @@ -2028,13 +2028,13 @@ static void sub_812D294(struct Sprite *sprite) { u16 var = sprite->data[0]; if ((var & 1) == 0) - sprite->invisible = 1; + sprite->invisible = TRUE; else - sprite->invisible = 0; + sprite->invisible = FALSE; } if (sprite->data[0] > 30) - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->data[0] == 61) { @@ -2095,7 +2095,7 @@ static void sub_812D3AC(struct Sprite *sprite) if (++sprite->data[3] == 9) { sprite->data[3] = 0; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; sub_8078F40(spriteId); sprite->data[0]++; } @@ -2178,11 +2178,11 @@ static void sub_812D5E8(struct Sprite *sprite) else { if (sprite->data[1] == 2) - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->data[1] == 3) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[1] = -1; } @@ -2504,8 +2504,8 @@ static void sub_812DEAC(struct Sprite *sprite) gSprites[spriteId2].data[2] = gBattleAnimArgs[1]; gSprites[spriteId1].data[7] = -1; gSprites[spriteId2].data[7] = -1; - gSprites[spriteId1].invisible = 1; - gSprites[spriteId2].invisible = 1; + gSprites[spriteId1].invisible = TRUE; + gSprites[spriteId2].invisible = TRUE; gSprites[spriteId1].callback = sub_812E0F8; gSprites[spriteId2].callback = sub_812E0F8; @@ -2525,19 +2525,19 @@ static void sub_812DFEC(struct Sprite *sprite) sprite->data[3] = var0 & 0xFF; if (sprite->data[4] == 0 && sprite->pos2.y < -8) { - gSprites[sprite->data[6]].invisible = 0; + gSprites[sprite->data[6]].invisible = FALSE; sprite->data[4]++; } if (sprite->data[4] == 1 && sprite->pos2.y < -16) { - gSprites[sprite->data[7]].invisible = 0; + gSprites[sprite->data[7]].invisible = FALSE; sprite->data[4]++; } if (--sprite->data[1] == -1) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812E09C; } } @@ -2555,24 +2555,16 @@ static void sub_812E09C(struct Sprite *sprite) static void sub_812E0F8(struct Sprite *sprite) { - u16 d2; - register u16 d3 asm("r1"); - int var0; - s8 var1; - - if (!sprite->invisible) - { - d2 = sprite->data[2]; - d3 = sprite->data[3]; - var0 = d2 + d3; - var1 = var0 >> 8; - sprite->pos2.y -= var1; - sprite->data[3] = var0 & 0xFF; - if (--sprite->data[1] == -1) - { - sprite->invisible = 1; - sprite->callback = SpriteCallbackDummy; - } + if (sprite->invisible) + return; + + sprite->data[3] += sprite->data[2]; + sprite->pos2.y -= sprite->data[3] >> 8; + sprite->data[3] &= 0xFF; + if (sprite->data[1]-- == 0) + { + sprite->invisible = TRUE; + sprite->callback = SpriteCallbackDummy; } } @@ -3102,7 +3094,7 @@ static void sub_812ED84(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sub_8078764(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_812EE00; } @@ -3111,7 +3103,7 @@ static void sub_812EE00(struct Sprite *sprite) switch (sprite->data[1]) { case 0: - sprite->invisible = 0; + sprite->invisible = FALSE; if (sprite->affineAnimEnded) sprite->data[1]++; break; @@ -3125,7 +3117,7 @@ static void sub_812EE00(struct Sprite *sprite) case 2: if (sprite->affineAnimEnded) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[1]++; } break; @@ -4593,7 +4585,7 @@ static void sub_8130FE0(struct Sprite *sprite) REG_BLDALPHA = (sprite->data[2] << 8) | sprite->data[1]; if (++sprite->data[0] == 32) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[5]++; } break; @@ -4666,7 +4658,7 @@ void sub_81312E4(u8 taskId) { gTasks[taskId].data[3] = 0; sub_8078F40(spriteId); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].data[0]++; } } @@ -4695,7 +4687,7 @@ static void sub_8131408(u8 taskId) case 0: gSprites[spriteId].pos2.y = -200; gSprites[spriteId].pos2.x = 200; - gSprites[spriteId].invisible = 0; + gSprites[spriteId].invisible = FALSE; gTasks[taskId].data[10] = 0; gTasks[taskId].data[0]++; break; @@ -4858,8 +4850,8 @@ void sub_81316F8(u8 taskId) gSprites[spriteId2].data[7] = 0; gSprites[spriteId1].data[7] = 0; gTasks[taskId].data[0] = 2; - gSprites[spriteId2].invisible = 0; - gSprites[spriteId1].invisible = 1; + gSprites[spriteId2].invisible = FALSE; + gSprites[spriteId1].invisible = TRUE; gSprites[spriteId2].oam.objMode = ST_OAM_OBJ_NORMAL; gSprites[spriteId1].oam.objMode = ST_OAM_OBJ_NORMAL; gSprites[spriteId2].callback = sub_8131838; @@ -5748,13 +5740,13 @@ void sub_8131EB8(struct Sprite *sprite) sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16; sprite->data[0] = -32; sprite->data[7]++; - sprite->invisible = 0; + sprite->invisible = FALSE; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT && !IsContest()) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET)].subpriority - 1; } else { - sprite->invisible = 1; + sprite->invisible = TRUE; } break; case 1: diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index d9cc2a477..e86b9359c 100755 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -582,7 +582,7 @@ void sub_813F798(u8 taskId) break; case 2: sub_8078F40(spriteId); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; DestroyAnimVisualTask(taskId); break; } @@ -847,7 +847,7 @@ static void sub_813FEC8(struct Sprite *sprite) break; case 2: sub_8078F40(spriteId); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].data[0]++; break; default: @@ -1173,7 +1173,7 @@ static void sub_81404E4(struct Sprite *sprite) } break; case 2: - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0]++; break; default: @@ -1223,7 +1223,7 @@ static void sub_81405F4(struct Sprite *sprite) sub_8141314(1, gBattleAnimTarget, 14, ballIndex); LABEL: - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = 0; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = FALSE; StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1); AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]); gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] = 0x1000; @@ -1234,7 +1234,7 @@ static void sub_81406BC(struct Sprite *sprite) int next = FALSE; if (sprite->animEnded) - sprite->invisible = 1; + sprite->invisible = TRUE; if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded) { @@ -1942,7 +1942,7 @@ static void sub_814191C(u8 taskId) gSprites[spriteId].callback = sub_8141B74; gSprites[spriteId].pos2.x = -32; gSprites[spriteId].pos2.y = 32; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; if (gTasks[taskId].data[11] == 0) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) @@ -1998,7 +1998,7 @@ static void sub_8141B74(struct Sprite *sprite) } else { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->pos2.x += 5; sprite->pos2.y -= 5; if (sprite->pos2.x > 32) @@ -2050,7 +2050,7 @@ static void sub_8141CF4(struct Sprite *sprite) if (TranslateAnimArc(sprite)) { sprite->data[0] = 0; - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = sub_8141D20; } } diff --git a/src/battle_main.c b/src/battle_main.c index 95edb3aee..040d42ef9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1292,9 +1292,8 @@ void c2_8011A1C(void) gScanlineEffectRegBuffers[0][i] = 0xF0; gScanlineEffectRegBuffers[1][i] = 0xF0; } - for (i = 80; i < 160; i++) + for (; i < 160; i++) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; } diff --git a/src/contest_link_80C2020.c b/src/contest_link_80C2020.c index 356c806f8..e14880ee0 100644 --- a/src/contest_link_80C2020.c +++ b/src/contest_link_80C2020.c @@ -1378,12 +1378,12 @@ void sub_80C3698(const u8 *text) sprite = &gSprites[eContestLink80C2020Struct2018000.unk_01]; sprite->pos1.x = x + 32; sprite->pos1.y = 80; - sprite->invisible = 0; + sprite->invisible = FALSE; for (i = 0; i < 3; i++) { gSprites[sprite->data[i]].pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64; gSprites[sprite->data[i]].pos1.y = sprite->pos1.y; - gSprites[sprite->data[i]].invisible = 0; + gSprites[sprite->data[i]].invisible = FALSE; } gBattle_WIN0H = 0x00F0; @@ -1397,9 +1397,9 @@ void sub_80C3764(void) struct Sprite *sprite; sprite = &gSprites[eContestLink80C2020Struct2018000.unk_01]; - sprite->invisible = 1; + sprite->invisible = TRUE; for (i = 0; i < 3; i++) - gSprites[sprite->data[i]].invisible = 1; + gSprites[sprite->data[i]].invisible = TRUE; gBattle_WIN0H = 0; gBattle_WIN0V = 0; @@ -2025,7 +2025,7 @@ void sub_80C3CB8(struct Sprite *sprite) if (sprite->pos1.x < -32) { sprite->callback = SpriteCallbackDummy; - sprite->invisible = 1; + sprite->invisible = TRUE; eContestLink80C2020Struct2018000.unk_06 = 2; } } @@ -2062,7 +2062,7 @@ void sub_80C3DF0(struct Sprite *sprite) sprite->data[4] = var0; sprite->pos1.y++; if (eContestLink80C2020Struct2018000.unk_09) - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->pos1.x > 248 || sprite->pos1.y > 116) { diff --git a/src/credits.c b/src/credits.c index 1ab6ed859..28a4994be 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1126,8 +1126,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) switch (data) { case 0: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1137,8 +1137,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); break; case 1: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1148,8 +1148,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); break; case 2: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1159,8 +1159,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); break; case 3: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = -32; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; @@ -1170,8 +1170,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); break; case 4: - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 88; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 152; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; diff --git a/src/decoration.c b/src/decoration.c index f999f4edd..35b9ff47f 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -3039,15 +3039,15 @@ void sub_81009C0(struct Sprite *sprite) { if (sprite->data[6] < 15) { - sprite->invisible = 0; + sprite->invisible = FALSE; } else { - sprite->invisible = 1; + sprite->invisible = TRUE; } sprite->data[6] = (sprite->data[6] + 1) & 0x1f; } else { - sprite->invisible = 0; + sprite->invisible = FALSE; } } @@ -3239,7 +3239,7 @@ void sub_8100EEC(u8 taskId) { Menu_EraseWindowRect(0, 0, 29, 19); gSprites[gUnknown_020391A8].data[7] = 0; - gSprites[gUnknown_020391A8].invisible = 0; + gSprites[gUnknown_020391A8].invisible = FALSE; gSprites[gUnknown_020391A8].callback = sub_8101698; gSprites[gUnknown_020391A9].pos1.x = 0x88; gSprites[gUnknown_020391A9].pos1.y = 0x48; @@ -3258,7 +3258,7 @@ void sub_8100FB4(u8 taskId) { gTasks[taskId].data[10] = 0; sub_810045C(); - gSprites[gUnknown_020391A8].invisible = 0; + gSprites[gUnknown_020391A8].invisible = FALSE; gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy; DisplayItemMessageOnField(taskId, gSecretBaseText_StopPuttingAwayDecor, sub_810156C, 0); } @@ -3278,7 +3278,7 @@ void sub_8101024(u8 taskId) if (MetatileBehavior_IsSecretBasePC(metatileBehavior) == TRUE || MetatileBehavior_IsPlayerRoomPCOn(metatileBehavior) == TRUE) { - gSprites[gUnknown_020391A8].invisible = 0; + gSprites[gUnknown_020391A8].invisible = FALSE; gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy; DisplayItemMessageOnField(taskId, gSecretBaseText_StopPuttingAwayDecor, sub_810156C, 0); } else @@ -3343,7 +3343,7 @@ void sub_8101118(u8 decorIdx, struct UnkStruct_020391B4 *unk_020391B4) void sub_8101198(u8 x, u8 y) { - gSprites[gUnknown_020391A8].invisible = 1; + gSprites[gUnknown_020391A8].invisible = TRUE; gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy; gSprites[gUnknown_020391A9].pos1.x = 0x88 + x * 16; gSprites[gUnknown_020391A9].pos1.y = 0x48 + y * 16; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 5071d1a75..24c2340ac 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -362,7 +362,7 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID) case 1: GetMonSpriteTemplate_803C56C(GetMonSpritePalStruct(mon)->tag, r5); spriteID = CreateSprite(&gUnknown_02024E8C, 120, 70, 6); - gSprites[spriteID].invisible = 1; + gSprites[spriteID].invisible = TRUE; gSprites[spriteID].callback = SpriteCallbackDummy; break; } @@ -679,7 +679,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) if (!gPaletteFade.active) { PlaySE(SE_EGG_HATCH); - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->callback = SpriteCB_Egg_5; sprite->data[0] = 0; } @@ -689,7 +689,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) { if (sprite->data[0] == 0) { - gSprites[gEggHatchData->pokeSpriteID].invisible = 0; + gSprites[gEggHatchData->pokeSpriteID].invisible = FALSE; StartSpriteAffineAnim(&gSprites[gEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 3f197f74c..d0f9d781d 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -223,10 +223,10 @@ static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite) sprite->subpriority = 1; else { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->subpriority = 20; if (sprite->data[6] > 112 && sprite->data[6] & 1) - sprite->invisible = 1; + sprite->invisible = TRUE; } if (matrixNum < 20) matrixNum = 20; @@ -501,13 +501,13 @@ u8 sub_8149E7C(u8 preEvoSpriteID, u8 postEvoSpriteID) gSprites[preEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB; gSprites[preEvoSpriteID].oam.affineMode = 1; gSprites[preEvoSpriteID].oam.matrixNum = 30; - gSprites[preEvoSpriteID].invisible = 0; + gSprites[preEvoSpriteID].invisible = FALSE; CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteID].oam.paletteNum * 16)], 16); gSprites[postEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB; gSprites[postEvoSpriteID].oam.affineMode = 1; gSprites[postEvoSpriteID].oam.matrixNum = 31; - gSprites[postEvoSpriteID].invisible = 0; + gSprites[postEvoSpriteID].invisible = FALSE; CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteID].oam.paletteNum * 16)], 16); gTasks[taskID].tEvoStopped = FALSE; @@ -591,11 +591,11 @@ static void PreEvoInVisible_PostEvoVisible_KillTask(u8 taskID) { gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = 1; + gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = TRUE; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 0; + gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = FALSE; DestroyTask(taskID); } @@ -604,11 +604,11 @@ static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID) { gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = 0; + gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = FALSE; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0; - gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 1; + gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = TRUE; DestroyTask(taskID); } diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 60568ee87..ea7fde015 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -238,7 +238,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 1; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; // postEvo sprite DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve], @@ -254,7 +254,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30); gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 2; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; LoadEvoSparkleSpriteAndPal(); @@ -455,7 +455,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 2; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; LoadEvoSparkleSpriteAndPal(); @@ -542,7 +542,7 @@ static void Task_EvolutionScene(u8 taskID) { case 0: BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); - gSprites[sEvoInfo.preEvoSpriteID].invisible = 0; + gSprites[sEvoInfo.preEvoSpriteID].invisible = FALSE; gTasks[taskID].tState++; break; case 1: // print 'whoa, poke is evolving!!!' msg diff --git a/src/field_effect.c b/src/field_effect.c index 9f53606c4..280eb20bc 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -888,7 +888,7 @@ u8 PokecenterHealEffectHelper(s16 x, s16 y) spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F220, x, y, 0); sprite = &gSprites[spriteIdAtEnd]; sprite->oam.priority = 2; - sprite->invisible = 1; + sprite->invisible = TRUE; SetSubspriteTables(sprite, &gUnknown_0839F1A0); return spriteIdAtEnd; } @@ -898,7 +898,7 @@ void SpriteCB_PokecenterMonitor(struct Sprite *sprite) if (sprite->data[0] != 0) { sprite->data[0] = 0; - sprite->invisible = 0; + sprite->invisible = FALSE; StartSpriteAnim(sprite, 1); } if (sprite->animEnded) @@ -918,7 +918,7 @@ void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3) { spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F250, a1, a2, 0); } - gSprites[spriteIdAtEnd].invisible = 1; + gSprites[spriteIdAtEnd].invisible = TRUE; gSprites[spriteIdAtEnd].data[0] = a0; } @@ -992,7 +992,7 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; if (gPlayerAvatar.flags & 0x08) { ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); @@ -1051,7 +1051,7 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0] playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gPlayerAvatar.preventStep = TRUE; ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; @@ -1080,7 +1080,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; PlaySE(SE_FALL); task->data[0]++; return FALSE; @@ -1677,7 +1677,7 @@ bool8 sub_80874CC(struct Task *task, struct ObjectEvent *objectEvent, struct Spr CameraObjectReset2(); FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - objectEvent->invisible = 1; + objectEvent->invisible = TRUE; task->data[0]++; return FALSE; } @@ -1702,7 +1702,7 @@ bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Spr if (sprite->animCmdIndex > 1) { task->data[0]++; - objectEvent->invisible = 0; + objectEvent->invisible = FALSE; CameraObjectReset1(); PlaySE(SE_M_DIG); ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); @@ -1791,7 +1791,7 @@ bool8 sub_8087774(struct Task *task, struct ObjectEvent *objectEvent, struct Spr { if (gSprites[task->data[1]].animCmdIndex == 2) { - objectEvent->invisible = 1; + objectEvent->invisible = TRUE; task->data[0]++; } return FALSE; @@ -1914,7 +1914,7 @@ void mapldr_080859D4(void) ScriptContext2_Enable(); FreezeObjectEvents(); gFieldCallback = NULL; - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CreateTask(sub_8087A74, 0); } @@ -1944,7 +1944,7 @@ void sub_8087AC8(struct Task *task) } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - objectEvent->invisible = 0; + objectEvent->invisible = FALSE; ScriptContext2_Disable(); UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087A74)); @@ -2062,7 +2062,7 @@ static void mapldr_08085D88(void) ScriptContext2_Enable(); FreezeObjectEvents(); gFieldCallback = NULL; - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CameraObjectReset2(); CreateTask(sub_8087E1C, 0); } @@ -2087,7 +2087,7 @@ void sub_8087E4C(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -3001,7 +3001,7 @@ void sub_808914C(struct Sprite *sprite) sprite->data[7]++; sprite->oam.affineMode = 0; FreeOamMatrix(sprite->oam.matrixNum); - sprite->invisible = 1; + sprite->invisible = TRUE; } } } @@ -3054,7 +3054,7 @@ void sub_80892A0(struct Task *task) CameraObjectReset2(); ObjectEventTurn(objectEvent, DIR_WEST); StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); - objectEvent->invisible = 0; + objectEvent->invisible = FALSE; task->data[1] = sub_8088F60(); sub_8088FC0(task->data[1]); sub_8088FFC(task->data[1], objectEvent->spriteId); diff --git a/src/field_specials.c b/src/field_specials.c index 4a2ddb180..9c444f93b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1596,7 +1596,7 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) void SpawnCameraDummy(void) { u8 objectEventId = SpawnSpecialObjectEventParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); - gObjectEvents[objectEventId].invisible = 1; + gObjectEvents[objectEventId].invisible = TRUE; CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId); } diff --git a/src/intro.c b/src/intro.c index d1f3fa1ea..f1904f86e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1046,7 +1046,7 @@ static void Task_IntroScrollDownAndShowEon(u8 taskId) { u8 spriteId = CreateSprite(&gSpriteTemplate_840AFF0, 200, 160, 10); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; } } else @@ -1403,7 +1403,7 @@ static void Task_IntroPokemonBattle(u8 taskId) gSprites[gTasks[taskId].data[4]].data[0] = 3; gSprites[gTasks[taskId].data[5]].data[0] = 3; spriteId = CreateSprite(&gSpriteTemplate_840B1F4, 0x78, 0x50, 15); - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; } if (gIntroFrameCounter == 800) PlaySE(SE_INTRO_BLAST); @@ -2207,7 +2207,7 @@ static void sub_813DE70(struct Sprite *sprite) case 3: if (sprite->pos1.y > 160) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0] = 1; } else diff --git a/src/main_menu.c b/src/main_menu.c index f271138d6..3237663a5 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -782,7 +782,7 @@ static void Task_NewGameSpeech2(u8 taskId) gSprites[spriteId].pos1.x = 136; gSprites[spriteId].pos1.y = 60; - gSprites[spriteId].invisible = 0; + gSprites[spriteId].invisible = FALSE; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; StartSpriteFadeIn(taskId, 10); StartBackgroundFadeIn(taskId, 20); @@ -833,7 +833,7 @@ static void Task_NewGameSpeech6(u8 taskId) gSprites[spriteId].pos1.x = 104; gSprites[spriteId].pos1.y = 72; - gSprites[spriteId].invisible = 0; + gSprites[spriteId].invisible = FALSE; gSprites[spriteId].data[0] = 0; CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF); gTasks[taskId].func = Task_NewGameSpeech7; @@ -1439,26 +1439,26 @@ void AddBirchSpeechObjects(u8 taskId) spriteId = CreateBirchSprite(136, 60, 1); gSprites[spriteId].callback = nullsub_34; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].tBirchSpriteId = spriteId; spriteId = CreateAzurillSprite(0x68, 0x48); gSprites[spriteId].callback = nullsub_34; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gTasks[taskId].tAzurillSpriteId = spriteId; //Create Brendan sprite spriteId = CreateTrainerSprite(0, 120, 60, 0, eBrendanSprite); gSprites[spriteId].callback = nullsub_34; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].oam.priority = 0; gTasks[taskId].tBrendanSpriteId = spriteId; //Create May sprite spriteId = CreateTrainerSprite(1, 120, 60, 0, eMaySprite); gSprites[spriteId].callback = nullsub_34; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].oam.priority = 0; gTasks[taskId].tMaySpriteId = spriteId; } diff --git a/src/menu_cursor.c b/src/menu_cursor.c index 32578d1a4..254723f17 100644 --- a/src/menu_cursor.c +++ b/src/menu_cursor.c @@ -136,7 +136,7 @@ void MenuCursor_SetPos814A880(u8 a1, u8 a2) if (gUnknown_0203A3D0 != 0x40) { spr = &gSprites[gUnknown_0203A3D0]; - spr->invisible = 0; + spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; spr->pos1.x = a1; @@ -146,7 +146,7 @@ void MenuCursor_SetPos814A880(u8 a1, u8 a2) if (gUnknown_0203A3D1 != 0x40) { spr = &gSprites[gUnknown_0203A3D1]; - spr->invisible = 0; + spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; spr->pos1.x = a1; @@ -163,13 +163,13 @@ void sub_814A904(void) if (gUnknown_0203A3D0 != 0x40) { spr = &gSprites[gUnknown_0203A3D0]; - spr->invisible = 1; + spr->invisible = TRUE; } if (gUnknown_0203A3D1 != 0x40) { spr = &gSprites[gUnknown_0203A3D1]; - spr->invisible = 1; + spr->invisible = TRUE; } return; @@ -744,7 +744,7 @@ void MenuCursor_SetPos814AD7C(u8 a1, u8 a2) if (gUnknown_0203A3D2 != 0x40) { spr = &gSprites[gUnknown_0203A3D2]; - spr->invisible = 0; + spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; spr->pos1.x = a1; @@ -759,7 +759,7 @@ void sub_814ADC8() if (gUnknown_0203A3D2 != 0x40) { spr = &gSprites[gUnknown_0203A3D2]; - spr->invisible = 1; + spr->invisible = TRUE; } return; } diff --git a/src/party_menu.c b/src/party_menu.c index f20f2ad16..b5b00c947 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2885,11 +2885,11 @@ void SpriteCB_HeldItemIcon(struct Sprite *sprite) if (gSprites[data7].invisible) { - sprite->invisible = 1; + sprite->invisible = TRUE; } else { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->pos1.x = gSprites[data7].pos1.x + gSprites[data7].pos2.x; sprite->pos1.y = gSprites[data7].pos1.y + gSprites[data7].pos2.y; } @@ -2979,7 +2979,7 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item) if (!item) { - gSprites[heldItemSpriteId].invisible = 1; + gSprites[heldItemSpriteId].invisible = TRUE; } else { @@ -2988,7 +2988,7 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item) else StartSpriteAnim(&gSprites[heldItemSpriteId], 0); - gSprites[heldItemSpriteId].invisible = 0; + gSprites[heldItemSpriteId].invisible = FALSE; } gSprites[heldItemSpriteId].callback(&gSprites[heldItemSpriteId]); @@ -3159,7 +3159,7 @@ void SetHeldItemIconVisibility(u8 taskId, u8 monIndex) spriteId = GetMonHeldItemIconSpriteId(taskId, monIndex); if (!GetMonData(&gPlayerParty[monIndex], MON_DATA_HELD_ITEM)) { - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; } else { @@ -3181,7 +3181,7 @@ void SetHeldItemIconVisibility(u8 taskId, u8 monIndex) animNum = 0; } StartSpriteAnim(sprite2, animNum); - sprite->invisible = 0; + sprite->invisible = FALSE; } } diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 6a1b78192..40e0e850b 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -2386,7 +2386,7 @@ void sub_809CC04(void) gPokemonStorageSystemPtr->unk_11c4 = &gSprites[spriteId]; gPokemonStorageSystemPtr->unk_11c4->oam.priority = priority; if (sBoxCursorArea) - gPokemonStorageSystemPtr->unk_11c4->invisible = 1; + gPokemonStorageSystemPtr->unk_11c4->invisible = TRUE; } else { diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 57626fc9d..63a65a6f0 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -4125,7 +4125,7 @@ static void sub_80A1BC0(struct Sprite *sprite) else { sprite->data[1] = 0; - sprite->invisible = 0; + sprite->invisible = FALSE; } if (sprite->data[0] == 9) diff --git a/src/pokenav.c b/src/pokenav.c index c0ac3356f..1db1ec6cc 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -3505,7 +3505,7 @@ void sub_80F3008(u8 arg0) if (spriteId != MAX_SPRITES) { gPokenavStructPtr->unk87D0[i] = &gSprites[spriteId]; - gSprites[spriteId].invisible = 1; + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[2] = i == 0 ? -1 : 1; @@ -4030,7 +4030,7 @@ void sub_80F3D00(void) if (spriteId != MAX_SPRITES) { gPokenavStructPtr->unk8800[i] = &gSprites[spriteId]; - gPokenavStructPtr->unk8800[i]->invisible = 1; + gPokenavStructPtr->unk8800[i]->invisible = TRUE; } else { @@ -4099,13 +4099,13 @@ void sub_80F3E9C(struct Sprite *sprite) return; SeekSpriteAnim(sprite, 0); - sprite->invisible = 0; + sprite->invisible = FALSE; } sub_80F3E24(sprite); if (sprite->animEnded) { - sprite->invisible = 1; + sprite->invisible = TRUE; if (sprite->data[3] == sprite->data[2]) { if (sprite->data[3] == 9) @@ -4147,7 +4147,7 @@ void sub_80F3F20(u8 arg0, u8 arg1) sub_80F3E24(gPokenavStructPtr->unk8800[i]); sub_80F3FAC(); gPokenavStructPtr->unk8800[i]->callback = sub_80F3E04; - gPokenavStructPtr->unk8800[i]->invisible = 0; + gPokenavStructPtr->unk8800[i]->invisible = FALSE; } } } @@ -4162,7 +4162,7 @@ void sub_80F3FAC(void) if (gPokenavStructPtr->unk8800[i]) { SeekSpriteAnim(gPokenavStructPtr->unk8800[i], 0); - gPokenavStructPtr->unk8800[i]->invisible = 0; + gPokenavStructPtr->unk8800[i]->invisible = FALSE; } } } @@ -4230,7 +4230,7 @@ void sub_80F4138(struct Sprite *sprite) { if (sprite->data[0] == 0) { - sprite->invisible = 1; + sprite->invisible = TRUE; sprite->data[0] = 1; } } @@ -4238,7 +4238,7 @@ void sub_80F4138(struct Sprite *sprite) { if (sprite->data[0] == 1) { - sprite->invisible = 0; + sprite->invisible = FALSE; sprite->data[0] = 0; } } |