Merge pull request #2250 from kjbranch/lower-level-fixes

Bubble Mountain Frozen Waver Platforms

Author: osse101

region/norfair/east/Bubble Mountain.json

@@ -846,6 +846,17 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 1],
+      "name": "Frozen Waver, Normalized Room Entry",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canTrickyUseFrozenEnemies"
+      ],
+      "note": "Freeze the Wavers on entry, as their initial pattern makes climbing much easier."
+    },
     {
       "id": 18,
       "link": [2, 1],
@@ -1576,6 +1587,17 @@
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}]
     },
+    {
+      "link": [2, 7],
+      "name": "Frozen Waver, Normalized Room Entry",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canTrickyUseFrozenEnemies"
+      ],
+      "note": "Freeze the Wavers on entry, as their initial pattern makes climbing much easier."
+    },
     {
       "id": 38,
       "link": [2, 7],
@@ -4099,11 +4121,16 @@
       "requires": [
         "canUseFrozenEnemies",
         {"or": [
-          "canTrickyUseFrozenEnemies",
-          "canWalljump",
           "HiJump",
           "canSpringBallJumpMidAir",
-          "h_crouchJumpDownGrab"
+          {"and": [
+            "canWalljump",
+            "canTrickyUseFrozenEnemies"
+          ]},
+          {"and": [
+            "canTrickyJump",
+            "canTrickyUseFrozenEnemies"
+          ]}
         ]}
       ]
     },
@@ -4194,10 +4221,17 @@
       "name": "Frozen Waver",
       "requires": [
         "canUseFrozenEnemies",
+        "canCarefulJump",
         {"or": [
-          "canTrickyUseFrozenEnemies",
           "canWalljump",
-          "HiJump"
+          {"and": [
+            "canTrickyUseFrozenEnemies",
+            {"or": [
+              "canTrickyJump",
+              "HiJump",
+              "canSpringBallJumpMidAir"
+            ]}
+          ]}
         ]}
       ]
     },