3 files changed, 8 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8dae57d4d..3a3563eef 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 2006/08/04
+	* Hide/Chasewalk will again stop screaming skill name. [Skotlex]
+	* Soul Breaker will no longer receive Mastery damage. [Skotlex]
 	* Fixed warning:'type' might be used uninitialized in this function [Toms]
 2006/08/03
 	* Added a check to skip the experience share of characters who are dead or
diff --git a/src/map/battle.c b/src/map/battle.c
index 2bf410ca3..e4521d6ed 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1753,8 +1753,11 @@ static struct Damage battle_calc_weapon_attack(
 		if (flag.rh && wd.damage < 1) wd.damage = 1;
 		if (flag.lh && wd.damage2 < 1) wd.damage2 = 1;
 
-		if (sd && flag.weapon && skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST
-			&& skill_num != CR_GRANDCROSS)
+		if (sd && flag.weapon &&
+			skill_num != MO_INVESTIGATE &&
+		  	skill_num != MO_EXTREMITYFIST &&
+		  	skill_num != CR_GRANDCROSS &&
+		  	skill_num != ASC_BREAKER)
 		{	//Add mastery damage
 			wd.damage = battle_addmastery(sd,target,wd.damage,0);
 			if (flag.lh) wd.damage2 = battle_addmastery(sd,target,wd.damage2,1);
diff --git a/src/map/skill.c b/src/map/skill.c
index a3bf2b040..c52bb1729 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4193,7 +4193,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			i = status_change_end(bl, type, -1);
 		else
 			i = sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv));
-		clif_skill_nodamage(src,bl,skillid,skilllv,i);
+		clif_skill_nodamage(src,bl,skillid,-1,i); //Hide skill-scream animation.
 		break;
 	case TK_RUN:
 			if (tsc && tsc->data[type].timer != -1)