Split gate/door runway, add frozen zebbo note

Author: aquanight

region/maridia/outer/Boyon Gate Hall.json

@@ -1400,58 +1400,25 @@
     },
     {
       "link": [4, 4],
-      "name": "R-Mode Spark Interrupt",
+      "name": "Open Gate, R-Mode Spark Interrupt",
       "requires": [
         {"obstaclesCleared": ["R-Mode"]},
+        {"obstaclesCleared": ["A"]},
         {"refill": ["Energy"]},
         {"or": [
+          {"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
           {"and": [
-            {"obstaclesCleared": ["A"]},
-            {"or": [
-              {"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
-              {"and": [
-                {"or": [
-                  {"and": [
-                    "h_trickyFrozenEnemyRunway",
-                    {"enemyKill": {"enemies": [["Boyon"]]}}
-                  ]},
-                  {"and": [
-                    "h_frozenEnemyRunway",
-                    "Morph"
-                  ]}
-                ]},
-                {"canShineCharge": {"usedTiles": 18, "openEnd": 1}}
-              ]}
-            ]}
-          ]},
-          {"and": [
-            "canShinechargeMovementTricky",
             {"or": [
-              "canWalljump",
               {"and": [
-                "SpaceJump",
-                "HiJump"
+                "h_trickyFrozenEnemyRunway",
+                {"enemyKill": {"enemies": [["Boyon"]]}}
               ]},
               {"and": [
-                "HiJump",
-                "canSpringBallJumpMidAir"
+                "h_frozenEnemyRunway",
+                "Morph"
               ]}
             ]},
-            {"or": [
-              {"and": [
-                {"doorUnlockedAtNode": 1},
-                {"doorUnlockedAtNode": 2},
-                {"canShineCharge": {"usedTiles": 13, "openEnd": 1}}
-              ]},
-              {"and": [
-                {"or": [
-                  {"doorUnlockedAtNode": 1},
-                  {"doorUnlockedAtNode": 2}
-                ]},
-                {"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
-              ]},
-              {"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
-            ]}
+            {"canShineCharge": {"usedTiles": 18, "openEnd": 1}}
           ]}
         ]},
         {"autoReserveTrigger": {"maxReserveEnergy": 95}},
@@ -1465,7 +1432,55 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Fill up on the respawning Zebbos. Use the runway with the gate or at the bottom of the room."
+        "Fill up on the respawning Zebbos. Shinecharge under the open gate, then jump into the left Boyon to interrupt.",
+        "A frozen Zebbo can add to the runway if needed."
+      ]
+    },
+    {
+      "link": [4, 4],
+      "name": "R-Mode Spark Interrupt",
+      "requires": [
+        {"obstaclesCleared": ["R-Mode"]},
+        {"refill": ["Energy"]},
+        "canShinechargeMovementTricky",
+        {"or": [
+          "canWalljump",
+          {"and": [
+            "SpaceJump",
+            "HiJump"
+          ]},
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]}
+        ]},
+        {"or": [
+          {"and": [
+            {"doorUnlockedAtNode": 1},
+            {"doorUnlockedAtNode": 2},
+            {"canShineCharge": {"usedTiles": 13, "openEnd": 1}}
+          ]},
+          {"and": [
+            {"or": [
+              {"doorUnlockedAtNode": 1},
+              {"doorUnlockedAtNode": 2}
+            ]},
+            {"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
+          ]},
+          {"canShineCharge": {"usedTiles": 12, "openEnd": 0}}
+        ]},
+        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        "canRModeSparkInterrupt"
+      ],
+      "unlocksDoors": [
+        {"nodeId": 1, "types": ["ammo"], "requires": []},
+        {"nodeId": 2, "types": ["ammo"], "requires": []}
+      ],
+      "resetsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Fill up on the respawning Zebbos. Shinecharge between the bottom doors, then jump back up to the Boyon."
       ]
     },
     {