From abd3ecfd7b5962119141296396eedc9e873569c6 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Thu, 11 Dec 2025 22:50:57 -0700
Subject: [PATCH 1/2] Frog Speedway R-Mode Spark Interrupt

---
 region/norfair/east/Frog Speedway.json | 54 ++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/region/norfair/east/Frog Speedway.json b/region/norfair/east/Frog Speedway.json
index ed6179f31..04d3b2d90 100644
--- a/region/norfair/east/Frog Speedway.json	
+++ b/region/norfair/east/Frog Speedway.json	
@@ -173,6 +173,33 @@
         "The resetRoom requirement is in case you need to farm a bit to get above health-bomb energy."
       ]
     },
+    {
+      "link": [1, 1],
+      "name": "R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 30}}
+          ]}
+        ]},
+        "canStopOnADime",
+        "h_shinechargeMaxRunway",
+        {"autoReserveTrigger": {"maxReserveEnergy": 63}},
+        "canRModeSparkInterrupt"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Use Speed Booster break all of the blocks and farm all but one Beetom.",
+        "Carefully use the last Beetom to damage down, and then use it to interrupt."
+      ]
+    },
     {
       "id": 5,
       "link": [1, 1],
@@ -901,6 +928,33 @@
         "After 175 moonfalls, reposition the Beetom to chest height, then continue dancing."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 30}}
+          ]}
+        ]},
+        "canStopOnADime",
+        "h_shinechargeMaxRunway",
+        {"autoReserveTrigger": {"maxReserveEnergy": 63}},
+        "canRModeSparkInterrupt"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Use Speed Booster break all of the blocks and farm all but one Beetom.",
+        "Carefully use the last Beetom to damage down, and then use it to interrupt."
+      ]
+    },
     {
       "id": 35,
       "link": [2, 2],

From 160edda74c7595df97e458d0ce9d27821c32c854 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@users.noreply.github.com>
Date: Fri, 12 Dec 2025 23:07:18 -0700
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/norfair/east/Frog Speedway.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/region/norfair/east/Frog Speedway.json b/region/norfair/east/Frog Speedway.json
index 04d3b2d90..943697489 100644
--- a/region/norfair/east/Frog Speedway.json	
+++ b/region/norfair/east/Frog Speedway.json	
@@ -189,6 +189,7 @@
           ]}
         ]},
         "canStopOnADime",
+        "canEscapeEnemyGrab",
         "h_shinechargeMaxRunway",
         {"autoReserveTrigger": {"maxReserveEnergy": 63}},
         "canRModeSparkInterrupt"
@@ -944,6 +945,7 @@
           ]}
         ]},
         "canStopOnADime",
+        "canEscapeEnemyGrab",
         "h_shinechargeMaxRunway",
         {"autoReserveTrigger": {"maxReserveEnergy": 63}},
         "canRModeSparkInterrupt"