some edits

Author: kjbranch

region/maridia/inner-green/Oasis.json

@@ -543,7 +543,7 @@
     {
       "id": 18,
       "link": [1, 4],
-      "name": "Suitless Water Shinecharge, Diagonal Shinespark to the Top",
+      "name": "Suitless Stutter Water Shinecharge, Diagonal Shinespark to the Top",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
@@ -1046,7 +1046,7 @@
     {
       "id": 41,
       "link": [2, 4],
-      "name": "Suitless Water Shinecharge, Diagonal Shinespark to the Top",
+      "name": "Suitless Stutter Water Shinecharge, Diagonal Shinespark to the Top",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,

region/maridia/inner-pink/Crab Shaft.json

@@ -169,7 +169,7 @@
     {
       "id": 2,
       "link": [1, 1],
-      "name": "Suitless Water Shinecharge, Leave with Spark",
+      "name": "Suitless Stutter Water Shinecharge, Leave with Spark",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,

region/maridia/inner-yellow/Plasma Room.json

@@ -549,8 +549,9 @@
     {
       "id": 24,
       "link": [3, 1],
-      "name": "Speedjump",
+      "name": "Speedy HiJump Wall Jump",
       "requires": [
+        "canCarefulJump",
         "SpeedBooster",
         "HiJump",
         "canWalljump"

region/maridia/outer/Fish Tank.json

@@ -359,6 +359,17 @@
       ],
       "note": "Once high enough, it may be necessary to kill the fish and open the door."
     },
+    {
+      "link": [1, 4],
+      "name": "Gravity Jump",
+      "requires": [
+        "canGravityJump",
+        {"or": [
+          "HiJump",
+          "canCarefulJump"
+        ]}
+      ]
+    },
     {
       "id": 10,
       "link": [1, 4],
@@ -494,11 +505,17 @@
           {"and": [
             "HiJump",
             "canSpringBallJumpMidAir"
-          ]},
-          "canGravityJump"
+          ]}
         ]}
       ]
     },
+    {
+      "link": [1, 5],
+      "name": "Gravity Jump",
+      "requires": [
+        "canGravityJump"
+      ]
+    },
     {
       "id": 14,
       "link": [1, 5],
@@ -1962,11 +1979,10 @@
       "requires": [
         "Gravity",
         {"or": [
-          "canWalljump",
+          "canConsecutiveWalljump",
+          "canPreciseWalljump",
           "SpaceJump",
-          "canLongIBJ",
-          "canUseFrozenEnemies",
-          "canGravityJump"
+          "canUseFrozenEnemies"
         ]}
       ]
     },

region/maridia/outer/Main Street.json

@@ -3077,6 +3077,32 @@
       ],
       "devNote": "For other doors, a shinespark is more reasonable than a complex Temporary Blue Chain. And the enemies here are farmable for energy."
     },
+    {
+      "link": [4, 6],
+      "name": "Temporary Blue Chain, Suitless",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 5,
+          "openEnd": 0
+        }
+      },
+      "requires": [
+        "canSuitlessMaridia",
+        "canChainTemporaryBlue",
+        "canXRayTurnaround",
+        {"or": [
+          "HiJump",
+          "canSpringBallJumpMidAir"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Bring a Shinecharge from the top door to the speed blocks below the Missile item location.",
+        "Be especially mindfull of the aquatic life during the descent.",
+        "Line up directly below the speed blocks when jumping up."
+      ],
+      "devNote": "Without a stutter water shinecharge, it is expected that Samus enters the room already at pretty high speed."
+    },
     {
       "id": 108,
       "link": [4, 6],
@@ -3093,14 +3119,8 @@
         "canXRayTurnaround",
         {"or": [
           "Gravity",
-          {"and": [
-            "canSuitlessMaridia",
-            "HiJump"
-          ]},
-          {"and": [
-            "canSuitlessMaridia",
-            "canSpringBallJumpMidAir"
-          ]}
+          "HiJump",
+          "canSpringBallJumpMidAir"
         ]}
       ],
       "flashSuitChecked": true,

region/maridia/outer/Mt. Everest.json

@@ -4293,7 +4293,7 @@
     {
       "id": 184,
       "link": [9, 5],
-      "name": "Gravity TrickyDashJump",
+      "name": "First Frame Dash Jump with Wall Jump",
       "requires": [
         "Gravity",
         "canWalljump",

region/norfair/east/Bubble Mountain.json

@@ -1894,14 +1894,16 @@
       "id": 205,
       "link": [3, 3],
       "name": "G-Mode Setup - Get Hit By Waver",
-      "requires": [
-        "canBeExtremelyPatient"
-      ],
+      "requires": [],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "note": "It takes nearly 6 minutes for a Waver to come and hit Samus."
+      "note": [
+        "Lure the Waver from the right side of the room. It only moves while on camera.",
+        "Crouch next to the closed door and let the Waver pass just overhead twice before opening it and getting into position, in order to get hit by the third swoop.",
+        "Or open the door and use the Waver's second swoop, which is a bit tighter."
+      ]
     },
     {
       "id": 206,