From 881b906ef3a6c6b3ea206a0c39f1286e8bb7d191 Mon Sep 17 00:00:00 2001 From: master ninja Date: Sat, 9 May 2026 16:46:51 +0200 Subject: [PATCH 1/6] add crouchjump shinespark to botwoon etank --- .../inner-pink/Botwoon Energy Tank Room.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index 5478da8e0..c37c4aff0 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -2662,6 +2662,21 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [4, 6], + "name": "Crouchjump Shinespark with Ledgegrab", + "entranceCondition": { + "comeInShinecharged": {} + }, + "requires": [ + {"shineChargeFrames": 49}, + "Morph", + "canHorizontalMidairShinespark", + {"shinespark": {"frames": 46, "excessFrames": 2}} + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 81, "link": [4, 6], From 5809882f1f6a3da5b1fed31f161791e967738511 Mon Sep 17 00:00:00 2001 From: master ninja Date: Sun, 10 May 2026 01:49:17 +0200 Subject: [PATCH 2/6] edit botwoon etank crouch spark ledgegrab --- .../inner-pink/Botwoon Energy Tank Room.json | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index c37c4aff0..f7f15b9d0 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -2669,13 +2669,27 @@ "comeInShinecharged": {} }, "requires": [ - {"shineChargeFrames": 49}, - "Morph", + "canSuitlessMaridia", "canHorizontalMidairShinespark", - {"shinespark": {"frames": 46, "excessFrames": 2}} + "canShinechargeMovementComplex", + "h_underwaterCrouchJumpDownGrab", + {"or": [ + {"and": [ + {"shineChargeFrames": 49}, + {"shinespark": {"frames": 46, "excessFrames": 2}} + ]}, + {"and": [ + {"shineChargeFrames": 167}, + {"shinespark": {"frames": 30, "excessFrames": 2}} + ]} + ]} ], "flashSuitChecked": true, - "blueSuitChecked": true + "blueSuitChecked": true, + "note": [ + "Do a crouchjump while keep holding down and horizontal spark on the highest point, with a little bit of lenience.", + "Samus will bonk the ledge (or stop very close to it); down-grab to get on top of it." + ] }, { "id": 81, From 90786e86968e99369cce0e7a3ed874772ec9c6e9 Mon Sep 17 00:00:00 2001 From: master ninja Date: Sun, 10 May 2026 16:00:13 +0200 Subject: [PATCH 3/6] edit2 botwoon etank crouch spark ledgegrab --- .../inner-pink/Botwoon Energy Tank Room.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index f7f15b9d0..dd6769d2d 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -2673,22 +2673,23 @@ "canHorizontalMidairShinespark", "canShinechargeMovementComplex", "h_underwaterCrouchJumpDownGrab", + {"shineChargeFrames": 55}, {"or": [ + {"shinespark": {"frames": 48, "excessFrames": 2}}, {"and": [ - {"shineChargeFrames": 49}, - {"shinespark": {"frames": 46, "excessFrames": 2}} - ]}, - {"and": [ - {"shineChargeFrames": 167}, - {"shinespark": {"frames": 30, "excessFrames": 2}} + "canShinechargeMovementTricky", + {"shinespark": {"frames": 43, "excessFrames": 2}} ]} ]} ], "flashSuitChecked": true, "blueSuitChecked": true, "note": [ - "Do a crouchjump while keep holding down and horizontal spark on the highest point, with a little bit of lenience.", - "Samus will bonk the ledge (or stop very close to it); down-grab to get on top of it." + "Crouch jump on entry and spark horizontally at the peak of the jump.", + "Samus will bonk on the corner of the ledge, but can down grab onto it.", + "In order to prevent sparking during the crouch jump, hold shot or aim down until Samus leaves the ground.", + "It is possible to move left during the jump to potentially save some health.", + "In that case, letting go of left while jump is still held will activate the spark." ] }, { From 043836ffa9a6e4376427b647a118dff26d4c0849 Mon Sep 17 00:00:00 2001 From: master ninja Date: Tue, 12 May 2026 14:25:10 +0200 Subject: [PATCH 4/6] edit3 botwoon etank crouch spark ledgegrab --- .../maridia/inner-pink/Botwoon Energy Tank Room.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index dd6769d2d..44ec2376f 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -2671,16 +2671,10 @@ "requires": [ "canSuitlessMaridia", "canHorizontalMidairShinespark", - "canShinechargeMovementComplex", + "canShinechargeMovementTricky", "h_underwaterCrouchJumpDownGrab", - {"shineChargeFrames": 55}, - {"or": [ - {"shinespark": {"frames": 48, "excessFrames": 2}}, - {"and": [ - "canShinechargeMovementTricky", - {"shinespark": {"frames": 43, "excessFrames": 2}} - ]} - ]} + {"shineChargeFrames": 45}, + {"shinespark": {"frames": 43, "excessFrames": 0}} ], "flashSuitChecked": true, "blueSuitChecked": true, From 8923cc2acdc386e5dafccb95b99b76124405d619 Mon Sep 17 00:00:00 2001 From: master ninja Date: Fri, 15 May 2026 15:16:36 +0200 Subject: [PATCH 5/6] edit4 botwoon etank crouch spark --- region/maridia/inner-pink/Botwoon Energy Tank Room.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index 44ec2376f..e7c226762 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -2664,7 +2664,7 @@ }, { "link": [4, 6], - "name": "Crouchjump Shinespark with Ledgegrab", + "name": "Come In Shinecharged, Crouchjump Shinespark", "entranceCondition": { "comeInShinecharged": {} }, @@ -2673,7 +2673,7 @@ "canHorizontalMidairShinespark", "canShinechargeMovementTricky", "h_underwaterCrouchJumpDownGrab", - {"shineChargeFrames": 45}, + {"shineChargeFrames": 60}, {"shinespark": {"frames": 43, "excessFrames": 0}} ], "flashSuitChecked": true, From 6375c522822079488adb6892ccb961f400e9ee19 Mon Sep 17 00:00:00 2001 From: Michael McKenzie Date: Fri, 15 May 2026 18:47:19 -0230 Subject: [PATCH 6/6] Update devnote --- region/maridia/inner-pink/Botwoon Energy Tank Room.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index e7c226762..2e075bb35 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -2684,6 +2684,9 @@ "In order to prevent sparking during the crouch jump, hold shot or aim down until Samus leaves the ground.", "It is possible to move left during the jump to potentially save some health.", "In that case, letting go of left while jump is still held will activate the spark." + ], + "devNote": [ + "10 leniency shineChargeFrames are added for the expected poor room entry." ] }, {