From da7e2b9bfb46b95b0ec4bef3ae55e5b7b181aabc Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Sat, 20 Feb 2016 20:08:59 +0100
Subject: Offset merlin and its shop on Artis.

---
 npc/001-1/merlin.txt | 2 +-
 npc/001-1/shop.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npc/001-1/merlin.txt b/npc/001-1/merlin.txt
index 4ff7e88c..d970f537 100644
--- a/npc/001-1/merlin.txt
+++ b/npc/001-1/merlin.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Fishmonger NPC
 
-001-1,72,128,0	script	Merlin	NPC_MERLIN,2,2,{
+001-1,73,128,0	script	Merlin	NPC_MERLIN,2,2,{
 
     function randomDialogue {
         closedialog;
diff --git a/npc/001-1/shop.txt b/npc/001-1/shop.txt
index 96afbdbd..2cc7e2c3 100644
--- a/npc/001-1/shop.txt
+++ b/npc/001-1/shop.txt
@@ -137,7 +137,7 @@ OnClock1600:
     restoreshopitem SmallTentacles, 7;
 }
 
-001-1,71,129,0	trader	Store#FishStore001-1	NPC_NO_SPRITE,{
+001-1,72,129,0	trader	Store#FishStore001-1	NPC_NO_SPRITE,{
 
 OnInit:
     tradertype(NST_MARKET);
-- 
cgit v1.2.3-70-g09d2