diff --git a/Lua/lib/addrs/O/CNIQ.lua b/Lua/lib/addrs/O/CNIQ.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/Lua/lib/addrs/O/CNIQ.lua
@@ -0,0 +1 @@
+return {}
diff --git a/Lua/lib/addrs/O/JPZC.lua b/Lua/lib/addrs/O/JPZC.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/Lua/lib/addrs/O/JPZC.lua
@@ -0,0 +1 @@
+return {}
diff --git a/Lua/lib/addrs/O/TWIQ.lua b/Lua/lib/addrs/O/TWIQ.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/Lua/lib/addrs/O/TWIQ.lua
@@ -0,0 +1 @@
+return {}
diff --git a/Lua/lib/addrs/basics.lua b/Lua/lib/addrs/basics.lua
index 1ed2c57..3a2e995 100644
--- a/Lua/lib/addrs/basics.lua
+++ b/Lua/lib/addrs/basics.lua
@@ -1,16 +1,4 @@
 return {
-    ["O CNIQ"] = {
-        save   = 0x137F40,
-        global = 0x1D5A20,
-        actor  = 0x1E7F70,
-        LLsize = 0x10,
-    },
-    ["O TWIQ"] = {
-        save   = 0x137300,
-        global = 0x1D4DE0,
-        actor  = 0x1E7330,
-        LLsize = 0x10,
-    },
     ["M US10"] = {
         save   = 0x1EF670,
         global = 0x3E6B20,
@@ -126,6 +114,24 @@ return {
         actor  = 0x1DBBB0,
         LLsize = 0x10,
     },
+    ["O JPZC"] = {
+        save   = 0x11B148,
+        global = 0x1C9660,
+        actor  = 0x1DBBB0,
+        LLsize = 0x10,
+    },
+    ["O CNIQ"] = {
+        save   = 0x137F40,
+        global = 0x1D5A20,
+        actor  = 0x1E7F70,
+        LLsize = 0x10,
+    },
+    ["O TWIQ"] = {
+        save   = 0x137300,
+        global = 0x1D4DE0,
+        actor  = 0x1E7330,
+        LLsize = 0x10,
+    },
     ["O USGC MQ"] = {
         save   = 0x11B128,
         global = 0x1C9620,
diff --git a/Lua/lib/addrs/versions.lua b/Lua/lib/addrs/versions.lua
index 3269ee3..976763d 100644
--- a/Lua/lib/addrs/versions.lua
+++ b/Lua/lib/addrs/versions.lua
@@ -39,6 +39,7 @@ return { -- md5 and sha1 hashes of .z64s
     ["1BF5F42B98C3E97948F01155F12E2D88"] = "O JP11",
     ["2258052847BDD056C8406A9EF6427F13"] = "O JP12",
     ["33FB7852C180B18EA0B9620B630F413F"] = "O JPGC",
+    ["0C13E0449A28EA5B925CDB8AF8D29768"] = "O JPZC",
     ["AD69C91157F6705E8AB06C79FE08AAD47BB57BA7"] = "O US10",
     ["D3ECB253776CD847A5AA63D859D8C89A2F37B364"] = "O US11",
     ["41B3BDC48D98C48529219919015A1AF22F5057C2"] = "O US12",
@@ -50,6 +51,7 @@ return { -- md5 and sha1 hashes of .z64s
     ["DBFC81F655187DC6FEFD93FA6798FACE770D579D"] = "O JP11",
     ["FA5F5942B27480D60243C2D52C0E93E26B9E6B86"] = "O JP12",
     ["0769C84615422D60F16925CD859593CDFA597F84"] = "O JPGC",
+    ["2CE2D1A9F0534C9CD9FA04EA5317B80DA21E5E73"] = "O JPZC",
 
     -- Ocarina of Time: Master Quest
     ["DA35577FE54579F6A266931CC75F512D"] = "O USGC MQ",