Merge pull request #1692 from kjbranch/remove-room-name-notable

Remove Room Names From Notable Names

Author: blkerby

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

@@ -496,9 +496,9 @@
     {
       "id": 23,
       "link": [1, 3],
-      "name": "Blue Brinstar E-Tank Ceiling Damage Boost",
+      "name": "Ceiling Damage Boost",
       "requires": [
-        {"notable": "Blue Brinstar E-Tank Ceiling Damage Boost"},
+        {"notable": "Ceiling Damage Boost"},
         "h_ZebesIsAwake",
         "canNeutralDamageBoost",
         {"enemyDamage": {
@@ -559,9 +559,9 @@
     {
       "id": 27,
       "link": [1, 3],
-      "name": "Taco Tank in Blue Brinstar Energy Tank Room",
+      "name": "Taco Tank",
       "requires": [
-        {"notable": "Taco Tank in Blue Brinstar Energy Tank Room"},
+        {"notable": "Taco Tank"},
         "canCWJ",
         "canInsaneWalljump",
         "canStationarySpinJump"
@@ -614,7 +614,7 @@
         }
       },
       "requires": [
-        {"notable": "Blue Brinstar Energy Tank G-Mode Flashing Lights"},
+        {"notable": "G-Mode Flashing Lights"},
         {"or": [
           "h_ZebesNotAwake",
           "h_canArtificialMorphSpringBall",
@@ -688,7 +688,7 @@
         }
       },
       "requires": [
-        {"notable": "Blue Brinstar Energy Tank G-Mode Flashing Lights"},
+        {"notable": "G-Mode Flashing Lights"},
         {"or": [
           "h_ZebesNotAwake",
           "h_canArtificialMorphSpringBall",
@@ -860,9 +860,9 @@
     {
       "id": 45,
       "link": [4, 2],
-      "name": "Blue Brin E-Tank Return Through Crumble Blocks",
+      "name": "Return Through Crumble Blocks",
       "requires": [
-        {"notable": "Blue Brin E-Tank Return Through Crumble Blocks"},
+        {"notable": "Return Through Crumble Blocks"},
         "Morph",
         {"or": [
           "canConsecutiveWalljump",
@@ -1076,9 +1076,9 @@
     {
       "id": 55,
       "link": [4, 2],
-      "name": "Blue Brinstar Energy Tank Room - Geemer Ice Stuck XRay Climb",
+      "name": "Geemer Ice Stuck XRay Climb",
       "requires": [
-        {"notable": "Blue Brinstar Energy Tank Room - Geemer Ice Stuck XRay Climb"},
+        {"notable": "Geemer Ice Stuck XRay Climb"},
         "canWallIceClip",
         "canXRayClimb",
         "Grapple",
@@ -1208,15 +1208,15 @@
   "notables": [
     {
       "id": 1,
-      "name": "Blue Brinstar Energy Tank G-Mode Flashing Lights",
+      "name": "G-Mode Flashing Lights",
       "note": [
         "The eye scanners are particularly annoying while in g-mode. They scan Samus with bright flashing lights which remain for a further distance.",
         "This is notable so a player can disable having to enter these flashing lights. If disabled, Samus will only require being in g-mode in this room if Zebes is awake."
       ]
     },
     {
       "id": 2,
-      "name": "Blue Brinstar E-Tank Ceiling Damage Boost",
+      "name": "Ceiling Damage Boost",
       "note": [
         "Have Samus shoot the shot block revealing the item and then quickly get hit by an enemy at the peak of her jump in order to reach the item.",
         "No directional inputs should be held while getting hit by the enemy in order to have a neutral boost and reach the item.",
@@ -1226,17 +1226,17 @@
     },
     {
       "id": 3,
-      "name": "Taco Tank in Blue Brinstar Energy Tank Room",
+      "name": "Taco Tank",
       "note": "Triple frame perfect dashing stationary spinjump into delayed CWJ and precise hitbox manipulation."
     },
     {
       "id": 4,
-      "name": "Blue Brin E-Tank Return Through Crumble Blocks",
+      "name": "Return Through Crumble Blocks",
       "note": "The Crumble Block does not respawn, so it's possible to grab the items and go back up without breaking the Power Bomb blocks."
     },
     {
       "id": 5,
-      "name": "Blue Brinstar Energy Tank Room - Geemer Ice Stuck XRay Climb",
+      "name": "Geemer Ice Stuck XRay Climb",
       "note": [
         "Keep the two Geemers on screen while moving to the right side of the room.",
         "Freeze the second Geemer as it exits the Morph Tunnel, with the Crumble block.",

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

@@ -335,9 +335,9 @@
     {
       "id": 16,
       "link": [3, 4],
-      "name": "Brinstar Reserve Hole-in-One",
+      "name": "Hole-in-One",
       "requires": [
-        {"notable": "Brinstar Reserve Hole-in-One"},
+        {"notable": "Hole-in-One"},
         "Morph",
         "ScrewAttack",
         {"or": [
@@ -369,7 +369,7 @@
   "notables": [
     {
       "id": 1,
-      "name": "Brinstar Reserve Hole-in-One",
+      "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."

region/brinstar/green/Early Supers Room.json

@@ -233,9 +233,9 @@
     {
       "id": 6,
       "link": [1, 1],
-      "name": "Early Supers Leave With Spark To The Left",
+      "name": "Leave With Spark To The Left",
       "requires": [
-        {"notable": "Early Supers Leave With Spark To The Left"},
+        {"notable": "Leave With Spark To The Left"},
         {"obstaclesNotCleared": ["A"]},
         "h_canCrouchJumpDownGrab",
         {"canShineCharge": {
@@ -293,9 +293,9 @@
     {
       "id": 10,
       "link": [1, 2],
-      "name": "Early Supers Mockball",
+      "name": "Mockball",
       "requires": [
-        {"notable": "Early Supers Mockball"},
+        {"notable": "Mockball"},
         {"obstaclesNotCleared": ["A"]},
         "canMockball"
       ],
@@ -340,9 +340,9 @@
     {
       "id": 12,
       "link": [1, 2],
-      "name": "Early Supers Crouch Gate Clip Damage Boost",
+      "name": "Crouch Gate Clip Damage Boost",
       "requires": [
-        {"notable": "Early Supers Crouch Gate Clip Damage Boost"},
+        {"notable": "Crouch Gate Clip Damage Boost"},
         {"obstaclesNotCleared": ["A"]},
         "canCrouchGateClip",
         "canCameraManip",
@@ -943,7 +943,7 @@
   "notables": [
     {
       "id": 1,
-      "name": "Early Supers Leave With Spark To The Left",
+      "name": "Leave With Spark To The Left",
       "note": [
         "Gain a shinecharge on the long, lower platform in the screen above, then carry it left and down.",
         "Use crumble quick drops, land on the floor at the bottom, spin jump left into the doorway, and activate the spark.",
@@ -952,12 +952,12 @@
     },
     {
       "id": 2,
-      "name": "Early Supers Mockball",
+      "name": "Mockball",
       "note": "Mockball to roll over the crumble blocks without falling down, and under the gate before it closes."
     },
     {
       "id": 3,
-      "name": "Early Supers Crouch Gate Clip Damage Boost",
+      "name": "Crouch Gate Clip Damage Boost",
       "note": [
         "Spawn a Zeb then run and do a very small spin jump to clip into the first gate before the Zeb reaches you.",
         "Do a damage boost off of the Zeb while inside the first gate to get enough speed to clip into the next gate.",

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

@@ -774,9 +774,9 @@
     {
       "id": 28,
       "link": [3, 2],
-      "name": "Etecoon E-Tank Beetom Clip",
+      "name": "Beetom Clip",
       "requires": [
-        {"notable": "Etecoon E-Tank Beetom Clip"},
+        {"notable": "Beetom Clip"},
         {"or": [
           "h_canXRayMorphIceClip",
           "h_canPreciseIceClip"
@@ -819,9 +819,9 @@
     {
       "id": 29,
       "link": [3, 2],
-      "name": "Etecoon E-Tank Beetom Clip (High Pixel, Preserve Flash Suit)",
+      "name": "Beetom Clip (High Pixel, Preserve Flash Suit)",
       "requires": [
-        {"notable": "Etecoon E-Tank Beetom Clip (High Pixel, Preserve Flash Suit)"},
+        {"notable": "Beetom Clip (High Pixel, Preserve Flash Suit)"},
         "h_canHighPixelIceClip",
         "Morph",
         {"enemyDamage": {
@@ -981,9 +981,9 @@
     {
       "id": 34,
       "link": [3, 6],
-      "name": "Etecoon Spikeway Tunnel Crawl (Left to Right)",
+      "name": "Spikeway Tunnel Crawl (Left to Right)",
       "requires": [
-        {"notable": "Etecoon Spikeway Tunnel Crawl"},
+        {"notable": "Spikeway Tunnel Crawl"},
         "canTunnelCrawl",
         "canTrickyJump",
         {"thornHits": 31}
@@ -1003,9 +1003,9 @@
     {
       "id": 35,
       "link": [3, 6],
-      "name": "Etecoon Spikeway Aim Cancel Wiggle",
+      "name": "Spikeway Aim Cancel Wiggle",
       "requires": [
-        {"notable": "Etecoon Spikeway Aim Cancel Wiggle"},
+        {"notable": "Spikeway Aim Cancel Wiggle"},
         "canTurnaroundAimCancel",
         "canBeVeryPatient",
         {"thornHits": 180}
@@ -1016,9 +1016,9 @@
     {
       "id": 36,
       "link": [3, 6],
-      "name": "Etecoon Spikeway Xray Wiggle (Left to Right)",
+      "name": "Spikeway X-Ray Wiggle (Left to Right)",
       "requires": [
-        {"notable": "Etecoon Spikeway Xray Wiggle"},
+        {"notable": "Spikeway X-Ray Wiggle"},
         "canXRayWaitForIFrames",
         "canXRayTurnaround",
         {"thornHits": 1}
@@ -1378,9 +1378,9 @@
     {
       "id": 57,
       "link": [4, 7],
-      "name": "Etecoon Beetom Tricky Dodge (Right to Left)",
+      "name": "Beetom Tricky Dodge (Right to Left)",
       "requires": [
-        {"notable": "Etecoon Beetom Tricky Dodge"},
+        {"notable": "Beetom Tricky Dodge"},
         "canTrickyJump"
       ],
       "clearsObstacles": ["A"],
@@ -1420,9 +1420,9 @@
     {
       "id": 61,
       "link": [6, 3],
-      "name": "Etecoon Spikeway Tunnel Crawl (Right to Left)",
+      "name": "Spikeway Tunnel Crawl (Right to Left)",
       "requires": [
-        {"notable": "Etecoon Spikeway Tunnel Crawl"},
+        {"notable": "Spikeway Tunnel Crawl"},
         "canTunnelCrawl",
         "canTrickyJump",
         {"thornHits": 31},
@@ -1443,9 +1443,9 @@
     {
       "id": 62,
       "link": [6, 3],
-      "name": "Etecoon Spikeway Xray Wiggle (Right to Left)",
+      "name": "Spikeway X-Ray Wiggle (Right to Left)",
       "requires": [
-        {"notable": "Etecoon Spikeway Xray Wiggle"},
+        {"notable": "Spikeway X-Ray Wiggle"},
         "canXRayWaitForIFrames",
         "canXRayTurnaround",
         {"thornHits": 1}
@@ -1596,9 +1596,9 @@
     {
       "id": 70,
       "link": [6, 7],
-      "name": "Etecoon Beetom Tricky Dodge (Left to Right)",
+      "name": "Beetom Tricky Dodge (Left to Right)",
       "requires": [
-        {"notable": "Etecoon Beetom Tricky Dodge"},
+        {"notable": "Beetom Tricky Dodge"},
         "canTrickyJump",
         {"obstaclesNotCleared": ["B"]}
       ],
@@ -1637,31 +1637,31 @@
   "notables": [
     {
       "id": 1,
-      "name": "Etecoon Beetom Tricky Dodge",
+      "name": "Beetom Tricky Dodge",
       "note": [
         "Patiently and carefully lure the Beetoms to get them stuck under the platforms. Afterwards, a farm can be used to gain energy.",
         "Then jump into the thorns to get invulnerability frames and run through, while luring the Beetoms under the platforms to use the farms."
       ]
     },
     {
       "id": 2,
-      "name": "Etecoon Spikeway Tunnel Crawl",
+      "name": "Spikeway Tunnel Crawl",
       "note": [
         "Perform a tunnel crawl through the Etecoon morph tunnel thorns. Perform one jump per thorn hit.",
         "Note that because of the thorn damage, getting into the tunnel is a bit more tricky."
       ]
     },
     {
       "id": 3,
-      "name": "Etecoon Spikeway Xray Wiggle",
+      "name": "Spikeway X-Ray Wiggle",
       "note": [
         "Slowly move through the thorns by alternating between X-Ray turnarounds and normal turnarounds.",
         "Maintain IFrames by using X-Ray whenever a thorn would deal damage."
       ]
     },
     {
       "id": 4,
-      "name": "Etecoon E-Tank Beetom Clip",
+      "name": "Beetom Clip",
       "note": [
         "Jump and freeze the Beetom at a precise location in order to jump through the crumble blocks.",
         "The pixel window is larger and higher with Morph and an X-Ray Stand Up.",
@@ -1670,7 +1670,7 @@
     },
     {
       "id": 5,
-      "name": "Etecoon E-Tank Beetom Clip (High Pixel, Preserve Flash Suit)",
+      "name": "Beetom Clip (High Pixel, Preserve Flash Suit)",
       "note": [
         "Jump and freeze the Beetom at a pixel perfect location in order to jump through the crumble blocks.",
         "The pixel is nearly the highest possible position with HiJump disabled, from the left ledge.",
@@ -1681,7 +1681,7 @@
     },
     {
       "id": 6,
-      "name": "Etecoon Spikeway Aim Cancel Wiggle",
+      "name": "Spikeway Aim Cancel Wiggle",
       "note": "Wiggle through the thorns. It is a long wiggle with a lot of thorn hits."
     }
   ],

region/brinstar/green/Green Brinstar Beetom Room.json

@@ -118,9 +118,9 @@
     {
       "id": 4,
       "link": [1, 1],
-      "name": "Green Brinstar Beetom Room Frozen Beetom Bridge (Left Door)",
+      "name": "Frozen Beetom Bridge (Left Door)",
       "requires": [
-        {"notable": "Green Brinstar Beetom Room Frozen Beetom Bridge"},
+        {"notable": "Frozen Beetom Bridge"},
         "canTrickyJump",
         "h_canFrozenEnemyRunway",
         {"enemyDamage": {
@@ -994,9 +994,9 @@
     {
       "id": 44,
       "link": [2, 2],
-      "name": "Green Brinstar Beetom Room Frozen Beetom Bridge (Right Door)",
+      "name": "Frozen Beetom Bridge (Right Door)",
       "requires": [
-        {"notable": "Green Brinstar Beetom Room Frozen Beetom Bridge"},
+        {"notable": "Frozen Beetom Bridge"},
         "canTrickyJump",
         "h_canFrozenEnemyRunway",
         {"enemyDamage": {
@@ -1132,7 +1132,7 @@
   "notables": [
     {
       "id": 1,
-      "name": "Green Brinstar Beetom Room Frozen Beetom Bridge",
+      "name": "Frozen Beetom Bridge",
       "note": [
         "Stand in the pit and freeze the Beetoms by shooting up. Keep them all separated and equally spaced apart to maximize the length of the runway.",
         "Freeze the Beetoms that aren't currently in use to avoid them from attaching to Samus and stacking together."