From ae5577605e492b31df6477cc2c9ac013b70ab5a7 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Thu, 30 Aug 2012 14:34:14 +0200
Subject: Update 000-1 wlk.

---
 data/000-1.wlk      | Bin 19204 -> 19204 bytes
 npc/000-1/_mobs.txt |   7 +++++++
 2 files changed, 7 insertions(+)

diff --git a/data/000-1.wlk b/data/000-1.wlk
index 85c26414..b6bc4695 100644
Binary files a/data/000-1.wlk and b/data/000-1.wlk differ
diff --git a/npc/000-1/_mobs.txt b/npc/000-1/_mobs.txt
index 78ee8f46..d857b684 100644
--- a/npc/000-1/_mobs.txt
+++ b/npc/000-1/_mobs.txt
@@ -1,5 +1,12 @@
 // 000-1 mobs
+<<<<<<< HEAD
 
 000-1.gat,0,0,0	script	Mob000-1	-1,{
 	end;
 }
+=======
+000-1.gat,0,0,0,0	monster	Piou	1002,4,15000,10000
+000-1.gat,61,122,77,31	monster	Tortuga	1004,4,35000,28000
+000-1.gat,28,46,13,24	monster	Tortuga	1004,2,16000,12000
+000-1.gat,79,48,59,56	monster	Tortuga	1004,5,16000,12000
+>>>>>>> Add mobs on 000-1 map.
-- 
cgit v1.2.3-70-g09d2