summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c106
1 files changed, 53 insertions, 53 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index 1617d8f51..51d1a1a0a 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1118,7 +1118,7 @@ void mapldr_08084390(void)
Overworld_PlaySpecialMapMusic();
pal_fill_black();
CreateTask(c3_080843F8, 0);
- gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+ gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
if (gPlayerAvatar.flags & 0x08)
{
FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_WEST);
@@ -1178,11 +1178,11 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0]
playerObject = &gMapObjects[gPlayerAvatar.mapObjectId];
playerSprite = &gSprites[gPlayerAvatar.spriteId];
CameraObjectReset2();
- gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+ gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
gPlayerAvatar.preventStep = TRUE;
FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
task->data[4] = playerSprite->subspriteMode;
- playerObject->mapobj_bit_26 = 1;
+ playerObject->fixedPriority = 1;
playerSprite->oam.priority = 1;
playerSprite->subspriteMode = 2;
task->data[0]++;
@@ -1207,7 +1207,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;
- gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0;
+ gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0;
PlaySE(SE_RU_HYUU);
task->data[0]++;
return FALSE;
@@ -1232,15 +1232,15 @@ bool8 sub_80868E4(struct Task *task)
if (task->data[3] == 0 && sprite->pos2.y >= -16)
{
task->data[3]++;
- mapObject->mapobj_bit_26 = 0;
+ mapObject->fixedPriority = 0;
sprite->subspriteMode = task->data[4];
- mapObject->mapobj_bit_2 = 1;
+ mapObject->triggerGroundEffectsOnMove = 1;
}
if (sprite->pos2.y >= 0)
{
PlaySE(SE_W070);
- mapObject->mapobj_bit_3 = 1;
- mapObject->mapobj_bit_5 = 1;
+ mapObject->triggerGroundEffectsOnStop = 1;
+ mapObject->landingJump = 1;
sprite->pos2.y = 0;
task->data[0]++;
}
@@ -1611,7 +1611,7 @@ bool8 sub_8087058(struct Task *task, struct MapObject *mapObject)
{
return FALSE;
}
- if (MetatileBehavior_IsWaterfall(mapObject->mapobj_unk_1E))
+ if (MetatileBehavior_IsWaterfall(mapObject->currentMetatileBehavior))
{
task->data[0] = 3;
return TRUE;
@@ -1663,7 +1663,7 @@ bool8 dive_3_unknown(struct Task *task)
PlayerGetDestCoords(&mapPosition.x, &mapPosition.y);
if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
{
- dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E);
+ dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior);
DestroyTask(FindTaskIdByFunc(Task_Dive));
FieldEffectActiveListRemove(FLDEFF_USE_DIVE);
}
@@ -1689,7 +1689,7 @@ bool8 sub_808722C(struct Task *task, struct MapObject *mapObject, struct Sprite
CameraObjectReset2();
SetCameraPanningCallback(NULL);
gPlayerAvatar.preventStep = TRUE;
- mapObject->mapobj_bit_26 = 1;
+ mapObject->fixedPriority = 1;
task->data[1] = 1;
task->data[0]++;
return TRUE;
@@ -1712,8 +1712,8 @@ bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite
{
sprite->pos2.y = 0;
task->data[3] = 1;
- gFieldEffectArguments[0] = mapObject->coords2.x;
- gFieldEffectArguments[1] = mapObject->coords2.y;
+ gFieldEffectArguments[0] = mapObject->currentCoords.x;
+ gFieldEffectArguments[1] = mapObject->currentCoords.y;
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
@@ -1754,7 +1754,7 @@ bool8 sub_80872E4(struct Task *task, struct MapObject *mapObject, struct Sprite
if (task->data[5] == 0 && sprite->pos2.y < -0x10)
{
task->data[5]++;
- mapObject->mapobj_bit_26 = 1;
+ mapObject->fixedPriority = 1;
sprite->oam.priority = 1;
sprite->subspriteMode = 2;
}
@@ -1806,7 +1806,7 @@ bool8 sub_80874CC(struct Task *task, struct MapObject *mapObject, struct Sprite
CameraObjectReset2();
FreezeMapObjects();
gPlayerAvatar.preventStep = TRUE;
- mapObject->mapobj_bit_13 = 1;
+ mapObject->invisible = 1;
task->data[0]++;
return FALSE;
}
@@ -1815,8 +1815,8 @@ bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite
{
if (IsWeatherNotFadingIn())
{
- gFieldEffectArguments[0] = mapObject->coords2.x;
- gFieldEffectArguments[1] = mapObject->coords2.y;
+ gFieldEffectArguments[0] = mapObject->currentCoords.x;
+ gFieldEffectArguments[1] = mapObject->currentCoords.y;
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -1831,7 +1831,7 @@ bool8 sub_8087548(struct Task *task, struct MapObject *mapObject, struct Sprite
if (sprite->animCmdIndex > 1)
{
task->data[0]++;
- mapObject->mapobj_bit_13 = 0;
+ mapObject->invisible = 0;
CameraObjectReset1();
PlaySE(SE_W091);
FieldObjectSetSpecialAnim(mapObject, sub_80608A4(DIR_EAST));
@@ -1889,7 +1889,7 @@ bool8 sub_80876C8(struct Task *task, struct MapObject *mapObject, struct Sprite
FreezeMapObjects();
CameraObjectReset2();
gPlayerAvatar.preventStep = TRUE;
- mapObject->mapobj_bit_26 = 1;
+ mapObject->fixedPriority = 1;
task->data[0]++;
return FALSE;
}
@@ -1900,8 +1900,8 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite
{
if (task->data[1] > 3)
{
- gFieldEffectArguments[0] = mapObject->coords2.x;
- gFieldEffectArguments[1] = mapObject->coords2.y;
+ gFieldEffectArguments[0] = mapObject->currentCoords.x;
+ gFieldEffectArguments[1] = mapObject->currentCoords.y;
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -1909,7 +1909,7 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite
} else
{
task->data[1]++;
- FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18));
+ FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection));
PlaySE(SE_FU_ZUZUZU);
}
}
@@ -1920,7 +1920,7 @@ bool8 sub_8087774(struct Task *task, struct MapObject *mapObject, struct Sprite
{
if (gSprites[task->data[1]].animCmdIndex == 2)
{
- mapObject->mapobj_bit_13 = 1;
+ mapObject->invisible = 1;
task->data[0]++;
}
return FALSE;
@@ -2011,7 +2011,7 @@ void sub_8087914(struct Task *task)
DestroyTask(FindTaskIdByFunc(sub_80878C4));
} else if (task->data[1] == 0 || (--task->data[1]) == 0)
{
- FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->mapobj_unk_18]));
+ FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection]));
if (task->data[2] < 12)
{
task->data[2]++;
@@ -2035,7 +2035,7 @@ void mapldr_080859D4(void)
ScriptContext2_Enable();
FreezeMapObjects();
gFieldCallback = NULL;
- gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+ gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
CreateTask(sub_8087A74, 0);
}
@@ -2065,20 +2065,20 @@ void sub_8087AC8(struct Task *task)
}
if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble())
{
- mapObject->mapobj_bit_13 = 0;
+ mapObject->invisible = 0;
ScriptContext2_Disable();
UnfreezeMapObjects();
DestroyTask(FindTaskIdByFunc(sub_8087A74));
return;
}
- FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->mapobj_unk_18]));
+ FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection]));
if (task->data[2] < 32)
{
task->data[2]++;
}
task->data[1] = task->data[2] >> 2;
}
- mapObject->mapobj_bit_13 ^= 1;
+ mapObject->invisible ^= 1;
}
static void ExecuteTeleportFieldEffectTask(u8);
@@ -2120,11 +2120,11 @@ static void TeleportFieldEffectTask2(struct Task *task)
struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
if (task->data[1] == 0 || (--task->data[1]) == 0)
{
- FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]);
+ FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]);
task->data[1] = 8;
task->data[2]++;
}
- if (task->data[2] > 7 && task->data[15] == mapObject->mapobj_unk_18)
+ if (task->data[2] > 7 && task->data[15] == mapObject->facingDirection)
{
task->data[0]++;
task->data[1] = 4;
@@ -2142,7 +2142,7 @@ static void TeleportFieldEffectTask3(struct Task *task)
if ((--task->data[1]) <= 0)
{
task->data[1] = 4;
- FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]);
+ FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]);
}
sprite->pos1.y -= task->data[3];
task->data[4] += task->data[3];
@@ -2183,7 +2183,7 @@ static void mapldr_08085D88(void)
ScriptContext2_Enable();
FreezeMapObjects();
gFieldCallback = NULL;
- gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+ gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
CameraObjectReset2();
CreateTask(sub_8087E1C, 0);
}
@@ -2208,7 +2208,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);
- gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0;
+ gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0;
task->data[0]++;
task->data[1] = 8;
task->data[2] = 1;
@@ -2228,7 +2228,7 @@ void sub_8087ED8(struct Task *task)
if (task->data[13] == 0)
{
task->data[13]++;
- mapObject->mapobj_bit_2 = 1;
+ mapObject->triggerGroundEffectsOnMove = 1;
sprite->subspriteMode = task->data[14];
}
} else
@@ -2246,7 +2246,7 @@ void sub_8087ED8(struct Task *task)
if ((--task->data[2]) == 0)
{
task->data[2] = 4;
- FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]);
+ FieldObjectTurn(mapObject, unknown_0839F380[mapObject->facingDirection]);
}
if (sprite->pos2.y >= 0)
{
@@ -2263,9 +2263,9 @@ void sub_8087FDC(struct Task *task)
struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
if ((--task->data[1]) == 0)
{
- FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]);
+ FieldObjectTurn(mapObject, unknown_0839F380[mapObject->facingDirection]);
task->data[1] = 8;
- if ((++task->data[2]) > 4 && task->data[14] == mapObject->mapobj_unk_18)
+ if ((++task->data[2]) > 4 && task->data[14] == mapObject->facingDirection)
{
ScriptContext2_Disable();
CameraObjectReset1();
@@ -2825,7 +2825,7 @@ void sub_8088984(struct Task *task)
gPlayerAvatar.preventStep = TRUE;
SetPlayerAvatarStateMask(8);
PlayerGetDestCoords(&task->data[1], &task->data[2]);
- MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].placeholder18, &task->data[1], &task->data[2]);
+ MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].movementDirection, &task->data[1], &task->data[2]);
task->data[0]++;
}
@@ -2861,11 +2861,11 @@ void sub_8088A78(struct Task *task)
mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
- FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->placeholder18));
+ FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->movementDirection));
gFieldEffectArguments[0] = task->data[1];
gFieldEffectArguments[1] = task->data[2];
gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
- mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB);
+ mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
task->data[0]++;
}
}
@@ -2878,8 +2878,8 @@ void sub_8088AF4(struct Task *task)
{
gPlayerAvatar.preventStep = FALSE;
gPlayerAvatar.flags &= 0xdf;
- FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->placeholder18));
- sub_8127ED0(mapObject->mapobj_unk_1A, 1);
+ FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection));
+ sub_8127ED0(mapObject->fieldEffectSpriteId, 1);
UnfreezeMapObjects();
ScriptContext2_Disable();
FieldEffectActiveListRemove(FLDEFF_USE_SURF);
@@ -2993,8 +2993,8 @@ void sub_8088D3C(struct Task *task)
mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
if (task->data[15] & 0x08)
{
- sub_8127ED0(mapObject->mapobj_unk_1A, 2);
- sub_8127EFC(mapObject->mapobj_unk_1A, 0);
+ sub_8127ED0(mapObject->fieldEffectSpriteId, 2);
+ sub_8127EFC(mapObject->fieldEffectSpriteId, 0);
}
task->data[1] = sub_8088F60();
task->data[0]++;
@@ -3032,11 +3032,11 @@ void sub_8088E2C(struct Task *task)
mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
- mapObject->mapobj_bit_12 = 1;
+ mapObject->inanimate = 1;
FieldObjectSetSpecialAnim(mapObject, 0x48);
if (task->data[15] & 0x08)
{
- DestroySprite(&gSprites[mapObject->mapobj_unk_1A]);
+ DestroySprite(&gSprites[mapObject->fieldEffectSpriteId]);
}
task->data[0]++;
task->data[2] = 0;
@@ -3050,8 +3050,8 @@ void sub_8088EB4(struct Task *task)
{
mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
FieldObjectClearAnimIfSpecialAnimActive(mapObject);
- mapObject->mapobj_bit_12 = 0;
- mapObject->mapobj_bit_22 = 0;
+ mapObject->inanimate = 0;
+ mapObject->hasShadow = 0;
sub_8088FFC(task->data[1], mapObject->spriteId);
CameraObjectReset2();
task->data[0]++;
@@ -3268,13 +3268,13 @@ void sub_80892A0(struct Task *task)
SetPlayerAvatarStateMask(0x01);
if (task->data[15] & 0x08)
{
- sub_8127ED0(mapObject->mapobj_unk_1A, 0);
+ sub_8127ED0(mapObject->fieldEffectSpriteId, 0);
}
sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
CameraObjectReset2();
FieldObjectTurn(mapObject, DIR_WEST);
StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
- mapObject->mapobj_bit_13 = 0;
+ mapObject->invisible = 0;
task->data[1] = sub_8088F60();
sub_8088FC0(task->data[1]);
sub_8088FFC(task->data[1], mapObject->spriteId);
@@ -3337,8 +3337,8 @@ void sub_8089414(struct Task *task)
{
mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
sprite = &gSprites[mapObject->spriteId];
- mapObject->mapobj_bit_12 = 0;
- sub_805C058(mapObject, mapObject->coords2.x, mapObject->coords2.y);
+ mapObject->inanimate = 0;
+ sub_805C058(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y);
sprite->pos2.x = 0;
sprite->pos2.y = 0;
sprite->coordOffsetEnabled = 1;
@@ -3378,7 +3378,7 @@ void fishE(struct Task *task)
if (task->data[15] & 0x08)
{
state = PLAYER_AVATAR_STATE_SURFING;
- sub_8127ED0(mapObject->mapobj_unk_1A, 1);
+ sub_8127ED0(mapObject->fieldEffectSpriteId, 1);
}
sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(state));
FieldObjectTurn(mapObject, DIR_SOUTH);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:53:22 +0000