diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json
index 507d4ae906..3262ad4dc4 100644
--- a/region/lowernorfair/east/Ridley's Room.json	
+++ b/region/lowernorfair/east/Ridley's Room.json	
@@ -164,8 +164,22 @@
         {"enemyDamage": {"enemy": "Ridley", "type": "contact", "hits": 1}}
       ],
       "gModeRegainMobility": {},
+      "flashSuitChecked": true
+    },
+    {
+      "link": [1, 1],
+      "name": "G-Mode Setup - Get Hit By Ridley",
+      "requires": [
+        {"heatFrames": 500},
+        {"not": "f_DefeatedRidley"},
+        "canRiskPermanentLossOfAccess"
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
       "flashSuitChecked": true,
-      "devNote": "FIXME: Ridley could also be used to set up G-mode, but the chaos of the fight makes this difficult."
+      "note": "Get into position and Ridley will hit Samus shorly after starting to move.",
+      "devNote": "Not likely to be possible, as it requires canRiskPermanentLossOfAccess and Ridley alive with the door unlocked."
     },
     {
       "id": 26,
@@ -555,6 +569,41 @@
       "flashSuitChecked": true,
       "devNote": "FIXME: Ridley could also be used to set up G-mode, but the chaos of the fight makes this difficult."
     },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Get Hit By Ridley",
+      "requires": [
+        {"heatFrames": 900},
+        {"or": [
+          "canTrickyGMode",
+          {"heatFrames": 180}
+        ]},
+        "canInsaneJump",
+        {"or": [
+          "SpaceJump",
+          "canWalljump",
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]}
+        ]},
+        {"not": "f_DefeatedRidley"},
+        "canRiskPermanentLossOfAccess"
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "It is much more common for Ridley to hit Samus when Ridley is facing left.",
+        "One way to get Ridley to turn around is when it pogos on the right side of the room, stationary spin jump and break spin.",
+        "The fireballs can be tricky to deal with in the door frame, but can be done by dropping down and quickly wall jumping back up or by kagoing them."
+      ],
+      "devNote": [
+        "Not likely to be possible, as it requires canRiskPermanentLossOfAccess and Ridley alive with the door unlocked.",
+        "The extra heat frames are a leniency to account for randomness."
+      ]
+    },
     {
       "id": 6,
       "link": [2, 2],
diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json
index c6c3e9d6b6..67653d79e8 100644
--- a/region/maridia/inner-pink/Draygon's Room.json	
+++ b/region/maridia/inner-pink/Draygon's Room.json	
@@ -396,6 +396,30 @@
       "gModeRegainMobility": {},
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "G-Mode Setup - Get Hit By Draygon",
+      "requires": [
+        {"not": "f_DefeatedDraygon"},
+        "canRiskPermanentLossOfAccess",
+        {"or": [
+          "h_breakOneDraygonTurret",
+          {"and": [
+            "canTrickyDodgeEnemies",
+            "Gravity"
+          ]},
+          {"and": [
+            "canSuitlessMaridia",
+            "canTrickyGMode"
+          ]}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "devNote": "Not likely to be possible, as it requires canRiskPermanentLossOfAccess and Draygon alive with the door unlocked."
+    },
     {
       "id": 9,
       "link": [1, 1],
diff --git a/region/norfair/east/Green Bubbles Tunnel.json b/region/norfair/east/Green Bubbles Tunnel.json
index 9184c7a697..708a71e37f 100644
--- a/region/norfair/east/Green Bubbles Tunnel.json	
+++ b/region/norfair/east/Green Bubbles Tunnel.json	
@@ -369,6 +369,25 @@
       "collectsItems": [3],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Get Hit By Geruta",
+      "requires": [
+        {"heatFrames": 350}
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "collectsItems": [3],
+      "flashSuitChecked": true,
+      "note": [
+        "On entry, wait for the Geruta to swoop under the door runway, then spin jump up into the alcove on the ceiling above the end of the runway.",
+        "The Geruta will often swoop around the runway and be set up to hit Samus on the next swoop.",
+        "Other times it may swoop outwards instead; in this scenario, repeat the same movements for another attempt for it to swoop towards the door.",
+        "Because it deals a lot of damage, it is possible to enter with ~99 Energy and use the setup whether it swoops towards the door on a first or second attempt at manipulating it."
+      ],
+      "devNote": "Adding more heat frame leniency here won't really help because then if the Geruta gets into position quickly, Samus will have too much Energy to use for the setup."
+    },
     {
       "id": 11,
       "link": [2, 3],
diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json
index 5c08718f31..ca5672ef8a 100644
--- a/region/norfair/west/Crocomire Escape.json	
+++ b/region/norfair/west/Crocomire Escape.json	
@@ -677,6 +677,45 @@
         "Use the platform at the top-right of the room to gain temporary blue, then chain it through the door."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Setup - Get Hit By Geruta",
+      "requires": [
+        "h_heatProof",
+        "canBePatient",
+        {"or": [
+          {"and": [
+            "canInsaneJump",
+            "canTrickyUseFrozenEnemies"
+          ]},
+          {"enemyDamage": {"enemy": "Geruta", "type": "contact", "hits": 2}}
+        ]},
+        {"or": [
+          "canInsaneJump",
+          "canTrickyUseFrozenEnemies",
+          "Charge",
+          "Plasma",
+          "h_usePowerBomb",
+          {"ammo": {"type": "Missile", "count": 3}},
+          {"ammo": {"type": "Super", "count": 1}},
+          {"and": [
+            "ScrewAttack",
+            {"lavaFrames": 20}
+          ]}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "On room entry, perform a low spin jump onto the first ledge to avoid getting the Geruta to swoop to the right.",
+        "Jump against the left wall, then move right and the Geruta should come down quickly.",
+        "Move back and forth until it comes down further. This can be tricky if needing to avoid contact damage.",
+        "Quickly freezing the Geruta as it starts to come down can be used to avoid taking a hit.",
+        "Killing the Dragon on room entry can also be helpful."
+      ]
+    },
     {
       "id": 53,
       "link": [2, 2],