most of west maridia

Author: kjbranch

region/maridia/outer/Fish Tank.json

@@ -713,15 +713,6 @@
             "canJumpIntoIBJ",
             "canBombHorizontally"
           ]},
-          {"and": [
-            "HiJump",
-            "canTrickyDashJump"
-          ]},
-          {"and": [
-            "canUseFrozenEnemies",
-            "HiJump",
-            "SpeedBooster"
-          ]},
           "h_maxHeightSpringBallJump",
           {"and": [
             "HiJump",
@@ -738,6 +729,31 @@
         "canGravityJump"
       ]
     },
+    {
+      "link": [1, 5],
+      "name": "Jump to the Frozen Fish",
+      "requires": [
+        "Gravity",
+        "canUseFrozenEnemies",
+        "HiJump",
+        "SpeedBooster"
+      ]
+    },
+    {
+      "link": [1, 5],
+      "name": "Tricky Dash Jump",
+      "requires": [
+        "Gravity",
+        "HiJump",
+        "canTrickyDashJump",
+        "canDownGrab"
+      ],
+      "note": [
+        "Get a tricky dash jump running up the hill, then precisely down grab at the top.",
+        "It is best to start a few pixels away from the edge of the runway, so that Samus can jump at the correct frame and while being higher up the hill."
+      ],
+      "devNote": "A down grab is not strictly necessary, but it makes it much easier."
+    },
     {
       "id": 14,
       "link": [1, 5],
@@ -2304,6 +2320,33 @@
       "bypassesDoorShell": "free",
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 3],
+      "name": "Carry G-Mode Back Up, Bomb Into Spring Ball Jump",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "h_artificialMorphUnderwaterBombIntoSpringBallJump"
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": "free",
+      "flashSuitChecked": true,
+      "note": [
+        "Pause and jump just before the fade out finishes. Turn off Spring Ball and place a Bomb just above where Samus' head would be if standing.",
+        "Pause again between 23-25 frames later and equip Spring Ball; Samus has a three frame window where she has upward momentum from the Bomb and can jump again.",
+        "The positioning of the Bomb is quite lenient, with an 11 frame window for where it can be placed.",
+        "Unmorph at the top of the jump to touch the transition blocks."
+      ]
+    },
     {
       "id": 47,
       "link": [3, 7],
@@ -2374,7 +2417,8 @@
               ]},
               {"and": [
                 "HiJump",
-                "canTrickyDashJump"
+                "canTrickyDashJump",
+                "canDownGrab"
               ]},
               "h_maxHeightSpringBallJump",
               {"and": [