summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-05-30 22:20:16 -0300
committershennetsind <ind@henn.et>2013-05-30 22:20:16 -0300
commit5a138ceabf08fe0ca75a24306e849ce3f24faef8 (patch)
tree5cc9cae641157e05172f450d84a6fe6d9753b793 /npc/pre-re
parent20bdc01fa687b174a732be4483ddea4982d67ce9 (diff)
parentb30c74a7733848f03e5defc238dca0e0cb044470 (diff)
downloadhercules-5a138ceabf08fe0ca75a24306e849ce3f24faef8.tar.gz
hercules-5a138ceabf08fe0ca75a24306e849ce3f24faef8.tar.bz2
hercules-5a138ceabf08fe0ca75a24306e849ce3f24faef8.tar.xz
hercules-5a138ceabf08fe0ca75a24306e849ce3f24faef8.zip
Memory Slasher - May 30 Patch
http://hercules.ws/board/topic/928-memory-slasher-may-30-patch/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/scripts.conf (renamed from npc/pre-re/scripts_athena.conf)0
-rw-r--r--npc/pre-re/scripts_main.conf4
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts.conf
index 6a69ede0e..6a69ede0e 100644
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts.conf
diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf
index e029447b5..db7ed1411 100644
--- a/npc/pre-re/scripts_main.conf
+++ b/npc/pre-re/scripts_main.conf
@@ -26,7 +26,7 @@ npc: npc/other/Global_Functions.txt
npc: npc/other/CashShop_Functions.txt
// ------------------- Common Script Files ----------------------
-import: npc/scripts_athena.conf
+import: npc/scripts.conf
import: npc/scripts_guild.conf
import: npc/scripts_jobs.conf
import: npc/scripts_mapflags.conf
@@ -34,7 +34,7 @@ import: npc/scripts_monsters.conf
import: npc/scripts_warps.conf
// ----------------- Pre-Renewal Script Files -------------------
-import: npc/pre-re/scripts_athena.conf
+import: npc/pre-re/scripts.conf
import: npc/pre-re/scripts_jobs.conf
import: npc/pre-re/scripts_monsters.conf
import: npc/pre-re/scripts_warps.conf