Skip to content

Commit 42bfb97

Browse files
osse101osse101
authored
Merge pull request #2285 from blkerby/yellow-maridia-flash-suits
Yellow Maridia check flash suits
2 parents 53a6782 + 2968b68 commit 42bfb97

14 files changed

Lines changed: 720 additions & 296 deletions

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

Lines changed: 82 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@
116116
"length": 1,
117117
"openEnd": 1
118118
}
119-
}
119+
},
120+
"flashSuitChecked": true
120121
},
121122
{
122123
"id": 2,
@@ -135,6 +136,7 @@
135136
"openEnd": 0
136137
}
137138
},
139+
"flashSuitChecked": true,
138140
"note": [
139141
"Freeze the Zoa just a few pixels higher than it would be if Samus was standing next to the farm.",
140142
"Dodge and freeze the other Zoas, or tank a hit then kill them and don't collect their drops.",
@@ -158,6 +160,7 @@
158160
"obstruction": [1, 0]
159161
}
160162
},
163+
"flashSuitChecked": true,
161164
"devNote": "Max extra run speed $1.2"
162165
},
163166
{
@@ -182,7 +185,8 @@
182185
]}
183186
]}
184187
],
185-
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
188+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}],
189+
"flashSuitChecked": true
186190
},
187191
{
188192
"id": 36,
@@ -195,6 +199,7 @@
195199
"Wave",
196200
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 2}}
197201
],
202+
"flashSuitChecked": true,
198203
"bypassesDoorShell": true,
199204
"note": "Repeatedly freeze the Zoas to slowly push Samus into the wall and through the locked doorway.",
200205
"devNote": "The drops will keep Samus at high energy, but 2 hits enemy damage were added as a worst-case scenario where the next-to-last Zoa you kill doesn't give you energy."
@@ -228,7 +233,8 @@
228233
"Gravity",
229234
"HiJump"
230235
]}
231-
]
236+
],
237+
"flashSuitChecked": true
232238
},
233239
{
234240
"id": 8,
@@ -239,7 +245,12 @@
239245
"canUseFrozenEnemies",
240246
"canPlayInSand"
241247
],
242-
"note": "Use the frozen Zoas as a bridge. Falling will require Samus to use ice beam and a crouch jump to escape."
248+
"flashSuitChecked": true,
249+
"note": [
250+
"Use a frozen Zoa as a platform to cross the sand without falling in.",
251+
"If Samus does fall into the sand, it is possible to get out using a crouch jump,",
252+
"in which case it can help to stand on a Zoa frozen low at the bottom of the sand."
253+
]
243254
},
244255
{
245256
"id": 9,
@@ -250,6 +261,7 @@
250261
"canPlayInSand",
251262
"h_useMorphBombs"
252263
],
264+
"flashSuitChecked": true,
253265
"note": "It is relatively easy to get out of the sand by rapidly placing bombs."
254266
},
255267
{
@@ -266,6 +278,7 @@
266278
]},
267279
"canPlayInSand"
268280
],
281+
"flashSuitChecked": true,
269282
"note": [
270283
"Kill all the Zoas and don't pick up their drops. If the door is unlocked, stand in the doorframe and jump across the room.",
271284
"Otherwise, jump across the sand, starting 1.5 tiles away from the sandfall. Hold jump and forward the whole time. Samus will dip into the sand, but still make it to the other side."
@@ -278,11 +291,20 @@
278291
"requires": [
279292
"canEscapeSand"
280293
],
294+
"flashSuitChecked": true,
281295
"note": [
282296
"It is possible to get out of the sand with nothing.",
283-
"While holding down, crouch jump then press forward diagonal to clip into the wall enough to jump out."
297+
"Press against the wall, hold down, crouch jump while continuing to hold down,",
298+
"then down-grab immediately by rolling from down to diagonal down-forward."
299+
],
300+
"detailNote": [
301+
"Before crouching, either wait to get i-frames from a Zoa hit,",
302+
"or kill the Zoas and leave their drops uncollected somewhere out of the way."
284303
],
285-
"devNote": "This will never be in logic because there are easier ways to cross the room, but this can document a common way to escape the sand."
304+
"devNote": [
305+
"This strat is unimportant logically, since there are easier ways to cross the room,",
306+
"but in practice it is useful, so it is good for it to be documented here."
307+
]
286308
},
287309
{
288310
"id": 12,
@@ -293,7 +315,8 @@
293315
},
294316
"requires": [
295317
{"shinespark": {"frames": 22, "excessFrames": 11}}
296-
]
318+
],
319+
"flashSuitChecked": true
297320
},
298321
{
299322
"id": 13,
@@ -305,6 +328,7 @@
305328
"requires": [
306329
"canCrossRoomJumpIntoWater"
307330
],
331+
"flashSuitChecked": true,
308332
"note": [
309333
"Only requires a runway of approximately 0.5 tiles in the adjacent room.",
310334
"Bomb boost through the doorway and hold right."
@@ -396,7 +420,8 @@
396420
}
397421
},
398422
"requires": [],
399-
"bypassesDoorShell": true
423+
"bypassesDoorShell": true,
424+
"flashSuitChecked": true
400425
},
401426
{
402427
"id": 15,
@@ -413,7 +438,8 @@
413438
"blockPositions": [[12, 12]]
414439
}
415440
},
416-
"bypassesDoorShell": true
441+
"bypassesDoorShell": true,
442+
"flashSuitChecked": true
417443
},
418444
{
419445
"id": 16,
@@ -430,7 +456,8 @@
430456
"blockPositions": [[12, 13]]
431457
}
432458
},
433-
"bypassesDoorShell": true
459+
"bypassesDoorShell": true,
460+
"flashSuitChecked": true
434461
},
435462
{
436463
"id": 17,
@@ -441,7 +468,8 @@
441468
"Gravity",
442469
"HiJump"
443470
]}
444-
]
471+
],
472+
"flashSuitChecked": true
445473
},
446474
{
447475
"id": 19,
@@ -452,7 +480,12 @@
452480
"canUseFrozenEnemies",
453481
"canPlayInSand"
454482
],
455-
"note": "Use the frozen Zoas as a bridge. Falling will require Samus to use ice beam and a crouch jump to escape."
483+
"flashSuitChecked": true,
484+
"note": [
485+
"Use a frozen Zoa as a platform to cross the sand without falling in.",
486+
"If Samus does fall into the sand, it is possible to get out using a crouch jump,",
487+
"in which case it can help to stand on a Zoa frozen low at the bottom of the sand."
488+
]
456489
},
457490
{
458491
"id": 20,
@@ -463,6 +496,7 @@
463496
"h_useMorphBombs",
464497
"canPlayInSand"
465498
],
499+
"flashSuitChecked": true,
466500
"note": "It is relatively easy to get out of the sand with rapidly placing bombs."
467501
},
468502
{
@@ -479,6 +513,7 @@
479513
]},
480514
"canPlayInSand"
481515
],
516+
"flashSuitChecked": true,
482517
"note": [
483518
"Kill all the Zoas and don't pick up their drops. If the door is unlocked, stand in the doorframe and jump across the room.",
484519
"Otherwise, jump across the sand, starting 1.5 tiles away from the sandfall. Hold jump and forward the whole time. Samus will dip into the sand, but still make it to the other side."
@@ -491,11 +526,20 @@
491526
"requires": [
492527
"canEscapeSand"
493528
],
529+
"flashSuitChecked": true,
494530
"note": [
495531
"It is possible to get out of the sand with nothing.",
496-
"While holding down, crouch jump then press forward diagonal to clip into the wall enough to jump out."
532+
"Press against the wall, hold down, crouch jump while continuing to hold down,",
533+
"then down-grab immediately by rolling from down to diagonal down-forward."
534+
],
535+
"detailNote": [
536+
"Before crouching, either wait to get i-frames from a Zoa hit,",
537+
"or kill the Zoas and leave their drops uncollected somewhere out of the way."
497538
],
498-
"devNote": "This will never be in logic because there are easier ways to cross the room, but this can document a common way to escape the sand."
539+
"devNote": [
540+
"This strat is unimportant logically, since there are easier ways to cross the room,",
541+
"but in practice it is useful, so it is good for it to be documented here."
542+
]
499543
},
500544
{
501545
"id": 23,
@@ -506,7 +550,8 @@
506550
},
507551
"requires": [
508552
{"shinespark": {"frames": 22, "excessFrames": 11}}
509-
]
553+
],
554+
"flashSuitChecked": true
510555
},
511556
{
512557
"id": 24,
@@ -518,6 +563,7 @@
518563
"requires": [
519564
"canCrossRoomJumpIntoWater"
520565
],
566+
"flashSuitChecked": true,
521567
"note": [
522568
"Only requires a runway of approximately 0.5 tiles in the adjacent room.",
523569
"Bomb boost through the doorway and hold left."
@@ -609,7 +655,8 @@
609655
}
610656
},
611657
"requires": [],
612-
"bypassesDoorShell": true
658+
"bypassesDoorShell": true,
659+
"flashSuitChecked": true
613660
},
614661
{
615662
"id": 26,
@@ -626,7 +673,8 @@
626673
"blockPositions": [[3, 12]]
627674
}
628675
},
629-
"bypassesDoorShell": true
676+
"bypassesDoorShell": true,
677+
"flashSuitChecked": true
630678
},
631679
{
632680
"id": 27,
@@ -643,7 +691,8 @@
643691
"blockPositions": [[3, 13]]
644692
}
645693
},
646-
"bypassesDoorShell": true
694+
"bypassesDoorShell": true,
695+
"flashSuitChecked": true
647696
},
648697
{
649698
"id": 28,
@@ -655,7 +704,8 @@
655704
"length": 1,
656705
"openEnd": 1
657706
}
658-
}
707+
},
708+
"flashSuitChecked": true
659709
},
660710
{
661711
"id": 29,
@@ -674,6 +724,7 @@
674724
"openEnd": 0
675725
}
676726
},
727+
"flashSuitChecked": true,
677728
"note": [
678729
"Freeze the Zoa just a few pixels higher than it would be if Samus was standing next to the farm.",
679730
"Dodge and freeze the other Zoas, or tank a hit then kill them and don't collect their drops.",
@@ -697,6 +748,7 @@
697748
"obstruction": [1, 0]
698749
}
699750
},
751+
"flashSuitChecked": true,
700752
"devNote": "Max extra run speed $1.2"
701753
},
702754
{
@@ -721,7 +773,8 @@
721773
]}
722774
]}
723775
],
724-
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
776+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}],
777+
"flashSuitChecked": true
725778
},
726779
{
727780
"id": 47,
@@ -750,7 +803,8 @@
750803
]},
751804
{"cycleFrames": 130}
752805
],
753-
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
806+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}],
807+
"flashSuitChecked": true
754808
},
755809
{
756810
"id": 48,
@@ -768,7 +822,8 @@
768822
]},
769823
{"cycleFrames": 165}
770824
],
771-
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}]
825+
"farmCycleDrops": [{"enemy": "Zoa", "count": 3}],
826+
"flashSuitChecked": true
772827
},
773828
{
774829
"id": 31,
@@ -782,6 +837,7 @@
782837
{"enemyDamage": {"enemy": "Zoa", "type": "contact", "hits": 2}}
783838
],
784839
"bypassesDoorShell": true,
840+
"flashSuitChecked": true,
785841
"note": "Repeatedly freeze the Zoas to slowly push Samus into the wall and through the locked doorway.",
786842
"devNote": "The drops will keep Samus at high energy, but 2 hits enemy damage were added as a worst-case scenario where the next-to-last Zoa you kill doesn't give you energy."
787843
},
@@ -814,7 +870,8 @@
814870
"h_navigateUnderwater",
815871
"HiJump"
816872
]}
817-
]
873+
],
874+
"flashSuitChecked": true
818875
},
819876
{
820877
"id": 43,
@@ -851,7 +908,8 @@
851908
"h_navigateUnderwater",
852909
"HiJump"
853910
]}
854-
]
911+
],
912+
"flashSuitChecked": true
855913
},
856914
{
857915
"id": 44,

‎region/maridia/inner-yellow/Forgotten Highway Save Room.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"length": 3,
6262
"openEnd": 1
6363
}
64-
}
64+
},
65+
"flashSuitChecked": true
6566
},
6667
{
6768
"id": 2,
@@ -76,13 +77,15 @@
7677
"id": 3,
7778
"link": [1, 2],
7879
"name": "Base",
79-
"requires": []
80+
"requires": [],
81+
"flashSuitChecked": true
8082
},
8183
{
8284
"id": 4,
8385
"link": [2, 1],
8486
"name": "Base",
85-
"requires": []
87+
"requires": [],
88+
"flashSuitChecked": true
8689
}
8790
],
8891
"notables": [],

0 commit comments

Comments
 (0)