fix errors

Author: kjbranch

region/maridia/inner-pink/Crab Shaft.json

@@ -134,6 +134,7 @@
     {
       "from": 3,
       "to": [
+        {"id": 1},
         {"id": 3},
         {"id": 4}
       ]
@@ -2064,27 +2065,17 @@
       "link": [3, 3],
       "name": "R-Mode Entry",
       "entranceCondition": {
-        "comeInWithRMode": {}
+        "comeInWithRMode": {},
+        "comesThroughToilet": "no"
       },
       "requires": [],
       "clearsObstacles": ["R-Mode"],
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
     {
-      "id": 66,
-      "link": [3, 4],
-      "name": "Fall Into Room",
-      "entranceCondition": {
-        "comeInNormally": {},
-        "comesThroughToilet": "any"
-      },
-      "requires": [],
-      "flashSuitChecked": true
-    },
-    {
-      "link": [3, 4],
-      "name": "Direct G-mode Morph, Crystal Flash Interrupt (Top of Shaft)",
+      "link": [3, 3],
+      "name": "Direct G-mode Morph, Crystal Flash Interrupt (Top of Shaft), Leave with Spark",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
@@ -2107,25 +2098,35 @@
             {"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
           ]}
         ]},
-        {"or": [
-          "Gravity",
-          "HiJump",
-          "canSpringBallJumpMidAir"
-        ]}
+        {"useFlashSuit": {}},
+        {"shinespark": {"frames": 7}}
+      ],
+      "exitCondition": {
+        "leaveWithSpark": {}
+      },
+      "unlocksDoors": [
+        {"types": ["ammo"], "requires": []}
       ],
       "flashSuitChecked": true,
       "note": [
         "Crystal Flash on the top right corner of the central structure to where the crab will hit Samus from below.",
         "Time the Power Bomb to avoid killing the crab."
-      ],
-      "devNote": [
-        "A node below the platform might help, but without the extra movement, Samus can always do this at 1 instead.",
-        "With Ice, Samus would want to do this at 1 and then climb back up."
       ]
     },
     {
+      "id": 66,
       "link": [3, 4],
-      "name": "Direct G-mode Morph, Crystal Flash Interrupt (Top of Shaft), Leave with Spark",
+      "name": "Fall Into Room",
+      "entranceCondition": {
+        "comeInNormally": {},
+        "comesThroughToilet": "any"
+      },
+      "requires": [],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [3, 4],
+      "name": "Direct G-mode Morph, Crystal Flash Interrupt (Top of Shaft)",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
@@ -2148,16 +2149,20 @@
             {"resourceCapacity": [{"type": "ReserveEnergy", "count": 199}]}
           ]}
         ]},
-        {"useFlashSuit": {}},
-        {"shinespark": {"frames": 7}}
+        {"or": [
+          "Gravity",
+          "HiJump",
+          "canSpringBallJumpMidAir"
+        ]}
       ],
-      "exitCondition": {
-        "leaveWithSpark": {}
-      },
       "flashSuitChecked": true,
       "note": [
         "Crystal Flash on the top right corner of the central structure to where the crab will hit Samus from below.",
         "Time the Power Bomb to avoid killing the crab."
+      ],
+      "devNote": [
+        "A node below the platform might help, but without the extra movement, Samus can always do this at 1 instead.",
+        "With Ice, Samus would want to do this at 1 and then climb back up."
       ]
     },
     {

region/maridia/outer/Red Fish Room.json

@@ -463,7 +463,8 @@
       "link": [2, 2],
       "name": "R-Mode Entry",
       "entranceCondition": {
-        "comeInWithRMode": {}
+        "comeInWithRMode": {},
+        "comesThroughToilet": "no"
       },
       "requires": [],
       "clearsObstacles": ["R-Mode"],