From b334272bb0439f6fcf70b7fb50192c48eb65915d Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 22 Apr 2026 23:05:19 +0900
Subject: [PATCH 01/25] some of the annoying g-mode setups.

from the https://github.com/vg-json-data/sm-json-data/isues/2240

https://videos.maprando.com/video/7581 [TE2] - top door

https://videos.maprando.com/video/6790 [Etecoons e-tank]

https://videos.maprando.com/video/8435 [warehouse kihunter]
---
 .../green/Etecoon Energy Tank Room.json       | 91 +++++++++++++++++++
 .../kraid/Warehouse Kihunter Room.json        | 12 +++
 .../tourian/main/Tourian Escape Room 2.json   | 13 +++
 3 files changed, 116 insertions(+)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index c9972104f..cf14e5555 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -338,6 +338,40 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "G-Mode Setup - Get Hit By Beetom",
+        "requires":[
+          {"notable": "Beetom Clip"},
+          {"noBlueSuit": {}},
+          {"or": [
+            "h_XRayMorphIceClip",
+            "h_preciseIceClip"
+          ]},
+          "Morph",
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}},
+          {"or": [
+            "h_preciseIceClip",
+            "canWalljump",
+            "HiJump",
+            "SpaceJump",
+            {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}}
+          ]},
+          {"or": [
+            "canCrumbleJump",
+            "canWalljump",
+            "HiJump",
+            "SpaceJump"
+          ]}
+        ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {
+          "knockback": false
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 8,
       "link": [1, 5],
@@ -588,6 +622,40 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+ {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Get Hit By Beetom",
+        "requires":[
+          {"notable": "Beetom Clip"},
+          {"noBlueSuit": {}},
+          {"or": [
+            "h_XRayMorphIceClip",
+            "h_preciseIceClip"
+          ]},
+          "Morph",
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}},
+          {"or": [
+            "h_preciseIceClip",
+            "canWalljump",
+            "HiJump",
+            "SpaceJump",
+            {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}}
+          ]},
+          {"or": [
+            "canCrumbleJump",
+            "canWalljump",
+            "HiJump",
+            "SpaceJump"
+          ]}
+        ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {
+          "knockback": false
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 16,
       "link": [2, 3],
@@ -1054,6 +1122,7 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+  
     {
       "id": 121,
       "link": [3, 3],
@@ -1122,6 +1191,28 @@
         "Alternatively, bring two Beetoms and stand on one while freezing the other at chest height.",
         "Freezing the lower one may be made easier or damageless by scrolling the camera when the Beetom is in the correct position and freezing it with a hero shot from the right."
       ]
+    },
+         {
+      "link": [3, 3],
+      "name": "Leave With Runway - Two Frozen Beetoms",
+      "requires": [
+        {"noBlueSuit": {}},
+        "Morph",
+        "h_frozenEnemyRunway",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
+      ],
+      "exitCondition": {
+        "leaveWithRunway": {
+          "length": 10,
+          "openEnd": 0
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Bring two Beetoms from the right of the spiky tunnel to the bottom left door.",
+        "It is possible to lure first beetom through the tunnel to not take any damage."
+      ]
     },
     {
       "id": 107,
diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json
index 39e7a53bf..433833a88 100644
--- a/region/brinstar/kraid/Warehouse Kihunter Room.json	
+++ b/region/brinstar/kraid/Warehouse Kihunter Room.json	
@@ -465,6 +465,18 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Get Hit By KiHunter",
+      "requires": [
+        {"enemyDamage": {"enemy": "KiHunter", "type": "contact", "hits": 1}}
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 48,
       "link": [2, 2],
diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index f3a551257..3bad01d76 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -209,6 +209,19 @@
       ],
       "devNote": "This is only for indirect G-Mode, because it is trivial while in direct, and would use a different strat."
     },
+    {
+      "link": [1, 1],
+      "name": "G-Mode Setup - Get Hit By Space Pirate",
+      "requires": [
+        "canUpwardGModeSetup",
+        "canTrickyUseFrozenEnemies"
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 6,
       "link": [1, 2],

From 44c358c9fd22d27e83cb114c89bd33e20439bb1e Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 22 Apr 2026 23:27:04 +0900
Subject: [PATCH 02/25] Update Warehouse Kihunter Room.json

---
 region/brinstar/kraid/Warehouse Kihunter Room.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json
index 433833a88..d48767732 100644
--- a/region/brinstar/kraid/Warehouse Kihunter Room.json	
+++ b/region/brinstar/kraid/Warehouse Kihunter Room.json	
@@ -469,7 +469,6 @@
       "link": [2, 2],
       "name": "G-Mode Setup - Get Hit By KiHunter",
       "requires": [
-        {"enemyDamage": {"enemy": "KiHunter", "type": "contact", "hits": 1}}
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}

From 5205ce071d838220bdfba39b9e1821c0efcf822c Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 23 Apr 2026 23:11:05 +0900
Subject: [PATCH 03/25] Update region/tourian/main/Tourian Escape Room 2.json

Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com>
---
 region/tourian/main/Tourian Escape Room 2.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 3bad01d76..0ab99a0f5 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -214,7 +214,8 @@
       "name": "G-Mode Setup - Get Hit By Space Pirate",
       "requires": [
         "canUpwardGModeSetup",
-        "canTrickyUseFrozenEnemies"
+        "canTrickyUseFrozenEnemies",
+        "canTrickyGMode"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}

From 8f852d3cdc6346d87c4176423c53e00179418c0f Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 23 Apr 2026 23:11:28 +0900
Subject: [PATCH 04/25] Update region/brinstar/green/Etecoon Energy Tank
 Room.json

Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com>
---
 region/brinstar/green/Etecoon Energy Tank Room.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index cf14e5555..d882a72fd 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -344,11 +344,8 @@
         "requires":[
           {"notable": "Beetom Clip"},
           {"noBlueSuit": {}},
-          {"or": [
-            "h_XRayMorphIceClip",
-            "h_preciseIceClip"
-          ]},
-          "Morph",
+          "h_XRayMorphIceClip",
+          "canComplexGMode",
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}},
           {"or": [
             "h_preciseIceClip",

From 220bb2eba3d3b255f850baf35e49fb0b07348b96 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 23 Apr 2026 23:11:44 +0900
Subject: [PATCH 05/25] Update region/tourian/main/Tourian Escape Room 2.json

Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com>
---
 region/tourian/main/Tourian Escape Room 2.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 0ab99a0f5..365d32d32 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -221,7 +221,20 @@
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": [
+        "Manipulate a Pirate to climb to the top of the room on the left side.",
+        "Freeze the pirate mid jump just below the doorframe.",
+        "Without Spring Ball, freeze the pirate low enough to where Samus can still spin jump onto it.",
+        "Land on the edge of it, X-Ray turnaround or crouch, then press forward when it is about to thaw to trigger the transition."
+      ],
+      "detailNote": [
+        "After jumping from right-to-left, Pirates will begin climbing up.",
+        "After jumping from left-to-right, Pirates will begin climbing down.",
+        "They will change direction when colliding with a block,",
+        "or at random (with 50% chance) after climbing a distance of about 5 tiles.",
+        "While climbing, they will fire a laser and jump across the room if the center vertical position of Samus and the Pirate differ by at most 32 pixels."
+      ]
     },
     {
       "id": 6,

From 8e84def41f21bc6e54db4d1434b82a34990eca10 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 23 Apr 2026 23:11:57 +0900
Subject: [PATCH 06/25] Update region/brinstar/green/Etecoon Energy Tank
 Room.json

Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com>
---
 region/brinstar/green/Etecoon Energy Tank Room.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index d882a72fd..0ec3cf715 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -367,7 +367,8 @@
         }
       },
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": "Ice clip with a Beetom attached to Samus to bring it up to the top of the room."
     },
     {
       "id": 8,

From c5685e914098fa18d458fb2c0e7e5556ad9272e5 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 23 Apr 2026 23:12:15 +0900
Subject: [PATCH 07/25] Update region/brinstar/green/Etecoon Energy Tank
 Room.json

Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com>
---
 region/brinstar/green/Etecoon Energy Tank Room.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 0ec3cf715..1fa6915cb 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -1196,7 +1196,7 @@
       "requires": [
         {"noBlueSuit": {}},
         "Morph",
-        "h_frozenEnemyRunway",
+        "h_trickyFrozenEnemyRunway",
         {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}
       ],
       "exitCondition": {

From 802f52b93cc0dfd6f9426c66cc72f75351af5dc7 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Thu, 23 Apr 2026 23:12:34 +0900
Subject: [PATCH 08/25] Update region/brinstar/green/Etecoon Energy Tank
 Room.json

Co-authored-by: kjbranch <61815121+kjbranch@users.noreply.github.com>
---
 region/brinstar/green/Etecoon Energy Tank Room.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 1fa6915cb..304a0d5f1 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -1201,7 +1201,7 @@
       ],
       "exitCondition": {
         "leaveWithRunway": {
-          "length": 10,
+          "length": 9,
           "openEnd": 0
         }
       },

From 691a44851b03173694c9cf28595153ce6e57dd7e Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 24 Apr 2026 00:04:57 +0900
Subject: [PATCH 09/25] update g-mode / moondance strats from top doors in
 etecoons etank

As per suggestion, created an obstacle for brining up a beetom that is required to be cleared to do the gmode/moondance strats.

The setup strat might need a little more refining? I put back both methods of clipping into it (removed when they were part of g-mode) as if using the strat as the basis for a Moondance you might not have X-Ray.

https://videos.maprando.com/video/10245
---
 .../green/Etecoon Energy Tank Room.json       | 173 +++++++++++++-----
 1 file changed, 130 insertions(+), 43 deletions(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 304a0d5f1..99ade5c84 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -117,6 +117,11 @@
       "id": "R-Mode",
       "name": "Entered with R-Mode",
       "obstacleType": "abstract"
+    },
+    {
+      "id": "C",
+      "name":"Beetom above the crumbles",
+      "obstacleType": "abstract"
     }
   ],
   "enemies": [
@@ -308,6 +313,47 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Leave with Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canMoondance",
+        "canCount",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing."
+    },
+    {
+      "link": [1, 1],
+      "name": "Leave with Extended Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canExtendedMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
+        "h_extendedMoondanceBeetomLeniency"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.",
+        "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing."
+      ]
+    },
     {
       "id": 118,
       "link": [1, 1],
@@ -342,24 +388,8 @@
       "link": [1, 1],
       "name": "G-Mode Setup - Get Hit By Beetom",
         "requires":[
-          {"notable": "Beetom Clip"},
-          {"noBlueSuit": {}},
-          "h_XRayMorphIceClip",
           "canComplexGMode",
-          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}},
-          {"or": [
-            "h_preciseIceClip",
-            "canWalljump",
-            "HiJump",
-            "SpaceJump",
-            {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}}
-          ]},
-          {"or": [
-            "canCrumbleJump",
-            "canWalljump",
-            "HiJump",
-            "SpaceJump"
-          ]}
+          {"obstaclesCleared": ["C"]}
         ],
       "exitCondition": {
         "leaveWithGModeSetup": {
@@ -367,8 +397,7 @@
         }
       },
       "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": "Ice clip with a Beetom attached to Samus to bring it up to the top of the room."
+      "blueSuitChecked": true
     },
     {
       "id": 8,
@@ -581,6 +610,47 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+{
+      "link": [2, 2],
+      "name": "Leave with Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canMoondance",
+        "canCount",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing."
+    },
+    {
+      "link": [2, 2],
+      "name": "Leave with Extended Moondance",
+      "requires": [
+        {"obstaclesCleared": ["C"]},
+        "canExtendedMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
+        "h_extendedMoondanceBeetomLeniency"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.",
+        "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing."
+      ]
+    },
     {
       "id": 15,
       "link": [2, 2],
@@ -620,31 +690,12 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
- {
+    {
       "link": [2, 2],
       "name": "G-Mode Setup - Get Hit By Beetom",
         "requires":[
-          {"notable": "Beetom Clip"},
-          {"noBlueSuit": {}},
-          {"or": [
-            "h_XRayMorphIceClip",
-            "h_preciseIceClip"
-          ]},
-          "Morph",
-          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}},
-          {"or": [
-            "h_preciseIceClip",
-            "canWalljump",
-            "HiJump",
-            "SpaceJump",
-            {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}}
-          ]},
-          {"or": [
-            "canCrumbleJump",
-            "canWalljump",
-            "HiJump",
-            "SpaceJump"
-          ]}
+          "canComplexGMode",
+          {"obstaclesCleared": ["C"]}
         ],
       "exitCondition": {
         "leaveWithGModeSetup": {
@@ -1019,10 +1070,46 @@
         "Two Beetom hits are assumed, but with failed attempts it could take more, possibly requiring leaving the Beetom and going back to the right to farm."
       ],
       "devNote": [
-        "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required.",
-        "FIXME: An ice clip would allow for Moondance strats at 1 and 2 using a second Beetom."
+        "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required."
       ]
     },
+    {
+      "link": [3, 2],
+      "name": "Bring a Beetom Through the Crumble Blocks",
+      "requires": [
+        {"obstaclesNotCleared": ["A"]},
+        {"notable": "Beetom Clip"},
+        {"noBlueSuit": {}},
+        {"or": [
+          "h_XRayMorphIceClip",
+          "h_preciseIceClip"
+        ]},
+        "Morph",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}},
+        {"or": [
+          "h_preciseIceClip",
+          "canWalljump",
+          "HiJump",
+          "SpaceJump",
+          {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
+        ]},
+        {"or": [
+          "canCrumbleJump",
+          "canWalljump",
+          "HiJump",
+          "SpaceJump"
+        ]}
+      ],
+      "clearsObstacles": ["C"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Bring two Beetoms through the morph tunnel, damage can be limited by carefully manipulating the Beetoms.",
+        "Freeze both and allow one to unfreeze and refreeze it in position to clip. Allow the second Beetom to unfreeze and latch onto Samus.",
+        "Perform the crumble block clip with the Beetom attached to bring it up to the top two doors."
+      ],
+      "devNote": "This strat is for bringing a Beetom above the crumble blocks in order to be used for a Moondance or G-Mode setup from either of the top two doors."
+    },
     {
       "id": 29,
       "link": [3, 2],

From 25a4377e346d0b8eeb29e2a708d1472c70b69c6c Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 24 Apr 2026 00:07:22 +0900
Subject: [PATCH 10/25] Update Etecoon Energy Tank Room.json

---
 region/brinstar/green/Etecoon Energy Tank Room.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 99ade5c84..877d50023 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -1562,7 +1562,7 @@
         ]}
       ],
       "clearsObstacles": ["A"],
-      "resetsObstacles": ["B", "R-Mode"],
+      "resetsObstacles": ["B", "R-Mode", "C"],
       "farmCycleDrops": [
         {"enemy": "Beetom", "count": 2},
         {"enemy": "Zebbo", "count": 1}
@@ -2310,7 +2310,7 @@
         ]}
       ],
       "clearsObstacles": ["A"],
-      "resetsObstacles": ["B", "R-Mode"],
+      "resetsObstacles": ["B", "R-Mode", "C"],
       "farmCycleDrops": [
         {"enemy": "Beetom", "count": 2},
         {"enemy": "Zebbo", "count": 2}

From d3bd019e4247b5ae6a346408545156a5082b7163 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 24 Apr 2026 00:54:42 +0900
Subject: [PATCH 11/25] Update Warehouse Kihunter Room.json

---
 region/brinstar/kraid/Warehouse Kihunter Room.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json
index d48767732..71bbfa41d 100644
--- a/region/brinstar/kraid/Warehouse Kihunter Room.json	
+++ b/region/brinstar/kraid/Warehouse Kihunter Room.json	
@@ -469,12 +469,19 @@
       "link": [2, 2],
       "name": "G-Mode Setup - Get Hit By KiHunter",
       "requires": [
+        {"enemyDamage": {"enemy": "KiHunter", "type": "contact", "hits": 1}},
+        "canComplexGMode"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": [
+        "Either run into the room or hold run during the transition. Quickly spinjump up into the tunnel to shoot the shotblocks before the KiHunter can swoop down.",
+        "Stand level with the tunnel and wait for the KiHunter to come down. Once it is in the tunnel, move to the wall to lure it down full.",
+        "Don't shoot the wings off it or it will spit projectiles at Samus. Instead take a contact hit when it is at the bottom and move towards to door to lure it along."
+      ]
     },
     {
       "id": 48,

From d7db77433c16c34f9c291fe30374a87c2919f844 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Fri, 24 Apr 2026 00:56:32 +0900
Subject: [PATCH 12/25] Update Warehouse Kihunter Room.json

---
 region/brinstar/kraid/Warehouse Kihunter Room.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json
index 71bbfa41d..c57dc974b 100644
--- a/region/brinstar/kraid/Warehouse Kihunter Room.json	
+++ b/region/brinstar/kraid/Warehouse Kihunter Room.json	
@@ -469,7 +469,7 @@
       "link": [2, 2],
       "name": "G-Mode Setup - Get Hit By KiHunter",
       "requires": [
-        {"enemyDamage": {"enemy": "KiHunter", "type": "contact", "hits": 1}},
+        {"enemyDamage": {"enemy": "Kihunter (green)", "type": "contact", "hits": 1}},
         "canComplexGMode"
       ],
       "exitCondition": {

From e720417be795248468e6dfff7643e03fe87c2456 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Sat, 25 Apr 2026 00:53:24 +0900
Subject: [PATCH 13/25] update description for vertical g-mode

https://videos.maprando.com/video/10250

I recorded the strat in Maprando too so there are no explosions and without music.

It would be in insane with the current tech on it, not sure if that is ok?
---
 region/tourian/main/Tourian Escape Room 2.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 365d32d32..970227247 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -224,16 +224,21 @@
       "blueSuitChecked": true,
       "note": [
         "Manipulate a Pirate to climb to the top of the room on the left side.",
-        "Freeze the pirate mid jump just below the doorframe.",
-        "Without Spring Ball, freeze the pirate low enough to where Samus can still spin jump onto it.",
-        "Land on the edge of it, X-Ray turnaround or crouch, then press forward when it is about to thaw to trigger the transition."
+        "This can be done by sticking close to the Pirate and watching it ascend or descend the wall.",
+        "If the Pirate starts to descend, move away, jump, dodge the laser and jump and observe its behaviour on the oppsiste wall",
+        "This can be repeated as many times as necessary to get it to climb to the top of the room",
+        "If using the vanilla theme a good visual cue is to have jump and freze the pirate as it is looking as Samus ready to fire,",
+        "If frozen correctly, the top claw will be  aligned with the lowest row of black horizontal lines at the top of the wall pipe.",
+        "Freeze the pirate again so it jumps across so it is partially in the door."
       ],
       "detailNote": [
         "After jumping from right-to-left, Pirates will begin climbing up.",
         "After jumping from left-to-right, Pirates will begin climbing down.",
         "They will change direction when colliding with a block,",
         "or at random (with 50% chance) after climbing a distance of about 5 tiles.",
-        "While climbing, they will fire a laser and jump across the room if the center vertical position of Samus and the Pirate differ by at most 32 pixels."
+        "While climbing, they will fire a laser and jump across the room if the center vertical position of Samus and the Pirate differ by at most 32 pixels.",
+        "Samus may need to be facing the pirate or facing away in order to take damage in the transition. Both directions can work",
+        "It depends on where the pirate is frozen and how close Samus is to the wall."
       ]
     },
     {

From 4f18687dec5daa43be20b1534c47f3a45207bc5a Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Sat, 25 Apr 2026 01:06:06 +0900
Subject: [PATCH 14/25] Update Pink Brinstar Wave Gate Room.json

add a note about suitlesss entry from an adjacent water room. (come in jumping gmode setup)
---
 region/brinstar/pink/Pink Brinstar Wave Gate Room.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json
index 9fc053f64..89972eae5 100644
--- a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json	
+++ b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json	
@@ -768,7 +768,9 @@
       "blueSuitChecked": true,
       "note": [
         "This is possible to do without taking a second hit:",
-        "Enter the room in a jump, then shoot down to open the door and land in the doorsill."
+        "Enter the room in a jump, then shoot down to open the door and land in the doorsill.",
+        "If the adjact room is water and Samus lacks Gravity suit, jumping high into the door and hold left before the transition,",
+        "Shoot the door open when Samus is near the top of the door and land back in the frame, let the Hopper bounce twice."
       ]
     },
     {

From 9b84c3fe52d67d8721a17a3b024323a803232f73 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Sun, 26 Apr 2026 01:12:50 +0900
Subject: [PATCH 15/25] Update region/tourian/main/Tourian Escape Room 2.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/tourian/main/Tourian Escape Room 2.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 970227247..24960940a 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -224,9 +224,7 @@
       "blueSuitChecked": true,
       "note": [
         "Manipulate a Pirate to climb to the top of the room on the left side.",
-        "This can be done by sticking close to the Pirate and watching it ascend or descend the wall.",
-        "If the Pirate starts to descend, move away, jump, dodge the laser and jump and observe its behaviour on the oppsiste wall",
-        "This can be repeated as many times as necessary to get it to climb to the top of the room",
+       "Pirates will typically climb up the left wall and down the right wall.",
         "If using the vanilla theme a good visual cue is to have jump and freze the pirate as it is looking as Samus ready to fire,",
         "If frozen correctly, the top claw will be  aligned with the lowest row of black horizontal lines at the top of the wall pipe.",
         "Freeze the pirate again so it jumps across so it is partially in the door."

From 06e8235c5efb7ceb97dd3fa26238dc97a138ea47 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Sun, 26 Apr 2026 01:13:10 +0900
Subject: [PATCH 16/25] Update region/tourian/main/Tourian Escape Room 2.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/tourian/main/Tourian Escape Room 2.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 24960940a..36620eb82 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -230,10 +230,7 @@
         "Freeze the pirate again so it jumps across so it is partially in the door."
       ],
       "detailNote": [
-        "After jumping from right-to-left, Pirates will begin climbing up.",
-        "After jumping from left-to-right, Pirates will begin climbing down.",
-        "They will change direction when colliding with a block,",
-        "or at random (with 50% chance) after climbing a distance of about 5 tiles.",
+        "They may (50% chance) change direction after climbing a distance of about 5 tiles.",
         "While climbing, they will fire a laser and jump across the room if the center vertical position of Samus and the Pirate differ by at most 32 pixels.",
         "Samus may need to be facing the pirate or facing away in order to take damage in the transition. Both directions can work",
         "It depends on where the pirate is frozen and how close Samus is to the wall."

From 1bef4d636e93e37e01fd76c85eda68275894bd01 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Sun, 26 Apr 2026 01:13:38 +0900
Subject: [PATCH 17/25] Update region/tourian/main/Tourian Escape Room 2.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/tourian/main/Tourian Escape Room 2.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 36620eb82..00c688d1f 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -231,7 +231,6 @@
       ],
       "detailNote": [
         "They may (50% chance) change direction after climbing a distance of about 5 tiles.",
-        "While climbing, they will fire a laser and jump across the room if the center vertical position of Samus and the Pirate differ by at most 32 pixels.",
         "Samus may need to be facing the pirate or facing away in order to take damage in the transition. Both directions can work",
         "It depends on where the pirate is frozen and how close Samus is to the wall."
       ]

From 2fa27448d2af0101eb5d35fa674d1e1e4092188c Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Sun, 26 Apr 2026 01:43:32 +0900
Subject: [PATCH 18/25] Update Etecoon Energy Tank Room.json

---
 .../green/Etecoon Energy Tank Room.json       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 877d50023..01feda49c 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -1050,14 +1050,14 @@
         {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
         {"or": [
           "h_preciseIceClip",
-          "canWalljump",
+          "canWallJump",
           "HiJump",
           "SpaceJump",
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
         ]},
         {"or": [
           "canCrumbleJump",
-          "canWalljump",
+          "canWallJump",
           "HiJump",
           "SpaceJump"
         ]}
@@ -1088,14 +1088,14 @@
         {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}},
         {"or": [
           "h_preciseIceClip",
-          "canWalljump",
+          "canWallJump",
           "HiJump",
           "SpaceJump",
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
         ]},
         {"or": [
           "canCrumbleJump",
-          "canWalljump",
+          "canWallJump",
           "HiJump",
           "SpaceJump"
         ]}
@@ -1121,7 +1121,7 @@
         "Morph",
         {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "HiJump",
           "SpaceJump",
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
@@ -1509,7 +1509,7 @@
         ]},
         {"ammo": {"type": "PowerBomb", "count": 2}},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "SpaceJump",
           {"and": [
             "HiJump",
@@ -1643,7 +1643,7 @@
         ]},
         {"ammo": {"type": "PowerBomb", "count": 2}},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "SpaceJump",
           {"and": [
             "HiJump",
@@ -2091,7 +2091,7 @@
         ]},
         {"ammo": {"type": "PowerBomb", "count": 2}},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "SpaceJump",
           {"and": [
             "HiJump",
@@ -2133,7 +2133,7 @@
         ]},
         {"ammo": {"type": "PowerBomb", "count": 2}},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "SpaceJump",
           {"and": [
             "HiJump",
@@ -2449,7 +2449,7 @@
             "Morph",
             {"or": [
               "HiJump",
-              "canWalljump"
+              "canWallJump"
             ]}
           ]}
         ]}
@@ -2485,7 +2485,7 @@
             "Morph",
             {"or": [
               "HiJump",
-              "canWalljump"
+              "canWallJump"
             ]}
           ]}
         ]}
@@ -2534,7 +2534,7 @@
         ]},
         {"ammo": {"type": "PowerBomb", "count": 2}},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "SpaceJump",
           {"and": [
             "HiJump",
@@ -2575,7 +2575,7 @@
         ]},
         {"ammo": {"type": "PowerBomb", "count": 2}},
         {"or": [
-          "canWalljump",
+          "canWallJump",
           "SpaceJump",
           {"and": [
             "HiJump",

From 4e16e1ca5c0ba5d4dbdc60cebd43ab71d276a3a8 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Mon, 27 Apr 2026 21:41:50 +0900
Subject: [PATCH 19/25] Update Tourian Escape Room 2.json

---
 region/tourian/main/Tourian Escape Room 2.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 00c688d1f..aa59d90bb 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -224,15 +224,15 @@
       "blueSuitChecked": true,
       "note": [
         "Manipulate a Pirate to climb to the top of the room on the left side.",
-       "Pirates will typically climb up the left wall and down the right wall.",
+        "Pirates will typically climb up the left wall and down the right wall.",
         "If using the vanilla theme a good visual cue is to have jump and freze the pirate as it is looking as Samus ready to fire,",
-        "If frozen correctly, the top claw will be  aligned with the lowest row of black horizontal lines at the top of the wall pipe.",
+        "If frozen correctly, the top claw will be aligned with the lowest row of black horizontal lines at the top of the wall pipe.",
         "Freeze the pirate again so it jumps across so it is partially in the door."
       ],
       "detailNote": [
         "They may (50% chance) change direction after climbing a distance of about 5 tiles.",
-        "Samus may need to be facing the pirate or facing away in order to take damage in the transition. Both directions can work",
-        "It depends on where the pirate is frozen and how close Samus is to the wall."
+        "Samus may need to be facing the pirate or facing away in order to take damage in the transition.",
+        "Both the left side of the door frame and the right side of the door frame work. However, the left side is easier to manipulate the Pirate"
       ]
     },
     {

From c706cbcdf90635f04e31ebd4af28e31608e92d53 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:45:44 +0900
Subject: [PATCH 20/25] Update region/brinstar/green/Etecoon Energy Tank
 Room.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/brinstar/green/Etecoon Energy Tank Room.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index 01feda49c..d795f12ed 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -1295,8 +1295,8 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Bring two Beetoms from the right of the spiky tunnel to the bottom left door.",
-        "It is possible to lure first beetom through the tunnel to not take any damage."
+        "An easy setup for this runway is to freeze one Beetom on the ground and then stand on it to freeze two other Beetoms at chest height.",
+        "It is possible to leave the Beetoms and refill using the Zebbos."
       ]
     },
     {

From eff77cf2bfbd34c6d8a631f15fa577cd4097c3ff Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:46:14 +0900
Subject: [PATCH 21/25] Update region/brinstar/kraid/Warehouse Kihunter
 Room.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/brinstar/kraid/Warehouse Kihunter Room.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json
index c57dc974b..6e4522446 100644
--- a/region/brinstar/kraid/Warehouse Kihunter Room.json	
+++ b/region/brinstar/kraid/Warehouse Kihunter Room.json	
@@ -470,6 +470,7 @@
       "name": "G-Mode Setup - Get Hit By KiHunter",
       "requires": [
         {"enemyDamage": {"enemy": "Kihunter (green)", "type": "contact", "hits": 1}},
+        {"noBlueSuit": {}},
         "canComplexGMode"
       ],
       "exitCondition": {

From 1e5ef2c099bdf2e5b322c55486e90d59e920e1b2 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:46:29 +0900
Subject: [PATCH 22/25] Update region/brinstar/kraid/Warehouse Kihunter
 Room.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/brinstar/kraid/Warehouse Kihunter Room.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json
index 6e4522446..edb12a7a3 100644
--- a/region/brinstar/kraid/Warehouse Kihunter Room.json	
+++ b/region/brinstar/kraid/Warehouse Kihunter Room.json	
@@ -479,7 +479,7 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Either run into the room or hold run during the transition. Quickly spinjump up into the tunnel to shoot the shotblocks before the KiHunter can swoop down.",
+        "Quickly spinjump up into the tunnel to shoot the shotblocks before the KiHunter can swoop down.",
         "Stand level with the tunnel and wait for the KiHunter to come down. Once it is in the tunnel, move to the wall to lure it down full.",
         "Don't shoot the wings off it or it will spit projectiles at Samus. Instead take a contact hit when it is at the bottom and move towards to door to lure it along."
       ]

From b5c0ba12dd918beba69e3c1edab70a069468354c Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:46:46 +0900
Subject: [PATCH 23/25] Update region/tourian/main/Tourian Escape Room 2.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/tourian/main/Tourian Escape Room 2.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index aa59d90bb..9e8d61039 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -223,11 +223,9 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Manipulate a Pirate to climb to the top of the room on the left side.",
         "Pirates will typically climb up the left wall and down the right wall.",
-        "If using the vanilla theme a good visual cue is to have jump and freze the pirate as it is looking as Samus ready to fire,",
-        "If frozen correctly, the top claw will be aligned with the lowest row of black horizontal lines at the top of the wall pipe.",
-        "Freeze the pirate again so it jumps across so it is partially in the door."
+        "Freeze the pirate as it jumps across so it is partially in the door.",
+        "This GMode setup is more easily performed on the left side."
       ],
       "detailNote": [
         "They may (50% chance) change direction after climbing a distance of about 5 tiles.",

From 875b46b1cfc43150c1dbe163816c9d19346e44a4 Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 29 Apr 2026 03:47:01 +0900
Subject: [PATCH 24/25] Update region/tourian/main/Tourian Escape Room 2.json

Co-authored-by: Michael McKenzie <mikemck101@gmail.com>
---
 region/tourian/main/Tourian Escape Room 2.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 9e8d61039..1b8ec2e6c 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -229,8 +229,7 @@
       ],
       "detailNote": [
         "They may (50% chance) change direction after climbing a distance of about 5 tiles.",
-        "Samus may need to be facing the pirate or facing away in order to take damage in the transition.",
-        "Both the left side of the door frame and the right side of the door frame work. However, the left side is easier to manipulate the Pirate"
+        "Samus may need to be facing the pirate or facing away in order to take damage in the transition."
       ]
     },
     {

From bfdf1202a05c3b333a9e81de0787fa38532a144c Mon Sep 17 00:00:00 2001
From: nn <53490794+nn357@users.noreply.github.com>
Date: Wed, 29 Apr 2026 17:13:35 +0900
Subject: [PATCH 25/25] Update Tourian Escape Room 2.json

---
 region/tourian/main/Tourian Escape Room 2.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json
index 6b7f11f55..5e50c3658 100644
--- a/region/tourian/main/Tourian Escape Room 2.json	
+++ b/region/tourian/main/Tourian Escape Room 2.json	
@@ -229,7 +229,7 @@
       ],
       "detailNote": [
         "They may (50% chance) change direction after climbing a distance of about 5 tiles.",
-        "Samus may need to be facing the pirate or facing away in order to take damage in the transition."
+        "Can randomly fail depending on the height the pirate is frozen and the direction Samus is facing."
       ]
     },
     {