summaryrefslogtreecommitdiff
path: root/npc/027-2_Caretakers_House/_warps.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/027-2_Caretakers_House/_warps.txt')
-rw-r--r--npc/027-2_Caretakers_House/_warps.txt21
1 files changed, 21 insertions, 0 deletions
diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2_Caretakers_House/_warps.txt
index 8b7af158..160e4dae 100644
--- a/npc/027-2_Caretakers_House/_warps.txt
+++ b/npc/027-2_Caretakers_House/_warps.txt
@@ -1,3 +1,24 @@
// 027-2 Caretaker's House warps
+<<<<<<< HEAD
+027-2.gat,25,32 warp toGraveyard -1,-1,027-1.gat,88,85
+
+
+
+// 027-2 Graveyard Inn 1rst floor Warps
+
+027-2.gat,127,35,0 warp ToInnSecondFloorL -1,-1,027-2.gat,75,92
+027-2.gat,128,35,0 warp ToInnSecondFloorR -1,-1,027-2.gat,76,92
+027-2.gat,106,46,0 warp GYInnExit 1,-1,debugroom.gat,30,27
+
+027-2.gat,111,37,0 warp ToReaper 1,-1,027-4.gat,40,38
+
+
+
+// 027-2 Graveyard Inn 2nd floor Warps
+
+027-2.gat,75,93,0 warp ToInnFirstFloorL -1,-1,027-2.gat,127,36
+027-2.gat,76,93,0 warp ToInnFirstFloorR -1,-1,027-2.gat,128,36
+=======
027-2.gat,26,33 warp toGraveyard -1,-1,027-1.gat,88,85
+>>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b