Simplifiy [2, 3]

Author: aquanight

region/lowernorfair/east/Lower Norfair Fireflea Room.json

@@ -783,7 +783,7 @@
     },
     {
       "link": [2, 3],
-      "name": "R-Mode Pause Abuse Spark Interrupt (Gain Blue Suit)",
+      "name": "R-Mode Spark Interrupt (Gain Blue Suit)",
       "entranceCondition": {
         "comeInWithRMode": {}
       },
@@ -794,7 +794,10 @@
           {"and": [
             "h_RModeCanRefillReserves",
             {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-            {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]}
+            {"or": [
+              {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
+              {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]}
+            ]}
           ]}
         ]},
         {"canShineCharge": {"usedTiles": 20, "gentleDownTiles": 2, "openEnd": 1}},
@@ -807,70 +810,11 @@
       "blueSuitChecked": true,
       "note": [
         "Kill the Fune. Crystal Flash or farm the top fireflea. After the shine charge,",
-        "use the spike pit for a pause abuse interrupt.",
+        "jump up to the first fune and take a fireball to interrupt.",
         "Note: farming more than the top fireflea while still in R-Mode will cause Samus to",
         "become difficult to see."
       ]
     },
-    {
-      "link": [2, 3],
-      "name": "R-Mode Spark Interrupt (Gain Blue Suit)",
-      "entranceCondition": {
-        "comeInWithRMode": {}
-      },
-      "requires": [
-        {"or": [
-          "canTrickyJump",
-          {"and": [
-            {"enemyKill": {"enemies": [["Fune"]]}},
-            "canCarefulJump"
-          ]},
-          {"enemyKill": {"enemies": [["Fune"], ["Boulder"], ["Fune"]]}},
-          "Ice",
-          {"and": [
-            "ScrewAttack",
-            {"or": [
-              "canCarefulJump",
-              "HiJump",
-              "SpaceJump",
-              {"enemyKill": {"enemies": [["Fune"]]}}
-            ]}
-          ]}
-        ]},
-        {"or": [
-          "h_CrystalFlashForReserveEnergy",
-          {"enemyKill": {"enemies": [["Fune"]]}},
-          "h_useSpringBall",
-          {"and": [
-            "h_useMorphBombs",
-            "canBombHorizontally",
-            {"or": ["Ice", "canCarefulJump"]}
-          ]}
-        ]},
-        {"or": [
-          {"resourceAvailable": [{"type": "ReserveEnergy", "count": 1}]},
-          {"and": [
-            "h_RModeCanRefillReserves",
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-            {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]}
-          ]}
-        ]},
-        {"canShineCharge": {"usedTiles": 21, "gentleDownTiles": 3, "gentleUpTiles": 3, "openEnd": 1}},
-        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
-        "canRModeSparkInterrupt"
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": [
-        "Farm firefleas before heading up, or you can Crystal Flash at any time. Unlike most rooms,",
-        "you can still use Power Bombs normally after Crystal Flash.",
-        "Leave the top Fune alive when you get to the top. Use the runway there to shinecharge,",
-        "then jump into the top Fune's fireball to interrupt."
-      ],
-      "devNote": [
-        "FIXME: Notable strat 'Morph Over The Fune' for getting over the secret fune (and then R-Jump to get out) isn't included."
-      ]
-    },
     {
       "id": 10,
       "link": [2, 3],