dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize sprite visibility to boolean

Browse Source
This commit is contained in:
Diegoisawesome
2018-09-10 10:25:58 -05:00
parent cb053b3a15
commit d9941cd1a8
27 changed files with 179 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim.c
+9 -9
View File
@@ -558,7 +558,7 @@ static void sub_80A40F4(u8 taskId)
s16 *selfData = gTasks[taskId].data; s16 *selfData = gTasks[taskId].data;
u8 battlerSpriteId = gBattlerSpriteIds[selfData[t1_MONBG_BATTLER]]; u8 battlerSpriteId = gBattlerSpriteIds[selfData[t1_MONBG_BATTLER]];
gSprites[battlerSpriteId].invisible = 1; gSprites[battlerSpriteId].invisible = TRUE;
if (!selfData[t1_CREATE_ANOTHER_TASK]) if (!selfData[t1_CREATE_ANOTHER_TASK])
{ {
@@ -699,7 +699,7 @@ void sub_80A438C(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
gBattle_BG1_Y = -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20; gBattle_BG1_Y = -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20;
if (setSpriteInvisible) if (setSpriteInvisible)
gSprites[gBattlerSpriteIds[battlerId]].invisible = 1; gSprites[gBattlerSpriteIds[battlerId]].invisible = TRUE;
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
@@ -734,7 +734,7 @@ void sub_80A438C(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
gBattle_BG2_Y = -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20; gBattle_BG2_Y = -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20;
if (setSpriteInvisible) if (setSpriteInvisible)
gSprites[gBattlerSpriteIds[battlerId]].invisible = 1; gSprites[gBattlerSpriteIds[battlerId]].invisible = TRUE;
SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X); SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y); SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
@@ -866,9 +866,9 @@ static void ScriptCmd_clearmonbg(void)
battlerId = gBattleAnimTarget; battlerId = gBattleAnimTarget;
if (sMonAnimTaskIdArray[0] != 0xFF) if (sMonAnimTaskIdArray[0] != 0xFF)
gSprites[gBattlerSpriteIds[battlerId]].invisible = 0; gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE;
if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF) if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF)
gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = 0; gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE;
else else
animBattlerId = 0; animBattlerId = 0;
@@ -973,9 +973,9 @@ static void ScriptCmd_clearmonbg_23(void)
battlerId = gBattleAnimTarget; battlerId = gBattleAnimTarget;
if (IsBattlerSpriteVisible(battlerId)) if (IsBattlerSpriteVisible(battlerId))
gSprites[gBattlerSpriteIds[battlerId]].invisible = 0; gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE;
if (animBattlerId > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK)) if (animBattlerId > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK))
gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = 0; gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE;
else else
animBattlerId = 0; animBattlerId = 0;
@@ -1745,7 +1745,7 @@ static void ScriptCmd_invisible(void)
spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
if (spriteId != 0xFF) if (spriteId != 0xFF)
gSprites[spriteId].invisible = 1; gSprites[spriteId].invisible = TRUE;
sBattleAnimScriptPtr += 2; sBattleAnimScriptPtr += 2;
} }
@@ -1756,7 +1756,7 @@ static void ScriptCmd_visible(void)
spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
if (spriteId != 0xFF) if (spriteId != 0xFF)
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
sBattleAnimScriptPtr += 2; sBattleAnimScriptPtr += 2;
} }
src/battle_bg.c
+4 -4
View File
@@ -412,8 +412,8 @@ void sub_8035D74(u8 taskId)
gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF; gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF;
gBattleStruct->field_7D = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0); gBattleStruct->field_7D = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0);
gBattleStruct->field_7E = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0); gBattleStruct->field_7E = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0);
gSprites[gBattleStruct->field_7D].invisible = 1; gSprites[gBattleStruct->field_7D].invisible = TRUE;
gSprites[gBattleStruct->field_7E].invisible = 1; gSprites[gBattleStruct->field_7E].invisible = TRUE;
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 2: case 2:
@@ -444,8 +444,8 @@ void sub_8035D74(u8 taskId)
PlaySE(SE_W231); PlaySE(SE_W231);
DestroyTask(taskId); DestroyTask(taskId);
gSprites[gBattleStruct->field_7D].invisible = 0; gSprites[gBattleStruct->field_7D].invisible = FALSE;
gSprites[gBattleStruct->field_7E].invisible = 0; gSprites[gBattleStruct->field_7E].invisible = FALSE;
gSprites[gBattleStruct->field_7E].oam.tileNum += 0x40; gSprites[gBattleStruct->field_7E].oam.tileNum += 0x40;
gSprites[gBattleStruct->field_7D].data[0] = 0; gSprites[gBattleStruct->field_7D].data[0] = 0;
gSprites[gBattleStruct->field_7E].data[0] = 1; gSprites[gBattleStruct->field_7E].data[0] = 1;
src/battle_controller_link_opponent.c
+1 -1
View File
@@ -442,7 +442,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
src/battle_controller_link_partner.c
+1 -1
View File
@@ -332,7 +332,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
src/battle_controller_opponent.c
+1 -1
View File
@@ -435,7 +435,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
src/battle_controller_player.c
+1 -1
View File
@@ -1398,7 +1398,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
src/battle_controller_player_partner.c
+1 -1
View File
@@ -520,7 +520,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();
} }
src/battle_controller_recorded_opponent.c
+1 -1
View File
@@ -425,7 +425,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();
} }
src/battle_controller_recorded_player.c
+1 -1
View File
@@ -415,7 +415,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
RecordedPlayerBufferExecCompleted(); RecordedPlayerBufferExecCompleted();
} }
src/battle_controller_wally.c
+1 -1
View File
@@ -371,7 +371,7 @@ static void DoHitAnimBlinkSpriteEffect(void)
if (gSprites[spriteId].data[1] == 32) if (gSprites[spriteId].data[1] == 32)
{ {
gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[1] = 0;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gDoingBattleAnim = FALSE; gDoingBattleAnim = FALSE;
WallyBufferExecCompleted(); WallyBufferExecCompleted();
} }
src/battle_dome.c
+28 -28
View File
@@ -3622,7 +3622,7 @@ static void sub_8190400(u8 taskId)
gSprites[r7].data[0] = i; gSprites[r7].data[0] = i;
gSprites[r7].data[1] = 0; gSprites[r7].data[1] = 0;
if (r9 == 1) if (r9 == 1)
gSprites[r7].invisible = 1; gSprites[r7].invisible = TRUE;
r7 = CreateSprite(&gUnknown_0860D050, 234, 80, 0); r7 = CreateSprite(&gUnknown_0860D050, 234, 80, 0);
StartSpriteAnim(&gSprites[r7], 1); StartSpriteAnim(&gSprites[r7], 1);
@@ -3644,7 +3644,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.y >= -32) if (sprite->pos1.y >= -32)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 40) if (++sprite->data[1] == 40)
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
@@ -3664,7 +3664,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.y <= 192) if (sprite->pos1.y <= 192)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 40) if (++sprite->data[1] == 40)
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
@@ -3684,7 +3684,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.x >= -32) if (sprite->pos1.x >= -32)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 64) if (++sprite->data[1] == 64)
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
@@ -3704,7 +3704,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.x <= 272) if (sprite->pos1.x <= 272)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 64) if (++sprite->data[1] == 64)
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
} }
@@ -3734,7 +3734,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.y >= -16) if (sprite->pos1.y >= -16)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 40) if (++sprite->data[1] == 40)
sprite->callback = SpriteCb_MonIcon; sprite->callback = SpriteCb_MonIcon;
} }
@@ -3756,7 +3756,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.y <= 176) if (sprite->pos1.y <= 176)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 40) if (++sprite->data[1] == 40)
sprite->callback = SpriteCb_MonIcon; sprite->callback = SpriteCb_MonIcon;
} }
@@ -3778,7 +3778,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.x >= -16) if (sprite->pos1.x >= -16)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 64) if (++sprite->data[1] == 64)
sprite->callback = SpriteCb_MonIcon; sprite->callback = SpriteCb_MonIcon;
} }
@@ -3800,7 +3800,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
if (sprite->pos1.x <= 256) if (sprite->pos1.x <= 256)
sprite->invisible = 0; sprite->invisible = FALSE;
if (++sprite->data[1] == 64) if (++sprite->data[1] == 64)
sprite->callback = SpriteCb_MonIcon; sprite->callback = SpriteCb_MonIcon;
} }
@@ -3828,29 +3828,29 @@ static void sub_8190B40(struct Sprite *sprite)
if ((gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated if ((gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated
&& sBattleDomeStruct->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].eliminatedAt)) && sBattleDomeStruct->unk_10 - 1 < gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].eliminatedAt))
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
} }
else if (!gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated else if (!gSaveBlock2Ptr->frontier.domeTrainers[tournmanetTrainerId].isEliminated
&& sBattleDomeStruct->unk_10 - 1 < r12) && sBattleDomeStruct->unk_10 - 1 < r12)
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
} }
else else
{ {
if (gTasks[taskId1].data[0] == 2) if (gTasks[taskId1].data[0] == 2)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
} }
else else
{ {
if (sBattleDomeStruct->unk_10 != 0) if (sBattleDomeStruct->unk_10 != 0)
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
} }
else else
{ {
if (gTasks[taskId1].data[0] == 2) if (gTasks[taskId1].data[0] == 2)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
} }
} }
@@ -3861,23 +3861,23 @@ static void sub_8190B40(struct Sprite *sprite)
if (sBattleDomeStruct->unk_10 > 1) if (sBattleDomeStruct->unk_10 > 1)
{ {
if (gTasks[taskId1].data[0] == 2) if (gTasks[taskId1].data[0] == 2)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
else else
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
} }
} }
else else
{ {
if (sBattleDomeStruct->unk_10 != 0) if (sBattleDomeStruct->unk_10 != 0)
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
} }
else else
{ {
if (gTasks[taskId1].data[0] == 2) if (gTasks[taskId1].data[0] == 2)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
} }
} }
@@ -3892,11 +3892,11 @@ static void sub_8190C6C(struct Sprite *sprite)
if (sBattleDomeStruct->unk_10 != 0) if (sBattleDomeStruct->unk_10 != 0)
{ {
if (gTasks[taskId1].data[0] == 2) if (gTasks[taskId1].data[0] == 2)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
else else
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
} }
} }
else else
@@ -3904,11 +3904,11 @@ static void sub_8190C6C(struct Sprite *sprite)
if (sBattleDomeStruct->unk_10 != 1) if (sBattleDomeStruct->unk_10 != 1)
{ {
if (gTasks[taskId1].data[0] == 2) if (gTasks[taskId1].data[0] == 2)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
else else
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
} }
} }
} }
@@ -4770,7 +4770,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerId), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF); sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerId), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF);
if (flags & 0x1E) if (flags & 0x1E)
gSprites[sBattleDomeStruct->arr[arrId]].invisible = 1; gSprites[sBattleDomeStruct->arr[arrId]].invisible = TRUE;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -4803,7 +4803,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId)
} }
if (flags & 0x1E) if (flags & 0x1E)
gSprites[sBattleDomeStruct->arr[2 + i + arrId]].invisible = 1; gSprites[sBattleDomeStruct->arr[2 + i + arrId]].invisible = TRUE;
} }
textPrinter.fontId = 2; textPrinter.fontId = 2;
textPrinter.x = 0; textPrinter.x = 0;
@@ -5208,7 +5208,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[0]), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF); sBattleDomeStruct->arr[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[0]), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF);
if (flags & 0x1E) if (flags & 0x1E)
gSprites[sBattleDomeStruct->arr[arrId]].invisible = 1; gSprites[sBattleDomeStruct->arr[arrId]].invisible = TRUE;
if (lost[0]) if (lost[0])
gSprites[sBattleDomeStruct->arr[arrId]].oam.paletteNum = 3; gSprites[sBattleDomeStruct->arr[arrId]].oam.paletteNum = 3;
@@ -5221,7 +5221,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
sBattleDomeStruct->arr[1 + arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[1]), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF); sBattleDomeStruct->arr[1 + arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[1]), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF);
if (flags & 0x1E) if (flags & 0x1E)
gSprites[sBattleDomeStruct->arr[1 + arrId]].invisible = 1; gSprites[sBattleDomeStruct->arr[1 + arrId]].invisible = TRUE;
if (lost[1]) if (lost[1])
gSprites[sBattleDomeStruct->arr[1 + arrId]].oam.paletteNum = 3; gSprites[sBattleDomeStruct->arr[1 + arrId]].oam.paletteNum = 3;
@@ -5257,7 +5257,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
} }
if (flags & 0x1E) if (flags & 0x1E)
gSprites[sBattleDomeStruct->arr[2 + i + arrId]].invisible = 1; gSprites[sBattleDomeStruct->arr[2 + i + arrId]].invisible = TRUE;
if (lost[0]) if (lost[0])
{ {
gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.paletteNum = 3; gSprites[sBattleDomeStruct->arr[2 + i + arrId]].oam.paletteNum = 3;
@@ -5297,7 +5297,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
} }
if (flags & 0x1E) if (flags & 0x1E)
gSprites[sBattleDomeStruct->arr[5 + i + arrId]].invisible = 1; gSprites[sBattleDomeStruct->arr[5 + i + arrId]].invisible = TRUE;
if (lost[1]) if (lost[1])
{ {
gSprites[sBattleDomeStruct->arr[5 + i + arrId]].oam.paletteNum = 3; gSprites[sBattleDomeStruct->arr[5 + i + arrId]].oam.paletteNum = 3;
src/battle_factory.c
+47 -47
View File
@@ -1273,8 +1273,8 @@ static void Select_InitAllSprites(void)
sFactorySelectScreen->menuCursor1SpriteId = CreateSprite(&gUnknown_08610608, 176, 112, 0); sFactorySelectScreen->menuCursor1SpriteId = CreateSprite(&gUnknown_08610608, 176, 112, 0);
sFactorySelectScreen->menuCursor2SpriteId = CreateSprite(&gUnknown_08610620, 176, 144, 0); sFactorySelectScreen->menuCursor2SpriteId = CreateSprite(&gUnknown_08610620, 176, 144, 0);
gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = 1; gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = 1; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE;
gSprites[sFactorySelectScreen->menuCursor1SpriteId].centerToCornerVecX = 0; gSprites[sFactorySelectScreen->menuCursor1SpriteId].centerToCornerVecX = 0;
gSprites[sFactorySelectScreen->menuCursor1SpriteId].centerToCornerVecY = 0; gSprites[sFactorySelectScreen->menuCursor1SpriteId].centerToCornerVecY = 0;
@@ -1767,8 +1767,8 @@ static void Select_ShowMenuOptions(void)
gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.x = 208; gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.x = 208;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = (sFactorySelectScreen->menuCursorPos * 16) + 112; gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = 0; gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = FALSE;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = 0; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = FALSE;
Select_PrintMenuOptions(); Select_PrintMenuOptions();
} }
@@ -1782,16 +1782,16 @@ static void Select_ShowYesNoOptions(void)
gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.x = 208; gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.x = 208;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = 112; gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = 112;
gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = 0; gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = FALSE;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = 0; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = FALSE;
Select_PrintYesNoOptions(); Select_PrintYesNoOptions();
} }
static void sub_819B958(u8 windowId) static void sub_819B958(u8 windowId)
{ {
gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = 1; gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = 1; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE;
FillWindowPixelBuffer(windowId, 0); FillWindowPixelBuffer(windowId, 0);
CopyWindowToVram(windowId, 2); CopyWindowToVram(windowId, 2);
ClearWindowTilemap(windowId); ClearWindowTilemap(windowId);
@@ -1977,7 +1977,7 @@ static void Select_ShowSummaryMonSprite(void)
gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecX = 0; gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecX = 0;
gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecY = 0; gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecY = 0;
gSprites[sFactorySelectScreen->unk294[1].field1].invisible = 1; gSprites[sFactorySelectScreen->unk294[1].field1].invisible = TRUE;
} }
static void Select_ShowChosenMonsSprites(void) static void Select_ShowChosenMonsSprites(void)
@@ -2013,9 +2013,9 @@ static void sub_819C040(struct Sprite *sprite)
&& gSprites[sFactorySelectScreen->unk294[0].field1].affineAnimEnded && gSprites[sFactorySelectScreen->unk294[0].field1].affineAnimEnded
&& gSprites[sFactorySelectScreen->unk294[2].field1].affineAnimEnded) && gSprites[sFactorySelectScreen->unk294[2].field1].affineAnimEnded)
{ {
sprite->invisible = 1; sprite->invisible = TRUE;
gSprites[sFactorySelectScreen->unk294[0].field1].invisible = 1; gSprites[sFactorySelectScreen->unk294[0].field1].invisible = TRUE;
gSprites[sFactorySelectScreen->unk294[2].field1].invisible = 1; gSprites[sFactorySelectScreen->unk294[2].field1].invisible = TRUE;
taskId = CreateTask(sub_819C1D0, 1); taskId = CreateTask(sub_819C1D0, 1);
gTasks[taskId].func(taskId); gTasks[taskId].func(taskId);
@@ -2091,11 +2091,11 @@ static void sub_819C2D4(u8 taskId)
{ {
default: default:
HideBg(3); HideBg(3);
gSprites[sFactorySelectScreen->unk294[1].field1].invisible = 0; gSprites[sFactorySelectScreen->unk294[1].field1].invisible = FALSE;
gSprites[sFactorySelectScreen->unk294[1].field1].callback = sub_819C100; gSprites[sFactorySelectScreen->unk294[1].field1].callback = sub_819C100;
gSprites[sFactorySelectScreen->unk294[0].field1].invisible = 0; gSprites[sFactorySelectScreen->unk294[0].field1].invisible = FALSE;
gSprites[sFactorySelectScreen->unk294[0].field1].callback = SpriteCallbackDummy; gSprites[sFactorySelectScreen->unk294[0].field1].callback = SpriteCallbackDummy;
gSprites[sFactorySelectScreen->unk294[2].field1].invisible = 0; gSprites[sFactorySelectScreen->unk294[2].field1].invisible = FALSE;
gSprites[sFactorySelectScreen->unk294[2].field1].callback = SpriteCallbackDummy; gSprites[sFactorySelectScreen->unk294[2].field1].callback = SpriteCallbackDummy;
StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[1].field1], 1); StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[1].field1], 1);
StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[0].field1], 1); StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[0].field1], 1);
@@ -3018,7 +3018,7 @@ static void sub_819D770(u8 taskId)
else else
Swap_PrintOnInfoWindow(gText_SelectPkmnToAccept); Swap_PrintOnInfoWindow(gText_SelectPkmnToAccept);
if (sFactorySwapScreen->cursorPos < 3) if (sFactorySwapScreen->cursorPos < 3)
gSprites[sFactorySwapScreen->cursorSpriteId].invisible = 0; gSprites[sFactorySwapScreen->cursorSpriteId].invisible = FALSE;
Swap_PrintMonCategory(); Swap_PrintMonCategory();
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
@@ -3048,7 +3048,7 @@ static void sub_819D9EC(u8 taskId)
break; break;
case 1: case 1:
sub_819EADC(); sub_819EADC();
gSprites[sFactorySwapScreen->cursorSpriteId].invisible = 1; gSprites[sFactorySwapScreen->cursorSpriteId].invisible = TRUE;
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
break; break;
case 2: case 2:
@@ -3068,7 +3068,7 @@ static void sub_819D9EC(u8 taskId)
{ {
Swap_InitActions(ACTIONS_PLAYER_SCREEN); Swap_InitActions(ACTIONS_PLAYER_SCREEN);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
gSprites[sFactorySwapScreen->unk8[1][i]].invisible = 1; gSprites[sFactorySwapScreen->unk8[1][i]].invisible = TRUE;
} }
gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x; gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x;
gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].func = Task_SwapFadeSpeciesName; gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].func = Task_SwapFadeSpeciesName;
@@ -3279,8 +3279,8 @@ static void Swap_InitAllSprites(void)
sFactorySwapScreen->cursorSpriteId = CreateSprite(&gUnknown_0861084C, gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x, 88, 0); sFactorySwapScreen->cursorSpriteId = CreateSprite(&gUnknown_0861084C, gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x, 88, 0);
sFactorySwapScreen->menuCursor1SpriteId = CreateSprite(&gUnknown_08610864, 176, 112, 0); sFactorySwapScreen->menuCursor1SpriteId = CreateSprite(&gUnknown_08610864, 176, 112, 0);
sFactorySwapScreen->menuCursor2SpriteId = CreateSprite(&gUnknown_0861087C, 176, 144, 0); sFactorySwapScreen->menuCursor2SpriteId = CreateSprite(&gUnknown_0861087C, 176, 144, 0);
gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = 1; gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = 1; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE;
gSprites[sFactorySwapScreen->menuCursor1SpriteId].centerToCornerVecX = 0; gSprites[sFactorySwapScreen->menuCursor1SpriteId].centerToCornerVecX = 0;
gSprites[sFactorySwapScreen->menuCursor1SpriteId].centerToCornerVecY = 0; gSprites[sFactorySwapScreen->menuCursor1SpriteId].centerToCornerVecY = 0;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].centerToCornerVecX = 0; gSprites[sFactorySwapScreen->menuCursor2SpriteId].centerToCornerVecX = 0;
@@ -3339,18 +3339,18 @@ static void Swap_InitAllSprites(void)
gSprites[sFactorySwapScreen->unkE[i][1]].centerToCornerVecX = 0; gSprites[sFactorySwapScreen->unkE[i][1]].centerToCornerVecX = 0;
gSprites[sFactorySwapScreen->unkE[i][1]].centerToCornerVecY = 0; gSprites[sFactorySwapScreen->unkE[i][1]].centerToCornerVecY = 0;
gSprites[sFactorySwapScreen->unk8[i][0]].invisible = 1; gSprites[sFactorySwapScreen->unk8[i][0]].invisible = TRUE;
gSprites[sFactorySwapScreen->unk8[i][1]].invisible = 1; gSprites[sFactorySwapScreen->unk8[i][1]].invisible = TRUE;
gSprites[sFactorySwapScreen->unk8[i][2]].invisible = 1; gSprites[sFactorySwapScreen->unk8[i][2]].invisible = TRUE;
gSprites[sFactorySwapScreen->unkE[i][0]].invisible = 1; gSprites[sFactorySwapScreen->unkE[i][0]].invisible = TRUE;
gSprites[sFactorySwapScreen->unkE[i][1]].invisible = 1; gSprites[sFactorySwapScreen->unkE[i][1]].invisible = TRUE;
} }
gSprites[sFactorySwapScreen->unkE[0][0]].invisible = 0; gSprites[sFactorySwapScreen->unkE[0][0]].invisible = FALSE;
gSprites[sFactorySwapScreen->unkE[0][1]].invisible = 0; gSprites[sFactorySwapScreen->unkE[0][1]].invisible = FALSE;
gSprites[sFactorySwapScreen->unk8[0][0]].invisible = 0; gSprites[sFactorySwapScreen->unk8[0][0]].invisible = FALSE;
gSprites[sFactorySwapScreen->unk8[0][1]].invisible = 0; gSprites[sFactorySwapScreen->unk8[0][1]].invisible = FALSE;
gSprites[sFactorySwapScreen->unk8[0][2]].invisible = 0; gSprites[sFactorySwapScreen->unk8[0][2]].invisible = FALSE;
} }
static void Swap_DestroyAllSprites(void) static void Swap_DestroyAllSprites(void)
@@ -3378,13 +3378,13 @@ static void Swap_HandleActionCursorChange(u8 cursorId)
{ {
if (cursorId < 3) if (cursorId < 3)
{ {
gSprites[sFactorySwapScreen->cursorSpriteId].invisible = 0; gSprites[sFactorySwapScreen->cursorSpriteId].invisible = FALSE;
sub_819E8EC(); sub_819E8EC();
gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[cursorId]].pos1.x; gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[cursorId]].pos1.x;
} }
else else
{ {
gSprites[sFactorySwapScreen->cursorSpriteId].invisible = 1; gSprites[sFactorySwapScreen->cursorSpriteId].invisible = TRUE;
sub_819E838(sFactorySwapScreen->actionsData[cursorId].id); sub_819E838(sFactorySwapScreen->actionsData[cursorId].id);
} }
} }
@@ -3490,15 +3490,15 @@ static void sub_819E838(u8 arg0)
{ {
if (arg0 == 2) if (arg0 == 2)
{ {
gSprites[sFactorySwapScreen->unk8[1][i]].invisible = 0; gSprites[sFactorySwapScreen->unk8[1][i]].invisible = FALSE;
if (i < 2) if (i < 2)
gSprites[sFactorySwapScreen->unkE[1][i]].invisible = 1; gSprites[sFactorySwapScreen->unkE[1][i]].invisible = TRUE;
} }
else if (arg0 == 3) else if (arg0 == 3)
{ {
if (i < 2) if (i < 2)
gSprites[sFactorySwapScreen->unkE[1][i]].invisible = 0; gSprites[sFactorySwapScreen->unkE[1][i]].invisible = FALSE;
gSprites[sFactorySwapScreen->unk8[1][i]].invisible = 1; gSprites[sFactorySwapScreen->unk8[1][i]].invisible = TRUE;
} }
} }
} }
@@ -3509,9 +3509,9 @@ static void sub_819E8EC(void)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
gSprites[sFactorySwapScreen->unk8[1][i]].invisible = 1; gSprites[sFactorySwapScreen->unk8[1][i]].invisible = TRUE;
if (i < 2) if (i < 2)
gSprites[sFactorySwapScreen->unkE[1][i]].invisible = 1; gSprites[sFactorySwapScreen->unkE[1][i]].invisible = TRUE;
} }
} }
@@ -3527,8 +3527,8 @@ static void Swap_ShowMenuOptions(void)
gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.x = 208; gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.x = 208;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112; gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = 0; gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = FALSE;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = 0; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = FALSE;
Swap_PrintMenuOptions(); Swap_PrintMenuOptions();
} }
@@ -3542,16 +3542,16 @@ static void Swap_ShowYesNoOptions(void)
gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.x = 208; gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.x = 208;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = 112; gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = 112;
gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = 0; gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = FALSE;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = 0; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = FALSE;
Swap_PrintYesNoOptions(); Swap_PrintYesNoOptions();
} }
static void sub_819EA64(u8 windowId) static void sub_819EA64(u8 windowId)
{ {
gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = 1; gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = 1; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE;
FillWindowPixelBuffer(windowId, 0); FillWindowPixelBuffer(windowId, 0);
CopyWindowToVram(windowId, 2); CopyWindowToVram(windowId, 2);
ClearWindowTilemap(windowId); ClearWindowTilemap(windowId);
@@ -3900,7 +3900,7 @@ static void Swap_ShowSummaryMonSprite(void)
gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecX = 0; gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecX = 0;
gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecY = 0; gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecY = 0;
gSprites[sFactorySwapScreen->unk2C.field1].invisible = 1; gSprites[sFactorySwapScreen->unk2C.field1].invisible = TRUE;
} }
static void sub_819F3F8(struct UnkFactoryStruct arg0, bool8 *arg1, bool8 swapScreen) static void sub_819F3F8(struct UnkFactoryStruct arg0, bool8 *arg1, bool8 swapScreen)
@@ -3984,7 +3984,7 @@ static void sub_819F600(struct Sprite *sprite)
if (sprite->affineAnimEnded) if (sprite->affineAnimEnded)
{ {
sprite->invisible = 1; sprite->invisible = TRUE;
taskId = CreateTask(sub_819F69C, 1); taskId = CreateTask(sub_819F69C, 1);
gTasks[taskId].data[7] = sprite->data[7]; gTasks[taskId].data[7] = sprite->data[7];
gTasks[taskId].func(taskId); gTasks[taskId].func(taskId);
@@ -4058,7 +4058,7 @@ static void sub_819F7B4(u8 taskId)
default: default:
HideBg(3); HideBg(3);
gSprites[task->data[6]].data[7] = task->data[7]; gSprites[task->data[6]].data[7] = task->data[7];
gSprites[task->data[6]].invisible = 0; gSprites[task->data[6]].invisible = FALSE;
gSprites[task->data[6]].callback = sub_819F654; gSprites[task->data[6]].callback = sub_819F654;
StartSpriteAffineAnim(&gSprites[task->data[6]], 1); StartSpriteAffineAnim(&gSprites[task->data[6]], 1);
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
src/battle_gfx_sfx_util.c
+1 -1
View File
@@ -1173,7 +1173,7 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
void SpriteCB_SetInvisible(struct Sprite *sprite) void SpriteCB_SetInvisible(struct Sprite *sprite)
{ {
sprite->invisible = 1; sprite->invisible = TRUE;
} }
void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species) void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species)
src/battle_interface.c
+9 -9
View File
@@ -974,13 +974,13 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId)
gSprites[healthboxLeftSpriteId].hMain_HealthBarSpriteId = healthbarSpriteId; gSprites[healthboxLeftSpriteId].hMain_HealthBarSpriteId = healthbarSpriteId;
gSprites[healthboxLeftSpriteId].hMain_Battler = battlerId; gSprites[healthboxLeftSpriteId].hMain_Battler = battlerId;
gSprites[healthboxLeftSpriteId].invisible = 1; gSprites[healthboxLeftSpriteId].invisible = TRUE;
gSprites[healthboxRightSpriteId].invisible = 1; gSprites[healthboxRightSpriteId].invisible = TRUE;
healthBarSpritePtr->hBar_HealthBoxSpriteId = healthboxLeftSpriteId; healthBarSpritePtr->hBar_HealthBoxSpriteId = healthboxLeftSpriteId;
healthBarSpritePtr->hBar_Data6 = data6; healthBarSpritePtr->hBar_Data6 = data6;
healthBarSpritePtr->invisible = 1; healthBarSpritePtr->invisible = TRUE;
return healthboxLeftSpriteId; return healthboxLeftSpriteId;
} }
@@ -1058,16 +1058,16 @@ void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 oldV
void SetHealthboxSpriteInvisible(u8 healthboxSpriteId) void SetHealthboxSpriteInvisible(u8 healthboxSpriteId)
{ {
gSprites[healthboxSpriteId].invisible = 1; gSprites[healthboxSpriteId].invisible = TRUE;
gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 1; gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = TRUE;
gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 1; gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = TRUE;
} }
void SetHealthboxSpriteVisible(u8 healthboxSpriteId) void SetHealthboxSpriteVisible(u8 healthboxSpriteId)
{ {
gSprites[healthboxSpriteId].invisible = 0; gSprites[healthboxSpriteId].invisible = FALSE;
gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 0; gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = FALSE;
gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 0; gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = FALSE;
} }
static void UpdateSpritePos(u8 spriteId, s16 x, s16 y) static void UpdateSpritePos(u8 spriteId, s16 x, s16 y)
src/berry_tag_screen.c
+10 -10
View File
@@ -477,29 +477,29 @@ static void SetFlavorCirclesVisiblity(void)
const struct Berry *berry = GetBerryInfo(sBerryTag->berryId); const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
if (berry->spicy) if (berry->spicy)
gSprites[sBerryTag->flavorCircleIds[FLAVOR_SPICY]].invisible = 0; gSprites[sBerryTag->flavorCircleIds[FLAVOR_SPICY]].invisible = FALSE;
else else
gSprites[sBerryTag->flavorCircleIds[FLAVOR_SPICY]].invisible = 1; gSprites[sBerryTag->flavorCircleIds[FLAVOR_SPICY]].invisible = TRUE;
if (berry->dry) if (berry->dry)
gSprites[sBerryTag->flavorCircleIds[FLAVOR_DRY]].invisible = 0; gSprites[sBerryTag->flavorCircleIds[FLAVOR_DRY]].invisible = FALSE;
else else
gSprites[sBerryTag->flavorCircleIds[FLAVOR_DRY]].invisible = 1; gSprites[sBerryTag->flavorCircleIds[FLAVOR_DRY]].invisible = TRUE;
if (berry->sweet) if (berry->sweet)
gSprites[sBerryTag->flavorCircleIds[FLAVOR_SWEET]].invisible = 0; gSprites[sBerryTag->flavorCircleIds[FLAVOR_SWEET]].invisible = FALSE;
else else
gSprites[sBerryTag->flavorCircleIds[FLAVOR_SWEET]].invisible = 1; gSprites[sBerryTag->flavorCircleIds[FLAVOR_SWEET]].invisible = TRUE;
if (berry->bitter) if (berry->bitter)
gSprites[sBerryTag->flavorCircleIds[FLAVOR_BITTER]].invisible = 0; gSprites[sBerryTag->flavorCircleIds[FLAVOR_BITTER]].invisible = FALSE;
else else
gSprites[sBerryTag->flavorCircleIds[FLAVOR_BITTER]].invisible = 1; gSprites[sBerryTag->flavorCircleIds[FLAVOR_BITTER]].invisible = TRUE;
if (berry->sour) if (berry->sour)
gSprites[sBerryTag->flavorCircleIds[FLAVOR_SOUR]].invisible = 0; gSprites[sBerryTag->flavorCircleIds[FLAVOR_SOUR]].invisible = FALSE;
else else
gSprites[sBerryTag->flavorCircleIds[FLAVOR_SOUR]].invisible = 1; gSprites[sBerryTag->flavorCircleIds[FLAVOR_SOUR]].invisible = TRUE;
} }
static void DestroyFlavorCircleSprites(void) static void DestroyFlavorCircleSprites(void)
src/credits.c
+10 -10
View File
@@ -1862,8 +1862,8 @@ static void sub_817664C(u8 data, u8 taskIdA)
switch (data) switch (data)
{ {
case 0: case 0:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 272; 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_RIVAL_CYCLIST]].pos1.x = 272;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46;
@@ -1873,8 +1873,8 @@ static void sub_817664C(u8 data, u8 taskIdA)
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8); gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8);
break; break;
case 1: case 1:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; 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_RIVAL_CYCLIST]].pos1.x = 272;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46;
@@ -1884,8 +1884,8 @@ static void sub_817664C(u8 data, u8 taskIdA)
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8); gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8);
break; break;
case 2: case 2:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; 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_RIVAL_CYCLIST]].pos1.x = 272;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46;
@@ -1895,8 +1895,8 @@ static void sub_817664C(u8 data, u8 taskIdA)
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8); gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8);
break; break;
case 3: case 3:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; 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_RIVAL_CYCLIST]].pos1.x = -32;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46;
@@ -1906,8 +1906,8 @@ static void sub_817664C(u8 data, u8 taskIdA)
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8); gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8);
break; break;
case 4: case 4:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 88; 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_RIVAL_CYCLIST]].pos1.x = 152;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46;
src/egg_hatch.c
+3 -3
View File
@@ -451,7 +451,7 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16* speciesLoc
case 1: case 1:
SetMultiuseSpriteTemplateToPokemon(GetMonSpritePalStruct(mon)->tag, r5); SetMultiuseSpriteTemplateToPokemon(GetMonSpritePalStruct(mon)->tag, r5);
spriteID = CreateSprite(&gMultiuseSpriteTemplate, 120, 75, 6); spriteID = CreateSprite(&gMultiuseSpriteTemplate, 120, 75, 6);
gSprites[spriteID].invisible = 1; gSprites[spriteID].invisible = TRUE;
gSprites[spriteID].callback = SpriteCallbackDummy; gSprites[spriteID].callback = SpriteCallbackDummy;
break; break;
} }
@@ -808,7 +808,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
PlaySE(SE_TAMAGO); PlaySE(SE_TAMAGO);
sprite->invisible = 1; sprite->invisible = TRUE;
sprite->callback = SpriteCB_Egg_5; sprite->callback = SpriteCB_Egg_5;
sprite->data[0] = 0; sprite->data[0] = 0;
} }
@@ -818,7 +818,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite)
{ {
if (sprite->data[0] == 0) if (sprite->data[0] == 0)
{ {
gSprites[sEggHatchData->pokeSpriteID].invisible = 0; gSprites[sEggHatchData->pokeSpriteID].invisible = FALSE;
StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1); StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1);
} }
if (sprite->data[0] == 8) if (sprite->data[0] == 8)
src/event_object_movement.c
+4 -4
View File
@@ -1097,13 +1097,13 @@ static void sub_808D450(void)
gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.affineMode = 1;
InitSpriteAffineAnim(&gSprites[spriteId]); InitSpriteAffineAnim(&gSprites[spriteId]);
StartSpriteAffineAnim(&gSprites[spriteId], 0); StartSpriteAffineAnim(&gSprites[spriteId], 0);
gSprites[spriteId].invisible = 1; gSprites[spriteId].invisible = TRUE;
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 31);
gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.affineMode = 1;
InitSpriteAffineAnim(&gSprites[spriteId]); InitSpriteAffineAnim(&gSprites[spriteId]);
StartSpriteAffineAnim(&gSprites[spriteId], 1); StartSpriteAffineAnim(&gSprites[spriteId], 1);
gSprites[spriteId].invisible = 1; gSprites[spriteId].invisible = TRUE;
} }
u8 GetFirstInactiveEventObjectId(void) u8 GetFirstInactiveEventObjectId(void)
@@ -8798,9 +8798,9 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible)
y2 = y - (sprite->centerToCornerVecY >> 1); y2 = y - (sprite->centerToCornerVecY >> 1);
if ((s16)x > 255 || x2 < -16) if ((s16)x > 255 || x2 < -16)
sprite->invisible = 1; sprite->invisible = TRUE;
if ((s16)y > 175 || y2 < -16) if ((s16)y > 175 || y2 < -16)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite)
src/evolution_graphics.c
+8 -8
View File
@@ -220,10 +220,10 @@ static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite)
sprite->subpriority = 1; sprite->subpriority = 1;
else else
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
sprite->subpriority = 20; sprite->subpriority = 20;
if (sprite->data[6] > 112 && sprite->data[6] & 1) if (sprite->data[6] > 112 && sprite->data[6] & 1)
sprite->invisible = 1; sprite->invisible = TRUE;
} }
if (matrixNum < 20) if (matrixNum < 20)
matrixNum = 20; matrixNum = 20;
@@ -498,13 +498,13 @@ u8 sub_817C3A0(u8 preEvoSpriteID, u8 postEvoSpriteID)
gSprites[preEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB; gSprites[preEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
gSprites[preEvoSpriteID].oam.affineMode = 1; gSprites[preEvoSpriteID].oam.affineMode = 1;
gSprites[preEvoSpriteID].oam.matrixNum = 30; gSprites[preEvoSpriteID].oam.matrixNum = 30;
gSprites[preEvoSpriteID].invisible = 0; gSprites[preEvoSpriteID].invisible = FALSE;
CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteID].oam.paletteNum * 16)], 16); CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteID].oam.paletteNum * 16)], 16);
gSprites[postEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB; gSprites[postEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
gSprites[postEvoSpriteID].oam.affineMode = 1; gSprites[postEvoSpriteID].oam.affineMode = 1;
gSprites[postEvoSpriteID].oam.matrixNum = 31; gSprites[postEvoSpriteID].oam.matrixNum = 31;
gSprites[postEvoSpriteID].invisible = 0; gSprites[postEvoSpriteID].invisible = FALSE;
CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteID].oam.paletteNum * 16)], 16); CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteID].oam.paletteNum * 16)], 16);
gTasks[taskID].tEvoStopped = FALSE; gTasks[taskID].tEvoStopped = FALSE;
@@ -588,11 +588,11 @@ static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskID)
{ {
gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0;
gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 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.affineMode = 0;
gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 0; gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = FALSE;
DestroyTask(taskID); DestroyTask(taskID);
} }
@@ -601,11 +601,11 @@ static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID)
{ {
gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0; gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = 0;
gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 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.affineMode = 0;
gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0; gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = 1; gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = TRUE;
DestroyTask(taskID); DestroyTask(taskID);
} }
src/evolution_scene.c
+4 -4
View File
@@ -285,7 +285,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 1; gSprites[ID].oam.paletteNum = 1;
gSprites[ID].invisible = 1; gSprites[ID].invisible = TRUE;
// postEvo sprite // postEvo sprite
DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve], DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve],
@@ -299,7 +299,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 2; gSprites[ID].oam.paletteNum = 2;
gSprites[ID].invisible = 1; gSprites[ID].invisible = TRUE;
LoadEvoSparkleSpriteAndPal(); LoadEvoSparkleSpriteAndPal();
@@ -514,7 +514,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri
gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 2; gSprites[ID].oam.paletteNum = 2;
gSprites[ID].invisible = 1; gSprites[ID].invisible = TRUE;
LoadEvoSparkleSpriteAndPal(); LoadEvoSparkleSpriteAndPal();
@@ -623,7 +623,7 @@ static void Task_EvolutionScene(u8 taskID)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gSprites[sEvoStructPtr->preEvoSpriteID].invisible = 0; gSprites[sEvoStructPtr->preEvoSpriteID].invisible = FALSE;
gTasks[taskID].tState++; gTasks[taskID].tState++;
ShowBg(0); ShowBg(0);
ShowBg(1); ShowBg(1);
src/field_effect.c
+15 -15
View File
@@ -1078,7 +1078,7 @@ u8 PokecenterHealEffectHelper(s16 x, s16 y)
spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C31C, x, y, 0); spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C31C, x, y, 0);
sprite = &gSprites[spriteIdAtEnd]; sprite = &gSprites[spriteIdAtEnd];
sprite->oam.priority = 2; sprite->oam.priority = 2;
sprite->invisible = 1; sprite->invisible = TRUE;
SetSubspriteTables(sprite, &gUnknown_0855C2AC); SetSubspriteTables(sprite, &gUnknown_0855C2AC);
return spriteIdAtEnd; return spriteIdAtEnd;
} }
@@ -1088,7 +1088,7 @@ void SpriteCB_PokecenterMonitor(struct Sprite *sprite)
if (sprite->data[0] != 0) if (sprite->data[0] != 0)
{ {
sprite->data[0] = 0; sprite->data[0] = 0;
sprite->invisible = 0; sprite->invisible = FALSE;
StartSpriteAnim(sprite, 1); StartSpriteAnim(sprite, 1);
} }
if (sprite->animEnded) if (sprite->animEnded)
@@ -1108,7 +1108,7 @@ void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3)
{ {
spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C34C, a1, a2, 0); spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C34C, a1, a2, 0);
} }
gSprites[spriteIdAtEnd].invisible = 1; gSprites[spriteIdAtEnd].invisible = TRUE;
gSprites[spriteIdAtEnd].data[0] = a0; gSprites[spriteIdAtEnd].data[0] = a0;
} }
@@ -1182,7 +1182,7 @@ void mapldr_08084390(void)
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
pal_fill_black(); pal_fill_black();
CreateTask(c3_080843F8, 0); CreateTask(c3_080843F8, 0);
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
if (gPlayerAvatar.flags & 0x08) if (gPlayerAvatar.flags & 0x08)
{ {
EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST);
@@ -1242,7 +1242,7 @@ bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0]
playerObject = &gEventObjects[gPlayerAvatar.eventObjectId]; playerObject = &gEventObjects[gPlayerAvatar.eventObjectId];
playerSprite = &gSprites[gPlayerAvatar.spriteId]; playerSprite = &gSprites[gPlayerAvatar.spriteId];
CameraObjectReset2(); CameraObjectReset2();
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
task->data[4] = playerSprite->subspriteMode; task->data[4] = playerSprite->subspriteMode;
@@ -1271,7 +1271,7 @@ bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2]
sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
task->data[1] = 1; task->data[1] = 1;
task->data[2] = 0; task->data[2] = 0;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE;
PlaySE(SE_RU_HYUU); PlaySE(SE_RU_HYUU);
task->data[0]++; task->data[0]++;
return FALSE; return FALSE;
@@ -1869,7 +1869,7 @@ bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Spr
CameraObjectReset2(); CameraObjectReset2();
FreezeEventObjects(); FreezeEventObjects();
gPlayerAvatar.preventStep = TRUE; gPlayerAvatar.preventStep = TRUE;
eventObject->invisible = 1; eventObject->invisible = TRUE;
task->data[0]++; task->data[0]++;
return FALSE; return FALSE;
} }
@@ -1894,7 +1894,7 @@ bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Spr
if (sprite->animCmdIndex > 1) if (sprite->animCmdIndex > 1)
{ {
task->data[0]++; task->data[0]++;
eventObject->invisible = 0; eventObject->invisible = FALSE;
CameraObjectReset1(); CameraObjectReset1();
PlaySE(SE_W091); PlaySE(SE_W091);
EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST));
@@ -1982,7 +1982,7 @@ bool8 sub_80B7B94(struct Task *task, struct EventObject *eventObject, struct Spr
{ {
if (gSprites[task->data[1]].animCmdIndex == 2) if (gSprites[task->data[1]].animCmdIndex == 2)
{ {
eventObject->invisible = 1; eventObject->invisible = TRUE;
task->data[0]++; task->data[0]++;
} }
return FALSE; return FALSE;
@@ -2097,7 +2097,7 @@ void mapldr_080859D4(void)
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeEventObjects();
gFieldCallback = NULL; gFieldCallback = NULL;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
CreateTask(sub_80B7E94, 0); CreateTask(sub_80B7E94, 0);
} }
@@ -2127,7 +2127,7 @@ void sub_80B7EE8(struct Task *task)
} }
if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
{ {
eventObject->invisible = 0; eventObject->invisible = FALSE;
ScriptContext2_Disable(); ScriptContext2_Disable();
UnfreezeEventObjects(); UnfreezeEventObjects();
DestroyTask(FindTaskIdByFunc(sub_80B7E94)); DestroyTask(FindTaskIdByFunc(sub_80B7E94));
@@ -2254,7 +2254,7 @@ static void mapldr_08085D88(void)
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeEventObjects(); FreezeEventObjects();
gFieldCallback = NULL; gFieldCallback = NULL;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
CameraObjectReset2(); CameraObjectReset2();
CreateTask(sub_80B8250, 0); CreateTask(sub_80B8250, 0);
} }
@@ -2279,7 +2279,7 @@ void sub_80B8280(struct Task *task)
sprite = &gSprites[gPlayerAvatar.spriteId]; sprite = &gSprites[gPlayerAvatar.spriteId];
centerToCornerVecY = -(sprite->centerToCornerVecY << 1); centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE;
task->data[0]++; task->data[0]++;
task->data[1] = 8; task->data[1] = 8;
task->data[2] = 1; task->data[2] = 1;
@@ -3463,7 +3463,7 @@ void sub_80B96B0(struct Sprite *sprite)
sprite->data[7]++; sprite->data[7]++;
sprite->oam.affineMode = 0; sprite->oam.affineMode = 0;
FreeOamMatrix(sprite->oam.matrixNum); FreeOamMatrix(sprite->oam.matrixNum);
sprite->invisible = 1; sprite->invisible = TRUE;
} }
} }
} }
@@ -3516,7 +3516,7 @@ void sub_80B9804(struct Task *task)
CameraObjectReset2(); CameraObjectReset2();
EventObjectTurn(eventObject, DIR_WEST); EventObjectTurn(eventObject, DIR_WEST);
StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
eventObject->invisible = 0; eventObject->invisible = FALSE;
task->data[1] = sub_80B94C4(); task->data[1] = sub_80B94C4();
sub_80B9524(task->data[1]); sub_80B9524(task->data[1]);
sub_80B9560(task->data[1], eventObject->spriteId); sub_80B9560(task->data[1], eventObject->spriteId);
src/item_menu.c
+1 -1
View File
@@ -1185,7 +1185,7 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3)
ClearWindowTilemap(1); ClearWindowTilemap(1);
DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
gSprites[gUnknown_0203CE54->unk804[2 + (gUnknown_0203CE54->unk81B_1 ^ 1)]].invisible = 1; gSprites[gUnknown_0203CE54->unk804[2 + (gUnknown_0203CE54->unk81B_1 ^ 1)]].invisible = TRUE;
sub_81AB824(); sub_81AB824();
} }
pocketId = gUnknown_0203CE58.pocket; pocketId = gUnknown_0203CE58.pocket;
src/main_menu.c
+11 -11
View File
@@ -1164,7 +1164,7 @@ void task_new_game_prof_birch_speech_2(u8 taskId)
spriteId = gTasks[taskId].data[8]; spriteId = gTasks[taskId].data[8];
gSprites[spriteId].pos1.x = 0x88; gSprites[spriteId].pos1.x = 0x88;
gSprites[spriteId].pos1.y = 0x3C; gSprites[spriteId].pos1.y = 0x3C;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = 1; gSprites[spriteId].oam.objMode = 1;
sub_8031BAC(taskId, 10); sub_8031BAC(taskId, 10);
sub_8031D34(taskId, 20); sub_8031D34(taskId, 20);
@@ -1225,7 +1225,7 @@ void sub_8030A70(u8 taskId)
gSprites[spriteId].pos1.x = 0x64; gSprites[spriteId].pos1.x = 0x64;
gSprites[spriteId].pos1.y = 0x4B; gSprites[spriteId].pos1.y = 0x4B;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[0] = 0;
CreatePokeballSpriteToReleaseMon(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0xFFFF, SPECIES_LOTAD); CreatePokeballSpriteToReleaseMon(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0xFFFF, SPECIES_LOTAD);
@@ -1306,8 +1306,8 @@ void task_new_game_prof_birch_speech_9(u8 taskId)
{ {
if (gTasks[taskId].data[5]) if (gTasks[taskId].data[5])
{ {
gSprites[gTasks[taskId].data[8]].invisible = 1; gSprites[gTasks[taskId].data[8]].invisible = TRUE;
gSprites[gTasks[taskId].data[9]].invisible = 1; gSprites[gTasks[taskId].data[9]].invisible = TRUE;
if (gTasks[taskId].data[7]) if (gTasks[taskId].data[7])
{ {
gTasks[taskId].data[7]--; gTasks[taskId].data[7]--;
@@ -1318,7 +1318,7 @@ void task_new_game_prof_birch_speech_9(u8 taskId)
gSprites[spriteId].pos1.x = 0xB4; gSprites[spriteId].pos1.x = 0xB4;
gSprites[spriteId].pos1.y = 0x3C; gSprites[spriteId].pos1.y = 0x3C;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = 1; gSprites[spriteId].oam.objMode = 1;
gTasks[taskId].data[2] = spriteId; gTasks[taskId].data[2] = spriteId;
gTasks[taskId].data[6] = 0; gTasks[taskId].data[6] = 0;
@@ -1394,14 +1394,14 @@ void sub_8030ED4(u8 taskId)
} }
else else
{ {
gSprites[spriteId].invisible = 1; gSprites[spriteId].invisible = TRUE;
if (gTasks[taskId].data[6]) if (gTasks[taskId].data[6])
spriteId = gTasks[taskId].data[11]; spriteId = gTasks[taskId].data[11];
else else
spriteId = gTasks[taskId].data[10]; spriteId = gTasks[taskId].data[10];
gSprites[spriteId].pos1.x = 0xF0; gSprites[spriteId].pos1.x = 0xF0;
gSprites[spriteId].pos1.y = 0x3C; gSprites[spriteId].pos1.y = 0x3C;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gTasks[taskId].data[2] = spriteId; gTasks[taskId].data[2] = spriteId;
gSprites[spriteId].oam.objMode = 1; gSprites[spriteId].oam.objMode = 1;
sub_8031BAC(taskId, 0); sub_8031BAC(taskId, 0);
@@ -1562,8 +1562,8 @@ void task_new_game_prof_birch_speech_part2_8(u8 taskId)
if (gTasks[taskId].data[5]) if (gTasks[taskId].data[5])
{ {
gSprites[gTasks[taskId].data[8]].invisible = 1; gSprites[gTasks[taskId].data[8]].invisible = TRUE;
gSprites[gTasks[taskId].data[9]].invisible = 1; gSprites[gTasks[taskId].data[9]].invisible = TRUE;
if (gTasks[taskId].data[7]) if (gTasks[taskId].data[7])
{ {
gTasks[taskId].data[7]--; gTasks[taskId].data[7]--;
@@ -1575,7 +1575,7 @@ void task_new_game_prof_birch_speech_part2_8(u8 taskId)
spriteId = gTasks[taskId].data[10]; spriteId = gTasks[taskId].data[10];
gSprites[spriteId].pos1.x = 0x78; gSprites[spriteId].pos1.x = 0x78;
gSprites[spriteId].pos1.y = 0x3C; gSprites[spriteId].pos1.y = 0x3C;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = 1; gSprites[spriteId].oam.objMode = 1;
gTasks[taskId].data[2] = spriteId; gTasks[taskId].data[2] = spriteId;
sub_8031BAC(taskId, 2); sub_8031BAC(taskId, 2);
@@ -1692,7 +1692,7 @@ void new_game_prof_birch_speech_part2_start(void)
} }
gSprites[spriteId].pos1.x = 0xB4; gSprites[spriteId].pos1.x = 0xB4;
gSprites[spriteId].pos1.y = 0x3C; gSprites[spriteId].pos1.y = 0x3C;
gSprites[spriteId].invisible = 0; gSprites[spriteId].invisible = FALSE;
gTasks[taskId].data[2] = spriteId; gTasks[taskId].data[2] = spriteId;
SetGpuReg(REG_OFFSET_BG1HOFS, -60); SetGpuReg(REG_OFFSET_BG1HOFS, -60);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
src/menu_helpers.c
+1 -1
View File
@@ -410,7 +410,7 @@ void sub_8122344(u8 *spriteIds, u8 count)
if (i != 0) if (i != 0)
StartSpriteAnim(&gSprites[spriteIds[i]], 1); StartSpriteAnim(&gSprites[spriteIds[i]], 1);
gSprites[spriteIds[i]].invisible = 1; gSprites[spriteIds[i]].invisible = TRUE;
} }
} }
src/pokemon_animation.c
+4 -4
View File
@@ -2347,7 +2347,7 @@ static void pokemonanimfunc_27(struct Sprite *sprite)
sprite->invisible = sprite->data[4]; sprite->invisible = sprite->data[4];
if (++sprite->data[2] > 19) if (++sprite->data[2] > 19)
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->callback = SpriteCB_SetDummyOnAnimEnd;
} }
sprite->data[3] = 2; sprite->data[3] = 2;
@@ -3069,17 +3069,17 @@ static void pokemonanimfunc_35(struct Sprite *sprite)
{ {
sprite->data[7] = 0; sprite->data[7] = 0;
sprite->data[2]++; sprite->data[2]++;
sprite->invisible = 0; sprite->invisible = FALSE;
} }
else else
{ {
sprite->data[7]++; sprite->data[7]++;
sprite->invisible = 1; sprite->invisible = TRUE;
} }
if (sprite->data[2] > 10) if (sprite->data[2] > 10)
{ {
sprite->invisible = 0; sprite->invisible = FALSE;
sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->callback = SpriteCB_SetDummyOnAnimEnd;
} }
} }
src/rom_8034C54.c
+1 -1
View File
@@ -442,7 +442,7 @@ static void sub_8035608(void)
ResetSpriteData(); ResetSpriteData();
spriteId = CreateSprite(&gUnknown_0831AC88, 0, 0, 0); spriteId = CreateSprite(&gUnknown_0831AC88, 0, 0, 0);
gSprites[spriteId].invisible = 1; gSprites[spriteId].invisible = TRUE;
SetMainCallback2(sub_8035648); SetMainCallback2(sub_8035648);
} }
src/sprite.c
+1 -1
View File
@@ -171,7 +171,7 @@ static const struct Sprite sDummySprite =
.data = {0, 0, 0, 0, 0, 0, 0}, .data = {0, 0, 0, 0, 0, 0, 0},
.inUse = 0, .inUse = 0,
.coordOffsetEnabled = 0, .coordOffsetEnabled = 0,
.invisible = 0, .invisible = FALSE,
.flags_3 = 0, .flags_3 = 0,
.flags_4 = 0, .flags_4 = 0,
.flags_5 = 0, .flags_5 = 0,