From 7702c3f54d8ba78bf20ae38995cba32f46d3013a Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Tue, 19 Aug 2025 14:48:38 -0600
Subject: [PATCH 1/2] Refine Bubble Mountain top-left to top-right jumps

---
 region/norfair/east/Bubble Mountain.json | 36 ++++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
index c60a433f51..b605221b21 100644
--- a/region/norfair/east/Bubble Mountain.json	
+++ b/region/norfair/east/Bubble Mountain.json	
@@ -667,19 +667,33 @@
     {
       "id": 11,
       "link": [1, 7],
-      "name": "Open Door Full Runway Jump",
+      "name": "Jump Across",
       "requires": [
         {"doorUnlockedAtNode": 1},
+        "canTrickyJump",
+        "canCameraManip"
+      ],
+      "note": "Kill King Cac by scrolling the camera, before attempting the jump."
+    },
+    {
+      "link": [1, 7],
+      "name": "Speedy Jump Across",
+      "requires": [
+        "SpeedBooster",
+        "canCarefulJump",
         {"or": [
-          "canTrickyJump",
+          {"doorUnlockedAtNode": 1},
+          "canTrickyJump"
+        ]},
+        {"or": [
+          "canCameraManip",
           {"and": [
-            "SpeedBooster",
-            "canCarefulJump"
+            "canNeutralDamageBoost",
+            {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}}
           ]}
-        ]},
-        "canCameraManip"
+        ]}
       ],
-      "note": "Kill King Cac by scrolling the camera, before attempting the jump."
+      "note": "King Cac can be killed by scrolling the camera before jumping across."
     },
     {
       "id": 12,
@@ -687,12 +701,16 @@
       "name": "Airball",
       "requires": [
         "canLateralMidAirMorph",
-        "canTrickyJump",
+        {"or": [
+          "canTrickyJump",
+          {"doorUnlockedAtNode": 1}
+        ]},
         {"or": [
           "canCameraManip",
           {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}}
         ]}
-      ]
+      ],
+      "note": "King Cac can be killed by scrolling the camera before jumping across."
     },
     {
       "id": 13,

From 60aa2104f06d28c638145525a77dbef5122409da Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Wed, 20 Aug 2025 09:40:33 -0600
Subject: [PATCH 2/2] add wallJumpAvoid tag

---
 region/norfair/east/Bubble Mountain.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
index b605221b21..fec3e1e5ee 100644
--- a/region/norfair/east/Bubble Mountain.json	
+++ b/region/norfair/east/Bubble Mountain.json	
@@ -673,6 +673,7 @@
         "canTrickyJump",
         "canCameraManip"
       ],
+      "wallJumpAvoid": true,
       "note": "Kill King Cac by scrolling the camera, before attempting the jump."
     },
     {