diff --git a/README.md b/README.md
index 7584c09c46..b5a9ecae72 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ It aims to be as accurate as possible to the original while also providing new o
 
 You must dump your own copy of the game. Please see [this article](https://wiki.dolphin-emu.org/index.php?title=Ripping_Games) for instructions. After dumping, you can use a program like [Dolphin](https://dolphin-emu.org/) or [nodtool](https://github.com/encounter/nod/releases) to convert the `.iso` to `.rvz` to save space.
 
-Currently, only the GameCube USA and EUR releases are supported. Support for other versions of the game is planned in the future.
+Currently, only the GameCube releases are supported. Support for other versions of the game is planned in the future.
 
 ### 2. Install Dusklight
 
diff --git a/libs/JSystem/src/JUtility/JUTCacheFont.cpp b/libs/JSystem/src/JUtility/JUTCacheFont.cpp
index 2282361672..3fd02a1232 100644
--- a/libs/JSystem/src/JUtility/JUTCacheFont.cpp
+++ b/libs/JSystem/src/JUtility/JUTCacheFont.cpp
@@ -56,6 +56,10 @@ void JUTCacheFont::initialize_state() {
     mCacheBuffer = NULL;
     field_0x9c = NULL;
     field_0xa0 = NULL;
+
+#if TARGET_PC
+    mJoinedTextureHeight = 0;
+#endif
 }
 
 int JUTCacheFont::getMemorySize(ResFONT const* p_font, u16* o_widCount, u32* o_widSize,
diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/src/Z2AudioLib/Z2SoundObjMgr.cpp
index 2c67cfb22b..013dbd1c54 100644
--- a/src/Z2AudioLib/Z2SoundObjMgr.cpp
+++ b/src/Z2AudioLib/Z2SoundObjMgr.cpp
@@ -182,6 +182,13 @@ void Z2SoundObjMgr::searchEnemy() {
         case Z2_ENEMY_PO:
         case Z2_ENEMY_HP:
             isGhostEnemy = true;
+#if TARGET_PC
+            if (enemyId == Z2_ENEMY_HP && dusk::version::isRegionJpn() &&
+                Z2GetLink()->isRiding() && Z2GetLink()->getMoveSpeed() > 38)
+            {
+                continue;
+            }
+#endif
             break;
         case Z2_ENEMY_RDB:
             if (subBgmType == 0)
@@ -212,7 +219,7 @@ void Z2SoundObjMgr::searchEnemy() {
 #elif TARGET_PC
         case Z2_ENEMY_SH:
             if (enemyId == Z2_ENEMY_SH && !dusk::version::isRegionJpn())
-                continue;
+                break;
 #endif
             if (!Z2GetLink()->isRiding())
                 break;
diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp
index 5dbc00a1d2..aeeb2243b8 100644
--- a/src/d/d_msg_class.cpp
+++ b/src/d/d_msg_class.cpp
@@ -1630,8 +1630,35 @@ void jmessage_tMeasureProcessor::do_scale(f32 i_scale) {
         mPageLineMax--;
         JUT_ASSERT(0x930, mPageLineMax > 0);
 
-#if TARGET_PC || REGION_JPN
-        if (IF_DUSK(dusk::version::isRegionJpn() &&) field_0x3e == 0) {
+#if TARGET_PC
+        if (dusk::version::isRegionJpn()) {
+            if (field_0x3e == 0) {
+                pReference->setPageType(field_0x40, 2);
+            } else {
+                pReference->setPageType(field_0x40, 3);
+                if (field_0x3e == 1 && pReference->getPageType(field_0x40) == 2) {
+                    pReference->setPageType(field_0x40, 4);
+                }
+            }
+        } else {
+            if (field_0x3e == 0) {
+                pReference->setPageType(field_0x40, 2);
+            } else if (field_0x3e == 2 && mPageLineMax == 3) {
+                if (pReference->getPageType(field_0x40) == 4) {
+                    pReference->setPageType(field_0x40, 5);
+                } else {
+                    pReference->setPageType(field_0x40, 8);
+                }
+            } else {
+                pReference->setPageType(field_0x40, 3);
+                if (field_0x3e == 1 && pReference->getPageType(field_0x40) == 2) {
+                    pReference->setPageType(field_0x40, 4);
+                }
+            }
+        }
+#else
+#if REGION_JPN
+        if (field_0x3e == 0) {
             pReference->setPageType(field_0x40, 2);
         }
 #else
@@ -1651,6 +1678,7 @@ void jmessage_tMeasureProcessor::do_scale(f32 i_scale) {
                 pReference->setPageType(field_0x40, 4);
             }
         }
+#endif
     }
 }
 
@@ -2150,8 +2178,10 @@ bool jmessage_tSequenceProcessor::do_isReady() {
             }
 
             field_0xa6++;
-#if TARGET_PC || REGION_JPN
-            if (IF_DUSK(dusk::version::isRegionJpn() &&) field_0xa6 >= 1) {
+#if TARGET_PC
+            if ((dusk::version::isRegionJpn() && field_0xa6 >= 1) || (!dusk::version::isRegionJpn() && field_0xa6 >= 2)) {
+#elif REGION_JPN
+            if (field_0xa6 >= 1) {
 #else
             if (field_0xa6 >= 2) {
 #endif