summaryrefslogtreecommitdiff
path: root/npc/re/guides/guides_gonryun.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-02 17:15:41 -0200
committershennetsind <ind@henn.et>2013-11-02 17:15:41 -0200
commitcf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch)
tree73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/re/guides/guides_gonryun.txt
parentb2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff)
parent566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff)
downloadhercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz
hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2
hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz
hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et> Conflicts: sql-files/main.sql sql-files/upgrades/index.txt src/common/mmo.h
Diffstat (limited to 'npc/re/guides/guides_gonryun.txt')
-rw-r--r--npc/re/guides/guides_gonryun.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/re/guides/guides_gonryun.txt b/npc/re/guides/guides_gonryun.txt
index 9d1517059..23f842758 100644
--- a/npc/re/guides/guides_gonryun.txt
+++ b/npc/re/guides/guides_gonryun.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-gonryun,163,60,4 script Kunlun Guide#01gonryun 780,{
+gonryun,163,60,4 script Kunlun Guide#01gonryun 8_M_TWSOLDIER,{
mes "[He Yuen Zhe]";
mes "Ni Hao!";
mes "Welcome to ^8B4513Kunlun^000000~";