split and expand the spring ball strat

Author: kjbranch

region/maridia/outer/Main Street.json

@@ -3310,20 +3310,45 @@
     {
       "id": 130,
       "link": [8, 3],
-      "name": "Suitless Frozen Fish with Jump Assist",
+      "name": "Suitless Frozen Fish, HiJump",
       "requires": [
         "canSuitlessMaridia",
-        {"or": [
-          "HiJump",
-          "canTrickySpringBallJump"
-        ]},
+        "HiJump",
+        "canTrickyUseFrozenEnemies"
+      ],
+      "note": [
+        "Freeze the crab on the corner of the ledge and the fish near the wall but with enough space for Samus to fit through and jump up.",
+        "Alternatively, freeze the Sciser on the ground and the Skultera low, then crouch jump and down grab on the fish while rubbing into it to gain extra height.",
+        "With Supers, Samus can knock the Sciser off the wall and freeze it midair. Or freeze the Skultera near a wall and walljumping into it repeatedly."
+      ]
+    },
+    {
+      "link": [8, 3],
+      "name": "Suitless Frozen Fish with Spring Ball",
+      "requires": [
+        "canSuitlessMaridia",
+        "canTrickySpringBallJump",
+        "canTrickyUseFrozenEnemies",
+        {"ammo": {"type": "Super", "count": 1}}
+      ],
+      "note": [
+        "Use a Super to knock the crab off the wall and freeze it midair. It can help to jump before firing the beam to freeze it a bit higher.",
+        "Quickly freeze the fish and Spring Ball jump to get onto it.",
+        "Note that the fish does not move while off camera, so this may be used to help get the fish cycle in a good position."
+      ]
+    },
+    {
+      "link": [8, 3],
+      "name": "Suitless Frozen Fish with Spring Ball",
+      "requires": [
+        "canSuitlessMaridia",
+        "h_canMaxHeightSpringBallJump",
+        "canStationaryLateralMidAirMorph",
         "canTrickyUseFrozenEnemies"
       ],
       "note": [
-        "Freeze the crab on the corner of the ledge and the fish near the wall but with enough space for Samus to fit through and jump up using HiJump or a midair spring ball jump.",
-        "Possible backups include: knocking the Sciser off the wall and freezing it midair, ",
-        "or with HiJump: freezing the Skultera near a wall and walljumping into it repeatedly, ",
-        "or freezing the Sciser on the ground and crouch jumping up to the Skultera, rubbing into the frozen enemy to gain extra height before downgrabbing."
+        "Freeze the crab on the corner of the ledge and the fish near the wall but with enough space for Samus to fit through and jump up.",
+        "Perform a stationary lateral midair morph and press against the fish to get enough height to get onto it."
       ]
     },
     {

region/norfair/west/Hi Jump Energy Tank Room.json

@@ -733,7 +733,6 @@
         "canXRayStandUp",
         "ScrewAttack"
       ],
-      "collectsItems": [3],
       "flashSuitChecked": true,
       "note": "Roll under the right-most single tile ceiling, X-Ray standup, then turnaround spin jump to break the Bomb block."
     }