Remove unused parameter from spell_new()

1 files changed, 141 insertions, 141 deletions

diff --git a/src/spells5.cc b/src/spells5.cc
index 72eddb76..0566768f 100644
--- a/src/spells5.cc
+++ b/src/spells5.cc
@@ -6,7 +6,7 @@
 #include "device_allocation.h"
 
 
-static spell_type *spell_new(s32b *index, cptr id, cptr name)
+static spell_type *spell_new(s32b *index, cptr name)
 {
 	assert(school_spells_count < SCHOOL_SPELLS_MAX);
 
@@ -64,7 +64,7 @@ s16b get_random_spell(s16b random_type, int level)
 static void spells_init_tome()
 {
 	{
-		spell_type *spell = spell_new(&DEVICE_LEBOHAUM, "DEVICE_LEBOHAUM", "Artifact Lebauhaum");
+		spell_type *spell = spell_new(&DEVICE_LEBOHAUM, "Artifact Lebauhaum");
 		spell_type_set_activation_timeout(spell, "3");
 		spell_type_describe(spell, "sing a cheerful song");
 		spell_type_set_mana(spell, 0, 0);
@@ -75,7 +75,7 @@ static void spells_init_tome()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_DURANDIL, "DEVICE_DURANDIL", "Artifact Durandil");
+		spell_type *spell = spell_new(&DEVICE_DURANDIL, "Artifact Durandil");
 		spell_type_set_activation_timeout(spell, "3");
 		spell_type_describe(spell, "sing a cheerful song");
 		spell_type_set_mana(spell, 0, 0);
@@ -86,7 +86,7 @@ static void spells_init_tome()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_THUNDERLORDS, "DEVICE_THUNDERLORDS", "Artifact Thunderlords");
+		spell_type *spell = spell_new(&DEVICE_THUNDERLORDS, "Artifact Thunderlords");
 		spell_type_describe(spell, "A thunderlord will appear to transport you quickly to the surface.");
 		spell_type_set_mana(spell, 1, 1);
 		spell_type_set_difficulty(spell, 1, 20);
@@ -109,7 +109,7 @@ static void spells_init_tome()
 static void spells_init_theme()
 {
 	{
-		spell_type *spell = spell_new(&GROW_ATHELAS, "GROW_ATHELAS", "Grow Athelas");
+		spell_type *spell = spell_new(&GROW_ATHELAS, "Grow Athelas");
 		spell_type_describe(spell, "Cures the Black Breath");
 		spell_type_set_mana(spell, 60, 100);
 		spell_type_set_difficulty(spell, 30, 95);
@@ -131,7 +131,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&AULE_FIREBRAND, "AULE_FIREBRAND", "Firebrand");
+		spell_type *spell = spell_new(&AULE_FIREBRAND, "Firebrand");
 		spell_type_describe(spell, "Imbues your melee weapon with fire to deal more damage");
 		spell_type_describe(spell, "At level 15 it spreads over a 1 radius zone around your target");
 		spell_type_describe(spell, "At level 30 it deals holy fire damage");
@@ -144,7 +144,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&AULE_ENCHANT_WEAPON, "AULE_ENCHANT_WEAPON", "Enchant Weapon");
+		spell_type *spell = spell_new(&AULE_ENCHANT_WEAPON, "Enchant Weapon");
 		spell_type_describe(spell, "Tries to enchant a weapon to-hit");
 		spell_type_describe(spell, "At level 5 it also enchants to-dam");
 		spell_type_describe(spell, "At level 45 it enhances the special powers of magical weapons");
@@ -158,7 +158,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&AULE_ENCHANT_ARMOUR, "AULE_ENCHANT_ARMOUR", "Enchant Armour");
+		spell_type *spell = spell_new(&AULE_ENCHANT_ARMOUR, "Enchant Armour");
 		spell_type_describe(spell, "Tries to enchant a piece of armour");
 		spell_type_describe(spell, "At level 20 it also enchants to-hit and to-dam");
 		spell_type_describe(spell, "At level 40 it enhances the special powers of magical armour");
@@ -172,7 +172,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&AULE_CHILD, "AULE_CHILD", "Child of Aule");
+		spell_type *spell = spell_new(&AULE_CHILD, "Child of Aule");
 		spell_type_describe(spell, "Summons a levelled Dwarven warrior to help you battle the forces");
 		spell_type_describe(spell, "of Morgoth");
 		spell_type_set_mana(spell, 200, 500);
@@ -184,7 +184,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&VARDA_LIGHT_VALINOR, "VARDA_LIGHT_VALINOR", "Light of Valinor");
+		spell_type *spell = spell_new(&VARDA_LIGHT_VALINOR, "Light of Valinor");
 		spell_type_describe(spell, "Lights a room");
 		spell_type_describe(spell, "At level 3 it starts damaging monsters");
 		spell_type_describe(spell, "At level 15 it starts creating a more powerful kind of light");
@@ -197,7 +197,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&VARDA_CALL_ALMAREN, "VARDA_CALL_ALMAREN", "Call of Almaren");
+		spell_type *spell = spell_new(&VARDA_CALL_ALMAREN, "Call of Almaren");
 		spell_type_describe(spell, "Banishes evil beings");
 		spell_type_describe(spell, "At level 20 it dispels evil beings");
 		spell_type_set_mana(spell, 5, 150);
@@ -209,7 +209,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&VARDA_EVENSTAR, "VARDA_EVENSTAR", "Evenstar");
+		spell_type *spell = spell_new(&VARDA_EVENSTAR, "Evenstar");
 		spell_type_describe(spell, "Maps and lights the whole level.");
 		spell_type_describe(spell, "At level 40 it maps and lights the whole level,");
 		spell_type_describe(spell, "in addition to letting you know yourself better");
@@ -223,7 +223,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&VARDA_STARKINDLER, "VARDA_STARKINDLER", "Star Kindler");
+		spell_type *spell = spell_new(&VARDA_STARKINDLER, "Star Kindler");
 		spell_type_describe(spell, "Does multiple bursts of light damage.");
 		spell_type_describe(spell, "The damage increases with level.");
 		spell_type_set_mana(spell, 50, 250);
@@ -235,7 +235,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&ULMO_BELEGAER, "ULMO_BELEGAER", "Song of Belegaer");
+		spell_type *spell = spell_new(&ULMO_BELEGAER, "Song of Belegaer");
 		spell_type_describe(spell, "Channels the power of the Great Sea into your fingertips.");
 		spell_type_describe(spell, "Sometimes it can blast through its first target.");
 		spell_type_set_mana(spell, 1, 100);
@@ -247,7 +247,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&ULMO_DRAUGHT_ULMONAN, "ULMO_DRAUGHT_ULMONAN", "Draught of Ulmonan");
+		spell_type *spell = spell_new(&ULMO_DRAUGHT_ULMONAN, "Draught of Ulmonan");
 		spell_type_describe(spell, "Fills you with a draught with powerful curing effects,");
 		spell_type_describe(spell, "prepared by Ulmo himself.");
 		spell_type_describe(spell, "Level 1: blindness, poison, cuts and stunning");
@@ -262,7 +262,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&ULMO_CALL_ULUMURI, "ULMO_CALL_ULUMURI", "Call of the Ulumuri");
+		spell_type *spell = spell_new(&ULMO_CALL_ULUMURI, "Call of the Ulumuri");
 		spell_type_describe(spell, "Summons a leveled water spirit or elemental");
 		spell_type_describe(spell, "to fight for you");
 		spell_type_set_mana(spell, 50, 300);
@@ -274,7 +274,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&ULMO_WRATH, "ULMO_WRATH", "Wrath of Ulmo");
+		spell_type *spell = spell_new(&ULMO_WRATH, "Wrath of Ulmo");
 		spell_type_describe(spell, "Conjures up a sea storm.");
 		spell_type_describe(spell, "At level 30 it turns into a more forceful storm.");
 		spell_type_set_mana(spell, 100, 400);
@@ -286,7 +286,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANDOS_TEARS_LUTHIEN, "MANDOS_TEARS_LUTHIEN", "Tears of Luthien");
+		spell_type *spell = spell_new(&MANDOS_TEARS_LUTHIEN, "Tears of Luthien");
 		spell_type_describe(spell, "Calls upon the spirit of Luthien to ask Mandos for healing and succour.");
 		spell_type_set_mana(spell, 10, 100);
 		spell_type_set_difficulty(spell, 5, 25);
@@ -297,7 +297,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANDOS_SPIRIT_FEANTURI, "MANDOS_SPIRIT_FEANTURI", "Feanturi");
+		spell_type *spell = spell_new(&MANDOS_SPIRIT_FEANTURI, "Feanturi");
 		spell_type_describe(spell, "Channels the power of Mandos to cure fear and confusion.");
 		spell_type_describe(spell, "At level 20 it restores lost INT and WIS");
 		spell_type_describe(spell, "At level 30 it cures hallucinations and restores a percentage of lost sanity");
@@ -310,7 +310,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANDOS_TALE_DOOM, "MANDOS_TALE_DOOM", "Tale of Doom");
+		spell_type *spell = spell_new(&MANDOS_TALE_DOOM, "Tale of Doom");
 		spell_type_describe(spell, "Allows you to predict the future for a short time.");
 		spell_type_set_mana(spell, 60, 300);
 		spell_type_set_difficulty(spell, 25, 75);
@@ -321,7 +321,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANDOS_CALL_HALLS, "MANDOS_CALL_HALLS", "Call to the Halls");
+		spell_type *spell = spell_new(&MANDOS_CALL_HALLS, "Call to the Halls");
 		spell_type_describe(spell, "Summons a leveled spirit from the Halls of Mandos");
 		spell_type_describe(spell, "to fight for you.");
 		spell_type_set_mana(spell, 80, 400);
@@ -333,7 +333,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_THUNDERLORDS, "DEVICE_THUNDERLORDS", "Artifact Thunderlords");
+		spell_type *spell = spell_new(&DEVICE_THUNDERLORDS, "Artifact Thunderlords");
 		spell_type_describe(spell, "An Eagle of Manwe will appear to transport you quickly to the town.");
 		spell_type_set_mana(spell, 1, 1);
 		spell_type_set_difficulty(spell, 1, 20);
@@ -353,7 +353,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_RADAGAST, "DEVICE_RADAGAST", "Artifact Radagast");
+		spell_type *spell = spell_new(&DEVICE_RADAGAST, "Artifact Radagast");
 		spell_type_set_activation_timeout(spell, "15000");
 		spell_type_describe(spell, "purity and health");
 		spell_type_set_mana(spell, 0, 0);
@@ -364,7 +364,7 @@ static void spells_init_theme()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_VALAROMA, "DEVICE_VALAROMA", "Artifact Valaroma");
+		spell_type *spell = spell_new(&DEVICE_VALAROMA, "Artifact Valaroma");
 		spell_type_set_activation_timeout(spell, "250");
 		spell_type_describe(spell, "banish evil (level x5)");
 		spell_type_set_mana(spell, 0, 0);
@@ -388,7 +388,7 @@ void school_spells_init()
 
 	/* Spells */
 	{
-		spell_type *spell = spell_new(&GLOBELIGHT, "GLOBELIGHT", "Globe of Light");
+		spell_type *spell = spell_new(&GLOBELIGHT, "Globe of Light");
 		spell_type_describe(spell, "Creates a globe of pure light");
 		spell_type_describe(spell, "At level 3 it starts damaging monsters");
 		spell_type_describe(spell, "At level 15 it starts creating a more powerful kind of light");
@@ -413,7 +413,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&FIREFLASH, "FIREFLASH", "Fireflash");
+		spell_type *spell = spell_new(&FIREFLASH, "Fireflash");
 		spell_type_describe(spell, "Conjures a ball of fire to burn your foes to ashes");
 		spell_type_describe(spell, "At level 20 it turns into a ball of holy fire");
 		spell_type_set_mana(spell, 5, 70);
@@ -436,7 +436,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&FIERYAURA, "FIERYAURA", "Fiery Shield");
+		spell_type *spell = spell_new(&FIERYAURA, "Fiery Shield");
 		spell_type_describe(spell, "Creates a shield of fierce flames around you");
 		spell_type_describe(spell, "At level 8 it turns into a greater kind of flame that can not be resisted");
 		spell_type_set_mana(spell, 20, 60);
@@ -460,7 +460,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&FIREWALL, "FIREWALL", "Firewall");
+		spell_type *spell = spell_new(&FIREWALL, "Firewall");
 		spell_type_describe(spell, "Creates a fiery wall to incinerate monsters stupid enough to attack you");
 		spell_type_describe(spell, "At level 6 it turns into a wall of hell fire");
 		spell_type_set_mana(spell, 25, 100);
@@ -483,7 +483,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&FIREGOLEM, "FIREGOLEM", "Fire Golem");
+		spell_type *spell = spell_new(&FIREGOLEM, "Fire Golem");
 		spell_type_describe(spell, "Creates a fiery golem and controls it");
 		spell_type_describe(spell, "During the control the available keylist is:");
 		spell_type_describe(spell, "Movement keys: movement of the golem(depending on its speed");
@@ -507,7 +507,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANATHRUST, "MANATHRUST", "Manathrust");
+		spell_type *spell = spell_new(&MANATHRUST, "Manathrust");
 		spell_type_describe(spell, "Conjures up mana into a powerful bolt");
 		spell_type_describe(spell, "The damage is irresistible and will increase with level");
 		spell_type_set_mana(spell, 1, 25);
@@ -530,7 +530,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DELCURSES, "DELCURSES", "Remove Curses");
+		spell_type *spell = spell_new(&DELCURSES, "Remove Curses");
 		spell_type_describe(spell, "Remove curses of worn objects");
 		spell_type_describe(spell, "At level 20 switches to *remove curses*");
 		spell_type_set_mana(spell, 20, 40);
@@ -554,7 +554,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&RESISTS, "RESISTS", "Elemental Shield");
+		spell_type *spell = spell_new(&RESISTS, "Elemental Shield");
 		spell_type_describe(spell, "Provide resistances to the four basic elements");
 		spell_type_set_mana(spell, 17, 20);
 		spell_type_set_inertia(spell, 2, 25);
@@ -567,7 +567,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANASHIELD, "MANASHIELD", "Disruption Shield");
+		spell_type *spell = spell_new(&MANASHIELD, "Disruption Shield");
 		spell_type_describe(spell, "Uses mana instead of hp to take damage");
 		spell_type_describe(spell, "At level 5 switches to Globe of Invulnerability.");
 		spell_type_describe(spell, "The spell breaks as soon as a melee, shooting, throwing or magical");
@@ -583,7 +583,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&TIDALWAVE, "TIDALWAVE", "Tidal Wave");
+		spell_type *spell = spell_new(&TIDALWAVE, "Tidal Wave");
 		spell_type_describe(spell, "Summons a monstrous tidal wave that will expand and crush the");
 		spell_type_describe(spell, "monsters under its mighty waves.");
 		spell_type_set_mana(spell, 16, 40);
@@ -607,7 +607,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ICESTORM, "ICESTORM", "Ice Storm");
+		spell_type *spell = spell_new(&ICESTORM, "Ice Storm");
 		spell_type_describe(spell, "Engulfs you in a storm of roaring cold that strikes your foes.");
 		spell_type_describe(spell, "At level 10 it turns into shards of ice.");
 		spell_type_set_mana(spell, 30, 60);
@@ -631,7 +631,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ENTPOTION, "ENTPOTION", "Ent's Potion");
+		spell_type *spell = spell_new(&ENTPOTION, "Ent's Potion");
 		spell_type_describe(spell, "Fills up your stomach.");
 		spell_type_describe(spell, "At level 5 it boldens your heart.");
 		spell_type_describe(spell, "At level 12 it makes you heroic.");
@@ -646,7 +646,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&VAPOR, "VAPOR", "Vapor");
+		spell_type *spell = spell_new(&VAPOR, "Vapor");
 		spell_type_describe(spell, "Fills the air with toxic moisture to eradicate annoying critters.");
 		spell_type_set_mana(spell, 2, 12);
 		spell_type_set_inertia(spell, 1, 30);
@@ -659,7 +659,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&GEYSER, "GEYSER", "Geyser");
+		spell_type *spell = spell_new(&GEYSER, "Geyser");
 		spell_type_describe(spell, "Shoots a geyser of water from your fingertips.");
 		spell_type_describe(spell, "Sometimes it can blast through its first target.");
 		spell_type_set_mana(spell, 1, 35);
@@ -672,7 +672,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&NOXIOUSCLOUD, "NOXIOUSCLOUD", "Noxious Cloud");
+		spell_type *spell = spell_new(&NOXIOUSCLOUD, "Noxious Cloud");
 		spell_type_describe(spell, "Creates a cloud of poison");
 		spell_type_describe(spell, "The cloud will persist for some turns, damaging all monsters passing by");
 		spell_type_describe(spell, "At spell level 30 it turns into a thick gas attacking all living beings");
@@ -696,7 +696,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&AIRWINGS, "AIRWINGS", "Wings of Winds");
+		spell_type *spell = spell_new(&AIRWINGS, "Wings of Winds");
 		spell_type_describe(spell, "Grants the power of levitation");
 		spell_type_describe(spell, "At level 16 it grants the power of controlled flight");
 		spell_type_add_school(spell, SCHOOL_CONVEYANCE);
@@ -721,7 +721,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&INVISIBILITY, "INVISIBILITY", "Invisibility");
+		spell_type *spell = spell_new(&INVISIBILITY, "Invisibility");
 		spell_type_describe(spell, "Grants invisibility");
 		spell_type_set_mana(spell, 10, 20);
 		spell_type_set_inertia(spell, 1, 30);
@@ -734,7 +734,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&POISONBLOOD, "POISONBLOOD", "Poison Blood");
+		spell_type *spell = spell_new(&POISONBLOOD, "Poison Blood");
 		spell_type_describe(spell, "Grants resist poison");
 		spell_type_describe(spell, "At level 15 it provides poison branding to wielded weapon");
 		spell_type_set_mana(spell, 10, 20);
@@ -758,7 +758,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&THUNDERSTORM, "THUNDERSTORM", "Thunderstorm");
+		spell_type *spell = spell_new(&THUNDERSTORM, "Thunderstorm");
 		spell_type_describe(spell, "Charges up the air around you with electricity");
 		spell_type_describe(spell, "Each turn it will throw a thunder bolt at a random monster in sight");
 		spell_type_describe(spell, "The thunder does 3 types of damage, one third of lightning");
@@ -785,7 +785,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&STERILIZE, "STERILIZE", "Sterilize");
+		spell_type *spell = spell_new(&STERILIZE, "Sterilize");
 		spell_type_describe(spell, "Prevents explosive breeding for a while.");
 		spell_type_set_mana(spell, 10, 100);
 		spell_type_set_difficulty(spell, 20, 50);
@@ -807,7 +807,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&STONESKIN, "STONESKIN", "Stone Skin");
+		spell_type *spell = spell_new(&STONESKIN, "Stone Skin");
 		spell_type_describe(spell, "Creates a shield of earth around you to protect you");
 		spell_type_describe(spell, "At level 25 it starts dealing damage to attackers");
 		spell_type_set_mana(spell, 1, 50);
@@ -821,7 +821,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DIG, "DIG", "Dig");
+		spell_type *spell = spell_new(&DIG, "Dig");
 		spell_type_describe(spell, "Digs a hole in a wall much faster than any shovels");
 		spell_type_set_mana(spell, 14, 14);
 		spell_type_set_difficulty(spell, 12, 20);
@@ -843,7 +843,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&STONEPRISON, "STONEPRISON", "Stone Prison");
+		spell_type *spell = spell_new(&STONEPRISON, "Stone Prison");
 		spell_type_describe(spell, "Creates a prison of walls around you");
 		spell_type_describe(spell, "At level 10 it allows you to target a monster");
 		spell_type_set_mana(spell, 30, 50);
@@ -866,7 +866,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&STRIKE, "STRIKE", "Strike");
+		spell_type *spell = spell_new(&STRIKE, "Strike");
 		spell_type_describe(spell, "Creates a micro-ball of force that will push monsters backwards");
 		spell_type_describe(spell, "If the monster is caught near a wall, it'll be crushed against it");
 		spell_type_describe(spell, "At level 12 it turns into a ball of radius 1");
@@ -890,7 +890,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&SHAKE, "SHAKE", "Shake");
+		spell_type *spell = spell_new(&SHAKE, "Shake");
 		spell_type_describe(spell, "Creates a localised earthquake");
 		spell_type_describe(spell, "At level 10 it can be targeted at any location");
 		spell_type_set_mana(spell, 25, 30);
@@ -914,7 +914,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&BLINK, "BLINK", "Phase Door");
+		spell_type *spell = spell_new(&BLINK, "Phase Door");
 		spell_type_describe(spell, "Teleports you on a small scale range");
 		spell_type_describe(spell, "At level 30 it creates void jumpgates");
 		spell_type_set_mana(spell, 1, 3);
@@ -928,7 +928,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DISARM, "DISARM", "Disarm");
+		spell_type *spell = spell_new(&DISARM, "Disarm");
 		spell_type_describe(spell, "Destroys doors and traps");
 		spell_type_describe(spell, "At level 10 it destroys doors and traps, then reveals and unlocks any secret");
 		spell_type_describe(spell, "doors");
@@ -952,7 +952,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&TELEPORT, "TELEPORT", "Teleportation");
+		spell_type *spell = spell_new(&TELEPORT, "Teleportation");
 		spell_type_describe(spell, "Teleports you around the level. The casting time decreases with level");
 		spell_type_set_mana(spell, 8, 14);
 		spell_type_set_inertia(spell, 1, 10);
@@ -975,7 +975,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&TELEAWAY, "TELEAWAY", "Teleport Away");
+		spell_type *spell = spell_new(&TELEAWAY, "Teleport Away");
 		spell_type_describe(spell, "Teleports a line of monsters away");
 		spell_type_describe(spell, "At level 10 it turns into a ball");
 		spell_type_describe(spell, "At level 20 it teleports all monsters in sight");
@@ -999,7 +999,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&RECALL, "RECALL", "Recall");
+		spell_type *spell = spell_new(&RECALL, "Recall");
 		spell_type_describe(spell, "Cast on yourself it will recall you to the surface/dungeon.");
 		spell_type_describe(spell, "Cast at a monster you will swap positions with the monster.");
 		spell_type_describe(spell, "Cast at an object it will fetch the object to you.");
@@ -1013,7 +1013,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&PROBABILITY_TRAVEL, "PROBABILITY_TRAVEL", "Probability Travel");
+		spell_type *spell = spell_new(&PROBABILITY_TRAVEL, "Probability Travel");
 		spell_type_describe(spell, "Renders you immaterial, when you hit a wall you travel through it and");
 		spell_type_describe(spell, "instantly appear on the other side of it. You can also float up and down");
 		spell_type_describe(spell, "at will");
@@ -1038,7 +1038,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&GROWTREE, "GROWTREE", "Grow Trees");
+		spell_type *spell = spell_new(&GROWTREE, "Grow Trees");
 		spell_type_describe(spell, "Makes trees grow extremely quickly around you");
 		spell_type_add_school(spell, SCHOOL_TEMPORAL);
 		spell_type_set_mana(spell, 6, 30);
@@ -1052,7 +1052,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&HEALING, "HEALING", "Healing");
+		spell_type *spell = spell_new(&HEALING, "Healing");
 		spell_type_describe(spell, "Heals a percent of hitpoints");
 		spell_type_set_mana(spell, 15, 50);
 		spell_type_set_difficulty(spell, 10, 45);
@@ -1074,7 +1074,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&RECOVERY, "RECOVERY", "Recovery");
+		spell_type *spell = spell_new(&RECOVERY, "Recovery");
 		spell_type_describe(spell, "Reduces the length of time that you are poisoned");
 		spell_type_describe(spell, "At level 5 it cures poison and cuts");
 		spell_type_describe(spell, "At level 10 it restores drained stats");
@@ -1100,7 +1100,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&REGENERATION, "REGENERATION", "Regeneration");
+		spell_type *spell = spell_new(&REGENERATION, "Regeneration");
 		spell_type_describe(spell, "Increases your body's regeneration rate");
 		spell_type_set_mana(spell, 30, 55);
 		spell_type_set_inertia(spell, 4, 40);
@@ -1113,7 +1113,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&SUMMONANNIMAL, "SUMMONANNIMAL", "Summon Animal");
+		spell_type *spell = spell_new(&SUMMONANNIMAL, "Summon Animal");
 		spell_type_describe(spell, "Summons a leveled animal to your aid");
 		spell_type_set_mana(spell, 25, 50);
 		spell_type_set_difficulty(spell, 25, 90);
@@ -1135,7 +1135,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&STARIDENTIFY, "STARIDENTIFY", "Greater Identify");
+		spell_type *spell = spell_new(&STARIDENTIFY, "Greater Identify");
 		spell_type_describe(spell, "Asks for an object and fully identify it, providing the full list of powers");
 		spell_type_describe(spell, "Cast at yourself it will reveal your powers");
 		spell_type_set_mana(spell, 30, 30);
@@ -1148,7 +1148,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&IDENTIFY, "IDENTIFY", "Identify");
+		spell_type *spell = spell_new(&IDENTIFY, "Identify");
 		spell_type_describe(spell, "Asks for an object and identifies it");
 		spell_type_describe(spell, "At level 17 it identifies all objects in the inventory");
 		spell_type_describe(spell, "At level 27 it identifies all objects in the inventory and in a");
@@ -1173,7 +1173,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&VISION, "VISION", "Vision");
+		spell_type *spell = spell_new(&VISION, "Vision");
 		spell_type_describe(spell, "Detects the layout of the surrounding area");
 		spell_type_describe(spell, "At level 25 it maps and lights the whole level");
 		spell_type_set_mana(spell, 7, 55);
@@ -1197,7 +1197,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&SENSEHIDDEN, "SENSEHIDDEN", "Sense Hidden");
+		spell_type *spell = spell_new(&SENSEHIDDEN, "Sense Hidden");
 		spell_type_describe(spell, "Detects the traps in a certain radius around you");
 		spell_type_describe(spell, "At level 15 it allows you to sense invisible for a while");
 		spell_type_set_mana(spell, 2, 10);
@@ -1221,7 +1221,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&REVEALWAYS, "REVEALWAYS", "Reveal Ways");
+		spell_type *spell = spell_new(&REVEALWAYS, "Reveal Ways");
 		spell_type_describe(spell, "Detects the doors/stairs/ways in a certain radius around you");
 		spell_type_set_mana(spell, 3, 15);
 		spell_type_set_inertia(spell, 1, 10);
@@ -1244,7 +1244,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&SENSEMONSTERS, "SENSEMONSTERS", "Sense Monsters");
+		spell_type *spell = spell_new(&SENSEMONSTERS, "Sense Monsters");
 		spell_type_describe(spell, "Detects all monsters near you");
 		spell_type_describe(spell, "At level 30 it allows you to sense monster minds for a while");
 		spell_type_set_mana(spell, 1, 20);
@@ -1268,7 +1268,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MAGELOCK, "MAGELOCK", "Magelock");
+		spell_type *spell = spell_new(&MAGELOCK, "Magelock");
 		spell_type_describe(spell, "Magically locks a door");
 		spell_type_describe(spell, "At level 30 it creates a glyph of warding");
 		spell_type_describe(spell, "At level 40 the glyph can be placed anywhere in the field of vision");
@@ -1292,7 +1292,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&SLOWMONSTER, "SLOWMONSTER", "Slow Monster");
+		spell_type *spell = spell_new(&SLOWMONSTER, "Slow Monster");
 		spell_type_describe(spell, "Magically slows down the passing of time around a monster");
 		spell_type_describe(spell, "At level 20 it affects a zone");
 		spell_type_set_mana(spell, 10, 15);
@@ -1315,7 +1315,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ESSENCESPEED, "ESSENCESPEED", "Essence of Speed");
+		spell_type *spell = spell_new(&ESSENCESPEED, "Essence of Speed");
 		spell_type_describe(spell, "Magically decreases the passing of time around you, making you move faster with");
 		spell_type_describe(spell, "respect to the rest of the universe.");
 		spell_type_set_mana(spell, 20, 40);
@@ -1339,7 +1339,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&BANISHMENT, "BANISHMENT", "Banishment");
+		spell_type *spell = spell_new(&BANISHMENT, "Banishment");
 		spell_type_describe(spell, "Disrupts the space/time continuum in your area and teleports all monsters away.");
 		spell_type_describe(spell, "At level 15 it may also lock them in a time bubble for a while.");
 		spell_type_add_school(spell, SCHOOL_CONVEYANCE);
@@ -1364,7 +1364,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&RECHARGE, "RECHARGE", "Recharge");
+		spell_type *spell = spell_new(&RECHARGE, "Recharge");
 		spell_type_describe(spell, "Taps on the ambient mana to recharge an object's power (charges or mana)");
 		spell_type_set_mana(spell, 10, 100);
 		spell_type_set_difficulty(spell, 5, 20);
@@ -1376,7 +1376,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&SPELLBINDER, "SPELLBINDER", "Spellbinder");
+		spell_type *spell = spell_new(&SPELLBINDER, "Spellbinder");
 		spell_type_describe(spell, "Stores spells in a trigger.");
 		spell_type_describe(spell, "When the condition is met all spells fire off at the same time");
 		spell_type_describe(spell, "This spell takes a long time to cast so you are advised to prepare it");
@@ -1393,7 +1393,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DISPERSEMAGIC, "DISPERSEMAGIC", "Disperse Magic");
+		spell_type *spell = spell_new(&DISPERSEMAGIC, "Disperse Magic");
 		spell_type_describe(spell, "Dispels a lot of magic that can affect you, be it good or bad");
 		spell_type_describe(spell, "Level 1: blindness and light");
 		spell_type_describe(spell, "Level 5: confusion and hallucination");
@@ -1423,7 +1423,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&TRACKER, "TRACKER", "Tracker");
+		spell_type *spell = spell_new(&TRACKER, "Tracker");
 		spell_type_describe(spell, "Tracks down the last teleportation that happened on the level and teleports");
 		spell_type_describe(spell, "you to it");
 		spell_type_add_school(spell, SCHOOL_CONVEYANCE);
@@ -1437,7 +1437,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&INERTIA_CONTROL, "INERTIA_CONTROL", "Inertia Control");
+		spell_type *spell = spell_new(&INERTIA_CONTROL, "Inertia Control");
 		spell_type_describe(spell, "Changes the energy flow of a spell to be continuously recasted");
 		spell_type_describe(spell, "at a given interval. The inertia controlled spell reduces your");
 		spell_type_describe(spell, "maximum mana by four times its cost.");
@@ -1451,7 +1451,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&CHARM, "CHARM", "Charm");
+		spell_type *spell = spell_new(&CHARM, "Charm");
 		spell_type_describe(spell, "Tries to manipulate the mind of a monster to make it friendly");
 		spell_type_describe(spell, "At level 15 it turns into a ball");
 		spell_type_describe(spell, "At level 35 it affects all monsters in sight");
@@ -1475,7 +1475,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&CONFUSE, "CONFUSE", "Confuse");
+		spell_type *spell = spell_new(&CONFUSE, "Confuse");
 		spell_type_describe(spell, "Tries to manipulate the mind of a monster to confuse it");
 		spell_type_describe(spell, "At level 15 it turns into a ball");
 		spell_type_describe(spell, "At level 35 it affects all monsters in sight");
@@ -1499,7 +1499,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ARMOROFFEAR, "ARMOROFFEAR", "Armor of Fear");
+		spell_type *spell = spell_new(&ARMOROFFEAR, "Armor of Fear");
 		spell_type_describe(spell, "Creates a shield of pure fear around you. Any monster attempting to hit you");
 		spell_type_describe(spell, "must save or flee");
 		spell_type_set_mana(spell, 10, 50);
@@ -1513,7 +1513,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&STUN, "STUN", "Stun");
+		spell_type *spell = spell_new(&STUN, "Stun");
 		spell_type_describe(spell, "Tries to manipulate the mind of a monster to stun it");
 		spell_type_describe(spell, "At level 20 it turns into a ball");
 		spell_type_set_mana(spell, 10, 90);
@@ -1526,7 +1526,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DRAIN, "DRAIN", "Drain");
+		spell_type *spell = spell_new(&DRAIN, "Drain");
 		spell_type_describe(spell, "Drains the mana contained in wands, staves and rods to increase yours");
 		spell_type_add_school(spell, SCHOOL_MANA);
 		spell_type_set_mana(spell, 0, 0);
@@ -1539,7 +1539,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&GENOCIDE, "GENOCIDE", "Genocide");
+		spell_type *spell = spell_new(&GENOCIDE, "Genocide");
 		spell_type_describe(spell, "Genocides all monsters of a race on the level");
 		spell_type_describe(spell, "At level 10 it can genocide all monsters near you");
 		spell_type_add_school(spell, SCHOOL_NATURE);
@@ -1563,7 +1563,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&WRAITHFORM, "WRAITHFORM", "Wraithform");
+		spell_type *spell = spell_new(&WRAITHFORM, "Wraithform");
 		spell_type_describe(spell, "Turns you into an immaterial being");
 		spell_type_add_school(spell, SCHOOL_CONVEYANCE);
 		spell_type_set_mana(spell, 20, 40);
@@ -1577,7 +1577,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&FLAMEOFUDUN, "FLAMEOFUDUN", "Flame of Udun");
+		spell_type *spell = spell_new(&FLAMEOFUDUN, "Flame of Udun");
 		spell_type_describe(spell, "Turns you into a powerful Balrog");
 		spell_type_add_school(spell, SCHOOL_FIRE);
 		spell_type_set_mana(spell, 70, 100);
@@ -1591,7 +1591,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&CALL_THE_ELEMENTS, "CALL_THE_ELEMENTS", "Call the Elements");
+		spell_type *spell = spell_new(&CALL_THE_ELEMENTS, "Call the Elements");
 		spell_type_describe(spell, "Randomly creates various elements around you");
 		spell_type_describe(spell, "Each type of element chance is controlled by your level");
 		spell_type_describe(spell, "in the corresponding skill");
@@ -1607,7 +1607,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&CHANNEL_ELEMENTS, "CHANNEL_ELEMENTS", "Channel Elements");
+		spell_type *spell = spell_new(&CHANNEL_ELEMENTS, "Channel Elements");
 		spell_type_describe(spell, "Draws on the caster's immediate environs to form an attack or other effect.");
 		spell_type_describe(spell, "Grass/Flower heals.");
 		spell_type_describe(spell, "Water creates water bolt attacks.");
@@ -1632,7 +1632,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ELEMENTAL_WAVE, "ELEMENTAL_WAVE", "Elemental Wave");
+		spell_type *spell = spell_new(&ELEMENTAL_WAVE, "Elemental Wave");
 		spell_type_describe(spell, "Draws on an adjacent special square to project a slow-moving");
 		spell_type_describe(spell, "wave of that element in that direction");
 		spell_type_describe(spell, "Abyss squares cannot be channeled into a wave.");
@@ -1647,7 +1647,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&VAPORIZE, "VAPORIZE", "Vaporize");
+		spell_type *spell = spell_new(&VAPORIZE, "Vaporize");
 		spell_type_describe(spell, "Draws upon your immediate environs to form a cloud of damaging vapors");
 		spell_type_set_mana(spell, 3, 30);
 		spell_type_set_difficulty(spell, 4, 15);
@@ -1660,7 +1660,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&GEOLYSIS, "GEOLYSIS", "Geolysis");
+		spell_type *spell = spell_new(&GEOLYSIS, "Geolysis");
 		spell_type_describe(spell, "Burrows deeply and slightly at random into a wall,");
 		spell_type_describe(spell, "leaving behind tailings of various different sorts of walls in the passage.");
 		spell_type_set_mana(spell, 15, 40);
@@ -1674,7 +1674,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DRIPPING_TREAD, "DRIPPING_TREAD", "Dripping Tread");
+		spell_type *spell = spell_new(&DRIPPING_TREAD, "Dripping Tread");
 		spell_type_describe(spell, "Causes you to leave random elemental forms behind as you walk");
 		spell_type_set_mana(spell, 15, 25);
 		spell_type_set_difficulty(spell, 10, 15);
@@ -1687,7 +1687,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&GROW_BARRIER, "GROW_BARRIER", "Grow Barrier");
+		spell_type *spell = spell_new(&GROW_BARRIER, "Grow Barrier");
 		spell_type_describe(spell, "Creates impassable terrain (walls, trees, etc.) around you.");
 		spell_type_describe(spell, "At level 20 it can be projected around another area.");
 		spell_type_set_mana(spell, 30, 40);
@@ -1701,7 +1701,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ELEMENTAL_MINION, "ELEMENTAL_MINION", "Elemental Minion");
+		spell_type *spell = spell_new(&ELEMENTAL_MINION, "Elemental Minion");
 		spell_type_describe(spell, "Summons a minion from a nearby element.");
 		spell_type_describe(spell, "Walls can summon Earth elmentals, Xorns and Xarens");
 		spell_type_describe(spell, "Dark Pits can summon Air elementals, Ancient blue dragons, Great Storm Wyrms");
@@ -1718,7 +1718,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ERU_SEE, "ERU_SEE", "See the Music");
+		spell_type *spell = spell_new(&ERU_SEE, "See the Music");
 		spell_type_describe(spell, "Allows you to 'see' the Great Music from which the world");
 		spell_type_describe(spell, "originates, allowing you to see unseen things");
 		spell_type_describe(spell, "At level 10 it allows you to see your surroundings");
@@ -1734,7 +1734,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ERU_LISTEN, "ERU_LISTEN", "Listen to the Music");
+		spell_type *spell = spell_new(&ERU_LISTEN, "Listen to the Music");
 		spell_type_describe(spell, "Allows you to listen to the Great Music from which the world");
 		spell_type_describe(spell, "originates, allowing you to understand the meaning of things");
 		spell_type_describe(spell, "At level 14 it allows you to identify all your pack");
@@ -1748,7 +1748,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ERU_UNDERSTAND, "ERU_UNDERSTAND", "Know the Music");
+		spell_type *spell = spell_new(&ERU_UNDERSTAND, "Know the Music");
 		spell_type_describe(spell, "Allows you to understand the Great Music from which the world");
 		spell_type_describe(spell, "originates, allowing you to know the full abilities of things");
 		spell_type_describe(spell, "At level 10 it allows you to *identify* all your pack");
@@ -1761,7 +1761,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&ERU_PROT, "ERU_PROT", "Lay of Protection");
+		spell_type *spell = spell_new(&ERU_PROT, "Lay of Protection");
 		spell_type_describe(spell, "Creates a circle of safety around you");
 		spell_type_set_mana(spell, 400, 400);
 		spell_type_set_difficulty(spell, 35, 80);
@@ -1772,7 +1772,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANWE_SHIELD, "MANWE_SHIELD", "Wind Shield");
+		spell_type *spell = spell_new(&MANWE_SHIELD, "Wind Shield");
 		spell_type_describe(spell, "It surrounds you with a shield of wind that deflects blows from evil monsters");
 		spell_type_describe(spell, "At level 10 it increases your armour rating");
 		spell_type_describe(spell, "At level 20 it retaliates against monsters that melee you");
@@ -1785,7 +1785,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANWE_AVATAR, "MANWE_AVATAR", "Avatar");
+		spell_type *spell = spell_new(&MANWE_AVATAR, "Avatar");
 		spell_type_describe(spell, "It turns you into a full grown Maia");
 		spell_type_set_mana(spell, 1000, 1000);
 		spell_type_set_difficulty(spell, 35, 80);
@@ -1796,7 +1796,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANWE_BLESS, "MANWE_BLESS", "Manwe's Blessing");
+		spell_type *spell = spell_new(&MANWE_BLESS, "Manwe's Blessing");
 		spell_type_describe(spell, "Manwe's Blessing removes your fears, blesses you and surrounds you with");
 		spell_type_describe(spell, "holy light");
 		spell_type_describe(spell, "At level 10 it also grants heroism");
@@ -1811,7 +1811,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MANWE_CALL, "MANWE_CALL", "Manwe's Call");
+		spell_type *spell = spell_new(&MANWE_CALL, "Manwe's Call");
 		spell_type_describe(spell, "Manwe's Call summons a Great Eagle to help you battle the forces");
 		spell_type_describe(spell, "of Morgoth");
 		spell_type_set_mana(spell, 200, 500);
@@ -1823,7 +1823,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&TULKAS_AIM, "TULKAS_AIM", "Divine Aim");
+		spell_type *spell = spell_new(&TULKAS_AIM, "Divine Aim");
 		spell_type_describe(spell, "It makes you more accurate in combat");
 		spell_type_describe(spell, "At level 20 all your blows are critical hits");
 		spell_type_set_mana(spell, 30, 500);
@@ -1835,7 +1835,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&TULKAS_WAVE, "TULKAS_WAVE", "Wave of Power");
+		spell_type *spell = spell_new(&TULKAS_WAVE, "Wave of Power");
 		spell_type_describe(spell, "It allows you to project a number of melee blows across a distance");
 		spell_type_set_mana(spell, 200, 200);
 		spell_type_set_difficulty(spell, 20, 75);
@@ -1846,7 +1846,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&TULKAS_SPIN, "TULKAS_SPIN", "Whirlwind");
+		spell_type *spell = spell_new(&TULKAS_SPIN, "Whirlwind");
 		spell_type_describe(spell, "It allows you to spin around and hit all monsters nearby");
 		spell_type_set_mana(spell, 100, 100);
 		spell_type_set_difficulty(spell, 10, 45);
@@ -1857,7 +1857,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MELKOR_CURSE, "MELKOR_CURSE", "Curse");
+		spell_type *spell = spell_new(&MELKOR_CURSE, "Curse");
 		spell_type_describe(spell, "It curses a monster, reducing its melee power");
 		spell_type_describe(spell, "At level 5 it can be auto-casted (with no piety cost) while fighting");
 		spell_type_describe(spell, "At level 15 it also reduces armor");
@@ -1872,7 +1872,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MELKOR_CORPSE_EXPLOSION, "MELKOR_CORPSE_EXPLOSION", "Corpse Explosion");
+		spell_type *spell = spell_new(&MELKOR_CORPSE_EXPLOSION, "Corpse Explosion");
 		spell_type_describe(spell, "It makes corpses in an area around you explode for a percent of their");
 		spell_type_describe(spell, "hit points as damage");
 		spell_type_set_mana(spell, 100, 500);
@@ -1884,7 +1884,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MELKOR_MIND_STEAL, "MELKOR_MIND_STEAL", "Mind Steal");
+		spell_type *spell = spell_new(&MELKOR_MIND_STEAL, "Mind Steal");
 		spell_type_describe(spell, "It allows your spirit to temporarily leave your own body, which will");
 		spell_type_describe(spell, "be vulnerable, to control one of your enemies body.");
 		spell_type_set_mana(spell, 1000, 3000);
@@ -1896,7 +1896,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&YAVANNA_CHARM_ANIMAL, "YAVANNA_CHARM_ANIMAL", "Charm Animal");
+		spell_type *spell = spell_new(&YAVANNA_CHARM_ANIMAL, "Charm Animal");
 		spell_type_describe(spell, "It tries to tame an animal");
 		spell_type_set_mana(spell, 10, 100);
 		spell_type_set_difficulty(spell, 1, 30);
@@ -1907,7 +1907,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&YAVANNA_GROW_GRASS, "YAVANNA_GROW_GRASS", "Grow Grass");
+		spell_type *spell = spell_new(&YAVANNA_GROW_GRASS, "Grow Grass");
 		spell_type_describe(spell, "Create a floor of grass around you. While on grass and praying");
 		spell_type_describe(spell, "a worshipper of Yavanna will know a greater regeneration rate");
 		spell_type_set_mana(spell, 70, 150);
@@ -1919,7 +1919,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&YAVANNA_TREE_ROOTS, "YAVANNA_TREE_ROOTS", "Tree Roots");
+		spell_type *spell = spell_new(&YAVANNA_TREE_ROOTS, "Tree Roots");
 		spell_type_describe(spell, "Creates roots deep in the floor from your feet, making you more stable and able");
 		spell_type_describe(spell, "to make stronger attacks, but prevents any movement (even teleportation).");
 		spell_type_describe(spell, "It also makes you recover from stunning almost immediately.");
@@ -1932,7 +1932,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&YAVANNA_WATER_BITE, "YAVANNA_WATER_BITE", "Water Bite");
+		spell_type *spell = spell_new(&YAVANNA_WATER_BITE, "Water Bite");
 		spell_type_describe(spell, "Imbues your melee weapon with a natural stream of water");
 		spell_type_describe(spell, "At level 25, it spreads over a 1 radius zone around your target");
 		spell_type_set_mana(spell, 150, 300);
@@ -1944,7 +1944,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&YAVANNA_UPROOT, "YAVANNA_UPROOT", "Uproot");
+		spell_type *spell = spell_new(&YAVANNA_UPROOT, "Uproot");
 		spell_type_describe(spell, "Awakes a tree to help you battle the forces of Morgoth");
 		spell_type_set_mana(spell, 250, 350);
 		spell_type_set_difficulty(spell, 35, 95);
@@ -1955,7 +1955,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEMON_BLADE, "DEMON_BLADE", "Demon Blade");
+		spell_type *spell = spell_new(&DEMON_BLADE, "Demon Blade");
 		spell_type_describe(spell, "Imbues your blade with fire to deal more damage");
 		spell_type_describe(spell, "At level 30 it deals hellfire damage");
 		spell_type_describe(spell, "At level 45 it spreads over a 1 radius zone around your target");
@@ -1977,7 +1977,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEMON_MADNESS, "DEMON_MADNESS", "Demon Madness");
+		spell_type *spell = spell_new(&DEMON_MADNESS, "Demon Madness");
 		spell_type_describe(spell, "Fire 2 balls in opposite directions of randomly chaos, confusion or charm");
 		spell_type_set_mana(spell, 5, 20);
 		spell_type_set_difficulty(spell, 10, 25);
@@ -1987,7 +1987,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEMON_FIELD, "DEMON_FIELD", "Demon Field");
+		spell_type *spell = spell_new(&DEMON_FIELD, "Demon Field");
 		spell_type_describe(spell, "Fires a cloud of deadly nexus over a radius of 7");
 		spell_type_set_mana(spell, 20, 60);
 		spell_type_set_difficulty(spell, 20, 60);
@@ -1997,7 +1997,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DOOM_SHIELD, "DOOM_SHIELD", "Doom Shield");
+		spell_type *spell = spell_new(&DOOM_SHIELD, "Doom Shield");
 		spell_type_describe(spell, "Raises a mirror of pain around you, doing very high damage to your foes");
 		spell_type_describe(spell, "that dare hit you, but greatly reduces your armour class");
 		spell_type_set_mana(spell, 2, 30);
@@ -2008,7 +2008,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&UNHOLY_WORD, "UNHOLY_WORD", "Unholy Word");
+		spell_type *spell = spell_new(&UNHOLY_WORD, "Unholy Word");
 		spell_type_describe(spell, "Kills a pet to heal you");
 		spell_type_describe(spell, "There is a chance that the pet won't die but will turn against you");
 		spell_type_describe(spell, "it will decrease with higher level");
@@ -2020,7 +2020,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEMON_CLOAK, "DEMON_CLOAK", "Demon Cloak");
+		spell_type *spell = spell_new(&DEMON_CLOAK, "Demon Cloak");
 		spell_type_describe(spell, "Raises a mirror that can reflect bolts and arrows for a time");
 		spell_type_set_mana(spell, 10, 40);
 		spell_type_set_difficulty(spell, 20, 70);
@@ -2030,7 +2030,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEMON_SUMMON, "DEMON_SUMMON", "Summon Demon");
+		spell_type *spell = spell_new(&DEMON_SUMMON, "Summon Demon");
 		spell_type_describe(spell, "Summons a leveled demon to your side");
 		spell_type_describe(spell, "At level 35 it summons a high demon");
 		spell_type_set_mana(spell, 10, 50);
@@ -2041,7 +2041,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DISCHARGE_MINION, "DISCHARGE_MINION", "Discharge Minion");
+		spell_type *spell = spell_new(&DISCHARGE_MINION, "Discharge Minion");
 		spell_type_describe(spell, "The targeted pet will explode in a burst of gravity");
 		spell_type_set_mana(spell, 20, 50);
 		spell_type_set_difficulty(spell, 10, 30);
@@ -2051,7 +2051,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&CONTROL_DEMON, "CONTROL_DEMON", "Control Demon");
+		spell_type *spell = spell_new(&CONTROL_DEMON, "Control Demon");
 		spell_type_describe(spell, "Attempts to control a demon");
 		spell_type_set_mana(spell, 30, 70);
 		spell_type_set_difficulty(spell, 25, 55);
@@ -2061,7 +2061,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_HEAL_MONSTER, "DEVICE_HEAL_MONSTER", "Heal Monster");
+		spell_type *spell = spell_new(&DEVICE_HEAL_MONSTER, "Heal Monster");
 		spell_type_describe(spell, "Heals a monster");
 		spell_type_set_mana(spell, 5, 20);
 		spell_type_set_difficulty(spell, 3, 15);
@@ -2081,7 +2081,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_SPEED_MONSTER, "DEVICE_SPEED_MONSTER", "Haste Monster");
+		spell_type *spell = spell_new(&DEVICE_SPEED_MONSTER, "Haste Monster");
 		spell_type_describe(spell, "Haste a monster");
 		spell_type_set_mana(spell, 10, 10);
 		spell_type_set_difficulty(spell, 10, 30);
@@ -2101,7 +2101,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_WISH, "DEVICE_WISH", "Wish");
+		spell_type *spell = spell_new(&DEVICE_WISH, "Wish");
 		spell_type_describe(spell, "This grants you a wish, beware of what you ask for!");
 		spell_type_set_mana(spell, 400, 400);
 		spell_type_set_difficulty(spell, 50, 99);
@@ -2121,7 +2121,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_SUMMON, "DEVICE_SUMMON", "Summon");
+		spell_type *spell = spell_new(&DEVICE_SUMMON, "Summon");
 		spell_type_describe(spell, "Summons hostile monsters near you");
 		spell_type_set_mana(spell, 5, 25);
 		spell_type_set_difficulty(spell, 5, 20);
@@ -2141,7 +2141,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_MANA, "DEVICE_MANA", "Mana");
+		spell_type *spell = spell_new(&DEVICE_MANA, "Mana");
 		spell_type_describe(spell, "Restores a part(or all) of your mana");
 		spell_type_set_mana(spell, 1, 1);
 		spell_type_set_difficulty(spell, 30, 80);
@@ -2161,7 +2161,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_NOTHING, "DEVICE_NOTHING", "Nothing");
+		spell_type *spell = spell_new(&DEVICE_NOTHING, "Nothing");
 		spell_type_describe(spell, "It does nothing.");
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, 0);
@@ -2189,7 +2189,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_MAGGOT, "DEVICE_MAGGOT", "Artifact Maggot");
+		spell_type *spell = spell_new(&DEVICE_MAGGOT, "Artifact Maggot");
 		spell_type_set_activation_timeout(spell, "10+d50");
 		spell_type_describe(spell, "terrify");
 		spell_type_set_mana(spell, 7, 7);
@@ -2200,7 +2200,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_HOLY_FIRE, "DEVICE_HOLY_FIRE", "Holy Fire of Mithrandir");
+		spell_type *spell = spell_new(&DEVICE_HOLY_FIRE, "Holy Fire of Mithrandir");
 		spell_type_describe(spell, "The Holy Fire created by this staff will deeply(double damage) burn");
 		spell_type_describe(spell, "all that is evil.");
 		spell_type_set_mana(spell, 50, 150);
@@ -2221,7 +2221,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&DEVICE_ETERNAL_FLAME, "DEVICE_ETERNAL_FLAME", "Artifact Eternal Flame");
+		spell_type *spell = spell_new(&DEVICE_ETERNAL_FLAME, "Artifact Eternal Flame");
 		spell_type_set_activation_timeout(spell, "0");
 		spell_type_describe(spell, "Imbuing an object with the eternal fire");
 		spell_type_set_mana(spell, 0, 0);
@@ -2232,7 +2232,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_STOP, "MUSIC_STOP", "Stop singing(I)");
+		spell_type *spell = spell_new(&MUSIC_STOP, "Stop singing(I)");
 		spell_type_describe(spell, "Stops the current song, if any.");
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, -400);
@@ -2244,7 +2244,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_HOLD, "MUSIC_HOLD", "Holding Pattern(I)");
+		spell_type *spell = spell_new(&MUSIC_HOLD, "Holding Pattern(I)");
 		spell_type_describe(spell, "Slows down all monsters listening the song.");
 		spell_type_describe(spell, "Consumes the amount of mana each turn.");
 		spell_type_set_mana(spell, 1, 10);
@@ -2259,7 +2259,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_CONF, "MUSIC_CONF", "Illusion Pattern(II)");
+		spell_type *spell = spell_new(&MUSIC_CONF, "Illusion Pattern(II)");
 		spell_type_describe(spell, "Tries to confuse all monsters listening the song.");
 		spell_type_describe(spell, "Consumes the amount of mana each turn.");
 		spell_type_set_mana(spell, 2, 15);
@@ -2274,7 +2274,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_STUN, "MUSIC_STUN", "Stun Pattern(IV)");
+		spell_type *spell = spell_new(&MUSIC_STUN, "Stun Pattern(IV)");
 		spell_type_describe(spell, "Stuns all monsters listening the song.");
 		spell_type_describe(spell, "Consumes the amount of mana each turn.");
 		spell_type_set_mana(spell, 3, 25);
@@ -2289,7 +2289,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_LITE, "MUSIC_LITE", "Song of the Sun(I)");
+		spell_type *spell = spell_new(&MUSIC_LITE, "Song of the Sun(I)");
 		spell_type_describe(spell, "Provides light as long as you sing.");
 		spell_type_describe(spell, "Consumes the amount of mana each turn.");
 		spell_type_set_mana(spell, 1, 1);
@@ -2304,7 +2304,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_HEAL, "MUSIC_HEAL", "Flow of Life(II)");
+		spell_type *spell = spell_new(&MUSIC_HEAL, "Flow of Life(II)");
 		spell_type_describe(spell, "Heals you as long as you sing.");
 		spell_type_describe(spell, "Consumes the amount of mana each turn.");
 		spell_type_set_mana(spell, 5, 30);
@@ -2318,7 +2318,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_HERO, "MUSIC_HERO", "Heroic Ballad(II)");
+		spell_type *spell = spell_new(&MUSIC_HERO, "Heroic Ballad(II)");
 		spell_type_describe(spell, "Increases melee accuracy");
 		spell_type_describe(spell, "At level 10 it increases it even more and reduces armour a bit");
 		spell_type_describe(spell, "At level 20 it increases it again");
@@ -2335,7 +2335,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_TIME, "MUSIC_TIME", "Hobbit Melodies(III)");
+		spell_type *spell = spell_new(&MUSIC_TIME, "Hobbit Melodies(III)");
 		spell_type_describe(spell, "Greatly increases your reflexes allowing you to block more melee blows.");
 		spell_type_describe(spell, "At level 15 it also makes you faster.");
 		spell_type_describe(spell, "Consumes the amount of mana each turn.");
@@ -2350,7 +2350,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_MIND, "MUSIC_MIND", "Clairaudience(IV)");
+		spell_type *spell = spell_new(&MUSIC_MIND, "Clairaudience(IV)");
 		spell_type_describe(spell, "Allows you to sense monster minds as long as you sing.");
 		spell_type_describe(spell, "At level 10 it identifies all objects in a radius on the floor,");
 		spell_type_describe(spell, "as well as probing monsters in that radius.");
@@ -2366,7 +2366,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_BLOW, "MUSIC_BLOW", "Blow(I)");
+		spell_type *spell = spell_new(&MUSIC_BLOW, "Blow(I)");
 		spell_type_describe(spell, "Produces a powerful, blowing, sound all around you.");
 		spell_type_set_mana(spell, 3, 30);
 		spell_type_set_difficulty(spell, 4, 20);
@@ -2377,7 +2377,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_WIND, "MUSIC_WIND", "Gush of Wind(II)");
+		spell_type *spell = spell_new(&MUSIC_WIND, "Gush of Wind(II)");
 		spell_type_describe(spell, "Produces a outgoing gush of wind that sends monsters away.");
 		spell_type_set_mana(spell, 15, 45);
 		spell_type_set_difficulty(spell, 14, 30);
@@ -2388,7 +2388,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_YLMIR, "MUSIC_YLMIR", "Horns of Ylmir(III)");
+		spell_type *spell = spell_new(&MUSIC_YLMIR, "Horns of Ylmir(III)");
 		spell_type_describe(spell, "Produces an earth shaking sound.");
 		spell_type_set_mana(spell, 25, 30);
 		spell_type_set_difficulty(spell, 20, 20);
@@ -2399,7 +2399,7 @@ void school_spells_init()
 	}
 
 	{
-		spell_type *spell = spell_new(&MUSIC_AMBARKANTA, "MUSIC_AMBARKANTA", "Ambarkanta(IV)");
+		spell_type *spell = spell_new(&MUSIC_AMBARKANTA, "Ambarkanta(IV)");
 		spell_type_describe(spell, "Produces a reality shaking sound that transports you to a nearly");
 		spell_type_describe(spell, "identical reality.");
 		spell_type_set_mana(spell, 70, 70);