actually fix KR for real this time

patataofcourse · Dec 13, 2023 · 0e037f2 · 0e037f2
1 parent db16fcd
commit 0e037f2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/img/UniversalUpdater.png b/img/UniversalUpdater.png
diff --git a/include/Megamix/Region.hpp b/include/Megamix/Region.hpp
@@ -11,12 +11,12 @@ extern u8 region;
 namespace Region {
 
     enum {
-        JP,
-        US,
-        EU,
-        KR,
-        UNK,
-        KR_CTR = 5 // in the SDK, KR is 5 instead of 3
+        JP = 0,
+        US = 1,
+        EU = 2,
+        KR = 3,
+        KR_CTR = 5, // in the SDK, KR is 5 instead of 3
+        UNK
     };
 
     u8 FromCode(u32 code);

diff --git a/src/Megamix/Hooks.cpp b/src/Megamix/Hooks.cpp
@@ -101,7 +101,8 @@ namespace Megamix::Hooks {
         }
     }
 
-    u32 getRegion() {
+    u32 getRegionCTR() {
+        //TODO: handle JP region / JP langpack
         if (region == Region::KR)
             return Region::KR_CTR;
         return region;
@@ -135,7 +136,7 @@ namespace Megamix::Hooks {
             rtInitHook(&regionFSHook, Region::RegionFSHookFunc(), (u32)getRegionMegamix);
             rtEnableHook(&regionFSHook);
         }
-        rtInitHook(&regionOtherHook, Region::RegionOtherHookFunc(), (u32)getRegion);
+        rtInitHook(&regionOtherHook, Region::RegionOtherHookFunc(), (u32)getRegionCTR);
         rtEnableHook(&regionOtherHook);
     }
 

diff --git a/src/Megamix/Region.cpp b/src/Megamix/Region.cpp
@@ -311,8 +311,9 @@ namespace Region {
         switch (region) {
             case US:
             case EU:
-            case KR:
                 return 0x28c070;
+            case KR:
+                return 0x28c048;
             default: // this function doesn't exist in JP afaik
                 return 0;