Merge pull request #2853 from kjbranch/small-fixes

Fix a couple leave shinecharged strats

Author: osse101

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

@@ -337,31 +337,6 @@
         "Bomb boost through the doorway and hold right."
       ]
     },
-    {
-      "id": 37,
-      "link": [1, 2],
-      "name": "Come In Shinecharging, Leave Shinecharged (Gravity)",
-      "entranceCondition": {
-        "comeInShinecharging": {
-          "length": 0,
-          "openEnd": 1
-        }
-      },
-      "requires": [
-        "Gravity",
-        "canShinechargeMovementComplex",
-        {"shineChargeFrames": 110}
-      ],
-      "exitCondition": {
-        "leaveShinecharged": {}
-      },
-      "unlocksDoors": [
-        {"types": ["super"], "requires": []},
-        {"types": ["missiles", "powerbomb"], "requires": ["never"]}
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true
-    },
     {
       "id": 38,
       "link": [1, 2],
@@ -601,31 +576,6 @@
         "Bomb boost through the doorway and hold left."
       ]
     },
-    {
-      "id": 40,
-      "link": [2, 1],
-      "name": "Come In Shinecharging, Leave Shinecharged (Gravity)",
-      "entranceCondition": {
-        "comeInShinecharging": {
-          "length": 0,
-          "openEnd": 1
-        }
-      },
-      "requires": [
-        "Gravity",
-        "canShinechargeMovementComplex",
-        {"shineChargeFrames": 105}
-      ],
-      "exitCondition": {
-        "leaveShinecharged": {}
-      },
-      "unlocksDoors": [
-        {"types": ["super"], "requires": []},
-        {"types": ["missiles", "powerbomb"], "requires": ["never"]}
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true
-    },
     {
       "id": 41,
       "link": [2, 1],

region/wreckedship/main/Basement.json

@@ -1421,6 +1421,7 @@
         "f_DefeatedPhantoon",
         "h_shinechargeMaxRunway",
         "canShinechargeMovementComplex",
+        "Morph",
         {"obstaclesCleared": ["A"]},
         {"shineChargeFrames": 130}
       ],