From 5d607e4b9fa573210fc702016d0153ef15c2ee8a Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Mon, 25 Aug 2025 15:20:24 -0600
Subject: [PATCH 1/3] A couple more helpers for flash suits

---
 helpers.json                                   | 18 ++++++++++++++++++
 .../blue/Blue Brinstar Boulder Room.json       |  5 +----
 region/maridia/outer/Crab Hole.json            |  5 +----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/helpers.json b/helpers.json
index 083a325e6b..446de882ab 100644
--- a/helpers.json
+++ b/helpers.json
@@ -747,6 +747,24 @@
             "canTrickySpringBallJump"
           ]
         },
+        {
+          "name": "h_complexToCarryFlashSuit",
+          "requires": [
+            {"or": [
+              {"noFlashSuit": {}},
+              "canComplexCarryFlashSuit"
+            ]}
+          ]
+        },
+        {
+          "name": "h_trickyToCarryFlashSuit",
+          "requires": [
+            {"or": [
+              {"noFlashSuit": {}},
+              "canTrickyCarryFlashSuit"
+            ]}
+          ]
+        },
         {
           "name": "h_PlasmaHitbox",
           "requires": [
diff --git a/region/brinstar/blue/Blue Brinstar Boulder Room.json b/region/brinstar/blue/Blue Brinstar Boulder Room.json
index b305f99f25..768fce75ad 100644
--- a/region/brinstar/blue/Blue Brinstar Boulder Room.json	
+++ b/region/brinstar/blue/Blue Brinstar Boulder Room.json	
@@ -874,10 +874,7 @@
       "requires": [
         "canBombJumpWaterEscape",
         "canJumpIntoIBJ",
-        {"or": [
-          "canTrickyCarryFlashSuit",
-          {"noFlashSuit": {}}
-        ]}
+        "h_trickyToCarryFlashSuit"
       ],
       "flashSuitChecked": true,
       "note": "When the water is high, jump and place a Bomb on the descent just above the water, then very quickly crouch jump to hit the Bomb and IBJ.",
diff --git a/region/maridia/outer/Crab Hole.json b/region/maridia/outer/Crab Hole.json
index 7621a28088..167774b966 100644
--- a/region/maridia/outer/Crab Hole.json	
+++ b/region/maridia/outer/Crab Hole.json	
@@ -1391,10 +1391,7 @@
               "HiJump",
               "Gravity"
             ]},
-            {"or": [
-              {"noFlashSuit": {}},
-              "canTrickyCarryFlashSuit"
-            ]}
+            "h_trickyToCarryFlashSuit"
           ]}
         ]}
       ],

From 6e19bd9e09f4c6d02d4c6181416e65f96868b30a Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Mon, 25 Aug 2025 15:50:08 -0600
Subject: [PATCH 2/3] remove req from boulder bomb jump water escape

---
 region/brinstar/blue/Blue Brinstar Boulder Room.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/region/brinstar/blue/Blue Brinstar Boulder Room.json b/region/brinstar/blue/Blue Brinstar Boulder Room.json
index 768fce75ad..e064690b1b 100644
--- a/region/brinstar/blue/Blue Brinstar Boulder Room.json	
+++ b/region/brinstar/blue/Blue Brinstar Boulder Room.json	
@@ -873,8 +873,7 @@
       "name": "Bomb Boost Water Escape Into IBJ",
       "requires": [
         "canBombJumpWaterEscape",
-        "canJumpIntoIBJ",
-        "h_trickyToCarryFlashSuit"
+        "canJumpIntoIBJ"
       ],
       "flashSuitChecked": true,
       "note": "When the water is high, jump and place a Bomb on the descent just above the water, then very quickly crouch jump to hit the Bomb and IBJ.",

From 97c0cffd81cdd04c069fa2719f3e0f3af4f6bbf5 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Mon, 25 Aug 2025 21:31:14 -0600
Subject: [PATCH 3/3] fix syntax error from merge

---
 helpers.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helpers.json b/helpers.json
index 5665e3c1b1..ac3f4d7127 100644
--- a/helpers.json
+++ b/helpers.json
@@ -773,6 +773,7 @@
               {"noFlashSuit": {}},
               "canTrickyCarryFlashSuit"
             ]}
+          ]
         },
         {
           "name": "h_PlasmaHitbox",