11 files changed, 50 insertions, 16 deletions
diff --git a/graphics/tilesets/desert_city_x4.tsx b/graphics/tilesets/desert_city_x4.tsx
index 1609cf87..0969310b 100644
--- a/graphics/tilesets/desert_city_x4.tsx
+++ b/graphics/tilesets/desert_city_x4.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="desert_city_x4" tilewidth="32" tileheight="128">
- <image source="../graphics/tiles/desert_city_x4.png" width="256" height="128"/>
+<tileset name="desert_city_x4" tilewidth="32" tileheight="64" tilecount="16" columns="8">
+ <image source="desert_city_x4.png" width="256" height="128"/>
 </tileset>
diff --git a/graphics/tilesets/desert_x2.tsx b/graphics/tilesets/desert_x2.tsx
index a7f95dc2..90f2b188 100644
--- a/graphics/tilesets/desert_x2.tsx
+++ b/graphics/tilesets/desert_x2.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="desert_x2" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/desert_x2.png" width="512" height="64"/>
+<tileset name="desert_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="desert_x2.png" width="512" height="192"/>
 </tileset>
diff --git a/graphics/tilesets/desert_x3.tsx b/graphics/tilesets/desert_x3.tsx
index b600ed43..5650ac90 100644
--- a/graphics/tilesets/desert_x3.tsx
+++ b/graphics/tilesets/desert_x3.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="desert_x3" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/desert_x3.png" width="512" height="96"/>
+<tileset name="desert_x3" tilewidth="32" tileheight="96" tilecount="32" columns="16">
+ <image source="desert_x3.png" width="512" height="192"/>
 </tileset>
diff --git a/graphics/tilesets/desert_x5.tsx b/graphics/tilesets/desert_x5.tsx
index 456602b5..9c8159bc 100644
--- a/graphics/tilesets/desert_x5.tsx
+++ b/graphics/tilesets/desert_x5.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="desert_x5" tilewidth="32" tileheight="160">
- <image source="../graphics/tiles/desert_x5.png" width="192" height="160"/>
+<tileset name="desert_x5" tilewidth="96" tileheight="160" tilecount="2" columns="2">
+ <image source="desert_x5.png" width="192" height="160"/>
 </tileset>
diff --git a/graphics/tilesets/docks.tsx b/graphics/tilesets/docks.tsx
index de0239f1..2543bb3c 100644
--- a/graphics/tilesets/docks.tsx
+++ b/graphics/tilesets/docks.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="docks" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/docks.png" width="512" height="320"/>
+<tileset name="docks" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+ <image source="docks.png" width="512" height="320"/>
 </tileset>
diff --git a/graphics/tilesets/docks_x2.tsx b/graphics/tilesets/docks_x2.tsx
index 8ae3906c..3b036cda 100644
--- a/graphics/tilesets/docks_x2.tsx
+++ b/graphics/tilesets/docks_x2.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="docks_x2" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/docks_x2.png" width="512" height="320"/>
+<tileset name="docks_x2" tilewidth="32" tileheight="64" tilecount="80" columns="16">
+ <image source="docks_x2.png" width="512" height="320"/>
 </tileset>
diff --git a/graphics/tilesets/docks_x3.tsx b/graphics/tilesets/docks_x3.tsx
index d54a1e09..2eb18437 100644
--- a/graphics/tilesets/docks_x3.tsx
+++ b/graphics/tilesets/docks_x3.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="docks_x3" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/docks_x3.png" width="384" height="96"/>
+<tileset name="docks_x3" tilewidth="32" tileheight="96" tilecount="12" columns="12">
+ <image source="docks_x3.png" width="384" height="96"/>
 </tileset>
diff --git a/graphics/tilesets/signs_x2.png b/graphics/tilesets/signs_x2.png
new file mode 100644
index 00000000..4262335a
--- /dev/null
+++ b/graphics/tilesets/signs_x2.png
diff --git a/graphics/tilesets/signs_x2.tsx b/graphics/tilesets/signs_x2.tsx
index 16f2d3fd..9d7e04e6 100644
--- a/graphics/tilesets/signs_x2.tsx
+++ b/graphics/tilesets/signs_x2.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="signs_x2" tilewidth="32" tileheight="64">
- <image source="../graphics/sprites/npcs/signs.png" width="256" height="192"/>
+<tileset name="signs_x2" tilewidth="32" tileheight="64" tilecount="24" columns="8">
+ <image source="signs_x2.png" width="256" height="192"/>
 </tileset>
diff --git a/graphics/tilesets/water2.png b/graphics/tilesets/water2.png
new file mode 100644
index 00000000..e751615a
--- /dev/null
+++ b/graphics/tilesets/water2.png
diff --git a/graphics/tilesets/water2.tsx b/graphics/tilesets/water2.tsx
new file mode 100644
index 00000000..97cdfcbd
--- /dev/null
+++ b/graphics/tilesets/water2.tsx
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset name="water2" tilewidth="32" tileheight="32" tilecount="165" columns="15">
+ <image source="water2.png" width="480" height="352"/>
+ <tile id="120">
+  <animation>
+   <frame tileid="120" duration="100"/>
+   <frame tileid="0" duration="100"/>
+   <frame tileid="1" duration="100"/>
+   <frame tileid="2" duration="100"/>
+   <frame tileid="3" duration="100"/>
+   <frame tileid="4" duration="100"/>
+  </animation>
+ </tile>
+ <tile id="135">
+  <animation>
+   <frame tileid="135" duration="100"/>
+   <frame tileid="15" duration="100"/>
+   <frame tileid="16" duration="100"/>
+   <frame tileid="17" duration="100"/>
+   <frame tileid="18" duration="100"/>
+   <frame tileid="19" duration="100"/>
+  </animation>
+ </tile>
+ <tile id="150">
+  <animation>
+   <frame tileid="150" duration="100"/>
+   <frame tileid="30" duration="100"/>
+   <frame tileid="31" duration="100"/>
+   <frame tileid="32" duration="100"/>
+   <frame tileid="33" duration="100"/>
+   <frame tileid="34" duration="100"/>
+  </animation>
+ </tile>
+</tileset>