Merge pull request #2197 from kjbranch/g-n-east-2

Upper Norfair Heated G-mode: part 2

Author: osse101

region/norfair/east/Single Chamber.json

@@ -471,11 +471,9 @@
         }
       },
       "requires": [
+        "canTrickyDodgeEnemies",
         {"or": [
-          {"and": [
-            "h_artificialMorphBombHorizontally",
-            "canTrickyJump"
-          ]},
+          "h_artificialMorphBombHorizontally",
           "h_artificialMorphJumpIntoIBJ",
           {"and": [
             "h_artificialMorphIBJ",

region/norfair/east/Spiky Platforms Tunnel.json

@@ -286,7 +286,7 @@
       "note": "Morph and ride the Trippers.",
       "devNote": [
         "FIXME: It is possible to start a Diagonal IBJ from the sinking tripper, but it's very precise (3 frame window if Samus doesn't move).",
-        "One of these frames gives a normal IBJ, which shouldn't be expected (1 frame for the first Bomb, then 3 frames for the second)."
+        "Only one of these frames gives a normal IBJ, which shouldn't be expected (1 frame for the first Bomb, then 3 frames for the second)."
       ]
     },
     {