diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-02-28 21:52:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 22:52:12 -0500 |
| commit | fb1ed529ad9cfeb13158edbe716deb5aace4f272 (patch) | |
| tree | 97be08e503eefe3cb3f58338ecdaab025cd45cd6 /src | |
| parent | 5c761c33f077e28b76efc74516271fd033d25cab (diff) | |
Add OoT actor structs and enums (#55)
* add oot structs
* revert formatting
* fix comment thing
* fix accidental renames
* slight fix
* naviEnemyId -> hintId
* fix headers
Diffstat (limited to 'src')
579 files changed, 740 insertions, 740 deletions
diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c index 31b42d4d5..ae25f25b2 100644 --- a/src/code/code_0x800A5AC0.c +++ b/src/code/code_0x800A5AC0.c @@ -8,10 +8,10 @@ void EnAObj_Init(ActorEnAObj* this, GlobalContext* ctxt) { s0->base.textId = ((s0->base.params >> 8) & 0xFF) | 0x300; s0->base.params = (s0->base.params & 0xFF) - 9; Actor_ProcessInitChain((Actor*)s0, &enAObjInitVar); - Actor_SetDrawParams(&s0->base.shape, 0, (actor_shadow_draw_func)func_800B3FC0, 12); + Actor_SetDrawParams(&s0->base.shape, 0, (ActorShadowFunc)func_800B3FC0, 12); Collision_InitCylinder(ctxt, &s0->collision, (Actor*)s0, &enAObjCylinderInit); Collision_CylinderMoveToActor((Actor*)s0, &s0->collision); - s0->base.unkA0.mass = 255; + s0->base.colChkInfo.mass = 255; s0->update = (ActorFunc)EnAObj_Update1; } @@ -26,7 +26,7 @@ void EnAObj_Update1(ActorEnAObj* this, GlobalContext* ctxt) { if (func_800B84D0((Actor*)this, ctxt) != 0) { this->update = (ActorFunc)EnAObj_Update2; } else { - v0 = this->base.rotTowardsLinkY - this->base.shape.rot.y; + v0 = this->base.yawTowardsPlayer - this->base.shape.rot.y; v1 = (v0 < 0)? -v0 : v0; if ((v1 < 10240) || ((this->base.params == 1) && (v1 > 22528))) { func_800B863C((Actor*)this, ctxt); diff --git a/src/code/code_0x800CAAD0.c b/src/code/code_0x800CAAD0.c index e4a9f4683..97bd8412e 100644 --- a/src/code/code_0x800CAAD0.c +++ b/src/code/code_0x800CAAD0.c @@ -38,10 +38,10 @@ void BgCheck2_UpdateActorPosition(CollisionContext* bgCtxt, s32 index, Actor* ac bgCtxt->dyna.actorMeshArr[index].currParams.pos.y, bgCtxt->dyna.actorMeshArr[index].currParams.pos.z); - Matrix_MultiplyByVectorXYZ(&prevMatrixInv, &actor->currPosRot.pos, &posWithInv); + Matrix_MultiplyByVectorXYZ(&prevMatrixInv, &actor->world.pos, &posWithInv); Matrix_MultiplyByVectorXYZ(&currMatrix, &posWithInv, &newPos); - actor->currPosRot.pos = newPos; + actor->world.pos = newPos; } void BgCheck2_UpdateActorYRotation(CollisionContext* bgCtxt, s32 index, Actor* actor) { @@ -56,7 +56,7 @@ void BgCheck2_UpdateActorYRotation(CollisionContext* bgCtxt, s32 index, Actor* a } actor->shape.rot.y += angleChange; - actor->currPosRot.rot.y += angleChange; + actor->world.rot.y += angleChange; } void BgCheck2_AttachToMesh(CollisionContext* bgCtxt, Actor* actor, s32 index) { diff --git a/src/code/code_0x800CAE10.c b/src/code/code_0x800CAE10.c index 0bad5fce7..194d779b8 100644 --- a/src/code/code_0x800CAE10.c +++ b/src/code/code_0x800CAE10.c @@ -2,11 +2,11 @@ #include <global.h> void BcCheck3_BgActorInit(DynaPolyActor* actor, UNK_TYPE4 param_2) { - actor->dynaPolyId = -1; + actor->bgId = -1; actor->unk148 = 0; actor->unk14C = 0; actor->unk154 = param_2; - actor->dynaFlags = 0; + actor->unk_158 = 0; } void BgCheck3_LoadMesh(GlobalContext* ctxt, DynaPolyActor* actor, BgMeshHeader* meshHeader) { @@ -14,19 +14,19 @@ void BgCheck3_LoadMesh(GlobalContext* ctxt, DynaPolyActor* actor, BgMeshHeader* header = NULL; BgCheck_RelocateMeshHeader(meshHeader, &header); - actor->dynaPolyId = BgCheck_AddActorMesh(ctxt, &ctxt->colCtx.dyna, actor, header); + actor->bgId = BgCheck_AddActorMesh(ctxt, &ctxt->colCtx.dyna, actor, header); } void BgCheck3_ResetFlags(DynaPolyActor* actor) { - actor->dynaFlags = 0; + actor->unk_158 = 0; } void func_800CAE88(DynaPolyActor* actor) { - actor->dynaFlags |= 1; + actor->unk_158 |= 1; } void func_800CAE9C(DynaPolyActor* actor) { - actor->dynaFlags |= 2; + actor->unk_158 |= 2; } void func_800CAEB0(CollisionContext* bgCtxt, s32 index) { @@ -39,7 +39,7 @@ void func_800CAEB0(CollisionContext* bgCtxt, s32 index) { } void func_800CAEE0(DynaPolyActor* actor) { - actor->dynaFlags |= 4; + actor->unk_158 |= 4; } void func_800CAEF4(CollisionContext* bgCtxt, s32 index) { @@ -52,15 +52,15 @@ void func_800CAEF4(CollisionContext* bgCtxt, s32 index) { } void func_800CAF24(DynaPolyActor* actor) { - actor->dynaFlags |= 8; + actor->unk_158 |= 8; } void func_800CAF38(DynaPolyActor* actor) { - actor->dynaFlags |= 0x10; + actor->unk_158 |= 0x10; } s32 func_800CAF4C(DynaPolyActor* actor) { - if (actor->dynaFlags & 1) { + if (actor->unk_158 & 1) { return 1; } else { return 0; @@ -68,7 +68,7 @@ s32 func_800CAF4C(DynaPolyActor* actor) { } s32 func_800CAF70(DynaPolyActor* actor) { - if (actor->dynaFlags & 2) { + if (actor->unk_158 & 2) { return 1; } else { return 0; @@ -76,7 +76,7 @@ s32 func_800CAF70(DynaPolyActor* actor) { } s32 func_800CAF94(DynaPolyActor* actor) { - if (actor->dynaFlags & 4) { + if (actor->unk_158 & 4) { return 1; } else { return 0; @@ -84,7 +84,7 @@ s32 func_800CAF94(DynaPolyActor* actor) { } s32 func_800CAFB8(DynaPolyActor* actor) { - if (actor->dynaFlags & 8) { + if (actor->unk_158 & 8) { return 1; } else { return 0; @@ -92,7 +92,7 @@ s32 func_800CAFB8(DynaPolyActor* actor) { } s32 func_800CAFDC(DynaPolyActor* actor) { - if (actor->dynaFlags & 0x10) { + if (actor->unk_158 & 0x10) { return 1; } else { return 0; diff --git a/src/code/code_0x800E8EA0.c b/src/code/code_0x800E8EA0.c index 146fb9790..cfb9a5b18 100644 --- a/src/code/code_0x800E8EA0.c +++ b/src/code/code_0x800E8EA0.c @@ -31,8 +31,8 @@ s32 func_800E8FA4(Actor* actor, Vec3f* param_2, Vec3s* param_3, Vec3s* param_4) s16 targetYaw; s16 yawDiffFromTarget; - targetPitch = Math_Vec3f_Pitch(&actor->topPosRot.pos,param_2); - targetYaw = Math_Vec3f_Yaw(&actor->topPosRot.pos,param_2) - actor->currPosRot.rot.y; + targetPitch = Math_Vec3f_Pitch(&actor->focus.pos,param_2); + targetYaw = Math_Vec3f_Yaw(&actor->focus.pos,param_2) - actor->world.rot.y; Math_SmoothScaleMaxMinS(¶m_3->x, targetPitch, 6, 2000, 1); param_3->x = (param_3->x < -6000)? -6000 : ((6000 < param_3->x)? 6000 : param_3->x); @@ -58,11 +58,11 @@ s32 func_800E9138(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para Vec3f local_14; player = (ctxt->actorCtx).actorList[2].first; - actor->topPosRot.pos = actor->currPosRot.pos; - actor->topPosRot.pos.y += param_5; + actor->focus.pos = actor->world.pos; + actor->focus.pos.y += param_5; if (((ctxt->csCtx).state == 0) && (D_801D0D50 == 0)) { - sVar3 = actor->rotTowardsLinkY - actor->shape.rot.y; + sVar3 = actor->yawTowardsPlayer - actor->shape.rot.y; // TODO is this shifting because of a missing cast? if (0x42ff < (sVar3 < 0? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) { func_800E8F08(param_3,param_4); @@ -73,7 +73,7 @@ s32 func_800E9138(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para if (((ctxt->csCtx).state != 0) || (D_801D0D50 != 0)) { local_14 = ctxt->view.eye; } else { - local_14 = player->topPosRot.pos; + local_14 = player->focus.pos; } func_800E8FA4(actor,&local_14,param_3,param_4); @@ -86,10 +86,10 @@ s32 func_800E9250(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para Vec3f local_14; player = (ctxt->actorCtx).actorList[2].first; - actor->topPosRot.pos = param_5; + actor->focus.pos = param_5; if (((ctxt->csCtx).state == 0) && (D_801D0D50 == 0)) { - sVar3 = actor->rotTowardsLinkY - actor->shape.rot.y; + sVar3 = actor->yawTowardsPlayer - actor->shape.rot.y; // TODO is this shifting because of a missing cast? if (0x42ff < (sVar3 < 0? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) { func_800E8F08(param_3,param_4); @@ -100,7 +100,7 @@ s32 func_800E9250(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para if (((ctxt->csCtx).state != 0) || (D_801D0D50 != 0)) { local_14 = ctxt->view.eye; } else { - local_14 = player->topPosRot.pos; + local_14 = player->focus.pos; } func_800E8FA4(actor,&local_14,param_3,param_4); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index f64931bad..6715613ec 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -7,11 +7,11 @@ #pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PrintLists.asm") -void Actor_SetDrawParams(ActorShape* iParm1, f32 yDisplacement, actor_shadow_draw_func func, f32 scale) { - iParm1->yDisplacement = yDisplacement; - iParm1->shadowDrawFunc = func; - iParm1->scale = scale; - iParm1->alphaScale = 255; +void Actor_SetDrawParams(ActorShape* actorShape, f32 yOffset, ActorShadowFunc func, f32 scale) { + actorShape->yOffset = yOffset; + actorShape->shadowDraw = func; + actorShape->shadowScale = scale; + actorShape->shadowAlpha = 255; } #pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PostDraw.asm") @@ -50,8 +50,8 @@ void Actor_TargetContextInit(TargetContext* targetCtxt, Actor* actor, GlobalCont targetCtxt->unk4B = 0; targetCtxt->unk4C = 0; targetCtxt->unk40 = 0; - func_800B5040(targetCtxt, actor, actor->type, ctxt); - func_800B4F78(targetCtxt, actor->type, ctxt); + func_800B5040(targetCtxt, actor, actor->category, ctxt); + func_800B4F78(targetCtxt, actor->category, ctxt); } #pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5208.asm") @@ -186,24 +186,24 @@ void Actor_MarkForDeath(Actor* actor) { } void Actor_InitCurrPosition(Actor* actor) { - actor->currPosRot = actor->initPosRot; + actor->world = actor->home; } void Actor_SetHeight(Actor* actor, f32 height) { - actor->topPosRot.pos.x = actor->currPosRot.pos.x; - actor->topPosRot.pos.y = actor->currPosRot.pos.y + height; - actor->topPosRot.pos.z = actor->currPosRot.pos.z; - actor->topPosRot.rot.x = actor->currPosRot.rot.x; - actor->topPosRot.rot.y = actor->currPosRot.rot.y; - actor->topPosRot.rot.z = actor->currPosRot.rot.z; + actor->focus.pos.x = actor->world.pos.x; + actor->focus.pos.y = actor->world.pos.y + height; + actor->focus.pos.z = actor->world.pos.z; + actor->focus.rot.x = actor->world.rot.x; + actor->focus.rot.y = actor->world.rot.y; + actor->focus.rot.z = actor->world.rot.z; } void Actor_SetRotationFromDrawRotation(Actor* actor) { - actor->currPosRot.rot = actor->shape.rot; + actor->world.rot = actor->shape.rot; } void Actor_InitDrawRotation(Actor* actor) { - actor->shape.rot = actor->currPosRot.rot; + actor->shape.rot = actor->world.rot; } void Actor_SetScale(Actor* actor, f32 scale) { @@ -222,18 +222,18 @@ void Actor_InitToDefaultValues(Actor* actor, GlobalContext* ctxt) { Actor_InitCurrPosition(actor); Actor_InitDrawRotation(actor); Actor_SetHeight(actor, 0); - Math_Vec3f_Copy(&actor->lastPos, &actor->currPosRot.pos); + Math_Vec3f_Copy(&actor->prevPos, &actor->world.pos); Actor_SetScale(actor, 0.01); - actor->unk1F = 3; + actor->targetMode = 3; actor->minYVelocity = -20.0f; actor->meshAttachedTo = 0x32; actor->sqrdDistToLink = D_801DCA54; - func_800E7494(&actor->unkA0); - actor->unkFC = 1000.0f; - actor->unk100 = 350.0f; - actor->unk104 = 700.0f; + func_800E7494(&actor->colChkInfo); + actor->uncullZoneForward = 1000.0f; + actor->uncullZoneScale = 350.0f; + actor->uncullZoneDownward = 700.0f; actor->naviMsgId = 255; @@ -263,9 +263,9 @@ void Actor_SetMovementScale(s32 scale) { #ifdef NON_MATCHING void Actor_ApplyMovement(Actor* actor) { - actor->currPosRot.pos.x += ((actor->velocity.x * actorMovementScale) + actor->unkA0.displacement.x); - actor->currPosRot.pos.y += ((actor->velocity.y * actorMovementScale) + actor->unkA0.displacement.y); - actor->currPosRot.pos.z += ((actor->velocity.z * actorMovementScale) + actor->unkA0.displacement.z); + actor->world.pos.x += ((actor->velocity.x * actorMovementScale) + actor->colChkInfo.displacement.x); + actor->world.pos.y += ((actor->velocity.y * actorMovementScale) + actor->colChkInfo.displacement.y); + actor->world.pos.z += ((actor->velocity.z * actorMovementScale) + actor->colChkInfo.displacement.z); } #else #pragma GLOBAL_ASM("asm/non_matchings/z_actor//Actor_ApplyMovement.asm") @@ -273,9 +273,9 @@ void Actor_ApplyMovement(Actor* actor) { #ifdef NON_MATCHING void Actor_SetVelocityYRotationAndGravity(Actor* actor) { - actor->velocity.x = actor->speedXZ * Math_Sins(actor->currPosRot.rot.x); + actor->velocity.x = actor->speedXZ * Math_Sins(actor->world.rot.x); actor->velocity.y = actor->velocity.y + actor->gravity; - actor->velocity.z = actor->speedXZ * Math_Coss(actor->currPosRot.rot.x); + actor->velocity.z = actor->speedXZ * Math_Coss(actor->world.rot.x); if (actor->velocity.y < actor->minYVelocity) { actor->velocity.y = actor->minYVelocity; @@ -291,10 +291,10 @@ void Actor_SetVelocityAndMoveYRotationAndGravity(Actor* actor) { } void Actor_SetVelocityXYRotation(Actor* actor) { - f32 velX = Math_Coss(actor->currPosRot.rot.x) * actor->speedXZ; - actor->velocity.x = Math_Sins(actor->currPosRot.rot.y) * velX; - actor->velocity.y = Math_Sins(actor->currPosRot.rot.x) * actor->speedXZ; - actor->velocity.z = Math_Coss(actor->currPosRot.rot.y) * velX; + f32 velX = Math_Coss(actor->world.rot.x) * actor->speedXZ; + actor->velocity.x = Math_Sins(actor->world.rot.y) * velX; + actor->velocity.y = Math_Sins(actor->world.rot.x) * actor->speedXZ; + actor->velocity.z = Math_Coss(actor->world.rot.y) * velX; } void Actor_SetVelocityAndMoveXYRotation(Actor* actor) { @@ -303,10 +303,10 @@ void Actor_SetVelocityAndMoveXYRotation(Actor* actor) { } void Actor_SetVelocityXYRotationReverse(Actor* actor) { - f32 velX = Math_Coss(-actor->currPosRot.rot.x) * actor->speedXZ; - actor->velocity.x = Math_Sins(actor->currPosRot.rot.y) * velX; - actor->velocity.y = Math_Sins(-actor->currPosRot.rot.x) * actor->speedXZ; - actor->velocity.z = Math_Coss(actor->currPosRot.rot.y) * velX; + f32 velX = Math_Coss(-actor->world.rot.x) * actor->speedXZ; + actor->velocity.x = Math_Sins(actor->world.rot.y) * velX; + actor->velocity.y = Math_Sins(-actor->world.rot.x) * actor->speedXZ; + actor->velocity.z = Math_Coss(actor->world.rot.y) * velX; } void Actor_SetVelocityAndMoveXYRotationReverse(Actor* actor) { @@ -319,43 +319,43 @@ void Actor_SetVelocityAndMoveXYRotationReverse(Actor* actor) { #pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6C58.asm") s16 Actor_YawBetweenActors(Actor* from, Actor* to) { - return Math_Vec3f_Yaw(&from->currPosRot.pos, &to->currPosRot.pos); + return Math_Vec3f_Yaw(&from->world.pos, &to->world.pos); } s16 Actor_YawBetweenActorsTop(Actor* from, Actor* to) { - return Math_Vec3f_Yaw(&from->topPosRot.pos, &to->topPosRot.pos); + return Math_Vec3f_Yaw(&from->focus.pos, &to->focus.pos); } s16 Actor_YawToPoint(Actor* actor, Vec3f* point) { - return Math_Vec3f_Yaw(&actor->currPosRot.pos, point); + return Math_Vec3f_Yaw(&actor->world.pos, point); } s16 Actor_PitchBetweenActors(Actor* from, Actor* to) { - return Math_Vec3f_Pitch(&from->currPosRot.pos, &to->currPosRot.pos); + return Math_Vec3f_Pitch(&from->world.pos, &to->world.pos); } s16 Actor_PitchBetweenActorsTop(Actor* from, Actor* to) { - return Math_Vec3f_Pitch(&from->topPosRot.pos, &to->topPosRot.pos); + return Math_Vec3f_Pitch(&from->focus.pos, &to->focus.pos); } s16 Actor_PitchToPoint(Actor* actor, Vec3f* point) { - return Math_Vec3f_Pitch(&actor->currPosRot.pos, point); + return Math_Vec3f_Pitch(&actor->world.pos, point); } f32 Actor_DistanceBetweenActors(Actor* actor1, Actor* actor2) { - return Math_Vec3f_DistXYZ(&actor1->currPosRot.pos, &actor2->currPosRot.pos); + return Math_Vec3f_DistXYZ(&actor1->world.pos, &actor2->world.pos); } f32 Actor_DistanceToPoint(Actor* actor, Vec3f* point) { - return Math_Vec3f_DistXYZ(&actor->currPosRot.pos, point); + return Math_Vec3f_DistXYZ(&actor->world.pos, point); } f32 Actor_XZDistanceBetweenActors(Actor* actor1, Actor* actor2) { - return Math_Vec3f_DistXZ(&actor1->currPosRot.pos, &actor2->currPosRot.pos); + return Math_Vec3f_DistXZ(&actor1->world.pos, &actor2->world.pos); } f32 Actor_XZDistanceToPoint(Actor* actor, Vec3f* point) { - return Math_Vec3f_DistXZ(&actor->currPosRot.pos, point); + return Math_Vec3f_DistXZ(&actor->world.pos, point); } void Actor_CalcOffsetOrientedToDrawRotation(Actor* actor, Vec3f* offset, Vec3f* point) { @@ -366,15 +366,15 @@ void Actor_CalcOffsetOrientedToDrawRotation(Actor* actor, Vec3f* offset, Vec3f* cos_rot_y = Math_Coss(actor->shape.rot.y); sin_rot_y = Math_Sins(actor->shape.rot.y); - imm_x = point->x - actor->currPosRot.pos.x; - imm_z = point->z - actor->currPosRot.pos.z; + imm_x = point->x - actor->world.pos.x; + imm_z = point->z - actor->world.pos.z; offset->x = ((imm_x * cos_rot_y) - (imm_z * sin_rot_y)); offset->z = ((imm_z * cos_rot_y) + (imm_x * sin_rot_y)); - offset->y = point->y - actor->currPosRot.pos.y; + offset->y = point->y - actor->world.pos.y; } f32 Actor_YDistance(Actor* actor1, Actor* actor2) { - return actor2->currPosRot.pos.y - actor1->currPosRot.pos.y; + return actor2->world.pos.y - actor1->world.pos.y; } #pragma GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6F20.asm") @@ -425,7 +425,7 @@ s32 Actor_IsActorFacedByActor(Actor* actor, Actor* other, s16 tolerance) { s32 Actor_IsActorFacingLink(Actor* actor, s16 angle) { s16 dist; - dist = actor->rotTowardsLinkY - actor->shape.rot.y; + dist = actor->yawTowardsPlayer - actor->shape.rot.y; if (ABS(dist) < angle) { return 1; } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index e1bc9ef74..86de5dd84 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -107,8 +107,8 @@ s32 Scene_FindSceneObjectIndex(SceneContext* sceneCtxt, s16 objectId) { return -1; } -s32 Scene_IsObjectLoaded(SceneContext* iParm1, s32 index) { - if (iParm1->objects[index].id > 0) { +s32 Scene_IsObjectLoaded(SceneContext* actorShape, s32 index) { + if (actorShape->objects[index].id > 0) { return 1; } else { return 0; diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index ce2c52a36..98c5eb656 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1072,9 +1072,9 @@ void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType Vec3f pos; func_80137748(entry->skelAnime, &pos, actor->shape.rot.y); - actor->currPosRot.pos.x += (pos.x * actor->scale.x) * entry->unk08; - actor->currPosRot.pos.y += (pos.y * actor->scale.y) * entry->unk08; - actor->currPosRot.pos.z += (pos.z * actor->scale.z) * entry->unk08; + actor->world.pos.x += (pos.x * actor->scale.x) * entry->unk08; + actor->world.pos.y += (pos.y * actor->scale.y) * entry->unk08; + actor->world.pos.z += (pos.z * actor->scale.z) * entry->unk08; } void func_80135EE8(GlobalContext* globalCtx, AnimationContext* animationCtx) { diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 101e08fc5..27a3c902c 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -14,7 +14,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx); const ActorInit Arms_Hook_InitVars = { ACTOR_ARMS_HOOK, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArmsHook), @@ -50,7 +50,7 @@ void ArmsHook_Init(Actor* thisx, GlobalContext* globalCtx) { Collision_InitQuadDefault(globalCtx, &this->collider); Collision_InitQuadWithData(globalCtx, &this->collider, &this->actor, &D_808C1BC0); ArmsHook_SetupAction(this, ArmsHook_Wait); - this->unk1E0 = this->actor.currPosRot.pos; + this->unk1E0 = this->actor.world.pos; } void ArmsHook_Destroy(Actor* thisx, GlobalContext* globalCtx) { @@ -100,7 +100,7 @@ s32 ArmsHook_CheckForCancel(ArmsHook* this) { ((player->stateFlags1 & 0x4000080))) { this->timer = 0; ArmsHook_DetachHookFromActor(this); - Math_Vec3f_Copy(&this->actor.currPosRot.pos, &player->unk368); + Math_Vec3f_Copy(&this->actor.world.pos, &player->unk368); return 1; } } @@ -110,7 +110,7 @@ s32 ArmsHook_CheckForCancel(ArmsHook* this) { void ArmsHook_AttachHookToActor(ArmsHook* this, Actor* actor) { actor->flags |= 0x2000; this->grabbed = actor; - Math_Vec3f_Diff(&actor->currPosRot.pos, &this->actor.currPosRot.pos, &this->unk1FC); + Math_Vec3f_Diff(&actor->world.pos, &this->actor.world.pos, &this->unk1FC); } void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { @@ -158,7 +158,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { if (this->actor.child != NULL) { f32 sp94 = Actor_DistanceBetweenActors(this, grabbed); f32 sp90 = sqrtf(SQ(this->unk1FC.x) + SQ(this->unk1FC.y) + SQ(this->unk1FC.z)); - Math_Vec3f_Diff(&grabbed->currPosRot.pos, &this->unk1FC, &this->actor.currPosRot.pos); + Math_Vec3f_Diff(&grabbed->world.pos, &this->unk1FC, &this->actor.world.pos); if (50.0f < (sp94 - sp90)) { ArmsHook_DetachHookFromActor(this); grabbed = NULL; @@ -171,7 +171,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { f32 velocity; bodyDistDiff = - Math_Vec3f_DistXYZAndStoreDiff(&player->unk368, &this->actor.currPosRot.pos, &bodyDistDiffVec); + Math_Vec3f_DistXYZAndStoreDiff(&player->unk368, &this->actor.world.pos, &bodyDistDiffVec); if (bodyDistDiff < 30.0f) { velocity = 0.0f; phi_f16 = 0.0f; @@ -198,13 +198,13 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { } if (this->actor.child == NULL) { - Math_Vec3f_Sum(&player->unk368, &newPos, &this->actor.currPosRot.pos); + Math_Vec3f_Sum(&player->unk368, &newPos, &this->actor.world.pos); if (grabbed != NULL) { - Math_Vec3f_Sum(&this->actor.currPosRot.pos, &this->unk1FC, &grabbed->currPosRot.pos); + Math_Vec3f_Sum(&this->actor.world.pos, &this->unk1FC, &grabbed->world.pos); } } else { Math_Vec3f_Diff(&bodyDistDiffVec, &newPos, &player->base.velocity); - player->base.currPosRot.rot.x = + player->base.world.rot.x = atans_flip(sqrtf(SQ(bodyDistDiffVec.x) + SQ(bodyDistDiffVec.z)), -bodyDistDiffVec.y); } if (phi_f16 < 50.0f) { @@ -212,47 +212,47 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { if (phi_f16 == 0.0f) { ArmsHook_SetupAction(this, ArmsHook_Wait); if (ArmsHook_AttachToPlayer(this, player)) { - Math_Vec3f_Diff(&this->actor.currPosRot.pos, &player->base.currPosRot.pos, &player->base.velocity); + Math_Vec3f_Diff(&this->actor.world.pos, &player->base.world.pos, &player->base.velocity); player->base.velocity.y -= 20.0f; } } } } else { BgPolygon* poly; - u32 dynaPolyID; + u32 bgId; Vec3f sp78; Vec3f prevFrameDiff; Vec3f sp60; Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor); - Math_Vec3f_Diff(&this->actor.currPosRot.pos, &this->actor.lastPos, &prevFrameDiff); + Math_Vec3f_Diff(&this->actor.world.pos, &this->actor.prevPos, &prevFrameDiff); Math_Vec3f_Sum(&this->unk1E0, &prevFrameDiff, &this->unk1E0); this->actor.shape.rot.x = atans_flip(this->actor.speedXZ, -this->actor.velocity.y); sp60.x = this->unk1EC.x - (this->unk1E0.x - this->unk1EC.x); sp60.y = this->unk1EC.y - (this->unk1E0.y - this->unk1EC.y); sp60.z = this->unk1EC.z - (this->unk1E0.z - this->unk1EC.z); - if (func_800C55C4(&globalCtx->colCtx, &sp60, &this->unk1E0, &sp78, &poly, 1, 1, 1, 1, &dynaPolyID) != 0 && - (func_800B90AC(globalCtx, &this->actor, poly, dynaPolyID, &sp78) == 0 || - func_800C576C(&globalCtx->colCtx, &sp60, &this->unk1E0, &sp78, &poly, 1, 1, 1, 1, &dynaPolyID) != 0)) { + if (func_800C55C4(&globalCtx->colCtx, &sp60, &this->unk1E0, &sp78, &poly, 1, 1, 1, 1, &bgId) != 0 && + (func_800B90AC(globalCtx, &this->actor, poly, bgId, &sp78) == 0 || + func_800C576C(&globalCtx->colCtx, &sp60, &this->unk1E0, &sp78, &poly, 1, 1, 1, 1, &bgId) != 0)) { f32 sp5C = poly->normal.x * (1 / SHT_MAX); f32 sp58 = poly->normal.z * (1 / SHT_MAX); - Math_Vec3f_Copy(&this->actor.currPosRot.pos, &sp78); - this->actor.currPosRot.pos.x += 10.0f * sp5C; - this->actor.currPosRot.pos.z += 10.0f * sp58; + Math_Vec3f_Copy(&this->actor.world.pos, &sp78); + this->actor.world.pos.x += 10.0f * sp5C; + this->actor.world.pos.z += 10.0f * sp58; this->timer = 1; - if (func_800C9CEC(&globalCtx->colCtx, poly, dynaPolyID)) { + if (func_800C9CEC(&globalCtx->colCtx, poly, bgId)) { { DynaPolyActor* dynaPolyActor; - if (dynaPolyID != 0x32 && - (dynaPolyActor = BgCheck_GetActorOfMesh(&globalCtx->colCtx, dynaPolyID)) != NULL) { + if (bgId != 0x32 && + (dynaPolyActor = BgCheck_GetActorOfMesh(&globalCtx->colCtx, bgId)) != NULL) { ArmsHook_AttachHookToActor(this, &dynaPolyActor->actor); } } func_808C1154(this); func_8019F1C0(&this->actor.projectedPos, 0x1829); } else { - func_800E8668(globalCtx, &this->actor.currPosRot.pos); + func_800E8668(globalCtx, &this->actor.world.pos); func_8019F1C0(&this->actor.projectedPos, 0x1813); } } else { @@ -305,9 +305,9 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(sp44->polyOpa.p++, SysMatrix_AppendStateToPolyOpaDisp(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(sp44->polyOpa.p++, D_0601D960); - SysMatrix_InsertTranslation(this->actor.currPosRot.pos.x, this->actor.currPosRot.pos.y, - this->actor.currPosRot.pos.z, MTXMODE_NEW); - Math_Vec3f_Diff(&player->unk368, &this->actor.currPosRot.pos, &sp68); + SysMatrix_InsertTranslation(this->actor.world.pos.x, this->actor.world.pos.y, + this->actor.world.pos.z, MTXMODE_NEW); + Math_Vec3f_Diff(&player->unk368, &this->actor.world.pos, &sp68); sp48 = SQ(sp68.x) + SQ(sp68.z); sp4C = sqrtf(sp48); SysMatrix_InsertYRotation_s(atans(sp68.x, sp68.z), MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index daf23e785..43579cd14 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -12,7 +12,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Arrow_Fire_InitVars = { ACTOR_ARROW_FIRE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArrowFire), diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 0988e2eeb..71181e48d 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -12,7 +12,7 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Arrow_Ice_InitVars = { ACTOR_ARROW_ICE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArrowIce), diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index fe7c4ace9..d4b23b713 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -12,7 +12,7 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Arrow_Light_InitVars = { ACTOR_ARROW_LIGHT, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ArrowLight), diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index b4f755279..2a336a8d5 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -12,7 +12,7 @@ void BgAstrBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Astr_Bombwall_InitVars = { ACTOR_BG_ASTR_BOMBWALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_ASTR_OBJ, sizeof(BgAstrBombwall), diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index 7a15eee02..7f4ab4a58 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -12,7 +12,7 @@ void BgBotihasira_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Botihasira_InitVars = { ACTOR_BG_BOTIHASIRA, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_BOTIHASIRA, sizeof(BgBotihasira), diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index a408a0e7d..1ed9e1b36 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -10,7 +10,7 @@ void BgBreakwall_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Breakwall_InitVars = { ACTOR_BG_BREAKWALL, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(BgBreakwall), diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index a7f9749b9..f85f739c7 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -12,7 +12,7 @@ void BgCraceMovebg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Crace_Movebg_InitVars = { ACTOR_BG_CRACE_MOVEBG, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_CRACE_OBJECT, sizeof(BgCraceMovebg), diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c index f28c4a25d..3794e6ec6 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -12,7 +12,7 @@ void BgCtowerGear_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ctower_Gear_InitVars = { ACTOR_BG_CTOWER_GEAR, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_CTOWER_ROT, sizeof(BgCtowerGear), diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c index ed2462561..341c4aa22 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -12,7 +12,7 @@ void BgCtowerRot_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ctower_Rot_InitVars = { ACTOR_BG_CTOWER_ROT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_CTOWER_ROT, sizeof(BgCtowerRot), diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index abc35cecb..0ccff884e 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -11,7 +11,7 @@ void BgDanpeiMovebg_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Danpei_Movebg_InitVars = { ACTOR_BG_DANPEI_MOVEBG, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(BgDanpeiMovebg), diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index d1666a173..c716120d2 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -12,7 +12,7 @@ void BgDblueBalance_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Dblue_Balance_InitVars = { ACTOR_BG_DBLUE_BALANCE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueBalance), diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index be009c5cc..ca411d1d0 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -12,7 +12,7 @@ void BgDblueElevator_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Dblue_Elevator_InitVars = { ACTOR_BG_DBLUE_ELEVATOR, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueElevator), diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index c1f781c02..b0e45d68a 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -12,7 +12,7 @@ void BgDblueMovebg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Dblue_Movebg_InitVars = { ACTOR_BG_DBLUE_MOVEBG, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueMovebg), diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index f2733527c..0c4a5babe 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -12,7 +12,7 @@ void BgDblueWaterfall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Dblue_Waterfall_InitVars = { ACTOR_BG_DBLUE_WATERFALL, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueWaterfall), diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index f71e288a7..ad38570f3 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -12,7 +12,7 @@ void BgDkjailIvy_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Dkjail_Ivy_InitVars = { ACTOR_BG_DKJAIL_IVY, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_DKJAIL_OBJ, sizeof(BgDkjailIvy), diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index edb31332c..08ddf10f9 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -11,7 +11,7 @@ void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Dy_Yoseizo_InitVars = { ACTOR_BG_DY_YOSEIZO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_DY_OBJ, sizeof(BgDyYoseizo), diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index b58a3c5a0..15a1e3d40 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -12,7 +12,7 @@ void BgF40Block_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_F40_Block_InitVars = { ACTOR_BG_F40_BLOCK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Block), diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c index e995cc3fb..c6b47bc2a 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -12,7 +12,7 @@ void BgF40Flift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_F40_Flift_InitVars = { ACTOR_BG_F40_FLIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Flift), diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 1b0191e53..5a9ecfdfb 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -12,7 +12,7 @@ void BgF40Switch_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_F40_Switch_InitVars = { ACTOR_BG_F40_SWITCH, - ACTORTYPE_SWITCH, + ACTORCAT_SWITCH, FLAGS, OBJECT_F40_SWITCH, sizeof(BgF40Switch), diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index 5c2c769fc..e94ab6766 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -12,7 +12,7 @@ void BgF40Swlift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_F40_Swlift_InitVars = { ACTOR_BG_F40_SWLIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Swlift), diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c index 6460fef14..76528e398 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -11,7 +11,7 @@ void BgFireWall_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Fire_Wall_InitVars = { ACTOR_BG_FIRE_WALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_FWALL, sizeof(BgFireWall), diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c index 45ac48e63..90aa0eaac 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c @@ -11,7 +11,7 @@ void BgFuKaiten_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit Bg_Fu_Kaiten_InitVars = { ACTOR_BG_FU_KAITEN, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_FU_KAITEN, sizeof(BgFuKaiten), @@ -29,7 +29,7 @@ void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(thisx, 1.0); BcCheck3_BgActorInit(&THIS->bg, 3); BgCheck_RelocateMeshHeader(&object_fu_kaiten_002D30, &header); - THIS->bg.dynaPolyId = BgCheck_AddActorMesh(globalCtx, &globalCtx->colCtx.dyna, &THIS->bg, header); + THIS->bg.bgId = BgCheck_AddActorMesh(globalCtx, &globalCtx->colCtx.dyna, &THIS->bg, header); THIS->bouceHeight = 0.0; THIS->rotationSpeed = 0; @@ -38,7 +38,7 @@ void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) { } void BgFuKaiten_Destroy(Actor* thisx, GlobalContext* globalCtx) { - BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, THIS->bg.dynaPolyId); + BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, THIS->bg.bgId); } void BgFuKaiten_UpdateRotation(BgFuKaiten* this) { @@ -53,9 +53,9 @@ void BgFuKaiten_UpdateRotation(BgFuKaiten* this) { void BgFuKaiten_UpdateHeight(BgFuKaiten* this) { this->bounce += this->bounceSpeed; - this->bg.actor.currPosRot.pos.y = this->bg.actor.initPosRot.pos.y + this->elevation + this->bouceHeight; + this->bg.actor.world.pos.y = this->bg.actor.home.pos.y + this->elevation + this->bouceHeight; - this->bg.actor.currPosRot.pos.y -= this->bouceHeight * Math_Coss(this->bounce); + this->bg.actor.world.pos.y -= this->bouceHeight * Math_Coss(this->bounce); } void BgFuKaiten_Update(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c index f1f18e8cb..546a0d0e1 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -12,7 +12,7 @@ void BgFuMizu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Fu_Mizu_InitVars = { ACTOR_BG_FU_MIZU, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_FU_KAITEN, sizeof(BgFuMizu), diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c index fdbcaeaaa..44b0b9e74 100644 --- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c @@ -12,7 +12,7 @@ void BgGoronOyu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Goron_Oyu_InitVars = { ACTOR_BG_GORON_OYU, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_OYU, sizeof(BgGoronOyu), diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index 7adf31bcc..b2c0948fe 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -12,7 +12,7 @@ void BgHakaBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Bombwall_InitVars = { ACTOR_BG_HAKA_BOMBWALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HAKA_OBJ, sizeof(BgHakaBombwall), diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c index 8831e6d65..678c4ca71 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c @@ -21,7 +21,7 @@ void func_80B6DE80(BgHakaCurtain* this); const ActorInit Bg_Haka_Curtain_InitVars = { ACTOR_BG_HAKA_CURTAIN, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HAKA_OBJ, sizeof(BgHakaCurtain), @@ -32,9 +32,9 @@ const ActorInit Bg_Haka_Curtain_InitVars = { }; static InitChainEntry D_80B6DFA0[] = { - ICHAIN_F32(unkFC, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(unk100, 700, ICHAIN_CONTINUE), - ICHAIN_F32(unk104, 600, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -57,7 +57,7 @@ void BgHakaCurtain_Init(Actor* thisx, GlobalContext* globalCtx) { void BgHakaCurtain_Destroy(Actor* thisx, GlobalContext* globalCtx) { BgHakaCurtain* this = THIS; - BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); } void func_80B6DC98(BgHakaCurtain* this) { @@ -96,13 +96,13 @@ void func_80B6DD80(BgHakaCurtain* this) { } void func_80B6DD9C(BgHakaCurtain* this, GlobalContext* globalCtx) { - if (this->dyna.actor.currPosRot.pos.y < this->dyna.actor.initPosRot.pos.y + 150.0f - 30.0f) { + if (this->dyna.actor.world.pos.y < this->dyna.actor.home.pos.y + 150.0f - 30.0f) { Lib_StepTowardsCheck_f(&this->dyna.actor.velocity.y, 1.6f, 0.12f); } else { Lib_StepTowardsCheck_f(&this->dyna.actor.velocity.y, 0.8f, 0.05f); } - this->dyna.actor.currPosRot.pos.y += this->dyna.actor.velocity.y; - if (this->dyna.actor.initPosRot.pos.y + 150.0f < this->dyna.actor.currPosRot.pos.y) { + this->dyna.actor.world.pos.y += this->dyna.actor.velocity.y; + if (this->dyna.actor.home.pos.y + 150.0f < this->dyna.actor.world.pos.y) { func_80B6DE80(this); return; } @@ -111,7 +111,7 @@ void func_80B6DD9C(BgHakaCurtain* this, GlobalContext* globalCtx) { void func_80B6DE80(BgHakaCurtain* this) { this->actionFunc = func_80B6DEA8; - this->dyna.actor.currPosRot.pos.y = this->dyna.actor.initPosRot.pos.y + 150.0f; + this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + 150.0f; } void func_80B6DEA8(BgHakaCurtain* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c index fa32384b3..333e099e1 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c @@ -12,7 +12,7 @@ void BgHakaTomb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Haka_Tomb_InitVars = { ACTOR_BG_HAKA_TOMB, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HAKA_OBJ, sizeof(BgHakaTomb), diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index 88612b76b..d0244b0e7 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -12,7 +12,7 @@ void BgHakuginBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Hakugin_Bombwall_InitVars = { ACTOR_BG_HAKUGIN_BOMBWALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginBombwall), diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 0db9b66b8..61d6ff9eb 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -12,7 +12,7 @@ void BgHakuginElvpole_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Hakugin_Elvpole_InitVars = { ACTOR_BG_HAKUGIN_ELVPOLE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginElvpole), diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index 264f0865d..b69907048 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -11,7 +11,7 @@ void BgHakuginPost_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Hakugin_Post_InitVars = { ACTOR_BG_HAKUGIN_POST, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginPost), diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index 55eb0411e..62755cbe2 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -12,7 +12,7 @@ void BgHakuginSwitch_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Hakugin_Switch_InitVars = { ACTOR_BG_HAKUGIN_SWITCH, - ACTORTYPE_SWITCH, + ACTORCAT_SWITCH, FLAGS, OBJECT_GORONSWITCH, sizeof(BgHakuginSwitch), diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index 1da94ebdb..2b7e908e4 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -12,7 +12,7 @@ void BgIcefloe_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Icefloe_InitVars = { ACTOR_BG_ICEFLOE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_ICEFLOE, sizeof(BgIcefloe), diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 2165eeb11..4bf84ee7e 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -12,7 +12,7 @@ void BgIcicle_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Icicle_InitVars = { ACTOR_BG_ICICLE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_ICICLE, sizeof(BgIcicle), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index d3fcc1be6..99cb6c7bc 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -11,7 +11,7 @@ void BgIkanaBlock_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ikana_Block_InitVars = { ACTOR_BG_IKANA_BLOCK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(BgIkanaBlock), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index f69593840..c72332bcb 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -12,7 +12,7 @@ void BgIkanaBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ikana_Bombwall_InitVars = { ACTOR_BG_IKANA_BOMBWALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaBombwall), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index fe4d633f4..cd7f6c7a4 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -12,7 +12,7 @@ void BgIkanaDharma_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ikana_Dharma_InitVars = { ACTOR_BG_IKANA_DHARMA, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaDharma), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c index b0144bc77..860e080ee 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -12,7 +12,7 @@ void BgIkanaMirror_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ikana_Mirror_InitVars = { ACTOR_BG_IKANA_MIRROR, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaMirror), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c index 62b55d446..cb2fa982d 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c @@ -16,7 +16,7 @@ void BgIkanaRay_UpdateActivated(BgIkanaRay* this, GlobalContext* globalCtx); const ActorInit Bg_Ikana_Ray_InitVars = { ACTOR_BG_IKANA_RAY, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaRay), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 04ed94b1f..0a87c0f7e 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -12,7 +12,7 @@ void BgIkanaRotaryroom_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ikana_Rotaryroom_InitVars = { ACTOR_BG_IKANA_ROTARYROOM, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaRotaryroom), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index 286531433..9cdc868a5 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -12,7 +12,7 @@ void BgIkanaShutter_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ikana_Shutter_InitVars = { ACTOR_BG_IKANA_SHUTTER, - ACTORTYPE_SWITCH, + ACTORCAT_SWITCH, FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaShutter), diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index 71cae796b..249404095 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -12,7 +12,7 @@ void BgIkninSusceil_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Iknin_Susceil_InitVars = { ACTOR_BG_IKNIN_SUSCEIL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_IKNINSIDE_OBJ, sizeof(BgIkninSusceil), diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index c332e6ea3..977e92ab4 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -12,7 +12,7 @@ void BgIkninside_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ikninside_InitVars = { ACTOR_BG_IKNINSIDE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_IKNINSIDE_OBJ, sizeof(BgIkninside), diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c index f89b4d715..28625c746 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -12,7 +12,7 @@ void BgIknvDoukutu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Iknv_Doukutu_InitVars = { ACTOR_BG_IKNV_DOUKUTU, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_IKNV_OBJ, sizeof(BgIknvDoukutu), diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c index 53bfbcf9f..f390aca63 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -12,7 +12,7 @@ void BgIknvObj_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Iknv_Obj_InitVars = { ACTOR_BG_IKNV_OBJ, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_IKNV_OBJ, sizeof(BgIknvObj), diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 1ca621f13..301976a1d 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -12,7 +12,7 @@ void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ingate_InitVars = { ACTOR_BG_INGATE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_SICHITAI_OBJ, sizeof(BgIngate), diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c index d73f01d28..381a542ee 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -11,7 +11,7 @@ void BgInibsMovebg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Inibs_Movebg_InitVars = { ACTOR_BG_INIBS_MOVEBG, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_INIBS_OBJECT, sizeof(BgInibsMovebg), diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c index 72ad6d0e5..1f2f576e1 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -12,7 +12,7 @@ void BgKeikokuSaku_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Keikoku_Saku_InitVars = { ACTOR_BG_KEIKOKU_SAKU, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_KEIKOKU_OBJ, sizeof(BgKeikokuSaku), diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c index 89f16ab3a..edb58e181 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c @@ -12,7 +12,7 @@ void BgKeikokuSpr_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Keikoku_Spr_InitVars = { ACTOR_BG_KEIKOKU_SPR, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_KEIKOKU_OBJ, sizeof(BgKeikokuSpr), diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index d55d6236d..a40986a19 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -12,7 +12,7 @@ void BgKin2Bombwall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Kin2_Bombwall_InitVars = { ACTOR_BG_KIN2_BOMBWALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Bombwall), diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c index d389d9aa5..37e8d66fc 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c @@ -12,7 +12,7 @@ void BgKin2Fence_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Kin2_Fence_InitVars = { ACTOR_BG_KIN2_FENCE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Fence), diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index 6fc2df81b..7a2f82ea8 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -12,7 +12,7 @@ void BgKin2Picture_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Kin2_Picture_InitVars = { ACTOR_BG_KIN2_PICTURE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Picture), diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index 8e5600d0e..ef42524cf 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -12,7 +12,7 @@ void BgKin2Shelf_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Kin2_Shelf_InitVars = { ACTOR_BG_KIN2_SHELF, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Shelf), diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index 5099d4db5..153c9f6a4 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -12,7 +12,7 @@ void BgLadder_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Ladder_InitVars = { ACTOR_BG_LADDER, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_LADDER, sizeof(BgLadder), diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index f6979dc87..1807e2365 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -12,7 +12,7 @@ void BgLastBwall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Last_Bwall_InitVars = { ACTOR_BG_LAST_BWALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_LAST_OBJ, sizeof(BgLastBwall), diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c index e42303e15..77ab17e17 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -11,7 +11,7 @@ void BgLbfshot_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Lbfshot_InitVars = { ACTOR_BG_LBFSHOT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_LBFSHOT, sizeof(BgLbfshot), diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index 6bd4a126e..c930d57a3 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -12,7 +12,7 @@ void BgLotus_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Lotus_InitVars = { ACTOR_BG_LOTUS, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_LOTUS, sizeof(BgLotus), diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c index 6d58adc13..0a85dee45 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c @@ -9,7 +9,7 @@ void BgMarketStep_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit Bg_Market_Step_InitVars = { ACTOR_BG_MARKET_STEP, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_MARKET_OBJ, sizeof(BgMarketStep), @@ -20,9 +20,9 @@ const ActorInit Bg_Market_Step_InitVars = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(unkFC, 1, ICHAIN_CONTINUE), - ICHAIN_F32(unk100, 1, ICHAIN_CONTINUE), - ICHAIN_F32(unk104, 1, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 1, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c index 261819909..9eb0f5ddb 100644 --- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c @@ -11,7 +11,7 @@ void BgMbarChair_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit Bg_Mbar_Chair_InitVars = { ACTOR_BG_MBAR_CHAIR, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_MBAR_OBJ, sizeof(BgMbarChair), @@ -22,9 +22,9 @@ const ActorInit Bg_Mbar_Chair_InitVars = { }; static InitChainEntry bgMbarChairInitVars[] = { - ICHAIN_F32(unkFC, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(unk100, 60, ICHAIN_CONTINUE), - ICHAIN_F32(unk104, 80, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 80, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -42,7 +42,7 @@ void BgMbarChair_Init(Actor* thisx, GlobalContext* globalCtx) { void BgMbarChair_Destroy(Actor* thisx, GlobalContext* globalCtx) { BgMbarChair* this = THIS; - BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); } void BgMbarChair_Update(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index d3a27669d..8c826057d 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -12,7 +12,7 @@ void BgNumaHana_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Numa_Hana_InitVars = { ACTOR_BG_NUMA_HANA, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_NUMA_OBJ, sizeof(BgNumaHana), diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index 46a5781f0..dbfcdc5c9 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -12,7 +12,7 @@ void BgOpenShutter_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Open_Shutter_InitVars = { ACTOR_BG_OPEN_SHUTTER, - ACTORTYPE_DOOR, + ACTORCAT_DOOR, FLAGS, OBJECT_OPEN_OBJ, sizeof(BgOpenShutter), diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c index 4874f17f2..06bd4fa66 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -11,7 +11,7 @@ void BgOpenSpot_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Open_Spot_InitVars = { ACTOR_BG_OPEN_SPOT, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_OPEN_OBJ, sizeof(BgOpenSpot), diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c index 926298c57..f08cdc523 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -11,7 +11,7 @@ void BgSinkaiKabe_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Sinkai_Kabe_InitVars = { ACTOR_BG_SINKAI_KABE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_SINKAI_KABE, sizeof(BgSinkaiKabe), diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index 6ea177c8f..73f02c0d1 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -12,7 +12,7 @@ void BgSpdweb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Spdweb_InitVars = { ACTOR_BG_SPDWEB, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_SPDWEB, sizeof(BgSpdweb), diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c index 03fa25aa5..85d462b17 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -11,7 +11,7 @@ void BgSpoutFire_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Spout_Fire_InitVars = { ACTOR_BG_SPOUT_FIRE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_FWALL, sizeof(BgSpoutFire), diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index 3c7213d86..a6f6ee002 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -12,7 +12,7 @@ void BgTobira01_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Tobira01_InitVars = { ACTOR_BG_TOBIRA01, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_SPOT11_OBJ, sizeof(BgTobira01), diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index befc93643..97738485d 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -11,7 +11,7 @@ void BgUmajump_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Bg_Umajump_InitVars = { ACTOR_BG_UMAJUMP, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(BgUmajump), diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 67a69eb92..7b56fba82 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -12,7 +12,7 @@ void Boss01_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_01_InitVars = { ACTOR_BOSS_01, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS01, sizeof(Boss01), diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index 781e636b4..45883ce53 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -12,7 +12,7 @@ void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_02_InitVars = { ACTOR_BOSS_02, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS02, sizeof(Boss02), diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 279e33a52..71ca3c74d 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -12,7 +12,7 @@ void Boss03_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_03_InitVars = { ACTOR_BOSS_03, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS03, sizeof(Boss03), diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index b05fcc66e..ed6cdcb84 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -12,7 +12,7 @@ void Boss04_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_04_InitVars = { ACTOR_BOSS_04, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS04, sizeof(Boss04), diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index 56fdc3822..e3d60ecb1 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -12,7 +12,7 @@ void Boss05_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_05_InitVars = { ACTOR_BOSS_05, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BOSS05, sizeof(Boss05), diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index 5e8e87cf3..1385fcec1 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -12,7 +12,7 @@ void Boss06_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_06_InitVars = { ACTOR_BOSS_06, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_KNIGHT, sizeof(Boss06), diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index 09ac7dc05..f8f84455f 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -12,7 +12,7 @@ void Boss07_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_07_InitVars = { ACTOR_BOSS_07, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS07, sizeof(Boss07), diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index 044ce82f5..1e88ac42a 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -12,7 +12,7 @@ void BossHakugin_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Boss_Hakugin_InitVars = { ACTOR_BOSS_HAKUGIN, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS_HAKUGIN, sizeof(BossHakugin), diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index c77e53b7f..c7e97191b 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -11,7 +11,7 @@ void DemoEffect_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Demo_Effect_InitVars = { ACTOR_DEMO_EFFECT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(DemoEffect), diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index 2a1b6e216..0ce117859 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -11,7 +11,7 @@ void DemoGetitem_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Demo_Getitem_InitVars = { ACTOR_DEMO_GETITEM, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(DemoGetitem), diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 7991dc3fd..b51e2e1a5 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -12,7 +12,7 @@ void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(DemoKankyo), diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index d2a5c5b25..1babc1630 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -12,7 +12,7 @@ void DemoMoonend_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Demo_Moonend_InitVars = { ACTOR_DEMO_MOONEND, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_MOONEND, sizeof(DemoMoonend), diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index d1f844e23..5781014cf 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -11,7 +11,7 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit Demo_Shd_InitVars = { ACTOR_DEMO_SHD, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_FWALL, sizeof(DemoShd), diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index 47d63558a..0392bcfb4 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -12,7 +12,7 @@ void DemoSyoten_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Demo_Syoten_InitVars = { ACTOR_DEMO_SYOTEN, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_SYOTEN, sizeof(DemoSyoten), diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index ef704eaeb..2aa338b03 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -12,7 +12,7 @@ void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Demo_Tre_Lgt_InitVars = { ACTOR_DEMO_TRE_LGT, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_BOX, sizeof(DemoTreLgt), diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c index 18182ba7a..593334483 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -12,7 +12,7 @@ void DmAh_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Ah_InitVars = { ACTOR_DM_AH, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AH, sizeof(DmAh), diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c index cb1f9f958..26bc05740 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -12,7 +12,7 @@ void DmAl_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Al_InitVars = { ACTOR_EN_AL, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AL, sizeof(DmAl), diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c index 1d8469bcd..ab291f701 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -11,7 +11,7 @@ void DmAn_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_An_InitVars = { ACTOR_DM_AN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AN1, sizeof(DmAn), diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c index 51004ce04..3e6ae9278 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -12,7 +12,7 @@ void DmBal_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Bal_InitVars = { ACTOR_DM_BAL, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BAL, sizeof(DmBal), diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 0a242c01a..9b3bab0b1 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -12,7 +12,7 @@ void DmChar00_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char00_InitVars = { ACTOR_DM_CHAR00, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_DELF, sizeof(DmChar00), diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index f1de9ae0d..932ecb313 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -12,7 +12,7 @@ void DmChar01_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char01_InitVars = { ACTOR_DM_CHAR01, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_MTORIDE, sizeof(DmChar01), diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index b41b851f4..2c105ac14 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -12,7 +12,7 @@ void DmChar02_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char02_InitVars = { ACTOR_DM_CHAR02, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK2, sizeof(DmChar02), diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index 9b5eb52ca..b98f2c27f 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -12,7 +12,7 @@ void DmChar03_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char03_InitVars = { ACTOR_DM_CHAR03, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_OSN, sizeof(DmChar03), diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index 5dffe757c..7abd2b8bf 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -12,7 +12,7 @@ void DmChar04_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char04_InitVars = { ACTOR_DM_CHAR04, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(DmChar04), diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index cf3c16de4..d0e14f6a1 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -12,7 +12,7 @@ void DmChar05_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char05_InitVars = { ACTOR_DM_CHAR05, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_DMASK, sizeof(DmChar05), diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c index f7cc5b025..6430cbac2 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -12,7 +12,7 @@ void DmChar06_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char06_InitVars = { ACTOR_DM_CHAR06, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_YUKIYAMA, sizeof(DmChar06), diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c index a998c5727..2b5ac9d8c 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -12,7 +12,7 @@ void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char07_InitVars = { ACTOR_DM_CHAR07, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_MILKBAR, sizeof(DmChar07), diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index b59b47018..e34fadab8 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -12,7 +12,7 @@ void DmChar08_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char08_InitVars = { ACTOR_DM_CHAR08, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KAMEJIMA, sizeof(DmChar08), diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index f7533ee8a..3e07134fd 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -12,7 +12,7 @@ void DmChar09_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Char09_InitVars = { ACTOR_DM_CHAR09, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_BEE, sizeof(DmChar09), diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c index bfb861d54..29e25b014 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -11,7 +11,7 @@ void DmGm_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Gm_InitVars = { ACTOR_DM_GM, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AN1, sizeof(DmGm), diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index a137d5554..87a76217c 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -12,7 +12,7 @@ void DmHina_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Hina_InitVars = { ACTOR_DM_HINA, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_BSMASK, sizeof(DmHina), diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c index ce8519502..73670abb4 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -12,7 +12,7 @@ void DmNb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Nb_InitVars = { ACTOR_DM_NB, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_NB, sizeof(DmNb), diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index d8fd39571..d8f2bb15b 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -12,7 +12,7 @@ void DmOpstage_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Opstage_InitVars = { ACTOR_DM_OPSTAGE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmOpstage), diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c index 5eaeb518b..d1c18ec06 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -12,7 +12,7 @@ void DmRavine_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Ravine_InitVars = { ACTOR_DM_RAVINE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmRavine), diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c index 3264a1183..2524d3aaa 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -12,7 +12,7 @@ void DmSa_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Sa_InitVars = { ACTOR_DM_SA, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK, sizeof(DmSa), diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c index a37c24453..f6ae80e92 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -12,7 +12,7 @@ void DmStatue_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Statue_InitVars = { ACTOR_DM_STATUE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_SMTOWER, sizeof(DmStatue), diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index abb3bd2cf..7f277df0f 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -12,7 +12,7 @@ void DmStk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Stk_InitVars = { ACTOR_DM_STK, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK, sizeof(DmStk), diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c index a357ddca2..87ad30a8d 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -11,7 +11,7 @@ void DmTag_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Tag_InitVars = { ACTOR_DM_TAG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(DmTag), diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index 4937bfbc4..4ef45b4d2 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -12,7 +12,7 @@ void DmTsg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Tsg_InitVars = { ACTOR_DM_TSG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_OPEN_OBJ, sizeof(DmTsg), diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index fc0f29806..89d3343e0 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -12,7 +12,7 @@ void DmZl_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Dm_Zl_InitVars = { ACTOR_DM_ZL, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_ZL4, sizeof(DmZl), diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 266d2df16..50aa8eac1 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -12,7 +12,7 @@ void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Door_Ana_InitVars = { ACTOR_DOOR_ANA, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(DoorAna), diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 8440dda39..97a4778a4 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -11,7 +11,7 @@ void DoorShutter_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Door_Shutter_InitVars = { ACTOR_DOOR_SHUTTER, - ACTORTYPE_DOOR, + ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(DoorShutter), diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c index da1d64618..0e37a7992 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -12,7 +12,7 @@ void DoorSpiral_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Door_Spiral_InitVars = { ACTOR_DOOR_SPIRAL, - ACTORTYPE_DOOR, + ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(DoorSpiral), diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 9f7e6d99b..a18c73f1e 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -12,7 +12,7 @@ void DoorWarp1_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Door_Warp1_InitVars = { ACTOR_DOOR_WARP1, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_WARP1, sizeof(DoorWarp1), diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c index 1007463c6..fab477714 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -11,7 +11,7 @@ void EffChange_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Eff_Change_InitVars = { ACTOR_EFF_CHANGE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EffChange), diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 622d7d2a4..32182e020 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -12,7 +12,7 @@ void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Eff_Dust_InitVars = { ACTOR_EFF_DUST, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EffDust), diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index bb79d9e6d..a1d418ef1 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -11,7 +11,7 @@ void EffKamejimaWave_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Eff_Kamejima_Wave_InitVars = { ACTOR_EFF_KAMEJIMA_WAVE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_KAMEJIMA, sizeof(EffKamejimaWave), diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index 7ab85e3d1..1f757d451 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -12,7 +12,7 @@ void EffLastday_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Eff_Lastday_InitVars = { ACTOR_EFF_LASTDAY, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_LASTDAY, sizeof(EffLastday), diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index 65c3c5ca0..0ea1f0780 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -12,7 +12,7 @@ void EffStk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Eff_Stk_InitVars = { ACTOR_EFF_STK, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK2, sizeof(EffStk), diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index 6a323d95e..0d3dfa858 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -12,7 +12,7 @@ void EffZoraband_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Eff_Zoraband_InitVars = { ACTOR_EFF_ZORABAND, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_ZORABAND, sizeof(EffZoraband), diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 15a87fb4a..d77f7b694 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -11,7 +11,7 @@ void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Elf_Msg_InitVars = { ACTOR_ELF_MSG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg), diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index ce2774591..ed2d6744c 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -11,7 +11,7 @@ void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Elf_Msg2_InitVars = { ACTOR_ELF_MSG2, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg2), diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c index c37f792e5..4a67e371d 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -11,7 +11,7 @@ void ElfMsg3_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Elf_Msg3_InitVars = { ACTOR_ELF_MSG3, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg3), diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index 35a4aebd7..42ab82018 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -11,7 +11,7 @@ void ElfMsg4_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Elf_Msg4_InitVars = { ACTOR_ELF_MSG4, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg4), diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c index 958b99600..bf0cffbec 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -11,7 +11,7 @@ void ElfMsg5_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Elf_Msg5_InitVars = { ACTOR_ELF_MSG5, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg5), diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index 91442cfaa..60fd51ba4 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -11,7 +11,7 @@ void ElfMsg6_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Elf_Msg6_InitVars = { ACTOR_ELF_MSG6, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg6), diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index 1fea42310..6938df328 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -12,7 +12,7 @@ void EnAh_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ah_InitVars = { ACTOR_EN_AH, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AH, sizeof(EnAh), diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index 47ef34e92..c7c476064 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -12,7 +12,7 @@ void EnAkindonuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Akindonuts_InitVars = { ACTOR_EN_AKINDONUTS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNT, sizeof(EnAkindonuts), diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index fcd491bdd..0f6637f4d 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -12,7 +12,7 @@ void EnAl_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Al_InitVars = { ACTOR_EN_AL, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AL, sizeof(EnAl), diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index ab7876f44..0a3e4031c 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -12,7 +12,7 @@ void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Am_InitVars = { ACTOR_EN_AM, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_AM, sizeof(EnAm), diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index d7131b1be..cf0e890ce 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -11,7 +11,7 @@ void EnAn_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_An_InitVars = { ACTOR_EN_AN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AN1, sizeof(EnAn), diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index 097ad3b0f..dfe3942f3 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -12,7 +12,7 @@ void EnAnd_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_And_InitVars = { ACTOR_EN_AND, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AND, sizeof(EnAnd), diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 824ee1da8..9b8068a02 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -12,7 +12,7 @@ void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ani_InitVars = { ACTOR_EN_ANI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ANI, sizeof(EnAni), diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index c773fa32d..7d9aa3a82 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -12,7 +12,7 @@ void EnAob01_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Aob_01_InitVars = { ACTOR_EN_AOB_01, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AOB, sizeof(EnAob01), diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 10606ec6a..206d111ad 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -12,7 +12,7 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Arrow_InitVars = { ACTOR_EN_ARROW, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnArrow), diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 810198eb8..99e9e8aaa 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -12,7 +12,7 @@ void EnAttackNiw_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Attack_Niw_InitVars = { ACTOR_EN_ATTACK_NIW, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_NIW, sizeof(EnAttackNiw), diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 04b48380a..6f4c111f5 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -12,7 +12,7 @@ void EnAz_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Az_InitVars = { ACTOR_EN_AZ, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_AZ, sizeof(EnAz), diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index e541aec1e..598d0b1d9 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -12,7 +12,7 @@ void EnBaba_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Baba_InitVars = { ACTOR_EN_BABA, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BBA, sizeof(EnBaba), diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index c5a905b25..33c0132b8 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -11,7 +11,7 @@ void EnBaguo_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Baguo_InitVars = { ACTOR_EN_BAGUO, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_GMO, sizeof(EnBaguo), diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index 3ff495e54..1582b7a00 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -12,7 +12,7 @@ void EnBaisen_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Baisen_InitVars = { ACTOR_EN_BAISEN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BAI, sizeof(EnBaisen), diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index 5b4afed5a..7208a508c 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -12,7 +12,7 @@ void EnBal_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bal_InitVars = { ACTOR_EN_BAL, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BAL, sizeof(EnBal), diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index 08277cb2d..667ec3ff6 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -12,7 +12,7 @@ void EnBat_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bat_InitVars = { ACTOR_EN_BAT, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BAT, sizeof(EnBat), diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 7cc183caa..4350f63d9 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -12,7 +12,7 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bb_InitVars = { ACTOR_EN_BB, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BB, sizeof(EnBb), diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index c64a59287..8a6c9d01e 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -12,7 +12,7 @@ void EnBba01_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bba_01_InitVars = { ACTOR_EN_BBA_01, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBba01), diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index e4d07cbc4..f357ae98a 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -12,7 +12,7 @@ void EnBbfall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bbfall_InitVars = { ACTOR_EN_BBFALL, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BB, sizeof(EnBbfall), diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index dc9235bee..a8e9c0191 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -12,7 +12,7 @@ void EnBee_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bee_InitVars = { ACTOR_EN_BEE, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BEE, sizeof(EnBee), diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.c b/src/overlays/actors/ovl_En_Bh/z_en_bh.c index 90988d88c..575adb889 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.c +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -12,7 +12,7 @@ void EnBh_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bh_InitVars = { ACTOR_EN_BH, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_BH, sizeof(EnBh), diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index b7fc71d1b..f350d4a1e 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -12,7 +12,7 @@ void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bigokuta_InitVars = { ACTOR_EN_BIGOKUTA, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BIGOKUTA, sizeof(EnBigokuta), diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index 82a9c9b7f..48af93933 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -12,7 +12,7 @@ void EnBigpamet_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bigpamet_InitVars = { ACTOR_EN_BIGPAMET, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_TL, sizeof(EnBigpamet), diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index afa041e92..45d31fa2c 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -11,7 +11,7 @@ void EnBigpo_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bigpo_InitVars = { ACTOR_EN_BIGPO, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BIGPO, sizeof(EnBigpo), diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 56df86825..75623b319 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -12,7 +12,7 @@ void EnBigslime_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bigslime_InitVars = { ACTOR_EN_BIGSLIME, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BIGSLIME, sizeof(EnBigslime), diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c index 5617636fa..da7963a3a 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -12,7 +12,7 @@ void EnBji01_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bji_01_InitVars = { ACTOR_EN_BJI_01, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BJI, sizeof(EnBji01), diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index 4ecfdaa08..4bf5e9c75 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -12,7 +12,7 @@ void EnBjt_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bjt_InitVars = { ACTOR_EN_BJT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BJT, sizeof(EnBjt), diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c index c940627ec..08a072ae0 100644 --- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c @@ -11,7 +11,7 @@ void EnBoj01_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Boj_01_InitVars = { ACTOR_EN_BOJ_01, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj01), diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c index ae00e435f..83a8348aa 100644 --- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c @@ -11,7 +11,7 @@ void EnBoj02_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Boj_02_InitVars = { ACTOR_EN_BOJ_02, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj02), diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c index 11f9aa21c..9ef272cd8 100644 --- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c @@ -11,7 +11,7 @@ void EnBoj03_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Boj_03_InitVars = { ACTOR_EN_BOJ_03, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj03), diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c index b148a4ec8..6229f78df 100644 --- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c @@ -11,7 +11,7 @@ void EnBoj04_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Boj_04_InitVars = { ACTOR_EN_BOJ_04, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj04), diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c index eedbcf887..488ee3be6 100644 --- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c @@ -11,7 +11,7 @@ void EnBoj05_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Boj_05_InitVars = { ACTOR_EN_BOJ_05, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj05), diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 1bce1263d..101131bef 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -12,7 +12,7 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bom_InitVars = { ACTOR_EN_BOM, - ACTORTYPE_EXPLOSIVES, + ACTORCAT_EXPLOSIVES, FLAGS, GAMEPLAY_KEEP, sizeof(EnBom), diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index e6c06b75b..dba77d24e 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -12,7 +12,7 @@ void EnBomBowlMan_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bom_Bowl_Man_InitVars = { ACTOR_EN_BOM_BOWL_MAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBomBowlMan), diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index fbe2ba35f..e8f38af73 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -12,7 +12,7 @@ void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bom_Chu_InitVars = { ACTOR_EN_BOM_CHU, - ACTORTYPE_EXPLOSIVES, + ACTORCAT_EXPLOSIVES, FLAGS, GAMEPLAY_KEEP, sizeof(EnBomChu), diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index 46597aae0..db4f5a254 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -12,7 +12,7 @@ void EnBombal_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bombal_InitVars = { ACTOR_EN_BOMBAL, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_FUSEN, sizeof(EnBombal), diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index 82230d647..d6ee24634 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -12,7 +12,7 @@ void EnBombers_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bombers_InitVars = { ACTOR_EN_BOMBERS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBombers), diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index ad9423d18..715c69586 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -12,7 +12,7 @@ void EnBombers2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bombers2_InitVars = { ACTOR_EN_BOMBERS2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBombers2), diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 73996fe31..e69286592 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -12,7 +12,7 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bombf_InitVars = { ACTOR_EN_BOMBF, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_BOMBF, sizeof(EnBombf), diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index 2eec34baa..a4e082ccf 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -12,7 +12,7 @@ void EnBomjima_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bomjima_InitVars = { ACTOR_EN_BOMJIMA, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBomjima), diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index c5763813f..9a03581d4 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -12,7 +12,7 @@ void EnBomjimb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bomjimb_InitVars = { ACTOR_EN_BOMJIMB, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_CS, sizeof(EnBomjimb), diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 69eca402d..eac123866 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -12,7 +12,7 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Boom_InitVars = { ACTOR_EN_BOOM, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnBoom), diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index cd5a7bc30..9079bea25 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -12,7 +12,7 @@ void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Box_InitVars = { ACTOR_EN_BOX, - ACTORTYPE_CHEST, + ACTORCAT_CHEST, FLAGS, OBJECT_BOX, sizeof(EnBox), diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 8977be018..7b22ae6d3 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -12,7 +12,7 @@ void EnBsb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bsb_InitVars = { ACTOR_EN_BSB, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_BSB, sizeof(EnBsb), diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c index 1e47e2211..4a1187f8c 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.c +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -12,7 +12,7 @@ void EnBu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bu_InitVars = { ACTOR_EN_BU, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, GAMEPLAY_KEEP, sizeof(EnBu), diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 0b3426e17..95f4a40ef 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -12,7 +12,7 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Bubble_InitVars = { ACTOR_EN_BUBBLE, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BUBBLE, sizeof(EnBubble), diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 5cf5f7842..c9666be48 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -12,7 +12,7 @@ void EnButte_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Butte_InitVars = { ACTOR_EN_BUTTE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnButte), diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index a63092366..2c2ccdb3b 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -12,7 +12,7 @@ void EnCha_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Cha_InitVars = { ACTOR_EN_CHA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_CHA, sizeof(EnCha), diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 270e6e2eb..20c587605 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -12,7 +12,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Clear_Tag_InitVars = { ACTOR_EN_CLEAR_TAG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnClearTag), diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index 37b5d71e8..b4b5adaa7 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -12,7 +12,7 @@ void EnCne01_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Cne_01_InitVars = { ACTOR_EN_CNE_01, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnCne01), diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index d7bdb785b..22f23088f 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -11,7 +11,7 @@ void EnColMan_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Col_Man_InitVars = { ACTOR_EN_COL_MAN, - ACTORTYPE_MISC, + ACTORCAT_MISC, FLAGS, GAMEPLAY_KEEP, sizeof(EnColMan), diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index b5b44a4d8..ac7f0b351 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -12,7 +12,7 @@ void EnCow_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Cow_InitVars = { ACTOR_EN_COW, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_COW, sizeof(EnCow), diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index ada7308ad..99a568383 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -12,7 +12,7 @@ void EnCrow_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Crow_InitVars = { ACTOR_EN_CROW, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_CROW, sizeof(EnCrow), diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c index 8a92963e8..5c98d36fe 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -12,7 +12,7 @@ void EnDai_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dai_InitVars = { ACTOR_EN_DAI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DAI, sizeof(EnDai), diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 597f20c5c..dfc158eee 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -12,7 +12,7 @@ void EnDaiku_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Daiku_InitVars = { ACTOR_EN_DAIKU, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DAIKU, sizeof(EnDaiku), diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index 89a9d028b..2ac218436 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -12,7 +12,7 @@ void EnDaiku2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Daiku2_InitVars = { ACTOR_EN_DAIKU2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DAIKU, sizeof(EnDaiku2), diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index 9b9591442..e15792015 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -12,7 +12,7 @@ void EnDeath_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Death_InitVars = { ACTOR_EN_DEATH, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DEATH, sizeof(EnDeath), diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index d12d8d87f..d4669fe3b 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -12,7 +12,7 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dekubaba_InitVars = { ACTOR_EN_DEKUBABA, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DEKUBABA, sizeof(EnDekubaba), diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 373af79cf..6bd6a1f8d 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -12,7 +12,7 @@ void EnDekunuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dekunuts_InitVars = { ACTOR_EN_DEKUNUTS, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DEKUNUTS, sizeof(EnDekunuts), diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index 155d39d68..e30bc1203 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -12,7 +12,7 @@ void EnDemoheishi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Demo_heishi_InitVars = { ACTOR_EN_DEMO_HEISHI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SDN, sizeof(EnDemoheishi), diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c index be92e61f6..edb9304e8 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -12,7 +12,7 @@ void EnDg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dg_InitVars = { ACTOR_EN_DG, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DOG, sizeof(EnDg), diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index cb8001eaf..69318cbcb 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -12,7 +12,7 @@ void EnDinofos_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dinofos_InitVars = { ACTOR_EN_DINOFOS, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DINOFOS, sizeof(EnDinofos), diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c index 4ef73d02b..48e00f59b 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -12,7 +12,7 @@ void EnDnb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dnb_InitVars = { ACTOR_EN_DNB, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HANAREYAMA_OBJ, sizeof(EnDnb), diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c index de5a232c6..0b5f2ef38 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -12,7 +12,7 @@ void EnDnh_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dnh_InitVars = { ACTOR_EN_DNH, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TRO, sizeof(EnDnh), diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index 145972b89..5a9c3e6e6 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -11,7 +11,7 @@ void EnDnk_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dnk_InitVars = { ACTOR_EN_DNK, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnDnk), diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index e1fe15e67..3f652b249 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -12,7 +12,7 @@ void EnDno_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dno_InitVars = { ACTOR_EN_DNO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNO, sizeof(EnDno), diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c index 05981fbf7..70384212f 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -12,7 +12,7 @@ void EnDnp_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dnp_InitVars = { ACTOR_EN_DNP, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNP, sizeof(EnDnp), diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c index c829d3e4d..d4d4bf00a 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -12,7 +12,7 @@ void EnDnq_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dnq_InitVars = { ACTOR_EN_DNQ, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNQ, sizeof(EnDnq), diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 964a3000a..bd36c37c6 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -12,7 +12,7 @@ void EnDns_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dns_InitVars = { ACTOR_EN_DNS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNS, sizeof(EnDns), diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 9d61ee253..728d2ca77 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -12,7 +12,7 @@ void EnDodongo_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dodongo_InitVars = { ACTOR_EN_DODONGO, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DODONGO, sizeof(EnDodongo), diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 6b0561972..9db5951ae 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -12,7 +12,7 @@ void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Door_InitVars = { ACTOR_EN_DOOR, - ACTORTYPE_DOOR, + ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(EnDoor), diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index 7108287bf..240118912 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -11,7 +11,7 @@ void EnDoorEtc_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Door_Etc_InitVars = { ACTOR_EN_DOOR_ETC, - ACTORTYPE_DOOR, + ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(EnDoorEtc), diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 40664ecd1..ccc289a26 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -12,7 +12,7 @@ void EnDragon_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dragon_InitVars = { ACTOR_EN_DRAGON, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_UTUBO, sizeof(EnDragon), diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c index 093063134..6988f88f5 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -11,7 +11,7 @@ void EnDrs_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Drs_InitVars = { ACTOR_EN_DRS, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_DRS, sizeof(EnDrs), diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c index 076ad40c8..6d3f8055e 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -12,7 +12,7 @@ void EnDs2n_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ds2n_InitVars = { ACTOR_EN_DS2N, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DS2N, sizeof(EnDs2n), diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index dee41e3ef..9b0d377e0 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -12,7 +12,7 @@ void EnDt_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Dt_InitVars = { ACTOR_EN_DT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DT, sizeof(EnDt), diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index b5b75083e..36b0db7ae 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -14,7 +14,7 @@ void func_80A613C8(EnDyExtra* this, GlobalContext* globalCtx); const ActorInit En_Dy_Extra_InitVars = { ACTOR_EN_DY_EXTRA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_DY_OBJ, sizeof(EnDyExtra), @@ -37,7 +37,7 @@ void EnDyExtra_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.scale.x = 0.025f; this->actor.scale.y = 0.039f; this->actor.scale.z = 0.025f; - this->unk160 = this->actor.currPosRot.pos; + this->unk160 = this->actor.world.pos; this->actor.gravity = -0.2f; this->unk150 = 1.0f; this->unk14C = 0x3C; @@ -47,7 +47,7 @@ void EnDyExtra_Init(Actor* thisx, GlobalContext* globalCtx) { void func_80A61334(EnDyExtra* this, GlobalContext* globalCtx) { Math_SmoothScaleMaxF(&this->actor.gravity, 0.0f, 0.1f, 0.005f); - if (this->actor.currPosRot.pos.y < -85.0f) { + if (this->actor.world.pos.y < -85.0f) { this->actor.velocity.y = 0.0f; } @@ -67,7 +67,7 @@ void func_80A613C8(EnDyExtra* this, GlobalContext* globalCtx) { this->unk150 -= 0.02f; - if (this->actor.currPosRot.pos.y < -85.0f) { + if (this->actor.world.pos.y < -85.0f) { this->actor.velocity.y = 0.0f; } } diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c index 6c2d2baaf..76b3b1fee 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -12,7 +12,7 @@ void EnEgblock_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Egblock_InitVars = { ACTOR_EN_EGBLOCK, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_EG, sizeof(EnEgblock), diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index c2a657e37..1cb22062d 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -12,7 +12,7 @@ void EnEgol_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Egol_InitVars = { ACTOR_EN_EGOL, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_EG, sizeof(EnEgol), diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 7b9a90a9a..964428084 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -12,7 +12,7 @@ void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Elf_InitVars = { ACTOR_EN_ELF, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnElf), diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index fc2562990..07c0c512b 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -12,7 +12,7 @@ void EnElfbub_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Elfbub_InitVars = { ACTOR_EN_ELFBUB, - ACTORTYPE_MISC, + ACTORCAT_MISC, FLAGS, OBJECT_BUBBLE, sizeof(EnElfbub), diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index ee4e9ed9b..1eaa193e8 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -11,7 +11,7 @@ void EnElfgrp_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Elfgrp_InitVars = { ACTOR_EN_ELFGRP, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnElfgrp), diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index c8488d14b..a34b675a2 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -12,7 +12,7 @@ void EnElforg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Elforg_InitVars = { ACTOR_EN_ELFORG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnElforg), diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index a4a813a83..07ff643fc 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -10,7 +10,7 @@ void EnEncount1_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Encount1_InitVars = { ACTOR_EN_ENCOUNT1, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount1), diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 404e1ace6..6bb4eb334 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -12,7 +12,7 @@ void EnEncount2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Encount2_InitVars = { ACTOR_EN_ENCOUNT2, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_FUSEN, sizeof(EnEncount2), diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index 845ad3340..dcd1db416 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -12,7 +12,7 @@ void EnEncount3_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Encount3_InitVars = { ACTOR_EN_ENCOUNT3, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_BIG_FWALL, sizeof(EnEncount3), diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c index 52963f442..c2dfcdbcf 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -11,7 +11,7 @@ void EnEncount4_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Encount4_InitVars = { ACTOR_EN_ENCOUNT4, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount4), diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c index 7ce355697..5215cd742 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c @@ -14,7 +14,7 @@ void func_80C1E764(EnEndingHero* this, GlobalContext* globalCtx); const ActorInit En_Ending_Hero_InitVars = { ACTOR_EN_ENDING_HERO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DT, sizeof(EnEndingHero), @@ -38,9 +38,9 @@ extern UNK_PTR D_0600A490[]; void EnEndingHero_Init(Actor* thisx, GlobalContext* globalCtx) { EnEndingHero* this = THIS; - this->actor.unkA0.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; Actor_SetScale(&this->actor, 0.01f); - this->actor.unk1F = 6; + this->actor.targetMode = 6; this->actor.gravity = -3.0f; SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B0CC, &D_06000BE0, this->limbDrawTable, this->transitionDrawTable, 15); diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c index fca9a92f7..96d249803 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c @@ -14,7 +14,7 @@ void func_80C23304(EnEndingHero2* this, GlobalContext* globalCtx); const ActorInit En_Ending_Hero2_InitVars = { ACTOR_EN_ENDING_HERO2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BAI, sizeof(EnEndingHero2), @@ -30,9 +30,9 @@ extern AnimationHeader D_060011C0; void EnEndingHero2_Init(Actor* thisx, GlobalContext* globalCtx) { EnEndingHero2* this = THIS; - this->actor.unkA0.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; Actor_SetScale(&this->actor, 0.01f); - this->actor.unk1F = 6; + this->actor.targetMode = 6; this->actor.gravity = -3.0f; SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06007908, &D_060011C0, this->limbDrawTable, this->transitionDrawTable, 20); diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c index 3209ceb8b..73dd87bc0 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c @@ -14,7 +14,7 @@ void func_80C23534(EnEndingHero3* this, GlobalContext* globalCtx); const ActorInit En_Ending_Hero3_InitVars = { ACTOR_EN_ENDING_HERO3, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TORYO, sizeof(EnEndingHero3), @@ -30,9 +30,9 @@ extern AnimationHeader D_06000E50; void EnEndingHero3_Init(Actor* thisx, GlobalContext* globalCtx) { EnEndingHero3* this = THIS; - this->actor.unkA0.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; Actor_SetScale(&this->actor, 0.01f); - this->actor.unk1F = 6; + this->actor.targetMode = 6; this->actor.gravity = -3.0f; SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06007150, &D_06000E50, this->limbDrawTable, this->transitionDrawTable, 17); diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c index fc3e1b3b4..b8c7d6c8a 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c @@ -14,7 +14,7 @@ void func_80C23764(EnEndingHero4* this, GlobalContext* globalCtx); const ActorInit En_Ending_Hero4_InitVars = { ACTOR_EN_ENDING_HERO4, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SDN, sizeof(EnEndingHero4), @@ -30,9 +30,9 @@ extern AnimationHeader D_06002A84; void EnEndingHero4_Init(Actor* thisx, GlobalContext* globalCtx) { EnEndingHero4* this = THIS; - this->actor.unkA0.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; Actor_SetScale(&this->actor, 0.01f); - this->actor.unk1F = 6; + this->actor.targetMode = 6; this->actor.gravity = -3.0f; SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600D640, &D_06002A84, this->limbDrawTable, this->transitionDrawTable, 17); diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c index f9ad9caa1..b4f88a545 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c +++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c @@ -14,7 +14,7 @@ void func_80C2399C(EnEndingHero5* this, GlobalContext* globalCtx); const ActorInit En_Ending_Hero5_InitVars = { ACTOR_EN_ENDING_HERO5, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DAIKU, sizeof(EnEndingHero5), @@ -36,9 +36,9 @@ extern Gfx D_0600A390[]; void EnEndingHero5_Init(Actor* thisx, GlobalContext* globalCtx) { EnEndingHero5* this = THIS; - this->actor.unkA0.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; Actor_SetScale(&this->actor, 0.01f); - this->actor.unk1F = 6; + this->actor.targetMode = 6; this->actor.gravity = -3.0f; SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600A850, &D_06002FA0, this->limbDrawTable, this->transitionDrawTable, 17); diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c index 5f9d2613b..e8323ef66 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c @@ -12,7 +12,7 @@ void EnEndingHero6_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ending_Hero6_InitVars = { ACTOR_EN_ENDING_HERO6, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnEndingHero6), diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index 9312121d2..cbf22cdd2 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -12,7 +12,7 @@ void EnEstone_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Estone_InitVars = { ACTOR_EN_ESTONE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_EG, sizeof(EnEstone), diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index 5a99b1db0..4f62c5774 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -11,7 +11,7 @@ void EnFall_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fall_InitVars = { ACTOR_EN_FALL, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnFall), diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c index abfc64c45..b3783d6c5 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -12,7 +12,7 @@ void EnFall2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fall2_InitVars = { ACTOR_EN_FALL2, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_FALL2, sizeof(EnFall2), diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index 4f3926c6a..f9f699bc8 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -12,7 +12,7 @@ void EnFamos_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Famos_InitVars = { ACTOR_EN_FAMOS, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_FAMOS, sizeof(EnFamos), diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 9aebc46dc..33b9154a4 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -12,7 +12,7 @@ void EnFg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fg_InitVars = { ACTOR_EN_FG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_FR, sizeof(EnFg), diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 8509c258d..e47c3c0c9 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -11,7 +11,7 @@ void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Fire_Rock_InitVars = { ACTOR_EN_FIRE_ROCK, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_EFC_STAR_FIELD, sizeof(EnFireRock), diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 381aaa722..5485d1bd1 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -12,7 +12,7 @@ void EnFirefly_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Firefly_InitVars = { ACTOR_EN_FIREFLY, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly), diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c index 1ac8faa5e..20921215e 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -11,7 +11,7 @@ void EnFirefly2_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Firefly2_InitVars = { ACTOR_EN_FIREFLY2, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly2), diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 5cfa2a3d0..a03860016 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -12,7 +12,7 @@ void EnFish_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fish_InitVars = { ACTOR_EN_FISH, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnFish), diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index fa7255054..61ea4baef 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -12,7 +12,7 @@ void EnFish2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fish2_InitVars = { ACTOR_EN_FISH2, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_FB, sizeof(EnFish2), diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index f1106725c..5250d2050 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -12,7 +12,7 @@ void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Floormas_InitVars = { ACTOR_EN_FLOORMAS, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_WALLMASTER, sizeof(EnFloormas), diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 96beb08ee..78c2d4b72 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -11,7 +11,7 @@ void EnFr_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fr_InitVars = { ACTOR_EN_FR, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnFr), diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 2e5b699ca..e32d6c7fa 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -12,7 +12,7 @@ void EnFsn_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fsn_InitVars = { ACTOR_EN_FSN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_FSN, sizeof(EnFsn), diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index bae20b7e2..f667d7b52 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -12,7 +12,7 @@ void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fu_InitVars = { ACTOR_EN_FU, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MU, sizeof(EnFu), diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index ecc0d6a73..255d6ef65 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -12,7 +12,7 @@ void EnFuKago_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fu_Kago_InitVars = { ACTOR_EN_FU_KAGO, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_FU_MATO, sizeof(EnFuKago), diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index 644242da5..ac59be187 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -12,7 +12,7 @@ void EnFuMato_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fu_Mato_InitVars = { ACTOR_EN_FU_MATO, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_FU_MATO, sizeof(EnFuMato), diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index eec176d5d..06b71d4c4 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -12,7 +12,7 @@ void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Fz_InitVars = { ACTOR_EN_FZ, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_FZ, sizeof(EnFz), diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index fe09e9670..ed391d2ff 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -12,7 +12,7 @@ void EnGakufu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gakufu_InitVars = { ACTOR_EN_GAKUFU, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnGakufu), diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index c0d566f70..b5768f839 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -12,7 +12,7 @@ void EnGamelupy_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gamelupy_InitVars = { ACTOR_EN_GAMELUPY, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnGamelupy), diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index fc7c22086..590d6573a 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -12,7 +12,7 @@ void EnGb2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gb2_InitVars = { ACTOR_EN_GB2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_PS, sizeof(EnGb2), diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 69ab54c14..61476aa6d 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -12,7 +12,7 @@ void EnGe1_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ge1_InitVars = { ACTOR_EN_GE1, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_GE1, sizeof(EnGe1), diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index a94bfa5bf..8e4f490be 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -12,7 +12,7 @@ void EnGe2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ge2_InitVars = { ACTOR_EN_GE2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_GLA, sizeof(EnGe2), diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index f855c2e97..440f5931d 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -12,7 +12,7 @@ void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ge3_InitVars = { ACTOR_EN_GE3, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_GELDB, sizeof(EnGe3), diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index 1540eb3ec..a11e6d3b0 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -12,7 +12,7 @@ void EnGeg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Geg_InitVars = { ACTOR_EN_GEG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnGeg), diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index 4344198e6..e9a64eb11 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -12,7 +12,7 @@ void EnGg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gg_InitVars = { ACTOR_EN_GG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_GG, sizeof(EnGg), diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c index fa07e17a6..45724cba2 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -12,7 +12,7 @@ void EnGg2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gg2_InitVars = { ACTOR_EN_GG2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_GG, sizeof(EnGg2), diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index 6cb67e25b..d993524d4 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -12,7 +12,7 @@ void EnGiant_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Giant_InitVars = { ACTOR_EN_GIANT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_GIANT, sizeof(EnGiant), diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index 4eb26b3a3..8c4b754ac 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -12,7 +12,7 @@ void EnGinkoMan_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ginko_Man_InitVars = { ACTOR_EN_GINKO_MAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BOJ, sizeof(EnGinkoMan), diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 726a560b8..c62e2fc40 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -11,7 +11,7 @@ void EnGirlA_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_GirlA_InitVars = { ACTOR_EN_GIRLA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnGirlA), diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index e762f3fb4..022eca47b 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -12,7 +12,7 @@ void EnGk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gk_InitVars = { ACTOR_EN_GK, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_GK, sizeof(EnGk), diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 1a339467f..275e068c2 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -12,7 +12,7 @@ void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gm_InitVars = { ACTOR_EN_GM, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_IN2, sizeof(EnGm), diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index d76d7604a..b0e4c6ed7 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -11,7 +11,7 @@ void EnGo_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Go_InitVars = { ACTOR_EN_GO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnGo), diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index a2fceed4a..1a7f36597 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -12,7 +12,7 @@ void EnGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Goroiwa_InitVars = { ACTOR_EN_GOROIWA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_GOROIWA, sizeof(EnGoroiwa), diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index 0d9d0a5fa..4ae601eb3 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -12,7 +12,7 @@ void EnGrasshopper_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Grasshopper_InitVars = { ACTOR_EN_GRASSHOPPER, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_GRASSHOPPER, sizeof(EnGrasshopper), diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 0c902dfab..a2e1fef88 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -12,7 +12,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Gs_InitVars = { ACTOR_EN_GS, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_GS, sizeof(EnGs), diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index 1fbfa798d..2a4c24eea 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -12,7 +12,7 @@ void EnGuardNuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Guard_Nuts_InitVars = { ACTOR_EN_GUARD_NUTS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNK, sizeof(EnGuardNuts), diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c index 90f6c8255..8b35f3207 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -12,7 +12,7 @@ void EnGuruguru_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Guruguru_InitVars = { ACTOR_EN_GURUGURU, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_FU, sizeof(EnGuruguru), diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index b0c7329e2..a20e2af40 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -11,7 +11,7 @@ void EnHakurock_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hakurock_InitVars = { ACTOR_EN_HAKUROCK, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_BOSS_HAKUGIN, sizeof(EnHakurock), diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index e43840ab5..0a6069192 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -11,7 +11,7 @@ void EnHanabi_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hanabi_InitVars = { ACTOR_EN_HANABI, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnHanabi), diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 44f64a3ac..3c1aea60f 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -12,7 +12,7 @@ void EnHata_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hata_InitVars = { ACTOR_EN_HATA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_HATA, sizeof(EnHata), diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c index 845cece06..1b2d31625 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -12,7 +12,7 @@ void EnHeishi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Heishi_InitVars = { ACTOR_EN_HEISHI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SDN, sizeof(EnHeishi), diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c index de8a72127..43971092c 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -12,7 +12,7 @@ void EnHg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hg_InitVars = { ACTOR_EN_HG, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_HARFGIBUD, sizeof(EnHg), diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index e0fa330fc..647e5ac1a 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -12,7 +12,7 @@ void EnHgo_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hgo_InitVars = { ACTOR_EN_HGO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_HARFGIBUD, sizeof(EnHgo), diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index d3170b2a4..d402ccae0 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -12,7 +12,7 @@ void EnHiddenNuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hidden_Nuts_InitVars = { ACTOR_EN_HIDDEN_NUTS, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_HINTNUTS, sizeof(EnHiddenNuts), diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index a89c22662..9b1ecd4ba 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -12,7 +12,7 @@ void EnHintSkb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hint_Skb_InitVars = { ACTOR_EN_HINT_SKB, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SKB, sizeof(EnHintSkb), diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index b104e6b12..881c87b35 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -11,7 +11,7 @@ void EnHitTag_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hit_Tag_InitVars = { ACTOR_EN_HIT_TAG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnHitTag), diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index c0706e1eb..bb3e22b50 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -12,7 +12,7 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Holl_InitVars = { ACTOR_EN_HOLL, - ACTORTYPE_DOOR, + ACTORCAT_DOOR, FLAGS, GAMEPLAY_KEEP, sizeof(EnHoll), diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index abe04c0e3..f0739f4a3 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -12,7 +12,7 @@ void EnHonotrap_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Honotrap_InitVars = { ACTOR_EN_HONOTRAP, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(EnHonotrap), diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index a199508a6..61b2061a0 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -12,7 +12,7 @@ void EnHorse_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Horse_InitVars = { ACTOR_EN_HORSE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(EnHorse), diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index e913622e2..67590eaa7 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -12,7 +12,7 @@ void EnHorseGameCheck_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Horse_Game_Check_InitVars = { ACTOR_EN_HORSE_GAME_CHECK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HORSE_GAME_CHECK, sizeof(EnHorseGameCheck), diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index c45218c57..ce6eb9fbb 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -12,7 +12,7 @@ void EnHorseLinkChild_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Horse_Link_Child_InitVars = { ACTOR_EN_HORSE_LINK_CHILD, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HORSE_LINK_CHILD, sizeof(EnHorseLinkChild), diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 416787d8f..5ac09f45e 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -12,7 +12,7 @@ void EnHs_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Hs_InitVars = { ACTOR_EN_HS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_HS, sizeof(EnHs), diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 118d9d0cc..4880f1f20 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -13,7 +13,7 @@ void EnHs2_DoNothing(EnHs2* this, GlobalContext* globalCtx); const ActorInit En_Hs2_InitVars = { ACTOR_EN_HS2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnHs2), diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c index 72cd0bb7b..aeca18f5e 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -12,7 +12,7 @@ void EnIg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ig_InitVars = { ACTOR_EN_IG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DAI, sizeof(EnIg), diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 44ab0b24f..2bfbe1928 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -12,7 +12,7 @@ void EnIk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ik_InitVars = { ACTOR_EN_IK, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_IK, sizeof(EnIk), diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index c99c220ac..6d5d765cc 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -12,7 +12,7 @@ void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_In_InitVars = { ACTOR_EN_IN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_IN, sizeof(EnIn), diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index b0b602b6c..1cb6d2d6d 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -12,7 +12,7 @@ void EnInsect_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Insect_InitVars = { ACTOR_EN_INSECT, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnInsect), diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 5de4590cd..2b35e80df 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -11,7 +11,7 @@ void EnInvadepoh_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Invadepoh_InitVars = { ACTOR_EN_INVADEPOH, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnInvadepoh), diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index f16a524bd..3fbb7f9d4 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -12,7 +12,7 @@ void EnInvadepohDemo_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Invadepoh_Demo_InitVars = { ACTOR_EN_INVADEPOH_DEMO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnInvadepohDemo), diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index 3e30a68cd..707eb988b 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -11,7 +11,7 @@ void EnInvisibleRuppe_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Invisible_Ruppe_InitVars = { ACTOR_EN_INVISIBLE_RUPPE, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnInvisibleRuppe), diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index e4f8541dd..3fcb21da6 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -11,7 +11,7 @@ void EnIshi_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ishi_InitVars = { ACTOR_EN_ISHI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnIshi), diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c index fd7fadde3..e1226239b 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -12,7 +12,7 @@ void EnJa_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ja_InitVars = { ACTOR_EN_JA, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BOJ, sizeof(EnJa), diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c index c73fd2ffb..b6af78d53 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -12,7 +12,7 @@ void EnJcMato_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Jc_Mato_InitVars = { ACTOR_EN_JC_MATO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_TRU, sizeof(EnJcMato), diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c index 3fff6f13e..55586a954 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -12,7 +12,7 @@ void EnJg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Jg_InitVars = { ACTOR_EN_JG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_JG, sizeof(EnJg), diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index e8ab41afd..0b6854d9b 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -12,7 +12,7 @@ void EnJgameTsn_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Jgame_Tsn_InitVars = { ACTOR_EN_JGAME_TSN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TSN, sizeof(EnJgameTsn), diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index bac02badb..e523f8fff 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -12,7 +12,7 @@ void EnJs_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Js_InitVars = { ACTOR_EN_JS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OB, sizeof(EnJs), diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index e65a555df..57e679b1d 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -11,7 +11,7 @@ void EnJso_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Jso_InitVars = { ACTOR_EN_JSO, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_JSO, sizeof(EnJso), diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index 7e994d589..4f5ea6a09 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -12,7 +12,7 @@ void EnJso2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Jso2_InitVars = { ACTOR_EN_JSO2, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_JSO, sizeof(EnJso2), diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index e7ceda751..6f6c016d7 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -11,7 +11,7 @@ void EnKaizoku_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kaizoku_InitVars = { ACTOR_EN_KAIZOKU, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_KZ, sizeof(EnKaizoku), diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index c20d075ec..98d6a6808 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -12,7 +12,7 @@ void EnKakasi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kakasi_InitVars = { ACTOR_EN_KAKASI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_KA, sizeof(EnKakasi), diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index e41408291..51f3a70d4 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -12,7 +12,7 @@ void EnKame_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kame_InitVars = { ACTOR_EN_KAME, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_TL, sizeof(EnKame), diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 1285058be..bf17828ed 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -12,7 +12,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kanban_InitVars = { ACTOR_EN_KANBAN, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_KANBAN, sizeof(EnKanban), diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 75f0d1ff1..6826bdadc 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -12,7 +12,7 @@ void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Karebaba_InitVars = { ACTOR_EN_KAREBABA, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DEKUBABA, sizeof(EnKarebaba), diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c index 0e938cd0c..88e17577b 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -12,7 +12,7 @@ void EnKbt_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kbt_InitVars = { ACTOR_EN_KBT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_KBT, sizeof(EnKbt), diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index 7d030f68d..c9bf5829f 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -12,7 +12,7 @@ void EnKendoJs_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kendo_Js_InitVars = { ACTOR_EN_KENDO_JS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_JS, sizeof(EnKendoJs), diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index 3ca43e269..5c9c8236a 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -12,7 +12,7 @@ void EnKgy_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kgy_InitVars = { ACTOR_EN_KGY, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_KGY, sizeof(EnKgy), diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index 7bf794a92..15b730221 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -11,7 +11,7 @@ void EnKitan_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kitan_InitVars = { ACTOR_EN_KITAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_KITAN, sizeof(EnKitan), diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index 27d659e2d..559ace60f 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -12,7 +12,7 @@ void EnKnight_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Knight_InitVars = { ACTOR_EN_KNIGHT, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_KNIGHT, sizeof(EnKnight), diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index bf1f3b630..a86a46e41 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -12,7 +12,7 @@ void EnKujiya_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kujiya_InitVars = { ACTOR_EN_KUJIYA, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_KUJIYA, sizeof(EnKujiya), diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index de68ea666..9406852a1 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -11,7 +11,7 @@ void EnKusa_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kusa_InitVars = { ACTOR_EN_KUSA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnKusa), diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 69164e96e..804e8b9c5 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -12,7 +12,7 @@ void EnKusa2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Kusa2_InitVars = { ACTOR_EN_KUSA2, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnKusa2), diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index 15f46ad5f..a7398101e 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -12,7 +12,7 @@ void EnLiftNuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Lift_Nuts_InitVars = { ACTOR_EN_LIFT_NUTS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNT, sizeof(EnLiftNuts), diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index 1ff9ba9a4..a029a8b35 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -12,7 +12,7 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Light_InitVars = { ACTOR_EN_LIGHT, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnLight), diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index 3950bf80f..866e716a1 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -12,7 +12,7 @@ void EnLookNuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Look_Nuts_InitVars = { ACTOR_EN_LOOK_NUTS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNK, sizeof(EnLookNuts), diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index daefd094d..841fa3dbb 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -11,7 +11,7 @@ void EnMFire1_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_M_Fire1_InitVars = { ACTOR_EN_M_FIRE1, - ACTORTYPE_MISC, + ACTORCAT_MISC, FLAGS, GAMEPLAY_KEEP, sizeof(EnMFire1), diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 842d3bf8f..24f1bb9a6 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -12,7 +12,7 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_M_Thunder_InitVars = { ACTOR_EN_M_THUNDER, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMThunder), diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index 88750b60e..1ee724ad7 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -12,7 +12,7 @@ void EnMa4_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ma4_InitVars = { ACTOR_EN_MA4, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MA1, sizeof(EnMa4), diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index cae305859..31f3caff3 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -12,7 +12,7 @@ void EnMaYto_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ma_Yto_InitVars = { ACTOR_EN_MA_YTO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MA2, sizeof(EnMaYto), diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c index 09a99264a..017b4ac6e 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c @@ -12,7 +12,7 @@ void EnMaYts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ma_Yts_InitVars = { ACTOR_EN_MA_YTS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MA1, sizeof(EnMaYts), diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 83a905ca0..43252b85f 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -12,7 +12,7 @@ void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mag_InitVars = { ACTOR_EN_MAG, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_MAG, sizeof(EnMag), diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 19c4caebd..91e0c9f87 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -12,7 +12,7 @@ void EnMaruta_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Maruta_InitVars = { ACTOR_EN_MARUTA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_MARUTA, sizeof(EnMaruta), diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index 3ee08719c..7aa4c4917 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -11,7 +11,7 @@ void EnMinideath_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Minideath_InitVars = { ACTOR_EN_MINIDEATH, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DEATH, sizeof(EnMinideath), diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index 0299a7358..07b36d560 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -12,7 +12,7 @@ void EnMinifrog_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Minifrog_InitVars = { ACTOR_EN_MINIFROG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_FR, sizeof(EnMinifrog), diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index 7ecf8810c..81877f982 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -11,7 +11,7 @@ void EnMinislime_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Minislime_InitVars = { ACTOR_EN_MINISLIME, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BIGSLIME, sizeof(EnMinislime), diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 8c9891562..9d897bf4b 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -12,7 +12,7 @@ void EnMk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mk_InitVars = { ACTOR_EN_MK, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MK, sizeof(EnMk), diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index 19e7b9b40..aefc609af 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -12,7 +12,7 @@ void EnMkk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mkk_InitVars = { ACTOR_EN_MKK, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_MKK, sizeof(EnMkk), diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index db5c7f557..bb38cd7ac 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -12,7 +12,7 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mm_InitVars = { ACTOR_EN_MM, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMm), diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index e915cdca5..84df32a1d 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -12,7 +12,7 @@ void EnMm2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mm2_InitVars = { ACTOR_EN_MM2, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMm2), diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index ad8c22235..af04b5c4d 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -12,7 +12,7 @@ void EnMm3_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mm3_InitVars = { ACTOR_EN_MM3, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MM, sizeof(EnMm3), diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index 0c88b029a..c8f727e82 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -12,7 +12,7 @@ void EnMnk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mnk_InitVars = { ACTOR_EN_MNK, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MNK, sizeof(EnMnk), diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index cd92e1861..6f6c18f9a 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -12,7 +12,7 @@ void EnMs_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ms_InitVars = { ACTOR_EN_MS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MS, sizeof(EnMs), diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index f11490ee0..ae56ceea6 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -11,7 +11,7 @@ void EnMttag_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mt_tag_InitVars = { ACTOR_EN_MT_TAG, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(EnMttag), diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index fc4110045..666899f9f 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -12,7 +12,7 @@ void EnMushi2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Mushi2_InitVars = { ACTOR_EN_MUSHI2, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnMushi2), diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c index 42acd792f..c04adf103 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -12,7 +12,7 @@ void EnMuto_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Muto_InitVars = { ACTOR_EN_MUTO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TORYO, sizeof(EnMuto), diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 9e5007e73..c2ef013c8 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -12,7 +12,7 @@ void EnNb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Nb_InitVars = { ACTOR_EN_NB, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_NB, sizeof(EnNb), diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index 1a358bacc..f72b629d4 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -12,7 +12,7 @@ void EnNeoReeba_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Neo_Reeba_InitVars = { ACTOR_EN_NEO_REEBA, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_RB, sizeof(EnNeoReeba), diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c index 7708c9ab0..6e52dd56c 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -12,7 +12,7 @@ void EnNimotsu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Nimotsu_InitVars = { ACTOR_EN_NIMOTSU, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_BOJ, sizeof(EnNimotsu), diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 73104565c..86d1a97af 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -12,7 +12,7 @@ void EnNiw_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Niw_InitVars = { ACTOR_EN_NIW, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_NIW, sizeof(EnNiw), diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c index 6f7ba4c07..8b6de69fe 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -16,7 +16,7 @@ void func_80C088B8(EnNnh* this, GlobalContext* globalCtx); const ActorInit En_Nnh_InitVars = { ACTOR_EN_NNH, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_NNH, sizeof(EnNnh), @@ -41,9 +41,9 @@ void EnNnh_Init(Actor *thisx, GlobalContext *globalCtx) { Actor_SetScale(&this->actor, 0.01f); Collision_InitCylinderDefault(globalCtx, &this->collider); Collision_InitCylinderWithData(globalCtx, &this->collider, &this->actor, &D_80C08A00); - this->actor.unk1F = 1; - this->actor.topPosRot.pos = this->actor.currPosRot.pos; - this->actor.topPosRot.pos.y += 30.0f; + this->actor.targetMode = 1; + this->actor.focus.pos = this->actor.world.pos; + this->actor.focus.pos.y += 30.0f; func_80C08828(this); } diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 43a6f0445..f85e9dd57 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -12,7 +12,7 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Nutsball_InitVars = { ACTOR_EN_NUTSBALL, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnNutsball), diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 3ee172024..bb0f7884e 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -12,7 +12,7 @@ void EnNwc_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Nwc_InitVars = { ACTOR_EN_NWC, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_NWC, sizeof(EnNwc), diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 4a4d39d20..49f52efef 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -14,7 +14,7 @@ void func_8096B1FC(EnOkarinaEffect* this, GlobalContext* globalCtx); const ActorInit En_Okarina_Effect_InitVars = { ACTOR_EN_OKARINA_EFFECT, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnOkarinaEffect), diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index e8f5c32c1..3defb5b6e 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -11,7 +11,7 @@ void EnOkarinaTag_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Okarina_Tag_InitVars = { ACTOR_EN_OKARINA_TAG, - ACTORTYPE_SWITCH, + ACTORCAT_SWITCH, FLAGS, GAMEPLAY_KEEP, sizeof(EnOkarinaTag), diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index ab6ab4bdc..ee7634e33 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -12,7 +12,7 @@ void EnOkuta_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Okuta_InitVars = { ACTOR_EN_OKUTA, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_OKUTA, sizeof(EnOkuta), diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index db5248a22..363fd2be9 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -11,7 +11,7 @@ void EnOnpuman_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Onpuman_InitVars = { ACTOR_EN_ONPUMAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnOnpuman), diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index 47d1da3b7..eff1707a5 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -12,7 +12,7 @@ void EnOsk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Osk_InitVars = { ACTOR_EN_OSK, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_IKN_DEMO, sizeof(EnOsk), diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 54ba59208..21b5dde8b 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -12,7 +12,7 @@ void EnOsn_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Osn_InitVars = { ACTOR_EN_OSN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OSN, sizeof(EnOsn), diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index f38c49e25..ee52b0b44 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -11,7 +11,7 @@ void EnOssan_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ossan_InitVars = { ACTOR_EN_OSSAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnOssan), diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index 390dfa20d..32ae3f22f 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -12,7 +12,7 @@ void EnOt_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ot_InitVars = { ACTOR_EN_OT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OT, sizeof(EnOt), diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index cdb9883d8..dd6dc9c12 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -12,7 +12,7 @@ void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Owl_InitVars = { ACTOR_EN_OWL, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OWL, sizeof(EnOwl), diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index 320b42364..a59d7b296 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -12,7 +12,7 @@ void EnPamera_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Pamera_InitVars = { ACTOR_EN_PAMERA, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_PAMERA, sizeof(EnPamera), diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index 833352a67..2bc26fe5b 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -12,7 +12,7 @@ void EnPametfrog_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Pametfrog_InitVars = { ACTOR_EN_PAMETFROG, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BIGSLIME, sizeof(EnPametfrog), diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index 15eeeeb6c..f59247039 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -12,7 +12,7 @@ void EnPaper_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Paper_InitVars = { ACTOR_EN_PAPER, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_BAL, sizeof(EnPaper), diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 55836bb96..dd5db652d 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -12,7 +12,7 @@ void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Part_InitVars = { ACTOR_EN_PART, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnPart), diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 2d43fd14b..849964c35 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -12,7 +12,7 @@ void EnPeehat_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Peehat_InitVars = { ACTOR_EN_PEEHAT, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_PH, sizeof(EnPeehat), diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index b3b13c828..6323b9e36 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -12,7 +12,7 @@ void EnPm_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Pm_InitVars = { ACTOR_EN_PM, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MM, sizeof(EnPm), diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index 0bea999a2..6dc9ec395 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -12,7 +12,7 @@ void EnPoComposer_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Po_Composer_InitVars = { ACTOR_EN_PO_COMPOSER, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_PO_COMPOSER, sizeof(EnPoComposer), diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c index a0387de8a..0614135bd 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -12,7 +12,7 @@ void EnPoFusen_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Po_Fusen_InitVars = { ACTOR_EN_PO_FUSEN, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_PO_FUSEN, sizeof(EnPoFusen), diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 236db1a1d..a1263f9e0 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -12,7 +12,7 @@ void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Po_Sisters_InitVars = { ACTOR_EN_PO_SISTERS, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_PO_SISTERS, sizeof(EnPoSisters), diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 88cf0e523..847d016f0 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -12,7 +12,7 @@ void EnPoh_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Poh_InitVars = { ACTOR_EN_POH, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_PO, sizeof(EnPoh), diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index abecefbac..5d521ecbb 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -12,7 +12,7 @@ void EnPp_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Pp_InitVars = { ACTOR_EN_PP, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_PP, sizeof(EnPp), diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index f29530bea..5de627b3a 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -12,7 +12,7 @@ void EnPr_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Pr_InitVars = { ACTOR_EN_PR, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_PR, sizeof(EnPr), diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 6bd81e543..099180eeb 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -12,7 +12,7 @@ void EnPr2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Pr2_InitVars = { ACTOR_EN_PR2, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_PR, sizeof(EnPr2), diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index 2817aa911..8f627fdc9 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -12,7 +12,7 @@ void EnPrz_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Prz_InitVars = { ACTOR_EN_PRZ, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_PR, sizeof(EnPrz), diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c index cff776ca7..3573f7b8c 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -12,7 +12,7 @@ void EnPst_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Pst_InitVars = { ACTOR_EN_PST, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_PST, sizeof(EnPst), diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index 67d873863..ca9292565 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -12,7 +12,7 @@ void EnRacedog_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Racedog_InitVars = { ACTOR_EN_RACEDOG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DOG, sizeof(EnRacedog), diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index 31aa43f87..d3b1bf6e6 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -12,7 +12,7 @@ void EnRaf_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Raf_InitVars = { ACTOR_EN_RAF, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_RAF, sizeof(EnRaf), diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 3310086f5..2dae27eb7 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -12,7 +12,7 @@ void EnRailSkb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Rail_Skb_InitVars = { ACTOR_EN_RAIL_SKB, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_SKB, sizeof(EnRailSkb), diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index 7b94577c9..e030f6451 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -12,7 +12,7 @@ void EnRailgibud_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Railgibud_InitVars = { ACTOR_EN_RAILGIBUD, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_RD, sizeof(EnRailgibud), diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index 80701df3c..0cb88abfb 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -12,7 +12,7 @@ void EnRat_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Rat_InitVars = { ACTOR_EN_RAT, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_RAT, sizeof(EnRat), diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index e1b7749ba..935c387bf 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -12,7 +12,7 @@ void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Rd_InitVars = { ACTOR_EN_RD, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_RD, sizeof(EnRd), diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c index 431203922..09bdc36a6 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -12,7 +12,7 @@ void EnRecepgirl_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BG, sizeof(EnRecepgirl), diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index 4bc21909c..44ef9d595 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -12,7 +12,7 @@ void EnRg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Rg_InitVars = { ACTOR_EN_RG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnRg), diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 322a04bc9..547f4eff0 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -11,7 +11,7 @@ void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_River_Sound_InitVars = { ACTOR_EN_RIVER_SOUND, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnRiverSound), diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index bf159384e..039972200 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -12,7 +12,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Rr_InitVars = { ACTOR_EN_RR, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_RR, sizeof(EnRr), diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c index 91a28363e..985745238 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -22,7 +22,7 @@ typedef struct { const ActorInit En_Rsn_InitVars = { ACTOR_EN_RSN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_RS, sizeof(EnRsn), @@ -68,7 +68,7 @@ void EnRsn_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor); SkelAnime_FrameUpdateMatrix(&this->skelAnime); - func_800E9250(globalCtx, &this->actor, &this->unk1D8, &this->unk1DE, this->actor.topPosRot.pos); + func_800E9250(globalCtx, &this->actor, &this->unk1D8, &this->unk1DE, this->actor.focus.pos); } s32 EnRsn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { @@ -87,7 +87,7 @@ void EnRsn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Vec3f sp18 = D_80C26028; if (limbIndex == 14) { - SysMatrix_MultiplyVector3fByState(&sp18, &this->actor.topPosRot); + SysMatrix_MultiplyVector3fByState(&sp18, &this->actor.focus); } } diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index db959dda8..54543798b 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -12,7 +12,7 @@ void EnRu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ru_InitVars = { ACTOR_EN_RU, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_RU2, sizeof(EnRu), diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index a07e69f45..1cdde4b3b 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -12,7 +12,7 @@ void EnRuppecrow_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ruppecrow_InitVars = { ACTOR_EN_RUPPECROW, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_CROW, sizeof(EnRuppecrow), diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index 8b31d4e77..1cc3141ee 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -12,7 +12,7 @@ void EnRz_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Rz_InitVars = { ACTOR_EN_RZ, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_RZ, sizeof(EnRz), diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index 6e86ec8ad..d6c3d2370 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -12,7 +12,7 @@ void EnSGoro_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_S_Goro_InitVars = { ACTOR_EN_S_GORO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_OF1D_MAP, sizeof(EnSGoro), diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index b13551c6b..d4c024258 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -12,7 +12,7 @@ void EnSb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sb_InitVars = { ACTOR_EN_SB, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_SB, sizeof(EnSb), diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index c1fc25927..7313bacc3 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -12,7 +12,7 @@ void EnScRuppe_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sc_Ruppe_InitVars = { ACTOR_EN_SC_RUPPE, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnScRuppe), diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index f51ea12fb..844c8256d 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -12,7 +12,7 @@ void EnScopecoin_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Scopecoin_InitVars = { ACTOR_EN_SCOPECOIN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnScopecoin), diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c index b8925a7eb..97ac38c1d 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -12,7 +12,7 @@ void EnScopecrow_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Scopecrow_InitVars = { ACTOR_EN_SCOPECROW, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_CROW, sizeof(EnScopecrow), diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index bda266345..81a671c79 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -12,7 +12,7 @@ void EnScopenuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Scopenuts_InitVars = { ACTOR_EN_SCOPENUTS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNT, sizeof(EnScopenuts), diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index f03f3c2b5..956b05bc3 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -12,7 +12,7 @@ void EnSda_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sda_InitVars = { ACTOR_EN_SDA, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, GAMEPLAY_KEEP, sizeof(EnSda), diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index a800d0584..e375318b1 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -11,7 +11,7 @@ void EnSekihi_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sekihi_InitVars = { ACTOR_EN_SEKIHI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnSekihi), diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index 84bedad88..bf9b7550e 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -12,7 +12,7 @@ void EnSellnuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sellnuts_InitVars = { ACTOR_EN_SELLNUTS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DNT, sizeof(EnSellnuts), diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c index fd35bd796..d325b96ed 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -12,7 +12,7 @@ void EnShn_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Shn_InitVars = { ACTOR_EN_SHN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SHN, sizeof(EnShn), diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 2d9bfe7a3..874db8936 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -12,7 +12,7 @@ void EnSi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Si_InitVars = { ACTOR_EN_SI, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_ST, sizeof(EnSi), diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 4887095fc..149e814bb 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -12,7 +12,7 @@ void EnSkb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Skb_InitVars = { ACTOR_EN_SKB, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_SKB, sizeof(EnSkb), diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 4cdd603ed..69248e71c 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -12,7 +12,7 @@ void EnSlime_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Slime_InitVars = { ACTOR_EN_SLIME, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_SLIME, sizeof(EnSlime), diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 0e91a078f..6a70e6cd4 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -12,7 +12,7 @@ void EnSnowman_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Snowman_InitVars = { ACTOR_EN_SNOWMAN, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_SNOWMAN, sizeof(EnSnowman), diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index e576438b9..3b74ea7e5 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -12,7 +12,7 @@ void EnSnowwd_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Snowwd_InitVars = { ACTOR_EN_SNOWWD, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_SNOWWD, sizeof(EnSnowwd), diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index ea36445d6..95b6b9533 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -11,7 +11,7 @@ void EnSob1_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sob1_InitVars = { ACTOR_EN_OSSAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnSob1), diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 42cbe3a55..f32d9743f 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -12,7 +12,7 @@ void EnSsh_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Ssh_InitVars = { ACTOR_EN_SSH, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SSH, sizeof(EnSsh), diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index f85ed6610..284ef7d6d 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -11,7 +11,7 @@ void EnSt_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_St_InitVars = { ACTOR_EN_ST, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_ST, sizeof(EnSt), diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 0b4876e4d..9fea92db6 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -11,7 +11,7 @@ void EnSth_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sth_InitVars = { ACTOR_EN_STH, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnSth), diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index 03aeb31f6..7941035ad 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -11,7 +11,7 @@ void EnSth2_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sth2_InitVars = { ACTOR_EN_STH2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(EnSth2), diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index fbdfd2651..d8b17e98a 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -12,7 +12,7 @@ void EnStoneheishi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Stone_heishi_InitVars = { ACTOR_EN_STONE_HEISHI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SDN, sizeof(EnStoneheishi), diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 1fa5c9b49..826521008 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -12,7 +12,7 @@ void EnStopheishi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Stop_heishi_InitVars = { ACTOR_EN_STOP_HEISHI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SDN, sizeof(EnStopheishi), diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 73bd6bcf8..7cd9f7f63 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -12,7 +12,7 @@ void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Stream_InitVars = { ACTOR_EN_STREAM, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_STREAM, sizeof(EnStream), diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index b498be596..a7c287e6b 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -12,7 +12,7 @@ void EnSuttari_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Suttari_InitVars = { ACTOR_EN_SUTTARI, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BOJ, sizeof(EnSuttari), diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index d9715bfb3..615889b58 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -12,7 +12,7 @@ void EnSw_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Sw_InitVars = { ACTOR_EN_SW, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ST, sizeof(EnSw), diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index 8f69cfa94..b0e57ffed 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -12,7 +12,7 @@ void EnSyatekiCrow_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Syateki_Crow_InitVars = { ACTOR_EN_SYATEKI_CROW, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_CROW, sizeof(EnSyatekiCrow), diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index 9b1f040e5..1e97367be 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -12,7 +12,7 @@ void EnSyatekiDekunuts_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Syateki_Dekunuts_InitVars = { ACTOR_EN_SYATEKI_DEKUNUTS, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_DEKUNUTS, sizeof(EnSyatekiDekunuts), diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index ba0df34e9..6f8095b8b 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -12,7 +12,7 @@ void EnSyatekiMan_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Syateki_Man_InitVars = { ACTOR_EN_SYATEKI_MAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_SHN, sizeof(EnSyatekiMan), diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 857865411..6b8dcc17c 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -12,7 +12,7 @@ void EnSyatekiOkuta_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Syateki_Okuta_InitVars = { ACTOR_EN_SYATEKI_OKUTA, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_OKUTA, sizeof(EnSyatekiOkuta), diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index 20ff38f1f..c223d3936 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -12,7 +12,7 @@ void EnSyatekiWf_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Syateki_Wf_InitVars = { ACTOR_EN_SYATEKI_WF, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_WF, sizeof(EnSyatekiWf), diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index e4958fd12..79c260e4e 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -12,7 +12,7 @@ void EnTab_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tab_InitVars = { ACTOR_EN_TAB, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TAB, sizeof(EnTab), diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c index ff67860b4..a9896c6dd 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -11,7 +11,7 @@ void EnTagObj_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tag_Obj_InitVars = { ACTOR_EN_TAG_OBJ, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnTagObj), diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index 502e8e1a1..3d8544a0d 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -12,7 +12,7 @@ void EnTakaraya_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Takaraya_InitVars = { ACTOR_EN_TAKARAYA, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_BG, sizeof(EnTakaraya), diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.c b/src/overlays/actors/ovl_En_Talk/z_en_talk.c index c970cf50e..f3bc56794 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.c +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -11,7 +11,7 @@ void EnTalk_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Talk_InitVars = { ACTOR_EN_TALK, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTalk), diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index 5c9da4a35..e18f96b48 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -12,7 +12,7 @@ void EnTalkGibud_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Talk_Gibud_InitVars = { ACTOR_EN_TALK_GIBUD, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_RD, sizeof(EnTalkGibud), diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index d09e860d9..6499c5423 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -12,7 +12,7 @@ void EnTanron1_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tanron1_InitVars = { ACTOR_EN_TANRON1, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, GAMEPLAY_KEEP, sizeof(EnTanron1), diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index fb84f3d75..1ee48d1da 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -12,7 +12,7 @@ void EnTanron2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tanron2_InitVars = { ACTOR_EN_TANRON2, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS04, sizeof(EnTanron2), diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index bc6c04ab5..ab09dd774 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -12,7 +12,7 @@ void EnTanron3_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tanron3_InitVars = { ACTOR_EN_TANRON3, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS03, sizeof(EnTanron3), diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c index 128f10ff5..374da8ba7 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -12,7 +12,7 @@ void EnTanron4_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tanron4_InitVars = { ACTOR_EN_TANRON4, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_TANRON4, sizeof(EnTanron4), diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index 0cc2383b3..25a261c57 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -12,7 +12,7 @@ void EnTanron5_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tanron5_InitVars = { ACTOR_EN_TANRON5, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_BOSS02, sizeof(EnTanron5), diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c index 8bb151e9f..d5d69b893 100644 --- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c @@ -14,7 +14,7 @@ void func_80BE60D0(EnTanron6* this, GlobalContext* globalCtx); const ActorInit En_Tanron6_InitVars = { ACTOR_EN_TANRON6, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_TANRON5, sizeof(EnTanron6), @@ -24,18 +24,18 @@ const ActorInit En_Tanron6_InitVars = { (ActorFunc)EnTanron6_Draw }; -ActorDamageChart D_80BE6170 = { 0xF0, 0xF0, 0x00, 0xF1, 0xE1, 0xE1, 0x00, 0xE1, 0xF0, 0xF0, 0xF0, +DamageTable D_80BE6170 = { 0xF0, 0xF0, 0x00, 0xF1, 0xE1, 0xE1, 0x00, 0xE1, 0xF0, 0xF0, 0xF0, 0xE1, 0xE1, 0x46, 0xF0, 0xF0, 0xE1, 0xF0, 0xF0, 0x00, 0x00, 0xF0, 0xE1, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0 }; void EnTanron6_Init(Actor* thisx, GlobalContext* globalCtx) { EnTanron6* this = THIS; - this->actor.unkA0.mass = 0xA; + this->actor.colChkInfo.mass = 0xA; Actor_SetDrawParams(&this->actor.shape, 0, func_800B3FC0, 19.0f); - this->actor.unkA0.health = 1; - this->actor.unkA0.damageChart = &D_80BE6170; - this->actor.unk1F = 6; + this->actor.colChkInfo.health = 1; + this->actor.colChkInfo.damageTable = &D_80BE6170; + this->actor.targetMode = 6; EnTanron6_DoNothing(this); } diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index d29652b28..64aca1197 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -12,7 +12,7 @@ void EnTest_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Test_InitVars = { ACTOR_EN_TEST, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest), diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index 19dde7295..81ce23955 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -10,7 +10,7 @@ void EnTest2_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Test2_InitVars = { ACTOR_EN_TEST2, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest2), diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 99ba5d71f..983130f09 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -11,7 +11,7 @@ void EnTest3_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Test3_InitVars = { ACTOR_EN_TEST3, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TEST3, sizeof(EnTest3), diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index 09938b879..9f2e0d796 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -11,7 +11,7 @@ void EnTest4_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Test4_InitVars = { ACTOR_EN_TEST4, - ACTORTYPE_SWITCH, + ACTORCAT_SWITCH, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest4), diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c index aa7fa4f43..013da85ef 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -11,7 +11,7 @@ void EnTest5_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Test5_InitVars = { ACTOR_EN_TEST5, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest5), diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index 9e3e998bb..6ac1424a2 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -12,7 +12,7 @@ void EnTest6_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Test6_InitVars = { ACTOR_EN_TEST6, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest6), diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index ba0e8bd90..6bd0a990e 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -12,7 +12,7 @@ void EnTest7_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Test7_InitVars = { ACTOR_EN_TEST7, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTest7), diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 325f01763..7b0495383 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -12,7 +12,7 @@ void EnTg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tg_InitVars = { ACTOR_EN_TG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_MU, sizeof(EnTg), diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index 0ef1f00d7..8d716bee0 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -12,7 +12,7 @@ void EnThiefbird_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Thiefbird_InitVars = { ACTOR_EN_THIEFBIRD, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_THIEFBIRD, sizeof(EnThiefbird), diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index 11a78aac1..740593591 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -11,7 +11,7 @@ void EnTimeTag_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Time_Tag_InitVars = { ACTOR_EN_TIME_TAG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTimeTag), diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 8a7dc24ca..ff3676d7c 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -12,7 +12,7 @@ void EnTite_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tite_InitVars = { ACTOR_EN_TITE, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_TITE, sizeof(EnTite), diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index c0d0f7228..4b0509413 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -12,7 +12,7 @@ void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tk_InitVars = { ACTOR_EN_TK, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TK, sizeof(EnTk), diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 6104790b1..15b68bfa7 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -8,7 +8,7 @@ void EnTorch_Init(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Torch_InitVars = { ACTOR_EN_TORCH, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch), @@ -24,8 +24,8 @@ void EnTorch_Init(Actor* thisx, GlobalContext* globalCtx) { EnTorch* this = THIS; s8 returnData = gSaveContext.extra.unk87; - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOX, this->actor.currPosRot.pos.x, - this->actor.currPosRot.pos.y, this->actor.currPosRot.pos.z, 0, this->actor.shape.rot.y, 0, + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOX, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, (sChestContents[(returnData >> 0x5) & 0x7] << 0x5) | 0x5000 | (returnData & 0x1F)); Actor_MarkForDeath(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index eafa7605e..c19f99a10 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -12,7 +12,7 @@ void EnTorch2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Torch2_InitVars = { ACTOR_EN_TORCH2, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch2), diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index 09eb10b52..322a7b71f 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -12,7 +12,7 @@ void EnToto_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Toto_InitVars = { ACTOR_EN_TOTO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZM, sizeof(EnToto), diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 8e884d663..74334d242 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -12,7 +12,7 @@ void EnTrt_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Trt_InitVars = { ACTOR_EN_TRT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TRT, sizeof(EnTrt), diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index 050293fe5..0d388df23 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -11,7 +11,7 @@ void EnTrt2_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Trt2_InitVars = { ACTOR_EN_TRT2, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TRT, sizeof(EnTrt2), diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index e314420aa..4576fc62e 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -12,7 +12,7 @@ void EnTru_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tru_InitVars = { ACTOR_EN_TRU, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TRU, sizeof(EnTru), diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index 71029c7b2..d09b9b0bf 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -12,7 +12,7 @@ void EnTruMt_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tru_Mt_InitVars = { ACTOR_EN_TRU_MT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TRU, sizeof(EnTruMt), diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index 9cbe5df44..b42f3fe85 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -12,7 +12,7 @@ void EnTsn_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tsn_InitVars = { ACTOR_EN_TSN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_TSN, sizeof(EnTsn), diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 78ff271d2..2f6af8203 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -12,7 +12,7 @@ void EnTuboTrap_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Tubo_Trap_InitVars = { ACTOR_EN_TUBO_TRAP, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(EnTuboTrap), diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index c26615195..efe7d9182 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -12,7 +12,7 @@ void EnTwig_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Twig_InitVars = { ACTOR_EN_TWIG, - ACTORTYPE_MISC, + ACTORCAT_MISC, FLAGS, OBJECT_TWIG, sizeof(EnTwig), diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 5b1c5442a..1b6e7f626 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -12,7 +12,7 @@ void EnViewer_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Viewer_InitVars = { ACTOR_EN_VIEWER, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnViewer), diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index fdc71f637..39bd90383 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -12,7 +12,7 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Vm_InitVars = { ACTOR_EN_VM, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_VM, sizeof(EnVm), diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 51fcabcf6..49d480975 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -12,7 +12,7 @@ void EnWallmas_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Wallmas_InitVars = { ACTOR_EN_WALLMAS, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_WALLMASTER, sizeof(EnWallmas), diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c index 526a5fbb1..fa49dfda5 100644 --- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c @@ -12,7 +12,7 @@ void EnWarpUzu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Warp_Uzu_InitVars = { ACTOR_EN_WARP_UZU, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_WARP_UZU, sizeof(EnWarpUzu), diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index ab2e3ccc6..51d242d91 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -11,7 +11,7 @@ void EnWarptag_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Warp_tag_InitVars = { ACTOR_EN_WARP_TAG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnWarptag), diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index 5dd63f698..b38936c53 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -12,7 +12,7 @@ void EnWaterEffect_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Water_Effect_InitVars = { ACTOR_EN_WATER_EFFECT, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_WATER_EFFECT, sizeof(EnWaterEffect), diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index a9d8133f9..8ec23ed5d 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -12,7 +12,7 @@ void EnWdhand_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Wdhand_InitVars = { ACTOR_EN_WDHAND, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_WDHAND, sizeof(EnWdhand), diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 526c92572..3533ecda8 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -12,7 +12,7 @@ void EnWeatherTag_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Weather_Tag_InitVars = { ACTOR_EN_WEATHER_TAG, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(EnWeatherTag), diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index c43e5a3df..7a6c2617b 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -12,7 +12,7 @@ void EnWf_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Wf_InitVars = { ACTOR_EN_WF, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_WF, sizeof(EnWf), diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index cd89cb61f..f30da61df 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -12,7 +12,7 @@ void EnWiz_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Wiz_InitVars = { ACTOR_EN_WIZ, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_WIZ, sizeof(EnWiz), diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index a66317628..04aef072a 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -12,7 +12,7 @@ void EnWizBrock_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Wiz_Brock_InitVars = { ACTOR_EN_WIZ_BROCK, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_WIZ, sizeof(EnWizBrock), diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index 3f4fe5398..33f5e97ee 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -12,7 +12,7 @@ void EnWizFire_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Wiz_Fire_InitVars = { ACTOR_EN_WIZ_FIRE, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, OBJECT_WIZ, sizeof(EnWizFire), diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 8a151b2c2..4bdd75a9c 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -12,7 +12,7 @@ void EnWood02_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Wood02_InitVars = { ACTOR_EN_WOOD02, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_WOOD02, sizeof(EnWood02), diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index 8bf23f544..6f2908935 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -12,7 +12,7 @@ void EnYb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Yb_InitVars = { ACTOR_EN_YB, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_YB, sizeof(EnYb), diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 63f62e409..d06b5ab53 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -11,7 +11,7 @@ void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Zl1_InitVars = { ACTOR_EN_ZL1, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZL1, sizeof(EnZl1), diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 9cde585be..4740a6259 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -12,7 +12,7 @@ void EnZl4_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zl4_InitVars = { ACTOR_EN_ZL4, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_STK, sizeof(EnZl4), diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index b81f63a17..ffe2a4417 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -12,7 +12,7 @@ void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zo_InitVars = { ACTOR_EN_ZO, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZO, sizeof(EnZo), diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index 58b36edd5..509200ac8 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -12,7 +12,7 @@ void EnZob_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zob_InitVars = { ACTOR_EN_ZOB, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZOB, sizeof(EnZob), diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index 6f4d3f4f4..1738361e8 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -12,7 +12,7 @@ void EnZod_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zod_InitVars = { ACTOR_EN_ZOD, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZOD, sizeof(EnZod), diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index b1f8bf5d8..52e2f772d 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -12,7 +12,7 @@ void EnZog_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zog_InitVars = { ACTOR_EN_ZOG, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZOG, sizeof(EnZog), diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index 81a2121b8..47da6ac3f 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -12,7 +12,7 @@ void EnZoraegg_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zoraegg_InitVars = { ACTOR_EN_ZORAEGG, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_ZORAEGG, sizeof(EnZoraegg), diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index adbc16569..80877ccd8 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -12,7 +12,7 @@ void EnZos_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zos_InitVars = { ACTOR_EN_ZOS, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZOS, sizeof(EnZos), diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 308f82b0f..48468c93a 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -12,7 +12,7 @@ void EnZot_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zot_InitVars = { ACTOR_EN_ZOT, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZO, sizeof(EnZot), diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index cfbedc8ef..74be33517 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -12,7 +12,7 @@ void EnZov_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zov_InitVars = { ACTOR_EN_ZOV, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZOV, sizeof(EnZov), diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 37203a3f5..d0cd17c64 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -12,7 +12,7 @@ void EnZow_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit En_Zow_InitVars = { ACTOR_EN_ZOW, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_ZO, sizeof(EnZow), diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index 54435bb74..24d34c2ac 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -12,7 +12,7 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Item_B_Heart_InitVars = { ACTOR_ITEM_B_HEART, - ACTORTYPE_BOSS, + ACTORCAT_BOSS, FLAGS, OBJECT_GI_HEARTS, sizeof(ItemBHeart), diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index cf0bb6993..a2b1c740b 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -11,7 +11,7 @@ void ItemEtcetera_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Item_Etcetera_InitVars = { ACTOR_ITEM_ETCETERA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ItemEtcetera), diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index a2294a64e..4d9202a97 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -12,7 +12,7 @@ void ItemInbox_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Item_Inbox_InitVars = { ACTOR_ITEM_INBOX, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, GAMEPLAY_KEEP, sizeof(ItemInbox), diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 8ff800290..b981796f8 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -12,7 +12,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Mir_Ray_InitVars = { ACTOR_MIR_RAY, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_MIR_RAY, sizeof(MirRay), diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c index d78b0a717..6f1815d7b 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -12,7 +12,7 @@ void MirRay2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Mir_Ray2_InitVars = { ACTOR_MIR_RAY2, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_MIR_RAY, sizeof(MirRay2), diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index 76acdba7f..c9eca46f0 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -12,7 +12,7 @@ void MirRay3_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Mir_Ray3_InitVars = { ACTOR_MIR_RAY3, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_MIR_RAY, sizeof(MirRay3), diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index 9177ef9af..ee08adf00 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -12,7 +12,7 @@ void ObjAqua_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Aqua_InitVars = { ACTOR_OBJ_AQUA, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjAqua), diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 0b1fe2540..db564e65a 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -12,7 +12,7 @@ void ObjArmos_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Armos_InitVars = { ACTOR_OBJ_ARMOS, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_AM, sizeof(ObjArmos), diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 4f7584928..4669ce545 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -11,7 +11,7 @@ void ObjBean_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Bean_InitVars = { ACTOR_OBJ_BEAN, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_MAMENOKI, sizeof(ObjBean), diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index d0d101b9a..b461ddfd4 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -12,7 +12,7 @@ void ObjBell_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Bell_InitVars = { ACTOR_OBJ_BELL, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_F52_OBJ, sizeof(ObjBell), diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index d6ab1a2ec..55c464805 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -12,7 +12,7 @@ void ObjBigicicle_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Bigicicle_InitVars = { ACTOR_OBJ_BIGICICLE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_BIGICICLE, sizeof(ObjBigicicle), diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 9408b41c8..7e6e076c7 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -10,7 +10,7 @@ void ObjBlockstop_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Blockstop_InitVars = { ACTOR_OBJ_BLOCKSTOP, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjBlockstop), diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index f0c4e199d..46c3ba17b 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -12,7 +12,7 @@ void ObjBoat_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Boat_InitVars = { ACTOR_OBJ_BOAT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjBoat), diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 2cc9b7b71..4d998af36 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -11,7 +11,7 @@ void ObjBombiwa_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Bombiwa_InitVars = { ACTOR_OBJ_BOMBIWA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_BOMBIWA, sizeof(ObjBombiwa), diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c index 0ee1df53b..606c89f31 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -12,7 +12,7 @@ void ObjBoyo_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Boyo_InitVars = { ACTOR_OBJ_BOYO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_BOYO, sizeof(ObjBoyo), diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c index 6f985d3f5..36e7a9ddc 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -12,7 +12,7 @@ void ObjChan_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Chan_InitVars = { ACTOR_OBJ_CHAN, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_OBJECT_UNSET_CHAN, sizeof(ObjChan), diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index 1af620b93..abfe9f7e5 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -12,7 +12,7 @@ void ObjChikuwa_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Chikuwa_InitVars = { ACTOR_OBJ_CHIKUWA, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_D_LIFT, sizeof(ObjChikuwa), diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 4bf11f0dc..bed9708d3 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -12,7 +12,7 @@ void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Comb_InitVars = { ACTOR_OBJ_COMB, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_COMB, sizeof(ObjComb), diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c index fc24070b8..8e925d1e0 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -12,7 +12,7 @@ void ObjDanpeilift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Danpeilift_InitVars = { ACTOR_OBJ_DANPEILIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_OBJECT_UNSET_DANPEILIFT, sizeof(ObjDanpeilift), diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c index b6baeb88e..90ac1d8a2 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -10,7 +10,7 @@ void ObjDemo_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Demo_InitVars = { ACTOR_OBJ_DEMO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjDemo), diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index 6a182ab8b..67df81aec 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -12,7 +12,7 @@ void ObjDhouse_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Dhouse_InitVars = { ACTOR_OBJ_DHOUSE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_DHOUSE, sizeof(ObjDhouse), diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c index 6e553d6e5..85ae56428 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -11,7 +11,7 @@ void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit Obj_Dinner_InitVars = { ACTOR_OBJ_DINNER, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_OBJECT_UNSET_DINNER, sizeof(ObjDinner), diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index 9c61c0778..4ca36b5ee 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -12,7 +12,7 @@ void ObjDora_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Dora_InitVars = { ACTOR_OBJ_DORA, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DORA, sizeof(ObjDora), diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c index 73787540d..7c2a6bd34 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -11,7 +11,7 @@ void ObjDowsing_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Dowsing_InitVars = { ACTOR_OBJ_DOWSING, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjDowsing), diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index 3cc1907b4..9d48303f7 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -12,7 +12,7 @@ void ObjDriftice_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Driftice_InitVars = { ACTOR_OBJ_DRIFTICE, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_DRIFTICE, sizeof(ObjDriftice), diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c index 9ced62a41..5d3faea85 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -11,7 +11,7 @@ void ObjEnding_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Ending_InitVars = { ACTOR_OBJ_ENDING, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_ENDING_OBJ, sizeof(ObjEnding), diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 5e6952945..1b025fcaa 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -12,7 +12,7 @@ void ObjEntotu_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Entotu_InitVars = { ACTOR_OBJ_ENTOTU, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjEntotu), diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c index 20dd2a1e6..9c8cffdf1 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -11,7 +11,7 @@ void ObjEtcetera_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Etcetera_InitVars = { ACTOR_OBJ_ETCETERA, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ObjEtcetera), diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index 412535c60..fe2e4bba0 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -12,7 +12,7 @@ void ObjFireshield_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Fireshield_InitVars = { ACTOR_OBJ_FIRESHIELD, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjFireshield), diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index 39e8e0b43..53e647472 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -12,7 +12,7 @@ void ObjFlowerpot_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Flowerpot_InitVars = { ACTOR_OBJ_FLOWERPOT, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_FLOWERPOT, sizeof(ObjFlowerpot), diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index 062818259..d53d7f31c 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -10,7 +10,7 @@ void ObjFunen_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Funen_InitVars = { ACTOR_OBJ_FUNEN, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_FUNEN, sizeof(ObjFunen), diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index 8ec3c6ed6..eb403cd0e 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -12,7 +12,7 @@ void ObjGhaka_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Ghaka_InitVars = { ACTOR_OBJ_GHAKA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_GHAKA, sizeof(ObjGhaka), diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index c2c984f9c..e48e9c90d 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -12,7 +12,7 @@ void ObjGrass_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Grass_InitVars = { ACTOR_OBJ_GRASS, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrass), diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index bdd3685f3..3adb9c2b8 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -11,7 +11,7 @@ void ObjGrassCarry_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Grass_Carry_InitVars = { ACTOR_OBJ_GRASS_CARRY, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassCarry), diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index d93580170..b27f1f598 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -9,7 +9,7 @@ void ObjGrassUnit_Init(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Grass_Unit_InitVars = { ACTOR_OBJ_GRASS_UNIT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassUnit), diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index fea762747..355ae69cd 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -12,7 +12,7 @@ void ObjHakaisi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Hakaisi_InitVars = { ACTOR_OBJ_HAKAISI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_HAKAISI, sizeof(ObjHakaisi), diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 5e730578c..626568b25 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -12,7 +12,7 @@ void ObjHamishi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Hamishi_InitVars = { ACTOR_OBJ_HAMISHI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjHamishi), diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 128679b25..5d1b8c589 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -16,7 +16,7 @@ void ObjHana_Draw(Actor* thisx, GlobalContext* globalCtx); const ActorInit Obj_Hana_InitVars = { ACTOR_OBJ_HANA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_HANA, sizeof(ObjHana), @@ -30,9 +30,9 @@ extern UNK_TYPE D_06000500; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(unkFC, 900, ICHAIN_CONTINUE), - ICHAIN_F32(unk100, 40, ICHAIN_CONTINUE), - ICHAIN_F32(unk104, 40, ICHAIN_STOP), + ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 40, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 40, ICHAIN_STOP), }; void ObjHana_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c index 18577e7c8..8f68d0383 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -12,7 +12,7 @@ void ObjHariko_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Hariko_InitVars = { ACTOR_OBJ_HARIKO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_HARIKO, sizeof(ObjHariko), diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c index ff3a21219..22745673f 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -12,7 +12,7 @@ void ObjHgdoor_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Hgdoor_InitVars = { ACTOR_OBJ_HGDOOR, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_HGDOOR, sizeof(ObjHgdoor), diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c index ee79db8c2..540abec9f 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -12,7 +12,7 @@ void ObjHsStump_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_HsStump_InitVars = { ACTOR_OBJ_HSSTUMP, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HSSTUMP, sizeof(ObjHsStump), diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index b12efddd6..80f9a9ae4 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -12,7 +12,7 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Hsblock_InitVars = { ACTOR_OBJ_HSBLOCK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_D_HSBLOCK, sizeof(ObjHsblock), diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index 15d0d8eaf..9a63bba1b 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -12,7 +12,7 @@ void ObjHugebombiwa_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Hugebombiwa_InitVars = { ACTOR_OBJ_HUGEBOMBIWA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_BOMBIWA, sizeof(ObjHugebombiwa), diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index 84227170e..ab2c69d0e 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -12,7 +12,7 @@ void ObjHunsui_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Hunsui_InitVars = { ACTOR_OBJ_HUNSUI, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_HUNSUI, sizeof(ObjHunsui), diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 831fbd51c..d4fe75740 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -12,7 +12,7 @@ void ObjIcePoly_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Ice_Poly_InitVars = { ACTOR_OBJ_ICE_POLY, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjIcePoly), diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index 04e119db4..e03275988 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -12,7 +12,7 @@ void ObjIceblock_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Iceblock_InitVars = { ACTOR_OBJ_ICEBLOCK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_ICE_BLOCK, sizeof(ObjIceblock), diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c index 079c05258..56bb137b0 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -12,7 +12,7 @@ void ObjJgGakki_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Jg_Gakki_InitVars = { ACTOR_OBJ_JG_GAKKI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_JG, sizeof(ObjJgGakki), diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index 7bb0cc023..7aaa715c8 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -12,7 +12,7 @@ void ObjJgameLight_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Jgame_Light_InitVars = { ACTOR_OBJ_JGAME_LIGHT, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_SYOKUDAI, sizeof(ObjJgameLight), diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 022d9ed4f..93544e487 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -12,7 +12,7 @@ void ObjKendoKanban_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Kendo_Kanban_InitVars = { ACTOR_OBJ_KENDO_KANBAN, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_DORA, sizeof(ObjKendoKanban), diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index 67e9b1029..cebb345b1 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -12,7 +12,7 @@ void ObjKepnKoya_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Kepn_Koya_InitVars = { ACTOR_OBJ_KEPN_KOYA, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_KEPN_KOYA, sizeof(ObjKepnKoya), diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 859b3daff..d44a7b990 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -11,7 +11,7 @@ void ObjKibako_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Kibako_InitVars = { ACTOR_OBJ_KIBAKO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjKibako), diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 8f8f00be5..481d99d46 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -12,7 +12,7 @@ void ObjKibako2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Kibako2_InitVars = { ACTOR_OBJ_KIBAKO2, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KIBAKO2, sizeof(ObjKibako2), diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index 56954c1fa..f9d70790b 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -12,7 +12,7 @@ void ObjKinoko_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Kinoko_InitVars = { ACTOR_OBJ_KINOKO, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjKinoko), diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index 5930360b9..f21f50d5b 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -12,7 +12,7 @@ void ObjKzsaku_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Kzsaku_InitVars = { ACTOR_OBJ_KZSAKU, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_KZSAKU, sizeof(ObjKzsaku), diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 5aff6a06b..cab492705 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -12,7 +12,7 @@ void ObjLift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Lift_InitVars = { ACTOR_OBJ_LIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_D_LIFT, sizeof(ObjLift), diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c index 12150374e..1b7b866b6 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -12,7 +12,7 @@ void ObjLightblock_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Lightblock_InitVars = { ACTOR_OBJ_LIGHTBLOCK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_LIGHTBLOCK, sizeof(ObjLightblock), diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 4f98bcc0d..0641fe6ad 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -12,7 +12,7 @@ void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Lightswitch_InitVars = { ACTOR_OBJ_LIGHTSWITCH, - ACTORTYPE_SWITCH, + ACTORCAT_SWITCH, FLAGS, OBJECT_LIGHTSWITCH, sizeof(ObjLightswitch), diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index 63792ecfa..15e33c438 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -12,7 +12,7 @@ void ObjLupygamelift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Lupygamelift_InitVars = { ACTOR_OBJ_LUPYGAMELIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_RAILLIFT, sizeof(ObjLupygamelift), diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index f729667db..a57d1c2c4 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -11,7 +11,7 @@ void ObjMakekinsuta_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Makekinsuta_InitVars = { ACTOR_OBJ_MAKEKINSUTA, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMakekinsuta), diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index ec2e03691..37bfa5d17 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -10,7 +10,7 @@ void ObjMakeoshihiki_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Makeoshihiki_InitVars = { ACTOR_OBJ_MAKEOSHIHIKI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMakeoshihiki), diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index 5a2cbd7d2..9f2c61eac 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -12,7 +12,7 @@ void ObjMilkBin_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Milk_Bin_InitVars = { ACTOR_OBJ_MILK_BIN, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_OBJECT_UNSET_MILK_BIN, sizeof(ObjMilkBin), diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index 923c53008..f8ce94a0f 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -12,7 +12,7 @@ void ObjMine_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Mine_InitVars = { ACTOR_OBJ_MINE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_NY, sizeof(ObjMine), diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index bcf47e130..5a75e8a9b 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -12,7 +12,7 @@ void ObjMoonStone_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Moon_Stone_InitVars = { ACTOR_OBJ_MOON_STONE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_GI_RESERVE00, sizeof(ObjMoonStone), diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c index ea1a613bf..5d3da6805 100644 --- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c @@ -12,7 +12,7 @@ void ObjMuPict_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Mu_Pict_InitVars = { ACTOR_OBJ_MU_PICT, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMuPict), diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index cfb9ce842..a6f3474b3 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -11,7 +11,7 @@ void ObjMure_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Mure_InitVars = { ACTOR_OBJ_MURE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure), diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index ce11f142c..4660c9445 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -10,7 +10,7 @@ void ObjMure2_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Mure2_InitVars = { ACTOR_OBJ_MURE2, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure2), diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index ec8033ca2..65ccdc733 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -11,7 +11,7 @@ void ObjMure3_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Mure3_InitVars = { ACTOR_OBJ_MURE3, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure3), diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 7817c2332..246bad7c9 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -11,7 +11,7 @@ void ObjNozoki_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Nozoki_InitVars = { ACTOR_OBJ_NOZOKI, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjNozoki), diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index 90fc335e1..fdb32dec7 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -12,7 +12,7 @@ void ObjOcarinalift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Ocarinalift_InitVars = { ACTOR_OBJ_OCARINALIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_RAILLIFT, sizeof(ObjOcarinalift), diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index b5c070d9f..728b9761b 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -12,7 +12,7 @@ void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Oshihiki_InitVars = { ACTOR_OBJ_OSHIHIKI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjOshihiki), diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index d99507f46..50f9d8fa5 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -11,7 +11,7 @@ void ObjPurify_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Purify_InitVars = { ACTOR_OBJ_PURIFY, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_KEEP, sizeof(ObjPurify), diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index 5cb191d2d..91c6842cd 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -11,7 +11,7 @@ void ObjPzlblock_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Pzlblock_InitVars = { ACTOR_OBJ_PZLBLOCK, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjPzlblock), diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c index 0b334c66a..87bd9cd6c 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -12,7 +12,7 @@ void ObjRaillift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Raillift_InitVars = { ACTOR_OBJ_RAILLIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_RAILLIFT, sizeof(ObjRaillift), diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index eb4b3a109..ca2c6edc2 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -11,7 +11,7 @@ void ObjRoomtimer_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Roomtimer_InitVars = { ACTOR_OBJ_ROOMTIMER, - ACTORTYPE_ENEMY, + ACTORCAT_ENEMY, FLAGS, GAMEPLAY_KEEP, sizeof(ObjRoomtimer), diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index ee6753f5c..b7071f6a6 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -12,7 +12,7 @@ void ObjRotlift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Rotlift_InitVars = { ACTOR_OBJ_ROTLIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_ROTLIFT, sizeof(ObjRotlift), diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index 26adff3e7..d351c0600 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -12,7 +12,7 @@ void ObjShutter_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Shutter_InitVars = { ACTOR_OBJ_SHUTTER, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjShutter), diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index b4840f775..af2e00673 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -12,7 +12,7 @@ void ObjSkateblock_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Skateblock_InitVars = { ACTOR_OBJ_SKATEBLOCK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjSkateblock), diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index cad51a44c..7dbfe5af5 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -12,7 +12,7 @@ void ObjSmork_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Smork_InitVars = { ACTOR_OBJ_SMORK, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjSmork), diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index 243ff5365..ba9510ced 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -12,7 +12,7 @@ void ObjSnowball_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Snowball_InitVars = { ACTOR_OBJ_SNOWBALL, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_GOROIWA, sizeof(ObjSnowball), diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index 03fa1bbae..489050ef4 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -12,7 +12,7 @@ void ObjSnowball2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Snowball2_InitVars = { ACTOR_OBJ_SNOWBALL2, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_GOROIWA, sizeof(ObjSnowball2), diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index 2642f1841..5be4cc38d 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -11,7 +11,7 @@ void ObjSound_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Sound_InitVars = { ACTOR_OBJ_SOUND, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjSound), diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 97ccb823b..80faac031 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -12,7 +12,7 @@ void ObjSpidertent_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Spidertent_InitVars = { ACTOR_OBJ_SPIDERTENT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_SPIDERTENT, sizeof(ObjSpidertent), diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index 2ef7b4d76..ff9117a64 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -12,7 +12,7 @@ void ObjSpinyroll_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Spinyroll_InitVars = { ACTOR_OBJ_SPINYROLL, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_SPINYROLL, sizeof(ObjSpinyroll), diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index 2395057b6..b3aaf37fc 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -12,7 +12,7 @@ void ObjSwitch_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Switch_InitVars = { ACTOR_OBJ_SWITCH, - ACTORTYPE_SWITCH, + ACTORCAT_SWITCH, FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjSwitch), diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index 509631ba9..b2a713f55 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -11,7 +11,7 @@ void ObjSwprize_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Swprize_InitVars = { ACTOR_OBJ_SWPRIZE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjSwprize), diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 8bb6fd499..01a48522a 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -12,7 +12,7 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Syokudai_InitVars = { ACTOR_OBJ_SYOKUDAI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_SYOKUDAI, sizeof(ObjSyokudai), diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index 934f27389..85c8c6808 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -12,7 +12,7 @@ void ObjTakarayaWall_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Takaraya_Wall_InitVars = { ACTOR_OBJ_TAKARAYA_WALL, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_TAKARAYA_OBJECTS, sizeof(ObjTakarayaWall), diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index 909dc5cb5..b2adffdf1 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -12,7 +12,7 @@ void ObjTaru_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Taru_InitVars = { ACTOR_OBJ_TARU, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_TARU, sizeof(ObjTaru), diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index d3b78a4a4..71db19cdb 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -12,7 +12,7 @@ void ObjToge_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Toge_InitVars = { ACTOR_OBJ_TOGE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_TRAP, sizeof(ObjToge), diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 97abb4019..907a80fb9 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -12,7 +12,7 @@ void ObjTokeiStep_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Tokei_Step_InitVars = { ACTOR_OBJ_TOKEI_STEP, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_TOKEI_STEP, sizeof(ObjTokeiStep), diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 52d877222..0dfc912a0 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -12,7 +12,7 @@ void ObjTokeiTobira_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Tokei_Tobira_InitVars = { ACTOR_OBJ_TOKEI_TOBIRA, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_TOKEI_TOBIRA, sizeof(ObjTokeiTobira), diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index b13514c19..8db2be157 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -12,7 +12,7 @@ void ObjTokeiTurret_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Tokei_Turret_InitVars = { ACTOR_OBJ_TOKEI_TURRET, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_TOKEI_TURRET, sizeof(ObjTokeiTurret), diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index cb78b76e6..54611e365 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -12,7 +12,7 @@ void ObjTokeidai_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Tokeidai_InitVars = { ACTOR_OBJ_TOKEIDAI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_OBJECT_UNSET_TOKEIDAI, sizeof(ObjTokeidai), diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index 66ffbcc2e..15e0e94b6 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -12,7 +12,7 @@ void ObjToudai_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Toudai_InitVars = { ACTOR_OBJ_TOUDAI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_F53_OBJ, sizeof(ObjToudai), diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index 74608a442..18dbfe841 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -12,7 +12,7 @@ void ObjTree_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Tree_InitVars = { ACTOR_OBJ_TREE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_TREE, sizeof(ObjTree), diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 5148a8dc1..5f26359d7 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -11,7 +11,7 @@ void ObjTsubo_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Tsubo_InitVars = { ACTOR_OBJ_TSUBO, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ObjTsubo), diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index 4aa12afd5..0ea3de99a 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -12,7 +12,7 @@ void ObjUm_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Um_InitVars = { ACTOR_OBJ_UM, - ACTORTYPE_NPC, + ACTORCAT_NPC, FLAGS, OBJECT_UM, sizeof(ObjUm), diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index fda41af3b..d93e5dd0f 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -12,7 +12,7 @@ void ObjUsiyane_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Usiyane_InitVars = { ACTOR_OBJ_USIYANE, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_OBJECT_UNSET_USIYANE, sizeof(ObjUsiyane), diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index 63a9b535e..9092f498a 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -11,7 +11,7 @@ void ObjVisiblock_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Visiblock_InitVars = { ACTOR_OBJ_VISIBLOCK, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_VISIBLOCK, sizeof(ObjVisiblock), diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index 379faeafe..69a8bad62 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -12,7 +12,7 @@ void ObjVspinyroll_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Vspinyroll_InitVars = { ACTOR_OBJ_VSPINYROLL, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_SPINYROLL, sizeof(ObjVspinyroll), diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index d1c69691c..08115f07b 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -12,7 +12,7 @@ void ObjWarpstone_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Warpstone_InitVars = { ACTOR_OBJ_WARPSTONE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, OBJECT_SEK, sizeof(ObjWarpstone), diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index f21a49315..ab5a65500 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -12,7 +12,7 @@ void ObjWind_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Wind_InitVars = { ACTOR_OBJ_WIND, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjWind), diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index dc876c529..8068c8a53 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -10,7 +10,7 @@ void ObjWturn_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Wturn_InitVars = { ACTOR_OBJ_WTURN, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjWturn), diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index 0c645a1b6..ca704d057 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -12,7 +12,7 @@ void ObjY2lift_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Y2lift_InitVars = { ACTOR_OBJ_Y2LIFT, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjY2lift), diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index 0e3e33c2c..a6d4ea8e8 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -12,7 +12,7 @@ void ObjY2shutter_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Y2shutter_InitVars = { ACTOR_OBJ_Y2SHUTTER, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjY2shutter), diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c index e26c343cd..b23a11909 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -12,7 +12,7 @@ void ObjYado_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Yado_InitVars = { ACTOR_OBJ_YADO, - ACTORTYPE_BG, + ACTORCAT_BG, FLAGS, OBJECT_YADO_OBJ, sizeof(ObjYado), diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index 837e74b90..19237e557 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -12,7 +12,7 @@ void ObjYasi_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Obj_Yasi_InitVars = { ACTOR_OBJ_YASI, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, OBJECT_OBJECT_UNSET_YASI, sizeof(ObjYasi), diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 050ac58b4..bf4590429 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -12,7 +12,7 @@ void ObjectKankyo_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Object_Kankyo_InitVars = { ACTOR_OBJECT_KANKYO, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(ObjectKankyo), diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index b5017742c..299bce5b0 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -12,7 +12,7 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Spot_InitVars = { ACTOR_OCEFF_SPOT, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffSpot), diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 450f7a988..6ca51f09e 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -12,7 +12,7 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Storm_InitVars = { ACTOR_OCEFF_STORM, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffStorm), diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index a30176a36..45ae69ce1 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -12,7 +12,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Wipe_InitVars = { ACTOR_OCEFF_WIPE, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe), diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 11ebc5102..5b1922e30 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -12,7 +12,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Wipe2_InitVars = { ACTOR_OCEFF_WIPE2, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe2), diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 034ecf1a5..b3e2a7c0d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -12,7 +12,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Wipe3_InitVars = { ACTOR_OCEFF_WIPE3, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe3), diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index f85ee9bd2..8674738ac 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -12,7 +12,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Wipe4_InitVars = { ACTOR_OCEFF_WIPE4, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe4), diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c index 31b206f92..9b1760790 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -12,7 +12,7 @@ void OceffWipe5_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Wipe5_InitVars = { ACTOR_OCEFF_WIPE5, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe5), diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index 9c3ca4275..96f6d172c 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -12,7 +12,7 @@ void OceffWipe6_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Wipe6_InitVars = { ACTOR_OCEFF_WIPE6, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe6), diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c index 234b6e5e9..91c3bb12e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -12,7 +12,7 @@ void OceffWipe7_Draw(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Oceff_Wipe7_InitVars = { ACTOR_OCEFF_WIPE7, - ACTORTYPE_ITEMACTION, + ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe7), diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index c703e07f2..693f8fed3 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -11,7 +11,7 @@ void ShotSun_Update(Actor* thisx, GlobalContext* globalCtx); /* const ActorInit Shot_Sun_InitVars = { ACTOR_SHOT_SUN, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(ShotSun), diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c index b10fd088c..96f16dda8 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -14,7 +14,7 @@ static void TGSw_ActionExecuteOneShot(struct TGSw* this, GlobalContext* globalCt const ActorInit TG_Sw_InitVars = { ACTOR_TG_SW, - ACTORTYPE_PROP, + ACTORCAT_PROP, FLAGS, GAMEPLAY_KEEP, sizeof(TGSw), @@ -31,11 +31,11 @@ static void TGSw_ActionDecider(struct TGSw* this, GlobalContext* globalCtx) { // Maybe actorCtx Debug Flag? if (!!globalCtx->actorCtx.unk1F5) { - scaledAbsoluteRotY = ABS_ALT(this->actor.currPosRot.rot.y) * 4.0f; - scaledAbsoluteRotZ = ABS_ALT(this->actor.currPosRot.rot.z) * 4.0f; + scaledAbsoluteRotY = ABS_ALT(this->actor.world.rot.y) * 4.0f; + scaledAbsoluteRotZ = ABS_ALT(this->actor.world.rot.z) * 4.0f; - if (!(scaledAbsoluteRotZ < this->actor.xzDistanceFromLink) && - !(scaledAbsoluteRotY < this->actor.yDistanceFromLink)) { + if (!(scaledAbsoluteRotZ < this->actor.xzDistToPlayer) && + !(scaledAbsoluteRotY < this->actor.yDistToPlayer)) { unk1F4 = globalCtx->actorCtx.unk1F4; if (unk1F4 == 2 || !unk1F4) { this->actionFunc = &TGSw_ActionExecuteOneShot; @@ -50,7 +50,7 @@ static void TGSw_ActionExecuteOneShot(struct TGSw* this, GlobalContext* globalCt actorIterator = NULL; do { - actorEntry = func_ActorCategoryIterateById(globalCtx, (struct Actor*)actorIterator, ACTORTYPE_ENEMY, ACTOR_EN_SW); + actorEntry = func_ActorCategoryIterateById(globalCtx, (struct Actor*)actorIterator, ACTORCAT_ENEMY, ACTOR_EN_SW); if (actorIterator = (void*)!actorEntry) { break; } @@ -59,21 +59,21 @@ static void TGSw_ActionExecuteOneShot(struct TGSw* this, GlobalContext* globalCt // Prevents register swap if (1) {} actorEntry->parent = (struct Actor*)this; - actorEntry->speedXZ = ABS_ALT(this->actor.currPosRot.rot.x); + actorEntry->speedXZ = ABS_ALT(this->actor.world.rot.x); break; } } while (actorIterator = actorEntry->next); actorIterator = NULL; do { - actorEntry = func_ActorCategoryIterateById(globalCtx, actorIterator, ACTORTYPE_NPC, ACTOR_EN_SW); + actorEntry = func_ActorCategoryIterateById(globalCtx, actorIterator, ACTORCAT_NPC, ACTOR_EN_SW); if (actorIterator = (void*)!actorEntry) { break; } if ((((this->actor.params & 0xFC) >> 2) & 0xFF) == (((actorEntry->params & 0xFC) >> 2) & 0xFF)) { actorEntry->parent = (struct Actor*)this; - actorEntry->speedXZ = ABS_ALT(this->actor.currPosRot.rot.x); + actorEntry->speedXZ = ABS_ALT(this->actor.world.rot.x); break; } } while (actorIterator = actorEntry->next); @@ -83,7 +83,7 @@ static void TGSw_ActionExecuteOneShot(struct TGSw* this, GlobalContext* globalCt void TGSw_Init(Actor* thisx, GlobalContext* globalCtx) { TGSw* this = THIS; - this->actor.cutscene = this->actor.currPosRot.rot.z; + this->actor.cutscene = this->actor.world.rot.z; this->actionFunc = &TGSw_ActionDecider; } @@ -104,19 +104,19 @@ void TGSw_Draw(Actor* thisx, GlobalContext* globalCtx) { TGSw* this = THIS; if (!!sREG(0)) { - absoluteRotZ = ABS_ALT(this->actor.currPosRot.rot.z); + absoluteRotZ = ABS_ALT(this->actor.world.rot.z); factoredRotZ = absoluteRotZ * 0.2f; // if needs to use the factored Rot as a var, "true" doesnt work if (factoredRotZ) { ; } - absoluteRotY = ABS_ALT(this->actor.currPosRot.rot.y); + absoluteRotY = ABS_ALT(this->actor.world.rot.y); - DebugDisplay_AddObject(this->actor.currPosRot.pos.x, this->actor.currPosRot.pos.y, this->actor.currPosRot.pos.z, + DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, 0.1f, 0.1f, factoredRotZ, 0xA0, 0xA0, 0xA0, 0xFF, 6, globalCtx->state.gfxCtx); - DebugDisplay_AddObject(this->actor.currPosRot.pos.x, this->actor.currPosRot.pos.y, this->actor.currPosRot.pos.z, + DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0.1f, absoluteRotY * 0.2f, 0.1f, 0xA0, 0xA0, 0xA0, 0xFF, 6, globalCtx->state.gfxCtx); this->actor.shape.rot.y = (s16)(this->actor.shape.rot.y + 0x1000); |