Skip to content

Increase y spawn coordinate of dead hand to avoid spawning out of bounds #2497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fenhl merged 1 commit into from
Dec 12, 2025
Merged

Increase y spawn coordinate of dead hand to avoid spawning out of bounds #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ASM/c/debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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"},
};
Expand Down Expand Up @@ -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},
};

Expand Down
13 changes: 8 additions & 5 deletions Patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions data/mqu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25707,7 +25707,7 @@
"00A5 F688 FFC1 FEED 0000 0000 0000 FFFF",
"00A5 F6DB FFC1 FEB1 0000 0000 0000 FFFF",
"00A5 F6E1 FFC1 FE1C 0000 0000 0000 FFFF",
"00A4 F67E FFC1 FE6B 0000 0000 0000 FFFF",
"00A4 F67E 0003 FE6B 0000 0000 0000 FFFF",
"000A F562 FFC1 FE64 0000 C000 0001 15E7"
]
},
Expand Down Expand Up @@ -27531,7 +27531,7 @@
"00A5 0464 FFEC 0173 0000 C000 0000 FFFF",
"00A5 059D FFEC 0036 0000 C000 0000 FFFF",
"00A5 059D FFEC 0170 0000 C000 0000 FFFF",
"00A4 0500 FFF0 00D2 0000 C000 0000 FFFF",
"00A4 0500 0032 00D2 0000 C000 0000 FFFF",
"0015 0644 FFEC FFA8 0000 0000 0000 0211",
"000A 0524 FFEC 0079 0000 C000 0000 1802",
"00BE 062C 0000 FFA6 0000 C000 0000 2102"
Expand Down
Loading