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

51 files changed, 118 insertions, 15 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
index 96e1a49f1e0..df6fee7fbb8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
@@ -201,6 +201,7 @@ class go_orb_of_domination : public GameObjectScript
         }
 };
 
+// 19873 - Destroy Egg
 class spell_egg_event : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
index d19b5a9795a..4d0adbd1997 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
@@ -124,6 +124,7 @@ class boss_baron_geddon : public CreatureScript
         }
 };
 
+// 19695 - Inferno
 class spell_baron_geddon_inferno : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 5a0a011855d..812e42151cc 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -486,6 +486,7 @@ private:
     ObjectGuid _eggGUID;
 };
 
+// 44191 - Flame Strike
 class spell_felblood_kaelthas_flame_strike : public AuraScript
 {
     PrepareAuraScript(spell_felblood_kaelthas_flame_strike);
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 5096cbf61c4..13ac778fb80 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -349,6 +349,7 @@ class go_acherus_soul_prison : public GameObjectScript
         }
 };
 
+// 51519 - Death Knight Initiate Visual
 class spell_death_knight_initiate_visual : public SpellScript
 {
     PrepareSpellScript(spell_death_knight_initiate_visual);
@@ -865,6 +866,7 @@ class spell_stable_master_repo : public AuraScript
     }
 };
 
+// 52264 - Deliver Stolen Horse
 class spell_deliver_stolen_horse : public SpellScript
 {
     PrepareSpellScript(spell_deliver_stolen_horse);
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index c5061bbb82b..539150de929 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -611,6 +611,7 @@ public:
     };
 };
 
+// 53110 - Devour Humanoid
 class spell_death_knight_devour_humanoid : public SpellScript
 {
     PrepareSpellScript(spell_death_knight_devour_humanoid);
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index ddf4864e0d9..9ed2ec0d907 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -404,7 +404,7 @@ class npc_apothecary_baxter : public CreatureScript
         }
 };
 
-// 68965 -[DND] Lingering Fumes Targetting (starter)
+// 68965 - [DND] Lingering Fumes Targetting (starter)
 class spell_apothecary_lingering_fumes : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index 86a19f0ba89..cc8d26e08ae 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -636,6 +636,7 @@ class spell_muru_darkness : SpellScriptLoader
         }
 };
 
+// 45934 - Dark Fiend
 class spell_dark_fiend_skin : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index dab7b38f08b..2d66df1956c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -263,6 +263,7 @@ public:
 
 };
 
+// 38196 - Vampiric Aura
 class spell_anetheron_vampiric_aura : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index e9d1f0621f0..cfb19483d79 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -242,6 +242,7 @@ class npc_buru_egg : public CreatureScript
         }
 };
 
+// 19593 - Egg Explosion
 class spell_egg_explosion : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 1363c758a28..f281f3bb894 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -373,6 +373,7 @@ enum KingoftheFoulwealdMisc
     GO_BANNER = 178205
 };
 
+// 20783 - Destroy Karang's Banner
 class spell_destroy_karangs_banner : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index e92e25c6e7c..fb1292814c3 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -600,6 +600,7 @@ struct npc_anubarak_impale_target : public NullCreatureAI
     }
 };
 
+// 53472, 59433 - Pound
 class spell_anubarak_pound : public AuraScript
 {
     PrepareAuraScript(spell_anubarak_pound);
@@ -621,6 +622,7 @@ class spell_anubarak_pound : public AuraScript
     }
 };
 
+// 53520 - Carrion Beetles
 class spell_anubarak_carrion_beetles : public AuraScript
 {
     PrepareAuraScript(spell_anubarak_carrion_beetles);
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 002b7668914..d35a7ea026a 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -914,6 +914,7 @@ class npc_gatewatcher_web_wrap : public CreatureScript
         }
 };
 
+// 52343 - Krik'Thir Subboss Aggro Trigger
 class spell_gatewatcher_subboss_trigger : public SpellScriptLoader
 {
     public:
@@ -966,6 +967,7 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader
         }
 };
 
+// 52536 - Fixate Trigger
 class spell_anub_ar_skirmisher_fixate : public SpellScriptLoader
 {
     public:
@@ -998,6 +1000,7 @@ class spell_anub_ar_skirmisher_fixate : public SpellScriptLoader
         }
 };
 
+// 52086 - Web Wrap
 class spell_gatewatcher_web_wrap : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index c79349c051e..ce9a770e6d4 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -125,6 +125,7 @@ class OrientationCheck
         Unit* caster;
 };
 
+// 66862, 67681 - Radiance
 class spell_eadric_radiance : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 237481d2078..b42915f93d4 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -912,6 +912,7 @@ class spell_impale : public SpellScriptLoader
         }
 };
 
+// 66118, 67630, 68646, 68647 - Leeching Swarm
 class spell_anubarak_leeching_swarm : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index 4336ed489c0..260d2d225f8 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -2248,6 +2248,7 @@ class npc_toc_pet_hunter : public CreatureScript
         }
 };
 
+// 65812, 68154, 68155, 68156 - Unstable Affliction
 class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader
 {
     public:
@@ -2280,6 +2281,7 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader
         }
 };
 
+// 66017, 68753, 68754, 68755 - Death Grip
 class spell_faction_champion_death_grip : public SpellScriptLoader
 {
     public:
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 94619dd179c..eac8260ce11 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -712,8 +712,7 @@ class npc_bullet_controller : public CreatureScript
         }
 };
 
-// 66149 - Bullet Controller Periodic
-// 68396 - Bullet Controller Periodic
+// 66149, 68396 - Bullet Controller Periodic
 class spell_bullet_controller : public AuraScript
 {
     PrepareAuraScript(spell_bullet_controller);
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index e53f80f7075..d82bae23626 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -260,6 +260,7 @@ class npc_corrupted_soul_fragment : public CreatureScript
         }
 };
 
+// 68793, 69050 - Magic's Bane
 class spell_bronjahm_magic_bane : public SpellScriptLoader
 {
     public:
@@ -291,6 +292,7 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader
         }
 };
 
+// 68861 - Consume Soul
 class spell_bronjahm_consume_soul : public SpellScriptLoader
 {
     public:
@@ -357,6 +359,7 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader
         }
 };
 
+// 68921, 69049 - Soulstorm
 class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index e5d0838ab9d..51db578edad 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -247,6 +247,7 @@ private:
     uint32 _permafrostStack;
 };
 
+// 68786, 70336 - Permafrost
 class spell_garfrost_permafrost : public SpellScript
 {
     PrepareSpellScript(spell_garfrost_permafrost);
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index abcc56f1c0c..30c3307a67a 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -570,6 +570,7 @@ class spell_ick_explosive_barrage : public AuraScript
     }
 };
 
+// 44851 - Hasty Grow
 class spell_exploding_orb_hasty_grow : public AuraScript
 {
     PrepareAuraScript(spell_exploding_orb_hasty_grow);
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 df45c82a6a2..e608805e53c 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
@@ -515,6 +515,7 @@ private:
 // helper for shortened code
 typedef boss_blood_queen_lana_thel LanaThelAI;
 
+// 70946, 71475, 71476, 71477 - Vampiric Bite
 class spell_blood_queen_vampiric_bite : public SpellScript
 {
     PrepareSpellScript(spell_blood_queen_vampiric_bite);
@@ -575,6 +576,7 @@ class spell_blood_queen_vampiric_bite : public SpellScript
     }
 };
 
+// 70877, 71474 - Frenzied Bloodthirst
 class spell_blood_queen_frenzied_bloodthirst : public AuraScript
 {
     PrepareAuraScript(spell_blood_queen_frenzied_bloodthirst);
@@ -623,6 +625,7 @@ class BloodboltHitCheck
         LanaThelAI* _ai;
 };
 
+// 71899, 71900, 71901, 71902 - Bloodbolt Whirl
 class spell_blood_queen_bloodbolt : public SpellScript
 {
     PrepareSpellScript(spell_blood_queen_bloodbolt);
@@ -688,6 +691,7 @@ class spell_blood_queen_essence_of_the_blood_queen : public AuraScript
     }
 };
 
+// 71390 - Pact of the Darkfallen
 class spell_blood_queen_pact_of_the_darkfallen : public SpellScript
 {
     PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen);
@@ -725,6 +729,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScript
     }
 };
 
+// 71340 - Pact of the Darkfallen
 class spell_blood_queen_pact_of_the_darkfallen_dmg : public AuraScript
 {
     PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg);
@@ -753,6 +758,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public AuraScript
     }
 };
 
+// 71341 - Pact of the Darkfallen
 class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScript
 {
     PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_dmg_target);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index 3a7c929eb55..e2d985c9145 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -988,6 +988,7 @@ private:
     uint32 _index;
 };
 
+// 72202 - Blood Link
 class spell_deathbringer_blood_link : public SpellScript
 {
     PrepareSpellScript(spell_deathbringer_blood_link);
@@ -1011,6 +1012,7 @@ class spell_deathbringer_blood_link : public SpellScript
     }
 };
 
+// 72178 - Blood Link
 class spell_deathbringer_blood_link_aura : public AuraScript
 {
     PrepareAuraScript(spell_deathbringer_blood_link_aura);
@@ -1034,6 +1036,7 @@ class spell_deathbringer_blood_link_aura : public AuraScript
     }
 };
 
+// 72371 - Blood Power
 class spell_deathbringer_blood_power : public SpellScript
 {
     PrepareSpellScript(spell_deathbringer_blood_power);
@@ -1067,6 +1070,7 @@ class spell_deathbringer_blood_power_aura : public AuraScript
     }
 };
 
+// 72409, 72447, 72448, 72449 - Rune of Blood
 class spell_deathbringer_rune_of_blood : public SpellScript
 {
     PrepareSpellScript(spell_deathbringer_rune_of_blood);
@@ -1110,6 +1114,7 @@ class spell_deathbringer_blood_beast_blood_link : public AuraScript
     }
 };
 
+// 72380, 72438, 72439, 72440 - Blood Nova
 class spell_deathbringer_blood_nova : public SpellScript
 {
     PrepareSpellScript(spell_deathbringer_blood_nova);
@@ -1131,6 +1136,7 @@ class spell_deathbringer_blood_nova : public SpellScript
     }
 };
 
+// 72378, 73058 - Blood Nova
 class spell_deathbringer_blood_nova_targeting : public SpellScript
 {
     PrepareSpellScript(spell_deathbringer_blood_nova_targeting);
@@ -1193,6 +1199,7 @@ private:
     WorldObject* target;
 };
 
+// 72385, 72441, 72442, 72443 - Boiling Blood
 class spell_deathbringer_boiling_blood : public SpellScript
 {
     PrepareSpellScript(spell_deathbringer_boiling_blood);
@@ -1219,6 +1226,7 @@ class spell_deathbringer_boiling_blood : public SpellScript
     }
 };
 
+// 72257 - Remove Marks of the Fallen Champion
 class spell_deathbringer_remove_marks : public SpellScript
 {
     PrepareSpellScript(spell_deathbringer_remove_marks);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index 257fd8aeda7..9d97075c789 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -346,6 +346,7 @@ private:
     InstanceScript* _instance;
 };
 
+// 69195, 71219, 73031, 73032 - Pungent Blight
 class spell_festergut_pungent_blight : public SpellScript
 {
     PrepareSpellScript(spell_festergut_pungent_blight);
@@ -371,6 +372,7 @@ class spell_festergut_pungent_blight : public SpellScript
     }
 };
 
+// 72219, 72551, 72552, 72553 - Gastric Bloat
 class spell_festergut_gastric_bloat : public SpellScript
 {
     PrepareSpellScript(spell_festergut_gastric_bloat);
@@ -396,6 +398,7 @@ class spell_festergut_gastric_bloat : public SpellScript
     }
 };
 
+// 69290, 71222, 73033, 73034 - Blighted Spores
 class spell_festergut_blighted_spores : public AuraScript
 {
     PrepareAuraScript(spell_festergut_blighted_spores);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index 3986e1be4da..d8074ce04e5 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -942,6 +942,7 @@ private:
     bool _canShatter;
 };
 
+// 70842 - Mana Barrier
 class spell_deathwhisper_mana_barrier : public AuraScript
 {
     PrepareAuraScript(spell_deathwhisper_mana_barrier);
@@ -963,6 +964,7 @@ class spell_deathwhisper_mana_barrier : public AuraScript
     }
 };
 
+// 71289 - Dominate Mind
 class spell_deathwhisper_dominated_mind : public AuraScript
 {
     PrepareAuraScript(spell_deathwhisper_dominated_mind);
@@ -984,6 +986,7 @@ class spell_deathwhisper_dominated_mind : public AuraScript
     }
 };
 
+// 72478 - Summon Spirits
 class spell_deathwhisper_summon_spirits : public SpellScript
 {
     PrepareSpellScript(spell_deathwhisper_summon_spirits);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 423a973d7da..6576074c10c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -1375,6 +1375,7 @@ class OrderWhelpTargetSelector
         Creature* _owner;
 };
 
+// 71357 - Order Whelp
 class spell_frostwarden_handler_order_whelp : public SpellScript
 {
     PrepareSpellScript(spell_frostwarden_handler_order_whelp);
@@ -1417,6 +1418,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScript
     }
 };
 
+// 71350 - Focus Fire
 class spell_frostwarden_handler_focus_fire : public SpellScript
 {
     PrepareSpellScript(spell_frostwarden_handler_focus_fire);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index 609389d8c80..a793b461798 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -987,6 +987,7 @@ private:
     InstanceScript* _instance;
 };
 
+// 71085 - Mana Void
 class spell_dreamwalker_mana_void : public AuraScript
 {
     PrepareAuraScript(spell_dreamwalker_mana_void);
@@ -1006,6 +1007,10 @@ class spell_dreamwalker_mana_void : public AuraScript
     }
 };
 
+// 70912 - Summon Timer: Suppresser
+// 70913 - Summon Timer: Blazing Skeleton
+// 70915 - Summon Timer: Gluttonous Abomination
+// 70916 - Summon Timer: Risen Archmage
 class spell_dreamwalker_decay_periodic_timer : public AuraScript
 {
     PrepareAuraScript(spell_dreamwalker_decay_periodic_timer);
@@ -1033,6 +1038,10 @@ class spell_dreamwalker_decay_periodic_timer : public AuraScript
     int32 _decayRate = 0;
 };
 
+// 70921 - Summon Gluttonous Abomination
+// 70933 - Summon Blazing Skeleton
+// 71032 - Summon Blistering Zombie
+// 71078 - Summon Risen Archmage
 class spell_dreamwalker_summoner : public SpellScript
 {
     PrepareSpellScript(spell_dreamwalker_summoner);
@@ -1071,6 +1080,7 @@ class spell_dreamwalker_summoner : public SpellScript
     }
 };
 
+// 70912 - Summon Timer: Suppresser
 class spell_dreamwalker_summon_suppresser : public AuraScript
 {
     PrepareAuraScript(spell_dreamwalker_summon_suppresser);
@@ -1113,6 +1123,7 @@ class spell_dreamwalker_summon_suppresser : public AuraScript
     }
 };
 
+// 70936 - Summon Suppresser
 class spell_dreamwalker_summon_suppresser_effect : public SpellScript
 {
     PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect);
@@ -1139,6 +1150,7 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScript
     }
 };
 
+// 72224 - Summon Dream Portal
 class spell_dreamwalker_summon_dream_portal : public SpellScript
 {
     PrepareSpellScript(spell_dreamwalker_summon_dream_portal);
@@ -1159,6 +1171,7 @@ class spell_dreamwalker_summon_dream_portal : public SpellScript
     }
 };
 
+// 72480 - Summon Nightmare Portal
 class spell_dreamwalker_summon_nightmare_portal : public SpellScript
 {
     PrepareSpellScript(spell_dreamwalker_summon_nightmare_portal);
@@ -1179,6 +1192,7 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScript
     }
 };
 
+// 71970 - Nightmare Cloud
 class spell_dreamwalker_nightmare_cloud : public AuraScript
 {
     PrepareAuraScript(spell_dreamwalker_nightmare_cloud);
@@ -1210,6 +1224,7 @@ private:
     InstanceScript* _instance;
 };
 
+// 71941 - Twisted Nightmares
 class spell_dreamwalker_twisted_nightmares : public SpellScript
 {
     PrepareSpellScript(spell_dreamwalker_twisted_nightmares);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index 18f293e49a8..1e8e38fccac 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -646,6 +646,10 @@ struct boss_four_horsemen_sir : public boss_four_horsemen_baseAI
         bool _shouldSay; // throttle to make sure we only talk on first target hit by holy wrath
 };
 
+// 28832 - Mark of Korth'azz
+// 28833 - Mark of Blaumeux
+// 28834 - Mark of Rivendare
+// 28835 - Mark of Zeliek
 class spell_four_horsemen_mark : public AuraScript
 {
     PrepareAuraScript(spell_four_horsemen_mark);
@@ -694,6 +698,7 @@ class spell_four_horsemen_mark : public AuraScript
     }
 };
 
+// 28865 - Consumption
 class spell_four_horsemen_consumption : public SpellScript
 {
     PrepareSpellScript(spell_four_horsemen_consumption);
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index ef3640f166d..0f0dd10b843 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1853,6 +1853,7 @@ class ExactDistanceCheck
         float _dist;
 };
 
+// 56438 - Arcane Overload
 class spell_arcane_overload : public SpellScriptLoader
 {
     public:
@@ -2056,6 +2057,7 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader
         }
 };
 
+// 59084 - Destroy Platform Boom Visual
 class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptLoader
 {
     public:
@@ -2093,6 +2095,7 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL
         }
 };
 
+// 59099 - Destroy Platform Event
 class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader
 {
     public:
@@ -2313,6 +2316,7 @@ class spell_malygos_surge_of_power_25 : public SpellScriptLoader
         }
 };
 
+// 61028 - Alexstrasza's Gift Beam
 class spell_alexstrasza_gift_beam : public SpellScriptLoader
 {
     public:
@@ -2357,6 +2361,7 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader
         }
 };
 
+// 61023 - Alexstrasza's Gift Visual
 class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 5150bc95c5b..f0bf6b2e8c0 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -243,6 +243,7 @@ private:
 
 };
 
+// 47941 - Crystal Spike
 class spell_crystal_spike : public AuraScript
 {
     PrepareAuraScript(spell_crystal_spike);
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index 13536813cd0..520439fbf54 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -251,6 +251,7 @@ private:
     bool _amberVoid;
 };
 
+// 51162 - Planar Shift
 class spell_eregos_planar_shift : public AuraScript
 {
     PrepareAuraScript(spell_eregos_planar_shift);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
index 3f2e9c19807..6cc4337921a 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
@@ -1037,7 +1037,7 @@ private:
     InstanceScript* _instance;
 };
 
-//  64412 - Phase Punch
+// 64412 - Phase Punch
 class spell_algalon_phase_punch : public AuraScript
 {
     PrepareAuraScript(spell_algalon_phase_punch);
@@ -1065,7 +1065,7 @@ class spell_algalon_phase_punch : public AuraScript
     }
 };
 
-//  65508 - Constellation Phase Trigger
+// 65508 - Constellation Phase Trigger
 class spell_algalon_phase_constellation : public AuraScript
 {
     PrepareAuraScript(spell_algalon_phase_constellation);
@@ -1118,7 +1118,7 @@ class spell_algalon_trigger_3_adds : public SpellScript
     }
 };
 
-//  62018 - Collapse
+// 62018 - Collapse
 class spell_algalon_collapse : public AuraScript
 {
     PrepareAuraScript(spell_algalon_collapse);
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 5b366c84354..84b041273a1 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -1588,6 +1588,7 @@ class spell_load_into_catapult : public SpellScriptLoader
         }
 };
 
+// 62705 - Auto-repair
 class spell_auto_repair : public SpellScriptLoader
 {
     enum Spells
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
index af439dd8ea2..f1bbba47094 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
@@ -1530,6 +1530,9 @@ class npc_unstable_sun_beam : public CreatureScript
         }
 };
 
+// 62521 - Attuned to Nature 25 Dose Reduction
+// 62524 - Attuned to Nature 2 Dose Reduction
+// 62525 - Attuned to Nature 10 Dose Reduction
 class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader
 {
     public:
@@ -1577,6 +1580,8 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader
         }
 };
 
+// 65158 - Strengthened Iron Roots Summon Effect
+// 65160 - Iron Roots Summon Effect
 class spell_freya_iron_roots : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
index 51a01716879..be65a5e5240 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
@@ -448,6 +448,7 @@ class npc_saronite_vapors : public CreatureScript
         }
 };
 
+// 63276 - Mark of the Faceless
 class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader
 {
     public:
@@ -484,6 +485,7 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader
         }
 };
 
+// 63278 - Mark of the Faceless
 class spell_general_vezax_mark_of_the_faceless_leech : public SpellScriptLoader
 {
     public:
@@ -513,6 +515,7 @@ class spell_general_vezax_mark_of_the_faceless_leech : public SpellScriptLoader
         }
 };
 
+// 63322 - Saronite Vapors
 class spell_general_vezax_saronite_vapors : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index 0276d45ec4a..6429ebf0f13 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -980,6 +980,7 @@ class npc_toasty_fire : public CreatureScript
         };
 };
 
+// 62038 - Biting Cold
 class spell_biting_cold : public SpellScriptLoader
 {
     public:
@@ -1036,6 +1037,7 @@ class spell_biting_cold : public SpellScriptLoader
         }
 };
 
+// 62039 - Biting Cold
 class spell_biting_cold_dot : public SpellScriptLoader
 {
 public:
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index 5df22f3bdf9..44bb9e4c28e 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -305,6 +305,7 @@ private:
     EventMap events;
 };
 
+// 48400 - Frost Tomb
 class spell_frost_tomb : public AuraScript
 {
     PrepareAuraScript(spell_frost_tomb);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index 6ae69cf3d6d..21750fc9296 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -111,6 +111,7 @@ enum Fixate
     SPELL_FIXATE_TRIGGER = 40415
 };
 
+// 40414 - Fixate
 class spell_fixate : public SpellScript
 {
     PrepareSpellScript(spell_fixate);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 9207b2980b5..6c4a7e77e99 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -576,6 +576,7 @@ struct npc_ymirjar_harpooner : public npc_skadi_trashAI
     }
 };
 
+// 47594 - Freezing Cloud
 class spell_freezing_cloud_area_right : public SpellScript
 {
     PrepareSpellScript(spell_freezing_cloud_area_right);
@@ -602,6 +603,7 @@ class spell_freezing_cloud_area_right : public SpellScript
     }
 };
 
+// 47574 - Freezing Cloud
 class spell_freezing_cloud_area_left : public SpellScript
 {
     PrepareSpellScript(spell_freezing_cloud_area_left);
@@ -628,6 +630,7 @@ class spell_freezing_cloud_area_left : public SpellScript
     }
 };
 
+// 47579, 60020 - Freezing Cloud
 class spell_freezing_cloud_damage : public AuraScript
 {
     PrepareAuraScript(spell_freezing_cloud_damage);
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 315e9e6d9d2..04eaa2fe6a8 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -133,6 +133,7 @@ class achievement_defenseless : public AchievementCriteriaScript
         }
 };
 
+// 58694 - Arcane Vacuum
 class spell_cyanigosa_arcane_vacuum : public SpellScript
 {
     PrepareSpellScript(spell_cyanigosa_arcane_vacuum);
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 63012a4a65c..3a9b9ff2306 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -1031,6 +1031,7 @@ enum CloseRift
     SPELL_DESPAWN_RIFT          = 61665
 };
 
+// 56763 - Close Rift
 class spell_close_rift : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 59bd5e678d6..1066f122ebb 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -1028,6 +1028,7 @@ class spell_scourge_disguise_expiring : public AuraScript
     }
 };
 
+// 54089 - Drop Disguise
 class spell_drop_disguise : public SpellScript
 {
     PrepareSpellScript(spell_drop_disguise);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index e5996460d56..8c456c7e1db 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -198,6 +198,7 @@ struct boss_blackheart_the_inciter_mc_dummy : public NullCreatureAI
     }
 };
 
+// 33676 - Incite Chaos
 class spell_blackheart_incite_chaos : public SpellScript
 {
     PrepareSpellScript(spell_blackheart_incite_chaos);
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index ad4a4ab0d35..a5d08f4d1bf 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -276,7 +276,7 @@ class go_broggok_lever : public GameObjectScript
         }
 };
 
-// 30914, 38462 - Poison (Broggok)
+// 30914, 38462 - Poison
 class spell_broggok_poison_cloud : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index f649a540eb6..606364abd76 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -499,6 +499,7 @@ class npc_solarium_priest : public CreatureScript
         }
 };
 
+// 42783 - Wrath of the Astromancer
 class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index c24917dc377..9888db8db7f 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -169,6 +169,8 @@ class boss_mechano_lord_capacitus : public CreatureScript
         }
 };
 
+// 39090 - Positive Charge
+// 39093 - Negative Charge
 class spell_capacitus_polarity_charge : public SpellScriptLoader
 {
     public:
@@ -235,6 +237,7 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader
         }
 };
 
+// 39096 - Polarity Shift
 class spell_capacitus_polarity_shift : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
index 281fb9240d2..4cc3cf527ea 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -161,6 +161,7 @@ enum Creatures
     NPC_SUMMONED_BLOODWARDER_RESERVIST  = 20078
 };
 
+// 34803 - Summon Reinforcements
 class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index d0db750f8f2..767042a04b0 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -451,7 +451,7 @@ class spell_dk_blade_barrier : public SpellScriptLoader
         }
 };
 
-// 48721 - Blood Boil
+// -48721 - Blood Boil
 class spell_dk_blood_boil : public SpellScriptLoader
 {
     public:
@@ -636,7 +636,7 @@ private:
     bool _allowGhoul;
 };
 
-// 49158 - Corpse Explosion (51325, 51326, 51327, 51328)
+// -49158 - Corpse Explosion (51325, 51326, 51327, 51328)
 class spell_dk_corpse_explosion : public SpellScriptLoader
 {
     public:
@@ -799,6 +799,7 @@ class spell_dk_dancing_rune_weapon : public SpellScriptLoader
         }
 };
 
+// -43265 - Death and Decay
 class spell_dk_death_and_decay : public SpellScriptLoader
 {
     public:
@@ -1764,7 +1765,7 @@ class spell_dk_necrosis : public SpellScriptLoader
         }
 };
 
-// ID - 50842 Pestilence
+// 50842 - Pestilence
 class spell_dk_pestilence : public SpellScriptLoader
 {
     public:
@@ -2244,7 +2245,7 @@ class spell_dk_scent_of_blood_trigger : public SpellScriptLoader
         }
 };
 
-// 55090 - Scourge Strike (55265, 55270, 55271)
+// -55090 - Scourge Strike (55265, 55270, 55271)
 class spell_dk_scourge_strike : public SpellScriptLoader
 {
     public:
@@ -2309,7 +2310,7 @@ class spell_dk_scourge_strike : public SpellScriptLoader
         }
 };
 
-// 49145 - Spell Deflection
+// -49145 - Spell Deflection
 class spell_dk_spell_deflection : public SpellScriptLoader
 {
     public:
@@ -2542,6 +2543,7 @@ class spell_dk_unholy_blight : public SpellScriptLoader
             return new spell_dk_unholy_blight_AuraScript();
         }
 };
+
 // 55233 - Vampiric Blood
 class spell_dk_vampiric_blood : public SpellScriptLoader
 {
@@ -2650,7 +2652,7 @@ class spell_dk_wandering_plague : public SpellScriptLoader
         }
 };
 
-// 52284 - Will of the Necropolis
+// -52284 - Will of the Necropolis
 class spell_dk_will_of_the_necropolis : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index cf7e918935a..e112f224272 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -1094,7 +1094,7 @@ class spell_dru_predatory_strikes : public AuraScript
     }
 };
 
-// 33851 - Primal Tenacity
+// -33851 - Primal Tenacity
 class spell_dru_primal_tenacity : public AuraScript
 {
     PrepareAuraScript(spell_dru_primal_tenacity);
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index af37d81e776..8cfda51bdab 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -4353,7 +4353,6 @@ class spell_gen_vehicle_control_link : public AuraScript
     }
 };
 
-// 34779 - Freezing Circle
 enum FreezingCircleSpells
 {
     SPELL_FREEZING_CIRCLE_PIT_OF_SARON_NORMAL = 69574,
@@ -4361,6 +4360,7 @@ enum FreezingCircleSpells
     SPELL_FREEZING_CIRCLE                     = 34787,
 };
 
+// 34779 - Freezing Circle
 class spell_freezing_circle : public SpellScript
 {
     PrepareSpellScript(spell_freezing_circle);
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index d1aa22aaba0..9c369e92aa6 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -1341,6 +1341,7 @@ class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript
         }
 };
 
+// 43755 - Brewfest - Daily - Relay Race - Player - Increase Mount Duration - DND
 class spell_brewfest_relay_race_turn_in : public SpellScriptLoader
 {
 public:
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index 2962e7b5011..2f1bc6aaf46 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -2743,6 +2743,8 @@ class spell_q13665_q13790_bested_trigger : public SpellScriptLoader
 };
 
 // herald of war and life without regret portal spells
+// 59064 - Portal to Orgrimmar
+// 59439 - Portal to Undercity
 class spell_59064_59439_portals : public SpellScriptLoader
 {
 public:
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index e72920c977a..31ff518cfa8 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -719,6 +719,7 @@ class DreamFogTargetSelector
         }
 };
 
+// 24778 - Sleep
 class spell_dream_fog_sleep : public SpellScriptLoader
 {
     public: