4 files changed, 75 insertions, 10 deletions
diff --git a/src/map/clif.h b/src/map/clif.h
index 9039c489c..e92dc4db5 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -166,6 +166,13 @@ typedef enum emotion_type
 	E_ENE,
 	E_PANIC,
 	E_WHISP,        // --- 80
+	E_YUT1,
+	E_YUT2,
+	E_YUT3,
+	E_YUT4,
+	E_YUT5,
+	E_YUT6,
+	E_YUT7,
 	//
 	E_MAX
 } emotion_type;
@@ -213,6 +220,9 @@ enum map_type
 	MAPTYPE_AGIT_SIEGEV15        = 18,
 	MAPTYPE_BATTLEFIELD          = 19,
 	MAPTYPE_PVP_TOURNAMENT       = 20,
+	//Map types 21 - 24 not used.
+	MAPTYPE_SIEGE_LOWLEVEL       = 25,
+	//Map types 26 - 28 remains opens for future types.
 	MAPTYPE_UNUSED               = 29,
 };
 
@@ -243,18 +253,18 @@ enum useskill_fail_cause
 	USESKILL_FAIL_DUPLICATE = 22,
 	USESKILL_FAIL_CONDITION = 23,
 	USESKILL_FAIL_PAINTBRUSH = 24,
-	//XXX_USESKILL_FAIL_II_SURFACE_PAINTS = 25,
+	USESKILL_FAIL_DRAGON = 25,
 	USESKILL_FAIL_POS = 26,
 	USESKILL_FAIL_HELPER_SP_INSUFFICIENT = 27,
-	//XXX_USESKILL_FAIL_II_NECK_CANDY = 28,
-	//XXX_USESKILL_FAIL_II_MISERABLE_TEAR = 29,
-	//XXX_USESKILL_FAIL_II_PROTECT_NECK_CANDY = 30,
+	USESKILL_FAIL_NEER_WALL = 28,
+	USESKILL_FAIL_NEED_EXP_1PERCENT = 29,
+	USESKILL_FAIL_CHORUS_SP_INSUFFICIENT = 30,
 	USESKILL_FAIL_GC_WEAPONBLOCKING = 31,
 	USESKILL_FAIL_GC_POISONINGWEAPON = 32,
 	USESKILL_FAIL_MADOGEAR = 33,
-	//XXX_USESKILL_FAIL_II_VULCANBULLET = 34,
-	//XXX_USESKILL_FAIL_II_FUELGAS = 35,
-	//XXX_USESKILL_FAIL_II_COLDSLOWERBULLET = 36,
+	USESKILL_FAIL_NEED_EQUIPMENT_KUNAI = 34,
+	USESKILL_FAIL_TOTARGET_PLAYER = 35,
+	USESKILL_FAIL_SIZE = 36,
 	USESKILL_FAIL_CANONBALL = 37,
 	//XXX_USESKILL_FAIL_II_MADOGEAR_ACCELERATION = 38,
 	//XXX_USESKILL_FAIL_II_MADOGEAR_HOVERING_BOOSTER = 39,
@@ -298,6 +308,10 @@ enum useskill_fail_cause
 	USESKILL_FAIL_NEED_ROYAL_GUARD_BANDING = 77,
 	USESKILL_FAIL_NEED_EQUIPPED_WEAPON_CLASS = 78,
 	USESKILL_FAIL_EL_SUMMON = 79,
+	USESKILL_FAIL_RELATIONGRADE = 80,
+	USESKILL_FAIL_STYLE_CHANGE_FIGHTER = 81,
+	USESKILL_FAIL_STYLE_CHANGE_GRAPPLER = 82,
+	USESKILL_FAIL_THERE_ARE_NPC_AROUND = 83,
 };
 
 int clif_setip(const char* ip);
diff --git a/src/map/skill.c b/src/map/skill.c
index a0af5fa5c..e56a1de25 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -11602,7 +11602,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 			break;	
 
 		case UNT_ZENKAI_WATER:
-		case UNT_ZENKAI_GROUND:
+		case UNT_ZENKAI_LAND:
 		case UNT_ZENKAI_FIRE:
 		case UNT_ZENKAI_WIND:
 			if( battle_check_target(&src->bl,bl,BCT_ENEMY) > 0 ){
@@ -11612,7 +11612,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 						sc_start(bl, SC_FREEZE, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); 
 						sc_start(bl, SC_FREEZING, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); 
 						break;
-					case UNT_ZENKAI_GROUND:
+					case UNT_ZENKAI_LAND:
 						sc_start(bl, SC_STONE, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); 
 						sc_start(bl, SC_POISON, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); 
 						break;
diff --git a/src/map/skill.h b/src/map/skill.h
index c282420fd..509c53bdb 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1135,6 +1135,15 @@ enum e_skill {
 	ALL_REVERSEORCISH,
 	ALL_WEWISH,
 	ALL_SONKRAN,
+	NPC_WIDEHEALTHFEAR,
+	NPC_WIDEBODYBURNNING,
+	NPC_WIDEFROSTMISTY,
+	NPC_WIDECOLD,
+	NPC_WIDE_DEEP_SLEEP,
+	NPC_WIDESIREN,
+	NPC_VENOMFOG,
+	NPC_MILLENNIUMSHIELD,
+	NPC_COMET,
 
 	KN_CHARGEATK = 1001,
 	CR_SHRINK,
@@ -1465,6 +1474,13 @@ enum e_skill {
 	ALL_BUYING_STORE,
 	ALL_GUARDIAN_RECALL,
 	ALL_ODINS_POWER,
+	BEER_BOTTLE_CAP,
+	NPC_ASSASSINCROSS,
+	NPC_DISSONANCE,
+	NPC_UGLYDANCE,
+	ALL_TETANY,
+	ALL_RAY_OF_PROTECTION,
+	MC_CARTDECORATE,
 
 	KO_YAMIKUMO = 3001,
 	KO_RIGHT,
@@ -1756,10 +1772,11 @@ enum {
 	UNT_LAVA_SLIDE,
 	UNT_VOLCANIC_ASH,
 	UNT_ZENKAI_WATER,
-	UNT_ZENKAI_GROUND,
+	UNT_ZENKAI_LAND,
 	UNT_ZENKAI_FIRE,
 	UNT_ZENKAI_WIND,
 	UNT_MAKIBISHI,
+	UNT_VENOMFOG,
 	
 	/**
 	 * Guild Auras
diff --git a/src/map/status.h b/src/map/status.h
index 8fa812432..076720c9d 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1312,6 +1312,40 @@ enum si_type {
 	SI_ON_PUSH_CART = 673,
 	SI_HAT_EFFECT = 674,
 	SI_FLOWER_LEAF = 675,
+	SI_RAY_OF_PROTECTION = 676,
+	SI_GLASTHEIM_ATK = 677,
+	SI_GLASTHEIM_DEF = 678,
+	SI_GLASTHEIM_HEAL = 679,
+	SI_GLASTHEIM_HIDDEN = 680,
+	SI_GLASTHEIM_STATE = 681,
+	SI_GLASTHEIM_ITEMDEF = 682,
+	SI_GLASTHEIM_HPSP = 683,
+	SI_HOMUN_SKILL_POSTDELAY = 684,
+	SI_ALMIGHTY = 685,
+	SI_GVG_GIANT = 686,
+	SI_GVG_GOLEM = 687,
+	SI_GVG_STUN = 688,
+	SI_GVG_STONE = 689,
+	SI_GVG_FREEZ = 690,
+	SI_GVG_SLEEP = 691,
+	SI_GVG_CURSE = 692,
+	SI_GVG_SILENCE = 693,
+	SI_GVG_BLIND = 694,
+	SI_CLIENT_ONLY_EQUIP_ARROW = 695,
+	SI_CLAN_INFO = 696,
+	SI_JP_EVENT01 = 697,
+	SI_JP_EVENT02 = 698,
+	SI_JP_EVENT03 = 699,
+	SI_JP_EVENT04 = 700,
+	SI_TELEPORT_FIXEDCASTINGDELAY = 701,
+	SI_GEFFEN_MAGIC1 = 702,
+	SI_GEFFEN_MAGIC2 = 703,
+	SI_GEFFEN_MAGIC3 = 704,
+	SI_QUEST_BUFF1 = 705,
+	SI_QUEST_BUFF2 = 706,
+	SI_QUEST_BUFF3 = 707,
+	SI_REUSE_LIMIT_RECALL = 708,
+	SI_SAVEPOSITION = 709,
 	SI_MAX,
 };