diff --git a/assets/xml/scenes/dungeons/jyasinzou.xml b/assets/xml/scenes/dungeons/jyasinzou.xml index 07f7944f9b..1a44e14d72 100644 --- a/assets/xml/scenes/dungeons/jyasinzou.xml +++ b/assets/xml/scenes/dungeons/jyasinzou.xml @@ -6,6 +6,10 @@ + + + + diff --git a/assets/xml/scenes/dungeons/jyasinzou_mq.xml b/assets/xml/scenes/dungeons/jyasinzou_mq.xml index 5614bc8936..6a99888abb 100644 --- a/assets/xml/scenes/dungeons/jyasinzou_mq.xml +++ b/assets/xml/scenes/dungeons/jyasinzou_mq.xml @@ -6,6 +6,10 @@ + + + + diff --git a/assets/xml/scenes/misc/hiral_demo.xml b/assets/xml/scenes/misc/hiral_demo.xml index 32c55fac4b..47cf353d4c 100644 --- a/assets/xml/scenes/misc/hiral_demo.xml +++ b/assets/xml/scenes/misc/hiral_demo.xml @@ -4,6 +4,16 @@ + + + + + + + + + + diff --git a/assets/xml/scenes/misc/hiral_demo_pal_n64.xml b/assets/xml/scenes/misc/hiral_demo_pal_n64.xml index 88d347899a..26c0287300 100644 --- a/assets/xml/scenes/misc/hiral_demo_pal_n64.xml +++ b/assets/xml/scenes/misc/hiral_demo_pal_n64.xml @@ -4,6 +4,16 @@ + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot04.xml b/assets/xml/scenes/overworld/spot04.xml index c861d45278..5a3e3079fc 100644 --- a/assets/xml/scenes/overworld/spot04.xml +++ b/assets/xml/scenes/overworld/spot04.xml @@ -2,8 +2,20 @@ - - + + + + + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot04_pal_n64.xml b/assets/xml/scenes/overworld/spot04_pal_n64.xml index c8e8776a7a..c9054cca4e 100644 --- a/assets/xml/scenes/overworld/spot04_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot04_pal_n64.xml @@ -2,8 +2,20 @@ - - + + + + + + + + + + + + + + diff --git a/assets/xml/scenes/overworld/spot09.xml b/assets/xml/scenes/overworld/spot09.xml index 7b7ec2ce5e..641ab8b7aa 100644 --- a/assets/xml/scenes/overworld/spot09.xml +++ b/assets/xml/scenes/overworld/spot09.xml @@ -3,6 +3,10 @@ + + + + diff --git a/assets/xml/scenes/overworld/spot09_pal_n64.xml b/assets/xml/scenes/overworld/spot09_pal_n64.xml index a75774bf68..7bb06c8a8f 100644 --- a/assets/xml/scenes/overworld/spot09_pal_n64.xml +++ b/assets/xml/scenes/overworld/spot09_pal_n64.xml @@ -3,6 +3,10 @@ + + + + diff --git a/include/z64actor.h b/include/z64actor.h index 344f5e15ce..c134d4d65f 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -130,14 +130,25 @@ typedef struct ActorShape { // What actually matters is the presence or lack of `ACTOR_FLAG_HOSTILE`. #define ACTOR_FLAG_FRIENDLY (1 << 3) -// -#define ACTOR_FLAG_4 (1 << 4) +// Culling of the actor's update process is disabled. +// In other words, the actor will keep updating even if the actor is outside its own culling volume. +// See `Actor_CullingCheck` for more information about culling. +// See `Actor_CullingVolumeTest` for more information on the test used to determine if an actor should be culled. +#define ACTOR_FLAG_UPDATE_CULLING_DISABLED (1 << 4) -// -#define ACTOR_FLAG_5 (1 << 5) +// Culling of the actor's draw process is disabled. +// In other words, the actor will keep drawing even if the actor is outside its own culling volume. +// See `Actor_CullingCheck` for more information about culling. +// See `Actor_CullingVolumeTest` for more information on the test used to determine if an actor should be culled. +// (The original name for this flag is `NO_CULL_DRAW`, known from the Majora's Mask Debug ROM) +#define ACTOR_FLAG_DRAW_CULLING_DISABLED (1 << 5) -// -#define ACTOR_FLAG_6 (1 << 6) +// Set if the actor is currently within the bounds of its culling volume. +// In most cases, this flag can be used to determine whether or not an actor is currently culled. +// However this flag still updates even if `ACTOR_FLAG_UPDATE_CULLING_DISABLED` or `ACTOR_FLAG_DRAW_CULLING_DISABLED` +// are set. Meaning, the flag can still have a value of "false" even if it is not actually culled. +// (The original name for this flag is `NO_CULL_FLAG`, known from the Majora's Mask Debug ROM) +#define ACTOR_FLAG_INSIDE_CULLING_VOLUME (1 << 6) // hidden or revealed by Lens of Truth (depending on room lensMode) #define ACTOR_FLAG_REACT_TO_LENS (1 << 7) @@ -277,9 +288,9 @@ typedef struct Actor { /* 0x0B4 */ ActorShape shape; // Variables related to the physical shape of the actor /* 0x0E4 */ Vec3f projectedPos; // Position of the actor in projected space /* 0x0F0 */ f32 projectedW; // w component of the projected actor position - /* 0x0F4 */ f32 uncullZoneForward; // Amount to increase the uncull zone forward by (in projected space) - /* 0x0F8 */ f32 uncullZoneScale; // Amount to increase the uncull zone scale by (in projected space) - /* 0x0FC */ f32 uncullZoneDownward; // Amount to increase uncull zone downward by (in projected space) + /* 0x0F4 */ f32 cullingVolumeDistance; // Forward distance of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. + /* 0x0F8 */ f32 cullingVolumeScale; // Scale of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. + /* 0x0FC */ f32 cullingVolumeDownward; // Downward height of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. /* 0x100 */ Vec3f prevPos; // World position from the previous update cycle /* 0x10C */ u8 isLockedOn; // Set to true if the actor is currently locked-on by Player /* 0x10D */ u8 attentionPriority; // Lower values have higher priority. Resets to 0 when lock-on is released. @@ -886,7 +897,7 @@ s32 func_8002F9EC(struct PlayState* play, Actor* actor, struct CollisionPoly* po void Actor_DisableLens(struct PlayState* play); void Actor_InitContext(struct PlayState* play, ActorContext* actorCtx, struct ActorEntry* playerEntry); void Actor_UpdateAll(struct PlayState* play, ActorContext* actorCtx); -s32 func_800314D4(struct PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3); +s32 Actor_CullingVolumeTest(struct PlayState* play, Actor* actor, Vec3f* projPos, f32 projW); void func_800315AC(struct PlayState* play, ActorContext* actorCtx); void Actor_KillAllWithMissingObject(struct PlayState* play, ActorContext* actorCtx); void func_80031B14(struct PlayState* play, ActorContext* actorCtx); diff --git a/include/z64cutscene.h b/include/z64cutscene.h index 76827116aa..7fcddc8d78 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -175,7 +175,7 @@ typedef enum CutsceneMiscType { /* 0x12 */ CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY, /* 0x13 */ CS_MISC_SET_FLAG_FAST_WINDMILL, /* 0x14 */ CS_MISC_SET_FLAG_DRAINED_WELL, - /* 0x15 */ CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED, + /* 0x15 */ CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA, /* 0x16 */ CS_MISC_VISMONO_BLACK_AND_WHITE, /* 0x17 */ CS_MISC_VISMONO_SEPIA, /* 0x18 */ CS_MISC_HIDE_ROOM, diff --git a/include/z64save.h b/include/z64save.h index d8c2facbea..30c51eeb02 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -537,7 +537,7 @@ typedef enum LinkAge { #define EVENTCHKINF_65 0x65 #define EVENTCHKINF_DRAINED_WELL 0x67 #define EVENTCHKINF_68 0x68 -#define EVENTCHKINF_69 0x69 +#define EVENTCHKINF_RESTORED_LAKE_HYLIA 0x69 #define EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO 0x6A // 0x6B @@ -559,10 +559,10 @@ typedef enum LinkAge { #define EVENTCHKINF_78 0x78 #define EVENTCHKINF_80 0x80 #define EVENTCHKINF_82 0x82 -#define EVENTCHKINF_8C 0x8C -#define EVENTCHKINF_8D 0x8D -#define EVENTCHKINF_8E 0x8E -#define EVENTCHKINF_8F 0x8F +#define EVENTCHKINF_PAID_BACK_KEATON_MASK 0x8C +#define EVENTCHKINF_PAID_BACK_SKULL_MASK 0x8D +#define EVENTCHKINF_PAID_BACK_SPOOKY_MASK 0x8E +#define EVENTCHKINF_PAID_BACK_BUNNY_HOOD 0x8F // 0x90-0x93 // carpenters freed from the gerudo @@ -699,8 +699,11 @@ typedef enum LinkAge { #define ITEMGETINF_1B 0x1B #define ITEMGETINF_1C 0x1C #define ITEMGETINF_1D 0x1D -#define ITEMGETINF_1E 0x1E -#define ITEMGETINF_1F 0x1F +#define ITEMGETINF_FOREST_STAGE_STICK_UPGRADE 0x1E +// This flag is shared by two events; It is set when obtaining the Deku Nut upgrade at the Forest Stage and when obtaining Poachers Saw. +// This will make obtaining the Deku Nut upgrade impossible if Poachers Saw is obtained first. +// This flag is never read for the Poachers Saw event, so the overlap only causes an issue for the Deku Nut Upgrade. It will not prevent obtaining Poachers Saw. +#define ITEMGETINF_FOREST_STAGE_NUT_UPGRADE 0x1F #define ITEMGETINF_23 0x23 #define ITEMGETINF_24 0x24 #define ITEMGETINF_25 0x25 diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c9f89ffc7f..fa11f4d079 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -896,9 +896,9 @@ void Actor_Init(Actor* actor, PlayState* play) { actor->minVelocityY = -20.0f; actor->xyzDistToPlayerSq = MAXFLOAT; actor->naviEnemyId = NAVI_ENEMY_NONE; - actor->uncullZoneForward = 1000.0f; - actor->uncullZoneScale = 350.0f; - actor->uncullZoneDownward = 700.0f; + actor->cullingVolumeDistance = 1000.0f; + actor->cullingVolumeScale = 350.0f; + actor->cullingVolumeDownward = 700.0f; CollisionCheck_InitInfo(&actor->colChkInfo); actor->floorBgId = BGCHECK_SCENE; ActorShape_Init(&actor->shape, 0.0f, NULL, 0.0f); @@ -2438,7 +2438,8 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) { actor->yawTowardsPlayer = Actor_WorldYawTowardActor(actor, &player->actor); actor->flags &= ~ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT; - if ((DECR(actor->freezeTimer) == 0) && (actor->flags & (ACTOR_FLAG_4 | ACTOR_FLAG_6))) { + if ((DECR(actor->freezeTimer) == 0) && + (actor->flags & (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME))) { if (actor == player->focusActor) { actor->isLockedOn = true; } else { @@ -2708,19 +2709,92 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis CLOSE_DISPS(gfxCtx, "../z_actor.c", 6284); } -s32 func_800314B0(PlayState* play, Actor* actor) { - return func_800314D4(play, actor, &actor->projectedPos, actor->projectedW); +/** + * Checks if an actor should be culled or not, by seeing if it is contained within its own culling volume. + * For more details on the culling test, see `Actor_CullingVolumeTest`. + * + * Returns true if the actor is inside its culling volume. In other words, it should not cull. + * + * "Culling" in this context refers to the removal of something for the sake of improving performance. + * For actors, being culled means that their Update and Draw processes are halted. + * While halted, an Actor's update state is frozen and it will not draw, making it invisible. + * + * Actors that are within the bounds of their culling volume may update and draw, while actors that are + * out of bounds of its culling volume may be excluded from updating and drawing until they are within bounds. + * + * It is possible for actors to opt out of update culling or draw culling. + * This is set per-actor with `ACTOR_FLAG_UPDATE_CULLING_DISABLED` and `ACTOR_FLAG_DRAW_CULLING_DISABLED`. + * + * Note: Even if either `ACTOR_FLAG_UPDATE_CULLING_DISABLED` or `ACTOR_FLAG_DRAW_CULLING_DISABLED` are set, the actor + * will still undergo the culling test and set `ACTOR_FLAG_INSIDE_CULLING_VOLUME` accordingly. + * So, `ACTOR_FLAG_INSIDE_CULLING_VOLUME` cannot be used on it own to determine if an actor is actually culled. + * It simply says whether or not they are physically located within the bounds of the culling volume. + */ +s32 Actor_CullingCheck(PlayState* play, Actor* actor) { + return Actor_CullingVolumeTest(play, actor, &actor->projectedPos, actor->projectedW); } -s32 func_800314D4(PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3) { - f32 var; +/** + * Tests if an actor is currently within the bounds of its own culling volume. + * + * The culling volume is a 3D shape composed of a frustum with a box attached to the end of it. The frustum sits at the + * camera's position and projects forward, encompassing the player's current view; the box extrudes behind the camera, + * allowing actors in the immediate vicinity behind and to the sides of the camera to be detected. + * + * This function returns true if the actor is within bounds, false if not. + * The comparison is done in projected space against the actor's projected position as the viewing frustum + * in world space transforms to a box in projected space, making the calculation easy. + * + * Every actor can set properties for their own culling volume, changing its dimensions to suit the needs of + * it and its environment. These properties are in units of projected space (i.e. compared to the actor's position + * after perspective projection is applied) are therefore not directly comparable to world units. + * These depend on the current view parameters (fov, aspect, scale, znear, zfar). + * The default parameters considered are (60 degrees, 4/3, 1.0, 10, 12800). + * + * cullingVolumeDistance: Configures how far forward the far plane of the frustum should extend. + * This along with cullingVolumeScale determines the maximum distance from + * the camera eye that the actor can be detected at. This quantity is related + * to world units by a factor of + * (znear - zfar) / ((znear + zfar) * scale). + * For default view parameters, increasing this property by 1 increases the + * distance by ~0.995 world units. + * + * cullingVolumeScale: Scales the entire culling volume in all directions except the downward + * direction. Both the frustum and the box will scale in size. This quantity is + * related to world units by different factors based on direction: + * - For the forward and backward directions, they are related in the same way + * as above. For default view parameters, increasing this property by 1 increases + * the forward and backward scales by ~0.995 world units. + * - For the sideways directions, the relation to world units is + * (aspect / scale) * tan(0.5 * fov) + * For default view parameters, increasing this property by 1 increases the + * sideways scales by ~0.77 world units. + * - For the upward direction, the relation to world units is + * (1 / scale) * tan(0.5 * fov) + * For default view parameters, increasing this property by 1 increases the + * scale by ~0.58 world units. + * + * cullingVolumeDownward: Sets the height of the culling volume in the downward direction. Increasing + * this value will make actors below the camera more easily detected. This + * quantity is related to world units by the same factor as the upward scale. + * For default view parameters, increasing this property by 1 increases the + * downward height by ~0.58 world units. + * + * This interactive 3D graph visualizes the shape of the culling volume and has sliders for the 3 properties mentioned + * above: https://www.desmos.com/3d/4ztkxqky2a. + */ +s32 Actor_CullingVolumeTest(PlayState* play, Actor* actor, Vec3f* projPos, f32 projW) { + f32 invW; - if ((arg2->z > -actor->uncullZoneScale) && (arg2->z < (actor->uncullZoneForward + actor->uncullZoneScale))) { - var = (arg3 < 1.0f) ? 1.0f : 1.0f / arg3; + if ((projPos->z > -actor->cullingVolumeScale) && + (projPos->z < (actor->cullingVolumeDistance + actor->cullingVolumeScale))) { + // Clamping `projW` affects points behind the camera, so that the culling volume has + // a frustum shape in front of the camera and a box shape behind the camera. + invW = (projW < 1.0f) ? 1.0f : 1.0f / projW; - if ((((fabsf(arg2->x) - actor->uncullZoneScale) * var) < 1.0f) && - (((arg2->y + actor->uncullZoneDownward) * var) > -1.0f) && - (((arg2->y - actor->uncullZoneScale) * var) < 1.0f)) { + if ((((fabsf(projPos->x) - actor->cullingVolumeScale) * invW) < 1.0f) && + (((projPos->y + actor->cullingVolumeDownward) * invW) > -1.0f) && + (((projPos->y - actor->cullingVolumeScale) * invW) < 1.0f)) { return true; } } @@ -2767,17 +2841,18 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { } if (!DEBUG_FEATURES || (HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(70) == 0)) { - if (func_800314B0(play, actor)) { - actor->flags |= ACTOR_FLAG_6; + if (Actor_CullingCheck(play, actor)) { + actor->flags |= ACTOR_FLAG_INSIDE_CULLING_VOLUME; } else { - actor->flags &= ~ACTOR_FLAG_6; + actor->flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; } } actor->isDrawn = false; if (!DEBUG_FEATURES || (HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(71) == 0)) { - if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & (ACTOR_FLAG_5 | ACTOR_FLAG_6))) { + if ((actor->init == NULL) && (actor->draw != NULL) && + (actor->flags & (ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_INSIDE_CULLING_VOLUME))) { if ((actor->flags & ACTOR_FLAG_REACT_TO_LENS) && ((play->roomCtx.curRoom.lensMode == LENS_MODE_SHOW_ACTORS) || play->actorCtx.lensActive || (actor->room != play->roomCtx.curRoom.num))) { diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 60368ddc37..58a2b690a4 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -111,7 +111,7 @@ EntranceCutscene sEntranceCutsceneTable[] = { { ENTR_SPIRIT_TEMPLE_BOSS_0, 0, EVENTCHKINF_C0, gSpiritBossNabooruKnuckleIntroCs }, { ENTR_GERUDOS_FORTRESS_17, 0, EVENTCHKINF_C7, gGerudoFortressFirstCaptureCs }, { ENTR_DEATH_MOUNTAIN_CRATER_1, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs }, - { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutCs }, + { ENTR_KOKIRI_FOREST_12, 2, EVENTCHKINF_C6, gKokiriForestDekuSproutPart3Cs }, }; void* sCutscenesUnknownList[] = { @@ -404,8 +404,8 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) { SET_EVENTCHKINF(EVENTCHKINF_DRAINED_WELL); break; - case CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED: - SET_EVENTCHKINF(EVENTCHKINF_69); + case CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA: + SET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA); break; case CS_MISC_VISMONO_BLACK_AND_WHITE: diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index c90a7eb3bb..23d77075dd 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -2,7 +2,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_d_hsblock/object_d_hsblock.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAObj_Init(Actor* thisx, PlayState* play); void EnAObj_Destroy(Actor* thisx, PlayState* play); @@ -114,8 +114,8 @@ void EnAObj_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = BGACTOR_NEG_ONE; this->dyna.interactFlags = 0; this->dyna.transformFlags = 0; - thisx->uncullZoneDownward = 1200.0f; - thisx->uncullZoneScale = 200.0f; + thisx->cullingVolumeDownward = 1200.0f; + thisx->cullingVolumeScale = 200.0f; switch (thisx->params) { case A_OBJ_BLOCK_LARGE: @@ -288,8 +288,8 @@ void EnAObj_BoulderFragment(EnAObj* this, PlayState* play) { } void EnAObj_SetupBlock(EnAObj* this, s16 type) { - this->dyna.actor.uncullZoneDownward = 1200.0f; - this->dyna.actor.uncullZoneScale = 720.0f; + this->dyna.actor.cullingVolumeDownward = 1200.0f; + this->dyna.actor.cullingVolumeScale = 720.0f; EnAObj_SetupAction(this, EnAObj_Block); } diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 5bafa3b987..cf822f7dc2 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -980,7 +980,7 @@ EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params) { (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { spawnedActor->actor.room = -1; } - spawnedActor->actor.flags |= ACTOR_FLAG_4; + spawnedActor->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } } @@ -1012,7 +1012,7 @@ EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params) { spawnedActor->actor.speed = 0.0f; spawnedActor->actor.gravity = param4000 ? 0.0f : -0.9f; spawnedActor->actor.world.rot.y = Rand_CenteredFloat(65536.0f); - spawnedActor->actor.flags |= ACTOR_FLAG_4; + spawnedActor->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } } @@ -1126,7 +1126,7 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP spawnedActor->actor.world.rot.y = Rand_ZeroOne() * 40000.0f; Actor_SetScale(&spawnedActor->actor, 0.0f); EnItem00_SetupAction(spawnedActor, func_8001E304); - spawnedActor->actor.flags |= ACTOR_FLAG_4; + spawnedActor->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if ((spawnedActor->actor.params != ITEM00_SMALL_KEY) && (spawnedActor->actor.params != ITEM00_HEART_PIECE) && (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index e6e451ee33..7666b1ff07 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1828,7 +1828,8 @@ u8 Item_Give(PlayState* play, u8 item) { } } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { if (item == ITEM_POACHERS_SAW) { - SET_ITEMGETINF(ITEMGETINF_1F); + //! @bug Setting this shared flag makes getting the Deku Nut upgrade impossible + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE); } temp = INV_CONTENT(item); diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index d6a473120e..b922f56638 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -1,8 +1,8 @@ #include "global.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES) #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.2:128 pal-1.1:128" diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index a64932f423..a6a08ccd16 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1226,7 +1226,7 @@ void Scene_DrawConfigLakeHylia(PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7058); - if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69))) { + if (IS_CUTSCENE_LAYER || (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA))) { play->roomCtx.drawParams[0] = 87; } 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 4b475c9c66..c79f9b0aa1 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -1,7 +1,7 @@ #include "z_arms_hook.h" #include "assets/objects/object_link_boy/object_link_boy.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ArmsHook_Init(Actor* thisx, PlayState* play); void ArmsHook_Destroy(Actor* thisx, PlayState* play); 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 c590f341e5..9fec296d7a 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -7,7 +7,7 @@ #include "z_arrow_fire.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowFire_Init(Actor* thisx, PlayState* play); void ArrowFire_Destroy(Actor* thisx, PlayState* play); @@ -33,7 +33,7 @@ ActorProfile Arrow_Fire_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void ArrowFire_SetupAction(ArrowFire* this, ArrowFireActionFunc actionFunc) { 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 09815d086c..326486aee0 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowIce_Init(Actor* thisx, PlayState* play); void ArrowIce_Destroy(Actor* thisx, PlayState* play); @@ -34,7 +34,7 @@ ActorProfile Arrow_Ice_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void ArrowIce_SetupAction(ArrowIce* this, ArrowIceActionFunc actionFunc) { 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 f88e2c092e..6922b5ba68 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowLight_Init(Actor* thisx, PlayState* play); void ArrowLight_Destroy(Actor* thisx, PlayState* play); @@ -34,7 +34,7 @@ ActorProfile Arrow_Light_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void ArrowLight_SetupAction(ArrowLight* this, ArrowLightActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 055f93e200..bcc7651687 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -8,7 +8,7 @@ #include "quake.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum BgBdanObjectsPropertyGetter { JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0 = 0, @@ -126,7 +126,7 @@ void BgBdanObjects_Init(Actor* thisx, PlayState* play) { this->var.switchFlag = PARAMS_GET_U(thisx->params, 8, 6); thisx->params &= 0xFF; if (thisx->params == JABU_OBJECTS_TYPE_WATERBOX_HEIGHT_CHANGER) { - thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; play->colCtx.colHeader->waterBoxes[7].ySurface = thisx->world.pos.y; this->actionFunc = BgBdanObjects_WaitForSwitch; return; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index d22c6124eb..f09d24d536 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -7,7 +7,7 @@ #include "z_bg_bdan_switch.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgBdanSwitch_Init(Actor* thisx, PlayState* play); void BgBdanSwitch_Destroy(Actor* thisx, PlayState* play); @@ -82,9 +82,9 @@ static ColliderJntSphInit sJntSphInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; static Vec3f D_8086E0E0 = { 0.0f, 140.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 729dd81552..cfbd466021 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -9,7 +9,7 @@ #include "assets/objects/object_bowl/object_bowl.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgBomGuard_Init(Actor* thisx, PlayState* play); void BgBomGuard_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 82daa4e13e..756677b225 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -104,9 +104,9 @@ void BgBombwall_RotateVec(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgBombwall_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index fa3de785f4..a43804fa93 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -11,7 +11,7 @@ #include "quake.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgBowlWall_Init(Actor* thisx, PlayState* play); void BgBowlWall_Destroy(Actor* thisx, PlayState* play); 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 4999abd966..39f9dce855 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -9,7 +9,7 @@ #include "assets/objects/object_bwall/object_bwall.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef struct BombableWallInfo { /* 0x00 */ CollisionHeader* colHeader; @@ -67,9 +67,9 @@ static BombableWallInfo sBombableWallInfo[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc) { @@ -207,7 +207,7 @@ void BgBreakwall_WaitForObject(BgBreakwall* this, PlayState* play) { this->dyna.actor.objectSlot = this->requiredObjectSlot; Actor_SetObjectDependency(play, &this->dyna.actor); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = BgBreakwall_Draw; CollisionHeader_GetVirtual(sBombableWallInfo[wallType].colHeader, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index dc5a1cba23..c1168182d8 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -7,7 +7,7 @@ #include "z_bg_ddan_jd.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgDdanJd_Init(Actor* thisx, PlayState* play); void BgDdanJd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 3fe150cc6f..e542f69705 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -7,7 +7,7 @@ #include "z_bg_ddan_kd.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgDdanKd_Init(Actor* thisx, PlayState* play); void BgDdanKd_Destroy(Actor* thisx, PlayState* play); @@ -52,9 +52,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 32767, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 32767, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 32767, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 32767, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 32767, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 32767, ICHAIN_STOP), }; void BgDdanKd_SetupAction(BgDdanKd* this, BgDdanKdActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index b8e3cfa33b..747a03d93f 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -102,9 +102,9 @@ void BgDodoago_SpawnSparkles(Vec3f* meanPos, PlayState* play) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void BgDodoago_Init(Actor* thisx, PlayState* play) { 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 567b141e72..9ec48c5084 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 @@ -13,9 +13,9 @@ #include "assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h" #if OOT_VERSION < NTSC_1_1 -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) #else -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) #endif typedef enum BgDyYoseizoRewardType { diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index edfb09d522..51450109de 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum FlashState { /* 0x00 */ FLASH_NONE, diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 2ec1f01506..d6272b9aea 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -32,7 +32,7 @@ ActorProfile Bg_Gjyo_Bridge_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 801475e3f3..b35f1ef36f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_darkmeiro.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgGndDarkmeiro_Init(Actor* thisx, PlayState* play2); void BgGndDarkmeiro_Destroy(Actor* thisx, PlayState* play2); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 9f97b57541..ad336d6fcf 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_firemeiro.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgGndFiremeiro_Init(Actor* thisx, PlayState* play); void BgGndFiremeiro_Destroy(Actor* thisx, PlayState* play2); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 75e44cb218..c98f0b9755 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_iceblock.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BgGndIceblockAction { /* 0 */ GNDICE_IDLE, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 3c100311d0..7a19324501 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -7,7 +7,7 @@ #include "z_bg_gnd_nisekabe.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgGndNisekabe_Init(Actor* thisx, PlayState* play); void BgGndNisekabe_Destroy(Actor* thisx, PlayState* play); @@ -30,7 +30,7 @@ void BgGndNisekabe_Init(Actor* thisx, PlayState* play) { BgGndNisekabe* this = (BgGndNisekabe*)thisx; Actor_SetScale(&this->actor, 0.1); - this->actor.uncullZoneForward = 3000.0; + this->actor.cullingVolumeDistance = 3000.0; } void BgGndNisekabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 17a3ea4508..3ed190587d 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -53,9 +53,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgGndSoulmeiro_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 3b5985d8f1..f7f31748a6 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -97,7 +97,7 @@ void BgHakaGate_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHakaGate_FalseSkull; } this->vScrollTimer = Rand_ZeroOne() * 20.0f; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (Flags_GetSwitch(play, this->switchFlag)) { this->vFlameScale = 350; } @@ -124,7 +124,7 @@ void BgHakaGate_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHakaGate_DoNothing; thisx->world.pos.y += 80.0f; } else { - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_SetFocus(thisx, 30.0f); this->actionFunc = BgHakaGate_GateWait; } @@ -274,7 +274,7 @@ void BgHakaGate_GateWait(BgHakaGate* this, PlayState* play) { void BgHakaGate_GateOpen(BgHakaGate* this, PlayState* play) { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 80.0f, 1.0f)) { Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgHakaGate_DoNothing; } else { Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index e660ccd38a..757e9ecb11 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Rd/z_en_rd.h" #include "quake.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHakaHuta_Init(Actor* thisx, PlayState* play); void BgHakaHuta_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 3d6de9f415..dad34f592d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -8,7 +8,7 @@ #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_REACT_TO_LENS) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_REACT_TO_LENS) void BgHakaMegane_Init(Actor* thisx, PlayState* play); void BgHakaMegane_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 3bcaac0071..f0f23b3131 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -36,8 +36,8 @@ ActorProfile Bg_Haka_MeganeBG_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -64,7 +64,7 @@ void BgHakaMeganeBG_Init(Actor* thisx, PlayState* play) { if (thisx->params == 2) { DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS | DYNA_TRANSFORM_ROT_Y); - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CollisionHeader_GetVirtual(&object_haka_objects_Col_005334, &colHeader); this->actionFunc = func_8087E258; } else { @@ -83,15 +83,15 @@ void BgHakaMeganeBG_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_8087E34C; thisx->world.pos.y = thisx->home.pos.y; } else { - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_8087E288; } } else { CollisionHeader_GetVirtual(&object_haka_objects_Col_00A7F4, &colHeader); this->unk_16A = 80; this->actionFunc = func_8087E10C; - thisx->uncullZoneScale = 3000.0f; - thisx->uncullZoneDownward = 3000.0f; + thisx->cullingVolumeScale = 3000.0f; + thisx->cullingVolumeDownward = 3000.0f; } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index 4bb944cb9d..fff0314d44 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -8,7 +8,7 @@ #include "assets/objects/object_haka_objects/object_haka_objects.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum SpinningScytheTrapMode { /* 0 */ SCYTHE_TRAP_SHADOW_TEMPLE, @@ -121,7 +121,7 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 80, 130, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_4, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -200,7 +200,7 @@ void BgHakaSgami_SetupSpin(BgHakaSgami* this, PlayState* play) { this->actor.objectSlot = this->requiredObjectSlot; this->actor.draw = BgHakaSgami_Draw; this->timer = SCYTHE_SPIN_TIME; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgHakaSgami_Spin; } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 2a8eadb18e..5a9a06d5c8 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -7,7 +7,7 @@ #include "z_bg_haka_ship.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgHakaShip_Init(Actor* thisx, PlayState* play); void BgHakaShip_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 2210299c76..761be4b154 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -131,7 +131,7 @@ void BgHakaTrap_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_80880484; } else { DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (thisx->params == HAKA_TRAP_SPIKED_BOX) { CollisionHeader_GetVirtual(&object_haka_objects_Col_009CD0, &colHeader); @@ -177,7 +177,7 @@ void BgHakaTrap_Init(Actor* thisx, PlayState* play) { } else { this->timer = 40; this->actionFunc = func_808809B0; - thisx->uncullZoneScale = 500.0f; + thisx->cullingVolumeScale = 500.0f; } CollisionCheck_SetInfo(&thisx->colChkInfo, NULL, &sColChkInfoInit); diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index de6dd98196..54d6501821 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHakaTubo_Init(Actor* thisx, PlayState* play); void BgHakaTubo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index be7a79332d..49f42262b7 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -7,7 +7,7 @@ #include "z_bg_haka_water.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgHakaWater_Init(Actor* thisx, PlayState* play); void BgHakaWater_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 9b7ed31904..f328a2d6df 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -8,7 +8,7 @@ #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum ShadowTempleAssetsType { /* 0x0 */ STA_GIANT_BIRD_STATUE, @@ -96,9 +96,9 @@ void BgHakaZou_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, 0); if (thisx->params == STA_GIANT_BIRD_STATUE) { - thisx->uncullZoneForward = 2000.0f; - thisx->uncullZoneScale = 3000.0f; - thisx->uncullZoneDownward = 3000.0f; + thisx->cullingVolumeDistance = 2000.0f; + thisx->cullingVolumeScale = 3000.0f; + thisx->cullingVolumeDownward = 3000.0f; } } @@ -176,7 +176,7 @@ void BgHakaZou_Wait(BgHakaZou* this, PlayState* play) { this->collider.dim.yShift = -30; this->collider.dim.pos.x -= 56; this->collider.dim.pos.z += 56; - this->dyna.actor.uncullZoneScale = 1500.0f; + this->dyna.actor.cullingVolumeScale = 1500.0f; } else if (this->dyna.actor.params == STA_BOMBABLE_SKULL_WALL) { CollisionHeader_GetVirtual(&object_haka_objects_Col_005E30, &colHeader); this->collider.dim.yShift = -50; diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index ab1b72b4d1..34587ad303 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -42,9 +42,9 @@ ActorProfile Bg_Heavy_Block_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; void BgHeavyBlock_SetPieceRandRot(BgHeavyBlock* this, f32 scale) { @@ -77,7 +77,8 @@ void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) { void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, PlayState* play) { s32 pad[2]; CollisionHeader* colHeader = NULL; - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_CARRY_X_ROT_INFLUENCE; + this->dyna.actor.flags |= + ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CARRY_X_ROT_INFLUENCE; DynaPolyActor_Init(&this->dyna, 0); CollisionHeader_GetVirtual(&gHeavyBlockCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); @@ -101,7 +102,7 @@ void BgHeavyBlock_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHeavyBlock_MovePiece; BgHeavyBlock_InitPiece(this, 1.0f); this->timer = 120; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_164.y = -50.0f; break; case HEAVYBLOCK_SMALL_PIECE: @@ -109,7 +110,7 @@ void BgHeavyBlock_Init(Actor* thisx, PlayState* play) { this->actionFunc = BgHeavyBlock_MovePiece; BgHeavyBlock_InitPiece(this, 2.0f); this->timer = 120; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_164.y = -20.0f; break; case HEAVYBLOCK_BREAKABLE: @@ -471,7 +472,7 @@ void BgHeavyBlock_Land(BgHeavyBlock* this, PlayState* play) { break; } } else { - this->dyna.actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_5); + this->dyna.actor.flags &= ~(ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); this->actionFunc = BgHeavyBlock_DoNothing; } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index ffe3b6c837..368ccedffa 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_curtain.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanCurtain_Init(Actor* thisx, PlayState* play); void BgHidanCurtain_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 83e984ee7b..d7868a5cc6 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -139,7 +139,7 @@ void BgHidanDalm_Wait(BgHidanDalm* this, PlayState* play) { this->dyna.actor.world.pos.z += 32.5f * Math_CosS(this->dyna.actor.world.rot.y); Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, PLAYER_CSACTION_8); - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgHidanDalm_Shrink; this->dyna.actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND_TOUCH; this->dyna.actor.bgCheckFlags &= ~BGCHECKFLAG_WALL; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 1b4ecb10eb..43525d92f7 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_fslift.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanFslift_Init(Actor* thisx, PlayState* play); void BgHidanFslift_Destroy(Actor* thisx, PlayState* play); @@ -32,9 +32,9 @@ ActorProfile Bg_Hidan_Fslift_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 350, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 350, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void BgHidanFslift_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index b8d0e63402..fef4a8d863 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum HidanFwbigMoveState { /* 0 */ FWBIG_MOVE, @@ -64,7 +64,7 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_STOP), }; void BgHidanFwbig_Init(Actor* thisx, PlayState* play2) { @@ -94,7 +94,7 @@ void BgHidanFwbig_Init(Actor* thisx, PlayState* play2) { BgHidanFwbig_UpdatePosition(this); Actor_SetScale(&this->actor, 0.15f); this->collider.dim.height = 230; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->moveState = FWBIG_MOVE; this->actionFunc = BgHidanFwbig_WaitForPlayer; this->actor.world.pos.y = this->actor.home.pos.y - (2400.0f * this->actor.scale.y); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index 3ef030dedd..53ce9892e9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -118,7 +118,7 @@ void BgHidanHrock_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_808894A4; if (thisx->params == 0) { thisx->world.pos.y -= 2800.0f; - thisx->uncullZoneForward = 3000.0f; + thisx->cullingVolumeDistance = 3000.0f; } else if (thisx->params == 1) { thisx->world.pos.y -= 800.0f; } else if (thisx->params == 2) { @@ -126,8 +126,8 @@ void BgHidanHrock_Init(Actor* thisx, PlayState* play) { } } else { if (thisx->params == 0) { - thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; - thisx->uncullZoneForward = 3000.0f; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; + thisx->cullingVolumeDistance = 3000.0f; } this->actionFunc = func_808896B8; } @@ -185,7 +185,7 @@ void func_8088960C(BgHidanHrock* this, PlayState* play) { this->dyna.actor.velocity.y++; if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, this->dyna.actor.velocity.y)) { - this->dyna.actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_5); + this->dyna.actor.flags &= ~(ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); if (this->dyna.actor.params == 0) { @@ -204,7 +204,7 @@ void func_808896B8(BgHidanHrock* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; this->actionFunc = func_808894B0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (this->dyna.actor.params == 0) { this->dyna.actor.room = -1; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 7a65b45343..e5e49a947f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_kousi.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanKousi_Init(Actor* thisx, PlayState* play); void BgHidanKousi_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 05e513a461..aaba19888f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -106,9 +106,9 @@ void BgHidanKowarerukabe_OffsetActorYPos(BgHidanKowarerukabe* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 02d864f83f..e115fb77f9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -91,7 +91,7 @@ void BgHidanRock_Init(Actor* thisx, PlayState* play) { } else { this->actionFunc = func_8088B268; } - thisx->flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; CollisionHeader_GetVirtual(&gFireTempleStoneBlock1Col, &colHeader); } else { CollisionHeader_GetVirtual(&gFireTempleStoneBlock2Col, &colHeader); @@ -114,7 +114,7 @@ void BgHidanRock_Destroy(Actor* thisx, PlayState* play) { } void func_8088B24C(BgHidanRock* this) { - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = func_8088B990; } @@ -247,7 +247,7 @@ void func_8088B79C(BgHidanRock* this, PlayState* play) { } else { this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 15.0f; this->actionFunc = func_8088B90C; - this->dyna.actor.flags &= ~(ACTOR_FLAG_4 | ACTOR_FLAG_5); + this->dyna.actor.flags &= ~(ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); } Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index eb69f0d0b9..8c212e87b1 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -110,8 +110,8 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_STOP), }; static void* sFireballsTexs[] = { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 2980f56746..4f0bc29e67 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -115,8 +115,8 @@ static CollisionCheckInfoInit sColChkInfoInit = { 1, 40, 240, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_STOP), }; static void* sFireballsTexs[] = { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index b5d5f4f372..e1a7007068 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -7,7 +7,7 @@ #include "z_bg_hidan_syoku.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgHidanSyoku_Init(Actor* thisx, PlayState* play); void BgHidanSyoku_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index f257aa5ef4..15163c9842 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -141,7 +141,7 @@ void BgIceObjects_Idle(BgIceObjects* this, PlayState* play) { if ((this->dyna.unk_150 > 0.0f) && !Player_InCsMode(play)) { BgIceObjects_SetNextTarget(this, play); if (Actor_WorldDistXZToPoint(thisx, &this->targetPos) > 1.0f) { - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Player_SetCsActionWithHaltedActors(play, thisx, PLAYER_CSACTION_8); thisx->params = 1; this->actionFunc = BgIceObjects_Slide; @@ -169,7 +169,7 @@ void BgIceObjects_Slide(BgIceObjects* this, PlayState* play) { this->targetPos.x = thisx->world.pos.x; this->targetPos.z = thisx->world.pos.z; if (thisx->velocity.y <= 0.0f) { - thisx->flags &= ~ACTOR_FLAG_4; + thisx->flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } thisx->params = 0; Player_SetCsActionWithHaltedActors(play, thisx, PLAYER_CSACTION_7); @@ -206,7 +206,7 @@ void BgIceObjects_Reset(BgIceObjects* this, PlayState* play) { this->dyna.unk_150 = 0.0f; } if (Math_StepToF(&thisx->world.pos.y, thisx->home.pos.y, 1.0f)) { - thisx->flags &= ~ACTOR_FLAG_4; + thisx->flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; Math_Vec3f_Copy(&this->targetPos, &thisx->home.pos); this->actionFunc = BgIceObjects_Idle; thisx->speed = 0.0f; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 5f9a1a6ca1..39c891ab4f 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -141,9 +141,9 @@ void BgIceShelter_RotateY(Vec3f* dest, Vec3f* src, s16 angle) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgIceShelter_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index a27d455caf..d00358e230 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -7,7 +7,7 @@ #include "z_bg_ice_shutter.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgIceShutter_Init(Actor* thisx, PlayState* play); void BgIceShutter_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index a9a560bc09..094f585645 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -53,7 +53,7 @@ ActorProfile Bg_Ice_Turara_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 600, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -3, ICHAIN_CONTINUE), ICHAIN_F32(minVelocityY, -30, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 0e35886304..7963199d74 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -7,7 +7,7 @@ #include "z_bg_jya_1flift.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJya1flift_Init(Actor* thisx, PlayState* play); void BgJya1flift_Destroy(Actor* thisx, PlayState* play); @@ -61,9 +61,9 @@ static f32 sFinalPositions[] = { 443.0f, -50.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index df98fa50ae..23f5658ce8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -37,9 +37,9 @@ ActorProfile Bg_Jya_Amishutter_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index 4c065932f0..ecdf4aa4de 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -7,7 +7,7 @@ #include "z_bg_jya_bigmirror.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgJyaBigmirror_Init(Actor* thisx, PlayState* play); void BgJyaBigmirror_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index d7aaafba54..eea63927ed 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -28,9 +28,9 @@ ActorProfile Bg_Jya_Block_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 333, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; void BgJyaBlock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 061ef48fd1..cd177d8044 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -56,9 +56,9 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_3, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaBombchuiwa_SetupCollider(BgJyaBombchuiwa* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 6268abe6ab..691e2adbe2 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -57,9 +57,9 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index e40258f9f6..3b418afec1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -4,7 +4,7 @@ #include "assets/objects/object_jya_obj/object_jya_obj.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaCobra_Init(Actor* thisx, PlayState* play); void BgJyaCobra_Destroy(Actor* thisx, PlayState* play); @@ -94,9 +94,9 @@ static s32 D_80897518[] = { 0x80, 0xA0, 0xA0, 0x80 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3s D_80897538 = { 0, -0x4000, 0 }; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 9e2a0d9ad4..9122ebfcf9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -8,7 +8,7 @@ #include "z_bg_jya_goroiwa.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaGoroiwa_Init(Actor* thisx, PlayState* play); void BgJyaGoroiwa_Destroy(Actor* thisx, PlayState* play); @@ -66,9 +66,9 @@ static CollisionCheckInfoInit sColChkInfoInit = { 1, 15, 0, MASS_HEAVY }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaGoroiwa_UpdateCollider(BgJyaGoroiwa* this) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 0f100259bd..f327e15f8c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -8,7 +8,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaHaheniron_Init(Actor* thisx, PlayState* play); void BgJyaHaheniron_Destroy(Actor* thisx, PlayState* play); @@ -64,9 +64,9 @@ static ColliderJntSphInit sJntSphInit = { static s16 sKakeraScales[] = { 5, 8, 11, 14, 17 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static f32 D_80898794[] = { 0.13f, 0.1f, 0.1f }; diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index cf15c084b0..e5a8e139ba 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -72,9 +72,9 @@ static s16 D_80899530[] = { 48, 42, 36, 32, 28, 24, 20, 16 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static CollisionHeader* sCollisionHeaders[] = { &gPillarCol, &gThroneCol }; diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 55f106a0ce..459e3f11af 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -35,9 +35,9 @@ ActorProfile Bg_Jya_Kanaami_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 8b3375967e..2d1092c8e5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -7,7 +7,7 @@ #include "z_bg_jya_lift.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaLift_Init(Actor* thisx, PlayState* play); void BgJyaLift_Destroy(Actor* thisx, PlayState* play); @@ -36,9 +36,9 @@ ActorProfile Bg_Jya_Lift_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2500, ICHAIN_STOP), }; void BgJyaLift_InitDynapoly(BgJyaLift* this, PlayState* play, CollisionHeader* collisionHeader, s32 moveFlag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index eed3074280..546f8c8d64 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -105,9 +105,9 @@ static Vec3f sVelocity = { 0.0f, 0.0f, 0.8f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; void BgJyaMegami_InitDynaPoly(BgJyaMegami* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index d33e173cee..66875ae85b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -8,7 +8,7 @@ #include "assets/objects/object_jya_obj/object_jya_obj.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgJyaZurerukabe_Init(Actor* thisx, PlayState* play); void BgJyaZurerukabe_Destroy(Actor* thisx, PlayState* play); @@ -54,9 +54,9 @@ static s16 D_8089BA30[6] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, CollisionHeader* collision, s32 flag) { diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 4e2dea2a9c..e44f561d83 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -7,7 +7,7 @@ #include "z_bg_menkuri_eye.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void BgMenkuriEye_Init(Actor* thisx, PlayState* play); void BgMenkuriEye_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 95b9bbb95d..cb3c724cf5 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -7,7 +7,7 @@ #include "z_bg_menkuri_kaiten.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMenkuriKaiten_Init(Actor* thisx, PlayState* play); void BgMenkuriKaiten_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 6c16b95e61..2bcc1974b2 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMizuBwall_Init(Actor* thisx, PlayState* play); void BgMizuBwall_Destroy(Actor* thisx, PlayState* play); @@ -157,9 +157,9 @@ static CollisionHeader* sColHeaders[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 96583b843f..095ab67e43 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define MOVEBG_TYPE(params) PARAMS_GET_U((u16)(params), 12, 4) #define MOVEBG_FLAGS(params) PARAMS_GET_U((u16)(params), 0, 6) @@ -62,9 +62,9 @@ static CollisionHeader* sColHeaders[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 44a2f7cce6..585f85f6f5 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -1,7 +1,7 @@ #include "z_bg_mizu_shutter.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMizuShutter_Init(Actor* thisx, PlayState* play); void BgMizuShutter_Destroy(Actor* thisx, PlayState* play); @@ -38,9 +38,9 @@ static Vec3f sDisplacements[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 1810d0bd2d..9f1884ea49 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -29,8 +29,8 @@ ActorProfile Bg_Mizu_Uzu_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 2b3abc2733..68f551be8b 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -7,7 +7,7 @@ #include "z_bg_mizu_water.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMizuWater_Init(Actor* thisx, PlayState* play); void BgMizuWater_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 7dd37baf58..69bbc3506c 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -14,7 +14,7 @@ #include "assets/objects/object_mjin_flash/object_mjin_flash.h" #include "assets/objects/object_mjin_oka/object_mjin_oka.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMjin_Init(Actor* thisx, PlayState* play); void BgMjin_Destroy(Actor* thisx, PlayState* play); @@ -40,9 +40,9 @@ extern UNK_TYPE D_06000000; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; static s16 sObjectIds[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME, @@ -78,7 +78,7 @@ void func_808A0850(BgMjin* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { colHeader = NULL; - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.objectSlot = this->requiredObjectSlot; Actor_SetObjectDependency(play, &this->dyna.actor); DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 7726f3b2d1..7b02395228 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mori_objects/object_mori_objects.h" #include "quake.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMoriBigst_Init(Actor* thisx, PlayState* play); void BgMoriBigst_Destroy(Actor* thisx, PlayState* play); @@ -41,8 +41,8 @@ ActorProfile Bg_Mori_Bigst_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -12000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 3ed26dfe1c..b441ed008c 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -1,7 +1,7 @@ #include "z_bg_mori_elevator.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMoriElevator_Init(Actor* thisx, PlayState* play); void BgMoriElevator_Destroy(Actor* thisx, PlayState* play); @@ -32,9 +32,9 @@ ActorProfile Bg_Mori_Elevator_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 3000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 7db118d243..53bc3b6b47 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -64,18 +64,18 @@ static ColliderJntSphInit sJntSphInit = { }; static InitChainEntry sInitChainClasp[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_3, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 40, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainLadder[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index e1ce8bdc05..c5f634640e 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -7,7 +7,7 @@ #include "z_bg_mori_hashira4.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgMoriHashira4_Init(Actor* thisx, PlayState* play); void BgMoriHashira4_Destroy(Actor* thisx, PlayState* play); @@ -34,9 +34,9 @@ ActorProfile Bg_Mori_Hashira4_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 3e346641eb..70e60eacf4 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -14,7 +14,7 @@ #include "assets/objects/object_mori_hineri2a/object_mori_hineri2a.h" #include "assets/objects/object_mori_tex/object_mori_tex.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMoriHineri_Init(Actor* thisx, PlayState* play); void BgMoriHineri_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 507f92e73c..9af9f14f2f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -7,7 +7,7 @@ #include "z_bg_mori_idomizu.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMoriIdomizu_Init(Actor* thisx, PlayState* play); void BgMoriIdomizu_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index e974aa2df9..910a2bd285 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -33,9 +33,9 @@ ActorProfile Bg_Mori_Kaitenkabe_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index e4d30217dd..61bbf6b9ef 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mori_objects/object_mori_objects.h" #include "quake.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play); void BgMoriRakkatenjo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 017f18606d..7199ec25b5 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -155,7 +155,7 @@ void BgPoEvent_InitBlocks(BgPoEvent* this, PlayState* play) { CollisionHeader* colHeader = NULL; s32 bgId; - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; CollisionHeader_GetVirtual(&gPoSistersAmyBlockCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if ((this->type == 0) && (this->index != 3)) { @@ -308,7 +308,7 @@ void BgPoEvent_BlockFall(BgPoEvent* this, PlayState* play) { this->dyna.actor.velocity.y++; if (Math_StepToF(&this->dyna.actor.world.pos.y, 433.0f, this->dyna.actor.velocity.y)) { - this->dyna.actor.flags &= ~ACTOR_FLAG_5; + this->dyna.actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->dyna.actor.velocity.y = 0.0f; sBlocksAtRest++; if (this->type != 1) { diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 3b1f559479..f6dfcc3d37 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -7,7 +7,7 @@ #include "z_bg_relay_objects.h" #include "assets/objects/object_relay_objects/object_relay_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum WindmillSetpiecesMode { /* 0 */ WINDMILL_ROTATING_GEAR, @@ -62,7 +62,7 @@ void BgRelayObjects_Init(Actor* thisx, PlayState* play) { } Audio_PlayWindmillBgm(); thisx->room = -1; - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (D_808A9508 & 2) { thisx->params = 0xFF; Actor_Kill(thisx); @@ -154,7 +154,7 @@ void func_808A9234(BgRelayObjects* this, PlayState* play) { return; } Flags_UnsetSwitch(play, this->switchFlag); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (play->roomCtx.curRoom.num == 4) { gSaveContext.timerState = TIMER_STATE_UP_FREEZE; } diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index 2ad49f6e71..3eb461a52f 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -27,9 +27,9 @@ ActorProfile Bg_Spot00_Break_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index 501d0f430b..c60865af16 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -8,7 +8,7 @@ #include "assets/objects/object_spot00_objects/object_spot00_objects.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum DrawbridgeType { /* -1 */ DT_DRAWBRIDGE = -1, @@ -40,9 +40,9 @@ ActorProfile Bg_Spot00_Hanebasi_Profile = { static f32 sTorchFlameScale = 0.0f; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 550, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 550, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 5000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 9dde534fa8..d8b3cfaba7 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -7,7 +7,7 @@ #include "z_bg_spot01_fusya.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Fusya_Init(Actor* thisx, PlayState* play); void BgSpot01Fusya_Destroy(Actor* thisx, PlayState* play); @@ -30,9 +30,9 @@ ActorProfile Bg_Spot01_Fusya_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 12800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 12800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1300, ICHAIN_STOP), }; void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, BgSpot01FusyaActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 475940dd53..ba1ff57d87 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -8,7 +8,7 @@ #include "assets/objects/object_spot01_objects/object_spot01_objects.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Idohashira_Init(Actor* thisx, PlayState* play); void BgSpot01Idohashira_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index f09c33325f..f2c89a41de 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -7,7 +7,7 @@ #include "z_bg_spot01_idomizu.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void BgSpot01Idomizu_Init(Actor* thisx, PlayState* play); void BgSpot01Idomizu_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 964416c0b0..1bad86dd46 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -7,7 +7,7 @@ #include "z_bg_spot01_idosoko.h" #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Idosoko_Init(Actor* thisx, PlayState* play); void BgSpot01Idosoko_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 6b35c92126..2ee4c58283 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -8,7 +8,7 @@ #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot01Objects2_Init(Actor* thisx, PlayState* play); void BgSpot01Objects2_Destroy(Actor* thisx, PlayState* play); @@ -31,9 +31,9 @@ ActorProfile Bg_Spot01_Objects2_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 12800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 12800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 811ce475ce..a0d74b4eda 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -7,7 +7,7 @@ #include "z_bg_spot02_objects.h" #include "assets/objects/object_spot02_objects/object_spot02_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot02Objects_Init(Actor* thisx, PlayState* play); void BgSpot02Objects_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index aa649c0df0..fccae09ba4 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -7,7 +7,7 @@ #include "z_bg_spot03_taki.h" #include "assets/objects/object_spot03_object/object_spot03_object.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot03Taki_Init(Actor* thisx, PlayState* play); void BgSpot03Taki_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 843b3e5235..93c30e65af 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -61,7 +61,7 @@ void BgSpot05Soko_Init(Actor* thisx, PlayState* play) { Actor_Kill(thisx); } else { this->actionFunc = func_808AE5B4; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader); diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 459667c5a9..d06e292e12 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -124,7 +124,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { Collider_SetJntSph(play, &this->collider, thisx, &sJntSphInit, this->colliderItem); if (LINK_IS_ADULT && Flags_GetSwitch(play, this->switchFlag)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_LOWERED; } else { thisx->home.pos.y = thisx->world.pos.y = WATER_LEVEL_RAISED; @@ -148,9 +148,9 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { break; case LHO_WATER_PLANE: Actor_ProcessInitChain(thisx, sInitChainWaterPlane); - thisx->flags = ACTOR_FLAG_4 | ACTOR_FLAG_5; + thisx->flags = ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; - if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (LINK_IS_ADULT && !GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { if (!IS_CUTSCENE_LAYER) { this->lakeHyliaWaterLevel = -681.0f; play->colCtx.colHeader->waterBoxes[LHWB_GERUDO_VALLEY_RIVER_LOWER].ySurface = @@ -291,7 +291,7 @@ void BgSpot06Objects_LockWait(BgSpot06Objects* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->timer = 130; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; sin = Math_SinS(this->dyna.actor.world.rot.y); cos = Math_CosS(this->dyna.actor.world.rot.y); this->dyna.actor.world.pos.x += (3.0f * sin); @@ -365,7 +365,7 @@ void BgSpot06Objects_LockSwimToSurface(BgSpot06Objects* this, PlayState* play) { this->dyna.actor.world.pos.z - (Math_CosS(this->dyna.actor.shape.rot.y) * 16.0f); this->dyna.actor.world.pos.y = -1993.0f; this->timer = 32; - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->collider.elements[0].dim.worldSphere.radius = this->collider.elements[0].dim.modelSphere.radius * 2; this->actionFunc = BgSpot06Objects_LockFloat; } @@ -482,7 +482,7 @@ void BgSpot06Objects_Draw(Actor* thisx, PlayState* play) { * cleared. */ void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* play) { - if (GET_EVENTCHKINF(EVENTCHKINF_69)) { + if (GET_EVENTCHKINF(EVENTCHKINF_RESTORED_LAKE_HYLIA)) { this->actionFunc = BgSpot06Objects_WaterPlaneCutsceneRise; } } diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 76d6ce04e7..04d06a57a5 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -8,7 +8,7 @@ #include "versions.h" #include "assets/objects/object_spot07_object/object_spot07_object.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot07Taki_Init(Actor* thisx, PlayState* play); void BgSpot07Taki_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 39126bcde9..7d44d616d2 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -88,9 +88,9 @@ static Vec3f D_808B08AC[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void func_808B02D0(BgSpot08Bakudankabe* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index f9a7d9c695..dfaa807a93 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -278,9 +278,9 @@ void BgSpot08Iceblock_SpawnTwinFloe(BgSpot08Iceblock* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2200, ICHAIN_STOP), }; void BgSpot08Iceblock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 2cce032344..2839607d85 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -41,15 +41,15 @@ static s32 (*D_808B1FA4[])(BgSpot09Obj* this, PlayState* play) = { }; static InitChainEntry sInitChain1[] = { - ICHAIN_F32(uncullZoneForward, 7200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 7200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 7200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 7200, ICHAIN_STOP), }; static InitChainEntry sInitChain2[] = { - ICHAIN_F32(uncullZoneForward, 7200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 7200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; static Gfx* sDLists[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 43dd1e73b9..d0568c23c8 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -9,7 +9,7 @@ #include "assets/objects/object_spot11_obj/object_spot11_obj.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot11Bakudankabe_Init(Actor* thisx, PlayState* play); void BgSpot11Bakudankabe_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 4218cc79fd..05987f0921 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot11Oasis_Init(Actor* thisx, PlayState* play); void BgSpot11Oasis_Update(Actor* thisx, PlayState* play); @@ -38,9 +38,9 @@ static s16 D_808B2E10[][2] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3f D_808B2E34[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 719baddf1b..b01eb98174 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -38,9 +38,9 @@ ActorProfile Bg_Spot12_Gate_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHeader* collision, s32 flags) { diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index bf53fec356..7fc67b38df 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -35,9 +35,9 @@ ActorProfile Bg_Spot12_Saku_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collision, s32 flags) { diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index bacf35e14d..b2c8f61b80 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -39,9 +39,9 @@ ActorProfile Bg_Spot15_Rrbox_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3f D_808B45C4[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 7e2f27fcc9..f7ba17ed02 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -4,7 +4,7 @@ #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play); void BgSpot16Bombstone_Destroy(Actor* thisx, PlayState* play); @@ -122,17 +122,17 @@ ActorProfile Bg_Spot16_Bombstone_Profile = { }; static InitChainEntry sInitChainBoulder[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainDebris[] = { ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static Vec3f sVelocity = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index ece0d3d6d4..b71c0fd137 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -31,9 +31,9 @@ ActorProfile Bg_Spot16_Doughnut_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 5500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 5000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 5000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 5500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 5000, ICHAIN_STOP), }; static s16 sScales[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 7d2166dd73..c6eafbdd47 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -30,9 +30,9 @@ ActorProfile Bg_Spot17_Bakudankabe_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void func_808B6BC0(BgSpot17Bakudankabe* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 8fbdd14048..8ee2e9dadf 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -7,7 +7,7 @@ #include "z_bg_spot17_funen.h" #include "assets/objects/object_spot17_obj/object_spot17_obj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot17Funen_Init(Actor* thisx, PlayState* play); void BgSpot17Funen_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index d41f0d86b9..95aecef7ff 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -2,7 +2,7 @@ #include "assets/objects/object_spot18_obj/object_spot18_obj.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgSpot18Basket_Init(Actor* thisx, PlayState* play); void BgSpot18Basket_Destroy(Actor* thisx, PlayState* play); @@ -123,9 +123,9 @@ void func_808B7770(BgSpot18Basket* this, PlayState* play, f32 arg2) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgSpot18Basket_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index c321d5c550..cec6266a2e 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -28,9 +28,9 @@ ActorProfile Bg_Spot18_Futa_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void BgSpot18Futa_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 4156815ddf..505797f7e9 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -67,15 +67,15 @@ static BgSpot18ObjInitFunc D_808B910C[] = { }; static InitChainEntry sInitChain1[] = { - ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -4, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -4, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; static InitChainEntry sInitChain2[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 700, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 700, ICHAIN_STOP), }; static BgSpot18ObjInitFunc D_808B913C[] = { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 789921509e..a078991b46 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -7,7 +7,7 @@ #include "z_bg_spot18_shutter.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSpot18Shutter_Init(Actor* thisx, PlayState* play); void BgSpot18Shutter_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index d328a2379b..5d96a0d750 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -7,7 +7,7 @@ #include "z_bg_sst_floor.h" #include "assets/objects/object_sst/object_sst.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgSstFloor_Init(Actor* thisx, PlayState* play); void BgSstFloor_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index 870a3edd6c..4ed9f8854c 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -7,7 +7,7 @@ #include "z_bg_toki_hikari.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void BgTokiHikari_Init(Actor* thisx, PlayState* play); void BgTokiHikari_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index e25280ed0b..3b2d73b30e 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -7,7 +7,7 @@ #include "z_bg_toki_swd.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgTokiSwd_Init(Actor* thisx, PlayState* play); void BgTokiSwd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index ef0e25f404..06eefa51c0 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -9,7 +9,7 @@ #include "assets/objects/object_spot04_objects/object_spot04_objects.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgTreemouth_Init(Actor* thisx, PlayState* play); void BgTreemouth_Destroy(Actor* thisx, PlayState* play); @@ -45,9 +45,9 @@ ActorProfile Bg_Treemouth_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_5, ICHAIN_CONTINUE), ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 8000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 8000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; // unused 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 822a9ddd59..ee8ea88865 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -45,7 +45,7 @@ void BgUmaJump_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->dyna.actor); return; } - this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; } } diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 020b056bb4..df6e12f851 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -7,7 +7,7 @@ #include "z_bg_ydan_hasi.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgYdanHasi_Init(Actor* thisx, PlayState* play); void BgYdanHasi_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 6e5a1010fb..2d9b6f9296 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -293,7 +293,7 @@ void BgYdanSp_FloorWebIdle(BgYdanSp* this, PlayState* play) { if (this->dyna.actor.xzDistToPlayer < 80.0f) { this->unk_16C = 200.0f; this->dyna.actor.room = -1; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->timer = 40; Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_WEB_BROKEN); this->actionFunc = BgYdanSp_FloorWebBreaking; diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index d5d3244348..958e3c3f4f 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -8,7 +8,7 @@ #include "assets/objects/object_zg/object_zg.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void BgZg_Init(Actor* thisx, PlayState* play); void BgZg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 5363ae0c54..2b60bf1238 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -3,7 +3,9 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void BossDodongo_Init(Actor* thisx, PlayState* play); void BossDodongo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index f8d9a39c82..4c25c62a00 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -12,7 +12,9 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BossFdIntroFlyState { /* 0 */ INTRO_FLY_EMERGE, diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index d28e4e031d..9b9fd17c75 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -10,7 +10,9 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BossFd2CutsceneState { /* 0 */ DEATH_START, diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 68bfe14550..5bae2cd95a 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -10,7 +10,9 @@ #include "assets/objects/object_ganon_anime2/object_ganon_anime2.h" #include "assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void BossGanon_Init(Actor* thisx, PlayState* play2); void BossGanon_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 8255e36d0b..53efb2bad5 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -9,7 +9,9 @@ #include "assets/objects/object_geff/object_geff.h" #include "assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define BOSS_GANON2_EFFECT_COUNT 100 diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 4a8842ce8e..7473f8d2d8 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -12,7 +12,9 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum BossGanondrofDeathState { /* 0 */ NOT_DEAD, diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index de21070a97..6db74ba2e8 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -4,7 +4,9 @@ #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) // IRIS_FOLLOW: gohma looks towards the player (iris rotation) // BONUS_IFRAMES: gain invincibility frames when the player does something (throwing things?), or diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index df146be4a2..cf15b46595 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -13,7 +13,9 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "pal-1.0:128 pal-1.1:128" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define MO_WATER_LEVEL(play) play->colCtx.colHeader->waterBoxes[0].ySurface diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 95d7609c70..78389aba5c 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -14,8 +14,9 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "pal-1.0:128 pal-1.1:128" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) #define vParity actionVar #define vVanish actionVar diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 61cac2ec1d..1e9a941536 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -3,7 +3,9 @@ #include "assets/objects/object_tw/object_tw.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum TwEffType { /* 0 */ TWEFF_NONE, diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 3b4d033b26..a973fd72fd 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -12,7 +12,9 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.2:128 pal-1.0:128 pal-1.1:128" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define GET_BODY(this) ((BossVa*)(this)->actor.parent) #define vaGorePulse offset.x diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 1887f64672..7657cf7432 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -11,7 +11,7 @@ #include "assets/objects/object_gnd_magic/object_gnd_magic.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void Demo6K_Init(Actor* thisx, PlayState* play); void Demo6K_Destroy(Actor* thisx, PlayState* play); @@ -162,7 +162,7 @@ void Demo6K_Init(Actor* thisx, PlayState* play) { case 17: case 18: case 19: - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->drawFunc = func_8096865C; this->initActionFunc = func_80967410; this->flags |= 1; diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index f2938f2b0a..a5e7139f07 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -4,7 +4,7 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef void (*DemoDuActionFunc)(DemoDu*, PlayState*); typedef void (*DemoDuDrawFunc)(Actor*, PlayState*); diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 0d6ba9ed5d..3f19529df0 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -37,7 +37,7 @@ #include "assets/objects/object_bba/object_bba.h" #include "assets/objects/object_ane/object_ane.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoEc_Init(Actor* thisx, PlayState* play); void DemoEc_Destroy(Actor* thisx, PlayState* play); 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 d5b09d9219..9ed730455f 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 @@ #include "assets/objects/object_efc_tw/object_efc_tw.h" #include "assets/objects/object_gi_jewel/object_gi_jewel.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoEffect_Init(Actor* thisx, PlayState* play2); void DemoEffect_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 94bda4604b..caae4cff14 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "assets/objects/object_fhg/object_fhg.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum DemoExtAction { /* 0x00 */ EXT_WAIT, diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index a7087e8975..f0b240070d 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -8,7 +8,7 @@ #include "assets/objects/object_geff/object_geff.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoGeff_Init(Actor* thisx, PlayState* play); void DemoGeff_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index d69f207b59..ae85f3ce89 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -8,7 +8,7 @@ #include "assets/objects/object_gj/object_gj.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoGj_Init(Actor* thisx, PlayState* play); void DemoGj_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index b638cbfd79..8d373a13f8 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -8,7 +8,7 @@ #include "assets/objects/object_oF1d_map/object_oF1d_map.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoGo_Init(Actor* thisx, PlayState* play); void DemoGo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 1f0c9e4dd9..a878a21f1f 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -7,7 +7,7 @@ #include "terminal.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoGt_Init(Actor* thisx, PlayState* play); void DemoGt_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 88cdaa7203..82db3d7fa6 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -2,7 +2,7 @@ #include "terminal.h" #include "assets/objects/object_ik/object_ik.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoIk_Init(Actor* thisx, PlayState* play); void DemoIk_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index f51f0c4c84..7e359f6625 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -11,7 +11,7 @@ #include "assets/objects/object_im/object_im.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void DemoIm_Init(Actor* thisx, PlayState* play); void DemoIm_Destroy(Actor* thisx, PlayState* play); @@ -841,7 +841,7 @@ s32 func_809869F8(DemoIm* this, PlayState* play) { f32 playerPosX = player->actor.world.pos.x; f32 thisPosX = this->actor.world.pos.x; - if ((thisPosX - (kREG(16) + 30.0f) > playerPosX) && !(this->actor.flags & ACTOR_FLAG_6)) { + if ((thisPosX - (kREG(16) + 30.0f) > playerPosX) && !(this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { return true; } else { return false; 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 ed4aba58da..8d1f8e6ca6 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -9,7 +9,7 @@ #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.2:128" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoKankyo_Init(Actor* thisx, PlayState* play); void DemoKankyo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 21f7a4c763..8c6ded1651 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -8,7 +8,7 @@ #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #include "assets/scenes/dungeons/ganontika/ganontika_scene.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoKekkai_Init(Actor* thisx, PlayState* play); void DemoKekkai_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 8f8867de3e..36e521701b 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -11,7 +11,7 @@ #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoSa_Init(Actor* thisx, PlayState* play); void DemoSa_Destroy(Actor* thisx, PlayState* play); 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 2b373bec30..d5cb025e46 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -6,7 +6,7 @@ #include "z_demo_shd.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoShd_Init(Actor* thisx, PlayState* play); void DemoShd_Destroy(Actor* thisx, PlayState* play); 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 d71810b23d..67adb46e78 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 @@ -2,7 +2,7 @@ #include "overlays/actors/ovl_En_Box/z_en_box.h" #include "assets/objects/object_box/object_box.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DemoTreLgt_Init(Actor* thisx, PlayState* play); void DemoTreLgt_Destroy(Actor* thisx, PlayState* play); 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 8c38023ac3..40f4878831 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -72,7 +72,7 @@ void DoorAna_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); } else { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } Actor_SetScale(&this->actor, 0); DoorAna_SetupAction(this, DoorAna_WaitClosed); @@ -99,7 +99,7 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play) { // opening with song of storms if (this->actor.xyzDistToPlayerSq < SQ(200.0f) && CutsceneFlags_Get(play, 5)) { openGrotto = true; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } else { // bombing/hammering open a grotto diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 01e2762657..0f2d3163ec 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -11,7 +11,7 @@ #include "assets/objects/object_haka_door/object_haka_door.h" #include "assets/objects/object_door_killer/object_door_killer.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum DoorKillerBehaviour { /* 0 */ DOOR_KILLER_DOOR, 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 130b833b63..e04ccb25d1 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -26,7 +26,7 @@ #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" #include "assets/objects/object_ouke_haka/object_ouke_haka.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void DoorShutter_Init(Actor* thisx, PlayState* play2); void DoorShutter_Destroy(Actor* thisx, PlayState* play); @@ -273,9 +273,9 @@ static s8 sTypeStyles[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; typedef struct DoorShutterSceneInfo { @@ -457,7 +457,7 @@ void DoorShutter_Init(Actor* thisx, PlayState* play2) { } else if (styleType == DOORSHUTTER_STYLE_JABU_JABU) { Actor_SetScale(&this->dyna.actor, 0.1f); this->jabuDoorClosedAmount = 100; - this->dyna.actor.uncullZoneScale = 200.0f; + this->dyna.actor.cullingVolumeScale = 200.0f; Actor_SetFocus(&this->dyna.actor, 0.0f); } else { Actor_SetFocus(&this->dyna.actor, 60.0f); 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 b5ff0dbaaf..23ff72a00e 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -46,9 +46,9 @@ ActorProfile Door_Warp1_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 4000, ICHAIN_STOP), }; static s16 sWarpTimerTarget; diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 3aa35ec587..ae7c4a807a 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -1,7 +1,7 @@ #include "z_efc_erupc.h" #include "assets/objects/object_efc_erupc/object_efc_erupc.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EfcErupc_Init(Actor* thisx, PlayState* play); void EfcErupc_Destroy(Actor* thisx, PlayState* play); 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 907f6d096d..f23a974a32 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -7,7 +7,7 @@ #include "z_eff_dust.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EffDust_Init(Actor* thisx, PlayState* play); void EffDust_Destroy(Actor* thisx, PlayState* play); 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 f0b2937df3..a4ebdfb131 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -9,7 +9,7 @@ #include "terminal.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ElfMsg_Init(Actor* thisx, PlayState* play); void ElfMsg_Destroy(Actor* thisx, PlayState* play); @@ -39,7 +39,7 @@ ActorProfile Elf_Msg_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) { 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 769578d004..0f0edc34e5 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -7,7 +7,7 @@ #include "z_elf_msg2.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ElfMsg2_Init(Actor* thisx, PlayState* play); void ElfMsg2_Destroy(Actor* thisx, PlayState* play); @@ -38,7 +38,7 @@ ActorProfile Elf_Msg2_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) { 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 9b552cc5ac..6f793ba1a3 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -8,7 +8,9 @@ #include "assets/objects/object_am/object_am.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_CAN_PRESS_SWITCHES) void EnAm_Init(Actor* thisx, PlayState* play); void EnAm_Destroy(Actor* thisx, PlayState* play); 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 6b493aa874..242afc095f 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -64,7 +64,7 @@ void EnAni_SetupAction(EnAni* this, EnAniActionFunc actionFunc) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 850, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 850, ICHAIN_STOP), }; void EnAni_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index f6742f9810..5773eb17ba 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnAnubice_Init(Actor* thisx, PlayState* play); void EnAnubice_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 1b2a1e0185..9e408a3350 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_anubice/object_anubice.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAnubiceFire_Init(Actor* thisx, PlayState* play); void EnAnubiceFire_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 72ce0b646c..b54dc180bc 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -7,7 +7,7 @@ #include "z_en_anubice_tag.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAnubiceTag_Init(Actor* thisx, PlayState* play); void EnAnubiceTag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c index 60b2121000..d44d380430 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c @@ -6,7 +6,7 @@ #include "z_en_arow_trap.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnArowTrap_Init(Actor* thisx, PlayState* play); void EnArowTrap_Destroy(Actor* thisx, PlayState* play); 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 3cec8313e6..669e5ed1fb 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -8,7 +8,7 @@ #include "global.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnArrow_Init(Actor* thisx, PlayState* play); void EnArrow_Destroy(Actor* thisx, PlayState* play); 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 d1b915ee45..d215d02cf3 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 @@ -9,7 +9,7 @@ #include "assets/objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnAttackNiw_Init(Actor* thisx, PlayState* play); void EnAttackNiw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 9662ec26ac..098980836e 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -7,7 +7,7 @@ #include "z_en_ba.h" #include "assets/objects/object_bxa/object_bxa.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBa_Init(Actor* thisx, PlayState* play); void EnBa_Destroy(Actor* thisx, PlayState* play); @@ -83,8 +83,8 @@ static Vec3f D_809B80E4 = { 0.01f, 0.01f, 0.01f }; static InitChainEntry sInitChain[] = { ICHAIN_S8(naviEnemyId, NAVI_ENEMY_PARASITIC_TENTACLE, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2500, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 0, ICHAIN_STOP), }; 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 3b26ad61d2..26af25354a 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -8,7 +8,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_Bb/object_Bb.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) #define vBombHopPhase actionVar1 #define vTrailIdx actionVar1 diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index e896f5bf25..58fcf61505 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -7,7 +7,7 @@ #include "z_en_bdfire.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBdfire_Init(Actor* thisx, PlayState* play); void EnBdfire_Destroy(Actor* thisx, PlayState* play); 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 559305e71d..1bb808abaf 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -1,7 +1,9 @@ #include "z_en_bigokuta.h" #include "assets/objects/object_bigokuta/object_bigokuta.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBigokuta_Init(Actor* thisx, PlayState* play); void EnBigokuta_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 73a8addd8f..8e9eba0c60 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -221,7 +221,7 @@ void EnBili_SetupBurnt(EnBili* this) { this->timer = 20; this->collider.base.atFlags &= ~AT_ON; this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 200, COLORFILTER_BUFFLAG_XLU, 20); this->actionFunc = EnBili_Burnt; @@ -594,7 +594,7 @@ void EnBili_UpdateDamage(EnBili* this, PlayState* play) { } if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_ARROW) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } } diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index a42e48252a..2e1141ffea 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -7,7 +7,7 @@ #include "z_en_blkobj.h" #include "assets/objects/object_blkobj/object_blkobj.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBlkobj_Init(Actor* thisx, PlayState* play); void EnBlkobj_Destroy(Actor* thisx, PlayState* play); @@ -33,9 +33,9 @@ ActorProfile En_Blkobj_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; static Gfx sSetupOpaDL[] = { @@ -87,7 +87,7 @@ void EnBlkobj_Wait(EnBlkobj* this, PlayState* play) { } void EnBlkobj_SpawnDarkLink(EnBlkobj* this, PlayState* play) { - if (!(this->dyna.actor.flags & ACTOR_FLAG_6)) { + if (!(this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_TORCH2, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, this->dyna.actor.yawTowardsPlayer, 0, 0); EnBlkobj_SetupAction(this, EnBlkobj_DarkLinkFight); 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 120bbaa1b2..a542cbfcb0 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -8,7 +8,7 @@ #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBom_Init(Actor* thisx, PlayState* play); void EnBom_Destroy(Actor* thisx, PlayState* play); @@ -170,7 +170,7 @@ void EnBom_Explode(EnBom* this, PlayState* play) { Player* player; if (this->explosionCollider.elements[0].dim.modelSphere.radius == 0) { - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); } @@ -323,7 +323,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) { Camera_RequestQuake(&play->mainCamera, 2, 11, 8); thisx->params = BOMB_EXPLOSION; this->timer = 10; - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; EnBom_SetupAction(this, EnBom_Explode); } } 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 bf2f41c6c1..4df7b35ce3 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 @@ -4,8 +4,9 @@ #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" #include "assets/objects/object_bg/object_bg.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) typedef enum BombchuGirlEyeMode { /* 0 */ CHU_GIRL_EYES_ASLEEP, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index 3e8ff39453..17657586c9 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -3,7 +3,7 @@ #include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h" #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnBomBowlPit_Init(Actor* thisx, PlayState* play); void EnBomBowlPit_Destroy(Actor* thisx, PlayState* play); 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 f5deec7285..9f4263d8cd 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 @@ -2,7 +2,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define BOMBCHU_SCALE 0.01f 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 87ed4120d4..34dd30010e 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -8,7 +8,7 @@ #include "assets/objects/object_bombf/object_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBombf_Init(Actor* thisx, PlayState* play); void EnBombf_Destroy(Actor* thisx, PlayState* play); @@ -104,7 +104,7 @@ void EnBombf_Init(Actor* thisx, PlayState* play) { thisx->focus.pos = thisx->world.pos; if (Actor_FindNearby(play, thisx, ACTOR_BG_DDAN_KD, ACTORCAT_BG, 10000.0f) != NULL) { - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; } thisx->colChkInfo.cylRadius = 10.0f; @@ -126,8 +126,8 @@ void EnBombf_Init(Actor* thisx, PlayState* play) { EnBombf_SetupGrowBomb(this, thisx->params); } - thisx->uncullZoneScale += 31000.0f; - thisx->uncullZoneForward += 31000.0f; + thisx->cullingVolumeScale += 31000.0f; + thisx->cullingVolumeDistance += 31000.0f; } void EnBombf_Destroy(Actor* thisx, PlayState* play) { @@ -260,7 +260,7 @@ void EnBombf_Explode(EnBombf* this, PlayState* play) { Player* player; if (this->explosionCollider.elements[0].dim.modelSphere.radius == 0) { - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); } @@ -431,7 +431,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { Camera_RequestQuake(&play->mainCamera, 2, 11, 8); thisx->params = BOMBFLOWER_EXPLOSION; this->timer = 10; - thisx->flags |= ACTOR_FLAG_5; + thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; EnBombf_SetupAction(this, EnBombf_Explode); } } 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 932e84f68a..982df71a03 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -8,7 +8,7 @@ #include "global.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBoom_Init(Actor* thisx, PlayState* play); void EnBoom_Destroy(Actor* thisx, PlayState* play); 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 9468fae6bb..2d7c748b47 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -135,7 +135,7 @@ void EnBox_Init(Actor* thisx, PlayState* play2) { EnBox_SetupAction(this, EnBox_FallOnSwitchFlag); this->alpha = 0; this->movementFlags |= ENBOX_MOVE_IMMOBILE; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if ((this->type == ENBOX_TYPE_ROOM_CLEAR_BIG || this->type == ENBOX_TYPE_ROOM_CLEAR_SMALL) && !Flags_GetClear(play, this->dyna.actor.room)) { EnBox_SetupAction(this, EnBox_AppearOnRoomClear); @@ -143,7 +143,7 @@ void EnBox_Init(Actor* thisx, PlayState* play2) { this->movementFlags |= ENBOX_MOVE_IMMOBILE; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f; this->alpha = 0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if (this->type == ENBOX_TYPE_9 || this->type == ENBOX_TYPE_10) { EnBox_SetupAction(this, func_809C9700); this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; @@ -151,14 +151,14 @@ void EnBox_Init(Actor* thisx, PlayState* play2) { this->movementFlags |= ENBOX_MOVE_IMMOBILE; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f; this->alpha = 0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if (this->type == ENBOX_TYPE_SWITCH_FLAG_BIG && !Flags_GetSwitch(play, this->switchFlag)) { EnBox_SetupAction(this, EnBox_AppearOnSwitchFlag); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->movementFlags |= ENBOX_MOVE_IMMOBILE; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f; this->alpha = 0; - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else { if (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6) { this->dyna.actor.flags |= ACTOR_FLAG_REACT_TO_LENS; 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 4a93d3f8dd..b3deb35f9e 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -139,9 +139,9 @@ void EnButte_DrawTransformationEffect(EnButte* this, PlayState* play) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 20, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 20, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_STOP), }; void EnButte_Init(Actor* thisx, PlayState* play) { @@ -154,7 +154,7 @@ void EnButte_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (PARAMS_GET_U(this->actor.params, 0, 1) == 1) { - this->actor.uncullZoneScale = 200.0f; + this->actor.cullingVolumeScale = 200.0f; } SkelAnime_Init(play, &this->skelAnime, &gButterflySkel, &gButterflyAnim, this->jointTable, this->morphTable, 8); @@ -347,7 +347,7 @@ void EnButte_FollowLink(EnButte* this, PlayState* play) { void EnButte_SetupTransformIntoFairy(EnButte* this) { this->timer = 9; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->skelAnime.playSpeed = 1.0f; EnButte_ResetTransformationEffect(); this->actionFunc = EnButte_TransformIntoFairy; diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 4c5c38e36a..6ab5fd6fcf 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_bw/object_bw.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBw_Init(Actor* thisx, PlayState* play); void EnBw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 91b701d0d7..efc4d4f5cf 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -7,7 +7,7 @@ #include "z_en_bx.h" #include "assets/objects/object_bxa/object_bxa.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnBx_Init(Actor* thisx, PlayState* play); void EnBx_Destroy(Actor* thisx, PlayState* play); @@ -98,7 +98,7 @@ void EnBx_Init(Actor* thisx, PlayState* play) { Collider_SetQuad(play, &this->colliderQuad, &this->actor, &sQuadInit); thisx->colChkInfo.mass = MASS_IMMOVABLE; this->unk_14C = 0; - thisx->uncullZoneDownward = 2000.0f; + thisx->cullingVolumeDownward = 2000.0f; if (Flags_GetSwitch(play, PARAMS_GET_U(thisx->params, 8, 8))) { Actor_Kill(&this->actor); } 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 e83dbc2dc8..c6cf2c7ad3 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 @@ -1,6 +1,8 @@ #include "z_en_clear_tag.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnClearTag_Init(Actor* thisx, PlayState* play); void EnClearTag_Destroy(Actor* thisx, PlayState* play); 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 c8319a7e79..a2533df3d5 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -98,7 +98,7 @@ static DamageTable sDamageTable = { static u32 sDeathCount = 0; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3000, ICHAIN_CONTINUE), ICHAIN_S8(naviEnemyId, NAVI_ENEMY_GUAY, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -200, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 2000, ICHAIN_STOP), @@ -181,7 +181,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { } this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnCrow_Damaged; } @@ -402,7 +402,7 @@ void EnCrow_Respawn(EnCrow* this, PlayState* play) { } if (Math_StepToF(&this->actor.scale.x, target, target * 0.1f)) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.colChkInfo.health = 1; EnCrow_SetupFlyIdle(this); } 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 0f84c7784a..2fac588608 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -2,7 +2,7 @@ #include "overlays/actors/ovl_En_GeldB/z_en_geldb.h" #include "assets/objects/object_daiku/object_daiku.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef struct EnDaikuEscapeSubCamParam { Vec3f eyePosDeltaLocal; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 2612749b4e..6b27191f79 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -7,7 +7,7 @@ #include "z_en_daiku_kakariko.h" #include "assets/objects/object_daiku/object_daiku.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum KakarikoCarpenterType { /* 0x0 */ CARPENTER_ICHIRO, // Red and purple pants, normal hair @@ -171,7 +171,7 @@ void EnDaikuKakariko_Init(Actor* thisx, PlayState* play) { this->actor.gravity = 0.0f; this->runSpeed = 3.0f; - this->actor.uncullZoneForward = 1200.0f; + this->actor.cullingVolumeDistance = 1200.0f; this->actor.attentionRangeType = ATTENTION_RANGE_6; this->currentAnimIndex = -1; 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 b2d7f0c8af..a770abcb63 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -402,7 +402,7 @@ void EnDekubaba_SetupPrunedSomersault(EnDekubaba* this) { this->actor.world.rot.y = this->actor.shape.rot.y + 0x8000; this->collider.base.acFlags &= ~AC_ON; this->actor.speed = this->size * 3.0f; - this->actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnDekubaba_PrunedSomersault; } @@ -455,7 +455,7 @@ void EnDekubaba_SetupDeadStickDrop(EnDekubaba* this, PlayState* play) { this->actor.velocity.y = 0.0f; this->actor.shape.shadowScale = 3.0f; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_MISC); - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->timer = 200; this->actionFunc = EnDekubaba_DeadStickDrop; } diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 4d0e0c269d..d0b44336bf 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -1,7 +1,9 @@ #include "z_en_dh.h" #include "assets/objects/object_dh/object_dh.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) typedef enum EnDhAction { /* 0 */ DH_WAIT, diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 3d31717cd6..8ecca0200a 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Dh/z_en_dh.h" #include "assets/objects/object_dh/object_dh.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDha_Init(Actor* thisx, PlayState* play); void EnDha_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 536be6a77d..504b26eaa9 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -9,7 +9,7 @@ #include "assets/objects/object_zo/object_zo.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDivingGame_Init(Actor* thisx, PlayState* play); void EnDivingGame_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 226a9e8d47..ad1eb7e58f 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -156,7 +156,7 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { delay = 0; switch (Player_GetMask(play)) { case PLAYER_MASK_SKULL: - if (!GET_ITEMGETINF(ITEMGETINF_1E)) { + if (!GET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_STICK_UPGRADE)) { reaction = DNT_SIGNAL_CELEBRATE; this->prize = DNT_PRIZE_STICK; SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_SARIA_THEME); @@ -164,7 +164,8 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { } FALLTHROUGH; case PLAYER_MASK_TRUTH: - if (!GET_ITEMGETINF(ITEMGETINF_1F) && (Player_GetMask(play) != PLAYER_MASK_SKULL)) { + if (!GET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE) && + (Player_GetMask(play) != PLAYER_MASK_SKULL)) { Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); this->prize = DNT_PRIZE_NUTS; diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index fb0b7bc340..9f88469f2b 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -10,7 +10,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDntJiji_Init(Actor* thisx, PlayState* play); void EnDntJiji_Destroy(Actor* thisx, PlayState* play); @@ -282,7 +282,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) { PRINTF("実 \n"); PRINTF("実 \n"); PRINTF("実 \n"); - SET_ITEMGETINF(ITEMGETINF_1F); + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE); } else { // "stick" PRINTF("棒 \n"); @@ -291,7 +291,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) { PRINTF("棒 \n"); PRINTF("棒 \n"); PRINTF("棒 \n"); - SET_ITEMGETINF(ITEMGETINF_1E); + SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_STICK_UPGRADE); } this->actor.textId = 0; if ((this->stage != NULL) && (this->stage->actor.update != NULL)) { diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 2863aa1f80..b1631fe434 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnDntNomal_Init(Actor* thisx, PlayState* play); void EnDntNomal_Destroy(Actor* thisx, PlayState* play); 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 0a4242d020..5cd7fec6c5 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -3,7 +3,7 @@ #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "assets/objects/object_dodongo/object_dodongo.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnDodongoActionState { DODONGO_SWEEP_TAIL, 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 301b804966..4d650f0a1b 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 @@ #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #include "assets/objects/object_haka_door/object_haka_door.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define DOOR_AJAR_SLAM_RANGE 120.0f #define DOOR_AJAR_OPEN_RANGE (2 * DOOR_AJAR_SLAM_RANGE) @@ -75,7 +75,7 @@ static EnDoorInfo sDoorInfo[] = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; static AnimationHeader* sDoorAnims[DOOR_OPEN_ANIM_MAX] = { @@ -177,7 +177,7 @@ void EnDoor_SetupType(EnDoor* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { s32 doorType = ENDOOR_GET_TYPE(&this->actor); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->requiredObjectSlot; this->actionFunc = EnDoor_Idle; if (doorType == DOOR_EVENING) { 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 784e28e072..836610b781 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 @@ -8,7 +8,7 @@ #include "assets/objects/object_dy_obj/object_dy_obj.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnDyExtra_Init(Actor* thisx, PlayState* play); void EnDyExtra_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index 733a9ccf83..c646cdf249 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -7,7 +7,7 @@ #include "z_en_eg.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnEg_Init(Actor* thisx, PlayState* play); void EnEg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 63e509986b..554512b148 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -215,7 +215,7 @@ void EnEiyer_SetupUnderground(EnEiyer* this) { } this->collider.base.acFlags |= AC_ON; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; } @@ -265,7 +265,7 @@ void EnEiyer_SetupDiveAttack(EnEiyer* this, PlayState* play) { void EnEiyer_SetupLand(EnEiyer* this) { Animation_MorphToPlayOnce(&this->skelanime, &gStingerDiveAnim, -3.0f); this->collider.base.atFlags &= ~AT_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; // Update BgCheck info, play sound, and spawn effect on the first frame of the land action this->timer = -1; 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 a83552b9bf..cd3658756e 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -8,7 +8,7 @@ #include "global.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) #define FAIRY_FLAG_TIMED (1 << 8) #define FAIRY_FLAG_BIG (1 << 9) 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 76546c3eb5..e513de558e 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -2,7 +2,7 @@ #include "terminal.h" #include "overlays/actors/ovl_En_Tite/z_en_tite.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnEncount1_Init(Actor* thisx, PlayState* play); void EnEncount1_Update(Actor* thisx, PlayState* play); 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 972f06b6f7..d0ba211fda 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -4,7 +4,7 @@ #include "terminal.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum Encount2State { /* 0x0 */ ENCOUNT2_INACTIVE, diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 53507b0e39..fea14bc560 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnExItem_Init(Actor* thisx, PlayState* play); void EnExItem_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index d3bf1f26cc..55f97c3686 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -3,7 +3,7 @@ #include "../ovl_En_Diving_Game/z_en_diving_game.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnExRuppy_Init(Actor* thisx, PlayState* play); void EnExRuppy_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 2de4d16ae0..785b4937aa 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -9,7 +9,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fw/object_fw.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) void EnFd_Init(Actor* thisx, PlayState* play); void EnFd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 472ff44b25..d408b7b9ac 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -1,7 +1,7 @@ #include "z_en_fd_fire.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnFdFire_Init(Actor* thisx, PlayState* play); void EnFdFire_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index a76c0b8783..aa3f190cee 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_En_fHG/z_en_fhg.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum StrikeMode { /* 0 */ STRIKE_INIT, 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 17011be7aa..2f7cd50862 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 @@ -3,7 +3,7 @@ #include "terminal.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnFireRock_Init(Actor* thisx, PlayState* play); void EnFireRock_Destroy(Actor* thisx, PlayState* play); 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 eb1be1b9cf..6a72e29224 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -215,7 +215,7 @@ void EnFirefly_SetupFall(EnFirefly* this) { this->actor.velocity.y = 0.0f; Animation_Change(&this->skelAnime, &gKeeseFlyAnim, 0.5f, 0.0f, 0.0f, ANIMMODE_LOOP_INTERP, -3.0f); Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_DEAD); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40); this->actionFunc = EnFirefly_Fall; } @@ -262,7 +262,7 @@ void EnFirefly_SetupFrozenFall(EnFirefly* this, PlayState* play) { s32 i; Vec3f iceParticlePos; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->auraType = KEESE_AURA_NONE; this->actor.speed = 0.0f; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_OPA, 255); 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 ccc27510e2..7f16563730 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -79,9 +79,9 @@ ActorProfile En_Fish_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 40, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 700, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 40, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 700, ICHAIN_STOP), }; f32 EnFish_XZDistanceSquared(Vec3f* v1, Vec3f* v2) { @@ -117,7 +117,7 @@ void EnFish_SetCutsceneData(EnFish* this) { thisx->shape.yOffset = 600.0f; D_80A17014 = 10.0f; D_80A17018 = 0.0f; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnFish_SetOutOfWaterAnimation(this); } } @@ -141,7 +141,7 @@ void EnFish_Init(Actor* thisx, PlayState* play) { this->fastPhase = Rand_ZeroOne() * (0xFFFF + 0.5f); if (params == FISH_DROPPED) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 8.0f); EnFish_Dropped_SetupFall(this); } else if (params == FISH_SWIMMING_UNIQUE) { @@ -476,7 +476,7 @@ void EnFish_Dropped_SetupSwimAway(EnFish* this) { this->actor.gravity = 0.0f; this->actor.minVelocityY = 0.0f; this->actor.shape.yOffset = 0.0f; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->timer = 200; EnFish_SetInWaterAnimation(this); this->actionFunc = EnFish_Dropped_SwimAway; 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 e08b501210..035a825073 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -279,7 +279,7 @@ void EnFloormas_SetupLand(EnFloormas* this) { void EnFloormas_SetupSplit(EnFloormas* this) { Actor_SetScale(&this->actor, 0.004f); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { this->actor.draw = EnFloormas_DrawHighlighted; } else { @@ -384,7 +384,7 @@ void EnFloormas_SetupSmallWait(EnFloormas* this) { } this->actor.draw = NULL; this->actionFunc = EnFloormas_SmallWait; - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); } void EnFloormas_SetupTakeDamage(EnFloormas* this) { @@ -911,7 +911,7 @@ void EnFloormas_Merge(EnFloormas* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.scale.x >= 0.01f) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnFloormas_MakeVulnerable(this); this->actor.params = 0; this->collider.elem.acElemFlags |= ACELEM_HOOKABLE; 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 d1bbe15141..b683415f80 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -3,7 +3,9 @@ #include "terminal.h" #include "assets/objects/object_fr/object_fr.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnFr_Init(Actor* thisx, PlayState* play); void EnFr_Destroy(Actor* thisx, PlayState* play); @@ -236,7 +238,7 @@ void EnFr_Init(Actor* thisx, PlayState* play) { this->actor.destroy = NULL; this->actor.draw = NULL; this->actor.update = EnFr_UpdateIdle; - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); this->actor.flags &= ~0; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_PROP); this->actor.textId = 0x40AC; @@ -278,7 +280,7 @@ void EnFr_Update(Actor* thisx, PlayState* play) { s32 pad2; if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; frogIndex = this->actor.params - 1; sEnFrPointers.frogs[frogIndex] = this; Actor_ProcessInitChain(&this->actor, sInitChain); 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 a1429d8c05..8069e6cb26 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -8,7 +8,9 @@ #include "assets/objects/object_fu/object_fu.h" #include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) #define FU_RESET_LOOK_ANGLE (1 << 0) #define FU_WAIT (1 << 1) diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index c6d3387194..bb11ab8f58 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -9,7 +9,9 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) void EnFw_Init(Actor* thisx, PlayState* play); void EnFw_Destroy(Actor* thisx, PlayState* play); 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 d22dbe06c2..af3ca60170 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -1,7 +1,9 @@ #include "z_en_fz.h" #include "assets/objects/object_fz/object_fz.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnFz_Init(Actor* thisx, PlayState* play); void EnFz_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index cc15ac714b..8cfec63ce1 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -12,7 +12,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum GSwitchMoveState { /* 0 */ MOVE_TARGET, diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 0153109acd..6e323a62c8 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -7,7 +7,7 @@ #include "z_en_ganon_mant.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGanonMant_Init(Actor* thisx, PlayState* play); void EnGanonMant_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 1a36f849ac..d64111fb9d 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -7,7 +7,7 @@ #include "z_en_ganon_organ.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGanonOrgan_Init(Actor* thisx, PlayState* play); void EnGanonOrgan_Destroy(Actor* thisx, PlayState* play); 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 bfd827349a..861bb4aaee 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -101,7 +101,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { this->actor.attentionRangeType = ATTENTION_RANGE_6; Actor_SetScale(&this->actor, 0.01f); - this->actor.uncullZoneForward = ((play->sceneId == SCENE_GERUDO_VALLEY) ? 1000.0f : 1200.0f); + this->actor.cullingVolumeDistance = ((play->sceneId == SCENE_GERUDO_VALLEY) ? 1000.0f : 1200.0f); switch (PARAMS_GET_U(this->actor.params, 0, 8)) { 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 da5b380082..5bdefc80f7 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "assets/objects/object_gla/object_gla.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define GE2_STATE_ANIMCOMPLETE (1 << 1) #define GE2_STATE_KO (1 << 2) @@ -124,9 +124,9 @@ void EnGe2_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.01f); if (play->sceneId == SCENE_GERUDO_VALLEY) { - this->actor.uncullZoneForward = 1000.0f; + this->actor.cullingVolumeDistance = 1000.0f; } else { - this->actor.uncullZoneForward = 1200.0f; + this->actor.cullingVolumeDistance = 1200.0f; } this->yDetectRange = (this->actor.world.rot.z + 1) * 40.0f; 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 c49252ace7..614936d3bc 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -8,7 +8,7 @@ #include "assets/objects/object_geldb/object_geldb.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGe3_Init(Actor* thisx, PlayState* play2); void EnGe3_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 4c1a386975..8ecd36af5e 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -7,7 +7,7 @@ #include "z_en_geldb.h" #include "assets/objects/object_geldb/object_geldb.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnGeldBAction { /* 0 */ GELDB_WAIT, 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 34bd2e0eb1..4261af7b18 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -7,7 +7,7 @@ #include "z_en_girla.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGirlA_Init(Actor* thisx, PlayState* play); void EnGirlA_Destroy(Actor* thisx, PlayState* play); @@ -982,7 +982,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) { ShopItemEntry* itemEntry = &sShopItemEntries[params]; if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->requiredObjectSlot; switch (this->actor.params) { case SI_KEATON_MASK: 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 f26c6db2ec..55c10f147d 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -9,7 +9,7 @@ #include "assets/objects/object_gm/object_gm.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGm_Init(Actor* thisx, PlayState* play); void EnGm_Destroy(Actor* thisx, PlayState* play); @@ -103,7 +103,7 @@ s32 func_80A3D7C8(void) { void func_80A3D838(EnGm* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->gmObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable, 18); gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[this->gmObjectSlot].segment); Animation_Change(&this->skelAnime, &object_gm_Anim_0002B8, 1.0f, 0.0f, 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 85470ab952..1de9faa7fb 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -7,7 +7,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGo_Init(Actor* thisx, PlayState* play); void EnGo_Destroy(Actor* thisx, PlayState* play); @@ -651,8 +653,8 @@ void EnGo_Init(Actor* thisx, PlayState* play) { } if (ENGO_GET_TYPE(this) && (ENGO_GET_TYPE(this) != ENGO_TYPE_DMT_BIGGORON)) { - this->actor.flags &= ~ACTOR_FLAG_4; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; } EnGo_ChangeAnim(this, ENGO_ANIM_UNCURL_SIT_STAND_DEFAULT); diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index f8a896194b..0fdac25abb 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -5,7 +5,9 @@ #include "quake.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) /* FLAGS @@ -1550,8 +1552,8 @@ void EnGo2_Init(Actor* thisx, PlayState* play) { case GORON_CITY_LOST_WOODS: case GORON_DMT_FAIRY_HINT: case GORON_MARKET_BAZAAR: - this->actor.flags &= ~ACTOR_FLAG_4; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; } EnGo2_SetColliderDim(this); diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 5791eccb67..06be045412 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -4,7 +4,9 @@ #include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGoma_Init(Actor* thisx, PlayState* play); void EnGoma_Destroy(Actor* thisx, PlayState* play); 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 acf8a7b615..923d4e3e70 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -11,7 +11,7 @@ #include "quake.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef s32 (*EnGoroiwaUnkFunc1)(EnGoroiwa* this, PlayState* play); typedef void (*EnGoroiwaUnkFunc2)(EnGoroiwa* this); @@ -536,9 +536,9 @@ void EnGoroiwa_SpawnFragments(EnGoroiwa* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -860, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -860, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; void EnGoroiwa_Init(Actor* thisx, PlayState* play) { 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 c1e9ed9d8d..46d470c330 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -356,8 +356,8 @@ void func_80A4ED34(EnGs* this, PlayState* play) { Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); if (this->unk_200++ >= 40) { this->unk_19E |= 0x10; - this->actor.flags |= ACTOR_FLAG_4; - this->actor.uncullZoneForward = 12000.0f; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.cullingVolumeDistance = 12000.0f; this->actor.gravity = 0.3f; this->unk_19F++; diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 5594103fd4..9bb3cb6783 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -9,7 +9,7 @@ #include "assets/objects/object_boj/object_boj.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGuest_Init(Actor* thisx, PlayState* play); void EnGuest_Destroy(Actor* thisx, PlayState* play); @@ -77,7 +77,7 @@ void EnGuest_Update(Actor* thisx, PlayState* play) { s32 pad; if (Object_IsLoaded(&play->objectCtx, this->osAnimeObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_ProcessInitChain(&this->actor, sInitChain); SkelAnime_InitFlex(play, &this->skelAnime, &gHylianMan2Skel, NULL, this->jointTable, this->morphTable, 16); 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 a339b3c3f4..6cdb51f59b 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -61,9 +61,9 @@ void EnHata_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, 0); CollisionHeader_GetVirtual(&gFlagpoleCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); - this->dyna.actor.uncullZoneScale = 500.0f; - this->dyna.actor.uncullZoneDownward = 550.0f; - this->dyna.actor.uncullZoneForward = 2200.0f; + this->dyna.actor.cullingVolumeScale = 500.0f; + this->dyna.actor.cullingVolumeDownward = 550.0f; + this->dyna.actor.cullingVolumeDistance = 2200.0f; this->invScale = 6; this->maxStep = 1000; this->minStep = 1; diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 71f5379cb5..0bc4ac8119 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -8,7 +8,7 @@ #include "assets/objects/object_sd/object_sd.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnHeishi1_Init(Actor* thisx, PlayState* play2); void EnHeishi1_Destroy(Actor* thisx, PlayState* play); @@ -404,9 +404,9 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); - this->actor.uncullZoneForward = 550.0f; - this->actor.uncullZoneScale = 350.0f; - this->actor.uncullZoneDownward = 700.0f; + this->actor.cullingVolumeDistance = 550.0f; + this->actor.cullingVolumeScale = 350.0f; + this->actor.cullingVolumeDownward = 700.0f; if (this->type != 5) { path = this->path * 2; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index b1ee099721..1622b2af67 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -112,7 +112,7 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) { this->actor.shape.rot.y = this->actor.world.rot.y; Collider_DestroyCylinder(play, &this->collider); Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_8); - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80A544AC; } } else { diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 898f4e120e..8a10e8f96e 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -136,7 +136,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, PlayState* play) { PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); #if OOT_PAL_N64 - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; #endif this->actionFunc = EnHeishi3_CatchStart; } @@ -167,7 +167,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, PlayState* play) { PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); #if OOT_PAL_N64 - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; #endif this->actionFunc = EnHeishi3_CatchStart; } diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 2b2b65d392..541e8b8519 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -170,7 +170,7 @@ void EnHintnuts_HitByScrubProjectile2(EnHintnuts* this) { } sPuzzleCounter--; } - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnHintnuts_BeginFreeze; } else { this->actionFunc = EnHintnuts_BeginRun; @@ -195,7 +195,7 @@ void EnHintnuts_SetupLeave(EnHintnuts* this, PlayState* play) { this->animFlagAndTimer = 100; this->actor.world.rot.y = this->actor.shape.rot.y; this->collider.base.ocFlags1 &= ~OC1_ON; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE); Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0x0, 0x0, 0x0, 0x3); // recovery heart @@ -451,7 +451,7 @@ void EnHintnuts_Freeze(EnHintnuts* this, PlayState* play) { Actor_Kill(&this->actor); } else { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.colChkInfo.health = sColChkInfoInit.health; this->actor.colorFilterTimer = 0; EnHintnuts_SetupWait(this); 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 c9af4d3b58..c17ff7e58f 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -1,6 +1,6 @@ #include "z_en_holl.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED /* * Horizontal holls parameters (`ENHOLL_H_*`) @@ -99,9 +99,9 @@ static EnHollActionFunc sActionFuncs[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; void EnHoll_SetupAction(EnHoll* this, EnHollActionFunc func) { 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 e0a1f34432..9a77366416 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define HONOTRAP_AT_ACTIVE (1 << 0) #define HONOTRAP_AC_ACTIVE (1 << 1) @@ -121,9 +121,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 9, 23, 1 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void EnHonotrap_FlameCollisionCheck(EnHonotrap* this, PlayState* play) { 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 843427fc8b..d6b8ac8870 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 @@ #include "assets/objects/object_hni/object_hni.h" #include "assets/scenes/overworld/spot09/spot09_scene.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef void (*EnHorseCsFunc)(EnHorse*, PlayState*, CsCmdActorCue*); typedef void (*EnHorseActionFunc)(EnHorse*, PlayState*); @@ -370,8 +370,8 @@ static RaceInfo sIngoRace = { ARRAY_COUNT(sIngoRaceWaypoints), sIngoRaceWaypoint static s32 sAnimSoundFrames[] = { 0, 16 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; static u8 sResetNoInput[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0 }; @@ -645,7 +645,7 @@ int func_80A5BBBC(PlayState* play, EnHorse* this, Vec3f* pos) { return false; } eyeDist = Math3D_Vec3f_DistXYZ(pos, &play->view.eye); - return func_800314D4(play, &this->actor, &sp24, sp20) || eyeDist < 100.0f; + return Actor_CullingVolumeTest(play, &this->actor, &sp24, sp20) || eyeDist < 100.0f; } void EnHorse_IdleAnimSounds(EnHorse* this, PlayState* play) { 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 839b25df2b..373e66d622 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 @@ -7,7 +7,7 @@ #include "z_en_horse_game_check.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define AT_FINISH_LINE(actor) \ (Math3D_PointInSquare2D(sFinishLine[0], sFinishLine[1], sFinishLine[2], sFinishLine[3], (actor)->world.pos.x, \ diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 0612993947..0ce01f2d6e 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -7,7 +7,7 @@ #include "z_en_horse_ganon.h" #include "assets/objects/object_horse_ganon/object_horse_ganon.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef struct unk_D_80A69248 { /* 0x0 */ Vec3s unk_0; @@ -102,7 +102,7 @@ static unk_D_80A69248 D_80A69248[] = { static s32 D_80A692B8[] = { 0, 16 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; static EnHorseGanonActionFunc sActionFuncs[] = { func_80A68AF0, func_80A68DB0 }; 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 c23c2a68de..cb5d43de88 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 @@ -7,7 +7,7 @@ #include "z_en_horse_link_child.h" #include "assets/objects/object_horse_link_child/object_horse_link_child.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnHorseLinkChild_Init(Actor* thisx, PlayState* play); void EnHorseLinkChild_Destroy(Actor* thisx, PlayState* play); @@ -136,7 +136,7 @@ f32 func_80A695A4(EnHorseLinkChild* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; void EnHorseLinkChild_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 79e8998762..30d3b7c4b4 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -177,8 +177,8 @@ f32 func_80A6B30C(EnHorseNormal* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; void EnHorseNormal_Init(Actor* thisx, PlayState* play) { @@ -276,7 +276,7 @@ void EnHorseNormal_Destroy(Actor* thisx, PlayState* play) { } void func_80A6B91C(EnHorseNormal* this, PlayState* play) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->action = HORSE_FOLLOW_PATH; this->animationIdx = 6; this->waypoint = 0; @@ -520,7 +520,7 @@ void func_80A6C6B0(EnHorseNormal* this) { this->unk_218 = 0.0f; this->unk_21C = 0; this->unk_21E = 0; - this->actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; Animation_Change(&this->skin.skelAnime, sAnimations[this->animationIdx], func_80A6B30C(this), 0.0f, Animation_GetLastFrame(sAnimations[this->animationIdx]), ANIMMODE_ONCE, 0.0f); } diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index dd8068cd2c..04b7b19336 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -7,7 +7,7 @@ #include "z_en_horse_zelda.h" #include "assets/objects/object_horse_zelda/object_horse_zelda.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnHorseZelda_Init(Actor* thisx, PlayState* play); void EnHorseZelda_Destroy(Actor* thisx, PlayState* play); @@ -97,7 +97,7 @@ static HorsePosSpeed sHorseFieldPositions[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; static EnHorseZeldaActionFunc sActionFuncs[] = { diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index b861717e86..10af2a5899 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -16,7 +16,7 @@ #include "assets/objects/object_cob/object_cob.h" #include "assets/objects/object_os_anime/object_os_anime.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHy_Init(Actor* thisx, PlayState* play); void EnHy_Destroy(Actor* thisx, PlayState* play); @@ -1160,8 +1160,8 @@ void EnHy_WaitForObjects(EnHy* this, PlayState* play) { Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, sModelInfo[ENHY_GET_TYPE(&this->actor)].animInfoIndex); if ((play->sceneId == SCENE_BACK_ALLEY_DAY) || (play->sceneId == SCENE_MARKET_DAY)) { - this->actor.flags &= ~ACTOR_FLAG_4; - this->actor.uncullZoneScale = 0.0f; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.cullingVolumeScale = 0.0f; } if (play->sceneId == SCENE_KAKARIKO_CENTER_GUEST_HOUSE) { diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 386b8c5e26..a0fc6e7bde 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -79,21 +79,21 @@ static ColliderCylinderInit sCylinderInitDroppedFlame = { static InitChainEntry sInitChainCapturableFlame[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_0, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainDroppedFlame[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static InitChainEntry sInitChainSmallFlame[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; f32 EnIceHono_XZDistanceSquared(Vec3f* v1, Vec3f* v2) { 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 47b89c6fbf..e95e5d4fac 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -10,7 +10,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef void (*EnIkDrawFunc)(struct EnIk*, PlayState*); 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 acb7c46e39..ad0e606379 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -3,7 +3,7 @@ #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "assets/objects/object_in/object_in.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnIn_Init(Actor* thisx, PlayState* play); void EnIn_Destroy(Actor* thisx, PlayState* play); 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 991c9de3ca..5fcc053a69 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -94,9 +94,9 @@ static u16 sInitInsectFlags[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 20, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 20, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_STOP), }; void EnInsect_InitFlags(EnInsect* this) { @@ -203,7 +203,7 @@ void EnInsect_Init(Actor* thisx, PlayState* play2) { if (this->insectFlags & INSECT_FLAG_IS_SHORT_LIVED) { this->lifeTimer = Rand_S16Offset(200, 40); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } if (type == INSECT_TYPE_FIRST_DROPPED || type == INSECT_TYPE_EXTRA_DROPPED) { 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 b2f0aa73f7..9fb7bd587c 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -293,16 +293,16 @@ static InitChainEntry sInitChains[][5] = { { ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }, { ICHAIN_F32_DIV1000(gravity, -2500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }, }; @@ -312,7 +312,7 @@ void EnIshi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChains[type]); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } if (this->actor.shape.rot.y == 0) { this->actor.shape.rot.y = this->actor.world.rot.y = Rand_ZeroFloat(0x10000); @@ -382,7 +382,7 @@ void EnIshi_Wait(EnIshi* this, PlayState* play) { void EnIshi_SetupLiftedUp(EnIshi* this) { this->actionFunc = EnIshi_LiftedUp; this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnIshi_LiftedUp(EnIshi* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index a0fc355728..f758cbc18c 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -8,7 +8,7 @@ #include "assets/objects/object_jj/object_jj.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum EnJjEyeState { /* 0 */ JABUJABU_EYE_OPEN, @@ -68,9 +68,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 87, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 3300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_STOP), }; void EnJj_SetupAction(EnJj* this, EnJjActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index f621913306..45a9390f63 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -8,9 +8,9 @@ #include "terminal.h" #include "assets/objects/object_ka/object_ka.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ - ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) static ColliderCylinderInit sCylinderInit = { { 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 a1a0369a4a..d3dce9d5aa 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -10,7 +10,7 @@ #include "assets/objects/object_kanban/object_kanban.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define PART_UPPER_LEFT (1 << 0) #define PART_LEFT_UPPER (1 << 1) 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 f17108e82e..cdba59e661 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -178,7 +178,7 @@ void EnKarebaba_SetupDying(EnKarebaba* this) { this->actor.world.rot.y = this->actor.shape.rot.y + 0x8000; this->actor.speed = 3.0f; Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_JR_DEAD); - this->actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnKarebaba_Dying; } @@ -191,7 +191,7 @@ void EnKarebaba_SetupDeadItemDrop(EnKarebaba* this, PlayState* play) { this->actor.shape.shadowScale = 3.0f; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_MISC); this->actor.params = 200; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnKarebaba_DeadItemDrop; } @@ -399,7 +399,7 @@ void EnKarebaba_Regrow(EnKarebaba* this, PlayState* play) { this->actor.world.pos.y = this->actor.home.pos.y + (14.0f * scaleFactor); if (this->actor.params == 20) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); EnKarebaba_SetupIdle(this); diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 006a06e64d..d203276fbe 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -12,7 +12,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define ENKO_TYPE PARAMS_GET_S(this->actor.params, 0, 8) #define ENKO_PATH PARAMS_GET_S(this->actor.params, 8, 8) @@ -1171,7 +1171,7 @@ void EnKo_Destroy(Actor* thisx, PlayState* play) { void func_80A99048(EnKo* this, PlayState* play) { if (EnKo_IsOsAnimeLoaded(this, play) && EnKo_AreObjectsLoaded(this, play)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->legsObjectSlot; gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[this->actor.objectSlot].segment); SkelAnime_InitFlex(play, &this->skelAnime, sSkeleton[sModelInfo[ENKO_TYPE].legsId].flexSkeletonHeader, NULL, 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 5f865d2387..0d938f45c6 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -12,7 +12,7 @@ #include "assets/objects/object_kusa/object_kusa.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnKusa_Init(Actor* thisx, PlayState* play); void EnKusa_Destroy(Actor* thisx, PlayState* play2); @@ -88,8 +88,8 @@ static s16 sFragmentScales[] = { 108, 102, 96, 84, 66, 55, 42, 38 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -3200, ICHAIN_CONTINUE), - ICHAIN_F32_DIV1000(minVelocityY, -17000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 120, ICHAIN_STOP), + ICHAIN_F32_DIV1000(minVelocityY, -17000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 120, ICHAIN_STOP), }; void EnKusa_SetupAction(EnKusa* this, EnKusaActionFunc actionFunc) { @@ -234,7 +234,7 @@ void EnKusa_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } EnKusa_InitCollider(thisx, play); @@ -286,13 +286,13 @@ void EnKusa_WaitForObject(EnKusa* this, PlayState* play) { this->actor.draw = EnKusa_Draw; this->actor.objectSlot = this->requiredObjectSlot; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } void EnKusa_SetupMain(EnKusa* this) { EnKusa_SetupAction(this, EnKusa_Main); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnKusa_Main(EnKusa* this, PlayState* play) { @@ -340,7 +340,7 @@ void EnKusa_Main(EnKusa* this, PlayState* play) { void EnKusa_SetupLiftedUp(EnKusa* this) { EnKusa_SetupAction(this, EnKusa_LiftedUp); this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnKusa_LiftedUp(EnKusa* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index ab27f30954..c2b6ca1d6c 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -7,7 +7,7 @@ #include "z_en_lightbox.h" #include "assets/objects/object_lightbox/object_lightbox.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnLightbox_Init(Actor* thisx, PlayState* play); void EnLightbox_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index f8c42427d0..d0c16c3a72 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -7,9 +7,9 @@ #include "z_en_ma1.h" #include "assets/objects/object_ma1/object_ma1.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnMa1_Init(Actor* thisx, PlayState* play); void EnMa1_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 7131f697b5..a4a4a17049 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -1,9 +1,9 @@ #include "z_en_ma2.h" #include "assets/objects/object_ma2/object_ma2.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnMa2_Init(Actor* thisx, PlayState* play); void EnMa2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 6b7297223a..69dc0d907a 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -8,7 +8,9 @@ #include "assets/objects/object_ma2/object_ma2.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnMa3_Init(Actor* thisx, PlayState* play); void EnMa3_Destroy(Actor* thisx, PlayState* play); 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 6d992e457f..03a6851ef7 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 @@ #endif #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnMag_Init(Actor* thisx, PlayState* play); void EnMag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index ac745b9dbf..1e97b32486 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -15,7 +15,7 @@ * - "Spear Patrol" (variable 0xPP00 PP=pathId): uses a spear, patrols following a path, charges */ -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnMbType { /* -1 */ ENMB_TYPE_SPEAR_GUARD = -1, @@ -293,9 +293,9 @@ void EnMb_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.02f); this->bodyCollider.dim.height = 170; this->bodyCollider.dim.radius = 45; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 800.0f; - this->actor.uncullZoneDownward = 1800.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 800.0f; + this->actor.cullingVolumeDownward = 1800.0f; this->playerDetectionRange = 710.0f; this->attackCollider.elem.atDmgInfo.dmgFlags = DMG_UNBLOCKABLE; diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index fc0a21642f..93ba4f894c 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -8,7 +8,9 @@ #include "assets/objects/object_md/object_md.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnMd_Init(Actor* thisx, PlayState* play); void EnMd_Destroy(Actor* thisx, PlayState* play); 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 ab748fe164..df17b239f4 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -7,7 +7,7 @@ #include "z_en_mk.h" #include "assets/objects/object_mk/object_mk.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMk_Init(Actor* thisx, PlayState* play); void EnMk_Destroy(Actor* thisx, PlayState* play); 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 1053bfb0af..b081f8304c 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mm/object_mm.h" #include "assets/objects/object_link_child/object_link_child.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum RunningManAnimIndex { /* 0 */ RM_ANIM_RUN, @@ -130,7 +130,7 @@ static EnMmPathInfo sPathInfo[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void EnMm_ChangeAnim(EnMm* this, s32 index, s32* currentIndex) { 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 f4876f70ed..28901f464d 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "assets/objects/object_mm/object_mm.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum RunningManAnimIndex { /* 0 */ RM2_ANIM_RUN, @@ -75,7 +75,7 @@ static AnimationSpeedInfo sAnimationInfo[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void EnMm2_ChangeAnim(EnMm2* this, s32 index, s32* currentIndex) { 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 d074cdee65..983af06780 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -9,7 +9,7 @@ #include "assets/objects/object_nb/object_nb.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum EnNbAction { /* 0x00 */ NB_CHAMBER_INIT, 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 96c00b42e6..88ec34a096 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -10,7 +10,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnNiw_Init(Actor* thisx, PlayState* play); void EnNiw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index dab07959e4..6af946ddeb 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -8,7 +8,7 @@ #include "assets/objects/object_gr/object_gr.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNiwGirl_Init(Actor* thisx, PlayState* play); void EnNiwGirl_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 02887234c5..2f650637c7 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -5,7 +5,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNiwLady_Init(Actor* thisx, PlayState* play); void EnNiwLady_Destroy(Actor* thisx, PlayState* play); @@ -88,7 +88,7 @@ void EnNiwLady_Init(Actor* thisx, PlayState* play) { PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n" VT_RST, this->unk_278); PRINTF("\n\n"); this->actionFunc = func_80AB9F24; - thisx->uncullZoneForward = 600.0f; + thisx->cullingVolumeDistance = 600.0f; } void EnNiwLady_Destroy(Actor* thisx, PlayState* play) { 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 016501b5fa..114971a1de 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 @@ #include "assets/objects/object_dns/object_dns.h" #include "assets/objects/object_dnk/object_dnk.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnNutsball_Init(Actor* thisx, PlayState* play); void EnNutsball_Destroy(Actor* thisx, PlayState* play); 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 00ba57f4ad..a990438adb 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -7,7 +7,7 @@ #include "z_en_nwc.h" #include "assets/objects/object_nwc/object_nwc.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnNwc_Init(Actor* thisx, PlayState* play); void EnNwc_Destroy(Actor* thisx, PlayState* play); 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 f336eda447..40eef58eb4 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 @@ -10,7 +10,7 @@ #include "z64frame_advance.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnOkarinaEffect_Init(Actor* thisx, PlayState* play); void EnOkarinaEffect_Destroy(Actor* thisx, PlayState* play); 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 b8898c3d58..308098c185 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 @@ -10,7 +10,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnOkarinaTag_Init(Actor* thisx, PlayState* play); void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play); 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 0360e73379..0baff94145 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -146,7 +146,7 @@ void EnOkuta_Init(Actor* thisx, PlayState* play) { } else { ActorShape_Init(&thisx->shape, 1100.0f, ActorShadow_DrawCircle, 18.0f); thisx->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - thisx->flags |= ACTOR_FLAG_4; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, thisx, &sProjectileColliderInit); Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_PROP); 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 28713a4122..2016b3bafb 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -14,7 +14,7 @@ #include "assets/objects/object_masterzoora/object_masterzoora.h" #include "assets/objects/object_masterkokirihead/object_masterkokirihead.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #if !PLATFORM_GC #define CURSOR_COLOR_R 0 @@ -877,18 +877,18 @@ void EnOssan_TryPaybackMask(EnOssan* this, PlayState* play) { Rupees_ChangeBy(-price); if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD) { - SET_EVENTCHKINF(EVENTCHKINF_8F); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_BUNNY_HOOD); Message_ContinueTextbox(play, 0x70A9); this->happyMaskShopState = OSSAN_HAPPY_STATE_ALL_MASKS_SOLD; return; } if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK) { - SET_EVENTCHKINF(EVENTCHKINF_8C); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_KEATON_MASK); } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK) { - SET_EVENTCHKINF(EVENTCHKINF_8E); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SPOOKY_MASK); } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK) { - SET_EVENTCHKINF(EVENTCHKINF_8D); + SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SKULL_MASK); } Message_ContinueTextbox(play, 0x70A7); @@ -2059,7 +2059,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { if (this->actor.params == OSSAN_TYPE_MASK) { if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) { if (GET_ITEMGETINF(ITEMGETINF_3B)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8F)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_BUNNY_HOOD)) { // Pay back Bunny Hood this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD; return 0x70C6; @@ -2068,7 +2068,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { } } if (GET_ITEMGETINF(ITEMGETINF_3A)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8E)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SPOOKY_MASK)) { // Pay back Spooky Mask this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK; return 0x70C5; @@ -2077,7 +2077,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { } } if (GET_ITEMGETINF(ITEMGETINF_39)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8D)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SKULL_MASK)) { // Pay back Skull Mask this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK; return 0x70C4; @@ -2086,7 +2086,7 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) { } } if (GET_ITEMGETINF(ITEMGETINF_38)) { - if (!GET_EVENTCHKINF(EVENTCHKINF_8C)) { + if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_KEATON_MASK)) { // Pay back Keaton Mask this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK; return 0x70A5; @@ -2120,7 +2120,7 @@ void EnOssan_InitActionFunc(EnOssan* this, PlayState* play) { ShopItem* items; if (EnOssan_AreShopkeeperObjectsLoaded(this, play)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->objectSlot1; Actor_SetObjectDependency(play, &this->actor); 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 78b170c63d..c5ed802b70 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -10,7 +10,7 @@ #include "assets/scenes/overworld/spot16/spot16_scene.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnOwl_Init(Actor* thisx, PlayState* play); void EnOwl_Destroy(Actor* thisx, PlayState* play); @@ -99,9 +99,9 @@ static ColliderCylinderInit sOwlCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 25, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2400, ICHAIN_STOP), }; void EnOwl_Init(Actor* thisx, PlayState* play) { @@ -146,7 +146,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { switch (owlType) { case OWL_DEFAULT: this->actionFunc = EnOwl_WaitDefault; - this->actor.uncullZoneForward = 4000.0f; + this->actor.cullingVolumeDistance = 4000.0f; this->unk_40A = 0; break; case OWL_OUTSIDE_KOKIRI: @@ -833,7 +833,7 @@ void func_80ACBAB8(EnOwl* this, PlayState* play) { } void func_80ACBC0C(EnOwl* this, PlayState* play) { - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (this->actor.xzDistToPlayer > 6000.0f && !(this->actionFlags & 0x80)) { Actor_Kill(&this->actor); 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 9651575806..215442f52e 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -8,7 +8,7 @@ #include "assets/objects/object_tite/object_tite.h" #include "assets/objects/object_ik/object_ik.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnPart_Init(Actor* thisx, PlayState* play); void EnPart_Destroy(Actor* thisx, PlayState* play); 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 8761c568d0..6265f2c5f3 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -3,7 +3,9 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) #define GROUND_HOVER_HEIGHT 75.0f #define MAX_LARVA 3 @@ -211,15 +213,15 @@ void EnPeehat_Init(Actor* thisx, PlayState* play) { this->actor.naviEnemyId = NAVI_ENEMY_PEAHAT; this->xzDistToRise = 740.0f; this->xzDistMax = 1200.0f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 800.0f; - this->actor.uncullZoneDownward = 1800.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 800.0f; + this->actor.cullingVolumeDownward = 1800.0f; switch (this->actor.params) { case PEAHAT_TYPE_GROUNDED: EnPeehat_Ground_SetStateGround(this); break; case PEAHAT_TYPE_FLYING: - this->actor.uncullZoneForward = 4200.0f; + this->actor.cullingVolumeDistance = 4200.0f; this->xzDistToRise = 2800.0f; this->xzDistMax = 1400.0f; EnPeehat_Flying_SetStateGround(this); @@ -983,7 +985,7 @@ void EnPeehat_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->colQuad.base); } // if PEAHAT_TYPE_GROUNDED - if (thisx->params < 0 && (thisx->flags & ACTOR_FLAG_6)) { + if (thisx->params < 0 && (thisx->flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { for (i = 1; i >= 0; i--) { poly = NULL; posB = &this->bladeTip[i]; diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index d6c5348862..fefa80aecc 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -7,7 +7,7 @@ #include "z_en_po_desert.h" #include "assets/objects/object_po_field/object_po_field.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_REACT_TO_LENS | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_REACT_TO_LENS | ACTOR_FLAG_IGNORE_QUAKE) void EnPoDesert_Init(Actor* thisx, PlayState* play); void EnPoDesert_Destroy(Actor* thisx, PlayState* play); @@ -53,7 +53,7 @@ static ColliderCylinderInit sColliderInit = { static InitChainEntry sInitChain[] = { ICHAIN_S8(naviEnemyId, NAVI_ENEMY_POE_WASTELAND, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 3200, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 8c694c46fd..b4de777c72 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -8,8 +8,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_field/object_po_field.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE) void EnPoField_Init(Actor* thisx, PlayState* play); void EnPoField_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index e79cec70c7..e515efabed 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -8,9 +8,9 @@ #include "overlays/actors/ovl_En_Honotrap/z_en_honotrap.h" #include "assets/objects/object_tk/object_tk.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_IGNORE_QUAKE | \ - ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED) void EnPoRelay_Init(Actor* thisx, PlayState* play); void EnPoRelay_Destroy(Actor* thisx, PlayState* play); 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 71ab72ebb4..3af363a28f 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 @@ -8,9 +8,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | \ - ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) void EnPoSisters_Init(Actor* thisx, PlayState* play); void EnPoSisters_Destroy(Actor* thisx, PlayState* play); 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 ceebba950c..2168c89e6b 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -8,7 +8,8 @@ #include "assets/objects/object_poh/object_poh.h" #include "assets/objects/object_po_composer/object_po_composer.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE) void EnPoh_Init(Actor* thisx, PlayState* play); void EnPoh_Destroy(Actor* thisx, PlayState* play); @@ -372,7 +373,7 @@ void EnPoh_SetupDeath(EnPoh* this, PlayState* play) { this->actor.draw = EnPoh_DrawSoul; this->actor.shape.shadowDraw = NULL; Actor_SetScale(&this->actor, 0.01f); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.gravity = -1.0f; this->actor.shape.yOffset = 1500.0f; this->actor.world.pos.y -= 15.0f; @@ -924,7 +925,7 @@ void EnPoh_Update(Actor* thisx, PlayState* play) { this->colliderCyl.dim.height = 55; this->colliderCyl.dim.yShift = 15; } - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnPoh_SetupInitialAction(this); } } diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index d9441d5506..495046f95d 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -7,7 +7,7 @@ #include "z_en_pu_box.h" #include "assets/objects/object_pu_box/object_pu_box.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnPubox_Init(Actor* thisx, PlayState* play); void EnPubox_Destroy(Actor* thisx, PlayState* play); @@ -48,8 +48,8 @@ void EnPubox_Init(Actor* thisx, PlayState* play) { this->unk_164 = 1; thisx->colChkInfo.cylRadius = 20; thisx->colChkInfo.cylHeight = 50; - thisx->uncullZoneDownward = 1200.0f; - thisx->uncullZoneScale = 720.0f; + thisx->cullingVolumeDownward = 1200.0f; + thisx->cullingVolumeScale = 720.0f; ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 6.0f); this->dyna.interactFlags = 0; this->dyna.transformFlags = 0; 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 89c9e5ff6b..ee6734ea64 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -1,7 +1,9 @@ #include "z_en_rd.h" #include "assets/objects/object_rd/object_rd.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnRd_Init(Actor* thisx, PlayState* play); void EnRd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index f36cfabbd2..1fbcc178ad 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -10,7 +10,9 @@ #include "terminal.h" #include "assets/objects/object_reeba/object_reeba.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void EnReeba_Init(Actor* thisx, PlayState* play); void EnReeba_Destroy(Actor* thisx, PlayState* play); 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 8aa760ecaf..a3861adec4 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 @@ -6,7 +6,7 @@ #include "z_en_river_sound.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnRiverSound_Init(Actor* thisx, PlayState* play); void EnRiverSound_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 8271dc4a6c..6d79ef6288 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -8,7 +8,7 @@ #include "terminal.h" #include "assets/objects/object_rl/object_rl.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnRl_Init(Actor* thisx, PlayState* play); void EnRl_Destroy(Actor* thisx, PlayState* play); 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 0708af32ef..ff67d09329 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -9,8 +9,9 @@ #include "terminal.h" #include "versions.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) #define RR_MESSAGE_SHIELD (1 << 0) #define RR_MESSAGE_TUNIC (1 << 1) diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 2ea4e87dd3..db4adcbf62 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -10,7 +10,7 @@ #include "versions.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void EnRu1_Init(Actor* thisx, PlayState* play); void EnRu1_Destroy(Actor* thisx, PlayState* play); @@ -2155,7 +2155,7 @@ void func_80AEFCE8(EnRu1* this, PlayState* play) { void func_80AEFD38(EnRu1* this, PlayState* play) { if (GET_EVENTCHKINF(EVENTCHKINF_37) && LINK_IS_CHILD) { func_80AEB264(this, &gRutoChildWait2Anim, 0, 0, 0); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->action = 44; this->drawConfig = 1; } else { diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 23b21eeae8..eff82bc1ec 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnRu2_Init(Actor* thisx, PlayState* play); void EnRu2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 67076188b4..79cba6bbb8 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -4,7 +4,9 @@ #include "assets/scenes/overworld/spot04/spot04_scene.h" #include "assets/scenes/overworld/spot05/spot05_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnSa_Init(Actor* thisx, PlayState* play); void EnSa_Destroy(Actor* thisx, PlayState* play); @@ -503,7 +505,7 @@ void EnSa_Init(Actor* thisx, PlayState* play) { case 4: this->unk_210 = 0; this->actor.gravity = -1.0f; - play->csCtx.script = SEGMENTED_TO_VIRTUAL(gSpot04Cs_10E20); + play->csCtx.script = SEGMENTED_TO_VIRTUAL(gKokiriForestSariaGreetingCs); gSaveContext.cutsceneTrigger = 1; EnSa_ChangeAnim(this, ENSA_ANIM1_4); this->actionFunc = func_80AF68E4; 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 4452c86610..62bd38cc11 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -6,7 +6,7 @@ #include "z_en_sda.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSda_Init(Actor* thisx, PlayState* play); void EnSda_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 20a655101a..1a1093f229 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -7,7 +7,7 @@ #include "z_en_siofuki.h" #include "assets/objects/object_siofuki/object_siofuki.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSiofuki_Init(Actor* thisx, PlayState* play); void EnSiofuki_Destroy(Actor* thisx, PlayState* play); 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 da5b8bd4bc..1a61fcfb9d 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "assets/objects/object_skb/object_skb.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum StalchildBehavior { SKB_BEHAVIOR_BURIED, diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 84d29be6a7..2c576afbcb 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -2,7 +2,9 @@ #include "overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h" #include "assets/objects/object_skj/object_skj.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnSkj_Init(Actor* thisx, PlayState* play2); void EnSkj_Destroy(Actor* thisx, PlayState* play); 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 3d9c998742..09b9df91c1 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -1,7 +1,9 @@ #include "z_en_ssh.h" #include "assets/objects/object_ssh/object_ssh.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define SSH_STATE_STUNNED (1 << 0) #define SSH_STATE_GROUND_START (1 << 2) 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 d1dd84467d..d7b6a20e50 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -7,7 +7,9 @@ #include "z_en_st.h" #include "assets/objects/object_st/object_st.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSt_Init(Actor* thisx, PlayState* play); void EnSt_Destroy(Actor* thisx, PlayState* play); 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 1d42d4c43c..e4ad439806 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -9,7 +9,7 @@ #include "assets/objects/object_ahg/object_ahg.h" #include "assets/objects/object_boj/object_boj.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnSth_Init(Actor* thisx, PlayState* play); void EnSth_Destroy(Actor* thisx, PlayState* play); 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 57ff345d61..dc73048393 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -7,7 +7,7 @@ #include "z_en_stream.h" #include "assets/objects/object_stream/object_stream.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnStream_Init(Actor* thisx, PlayState* play); void EnStream_Destroy(Actor* thisx, PlayState* play); 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 7f18de1528..b9b6b47c94 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1,7 +1,7 @@ #include "z_en_sw.h" #include "assets/objects/object_st/object_st.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnSw_Init(Actor* thisx, PlayState* play); void EnSw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 832a1f1baf..ed7d99541f 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -4,7 +4,7 @@ #include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" #include "overlays/actors/ovl_En_G_Switch/z_en_g_switch.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum EnSyatekItemRound { SYATEKI_ROUND_GREEN_APPEAR, 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 e768c2cc14..5575182fe6 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 @@ -3,7 +3,9 @@ #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h" #include "assets/objects/object_ossan/object_ossan.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_LOCK_ON_DISABLED) typedef enum EnSyatekiManGameResult { /* 0 */ SYATEKI_RESULT_NONE, diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 566a866f9a..67d21f2311 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -8,7 +8,7 @@ #include "assets/objects/object_niw/object_niw.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnSyatekiNiw_Init(Actor* thisx, PlayState* play); void EnSyatekiNiw_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index c94f1acef9..90c9465404 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -219,7 +219,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { Actor_Kill(&this->actor); } else { if (IS_DAY) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->superCuccoTimers[0] = this->superCuccoTimers[1] = this->superCuccoTimers[2] = 7; this->superCuccos[0] = (EnNiw*)Actor_Spawn( &play->actorCtx, play, ACTOR_EN_NIW, this->actor.world.pos.x + 5.0f, @@ -501,7 +501,7 @@ void EnTa_RunAwayStart(EnTa* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_VO_TA_CRY_1); EnTa_SetupAction(this, EnTa_RunAwayRunSouth, EnTa_AnimRepeatCurrent); this->timer = 65; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 87e2b836ea..bcc60b5f1a 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -9,8 +9,9 @@ #include "versions.h" #include "assets/objects/object_ts/object_ts.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnTakaraMan_Init(Actor* thisx, PlayState* play); void EnTakaraMan_Destroy(Actor* thisx, PlayState* play); 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 b3a7fc6ccf..13002ddc54 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -7,7 +7,7 @@ #include "z_en_test.h" #include "assets/objects/object_sk2/object_sk2.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnTest_Init(Actor* thisx, PlayState* play); void EnTest_Destroy(Actor* thisx, PlayState* play); 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 2471e1e371..b253b7ea0b 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -10,7 +10,7 @@ #include "terminal.h" #include "assets/objects/object_tite/object_tite.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) // EnTite_Idle #define vIdleTimer actionVar1 @@ -364,7 +364,7 @@ void EnTite_Attack(EnTite* this, PlayState* play) { func_800355B8(play, &this->backLeftFootPos); } } - if (!(this->collider.base.atFlags & AT_HIT) && (this->actor.flags & ACTOR_FLAG_6)) { + if (!(this->collider.base.atFlags & AT_HIT) && (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); } else { Player* player = GET_PLAYER(play); 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 bef80ab310..53243d29a8 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -8,7 +8,9 @@ #include "assets/objects/object_torch2/object_torch2.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum EnTorch2ActionStates { /* 0 */ ENTORCH2_WAIT, diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index cadc1f45da..79500059b5 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -154,7 +154,7 @@ void EnTp_Init(Actor* thisx, PlayState* play2) { this->collider.elements[0].dim.modelSphere.radius = this->collider.elements[0].dim.worldSphere.radius = 8; EnTp_Head_SetupWait(this); this->actor.focus.pos = this->actor.world.pos; - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_SetScale(&this->actor, 1.5f); for (i = 0; i <= 6; i++) { @@ -171,7 +171,8 @@ void EnTp_Init(Actor* thisx, PlayState* play2) { Actor_SetScale(&next->actor, 0.3f); if (i == 2) { - next->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4; + next->actor.flags |= + ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED; next->unk_150 = 1; // Why? } diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index e2d612d61b..6cd63e00f8 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -7,7 +7,7 @@ #include "z_en_tr.h" #include "assets/objects/object_tr/object_tr.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnTr_Init(Actor* thisx, PlayState* play); void EnTr_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 420e5a1ca1..640332ecba 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -7,7 +7,7 @@ #include "z_en_trap.h" #include "assets/objects/object_trap/object_trap.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define BEGIN_MOVE_OUT 65535.0f 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 c122d39684..8db28db170 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 @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnTuboTrap_Init(Actor* thisx, PlayState* play); void EnTuboTrap_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index be03eb1644..fa83618611 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -7,7 +7,8 @@ #include "z_en_vali.h" #include "assets/objects/object_vali/object_vali.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE) void EnVali_Init(Actor* thisx, PlayState* play); void EnVali_Destroy(Actor* thisx, PlayState* play); @@ -197,7 +198,7 @@ void EnVali_SetupFloatIdle(EnVali* this) { this->leftArmCollider.dim.quad[1].y = this->rightArmCollider.dim.quad[0].y = this->rightArmCollider.dim.quad[1].y = this->actor.world.pos.y - 10.0f; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->bodyCollider.base.acFlags |= AC_ON; this->slingshotReactionTimer = 0; this->floatHomeHeight = this->actor.world.pos.y; @@ -274,7 +275,7 @@ void EnVali_SetupFrozen(EnVali* this) { void EnVali_SetupReturnToLurk(EnVali* this) { Animation_MorphToPlayOnce(&this->skelAnime, &gBariLurkingAnim, 10.0f); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actionFunc = EnVali_ReturnToLurk; } diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index 065013bb52..9861413414 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -7,7 +7,7 @@ #include "z_en_vase.h" #include "assets/objects/object_vase/object_vase.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnVase_Init(Actor* thisx, PlayState* play); void EnVase_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 1a8f8d2275..e31e9ca9a7 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnVbBall_Init(Actor* thisx, PlayState* play); void EnVbBall_Destroy(Actor* thisx, PlayState* play); 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 0b0594ed86..c7a231c0a2 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -16,7 +16,7 @@ #include "assets/objects/object_ganon/object_ganon.h" #include "assets/objects/object_opening_demo1/object_opening_demo1.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnViewer_Init(Actor* thisx, PlayState* play); void EnViewer_Destroy(Actor* thisx, PlayState* play); @@ -44,7 +44,7 @@ ActorProfile En_Viewer_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_STOP), }; static EnViewerInitData sInitData[] = { @@ -176,7 +176,7 @@ void EnViewer_InitImpl(EnViewer* this, PlayState* play) { if (!Object_IsLoaded(&play->objectCtx, skelObjectSlot) || !Object_IsLoaded(&play->objectCtx, this->animObjectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_6; + this->actor.flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; return; } @@ -209,9 +209,9 @@ void EnViewer_UpdateImpl(EnViewer* this, PlayState* play) { } } else if (type == ENVIEWER_TYPE_7_GANONDORF) { Actor_SetScale(&this->actor, 0.3f); - this->actor.uncullZoneForward = 10000.0f; - this->actor.uncullZoneScale = 10000.0f; - this->actor.uncullZoneDownward = 10000.0f; + this->actor.cullingVolumeDistance = 10000.0f; + this->actor.cullingVolumeScale = 10000.0f; + this->actor.cullingVolumeDownward = 10000.0f; } else if (type == ENVIEWER_TYPE_3_GANONDORF) { if (gSaveContext.sceneLayer == 4) { switch (play->csCtx.curFrame) { 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 1fe315ae2f..9847d4fa8d 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnVm_Init(Actor* thisx, PlayState* play); void EnVm_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index 0513d161cc..2824daa4cb 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnWallTubo_Init(Actor* thisx, PlayState* play); void EnWallTubo_Destroy(Actor* thisx, PlayState* play); 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 7346278053..abbf3ecaa0 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -8,7 +8,7 @@ #include "assets/objects/object_wallmaster/object_wallmaster.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define TIMER_SCALE ((f32)OS_CLOCK_RATE / 10000000000) @@ -151,7 +151,7 @@ void EnWallmas_TimerInit(EnWallmas* this, PlayState* play) { Player* player = GET_PLAYER(play); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->timer = 0x82; this->actor.velocity.y = 0.0f; this->actor.world.pos.y = player->actor.world.pos.y; @@ -172,7 +172,7 @@ void EnWallmas_SetupDrop(EnWallmas* this, PlayState* play) { this->actor.world.rot.y = player->actor.shape.rot.y + 0x8000; this->actor.floorHeight = player->actor.floorHeight; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_5; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnWallmas_Drop; } 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 6e0d3b8e77..a7268efc97 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 @@ -8,7 +8,7 @@ #include "terminal.h" #include "versions.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnWeatherTag_Init(Actor* thisx, PlayState* play); void EnWeatherTag_Destroy(Actor* thisx, PlayState* play); 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 acb8b32bbe..36aaac2344 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "assets/objects/object_wf/object_wf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnWf_Init(Actor* thisx, PlayState* play); void EnWf_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 5b31e6836d..578c9851dc 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -193,7 +193,7 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) { if (this->talkMode == 4) { this->unk_15A = true; } - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_7); this->unk_156 = true; this->actionFunc = func_80B3A4F8; @@ -256,7 +256,7 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) { if (!this->unk_156) { Message_StartTextbox(play, this->actor.textId, NULL); Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_8); - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80B3A3D4; } 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 f893a1b06c..c66a2232dd 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -104,11 +104,11 @@ s32 EnWood02_SpawnZoneCheck(EnWood02* this, PlayState* play, Vec3f* pos) { phi_f12 = ((this->actor.projectedW == 0.0f) ? 1000.0f : fabsf(1.0f / this->actor.projectedW)); - if ((-this->actor.uncullZoneScale < this->actor.projectedPos.z) && - (this->actor.projectedPos.z < (this->actor.uncullZoneForward + this->actor.uncullZoneScale)) && - (((fabsf(this->actor.projectedPos.x) - this->actor.uncullZoneScale) * phi_f12) < 1.0f) && - (((this->actor.projectedPos.y + this->actor.uncullZoneDownward) * phi_f12) > -1.0f) && - (((this->actor.projectedPos.y - this->actor.uncullZoneScale) * phi_f12) < 1.0f)) { + if ((-this->actor.cullingVolumeScale < this->actor.projectedPos.z) && + (this->actor.projectedPos.z < (this->actor.cullingVolumeDistance + this->actor.cullingVolumeScale)) && + (((fabsf(this->actor.projectedPos.x) - this->actor.cullingVolumeScale) * phi_f12) < 1.0f) && + (((this->actor.projectedPos.y + this->actor.cullingVolumeDownward) * phi_f12) > -1.0f) && + (((this->actor.projectedPos.y - this->actor.cullingVolumeScale) * phi_f12) < 1.0f)) { return true; } return false; @@ -200,9 +200,9 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) { case WOOD_BUSH_GREEN_LARGE: case WOOD_BUSH_BLACK_LARGE: actorScale = 1.5f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 2000.0f; - this->actor.uncullZoneDownward = 2400.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 2000.0f; + this->actor.cullingVolumeDownward = 2400.0f; break; case WOOD_TREE_CONICAL_SPAWNER: case WOOD_TREE_OVAL_YELLOW_SPAWNER: @@ -223,15 +223,15 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) { case WOOD_TREE_KAKARIKO_ADULT: case WOOD_BUSH_GREEN_SMALL: case WOOD_BUSH_BLACK_SMALL: - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 800.0f; - this->actor.uncullZoneDownward = 1800.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 800.0f; + this->actor.cullingVolumeDownward = 1800.0f; break; case WOOD_TREE_CONICAL_SMALL: actorScale = 0.6f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 400.0f; - this->actor.uncullZoneDownward = 1000.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 400.0f; + this->actor.cullingVolumeDownward = 1000.0f; break; case WOOD_LEAF_GREEN: case WOOD_LEAF_YELLOW: @@ -275,7 +275,7 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) { this->actor.world.pos.x += (sSpawnSin * sSpawnDistance[5]); this->actor.world.pos.z += (sSpawnCos * sSpawnDistance[5]); } else { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } // Snap to floor, or remove if over void @@ -309,7 +309,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { // Despawn extra trees in a group if out of range if ((this->spawnType == WOOD_SPAWN_SPAWNED) && (this->actor.parent != NULL)) { - if (!(this->actor.flags & ACTOR_FLAG_6)) { + if (!(this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { u8 new_var = this->unk_14E[0]; u8 phi_v0 = 0; s32 pad; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index ccf9bf873f..8a4b4be3f4 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -17,7 +17,7 @@ #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.0:0" \ "ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnXc_Init(Actor* thisx, PlayState* play); void EnXc_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index a2b2e50fcf..f294fb60c2 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -104,7 +104,7 @@ void EnYabusameMark_Init(Actor* thisx, PlayState* play) { Collider_InitQuad(play, &this->collider); Collider_SetQuad(play, &this->collider, &this->actor, &sQuadInit); this->worldPos = this->actor.world.pos; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (gSaveContext.sceneLayer != 4) { Actor_Kill(&this->actor); return; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 4f739acac8..4a6d3bc397 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -7,7 +7,7 @@ #include "z_en_yukabyun.h" #include "assets/objects/object_yukabyun/object_yukabyun.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnYukabyun_Init(Actor* thisx, PlayState* play); void EnYukabyun_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 9c50186329..70812e3f0f 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -7,7 +7,7 @@ #include "z_en_zf.h" #include "assets/objects/object_zf/object_zf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZf_Init(Actor* thisx, PlayState* play); void EnZf_Destroy(Actor* thisx, PlayState* play); 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 7a9edb9c67..b334a67d8d 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -7,7 +7,7 @@ #include "z_en_zl1.h" #include "assets/objects/object_zl1/object_zl1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZl1_Init(Actor* thisx, PlayState* play); void EnZl1_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 7279c01f4c..dbc45b62c6 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -13,7 +13,7 @@ #include "assets/objects/object_zl2/object_zl2.h" #include "assets/objects/object_zl2_anime1/object_zl2_anime1.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnZl2_Init(Actor* thisx, PlayState* play); void EnZl2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 5a2018aeb6..c1305ca7f6 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -15,7 +15,7 @@ #include "assets/objects/object_zl2/object_zl2.h" #include "assets/objects/object_zl2_anime2/object_zl2_anime2.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void EnZl3_Init(Actor* thisx, PlayState* play); void EnZl3_Destroy(Actor* thisx, PlayState* play); 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 22f558ea5f..e3b8a51af3 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -8,7 +8,7 @@ #include "assets/objects/object_zl4/object_zl4.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum EnZl4CutsceneState { /* 0 */ ZL4_CS_WAIT, diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index c6778bd104..5eb021dce8 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h" #include "overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef struct EnfHGPainting { /* 0x00 */ Vec3f pos; @@ -65,7 +65,7 @@ static EnfHGPainting sPaintings[] = { static InitChainEntry sInitChain[] = { ICHAIN_S8(naviEnemyId, NAVI_ENEMY_PHANTOM_GANON_PHASE_2, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; void EnfHG_Init(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 1b76ac86d5..0762c9c5e5 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -7,7 +7,7 @@ #include "z_end_title.h" #include "versions.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EndTitle_Init(Actor* thisx, PlayState* play); void EndTitle_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 4c5e2ab731..6a7dc3ad59 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -38,7 +38,7 @@ #pragma increment_block_number "gc-eu:177 gc-eu-mq:177 gc-jp:177 gc-jp-ce:177 gc-jp-mq:177 gc-us:177 gc-us-mq:177" \ "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->ySurface @@ -2962,8 +2962,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { f32 temp; f32 rumbleStrength; - this->actor.uncullZoneForward = 700.0f; - this->actor.uncullZoneScale = 50.0f; + this->actor.cullingVolumeDistance = 700.0f; + this->actor.cullingVolumeScale = 50.0f; if (this->isLoach == 0) { playerSpeedMod = (player->actor.speed * 0.15f) + 0.25f; @@ -3082,8 +3082,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { case 100: Fishing_HandleAquariumDialog(this, play); - this->actor.uncullZoneForward = 500.0f; - this->actor.uncullZoneScale = 300.0f; + this->actor.cullingVolumeDistance = 500.0f; + this->actor.cullingVolumeScale = 300.0f; Lights_PointNoGlowSetInfo(&this->lightInfo, (s16)this->actor.world.pos.x, (s16)this->actor.world.pos.y + 20.0f, (s16)this->actor.world.pos.z - 50.0f, 255, @@ -3629,8 +3629,8 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { break; case 5: - this->actor.uncullZoneForward = 1200.0f; - this->actor.uncullZoneScale = 200.0f; + this->actor.cullingVolumeDistance = 1200.0f; + this->actor.cullingVolumeScale = 200.0f; sFishFightTime++; PRINTF("HIT FISH %dcm\n", (u8)this->fishLength); @@ -5195,7 +5195,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { if ((sOwnerTheftTimer != 0) || (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE)) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; } else { - this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; } if ((this->actor.xzDistToPlayer < 120.0f) || (Message_GetState(&play->msgCtx) != TEXT_STATE_NONE)) { 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 bd581b2aa1..da8ddad524 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 @@ -30,9 +30,9 @@ ActorProfile Item_B_Heart_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ItemBHeart_Init(Actor* thisx, PlayState* play) { 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 83f282da0d..5527cef6df 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -6,7 +6,7 @@ #include "z_item_etcetera.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ItemEtcetera_Init(Actor* thisx, PlayState* play); void ItemEtcetera_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 00d7eab43e..89d807318b 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -7,7 +7,7 @@ #include "z_item_ocarina.h" #include "assets/scenes/overworld/spot00/spot00_scene.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ItemOcarina_Init(Actor* thisx, PlayState* play); void ItemOcarina_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index bebe954983..0307862327 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -8,7 +8,7 @@ #include "z_item_shield.h" #include "assets/objects/object_link_child/object_link_child.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ItemShield_Init(Actor* thisx, PlayState* play); void ItemShield_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index fc298fca8b..d809a82ebe 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -7,7 +7,7 @@ #include "z_magic_dark.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void MagicDark_Init(Actor* thisx, PlayState* play); void MagicDark_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index e36a673c95..ede5f3691c 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -6,7 +6,7 @@ #include "z_magic_fire.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void MagicFire_Init(Actor* thisx, PlayState* play); void MagicFire_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 1126ae5b0a..0694e07128 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -6,7 +6,7 @@ #include "z_magic_wind.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void MagicWind_Init(Actor* thisx, PlayState* play); void MagicWind_Destroy(Actor* thisx, PlayState* play); 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 4bb8ce0cf6..1915999df6 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -7,7 +7,7 @@ #include "z_mir_ray.h" #include "assets/objects/object_mir_ray/object_mir_ray.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void MirRay_Init(Actor* thisx, PlayState* play); void MirRay_Destroy(Actor* thisx, PlayState* play); @@ -106,9 +106,9 @@ static MirRayDataEntry sMirRayData[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void MirRay_SetupCollider(MirRay* this) { 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 570c645a24..ec4bf0f290 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -120,9 +120,9 @@ static Gfx* sBreakDlists[] = { gCuttableShrubStalkDL, gCuttableShrubTipDL }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1600, ICHAIN_STOP), }; void ObjBean_InitCollider(Actor* thisx, PlayState* play) { @@ -636,7 +636,7 @@ void ObjBean_WaitForWater(ObjBean* this, PlayState* play) { ObjBean_SetupGrowWaterPhase1(this); D_80B90E30 = this; OnePointCutscene_Init(play, 2210, -99, &this->dyna.actor, CAM_ID_MAIN); - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; return; } @@ -739,7 +739,7 @@ void ObjBean_GrowWaterPhase5(ObjBean* this, PlayState* play) { this->transformFunc(this); if (this->timer <= 0) { func_80B8FF50(this); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } @@ -764,7 +764,7 @@ void ObjBean_SetupFly(ObjBean* this) { this->actionFunc = ObjBean_Fly; ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_PLANT); this->dyna.actor.speed = 0.0f; - this->dyna.actor.flags |= ACTOR_FLAG_4; // Never stop updating + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; // Never stop updating } void ObjBean_Fly(ObjBean* this, PlayState* play) { @@ -776,7 +776,7 @@ void ObjBean_Fly(ObjBean* this, PlayState* play) { ObjBean_SetupPath(this, play); ObjBean_SetupWaitForStepOff(this); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; // Never stop updating (disable) + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; // Never stop updating (disable) mainCam = play->cameraPtrs[CAM_ID_MAIN]; if ((mainCam->setting == CAM_SET_BEAN_LOST_WOODS) || (mainCam->setting == CAM_SET_BEAN_GENERIC)) { 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 bf6a5ebf4f..68e1687aa8 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -54,9 +54,9 @@ static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 350, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 350, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; static s16 sEffectScales[] = { 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 0198ddfc8f..6f86b829a4 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -61,9 +61,9 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 900, ICHAIN_STOP), }; void ObjComb_Break(ObjComb* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index fac468a29c..411d3e2ad9 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -32,9 +32,9 @@ ActorProfile Obj_Elevator_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; static f32 sScales[] = { 0.1f, 0.05f }; 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 ba43d40a46..3f45341e30 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -54,9 +54,9 @@ static s16 sEffectScales[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; void ObjHamishi_InitCollision(Actor* thisx, PlayState* play) { @@ -140,7 +140,7 @@ void ObjHamishi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } if (this->actor.shape.rot.y == 0) { this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.home.rot.y = Rand_ZeroFloat(65536.0f); 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 11b671c4b4..badd99186d 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -64,9 +64,9 @@ static HanaParams sHanaParams[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjHana_Init(Actor* thisx, PlayState* play) { 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 75163663e9..d946077670 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -37,9 +37,9 @@ static f32 D_80B940C0[] = { 85.0f, 85.0f, 0.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; static CollisionHeader* sCollisionHeaders[] = { &gHookshotPostCol, &gHookshotPostCol, &gHookshotTargetCol }; @@ -116,7 +116,7 @@ void func_80B93D90(ObjHsblock* this) { } void func_80B93DB0(ObjHsblock* this) { - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 105.0f; ObjHsblock_SetupAction(this, func_80B93DF4); } @@ -137,7 +137,7 @@ void func_80B93E5C(ObjHsblock* this, PlayState* play) { this->dyna.actor.velocity.y, 0.3f)) < 0.001f) { this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y; func_80B93D90(this); - this->dyna.actor.flags &= ~ACTOR_FLAG_4; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } 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 18b90b5584..23b1728fcc 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 @@ -7,7 +7,7 @@ #include "z_obj_ice_poly.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjIcePoly_Init(Actor* thisx, PlayState* play); void ObjIcePoly_Destroy(Actor* thisx, PlayState* play); 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 0e41cff338..0f26d40611 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void ObjKibako_Init(Actor* thisx, PlayState* play); void ObjKibako_Destroy(Actor* thisx, PlayState* play2); @@ -58,9 +58,9 @@ static CollisionCheckInfoInit sCCInfoInit = { 0, 12, 60, MASS_HEAVY }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void ObjKibako_SpawnCollectible(ObjKibako* this, PlayState* play) { 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 58e578c059..035dbb9b09 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -51,9 +51,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void ObjKibako2_InitCollider(Actor* thisx, PlayState* play) { @@ -147,7 +147,7 @@ void ObjKibako2_Idle(ObjKibako2* this, PlayState* play) { func_80033684(play, &this->dyna.actor) != NULL) { ObjKibako2_Break(this, play); SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 20, NA_SE_EV_WOODBOX_BREAK); - this->dyna.actor.flags |= ACTOR_FLAG_4; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->dyna.actor.draw = NULL; this->actionFunc = ObjKibako2_Kill; 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 3c63e0af1f..e13352a5a3 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "quake.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjLift_Init(Actor* thisx, PlayState* play); void ObjLift_Destroy(Actor* thisx, PlayState* play); @@ -49,9 +49,9 @@ static ObjLiftFramgentScale sFragmentScales[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -600, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -600, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; static f32 sScales[] = { 0.1f, 0.05f }; 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 6f723d292a..a2d8dbbb12 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #include "assets/objects/object_lightswitch/object_lightswitch.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED typedef enum FaceTextureIndex { /* 0x00 */ FACE_EYES_CLOSED, @@ -83,9 +83,9 @@ static Vec3f D_80B97F74 = { 0.0f, 0.0f, 0.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; void ObjLightswitch_InitCollider(ObjLightswitch* this, PlayState* play) { @@ -184,7 +184,7 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) { this->actor.shape.rot.z = 0; this->actor.world.rot.x = this->actor.home.rot.x = this->actor.shape.rot.x; this->actor.world.rot.z = this->actor.home.rot.z = this->actor.shape.rot.z; - this->actor.flags |= ACTOR_FLAG_5; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_OSHIHIKI, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, 0, this->actor.home.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) { 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 e909134128..82e10d0f23 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -8,7 +8,7 @@ #include "global.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjMakekinsuta_Init(Actor* thisx, PlayState* play); void ObjMakekinsuta_Update(Actor* thisx, PlayState* play); 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 eeaf2bdd60..1cc2161196 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_5 +#define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play); void ObjMakeoshihiki_Draw(Actor* thisx, PlayState* play); 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 7b52356690..90e1b5dda7 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -54,9 +54,9 @@ static s16 sSpawnActorIds[] = { ACTOR_EN_KUSA, 0, ACTOR_EN_FISH, ACTOR_EN_INSECT static s16 sSpawnParams[] = { 0, 2, -1, INSECT_TYPE_PERMANENT, -1 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; s32 ObjMure_SetCullingImpl(Actor* thisx, PlayState* play) { @@ -284,7 +284,7 @@ void ObjMure_InitialAction(ObjMure* this, PlayState* play) { void ObjMure_CulledState(ObjMure* this, PlayState* play) { if (fabsf(this->actor.projectedPos.z) < sZClip[this->type]) { this->actionFunc = ObjMure_ActiveState; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure_SpawnActors(this, play); } } @@ -407,7 +407,7 @@ void ObjMure_ActiveState(ObjMure* this, PlayState* play) { ObjMure_CheckChildren(this, play); if (sZClip[this->type] + 40.0f <= fabsf(this->actor.projectedPos.z)) { this->actionFunc = ObjMure_CulledState; - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure_KillActors(this, play); } else if (sTypeGroupBehaviorFunc[this->type] != NULL) { sTypeGroupBehaviorFunc[this->type](this, play); 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 7539520b3d..bcdb0558e7 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -159,9 +159,9 @@ void func_80B9A534(ObjMure2* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void ObjMure2_Init(Actor* thisx, PlayState* play) { @@ -169,7 +169,7 @@ void ObjMure2_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1200.0f; + this->actor.cullingVolumeDistance += 1200.0f; } ObjMure2_SetupWait(this); } @@ -189,7 +189,7 @@ void func_80B9A658(ObjMure2* this) { void func_80B9A668(ObjMure2* this, PlayState* play) { if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) < (sDistSquared1[PARAMS_GET_U(this->actor.params, 0, 2)] * this->unk_184)) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure2_SpawnActors(this, play); func_80B9A6E8(this); } @@ -203,7 +203,7 @@ void func_80B9A6F8(ObjMure2* this, PlayState* play) { func_80B9A534(this); if ((sDistSquared2[PARAMS_GET_U(this->actor.params, 0, 2)] * this->unk_184) <= Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure2_CleanupAndDie(this, play); func_80B9A658(this); } 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 1ed11535ca..c9ed01e3c9 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -34,9 +34,9 @@ ActorProfile Obj_Mure3_Profile = { static s16 sRupeeCounts[] = { 5, 5, 7, 0 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void func_80B9A9D0(ObjMure3* this, PlayState* play) { @@ -172,7 +172,7 @@ void func_80B9AF64(ObjMure3* this, PlayState* play) { static ObjMure3SpawnFunc spawnFuncs[] = { func_80B9A9D0, func_80B9AA90, func_80B9ABA0 }; if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) < SQ(1150.0f)) { - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; spawnFuncs[PARAMS_GET_U(this->actor.params, 13, 3)](this, play); func_80B9AFEC(this); } @@ -185,7 +185,7 @@ void func_80B9AFEC(ObjMure3* this) { void func_80B9AFFC(ObjMure3* this, PlayState* play) { func_80B9ADCC(this, play); if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) >= SQ(1450.0f)) { - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80B9ACE4(this, play); func_80B9AF54(this); } 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 1a0abd417f..2d4457d3e8 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Obj_Switch/z_obj_switch.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjOshihiki_Init(Actor* thisx, PlayState* play2); void ObjOshihiki_Destroy(Actor* thisx, PlayState* play); @@ -59,9 +59,9 @@ static s16 sSceneIds[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; // The vertices and center of the bottom face 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 5648c809ca..8ed5e8558e 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -6,7 +6,7 @@ #include "z_obj_roomtimer.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED void ObjRoomtimer_Init(Actor* thisx, PlayState* play); void ObjRoomtimer_Destroy(Actor* thisx, PlayState* play); 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 998dd7d575..05f23ebaaf 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "terminal.h" -#define FLAGS ACTOR_FLAG_4 +#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define OBJSWITCH_TYPE(thisx) PARAMS_GET_U((thisx)->params, 0, 3) #define OBJSWITCH_SUBTYPE(thisx) PARAMS_GET_U((thisx)->params, 4, 3) @@ -176,9 +176,9 @@ static ColliderJntSphInit sCrystalJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; void ObjSwitch_RotateY(Vec3f* dest, Vec3f* src, s16 rotY) { 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 d68f3d3c46..7c221da0b8 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void ObjSyokudai_Init(Actor* thisx, PlayState* play); void ObjSyokudai_Destroy(Actor* thisx, PlayState* play); @@ -70,9 +70,9 @@ static ColliderCylinderInit sCylInitFlame = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; static s32 sLitTorchCount; diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 0235a0513c..bc231076ce 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -7,8 +7,9 @@ #include "z_obj_timeblock.h" #include "assets/objects/object_timeblock/object_timeblock.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void ObjTimeblock_Init(Actor* thisx, PlayState* play); void ObjTimeblock_Destroy(Actor* thisx, PlayState* play); @@ -53,9 +54,9 @@ static f32 sRanges[] = { 60.0, 100.0, 140.0, 180.0, 220.0, 260.0, 300.0, 300.0 } static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_2, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; static Color_RGB8 sPrimColors[] = { 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 d88f5c7142..a5911678e4 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void ObjTsubo_Init(Actor* thisx, PlayState* play); void ObjTsubo_Destroy(Actor* thisx, PlayState* play2); @@ -77,9 +77,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit[] = { 0, 12, 60, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 150, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 150, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjTsubo_SpawnCollectible(ObjTsubo* this, PlayState* play) { @@ -227,7 +227,7 @@ void ObjTsubo_WaitForObject(ObjTsubo* this, PlayState* play) { this->actor.draw = ObjTsubo_Draw; this->actor.objectSlot = this->requiredObjectSlot; ObjTsubo_SetupIdle(this); - this->actor.flags &= ~ACTOR_FLAG_4; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } @@ -279,7 +279,7 @@ void ObjTsubo_SetupLiftedUp(ObjTsubo* this) { this->actor.room = -1; //! @bug: This is an unsafe cast, although the sound effect will still play Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_POT); - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void ObjTsubo_LiftedUp(ObjTsubo* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 7877b148a7..ac422c63e8 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -8,8 +8,9 @@ #include "assets/objects/object_timeblock/object_timeblock.h" #include "terminal.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void ObjWarp2block_Init(Actor* thisx, PlayState* play2); void ObjWarp2block_Destroy(Actor* thisx, PlayState* play); @@ -55,9 +56,9 @@ static Warp2BlockSpawnData sSpawnData[] = { static f32 sDistances[] = { 60.0f, 100.0f, 140.0f, 180.0f, 220.0f, 260.0f, 300.0f, 300.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_STOP), }; static Color_RGB8 sColors[] = { 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 df08e74937..25048f5349 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_spot02_objects/object_spot02_objects.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ObjectKankyo_Init(Actor* thisx, PlayState* play); void ObjectKankyo_Destroy(Actor* thisx, PlayState* play); 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 0c229ebb12..0c9b94a2b9 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -7,7 +7,7 @@ #include "z_oceff_spot.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffSpot_Init(Actor* thisx, PlayState* play); void OceffSpot_Destroy(Actor* thisx, PlayState* play); @@ -32,7 +32,7 @@ ActorProfile Oceff_Spot_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_STOP), }; void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc) { 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 3d95b4651e..c7c63690b7 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -6,7 +6,7 @@ #include "z_oceff_storm.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffStorm_Init(Actor* thisx, PlayState* play); void OceffStorm_Destroy(Actor* thisx, PlayState* play); 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 4235b1c004..f9b14bc7de 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe_Init(Actor* thisx, PlayState* play); void OceffWipe_Destroy(Actor* thisx, PlayState* play); 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 d613381f81..9e3b03a8f9 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe2.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe2_Init(Actor* thisx, PlayState* play); void OceffWipe2_Destroy(Actor* thisx, PlayState* play); 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 ea5c7eddcd..757e9b116d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe3.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe3_Init(Actor* thisx, PlayState* play); void OceffWipe3_Destroy(Actor* thisx, PlayState* play); 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 0aaee51d08..9ad0dbf68e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -7,7 +7,7 @@ #include "z_oceff_wipe4.h" #include "terminal.h" -#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe4_Init(Actor* thisx, PlayState* play); void OceffWipe4_Destroy(Actor* thisx, PlayState* play); 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 4d581a4448..a91fb67154 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -68,7 +68,7 @@ void ShotSun_Init(Actor* thisx, PlayState* play) { params = PARAMS_GET_U(this->actor.params, 0, 8); if (params == 0x40 || params == 0x41) { this->fairySpawnerState = SPAWNER_OUT_OF_RANGE; - this->actor.flags |= ACTOR_FLAG_4; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; this->actionFunc = ShotSun_UpdateFairySpawner; this->actor.flags |= ACTOR_FLAG_LOCK_ON_DISABLED; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index d5dfcaa4b3..8ce71a8480 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -15998,7 +15998,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorCue* cueUnused) { } if (cue == NULL) { - this->actor.flags &= ~ACTOR_FLAG_6; + this->actor.flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; } else { s32 csAction; diff --git a/tools/ZAPDConfigs/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml index 3d9300ccb6..9ab185a2b8 100644 --- a/tools/ZAPDConfigs/EnumData.xml +++ b/tools/ZAPDConfigs/EnumData.xml @@ -173,7 +173,7 @@ - + diff --git a/tools/csdis.py b/tools/csdis.py index e2b8a8a034..2d299e2fab 100755 --- a/tools/csdis.py +++ b/tools/csdis.py @@ -330,7 +330,7 @@ cutscene_misc_types = { 0x12: "CS_MISC_STOP_STORM_AND_ADVANCE_TO_DAY", 0x13: "CS_MISC_SET_FLAG_FAST_WINDMILL", 0x14: "CS_MISC_SET_FLAG_DRAINED_WELL", - 0x15: "CS_MISC_SET_FLAG_LAKE_HYLIA_RESTORED", + 0x15: "CS_MISC_SET_FLAG_RESTORED_LAKE_HYLIA", 0x16: "CS_MISC_VISMONO_BLACK_AND_WHITE", 0x17: "CS_MISC_VISMONO_SEPIA", 0x18: "CS_MISC_HIDE_ROOM",