diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/re/guides/guides_malaya.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-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_malaya.txt')
| -rw-r--r-- | npc/re/guides/guides_malaya.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/re/guides/guides_malaya.txt b/npc/re/guides/guides_malaya.txt index 265b362bb..7120d843c 100644 --- a/npc/re/guides/guides_malaya.txt +++ b/npc/re/guides/guides_malaya.txt @@ -11,7 +11,7 @@ //= 1.1 Navigation system update. [Euphy] //============================================================ -malaya,71,72,4 script Port Malaya Guide#01::GuideMalaya 579,{ +malaya,71,72,4 script Port Malaya Guide#01::GuideMalaya 4_F_BARYO_WOMAN,{ mes "[Port Malaya Guide]"; mes "Welcome to ^8B4513Port Malaya^000000, the Breathing Village."; mes "Where cultures and legends come to life!"; @@ -77,5 +77,5 @@ L_Mark: mes "Is there anything else I can do for you?"; return; } -malaya,250,83,6 duplicate(GuideMalaya) Port Malaya Guide#02 579 -malaya,224,204,6 duplicate(GuideMalaya) Port Malaya Guide#03 579 +malaya,250,83,6 duplicate(GuideMalaya) Port Malaya Guide#02 4_F_BARYO_WOMAN +malaya,224,204,6 duplicate(GuideMalaya) Port Malaya Guide#03 4_F_BARYO_WOMAN |