Merge 3e8866d47c into 67ee5f8d0e

soh/soh/Enhancements/mods.cpp

@@ -1464,40 +1464,44 @@ typedef struct {
 //special respawns used when voided out without swim to prevent infinite loops
 std::map<s32, SpecialRespawnInfo> swimSpecialRespawnInfo = {
     {
-        0x1D9,//hf to zr in water
+        ENTR_ZORAS_RIVER_3,//hf to zr in water
         { { -1455.443, -20, 1384.826 }, 28761 }
     },
     {
-        0x311,//zr to hf in water
+        ENTR_HYRULE_FIELD_14,//zr to hf in water
         { { 5830.209, -92.16, 3925.911 }, -20025 }
     },
     {
-        0x4DA,//zr to lw
+        ENTR_LOST_WOODS_7,//zr to lw
         { { 1978.718, -36.908, -855 }, -16384 }
     },
     {
-        0x1DD,//lw to zr
+        ENTR_ZORAS_RIVER_4,//lw to zr
         { { 4082.366, 860.442, -1018.949 }, -32768 }
     },
     {
-        0x219,//gv to lh
+        ENTR_LAKE_HYLIA_1,//gv to lh
         { { -3276.416, -1033, 2908.421 }, 11228 }
     },
     {
-        0x10,//lh to water temple
+        ENTR_WATER_TEMPLE_0,//lh to water temple
         { { -182, 780, 759.5 }, -32768 }
     },
     {
-        0x21D,//water temple to lh
+        ENTR_LAKE_HYLIA_2,//water temple to lh
         { { -955.028, -1306.9, 6768.954 }, -32768 }
     },
     {
-        0x328,//lh to zd
+        ENTR_ZORAS_DOMAIN_4,//lh to zd
         { { -109.86, 11.396, -9.933 }, -29131 }
     },
     {
-        0x560,//zd to lh
+        ENTR_LAKE_HYLIA_7,//zd to lh
         { { -912, -1326.967, 3391 }, 0 }
+    },
+    {
+        ENTR_GERUDO_VALLEY_1,//caught by gerudos as child
+        { { -424, -2051, -74 }, 16384 }
     }
 };