Merge remote-tracking branch 'upstream/master' into x-mode-shinecharges

blkerby · blkerby · commit 4aeeca4761ee · 2025-07-08T12:45:33.000-06:00
diff --git a/region/brinstar/green/Green Brinstar Save Room.json b/region/brinstar/green/Green Brinstar Save Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 314,
-  "name": "Green Brinstar Main Shaft Save Room",
+  "name": "Green Brinstar Save Room",
   "area": "Brinstar",
   "subarea": "Green",
   "roomAddress": "0x7A201",
diff --git a/region/brinstar/pink/Mission Impossible Room.json b/region/brinstar/pink/Mission Impossible Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 60,
-  "name": "Pink Brinstar Power Bomb Room",
+  "name": "Mission Impossible Room",
   "area": "Brinstar",
   "subarea": "Pink",
   "roomAddress": "0x79E11",
diff --git a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 61,
-  "name": "Pink Brinstar Hopper Room",
+  "name": "Pink Brinstar Wave Gate Room",
   "area": "Brinstar",
   "subarea": "Pink",
   "roomAddress": "0x7A130",
diff --git a/region/brinstar/pink/Wave Gate Energy Tank Room.json b/region/brinstar/pink/Wave Gate Energy Tank Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 62,
-  "name": "Hopper Energy Tank Room",
+  "name": "Wave Gate Energy Tank Room",
   "area": "Brinstar",
   "subarea": "Pink",
   "roomAddress": "0x7A15B",
diff --git a/region/brinstar/red/Skree Boost Room.json b/region/brinstar/red/Skree Boost Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 69,
-  "name": "Bat Room",
+  "name": "Skree Boost Room",
   "area": "Brinstar",
   "subarea": "Red",
   "roomAddress": "0x7A3DD",
diff --git a/region/crateria/central/230 Missile Room.json b/region/crateria/central/230 Missile Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 17,
-  "name": "The Final Missile",
+  "name": "230 Missile Room",
   "area": "Crateria",
   "subarea": "Central",
   "roomAddress": "0x79A90",
diff --git a/region/crateria/central/Climb Supers Room.json b/region/crateria/central/Climb Supers Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 29,
-  "name": "Crateria Super Room",
+  "name": "Climb Supers Room",
   "area": "Crateria",
   "subarea": "Central",
   "roomAddress": "0x799F9",
diff --git a/region/crateria/east/Pancakes and Wavers Room.json b/region/crateria/east/Pancakes and Wavers Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 33,
-  "name": "Bowling Alley Path",
+  "name": "Pancakes and Wavers Room",
   "area": "Crateria",
   "subarea": "East",
   "roomAddress": "0x79461",
diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json
@@ -1176,6 +1176,26 @@
         "SpeedBooster"
       ]
     },
+    {
+      "link": [7, 6],
+      "name": "Shinespark",
+      "requires": [
+        {"canShineCharge": {
+          "usedTiles": 17,
+          "openEnd": 1,
+          "gentleUpTiles": 6,
+          "steepUpTiles": 1
+        }},
+        {"or": [
+          {"and": [
+            "canMidairShinespark",
+            "canShinechargeMovement",
+            {"shinespark": {"frames": 9, "excessFrames": 4}}
+          ]},
+          {"shinespark": {"frames": 21, "excessFrames": 4}}
+        ]}
+      ]
+    },
     {
       "id": 63,
       "link": [7, 6],
diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 146,
-  "name": "Lower Norfair Spring Ball Maze Room",
+  "name": "Lower Norfair Spring Ball Maze",
   "area": "Norfair",
   "subarea": "Lower",
   "subsubarea": "East",
diff --git a/region/lowernorfair/east/The Jail.json b/region/lowernorfair/east/The Jail.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 147,
-  "name": "Lower Norfair Escape Power Bomb Room",
+  "name": "The Jail",
   "area": "Norfair",
   "subarea": "Lower",
   "subsubarea": "East",
diff --git a/region/maridia/inner-green/Lonely Crab Room.json b/region/maridia/inner-green/Lonely Crab Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 202,
-  "name": "West Sand Hall Tunnel",
+  "name": "Lonely Crab Room",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Green",
diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 196,
-  "name": "East Cactus Alley Room",
+  "name": "East Cactus Alley",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-pink/East Sand Pit.json b/region/maridia/inner-pink/East Sand Pit.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 208,
-  "name": "East Sand Hole",
+  "name": "East Sand Pit",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-pink/West Cactus Alley.json b/region/maridia/inner-pink/West Cactus Alley.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 195,
-  "name": "West Cactus Alley Room",
+  "name": "West Cactus Alley",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 209,
-  "name": "West Sand Hole",
+  "name": "West Sand Pit",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 180,
-  "name": "Northwest Maridia Bug Room",
+  "name": "Maridia Swiss Cheese Room",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Yellow",
diff --git a/region/maridia/inner-yellow/The Beach.json b/region/maridia/inner-yellow/The Beach.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 179,
-  "name": "Pseudo Plasma Spark Room",
+  "name": "The Beach",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Yellow",
diff --git a/region/maridia/inner-yellow/Yoink Room.json b/region/maridia/inner-yellow/Yoink Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 211,
-  "name": "Bug Sand Hole",
+  "name": "Yoink Room",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Yellow",
diff --git a/region/maridia/outer/Crab Gate Room.json b/region/maridia/outer/Crab Gate Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 176,
-  "name": "Crab Tunnel",
+  "name": "Crab Gate Room",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7D08A",
diff --git a/region/maridia/outer/Maridia Tube Save Room.json b/region/maridia/outer/Maridia Tube Save Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 171,
-  "name": "Glass Tunnel Save Room",
+  "name": "Maridia Tube Save Room",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7CED2",
diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 170,
-  "name": "Glass Tunnel",
+  "name": "Maridia Tube",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7CEFB",
diff --git a/region/maridia/outer/West Maridia Tube Tunnel.json b/region/maridia/outer/West Maridia Tube Tunnel.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 169,
-  "name": "West Glass Tube Tunnel",
+  "name": "West Maridia Tube Tunnel",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7CF54",
diff --git a/region/norfair/crocomire/Cosine Room.json b/region/norfair/crocomire/Cosine Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 126,
-  "name": "Post Crocomire Missile Room",
+  "name": "Cosine Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "Crocomire",
diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 127,
-  "name": "Post Crocomire Jump Room",
+  "name": "Indiana Jones Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "Crocomire",
diff --git a/region/norfair/east/Green Bubbles Tunnel.json b/region/norfair/east/Green Bubbles Tunnel.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 98,
-  "name": "Green Bubbles Missile Room",
+  "name": "Green Bubbles Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/east/Lava Farm Tunnel.json b/region/norfair/east/Lava Farm Tunnel.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 119,
-  "name": "Acid Snakes Tunnel",
+  "name": "Lava Farm Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/east/Lava Grapple Tunnel.json b/region/norfair/east/Lava Grapple Tunnel.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 112,
-  "name": "Spiky Acid Snakes Tunnel",
+  "name": "Lava Grapple Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/west/Ice Beam Trippers Room.json b/region/norfair/west/Ice Beam Trippers Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 107,
-  "name": "Ice Beam Acid Room",
+  "name": "Ice Beam Trippers Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "West",
diff --git a/region/tourian/main/Tourian Hopper Room.json b/region/tourian/main/Tourian Hopper Room.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 230,
-  "name": "Blue Hopper Room",
+  "name": "Tourian Hopper Room",
   "area": "Tourian",
   "subarea": "Main",
   "roomAddress": "0x7DC19",
diff --git a/region/wreckedship/main/Robot Assembly Line.json b/region/wreckedship/main/Robot Assembly Line.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 168,
-  "name": "Assembly Line",
+  "name": "Robot Assembly Line",
   "area": "Wrecked Ship",
   "subarea": "Main",
   "roomAddress": "0x7CAAE",
diff --git a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 314,`
`4`		`- "name": "Green Brinstar Main Shaft Save Room",`
	`4`	`+ "name": "Green Brinstar Save Room",`
`5`	`5`	`"area": "Brinstar",`
`6`	`6`	`"subarea": "Green",`
`7`	`7`	`"roomAddress": "0x7A201",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 60,`
`4`		`- "name": "Pink Brinstar Power Bomb Room",`
	`4`	`+ "name": "Mission Impossible Room",`
`5`	`5`	`"area": "Brinstar",`
`6`	`6`	`"subarea": "Pink",`
`7`	`7`	`"roomAddress": "0x79E11",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 61,`
`4`		`- "name": "Pink Brinstar Hopper Room",`
	`4`	`+ "name": "Pink Brinstar Wave Gate Room",`
`5`	`5`	`"area": "Brinstar",`
`6`	`6`	`"subarea": "Pink",`
`7`	`7`	`"roomAddress": "0x7A130",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 62,`
`4`		`- "name": "Hopper Energy Tank Room",`
	`4`	`+ "name": "Wave Gate Energy Tank Room",`
`5`	`5`	`"area": "Brinstar",`
`6`	`6`	`"subarea": "Pink",`
`7`	`7`	`"roomAddress": "0x7A15B",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 69,`
`4`		`- "name": "Bat Room",`
	`4`	`+ "name": "Skree Boost Room",`
`5`	`5`	`"area": "Brinstar",`
`6`	`6`	`"subarea": "Red",`
`7`	`7`	`"roomAddress": "0x7A3DD",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 17,`
`4`		`- "name": "The Final Missile",`
	`4`	`+ "name": "230 Missile Room",`
`5`	`5`	`"area": "Crateria",`
`6`	`6`	`"subarea": "Central",`
`7`	`7`	`"roomAddress": "0x79A90",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 29,`
`4`		`- "name": "Crateria Super Room",`
	`4`	`+ "name": "Climb Supers Room",`
`5`	`5`	`"area": "Crateria",`
`6`	`6`	`"subarea": "Central",`
`7`	`7`	`"roomAddress": "0x799F9",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 33,`
`4`		`- "name": "Bowling Alley Path",`
	`4`	`+ "name": "Pancakes and Wavers Room",`
`5`	`5`	`"area": "Crateria",`
`6`	`6`	`"subarea": "East",`
`7`	`7`	`"roomAddress": "0x79461",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "../../../schema/m3-room.schema.json",`
`3`	`3`	`"id": 146,`
`4`		`- "name": "Lower Norfair Spring Ball Maze Room",`
	`4`	`+ "name": "Lower Norfair Spring Ball Maze",`
`5`	`5`	`"area": "Norfair",`
`6`	`6`	`"subarea": "Lower",`
`7`	`7`	`"subsubarea": "East",`