Scripts/Spells: Add comments with id & name of spells part 3

(cherry picked from commit 03c727326dce5d990fd453f42a92300dbd68dc0e)

36 files changed, 176 insertions, 46 deletions

diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index e29fffe06f9..aed2154129f 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -162,6 +162,7 @@ enum SPSpells
     SPELL_SHADOW_PORTAL_VAULTOFTHERAVENIAN     = 17948
 };
 
+// 17950 - Shadow Portal
 class spell_shadow_portal : public SpellScriptLoader
 {
     public:
@@ -280,6 +281,7 @@ enum ScriptEventId
     SPELL_EVENT_VAULTOFTHERAVENIAN     = 5623
 };
 
+// 17863, 17939, 17943, 17944, 17946, 17948 - Shadow Portal
 class spell_shadow_portal_rooms : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index e577cb40d4f..6710eb7cf39 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -318,6 +318,7 @@ class boss_archmage_arugal : public CreatureScript
         }
 };
 
+// 7057 - Haunting Spirits
 class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index 5fa91af18d2..e5180c2674b 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -604,6 +604,7 @@ class spell_summon_blood_elves_script : SpellScriptLoader
         }
 };
 
+// 45996 - Darkness
 class spell_muru_darkness : SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
index a732a304556..1df9a5abac7 100644
--- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
@@ -32,10 +32,7 @@ enum DeathlyUsher
     SPELL_TELEPORT_GROUP                = 27686
 };
 
-/*#####
-# spell_razelikh_teleport_group
-#####*/
-
+// 27686 - Teleport to Razelikh (GROUP)
 class spell_razelikh_teleport_group : public SpellScriptLoader
 {
     public: spell_razelikh_teleport_group() : SpellScriptLoader("spell_razelikh_teleport_group") { }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index a23f8707dba..cdcf56f5e96 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -181,6 +181,7 @@ class MarkTargetFilter
         }
 };
 
+// 31447 - Mark of Kaz'rogal
 class spell_mark_of_kazrogal : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index 15952e2da41..70f97948f7c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -140,6 +140,7 @@ class boss_salramm : public CreatureScript
         }
 };
 
+// 52708 - Steal Flesh
 class spell_salramm_steal_flesh : public AuraScript
 {
     PrepareAuraScript(spell_salramm_steal_flesh);
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 5dd859869bd..2b715fba60a 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -123,6 +123,7 @@ class boss_rajaxx : public CreatureScript
         }
 };
 
+// 25599 - Thundercrash
 class spell_rajaxx_thundercrash : public SpellScript
 {
     PrepareSpellScript(spell_rajaxx_thundercrash);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index f32dd34537f..9319aa1b84e 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -732,6 +732,7 @@ class spell_bullet_controller : public AuraScript
     }
 };
 
+// 67590, 67602, 67603, 67604 - Powering Up
 class spell_powering_up : public SpellScriptLoader
 {
     public:
@@ -863,6 +864,8 @@ class spell_valkyr_essences : public SpellScriptLoader
         }
 };
 
+// 65879, 67244, 67245, 67246 - Power of the Twins
+// 65916, 67248, 67249, 67250 - Power of the Twins
 class spell_power_of_the_twins : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 044e4b9f140..b9e2a1e78ee 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -384,6 +384,7 @@ public:
     }
 };
 
+// 59910 - Summon Minions
 class spell_novos_summon_minions : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 60f084fa469..61fd509cdf4 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -230,6 +230,7 @@ private:
     ObjectGuid _summonerGUID;
 };
 
+// 70827 - Ice Shards
 class spell_pos_ice_shards : public SpellScript
 {
     PrepareSpellScript(spell_pos_ice_shards);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index fcbbf37c0cc..c8b8c4a2f6c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -478,6 +478,7 @@ private:
     bool _hasTrappedUnit;
 };
 
+// 69140 - Coldflame
 class spell_marrowgar_coldflame : public SpellScript
 {
     PrepareSpellScript(spell_marrowgar_coldflame);
@@ -509,6 +510,7 @@ class spell_marrowgar_coldflame : public SpellScript
     }
 };
 
+// 72705 - Coldflame (Bonestorm)
 class spell_marrowgar_coldflame_bonestorm : public SpellScript
 {
     PrepareSpellScript(spell_marrowgar_coldflame_bonestorm);
@@ -526,6 +528,7 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScript
     }
 };
 
+// 69146, 70823, 70824, 70825 - Coldflame (Damage)
 class spell_marrowgar_coldflame_damage : public AuraScript
 {
     PrepareAuraScript(spell_marrowgar_coldflame_damage);
@@ -551,6 +554,7 @@ class spell_marrowgar_coldflame_damage : public AuraScript
     }
 };
 
+// 69057, 70826, 72088, 72089 - Bone Spike Graveyard
 class spell_marrowgar_bone_spike_graveyard : public SpellScript
 {
     PrepareSpellScript(spell_marrowgar_bone_spike_graveyard);
@@ -610,6 +614,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScript
     }
 };
 
+// 69075, 70834, 70835, 70836 - Bone Storm
 class spell_marrowgar_bone_storm : public SpellScript
 {
     PrepareSpellScript(spell_marrowgar_bone_storm);
@@ -625,6 +630,7 @@ class spell_marrowgar_bone_storm : public SpellScript
     }
 };
 
+// 69055, 70814 - Bone Slice
 class spell_marrowgar_bone_slice : public SpellScript
 {
     PrepareSpellScript(spell_marrowgar_bone_slice);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 861ab65de60..4a687421b8c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -807,6 +807,7 @@ private:
     uint32 _newTargetSelectTimer;
 };
 
+// 70672, 72455, 72832, 72833 - Gaseous Bloat
 class spell_putricide_gaseous_bloat : public AuraScript
 {
     PrepareAuraScript(spell_putricide_gaseous_bloat);
@@ -848,6 +849,8 @@ class spell_putricide_gaseous_bloat : public AuraScript
     }
 };
 
+// 70447, 72836, 72837, 72838 - Volatile Ooze Adhesive
+// 70672, 72455, 72832, 72833 - Gaseous Bloat
 class spell_putricide_ooze_channel : public SpellScript
 {
     PrepareSpellScript(spell_putricide_ooze_channel);
@@ -922,6 +925,7 @@ class ExactDistanceCheck
         float _dist;
 };
 
+// 70346, 72456, 72868, 72869 - Slime Puddle
 class spell_putricide_slime_puddle : public SpellScript
 {
     PrepareSpellScript(spell_putricide_slime_puddle);
@@ -939,6 +943,7 @@ class spell_putricide_slime_puddle : public SpellScript
 };
 
 // this is here only because on retail you dont actually enter HEROIC mode for ICC
+// 72868, 72869 - Slime Puddle
 class spell_putricide_slime_puddle_aura : public SpellScript
 {
     PrepareSpellScript(spell_putricide_slime_puddle_aura);
@@ -955,6 +960,7 @@ class spell_putricide_slime_puddle_aura : public SpellScript
     }
 };
 
+// 70351, 71966, 71967, 71968 - Unstable Experiment
 class spell_putricide_unstable_experiment : public SpellScript
 {
     PrepareSpellScript(spell_putricide_unstable_experiment);
@@ -992,6 +998,7 @@ class spell_putricide_unstable_experiment : public SpellScript
     }
 };
 
+// 70459 - Ooze Eruption Search Effect
 class spell_putricide_ooze_eruption_searcher : public SpellScript
 {
     PrepareSpellScript(spell_putricide_ooze_eruption_searcher);
@@ -1037,6 +1044,7 @@ class spell_putricide_ooze_tank_protection : public AuraScript
     }
 };
 
+// 71255 - Choking Gas Bomb
 class spell_putricide_choking_gas_bomb : public SpellScript
 {
     PrepareSpellScript(spell_putricide_choking_gas_bomb);
@@ -1061,6 +1069,7 @@ class spell_putricide_choking_gas_bomb : public SpellScript
     }
 };
 
+// 70920 - Unbound Plague Search Effect
 class spell_putricide_unbound_plague : public SpellScript
 {
     PrepareSpellScript(spell_putricide_unbound_plague);
@@ -1122,6 +1131,7 @@ class spell_putricide_unbound_plague : public SpellScript
     }
 };
 
+// 70360, 72527 - Eat Ooze
 class spell_putricide_eat_ooze : public SpellScript
 {
     PrepareSpellScript(spell_putricide_eat_ooze);
@@ -1163,6 +1173,7 @@ class spell_putricide_eat_ooze : public SpellScript
     }
 };
 
+// 72451, 72463, 72671, 72672 - Mutated Plague
 class spell_putricide_mutated_plague : public AuraScript
 {
     PrepareAuraScript(spell_putricide_mutated_plague);
@@ -1213,6 +1224,7 @@ class spell_putricide_mutated_plague : public AuraScript
     }
 };
 
+// 70308 - Mutated Transformation (Init)
 class spell_putricide_mutation_init : public SpellScript
 {
     PrepareSpellScript(spell_putricide_mutation_init);
@@ -1286,6 +1298,7 @@ class spell_putricide_mutation_init_aura : public AuraScript
     }
 };
 
+// 70405, 72508, 72509, 72510 - Mutated Transformation (Dismiss)
 class spell_putricide_mutated_transformation_dismiss : public AuraScript
 {
     PrepareAuraScript(spell_putricide_mutated_transformation_dismiss);
@@ -1302,6 +1315,7 @@ class spell_putricide_mutated_transformation_dismiss : public AuraScript
     }
 };
 
+// 70311, 71503 - Mutated Transformation
 class spell_putricide_mutated_transformation : public SpellScript
 {
     PrepareSpellScript(spell_putricide_mutated_transformation);
@@ -1352,6 +1366,7 @@ class spell_putricide_mutated_transformation : public SpellScript
     }
 };
 
+// 70402, 72511, 72512, 72513 - Mutated Transformation (Damage)
 class spell_putricide_mutated_transformation_dmg : public SpellScript
 {
     PrepareSpellScript(spell_putricide_mutated_transformation_dmg);
@@ -1368,6 +1383,7 @@ class spell_putricide_mutated_transformation_dmg : public SpellScript
     }
 };
 
+// 70539, 72457, 72875, 72876 - Regurgitated Ooze
 class spell_putricide_regurgitated_ooze : public SpellScript
 {
     PrepareSpellScript(spell_putricide_regurgitated_ooze);
@@ -1386,6 +1402,8 @@ class spell_putricide_regurgitated_ooze : public SpellScript
 };
 
 // Removes aura with id stored in effect value
+// 71620 - Tear Gas Cancel
+// 72618 - Mutated Plague Clear
 class spell_putricide_clear_aura_effect_value : public SpellScript
 {
     PrepareSpellScript(spell_putricide_clear_aura_effect_value);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index 84ddfab0c68..94e7968642a 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -412,6 +412,7 @@ private:
     InstanceScript* _instance;
 };
 
+// 69782, 69796, 69798, 69801 - Ooze Flood
 class spell_rotface_ooze_flood : public SpellScript
 {
     PrepareSpellScript(spell_rotface_ooze_flood);
@@ -452,6 +453,7 @@ class spell_rotface_ooze_flood : public SpellScript
     }
 };
 
+// 69674, 71224, 73022, 73023 - Mutated Infection
 class spell_rotface_mutated_infection : public SpellScript
 {
     PrepareSpellScript(spell_rotface_mutated_infection);
@@ -506,6 +508,7 @@ class spell_rotface_mutated_infection_aura : public AuraScript
     }
 };
 
+// 69538 - Small Ooze Combine
 class spell_rotface_little_ooze_combine : public SpellScript
 {
     PrepareSpellScript(spell_rotface_little_ooze_combine);
@@ -529,6 +532,7 @@ class spell_rotface_little_ooze_combine : public SpellScript
     }
 };
 
+// 69553 - Large Ooze Combine
 class spell_rotface_large_ooze_combine : public SpellScript
 {
     PrepareSpellScript(spell_rotface_large_ooze_combine);
@@ -574,6 +578,7 @@ class spell_rotface_large_ooze_combine : public SpellScript
     }
 };
 
+// 69610 - Large Ooze Buff Combine
 class spell_rotface_large_ooze_buff_combine : public SpellScript
 {
     PrepareSpellScript(spell_rotface_large_ooze_buff_combine);
@@ -639,6 +644,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScript
     }
 };
 
+// 69839 - Unstable Ooze Explosion
 class spell_rotface_unstable_ooze_explosion_init : public SpellScript
 {
     PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init);
@@ -666,6 +672,7 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScript
     }
 };
 
+// 69832 - Unstable Ooze Explosion
 class spell_rotface_unstable_ooze_explosion : public SpellScript
 {
     PrepareSpellScript(spell_rotface_unstable_ooze_explosion);
@@ -690,6 +697,7 @@ class spell_rotface_unstable_ooze_explosion : public SpellScript
     }
 };
 
+// 71441 - Unstable Ooze Explosion Suicide Trigger
 class spell_rotface_unstable_ooze_explosion_suicide : public AuraScript
 {
     PrepareAuraScript(spell_rotface_unstable_ooze_explosion_suicide);
@@ -712,6 +720,7 @@ class spell_rotface_unstable_ooze_explosion_suicide : public AuraScript
     }
 };
 
+// 72285, 72288 - Vile Gas Trigger
 class spell_rotface_vile_gas_trigger : public SpellScript
 {
     PrepareSpellScript(spell_rotface_vile_gas_trigger);
@@ -766,6 +775,7 @@ class spell_rotface_vile_gas_trigger : public SpellScript
     }
 };
 
+// 69507, 71213, 73189, 73190 - Slime Spray
 class spell_rotface_slime_spray : public SpellScript
 {
     PrepareSpellScript(spell_rotface_slime_spray);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index bb27ec91165..95bed61573b 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -1322,6 +1322,7 @@ class spell_sindragosa_mystic_buffet : public SpellScript
     }
 };
 
+// 71376 - Icy Blast
 class spell_rimefang_icy_blast : public SpellScript
 {
     PrepareSpellScript(spell_rimefang_icy_blast);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index 67bcc079e64..45f24d1e00e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -474,6 +474,7 @@ struct go_sapphiron_birth : public GameObjectAI
     InstanceScript* instance;
 };
 
+// 24780 - Dream Fog
 class spell_sapphiron_change_blizzard_target : public AuraScript
 {
     PrepareAuraScript(spell_sapphiron_change_blizzard_target);
@@ -503,6 +504,7 @@ class spell_sapphiron_change_blizzard_target : public AuraScript
     }
 };
 
+// 28522 - Icebolt
 class spell_sapphiron_icebolt : public AuraScript
 {
     PrepareAuraScript(spell_sapphiron_icebolt);
@@ -542,6 +544,7 @@ class spell_sapphiron_icebolt : public AuraScript
     ObjectGuid _block;
 };
 
+// 28560 - Summon Blizzard
 class spell_sapphiron_summon_blizzard : public SpellScript
 {
     PrepareSpellScript(spell_sapphiron_summon_blizzard);
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 22f1bd25d01..842a2009ce6 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1588,6 +1588,7 @@ class npc_static_field : public CreatureScript
         }
 };
 
+// 56046 - Portal Beam
 class spell_malygos_portal_beam : public SpellScriptLoader
 {
     public:
@@ -1632,6 +1633,7 @@ class spell_malygos_portal_beam : public SpellScriptLoader
         }
 };
 
+// 56047 - Random Portal
 class spell_malygos_random_portal : public SpellScriptLoader
 {
     public:
@@ -1688,6 +1690,7 @@ class IsCreatureVehicleCheck
         bool _isVehicle;
 };
 
+// 57459, 61693, 61694 - Arcane Storm
 class spell_malygos_arcane_storm : public SpellScriptLoader
 {
     public:
@@ -1745,6 +1748,7 @@ class spell_malygos_arcane_storm : public SpellScriptLoader
         }
 };
 
+// 56105 - Vortex
 class spell_malygos_vortex_dummy : public SpellScriptLoader
 {
 public:
@@ -1782,6 +1786,7 @@ public:
     }
 };
 
+// 55873 - Vortex
 class spell_malygos_vortex_visual : public SpellScriptLoader
 {
     public:
@@ -1890,6 +1895,7 @@ class spell_arcane_overload : public SpellScriptLoader
         }
 };
 
+// 61210 - Align Disk Aggro
 class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader
 {
     public:
@@ -1941,6 +1947,7 @@ class IsPlayerOnHoverDisk
         bool _isOnHoverDisk;
 };
 
+// 56397 - Arcane Barrage
 class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader
 {
     public:
@@ -2022,6 +2029,7 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader
         }
 };
 
+// 58842 - Destroy Platform Channel
 class spell_malygos_destroy_platform_channel : public SpellScriptLoader
 {
     public:
@@ -2206,6 +2214,7 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript
         }
 };
 
+// 60939 - Surge of Power
 class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoader
 {
     public:
@@ -2269,6 +2278,7 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade
         }
 };
 
+// 60936 - Surge of Power
 class spell_malygos_surge_of_power_25 : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index f607781d184..1db5a03d2ec 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -1497,7 +1497,7 @@ class achievement_orbit_uary : public AchievementCriteriaScript
         }
 };
 
-// 62399 Overload Circuit
+// 62399 - Overload Circuit
 class spell_overload_circuit : public AuraScript
 {
     PrepareAuraScript(spell_overload_circuit);
@@ -1743,6 +1743,7 @@ class FlameLeviathanPursuedTargetSelector
         }
 };
 
+// 62374 - Pursued
 class spell_pursue : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index 97d6fdba587..0be09d2470a 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -2056,7 +2056,7 @@ class spell_mimiron_plasma_blast : public SpellScriptLoader
         }
 };
 
-// 66351 - Explosion
+// 66351, 63009 - Explosion
 class spell_mimiron_proximity_explosion : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 5944b1c3dc2..e8ba3a5f62a 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -521,7 +521,7 @@ struct go_palehoof_sphere : public GameObjectAI
     }
 };
 
-//  48139 - Crazed
+// 48139 - Crazed
 class spell_palehoof_crazed : public AuraScript
 {
     PrepareAuraScript(spell_palehoof_crazed);
@@ -537,6 +537,7 @@ class spell_palehoof_crazed : public AuraScript
     }
 };
 
+// 48146 - Crazed
 class spell_palehoof_crazed_effect : public SpellScript
 {
     PrepareSpellScript(spell_palehoof_crazed_effect);
@@ -557,7 +558,7 @@ class spell_palehoof_crazed_effect : public SpellScript
     }
 };
 
-// 47669 - Awaken Subbos
+// 47669 - Awaken Subboss
 class spell_palehoof_awaken_subboss : public SpellScript
 {
     PrepareSpellScript(spell_palehoof_awaken_subboss);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 74132a557a4..5d850c00c30 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -459,6 +459,7 @@ class RitualTargetCheck
         }
 };
 
+// 48278 - Paralyze
 class spell_paralyze_pinnacle : public SpellScript
 {
     PrepareSpellScript(spell_paralyze_pinnacle);
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
index a78c2427aee..0401dd9de2b 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -88,6 +88,8 @@ struct boss_moragg : public BossAI
     }
 };
 
+// 54438, 59523 - Ray of Pain
+// 54442, 59524 - Ray of Suffering
 class spell_moragg_ray : public AuraScript
 {
     PrepareAuraScript(spell_moragg_ray);
@@ -110,6 +112,7 @@ class spell_moragg_ray : public AuraScript
     }
 };
 
+// 54396 - Optic Link
 class spell_moragg_optic_link : public AuraScript
 {
     PrepareAuraScript(spell_moragg_optic_link);
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 34f35cdd96d..d984d70c1d8 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -196,6 +196,7 @@ const uint32 CaribouTraps[CaribouTrapsNum] =
     GO_CARIBOU_TRAP_11, GO_CARIBOU_TRAP_12, GO_CARIBOU_TRAP_13, GO_CARIBOU_TRAP_14, GO_CARIBOU_TRAP_15,
 };
 
+// 46085 - Place Fake Fur
 class spell_q11865_place_fake_fur : public SpellScript
 {
     PrepareSpellScript(spell_q11865_place_fake_fur);
@@ -355,6 +356,7 @@ enum red_dragonblood
     SPELL_SUBDUED = 46675
 };
 
+// 46620 - Red Dragonblood
 class spell_red_dragonblood : public SpellScriptLoader
 {
 public:
@@ -1698,6 +1700,7 @@ enum BloodsporeRuination
     EVENT_RESET_ORIENTATION
 };
 
+// 45997 - Bloodspore Ruination
 class spell_q11719_bloodspore_ruination_45997 : public SpellScriptLoader
 {
 public:
@@ -1832,7 +1835,6 @@ public:
     }
 };
 
-// 45668 - Ultra-Advanced Proto-Typical Shortening Blaster
 enum ShorteningBlaster
 {
     SPELL_SHORTENING_BLASTER_BIGGER1    = 45674,
@@ -1848,6 +1850,7 @@ enum ShorteningBlaster
     SPELL_SHORTENING_BLASTER_POLYMORPH2 = 45683
 };
 
+// 45668 - Crafty's Ultra-Advanced Proto-Typical Shortening Blaster
 class spell_q11653_shortening_blaster : public SpellScript
 {
     PrepareSpellScript(spell_q11653_shortening_blaster);
diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
index 5623715c65c..6858707bc88 100644
--- a/src/server/scripts/Northrend/zone_dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
@@ -381,6 +381,7 @@ enum StrengthenAncientsMisc
     NPC_LOTHALOR                = 26321
 };
 
+// 47575 - Strengthen the Ancients: On Interact Dummy to Woodlands Walker
 class spell_q12096_q12092_dummy : public SpellScriptLoader // Strengthen the Ancients: On Interact Dummy to Woodlands Walker
 {
 public:
@@ -428,7 +429,8 @@ public:
     }
 };
 
-class spell_q12096_q12092_bark : public SpellScriptLoader // Bark of the Walkers
+// 47530 - Bark of the Walkers
+class spell_q12096_q12092_bark : public SpellScriptLoader
 {
 public:
     spell_q12096_q12092_bark() : SpellScriptLoader("spell_q12096_q12092_bark") { }
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index a5035094a95..8b37c2c0b33 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -468,6 +468,7 @@ public:
     }
 };
 
+// 42268 - Quest - Mindless Abomination Explosion FX Master
 class spell_mindless_abomination_explosion_fx_master : public SpellScriptLoader
 {
     enum Spells
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index b64f3038ca9..44cb45e0b4c 100644
--- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
@@ -369,6 +369,7 @@ enum MiscLifewarden
     SPELL_WILD_GROWTH            = 52948,
 };
 
+// 51957 - Call of the Lifewarden
 class spell_q12620_the_lifewarden_wrath : public SpellScriptLoader
 {
 public:
@@ -457,6 +458,7 @@ enum KickWhatKick
     SAY_DROSTAN_REPLY_MISS    = 0,
 };
 
+// 51330 - Shoot RJR
 class spell_q12589_shoot_rjr : public SpellScriptLoader
 {
 public:
@@ -608,6 +610,8 @@ enum ShangoTracks
     SAY_INCORRECT_TRACKS   = 28635
 };
 
+// 52160 - Correct Tracks
+// 52163 - Incorrect Tracks
 class spell_shango_tracks : public SpellScriptLoader
 {
 public:
@@ -654,6 +658,7 @@ enum ReturnedSevenfold
     SPELL_DEATHBOLT             = 51855
 };
 
+// 51854 - Deathbolt
 class spell_q12611_deathbolt : public SpellScript
 {
     PrepareSpellScript(spell_q12611_deathbolt);
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 87454186e9d..a771c256b8b 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -631,10 +631,9 @@ uint32 const FetchIngredients[21][4] =
     { SPELL_FETCH_FROZEN_SPIDER_ICHOR,        SPELL_HAVE_FROZEN_SPIDER_ICHOR,        ITEM_FROZEN_SPIDER_ICHOR,        SAY_FROZEN_SPIDER_ICHOR        }
 };
 
-/*#####
-# spell_random_ingredient_aura
-#####*/
-
+// 51015 - Random Ingredient Easy Aura
+// 51154 - Random Ingredient Medium Aura
+// 51157 - Random Ingredient Hard Aura
 class spell_random_ingredient_aura : public SpellScriptLoader
 {
     public: spell_random_ingredient_aura() : SpellScriptLoader("spell_random_ingredient_aura") { }
@@ -681,10 +680,9 @@ class spell_random_ingredient_aura : public SpellScriptLoader
         }
 };
 
-/*#####
-# spell_random_ingredient
-#####*/
-
+// 51105 - Random Ingredient Medium
+// 51107 - Random Ingredient Hard
+// 51134 - Random Ingredient Easy
 class spell_random_ingredient : public SpellScriptLoader
 {
     public: spell_random_ingredient() : SpellScriptLoader("spell_random_ingredient") { }
@@ -764,6 +762,7 @@ class spell_random_ingredient : public SpellScriptLoader
 # spell_pot_check
 #####*/
 
+// 51046 - Pot Check
 class spell_pot_check : public SpellScriptLoader
 {
     public: spell_pot_check() : SpellScriptLoader("spell_pot_check") { }
@@ -960,6 +959,7 @@ enum ScourgeDisguise
     TEXT_DISGUISE_WARNING              = 28891
 };
 
+// 51966 - Scourge Disguise
 class spell_scourge_disguise : public AuraScript
 {
     PrepareAuraScript(spell_scourge_disguise);
@@ -983,6 +983,7 @@ class spell_scourge_disguise : public AuraScript
     }
 };
 
+// 51971 - Scourge Disguise Instability
 class spell_scourge_disguise_instability : public AuraScript
 {
     PrepareAuraScript(spell_scourge_disguise_instability);
@@ -1011,6 +1012,7 @@ class spell_scourge_disguise_instability : public AuraScript
     }
 };
 
+// 52010 - Scourge Disguise Expiring
 class spell_scourge_disguise_expiring : public AuraScript
 {
     PrepareAuraScript(spell_scourge_disguise_expiring);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
index a6fab624db4..ed5da1af652 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
@@ -24,6 +24,7 @@ enum Spells
     SPELL_MARK_OF_MALICE_TRIGGERED = 33494
 };
 
+// 33493 - Mark of Malice
 class spell_mark_of_malice : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
index 0a0b6b82b8b..e1da5cc09bd 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
@@ -218,6 +218,7 @@ class spell_kargath_executioner : public SpellScriptLoader
         }
 };
 
+// 39291 - Remove Kargath's Executioner
 class spell_remove_kargath_executioner : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 6b23be80e52..7e041603191 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -163,6 +163,7 @@ private:
     EventMap _events;
 };
 
+// 32960 - Mark of Kazzak
 class spell_mark_of_kazzak : public AuraScript
 {
     PrepareAuraScript(spell_mark_of_kazzak);
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index 114bded690d..11d5fadd530 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -982,6 +982,7 @@ public:
     }
 };
 
+// 37408 - Oscillation Field
 class spell_oscillating_field : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index 4cb6bf0c309..1f1e0b2b7fb 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -531,6 +531,11 @@ enum FeastOnSpells
     SPELL_ON_PLATE_EAT_VISUAL           = 61826
 };
 
+/* 61784 - Feast On Turkey
+   61785 - Feast On Cranberries
+   61786 - Feast On Sweet Potatoes
+   61787 - Feast On Pie
+   61788 - Feast On Stuffing */
 class spell_pilgrims_bounty_feast_on : public SpellScriptLoader
 {
     public:
@@ -612,6 +617,7 @@ enum TheTurkinator
     EMOTE_TURKEY_TRIUMPH            = 3
 };
 
+// 62014 - Turkey Tracker
 class spell_pilgrims_bounty_turkey_tracker : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index c4f37a257c0..0abcae0a251 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -2723,6 +2723,7 @@ enum MagicEater
     SPELL_WELL_FED_5                             = 57291,
 };
 
+// 58886 - Food
 class spell_magic_eater_food : public AuraScript
 {
     PrepareAuraScript(spell_magic_eater_food);
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index a476c4d799a..ba66b8f99d4 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -206,7 +206,7 @@ private:
 };
 
 /*
-// 31850 - Ardent Defender
+// -31850 - Ardent Defender
 class spell_pal_ardent_defender : public SpellScriptLoader
 {
     public:
@@ -1509,7 +1509,7 @@ class spell_pal_t3_6p_bonus : public SpellScriptLoader
         }
 };
 
-// 64890 Item - Paladin T8 Holy 2P Bonus
+// 64890 - Item - Paladin T8 Holy 2P Bonus
 class spell_pal_t8_2p_bonus : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index b801afa86c8..7f100140133 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -69,13 +69,13 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript
 };
 
 // http://www.wowhead.com/quest=55 Morbent Fel
-// 8913 Sacred Cleansing
 enum Quest55Data
 {
     NPC_MORBENT             = 1200,
     NPC_WEAKENED_MORBENT    = 24782,
 };
 
+// 8913 - Sacred Cleansing
 class spell_q55_sacred_cleansing : public SpellScriptLoader
 {
     public:
@@ -93,6 +93,7 @@ enum BendingShinbone
     SPELL_BENDING_SHINBONE2 = 8855
 };
 
+// 8856 - Bending Shinbone
 class spell_q1846_bending_shinbone : public SpellScript
 {
     PrepareSpellScript(spell_q1846_bending_shinbone);
@@ -114,12 +115,12 @@ class spell_q1846_bending_shinbone : public SpellScript
     }
 };
 
-// 9712 - Thaumaturgy Channel
 enum ThaumaturgyChannel
 {
     SPELL_THAUMATURGY_CHANNEL = 21029
 };
 
+// 9712 - Thaumaturgy Channel
 class spell_q2203_thaumaturgy_channel : public SpellScriptLoader
 {
     public:
@@ -154,13 +155,13 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=5206 Marauders of Darrowshire
-// 17271 Test Fetid Skull
 enum Quest5206Data
 {
     SPELL_CREATE_RESONATING_SKULL = 17269,
     SPELL_CREATE_BONE_DUST = 17270
 };
 
+// 17271 - Test Fetid Skull
 class spell_q5206_test_fetid_skull : public SpellScriptLoader
 {
     public:
@@ -201,7 +202,6 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader
 
 // http://www.wowhead.com/quest=6124 Curing the Sick (A)
 // http://www.wowhead.com/quest=6129 Curing the Sick (H)
-// 19512 Apply Salve
 enum Quests6124_6129Data
 {
     NPC_SICKLY_GAZELLE  = 12296,
@@ -212,6 +212,7 @@ enum Quests6124_6129Data
 
 constexpr Milliseconds Quest6124_6129_DESPAWN_TIME = 30s;
 
+// 19512 - Apply Salve
 class spell_q6124_6129_apply_salve : public SpellScriptLoader
 {
     public:
@@ -266,13 +267,13 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=10255 Testing the Antidote
-// 34665 Administer Antidote
 enum Quest10255Data
 {
     NPC_HELBOAR     = 16880,
     NPC_DREADTUSK   = 16992,
 };
 
+// 34665 - Administer Antidote
 class spell_q10255_administer_antidote : public SpellScriptLoader
 {
     public:
@@ -292,7 +293,7 @@ enum Quest11396_11399Data
     SPELL_SCOURGING_CRYSTAL_CONTROLLER = 43878
 };
 
-// 43874 Scourge Mur'gul Camp: Force Shield Arcane Purple x3
+// 43874 - Scourge Mur'gul Camp: Force Shield Arcane Purple x3
 class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoader
 {
     public:
@@ -328,7 +329,7 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade
         }
 };
 
-// 50133 Scourging Crystal Controller
+// 50133 - Scourging Crystal Controller
 class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader
 {
     public:
@@ -364,7 +365,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader
         }
 };
 
-// 43882 Scourging Crystal Controller Dummy
+// 43882 - Scourging Crystal Controller Dummy
 class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScriptLoader
 {
     public:
@@ -399,13 +400,13 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript
 };
 
 // http://www.wowhead.com/quest=11515 Blood for Blood
-// 44936 Quest - Fel Siphon Dummy
 enum Quest11515Data
 {
     NPC_FELBLOOD_INITIATE   = 24918,
     NPC_EMACIATED_FELBLOOD  = 24955
 };
 
+// 44936 - Quest - Fel Siphon Dummy
 class spell_q11515_fel_siphon_dummy : public SpellScriptLoader
 {
     public:
@@ -418,13 +419,13 @@ class spell_q11515_fel_siphon_dummy : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=11587 Prison Break
-// 45449 Arcane Prisoner Rescue
 enum Quest11587Data
 {
     SPELL_SUMMON_ARCANE_PRISONER_MALE    = 45446,    // Summon Arcane Prisoner - Male
     SPELL_SUMMON_ARCANE_PRISONER_FEMALE  = 45448     // Summon Arcane Prisoner - Female
 };
 
+// 45449 - Arcane Prisoner Rescue
 class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader
 {
     public:
@@ -461,7 +462,6 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=11730 Master and Servant
-// 46023 The Ultrasonic Screwdriver
 enum Quest11730Data
 {
     SPELL_SUMMON_SCAVENGEBOT_004A8  = 46063,
@@ -477,6 +477,7 @@ enum Quest11730Data
     NPC_55D_COLLECTATRON            = 25793
 };
 
+// 46023 - The Ultrasonic Screwdriver
 class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader
 {
     public:
@@ -540,7 +541,6 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=12459 That Which Creates Can Also Destroy
-// 49587 Seeds of Nature's Wrath
 enum Quest12459Data
 {
     NPC_REANIMATED_FROSTWYRM        = 26841,
@@ -553,6 +553,7 @@ enum Quest12459Data
     NPC_WEAK_DEATHGAZE              = 27807,
 };
 
+// 49587 - Seeds of Nature's Wrath
 class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader
 {
     public:
@@ -591,7 +592,6 @@ class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=12634 Some Make Lemonade, Some Make Liquor
-// 51840 Despawn Fruit Tosser
 enum Quest12634Data
 {
     SPELL_BANANAS_FALL_TO_GROUND    = 51836,
@@ -600,6 +600,7 @@ enum Quest12634Data
     SPELL_SUMMON_ADVENTUROUS_DWARF  = 52070
 };
 
+// 51840 - Despawn Fruit Tosser
 class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader
 {
     public:
@@ -647,7 +648,7 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=12683 Burning to Help
-// 52308 Take Sputum Sample
+// 52308 - Take Sputum Sample
 class spell_q12683_take_sputum_sample : public SpellScriptLoader
 {
     public:
@@ -687,7 +688,6 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=12851 Going Bearback
-// 54798 FLAMING Arrow Triggered Effect
 enum Quest12851Data
 {
     NPC_FROSTGIANT = 29351,
@@ -698,6 +698,7 @@ enum Quest12851Data
     SPELL_ABLAZE            = 54683,
 };
 
+// 54798 - FLAMING Arrow Triggered Effect
 class spell_q12851_going_bearback : public SpellScriptLoader
 {
     public:
@@ -749,13 +750,13 @@ class spell_q12851_going_bearback : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=12937 Relief for the Fallen
-// 55804 Healing Finished
 enum Quest12937Data
 {
     SPELL_TRIGGER_AID_OF_THE_EARTHEN    = 55809,
     NPC_FALLEN_EARTHEN_DEFENDER         = 30035,
 };
 
+// 55804 - Healing Finished
 class spell_q12937_relief_for_the_fallen : public SpellScriptLoader
 {
     public:
@@ -805,6 +806,7 @@ enum Whoarethey
     SPELL_GENERIC_DISGUISE = 32756
 };
 
+// 48917 - Who Are They: Cast from Questgiver
 class spell_q10041_q10040_who_are_they : public SpellScriptLoader
 {
     public:
@@ -884,12 +886,12 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=12659 Scalps!
-// 52090 Ahunae's Knife
 enum Quest12659Data
 {
     NPC_SCALPS_KC_BUNNY = 28622,
 };
 
+// 52090 - Ahunae's Knife
 class spell_q12659_ahunaes_knife : public SpellScriptLoader
 {
     public:
@@ -932,6 +934,7 @@ enum StoppingTheSpread
     SPELL_FLAMES                                 = 39199
 };
 
+// 32146 - Liquid Fire
 class spell_q9874_liquid_fire : public SpellScriptLoader
 {
     public:
@@ -977,6 +980,7 @@ enum SalvagingLifesStength
     NPC_SHARD_KILL_CREDIT                        = 29303,
 };
 
+// 54190 - Lifeblood Dummy
 class spell_q12805_lifeblood_dummy : public SpellScriptLoader
 {
     public:
@@ -1019,8 +1023,6 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader
 /*
  http://www.wowhead.com/quest=13283 King of the Mountain
  http://www.wowhead.com/quest=13280 King of the Mountain
- 59643 Plant Horde Battle Standard
- 4338 Plant Alliance Battle Standard
  */
 enum BattleStandard
 {
@@ -1031,6 +1033,8 @@ enum BattleStandard
     SPELL_JUMP_ROCKET_BLAST              = 4340
 };
 
+// 4338 - Plant Alliance Battle Standard
+// 59643 - Plant Horde Battle Standard
 class spell_q13280_13283_plant_battle_standard : public SpellScript
 {
     PrepareSpellScript(spell_q13280_13283_plant_battle_standard);
@@ -1059,6 +1063,7 @@ class spell_q13280_13283_plant_battle_standard : public SpellScript
     }
 };
 
+// 4336 - Jump Jets
 class spell_q13280_13283_jump_jets : public SpellScript
 {
     PrepareSpellScript(spell_q13280_13283_jump_jets);
@@ -1085,6 +1090,7 @@ enum ChumTheWaterSummons
     SUMMON_NORTH_SEA_BLUE_SHARK = 66740
 };
 
+// 66741 - Chum the Water
 class spell_q14112_14145_chum_the_water: public SpellScriptLoader
 {
     public:
@@ -1189,6 +1195,7 @@ enum HodirsHelm
     NPC_ICE_SPIKE_BUNNY = 30215
 };
 
+// 56278 - Read Pronouncement
 class spell_q12987_read_pronouncement : public SpellScriptLoader
 {
 public:
@@ -1233,6 +1240,7 @@ enum LeaveNothingToChance
     SPELL_LOWER_MINE_SHAFT_CREDIT   = 48745,
 };
 
+// 48742 - Wintergarde Mine Explosion
 class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader
 {
     public:
@@ -1286,6 +1294,7 @@ enum FocusOnTheBeach
     SPELL_BUNNY_CREDIT_BEAM = 47390,
 };
 
+// 50546 - The Focus on the Beach: Ley Line Focus Control Ring Effect
 class spell_q12066_bunny_kill_credit : public SpellScriptLoader
 {
 public:
@@ -1324,6 +1333,7 @@ enum ACleansingSong
     AREA_WINTERGRASPRIVER           = 4388,
 };
 
+// 52941 - Song of Cleansing
 class spell_q12735_song_of_cleansing : public SpellScriptLoader
 {
     public:
@@ -1369,6 +1379,7 @@ enum DefendingWyrmrestTemple
     SPELL_SUMMON_WYRMREST_DEFENDER       = 49207
 };
 
+// 49213 - Defending Wyrmrest Temple: Character Script Cast From Gossip
 class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader
 {
     public:
@@ -1396,7 +1407,6 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader
 };
 
 // http://www.wowhead.com/quest=12372 Defending Wyrmrest Temple
-// 49370 - Wyrmrest Defender: Destabilize Azure Dragonshrine Effect
 enum Quest12372Data
 {
     // NPCs
@@ -1405,6 +1415,7 @@ enum Quest12372Data
     WHISPER_ON_HIT_BY_FORCE_WHISPER       = 1
 };
 
+// 49370 - Wyrmrest Defender: Destabilize Azure Dragonshrine Effect
 class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoader
 {
     public:
@@ -1436,11 +1447,12 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad
         }
 };
 
-// ID - 50287 Azure Dragon: On Death Force Cast Wyrmrest Defender to Whisper to Controller - Random (cast from Azure Dragons and Azure Drakes on death)
 enum q12372Creatures
 {
     NPC_WYRMREST_DEFENDER = 27629
 };
+
+// 50287 - Azure Dragon: On Death Force Cast Wyrmrest Defender to Whisper to Controller - Random (cast from Azure Dragons and Azure Drakes on death)
 class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader
 {
     public:
@@ -1480,7 +1492,7 @@ enum Quest11010_11102_11023Data
     NPC_FEL_CANNON2           = 23082
 };
 
-// 40113 Knockdown Fel Cannon: The Aggro Check Aura
+// 40113 - Knockdown Fel Cannon: The Aggro Check Aura
 class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader
 {
     public:
@@ -1509,7 +1521,7 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader
         }
 };
 
-// 40112 Knockdown Fel Cannon: The Aggro Check
+// 40112 - Knockdown Fel Cannon: The Aggro Check
 class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader
 {
     public:
@@ -1539,7 +1551,7 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader
         }
 };
 
-// 40119 Knockdown Fel Cannon: The Aggro Burst
+// 40119 - Knockdown Fel Cannon: The Aggro Burst
 class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader
 {
     public:
@@ -1568,7 +1580,7 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader
         }
 };
 
-// 40056 Knockdown Fel Cannon: Choose Loc
+// 40056 - Knockdown Fel Cannon: Choose Loc
 class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader
 {
     public:
@@ -1674,6 +1686,7 @@ enum SpellZuldrakRat
     SPELL_SUMMON_GORGED_LURKING_BASILISK    = 50928
 };
 
+// 50894 - Zul'Drak Rat
 class spell_q12527_zuldrak_rat : public SpellScriptLoader
 {
     public:
@@ -1744,6 +1757,7 @@ enum QuenchingMist
     SPELL_FLICKERING_FLAMES = 53504
 };
 
+// 53350 - Quenching Mist
 class spell_q12730_quenching_mist : public SpellScriptLoader
 {
     public:
@@ -1785,6 +1799,7 @@ enum Quest13291_13292_13239_13261Data
     SPELL_RIDE         = 59319
 };
 
+// 59318 - Grab Fake Soldier
 class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public SpellScriptLoader
 {
     public:
@@ -1884,6 +1899,7 @@ enum BearFlankMaster
     SPELL_BEAR_FLANK_FAIL   = 56569
 };
 
+// 56565 - Bear Flank Master
 class spell_q13011_bear_flank_master : public SpellScriptLoader
 {
     public:
@@ -1934,6 +1950,8 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader
         }
 };
 
+// 57385 - Argent Cannon
+// 57412 - Reckoning Bomb
 class spell_q13086_cannons_target : public SpellScriptLoader
 {
     public:
@@ -2003,6 +2021,7 @@ enum BurstAtTheSeams
     SPELL_DRAKKARI_CHIEFTAINK_KILL_CREDIT       = 52620
 };
 
+// 59576 - Burst at the Seams
 class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576 : public SpellScript
 {
     PrepareSpellScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576);
@@ -2042,6 +2061,7 @@ class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576 : public SpellS
     }
 };
 
+// 59579 - Burst at the Seams
 class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579 : public AuraScript
 {
     PrepareAuraScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579);
@@ -2085,6 +2105,7 @@ class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579 : public AuraSc
     }
 };
 
+// 52593 - Bloated Abomination Feign Death
 class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraScript
 {
     PrepareAuraScript(spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death);
@@ -2113,6 +2134,7 @@ class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraSc
     }
 };
 
+// 76245 - Area Restrict Abom
 class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript
 {
     PrepareSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom);
@@ -2132,6 +2154,9 @@ class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript
     }
 };
 
+// 59590 - Assign Ghoul Kill Credit to Master
+// 60039 - Assign Skeleton Kill Credit to Master
+// 60041 - Assign Geist Kill Credit to Master
 class spell_q13264_q13276_q13288_q13289_assign_credit_to_master : public SpellScript
 {
     PrepareSpellScript(spell_q13264_q13276_q13288_q13289_assign_credit_to_master);
@@ -2153,6 +2178,7 @@ class spell_q13264_q13276_q13288_q13289_assign_credit_to_master : public SpellSc
     }
 };
 
+// 52510 - Burst at the Seams
 class spell_q12690_burst_at_the_seams_52510 : public SpellScript
 {
     PrepareSpellScript(spell_q12690_burst_at_the_seams_52510);
@@ -2290,6 +2316,11 @@ enum BasicOrdersEmote
     SPELL_TEST_STOP_DANCE    = 73886
 };
 
+/* 73725 - [DND] Test Cheer
+   73835 - [DND] Test Salute
+   73836 - [DND] Test Roar
+   73837 - [DND] Test Dance
+   73886 - [DND] Test Stop Dance */
 class spell_q25199_emote : public AuraScript
 {
     PrepareAuraScript(spell_q25199_emote);
@@ -2398,12 +2429,12 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader
         }
 };
 
-// 52694 - Recall Eye of Acherus
 enum Recall_Eye_of_Acherus
 {
     THE_EYE_OF_ACHERUS = 51852
 };
 
+// 52694 - Recall Eye of Acherus
 class spell_q12641_recall_eye_of_acherus : public SpellScriptLoader
 {
     public:
@@ -2497,6 +2528,7 @@ enum Quest_The_Storm_King
     SPELL_GRABBED               = 55424
 };
 
+// 55516 - Gymer's Grab
 class spell_q12919_gymers_grab : public SpellScriptLoader
 {
     public:
@@ -2538,6 +2570,7 @@ enum Quest_The_Storm_King_Throw
     SPELL_VARGUL_EXPLOSION      = 55569
 };
 
+// 55421 - Gymer's Throw
 class spell_q12919_gymers_throw : public SpellScriptLoader
 {
     public:
@@ -2575,6 +2608,7 @@ enum Quest_The_Hunter_And_The_Prince
     SPELL_ILLIDAN_KILL_CREDIT      = 61748
 };
 
+// 61752 - Illidan Kill Credit Master
 class spell_q13400_illidan_kill_master : public SpellScriptLoader
 {
     public:
@@ -2733,6 +2767,7 @@ public:
     }
 };
 
+// 53034 - Set Health Random
 class spell_q28813_set_health_random : public SpellScriptLoader
 {
 public:
@@ -2760,6 +2795,7 @@ public:
     }
 };
 
+// 49285 - Hand Over Reins
 class spell_q12414_hand_over_reins : public SpellScriptLoader
 {
     public:
@@ -2862,6 +2898,7 @@ enum ApplyHeatAndStir
     TALK_1 = 1
 };
 
+// 43972 - Mixing Blood
 class spell_q11306_mixing_blood : public SpellScriptLoader
 {
 public:
@@ -2890,6 +2927,7 @@ public:
     }
 };
 
+// 43375 - Mixing Vrykul Blood
 class spell_q11306_mixing_vrykul_blood : public SpellScriptLoader
 {
     public:
@@ -2932,6 +2970,7 @@ class spell_q11306_mixing_vrykul_blood : public SpellScriptLoader
         }
 };
 
+// 43376 - Failed Mix
 class spell_q11306_failed_mix_43376 : public SpellScriptLoader
 {
 public:
@@ -2960,6 +2999,7 @@ public:
     }
 };
 
+// 43378 - Failed Mix
 class spell_q11306_failed_mix_43378 : public SpellScriptLoader
 {
 public:
@@ -2988,6 +3028,7 @@ public:
     }
 };
 
+// 46444 - Weakness to Lightning: Cast on Master Script Effect
 class spell_q11896_weakness_to_lightning_46444 : public SpellScript
 {
     PrepareSpellScript(spell_q11896_weakness_to_lightning_46444);
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index 0b82abfc978..540724747f0 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -835,6 +835,7 @@ public:
     void SetRedirectTarget(ObjectGuid guid) { _redirectTarget = guid; }
 };
 
+// 57934 - Tricks of the Trade
 class spell_rog_tricks_of_the_trade : public SpellScript
 {
     PrepareSpellScript(spell_rog_tricks_of_the_trade);
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index d44d7123a1f..8535ebca83f 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -762,6 +762,7 @@ class MarkOfNatureTargetSelector
         }
 };
 
+// 25042 - Triggerspell - Mark of Nature
 class spell_mark_of_nature : public SpellScriptLoader
 {
     public: