Merge 'Increase y spawn coordinate of dead hand to avoid spawning out of bounds' (#2497)

Author: fenhl

ASM/build/asm_symbols.txt

@@ -91,6 +91,7 @@ room_t water_rooms[] = {
 
 room_t shadow_rooms[] = {
     {  0x37, 2, { -254, -63, 594 }, 32768, "Entrance"},
+    {  0x37, 4, { -2141, -63, -394 }, 49152, "Dead Hand"},
     {  0x37, 8, { 4164, -983, 1366 }, 49152, "Before huge room"},
     {  0x37, 16, { 4677, -1143, 2474 }, 32768, "Invisible scythes"},
     {  0x37, 10, { 1227, -1343, 3853 }, 49152, "Stone umbrella"},
@@ -110,6 +111,7 @@ room_t spirit_rooms[] = {
 
 room_t botw_rooms[] = {
     {  0x98, 0, { 0, -12, 117 }, 32768, "Main room Entrance"},
+    {  0x98, 4, { 991, -20, 207 }, 16384, "Dead Hand"},
     {  0x98, 2, { -1650, 0, -739 }, 49152, "Coffin room"},
     {  0x98, 3, { 1140, 0, -1339 }, 0, "Beamos room"},
 };
@@ -151,7 +153,7 @@ room_t ganon_rooms[] = {
 rooms_t dungeon_rooms[13] = {
                             {6, deku_rooms}, {4, dc_rooms}, {3, jabu_rooms},
                             {6, forest_rooms}, {7, fire_rooms}, {6, water_rooms},
-                            {7, shadow_rooms}, {6, spirit_rooms}, {3, botw_rooms},
+                            {8, shadow_rooms}, {6, spirit_rooms}, {4, botw_rooms},
                             {5, ice_rooms}, {4, hideout_rooms}, {6, gtg_rooms}, {7, ganon_rooms},
                         };
 

ASM/build/bundle.o

@@ -27,6 +27,7 @@
 * Fix the texture of the rotated Forest Temple boss key chest when `Chest Appearance Matches Content` is off.
 * Misc. location hints no longer prevent their area from being hinted as Barren.
 * Fix a generator failure when a `named_items_required` Named Item hint conflicts with a misc. location hint.
+* Prevent another case of Dead Hand spawning outside the room collision.
 
 ## Other changes
 * Big poe souls can now be collected while riding Epona.

ASM/build/c_symbols.txt

@@ -1795,13 +1795,16 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
 
     # Fix Dead Hand spawn coordinates in vanilla shadow temple and bottom of the well to be the exact centre of the room
     # This prevents the extremely small possibility of Dead Hand spawning outside of collision
+    # He can still spawn outside of the room if the xz spawn rolls in the specific corner of the room where there is rubble, so
+    # also elevate its y coordinate. This way, Dead Hand will correctly be projected down at the ground for all possible values.
     if not world.dungeon_mq['Shadow Temple']:
-        rom.write_int16(0x27DC0AE, 0xF67E) # x-coordinate spawn in shadow temple
-        rom.write_int16(0x27DC0B2, 0xFE6B) # z-coordinate spawn in shadow temple
+        rom.write_int16(0x27DC0AE, 0xF67E) # x-coordinate spawn in shadow temple, original value is -2424
+        rom.write_int16(0x27DC0B0, 0x0003) # y-coordinate spawn in shadow temple, original value is -63
+        rom.write_int16(0x27DC0B2, 0xFE6B) # z-coordinate spawn in shadow temple, original value is -413
     if not world.dungeon_mq['Bottom of the Well']:
-        rom.write_int16(0x32FB08E, 0x0500) # x-coordinate spawn in bottom of the well
-        rom.write_int16(0x32FB092, 0x00D2) # z-coordinate spawn in bottom of the well
-
+        rom.write_int16(0x32FB08E, 0x0500) # x-coordinate spawn in bottom of the well, original value is 1276
+        rom.write_int16(0x32FB090, 0x0032) # y-coordinate spawn in bottom of the well, original value is -16
+        rom.write_int16(0x32FB092, 0x00D2) # z-coordinate spawn in bottom of the well, original value is 209
     # update happy mask shop to use new SOLD OUT text id
     rom.write_int16(shop_item_file.start + 0x1726, shop_items[0x26].description_message)