miscellaneous grapple teleport updates

Author: blkerby

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

@@ -659,6 +659,23 @@
         "since you could just do a running jump through the door and airball."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Grapple Teleport Door Escape",
+      "entranceCondition": {
+        "comeInWithGrappleTeleport": {
+          "blockPositions": [[3, 12], [3, 13]]
+        }
+      },
+      "requires": [
+        {"or": [
+          "canGrappleTeleportWallEscape",
+          {"doorUnlockedAtNode": 1}
+        ]}
+      ],
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true
+    },
     {
       "id": 27,
       "link": [2, 1],

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

@@ -1961,7 +1961,7 @@
         "after just one pixel of Samus' feet are visible while crouching facing left, perform exactly 7 more X-Ray stand-ups.",
         "Use X-ray to face left, then run and jump to barely make it onto the ledge."
       ],
-      "devNote": ["3 pixels stuck in the door is X position 478 (0x1DE)."]
+      "devNote": ["3 pixels stuck in the door is X position $1DE."]
     },
     {
       "id": 65,
@@ -1987,9 +1987,9 @@
         "Use X-ray to face left, then run and jump to barely make it onto the ledge."
       ],
       "devNote": [
-        "9 pixels stuck in the door is X position 484 (0x1E4).",
-        "The correct Y positions for the jump are 193 (0xC1), 188 (0xBC), and 187 (0xBB)",
-        "FIXME: Some of the X position to the left (482, 483) could also work; maybe investigate which vertical positions work for them?"
+        "9 pixels stuck in the door is X position $1E4.",
+        "The correct Y positions for the jump are $C1, $BC, and $BB",
+        "FIXME: Some of the X position to the left ($1E2, $1E3) could also work; maybe investigate which vertical positions work for them?"
       ]
     },
     {

…ms/pink_PinkBrinstarPowerBombRoom_60.png …agrams/pink_MissionImpossibleRoom_60.pngregion/brinstar/roomDiagrams/pink_PinkBrinstarPowerBombRoom_60.png renamed to region/brinstar/roomDiagrams/pink_MissionImpossibleRoom_60.png region/brinstar/roomDiagrams/pink_PinkBrinstarPowerBombRoom_60.png renamed to region/brinstar/roomDiagrams/pink_MissionImpossibleRoom_60.png

@@ -195,7 +195,7 @@
         {"heatFrames": 180}
       ],
       "note": [
-        "In the previous room, avoid triggering the transition too deeply (position 238), otherwise Samus ends up stuck too far right in the wall.",
+        "In the previous room, avoid triggering the transition too deeply (position $EE), otherwise Samus ends up stuck too far right in the wall.",
         "After teleporting, Samus should be standing inside the wall.",
         "Wait a moment for the acid to lower, then retract Grapple by pressing up, which will pull Samus left and down.",
         "Hold left, and release Grapple while still holding left.",
@@ -502,7 +502,7 @@
       "id": 2,
       "name": "Grapple Teleport Inside Wall",
       "note": [
-        "In the previous room, avoid triggering the transition too deeply (position 238), otherwise Samus ends up stuck too far right in the wall.",
+        "In the previous room, avoid triggering the transition too deeply (position $EE), otherwise Samus ends up stuck too far right in the wall.",
         "After teleporting, Samus should be standing inside the wall.",
         "Wait a moment for the acid to lower, then retract Grapple by pressing up, which will pull Samus left and down.",
         "Hold left, and release Grapple while still holding left.",

region/lowernorfair/east/The Jail.json

@@ -450,8 +450,8 @@
         "If Samus needs to be standing in the next room (e.g. for an X-Ray climb), then be sure to touch the ground before reaching the transition;",
         "this can be done by timing the Grapple extension early enough,",
         "or, if enough energy is available, by doing a small bounce before going through the transition.",
-        "Samus can reach the transition at either horizontal position 20 or 21, depending on the specific timing and positioning of the swing.",
-        "Pressing diagonal up-left just before the transition (to retracting Grapple slightly) can help more consistently reach it at position 21."
+        "Samus can reach the transition at either horizontal position $14 or $15, depending on the specific timing and positioning of the swing.",
+        "Pressing diagonal up-left just before the transition (to retracting Grapple slightly) can help more consistently reach it at position $15."
       ],
       "devNote": [
         "FIXME: We could model the turret as an obstacle in case it was already broken for the Draygon fight.",
@@ -486,7 +486,7 @@
         "If Samus needs to be standing in the next room (e.g. for an X-Ray climb), then be sure to touch the ground before reaching the transition;",
         "this can be done by timing the Grapple extension early enough,",
         "or, if enough energy is available, by doing a small bounce before going through the transition.",
-        "If it is needed to enter far to the right (at horizontal position 21), this can be done by pressing up to retract Grapple just before the transition."
+        "If it is needed to enter far to the right (at horizontal position $15), this can be done by pressing up to retract Grapple just before the transition."
       ]
     },
     {
@@ -516,8 +516,8 @@
         "After the Grapple attachment, hold diagonally down-left to swing directly into the door and through the transition.",
         "Continue holding Grapple through the door transition to initiate a teleport in the next room.",
         "Samus should be able to stand in the next room (e.g. in case this is needed for an X-Ray climb).",
-        "Samus may trigger the transition at either horizontal position 20 or 21, depending on the specific timing and positioning of the swing.",
-        "To reliably trigger it at position 21, press diagonally up-left just before the transition to retract Grapple slightly."
+        "Samus may trigger the transition at either horizontal position $14 or $15, depending on the specific timing and positioning of the swing.",
+        "To reliably trigger it at position $15, press diagonally up-left just before the transition to retract Grapple slightly."
       ]
     },
     {
@@ -548,7 +548,7 @@
         "Swing down, and hold left while approaching the door to trigger the transition.",
         "Continue holding Grapple through the door transition to initiate a teleport in the next room.",
         "Samus should be able to stand in the next room (e.g. in case this is needed for an X-Ray climb).",
-        "Samus can reach the transition at either horizontal position 20 or 21, depending on the specific timing and positioning of the swing."
+        "Samus can reach the transition at either horizontal position $14 or $15, depending on the specific timing and positioning of the swing."
       ]
     },
     {
@@ -583,7 +583,7 @@
         "Swing down, and hold left while approaching the door to trigger the transition.",
         "Continue holding Grapple through the door transition to initiate a teleport in the next room.",
         "Samus should be able to stand in the next room (e.g. in case this is needed for an X-Ray climb).",
-        "Samus can reach the transition at horizontal position 20, or at positions 19 or 21 by pressing up at a specific time just before reaching the transition."
+        "Samus can reach the transition at horizontal position $14, or at positions $13 or $15 by pressing up at a specific time just before reaching the transition."
       ],
       "devNote": [
         "This is technically possible to do without a stationary lateral morph, but with much greater difficulty."