summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/warps/cities/amatsu.txt9
-rw-r--r--npc/warps/fields/amatsu_fild.txt11
3 files changed, 13 insertions, 9 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 959879146..7b1f98c8f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,8 @@ Other Ppl
Date Added
======
+03/29
+ * Corrected Amatsu warp points, thanks to Dino9021
03/28
* Corrected Yuno warp points, thanks to Dino9021
* Added Yuno warps to the Aldebaran kafra NPC, thanks to Dino9021
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 29a6c80af..7d19d5f70 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -18,13 +18,13 @@ ama_in01.gat,157,25,0 warp warp1969 1,1,amatsu.gat,213,116
ama_in01.gat,161,34,0 warp warp1970 1,1,ama_in01.gat,166,77
ama_in01.gat,166,73,0 warp warp1971 1,1,ama_in01.gat,162,32
ama_in01.gat,174,120,0 warp warp2011 1,1,amatsu.gat,217,146
-ama_in01.gat,174,170,0 warp warp2012 1,1,amatsu.gat,52,144
+ama_in01.gat,174,170,0 warp warp2012 1,1,ama_fild01.gat,174,328
ama_in01.gat,31,176,0 warp warp2010 1,1,amatsu.gat,42,110
ama_in01.gat,32,24,0 warp warp1963 1,1,amatsu.gat,98,117
ama_in01.gat,34,97,0 warp warp1965 1,1,amatsu.gat,168,178
ama_in01.gat,77,177,0 warp warp1967 1,1,amatsu.gat,246,160
ama_in01.gat,86,23,0 warp warp2009 1,1,amatsu.gat,130,148
-ama_in01.gat,88,94,0 warp warp2008 1,1,amatsu.gat,99,148
+ama_in01.gat,88,94,0 warp warp2008 1,1,amatsu.gat,52,145
ama_in02.gat,127,163,0 warp warp1980 1,1,ama_in02.gat,220,161
ama_in02.gat,195,44,0 warp warp1973 1,1,ama_in02.gat,65,40
ama_in02.gat,215,150,0 warp warp1978 1,1,ama_in02.gat,59,156
@@ -46,7 +46,8 @@ amatsu.gat,217,149,0 warp warp1987 1,1,ama_in01.gat,174,122
amatsu.gat,247,290,0 warp warp1960 1,1,ama_fild01.gat,73,32
amatsu.gat,249,160,0 warp warp1966 1,1,ama_in01.gat,79,178
amatsu.gat,40,110,0 warp warp1995 1,1,ama_in01.gat,28,176
-amatsu.gat,52,148,0 warp warp1994 1,1,ama_in01.gat,174,172
+amatsu.gat,52,148,0 warp warp1994 1,1,ama_in01.gat,88,97
amatsu.gat,85,235,0 warp warp1972 1,1,ama_in02.gat,224,45
-amatsu.gat,95,148,0 warp warp1990 1,1,ama_in01.gat,88,97
+//removed
+//amatsu.gat,95,148,0 warp warp1990 1,1,ama_in01.gat,88,97
amatsu.gat,96,118,0 warp warp1962 1,1,ama_in01.gat,31,23 \ No newline at end of file
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index 56506edc7..19df68ff5 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -13,9 +13,10 @@
//============================================================
//= Amatsu Fields ============================================
-ama_fild.gat,154,301,0 warp warp1998 1,1,prontera.gat,163,186
-ama_fild.gat,174,132,0 warp warp1996 1,1,prontera.gat,163,186
-ama_fild.gat,193,302,0 warp warp1997 1,1,prontera.gat,163,186
-ama_fild.gat,330,141,0 warp warp1999 1,1,prontera.gat,163,186
-ama_fild01.gat,174,332,0 warp warp8003 1,1,ama_test.gat,50,19
+// removed
+//ama_fild.gat,154,301,0 warp warp1998 1,1,prontera.gat,163,186
+//ama_fild.gat,174,132,0 warp warp1996 1,1,prontera.gat,163,186
+//ama_fild.gat,193,302,0 warp warp1997 1,1,prontera.gat,163,186
+//ama_fild.gat,330,141,0 warp warp1999 1,1,prontera.gat,163,186
+ama_fild01.gat,174,332,0 warp warp8003 1,1,ama_in01.gat,175,174
ama_fild01.gat,75,29,0 warp warp1961 1,1,amatsu.gat,247,287 \ No newline at end of file