bug fixes

Author: kjbranch

region/maridia/inner-yellow/Watering Hole.json

@@ -243,7 +243,7 @@
           ]},
           {"and": [
             "h_canArtificialMorphPowerBomb",
-            {"and": [
+            {"or": [
               "canTrickyJump",
               "h_canArtificialMorphSpringBall",
               {"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
@@ -289,7 +289,7 @@
           ]},
           {"and": [
             "h_canArtificialMorphPowerBomb",
-            {"and": [
+            {"or": [
               "canTrickyJump",
               "h_canArtificialMorphSpringBall",
               {"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}

region/norfair/east/Lava Dive Room.json

@@ -455,7 +455,8 @@
         {"notable": "Artificial Morph, Triple Spring Ball Jump"},
         "h_canArtificialMorphDoubleSpringBallJump",
         "canInsaneJump",
-        {"gravitylessLavaFrames": 640}
+        {"gravitylessLavaFrames": 640},
+        {"heatFrames": 0}
       ],
       "flashSuitChecked": true,
       "note": [
@@ -1130,5 +1131,5 @@
     }
   ],
   "nextStratId": 45,
-  "nextNotableId": 9
+  "nextNotableId": 10
 }