Merge pull request #8554 from Gacko/creaturetext

Core/DB: Creature text for 26 script files

27 files changed, 759 insertions, 412 deletions

diff --git a/sql/updates/world/2012_12_03_00_world_creature_text.sql b/sql/updates/world/2012_12_03_00_world_creature_text.sql
new file mode 100644
index 00000000000..654ed11de4f
--- /dev/null
+++ b/sql/updates/world/2012_12_03_00_world_creature_text.sql
@@ -0,0 +1,388 @@
+-- ------------------------------- --
+-- Creature text conversion part 6 --
+-- ------------------------------- --
+-- moorabi
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1604017 AND -1604010;
+DELETE FROM `creature_text` WHERE `entry`=29305;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(29305,0,0,14,0,100,"moorabi SAY_AGGRO","We fought back da Scourge. What chance joo be thinkin' JOO got?"),
+(29305,1,0,14,0,100,"moorabi SAY_SLAY_1","Who gonna stop me; you? "),
+(29305,1,1,14,0,100,"moorabi SAY_SLAY_2","Not so tough now."),
+(29305,2,0,14,0,100,"moorabi SAY_DEATH","If our gods can die... den so can we... "),
+(29305,3,0,14,0,100,"moorabi SAY_TRANSFORM","Get ready for somethin'... much... BIGGAH! "),
+(29305,4,0,14,0,100,"moorabi SAY_QUAKE","Da ground gonna swallow you up"),
+(29305,5,0,41,0,100,"moorabi EMOTE_TRANSFORM","%s begins to transform!");
+
+-- Slad'ran
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1604023 AND -1604017;
+DELETE FROM `creature_text` WHERE `entry`=29304;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(29304,0,0,41,0,100,"Slad'ran EMOTE_TRANSFORM","%s begins to transform!"),
+(29304,1,0,12,0,100,"Slad'ran SAY_SLAY_1","Ye not breathin'! Good."),
+(29304,1,1,12,0,100,"Slad'ran SAY_SLAY_2","You ssscared now?"),
+(29304,1,2,12,0,100,"Slad'ran SAY_SLAY_3","I'll eat you next, mon!"),
+(29304,2,0,12,0,100,"Slad'ran SAY_DEATH","I sssee now... Ssscourge wasss not... our greatessst enemy..."),
+(29304,3,0,12,0,100,"Slad'ran SAY_SUMMON_SNAKES","Minionsss of the scale, heed my call!"),
+(29304,4,0,12,0,100,"Slad'ran SAY_SUMMON_CONSTRICTORS","A thousssand fangs gonna rend your flesh!");
+
+-- blood queen lana thel
+DELETE FROM `creature_text` WHERE `entry`=37955 AND `groupid`=12;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(37955,12,0,41,0,100,"blood queen lana thel EMOTE_BERSERK_RAID","%s goes into a berserker rage!");
+
+-- sindragosa
+DELETE FROM `creature_text` WHERE `entry`=36853 AND `groupid`=11;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(36853,11,0,41,0,100,"sindragosa EMOTE_BERSERK_RAID","%s goes into a berserker rage!");
+
+-- anubrekhan
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533008 AND -1533000;
+DELETE FROM `creature_text` WHERE `entry`=15956;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(15956,0,0,14,8785,100,"anubrekhan SAY_AGGRO1","Just a little taste..."),
+(15956,0,1,14,8786,100,"anubrekhan SAY_AGGRO2","There is no way out."),
+(15956,0,2,14,8787,100,"anubrekhan SAY_AGGRO3","Yes, Run! It makes the blood pump faster!"),
+(15956,1,0,14,8788,100,"anubrekhan SAY_GREET1","Ahh... welcome to my parlor."),
+(15956,1,1,14,8790,100,"anubrekhan SAY_GREET2","I hear little hearts beating. Yesss... beating faster now. Soon the beating will stop."),
+(15956,1,2,14,8791,100,"anubrekhan SAY_GREET3","Where to go? What to do? So many choices that all end in pain, end in death."),
+(15956,1,3,14,8792,100,"anubrekhan SAY_GREET4","Which one shall I eat first? So difficult to choose... the all smell so delicious."),
+(15956,1,4,14,8793,100,"anubrekhan SAY_GREET5","Closer now... tasty morsels. I've been too long without food. Without blood to drink."),
+(15956,2,0,14,8789,100,"anubrekhan SAY_SLAY","Shh... it will all be over soon.");
+
+-- faerlina
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533016 AND -1533009;
+DELETE FROM `creature_text` WHERE `entry`=15953;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(15953,0,0,14,8799,100,"faerlina SAY_GREET","Your old lives, your mortal desires, mean nothing. You are acolytes of the master now, and you will serve the cause without question! The greatest glory is to die in the master's service!"),
+(15953,1,0,14,8794,100,"faerlina SAY_AGGRO1","Slay them in the master's name!"),
+(15953,1,1,14,8795,100,"faerlina SAY_AGGRO2","You cannot hide from me!"),
+(15953,1,2,14,8796,100,"faerlina SAY_AGGRO3","Kneel before me, worm!"),
+(15953,1,3,14,8797,100,"faerlina SAY_AGGRO4","Run while you still can!"),
+(15953,2,0,14,8800,100,"faerlina SAY_SLAY1","You have failed!"),
+(15953,2,1,14,8801,100,"faerlina SAY_SLAY2","Pathetic wretch!"),
+(15953,3,0,14,8798,100,"faerlina SAY_DEATH","The master... will avenge me!");
+
+-- korthazz
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533057 AND -1533051;
+DELETE FROM `creature_text` WHERE `entry`=16064;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(16064,0,0,14,8899,100,"korthazz SAY_KORT_AGGRO","Come out and fight, ye wee ninny!"),
+(16064,1,0,14,8903,100,"korthazz SAY_KORT_TAUNT1","To arms, ye roustabouts! We've got company!"),
+(16064,1,1,14,8904,100,"korthazz SAY_KORT_TAUNT2","I heard about enough of yer sniveling. Shut yer fly trap 'afore I shut it for ye!"),
+(16064,1,2,14,8905,100,"korthazz SAY_KORT_TAUNT3","I'm gonna enjoy killin' these slack-jawed daffodils!"),
+(16064,2,0,14,8902,100,"korthazz SAY_KORT_SPECIAl","I like my meat extra crispy!"),
+(16064,3,0,14,8901,100,"korthazz SAY_KORT_SLAY","Next time, bring more friends!"),
+(16064,4,0,14,8900,100,"korthazz SAY_KORT_DEATH","What a bloody waste this is!");
+
+-- blaumeux
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533050 AND -1533044;
+DELETE FROM `creature_text` WHERE `entry`=16065;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(16065,0,0,14,8892,100,"blaumeux SAY_BLAU_AGGRO","Defend youself!"),
+(16065,1,0,14,8896,100,"blaumeux SAY_BLAU_TAUNT1","Come, Zeliek, do not drive them out. Not before we've had our fun."),
+(16065,1,1,14,8897,100,"blaumeux SAY_BLAU_TAUNT2","I do hope they stay alive long enough for me to... introduce myself."),
+(16065,1,2,14,8898,100,"blaumeux SAY_BLAU_TAUNT3","The first kill goes to me! Anyone care to wager?"),
+(16065,2,0,14,8895,100,"blaumeux SAY_BLAU_SPECIAL","Your life is mine!"),
+(16065,3,0,14,8894,100,"blaumeux SAY_BLAU_SLAY","Who's next?"),
+(16065,4,0,14,8893,100,"blaumeux SAY_BLAU_DEATH","Tou... che!");
+
+-- rivendare
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533074 AND -1533065;
+DELETE FROM `creature_text` WHERE `entry`=30549;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(30549,0,0,14,14571,100,"rivendare SAY_RIVE_AGGRO1","You seek death?"),
+(30549,0,1,14,14572,100,"rivendare SAY_RIVE_AGGRO2","None shall pass!"),
+(30549,0,2,14,14573,100,"rivendare SAY_RIVE_AGGRO3","Be still!"),
+(30549,1,0,14,14577,100,"rivendare SAY_RIVE_TAUNT1","Enough prattling. Let them come! We shall grind their bones to dust."),
+(30549,1,1,14,14578,100,"rivendare SAY_RIVE_TAUNT2","Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough."),
+(30549,1,2,14,14579,100,"rivendare SAY_RIVE_TAUNT3","Life is meaningless. It is in death that we are truly tested."),
+(30549,2,0,14,14576,100,"rivendare SAY_RIVE_SPECIAL","Bow to the might of the scourge!"),
+(30549,3,0,14,14574,100,"rivendare SAY_RIVE_SLAY1","You will find no peace in death."),
+(30549,3,1,14,14575,100,"rivendare SAY_RIVE_SLAY2","The master's will is done."),
+(30549,4,0,14,14580,100,"rivendare SAY_RIVE_DEATH","Death... will not stop me...");
+
+-- zeliek
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533064 AND -1533058;
+DELETE FROM `creature_text` WHERE `entry`=16063;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(16063,0,0,14,8913,100,"zeliek SAY_ZELI_AGGRO","Flee, before it's too late!"),
+(16063,1,0,14,8917,100,"zeliek SAY_ZELI_TAUNT1","Invaders, cease this foolish venture at once! Turn away while you still can!"),
+(16063,1,1,14,8918,100,"zeliek SAY_ZELI_TAUNT2","Perhaps they will come to their senses, and run away as fast as they can!"),
+(16063,1,2,14,8919,100,"zeliek SAY_ZELI_TAUNT3","Do not continue! Turn back while there's still time!"),
+(16063,2,0,14,8916,100,"zeliek SAY_ZELI_SPECIAL","I- I have no choice but to obey!"),
+(16063,3,0,14,8915,100,"zeliek SAY_ZELI_SLAY","Forgive me!"),
+(16063,4,0,14,8914,100,"zeliek SAY_ZELI_DEATH","It is... as it should be.");
+
+-- gothik
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533043 AND -1533040;
+DELETE FROM `creature_text` WHERE `entry`=16060;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(16060,0,0,14,8807,100,"gothik SAY_SPEECH","Foolishly you have sought your own demise. Brazenly you have disregarded powers beyond your understanding. You have fought hard to invade the realm of the harvester. Now there is only one way out - to walk the lonely path of the damned."),
+(16060,1,0,14,8806,100,"gothik SAY_KILL","Death is the only escape."),
+(16060,2,0,14,8805,100,"gothik SAY_DEATH","I... am... undone!"),
+(16060,3,0,14,8808,100,"gothik SAY_TELEPORT","I have waited long enough! Now, you face the harvester of souls!");
+
+-- heigan
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533118 AND -1533109;
+DELETE FROM `creature_text` WHERE `entry`=15936;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(15936,0,0,14,8825,100,"heigan SAY_AGGRO1","You are mine now!"),
+(15936,0,1,14,8826,100,"heigan SAY_AGGRO2","I see you!"),
+(15936,0,2,14,8827,100,"heigan SAY_AGGRO3","You...are next!"),
+(15936,1,0,14,8829,100,"heigan SAY_SLAY","Close your eyes... sleep!"),
+(15936,2,0,14,8830,100,"heigan SAY_TAUNT1","The races of the world will perish. It is only a matter of time."),
+(15936,2,1,14,8831,100,"heigan SAY_TAUNT2","I see endless suffering, I see torment, I see rage. I see... everything!"),
+(15936,2,2,14,8832,100,"heigan SAY_TAUNT3","Soon... the world will tremble!"),
+(15936,2,3,14,8833,100,"heigan SAY_TAUNT4","The end is upon you."),
+(15936,2,4,14,8834,100,"heigan SAY_TAUNT5","Hungry worms will feast on your rotten flesh!"),
+(15936,3,0,14,8828,100,"heigan SAY_DEATH","Noo... o...");
+
+-- noth
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533081 AND -1533075;
+DELETE FROM `creature_text` WHERE `entry`=15954;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(15954,0,0,14,8845,100,"noth SAY_AGGRO1","Glory to the master!"),
+(15954,0,1,14,8846,100,"noth SAY_AGGRO2","Your life is forfeit!"),
+(15954,0,2,14,8847,100,"noth SAY_AGGRO3","Die, trespasser!"),
+(15954,1,0,14,8851,100,"noth SAY_SUMMON","Rise, my soldiers! Rise and fight once more!"),
+(15954,2,0,14,8849,100,"noth SAY_SLAY1","My task is done!"),
+(15954,2,1,14,8850,100,"noth SAY_SLAY2","Breathe no more!"),
+(15954,3,0,14,8848,100,"noth SAY_DEATH","I will serve the master... in... death!");
+
+-- patchwerk
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533022 AND -1533017;
+DELETE FROM `creature_text` WHERE `entry`=16028;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(16028,0,0,14,8909,100,"patchwerk SAY_AGGRO1","Patchwerk want to play!"),
+(16028,0,1,14,8910,100,"patchwerk SAY_AGGRO2","Kel'Thuzad make Patchwerk his Avatar of War!"),
+(16028,1,0,14,8912,100,"patchwerk SAY_SLAY","No more play?"),
+(16028,2,0,14,8911,100,"patchwerk SAY_DEATH","What happened to... Patch..."),
+(16028,3,0,16,0,100,"patchwerk EMOTE_BERSERK","goes into a berserker rage!"),
+(16028,4,0,16,0,100,"patchwerk EMOTE_ENRAGE","%s becomes enraged!");
+
+-- stalagg
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533025 AND -1533023;
+DELETE FROM `creature_text` WHERE `entry`=15929;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(15929,0,0,14,8864,100,"stalagg SAY_STAL_AGGRO","Stalagg crush you!"),
+(15929,1,0,14,8866,100,"stalagg SAY_STAL_SLAY","Stalagg kill!"),
+(15929,2,0,14,8865,100,"stalagg SAY_STAL_DEATH","Master save me...");
+
+-- feugen
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533028 AND -1533026;
+DELETE FROM `creature_text` WHERE `entry`=15930;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(15930,0,0,14,8802,100,"feugen SAY_FEUG_AGGRO","Feed you to master!"),
+(15930,1,0,14,8804,100,"feugen SAY_FEUG_SLAY","Feugen make master happy!"),
+(15930,2,0,14,8803,100,"feugen SAY_FEUG_DEATH","No... more... Feugen...");
+
+-- thaddius
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533039 AND -1533029;
+DELETE FROM `creature_text` WHERE `entry`=15928;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(15928,0,0,14,8872,100,"thaddius SAY_GREET","You are too late... I... must... OBEY!"),
+(15928,1,0,14,8867,100,"thaddius SAY_AGGRO1","KILL!"),
+(15928,1,1,14,8868,100,"thaddius SAY_AGGRO2","EAT YOUR BONES!"),
+(15928,1,2,14,8869,100,"thaddius SAY_AGGRO3","BREAK YOU!"),
+(15928,2,0,14,8877,100,"thaddius SAY_SLAY","You die now!"),
+(15928,3,0,14,8871,100,"thaddius SAY_ELECT","Now YOU feel pain!"),
+(15928,4,0,14,8870,100,"thaddius SAY_DEATH","Thank... you..."),
+(15928,5,0,14,8873,100,"thaddius SAY_SCREAM1","Pleeease!"),
+(15928,5,1,14,8874,100,"thaddius SAY_SCREAM2","Stop, make it stop!"),
+(15928,5,2,14,8875,100,"thaddius SAY_SCREAM3","Help me! Save me!"),
+(15928,5,3,14,8876,100,"thaddius SAY_SCREAM4","Please, nooo!");
+
+-- anomalus
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576013 AND -1576010;
+DELETE FROM `creature_text` WHERE `entry`=26763;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(26763,0,0,14,13186,100,"anomalus SAY_AGGRO","Chaos beckons."),
+(26763,1,0,14,13187,100,"anomalus SAY_DEATH","Of course."),
+(26763,2,0,14,13188,100,"anomalus SAY_RIFT","Reality... unwoven."),
+(26763,3,0,14,13189,100,"anomalus SAY_SHIELD","Indestructible.");
+
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576044 AND -1576040;
+DELETE FROM `creature_text` WHERE `entry`=26723;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(26723,0,0,14,13450,100,"keristrasza SAY_AGGRO","Preserve? Why? There's no truth in it. No no no... only in the taking! I see that now!"),
+(26723,1,0,14,13453,100,"keristrasza SAY_SLAY","Now we've come to the truth!"),
+(26723,2,0,14,13452,100,"keristrasza SAY_ENRAGE","Finish it! FINISH IT! Kill me, or I swear by the Dragonqueen you'll never see daylight again!"),
+(26723,3,0,14,13454,100,"keristrasza SAY_DEATH","Dragonqueen... Life-Binder... preserve... me."),
+(26723,4,0,14,13451,100,"keristrasza SAY_CRYSTAL_NOVA","Stay. Enjoy your final moments.");
+
+-- grand magus telestra
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1576005 AND -1576000;
+DELETE FROM `creature_text` WHERE `entry`=26731;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(26731,0,0,14,13319,100,"grand magus telestra SAY_AGGRO","You know what they say about curiosity."),
+(26731,1,0,14,13324,100,"grand magus telestra SAY_KILL","Death becomes you!"),
+(26731,2,0,14,13320,100,"grand magus telestra SAY_DEATH","Damn the... luck."),
+(26731,3,0,14,13323,100,"grand magus telestra SAY_MERGE","Now to finish the job!"),
+(26731,4,0,14,13321,100,"grand magus telestra SAY_SPLIT_1","There's plenty of me to go around."),
+(26731,4,1,14,13322,100,"grand magus telestra SAY_SPLIT_2","I'll give you more than you can handle.");
+
+-- drakos
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1578016 AND -1578005;
+DELETE FROM `creature_text` WHERE `entry`=27654;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(27654,0,0,14,13594,100,"drakos SAY_AGGRO","The prisoners shall not go free! The word of Malygos is law!"),
+(27654,1,0,14,13602,100,"drakos SAY_KILL_1","A fitting punishment!"),
+(27654,1,1,14,13603,100,"drakos SAY_KILL_2","Sentence: executed!"),
+(27654,1,2,14,13604,100,"drakos SAY_KILL_3","Another casualty of war!"),
+(27654,2,0,14,13605,100,"drakos SAY_DEATH","The war... goes on."),
+(27654,3,0,14,13598,100,"drakos SAY_PULL_1","It is too late to run!"),
+(27654,3,1,14,13599,100,"drakos SAY_PULL_2","Gather 'round...."),
+(27654,3,2,14,13600,100,"drakos SAY_PULL_3","None shall escape!"),
+(27654,3,3,14,13601,100,"drakos SAY_PULL_4","I condemn you to death!"),
+(27654,4,0,14,13595,100,"drakos SAY_STOMP_1","Tremble, worms!"),
+(27654,4,1,14,13596,100,"drakos SAY_STOMP_2","I will crush you!"),
+(27654,4,2,14,13597,100,"drakos SAY_STOMP_3","Can you fly?");
+
+-- urom
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1578004 AND -1578000;
+DELETE FROM `creature_text` WHERE `entry`=27655;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(27655,0,0,14,0,100,"urom SAY_AGGRO_1","What do we have here... those that would defy the Spell-Weaver? Those without foresight our understanding. How can i make you see? Malygos is saving the world from itself! Bah! You are hardly worth my time!"),
+(27655,1,0,14,0,100,"urom SAY_AGGRO_2","Clearly my pets failed. Perhaps another demonstration is in order."),
+(27655,2,0,14,0,100,"urom SAY_AGGRO_3","Still you fight. Still you cling to misguided principles. If you survive, you'll find me in the center ring."),
+(27655,3,0,14,0,100,"urom SAY_AGGRO_4","Poor blind fools!"),
+(27655,4,0,14,0,100,"urom SAY_TELEPORT","A taste... just a small taste... of the Spell-Weaver's power!");
+
+-- injured rainspeaker oracle
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571002 AND -1571000;
+DELETE FROM `creature_text` WHERE `entry`=28217;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(28217,0,0,12,0,100,"injured rainspeaker oracle SAY_END_IRO","You save me! We thank you. We going to go back to village now. You come too... you can stay with us! Puppy-men kind of mean anyway. "),
+(28217,1,0,12,0,100,"injured rainspeaker oracle SAY_QUEST_ACCEPT_IRO ","Let me know when you ready to go, okay?"),
+(28217,2,0,12,0,100,"injured rainspeaker oracle SAY_START_IRO","Home time!");
+
+-- vekjik
+DELETE FROM `script_texts` WHERE `entry`=-1000208;
+DELETE FROM `creature_text` WHERE `entry`=28315;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(28315,0,0,12,0,100,"vekjik SAY_TEXTID_VEKJIK1","Frenzyheart kill you if you come back. You no welcome here no more!");
+
+-- engineer helice
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800053 AND -1800047;
+DELETE FROM `creature_text` WHERE `entry`=28787;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(28787,0,0,12,0,100,"engineer helice SAY_WP_1","We made it! Thank you for getting me out of that hell hole. Tell Hemet to expect me!"),
+(28787,1,0,12,0,100,"engineer helice SAY_WP_2","You really shouldn't play with this stuff. Someone could get hurt."),
+(28787,2,0,12,0,100,"engineer helice SAY_WP_3","Oh, look, it's another cartload of explosives! Let's help them dispose of it."),
+(28787,3,0,12,0,100,"engineer helice SAY_WP_4","It's getting a little hot over here. Shall we move on?"),
+(28787,4,0,12,0,100,"engineer helice SAY_WP_5","Or THIS is what you get."),
+(28787,5,0,12,0,100,"engineer helice SAY_WP_6","Listen up, Venture Company goons! Rule #1: Never keep the prisoner near the explosives."),
+(28787,6,0,12,0,100,"engineer helice SAY_WP_7","Let's get the hell out of here");
+
+-- adventurous dwarf
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1571043 AND -1571042;
+DELETE FROM `creature_text` WHERE `entry`=28604;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(28604,0,0,12,0,100,"adventurous dwarf SAY_DWARF_OUCH","Ouch! Watch where you're tugging!"),
+(28604,1,0,12,0,100,"adventurous dwarf SAY_DWARF_HELP","Glad I could help!");
+
+-- agnetta
+DELETE FROM `script_texts` WHERE `entry`=-1571003;
+DELETE FROM `creature_text` WHERE `entry`=30154;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(30154,0,0,12,0,100,"agnetta SAY_AGGRO","I'm not afraid of anything -- bring it on!");
+
+-- injured goblin
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800043 AND -1800042;
+DELETE FROM `creature_text` WHERE `entry`=29434;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(29434,0,0,12,0,100,"injured goblin SAY_QUEST_START","Let me know when you're ready. I'd prefer sooner than later... what with the slowly dying from poison and all."),
+(29434,1,0,12,0,100,"injured goblin SAY_END_WP_REACHED","I'm going to bring the venom sack to Ricket... and then... you know... collapse. Thank you for helping me!");
+
+-- krystallus
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599010 AND -1599007;
+DELETE FROM `creature_text` WHERE `entry`=27977;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(27977,0,0,14,14176,100,"krystallus SAY_AGGRO","Crush...."),
+(27977,1,0,14,14177,100,"krystallus SAY_KILL","Ha...ha...ha...ha..."),
+(27977,2,0,14,14179,100,"krystallus SAY_DEATH","Uuuuhhhhhhhhhh......"),
+(27977,3,0,14,14178,100,"krystallus SAY_SHATTER","Break.... you....");
+
+-- maiden of grief
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599006 AND -1599000;
+DELETE FROM `creature_text` WHERE `entry`=27975;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(27975,0,0,14,13487,100,"maiden of grief SAY_AGGRO","You shouldn't have come...now you will die!"),
+(27975,1,0,14,13488,100,"maiden of grief SAY_SLAY_1","Why must it be this way?"),
+(27975,1,1,14,13489,100,"maiden of grief SAY_SLAY_2","You had it coming!"),
+(27975,1,2,14,13490,100,"maiden of grief SAY_SLAY_3","My burden grows heavier."),
+(27975,1,3,14,13491,100,"maiden of grief SAY_SLAY_4","This is your own fault!"),
+(27975,2,0,14,13493,100,"maiden of grief SAY_DEATH","I hope you all rot! I never...wanted...this."),
+(27975,3,0,14,13492,100,"maiden of grief SAY_STUN","So much lost time... that you'll never get back!");
+
+-- Sjonnir
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599006 AND -1599000;
+DELETE FROM `creature_text` WHERE `entry`=27978;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(27978,0,0,14,14180,100,"Sjonnir SAY_AGGRO","Soft, vulnerable shells. Brief, fragile lives. You can not escape the curse of flesh!"),
+(27978,1,0,14,14182,100,"Sjonnir SAY_SLAY_1","Flesh is no match for iron!"),
+(27978,1,1,14,14183,100,"Sjonnir SAY_SLAY_2","Armies of iron will smother the world!"),
+(27978,1,2,12,0,100,"Sjonnir SAY_SLAY_3","Folvynn buul hrom onn!"),
+(27978,2,0,14,14184,100,"Sjonnir SAY_DEATH","Loken will not rest, until the forge is retaken. You changed nothing!");
+
+-- halls of stone
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1599068 AND -1599016;
+DELETE FROM `creature_text` WHERE `entry` IN (30898,30899,30897,28070);
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+-- brann
+(28070,0,0,14,14244,100,"brann SAY_KILL_1","Now that's owning your supper!"),
+(28070,0,1,14,14245,100,"brann SAY_KILL_2","Press on, that's the way!"),
+(28070,0,2,14,14246,100,"brann SAY_KILL_3","Keep it up now. Plenty of death-dealing for everyone!"),
+(28070,1,0,14,14257,100,"brann SAY_LOW_HEALTH","I'm all kinds of busted up. Might not... make it..."),
+(28070,2,0,14,14258,100,"brann SAY_DEATH","Not yet, not... yet-"),
+(28070,3,0,14,14260,100,"brann SAY_PLAYER_DEATH_1","I'm doing everything I can!"),
+(28070,3,1,14,14261,100,"brann SAY_PLAYER_DEATH_2","Light preserve you!"),
+(28070,3,2,14,14262,100,"brann SAY_PLAYER_DEATH_3","I hope this is all worth it!"),
+(28070,4,0,14,14259,100,"brann SAY_ESCORT_START","Time to get some answers! Let's get this show on the road!"),
+(28070,5,0,14,14274,100,"brann SAY_SPAWN_DWARF","Don't worry. Old Brann has got your back. Keep that metal monstrosity busy and I'll see if I can sweet talk this machine into helping you."),
+(28070,6,0,14,14275,100,"brann SAY_SPAWN_TROGG","This is a wee bit trickier that before... Oh, bloody--incomin'!"),
+(28070,7,0,14,14276,100,"brann SAY_SPAWN_OOZE","What in the name o' Madoran did THAT do? Oh! Wait: I just about got it..."),
+(28070,8,0,14,14277,100,"brann SAY_SPAWN_EARTHEN","Ha, that did it. Help's a-coming. Take this you glow-eying brute!"),
+(28070,9,0,14,14247,100,"brann SAY_EVENT_INTRO_1","Take a moment and relish this with me! Soon all will be revealed! Okay then, let's do this!"),
+(28070,10,0,14,14248,100,"brann SAY_EVENT_INTRO_2","Now keep an eye out! I'll have this licked in two shakes of a--"),
+(28070,11,0,14,14249,100,"brann SAY_EVENT_A_1","Oh, that doesn't sound good. We might have a complication or two..."),
+(28070,12,0,14,14250,100,"brann SAY_EVENT_A_3","Ah, you want to play hardball, eh? That's just my game!"),
+(28070,13,0,14,14251,100,"brann SAY_EVENT_B_1","Couple more minutes and I'll--"),
+(28070,14,0,14,14252,100,"brann SAY_EVENT_B_3","Heightened? What's the good news?"),
+(28070,15,0,14,14253,100,"brann SAY_EVENT_C_1","So that was the problem? Now I'm makin' progress..."),
+(28070,16,0,14,14254,100,"brann SAY_EVENT_C_3","Hang on! Nobody's gonna' be sanitized as long as I have a say in it!"),
+(28070,17,0,14,14255,100,"brann SAY_EVENT_D_1","Ha! The old magic fingers finally won through! Now let's get down to-"),
+(28070,18,0,14,14256,100,"brann SAY_EVENT_D_3","Purge? No no no no no! Where did I-- Aha, this should do the trick..."),
+(28070,19,0,14,14263,100,"brann SAY_EVENT_END_01","Query? What do you think I'm here for? Tea and biscuits? Spill the beans already!"),
+(28070,20,0,14,14264,100,"brann SAY_EVENT_END_02","Tell me how that dwarfs came to be! And start at the beginning!"),
+(28070,21,0,14,14265,100,"brann SAY_EVENT_END_04","Right, right! I know that the Earthen were made of stone to shape the deep reaches of the world but what about the anomalies? Matrix non-stabilizing and whatnot."),
+(28070,22,0,14,14266,100,"brann SAY_EVENT_END_06","Necro-what? Speak bloody common will ya?"),
+(28070,23,0,14,14267,100,"brann SAY_EVENT_END_08","Old Gods eh? So they zapped the Earthen with this Curse of Flesh. And then what?"),
+(28070,24,0,14,14268,100,"brann SAY_EVENT_END_10","If they killed the Old Gods Azeroth would have been destroyed."),
+(28070,25,0,14,14269,100,"brann SAY_EVENT_END_12","What protectors?"),
+(28070,26,0,14,14270,100,"brann SAY_EVENT_END_14","Aesir and Vanir. Okay. So the Forge of Wills started to make new Earthen. But what happened to the old ones?"),
+(28070,27,0,14,14271,100,"brann SAY_EVENT_END_16","Hold everything! The Aesir and Vanir went to war? Why?"),
+(28070,28,0,14,14272,100,"brann SAY_EVENT_END_18","This Loken sounds like a nasty character. Glad we don't have to worry about the likes of him anymore. So if I'm understanding you lads the original Earthen eventually woke up from this statis. And by that time this destabily-whatever had turned them into our brother dwarfs. Or at least dwarf ancestors. Hm?"),
+(28070,29,0,14,14273,100,"brann SAY_EVENT_END_20","Well now. That's a lot to digest. I'm gonna need some time to take all of this in. Thank you!"),
+(28070,30,0,14,14278,100,"brann SAY_VICTORY_SJONNIR_1","Loken?! That's downright bothersome... We might've neutralized the iron dwarves, but I'd lay odds there's another machine somewhere else churnin' out a whole mess o' these iron vrykul!"),
+(28070,31,0,14,14279,100,"brann SAY_VICTORY_SJONNIR_2","I'll use the forge to make badtches o' earthen to stand guard... But our greatest challenge still remains: find and stop Loken!"),
+(28070,32,0,14,0,100,"brann SAY_ENTRANCE_MEET","I think it's time to see what's behind the door near the entrance. I'm going to sneak over there, nice and quiet. Meet me at the door and I'll get us in."),
+-- marnak
+(30897,0,0,14,13761,100,"brann SAY_EVENT_B_2_MARN","Threat index threshold exceeded. Celestial archive aborted. Security level heightened."),
+(30897,1,0,14,13762,100,"brann SAY_EVENT_END_15_MARN","Additional background is relevant to your query. Following global combat between-"),
+(30897,2,0,14,13763,100,"brann SAY_EVENT_END_17_MARN","Unknown. Data suggests that impetus for global combat originated with prime designate Loken who neutralized all remaining Aesir and Vanir affecting termination of conflict. Prime designate Loken then initiated stasis of several seed races including Earthen, Giant and Vrykul at designated holding facilities."),
+(30897,3,0,14,13764,100,"brann SAY_EVENT_END_19_MARN","Essentially that is correct."),
+-- kaddrak
+(30898,0,0,14,13756,100,"brann SAY_EVENT_A_2_KADD","Security breach in progress. Analysis of historical archives transferred to lower priority queue. Countermeasures engaged."),
+(30898,1,0,14,13757,100,"brann SAY_EVENT_END_09_KADD","Accessing. Creators arrived to extirpate symbiotic infection. Assessment revealed that Old God infestation had grown malignant. Excising parasites would result in loss of host."),
+(30898,2,0,14,13758,100,"brann SAY_EVENT_END_11_KADD","Correct. Creators neutralized parasitic threat and contained it within the host. Forge of Wills and other systems were instituted to create new Earthen. Safeguards were implemented and protectors were appointed."),
+(30898,3,0,14,13759,100,"brann SAY_EVENT_END_13_KADD","Designations: Aesir and Vanir or in common nomenclator Storm and Earth Giants. Sentinel Loken designated supreme. Dragon Aspects appointed to monitor evolution of Azeroth."),
+-- abedneum
+(30899,0,0,14,13765,100,"brann SAY_EVENT_INTRO_3_ABED","Warning! Life form pattern not recognized. Archival processing terminated. Continued interference will result in targeted response."),
+(30899,1,0,14,13767,100,"brann SAY_EVENT_C_2_ABED","Critical threat index. Void analysis diverted. Initiating sanitization protocol."),
+(30899,2,0,14,13768,100,"brann SAY_EVENT_D_2_ABED","Alert! Security fail safes deactivated. Beginning memory purge..."),
+(30899,3,0,14,13769,100,"brann SAY_EVENT_D_4_ABED","System online. Life form pattern recognized. Welcome Branbronzan. Query?"),
+(30899,4,0,14,13770,100,"brann SAY_EVENT_END_03_ABED","Accessing prehistoric data. Retrieved. In the beginning Earthen were created to-"),
+(30899,5,0,14,13771,100,"brann SAY_EVENT_END_05_ABED","Accessing. In the early stages of its development cycle Azeroth suffered infection by parasitic, necrophotic symbiotes."),
+(30899,6,0,14,13772,100,"brann SAY_EVENT_END_07_ABED","Designation: Old Gods. Old Gods rendered all systems, including Earthen defenseless in order to facilitate assimilation. This matrix destabilization has been termed the Curse of Flesh. Effects of destabilization increased over time."),
+(30899,7,0,14,13773,100,"brann SAY_EVENT_END_21_ABED","Acknowledged Branbronzan. Session terminated.");
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index 45c55f7ec9b..d5e10aedd70 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -34,14 +34,12 @@ enum eSpells
 
 enum eSays
 {
-    SAY_AGGRO                                     = -1604010,
-    //SAY_SLAY_1                                  = -1604011, // not in db
-    SAY_SLAY_2                                    = -1604012,
-    SAY_SLAY_3                                    = -1604013,
-    SAY_DEATH                                     = -1604014,
-    SAY_TRANSFORM                                 = -1604015,
-    SAY_QUAKE                                     = -1604016,
-    EMOTE_TRANSFORM                               = -1604017
+    SAY_AGGRO                                     = 0,
+    SAY_SLAY                                      = 1,
+    SAY_DEATH                                     = 2,
+    SAY_TRANSFORM                                 = 3,
+    SAY_QUAKE                                     = 4,
+    EMOTE_TRANSFORM                               = 5
 };
 
 #define DATA_LESS_RABI                            1
@@ -86,7 +84,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
             DoCast(me, SPELL_MOJO_FRENZY, true);
 
             if (instance)
@@ -107,7 +105,7 @@ public:
 
             if (uiGroundTremorTimer <= uiDiff)
             {
-                DoScriptText(SAY_QUAKE, me);
+                Talk(SAY_QUAKE);
                 if (bPhase)
                     DoCast(me->getVictim(), SPELL_QUAKE, true);
                 else
@@ -135,8 +133,8 @@ public:
 
             if (!bPhase && uiTransformationTImer <= uiDiff)
             {
-                DoScriptText(EMOTE_TRANSFORM, me);
-                DoScriptText(SAY_TRANSFORM, me);
+                Talk(EMOTE_TRANSFORM);
+                Talk(SAY_TRANSFORM);
                 DoCast(me, SPELL_TRANSFORMATION, false);
                 uiTransformationTImer = 10*IN_MILLISECONDS;
             } else uiTransformationTImer -= uiDiff;
@@ -154,7 +152,7 @@ public:
 
          void JustDied(Unit* /*killer*/)
          {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (instance)
                 instance->SetData(DATA_MOORABI_EVENT, DONE);
@@ -165,7 +163,7 @@ public:
             if (victim == me)
                 return;
 
-            DoScriptText(RAND(SAY_SLAY_2, SAY_SLAY_3), me);
+            Talk(SAY_SLAY);
         }
     };
 
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index f35228d44d9..39bb7a3699d 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
@@ -35,13 +35,11 @@ enum Spells
 //Yell
 enum Yells
 {
-    SAY_AGGRO                                     = -1604017,
-    SAY_SLAY_1                                    = -1604018,
-    SAY_SLAY_2                                    = -1604019,
-    SAY_SLAY_3                                    = -1604020,
-    SAY_DEATH                                     = -1604021,
-    SAY_SUMMON_SNAKES                             = -1604022,
-    SAY_SUMMON_CONSTRICTORS                       = -1604023
+    SAY_AGGRO                                     = 0,
+    SAY_SLAY                                      = 1,
+    SAY_DEATH                                     = 2,
+    SAY_SUMMON_SNAKES                             = 3,
+    SAY_SUMMON_CONSTRICTORS                       = 4
 };
 
 //Creatures
@@ -117,7 +115,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             if (instance)
                 instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS);
@@ -163,13 +161,13 @@ public:
 
             if (uiPhase == 0 && HealthBelowPct(30))
             {
-                DoScriptText(SAY_SUMMON_SNAKES, me);
+                Talk(SAY_SUMMON_SNAKES);
                 uiPhase = 1;
             }
 
             if (uiPhase == 1 && HealthBelowPct(25))
             {
-                DoScriptText(SAY_SUMMON_CONSTRICTORS, me);
+                Talk(SAY_SUMMON_CONSTRICTORS);
                 uiPhase = 2;
             }
 
@@ -178,7 +176,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
             lSummons.DespawnAll();
 
             if (instance)
@@ -187,7 +185,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
+            Talk(SAY_SLAY);
         }
 
         void JustSummoned(Creature* summoned)
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 0d092ec86b2..2b240bc93d8 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -37,6 +37,7 @@ enum Texts
     SAY_WIPE                    = 9,
     SAY_BERSERK                 = 10,
     SAY_DEATH                   = 11,
+    EMOTE_BERSERK_RAID          = 12
 };
 
 enum Spells
@@ -336,7 +337,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
                     switch (eventId)
                     {
                         case EVENT_BERSERK:
-                            DoScriptText(EMOTE_GENERIC_BERSERK_RAID, me);
+                            Talk(EMOTE_BERSERK_RAID);
                             Talk(SAY_BERSERK);
                             DoCast(me, SPELL_BERSERK);
                             break;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index a12a38b2f62..96cabfed918 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -36,6 +36,7 @@ enum Texts
                                              // A flaw of mortality...
     SAY_BERSERK                         = 9, // Enough! I tire of these games!
     SAY_DEATH                           = 10, // Free...at last...
+    EMOTE_BERSERK_RAID                  = 11
 };
 
 enum Spells
@@ -440,7 +441,7 @@ class boss_sindragosa : public CreatureScript
                     switch (eventId)
                     {
                         case EVENT_BERSERK:
-                            DoScriptText(EMOTE_GENERIC_BERSERK_RAID, me);
+                            Talk(EMOTE_BERSERK_RAID);
                             Talk(SAY_BERSERK);
                             DoCast(me, SPELL_BERSERK);
                             break;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index 8901a61e79d..61ce8817b17 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -19,11 +19,14 @@
 #include "ScriptedCreature.h"
 #include "naxxramas.h"
 
-#define SAY_GREET           RAND(-1533000, -1533004, -1533005, -1533006, -1533007)
-#define SAY_AGGRO           RAND(-1533001, -1533002, -1533003)
-#define SAY_SLAY            -1533008
+enum Anubrekhan
+{
+    SAY_AGGRO           = 0,
+    SAY_GREET           = 1,
+    SAY_SLAY            = 2,
 
-#define MOB_CRYPT_GUARD     16573
+    MOB_CRYPT_GUARD     = 16573
+};
 
 const Position GuardSummonPos = {3333.72f, -3476.30f, 287.1f, 6.2801f};
 
@@ -97,7 +100,7 @@ public:
                 if (victim->GetTypeId() == TYPEID_PLAYER)
                     victim->CastSpell(victim, SPELL_SUMMON_CORPSE_SCARABS_PLR, true, NULL, NULL, me->GetGUID());
 
-            DoScriptText(SAY_SLAY, me);
+            Talk(SAY_SLAY);
         }
 
         void JustDied(Unit* /*killer*/)
@@ -111,7 +114,7 @@ public:
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
             events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000));
             events.ScheduleEvent(EVENT_LOCUST, 90000);
             events.ScheduleEvent(EVENT_BERSERK, 600000);
@@ -124,7 +127,7 @@ public:
         {
             if (!hasTaunted && me->IsWithinDistInMap(who, 60.0f) && who->GetTypeId() == TYPEID_PLAYER)
             {
-                DoScriptText(SAY_GREET, me);
+                Talk(SAY_GREET);
                 hasTaunted = true;
             }
             ScriptedAI::MoveInLineOfSight(who);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
index a75f87e91af..58db1d9caea 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
@@ -22,14 +22,10 @@
 
 enum Yells
 {
-    SAY_GREET       = -1533009,
-    SAY_AGGRO_1     = -1533010,
-    SAY_AGGRO_2     = -1533011,
-    SAY_AGGRO_3     = -1533012,
-    SAY_AGGRO_4     = -1533013,
-    SAY_SLAY_1      = -1533014,
-    SAY_SLAY_2      = -1533015,
-    SAY_DEATH       = -1533016
+    SAY_GREET       = 0,
+    SAY_AGGRO       = 1,
+    SAY_SLAY        = 2,
+    SAY_DEATH       = 3
 };
 
 enum Spells
@@ -71,7 +67,7 @@ class boss_faerlina : public CreatureScript
             void EnterCombat(Unit* /*who*/)
             {
                 _EnterCombat();
-                DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4), me);
+                Talk(SAY_AGGRO);
                 events.ScheduleEvent(EVENT_POISON, urand(10000, 15000));
                 events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000));
                 events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000));
@@ -88,7 +84,7 @@ class boss_faerlina : public CreatureScript
             {
                 if (!_introDone && who->GetTypeId() == TYPEID_PLAYER)
                 {
-                    DoScriptText(SAY_GREET, me);
+                    Talk(SAY_GREET);
                     _introDone = true;
                 }
 
@@ -98,13 +94,13 @@ class boss_faerlina : public CreatureScript
             void KilledUnit(Unit* /*victim*/)
             {
                 if (!urand(0, 2))
-                    DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
+                    Talk(SAY_SLAY);
             }
 
             void JustDied(Unit* /*killer*/)
             {
                 _JustDied();
-                DoScriptText(SAY_DEATH, me);
+                Talk(SAY_DEATH);
             }
 
             void SpellHit(Unit* caster, SpellInfo const* spell)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index 29a0a11af9b..7785044e7d1 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -73,17 +73,14 @@ const uint32 SPELL_SECONDARY_H[]=   {0, 57464, 0, 57465};
 const uint32 SPELL_PUNISH[]     =   {0, 57381, 0, 57377};
 #define SPELL_BERSERK               26662
 
-// used by 16063, 16064, 16065, 30549, but signed for 16063
-const int32 SAY_AGGRO[]     =   {-1533051, -1533044, -1533065, -1533058};
-const int32 SAY_TAUNT[3][4] ={  {-1533052, -1533045, -1533071, -1533059},
-                                {-1533053, -1533046, -1533072, -1533060},
-                                {-1533054, -1533047, -1533073, -1533061}, };
-const int32 SAY_SPECIAL[]   =   {-1533055, -1533048, -1533070, -1533062};
-const int32 SAY_SLAY[]      =   {-1533056, -1533049, -1533068, -1533063};
-const int32 SAY_DEATH[]     =   {-1533057, -1533050, -1533074, -1533064};
-
-#define SAY_BARON_AGGRO     RAND(-1533065, -1533066, -1533067)
-#define SAY_BARON_SLAY      RAND(-1533068, -1533069)
+enum FourHorsemen
+{
+    SAY_AGGRO       = 0,
+    SAY_TAUNT       = 1,
+    SAY_SPECIAL     = 2,
+    SAY_SLAY        = 3,
+    SAY_DEATH       = 4
+};
 
 class boss_four_horsemen : public CreatureScript
 {
@@ -295,12 +292,7 @@ public:
         void KilledUnit(Unit* /*victim*/)
         {
             if (!(rand()%5))
-            {
-                if (id == HORSEMEN_BARON)
-                    DoScriptText(SAY_BARON_SLAY, me);
-                else
-                    DoScriptText(SAY_SLAY[id], me);
-            }
+                Talk(SAY_SLAY);
         }
 
         void JustDied(Unit* /*killer*/)
@@ -321,17 +313,13 @@ public:
                 instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 59450);
             }
 
-            DoScriptText(SAY_DEATH[id], me);
+            Talk(SAY_DEATH);
         }
 
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
-
-            if (id == HORSEMEN_BARON)
-                DoScriptText(SAY_BARON_AGGRO, me);
-            else
-                DoScriptText(SAY_AGGRO[id], me);
+            Talk(SAY_AGGRO);
 
             events.ScheduleEvent(EVENT_MARK, 15000);
             events.ScheduleEvent(EVENT_CAST, 20000+rand()%5000);
@@ -360,13 +348,13 @@ public:
                 {
                     case EVENT_MARK:
                         if (!(rand()%5))
-                            DoScriptText(SAY_SPECIAL[id], me);
+                            Talk(SAY_SPECIAL);
                         DoCastAOE(SPELL_MARK[id]);
                         events.ScheduleEvent(EVENT_MARK, 15000);
                         break;
                     case EVENT_CAST:
                         if (!(rand()%5))
-                            DoScriptText(SAY_TAUNT[rand()%3][id], me);
+                            Talk(SAY_TAUNT);
 
                         if (caster)
                         {
@@ -379,7 +367,7 @@ public:
                         events.ScheduleEvent(EVENT_CAST, 15000);
                         break;
                     case EVENT_BERSERK:
-                        DoScriptText(SAY_SPECIAL[id], me);
+                        Talk(SAY_SPECIAL);
                         DoCast(me, EVENT_BERSERK);
                         break;
                 }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index d335d36e112..14043f00939 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -24,10 +24,10 @@
 
 enum Yells
 {
-    SAY_SPEECH                  = -1533040,
-    SAY_KILL                    = -1533041,
-    SAY_DEATH                   = -1533042,
-    SAY_TELEPORT                = -1533043
+    SAY_SPEECH                  = 0,
+    SAY_KILL                    = 1,
+    SAY_DEATH                   = 2,
+    SAY_TELEPORT                = 3
 };
 
 //Gothik
@@ -209,7 +209,7 @@ class boss_gothik : public CreatureScript
                 waveCount = 0;
                 events.ScheduleEvent(EVENT_SUMMON, 30000);
                 DoTeleportTo(PosPlatform);
-                DoScriptText(SAY_SPEECH, me);
+                Talk(SAY_SPEECH);
                 if (instance)
                     instance->SetData(DATA_GOTHIK_GATE, GO_STATE_READY);
             }
@@ -239,7 +239,7 @@ class boss_gothik : public CreatureScript
             void KilledUnit(Unit* /*victim*/)
             {
                 if (!(rand()%5))
-                    DoScriptText(SAY_KILL, me);
+                    Talk(SAY_KILL);
             }
 
             void JustDied(Unit* /*killer*/)
@@ -247,7 +247,7 @@ class boss_gothik : public CreatureScript
                 LiveTriggerGUID.clear();
                 DeadTriggerGUID.clear();
                 _JustDied();
-                DoScriptText(SAY_DEATH, me);
+                Talk(SAY_DEATH);
                 if (instance)
                     instance->SetData(DATA_GOTHIK_GATE, GO_STATE_ACTIVE);
             }
@@ -452,7 +452,7 @@ class boss_gothik : public CreatureScript
                             else
                             {
                                 phaseTwo = true;
-                                DoScriptText(SAY_TELEPORT, me);
+                                Talk(SAY_TELEPORT);
                                 DoTeleportTo(PosGroundLiveSide);
                                 me->SetReactState(REACT_AGGRESSIVE);
                                 DummyEntryCheckPredicate pred;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index e7126ba7e33..0018c58f4cb 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -21,14 +21,17 @@
 #include "naxxramas.h"
 #include "Player.h"
 
-#define SAY_AGGRO           RAND(-1533109, -1533110, -1533111)
-#define SAY_SLAY            -1533112
-#define SAY_TAUNT           RAND(-1533113, -1533114, -1533115, -1533116, -1533117)
-#define SAY_DEATH           -1533118
-
-#define SPELL_SPELL_DISRUPTION  29310
-#define SPELL_DECREPIT_FEVER    RAID_MODE(29998, 55011)
-#define SPELL_PLAGUE_CLOUD      29350
+enum Heigan
+{
+    SPELL_DECREPIT_FEVER        = 29998, // 25-man: 55011
+    SPELL_SPELL_DISRUPTION      = 29310,
+    SPELL_PLAGUE_CLOUD          = 29350,
+
+    SAY_AGGRO                   = 0,
+    SAY_SLAY                    = 1,
+    SAY_TAUNT                   = 2,
+    SAY_DEATH                   = 3
+};
 
 enum Events
 {
@@ -70,7 +73,7 @@ public:
         void KilledUnit(Unit* who)
         {
             if (!(rand()%5))
-                DoScriptText(SAY_SLAY, me);
+                Talk(SAY_SLAY);
             if (who->GetTypeId() == TYPEID_PLAYER)
                 safetyDance = false;
         }
@@ -92,13 +95,13 @@ public:
         void JustDied(Unit* /*killer*/)
         {
             _JustDied();
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
         }
 
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
             EnterPhase(PHASE_FIGHT);
             safetyDance = true;
         }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 9167db45d20..183fb40e5a0 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -33,32 +33,23 @@ EndScriptData */
 enum Yells
 {
     //when shappiron dies. dialog between kel and lich king (in this order)
-    SAY_SAPP_DIALOG1                                       = -1533084, //not used
-    SAY_SAPP_DIALOG2_LICH                                  = -1533085, //not used
-    SAY_SAPP_DIALOG3                                       = -1533086, //not used
-    SAY_SAPP_DIALOG4_LICH                                  = -1533087, //not used
-    SAY_SAPP_DIALOG5                                       = -1533088, //not used
-    SAY_CAT_DIED                                           = -1533089, //when cat dies, not used
+    SAY_SAPP_DIALOG1                                       = 0, //not used
+    SAY_SAPP_DIALOG2_LICH                                  = 1, //not used
+    SAY_SAPP_DIALOG3                                       = 2, //not used
+    SAY_SAPP_DIALOG4_LICH                                  = 3, //not used
+    SAY_SAPP_DIALOG5                                       = 4, //not used
+    SAY_CAT_DIED                                           = 5, //when cat dies, not used
     //when each of the 4 wing bosses dies
-    SAY_TAUNT1                                             = -1533090, //not used
-    SAY_TAUNT2                                             = -1533091, //not used
-    SAY_TAUNT3                                             = -1533092, //not used
-    SAY_TAUNT4                                             = -1533093, //not used
-    SAY_SUMMON_MINIONS                                     = -1533105, //start of phase 1
-    SAY_AGGRO_1                                            = -1533094, //start of phase 2
-    SAY_AGGRO_2                                            = -1533095,
-    SAY_AGGRO_3                                            = -1533096,
-    SAY_SLAY_1                                             = -1533097,
-    SAY_SLAY_2                                             = -1533098,
-    SAY_DEATH                                              = -1533099,
-    SAY_CHAIN_1                                            = -1533100,
-    SAY_CHAIN_2                                            = -1533101,
-    SAY_FROST_BLAST                                        = -1533102,
-    SAY_SPECIAL_1                                          = -1533106,
-    SAY_SPECIAL_2                                          = -1533107,
-    SAY_SPECIAL_3                                          = -1533108,
-    SAY_REQUEST_AID                                        = -1533103, //start of phase 3
-    SAY_ANSWER_REQUEST                                     = -1533104  //lich king answer
+    SAY_TAUNT                                              = 6,
+    SAY_AGGRO                                              = 7,
+    SAY_SLAY                                               = 8,
+    SAY_DEATH                                              = 9,
+    SAY_CHAIN                                              = 10,
+    SAY_FROST_BLAST                                        = 11,
+    SAY_REQUEST_AID                                        = 12, //start of phase 3
+    SAY_ANSWER_REQUEST                                     = 13, //lich king answer
+    SAY_SUMMON_MINIONS                                     = 14, //start of phase 1
+    SAY_SPECIAL                                            = 15
 };
 
 enum Events
@@ -341,13 +332,13 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
+            Talk(SAY_SLAY);
         }
 
         void JustDied(Unit* /*killer*/)
         {
             _JustDied();
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             std::map<uint64, float>::const_iterator itr;
             for (itr = chained.begin(); itr != chained.end(); ++itr)
@@ -370,7 +361,7 @@ public:
                     pPortal->ResetDoorOrButton();
             }
             DoCast(me, SPELL_KELTHUZAD_CHANNEL, false);
-            DoScriptText(SAY_SUMMON_MINIONS, me);
+            Talk(SAY_SUMMON_MINIONS);
             Phase = 1;
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE);
             me->SetFloatValue(UNIT_FIELD_COMBATREACH, 4);
@@ -435,7 +426,7 @@ public:
                             break;
                         case EVENT_PHASE:
                             events.Reset();
-                            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
+                            Talk(SAY_AGGRO);
                             spawns.DespawnAll();
                             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE);
                             me->CastStop();
@@ -464,10 +455,10 @@ public:
                     if (HealthBelowPct(45))
                     {
                         Phase = 3;
-                        DoScriptText(SAY_REQUEST_AID, me);
+                        Talk(SAY_REQUEST_AID);
                         //here Lich King should respond to KelThuzad but I don't know which Creature to make talk
                         //so for now just make Kelthuzad says it.
-                        DoScriptText(SAY_ANSWER_REQUEST, me);
+                        Talk(SAY_ANSWER_REQUEST);
 
                         for (uint8 i = 0; i <= 3; ++i)
                         {
@@ -523,7 +514,7 @@ public:
                                 }
                             }
                             if (!chained.empty())
-                                DoScriptText(RAND(SAY_CHAIN_1, SAY_CHAIN_2), me);
+                                Talk(SAY_CHAIN);
                             events.RepeatEvent(urand(100000, 180000));
                             break;
                         }
@@ -627,7 +618,7 @@ public:
                                 std::vector<Unit*>::const_iterator itr = unitList.begin();
                                 advance(itr, rand()%unitList.size());
                                 DoCast(*itr, SPELL_MANA_DETONATION);
-                                DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2, SAY_SPECIAL_3), me);
+                                Talk(SAY_SPECIAL);
                             }
 
                             events.RepeatEvent(urand(20000, 50000));
@@ -642,7 +633,7 @@ public:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true))
                                 DoCast(target, SPELL_FROST_BLAST);
                             if (rand()%2)
-                                DoScriptText(SAY_FROST_BLAST, me);
+                                Talk(SAY_FROST_BLAST);
                             events.RepeatEvent(urand(30000, 90000));
                             break;
                         default:
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index d106b99ace0..b670e36fa96 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -19,21 +19,25 @@
 #include "ScriptedCreature.h"
 #include "naxxramas.h"
 
-#define SAY_AGGRO               RAND(-1533075, -1533076, -1533077)
-#define SAY_SUMMON              -1533078
-#define SAY_SLAY                RAND(-1533079, -1533080)
-#define SAY_DEATH               -1533081
+enum Noth
+{
+    SAY_AGGRO                       = 0,
+    SAY_SUMMON                      = 1,
+    SAY_SLAY                        = 2,
+    SAY_DEATH                       = 3,
 
-#define SOUND_DEATH      8848
+    SOUND_DEATH                     = 8848,
 
-#define SPELL_CURSE_PLAGUEBRINGER       RAID_MODE(29213, 54835)
-#define SPELL_BLINK                     RAND(29208, 29209, 29210, 29211)
-#define SPELL_CRIPPLE                   RAID_MODE(29212, 54814)
-#define SPELL_TELEPORT                  29216
+    SPELL_CURSE_PLAGUEBRINGER       = 29213, // 25-man: 54835
+    SPELL_CRIPPLE                   = 29212, // 25-man: 54814
+    SPELL_TELEPORT                  = 29216,
 
-#define MOB_WARRIOR         16984
-#define MOB_CHAMPION        16983
-#define MOB_GUARDIAN        16981
+    MOB_WARRIOR                     = 16984,
+    MOB_CHAMPION                    = 16983,
+    MOB_GUARDIAN                    = 16981
+};
+
+#define SPELL_BLINK                     RAND(29208, 29209, 29210, 29211)
 
 // Teleport position of Noth on his balcony
 #define TELE_X 2631.370f
@@ -90,7 +94,7 @@ public:
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
             balconyCount = 0;
             EnterPhaseGround();
         }
@@ -115,7 +119,7 @@ public:
         void KilledUnit(Unit* /*victim*/)
         {
             if (!(rand()%5))
-                DoScriptText(SAY_SLAY, me);
+                Talk(SAY_SLAY);
         }
 
         void JustSummoned(Creature* summon)
@@ -128,7 +132,7 @@ public:
         void JustDied(Unit* /*killer*/)
         {
             _JustDied();
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
         }
 
         void SummonUndead(uint32 entry, uint32 num)
@@ -157,7 +161,7 @@ public:
                         events.ScheduleEvent(EVENT_CURSE, urand(50000, 60000));
                         return;
                     case EVENT_WARRIOR:
-                        DoScriptText(SAY_SUMMON, me);
+                        Talk(SAY_SUMMON);
                         SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3));
                         events.ScheduleEvent(EVENT_WARRIOR, 30000);
                         return;
@@ -178,7 +182,7 @@ public:
                         waveCount = 0;
                         return;
                     case EVENT_WAVE:
-                        DoScriptText(SAY_SUMMON, me);
+                        Talk(SAY_SUMMON);
                         switch (balconyCount)
                         {
                             case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index b1b57836a89..d4b3f5ddce0 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -30,12 +30,11 @@ enum Spells
 
 enum Yells
 {
-    SAY_AGGRO_1                                 = -1533017,
-    SAY_AGGRO_2                                 = -1533018,
-    SAY_SLAY                                    = -1533019,
-    SAY_DEATH                                   = -1533020,
-    EMOTE_BERSERK                               = -1533021,
-    EMOTE_ENRAGE                                = -1533022,
+    SAY_AGGRO                                   = 0,
+    SAY_SLAY                                    = 1,
+    SAY_DEATH                                   = 2,
+    EMOTE_BERSERK                               = 3,
+    EMOTE_ENRAGE                                = 4
 };
 
 enum Events
@@ -78,20 +77,20 @@ public:
         void KilledUnit(Unit* /*Victim*/)
         {
             if (!(rand()%5))
-                DoScriptText(SAY_SLAY, me);
+                Talk(SAY_SLAY);
         }
 
         void JustDied(Unit* /*killer*/)
         {
             _JustDied();
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
         }
 
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
             Enraged = false;
-            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me);
+            Talk(SAY_AGGRO);
             events.ScheduleEvent(EVENT_HATEFUL, 1000);
             events.ScheduleEvent(EVENT_BERSERK, 360000);
 
@@ -137,7 +136,7 @@ public:
                     }
                     case EVENT_BERSERK:
                         DoCast(me, SPELL_BERSERK, true);
-                        DoScriptText(EMOTE_BERSERK, me);
+                        Talk(EMOTE_BERSERK);
                         events.ScheduleEvent(EVENT_SLIME, 2000);
                         break;
                     case EVENT_SLIME:
@@ -150,7 +149,7 @@ public:
             if (!Enraged && HealthBelowPct(5))
             {
                 DoCast(me, SPELL_FRENZY, true);
-                DoScriptText(EMOTE_ENRAGE, me);
+                Talk(EMOTE_ENRAGE);
                 Enraged = true;
             }
 
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index 4dd7cbf6a66..aebd7fdc19c 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -245,7 +245,7 @@ class boss_sapphiron : public CreatureScript
                         switch (eventId)
                         {
                             case EVENT_BERSERK:
-                                DoScriptText(EMOTE_ENRAGE, me);
+                                Talk(EMOTE_ENRAGE);
                                 DoCast(me, SPELL_BERSERK);
                                 return;
                             case EVENT_CLEAVE:
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 482f8a1200d..c86cf1e9f28 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -24,9 +24,9 @@
 //Stalagg
 enum StalaggYells
 {
-    SAY_STAL_AGGRO          = -1533023, //not used
-    SAY_STAL_SLAY           = -1533024, //not used
-    SAY_STAL_DEATH          = -1533025  //not used
+    SAY_STAL_AGGRO          = 0,
+    SAY_STAL_SLAY           = 1,
+    SAY_STAL_DEATH          = 2
 };
 
 enum StalagSpells
@@ -40,9 +40,9 @@ enum StalagSpells
 //Feugen
 enum FeugenYells
 {
-    SAY_FEUG_AGGRO          = -1533026, //not used
-    SAY_FEUG_SLAY           = -1533027, //not used
-    SAY_FEUG_DEATH          = -1533028 //not used
+    SAY_FEUG_AGGRO          = 0,
+    SAY_FEUG_SLAY           = 1,
+    SAY_FEUG_DEATH          = 2
 };
 
 enum FeugenSpells
@@ -67,17 +67,12 @@ enum ThaddiusActions
 //Thaddius
 enum ThaddiusYells
 {
-    SAY_GREET               = -1533029, //not used
-    SAY_AGGRO_1             = -1533030,
-    SAY_AGGRO_2             = -1533031,
-    SAY_AGGRO_3             = -1533032,
-    SAY_SLAY                = -1533033,
-    SAY_ELECT               = -1533034, //not used
-    SAY_DEATH               = -1533035,
-    SAY_SCREAM1             = -1533036, //not used
-    SAY_SCREAM2             = -1533037, //not used
-    SAY_SCREAM3             = -1533038, //not used
-    SAY_SCREAM4             = -1533039 //not used
+    SAY_GREET               = 0,
+    SAY_AGGRO               = 1,
+    SAY_SLAY                = 2,
+    SAY_ELECT               = 3,
+    SAY_DEATH               = 4,
+    SAY_SCREAM              = 5
 };
 
 enum ThaddiusSpells
@@ -155,13 +150,13 @@ public:
         void KilledUnit(Unit* /*victim*/)
         {
             if (!(rand()%5))
-                DoScriptText(SAY_SLAY, me);
+                Talk(SAY_SLAY);
         }
 
         void JustDied(Unit* /*killer*/)
         {
             _JustDied();
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
         }
 
         void DoAction(const int32 action)
@@ -198,7 +193,7 @@ public:
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
-            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
+            Talk(SAY_AGGRO);
             events.ScheduleEvent(EVENT_SHIFT, 30000);
             events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000));
             events.ScheduleEvent(EVENT_BERSERK, 360000);
@@ -315,13 +310,21 @@ public:
             magneticPullTimer = 20000;
         }
 
+        void KilledUnit(Unit* /*victim*/)
+        {
+            if (!(rand()%5))
+                Talk(SAY_STAL_SLAY);
+        }
+
         void EnterCombat(Unit* /*who*/)
         {
+            Talk(SAY_STAL_AGGRO);
             DoCast(SPELL_STALAGG_TESLA);
         }
 
         void JustDied(Unit* /*killer*/)
         {
+            Talk(SAY_STAL_DEATH);
             if (instance)
                 if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
                     if (pThaddius->AI())
@@ -399,13 +402,21 @@ public:
             staticFieldTimer = 5000;
         }
 
+        void KilledUnit(Unit* /*victim*/)
+        {
+            if (!(rand()%5))
+                Talk(SAY_FEUG_SLAY);
+        }
+
         void EnterCombat(Unit* /*who*/)
         {
+            Talk(SAY_FEUG_AGGRO);
             DoCast(SPELL_FEUGEN_TESLA);
         }
 
         void JustDied(Unit* /*killer*/)
         {
+            Talk(SAY_FEUG_DEATH);
             if (instance)
                 if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS)))
                     if (pThaddius->AI())
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index 80a5336a30c..2d89e5db0f0 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -38,10 +38,10 @@ enum Adds
 
 enum Yells
 {
-    SAY_AGGRO                                     = -1576010,
-    SAY_DEATH                                     = -1576011,
-    SAY_RIFT                                      = -1576012,
-    SAY_SHIELD                                    = -1576013
+    SAY_AGGRO                                     = 0,
+    SAY_DEATH                                     = 1,
+    SAY_RIFT                                      = 2,
+    SAY_SHIELD                                    = 3
 };
 
 enum RiftSpells
@@ -96,7 +96,7 @@ class boss_anomalus : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
-                DoScriptText(SAY_AGGRO, me);
+                Talk(SAY_AGGRO);
 
                 if (instance)
                     instance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS);
@@ -104,7 +104,7 @@ class boss_anomalus : public CreatureScript
 
             void JustDied(Unit* /*killer*/)
             {
-                DoScriptText(SAY_DEATH, me);
+                Talk(SAY_DEATH);
 
                 if (instance)
                     instance->SetData(DATA_ANOMALUS_EVENT, DONE);
@@ -155,7 +155,7 @@ class boss_anomalus : public CreatureScript
                 if ((Phase == 0) && HealthBelowPct(50))
                 {
                     Phase = 1;
-                    DoScriptText(SAY_SHIELD, me);
+                    Talk(SAY_SHIELD);
                     DoCast(me, SPELL_RIFT_SHIELD);
                     if (Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000))
                     {
@@ -163,7 +163,7 @@ class boss_anomalus : public CreatureScript
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             Rift->AI()->AttackStart(target);
                         uiChaoticRiftGUID = Rift->GetGUID();
-                        DoScriptText(SAY_RIFT, me);
+                        Talk(SAY_RIFT);
                     }
                 }
 
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index bbd86ec6a9f..c110a4a3e85 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -40,11 +40,11 @@ enum Spells
 enum Yells
 {
     //Yell
-    SAY_AGGRO                                     = -1576040,
-    SAY_SLAY                                      = -1576041,
-    SAY_ENRAGE                                    = -1576042,
-    SAY_DEATH                                     = -1576043,
-    SAY_CRYSTAL_NOVA                              = -1576044
+    SAY_AGGRO                                     = 0,
+    SAY_SLAY                                      = 1,
+    SAY_ENRAGE                                    = 2,
+    SAY_DEATH                                     = 3,
+    SAY_CRYSTAL_NOVA                              = 4
 };
 
 enum Misc
@@ -100,7 +100,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
             DoCastAOE(SPELL_INTENSE_COLD);
 
             if (instance)
@@ -109,7 +109,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (instance)
                 instance->SetData(DATA_KERISTRASZA_EVENT, DONE);
@@ -117,7 +117,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(SAY_SLAY, me);
+            Talk(SAY_SLAY);
         }
 
         bool CheckContainmentSpheres(bool remove_prison = false)
@@ -174,7 +174,7 @@ public:
 
             if (!bEnrage && HealthBelowPct(25))
             {
-                DoScriptText(SAY_ENRAGE, me);
+                Talk(SAY_ENRAGE);
                 DoCast(me, SPELL_ENRAGE);
                 bEnrage = true;
             }
@@ -193,7 +193,7 @@ public:
 
             if (uiCrystalChainsCrystalizeTimer <= diff)
             {
-                DoScriptText(SAY_CRYSTAL_NOVA, me);
+                Talk(SAY_CRYSTAL_NOVA);
                 if (IsHeroic())
                     DoCast(me, SPELL_CRYSTALIZE);
                 else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 317a9845e87..c8d3cc6416c 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -43,12 +43,11 @@ enum Creatures
 
 enum Yells
 {
-    SAY_AGGRO                                     = -1576000,
-    SAY_KILL                                      = -1576001,
-    SAY_DEATH                                     = -1576002,
-    SAY_MERGE                                     = -1576003,
-    SAY_SPLIT_1                                   = -1576004,
-    SAY_SPLIT_2                                   = -1576005,
+    SAY_AGGRO                                     = 0,
+    SAY_KILL                                      = 1,
+    SAY_DEATH                                     = 2,
+    SAY_MERGE                                     = 3,
+    SAY_SPLIT                                     = 4
 };
 
 #define ACTION_MAGUS_DEAD                         1
@@ -122,7 +121,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             if (instance)
                 instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS);
@@ -130,7 +129,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (instance)
                 instance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE);
@@ -138,7 +137,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(SAY_KILL, me);
+            Talk(SAY_KILL);
         }
 
         void DoAction(int32 const action)
@@ -251,7 +250,7 @@ public:
                     uiArcaneMagusGUID = 0;
                     bIsWaitingToAppear = true;
                     uiIsWaitingToAppearTimer = 4*IN_MILLISECONDS;
-                    DoScriptText(SAY_MERGE, me);
+                    Talk(SAY_MERGE);
                 }
                 else
                     return;
@@ -270,7 +269,7 @@ public:
                 bFireMagusDead = false;
                 bFrostMagusDead = false;
                 bArcaneMagusDead = false;
-                DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me);
+                Talk(SAY_SPLIT);
                 return;
             }
 
@@ -287,7 +286,7 @@ public:
                 bFireMagusDead = false;
                 bFrostMagusDead = false;
                 bArcaneMagusDead = false;
-                DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me);
+                Talk(SAY_SPLIT);
                 return;
             }
 
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
index 38808bc718d..1af1edcdf71 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
@@ -26,17 +26,15 @@ Script Data End */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
-#define SPELL_BATTLE_SHOUT                                       31403
-#define SPELL_CHARGE                                             60067
-#define SPELL_FRIGHTENING_SHOUT                                  19134
-#define SPELL_WHIRLWIND_1                                        38619
-#define SPELL_WHIRLWIND_2                                        38618
+enum CommanderStoutbeard
+{
+    SPELL_BATTLE_SHOUT              = 31403,
+    SPELL_CHARGE                    = 60067,
+    SPELL_FRIGHTENING_SHOUT         = 19134,
+    SPELL_WHIRLWIND_1               = 38619,
+    SPELL_WHIRLWIND_2               = 38618
+};
 
-//not used
-//Yell
-#define SAY_AGGRO                                              -1576021
-#define SAY_KILL                                               -1576022
-#define SAY_DEATH                                              -1576023
 
 class boss_commander_stoutbeard : public CreatureScript
 {
@@ -53,10 +51,6 @@ public:
         boss_commander_stoutbeardAI(Creature* creature) : ScriptedAI(creature) {}
 
         void Reset() {}
-        void EnterCombat(Unit* /*who*/)
-        {
-            DoScriptText(SAY_AGGRO, me);
-        }
         void AttackStart(Unit* /*who*/) {}
         void MoveInLineOfSight(Unit* /*who*/) {}
         void UpdateAI(const uint32 /*diff*/)
@@ -67,10 +61,6 @@ public:
 
             DoMeleeAttackIfReady();
         }
-        void JustDied(Unit* /*killer*/)
-        {
-            DoScriptText(SAY_DEATH, me);
-        }
     };
 
 };
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 035e1a9a6df..60f9a3ddc9a 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -31,18 +31,11 @@ enum Spells
 
 enum Yells
 {
-    SAY_AGGRO                                     = -1578005,
-    SAY_KILL_1                                    = -1578006,
-    SAY_KILL_2                                    = -1578007,
-    SAY_KILL_3                                    = -1578008,
-    SAY_DEATH                                     = -1578009,
-    SAY_PULL_1                                    = -1578010,
-    SAY_PULL_2                                    = -1578011,
-    SAY_PULL_3                                    = -1578012,
-    SAY_PULL_4                                    = -1578013,
-    SAY_STOMP_1                                   = -1578014,
-    SAY_STOMP_2                                   = -1578015,
-    SAY_STOMP_3                                   = -1578016
+    SAY_AGGRO                                     = 0,
+    SAY_KILL                                      = 1,
+    SAY_DEATH                                     = 2,
+    SAY_PULL                                      = 3,
+    SAY_STOMP                                     = 4
 };
 
 enum DrakosAchievement
@@ -85,7 +78,7 @@ public:
         void EnterCombat(Unit* /*who*/)
         {
             _EnterCombat();
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
         }
 
         void UpdateAI(const uint32 diff)
@@ -122,7 +115,7 @@ public:
                         events.ScheduleEvent(EVENT_MAGIC_PULL, 15000);
                         break;
                     case EVENT_STOMP:
-                        DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2, SAY_STOMP_3), me);
+                        Talk(SAY_STOMP);
                         DoCast(SPELL_THUNDERING_STOMP);
                         events.ScheduleEvent(EVENT_STOMP, 17000);
                         break;
@@ -136,7 +129,7 @@ public:
         {
             _JustDied();
 
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             // start achievement timer (kill Eregos within 20 min)
             instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
@@ -144,7 +137,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me);
+            Talk(SAY_KILL);
         }
     private:
         bool postPull;
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index 51e476785ff..44e2628e778 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -45,11 +45,11 @@ enum Spells
 
 enum Yells
 {
-    SAY_AGGRO_1                                   = -1578000,
-    SAY_AGGRO_2                                   = -1578001,
-    SAY_AGGRO_3                                   = -1578002,
-    SAY_AGGRO_4                                   = -1578003,
-    SAY_TELEPORT                                  = -1578004,
+    SAY_AGGRO_1                                   = 0,
+    SAY_AGGRO_2                                   = 1,
+    SAY_AGGRO_3                                   = 2,
+    SAY_AGGRO_4                                   = 3,
+    SAY_TELEPORT                                  = 1
 };
 
 enum eCreature
@@ -84,11 +84,6 @@ static uint32 TeleportSpells[]=
     SPELL_SUMMON_MENAGERIE, SPELL_SUMMON_MENAGERIE_2, SPELL_SUMMON_MENAGERIE_3
 };
 
-static int32 SayAggro[]=
-{
-    SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4
-};
-
 class boss_urom : public CreatureScript
 {
 public:
@@ -153,7 +148,7 @@ public:
             {
                 if (me->Attack(who, true))
                 {
-                    DoScriptText(SayAggro[3], me);
+                    Talk(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4));
 
                     me->SetInCombatWith(who);
                     who->SetInCombatWith(me);
@@ -217,7 +212,7 @@ public:
             if (!instance || instance->GetData(DATA_UROM_PLATAFORM) > 2)
                 return;
 
-            DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)], me);
+            Talk(instance->GetData(DATA_UROM_PLATAFORM) < 5 ? instance->GetData(DATA_UROM_PLATAFORM) : 0);
             DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]);
         }
 
@@ -233,7 +228,7 @@ public:
             if (teleportTimer <= uiDiff)
             {
                 me->InterruptNonMeleeSpells(false);
-                DoScriptText(SAY_TELEPORT, me);
+                Talk(SAY_TELEPORT);
                 me->GetMotionMaster()->MoveIdle();
                 DoCast(SPELL_TELEPORT);
                 teleportTimer = urand(30000, 35000);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 93bea92503c..747bd699c81 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -45,10 +45,10 @@ enum Spells
 
 enum Yells
 {
-    SAY_AGGRO                                   = -1599007,
-    SAY_KILL                                    = -1599008,
-    SAY_DEATH                                   = -1599009,
-    SAY_SHATTER                                 = -1599010
+    SAY_AGGRO                                   = 0,
+    SAY_KILL                                    = 1,
+    SAY_DEATH                                   = 2,
+    SAY_SHATTER                                 = 3
 };
 
 class boss_krystallus : public CreatureScript
@@ -93,7 +93,7 @@ public:
         }
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             if (instance)
                 instance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS);
@@ -146,7 +146,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (instance)
                 instance->SetData(DATA_KRYSTALLUS_EVENT, DONE);
@@ -156,7 +156,7 @@ public:
         {
             if (victim == me)
                 return;
-            DoScriptText(SAY_KILL, me);
+            Talk(SAY_KILL);
         }
 
         void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index 8d113bce226..4511b8b0f1e 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -40,13 +40,10 @@ enum Spells
 
 enum Yells
 {
-    SAY_AGGRO                                     = -1599000,
-    SAY_SLAY_1                                    = -1599001,
-    SAY_SLAY_2                                    = -1599002,
-    SAY_SLAY_3                                    = -1599003,
-    SAY_SLAY_4                                    = -1599004,
-    SAY_DEATH                                     = -1599005,
-    SAY_STUN                                      = -1599006
+    SAY_AGGRO                                     = 0,
+    SAY_SLAY                                      = 1,
+    SAY_DEATH                                     = 2,
+    SAY_STUN                                      = 3
 };
 
 enum Achievements
@@ -94,7 +91,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             if (instance)
             {
@@ -138,7 +135,7 @@ public:
             if (ShockOfSorrowTimer <= diff)
             {
                 DoResetThreat();
-                DoScriptText(SAY_STUN, me);
+                Talk(SAY_STUN);
                 DoCast(me, SPELL_SHOCK_OF_SORROW_N);
                 ShockOfSorrowTimer = urand(20000, 30000);
             } else ShockOfSorrowTimer -= diff;
@@ -160,7 +157,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (instance)
                 instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE);
@@ -171,7 +168,7 @@ public:
             if (victim == me)
                 return;
 
-            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me);
+            Talk(SAY_SLAY);
         }
     };
 
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index c3e815f57dd..326779661cc 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -44,11 +44,9 @@ enum Spells
 
 enum Yells
 {
-    SAY_AGGRO                                              = -1599011,
-    SAY_SLAY_1                                             = -1599012,
-    SAY_SLAY_2                                             = -1599013,
-    SAY_SLAY_3                                             = -1599014,
-    SAY_DEATH                                              = -1599015
+    SAY_AGGRO                                              = 0,
+    SAY_SLAY                                               = 1,
+    SAY_DEATH                                              = 2
 };
 
 #define EMOTE_GENERIC_FRENZY                               -1000002
@@ -132,7 +130,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             uiEncounterTimer = 0;
 
@@ -217,7 +215,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
             lSummons.DespawnAll();
 
             if (instance)
@@ -227,7 +225,7 @@ public:
         {
             if (victim == me)
                 return;
-            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
+            Talk(SAY_SLAY);
         }
 
         void DoAction(int32 const action)
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index 3c03508a14c..677541b2dfd 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -24,68 +24,62 @@
 
 enum Texts
 {
-    SAY_KILL_1                          = -1599016,
-    SAY_KILL_2                          = -1599017,
-    SAY_KILL_3                          = -1599018,
-    SAY_LOW_HEALTH                      = -1599019,
-    SAY_DEATH                           = -1599020,
-    SAY_PLAYER_DEATH_1                  = -1599021,
-    SAY_PLAYER_DEATH_2                  = -1599022,
-    SAY_PLAYER_DEATH_3                  = -1599023,
-    SAY_ESCORT_START                    = -1599024,
-
-    SAY_SPAWN_DWARF                     = -1599025,
-    SAY_SPAWN_TROGG                     = -1599026,
-    SAY_SPAWN_OOZE                      = -1599027,
-    SAY_SPAWN_EARTHEN                   = -1599028,
-
-    SAY_EVENT_INTRO_1                   = -1599029,
-    SAY_EVENT_INTRO_2                   = -1599030,
-    SAY_EVENT_INTRO_3_ABED              = -1599031,
-
-    SAY_EVENT_A_1                       = -1599032,
-    SAY_EVENT_A_2_KADD                  = -1599033,
-    SAY_EVENT_A_3                       = -1599034,
-
-    SAY_EVENT_B_1                       = -1599035,
-    SAY_EVENT_B_2_MARN                  = -1599036,
-    SAY_EVENT_B_3                       = -1599037,
-
-    SAY_EVENT_C_1                       = -1599038,
-    SAY_EVENT_C_2_ABED                  = -1599039,
-    SAY_EVENT_C_3                       = -1599040,
-
-    SAY_EVENT_D_1                       = -1599041,
-    SAY_EVENT_D_2_ABED                  = -1599042,
-    SAY_EVENT_D_3                       = -1599043,
-    SAY_EVENT_D_4_ABED                  = -1599044,
-
-    SAY_EVENT_END_01                    = -1599045,
-    SAY_EVENT_END_02                    = -1599046,
-    SAY_EVENT_END_03_ABED               = -1599047,
-    SAY_EVENT_END_04                    = -1599048,
-    SAY_EVENT_END_05_ABED               = -1599049,
-    SAY_EVENT_END_06                    = -1599050,
-    SAY_EVENT_END_07_ABED               = -1599051,
-    SAY_EVENT_END_08                    = -1599052,
-    SAY_EVENT_END_09_KADD               = -1599053,
-    SAY_EVENT_END_10                    = -1599054,
-    SAY_EVENT_END_11_KADD               = -1599055,
-    SAY_EVENT_END_12                    = -1599056,
-    SAY_EVENT_END_13_KADD               = -1599057,
-    SAY_EVENT_END_14                    = -1599058,
-    SAY_EVENT_END_15_MARN               = -1599059,
-    SAY_EVENT_END_16                    = -1599060,
-    SAY_EVENT_END_17_MARN               = -1599061,
-    SAY_EVENT_END_18                    = -1599062,
-    SAY_EVENT_END_19_MARN               = -1599063,
-    SAY_EVENT_END_20                    = -1599064,
-    SAY_EVENT_END_21_ABED               = -1599065,
-
-    SAY_VICTORY_SJONNIR_1               = -1599066,
-    SAY_VICTORY_SJONNIR_2               = -1599067,
-
-    SAY_ENTRANCE_MEET                   = -1599068,
+    SAY_KILL                            = 0,
+    SAY_LOW_HEALTH                      = 1,
+    SAY_DEATH                           = 2,
+    SAY_PLAYER_DEATH                    = 3,
+    SAY_ESCORT_START                    = 4,
+
+    SAY_SPAWN_DWARF                     = 5,
+    SAY_SPAWN_TROGG                     = 6,
+    SAY_SPAWN_OOZE                      = 7,
+    SAY_SPAWN_EARTHEN                   = 8,
+
+    SAY_EVENT_INTRO_1                   = 9,
+    SAY_EVENT_INTRO_2                   = 10,
+    SAY_EVENT_A_1                       = 11,
+    SAY_EVENT_A_3                       = 12,
+    SAY_EVENT_B_1                       = 13,
+    SAY_EVENT_B_3                       = 14,
+    SAY_EVENT_C_1                       = 15,
+    SAY_EVENT_C_3                       = 16,
+    SAY_EVENT_D_1                       = 17,
+    SAY_EVENT_D_3                       = 18,
+
+    SAY_EVENT_END_01                    = 19,
+    SAY_EVENT_END_02                    = 20,
+    SAY_EVENT_END_04                    = 21,
+    SAY_EVENT_END_06                    = 22,
+    SAY_EVENT_END_08                    = 23,
+    SAY_EVENT_END_10                    = 24,
+    SAY_EVENT_END_12                    = 25,
+    SAY_EVENT_END_14                    = 26,
+    SAY_EVENT_END_16                    = 27,
+    SAY_EVENT_END_18                    = 28,
+    SAY_EVENT_END_20                    = 29,
+
+    SAY_VICTORY_SJONNIR_1               = 30,
+    SAY_VICTORY_SJONNIR_2               = 31,
+    SAY_ENTRANCE_MEET                   = 32,
+
+    SAY_EVENT_INTRO_3_ABED              = 0,
+    SAY_EVENT_C_2_ABED                  = 1,
+    SAY_EVENT_D_2_ABED                  = 2,
+    SAY_EVENT_D_4_ABED                  = 3,
+    SAY_EVENT_END_03_ABED               = 4,
+    SAY_EVENT_END_05_ABED               = 5,
+    SAY_EVENT_END_07_ABED               = 6,
+    SAY_EVENT_END_21_ABED               = 7,
+
+    SAY_EVENT_A_2_KADD                  = 0,
+    SAY_EVENT_END_09_KADD               = 1,
+    SAY_EVENT_END_11_KADD               = 2,
+    SAY_EVENT_END_13_KADD               = 3,
+
+    SAY_EVENT_B_2_MARN                  = 0,
+    SAY_EVENT_END_15_MARN               = 1,
+    SAY_EVENT_END_17_MARN               = 2,
+    SAY_EVENT_END_19_MARN               = 3,
 
     TEXT_ID_START                       = 13100,
     TEXT_ID_PROGRESS                    = 13101
@@ -363,12 +357,12 @@ public:
                     }
                     break;
                 case 13:
-                    DoScriptText(SAY_EVENT_INTRO_1, me);
+                    Talk(SAY_EVENT_INTRO_1);
                     SetEscortPaused(true);
                     JumpToNextStep(20000);
                     break;
                 case 17:
-                    DoScriptText(SAY_EVENT_INTRO_2, me);
+                    Talk(SAY_EVENT_INTRO_2);
                     if (instance)
                         instance->HandleGameObject(instance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true);
                     me->SetStandState(UNIT_STAND_STATE_KNEEL);
@@ -452,7 +446,7 @@ public:
                             instance->SetData(DATA_BRANN_EVENT, IN_PROGRESS);
                         }
                         bIsBattle = false;
-                        DoScriptText(SAY_ESCORT_START, me);
+                        Talk(SAY_ESCORT_START);
                         SetRun(true);
                         JumpToNextStep(0);
                         break;
@@ -463,21 +457,21 @@ public:
                     case 5:
                         if (instance)
                             if (Creature* temp = (Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM))))
-                                DoScriptText(SAY_EVENT_INTRO_3_ABED, temp);
+                                temp->AI()->Talk(SAY_EVENT_INTRO_3_ABED);
                             JumpToNextStep(8500);
                         break;
                     case 6:
-                        DoScriptText(SAY_EVENT_A_1, me);
+                        Talk(SAY_EVENT_A_1);
                         JumpToNextStep(6500);
                         break;
                     case 7:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
-                                DoScriptText(SAY_EVENT_A_2_KADD, temp);
+                                temp->AI()->Talk(SAY_EVENT_A_2_KADD);
                             JumpToNextStep(12500);
                         break;
                     case 8:
-                        DoScriptText(SAY_EVENT_A_3, me);
+                        Talk(SAY_EVENT_A_3);
                         if (instance)
                             instance->HandleGameObject(instance->GetData64(DATA_GO_KADDRAK), true);
                         if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
@@ -490,18 +484,18 @@ public:
                         JumpToNextStep(20000);
                         break;
                     case 10:
-                        DoScriptText(SAY_EVENT_B_1, me);
+                        Talk(SAY_EVENT_B_1);
                         JumpToNextStep(6000);
                         break;
                     case 11:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
-                                DoScriptText(SAY_EVENT_B_2_MARN, temp);
+                                temp->AI()->Talk(SAY_EVENT_B_2_MARN);
                         SpawnDwarf(1);
                         JumpToNextStep(20000);
                         break;
                     case 12:
-                        DoScriptText(SAY_EVENT_B_3, me);
+                        Talk(SAY_EVENT_B_3);
                         if (instance)
                             instance->HandleGameObject(instance->GetData64(DATA_GO_MARNAK), true);
                         if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
@@ -517,7 +511,7 @@ public:
                         JumpToNextStep(20000);
                         break;
                     case 15:
-                        DoScriptText(SAY_EVENT_C_1, me);
+                        Talk(SAY_EVENT_C_1);
                         SpawnDwarf(1);
                         JumpToNextStep(10000);
                         break;
@@ -528,12 +522,12 @@ public:
                     case 17:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
-                                DoScriptText(SAY_EVENT_C_2_ABED, temp);
+                                temp->AI()->Talk(SAY_EVENT_C_2_ABED);
                             SpawnDwarf(1);
                         JumpToNextStep(20000);
                         break;
                     case 18:
-                        DoScriptText(SAY_EVENT_C_3, me);
+                        Talk(SAY_EVENT_C_3);
                         if (instance)
                             instance->HandleGameObject(instance->GetData64(DATA_GO_ABEDNEUM), true);
                         if (Creature* temp = Unit::GetCreature(*me, uiControllerGUID))
@@ -549,14 +543,14 @@ public:
                         JumpToNextStep(15000);
                         break;
                     case 21:
-                        DoScriptText(SAY_EVENT_D_1, me);
+                        Talk(SAY_EVENT_D_1);
                         SpawnDwarf(3);
                         JumpToNextStep(20000);
                         break;
                     case 22:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
-                                DoScriptText(SAY_EVENT_D_2_ABED, temp);
+                                Talk(SAY_EVENT_D_2_ABED);
                         SpawnDwarf(1);
                         JumpToNextStep(5000);
                         break;
@@ -565,7 +559,7 @@ public:
                         JumpToNextStep(15000);
                         break;
                     case 24:
-                        DoScriptText(SAY_EVENT_D_3, me);
+                        Talk(SAY_EVENT_D_3);
                         SpawnDwarf(3);
                         JumpToNextStep(5000);
                         break;
@@ -580,13 +574,13 @@ public:
                     case 27:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
-                                DoScriptText(SAY_EVENT_D_4_ABED, temp);
+                                temp->AI()->Talk(SAY_EVENT_D_4_ABED);
                         SpawnDwarf(1);
                         JumpToNextStep(10000);
                         break;
                     case 28:
                         me->SetReactState(REACT_DEFENSIVE);
-                        DoScriptText(SAY_EVENT_END_01, me);
+                        Talk(SAY_EVENT_END_01);
                         me->SetStandState(UNIT_STAND_STATE_STAND);
                         if (instance)
                             instance->HandleGameObject(instance->GetData64(DATA_GO_SKY_FLOOR), true);
@@ -597,7 +591,7 @@ public:
                         JumpToNextStep(6500);
                         break;
                     case 29:
-                        DoScriptText(SAY_EVENT_END_02, me);
+                        Talk(SAY_EVENT_END_02);
                         if (instance)
                             instance->SetData(DATA_BRANN_EVENT, DONE);
                         me->CastSpell(me, SPELL_REWARD_ACHIEVEMENT, true);
@@ -606,97 +600,97 @@ public:
                     case 30:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
-                                DoScriptText(SAY_EVENT_END_03_ABED, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_03_ABED);
                         JumpToNextStep(8500);
                         break;
                     case 31:
-                        DoScriptText(SAY_EVENT_END_04, me);
+                        Talk(SAY_EVENT_END_04);
                         JumpToNextStep(11500);
                         break;
                     case 32:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
-                                DoScriptText(SAY_EVENT_END_05_ABED, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_05_ABED);
                             JumpToNextStep(11500);
                         break;
                     case 33:
-                        DoScriptText(SAY_EVENT_END_06, me);
+                        Talk(SAY_EVENT_END_06);
                         JumpToNextStep(4500);
                         break;
                     case 34:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
-                                DoScriptText(SAY_EVENT_END_07_ABED, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_07_ABED);
                             JumpToNextStep(22500);
                         break;
                     case 35:
-                        DoScriptText(SAY_EVENT_END_08, me);
+                        Talk(SAY_EVENT_END_08);
                         JumpToNextStep(7500);
                         break;
                     case 36:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
-                                DoScriptText(SAY_EVENT_END_09_KADD, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_09_KADD);
                         JumpToNextStep(18500);
                         break;
                     case 37:
-                        DoScriptText(SAY_EVENT_END_10, me);
+                        Talk(SAY_EVENT_END_10);
                         JumpToNextStep(5500);
                         break;
                     case 38:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
-                                DoScriptText(SAY_EVENT_END_11_KADD, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_11_KADD);
                             JumpToNextStep(20500);
                         break;
                     case 39:
-                        DoScriptText(SAY_EVENT_END_12, me);
+                        Talk(SAY_EVENT_END_12);
                         JumpToNextStep(2500);
                         break;
                     case 40:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_KADDRAK)))
-                                DoScriptText(SAY_EVENT_END_13_KADD, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_13_KADD);
                         JumpToNextStep(19500);
                         break;
                     case 41:
-                        DoScriptText(SAY_EVENT_END_14, me);
+                        Talk(SAY_EVENT_END_14);
                         JumpToNextStep(10500);
                         break;
                     case 42:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
-                                DoScriptText(SAY_EVENT_END_15_MARN, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_15_MARN);
                             JumpToNextStep(6500);
                         break;
                     case 43:
-                        DoScriptText(SAY_EVENT_END_16, me);
+                        Talk(SAY_EVENT_END_16);
                         JumpToNextStep(6500);
                         break;
                     case 44:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
-                                DoScriptText(SAY_EVENT_END_17_MARN, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_17_MARN);
                             JumpToNextStep(25500);
                         break;
                     case 45:
-                        DoScriptText(SAY_EVENT_END_18, me);
+                        Talk(SAY_EVENT_END_18);
                         JumpToNextStep(23500);
                         break;
                     case 46:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_MARNAK)))
-                                DoScriptText(SAY_EVENT_END_19_MARN, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_19_MARN);
                             JumpToNextStep(3500);
                         break;
                     case 47:
-                        DoScriptText(SAY_EVENT_END_20, me);
+                        Talk(SAY_EVENT_END_20);
                         JumpToNextStep(8500);
                         break;
                     case 48:
                         if (instance)
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ABEDNEUM)))
-                                DoScriptText(SAY_EVENT_END_21_ABED, temp);
+                                temp->AI()->Talk(SAY_EVENT_END_21_ABED);
                             JumpToNextStep(5500);
                         break;
                     case 49:
@@ -723,7 +717,7 @@ public:
 
             if (!bIsLowHP && HealthBelowPct(30))
             {
-                DoScriptText(SAY_LOW_HEALTH, me);
+                Talk(SAY_LOW_HEALTH);
                 bIsLowHP = true;
             }
             else if (bIsLowHP && !HealthBelowPct(30))
diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
index 8404413ad9d..a6d6cda11b1 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -44,9 +44,9 @@ EndContentData */
 
 enum eRainspeaker
 {
-    SAY_START_IRO                       = -1571000,
-    SAY_QUEST_ACCEPT_IRO                = -1571001,
-    SAY_END_IRO                         = -1571002,
+    SAY_START_IRO                       = 0,
+    SAY_QUEST_ACCEPT_IRO                = 1,
+    SAY_END_IRO                         = 2,
 
     QUEST_FORTUNATE_MISUNDERSTANDINGS   = 12570,
     FACTION_ESCORTEE_A                  = 774,
@@ -106,7 +106,7 @@ public:
                 case 28:
                     player->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me);
                     // me->RestoreFaction();
-                    DoScriptText(SAY_END_IRO, me);
+                    Talk(SAY_END_IRO);
                     SetRun(false);
                     break;
             }
@@ -146,7 +146,7 @@ public:
             CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
             CAST_AI(npc_escortAI, (creature->AI()))->SetMaxPlayerDistance(35.0f);
             creature->SetUnitMovementFlags(MOVEMENTFLAG_FALLING);
-            DoScriptText(SAY_START_IRO, creature);
+            creature->AI()->Talk(SAY_START_IRO);
 
             switch (player->GetTeam()){
             case ALLIANCE:
@@ -162,7 +162,7 @@ public:
 
     bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* /*_Quest*/)
     {
-        DoScriptText(SAY_QUEST_ACCEPT_IRO, creature);
+        creature->AI()->Talk(SAY_QUEST_ACCEPT_IRO);
         return false;
     }
 
@@ -184,7 +184,7 @@ enum eVekjik
     GOSSIP_TEXTID_VEKJIK1       = 13137,
     GOSSIP_TEXTID_VEKJIK2       = 13138,
 
-    SAY_TEXTID_VEKJIK1          = -1000208,
+    SAY_TEXTID_VEKJIK1          = 0,
 
     SPELL_FREANZYHEARTS_FURY    = 51469,
 
@@ -223,7 +223,7 @@ public:
                 break;
             case GOSSIP_ACTION_INFO_DEF+2:
                 player->CLOSE_GOSSIP_MENU();
-                DoScriptText(SAY_TEXTID_VEKJIK1, creature, player);
+                creature->AI()->Talk(SAY_TEXTID_VEKJIK1, player->GetGUID());
                 player->AreaExploredOrEventHappens(QUEST_MAKING_PEACE);
                 creature->CastSpell(player, SPELL_FREANZYHEARTS_FURY, false);
                 break;
@@ -342,13 +342,13 @@ enum eEnums
     SPELL_EXPLODE_CRYSTAL       = 62487,
     SPELL_FLAMES                = 64561,
 
-    SAY_WP_7                    = -1800047,
-    SAY_WP_6                    = -1800048,
-    SAY_WP_5                    = -1800049,
-    SAY_WP_4                    = -1800050,
-    SAY_WP_3                    = -1800051,
-    SAY_WP_2                    = -1800052,
-    SAY_WP_1                    = -1800053,
+    SAY_WP_1                    = 0,
+    SAY_WP_2                    = 1,
+    SAY_WP_3                    = 2,
+    SAY_WP_4                    = 3,
+    SAY_WP_5                    = 4,
+    SAY_WP_6                    = 5,
+    SAY_WP_7                    = 6,
 
     QUEST_DISASTER              = 12688
 };
@@ -371,19 +371,19 @@ public:
             switch (waypointId)
             {
                 case 0:
-                    DoScriptText(SAY_WP_2, me);
+                    Talk(SAY_WP_2);
                     break;
                 case 1:
-                    DoScriptText(SAY_WP_3, me);
+                    Talk(SAY_WP_3);
                     me->CastSpell(5918.33f, 5372.91f, -98.770f, SPELL_EXPLODE_CRYSTAL, true);
                     me->SummonGameObject(184743, 5918.33f, 5372.91f, -98.770f, 0, 0, 0, 0, 0, TEMPSUMMON_MANUAL_DESPAWN);     //approx 3 to 4 seconds
                     me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH);
                     break;
                 case 2:
-                    DoScriptText(SAY_WP_4, me);
+                    Talk(SAY_WP_4);
                     break;
                 case 7:
-                    DoScriptText(SAY_WP_5, me);
+                    Talk(SAY_WP_5);
                     break;
                 case 8:
                     me->CastSpell(5887.37f, 5379.39f, -91.289f, SPELL_EXPLODE_CRYSTAL, true);
@@ -391,13 +391,13 @@ public:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH);
                     break;
                 case 9:
-                    DoScriptText(SAY_WP_6, me);
+                    Talk(SAY_WP_6);
                     break;
                 case 13:
                     if (player)
                     {
                         player->GroupEventHappens(QUEST_DISASTER, me);
-                        DoScriptText(SAY_WP_7, me);
+                        Talk(SAY_WP_7);
                     }
                     break;
             }
@@ -448,7 +448,7 @@ public:
                 creature->setFaction(113);
 
                 pEscortAI->Start(false, false, player->GetGUID());
-                DoScriptText(SAY_WP_1, creature);
+                creature->AI()->Talk(SAY_WP_1);
             }
         }
         return true;
@@ -713,8 +713,8 @@ enum eAdventurousDwarf
 
     GOSSIP_MENU_DWARF   = 13307,
 
-    SAY_DWARF_OUCH      = -1571042,
-    SAY_DWARF_HELP      = -1571043
+    SAY_DWARF_OUCH      = 0,
+    SAY_DWARF_HELP      = 1
 };
 
 class npc_adventurous_dwarf : public CreatureScript
@@ -724,7 +724,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const
     {
-        DoScriptText(SAY_DWARF_OUCH, creature);
+        creature->AI()->Talk(SAY_DWARF_OUCH);
         return NULL;
     }
 
@@ -758,7 +758,7 @@ public:
         }
         if (spellId)
             player->CastSpell(player, spellId, true);
-        DoScriptText(SAY_DWARF_HELP, creature);
+        creature->AI()->Talk(SAY_DWARF_HELP);
         creature->DespawnOrUnsummon();
         return true;
     }
diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp
index b3a379d903d..f87b24ce639 100644
--- a/src/server/scripts/Northrend/storm_peaks.cpp
+++ b/src/server/scripts/Northrend/storm_peaks.cpp
@@ -30,13 +30,13 @@
 ## npc_agnetta_tyrsdottar
 ######*/
 
-#define SAY_AGGRO                  -1571003
 #define GOSSIP_AGNETTA             "Skip the warmup, sister... or are you too scared to face soemeone your own size?"
 
 enum eAgnetta
 {
     QUEST_ITS_THAT_YOUR_GOBLIN      = 12969,
-    FACTION_HOSTILE_AT1             = 45
+    FACTION_HOSTILE_AT1             = 45,
+    SAY_AGGRO                       = 0
 };
 
 class npc_agnetta_tyrsdottar : public CreatureScript
@@ -73,7 +73,7 @@ public:
         player->PlayerTalkClass->ClearMenus();
         if (action == GOSSIP_ACTION_INFO_DEF+1)
         {
-            DoScriptText(SAY_AGGRO, creature);
+            creature->AI()->Talk(SAY_AGGRO);
             player->CLOSE_GOSSIP_MENU();
             creature->setFaction(FACTION_HOSTILE_AT1);
             creature->AI()->AttackStart(player);
@@ -143,8 +143,8 @@ public:
 enum eInjuredGoblin
 {
     QUEST_BITTER_DEPARTURE     = 12832,
-    SAY_QUEST_ACCEPT           =  -1800042,
-    SAY_END_WP_REACHED         =  -1800043
+    SAY_QUEST_ACCEPT           = 0,
+    SAY_END_WP_REACHED         = 1
 };
 
 #define GOSSIP_ITEM_1       "I am ready, lets get you out of here"
@@ -167,7 +167,7 @@ public:
             switch (waypointId)
             {
                 case 26:
-                    DoScriptText(SAY_END_WP_REACHED, me, player);
+                    Talk(SAY_END_WP_REACHED, player->GetGUID());
                     break;
                 case 27:
                     player->GroupEventHappens(QUEST_BITTER_DEPARTURE, me);
@@ -218,7 +218,7 @@ public:
     bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest)
     {
         if (quest->GetQuestId() == QUEST_BITTER_DEPARTURE)
-            DoScriptText(SAY_QUEST_ACCEPT, creature);
+            creature->AI()->Talk(SAY_QUEST_ACCEPT);
 
         return false;
     }