diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 0fc4b36d9..8d30e4b4a 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -2981,8 +2981,12 @@ void daPy_lk_c::setCollision() {
 /* 8011EC0C-8011EEBC       .text setAttentionPos__9daPy_lk_cFv */
 void daPy_lk_c::setAttentionPos() {
     /* Nonmatching */
-    static const Vec offset_39104 = {0.0f, 30.0f, 20.0f};
-    static const Vec offset_39108 = {0.0f, 70.0f, 0.0f};
+    {
+        static const Vec offset = {0.0f, 30.0f, 20.0f};
+    }
+    {
+        static const Vec offset = {0.0f, 70.0f, 0.0f};
+    }
 }
 
 /* 8011EEBC-8011EF94       .text setRoomInfo__9daPy_lk_cFv */
diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc
index ac42d70cf..0b170f858 100644
--- a/src/d/actor/d_a_player_particle.inc
+++ b/src/d/actor/d_a_player_particle.inc
@@ -146,16 +146,16 @@ void daPy_swBlur_c::draw() {
 
     if (mBlurColorType == 0) {
         // Normal color.
-        static GXColor n_color = {0xFF, 0xFF, 0xFF, 0x96};
-        GXSetTevColor(GX_TEVREG0, n_color);
+        static GXColor n_color0 = {0xFF, 0xFF, 0xFF, 0x96};
+        GXSetTevColor(GX_TEVREG0, n_color0);
     } else if (mBlurColorType == 1) {
         // Elixir Soup color.
-        static GXColor y_color = {0xFF, 0xFF, 0x7B, 0x96};
-        GXSetTevColor(GX_TEVREG0, y_color);
+        static GXColor y_color0 = {0xFF, 0xFF, 0x7B, 0x96};
+        GXSetTevColor(GX_TEVREG0, y_color0);
     } else {
         // Parrying color.
-        static GXColor g_color = {0x5A, 0xFF, 0x5A, 0x96};
-        GXSetTevColor(GX_TEVREG0, g_color);
+        static GXColor g_color0 = {0x5A, 0xFF, 0x5A, 0x96};
+        GXSetTevColor(GX_TEVREG0, g_color0);
     }
 
     GXSetNumTexGens(1);
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index f010b5383..459d450dd 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -541,7 +541,7 @@ void daTbox_c::CreateInit() {
     mAllColRatio = 1.0f;
 
     if (l_HIO.mHioId < 0) {
-        l_HIO.mHioId = mDoHIO_root.mDoHIO_createChild("宝箱", &l_HIO); //  "Treasure Chest"
+        l_HIO.mHioId = mDoHIO_root.mDoHIO_createChild("宝箱", &l_HIO); // "Treasure Chest"
     }
 
     shape_angle.z = 0;
diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp
index 454fd292a..dfc9e7195 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -495,7 +495,7 @@ u32 dLib_getIplDaysFromSaveTime() {
 }
 
 /* 80058834-80058910       .text dLib_get_QuatFromTriangle__FP4cXyzP4cXyzP4cXyz */
-void dLib_get_QuatFromTriangle(cXyz*, cXyz*, cXyz*) {
+Quaternion dLib_get_QuatFromTriangle(cXyz*, cXyz*, cXyz*) {
     /* Nonmatching */
 }