Removing and refining lower-difficulty notables

Author: kjbranch

region/brinstar/green/Brinstar Reserve Tank Room.json

@@ -362,24 +362,17 @@
     {
       "id": 16,
       "link": [3, 4],
-      "name": "Hole-in-One",
+      "name": "Screw Attack, Tunnel Crawl",
       "requires": [
-        {"notable": "Hole-in-One"},
         "Morph",
         "ScrewAttack",
-        {"or": [
-          "canTunnelCrawl",
-          {"and": [
-            "canTwoTileSqueeze",
-            "canTrickyJump"
-          ]}
-        ]}
+        "canTunnelCrawl"
       ],
       "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
-        "A single very precise jump into the bomb blocks can break both sets of blocks with screw attack. Obtaining the item requires morph, so this strat has no soft lock risk.",
-        "Alternatively, tunnel crawl through to break both blocks with multiple, less precise jumps."
+        "Tunnel crawl with Screw Attack to break the bomb blocks.",
+        "With a very precise jump and aim down, it is possible to jump deep enough into where the first block was in order to only require a turnaround jump, but it's not easier."
       ]
     },
     {
@@ -392,16 +385,7 @@
       "flashSuitChecked": true
     }
   ],
-  "notables": [
-    {
-      "id": 1,
-      "name": "Hole-in-One",
-      "note": [
-        "A single very precise jump into the bomb blocks can break both sets of blocks with screw attack. Obtaining the item requires morph, so this strat has no soft lock risk.",
-        "Alternatively, tunnel crawl through to break both blocks with multiple, less precise jumps."
-      ]
-    }
-  ],
+  "notables": [],
   "nextStratId": 19,
   "nextNotableId": 2
 }

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -1363,7 +1363,7 @@
       "name": "Beetom Tricky Dodge (Right to Left)",
       "requires": [
         {"notable": "Beetom Tricky Dodge"},
-        "canTrickyJump"
+        "canTrickyDodgeEnemies"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
@@ -1555,7 +1555,7 @@
       "name": "Beetom Tricky Dodge (Left to Right)",
       "requires": [
         {"notable": "Beetom Tricky Dodge"},
-        "canTrickyJump",
+        "canTrickyDodgeEnemies",
         {"obstaclesNotCleared": ["B"]}
       ],
       "clearsObstacles": ["A"],

region/brinstar/kraid/Warehouse Kihunter Room.json

@@ -698,7 +698,6 @@
       "link": [5, 2],
       "name": "Bottom Spark Out",
       "requires": [
-        {"notable": "Bottom Spark Out"},
         "canShinechargeMovementComplex",
         {"obstaclesCleared": ["C"]},
         {"obstaclesNotCleared": ["D"]},
@@ -864,11 +863,6 @@
       "name": "Tunnel Charge",
       "note": "Generate a charge on the left side and carry it through the morph tunnel and out the right door."
     },
-    {
-      "id": 2,
-      "name": "Bottom Spark Out",
-      "note": "Charge a spark, then break the shot blocks, drop through, and spark out the bottom right door."
-    },
     {
       "id": 3,
       "name": "Bottom Leave Shinecharged",

region/brinstar/pink/Big Pink.json

@@ -2766,7 +2766,6 @@
       "link": [13, 7],
       "name": "Crystal Flash Standup - Super Block",
       "requires": [
-        {"notable": "Crystal Flash Standup - Super Block"},
         "h_canBombThings",
         "h_canCrystalFlash",
         {"ammo": {"type": "Super", "count": 1}}
@@ -3282,11 +3281,6 @@
         "Requires pixel precision, although there are several pixels that work. The camera must be fully scrolled to the right, which may require going far left and back."
       ]
     },
-    {
-      "id": 12,
-      "name": "Crystal Flash Standup - Super Block",
-      "note": "Crystal Flash in the morph tunnel to force a standup, making it possible to shoot the super block from the left while it's on-screen."
-    },
     {
       "id": 13,
       "name": "Wall Ice Clip X-Ray Climb",

region/brinstar/pink/Pink Brinstar Hopper Room.json

@@ -1308,6 +1308,7 @@
       "requires": [
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
@@ -1324,6 +1325,7 @@
         {"shineChargeFrames": 45},
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
@@ -1340,6 +1342,7 @@
       "requires": [
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"shinespark": {"frames": 15, "excessFrames": 6}}
       ],
       "clearsObstacles": ["B"],
@@ -1352,6 +1355,7 @@
       "requires": [
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
+        "canUseSpeedEchoes",
         {"useFlashSuit": {}},
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],

region/brinstar/red/Red Tower.json

@@ -2463,20 +2463,32 @@
     {
       "id": 113,
       "link": [9, 5],
-      "name": "Fast Climb with Space Jump",
+      "name": "Fast Climb with Space Jump, No Rippers",
       "requires": [
-        {"notable": "Climb with Space Jump"},
+        {"notable": "Fast Climb with Space Jump"},
         "SpaceJump",
         "canTrickyJump"
       ],
+      "wallJumpAvoid": true,
       "note": [
         "Climb the top of Red Tower with just Space Jump.",
-        "This can be done by dodging the Rippers and shooting the block as Samus is going upward, so she goes through the block as it breaks.",
-        "HiJump or killing the Rippers can help but are not required.",
-        "If the Rippers are killed, this can instead be done by shooting the block while falling right as it goes off screen,",
+        "This can be done by shooting the block as Samus is going upward, so she goes through the block as it breaks.",
+        "Alternatively, this can be done by shooting the block while falling right as it goes off screen,",
         "then using well-timed short space jumps to go up as rapidly as possible before the block respawns."
       ]
     },
+    {
+      "link": [9, 5],
+      "name": "Space Jump Climb Between the Rippers",
+      "requires": [
+        "canPreciseSpaceJump",
+        "canTrickyDodgeEnemies"
+      ],
+      "note": [
+        "Climb the top of Red Tower with just Space Jump.",
+        "This can be done by dodging the Rippers and shooting the block as Samus is going upward, so she goes through the block as it breaks."
+      ]
+    },
     {
       "id": 114,
       "link": [9, 5],
@@ -2732,12 +2744,12 @@
     },
     {
       "id": 9,
-      "name": "Climb with Space Jump",
+      "name": "Fast Climb with Space Jump",
+      "wallJumpAvoid": true,
       "note": [
         "Climb the top of Red Tower with just Space Jump.",
-        "This can be done by dodging the Rippers and shooting the block as Samus is going upward, so she goes through the block as it breaks.",
-        "HiJump or killing the Rippers can help but are not required.",
-        "If the Rippers are killed, this can instead be done by shooting the block while falling right as it goes off screen,",
+        "This can be done by shooting the block as Samus is going upward, so she goes through the block as it breaks.",
+        "Alternatively, this can be done by shooting the block while falling right as it goes off screen,",
         "then using well-timed short space jumps to go up as rapidly as possible before the block respawns."
       ]
     }

region/crateria/central/Landing Site.json

@@ -1172,9 +1172,8 @@
     {
       "id": 46,
       "link": [4, 1],
-      "name": "Blue Space Jump (Bottom)",
+      "name": "Blue Space Jump",
       "requires": [
-        {"notable": "Blue Space Jump (Bottom)"},
         "canBlueSpaceJump",
         "HiJump",
         {"getBlueSpeed": {"usedTiles": 38, "steepDownTiles": 3, "openEnd": 1}}
@@ -1859,14 +1858,6 @@
         "The jump can be set up by using the full runway with a one-tap shortcharge, with the tap being at the top of the lowest slope."
       ]
     },
-    {
-      "id": 4,
-      "name": "Blue Space Jump (Bottom)",
-      "note": [
-        "Starting near the right runway, run through the bomb block passage, then jump right after exiting.",
-        "Using HiJump and space jump, Samus is able to elevate enough to break through the bomb blocks blocking the Gauntlet entrance."
-      ]
-    },
     {
       "id": 5,
       "name": "Crystal Flash X-Ray Climb",

region/crateria/east/The Moat.json

@@ -243,7 +243,6 @@
         }
       },
       "requires": [
-        {"notable": "SpringBall Bounce"},
         "canSpringBallBounce",
         "canDisableEquipment",
         {"or": [
@@ -259,7 +258,6 @@
       "link": [1, 2],
       "name": "SpringBall Bounce, Open Doorway",
       "requires": [
-        {"notable": "SpringBall Bounce"},
         "canSpringBallBounce",
         "canDisableEquipment",
         {"doorUnlockedAtNode": 1},
@@ -1137,11 +1135,6 @@
     }
   ],
   "notables": [
-    {
-      "id": 1,
-      "name": "SpringBall Bounce",
-      "note": "From an open doorway or adjacent room, run, jump, lateral midair morph on the way down, then bounce off the pedestal to get to the other side."
-    },
     {
       "id": 2,
       "name": "Leave With Grapple Teleport",

region/crateria/west/Gauntlet Entrance.json

@@ -914,6 +914,7 @@
         {"obstaclesCleared": ["A"]},
         "canMidairShinespark",
         "canCameraManip",
+        "canTrickyDodgeEnemies",
         {"canShineCharge": {
           "usedTiles": 22,
           "steepUpTiles": 2,
@@ -929,9 +930,9 @@
         }
       },
       "note": [
-        "Jump towards the yapping maw before it is on screen so it moves up.",
+        "Jump towards the Yapping Maw before it is on screen so it moves up.",
         "Quickly move it off camera so it will be `frozen` in place.",
-        "Shortcharge like normal.  If the Yapping Maw is returning to its hole, it will usually not grab Samus."
+        "Shortcharge like normal. If the Yapping Maw is returning to its hole, it will usually not grab Samus."
       ]
     },
     {

region/lowernorfair/east/Lower Norfair Fireflea Room.json

@@ -898,11 +898,10 @@
     {
       "id": 37,
       "link": [4, 5],
-      "name": "Ice Bridge (Right to Left)",
+      "name": "Ice Bridge",
       "requires": [
-        {"notable": "Ice Bridge"},
         "canTrickyUseFrozenEnemies",
-        "canCarefulJump"
+        "canTrickyJump"
       ],
       "note": [
         "Avoid killing the Firefleas and instead freeze them as a way accross the spikes.",
@@ -938,11 +937,10 @@
     {
       "id": 41,
       "link": [5, 4],
-      "name": "Ice Bridge (Left to Right)",
+      "name": "Ice Bridge",
       "requires": [
-        {"notable": "Ice Bridge"},
         "canTrickyUseFrozenEnemies",
-        "canCarefulJump"
+        "canTrickyJump"
       ],
       "note": [
         "Avoid killing the Firefleas and instead freeze them as a way accross the spikes.",
@@ -1189,14 +1187,6 @@
     }
   ],
   "notables": [
-    {
-      "id": 1,
-      "name": "Ice Bridge",
-      "note": [
-        "Avoid killing the Firefleas and instead freeze them as a way accross the spikes.",
-        "It helps to freeze them low, closer to the spikes."
-      ]
-    },
     {
       "id": 2,
       "name": "G-Mode Morph Blind Top to Bottom",