Update Remaining Old Room Names

helpers.json

@@ -52,7 +52,7 @@
             "In the original game, some items don't spawn until certain conditions are met.",
             "These may be unintuitive to players, so randomizers may want to instead spawn all items at all times, which can be done by removing the 'never' in this helper.",
             "Seven of the eight items in Wrecked Ship only spawn if Phantoon is defeated.",
-            "The item in missile in the Final Missile Room, and the Power Bomb in the Morph Ball Room only spawn if Zebes is awake.",
+            "The item in 230 Missile Room, and the Power Bomb in the Morph Ball Room only spawn if Zebes is awake.",
             "The item in the Pit Room only spawns if both Morph and Missiles have been collected.",
             "In addition, in the original game, Morph will no longer spawn if Zebes is awake; this bug is considered never valuable and the data lists it as always spawned regardless of this helper."
           ]
@@ -264,7 +264,7 @@
           "requires": [ "never" ],
           "devNote": [
             "In Vanilla, there is a bug placing the closing door at the top of the Etecoon Shaft in the wrong location.",
-            "Additionally, the top right door in both Pink Brinstar Power Bomb Room and Halfie Climb Room are immediately closed.",
+            "Additionally, the top right door in both Mission Impossible Room and Halfie Climb Room are immediately closed.",
             "This affects the closing animation and prevents return through the door while in direct G-mode.",
             "This also prevents getting doorstuck, although that doesn't seem to be important in any of these locations."
           ]

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -522,7 +522,7 @@
               "speedBooster": "any",
               "obstructions": [[1, 0]],
               "note": [
-                "This applies to Early Supers Room, Shaktool Room, Blue Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge."
+                "This applies to Early Supers Room, Shaktool Room, Tourian Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge."
               ],
               "detailNote": ["With this longer amount of runway, the jump has a 2-frame window."]
             },
@@ -533,7 +533,7 @@
               "speedBooster": "any",
               "obstructions": [[1, 0]],
               "note": [
-                "This applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, and Double Chamber."
+                "This applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, and Double Chamber."
               ]
             }
           ]

region/brinstar/pink/Pink Brinstar Wave Gate Room.json

@@ -1787,7 +1787,7 @@
               "requires": [
                 "canTrickyDashJump"
               ],
-              "note": ["This applies to Shaktool Room, Blue Hopper Room, and Bowling Alley (bottom)."],
+              "note": ["This applies to Shaktool Room, Tourian Hopper Room, and Bowling Alley (bottom)."],
               "detailNote": [
                 "This needs extra run speed $2.0 or $2.1,",
                 "being sure to maintain forward momentum while performing the mid-air jump to boost its height."
@@ -1811,7 +1811,7 @@
                 "canTrickyDashJump"
               ],
               "note": [
-                "This applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Fish Tank, Botwoon's Room, and Big Boy Room."
+                "This applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Fish Tank, Botwoon's Room, and Big Boy Room."
               ],
               "detailNote": [
                 "This needs extra run speed $2.0 or $2.1,",
@@ -2054,7 +2054,7 @@
       "requires": [
         "canTrickyGrappleJump"
       ],
-      "devNote": ["This appears not to be possible from Crateria Super Room?"]
+      "devNote": ["This appears not to be possible from Climb Supers Room?"]
     },
     {
       "id": 84,

region/brinstar/red/Caterpillar Room.json

@@ -1283,7 +1283,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"

region/brinstar/red/Skree Boost Room.json

@@ -38,7 +38,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Bat Room Skrees",
+      "groupName": "Skree Boost Skrees",
       "enemyName": "Skree",
       "quantity": 2,
       "homeNodes": [2]

region/crateria/central/230 Missile Room.json

@@ -31,7 +31,7 @@
       "nodeAddress": "0x78486",
       "locks": [
         {
-          "name": "Final Missile Spawn Lock",
+          "name": "230 Missile Spawn Lock",
           "lockType": "gameFlag",
           "unlockStrats": [
             {

region/crateria/central/Climb Supers Room.json

@@ -168,7 +168,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Crateria Supers Boyons",
+      "groupName": "Climb Supers Boyons",
       "enemyName": "Boyon",
       "quantity": 4,
       "homeNodes": [2]

region/crateria/central/Climb.json

@@ -84,7 +84,7 @@
       "doorEnvironments": [{"physics": "air"}],
       "locks": [
         {
-          "name": "Climb Top Right Gray Lock (to Crateria Supers Top)",
+          "name": "Climb Top Right Gray Lock (to Climb Supers Top)",
           "lockType": "permanent",
           "unlockStrats": [
             {
@@ -118,7 +118,7 @@
       "doorEnvironments": [{"physics": "air"}],
       "locks": [
         {
-          "name": "Climb Middle Right Escape Lock (to Crateria supers Bottom)",
+          "name": "Climb Middle Right Escape Lock (to Climb supers Bottom)",
           "lockType": "escapeFunnel",
           "lock": ["f_ZebesSetAblaze"],
           "unlockStrats": [

region/crateria/east/Pancakes and Wavers Room.json

@@ -38,14 +38,14 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Bowling Alley Path Wavers",
+      "groupName": "Pancakes and Wavers Wavers",
       "enemyName": "Waver",
       "quantity": 3,
       "homeNodes": [1, 2]
     },
     {
       "id": "e2",
-      "groupName": "Bowling Alley Path Choots",
+      "groupName": "Pancakes and Wavers Choots",
       "enemyName": "Choot",
       "quantity": 3,
       "homeNodes": [1]

region/crateria/east/West Ocean.json

@@ -395,9 +395,9 @@
           "devNote": [
             "It's possible to stop half-way by shooting open the door that appears to lead to Bowling Alley",
             "This has limited usefulness, because this door actually leads to the same transition as the bottom right door (to the Wrecked Ship Entrance).",
-            "Likewise the door on the left, which appears to lead to Bowling Alley Path, actually leads to the same transition as the bottom left door (to the Moat).",
+            "Likewise the door on the left, which appears to lead to Pancakes and Wavers Room, actually leads to the same transition as the bottom left door (to the Moat).",
             "There is a potential application by using this runway to the right, as it is longer than the one in front of the bottom right door.",
-            "FIXME: add nodes to represent the doors that appear to lead left and right to Bowling Alley Path and Bowling Alley, and add a similar strat leading there."
+            "FIXME: add nodes to represent the doors that appear to lead left and right to Pancakes and Wavers Room and Bowling Alley, and add a similar strat leading there."
           ]
         },
         {"id": 15},
@@ -3279,5 +3279,5 @@
   ],
   "nextStratId": 145,
   "nextNotableId": 14,
-  "note": "The section between Bowling Alley Path and Bowling Alley is excluded from West Ocean and considered as its own room instead (Homing Geemer Room)"
+  "note": "The section between Pancakes and Wavers Room and Bowling Alley is excluded from West Ocean and considered as its own room instead (Homing Geemer Room)"
 }

region/crateria/roomDiagrams.json

@@ -99,7 +99,7 @@
     "height": 6,
     "covers": [
       {
-        "name": "Bowling Alley Path/Homing Geemer Room",
+        "name": "Pancakes and Wavers Room/Homing Geemer Room",
         "origin": [3, 2],
         "width": 3
       }

region/lowernorfair/east/Fast Pillars Setup Room.json

@@ -933,7 +933,7 @@
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"}
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"}
           ]
         }
       },

region/lowernorfair/east/Ridley's Room.json

@@ -388,7 +388,7 @@
         "comeInWithGrappleSwing": {
           "blocks": [
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"

region/lowernorfair/roomDiagrams.json

@@ -86,7 +86,7 @@
     "height": 6,
     "covers": [
       {
-        "name": "LNorf Escape Power Bombs",
+        "name": "The Jail",
         "origin": [2, 0],
         "height": 2
       },

region/maridia/inner-green/Lonely Crab Room.json

@@ -59,7 +59,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "West Sand Hall Tunnel Sciser",
+      "groupName": "Lonely Crab Room Sciser",
       "enemyName": "Sciser",
       "quantity": 1,
       "homeNodes": [1, 2]

region/maridia/inner-green/Oasis.json

@@ -1339,7 +1339,7 @@
               "speedBooster": true,
               "obstructions": [[1, 0]],
               "note": [
-                "Applies to Early Super Room, Bowling Alley (Bottom), Blue Hopper Room, Dust Torizo Room, and Noob Bridge."
+                "Applies to Early Super Room, Bowling Alley (Bottom), Tourian Hopper Room, Dust Torizo Room, and Noob Bridge."
               ]
             },
             {
@@ -1352,7 +1352,7 @@
                 "canInsaneJump"
               ],
               "note": [
-                "Applies to Bowling Alley (Bottom), Blue Hopper Room, Dust Torizo Room, and Noob Bridge.",
+                "Applies to Bowling Alley (Bottom), Tourian Hopper Room, Dust Torizo Room, and Noob Bridge.",
                 "Without Speed Booster, this requires specific positioning to align Samus to just barely clear the door ledge."
               ]
             },
@@ -1363,7 +1363,7 @@
               "speedBooster": "any",
               "obstructions": [[1, 0]],
               "note": [
-                "Applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, Double Chamber."
+                "Applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, Double Chamber."
               ]
             },
             {
@@ -1373,7 +1373,7 @@
               "speedBooster": true,
               "obstructions": [[1, 0], [3, 2]],
               "note": [
-                "Applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, Double Chamber, and Metal Pirates Room.",
+                "Applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, Double Chamber, and Metal Pirates Room.",
                 "With extra run speed exactly $1.2, this works without collision oscillation.",
                 "Extra run speed up through $1.8 also work but with collision oscillation giving a 50% failure rate, as with most other setups."
               ]

region/maridia/inner-pink/Colosseum.json

@@ -1394,7 +1394,7 @@
                 "canTrickySpringBallJump",
                 "canTrickyJump"
               ],
-              "note": "Applies to Early Supers Room, Blue Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge"
+              "note": "Applies to Early Supers Room, Tourian Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge"
             },
             {
               "minHeight": 3,
@@ -1406,7 +1406,7 @@
                 "canTrickySpringBallJump",
                 "canTrickyJump"
               ],
-              "note": "Applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, and Double Chamber."
+              "note": "Applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, and Double Chamber."
             },
             {
               "minHeight": 3,

region/maridia/inner-pink/Crab Shaft.json

@@ -1037,7 +1037,7 @@
         "comeInWithGrappleSwing": {
           "blocks": [
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"

region/maridia/inner-pink/Draygon's Room.json

@@ -981,7 +981,7 @@
       "name": "Precise Grapple Jump",
       "entranceCondition": {
         "comeInWithGrappleSwing": {
-          "blocks": [{"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"}]
+          "blocks": [{"position": [6, 2], "note": "Lava Grapple Tunnel"}]
         }
       },
       "requires": [

region/maridia/inner-pink/East Cactus Alley.json

@@ -1149,7 +1149,7 @@
             },
             {
               "position": [9, 2],
-              "note": "Crateria Super Room, Bubble Mountain, Spiky Acid Snakes Tunnel"
+              "note": "Climb Supers Room, Bubble Mountain, Lava Grapple Tunnel"
             }
           ]
         }

region/maridia/inner-pink/The Precious Room.json

@@ -717,7 +717,7 @@
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"

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

@@ -96,7 +96,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "West Sand Hole Boulders",
+      "groupName": "West Sand Pit Boulders",
       "enemyName": "Boulder",
       "quantity": 2,
       "homeNodes": [7]

region/maridia/inner-yellow/Kassiuz Room.json

@@ -414,7 +414,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
@@ -445,7 +445,7 @@
           "blocks": [
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"

region/maridia/inner-yellow/Maridia Elevator Room.json

@@ -626,7 +626,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"

region/maridia/inner-yellow/Maridia Swiss Cheese Room.json

@@ -59,28 +59,28 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Maridia Bug Room Left Owtches",
+      "groupName": "Maridia Swiss Cheese Room Left Owtches",
       "enemyName": "Owtch",
       "quantity": 4,
       "homeNodes": [1]
     },
     {
       "id": "e2",
-      "groupName": "Maridia Bug Room Left Menus",
+      "groupName": "Maridia Swiss Cheese Room Left Menus",
       "enemyName": "Menu",
       "quantity": 3,
       "homeNodes": [1]
     },
     {
       "id": "e3",
-      "groupName": "Maridia Bug Room Right Owtches",
+      "groupName": "Maridia Swiss Cheese Room Right Owtches",
       "enemyName": "Owtch",
       "quantity": 3,
       "homeNodes": [2]
     },
     {
       "id": "e4",
-      "groupName": "Maridia Bug Room Right Menus",
+      "groupName": "Maridia Swiss Cheese Room Right Menus",
       "enemyName": "Menu",
       "quantity": 2,
       "homeNodes": [2]