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 116a6ebf75..41d68fbcc3 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 @@ -291,8 +291,8 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { platform->dyna.actor.world.pos.z, MTXMODE_NEW); phi_s1 = NULL; if (platform->isFalling) { - Matrix_RotateX((platform->dyna.actor.shape.rot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((platform->dyna.actor.shape.rot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(platform->dyna.actor.shape.rot.x), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(platform->dyna.actor.shape.rot.z), MTXMODE_APPLY); if (camera->eye.y > platform->dyna.actor.world.pos.y) { phi_s1 = sPlatformBottomDL; } else { 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 31cbf1f2d8..d977e8f7f6 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -950,9 +950,9 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) { this->bodySegsPos[i4].x = this->actor.world.pos.x; this->bodySegsPos[i4].y = this->actor.world.pos.y; this->bodySegsPos[i4].z = this->actor.world.pos.z; - this->bodySegsRot[i4].x = (this->actor.world.rot.x / (f32)0x8000) * M_PI; - this->bodySegsRot[i4].y = (this->actor.world.rot.y / (f32)0x8000) * M_PI; - this->bodySegsRot[i4].z = (this->actor.world.rot.z / (f32)0x8000) * M_PI; + this->bodySegsRot[i4].x = BINANG_TO_RAD_ALT(this->actor.world.rot.x); + this->bodySegsRot[i4].y = BINANG_TO_RAD_ALT(this->actor.world.rot.y); + this->bodySegsRot[i4].z = BINANG_TO_RAD_ALT(this->actor.world.rot.z); this->work[BFD_LEAD_MANE_SEG]++; if (this->work[BFD_LEAD_MANE_SEG] >= 30) { @@ -963,9 +963,9 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) { this->rightMane.scale[i4] = (Math_SinS(this->work[BFD_MOVE_TIMER] * 5496.0f) * 0.3f) + 1.0f; this->leftMane.scale[i4] = (Math_CosS(this->work[BFD_MOVE_TIMER] * 5696.0f) * 0.3f) + 1.0f; this->centerMane.pos[i4] = this->centerMane.head; - this->fireManeRot[i4].x = (this->actor.world.rot.x / (f32)0x8000) * M_PI; - this->fireManeRot[i4].y = (this->actor.world.rot.y / (f32)0x8000) * M_PI; - this->fireManeRot[i4].z = (this->actor.world.rot.z / (f32)0x8000) * M_PI; + this->fireManeRot[i4].x = BINANG_TO_RAD_ALT(this->actor.world.rot.x); + this->fireManeRot[i4].y = BINANG_TO_RAD_ALT(this->actor.world.rot.y); + this->fireManeRot[i4].z = BINANG_TO_RAD_ALT(this->actor.world.rot.z); this->rightMane.pos[i4] = this->rightMane.head; this->leftMane.pos[i4] = this->leftMane.head; @@ -1233,8 +1233,8 @@ void BossFd_Effects(BossFd* this, GlobalContext* globalCtx) { &D_801333E8); spawnPos2 = this->headPos; - spawnAngleY = (this->actor.world.rot.y / (f32)0x8000) * M_PI; - spawnAngleX = (((-this->actor.world.rot.x) / (f32)0x8000) * M_PI) + 0.3f; + spawnAngleY = BINANG_TO_RAD_ALT(this->actor.world.rot.y); + spawnAngleX = BINANG_TO_RAD_ALT(-this->actor.world.rot.x) + 0.3f; Matrix_RotateY(spawnAngleY, MTXMODE_NEW); Matrix_RotateX(spawnAngleX, MTXMODE_APPLY); Matrix_MultVec3f(&spawnSpeed2, &spawnVel2); @@ -1938,7 +1938,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) { MTXMODE_NEW); Matrix_RotateY(this->bodySegsRot[segIndex].y, MTXMODE_APPLY); Matrix_RotateX(-this->bodySegsRot[segIndex].x, MTXMODE_APPLY); - Matrix_RotateZ((this->actor.shape.rot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(this->actor.shape.rot.z), MTXMODE_APPLY); Matrix_Translate(0.0f, 0.0f, temp_float, MTXMODE_APPLY); Matrix_Push(); Matrix_Translate(0.0f, 0.0f, 25.0f, MTXMODE_APPLY); 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 e0185daf06..714f855c86 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -455,8 +455,8 @@ void BossFd2_BreatheFire(BossFd2* this, GlobalContext* globalCtx) { spawnSpeed.z = 30.0f; spawnPos = this->headPos; - tempY = ((this->actor.shape.rot.y + this->headRot.y) / (f32)0x8000) * M_PI; - tempX = ((this->headRot.x / (f32)0x8000) * M_PI) + 1.0f / 2; + tempY = BINANG_TO_RAD_ALT(this->actor.shape.rot.y + this->headRot.y); + tempX = BINANG_TO_RAD_ALT(this->headRot.x) + 1.0f / 2; Matrix_RotateY(tempY, MTXMODE_NEW); Matrix_RotateX(tempX, MTXMODE_APPLY); Matrix_MultVec3f(&spawnSpeed, &spawnVel); @@ -692,7 +692,7 @@ void BossFd2_Death(BossFd2* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_VALVAISA_DAMAGE2); } Math_ApproachF(&this->skelAnime.playSpeed, retreatSpeed, 1.0f, 1.0f); - Matrix_RotateY(((this->actor.yawTowardsPlayer / (f32)0x8000) * M_PI) + 0.2f, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.yawTowardsPlayer) + 0.2f, MTXMODE_NEW); sp70.x = 0.0f; sp70.y = 0.0f; sp70.z = 250.0f; 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 591eaf7b88..04a27e1c12 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -908,7 +908,7 @@ void func_808FF898(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; Vec3f sp28; - Matrix_RotateY(((this->actor.shape.rot.y / (f32)0x8000) * M_PI) + 0.5f, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y) + 0.5f, MTXMODE_NEW); sp28.x = 0.0f; sp28.y = 0.0f; sp28.z = 1.0f; @@ -1300,7 +1300,7 @@ void func_80900890(BossGanon2* this, GlobalContext* globalCtx) { if (this->unk_1A2[1] == 50) { func_80078884(NA_SE_EN_MGANON_WALK); } - Matrix_RotateY(((this->actor.shape.rot.y / (f32)0x8000) * M_PI) + 0.3f, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y) + 0.3f, MTXMODE_NEW); sp5C.x = 0.0f; sp5C.y = 0.0f; sp5C.z = 250.0f; 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 29e4b6040c..286eebe9c9 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -896,9 +896,9 @@ void BossGanondrof_Charge(BossGanondrof* this, GlobalContext* globalCtx) { baseOffset.y = 10.0f; for (i = 0; i < 10; i++) { Matrix_Push(); - Matrix_RotateY((thisx->shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); - Matrix_RotateX((thisx->shape.rot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((this->work[GND_PARTICLE_ANGLE] / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(thisx->shape.rot.y), MTXMODE_NEW); + Matrix_RotateX(BINANG_TO_RAD_ALT(thisx->shape.rot.x), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(this->work[GND_PARTICLE_ANGLE]), MTXMODE_APPLY); Matrix_MultVec3f(&baseOffset, &offset); Matrix_Pop(); pos.x = this->spearTip.x + offset.x; 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 7119b38900..ba5979d428 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -925,7 +925,7 @@ void BossMo_Tentacle(BossMo* this, GlobalContext* globalCtx) { spFC.x = 0; spFC.y = 0; spFC.z = 0; - Matrix_RotateY((player->actor.world.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(player->actor.world.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&spFC, &spF0); spF0.x = player->actor.world.pos.x + spF0.x; spF0.z = player->actor.world.pos.z + spF0.z; @@ -2101,7 +2101,7 @@ void BossMo_Core(BossMo* this, GlobalContext* globalCtx) { sp70.x = 0.0f; sp70.y = 0.0f; sp70.z = 100.0f; - Matrix_RotateY((player->actor.world.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(player->actor.world.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&sp70, &sp64); this->targetPos.x = player->actor.world.pos.x + sp64.x; this->targetPos.y = player->actor.world.pos.y + 30.0f; @@ -2448,8 +2448,8 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x0C, matrix); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); - Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((this->actor.shape.rot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->actor.shape.rot.x), MTXMODE_APPLY); BossMo_InitRand(1, 29100, 9786); @@ -2464,8 +2464,8 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) { } else { if (i >= 3) { Matrix_Translate(0.0f, this->tentStretch[i - 2].y, 0.0f, MTXMODE_APPLY); - Matrix_RotateX((this->tentRot[i - 2].x / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((this->tentRot[i - 2].z / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->tentRot[i - 2].x), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(this->tentRot[i - 2].z), MTXMODE_APPLY); } Matrix_Push(); Matrix_Scale((this->tentScale[i - 2].x + this->tentRipple[i - 2].x) * this->actor.scale.x, 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 562f7f7346..53aafef472 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -1219,8 +1219,8 @@ void BossTw_ShootBeam(BossTw* this, GlobalContext* globalCtx) { sp128.x = -sp128.x; Math_ApproachS(&this->magicDir.x, sp128.x, 5, 0x2000); Math_ApproachS(&this->magicDir.y, sp128.y, 5, 0x2000); - this->beamReflectionPitch = (this->magicDir.x / 32768.0f) * M_PI; - this->beamReflectionYaw = (this->magicDir.y / 32768.0f) * M_PI; + this->beamReflectionPitch = BINANG_TO_RAD_ALT(this->magicDir.x); + this->beamReflectionYaw = BINANG_TO_RAD_ALT(this->magicDir.y); } Matrix_Translate(this->beamReflectionOrigin.x, this->beamReflectionOrigin.y, this->beamReflectionOrigin.z, @@ -4702,7 +4702,7 @@ void BossTw_UpdateEffects(GlobalContext* globalCtx) { sp11C.x = 0.0f; sp11C.y = 0.0f; sp11C.z = -eff->workf[EFF_DIST]; - Matrix_RotateY((sShieldHitYaw / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(sShieldHitYaw), MTXMODE_NEW); Matrix_RotateX(-0.2f, MTXMODE_APPLY); Matrix_RotateZ(eff->workf[EFF_ROLL], MTXMODE_APPLY); Matrix_RotateY(eff->workf[EFF_YAW], MTXMODE_APPLY); @@ -4748,7 +4748,7 @@ void BossTw_UpdateEffects(GlobalContext* globalCtx) { sp11C.x = 0.0f; sp11C.y = 0.0f; sp11C.z = -eff->workf[EFF_DIST]; - Matrix_RotateY((sShieldHitYaw / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(sShieldHitYaw), MTXMODE_NEW); Matrix_RotateX(-0.2f, MTXMODE_APPLY); Matrix_RotateZ(eff->workf[EFF_ROLL], MTXMODE_APPLY); Matrix_RotateY(eff->workf[EFF_YAW], MTXMODE_APPLY); 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 e00ceb232b..0e16041024 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 @@ -741,9 +741,9 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(this->floorTangent.x, MTXMODE_APPLY); Matrix_RotateZ(this->floorTangent.z, MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x + 0.35f, 0.0f, this->actor.scale.z + 0.35f, MTXMODE_APPLY); - Matrix_RotateY((this->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((this->actor.shape.rot.x / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((this->actor.shape.rot.z / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->actor.shape.rot.x), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(this->actor.shape.rot.z), MTXMODE_APPLY); if (this->crashingTimer != 0) { f32 xRotation; f32 yRotation; 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 4cd11c07d5..084f2d1d0c 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 @@ -686,8 +686,8 @@ void EnDntNomal_StageAttack(EnDntNomal* this, GlobalContext* globalCtx) { f32 spawnY; f32 spawnZ; - Matrix_RotateY(this->actor.shape.rot.y / (f32)0x8000 * M_PI, MTXMODE_NEW); - Matrix_RotateX(this->actor.shape.rot.x / (f32)0x8000 * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->actor.shape.rot.x), MTXMODE_APPLY); baseOffset.x = 0.0f; baseOffset.y = 0.0f; baseOffset.z = 5.0f; 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 76b08717d3..259be1dbbc 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -411,7 +411,7 @@ void EnFr_JumpingOutOfWater(EnFr* this, GlobalContext* globalCtx) { vec1.x = vec1.y = 0.0f; vec1.z = this->xzDistToLogSpot; - Matrix_RotateY(((this->actor.world.rot.y + 0x8000) / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.world.rot.y + 0x8000), MTXMODE_NEW); Matrix_MultVec3f(&vec1, &vec2); this->actor.world.pos.x = this->posLogSpot.x + vec2.x; this->actor.world.pos.z = this->posLogSpot.z + vec2.z; 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 afa4236f1c..35f323dd71 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -519,7 +519,7 @@ void EnFz_BlowSmoke(EnFz* this, GlobalContext* globalCtx) { pos.y = this->actor.world.pos.y + 20.0f; pos.z = this->actor.world.pos.z; - Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); vec1.x = 0.0f; vec1.y = -2.0f; @@ -631,7 +631,7 @@ void EnFz_BlowSmokeStationary(EnFz* this, GlobalContext* globalCtx) { pos.y = this->actor.world.pos.y + 20.0f; pos.z = this->actor.world.pos.z; - Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); vec1.x = 0.0f; vec1.y = -2.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 182a21e485..52774535e5 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1085,18 +1085,18 @@ s32 EnGo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f if (limb == 17) { Matrix_Translate(2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); vec1 = this->unk_1E0.unk_08; - float1 = (vec1.y / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.y); Matrix_RotateX(float1, MTXMODE_APPLY); - float1 = (vec1.x / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.x); Matrix_RotateZ(float1, MTXMODE_APPLY); Matrix_Translate(-2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limb == 10) { vec1 = this->unk_1E0.unk_0E; - float1 = (vec1.y / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.y); Matrix_RotateY(float1, MTXMODE_APPLY); - float1 = (vec1.x / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.x); Matrix_RotateX(float1, MTXMODE_APPLY); } 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 afbd4b3d7c..b2be801fdb 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -2004,17 +2004,17 @@ s32 EnGo2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3 if (limb == 17) { Matrix_Translate(2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); vec1 = this->unk_194.unk_08; - float1 = (vec1.y / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.y); Matrix_RotateX(float1, MTXMODE_APPLY); - float1 = (vec1.x / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.x); Matrix_RotateZ(float1, MTXMODE_APPLY); Matrix_Translate(-2800.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limb == 10) { vec1 = this->unk_194.unk_0E; - float1 = (vec1.y / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.y); Matrix_RotateY(float1, MTXMODE_APPLY); - float1 = (vec1.x / (f32)0x8000) * M_PI; + float1 = BINANG_TO_RAD_ALT(vec1.x); Matrix_RotateX(float1, MTXMODE_APPLY); } if ((limb == 10) || (limb == 11) || (limb == 14)) { 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 4e0efc9a88..8fd74ea734 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -631,7 +631,7 @@ void EnGoma_UpdateHit(EnGoma* this, GlobalContext* globalCtx) { this->actor.velocity.y = 0.0f; this->actor.speedXZ = -5.0f; } else { - Matrix_RotateY(player->actor.shape.rot.y / (f32)0x8000 * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(player->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&sShieldKnockbackVel, &this->shieldKnockbackVel); this->invincibilityTimer = 5; } @@ -792,11 +792,11 @@ void EnGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { this->actor.world.pos.y + ((this->actor.shape.yOffset * this->actor.scale.y) + globalCtx->mainCamera.skyboxOffset.y), this->actor.world.pos.z, MTXMODE_NEW); - Matrix_RotateX(this->slopePitch / (f32)0x8000 * M_PI, MTXMODE_APPLY); - Matrix_RotateZ(this->slopeRoll / (f32)0x8000 * M_PI, MTXMODE_APPLY); - Matrix_RotateY(this->actor.shape.rot.y / (f32)0x8000 * M_PI, MTXMODE_APPLY); - Matrix_RotateX(this->actor.shape.rot.x / (f32)0x8000 * M_PI, MTXMODE_APPLY); - Matrix_RotateZ(this->actor.shape.rot.z / (f32)0x8000 * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->slopePitch), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(this->slopeRoll), MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->actor.shape.rot.x), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(this->actor.shape.rot.z), MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); SkelAnime_DrawOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, EnGoma_OverrideLimbDraw, NULL, this); 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 9d2115b2a4..d7f6b890fc 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -190,15 +190,15 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis *dList = object_boj_DL_0059B0; Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); sp3C = this->unk_2A0.unk_08; - Matrix_RotateX((sp3C.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((sp3C.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(sp3C.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(sp3C.x), MTXMODE_APPLY); Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == 8) { sp3C = this->unk_2A0.unk_0E; - Matrix_RotateX((-sp3C.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((sp3C.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(-sp3C.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(sp3C.x), MTXMODE_APPLY); } if (limbIndex == 8 || limbIndex == 9 || limbIndex == 12) { 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 325b4c9409..94f66bcf1d 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -424,7 +424,7 @@ void EnHeishi1_Update(Actor* thisx, GlobalContext* globalCtx) { searchBallPos.z = this->actor.world.pos.z; Matrix_Push(); - Matrix_RotateY(((this->actor.shape.rot.y + this->headAngle) / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y + this->headAngle), MTXMODE_NEW); searchBallMult.z = 30.0f; Matrix_MultVec3f(&searchBallMult, &searchBallVel); Matrix_Pop(); 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 662b0494fb..38292ec2cf 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -1121,15 +1121,15 @@ s32 EnHy_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == 15) { Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); sp48 = this->unk_1E8.unk_08; - Matrix_RotateX((sp48.y / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((sp48.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(sp48.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(sp48.x), MTXMODE_APPLY); Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == 8) { sp48 = this->unk_1E8.unk_0E; - Matrix_RotateX((-sp48.y / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((sp48.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(-sp48.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(sp48.x), MTXMODE_APPLY); } if ((limbIndex == 8) || (limbIndex == 9) || (limbIndex == 12)) { 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 0ac8cceb2e..7de76c5fcc 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -371,7 +371,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) { piece->pieceType = PIECE_WHOLE_SIGN; } - Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&sPieceOffsets[piece->pieceType], &offset); piece->actor.world.pos.x += offset.x; piece->actor.world.pos.y += offset.y; @@ -750,7 +750,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) { Actor_Kill(&this->actor); } - Matrix_RotateY((signpost->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(signpost->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&sPieceOffsets[this->pieceType], &offset); distX = Math_SmoothStepToF(&this->actor.world.pos.x, signpost->actor.world.pos.x + offset.x, 1.0f, 3.0f, 0.0f); @@ -815,15 +815,15 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(this->floorRot.x, MTXMODE_APPLY); Matrix_RotateZ(this->floorRot.z, MTXMODE_APPLY); Matrix_Translate(0.0f, this->actor.shape.yOffset, 0.0f, MTXMODE_APPLY); - Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((this->actor.shape.rot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->actor.shape.rot.x), MTXMODE_APPLY); zShift = fabsf(Math_SinS(this->spinRot.x) * this->pieceHeight); zShift2 = fabsf(Math_SinS(this->spinRot.z) * this->pieceWidth); zShift = MAX(zShift2, zShift); zShift *= -(f32)this->direction; Matrix_Translate(0.0f, 0.0f, zShift, MTXMODE_APPLY); - Matrix_RotateX((this->spinRot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateY((this->spinRot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->spinRot.x), MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->spinRot.z), MTXMODE_APPLY); Matrix_Translate(this->offset.x, this->offset.y, this->offset.z - 100.0f, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1715), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -888,10 +888,10 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->actionState == ENKANBAN_SIGN) { Matrix_RotateX(-M_PI / 5, MTXMODE_APPLY); } - Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((this->actor.shape.rot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((this->spinRot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateY((this->spinRot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->actor.shape.rot.x), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->spinRot.x), MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->spinRot.z), MTXMODE_APPLY); Matrix_Translate(this->offset.x, this->offset.y, this->offset.z, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1833), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); 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 c97b2f2a40..4650001189 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -423,14 +423,14 @@ s32 EnMa1_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == 15) { Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); vec = this->unk_1E8.unk_08; - Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(vec.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(vec.x), MTXMODE_APPLY); Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == 8) { vec = this->unk_1E8.unk_0E; - Matrix_RotateX((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(-vec.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(-vec.x), MTXMODE_APPLY); } return false; } 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 9852548b8f..f6ca64d80e 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -334,14 +334,14 @@ s32 EnMa2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == MALON_ADULT_HEAD_LIMB) { Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); vec = this->unk_1E0.unk_08; - Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(vec.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(vec.x), MTXMODE_APPLY); Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) { vec = this->unk_1E0.unk_0E; - Matrix_RotateY((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(-vec.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(-vec.x), MTXMODE_APPLY); } if ((limbIndex == MALON_ADULT_CHEST_AND_NECK_LIMB) || (limbIndex == MALON_ADULT_LEFT_SHOULDER_LIMB) || (limbIndex == MALON_ADULT_RIGHT_SHOULDER_LIMB)) { 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 6f1e8892a5..b78babe6ff 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -314,14 +314,14 @@ s32 EnMa3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == MALON_ADULT_LIMB_HEAD) { Matrix_Translate(1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); vec = this->unk_1E0.unk_08; - Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(vec.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(vec.x), MTXMODE_APPLY); Matrix_Translate(-1400.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) { vec = this->unk_1E0.unk_0E; - Matrix_RotateY((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(-vec.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(-vec.x), MTXMODE_APPLY); } if ((limbIndex == MALON_ADULT_LIMB_CHEST_AND_NECK) || (limbIndex == MALON_ADULT_LIMB_LEFT_SHOULDER) || (limbIndex == MALON_ADULT_LIMB_RIGHT_SHOULDER)) { 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 e32cb46b22..66e913c26d 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -815,14 +815,14 @@ s32 EnMd_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == 16) { Matrix_Translate(1200.0f, 0.0f, 0.0f, MTXMODE_APPLY); vec = this->unk_1E0.unk_08; - Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(vec.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(vec.x), MTXMODE_APPLY); Matrix_Translate(-1200.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == 9) { vec = this->unk_1E0.unk_0E; - Matrix_RotateX((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateY((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(vec.x), MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(vec.y), MTXMODE_APPLY); } if (((limbIndex == 9) || (limbIndex == 10)) || (limbIndex == 13)) { 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 ccac186d81..c795e61c7e 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 @@ -68,7 +68,7 @@ void EnNiwGirl_Init(Actor* thisx, GlobalContext* globalCtx) { } this->path = ((this->actor.params >> 8) & 0xFF); this->actor.gravity = -3.0f; - Matrix_RotateY((this->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); vec2.x = vec2.y = vec2.z = 0.0f; vec1.x = vec1.y = 0.0f; vec1.z = 50.0; 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 d80ebb348d..c1781f3ddc 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -286,8 +286,8 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, GlobalContext sp178.x *= (KREG(88) - 1); Matrix_Mult(&player->shieldMf, MTXMODE_NEW); Matrix_MultVec3f(&D_80AFA0D0, &sp16C); - Matrix_RotateY((sp178.y / 32768.0f) * M_PI, MTXMODE_NEW); - Matrix_RotateX((sp178.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(sp178.y), MTXMODE_NEW); + Matrix_RotateX(BINANG_TO_RAD_ALT(sp178.x), MTXMODE_APPLY); for (i = 0; i < 22; i++) { Matrix_MultVec3f(&D_80AFA180[i], &sp188); if (1) {} 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 a7ad4c9600..af4b85f4c2 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -330,7 +330,7 @@ void EnSkj_CalculateCenter(EnSkj* this) { mult.y = 0.0f; mult.z = 120.0f; - Matrix_RotateY((this->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&mult, &this->center); this->center.x += this->actor.world.pos.x; @@ -498,7 +498,7 @@ s32 EnSkj_ShootNeedle(EnSkj* this, GlobalContext* globalCtx) { pos.y = 0.0f; pos.z = 40.0f; - Matrix_RotateY((this->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&pos, &pos2); pos2.x += this->actor.world.pos.x; @@ -822,7 +822,7 @@ void EnSkj_Fight(EnSkj* this, GlobalContext* globalCtx) { pos1.y = 0.0f; pos1.z = -120.0f; - Matrix_RotateY((this->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&pos1, &pos2); prevPosX = this->actor.world.pos.x; prevPosZ = this->actor.world.pos.z; 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 1d1313d9f0..ffd094df1c 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -573,7 +573,7 @@ s32 EnSsh_SetCylinderOC(EnSsh* this, GlobalContext* globalCtx) { cyloffsets[i].z *= this->colliderScale; Matrix_Push(); Matrix_Translate(cylPos.x, cylPos.y, cylPos.z, MTXMODE_NEW); - Matrix_RotateY((this->initialYaw / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->initialYaw), MTXMODE_APPLY); Matrix_MultVec3f(&cyloffsets[i], &cylPos); Matrix_Pop(); this->colCylinder[i + 3].dim.pos.x = cylPos.x; 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 25ef04ec8f..8464a358c9 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -346,7 +346,7 @@ s32 EnSt_SetCylinderOC(EnSt* this, GlobalContext* globalCtx) { cyloffsets[i].z *= this->colliderScale; Matrix_Push(); Matrix_Translate(cylPos.x, cylPos.y, cylPos.z, MTXMODE_NEW); - Matrix_RotateY((this->initalYaw / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->initalYaw), MTXMODE_APPLY); Matrix_MultVec3f(&cyloffsets[i], &cylPos); Matrix_Pop(); this->colCylinder[i + 3].dim.pos.x = cylPos.x; 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 1860d580ac..79848ffb7c 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -877,7 +877,7 @@ void EnViewer_UpdateGanondorfCape(GlobalContext* globalCtx, EnViewer* this) { forearmModelOffset.z = KREG(18) - 10.0f; yOscillationPhase += KREG(19) * 0x1000 + 0x2000; - Matrix_RotateY((this->actor.shape.rot.y / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&forearmModelOffset, &forearmWorldOffset); sGanondorfCape->rightForearmPos.x = sGanondorfNeckWorldPos.x + forearmWorldOffset.x; sGanondorfCape->rightForearmPos.y = sGanondorfNeckWorldPos.y + forearmWorldOffset.y; 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 ceaae5feeb..b7f4d1d068 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -1255,14 +1255,14 @@ s32 EnZl4_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == 17) { sp1C = this->unk_1E0.unk_08; Matrix_Translate(900.0f, 0.0f, 0.0f, MTXMODE_APPLY); - Matrix_RotateX((sp1C.y / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((sp1C.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(sp1C.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(sp1C.x), MTXMODE_APPLY); Matrix_Translate(-900.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == 10) { sp1C = this->unk_1E0.unk_0E; - Matrix_RotateY((sp1C.y / (f32)0x8000) * M_PI, MTXMODE_APPLY); - Matrix_RotateX((sp1C.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(sp1C.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(sp1C.x), MTXMODE_APPLY); } if ((limbIndex >= 3) && (limbIndex < 7)) { *dList = NULL; diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 1b89266e1f..321a02799b 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -758,15 +758,15 @@ s32 EnZo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == 15) { Matrix_Translate(1800.0f, 0.0f, 0.0f, MTXMODE_APPLY); vec = this->unk_194.unk_08; - Matrix_RotateX((vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(vec.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(vec.x), MTXMODE_APPLY); Matrix_Translate(-1800.0f, 0.0f, 0.0f, MTXMODE_APPLY); } if (limbIndex == 8) { vec = this->unk_194.unk_0E; - Matrix_RotateX((-vec.y / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ((vec.x / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(-vec.y), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(vec.x), MTXMODE_APPLY); } if ((limbIndex == 8) || (limbIndex == 9) || (limbIndex == 12)) { 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 c2a1b20363..9f7231454f 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -61,7 +61,7 @@ void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) { Matrix_Mult(mf, MTXMODE_NEW); Matrix_Translate(0.0f, 150.0f, 170.0f, MTXMODE_APPLY); Matrix_Scale(0.13f, 0.13f, 0.13f, MTXMODE_APPLY); - Matrix_RotateX(0xBB8 * M_PI / 0x8000, MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(0xBB8), MTXMODE_APPLY); Matrix_RotateY(0.0f, MTXMODE_APPLY); Matrix_RotateZ(0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_end_title.c", 412), G_MTX_LOAD); diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index b212dc4ed9..7fe7e193f8 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -2213,7 +2213,7 @@ void Fishing_UpdateLure(Fishing* this, GlobalContext* globalCtx) { if (D_80B7E0B4 == 18) { D_80B7A694 = 1; sLurePos = sRodTipPos; - Matrix_RotateY((player->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(player->actor.shape.rot.y), MTXMODE_NEW); sp90.x = 0.0f; sp90.y = 0.0f; sp90.z = 25.0f; @@ -2493,7 +2493,7 @@ void Fishing_UpdateLure(Fishing* this, GlobalContext* globalCtx) { Math_ApproachZeroF(&D_80B7E138, 1.0f, 0.3f); Math_ApproachS(&D_80B7E13C, (D_80B7E134 * 32768.0f) / M_PI, 3, spDC); - sLureRot.y = (D_80B7E13C / 32768.0f) * M_PI; + sLureRot.y = BINANG_TO_RAD_ALT(D_80B7E13C); sp90.x = 0.0f; sp90.y = 0.0f; @@ -2746,7 +2746,7 @@ void func_80B70ED4(Fishing* this, Input* input) { sp24 = SQ(sp34.x) + SQ(sp34.y) + SQ(sp34.z); if ((D_80B7A694 == 3) && (this->unk_1A2 == 0) && (D_80B7A68C == 0)) { - Matrix_RotateY((-this->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(-this->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&sp34, &sp28); if ((sp28.z > 0.0f) || (this->unk_1AC < 40.0f)) { @@ -3640,7 +3640,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { for (spA2 = 0; spA2 < 100; spA2++) { Matrix_RotateY(Rand_CenteredFloat(3.0f * M_PI / 4.0f) + - (((this->actor.yawTowardsPlayer + 0x8000) / 32768.0f) * M_PI), + BINANG_TO_RAD_ALT(this->actor.yawTowardsPlayer + 0x8000), MTXMODE_NEW); Matrix_MultVec3f(&sp10C, &sp100); @@ -3844,7 +3844,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { sp10C.y = 10.0f; sp10C.z = 50.0f; } - Matrix_RotateY((player->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(player->actor.shape.rot.y), MTXMODE_NEW); Matrix_MultVec3f(&sp10C, &sCameraEye); sCameraEye.x += player->actor.world.pos.x; @@ -4268,9 +4268,9 @@ void Fishing_DrawFish(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); - Matrix_RotateY(((this->unk_162 + this->actor.shape.rot.y) / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateX(((this->unk_160 + this->actor.shape.rot.x) / 32768.0f) * M_PI, MTXMODE_APPLY); - Matrix_RotateZ(((this->unk_164 + this->actor.shape.rot.z) / 32768.0f) * M_PI, MTXMODE_APPLY); + Matrix_RotateY(BINANG_TO_RAD_ALT(this->unk_162 + this->actor.shape.rot.y), MTXMODE_APPLY); + Matrix_RotateX(BINANG_TO_RAD_ALT(this->unk_160 + this->actor.shape.rot.x), MTXMODE_APPLY); + Matrix_RotateZ(BINANG_TO_RAD_ALT(this->unk_164 + this->actor.shape.rot.z), MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); if (this->unk_150 == 0) { @@ -5442,7 +5442,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) { D_80B7A6D4 = 1; Math_ApproachF(&D_80B7FEE4, 71.0f, 0.5f, 3.0f); - Matrix_RotateY((player->actor.shape.rot.y / 32768.0f) * M_PI, MTXMODE_NEW); + Matrix_RotateY(BINANG_TO_RAD_ALT(player->actor.shape.rot.y), MTXMODE_NEW); sp114.x = Math_SinS(globalCtx->gameplayFrames * 0x1000); sp114.y = D_80B7FEE4;