diff --git a/libs/nitro/include/nitro/math.h b/libs/nitro/include/nitro/math.h
index 5bc42aba..185350d8 100644
--- a/libs/nitro/include/nitro/math.h
+++ b/libs/nitro/include/nitro/math.h
@@ -47,13 +47,11 @@ extern "C" {
 #define CLAMP(x, min, max) ((x) > (max) ? (max) : (x) < (min) ? (min) : (x))
 #define CLAMP2(x, min, max) ((x) > (max) ? (max) : (x) >= (min) ? (x) : (min))
 
-#define INT_TO_Q20(n) ((s32) ((n) << FX32_SHIFT))
-#define FLOAT_TO_Q21(n) ((s32) (((n) * 8192 + 1) / 4))
-#define FLOAT_TO_Q20(n) ((s32) (((n) * 8192 + 1) / 2))
-#define FLOAT_TO_Q19(n) ((s32) (((n) * 8192 + 1)))
-#define ROUND_Q20(n) (((s32) (n) + 0x800) >> FX32_SHIFT)
-#define MUL_Q20(a, b) (fx32)((((s64) (a)) * ((s64) (b)) + 0x800) >> FX32_SHIFT)
-#define DIV_Q20(a, b) (((a) << FX32_SHIFT) / (b))
+#define INT_TO_FX32(n) ((s32) ((n) << FX32_SHIFT))
+#define FLOAT_TO_FX32(n) ((s32) (((n) * 8192 + 1) / 2))
+#define ROUND_FX32(n) (((s32) (n) + 0x800) >> FX32_SHIFT)
+#define MUL_FX32(a, b) (fx32)((((s64) (a)) * ((s64) (b)) + 0x800) >> FX32_SHIFT)
+#define DIV_FX32(a, b) (((a) << FX32_SHIFT) / (b))
 
 #define DEG_TO_ANG(n) ((n) * 0x10000 / 360)
 #define SIN(n) (gSinCosTable[2 * ((n) >> 4)])
@@ -144,10 +142,10 @@ void VecFx32_Scale(VecFx32 *vec, fx32 scale);
 bool VecFx32_CalculateNormal(VecFx32 *vec, VecFx32 *a, VecFx32 *b, VecFx32 *c);
 
 static inline void VecFx32_Rotate(VecFx32 *vec, fx32 sin, fx32 cos, VecFx32 *out) {
-    out->x += MUL_Q20(vec->z, sin);
-    out->z += MUL_Q20(vec->z, cos);
-    out->x += MUL_Q20(vec->x, cos);
-    out->z += MUL_Q20(vec->x, -sin);
+    out->x += MUL_FX32(vec->z, sin);
+    out->z += MUL_FX32(vec->z, cos);
+    out->x += MUL_FX32(vec->x, cos);
+    out->z += MUL_FX32(vec->x, -sin);
 }
 
 static inline void VecFx32_CopyXZ(VecFx32 *vec, VecFx32 *out) {
diff --git a/libs/nns/src/g3d/sbc.c b/libs/nns/src/g3d/sbc.c
index b406c70f..fdca2418 100644
--- a/libs/nns/src/g3d/sbc.c
+++ b/libs/nns/src/g3d/sbc.c
@@ -679,7 +679,7 @@ void G3d_SBCRender_00C(G3d_RenderState *renderState, u32) {
             VecFx32 vec;
             u32 tmp;
 
-            G3d_Scale_inline(width << 15, -height << 15, INT_TO_Q20(1) << 4);
+            G3d_Scale_inline(width << 15, -height << 15, INT_TO_FX32(1) << 4);
 
             tmp = GX_PACK_TEXCOORD_PARAM(width << 11, height << 11);
             PushGeometryCommand(0x22, (u32 *) &tmp, 1); // TEXCOORD
diff --git a/src/000_Second/Actor/ActorUnkSWOB.cpp b/src/000_Second/Actor/ActorUnkSWOB.cpp
index 257d726b..0b40e98b 100644
--- a/src/000_Second/Actor/ActorUnkSWOB.cpp
+++ b/src/000_Second/Actor/ActorUnkSWOB.cpp
@@ -90,7 +90,7 @@ ARM void ActorUnkSWOB::func_ov000_0209aa30(void) {
             data_ov000_020b5214.func_ov000_0206db44(0xA3);
             temp   = *data_027e0ce0->func_01fff148(0);
             vec2.x = temp.x;
-            vec2.y = temp.y + FLOAT_TO_Q20(3.0f);
+            vec2.y = temp.y + FLOAT_TO_FX32(3.0f);
             vec2.z = temp.z;
 
             AStack_7c.mUnk_28 = 0;
@@ -100,9 +100,9 @@ ARM void ActorUnkSWOB::func_ov000_0209aa30(void) {
                 if (gpActorManager->func_01fff3b4(this->mUnk_A4[i].mUnk_00) == NULL) {
                     this->mUnk_A4[i].mUnk_00 = 0;
 
-                    vec.x = INT_TO_Q20(gRandom.Next32(0, 11) - 5);
+                    vec.x = INT_TO_FX32(gRandom.Next32(0, 11) - 5);
                     vec.y = 0;
-                    vec.z = INT_TO_Q20(gRandom.Next32(0, 11) - 5);
+                    vec.z = INT_TO_FX32(gRandom.Next32(0, 11) - 5);
 
                     VecFx32_Add(&vec, &vec2, &vec);
 
diff --git a/src/000_Second/MapObject/MapObject.cpp b/src/000_Second/MapObject/MapObject.cpp
index eaaedb10..51d32025 100644
--- a/src/000_Second/MapObject/MapObject.cpp
+++ b/src/000_Second/MapObject/MapObject.cpp
@@ -177,7 +177,7 @@ ARM void MapObject::func_ov000_0209d3b4(unk32 param1, fx32 size) {
     if (this->mUnk_10 != NULL) {
         this->mUnk_10->vfunc_10(&spC);
     } else {
-        spC.Init(FLOAT_TO_Q20(0.5f));
+        spC.Init(FLOAT_TO_FX32(0.5f));
     }
 
     VecFx32_Add(&spC.pos, &this->mPos, &spC.pos);
diff --git a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp
index b870a6c1..57dcea99 100644
--- a/src/000_Second/MapObject/MapObjectMiniBlocks.cpp
+++ b/src/000_Second/MapObject/MapObjectMiniBlocks.cpp
@@ -45,9 +45,9 @@ ARM bool MapObjectMiniBlocks::vfunc_00(void) {
     }
 
     VecFx32 vec;
-    vec.x = FLOAT_TO_Q20(0.0f);
-    vec.y = FLOAT_TO_Q20(0.0f);
-    vec.z = FLOAT_TO_Q20(0.0f);
+    vec.x = FLOAT_TO_FX32(0.0f);
+    vec.y = FLOAT_TO_FX32(0.0f);
+    vec.z = FLOAT_TO_FX32(0.0f);
     uVar6 = 0;
 
     switch (this->mUnk_20.mUnk_00[0]) {
@@ -65,13 +65,13 @@ ARM bool MapObjectMiniBlocks::vfunc_00(void) {
             break;
         default:
             if (this->mUnk_20.mUnk_00[1] == MiniBlocksVariant_BLKF) {
-                vec.x = FLOAT_TO_Q20(0.0f);
-                vec.y = FLOAT_TO_Q20(0.0f);
-                vec.z = -FLOAT_TO_Q20(0.375f);
+                vec.x = FLOAT_TO_FX32(0.0f);
+                vec.y = FLOAT_TO_FX32(0.0f);
+                vec.z = -FLOAT_TO_FX32(0.375f);
             } else {
-                vec.x = FLOAT_TO_Q20(0.0f);
-                vec.y = FLOAT_TO_Q20(0.0f);
-                vec.z = -FLOAT_TO_Q20(0.25f);
+                vec.x = FLOAT_TO_FX32(0.0f);
+                vec.y = FLOAT_TO_FX32(0.0f);
+                vec.z = -FLOAT_TO_FX32(0.25f);
             }
             break;
     }
diff --git a/src/000_Second/MapObject/MapObjectSwitchStep.cpp b/src/000_Second/MapObject/MapObjectSwitchStep.cpp
index 340e17f5..303fea24 100644
--- a/src/000_Second/MapObject/MapObjectSwitchStep.cpp
+++ b/src/000_Second/MapObject/MapObjectSwitchStep.cpp
@@ -24,13 +24,13 @@ ARM MapObjectProfileSwitchStep::MapObjectProfileSwitchStep() :
     MapObjectProfileSwitchStep_Base(MapObjectId_SwitchStep) {
     this->mUnk_D4.mUnk_08 = 0x2DC04009;
 
-    this->mUnk_D4.mUnk_0C.x = -FLOAT_TO_Q20(0.5f);
-    this->mUnk_D4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_D4.mUnk_0C.z = -FLOAT_TO_Q20(0.5f);
+    this->mUnk_D4.mUnk_0C.x = -FLOAT_TO_FX32(0.5f);
+    this->mUnk_D4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_D4.mUnk_0C.z = -FLOAT_TO_FX32(0.5f);
 
-    this->mUnk_D4.mUnk_18.x = FLOAT_TO_Q20(0.5f);
-    this->mUnk_D4.mUnk_18.y = FLOAT_TO_Q20(0.5f);
-    this->mUnk_D4.mUnk_18.z = FLOAT_TO_Q20(0.5f);
+    this->mUnk_D4.mUnk_18.x = FLOAT_TO_FX32(0.5f);
+    this->mUnk_D4.mUnk_18.y = FLOAT_TO_FX32(0.5f);
+    this->mUnk_D4.mUnk_18.z = FLOAT_TO_FX32(0.5f);
 
     this->mUnk_06                 = 1;
     this->mUnk_0C                 = 0xC00;
diff --git a/src/019_MainSelect/FileSelectMicTest.cpp b/src/019_MainSelect/FileSelectMicTest.cpp
index c799ade4..d2ff82a6 100644
--- a/src/019_MainSelect/FileSelectMicTest.cpp
+++ b/src/019_MainSelect/FileSelectMicTest.cpp
@@ -282,7 +282,7 @@ ARM void UnkStruct_ov019_020d24c8_28_270::func_ov019_020cf168() {
         iVar4 += this->mUnk_7C[i];
     }
 
-    iVar4_2 = ROUND_Q20(func_01ffb428(iVar4 * 0x1000, 0xF000));
+    iVar4_2 = ROUND_FX32(func_01ffb428(iVar4 * 0x1000, 0xF000));
 
     if (iVar4_2 > 0) {
         this->mUnk_78[0] = 1;
diff --git a/src/019_MainSelect/FileSelectSubScreen.cpp b/src/019_MainSelect/FileSelectSubScreen.cpp
index 842453cb..4eb30738 100644
--- a/src/019_MainSelect/FileSelectSubScreen.cpp
+++ b/src/019_MainSelect/FileSelectSubScreen.cpp
@@ -74,11 +74,11 @@ ARM void FileSelectSubScreen::vfunc_08(Input *pButtons, TouchControl *pTouchCont
     this->mUnk_0024 = this->mUnk_0020;
     this->mUnk_0020 += 0x800;
 
-    G2S_SetBG1Offset(ROUND_Q20(this->mUnk_0020), 0);
-    G2S_SetBG2Offset(ROUND_Q20(this->mUnk_0020) + 0x100, 0);
-    G2S_SetBG3Offset(ROUND_Q20(this->mUnk_0020) / 2, 0);
+    G2S_SetBG1Offset(ROUND_FX32(this->mUnk_0020), 0);
+    G2S_SetBG2Offset(ROUND_FX32(this->mUnk_0020) + 0x100, 0);
+    G2S_SetBG3Offset(ROUND_FX32(this->mUnk_0020) / 2, 0);
 
-    if (!(ROUND_Q20(this->mUnk_0020) % 256) && (ROUND_Q20(this->mUnk_0024) % 256)) {
+    if (!(ROUND_FX32(this->mUnk_0020) % 256) && (ROUND_FX32(this->mUnk_0024) % 256)) {
         switch (this->mUnk_001C) {
             case 0:
                 this->mUnk_001C = 1;
diff --git a/src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp b/src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp
index 13248d3c..16b4d104 100644
--- a/src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp
+++ b/src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp
@@ -116,14 +116,14 @@ bool AdventureModeManager_1B8_Base::func_ov024_020d0744(s32 arg1, s32 arg2, s32
         s32 var_r11 = (temp_r1 >= 0) ? temp_r1 : -temp_r1;
 
         if (sp8 >= var_r11) {
-            func_01ffb644(INT_TO_Q20(temp_r1), INT_TO_Q20(temp_r2));
+            func_01ffb644(INT_TO_FX32(temp_r1), INT_TO_FX32(temp_r2));
             s32 var_r11_2 = (arg1 <= arg3) ? 1 : -1;
-            unk32 var_r5  = INT_TO_Q20(arg2);
+            unk32 var_r5  = INT_TO_FX32(arg2);
             unk32 var_r6  = func_01ffb558();
             SetUnkValue4(arg2, arg4, &var_r6);
 
             for (int i = 0; i <= sp8; i++) {
-                if (this->func_ov024_020d0924(arg1, ROUND_Q20(var_r5), arg5, arg6)) {
+                if (this->func_ov024_020d0924(arg1, ROUND_FX32(var_r5), arg5, arg6)) {
                     sp10 = true;
                 }
 
@@ -131,14 +131,14 @@ bool AdventureModeManager_1B8_Base::func_ov024_020d0744(s32 arg1, s32 arg2, s32
                 var_r5 += var_r6;
             }
         } else {
-            func_01ffb644(INT_TO_Q20(temp_r2), INT_TO_Q20(temp_r1));
-            unk32 var_r5  = INT_TO_Q20(arg1);
+            func_01ffb644(INT_TO_FX32(temp_r2), INT_TO_FX32(temp_r1));
+            unk32 var_r5  = INT_TO_FX32(arg1);
             s32 var_r11_2 = (arg2 <= arg4) ? 1 : -1;
             unk32 var_r6  = func_01ffb558();
             SetUnkValue4(arg1, arg3, &var_r6);
 
             for (int i = 0; i <= var_r11; i++) {
-                if (this->func_ov024_020d0924(ROUND_Q20(var_r5), arg2, arg5, arg6)) {
+                if (this->func_ov024_020d0924(ROUND_FX32(var_r5), arg2, arg5, arg6)) {
                     sp10 = true;
                 }
 
diff --git a/src/031_Land/Actor/ActorHeart.cpp b/src/031_Land/Actor/ActorHeart.cpp
index 4ce46908..4266e97c 100644
--- a/src/031_Land/Actor/ActorHeart.cpp
+++ b/src/031_Land/Actor/ActorHeart.cpp
@@ -57,7 +57,7 @@ ARM Actor *ActorProfileHeart::Create() {
 
 ARM ActorProfileHeart::ActorProfileHeart() :
     ActorProfile(ActorId_Heart) {
-    this->mUnk_04.Init(FLOAT_TO_Q20(0.25));
+    this->mUnk_04.Init(FLOAT_TO_FX32(0.25));
 }
 
 ARM void ActorHeart::func_ov031_020eed64(ActorParams *param_2, unk32 param_3, unk32 param_4) {
@@ -84,9 +84,9 @@ ARM ActorHeart::ActorHeart() :
     mUnk_C4(0),
     mUnk_C8(this) {
 
-    this->mUnk_EC.x = FLOAT_TO_Q20(0.0);
-    this->mUnk_EC.y = FLOAT_TO_Q20(0.0);
-    this->mUnk_EC.z = FLOAT_TO_Q20(0.0);
+    this->mUnk_EC.x = FLOAT_TO_FX32(0.0);
+    this->mUnk_EC.y = FLOAT_TO_FX32(0.0);
+    this->mUnk_EC.z = FLOAT_TO_FX32(0.0);
 
     this->mUnk_9C = 0x13100;
     this->mUnk_40 = &this->mUnk_C8;
@@ -195,13 +195,13 @@ void ActorHeart::vfunc_20() {
         this->func_ov000_02098910(0, 0x10);
     }
     if (this->mUnk_46 & 0x3) {
-        this->mVel.y = FLOAT_TO_Q20(0.0);
+        this->mVel.y = FLOAT_TO_FX32(0.0);
     }
 
     VecFx32_Add(&this->mPos, &this->mUnk_EC, &this->mPos);
-    this->mUnk_EC.x = FLOAT_TO_Q20(0.0);
-    this->mUnk_EC.y = FLOAT_TO_Q20(0.0);
-    this->mUnk_EC.z = FLOAT_TO_Q20(0.0);
+    this->mUnk_EC.x = FLOAT_TO_FX32(0.0);
+    this->mUnk_EC.y = FLOAT_TO_FX32(0.0);
+    this->mUnk_EC.z = FLOAT_TO_FX32(0.0);
 }
 
 extern unk32 data_ov000_020aecf8;
@@ -269,7 +269,7 @@ ARM void ActorHeart::func_ov031_020ef208() {
 }
 
 ARM void ActorHeart::func_ov031_020ef2ec() {
-    this->mVel.y = FLOAT_TO_Q20(0.25);
+    this->mVel.y = FLOAT_TO_FX32(0.25);
 }
 
 ARM void ActorHeart::func_ov031_020ef2f8() {
@@ -294,9 +294,9 @@ ARM void ActorHeart::func_ov031_020ef334() {
 }
 
 ARM void ActorHeart::func_ov031_020ef35c() {
-    this->mVel.x = FLOAT_TO_Q20(0.0);
-    this->mVel.y = FLOAT_TO_Q20(0.0);
-    this->mVel.z = FLOAT_TO_Q20(0.0);
+    this->mVel.x = FLOAT_TO_FX32(0.0);
+    this->mVel.y = FLOAT_TO_FX32(0.0);
+    this->mVel.z = FLOAT_TO_FX32(0.0);
     if ((u8) this->mUnk_BE == 0 && (this->mUnk_52 - this->mUnk_50) > 0xB4) {
         this->mUnk_52 = 0xB4;
         this->mUnk_50 = 0x00;
@@ -321,18 +321,18 @@ ARM void ActorHeart::func_ov031_020ef3d0() {
     if (!GET_FLAG(this->mFlags, ActorFlag_5)) {
         return;
     }
-    this->mVel.x = FLOAT_TO_Q20(0.0);
-    this->mVel.y = FLOAT_TO_Q20(0.0);
-    this->mVel.z = FLOAT_TO_Q20(0.0);
+    this->mVel.x = FLOAT_TO_FX32(0.0);
+    this->mVel.y = FLOAT_TO_FX32(0.0);
+    this->mVel.z = FLOAT_TO_FX32(0.0);
 
     this->mUnk_9C |= 0x1000;
     this->func_ov031_020ef1b4(0x01);
 }
 
 ARM void ActorHeart::func_ov031_020ef430() {
-    this->mVel.x = FLOAT_TO_Q20(0.0);
-    this->mVel.y = FLOAT_TO_Q20(0.0);
-    this->mVel.z = FLOAT_TO_Q20(0.0);
+    this->mVel.x = FLOAT_TO_FX32(0.0);
+    this->mVel.y = FLOAT_TO_FX32(0.0);
+    this->mVel.z = FLOAT_TO_FX32(0.0);
 }
 
 ARM void ActorHeart::func_ov031_020ef444() {
@@ -340,8 +340,8 @@ ARM void ActorHeart::func_ov031_020ef444() {
 }
 
 ARM void ActorHeart::func_ov031_020ef448() {
-    this->mVel.x = FLOAT_TO_Q20(0.0);
-    this->mVel.z = FLOAT_TO_Q20(0.0);
+    this->mVel.x = FLOAT_TO_FX32(0.0);
+    this->mVel.z = FLOAT_TO_FX32(0.0);
 }
 
 typedef struct {
@@ -396,15 +396,15 @@ ARM void ActorHeart::func_ov031_020ef528() {
 ARM void ActorHeart::func_ov031_020ef570() {
     func_ov000_02098838();
     this->mUnk_B8 += 0x666;
-    this->mVel.z = FLOAT_TO_Q20(0.0);
+    this->mVel.z = FLOAT_TO_FX32(0.0);
 
     s16 sin_value = SIN((u16) this->mUnk_B8);
     s32 value     = ((sin_value >> 0x1F) << 6 | sin_value >> 0x1A) + (sin_value * 0x40 > ~0x800);
 
-    this->mVel.x = ROUND_Q20(sin_value * 0x40) + value;
+    this->mVel.x = ROUND_FX32(sin_value * 0x40) + value;
 
-    if (this->mVel.y <= FLOAT_TO_Q20(-0.005)) {
-        this->mVel.y = FLOAT_TO_Q20(-0.005);
+    if (this->mVel.y <= FLOAT_TO_FX32(-0.005)) {
+        this->mVel.y = FLOAT_TO_FX32(-0.005);
     }
 }
 
@@ -418,13 +418,13 @@ ARM void ActorHeart::vfunc_2c(unk32 param1) {
     }
 
     iStack_20 = this->mPos;
-    iStack_20.y += FLOAT_TO_Q20(0.03113);
+    iStack_20.y += FLOAT_TO_FX32(0.03113);
     this->func_ov017_020bf5c4(&iStack_20, 0x400, 0x400, 0x1f, 0);
 
     func_ov000_0205c1f0(&auStack_30, 0x10);
 
     iStack_2c = this->mPos;
-    iStack_2c.y += FLOAT_TO_Q20(0.33);
+    iStack_2c.y += FLOAT_TO_FX32(0.33);
     func_ov000_0205c204(&auStack_30, &iStack_2c, 0xccd, 0xccd, 0x1f);
 }
 
diff --git a/src/031_Land/Actor/ActorRupee.cpp b/src/031_Land/Actor/ActorRupee.cpp
index 6dbe7efc..a0380e6e 100644
--- a/src/031_Land/Actor/ActorRupee.cpp
+++ b/src/031_Land/Actor/ActorRupee.cpp
@@ -452,7 +452,7 @@ ARM void ActorRupee::func_ov031_020e9638() {
         this->mUnk_4A = 0;
     }
 
-    this->mPos.y -= FLOAT_TO_Q20(1.2);
+    this->mPos.y -= FLOAT_TO_FX32(1.2);
 }
 
 // non-matching
diff --git a/src/031_Land/MapObject/MapObjectChestBase.cpp b/src/031_Land/MapObject/MapObjectChestBase.cpp
index 1dbf99ae..2892af9a 100644
--- a/src/031_Land/MapObject/MapObjectChestBase.cpp
+++ b/src/031_Land/MapObject/MapObjectChestBase.cpp
@@ -107,23 +107,23 @@ ARM void MapObjectChestBase::vfunc_04() {
 
     pUVar5 = data_027e0cd8->mUnk_0C;
 
-    sp48.x = FLOAT_TO_Q20(0.0f);
-    sp48.y = FLOAT_TO_Q20(0.0f);
-    sp48.z = FLOAT_TO_Q20(0.0f);
+    sp48.x = FLOAT_TO_FX32(0.0f);
+    sp48.y = FLOAT_TO_FX32(0.0f);
+    sp48.z = FLOAT_TO_FX32(0.0f);
 
-    sp3C.x = FLOAT_TO_Q20(0.0f);
-    sp3C.y = FLOAT_TO_Q20(0.0f);
-    sp3C.z = FLOAT_TO_Q20(0.0f);
+    sp3C.x = FLOAT_TO_FX32(0.0f);
+    sp3C.y = FLOAT_TO_FX32(0.0f);
+    sp3C.z = FLOAT_TO_FX32(0.0f);
 
-    sp18.x = FLOAT_TO_Q20(0.5f);
-    sp18.y = FLOAT_TO_Q20(0.0f);
-    sp18.z = FLOAT_TO_Q20(0.5f);
+    sp18.x = FLOAT_TO_FX32(0.5f);
+    sp18.y = FLOAT_TO_FX32(0.0f);
+    sp18.z = FLOAT_TO_FX32(0.5f);
 
     func_01ffb714(&sp48, &sp18, &sp48);
 
-    spC.x = FLOAT_TO_Q20(0.5f);
-    spC.y = FLOAT_TO_Q20(1.0f);
-    spC.z = FLOAT_TO_Q20(0.5f);
+    spC.x = FLOAT_TO_FX32(0.5f);
+    spC.y = FLOAT_TO_FX32(1.0f);
+    spC.z = FLOAT_TO_FX32(0.5f);
 
     VecFx32_Add((VecFx32 *) &sp3C, &spC, (VecFx32 *) &sp3C);
 
@@ -136,12 +136,12 @@ ARM void MapObjectChestBase::vfunc_04() {
         temp_r0.x--;
 
         if (pUVar5->func_01ffedf4((Vec2b *) &temp_r0) > iVar2 || gpMapObjManager->func_01fff498(local_5e) != NULL) {
-            sp48.x -= FLOAT_TO_Q20(0.5f);
+            sp48.x -= FLOAT_TO_FX32(0.5f);
         }
 
         temp_r0.x += 3;
         if (pUVar5->func_01ffedf4((Vec2b *) &temp_r0) > iVar2 || gpMapObjManager->func_01fff498(local_5e) != NULL) {
-            sp3C.x += FLOAT_TO_Q20(0.5f);
+            sp3C.x += FLOAT_TO_FX32(0.5f);
         }
     } else {
         Vec2b temp_r0(this->mUnk_3A.x, this->mUnk_3A.y);
@@ -152,12 +152,12 @@ ARM void MapObjectChestBase::vfunc_04() {
         // local_5e.y += 2;
 
         if (gpMapObjManager->func_ov000_0209c3a8(&temp_r0) == MapObjectId_MiniBlocks) {
-            sp48.x -= FLOAT_TO_Q20(0.5f);
+            sp48.x -= FLOAT_TO_FX32(0.5f);
         }
 
         // temp_r0.x += 3;
         if (gpMapObjManager->func_ov000_0209c3a8(&temp_r0) == MapObjectId_MiniBlocks) {
-            sp3C.x += FLOAT_TO_Q20(0.5f);
+            sp3C.x += FLOAT_TO_FX32(0.5f);
         }
     }
 
@@ -165,7 +165,7 @@ ARM void MapObjectChestBase::vfunc_04() {
 
     if (gpMapObjManager->func_ov000_0209c3a8(&local_62) == MapObjectId_MiniBlocks &&
         iVar2 == pUVar5->func_01ffedf4(&local_62)) {
-        sp48.z -= FLOAT_TO_Q20(0.5f);
+        sp48.z -= FLOAT_TO_FX32(0.5f);
     }
 
     if (data_027e09a4->mUnk_00.mSceneIndex == SceneIndex_d_flame) {
@@ -176,7 +176,7 @@ ARM void MapObjectChestBase::vfunc_04() {
         local_64.y = local_66.y - 1;
 
         if (iVar2 > pUVar5->func_01ffedf4(&local_64) && iVar2 > pUVar5->func_01ffedf4(&local_66)) {
-            sp3C.y += FLOAT_TO_Q20(1.0f);
+            sp3C.y += FLOAT_TO_FX32(1.0f);
         }
     }
 
diff --git a/src/031_Land/MapObject/MapObjectDoorBase.cpp b/src/031_Land/MapObject/MapObjectDoorBase.cpp
index a4e38e47..2ea79395 100644
--- a/src/031_Land/MapObject/MapObjectDoorBase.cpp
+++ b/src/031_Land/MapObject/MapObjectDoorBase.cpp
@@ -24,30 +24,30 @@ UnkStruct_ov031_02117210 data_ov031_02117210;
 UnkStruct_ov019_020d24c8_28_258_00 data_ov031_02117204(NULL, 0);
 
 ARM UnkStruct_ov031_02117210::UnkStruct_ov031_02117210() {
-    this->mUnk_00[0].mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-    this->mUnk_00[0].mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_00[0].mUnk_0C.z = -FLOAT_TO_Q20(0.35f);
-    this->mUnk_00[0].mUnk_18.x = FLOAT_TO_Q20(1.0f);
-    this->mUnk_00[0].mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_00[0].mUnk_18.z = FLOAT_TO_Q20(0.35f);
+    this->mUnk_00[0].mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+    this->mUnk_00[0].mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_00[0].mUnk_0C.z = -FLOAT_TO_FX32(0.35f);
+    this->mUnk_00[0].mUnk_18.x = FLOAT_TO_FX32(1.0f);
+    this->mUnk_00[0].mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_00[0].mUnk_18.z = FLOAT_TO_FX32(0.35f);
     this->mUnk_00[0].mUnk_04 &= 0xFE;
     this->mUnk_00[0].mUnk_08 = 0x7009;
 
-    this->mUnk_00[1].mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-    this->mUnk_00[1].mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_00[1].mUnk_0C.z = -FLOAT_TO_Q20(1.35f);
-    this->mUnk_00[1].mUnk_18.x = FLOAT_TO_Q20(1.0f);
-    this->mUnk_00[1].mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_00[1].mUnk_18.z = FLOAT_TO_Q20(0.35f);
+    this->mUnk_00[1].mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+    this->mUnk_00[1].mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_00[1].mUnk_0C.z = -FLOAT_TO_FX32(1.35f);
+    this->mUnk_00[1].mUnk_18.x = FLOAT_TO_FX32(1.0f);
+    this->mUnk_00[1].mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_00[1].mUnk_18.z = FLOAT_TO_FX32(0.35f);
     this->mUnk_00[1].mUnk_04 &= 0xFE;
     this->mUnk_00[1].mUnk_08 = 0x7009;
 
-    this->mUnk_00[2].mUnk_0C.x = -FLOAT_TO_Q20(0.35f);
-    this->mUnk_00[2].mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_00[2].mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
-    this->mUnk_00[2].mUnk_18.x = FLOAT_TO_Q20(0.35f);
-    this->mUnk_00[2].mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_00[2].mUnk_18.z = FLOAT_TO_Q20(1.0f);
+    this->mUnk_00[2].mUnk_0C.x = -FLOAT_TO_FX32(0.35f);
+    this->mUnk_00[2].mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_00[2].mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
+    this->mUnk_00[2].mUnk_18.x = FLOAT_TO_FX32(0.35f);
+    this->mUnk_00[2].mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_00[2].mUnk_18.z = FLOAT_TO_FX32(1.0f);
     this->mUnk_00[2].mUnk_04 &= 0xFE;
     this->mUnk_00[2].mUnk_08 = 0x7009;
 }
@@ -81,12 +81,12 @@ ARM MapObjectDoorBase::MapObjectDoorBase() :
 
 ARM void MapObjectDoorBase::func_ov031_020fbf10(bool param1, bool param2) {
     if (this->IsOrientedVertically()) {
-        this->mPos.z += FLOAT_TO_Q20(0.5f);
+        this->mPos.z += FLOAT_TO_FX32(0.5f);
         Vec2b local_16(1, 2);
         this->func_ov000_0209d2f0(5, 1, &local_16);
 
     } else {
-        this->mPos.x += FLOAT_TO_Q20(0.5f);
+        this->mPos.x += FLOAT_TO_FX32(0.5f);
         Vec2b local_18(2, 1);
         this->func_ov000_0209d2f0(5, 1, &local_18);
     }
@@ -126,7 +126,7 @@ ARM void MapObjectDoorBase::vfunc_08() {
             }
 
             if (this->mUnk_80 > 0) {
-                func_01ff9218(&this->mUnk_6C, 0, func_01ffb464(INT_TO_Q20(this->mUnk_80)));
+                func_01ff9218(&this->mUnk_6C, 0, func_01ffb464(INT_TO_FX32(this->mUnk_80)));
             }
 
             if (this->mUnk_80 == 0) {
@@ -206,7 +206,7 @@ ARM void MapObjectDoorBase::vfunc_08() {
             this->mUnk_80--;
 
             if (this->mUnk_80 > 0) {
-                func_01ff9218(&this->mUnk_6C, 0x1000, func_01ffb464(INT_TO_Q20(this->mUnk_80)));
+                func_01ff9218(&this->mUnk_6C, 0x1000, func_01ffb464(INT_TO_FX32(this->mUnk_80)));
             }
 
             if (this->mUnk_88) {
@@ -277,19 +277,19 @@ ARM void MapObjectDoorBase::vfunc_0C() {
 ARM void MapObjectDoorBase::vfunc_60() {
     switch (this->mUnk_16) {
         case 0:
-            if (!this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_Q20(0.5f)) {
+            if (!this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_FX32(0.5f)) {
                 this->func_ov031_020fcf0c(1);
             }
             this->vfunc_54();
             break;
         case 2:
-            if (this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_Q20(0.5f)) {
+            if (this->mUnk_86 && !GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C <= FLOAT_TO_FX32(0.5f)) {
                 this->func_ov031_020fcf0c(1);
                 this->vfunc_58();
             }
             break;
         case 5:
-            if (GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C >= FLOAT_TO_Q20(0.5f)) {
+            if (GET_FLAG(this->mFlags, MapObjFlag_1) && this->mUnk_6C >= FLOAT_TO_FX32(0.5f)) {
                 this->func_ov031_020fcf0c(0);
             }
             break;
@@ -331,7 +331,7 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
             this->mUnk_82 = 0;
             this->mUnk_84 = 0x0D;
             this->mUnk_80 =
-                (MUL_Q20(INT_TO_Q20(this->mUnk_7A), func_01ffb428(this->mUnk_6C, 0x1000)) + FLOAT_TO_Q20(0.5f)) >> 12;
+                (MUL_FX32(INT_TO_FX32(this->mUnk_7A), func_01ffb428(this->mUnk_6C, 0x1000)) + FLOAT_TO_FX32(0.5f)) >> 12;
 
             this->vfunc_50();
 
@@ -409,7 +409,8 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
             this->vfunc_7C();
 
             this->mUnk_80 =
-                (MUL_Q20(INT_TO_Q20(this->mUnk_78), func_01ffb428(0x1000 - this->mUnk_6C, 0x1000)) + FLOAT_TO_Q20(0.5f)) >> 12;
+                (MUL_FX32(INT_TO_FX32(this->mUnk_78), func_01ffb428(0x1000 - this->mUnk_6C, 0x1000)) + FLOAT_TO_FX32(0.5f)) >>
+                12;
 
             if (this->mUnk_8A) {
                 this->mUnk_82 = 0;
@@ -658,12 +659,12 @@ ARM void MapObjectDoorBase::vfunc_84(unk32 param1, VecFx32 *param2, unk16 *param
     *param3 = this->mUnk_14;
 
     if (param1 != 0) {
-        local_20.x = MUL_Q20(SIN((u16) this->mUnk_14), 0x1000);
-        local_20.z = MUL_Q20(COS((u16) this->mUnk_14), 0x1000);
+        local_20.x = MUL_FX32(SIN((u16) this->mUnk_14), 0x1000);
+        local_20.z = MUL_FX32(COS((u16) this->mUnk_14), 0x1000);
         local_20.y = 0;
     } else {
-        local_20.x = MUL_Q20(SIN((u16) this->mUnk_14), 0xC00);
-        local_20.z = MUL_Q20(COS((u16) this->mUnk_14), 0xC00);
+        local_20.x = MUL_FX32(SIN((u16) this->mUnk_14), 0xC00);
+        local_20.z = MUL_FX32(COS((u16) this->mUnk_14), 0xC00);
         local_20.y = 0;
 
         *param3 += -DEG_TO_ANG(180);
@@ -713,7 +714,7 @@ ARM void MapObjectDoorBase::vfunc2_08() {
     bool result = data_027e0ce0->func_01fff1a4();
     temp_r0     = this->mPos.x;
     temp_r1     = this->mPos.y;
-    temp_r2     = this->mPos.z - FLOAT_TO_Q20(3.0f);
+    temp_r2     = this->mPos.z - FLOAT_TO_FX32(3.0f);
 
     if (!result) {
         this->mUnk_4C.x = temp_r0;
@@ -726,7 +727,7 @@ ARM void MapObjectDoorBase::vfunc2_08() {
         return;
     }
 
-    this->mUnk_4C.x = temp_r0 - FLOAT_TO_Q20(1.0f);
+    this->mUnk_4C.x = temp_r0 - FLOAT_TO_FX32(1.0f);
     this->mUnk_4C.y = temp_r1;
     this->mUnk_4C.z = temp_r2;
 
@@ -734,9 +735,9 @@ ARM void MapObjectDoorBase::vfunc2_08() {
     // *temp_r3_2  = this->mUnk_4A;
     data_027e0ce0->func_ov000_0208bbd4(this->mUnk_44, &this->mUnk_4C, this->mUnk_4A);
 
-    this->mUnk_5C.x = this->mPos.x + FLOAT_TO_Q20(1.0f);
+    this->mUnk_5C.x = this->mPos.x + FLOAT_TO_FX32(1.0f);
     this->mUnk_5C.y = this->mPos.y;
-    this->mUnk_5C.z = this->mPos.z - FLOAT_TO_Q20(3.0f);
+    this->mUnk_5C.z = this->mPos.z - FLOAT_TO_FX32(3.0f);
     this->mUnk_5A   = this->mUnk_4A;
 
     // temp_r2_2   = sp - 4;
diff --git a/src/031_Land/MapObject/MapObjectDoorClick.cpp b/src/031_Land/MapObject/MapObjectDoorClick.cpp
index 9a6a1215..9c437092 100644
--- a/src/031_Land/MapObject/MapObjectDoorClick.cpp
+++ b/src/031_Land/MapObject/MapObjectDoorClick.cpp
@@ -145,7 +145,7 @@ ARM void MapObjectDoorClick::vfunc_08(void) {
             this->mUnk_80--;
 
             if (this->mUnk_80 > 0) {
-                func_01ff9218(&this->mUnk_6C, 0x1000, func_01ffb464(INT_TO_Q20(this->mUnk_80)));
+                func_01ff9218(&this->mUnk_6C, 0x1000, func_01ffb464(INT_TO_FX32(this->mUnk_80)));
             }
 
             if (this->mUnk_88 != false) {
@@ -227,7 +227,7 @@ ARM void MapObjectDoorClick::vfunc_14(void) {
     VecFx32 temp;
 
     Mat3p_InitYRotation(&m, SIN(angle), COS(angle));
-    temp.x     = this->mPos.x - FLOAT_TO_Q20(1.0f) + this->mUnk_70;
+    temp.x     = this->mPos.x - FLOAT_TO_FX32(1.0f) + this->mUnk_70;
     temp.z     = this->mPos.z;
     temp.y     = this->mPos.y;
     local_48.x = temp.x;
@@ -237,7 +237,7 @@ ARM void MapObjectDoorClick::vfunc_14(void) {
 
     u16 var = (-0x8000 - sVar2);
     Mat3p_InitYRotation(&m, SIN(var), COS(var));
-    temp.x     = this->mPos.x + FLOAT_TO_Q20(1.0f) - this->mUnk_70;
+    temp.x     = this->mPos.x + FLOAT_TO_FX32(1.0f) - this->mUnk_70;
     temp.z     = this->mPos.z;
     temp.y     = this->mPos.y;
     local_48.x = temp.x;
@@ -259,7 +259,7 @@ ARM void MapObjectDoorClick::vfunc_5C(unk32 param1, unk32 param2) {
         case 3:
             this->vfunc_7C();
 
-            u16 result    = ROUND_Q20(MUL_Q20(func_01ffb428(0x1000 - this->mUnk_6C, 0x1000), INT_TO_Q20(this->mUnk_78)));
+            u16 result    = ROUND_FX32(MUL_FX32(func_01ffb428(0x1000 - this->mUnk_6C, 0x1000), INT_TO_FX32(this->mUnk_78)));
             this->mUnk_80 = result;
 
             if (this->mUnk_8A) {
@@ -363,11 +363,11 @@ ARM void MapObjectDoorClick::vfunc_78(void) {
     temp.z = this->mPos.z;
     temp.y = this->mPos.y;
 
-    local_24.x = temp.x - FLOAT_TO_Q20(0.999f);
+    local_24.x = temp.x - FLOAT_TO_FX32(0.999f);
     local_24.y = temp.y;
     local_24.z = temp.z;
 
-    local_30.x = temp.x + FLOAT_TO_Q20(0.999f);
+    local_30.x = temp.x + FLOAT_TO_FX32(0.999f);
     local_30.y = temp.y;
     local_30.z = temp.z;
 
@@ -376,13 +376,13 @@ ARM void MapObjectDoorClick::vfunc_78(void) {
 
     Mat4x3p_InitYRotation(&m, SIN((u16) angle), COS((u16) angle));
 
-    local_84.x = FLOAT_TO_Q20(1.0f);
+    local_84.x = FLOAT_TO_FX32(1.0f);
     local_84.y = 0;
     local_84.z = 0;
 
     local_90.x = 0;
     local_90.y = 0;
-    local_90.z = FLOAT_TO_Q20(0.3299f);
+    local_90.z = FLOAT_TO_FX32(0.3299f);
 
     func_01ffaf74(&local_90, &m, &local_90);
     func_01ffaf74(&local_84, &m, &local_84);
diff --git a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp
index aef2c3c0..df28c985 100644
--- a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp
+++ b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp
@@ -297,7 +297,7 @@ ARM void MapObjectDoorDangerSpawn::vfunc_5C(unk32 param1, unk32 param2) {
                 this->mUnk_8B = 1;
             }
 
-            u16 result    = ROUND_Q20(MUL_Q20(func_01ffb428(0x1000 - this->mUnk_6C, 0x1000), INT_TO_Q20(this->mUnk_78)));
+            u16 result    = ROUND_FX32(MUL_FX32(func_01ffb428(0x1000 - this->mUnk_6C, 0x1000), INT_TO_FX32(this->mUnk_78)));
             this->mUnk_80 = result;
 
             if (this->mUnk_8A) {
@@ -706,12 +706,12 @@ ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, VecFx32 *param2, unk16
     *param3 = this->mUnk_14;
     iVar1   = this->mUnk_14 + DEG_TO_ANG(30);
     if (param1 != 0) {
-        local_24.x = MUL_Q20(SIN((u16) iVar1), 0x1666);
-        local_24.z = MUL_Q20(COS((u16) iVar1), 0x1666);
+        local_24.x = MUL_FX32(SIN((u16) iVar1), 0x1666);
+        local_24.z = MUL_FX32(COS((u16) iVar1), 0x1666);
         local_24.y = 0;
     } else {
-        local_24.x = MUL_Q20(SIN((u16) iVar1), 0x10CD);
-        local_24.z = MUL_Q20(COS((u16) iVar1), 0x10CD);
+        local_24.x = MUL_FX32(SIN((u16) iVar1), 0x10CD);
+        local_24.z = MUL_FX32(COS((u16) iVar1), 0x10CD);
         local_24.y = 0;
 
         *param3 += DEG_TO_ANG(180);
@@ -722,12 +722,12 @@ ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, VecFx32 *param2, unk16
     this->mUnk_5A = this->mUnk_14;
     iVar1         = this->mUnk_14 - DEG_TO_ANG(30);
     if (param1 != 0) {
-        local_30.x = MUL_Q20(SIN((u16) iVar1), 0x1666);
-        local_30.z = MUL_Q20(COS((u16) iVar1), 0x1666);
+        local_30.x = MUL_FX32(SIN((u16) iVar1), 0x1666);
+        local_30.z = MUL_FX32(COS((u16) iVar1), 0x1666);
         local_30.y = 0;
     } else {
-        local_30.x = MUL_Q20(SIN((u16) iVar1), 0x10CD);
-        local_30.z = MUL_Q20(COS((u16) iVar1), 0x10CD);
+        local_30.x = MUL_FX32(SIN((u16) iVar1), 0x10CD);
+        local_30.z = MUL_FX32(COS((u16) iVar1), 0x10CD);
         local_30.y = 0;
         this->mUnk_5A += DEG_TO_ANG(180);
     }
@@ -745,7 +745,7 @@ ARM void MapObjectDoorDangerSpawn::func_ov031_020fe5fc(VecFx32 *param1, MapObjec
         VecFx32 pos;
         VecFx32_Init(temp.x + piVar2->x, temp.y + piVar2->y, temp.z + piVar2->z, &pos);
 
-        func_01ff93c0(&pos, FLOAT_TO_Q20(0.5f));
+        func_01ff93c0(&pos, FLOAT_TO_FX32(0.5f));
         *param1 = pos;
     } else {
         VecFx32 *piVar4 = data_027e0ce0->func_01fff148(0);
diff --git a/src/031_Land/MapObject/MapObjectDoorKey.cpp b/src/031_Land/MapObject/MapObjectDoorKey.cpp
index f6cd2b64..91d6605b 100644
--- a/src/031_Land/MapObject/MapObjectDoorKey.cpp
+++ b/src/031_Land/MapObject/MapObjectDoorKey.cpp
@@ -72,7 +72,7 @@ ARM void MapObjectDoorKey::vfunc_14(void) {
     VecFx32 temp;
 
     Mat3p_InitYRotation(&m, SIN(angle), COS(angle));
-    temp.x     = this->mPos.x - FLOAT_TO_Q20(1.0f) + this->mUnk_70;
+    temp.x     = this->mPos.x - FLOAT_TO_FX32(1.0f) + this->mUnk_70;
     temp.z     = this->mPos.z;
     temp.y     = this->mPos.y;
     local_48.x = temp.x;
@@ -82,7 +82,7 @@ ARM void MapObjectDoorKey::vfunc_14(void) {
 
     u16 var = (-0x8000 - sVar2);
     Mat3p_InitYRotation(&m, SIN(var), COS(var));
-    temp.x     = this->mPos.x + FLOAT_TO_Q20(1.0f) - this->mUnk_70;
+    temp.x     = this->mPos.x + FLOAT_TO_FX32(1.0f) - this->mUnk_70;
     temp.z     = this->mPos.z;
     temp.y     = this->mPos.y;
     local_48.x = temp.x;
@@ -188,11 +188,11 @@ ARM void MapObjectDoorKey::vfunc_78(void) {
     temp.z = this->mPos.z;
     temp.y = this->mPos.y;
 
-    local_24.x = temp.x - FLOAT_TO_Q20(0.999f);
+    local_24.x = temp.x - FLOAT_TO_FX32(0.999f);
     local_24.y = temp.y;
     local_24.z = temp.z;
 
-    local_30.x = temp.x + FLOAT_TO_Q20(0.999f);
+    local_30.x = temp.x + FLOAT_TO_FX32(0.999f);
     local_30.y = temp.y;
     local_30.z = temp.z;
 
@@ -201,13 +201,13 @@ ARM void MapObjectDoorKey::vfunc_78(void) {
 
     Mat4x3p_InitYRotation(&m, SIN((u16) angle), COS((u16) angle));
 
-    local_84.x = FLOAT_TO_Q20(1.0f);
+    local_84.x = FLOAT_TO_FX32(1.0f);
     local_84.y = 0;
     local_84.z = 0;
 
     local_90.x = 0;
     local_90.y = 0;
-    local_90.z = FLOAT_TO_Q20(0.3299f);
+    local_90.z = FLOAT_TO_FX32(0.3299f);
 
     func_01ffaf74(&local_90, &m, &local_90);
     func_01ffaf74(&local_84, &m, &local_84);
diff --git a/src/031_Land/MapObject/MapObjectDoorSwitch.cpp b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp
index 24215774..3ced7e07 100644
--- a/src/031_Land/MapObject/MapObjectDoorSwitch.cpp
+++ b/src/031_Land/MapObject/MapObjectDoorSwitch.cpp
@@ -25,7 +25,7 @@ ARM MapObjectProfileDoorSwitch::MapObjectProfileDoorSwitch() :
 
 ARM MapObjectDoorSwitch::MapObjectDoorSwitch() :
     mUnk_094(0) {
-    this->mUnkPos = FLOAT_TO_Q20(0.0f);
+    this->mUnkPos = FLOAT_TO_FX32(0.0f);
 
 #if IS_JP
     this->mUnk_140 = false;
@@ -51,25 +51,25 @@ ARM bool MapObjectDoorSwitch::vfunc_00(void) {
     }
 #endif
 
-    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_0F4.mUnk_0C.z = -FLOAT_TO_Q20(1.35f);
+    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_0F4.mUnk_0C.z = -FLOAT_TO_FX32(1.35f);
 
-    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_Q20(0.35f);
+    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_FX32(0.35f);
 
     this->mUnk_0F4.mUnk_04 &= ~0x01;
     this->mUnk_0F4.mUnk_08 = 0x7009;
 
 #if IS_JP
-    this->mUnk_118.mUnk_0C.x = -FLOAT_TO_Q20(0.35f);
-    this->mUnk_118.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_118.mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
+    this->mUnk_118.mUnk_0C.x = -FLOAT_TO_FX32(0.35f);
+    this->mUnk_118.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_118.mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
 
-    this->mUnk_118.mUnk_18.x = FLOAT_TO_Q20(0.35f);
-    this->mUnk_118.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_118.mUnk_18.z = FLOAT_TO_Q20(1.0f);
+    this->mUnk_118.mUnk_18.x = FLOAT_TO_FX32(0.35f);
+    this->mUnk_118.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_118.mUnk_18.z = FLOAT_TO_FX32(1.0f);
 
     this->mUnk_118.mUnk_04 &= ~0x01;
     this->mUnk_118.mUnk_08 = 0x7009;
@@ -159,15 +159,15 @@ ARM void MapObjectDoorSwitch::vfunc_50(void) {
     u16 uVar1 = this->GetDirection();
 
     if (!this->IsOrientedVertically()) {
-        this->mUnkPos = FLOAT_TO_Q20(0.35f);
+        this->mUnkPos = FLOAT_TO_FX32(0.35f);
 
-        this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-        this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-        this->mUnk_0F4.mUnk_0C.z = FLOAT_TO_Q20(0.35f);
+        this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+        this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+        this->mUnk_0F4.mUnk_0C.z = FLOAT_TO_FX32(0.35f);
 
-        this->mUnk_0F4.mUnk_18.x = FLOAT_TO_Q20(1.0f);
-        this->mUnk_0F4.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-        this->mUnk_0F4.mUnk_18.z = FLOAT_TO_Q20(0.35f);
+        this->mUnk_0F4.mUnk_18.x = FLOAT_TO_FX32(1.0f);
+        this->mUnk_0F4.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+        this->mUnk_0F4.mUnk_18.z = FLOAT_TO_FX32(0.35f);
         return;
     }
 
@@ -176,36 +176,36 @@ ARM void MapObjectDoorSwitch::vfunc_50(void) {
     }
 
     if (uVar1 == 3) {
-        this->mUnkPos = FLOAT_TO_Q20(0.35f);
+        this->mUnkPos = FLOAT_TO_FX32(0.35f);
 
-        this->mUnk_118.mUnk_0C.x = FLOAT_TO_Q20(0.35f);
-        this->mUnk_118.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_0C.x = FLOAT_TO_FX32(0.35f);
+        this->mUnk_118.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
 
-        this->mUnk_118.mUnk_18.x = FLOAT_TO_Q20(0.35f);
-        this->mUnk_118.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-        this->mUnk_118.mUnk_18.z = FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_18.x = FLOAT_TO_FX32(0.35f);
+        this->mUnk_118.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+        this->mUnk_118.mUnk_18.z = FLOAT_TO_FX32(1.0f);
     } else {
-        this->mUnkPos = -FLOAT_TO_Q20(0.35f);
+        this->mUnkPos = -FLOAT_TO_FX32(0.35f);
 
-        this->mUnk_118.mUnk_0C.x = -FLOAT_TO_Q20(0.35f);
-        this->mUnk_118.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_0C.x = -FLOAT_TO_FX32(0.35f);
+        this->mUnk_118.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
 
-        this->mUnk_118.mUnk_18.x = -FLOAT_TO_Q20(0.35f);
-        this->mUnk_118.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-        this->mUnk_118.mUnk_18.z = FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_18.x = -FLOAT_TO_FX32(0.35f);
+        this->mUnk_118.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+        this->mUnk_118.mUnk_18.z = FLOAT_TO_FX32(1.0f);
     }
 #else
-    this->mUnkPos = FLOAT_TO_Q20(0.35f);
+    this->mUnkPos = FLOAT_TO_FX32(0.35f);
 
-    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_0F4.mUnk_0C.z = FLOAT_TO_Q20(0.35f);
+    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_0F4.mUnk_0C.z = FLOAT_TO_FX32(0.35f);
 
-    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_Q20(0.35f);
+    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_FX32(0.35f);
 #endif
 }
 
@@ -221,17 +221,17 @@ ARM void MapObjectDoorSwitch::vfunc_54(void) {
 
     if (!this->IsOrientedVertically()) {
         if (this->mUnk_80 > 0) {
-            func_01ff9218(&this->mUnkPos, -FLOAT_TO_Q20(1.35f), func_01ffb464(INT_TO_Q20(this->mUnk_80)));
+            func_01ff9218(&this->mUnkPos, -FLOAT_TO_FX32(1.35f), func_01ffb464(INT_TO_FX32(this->mUnk_80)));
         }
 
         fx32 temp_118            = this->mUnkPos;
-        this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-        this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
+        this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+        this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
         this->mUnk_0F4.mUnk_0C.z = temp_118;
 
-        this->mUnk_0F4.mUnk_18.x = FLOAT_TO_Q20(1.0f);
-        this->mUnk_0F4.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-        this->mUnk_0F4.mUnk_18.z = FLOAT_TO_Q20(0.35f);
+        this->mUnk_0F4.mUnk_18.x = FLOAT_TO_FX32(1.0f);
+        this->mUnk_0F4.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+        this->mUnk_0F4.mUnk_18.z = FLOAT_TO_FX32(0.35f);
         return;
     }
 
@@ -243,42 +243,42 @@ ARM void MapObjectDoorSwitch::vfunc_54(void) {
 
     if (uVar1 == 3) {
         if (this->mUnk_80 > 0) {
-            func_01ff9218(&this->mUnkPos, -FLOAT_TO_Q20(0.35f), func_01ffb464(INT_TO_Q20(this->mUnk_80)));
+            func_01ff9218(&this->mUnkPos, -FLOAT_TO_FX32(0.35f), func_01ffb464(INT_TO_FX32(this->mUnk_80)));
         }
 
         this->mUnk_118.mUnk_0C.x = this->mUnkPos;
-        this->mUnk_118.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
 
-        this->mUnk_118.mUnk_18.x = FLOAT_TO_Q20(0.35f);
-        this->mUnk_118.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-        this->mUnk_118.mUnk_18.z = FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_18.x = FLOAT_TO_FX32(0.35f);
+        this->mUnk_118.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+        this->mUnk_118.mUnk_18.z = FLOAT_TO_FX32(1.0f);
     } else {
         if (this->mUnk_80 > 0) {
-            func_01ff9218(&this->mUnkPos, FLOAT_TO_Q20(0.35f), func_01ffb464(INT_TO_Q20(this->mUnk_80)));
+            func_01ff9218(&this->mUnkPos, FLOAT_TO_FX32(0.35f), func_01ffb464(INT_TO_FX32(this->mUnk_80)));
         }
 
-        this->mUnk_118.mUnk_0C.x = -FLOAT_TO_Q20(0.35f);
-        this->mUnk_118.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_0C.x = -FLOAT_TO_FX32(0.35f);
+        this->mUnk_118.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+        this->mUnk_118.mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
 
         this->mUnk_118.mUnk_18.x = this->mUnkPos;
-        this->mUnk_118.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-        this->mUnk_118.mUnk_18.z = FLOAT_TO_Q20(1.0f);
+        this->mUnk_118.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+        this->mUnk_118.mUnk_18.z = FLOAT_TO_FX32(1.0f);
     }
 #else
     if (this->mUnk_80 > 0) {
-        func_01ff9218(&this->mUnkPos, -FLOAT_TO_Q20(1.35f), func_01ffb464(INT_TO_Q20(this->mUnk_80)));
+        func_01ff9218(&this->mUnkPos, -FLOAT_TO_FX32(1.35f), func_01ffb464(INT_TO_FX32(this->mUnk_80)));
     }
 
     fx32 temp_118            = this->mUnkPos;
-    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
+    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
     this->mUnk_0F4.mUnk_0C.z = temp_118;
 
-    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_Q20(0.35f);
+    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_FX32(0.35f);
 #endif
 }
 
@@ -289,32 +289,32 @@ ARM void MapObjectDoorSwitch::vfunc_58(void) {
     }
 
     if (!this->IsOrientedVertically()) {
-        this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-        this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-        this->mUnk_0F4.mUnk_0C.z = -FLOAT_TO_Q20(1.35f);
+        this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+        this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+        this->mUnk_0F4.mUnk_0C.z = -FLOAT_TO_FX32(1.35f);
 
-        this->mUnk_0F4.mUnk_18.x = FLOAT_TO_Q20(1.0f);
-        this->mUnk_0F4.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-        this->mUnk_0F4.mUnk_18.z = FLOAT_TO_Q20(0.35f);
+        this->mUnk_0F4.mUnk_18.x = FLOAT_TO_FX32(1.0f);
+        this->mUnk_0F4.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+        this->mUnk_0F4.mUnk_18.z = FLOAT_TO_FX32(0.35f);
     } else {
         if (this->mUnk_141) {
-            this->mUnk_118.mUnk_0C.x = -FLOAT_TO_Q20(0.35f);
-            this->mUnk_118.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-            this->mUnk_118.mUnk_0C.z = -FLOAT_TO_Q20(1.0f);
+            this->mUnk_118.mUnk_0C.x = -FLOAT_TO_FX32(0.35f);
+            this->mUnk_118.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+            this->mUnk_118.mUnk_0C.z = -FLOAT_TO_FX32(1.0f);
 
-            this->mUnk_118.mUnk_18.x = FLOAT_TO_Q20(0.35f);
-            this->mUnk_118.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-            this->mUnk_118.mUnk_18.z = FLOAT_TO_Q20(1.0f);
+            this->mUnk_118.mUnk_18.x = FLOAT_TO_FX32(0.35f);
+            this->mUnk_118.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+            this->mUnk_118.mUnk_18.z = FLOAT_TO_FX32(1.0f);
         }
     }
 #else
-    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
-    this->mUnk_0F4.mUnk_0C.z = -FLOAT_TO_Q20(1.35f);
+    this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_FX32(0.0f);
+    this->mUnk_0F4.mUnk_0C.z = -FLOAT_TO_FX32(1.35f);
 
-    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_Q20(1.0f);
-    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_Q20(2.4f);
-    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_Q20(0.35f);
+    this->mUnk_0F4.mUnk_18.x = FLOAT_TO_FX32(1.0f);
+    this->mUnk_0F4.mUnk_18.y = FLOAT_TO_FX32(2.4f);
+    this->mUnk_0F4.mUnk_18.z = FLOAT_TO_FX32(0.35f);
 #endif
 }
 
diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp
index 516f1c89..bf415015 100644
--- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp
+++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp
@@ -130,20 +130,20 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
 
             switch (this->mUnk_68) {
                 case 0x08:
-                    this->mUnk_70.x = temp_r8->x + MUL_Q20(data_02040964[0], FLOAT_TO_Q20(2.0f));
-                    this->mUnk_70.z = temp_r8->z + MUL_Q20(data_02040964[1], FLOAT_TO_Q20(2.0f));
+                    this->mUnk_70.x = temp_r8->x + MUL_FX32(data_02040964[0], FLOAT_TO_FX32(2.0f));
+                    this->mUnk_70.z = temp_r8->z + MUL_FX32(data_02040964[1], FLOAT_TO_FX32(2.0f));
                     break;
                 case 0x09:
-                    this->mUnk_70.x = temp_r8->x + MUL_Q20(data_0203e964[0], FLOAT_TO_Q20(2.0f));
-                    this->mUnk_70.z = temp_r8->z + MUL_Q20(data_0203e964[1], FLOAT_TO_Q20(2.0f));
+                    this->mUnk_70.x = temp_r8->x + MUL_FX32(data_0203e964[0], FLOAT_TO_FX32(2.0f));
+                    this->mUnk_70.z = temp_r8->z + MUL_FX32(data_0203e964[1], FLOAT_TO_FX32(2.0f));
                     break;
                 case 0x22:
-                    this->mUnk_70.x = temp_r8->x + MUL_Q20(data_02041964[0], FLOAT_TO_Q20(2.0f));
-                    this->mUnk_70.z = temp_r8->z + MUL_Q20(data_02041964[1], FLOAT_TO_Q20(2.0f));
+                    this->mUnk_70.x = temp_r8->x + MUL_FX32(data_02041964[0], FLOAT_TO_FX32(2.0f));
+                    this->mUnk_70.z = temp_r8->z + MUL_FX32(data_02041964[1], FLOAT_TO_FX32(2.0f));
                     break;
                 case 0x23:
-                    this->mUnk_70.x = temp_r8->x + MUL_Q20(data_0203f964[0], FLOAT_TO_Q20(2.0f));
-                    this->mUnk_70.z = temp_r8->z + MUL_Q20(data_0203f964[1], FLOAT_TO_Q20(2.0f));
+                    this->mUnk_70.x = temp_r8->x + MUL_FX32(data_0203f964[0], FLOAT_TO_FX32(2.0f));
+                    this->mUnk_70.z = temp_r8->z + MUL_FX32(data_0203f964[1], FLOAT_TO_FX32(2.0f));
                     break;
                 default:
                     if (this->mUnk_2C->mUnk_150 == 0x1000) {
@@ -163,13 +163,13 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
 
                                 switch (pDRTY->mUnk_CC) {
                                     case 1:
-                                        this->mUnk_AE = FLOAT_TO_Q20(-5.778f);
+                                        this->mUnk_AE = FLOAT_TO_FX32(-5.778f);
                                         break;
                                     case 2:
-                                        this->mUnk_AE = FLOAT_TO_Q20(5.7778f);
+                                        this->mUnk_AE = FLOAT_TO_FX32(5.7778f);
                                         break;
                                     default:
-                                        this->mUnk_AE = FLOAT_TO_Q20(-8.0002f);
+                                        this->mUnk_AE = FLOAT_TO_FX32(-8.0002f);
                                         break;
                                 }
                             }
@@ -253,13 +253,13 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
                 case 0x21:
                 case 0x25:
                 case 0x33:
-                    this->mUnk_7C = FLOAT_TO_Q20(1 / 2);
+                    this->mUnk_7C = FLOAT_TO_FX32(1 / 2);
                     break;
                 case 0x19:
-                    this->mUnk_7C = FLOAT_TO_Q20(0.3f);
+                    this->mUnk_7C = FLOAT_TO_FX32(0.3f);
                     break;
                 default:
-                    this->mUnk_7C = FLOAT_TO_Q20(0.8f);
+                    this->mUnk_7C = FLOAT_TO_FX32(0.8f);
                     break;
             }
 
@@ -356,8 +356,8 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
                 case 0x16:
                 case 0x1C:
                     pVec = this->mUnk_34;
-                    pVec->x += MUL_Q20(FLOAT_TO_Q20(-1.1003f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
-                    pVec->z += MUL_Q20(FLOAT_TO_Q20(-1.1003f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    pVec->x += MUL_FX32(FLOAT_TO_FX32(-1.1003f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    pVec->z += MUL_FX32(FLOAT_TO_FX32(-1.1003f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
                     break;
                 case 0x08:
                 case 0x09:
@@ -378,8 +378,8 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
                 case 0x22:
                 case 0x23:
                     pVec = this->mUnk_34;
-                    pVec->x += MUL_Q20(FLOAT_TO_Q20(-1.9001f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
-                    pVec->z += MUL_Q20(FLOAT_TO_Q20(-1.9001f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    pVec->x += MUL_FX32(FLOAT_TO_FX32(-1.9001f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    pVec->z += MUL_FX32(FLOAT_TO_FX32(-1.9001f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
                     break;
                 case 0x0F:
                 case 0x10:
@@ -391,13 +391,13 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
                 case 0x24:
                 case 0x25:
                     pVec = this->mUnk_34;
-                    pVec->x += MUL_Q20(FLOAT_TO_Q20(-1.0002f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
-                    pVec->z += MUL_Q20(FLOAT_TO_Q20(-1.0002f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    pVec->x += MUL_FX32(FLOAT_TO_FX32(-1.0002f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    pVec->z += MUL_FX32(FLOAT_TO_FX32(-1.0002f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
                     break;
                 default:
                     // pVec = this->mUnk_34;
-                    // pVec->x += MUL_Q20(FLOAT_TO_Q20(-1.7001f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
-                    // pVec->z += MUL_Q20(FLOAT_TO_Q20(-1.7001f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    // pVec->x += MUL_FX32(FLOAT_TO_FX32(-1.7001f), SIN2(pSinCosTable, this->mUnk_40->mUnk_00));
+                    // pVec->z += MUL_FX32(FLOAT_TO_FX32(-1.7001f), COS2(pSinCosTable, this->mUnk_40->mUnk_00));
                     break;
             }
 
@@ -447,10 +447,10 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1
                 case 0x1C:
                 case 0x33:
                 case 0x3B:
-                    this->mUnk_7C = FLOAT_TO_Q20(0.5f);
+                    this->mUnk_7C = FLOAT_TO_FX32(0.5f);
                     break;
                 default:
-                    this->mUnk_7C = FLOAT_TO_Q20(0.8f);
+                    this->mUnk_7C = FLOAT_TO_FX32(0.8f);
                     break;
             }
 
@@ -567,8 +567,8 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
                         fx16 sin  = SIN2(data_0203feb0, value);
                         fx16 cos  = COS2(data_0203feb0, value);
 
-                        this->mUnk_70.x += MUL_Q20(sin, 0x19A);
-                        this->mUnk_70.z += MUL_Q20(cos, 0x19A);
+                        this->mUnk_70.x += MUL_FX32(sin, 0x19A);
+                        this->mUnk_70.z += MUL_FX32(cos, 0x19A);
                         break;
                     }
 
@@ -591,8 +591,8 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
 
                             fx16 sin = SIN2(data_0203feb0, this->mUnk_40->mUnk_00);
                             fx16 cos = COS2(data_0203feb0, this->mUnk_40->mUnk_00);
-                            this->mUnk_70.x += MUL_Q20(sin, 0x19A);
-                            this->mUnk_70.z += MUL_Q20(cos, 0x19A);
+                            this->mUnk_70.x += MUL_FX32(sin, 0x19A);
+                            this->mUnk_70.z += MUL_FX32(cos, 0x19A);
                         }
                         break;
                     default:
@@ -708,8 +708,8 @@ ARM void PlayerSceneChange::vfunc_10(unk32 param1, unk32 param2) {
                     this->mUnk_98 = -1;
                     fx16 sin      = SIN2(data_0203feb0, this->mUnk_40->mUnk_00);
                     fx16 cos      = COS2(data_0203feb0, this->mUnk_40->mUnk_00);
-                    this->mUnk_70.x += MUL_Q20(sin, FLOAT_TO_Q20(2.0f));
-                    this->mUnk_70.z += MUL_Q20(cos, FLOAT_TO_Q20(2.0f));
+                    this->mUnk_70.x += MUL_FX32(sin, FLOAT_TO_FX32(2.0f));
+                    this->mUnk_70.z += MUL_FX32(cos, FLOAT_TO_FX32(2.0f));
                     this->mUnk_AD = true;
                     return;
                 } else {