mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-11 03:23:46 +00:00
Code Issues Projects Releases Wiki Activity

Rename culling related variables (#225)

Browse source 
* rename some things

* reword one comment

* rename vars

* fix bgjyalift
This commit is contained in:
fig02 2020-06-24 21:20:31 -04:00 • committed by GitHub
parent 6b2a013cca
commit d77dbe0465
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 189 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/functions.h
View file

@ -1332,8 +1332,8 @@ void func_800AA178(u32);
View* View_New(GraphicsContext* gfxCtx);
void View_Free(View* view);
void View_Init(View*, GraphicsContext*);
void func_800AA358(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3);
void func_800AA3F0(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3);
void func_800AA358(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up);
void func_800AA3F0(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up);
void View_SetScale(View* view, f32 scale);
void View_GetScale(View* view, f32* scale);
void func_800AA460(View* view, f32 fovy, f32 near, f32 far);

4
include/z64.h
View file

@ -343,8 +343,8 @@ typedef struct {
/* 0x0020 */ f32 zFar; // distance to far clipping plane
/* 0x0024 */ f32 scale; // scale for matrix elements
/* 0x0028 */ Vec3f eye;
/* 0x0034 */ Vec3f unk_34;
/* 0x0040 */ Vec3f unk_40;
/* 0x0034 */ Vec3f lookAt;
/* 0x0040 */ Vec3f up;
/* 0x0050 */ Vp vp;
/* 0x0060 */ Mtx projection;
/* 0x00A0 */ Mtx viewing;

12
include/z64actor.h
View file

@ -137,11 +137,11 @@ typedef struct Actor {
/* 0x098 */ CollisionCheckInfo colChkInfo;
/* 0x0B4 */ ActorShape shape;
/* 0x0CC */ Vec3f unk_CC[2];
/* 0x0E4 */ Vec3f unk_E4; // Stores result of some vector transformation involving actor xyz vector and mf_11D60
/* 0x0F0 */ f32 unk_F0; // Related to above
/* 0x0F4 */ f32 unk_F4;
/* 0x0F8 */ f32 unk_F8;
/* 0x0FC */ f32 unk_FC;
/* 0x0E4 */ Vec3f projectedPos; // actor position in projected space
/* 0x0F0 */ f32 projectedW; // w component of the projected actor position vector
/* 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)
/* 0x100 */ Vec3f pos4;
/* 0x10C */ u8 unk_10C; // Z-Target related
/* 0x10D */ u8 unk_10D; // Z-Target related
@ -149,7 +149,7 @@ typedef struct Actor {
/* 0x110 */ u16 freeze;
/* 0x112 */ u16 dmgEffectParams; // Specifies damage effect color (white/red/blue) and if opaque or translucent
/* 0x114 */ u8 dmgEffectTimer;
/* 0x115 */ u8 activelyDrawn; // Indicates whether the actor is currently being drawn (but not through lens)
/* 0x115 */ u8 isDrawn; // Indicates whether the actor is currently being drawn (but not seen through lens)
/* 0x116 */ u8 unk_116;
/* 0x117 */ u8 naviEnemyId; // Sets what 0600 dialog to display when talking to navi. Default 0xFF
/* 0x118 */ struct Actor* attachedA; // Attached By?

38
src/code/z_actor.c
View file

@ -842,9 +842,9 @@ void Actor_Init(Actor* actor, GlobalContext* globalCtx) {
actor->minVelocityY = -20.0f;
actor->xyzDistFromLinkSq = FLT_MAX;
actor->naviEnemyId = 0xFF;
actor->unk_F4 = 1000.0f;
actor->unk_F8 = 350.0f;
actor->unk_FC = 700.0f;
actor->uncullZoneForward = 1000.0f;
actor->uncullZoneScale = 350.0f;
actor->uncullZoneDownward = 700.0f;
func_80061E48(&actor->colChkInfo);
actor->floorPolySource = 0x32;
ActorShape_Init(&actor->shape, 0.0f, NULL, 0.0f);
@ -1685,11 +1685,11 @@ void func_8002F7A0(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 a
}
void func_8002F7DC(Actor* actor, u16 sfxId) {
Audio_PlaySoundGeneral(sfxId, &actor->unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(sfxId, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
void Audio_PlayActorSound2(Actor* actor, u16 sfxId) {
func_80078914(&actor->unk_E4, sfxId);
func_80078914(&actor->projectedPos, sfxId);
}
void func_8002F850(GlobalContext* globalCtx, Actor* actor) {
@ -1705,8 +1705,8 @@ void func_8002F850(GlobalContext* globalCtx, Actor* actor) {
sfxId = func_80041F34(&globalCtx->colCtx, actor->floorPoly, actor->floorPolySource, actor);
}
func_80078914(&actor->unk_E4, NA_SE_EV_BOMB_BOUND);
func_80078914(&actor->unk_E4, sfxId + 0x800);
func_80078914(&actor->projectedPos, NA_SE_EV_BOMB_BOUND);
func_80078914(&actor->projectedPos, sfxId + 0x800);
}
void func_8002F8F0(Actor* actor, u16 sfxId) {
@ -2095,7 +2095,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) {
func_80061E8C(&actor->colChkInfo);
actor = actor->next;
} else if (actor->update == NULL) {
if (!actor->activelyDrawn) {
if (!actor->isDrawn) {
actor = Actor_Delete(&globalCtx->actorCtx, actor, globalCtx);
} else {
Actor_Destroy(actor, globalCtx);
@ -2257,7 +2257,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
void func_80030ED8(Actor* actor) {
if (actor->flags & 0x80000) {
Audio_PlaySoundGeneral(actor->sfx, &actor->unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else if (actor->flags & 0x100000) {
func_80078884(actor->sfx);
} else if (actor->flags & 0x200000) {
@ -2265,7 +2265,7 @@ void func_80030ED8(Actor* actor) {
} else if (actor->flags & 0x10000000) {
func_800F4C58(&D_801333D4, 0x2021, (s8)(actor->sfx - 1));
} else {
func_80078914(&actor->unk_E4, actor->sfx);
func_80078914(&actor->projectedPos, actor->sfx);
}
}
@ -2361,17 +2361,17 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi
}
s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) {
return func_800314D4(globalCtx, actor, &actor->unk_E4, actor->unk_F0);
return func_800314D4(globalCtx, actor, &actor->projectedPos, actor->projectedW);
}
s32 func_800314D4(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3) {
f32 var;
if ((arg2->z > -actor->unk_F8) && (arg2->z < (actor->unk_F4 + actor->unk_F8))) {
if ((arg2->z > -actor->uncullZoneScale) && (arg2->z < (actor->uncullZoneForward + actor->uncullZoneScale))) {
var = (arg3 < 1.0f) ? 1.0f : 1.0f / arg3;
if ((((fabsf(arg2->x) - actor->unk_F8) * var) < 1.0f) && (((arg2->y + actor->unk_FC) * var) > -1.0f) &&
(((arg2->y - actor->unk_F8) * var) < 1.0f)) {
if ((((fabsf(arg2->x) - actor->uncullZoneScale) * var) < 1.0f) && (((arg2->y + actor->uncullZoneDownward) * var) > -1.0f) &&
(((arg2->y - actor->uncullZoneScale) * var) < 1.0f)) {
return 1;
}
}
@ -2409,7 +2409,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
HREG(66) = i;
if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(68) == 0)) {
func_800A6E10(&globalCtx->mf_11D60, &actor->posRot.pos, &actor->unk_E4, &actor->unk_F0);
func_800A6E10(&globalCtx->mf_11D60, &actor->posRot.pos, &actor->projectedPos, &actor->projectedW);
}
if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(69) == 0)) {
@ -2426,7 +2426,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
}
}
actor->activelyDrawn = 0;
actor->isDrawn = 0;
if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(71) == 0)) {
if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & 0x60)) {
@ -2441,7 +2441,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
} else {
if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(72) == 0)) {
Actor_Draw(globalCtx, actor);
actor->activelyDrawn = 1;
actor->isDrawn = 1;
}
}
}
@ -2524,7 +2524,7 @@ void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx) {
while (actor != NULL) {
if ((actor->room >= 0) && (actor->room != globalCtx->roomCtx.curRoom.num) &&
(actor->room != globalCtx->roomCtx.prevRoom.num)) {
if (!actor->activelyDrawn) {
if (!actor->isDrawn) {
actor = Actor_Delete(actorCtx, actor, globalCtx);
} else {
Actor_Kill(actor);
@ -2903,7 +2903,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC
actorCtx->targetCtx.unk_90 = NULL;
}
func_800F89E8(&actor->unk_E4);
func_800F89E8(&actor->projectedPos);
Actor_Destroy(actor, globalCtx);
newFirstActor = Actor_RemoveFromTypeList(globalCtx, actorCtx, actor);

20
src/code/z_collision_check.c
View file

@ -1366,7 +1366,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
return;
}
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
return;
}
@ -1376,7 +1376,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide
func_80062D60(globalCtx, arg3);
return;
}
func_80062DAC(globalCtx, arg3, &collider->actor->unk_E4);
func_80062DAC(globalCtx, arg3, &collider->actor->projectedPos);
return;
}
if (flags == 8) {
@ -1385,7 +1385,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
return;
}
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
return;
}
@ -1395,7 +1395,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
return;
}
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &collider->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &collider->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
return;
}
@ -1405,16 +1405,16 @@ s32 func_8005E4F8(Collider* left, ColliderBody* rightBody) {
if (left->actor != NULL) {
if (ACTORTYPE_PLAYER == left->actor->type) {
if (rightBody->flags == 0) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
} else if (rightBody->flags == 1) {
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
} else if (2 == rightBody->flags) {
Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
} else if (rightBody->flags == 3) {
Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
}
}
@ -1456,7 +1456,7 @@ void func_8005E604(GlobalContext* globalCtx, Collider* left, ColliderBody* leftB
func_80062CD4(globalCtx, arg5);
Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else {
func_80062E14(globalCtx, arg5, &left->actor->unk_E4);
func_80062E14(globalCtx, arg5, &left->actor->projectedPos);
}
} else if (D_8011DF40[right->type].unk01 != 5) {
func_80029CA4(globalCtx, D_8011DF40[right->type].unk01, arg5);
@ -1469,7 +1469,7 @@ void func_8005E604(GlobalContext* globalCtx, Collider* left, ColliderBody* leftB
if (right->actor == NULL) {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else {
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &right->actor->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &right->actor->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
}
}

8
src/code/z_en_a_keep.c
View file

@ -126,8 +126,8 @@ void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.dynaPolyId = -1;
this->dyna.unk_160 = 0;
this->dyna.unk_15C = 0;
thisx->unk_FC = 1200.0f;
thisx->unk_F8 = 200.0f;
thisx->uncullZoneDownward = 1200.0f;
thisx->uncullZoneScale = 200.0f;
switch (thisx->params) {
case A_OBJ_BLOCK_LARGE:
@ -301,8 +301,8 @@ void func_8001D4A8(EnAObj* this, GlobalContext* globalCtx) {
}
void func_8001D5C8(EnAObj* this, s16 params) {
this->dyna.actor.unk_FC = 1200.0f;
this->dyna.actor.unk_F8 = 720.0f;
this->dyna.actor.uncullZoneDownward = 1200.0f;
this->dyna.actor.uncullZoneScale = 720.0f;
EnAObj_SetupAction(this, func_8001D608);
}

42
src/code/z_view.c
View file

@ -46,10 +46,10 @@ void View_Init(View* view, GraphicsContext* gfxCtx) {
view->fovy = 60.0f;
view->zNear = 10.0f;
view->zFar = 12800.0f;
view->unk_34.x = 0.0f;
view->unk_40.x = 0.0f;
view->unk_40.y = 1.0f;
view->unk_40.z = 0.0f;
view->lookAt.x = 0.0f;
view->up.x = 0.0f;
view->up.y = 1.0f;
view->up.z = 0.0f;
view->eye.z = -1.0f;
if (D_8012ABF0) {
@ -63,21 +63,21 @@ void View_Init(View* view, GraphicsContext* gfxCtx) {
func_800AA7B8(view);
}
void func_800AA358(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3) {
if (eye->x == vec2->x && eye->z == vec2->z) {
void func_800AA358(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up) {
if (eye->x == lookAt->x && eye->z == lookAt->z) {
eye->x += 0.1f;
}
view->eye = *eye;
view->unk_34 = *vec2;
view->unk_40 = *vec3;
view->lookAt = *lookAt;
view->up = *up;
view->flags |= 1;
}
void func_800AA3F0(View* view, Vec3f* eye, Vec3f* vec2, Vec3f* vec3) {
void func_800AA3F0(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up) {
view->eye = *eye;
view->unk_34 = *vec2;
view->unk_40 = *vec3;
view->lookAt = *lookAt;
view->up = *up;
}
void View_SetScale(View* view, f32 scale) {
@ -344,15 +344,15 @@ s32 func_800AAA9C(View* view) {
LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667);
view->viewingPtr = viewing;
if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) {
if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) {
view->eye.x += 1.0f;
view->eye.y += 1.0f;
view->eye.z += 1.0f;
}
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
view->unk_40.x, view->unk_40.y, view->unk_40.z);
guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
view->up.x, view->up.y, view->up.z);
view->viewing = *viewing;
@ -493,15 +493,15 @@ s32 func_800AB560(View* view) {
LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848);
view->viewingPtr = viewing;
if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) {
if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) {
view->eye.x += 1.0f;
view->eye.y += 1.0f;
view->eye.z += 1.0f;
}
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
view->unk_40.x, view->unk_40.y, view->unk_40.z);
guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
view->up.x, view->up.y, view->up.z);
view->viewing = *viewing;
@ -518,8 +518,8 @@ s32 func_800AB944(View* view) {
Graph_OpenDisps(dispRefs, view->gfxCtx, "../z_view.c", 878);
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
view->unk_40.x, view->unk_40.y, view->unk_40.z);
guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
view->up.x, view->up.y, view->up.z);
Graph_CloseDisps(dispRefs, view->gfxCtx, "../z_view.c", 886);
@ -582,8 +582,8 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) {
view->viewingPtr = viewing;
func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z,
view->unk_40.x, view->unk_40.y, view->unk_40.z);
guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
view->up.x, view->up.y, view->up.z);
view->viewing = *viewing;

6
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -172,7 +172,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) {
}
}
this->timer = 0;
Audio_PlaySoundGeneral(NA_SE_IT_ARROW_STICK_CRE, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_ARROW_STICK_CRE, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
return;
}
@ -274,12 +274,12 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) {
}
}
func_80865044(this);
Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_STICK_OBJ, &this->actor.unk_E4, 4, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_STICK_OBJ, &this->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
return;
}
func_80062D60(globalCtx, &this->actor.posRot.pos);
Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_REFLECT, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_IT_HOOKSHOT_REFLECT, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
return;
}

8
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View file

@ -35,7 +35,7 @@ const ActorInit Arrow_Fire_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
};
void ArrowFire_SetupAction(ArrowFire* this, ArrowFireActionFunc actionFunc) {
@ -99,13 +99,13 @@ void ArrowFire_Hit(ArrowFire* this, GlobalContext* globalCtx) {
f32 offset;
u16 timer;
if (this->actor.unk_F0 < 50.0f) {
if (this->actor.projectedW < 50.0f) {
scale = 10.0f;
} else {
if (950.0f < this->actor.unk_F0) {
if (950.0f < this->actor.projectedW) {
scale = 310.0f;
} else {
scale = this->actor.unk_F0;
scale = this->actor.projectedW;
scale = ((scale - 50.0f) * (1.0f / 3.0f)) + 10.0f;
}
}

8
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View file

@ -36,7 +36,7 @@ const ActorInit Arrow_Ice_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
};
void ArrowIce_SetupAction(ArrowIce* this, ArrowIceActionFunc actionFunc) {
@ -100,13 +100,13 @@ void ArrowIce_Hit(ArrowIce* this, GlobalContext* globalCtx) {
f32 offset;
u16 timer;
if (this->actor.unk_F0 < 50.0f) {
if (this->actor.projectedW < 50.0f) {
scale = 10.0f;
} else {
if (950.0f < this->actor.unk_F0) {
if (950.0f < this->actor.projectedW) {
scale = 310.0f;
} else {
scale = this->actor.unk_F0;
scale = this->actor.projectedW;
scale = ((scale - 50.0f) * (1.0f / 3.0f)) + 10.0f;
}
}

8
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View file

@ -36,7 +36,7 @@ const ActorInit Arrow_Light_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
};
void ArrowLight_SetupAction(ArrowLight* this, ArrowLightActionFunc actionFunc) {
@ -100,13 +100,13 @@ void ArrowLight_Hit(ArrowLight* this, GlobalContext* globalCtx) {
f32 offset;
u16 timer;
if (this->actor.unk_F0 < 50.0f) {
if (this->actor.projectedW < 50.0f) {
scale = 10.0f;
} else {
if (950.0f < this->actor.unk_F0) {
if (950.0f < this->actor.projectedW) {
scale = 310.0f;
} else {
scale = this->actor.unk_F0;
scale = this->actor.projectedW;
scale = ((scale - 50.0f) * (1.0f / 3.0f)) + 10.0f;
}
}

2
src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
View file

@ -306,7 +306,7 @@ void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx) {
this->actionFunc = func_8086C6EC;
} else {
this->dyna.actor.shape.rot.y += this->dyna.actor.posRot.rot.y;
func_800F436C(&this->dyna.actor.unk_E4, 0x2063, ABS(this->dyna.actor.posRot.rot.y) / 512.0f);
func_800F436C(&this->dyna.actor.projectedPos, 0x2063, ABS(this->dyna.actor.posRot.rot.y) / 512.0f);
}
}

6
src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
View file

@ -73,9 +73,9 @@ static ColliderJntSphInit sJntSphInit = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F4, 1400, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1200, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP),
};
static Vec3f D_8086E0E0 = { 0, 140.0f, 0 };

8
src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
View file

@ -39,9 +39,9 @@ static ColliderCylinderInit sCylinderInit = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 32767, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 32767, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 32767, ICHAIN_STOP),
ICHAIN_F32(uncullZoneScale, 32767, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 32767, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 32767, ICHAIN_STOP),
};
static f32 D_808718FC[] = { 0.0f, 5.0f };
@ -161,7 +161,7 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) {
func_8003555C(globalCtx, &sp5C, &D_808718FC, &D_80871908);
}
func_8005AA1C(&globalCtx->cameras, 0, sp4C * 0.6f, 3);
Audio_PlaySoundGeneral(0x2027, &this->dyna.actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(0x2027, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
}

2
src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View file

@ -32,7 +32,7 @@ const ActorInit Bg_Gjyo_Bridge_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F8, 800, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};

2
src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c
View file

@ -33,7 +33,7 @@ void BgGndNisekabe_Init(Actor* thisx, GlobalContext* globalCtx) {
BgGndNisekabe* this = THIS;
Actor_SetScale(&this->actor, 0.1);
this->actor.unk_F4 = 3000.0;
this->actor.uncullZoneForward = 3000.0;
}
void BgGndNisekabe_Destroy(Actor* thisx, GlobalContext* globalCtx) {

2
src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
View file

@ -148,7 +148,7 @@ void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx) {
} else {
this->timer = 40;
this->actionFunc = func_808809B0;
thisx->unk_F8 = 500.0f;
thisx->uncullZoneScale = 500.0f;
}
func_80061ED4(&thisx->colChkInfo, 0, &sColChkInfoInit);

6
src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
View file

@ -36,9 +36,9 @@ const ActorInit Bg_Hidan_Fslift_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 300, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 350, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 350, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP),
};
void BgHidanFslift_Init(Actor* thisx, GlobalContext* globalCtx) {

6
src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
View file

@ -38,9 +38,9 @@ const ActorInit Bg_Jya_Amishutter_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 200, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
};
extern UNK_TYPE D_0600C4C8;

6
src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c
View file

@ -35,9 +35,9 @@ const ActorInit Bg_Jya_Kanaami_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 700, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
};
extern Gfx D_0600F000[];

6
src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
View file

@ -38,9 +38,9 @@ const ActorInit Bg_Jya_Lift_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1400, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 1800, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 2500, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 1800, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 2500, ICHAIN_STOP),
};
extern UNK_TYPE D_0600D7E8;

4
src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c
View file

@ -28,8 +28,8 @@ const ActorInit Bg_Mizu_Uzu_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F8, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};

6
src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
View file

@ -38,9 +38,9 @@ extern UNK_TYPE D_06000658;
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 400, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 400, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP),
};
static s16 sObjectIDs[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME,

6
src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c
View file

@ -28,9 +28,9 @@ const ActorInit Bg_Spot00_Break_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F8, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 2000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};

8
src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
View file

@ -31,9 +31,9 @@ const ActorInit Bg_Spot01_Fusya_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 12800, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 1300, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1300, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 12800, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 1300, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1300, ICHAIN_STOP),
};
extern Gfx D_06000100[];
@ -67,7 +67,7 @@ void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) {
}
thisx->shape.rot.z += this->unk_154;
temp = ((this->unk_154 - 100.0f) / 1700.0f) + 1.0f;
func_800F436C(&thisx->unk_E4, 0x2085, temp);
func_800F436C(&thisx->projectedPos, 0x2085, temp);
Math_SmoothScaleMaxF(&this->unk_154, this->unk_158, this->unk_15C, 100.0f);
}

2
src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
View file

@ -54,7 +54,7 @@ extern Gfx D_06000420[];
extern UNK_TYPE D_0600075C;
void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) {
func_80078914(&this->dyna.actor.unk_E4, NA_SE_EV_BOX_BREAK);
func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_BOX_BREAK);
}
void BgSpot01Idohashira_PlayBreakSfx2(BgSpot01Idohashira* this, GlobalContext* globalCtx) {

12
src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
View file

@ -40,15 +40,15 @@ static s32 (*D_808B1FA4[])(BgSpot09Obj* this, GlobalContext* globalCtx) = {
};
static InitChainEntry sInitChain1[] = {
ICHAIN_F32(unk_F4, 7200, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 3000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 7200, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 7200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 7200, ICHAIN_STOP),
};
static InitChainEntry sInitChain2[] = {
ICHAIN_F32(unk_F4, 7200, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 800, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1500, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 7200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP),
};
static Gfx* sDLists[] = { 0x06000100, 0x06003970, 0x06001120, 0x06007D40, 0x06006210 };

6
src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c
View file

@ -38,9 +38,9 @@ const ActorInit Bg_Spot12_Gate_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 2500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1200, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 2500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP),
};
extern Gfx D_06001080[];

6
src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
View file

@ -36,9 +36,9 @@ const ActorInit Bg_Spot12_Saku_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
};
extern Gfx D_06002260[];

6
src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
View file

@ -32,9 +32,9 @@ const ActorInit Bg_Spot16_Doughnut_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F4, 5500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 5000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 5000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 5500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 5000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 5000, ICHAIN_STOP),
};
static s16 sScales[] = {

6
src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c
View file

@ -29,9 +29,9 @@ const ActorInit Bg_Spot18_Futa_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
};
extern UNK_TYPE D_06000368;

12
src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
View file

@ -69,15 +69,15 @@ BgSpot18ObjInitFunc D_808B910C[] = {
static InitChainEntry sInitChain1[] = {
ICHAIN_F32(minVelocityY, 65526, ICHAIN_CONTINUE),
ICHAIN_F32(gravity, 65532, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1400, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 800, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP),
};
static InitChainEntry sInitChain2[] = {
ICHAIN_F32(unk_F4, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 700, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 700, ICHAIN_STOP),
};
BgSpot18ObjInitFunc D_808B913C[] = {

4
src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
View file

@ -40,8 +40,8 @@ const ActorInit Bg_Treemouth_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_U8(unk_1F, 5, ICHAIN_CONTINUE), ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 8000, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 300, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 300, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 8000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP),
};
// unused

2
src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
View file

@ -58,7 +58,7 @@ void BgZg_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_808C0C50(BgZg* this) {
Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx) {

4
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -108,13 +108,13 @@ void func_8097C930(DemoGo* this) {
}
void func_8097C9B8(DemoGo* this) {
func_80078914(&this->actor.unk_E4, NA_SE_EN_DODO_M_GND);
func_80078914(&this->actor.projectedPos, NA_SE_EN_DODO_M_GND);
}
void func_8097C9DC(DemoGo* this) {
s32 pad[2];
if (func_800A56C8(&this->skelAnime, 12.0f) || func_800A56C8(&this->skelAnime, 25.0f)) {
func_80078914(&this->actor.unk_E4, NA_SE_EN_MORIBLIN_WALK);
func_80078914(&this->actor.projectedPos, NA_SE_EN_MORIBLIN_WALK);
}
}

2
src/overlays/actors/ovl_En_Ani/z_en_ani.c
View file

@ -52,7 +52,7 @@ static ColliderCylinderInit sCylinderInit = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 850, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 850, ICHAIN_STOP),
};
static Vec3f sMultVec = { 800.0f, 500.0f, 0.0f };

6
src/overlays/actors/ovl_En_Hata/z_en_hata.c
View file

@ -52,9 +52,9 @@ void EnHata_Init(Actor* thisx, GlobalContext* globalCtx) {
DynaPolyInfo_SetActorMove(&this->dyna, DPM_UNK);
DynaPolyInfo_Alloc(&D_060000C0, &temp);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, temp);
this->dyna.actor.unk_F8 = 500.0f;
this->dyna.actor.unk_FC = 550.0f;
this->dyna.actor.unk_F4 = 2200.0f;
this->dyna.actor.uncullZoneScale = 500.0f;
this->dyna.actor.uncullZoneDownward = 550.0f;
this->dyna.actor.uncullZoneForward = 2200.0f;
this->invScale = 6;
this->maxStep = 1000;
this->minStep = 1;

2
src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
View file

@ -437,7 +437,7 @@ void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx) {
}
Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, temp_a1, 0x800);
this->actor.posRot.rot.y = this->actor.shape.rot.y;
if ((this->animFlagAndTimer == 0) || (this->actor.unk_E4.z < 0.0f)) {
if ((this->animFlagAndTimer == 0) || (this->actor.projectedPos.z < 0.0f)) {
func_80106CCC(globalCtx);
if (this->actor.params == 3) {
Flags_SetClear(globalCtx, this->actor.room);

8
src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
View file

@ -79,7 +79,7 @@ unk_D_80A69248 D_80A69248[] = { { 0x09B8, 0x0126, 0x0E2C, 0x07 }, { 0x0C11, 0x01
s32 D_80A692B8[] = { 0, 0x00000010 };
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F8, 1200, ICHAIN_STOP),
ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP),
};
static EnHorseGanonActionFunc sActionFuncs[] = { func_80A68AF0, func_80A68DB0, NULL };
@ -138,7 +138,7 @@ void func_80A686A8(EnHorseGanon* this, GlobalContext* globalCtx) {
void func_80A68870(EnHorseGanon* this) {
if (this->skin.skelAnime.animCurrentFrame > D_80A692B8[this->soundCount]) {
if (D_80A692B8[this->soundCount] != 0 || !(this->skin.skelAnime.animCurrentFrame > D_80A692B8[1])) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
this->soundCount += 1;
if (this->soundCount >= 2) {
@ -222,10 +222,10 @@ void func_80A68B20(EnHorseGanon* this) {
sp30 = this->actor.speedXZ / 3.0f;
} else if (this->currentAnimation == 3) {
sp30 = this->actor.speedXZ / 5.0f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else if (this->currentAnimation == 4) {
sp30 = this->actor.speedXZ / 7.0f;
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else {
sp30 = 1.0f;
}

4
src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c
View file

@ -83,7 +83,7 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
if (thisx->speedXZ) {
if (thisx->bgCheckFlags & 8) {
thisx->posRot.rot.y = (thisx->posRot.rot.y + thisx->wallPolyRot) - thisx->posRot.rot.y;
Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
thisx->speedXZ *= 0.7f;
thisx->bgCheckFlags &= ~0x8;
@ -95,7 +95,7 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
} else {
Math_ApproxF(&thisx->speedXZ, 0, IREG(58) / 100.0f);
if ((thisx->bgCheckFlags & 2) && (thisx->velocity.y < IREG(59) / 100.0f)) {
Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
thisx->velocity.y *= IREG(60) / 100.0f;
thisx->bgCheckFlags &= ~0x1;

6
src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
View file

@ -52,8 +52,8 @@ void EnPubox_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_164 = 1;
thisx->colChkInfo.unk_10 = 0x14;
thisx->colChkInfo.unk_12 = 0x32;
thisx->unk_FC = 1200.0f;
thisx->unk_F8 = 720.0f;
thisx->uncullZoneDownward = 1200.0f;
thisx->uncullZoneScale = 720.0f;
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, 6.0f);
this->dyna.unk_160 = 0;
this->dyna.unk_15C = 0;
@ -77,7 +77,7 @@ void EnPubox_Update(Actor* thisx, GlobalContext* globalCtx) {
thisx->speedXZ = (thisx->speedXZ < -2.5f) ? -2.5f : ((thisx->speedXZ > 2.5f) ? 2.5f : thisx->speedXZ);
Math_SmoothScaleMaxMinF(&thisx->speedXZ, 0.0f, 1.0f, 1.0f, 0.0f);
if (thisx->speedXZ != 0.0f) {
Audio_PlaySoundGeneral(0x200A, &thisx->unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Audio_PlaySoundGeneral(0x200A, &thisx->projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
this->dyna.unk_154 = 0.0f;
this->dyna.unk_150 = 0.0f;

42
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -582,14 +582,14 @@ void func_80AEBA2C(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEBAFC(EnRu1* this) {
if (this->unk_298 == 0) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_DIVE_INTO_WATER);
func_80078914(&this->actor.projectedPos, NA_SE_EV_DIVE_INTO_WATER);
this->unk_298 = 1;
}
}
void func_80AEBB3C(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 5.0f)) {
func_80078914(&this->actor.unk_E4, 0x863);
func_80078914(&this->actor.projectedPos, 0x863);
}
}
@ -599,13 +599,13 @@ void func_80AEBB78(EnRu1* this) {
if ((((func_800A56C8(skelAnime, 4.0f)) || (func_800A56C8(skelAnime, 13.0f))) ||
(func_800A56C8(skelAnime, 22.0f))) ||
(func_800A56C8(skelAnime, 31.0f))) {
func_80078914(&this->actor.unk_E4, 0x839);
func_80078914(&this->actor.projectedPos, 0x839);
}
}
void func_80AEBBF4(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 8.0f)) {
func_80078914(&this->actor.unk_E4, 0x873);
func_80078914(&this->actor.projectedPos, 0x873);
}
}
@ -614,14 +614,14 @@ void func_80AEBC30(GlobalContext* globalCtx) {
if (globalCtx->csCtx.frames == 0xCD) {
player = PLAYER;
Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.unk_E4, 4, &D_801333E0, &D_801333E0,
Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
}
}
void func_80AEBC84(EnRu1* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.frames == 0x82) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LAUGH_0);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0);
}
}
@ -861,14 +861,14 @@ void func_80AEC650(EnRu1* this) {
s32 pad[2];
if (this->unk_280 == 0) {
if ((func_800A56C8(&this->skelAnime, 2.0f)) || (func_800A56C8(&this->skelAnime, 7.0f))) {
func_80078914(&this->actor.unk_E4, 0x803);
func_80078914(&this->actor.projectedPos, 0x803);
}
}
}
void func_80AEC6B0(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_FALL_DOWN_DIRT);
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_FALL);
func_80078914(&this->actor.projectedPos, NA_SE_EV_FALL_DOWN_DIRT);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_FALL);
}
void func_80AEC6E4(EnRu1* this, GlobalContext* globalCtx) {
@ -1221,32 +1221,32 @@ void func_80AED44C(EnRu1* this, GlobalContext* globalCtx) {
}
void func_80AED4FC(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_LAND_DIRT);
func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT);
}
func_80AED520(EnRu1* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Audio_PlaySoundGeneral(0x883, &player->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LIFT);
Audio_PlaySoundGeneral(0x883, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LIFT);
}
void func_80AED57C(EnRu1* this) {
if (this->actor.speedXZ != 0.0f) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_THROW);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW);
}
}
void func_80AED5B8(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_CRASH);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_CRASH);
}
void func_80AED5DC(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_UNBALLANCE);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_UNBALLANCE);
}
void func_80AED600(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_DISCOVER);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_DISCOVER);
}
s32 func_80AED624(EnRu1* this, GlobalContext* globalCtx) {
@ -1845,7 +1845,7 @@ void func_80AEEFEC(EnRu1* this, GlobalContext* globalCtx) {
void func_80AEF080(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 11.0f)) {
func_80078914(&this->actor.unk_E4, NA_SE_EV_LAND_DIRT);
func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT);
}
}
@ -1937,22 +1937,22 @@ void func_80AEF40C(EnRu1* this) {
if ((func_800A56C8(skelAnime, 2.0f)) || (func_800A56C8(skelAnime, 7.0f)) || (func_800A56C8(skelAnime, 12.0f)) ||
(func_800A56C8(skelAnime, 18.0f)) || (func_800A56C8(skelAnime, 25.0f)) || (func_800A56C8(skelAnime, 33.0f))) {
func_80078914(&this->actor.unk_E4, 0x803);
func_80078914(&this->actor.projectedPos, 0x803);
}
}
void func_80AEF4A8(EnRu1* this, GlobalContext* globalCtx) {
Audio_PlaySoundAtPosition(globalCtx, &this->actor.unk_E4, 20, NA_SE_VO_RT_FALL);
Audio_PlaySoundAtPosition(globalCtx, &this->actor.projectedPos, 20, NA_SE_VO_RT_FALL);
}
void func_80AEF4E0(EnRu1* this) {
if (func_800A56C8(&this->skelAnime, 5.0f)) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LAUGH_0);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0);
}
}
void func_80AEF51C(EnRu1* this) {
func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_THROW);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW);
}
void func_80AEF540(EnRu1* this) {

6
src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
View file

@ -45,9 +45,9 @@ static CollisionCheckInfoInit sColChkInfoInit = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 0x64, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 0x7D0, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 0x15E, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 0x3E8, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 0x7D0, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 0x15E, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 0x3E8, ICHAIN_STOP),
};
static s16 sEffectScales[] = {

6
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
View file

@ -47,9 +47,9 @@ ColliderJntSphInit sJntSphInit = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 100, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 900, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1100, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP),
};
extern Gfx D_050095B0[];

6
src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c
View file

@ -33,9 +33,9 @@ const ActorInit Obj_Elevator_InitVars = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_F32(unk_F4, 2000, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 600, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 2000, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 600, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP),
};
static f32 sScales[] = { 0.1f, 0.05f };

2
src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
View file

@ -34,7 +34,7 @@ const ActorInit Oceff_Spot_InitVars = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 1500, ICHAIN_STOP),
ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP),
};
void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc) {