Merge pull request #3 from eldri7ch2/master

Updated Lookingglass to match Magic-Mirror
MottZilla · Jun 8, 2024 · 36c6900 · 36c6900
2 parents c0a8d97 + 9aded96
commit 36c6900
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 37 deletions.
diff --git a/build/presets/lookingglass.js b/build/presets/lookingglass.js
diff --git a/presets/lookingglass.json b/presets/lookingglass.json
@@ -378,8 +378,11 @@
   }, {
     "location": "Crystal cloak",
     "locks": [
+      "Jewel of Open",
       "Mirror + Soul of Wolf",
-      "Jewel of Open"
+      "Mirror + Gravity Boots",
+      "Mirror + Soul of Bat",
+      "Mirror + Form of Mist + Power of Mist"
     ]
   }, {
     "location": "Mormegil",
@@ -2039,41 +2042,6 @@
     "value": "0x022a0228"
   },
 
-  {
-    "comment": "Mirror Logic for Clock Tower",
-    "address": "0x558e46e",
-    "type": "short",
-    "value": "0x04f1"
-  },{
-    "address": "0x558e48e",
-    "type": "short",
-    "value": "0x04f8"
-  },{
-    "address": "0x558e4ae",
-    "type": "short",
-    "value": "0x04ee"
-  },{
-    "address": "0x558e4ce",
-    "type": "short",
-    "value": "0x04da"
-  },{
-    "address": "0x558eb80",
-    "type": "short",
-    "value": "0x04ee"
-  },{
-    "address": "0x558eba0",
-    "type": "short",
-    "value": "0x04cf"
-  },{
-    "address": "0x558ebc0",
-    "type": "short",
-    "value": "0x053d"
-  },{
-    "address": "0x558ebe0",
-    "type": "short",
-    "value": "0x04ea"
-  },
-
   {
     "comment": "Library Shortcut",
     "address": "0x47c22ea",
@@ -6344,6 +6312,66 @@
   }, {
     "type": "short",
     "value": "0x8047"
+  }, {
+    "comment": "Sync Teleporter Unlocks A",
+    "address": "0x5A78DBC",
+    "type": "char",
+    "value": "0xBC"
+  }, {
+    "comment": "Sync Teleporter Unlocks B",
+    "address": "0x5A7909C",
+    "type": "char",
+    "value": "0xBC"
+  }, {
+    "comment": "Death Softlock Fix",
+    "type": "word",
+    "address": "0x6647250",
+    "value": "0x34020000"
+  }, {
+    "type": "word",
+    "value": "0x00000000"
+  }, {
+    "comment": "Teleport not bright as hell",
+    "type":    "char",
+    "address": "0xFB1F8",
+    "value":    "0x20"
+  }, {
+    "type":    "char",
+    "address": "0xFB1FC",
+    "value":    "0x20"
+  }, {
+    "type":    "char",
+    "address": "0xFB204",
+    "value":    "0x20"
+  }, {
+    "type":    "char",
+    "address": "0x10AD98",
+    "value":    "0x20"
+  }, {
+    "type":    "char",
+    "address": "0x10ADA8",
+    "value":    "0x20"
+  }, {
+    "type":    "char",
+    "address": "0x10ADB0",
+    "value":    "0x40"
+  }, {
+    "type":    "char",
+    "address": "0x10B29C",
+    "value":    "0x20"
+  }, {
+    "type":    "char",
+    "address": "0x10B2A0",
+    "value":    "0x20"
+  }, {
+    "type":    "char",
+    "address": "0x10B2A8",
+    "value":    "0x40"
+  }, {
+    "comment":"last Teleport not bright",
+    "type":    "char",
+    "address": "0x143C58",
+    "value":    "0x40"
   }],
 
   "complexityGoal": {