Core/DB: Assign texts to correct creatures

Also convert some never used script texts to creature text for future use.
Some scripts or Talk() calls need to be implemented first.

Solves #8659

5 files changed, 32 insertions, 29 deletions

diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index 73fefe210df..4a08801c972 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -32,10 +32,11 @@ enum Midnight
     SAY_MIDNIGHT_KILL           = 0,
     SAY_APPEAR                  = 1,
     SAY_MOUNT                   = 2,
-    SAY_KILL                    = 3,
-    SAY_DISARMED                = 4,
-    SAY_DEATH                   = 5,
-    SAY_RANDOM                  = 6,
+
+    SAY_KILL                    = 0,
+    SAY_DISARMED                = 1,
+    SAY_DEATH                   = 2,
+    SAY_RANDOM                  = 3,
 
     SPELL_SHADOWCLEAVE          = 29832,
     SPELL_INTANGIBLE_PRESENCE   = 29833,
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 40d4d5d54b4..7dd395770db 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 
 enum Yells
 {
-    EMOTE_TARGET               = -1509002
+    EMOTE_TARGET               = 0
 };
 
 class boss_buru : public CreatureScript
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index 4abbf99d4ef..5f5b958fb9b 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -21,8 +21,8 @@
 
 enum Texts
 {
-    EMOTE_AGGRO             = -1509000,
-    EMOTE_MANA_FULL         = -1509001
+    EMOTE_AGGRO             = 0,
+    EMOTE_MANA_FULL         = 1
 };
 
 enum Spells
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index da67f93f968..1ffd74eddf3 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -23,22 +23,22 @@
 enum Yells
 {
     // The time of our retribution is at hand! Let darkness reign in the hearts of our enemies! Sound: 8645 Emote: 35
-    SAY_ANDOROV_INTRO         = -1509003,   // Before for the first wave
-    SAY_ANDOROV_ATTACK        = -1509004,   // Beginning the event
-    SAY_ANDOROV_WAVE_1        = -1509001,   // When the first wave comes text: Kill first, ask questions later... Incoming! emote: 45 sound: 8653
-    SAY_WAVE3                 = -1509005,
-    SAY_WAVE4                 = -1509006,
-    SAY_WAVE5                 = -1509007,
-    SAY_WAVE6                 = -1509008,
-    SAY_WAVE7                 = -1509009,
-    SAY_INTRO                 = -1509010,
-    SAY_UNK1                  = -1509011,
-    SAY_UNK2                  = -1509012,
-    SAY_UNK3                  = -1509013,
-    SAY_DEATH                 = -1509014,
-    SAY_CHANGEAGGRO           = -1509015,
-    SAY_KILLS_ANDOROV         = -1509016,
-    SAY_COMPLETE_QUEST        = -1509017    // Yell when realm complete quest 8743 for world event
+    SAY_ANDOROV_INTRO         = 0,   // Before for the first wave
+    SAY_ANDOROV_ATTACK        = 1,   // Beginning the event
+
+    SAY_WAVE3                 = 0,
+    SAY_WAVE4                 = 1,
+    SAY_WAVE5                 = 2,
+    SAY_WAVE6                 = 3,
+    SAY_WAVE7                 = 4,
+    SAY_INTRO                 = 5,
+    SAY_UNK1                  = 6,
+    SAY_UNK2                  = 7,
+    SAY_UNK3                  = 8,
+    SAY_DEATH                 = 9,
+    SAY_CHANGEAGGRO           = 10,
+    SAY_KILLS_ANDOROV         = 11,
+    SAY_COMPLETE_QUEST        = 12    // Yell when realm complete quest 8743 for world event
     // Warriors, Captains, continue the fight! Sound: 8640
 };
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 7fa476100d5..5617c69aea9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -53,14 +53,16 @@ enum eUnits
     ENTRY_REINFORCED_FEL_IRON_CHEST_H = 185169
 };
 
-enum eSays
+enum Says
 {
     SAY_INTRO                     = 0,
-    SAY_WIPE                      = 1,
-    SAY_AGGRO                     = 2,
-    SAY_KILL                      = 3,
-    SAY_DIE                       = 4,
-    EMOTE                         = 5
+
+    SAY_WIPE                      = 0,
+    SAY_AGGRO                     = 1,
+    SAY_KILL                      = 2,
+    SAY_DIE                       = 3,
+
+    EMOTE                         = 0
 };
 
 const float VazrudenMiddle[3] = {-1406.5f, 1746.5f, 81.2f};