diff --git a/region/maridia/inner-yellow/Butterfly Room.json b/region/maridia/inner-yellow/Butterfly Room.json index d6a2a6eb6..aa8d5adbd 100644 --- a/region/maridia/inner-yellow/Butterfly Room.json +++ b/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], diff --git a/region/wreckedship/main/Basement.json b/region/wreckedship/main/Basement.json index 978125cdc..6178b5b50 100644 --- a/region/wreckedship/main/Basement.json +++ b/region/wreckedship/main/Basement.json @@ -1421,6 +1421,7 @@ "f_DefeatedPhantoon", "h_shinechargeMaxRunway", "canShinechargeMovementComplex", + "Morph", {"obstaclesCleared": ["A"]}, {"shineChargeFrames": 130} ],