From 1152107f89ff26c820ed13d35c2bd4b5e3f90d6c Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Wed, 23 Jul 2025 12:48:00 -0600
Subject: [PATCH] Refine Rising Tide speedball

---
 region/norfair/east/Rising Tide.json | 38 ++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/region/norfair/east/Rising Tide.json b/region/norfair/east/Rising Tide.json
index 0e592ae522..023af9145c 100644
--- a/region/norfair/east/Rising Tide.json	
+++ b/region/norfair/east/Rising Tide.json	
@@ -189,24 +189,42 @@
     {
       "id": 8,
       "link": [1, 2],
-      "name": "Speedball Roll Under",
+      "name": "Speedball Roll Under (Come in Getting Blue Speed)",
       "entranceCondition": {
-        "comeInSpeedballing": {
-          "runway": {
-            "length": 3,
-            "openEnd": 1
-          }
+        "comeInGettingBlueSpeed": {
+          "length": 3,
+          "openEnd": 1,
+          "minExtraRunSpeed": "$0.E",
+          "maxExtraRunSpeed": "$1.B"
         }
       },
       "requires": [
         "canSpeedball",
         "canSlowShortCharge",
+        {"heatFrames": 350}
+      ],
+      "note": "Jump between the first and second floating platforms, to speedball through the room.",
+      "devNote": ["Some heat frames are implicit in the entrance condition."]
+    },
+    {
+      "link": [1, 2],
+      "name": "Speedball Roll Under (Come in Blue Spinning)",
+      "entranceCondition": {
+        "comeInBlueSpinning": {
+          "unusableTiles": 3,
+          "minExtraRunSpeed": "$0.E",
+          "maxExtraRunSpeed": "$1.9"
+        }
+      },
+      "requires": [
+        "canSpeedball",
+        "canSlowShortCharge",
+        "canInsaneJump",
         {"heatFrames": 360}
       ],
-      "devNote": [
-        "FIXME: Coming in already in speedball wouldn't work here, so this isn't the right entrance condition.",
-        "After a new entrance condition is developed which can properly represent this, it should be switched to use it.",
-        "5 Unusable tiles."
+      "note": [
+        "Jump into the room with blue speed,",
+        "and fall between the door ledge and the first floating platform, to speedball through the room."
       ]
     },
     {