Merge pull request #201 from Michieru/master

Super-Mega Thanks to Michieru!
NPC Changelog (might be incomplete, did my best)
- npc/battleground/bg_common.txt 
-- 1.4 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/flavius/flavius02.txt 
-- 1.5 Label standardization. [Euphy] 
-- 1.6 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra01.txt 
-- 1.4 Label standardization. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/battleground/tierra/tierra02.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/cities/ayothaya.txt 
-- 1.9 Updated Renewal warp coordinates. 
- npc/cities/izlude.txt 
-- 1.9a A part of Kylick's dialogue is Pre-Renewal only. [Euphy] 
- npc/cities/yuno.txt 
-- 1.5 Added Renewal coordinates for Payon and Izlude. [Euphy] 
- npc/events/bossnia.txt 
-- 1.2 Moved spawns and warps (by Masao) to this file. [Euphy] 
- npc/events/easter_2010.txt 
-- 1.0 First version. [Euphy] 
- npc/events/gdevent_aru.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/gdevent_sch.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/events/god_se_festival.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/jobs/2-2/rogue.txt 
-- impossible get a Gladius [3]. (bugreport:481) [Samuray22] 
- npc/jobs/2-2e/SoulLinker.txt 
-- 1.6 Updated to match the latest official script. [Euphy] 
- npc/kafras/kafras.txt 
-- 1.1a Fixed Pre-RE Call and some leftovers. [Lemongrass] 
-- 1.1b Enabled saving in Izlude duplicates (RE). [Euphy] 
- npc/merchants/alchemist.txt 
-- 1.8 Moved Craft Book Merchant to Renewal path. [Euphy] 
- npc/mobs/citycleaners.txt 
-- 1.2 Split spawns into Pre-RE/RE and Town files. [Euphy] 
- npc/mobs/towns.txt 
-- 1.0 First version. 
- npc/other/Global_Functions.txt 
-- 2.17 Renamed 'F_RandMes' to 'F_Rand'. [Euphy]
-- 2.18 Removed useless 'getJobName' function. [Euphy]
- npc/other/acolyte_warp.txt 
-- 1.0 First version. [Euphy] 
- npc/other/arena/arena_aco.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates, and removed two level restrictions. [Euphy] 
-- 1.5 Added GM management function. [Euphy] 
- npc/other/arena/arena_lvl50.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl60.txt 
-- 1.3 Label standardization. [Euphy] 
-- 1.4 Script updates. [Euphy] 
- npc/other/arena/arena_lvl70.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates. [Euphy] 
- npc/other/arena/arena_lvl80.txt 
-- 1.2 Label standardization. [Euphy] 
-- 1.3 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_party.txt 
-- 1.4 Label standardization and bug fixes. [Euphy] 
-- 1.5 Script updates, and removed a level restriction. [Euphy] 
- npc/other/arena/arena_room.txt 
-- 1.2 Label standardization, disabled GM NPCs. [Euphy] 
-- 1.2a Added Renewal level checksk. [Euphy] 
-- 1.3 Script updates. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/hugel_bingo.txt 
-- 1.9 Some optimization/standardization. [Euphy] 
- npc/other/marriage.txt 
-- 1.3 Changed permanent global variables to temporary ones. [Euphy] 
-- 1.4 Added GM management function. [Euphy] 
- npc/other/pvp.txt 
-- 2.4 Fixed incorrect use of 'close' and some cleaning. [Joseph] 
-- 2.5 Renewal/Pre-Renewal split. [Euphy] 
- npc/other/turbo_track.txt 
-- 1.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.2 Added Renewal features. [Euphy] 
- npc/pre-re/cities/yuno.txt 
-- 1.0 First version. 
- npc/pre-re/kafras/kafras.txt 
-- 1.0 First version. 
- npc/pre-re/merchants/ammo_boxes.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/ammo_dealer.txt 
-- 1.0 First version, Pre-Renewal duplicates. 
- npc/pre-re/merchants/shops.txt 
-- 1.1 Moved Izlude shops to pre-re/re paths. [Streusel] 
- npc/pre-re/mobs/citycleaners.txt 
-- 1.0 First version, Pre-Renewal spawns. 
- npc/pre-re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/pre-re/other/msg_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE path. 
- npc/pre-re/other/pvp.txt 
-- 1.0 First version, Pre-Renewal. 
- npc/pre-re/other/resetskill.txt 
-- 1.0 First version. [L0ne_W0lf] 
- npc/pre-re/other/turbo_track.txt 
-- 1.0 Split Peco Peco Manager NPC. 
- npc/pre-re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/pre-re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/pre-re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
- npc/pre-re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/pre-re/quests/quests_veins.txt 
-- 1.0 First version. 
- npc/pre-re/warps/other/arena.txt 
-- 1.0 First version, Pre-Renewal warps. 
- npc/quests/dandelion_request.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/quests/eye_of_hellion.txt 
-- 2.0 Updated EXP rewards. 
-- 2.1 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/first_class/tu_archer.txt 
-- 1.1 optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_magician01.txt 
-- 1.4 Updated to match the official script. [Euphy] 
- npc/quests/first_class/tu_merchant.txt 
-- 1.1 Fixed bugs, optimized [Lupus] 
-- 1.2 fixed Weight check 
- npc/quests/first_class/tu_sword.txt 
-- 1.5 Added Renewal Izlude coordinates. 
-- 1.6 Added Pre-Renewal support. [Euphy] 
- npc/quests/first_class/tu_thief01.txt 
-- 1.5 Added Pre-Renewal support. [Euphy] 
- npc/quests/mage_solution.txt 
-- 1.0 Split from Pre-Renewal Mage job quest. [Zopokx] 
- npc/quests/okolnir.txt 
-- 1.1 Some bug fixes. [Toshiro90/Euphy] 
- npc/quests/partyrelay.txt 
-- 1.2 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_13_1.txt 
-- 3.1 Updated RE/Pre-RE EXP. [Euphy] 
-- 3.2 Updated ep13_start and dialog to match official script. [Joseph] 
-- 3.3 Updated to match the latest official script. [Euphy] 
-- 3.3a Added Izlude RE coordinates. [Euphy] 
-- 3.4 Added GM management function and NPC. [Euphy] 
- npc/quests/quests_alberta.txt 
-- 2.6 Updated RE/Pre-RE EXP. [Euphy] 
- npc/quests/quests_amatsu.txt 
-- 1.5 Added questlog support. [Euphy] 
- npc/quests/quests_geffen.txt 
-- 1.5 Added Number Match Game. [Euphy] 
- npc/quests/quests_juperos.txt 
-- 1.8 Updated RE/Pre-RE EXP. [Euphy] 
-- 1.9 Added GM management NPC. [Euphy] 
- npc/quests/quests_niflheim.txt 
-- Updated to Aegis 10.3 Standed, added Message Delivery Quest. 
-- 1.6 Added questlog support. [Euphy] 
- npc/quests/quests_veins.txt 
-- Added Veins Thor Volcano Base Quest NPC. [L0ne_W0lf] 
- npc/quests/seals/god_global.txt 
-- 1.2 Renewal script update. [Euphy] 
- npc/quests/seals/god_weapon_creation.txt 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/seal_status.txt 
-- 1.0 Translated from the official. [L0ne_W0lf] 
-- 1.1 Now checks proper char vars. [L0ne_W0lf] 
-- 1.2 Cleaning. [Euphy] 
-- 1.3 Renewal script update. [Euphy] 
- npc/quests/seals/sleipnir_seal.txt 
-- 1.4 Renewal script update. [Euphy] 
- npc/quests/skills/novice_skills.txt 
-- 1.8 Added Baby support. [Zopokx] 
- npc/quests/skills/rogue_skills.txt 
-- 1.8 Some cleaning. [Euphy] 
- npc/quests/skills/sage_skills.txt 
-- 1.5 Optimized. [Euphy] 
- npc/re/airports/izlude.txt 
-- 1.0 Updated to match the new Izlude Map. [Masao] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/cities/dicastes.txt 
-- 1.3 Updated to match official script. [SkittleNugget] 
- npc/re/cities/izlude.txt 
-- 1.1 Updated to match the official script. [Euphy] 
-- 1.2 Added Channel Warper and Izlude duplicates. [Euphy] 
- npc/re/cities/jawaii.txt 
-- 1.1 Moved "Honeymoon Helper" NPC. 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/cities/malangdo.txt 
-- 1.2 Moved "Odgnalam" coordinates. 
-- 1.3 Fixed dialogues. 
-- 1.4 Dialogue edits, source iRO. 
-- 1.5 Added Izlude duplicates. 
- npc/re/cities/malaya.txt 
-- 0.1 Alberta sailors only. [Euphy] 
-- 0.2 Adapted from Masao's conversion. 
-- 1.0 Added remaining NPCs. 
- npc/re/cities/yuno.txt 
-- 1.0 First version. 
- npc/re/guides/guides_alberta.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_aldebaran.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_amatsu.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_ayothaya.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_brasilis.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_comodo.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_dewata.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_dicastes.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_einbroch.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_geffen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_gonryun.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_hugel.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_izlude.txt 
-- 1.2 Added Renewal Izlude viewpoint coordinates. 
-- 1.3 Navigation system update. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/guides/guides_juno.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_lighthalzen.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_louyang.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_lutie.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_malaya.txt 
-- 1.0 First version. [Euphy] 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_mora.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_morroc.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_moscovia.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_niflheim.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_payon.txt 
-- 1.2 Navigation system update. [Euphy] 
- npc/re/guides/guides_prontera.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_rachel.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_umbala.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/guides_veins.txt 
-- 1.1 Navigation system update. [Euphy] 
- npc/re/guides/navigation.txt 
-- 1.0 First version. 
- npc/re/guild/invest_main.txt 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/jobs/3-1/guillotine_cross.txt 
-- 1.4 Added missing labels. [Joseph] 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/royal_guard.txt 
-- 1.2 Added GM management function. [Euphy] 
- npc/re/jobs/3-2/sura.txt 
-- 1.3 Added GM management function. [Euphy] 
- npc/re/jobs/novice/novice.txt 
-- 1.0 First version, hand scripted from iRO. [Kisuka] 
-- 1.5 Replaced with the official kRO scripts. [Euphy] 
- npc/re/jobs/repair.txt 
-- 1.0 First version. 
-- 1.1 Added GM management function. [Euphy] 
- npc/re/kafras/kafras.txt 
-- 1.2 Added Port Malaya Kafras. [Euphy] 
-- 1.3 Added Eden Group Kafra. [Euphy] 
-- 1.3a Moved Rune Knight Kafra from job file. [Euphy] 
-- 1.4 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/3rd_trader.txt 
-- 1.3 Added Malangdo/Mora Points NPC. [Euphy] 
-- 1.4 Updated to match the official scripts. [Euphy] 
-- 1.5 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/advanced_refiner.txt 
-- 1.0 Added Malangdo Refiner "Holink". [Euphy] 
- npc/re/merchants/alchemist.txt 
-- 1.0 Split Geneticist shop from main file. [Euphy] 
- npc/re/merchants/ammo_boxes.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/ammo_dealer.txt 
-- 1.0 First version, Renewal duplicates. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/merchants/card_separation.txt 
-- 1.1 Added "Richard" NPC. [Euphy] 
- npc/re/merchants/enchan_mora.txt 
-- 1.2 Bug fixes (bugreport:7930) [DeadlySilence] 
- npc/re/merchants/enchan_upg.txt 
-- 1.0 First version. 
-- 1.1 Standardizing, grammar and bug fixes. [Euphy] 
- npc/re/merchants/flute.txt 
-- 1.2a Fixed some conditions. [Euphy] 
- npc/re/merchants/renters.txt 
-- 2.2 Updated to match the official scripts. [Euphy] 
- npc/re/merchants/shops.txt 
-- 1.7 Added Izlude duplicates. [Euphy] 
- npc/re/mobs/citycleaners.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/mobs/dungeons/ecl_tdun.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/dungeons/mal_dun.txt 
-- 1.2 Added Pouring spawn, source iRO. [Euphy] 
- npc/re/mobs/fields/eclage.txt 
-- 1.0 First version. [Euphy] 
- npc/re/mobs/towns.txt 
-- 1.0 First version, Renewal spawns. 
- npc/re/other/bulletin_boards.txt 
-- 1.0 Moved Izlude NPCs to Pre-RE/RE paths. 
- npc/re/other/item_merge.txt 
-- 1.0 First version, currently useless/disabled. 
- npc/re/other/mail.txt 
-- 1.0 First version, Renewal duplicates. 
- npc/re/other/mercenary_rent.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/pvp.txt 
-- 1.0 First version, Renewal. 
- npc/re/other/resetskill.txt 
-- 1.0 First version, Renewal script. 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/other/stone_change.txt 
-- 1.0 First version. 
- npc/re/other/turbo_track.txt 
-- 1.0 Split Mount Manager NPC. 
- npc/re/quests/eden/71-85.txt 
-- 1.3 Updated to match the official scripts. [Euphy] 
- npc/re/quests/eden/eden_iro.txt 
-- 1.0 First version. 
-- 1.1 Edited and added more NPCs, lots of placeholders. [Euphy] 
- npc/re/quests/eden/eden_quests.txt 
-- 1.5 Added GM management function. [Euphy] 
- npc/re/quests/first_class/tu_archer.txt 
-- 1.0 First version. [Euphy] 
- npc/re/quests/homun_s.txt 
-- Genetic quest to mutate a level 99 evolved Homunculus 
-- 1.0 First Version, entirely custom. [Masao] 
- npc/re/quests/magic_books.txt 
-- 1.1 Optimized. [Euphy] 
-- 1.1a Updated NPC name to "Master Velofos". [Euphy] 
- npc/re/quests/monstertamers.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. 
- npc/re/quests/mrsmile.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_13_1.txt 
-- 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_izlude.txt 
-- 1.1 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_lighthalzen.txt 
-- 1.2 Added Izlude duplicates. [Euphy] 
- npc/re/quests/quests_malangdo.txt 
-- 1.4a Dialogue edits, source iRO. 
-- 1.5 Added Cat Gamers. 
-- 1.6 Added GM management function. 
- npc/re/quests/quests_malaya.txt 
-- 0.4 Added "Cautious Village" and subsequent quests [DeadlySilence] 
-- 0.5 Added "Bakonawa Extermination" quest. [Euphy] 
-- 1.0 Added "Nurse in Port Malaya" and "Pintados Festival" quests. [Euphy] 
-- 1.1 Added GM management function and NPC. [Euphy] 
- npc/re/quests/quests_mora.txt 
-- 1.1 Added GM management function and NPCs. [Euphy] 
- npc/re/quests/quests_morocc.txt 
-- 1.1 Added new warpers for Satan Morroc maps. [Euphy] 
- npc/re/quests/quests_nameless.txt 
-- 1.0 Moved Dorian to pre-re/re paths. 
- npc/re/warps/cities/eclage.txt 
-- 1.0a Disabled quest warp. [Euphy] 
- npc/re/warps/cities/izlude.txt 
-- 1.7 Updated to match the official scripts. [Euphy] 
-- 1.8 Added Izlude & Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/cities/malaya.txt 
-- 1.1 Updated to match official scripts. [Masao] 
-- 1.2 Added official Jeepney warp scripts. [Euphy] 
- npc/re/warps/fields/prontera_fild.txt 
-- 1.3a Moved Izlude warp to other file. [Euphy] 
-- 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy] 
-- 1.5 Added Prontera Field 8 duplicates. [Euphy] 
- npc/re/warps/other/arena.txt 
-- 1.0 First version, Renewal warps. 
- npc/re/warps/other/jobquests.txt 
-- 2.3 Added exit warps (job_exit) for 2nd class quests. [Euphy] 
- npc/warps/fields/glastheim.txt 
-- 1.5 Fixed random warp coordinates. [Euphy] 
- npc/warps/other/arena.txt 
-- 1.3 Split Izlude warps into Pre-Renewal/Renewal paths. [Euphy] 
-- 1.4 Added GM management function. [Euphy]

1 files changed, 40 insertions, 40 deletions

diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 91555424a..5e9b26e86 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -29,7 +29,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Merry Christmas!";
 			mes "Hey! You! What comes to mind when you think about Christmas?";
 			next;
-		}else{
+		} else {
 			mes "[Caroller]";
 			mes "Jingle Bells! Jingle Bells! Jingle all the way!";
 			next;
@@ -41,7 +41,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Merry Christmas!";
 			if (Sex) {
 				mes "Hey, boy! What comes to mind when";
-			}else{
+			} else {
 				mes "Hey, girl! What comes to mind when";
 			}
 			mes "you think about Christmas?";
@@ -67,7 +67,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "If you win over Santa, you can get a gift. Would you go for it?";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't that big news?";
@@ -85,7 +85,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "Furthermore, he has put bad magic on the gifts so that they become monsters!";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Isn't it amazing?";
@@ -113,7 +113,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 						mes "[Caroller]";
 						mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 						close;
-					}else{
+					} else {
 						mes "[Caroller]";
 						mes "Wow, you have them.";
 						next;
@@ -131,13 +131,13 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion 18;
+							emotion e_heh;
 							delitem 6092,6;
 							getnameditem 12354,"+strcharinfo(0)+";
 							mes "[Caroller]";
 							mes "Let's care about others around you on this Christmas season!";
 							close;
-						}else{
+						} else {
 							mes "[Caroller]";
 							mes "Oh!";
 							mes "Shyness!";
@@ -152,7 +152,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 							mes "[Caroller]";
 							mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?";
 							next;
-							emotion 18;
+							emotion e_heh;
 							delitem 6092,6;
 							getitem 12354,1;
 							mes "[Caroller]";
@@ -230,7 +230,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 					mes "Please, for our children's hope!!!?";
 					mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
 					next;
-					emotion 33;
+					emotion e_ok;
 					mes "[Caroller]";
 					mes "They're definitely as harsh as their name.";
 					mes "Go on please!";
@@ -252,7 +252,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "Are there some spcial abilities within them?";
 				mes "There's still the designer in the Christmas village... How about asking her to make that costume?";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "It's hot, huh?";
@@ -270,7 +270,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 				mes "[Caroller]";
 				mes "And he isn't alone anymore... is what I heard...";
 				next;
-				emotion 18;
+				emotion e_heh;
 				mes "[Caroller]";
 				mes "Caroller's hot news! Ha!";
 				mes "Hotness, right?";
@@ -293,13 +293,13 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "For all of the children of this world!!!";
 			mes "Please bring me ^0000FFSinging Crystal Pieces^000000 from ^0000FFViolent Gift Boxes^000000!";
 			next;
-			emotion 33;
+			emotion e_ok;
 			mes "[Caroller]";
 			mes "Be careful!";
 			mes "They're definitely as harsh as their name.";
 			mes "Take care!!!";
 			close;
-		}else{
+		} else {
 			specialeffect EF_GLORIA;
 			mes "[Caroller]";
 			mes "Don't cry, don't cry!";
@@ -335,7 +335,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
 			delitem 6092,6;
-			emotion 33;
+			emotion e_ok;
 			set iROxmas08carol,2;
 			mes "[Caroller]";
 			mes "Those are all needed.";
@@ -354,12 +354,12 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "So, we need more of some materials.";
 			mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!";
 			next;
-			emotion 33;
+			emotion e_ok;
 			mes "[Caroller]";
 			mes "That's all we need.";
 			mes "Isn't that easy?";
 			close;
-		}else{
+		} else {
 			specialeffect EF_GLORIA;
 			mes "[Caroller]";
 			mes "Jingle bells, jingle bells,";
@@ -414,7 +414,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "[Caroller]";
 			mes "Don't worry, it tastes good.";
 			next;
-			emotion 33;
+			emotion e_ok;
 			getitem 2784,1;
 			getnameditem 12354,"+strcharinfo(0)+";
 			delitem 1019,10;
@@ -454,7 +454,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "[Santa Claus]";
 		if (Sex) {
 			mes "Ho ho ho! What a good boy!";
-		}else{
+		} else {
 			mes "Ho ho ho! What a good girl!";
 		}
 		next;
@@ -526,7 +526,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "Let's get started!";
 		next;
 		while(.@SantaCardTurn != 5) {
-			emotion 56;
+			emotion e_loud;
 			mes "[Santa Claus]";
 			mes "First let me shuffle up these cards... Ok!!!";
 			next;
@@ -581,28 +581,28 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "Let's see!!";
 			mes "One! Two! Three!";
 			if (.@SantaCardNpc == 1) {
-				cutin "Æ÷¸µÄ«µå",4;
+				cutin "����ī��",4; // Poring Card
 			}
 			else if (.@SantaCardNpc == 2) {
-				cutin "¿£Á©¸µÄ«µå",4;
+				cutin "������ī��",4; // Angeling Card
 			}
 			else if (.@SantaCardNpc == 3) {
-				cutin "°í½ºÆ®¸µÄ«µå",4;
+				cutin "����Ʈ��ī��",4; // Ghostring Card
 			}
 			next;
 			set .@SantaCardTurn,.@SantaCardTurn+1;
 			if (.@SantaCardP == .@SantaCardNpc) {
 				set .@SantaCardWins,.@SantaCardWins+1;
-				emotion 0;
-				emotion 5,1;
+				emotion e_gasp;
+				emotion e_ic,1;
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "You're lucky.";
 				mes "Can you guess the right card the next time around?";
 				next;
-			}else{
-				emotion 0;
-				emotion 23,1;
+			} else {
+				emotion e_gasp;
+				emotion e_omg,1;
 				cutin "",255;
 				mes "[Santa Claus]";
 				mes "Aww maybe next time...";
@@ -617,7 +617,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			mes "[Santa Claus]";
 			mes "Whenever you want.";
 			close;
-		}else{
+		} else {
 			mes "[Santa Claus]";
 			mes "You're so good!";
 			next;
@@ -687,7 +687,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "........................";
 		if (Sex) {
 			mes "Oh! Poor boy...";
-		}else{
+		} else {
 			mes "Oh! Poor girl...";
 		}
 		next;
@@ -695,7 +695,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		mes "........................";
 		if (Sex) {
 			mes "Oh! Poor boy...";
-		}else{
+		} else {
 			mes "Oh! Poor girl...";
 		}
 		mes "...";
@@ -728,7 +728,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "The reason catching up to him is so hard, is that his clothes have been given strong power!";
 	mes "I blessed them with good luck!";
 	next;
-	emotion 3;
+	emotion e_lv;
 	mes "[Louise Kim]";
 	mes "Preta Porter!!";
 	mes "Which is quite luxurious but sold at good price ~";
@@ -745,7 +745,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "Ah!";
 		mes "You're silly! You lost your big chance!";
 		next;
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "Come to me later if you want to get the mission.";
 		mes "I, Louise Kim, am generous enough to accept you next time.";
@@ -763,7 +763,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "Anyway, can you bring me some stuff?";
 	next;
 	if (select("Why not? What do you need?:Sorry, no time.") == 2) {
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "What?";
 		mes "You will definitely regret it.";
@@ -781,13 +781,13 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 			mes "[Louise Kim]";
 			mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free...";
 			next;
-			emotion 3;
+			emotion e_lv;
 			mes "[Louise Kim]";
 			mes "Please see me again if you are interested.";
 			close;
-	}else{
+	} else {
 		select("Here you are.");
-		emotion 33;
+		emotion e_ok;
 		mes "[Louise Kim]";
 		mes "Oh! Good!";
 		mes "Let's not delay.";
@@ -799,7 +799,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-and many blessings she sings.-";
 		next;
 		specialeffect EF_BLESSING;
-		emotion 2;
+		emotion e_ho;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -813,7 +813,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-Count your blessings and sing!-";
 		next;
 		specialeffect EF_GLORIA;
-		emotion 2;
+		emotion e_ho;
 		mes "[Louise Kim]";
 		mes "By artist, Louise Kim!";
 		mes "All over the world will be blessed tonight!";
@@ -825,7 +825,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "-cheer and goodwill!-";
 		next;
 		specialeffect EF_BENEDICTIO;
-		emotion 3;
+		emotion e_lv;
 		mes "[Louise Kim]";
 		mes "This is miraculous!";
 		mes "I am a genius of the world.";
@@ -837,7 +837,7 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 		mes "My fashion is radiant.";
 		mes "I ain't envious of Designer Pierre.";
 		next;
-		emotion 18;
+		emotion e_heh;
 		mes "[Louise Kim]";
 		mes "I am supposed to get paid well, however I will just let it be free, since this is Christmas!";
 		next;