Mapflags + Liangtai patch + Jesusalva patch

4 files changed, 11 insertions, 10 deletions

diff --git a/npc/001-1/mapflags.txt b/npc/001-1/mapflags.txt
index d0bb944f4..aa8f150c3 100644
--- a/npc/001-1/mapflags.txt
+++ b/npc/001-1/mapflags.txt
@@ -5,3 +5,4 @@
 
 001-4	mapflag	zone	Aeros
 001-5	mapflag	zone	Aeros
+001-11	mapflag	zone	Aeros
diff --git a/npc/004-2/_warps.txt b/npc/004-2/_warps.txt
index b160a25b8..3fc6454e3 100644
--- a/npc/004-2/_warps.txt
+++ b/npc/004-2/_warps.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains warps
 004-2,20,48,0	warp	#004-2_20_48	0,2,004-1,119,95
-004-2,84,77,0	warp	#004-2_84_77	0,0,004-2-1,26,87
 004-2,100,89,0	warp	#004-2_100_89	0,0,004-2-1,78,72
 004-2,116,34,0	warp	#004-2_116_34	0,0,004-2-1,51,27
 004-2,98,34,0	warp	#004-2_98_34	0,0,010-1-1,142,119
+004-2,72,69,0	warp	#004-2_72_69	1,0,010-2,97,123
diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
index 15ad1fa59..df5dc7031 100644
--- a/npc/010-1-1/_warps.txt
+++ b/npc/010-1-1/_warps.txt
@@ -1,21 +1,21 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-1-1: Canyon Great Caves warps
-010-1-1,78,73,0	warp	#010-1-1_78_73	0,0,010-1,76,67
+010-1-1,78,73,0	warp	#010-1-1_78_73	0,0,010-1,76,69
 010-1-1,31,115,0	warp	#010-1-1_31_115	0,0,010-1,81,91
-010-1-1,27,71,0	warp	#010-1-1_27_71	0,0,010-1,52,51
-010-1-1,30,39,0	warp	#010-1-1_30_39	0,0,010-1,53,91
+010-1-1,27,71,0	warp	#010-1-1_27_71	0,0,010-1,52,53
+010-1-1,30,39,0	warp	#010-1-1_30_39	0,0,010-1,53,93
 010-1-1,41,37,0	warp	#010-1-1_41_37	0,0,010-2,88,114
-010-1-1,34,30,0	warp	#010-1-1_34_30	0,0,010-1,45,71
+010-1-1,34,30,0	warp	#010-1-1_34_30	0,0,010-1,44,73
 010-1-1,32,24,0	warp	#010-1-1_32_24	0,0,010-2,36,104
-010-1-1,43,18,0	warp	#010-1-1_43_18	0,0,010-1,6,33
+010-1-1,43,18,0	warp	#010-1-1_43_18	0,0,010-1,42,35
 010-1-1,47,83,0	warp	#010-1-1_47_83	0,0,010-2,162,69
-010-1-1,85,98,0	warp	#010-1-1_85_98	0,0,010-1,96,31
+010-1-1,85,98,0	warp	#010-1-1_85_98	0,0,010-1,96,33
 010-1-1,163,105,0	warp	#010-1-1_163_105	0,0,010-1,110,84
 010-1-1,142,120,0	warp	#010-1-1_142_120	0,0,004-2,98,35
 010-1-1,170,49,0	warp	#010-1-1_170_49	0,0,010-2,108,128
-010-1-1,178,85,0	warp	#010-1-1_178_85	0,0,010-1,87,37
+010-1-1,178,85,0	warp	#010-1-1_178_85	0,0,010-1,87,39
 010-1-1,112,44,0	warp	#010-1-1_112_44	0,0,010-2,114,104
 010-1-1,119,36,0	warp	#010-1-1_119_36	0,0,010-2,123,100
-010-1-1,112,42,0	warp	#010-1-1_112_42	0,0,010-1,105,28
+010-1-1,112,42,0	warp	#010-1-1_112_42	0,0,010-1,105,30
 010-1-1,168,23,0	warp	#010-1-1_168_23	0,0,010-1,59,192
 010-1-1,176,50,0	warp	#010-1-1_176_50	0,0,010-2,136,116
diff --git a/npc/010-2/_warps.txt b/npc/010-2/_warps.txt
index 621a3254d..f3ffe77e3 100644
--- a/npc/010-2/_warps.txt
+++ b/npc/010-2/_warps.txt
@@ -4,7 +4,6 @@
 010-2,39,98,0	warp	#010-2_39_98	0,0,004-1,33,110
 010-2,59,81,0	warp	#010-2_59_81	0,0,004-1,33,110
 010-2,64,75,0	warp	#010-2_64_75	0,0,004-1,33,110
-010-2,94,125,0	warp	#010-2_94_125	0,0,010-1,124,25
 010-2,108,129,0	warp	#010-2_108_129	0,0,010-1-1,170,50
 010-2,88,113,0	warp	#010-2_88_113	0,0,010-1-1,41,38
 010-2,127,122,0	warp	#010-2_127_122	0,0,004-1,33,110
@@ -29,3 +28,4 @@
 010-2,209,41,0	warp	#010-2_209_41	0,0,004-1,33,110
 010-2,243,41,0	warp	#010-2_243_41	0,0,004-1,33,110
 010-2,171,18,0	warp	#010-2_171_18	0,0,009-1,56,105
+010-2,97,124,0	warp	#010-2_97_124	8,0,004-2,71,70