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

30
src/field_effect.c
View File

@@ -1078,7 +1078,7 @@ u8 PokecenterHealEffectHelper(s16 x, s16 y)
spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C31C, x, y, 0);
sprite = &gSprites[spriteIdAtEnd];
sprite->oam.priority = 2;
sprite->invisible = 1;
sprite->invisible = TRUE;
SetSubspriteTables(sprite, &gUnknown_0855C2AC);
return spriteIdAtEnd;
}
@@ -1088,7 +1088,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)
@@ -1108,7 +1108,7 @@ void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3)
{
spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_855C34C, a1, a2, 0);
}
gSprites[spriteIdAtEnd].invisible = 1;
gSprites[spriteIdAtEnd].invisible = TRUE;
gSprites[spriteIdAtEnd].data[0] = a0;
}
@@ -1182,7 +1182,7 @@ void mapldr_08084390(void)
Overworld_PlaySpecialMapMusic();
pal_fill_black();
CreateTask(c3_080843F8, 0);
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
if (gPlayerAvatar.flags & 0x08)
{
EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST);
@@ -1242,7 +1242,7 @@ bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0]
playerObject = &gEventObjects[gPlayerAvatar.eventObjectId];
playerSprite = &gSprites[gPlayerAvatar.spriteId];
CameraObjectReset2();
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
gPlayerAvatar.preventStep = TRUE;
EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
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);
task->data[1] = 1;
task->data[2] = 0;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE;
PlaySE(SE_RU_HYUU);
task->data[0]++;
return FALSE;
@@ -1869,7 +1869,7 @@ bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Spr
CameraObjectReset2();
FreezeEventObjects();
gPlayerAvatar.preventStep = TRUE;
eventObject->invisible = 1;
eventObject->invisible = TRUE;
task->data[0]++;
return FALSE;
}
@@ -1894,7 +1894,7 @@ bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Spr
if (sprite->animCmdIndex > 1)
{
task->data[0]++;
eventObject->invisible = 0;
eventObject->invisible = FALSE;
CameraObjectReset1();
PlaySE(SE_W091);
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)
{
eventObject->invisible = 1;
eventObject->invisible = TRUE;
task->data[0]++;
}
return FALSE;
@@ -2097,7 +2097,7 @@ void mapldr_080859D4(void)
ScriptContext2_Enable();
FreezeEventObjects();
gFieldCallback = NULL;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
CreateTask(sub_80B7E94, 0);
}
@@ -2127,7 +2127,7 @@ void sub_80B7EE8(struct Task *task)
}
if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
{
eventObject->invisible = 0;
eventObject->invisible = FALSE;
ScriptContext2_Disable();
UnfreezeEventObjects();
DestroyTask(FindTaskIdByFunc(sub_80B7E94));
@@ -2254,7 +2254,7 @@ static void mapldr_08085D88(void)
ScriptContext2_Enable();
FreezeEventObjects();
gFieldCallback = NULL;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
CameraObjectReset2();
CreateTask(sub_80B8250, 0);
}
@@ -2279,7 +2279,7 @@ void sub_80B8280(struct Task *task)
sprite = &gSprites[gPlayerAvatar.spriteId];
centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
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[1] = 8;
task->data[2] = 1;
@@ -3463,7 +3463,7 @@ void sub_80B96B0(struct Sprite *sprite)
sprite->data[7]++;
sprite->oam.affineMode = 0;
FreeOamMatrix(sprite->oam.matrixNum);
sprite->invisible = 1;
sprite->invisible = TRUE;
}
}
}
@@ -3516,7 +3516,7 @@ void sub_80B9804(struct Task *task)
CameraObjectReset2();
EventObjectTurn(eventObject, DIR_WEST);
StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
eventObject->invisible = 0;
eventObject->invisible = FALSE;
task->data[1] = sub_80B94C4();
sub_80B9524(task->data[1]);
sub_80B9560(task->data[1], eventObject->spriteId);