Clean up angle constants and conversions (#1135)

* Add angle conversion constants and macros

* Replace angle literals with hex instead of decimal

1 files changed, 10 insertions, 10 deletions

diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp
index d185baed..96d3dea0 100644
--- a/src/d/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo_rain.cpp
@@ -133,8 +133,8 @@ void dKyr_kamome_move() {
         case 0:
             if (spawnBirds) {
                 if (pWind->mKamomeEff[i].mTimer == 0) {
-                    pWind->mKamomeEff[i].mAngleY = cM_rndFX(65535.0f);
-                    pWind->mKamomeEff[i].mAngleX = cM_rndFX(65535.0f);
+                    pWind->mKamomeEff[i].mAngleY = cM_rndFX(0xFFFF);
+                    pWind->mKamomeEff[i].mAngleX = cM_rndFX(0xFFFF);
                     newPos.x = pCamera->mLookat.mEye.x + cM_ssin(pWind->mKamomeEff[i].mAngleY) * 7000.0f;
                     newPos.y = 4500.0f;
                     newPos.z = pCamera->mLookat.mEye.z + cM_scos(pWind->mKamomeEff[i].mAngleY) * 7000.0f;
@@ -343,7 +343,7 @@ void dKyr_wind_move() {
                 windEff.mPos.y -= windVec.y * windScale;
                 windEff.mPos.z -= windVec.z * windScale;
 
-                windEff.field_0x2c = cM_rndF(65535.0f);
+                windEff.field_0x2c = cM_rndF(0xFFFF);
 
                 cXyz pos;
                 pos.x = windEff.mBasePos.x + windEff.mPos.x;
@@ -498,7 +498,7 @@ void dKyr_lenzflare_move() {
     s16 angle = cM_atan2s(vectle.x, vectle.y);
 
     pLenzPkt->mAngleDeg = angle;
-    pLenzPkt->mAngleDeg *= 0.005493164f;
+    pLenzPkt->mAngleDeg *= S2DEG_CONSTANT;
     pLenzPkt->mAngleDeg += 180.0f;
 
     dKyr_get_vectle_calc(&pCamera->mLookat.mEye, &pCamera->mLookat.mCenter, &camFwd);
@@ -1106,7 +1106,7 @@ void dKyr_housi_move() {
         case 0:
             effect->field_0x34 = cM_rndF(1.5f) + 0.2f;
             effect->field_0x3c = 0;
-            effect->field_0x4c = cM_rndFX(65536.0f);
+            effect->field_0x4c = cM_rndFX(0x10000);
             effect->mBasePos.x = sp84.x;
             effect->mBasePos.y = sp84.y;
             effect->mBasePos.z = sp84.z;
@@ -1399,9 +1399,9 @@ void wave_move() {
                 pPkt->mEff[i].mPos.x = cM_rndFX(g_env_light.mWaveChan.mWaveSpawnRadius);
                 pPkt->mEff[i].mPos.y = 0.0f;
                 pPkt->mEff[i].mPos.z = cM_rndFX(g_env_light.mWaveChan.mWaveSpawnRadius);
-                pPkt->mEff[i].mCounter = cM_rndF(65536.0f);
+                pPkt->mEff[i].mCounter = cM_rndF(0x10000);
                 pPkt->mEff[i].mAlpha = 0.0f;
-                pPkt->mEff[i].field_0x32 = cM_rndF(65536.0f);
+                pPkt->mEff[i].field_0x32 = cM_rndF(0x10000);
                 pPkt->mEff[i].mStrengthEnv = 1.0f;
                 pPkt->mEff[i].mScale = g_env_light.mWaveChan.mWaveScaleRand + cM_rndF(1.0f - g_env_light.mWaveChan.mWaveScaleRand);
                 pPkt->mEff[i].mSpeed = pPkt->mEff[i].mScale;
@@ -1562,7 +1562,7 @@ void cloud_shadow_move() {
             pPkt->mEff[i].mPos.z = cM_rndFX(2000.0f);
             pPkt->mEff[i].mWindSpeed = 0.7f + cM_rndF(0.3f);
             pPkt->mEff[i].mAlpha = 0.0;
-            pPkt->mEff[i].mAnimCounter = cM_rndF(65535.0f);
+            pPkt->mEff[i].mAnimCounter = cM_rndF(0xFFFF);
             pPkt->mEff[i].mVelRndm.x = cM_rndFX(360.0f);
             pPkt->mEff[i].mVelRndm.y = cM_rndFX(360.0f);
             pPkt->mEff[i].mVelRndm.z = cM_rndFX(360.0f);
@@ -2949,7 +2949,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** pImg) {
             GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
             GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
 
-            MTXRotRad(rotMtx, 'Z', DEG_TO_RAD(rot));
+            MTXRotRad(rotMtx, 'Z', DEG2RAD(rot));
             MTXConcat(camMtx, rotMtx, camMtx);
 
             GXLoadPosMtxImm(drawMtx, GX_PNMTX0);
@@ -3136,7 +3136,7 @@ void dKyr_drawStar(Mtx drawMtx, u8** pImg) {
         GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
 
         Mtx rotMtx;
-        MTXRotRad(rotMtx, 'Z', DEG_TO_RAD(rot));
+        MTXRotRad(rotMtx, 'Z', DEG2RAD(rot));
         MTXConcat(camMtx, rotMtx, camMtx);
 
         GXLoadPosMtxImm(drawMtx, GX_PNMTX0);