Follow up r16545. Fixed some mistakes I made.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16548 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/kafras/functions_kafras.txt

@@ -402,10 +402,12 @@ function	script	F_KafTele	{
 		if (@wrpD$[@num] == "Al De Baran") warp "aldebaran",168,112;
 		if (@wrpD$[@num] == "Aldebaran") warp "aldebaran",168,112;
 		if (@wrpD$[@num] == "Comodo") warp "comodo", 209, 143;
-		if(checkre(0)
-			if (@wrpD$[@num] == "Izlude") warp "izlude", 128, 98;
-		else
-			if (@wrpD$[@num] == "Izlude") warp "izlude", 91, 105;
+		if (@wrpD$[@num] == "Izlude") {
+			if(checkre(0))
+				warp "izlude", 128, 98;
+			else
+				warp "izlude", 91, 105;
+		}
 		if (@wrpD$[@num] == "Geffen") warp "geffen", 120, 39;
 		if (@wrpD$[@num] == "Morroc") warp "morocc", 156, 46;
 		if (@wrpD$[@num] == "Payon") warp "payon", 161, 58;

npc/pre-re/scripts_main.conf

@@ -19,11 +19,11 @@
 
 // ------------------ Global Scripts Functions ------------------
 // Utilitarian functions used by many scripts.
-npc: npc/pre-re/other/Global_Functions.txt
+npc: npc/other/Global_Functions.txt
 
 // -------------------- Cash Shop Functions ---------------------
 // Used by cash shop items in the Item Database.
-npc: npc/pre-re/other/CashShop_Functions.txt
+npc: npc/other/CashShop_Functions.txt
 
 // ------------------- Common Script Files ----------------------
 import: npc/scripts_athena.conf

npc/re/scripts_main.conf

@@ -19,11 +19,11 @@
 
 // ------------------ Global Scripts Functions ------------------
 // Utilitarian functions used by many scripts.
-npc: npc/re/other/Global_Functions.txt
+npc: npc/other/Global_Functions.txt
 
 // -------------------- Cash Shop Functions ---------------------
 // Used by cash shop items in the Item Database.
-npc: npc/re/other/CashShop_Functions.txt
+npc: npc/other/CashShop_Functions.txt
 
 // ------------------- Common Script Files ----------------------
 import: npc/scripts_athena.conf

npc/scripts_monsters.conf

@@ -2,7 +2,7 @@
 // -                      Monster  Scripts                      -
 // --------------------------------------------------------------
 
-npc: npc/pre-re/mobs/bossnia.txt
-npc: npc/pre-re/mobs/citycleaners.txt
-npc: npc/pre-re/mobs/jail.txt
-npc: npc/pre-re/mobs/pvp.txt
+npc: npc/mobs/bossnia.txt
+npc: npc/mobs/citycleaners.txt
+npc: npc/mobs/jail.txt
+npc: npc/mobs/pvp.txt