summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-22 16:31:56 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-22 16:31:56 +0000
commitb5735b90f5ec847a89acd80509e8ba2ce23a3905 (patch)
treec784ba41982fe5370eee9245d9fe65063b389328 /npc
parente52e5e17df12881d87065106a96ed48a9d302555 (diff)
downloadhercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.tar.gz
hercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.tar.bz2
hercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.tar.xz
hercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.zip
Check changelog ^^
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1267 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/quests/juice_maker.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b1739129b..7a1a644e0 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -35,6 +35,8 @@ Other Ppl
Date Added
======
+03/22
+ * Moved position for Marx Hansen to payon_in03, thanks to Dino9021 [celest]
03/18
* Reduced label name length in heal_payment.txt [celest]
* Added Sara-chan's Einbroch/Einbech city warps [celest]
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index a41d6ad0f..c94d9234d 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -181,7 +181,7 @@ L_Juice:
}
// Juicer Marx Hansen ---------------------------------------------------------
-payon_in01.gat,5,48,7 script Juicer Marx Hansen 86,{
+payon_in03.gat,188,146,5 script Juicer Marx Hansen 86,{
mes "[Juicer Marx Hansen]";
if(MARIANNE == 1) goto L_Juice;
mes "Welcome to my shop. What brings you here?";