summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/data/001-2.wlkbin16004 -> 16004 bytes
-rw-r--r--world/map/data/002-4.wlkbin16388 -> 16388 bytes
-rw-r--r--world/map/data/005-3.wlkbin13924 -> 13924 bytes
-rw-r--r--world/map/data/006-3.wlkbin22504 -> 22504 bytes
-rw-r--r--world/map/data/025-3.wlkbin36104 -> 36104 bytes
-rw-r--r--world/map/data/025-4.wlkbin48004 -> 48004 bytes
-rw-r--r--world/map/data/resnametable.txt1
-rw-r--r--world/map/npc/001-1/_warps.txt2
-rw-r--r--world/map/npc/001-2/_import.txt2
-rw-r--r--world/map/npc/001-2/dedication.txt (renamed from world/map/npc/001-4/dedication.txt)4
-rw-r--r--world/map/npc/001-2/omar.txt (renamed from world/map/npc/001-4/omar.txt)4
-rw-r--r--world/map/npc/001-3/_warps.txt2
-rw-r--r--world/map/npc/001-4/_import.txt2
-rw-r--r--world/map/npc/025-3/_mobs.txt2
-rw-r--r--world/map/npc/_import.txt1
15 files changed, 9 insertions, 11 deletions
diff --git a/world/map/data/001-2.wlk b/world/map/data/001-2.wlk
index 0a762e12..fd57ccae 100644
--- a/world/map/data/001-2.wlk
+++ b/world/map/data/001-2.wlk
Binary files differ
diff --git a/world/map/data/002-4.wlk b/world/map/data/002-4.wlk
index a9d3449b..b6abb2c1 100644
--- a/world/map/data/002-4.wlk
+++ b/world/map/data/002-4.wlk
Binary files differ
diff --git a/world/map/data/005-3.wlk b/world/map/data/005-3.wlk
index dd0e45bd..9aaa21f7 100644
--- a/world/map/data/005-3.wlk
+++ b/world/map/data/005-3.wlk
Binary files differ
diff --git a/world/map/data/006-3.wlk b/world/map/data/006-3.wlk
index d635df84..0e428b38 100644
--- a/world/map/data/006-3.wlk
+++ b/world/map/data/006-3.wlk
Binary files differ
diff --git a/world/map/data/025-3.wlk b/world/map/data/025-3.wlk
index 85f1b94f..63a35094 100644
--- a/world/map/data/025-3.wlk
+++ b/world/map/data/025-3.wlk
Binary files differ
diff --git a/world/map/data/025-4.wlk b/world/map/data/025-4.wlk
index 00b9fa66..529cb652 100644
--- a/world/map/data/025-4.wlk
+++ b/world/map/data/025-4.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index fa526488..c9cad372 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -1,7 +1,6 @@
001-1.gat#001-1.wlk#
001-2.gat#001-2.wlk#
001-3.gat#001-3.wlk#
-001-4.gat#001-4.wlk#
002-1.gat#002-1.wlk#
002-2.gat#002-2.wlk#
002-3.gat#002-3.wlk#
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index d116051c..6d167694 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -5,4 +5,4 @@
001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145
001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146
001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34
-001-1.gat,75,41 warp ToHouse -1,-1,001-4.gat,26,33
+001-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72
diff --git a/world/map/npc/001-2/_import.txt b/world/map/npc/001-2/_import.txt
index e318db9b..7b1c49ea 100644
--- a/world/map/npc/001-2/_import.txt
+++ b/world/map/npc/001-2/_import.txt
@@ -4,7 +4,9 @@ map: 001-2.gat
npc: npc/001-2/_mobs.txt
npc: npc/001-2/_warps.txt
npc: npc/001-2/casino.txt
+npc: npc/001-2/dedication.txt
npc: npc/001-2/mapflags.txt
+npc: npc/001-2/omar.txt
npc: npc/001-2/phaet.txt
npc: npc/001-2/shops.txt
npc: npc/001-2/troupe_leader.txt
diff --git a/world/map/npc/001-4/dedication.txt b/world/map/npc/001-2/dedication.txt
index 4b240b11..d65f47d1 100644
--- a/world/map/npc/001-4/dedication.txt
+++ b/world/map/npc/001-2/dedication.txt
@@ -1,9 +1,9 @@
// Dedication to Irene Christina
-001-4.gat,31,29,0 script #IreneDedication 127,{
+001-2.gat,76,68,0 script #IreneDedication 127,{
mes "~ Irene Christina ~";
mes "The song in this house is dedicated to Irene.";
- mes "";
+ next;
mes "She had seen only twenty hours of this world when she died in her father's arms.";
close;
};
diff --git a/world/map/npc/001-4/omar.txt b/world/map/npc/001-2/omar.txt
index aedf1806..4f75574e 100644
--- a/world/map/npc/001-4/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -23,7 +23,7 @@ function script KadiyaSubquestConsts {
}
-001-4.gat,25,21,0 script Omar 162,{
+001-2.gat,70,60,0 script Omar 162,{
callfunc "ElanoreFix";
callfunc "KadiyaSubquestConsts";
@@ -184,7 +184,7 @@ S_update_var:
}
-001-4.gat,31,20,0 script _______Kadiya 174,{
+001-2.gat,76,59,0 script _______Kadiya 174,{
callfunc "ElanoreFix";
set @Q_MASK, NIBBLE_3_MASK;
set @Q_SHIFT, NIBBLE_3_SHIFT;
diff --git a/world/map/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index adb7642a..f92d7e46 100644
--- a/world/map/npc/001-3/_warps.txt
+++ b/world/map/npc/001-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar arena warps
-001-3.gat,72,29 warp ToInn 1,-1,001-2.gat,24,23
+001-3.gat,72,28 warp ToInn -1,-1,001-2.gat,23,24
diff --git a/world/map/npc/001-4/_import.txt b/world/map/npc/001-4/_import.txt
index aecdcb62..b4d7eaf4 100644
--- a/world/map/npc/001-4/_import.txt
+++ b/world/map/npc/001-4/_import.txt
@@ -3,5 +3,3 @@
map: 001-4.gat
npc: npc/001-4/_mobs.txt
npc: npc/001-4/_warps.txt
-npc: npc/001-4/dedication.txt
-npc: npc/001-4/omar.txt
diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt
index 9ce0508c..236af8c8 100644
--- a/world/map/npc/025-3/_mobs.txt
+++ b/world/map/npc/025-3/_mobs.txt
@@ -4,7 +4,7 @@
025-3.gat,0,0,0,0 monster CaveMaggot 1056,100,0,100,Mob025-3::On1056
025-3.gat,0,0,0,0 monster Archant 1060,20,0,100,Mob025-3::On1060
025-3.gat,0,0,0,0 monster AngryScorpion 1057,25,0,0,Mob025-3::On1057
-025-3.gat,67,153,4,2 monster Skeleton 1043,1,0,30000,Mob025-3::On1043
+025-3.gat,69,153,13,1 monster Skeleton 1043,1,0,30000,Mob025-3::On1043
025-3.gat,0,0,0 script Mob025-3 -1,{
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index f6da80e5..15563bfd 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -3,7 +3,6 @@
import: npc/001-1/_import.txt
import: npc/001-2/_import.txt
import: npc/001-3/_import.txt
-import: npc/001-4/_import.txt
import: npc/002-1/_import.txt
import: npc/002-3/_import.txt
import: npc/002-4/_import.txt