Skip to content

Commit 6b831f9

Browse files
authored
Fix swim softlock (HarbourMasters#3965)
* Update mods.cpp * Update mods.cpp
1 parent b65a150 commit 6b831f9

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

soh/soh/Enhancements/mods.cpp

+13-9
Original file line numberDiff line numberDiff line change
@@ -1464,40 +1464,44 @@ typedef struct {
14641464
//special respawns used when voided out without swim to prevent infinite loops
14651465
std::map<s32, SpecialRespawnInfo> swimSpecialRespawnInfo = {
14661466
{
1467-
0x1D9,//hf to zr in water
1467+
ENTR_ZORAS_RIVER_3,//hf to zr in water
14681468
{ { -1455.443, -20, 1384.826 }, 28761 }
14691469
},
14701470
{
1471-
0x311,//zr to hf in water
1471+
ENTR_HYRULE_FIELD_14,//zr to hf in water
14721472
{ { 5830.209, -92.16, 3925.911 }, -20025 }
14731473
},
14741474
{
1475-
0x4DA,//zr to lw
1475+
ENTR_LOST_WOODS_7,//zr to lw
14761476
{ { 1978.718, -36.908, -855 }, -16384 }
14771477
},
14781478
{
1479-
0x1DD,//lw to zr
1479+
ENTR_ZORAS_RIVER_4,//lw to zr
14801480
{ { 4082.366, 860.442, -1018.949 }, -32768 }
14811481
},
14821482
{
1483-
0x219,//gv to lh
1483+
ENTR_LAKE_HYLIA_1,//gv to lh
14841484
{ { -3276.416, -1033, 2908.421 }, 11228 }
14851485
},
14861486
{
1487-
0x10,//lh to water temple
1487+
ENTR_WATER_TEMPLE_0,//lh to water temple
14881488
{ { -182, 780, 759.5 }, -32768 }
14891489
},
14901490
{
1491-
0x21D,//water temple to lh
1491+
ENTR_LAKE_HYLIA_2,//water temple to lh
14921492
{ { -955.028, -1306.9, 6768.954 }, -32768 }
14931493
},
14941494
{
1495-
0x328,//lh to zd
1495+
ENTR_ZORAS_DOMAIN_4,//lh to zd
14961496
{ { -109.86, 11.396, -9.933 }, -29131 }
14971497
},
14981498
{
1499-
0x560,//zd to lh
1499+
ENTR_LAKE_HYLIA_7,//zd to lh
15001500
{ { -912, -1326.967, 3391 }, 0 }
1501+
},
1502+
{
1503+
ENTR_GERUDO_VALLEY_1,//caught by gerudos as child
1504+
{ { -424, -2051, -74 }, 16384 }
15011505
}
15021506
};
15031507

0 commit comments

Comments
 (0)