Skip to content

Commit 53a6782

Browse files
authored
Merge pull request #2282 from blkerby/pink-maridia-flash-suits-2
Rest of Pink Maridia check flash suits
2 parents 77d44e8 + 0eb9e90 commit 53a6782

9 files changed

Lines changed: 514 additions & 257 deletions

region/maridia/inner-pink/East Sand Pit.json

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@
124124
"id": 2,
125125
"link": [1, 2],
126126
"name": "Base",
127-
"requires": []
127+
"requires": [],
128+
"flashSuitChecked": true
128129
},
129130
{
130131
"id": 3,
@@ -182,7 +183,8 @@
182183
]}
183184
]}
184185
]}
185-
]
186+
],
187+
"flashSuitChecked": true
186188
},
187189
{
188190
"id": 11,
@@ -220,6 +222,7 @@
220222
]}
221223
]}
222224
],
225+
"flashSuitChecked": true,
223226
"devNote": "FIXME: WallJump + canMidAirMorph is actually a canWallJumpInstantMorph."
224227
},
225228
{
@@ -231,7 +234,8 @@
231234
"canPlayInSand",
232235
"HiJump",
233236
"canSpringBallJumpMidAir"
234-
]
237+
],
238+
"flashSuitChecked": true
235239
},
236240
{
237241
"id": 13,
@@ -245,6 +249,7 @@
245249
]},
246250
"h_doubleSpringBallJumpWithHiJump"
247251
],
252+
"flashSuitChecked": true,
248253
"note": "Perform a double springball jump with the first jump being a bounce on the sand."
249254
},
250255
{
@@ -257,6 +262,7 @@
257262
"canPlayInSand",
258263
"canUnderwaterWalljump"
259264
],
265+
"flashSuitChecked": true,
260266
"note": "Jump off the sand and use Underwater Walljumps to enter the maze leading to the Power Bomb location."
261267
},
262268
{
@@ -284,6 +290,7 @@
284290
"canTrickySpringBallJump",
285291
"canTrickyJump"
286292
],
293+
"flashSuitChecked": true,
287294
"note": [
288295
"By using the sandfall physics, it is possible to Spring Ball jump to the Maridia Power Bomb location without Gravity or HiJump.",
289296
"This requires a very precise spinjump into the sandfall which also exits the sandfall, after being pushed down, with more height than a regular jump.",
@@ -496,7 +503,8 @@
496503
"name": "Base",
497504
"requires": [
498505
"Gravity"
499-
]
506+
],
507+
"flashSuitChecked": true
500508
},
501509
{
502510
"id": 6,
@@ -517,7 +525,8 @@
517525
"canSunkenTileWideWallClimb",
518526
"canSpringBallJumpMidAir"
519527
]}
520-
]
528+
],
529+
"flashSuitChecked": true
521530
},
522531
{
523532
"id": 8,
@@ -574,20 +583,12 @@
574583
"The easiest way to crouch jump without using the flash suit is to hold shot."
575584
]
576585
},
577-
{
578-
"id": 22,
579-
"link": [2, 2],
580-
"name": "Leave Normally",
581-
"requires": [],
582-
"exitCondition": {
583-
"leaveNormally": {}
584-
}
585-
},
586586
{
587587
"id": 23,
588588
"link": [3, 5],
589589
"name": "Base",
590-
"requires": []
590+
"requires": [],
591+
"flashSuitChecked": true
591592
},
592593
{
593594
"id": 35,
@@ -608,7 +609,8 @@
608609
"canPlayInSand"
609610
]}
610611
]}
611-
]
612+
],
613+
"flashSuitChecked": true
612614
},
613615
{
614616
"id": 24,
@@ -619,13 +621,15 @@
619621
],
620622
"devNote": [
621623
"This does not require a mid-air morph, and Samus can roll from the ledge above to get into the morph tunnel."
622-
]
624+
],
625+
"flashSuitChecked": true
623626
},
624627
{
625628
"id": 25,
626629
"link": [5, 1],
627630
"name": "Base",
628-
"requires": []
631+
"requires": [],
632+
"flashSuitChecked": true
629633
},
630634
{
631635
"id": 29,
@@ -636,7 +640,8 @@
636640
"Gravity",
637641
"canWalljump"
638642
]}
639-
]
643+
],
644+
"flashSuitChecked": true
640645
},
641646
{
642647
"id": 30,
@@ -646,7 +651,8 @@
646651
"canSuitlessMaridia",
647652
"h_useSpringBall",
648653
"canJumpIntoIBJ"
649-
]
654+
],
655+
"flashSuitChecked": true
650656
},
651657
{
652658
"id": 31,
@@ -659,7 +665,8 @@
659665
"HiJump",
660666
"can4HighMidAirMorph"
661667
]}
662-
]
668+
],
669+
"flashSuitChecked": true
663670
},
664671
{
665672
"id": 32,
@@ -668,7 +675,8 @@
668675
"requires": [
669676
"HiJump",
670677
"canSpaceJumpWaterEscape"
671-
]
678+
],
679+
"flashSuitChecked": true
672680
},
673681
{
674682
"id": 33,
@@ -679,7 +687,8 @@
679687
"h_underwaterCrouchJump",
680688
"canBombJumpWaterEscape",
681689
"canIBJ"
682-
]
690+
],
691+
"flashSuitChecked": true
683692
},
684693
{
685694
"id": 7,
@@ -692,6 +701,7 @@
692701
"canBombJumpWaterEscape"
693702
],
694703
"wallJumpAvoid": true,
704+
"flashSuitChecked": true,
695705
"note": [
696706
"Reach the left side item using a single bomb explosion barely reach it.",
697707
"Use HiJump to reach the water line and then use a Bomb Jump Water Escape motion to Bomb jump out of the water.",

0 commit comments

Comments
 (0)