Propageted the AegisName fix to scripts and pre-re database

This commit just propagates the AegisName changes to the pre-re database
and to the (re) scripts.

Two issues are fixed as a side-effect:

- The ghost_palace script was referring the non-existing constant(s):
  Thanatos_Two-Handed_Staff == (Thanatos_Two) - (Handed_Staff) == 0.
  Paired with the script engine's inability to differentiate between
  constants and player variables, that produced a very subtle issue.
- The item RAG203 is sold by a NPC (Rebellion Weapon Vending). Due to a
  pair of swapped AegisName constants (RAG203 and RAG203_), the slotted
  version was sold by the NPC instead of hte non-slotted one (the issue
  was actually fixed in the previous commit, although the description of
  the fix is here - these two commits are only split for legibility
  purposes but they're to be considered indivisible).

Signed-off-by: Haru <haru@dotalux.com>

8 files changed, 202 insertions, 202 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 4e77704da..836020da8 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -50556,7 +50556,7 @@ item_db: (
 /*
 {
 	Id: 5744
-	AegisName: "Capricon_Crown"
+	AegisName: "Capricorn_Crown"
 	Name: "Capricon Crown"
 	Type: 5
 	Buy: 20
@@ -50575,7 +50575,7 @@ item_db: (
 /*
 {
 	Id: 5745
-	AegisName: "Capricon_Diadem"
+	AegisName: "Capricorn_Diadem"
 	Name: "Capricon Diadem"
 	Type: 5
 	Buy: 20
@@ -56986,7 +56986,7 @@ item_db: (
 },
 {
 	Id: 7062
-	AegisName: "Broken_Turtle_Shell"
+	AegisName: "Turtle_Shell_"
 	Name: "Broken Turtle Shell"
 	Type: 3
 	Buy: 280
@@ -72932,7 +72932,7 @@ item_db: (
 },
 {
 	Id: 12416
-	AegisName: "LUcky_Egg_C3"
+	AegisName: "Lucky_Egg_C3"
 	Name: "Lucky Egg C3"
 	Type: 2
 	Buy: 20
@@ -81769,7 +81769,7 @@ item_db: (
 },
 {
 	Id: 13521
-	AegisName: "Garment_Card_Scroll_Box"
+	AegisName: "Hood_Card_Scroll_Box"
 	Name: "Garment Card Pet Egg Scroll Box"
 	Type: 18
 	Buy: 20
@@ -81778,7 +81778,7 @@ item_db: (
 },
 {
 	Id: 13522
-	AegisName: "Shield_Card_Scroll_Box"
+	AegisName: "Hood_Card_Scroll_Box2"
 	Name: "Shield Card Pet Egg Scroll Box"
 	Type: 18
 	Buy: 20
@@ -85919,7 +85919,7 @@ item_db: (
 },
 {
 	Id: 13896
-	AegisName: "Mimic_Scroll_Box5"
+	AegisName: "Mimic_Summon_Box5"
 	Name: "Mimic Summoning 5 Box"
 	Type: 18
 	Buy: 20
@@ -85947,7 +85947,7 @@ item_db: (
 },
 {
 	Id: 13898
-	AegisName: "Alice_Scroll_Box5"
+	AegisName: "Alice_Summon_Box5"
 	Name: "Alice Summoning 5 Box"
 	Type: 18
 	Buy: 20
@@ -85961,7 +85961,7 @@ item_db: (
 },
 {
 	Id: 13899
-	AegisName: "Mimic_Scroll_Box10"
+	AegisName: "Mimic_Summon_Box10"
 	Name: "Mimic Summoning 10 Box"
 	Type: 18
 	Buy: 20
@@ -85989,7 +85989,7 @@ item_db: (
 },
 {
 	Id: 13901
-	AegisName: "Alice_Scroll_Box10"
+	AegisName: "Alice_Summon_Box10"
 	Name: "Alice Summoning 10 Box"
 	Type: 18
 	Buy: 20
@@ -92024,7 +92024,7 @@ item_db: (
 /*
 {
 	Id: 14230
-	AegisName: "Note_Headphones_Box"
+	AegisName: "Headphone_Box"
 	Name: "Note Headphones Box"
 	Type: 18
 	Weight: 10
@@ -92034,7 +92034,7 @@ item_db: (
 /*
 {
 	Id: 14231
-	AegisName: "Novice_Breastplate_Boxes"
+	AegisName: "Novice_Box"
 	Name: "Novice Breastplate Boxes"
 	Type: 18
 	Weight: 10
@@ -92083,7 +92083,7 @@ item_db: (
 },
 {
 	Id: 14236
-	AegisName: "Steamed_Tongue_Box_20"
+	AegisName: "Str_Dish_Box60"
 	Name: "Steamed Tongue 20 Box"
 	Type: 18
 	Buy: 20
@@ -92092,7 +92092,7 @@ item_db: (
 },
 {
 	Id: 14237
-	AegisName: "Steamed_Desert_Scorpions_Box_20"
+	AegisName: "Agi_Dish_Box60"
 	Name: "Steamed Desert Scorpions Box(20)"
 	Type: 18
 	Buy: 20
@@ -92101,7 +92101,7 @@ item_db: (
 },
 {
 	Id: 14238
-	AegisName: "Stew_Of_Immortality_Box_20"
+	AegisName: "Int_Dish_Box60"
 	Name: "Immortal Stew 20 Box"
 	Type: 18
 	Buy: 20
@@ -92110,7 +92110,7 @@ item_db: (
 },
 {
 	Id: 14239
-	AegisName: "Dragon_Breath_Cocktail_Box_20"
+	AegisName: "Dex_Dish_Box60"
 	Name: "Dragon Breath Cocktail 20 Box"
 	Type: 18
 	Buy: 20
@@ -92119,7 +92119,7 @@ item_db: (
 },
 {
 	Id: 14240
-	AegisName: "Hwergelmir's_Tonic_Box_20"
+	AegisName: "Luk_Dish_Box60"
 	Name: "Hwergelmir's Tonic 20 Box"
 	Type: 18
 	Buy: 20
@@ -92128,7 +92128,7 @@ item_db: (
 },
 {
 	Id: 14241
-	AegisName: "Nine_Tail_Dish_Box_20"
+	AegisName: "Vit_Dish_Box60"
 	Name: "Nine Tail Dish 20 Box"
 	Type: 18
 	Buy: 20
@@ -92513,7 +92513,7 @@ item_db: (
 },
 {
 	Id: 14274
-	AegisName: "Amplification_10_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box"
 	Name: "Mystical Amplification Scroll 10 Box"
 	Type: 18
 	Buy: 20
@@ -92522,7 +92522,7 @@ item_db: (
 },
 {
 	Id: 14275
-	AegisName: "Amplification_30_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box30"
 	Name: "Mystical Amplification Scroll 30 Box"
 	Type: 18
 	Buy: 20
@@ -92531,7 +92531,7 @@ item_db: (
 },
 {
 	Id: 14276
-	AegisName: "Amplification_50_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box50"
 	Name: "Mystical Amplification Scroll 50 Box"
 	Type: 18
 	Buy: 20
@@ -92540,7 +92540,7 @@ item_db: (
 },
 {
 	Id: 14277
-	AegisName: "Quagmire_10_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box"
 	Name: "Quagmire Scroll 10 Box"
 	Type: 18
 	Buy: 20
@@ -92549,7 +92549,7 @@ item_db: (
 },
 {
 	Id: 14278
-	AegisName: "Quagmire_30_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box30"
 	Name: "Quagmire Scroll 30 Box"
 	Type: 18
 	Buy: 20
@@ -92558,7 +92558,7 @@ item_db: (
 },
 {
 	Id: 14279
-	AegisName: "Quagmire_50_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box50"
 	Name: "Quagmire Scroll 50 Box"
 	Type: 18
 	Buy: 20
@@ -92606,7 +92606,7 @@ item_db: (
 /*
 {
 	Id: 14284
-	AegisName: "Muffler_Box"
+	AegisName: "Muffler_C_Box"
 	Name: "Muffler Box"
 	Type: 18
 	Buy: 20
@@ -92617,7 +92617,7 @@ item_db: (
 /*
 {
 	Id: 14285
-	AegisName: "Balkiriah_Shield_Box"
+	AegisName: "Valkyrja's_Shield_C_Box"
 	Name: "Balkiriah Shield Box"
 	Type: 18
 	Buy: 20
@@ -92628,7 +92628,7 @@ item_db: (
 /*
 {
 	Id: 14286
-	AegisName: "Skull_Ring_Box"
+	AegisName: "Skul_Ring_C_Box"
 	Name: "Skull Ring Box"
 	Type: 18
 	Buy: 20
@@ -92638,7 +92638,7 @@ item_db: (
 */
 {
 	Id: 14287
-	AegisName: "Baricade_Repair_Kit"
+	AegisName: "S_Barricade_Repair_Kit"
 	Name: "Barricade Repair Kit"
 	Type: 18
 	Buy: 20
@@ -92652,7 +92652,7 @@ item_db: (
 },
 {
 	Id: 14288
-	AegisName: "Guardian_Stone_Repair_Kit"
+	AegisName: "S_Gstone_Repair_Kit"
 	Name: "Guardian Stone Repair Kit"
 	Type: 18
 	Buy: 20
@@ -92731,7 +92731,7 @@ item_db: (
 /*
 {
 	Id: 14294
-	AegisName: "Mercenary_Contract_Box5"
+	AegisName: "Mercenary_Contract_5Box"
 	Name: "Mercenary Contract Box 5ea"
 	Type: 2
 	Weight: 10
@@ -92741,7 +92741,7 @@ item_db: (
 /*
 {
 	Id: 14295
-	AegisName: "Mercenary_Contract_Box10"
+	AegisName: "Mercenary_Contract_10Bo"
 	Name: "Mercenary Contract Box 10ea"
 	Type: 2
 	Weight: 10
@@ -92820,7 +92820,7 @@ item_db: (
 },
 {
 	Id: 14314
-	AegisName: "PhreeoniS_Box"
+	AegisName: "Phreeoni_Scroll_Box"
 	Name: "Phreeoni Scroll Box"
 	Type: 2
 	Weight: 10
@@ -95110,7 +95110,7 @@ item_db: (
 */
 {
 	Id: 16304
-	AegisName: "Evil_Incarnation"
+	AegisName: "Evil_Incarnation_Disable"
 	Name: "Evil Incarnation"
 	Type: 2
 	Buy: 20
@@ -95968,7 +95968,7 @@ item_db: (
 },
 {
 	Id: 19507
-	AegisName: "Clear_Sun"
+	AegisName: "Fine_Sun"
 	Name: "Clear Sun"
 	Type: 5
 	Loc: 1024
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index 63f6efcb0..6681abf7c 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -3892,7 +3892,7 @@ Splendid_Box2: (
 /* currently unsupported or unknown ('Mysterious_Egg')
 Mysterious_Egg: (
 	("Lucky_Egg_C2",3),
-	("LUcky_Egg_C3",3),
+	("Lucky_Egg_C3",3),
 	("Lucky_Egg_C4",3),
 	("Lucky_Egg_C5",3),
 	("Lucky_Egg_C6",3),
diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf
index 3c952e258..808addc58 100644
--- a/db/pre-re/item_packages.conf
+++ b/db/pre-re/item_packages.conf
@@ -4745,8 +4745,8 @@ July7_Scroll: {
 		Named: true
 		Rate: 1
 	}
-//unsupported/unknown item 'Hair_Of_The_Strong'
-//	Hair_Of_The_Strong: {
+//unsupported/unknown item 'C_Hair_Of_The_Strong'
+//	C_Hair_Of_The_Strong: {
 //		Random: 1
 //		Announce: true
 //		Named: true
@@ -5283,7 +5283,7 @@ Buddah_Scroll: {
 		Rate: 1
 	}
 }
-Evil_Incarnation: {
+Evil_Incarnation_Disable: {
 	Dead_Tree_Branch_Box2: {
 		Random: 1
 		Named: true
@@ -5791,8 +5791,8 @@ Premium_Reset_Stone_Box: {
 		Random: 0
 	}
 }
-/* unsupported/unknown item 'FPr_Reset_Stone_Box'
-FPr_Reset_Stone_Box: {
+/* unsupported/unknown item 'FPremium_Reset_Stone_Box'
+FPremium_Reset_Stone_Box: {
 	Premium_Reset_Stone: {
 		Random: 0
 	}
@@ -5881,8 +5881,8 @@ Majestic_Devil_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box'
-Life_Ribbon_Box: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box'
+Ribbon_Of_Life_Box: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5890,8 +5890,8 @@ Life_Ribbon_Box: {
 //	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box2'
-Life_Ribbon_Box2: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box2'
+Ribbon_Of_Life_Box2: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5900,8 +5900,8 @@ Life_Ribbon_Box2: {
 //	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box3'
-Life_Ribbon_Box3: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box3'
+Ribbon_Of_Life_Box3: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -6896,8 +6896,8 @@ Pisces_Diadem_Scroll: {
 		Named: true
 		Rate: 130
 	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Named: true
 //		Rate: 160
@@ -6920,8 +6920,8 @@ Pisces_Diadem_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'Pisces_Diadem_Box'
-Pisces_Diadem_Box: {
+/* unsupported/unknown item 'Pisces_Diadem_Box2'
+Pisces_Diadem_Box2: {
 //unsupported/unknown item 'Pisces_Diadem_Scroll'
 //	Pisces_Diadem_Scroll: {
 //		Random: 0
@@ -7105,8 +7105,8 @@ Energetic_Pisces_Box: {
 //	}
 }
 */
-/* unsupported/unknown item 'Aries_Scroll'
-Aries_Scroll: {
+/* unsupported/unknown item 'Aries_Scroll_'
+Aries_Scroll_: {
 //unsupported/unknown item 'Freyja_Boots'
 //	Freyja_Boots: {
 //		Random: 1
@@ -7173,53 +7173,53 @@ Aries_Scroll: {
 */
 /* unsupported/unknown item 'Aries_Scroll_Box'
 Aries_Scroll_Box: {
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
@@ -8305,8 +8305,8 @@ RWC_Super_Scroll: {
 //		Announce: true
 //		Rate: 250
 //	}
-//unsupported/unknown item 'Hair_Of_The_Strong'
-//	Hair_Of_The_Strong: {
+//unsupported/unknown item 'C_Hair_Of_The_Strong'
+//	C_Hair_Of_The_Strong: {
 //		Random: 1
 //		Announce: true
 //		Rate: 100
@@ -8362,8 +8362,8 @@ RWC_Super_Scroll: {
 //	}
 }
 */
-/* unsupported/unknown item 'Leo_Scroll'
-Leo_Scroll: {
+/* unsupported/unknown item 'Leo_Scroll3'
+Leo_Scroll3: {
 	Fallen_Bishop_Card: {
 		Random: 1
 		Announce: true
@@ -8493,8 +8493,8 @@ Ms_Virgo_Scroll: {
 		Announce: true
 		Rate: 300
 	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Rate: 800
 //	}
@@ -9571,7 +9571,7 @@ Wind_Type_Scroll: {
 //	}
 }
 */
-LUcky_Egg_C3: {
+Lucky_Egg_C3: {
 	Magic_Card_Album: {
 		Random: 1
 		Announce: true
@@ -11717,8 +11717,8 @@ Tw_Yellow_Scroll: {
 //		Random: 1
 //		Rate: 450
 //	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Rate: 1000
 //	}
@@ -12033,8 +12033,8 @@ Tw_Yellow_Scroll: {
 		Announce: true
 		Rate: 25
 	}
-//unsupported/unknown item 'Devil_Whisper'
-//	Devil_Whisper: {
+//unsupported/unknown item 'Evil_Whisper'
+//	Evil_Whisper: {
 //		Random: 1
 //		Announce: true
 //		Rate: 40
@@ -12395,8 +12395,8 @@ Tw_Yellow_Scroll: {
 //		Announce: true
 //		Rate: 150
 //	}
-//unsupported/unknown item 'Little_Feather_Hat'
-//	Little_Feather_Hat: {
+//unsupported/unknown item 'Little_Fhat'
+//	Little_Fhat: {
 //		Random: 1
 //		Announce: true
 //		Rate: 100
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 426077afb..04315b083 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -146933,7 +146933,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Lightning_Grenade, 500; ">
+	Script: <" getitem Lighting_Sphere_, 500; ">
 },
 {
 	Id: 22740
@@ -146942,7 +146942,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Flash_Grenade, 500; ">
+	Script: <" getitem Blind_Sphere_, 500; ">
 },
 {
 	Id: 22741
@@ -146951,7 +146951,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Poison_Grenade, 500; ">
+	Script: <" getitem Poison_Sphere_, 500; ">
 },
 {
 	Id: 22742
@@ -146960,7 +146960,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Cyro_Grenade, 500; ">
+	Script: <" getitem Freezing_Sphere_, 500; ">
 },
 {
 	Id: 22743
@@ -146969,7 +146969,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Incendiary_Grenade, 500; ">
+	Script: <" getitem Flare_Sphere_, 500; ">
 },
 {
 	Id: 22744
@@ -146978,7 +146978,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Armor_Piercing_Bullet, 500; ">
+	Script: <" getitem AP_Ammo, 500; ">
 },
 {
 	Id: 22745
@@ -146987,7 +146987,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Blazing_Bullet, 500; ">
+	Script: <" getitem Blaze_Bullet, 500; ">
 },
 {
 	Id: 22746
@@ -147005,7 +147005,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Lightning_Bullet, 500; ">
+	Script: <" getitem Electric_Shock_Bullet, 500; ">
 },
 {
 	Id: 22748
@@ -147014,7 +147014,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Magic_Stone_Bullet, 500; ">
+	Script: <" getitem Magical_Stone_Bullet, 500; ">
 },
 {
 	Id: 22749
@@ -147023,7 +147023,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Purifying_Bullet, 500; ">
+	Script: <" getitem Sanctified_Bullet, 500; ">
 },
 {
 	Id: 22777
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index 5551fe51c..c196c95f5 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -4796,7 +4796,7 @@ HALLOWEEN_G_BOX: (
 	"Old_Card_Album",
 	"Old_Violet_Box"
 )
-Pumpkin_Candy_Holder: (
+Something_Candy_Holder: (
 	("Honey", 3),
 	("Candy", 7),
 	("Well_Baked_Cookie", 2),
diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf
index 1a70a63cc..ea4a1aee8 100644
--- a/db/re/item_packages.conf
+++ b/db/re/item_packages.conf
@@ -3870,7 +3870,7 @@ Brewing_Box: {
 		Named: true
 	}
 }
-Christmas_Pet_Scroll: {
+Xmas_Pet_Scroll: {
 	Fish_Head_Hat: {
 		Random: 1
 		Named: true
@@ -3966,7 +3966,7 @@ Christmas_Pet_Scroll: {
 		Rate: 50
 	}
 }
-Year_Of_Mouse_Scroll: {
+Lucky_Scroll08: {
 	Kafra_Card: {
 		Random: 1
 		Count: 15
@@ -4058,7 +4058,7 @@ Year_Of_Mouse_Scroll: {
 		Rate: 110
 	}
 }
-BRO_SM_Package: {
+Br_SwordPackage: {
 	Plate_Armor_: {
 		Random: 0
 		Named: true
@@ -4100,7 +4100,7 @@ BRO_SM_Package: {
 		Named: true
 	}
 }
-BRO_MG_Package: {
+Br_MagePackage: {
 	Silk_Robe_: {
 		Random: 0
 		Named: true
@@ -4138,7 +4138,7 @@ BRO_MG_Package: {
 		Named: true
 	}
 }
-BRO_AC_Package: {
+Br_AcolPackage: {
 	Saint_Robe_: {
 		Random: 0
 		Named: true
@@ -4176,7 +4176,7 @@ BRO_AC_Package: {
 		Named: true
 	}
 }
-BRO_AR_Package: {
+Br_ArcherPackage: {
 	Tights_: {
 		Random: 0
 		Named: true
@@ -4214,7 +4214,7 @@ BRO_AR_Package: {
 		Named: true
 	}
 }
-BRO_MC_Package: {
+Br_MerPackage: {
 	Chain_Mail_: {
 		Random: 0
 		Named: true
@@ -4252,7 +4252,7 @@ BRO_MC_Package: {
 		Named: true
 	}
 }
-BRO_TF_Package: {
+Br_ThiefPackage: {
 	Thief_Clothes_: {
 		Random: 0
 		Named: true
@@ -4733,7 +4733,7 @@ July7_Scroll: {
 		Named: true
 		Rate: 1
 	}
-	Hair_Of_The_Strong: {
+	C_Hair_Of_The_Strong: {
 		Random: 1
 		Announce: true
 		Named: true
@@ -5259,7 +5259,7 @@ Buddah_Scroll: {
 		Rate: 1
 	}
 }
-Evil_Incarnation: {
+Evil_Incarnation_Disable: {
 	Dead_Tree_Branch_Box2: {
 		Random: 1
 		Named: true
@@ -5746,8 +5746,8 @@ Pr_Reset_Stone_Box: {
 	}
 }
 */
-/* unsupported/unknown item 'FPr_Reset_Stone_Box'
-FPr_Reset_Stone_Box: {
+/* unsupported/unknown item 'FPremium_Reset_Stone_Box'
+FPremium_Reset_Stone_Box: {
 	Premium_Reset_Stone: {
 		Random: 0
 	}
@@ -5834,8 +5834,8 @@ Majestic_Devil_Scroll: {
 		Rate: 1
 	}
 }
-/* supported container but with no known entries 'Life_Ribbon_Box'
-Life_Ribbon_Box: {
+/* supported container but with no known entries 'Ribbon_Of_Life_Box'
+Ribbon_Of_Life_Box: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5843,8 +5843,8 @@ Life_Ribbon_Box: {
 //	}
 }
 */
-/* supported container but with no known entries 'Life_Ribbon_Box2'
-Life_Ribbon_Box2: {
+/* supported container but with no known entries 'Ribbon_Of_Life_Box2'
+Ribbon_Of_Life_Box2: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5853,8 +5853,8 @@ Life_Ribbon_Box2: {
 //	}
 }
 */
-/* supported container but with no known entries 'Life_Ribbon_Box3'
-Life_Ribbon_Box3: {
+/* supported container but with no known entries 'Ribbon_Of_Life_Box3'
+Ribbon_Of_Life_Box3: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -6742,7 +6742,7 @@ Pisces_Diadem_Scroll: {
 		Named: true
 		Rate: 130
 	}
-	Life_Ribbon_Box3: {
+	Ribbon_Of_Life_Box3: {
 		Random: 1
 		Named: true
 		Rate: 160
@@ -6764,7 +6764,7 @@ Pisces_Diadem_Scroll: {
 		Rate: 70
 	}
 }
-Pisces_Diadem_Box: {
+Pisces_Diadem_Box2: {
 	Pisces_Diadem_Scroll: {
 		Random: 0
 		Named: true
@@ -6923,7 +6923,7 @@ Energetic_Pisces_Box: {
 		Named: true
 	}
 }
-Aries_Scroll: {
+Aries_Scroll_: {
 	Freyja_Boots: {
 		Random: 1
 		Announce: true
@@ -6987,43 +6987,43 @@ Aries_Scroll: {
 	}
 }
 Aries_Scroll_Box: {
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
@@ -8014,7 +8014,7 @@ RWC_Super_Scroll: {
 		Announce: true
 		Rate: 250
 	}
-	Hair_Of_The_Strong: {
+	C_Hair_Of_The_Strong: {
 		Random: 1
 		Announce: true
 		Rate: 100
@@ -8063,7 +8063,7 @@ RWC_Super_Scroll: {
 		Rate: 3000
 	}
 }
-Leo_Scroll: {
+Leo_Scroll3: {
 	Fallen_Bishop_Card: {
 		Random: 1
 		Announce: true
@@ -8186,7 +8186,7 @@ Ms_Virgo_Scroll: {
 		Announce: true
 		Rate: 300
 	}
-	Life_Ribbon_Box3: {
+	Ribbon_Of_Life_Box3: {
 		Random: 1
 		Rate: 800
 	}
@@ -9215,8 +9215,8 @@ Wind_Type_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'LUcky_Egg_C3'
-LUcky_Egg_C3: {
+/* unsupported/unknown item 'Lucky_Egg_C3'
+Lucky_Egg_C3: {
 	Magic_Card_Album: {
 		Random: 1
 		Announce: true
@@ -9538,7 +9538,7 @@ Lucky_Egg_C5: {
 	}
 }
 Weather_Report_Box: {
-	Clear_Sun: {
+	Fine_Sun: {
 		Random: 0
 	}
 	Rainbow: {
@@ -11200,7 +11200,7 @@ Tw_Yellow_Scroll: {
 //		Random: 1
 //		Rate: 450
 //	}
-	Life_Ribbon_Box3: {
+	Ribbon_Of_Life_Box3: {
 		Random: 1
 		Rate: 1000
 	}
@@ -11498,7 +11498,7 @@ Tw_Yellow_Scroll: {
 		Announce: true
 		Rate: 25
 	}
-	Devil_Whisper: {
+	Evil_Whisper: {
 		Random: 1
 		Announce: true
 		Rate: 40
@@ -11833,7 +11833,7 @@ Tw_Yellow_Scroll: {
 		Announce: true
 		Rate: 150
 	}
-	Little_Feather_Hat: {
+	Little_Fhat: {
 		Random: 1
 		Announce: true
 		Rate: 100
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 5a3275805..9d72380f7 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -56950,7 +56950,7 @@ mob_db: (
 		Creeper_Bow: 20
 		Mental_Stick: 2
 		Blood_Thirst: 300
-		Celia_Card: 1
+		Ceila_Card: 1
 	}
 },
 {
@@ -58196,7 +58196,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 6000
 		Sg_White_Potion_Box: 4000
 		Sg_Blue_Potion_Box: 2000
-		Angry_Student_Pyuriel_Card: 1
+		Pyuriel_Card: 1
 	}
 },
 {
@@ -58249,7 +58249,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 100
 		Sg_White_Potion_Box: 1000
 		Sg_Blue_Potion_Box: 1000
-		Warrior_Lola_Card: 1
+		Lora_Card: 1
 	}
 },
 {
@@ -58418,7 +58418,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 6000
 		Sg_White_Potion_Box: 4000
 		Sg_Blue_Potion_Box: 2000
-		General_Daehyon_Card: 1
+		Daehyon_Card: 1
 	}
 },
 {
@@ -58471,7 +58471,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 100
 		Sg_White_Potion_Box: 1000
 		Sg_Blue_Potion_Box: 1000
-		Armed_Guard_Soheon_Card: 1
+		Soheon_Card: 1
 	}
 },
 {
@@ -58530,7 +58530,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 6000
 		Sg_White_Potion_Box: 4000
 		Sg_Blue_Potion_Box: 2000
-		Guardian_Kades_Card: 1
+		Kades_Card: 1
 	}
 },
 {
@@ -63299,7 +63299,7 @@ mob_db: (
 		Bookclip_In_Memory: 1000
 		Worn_Out_Page: 1000
 		Snow_Flip: 5
-		Antique_Book_Card: 1
+		AntiqueBook_Card: 1
 	}
 },
 {
@@ -63350,7 +63350,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Mistic_Frozen: 20
 		Snow_Flip: 5
-		Lichtern_Blue_Card: 1
+		LichternB_Card: 1
 	}
 },
 {
@@ -63401,7 +63401,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Rough_Wind: 20
 		Slapping_Herb: 5
-		Lichtern_Yellow_Card: 1
+		LichternG_Card: 1 // FIXME: Are the yellow and green intended to be swapped? (see names in the item db)
 	}
 },
 {
@@ -63452,7 +63452,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Flame_Heart: 20
 		Peony_Mommy: 5
-		Lichtern_Red_Card: 1
+		LichternR_Card: 1
 	}
 },
 {
@@ -63503,7 +63503,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Great_Nature: 20
 		Yggdrasil_Dust: 5
-		Lichtern_Green_Card: 1
+		LichternY_Card: 1 // FIXME: Are the yellow and green intended to be swapped? (see names in the item db)
 	}
 },
 {
@@ -63554,7 +63554,7 @@ mob_db: (
 		Alchol: 100
 		Detrimindexta: 100
 		Karvodailnirol: 100
-		Faithful_Manager_Card: 1
+		FaithfulManager_Card: 1
 	}
 },
 // Additional Monsters
@@ -64518,7 +64518,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Sticky_Mucus: 1000
 		White_Jewel: 500
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64569,7 +64569,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64619,7 +64619,7 @@ mob_db: (
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
 		Old_White_Cloth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64668,7 +64668,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64716,7 +64716,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Plate_Armor: 200
 	}
 },
@@ -64765,7 +64765,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Tights: 200
 	}
 },
@@ -64817,7 +64817,7 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 3000
 		Glast_Horrendous_Mouth: 2000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Full_Plate_Armor: 200
 	}
 },
@@ -64869,7 +64869,7 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 3000
 		Glast_Horrendous_Mouth: 2000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Lapier: 300
 	}
 },
@@ -64921,7 +64921,7 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 3000
 		Glast_Horrendous_Mouth: 2000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Brigan: 500
 	}
 },
@@ -64973,9 +64973,9 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 5000
 		Glast_Horrendous_Mouth: 5000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Halberd: 200
-		Agony_Of_Royal_Knight_Card: 1
+		UndeadKnightM_Card: 1
 	}
 },
 {
@@ -65026,8 +65026,8 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 5000
 		Glast_Horrendous_Mouth: 5000
-		Contaminated_Magic: 500
-		Grudge_of_Royal_Knight_Card: 1
+		Corrupted_Charm: 500
+		UndeadKnightF_Card: 1
 	}
 },
 {
@@ -65079,8 +65079,8 @@ mob_db: (
 		Yggdrasilberry: 10000
 		Alchemy_Glove: 1000
 		Will_Of_Darkness_: 10000
-		Contaminated_Magic: 500
-		Corruption_Root_Card: 1
+		Corrupted_Charm: 500
+		CorruptionRoot_Card: 1
 	}
 },
 {
@@ -80040,7 +80040,7 @@ mob_db: (
 		Creeper_Bow: 10
 		Mental_Stick: 1
 		Blood_Thirst: 150
-		Celia_Card: 1
+		Ceila_Card: 1
 	}
 },
 {
@@ -81140,7 +81140,7 @@ mob_db: (
 		Leaf_Bookmark: 2000
 		Bookclip_In_Memory: 1000
 		Worn_Out_Page: 1000
-		Antique_Book_Card: 1
+		AntiqueBook_Card: 1
 	}
 },
 {
@@ -81189,7 +81189,7 @@ mob_db: (
 		Leaf_Bookmark: 2000
 		Bookclip_In_Memory: 1000
 		Worn_Out_Page: 1000
-		Antique_Book_Card: 1
+		AntiqueBook_Card: 1
 	}
 },
 {
@@ -81973,8 +81973,8 @@ mob_db: (
 		White_Herb: 950
 		Lemon: 160
 		Elunium_Stone: 100
-		Twisted_Key_of_Time: 15
-		Twisted_Key_of_Time: 15
+		Key_Of_Twisted_Time: 15
+		Key_Of_Twisted_Time: 15
 		Big_Ben_Card: 1
 	}
 },
@@ -82024,7 +82024,7 @@ mob_db: (
 		Skull: 750
 		Oridecon: 100
 		Zargon: 750
-		Twisted_Key_of_Time: 10
+		Key_Of_Twisted_Time: 10
 		Big_Bell_Card: 1
 	}
 },
@@ -82069,8 +82069,8 @@ mob_db: (
 		Steel: 250
 		Leaflet_Of_Hinal: 425
 		Memorize_Book: 1
-		Twisted_Key_of_Time: 1000
-		Twisted_Key_of_Time: 1000
+		Key_Of_Twisted_Time: 1000
+		Key_Of_Twisted_Time: 1000
 		Time_Keeper_Card: 1
 	}
 },
@@ -82166,7 +82166,7 @@ mob_db: (
 		Encyclopedia: 5
 		Wizardy_Staff: 1
 		Old_Card_Album: 2
-		Twisted_Key_of_Time: 1500
+		Key_Of_Twisted_Time: 1500
 		Elder_Branch: 500
 		Arc_Elder_Card: 1
 	}
@@ -82216,11 +82216,11 @@ mob_db: (
 	Drops: {
 		Tatters_Clothes: 2500
 		Soft_Feather: 1000
-		Cyclops_Glasses: 1
+		One_Eyed_Glass_: 1
 		Crystal_Mirror: 1
 		Pocket_Watch__: 2
 		Quadrille_: 1
-		Menswear: 1
+		Lounge_Suit: 1
 		Owl_Viscount_Card: 1
 	}
 },
@@ -82272,9 +82272,9 @@ mob_db: (
 		Soft_Feather: 1500
 		Kakkung_: 1
 		Staff_Of_Soul: 1
-		Menswear: 3
+		Lounge_Suit: 3
 		Sword_Stick: 1
-		Cyclops_Glasses: 1
+		One_Eyed_Glass_: 1
 		Owl_Marquees_Card: 1
 	}
 },
@@ -82883,7 +82883,7 @@ mob_db: (
 	DamageMotion: 420
 	Drops: {
 		Decayed_Nail: 3000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -82927,7 +82927,7 @@ mob_db: (
 	Drops: {
 		Mementos: 2500
 		Worn_Out_Page: 1500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -82971,7 +82971,7 @@ mob_db: (
 	Drops: {
 		Exorcize_Herb: 1000
 		Withered_Flower: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83015,7 +83015,7 @@ mob_db: (
 	Drops: {
 		Sticky_Mucus: 3000
 		Horn: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83058,7 +83058,7 @@ mob_db: (
 	DamageMotion: 336
 	Drops: {
 		Immortal_Heart: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83101,7 +83101,7 @@ mob_db: (
 	DamageMotion: 192
 	Drops: {
 		Decayed_Nail: 3000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83145,7 +83145,7 @@ mob_db: (
 	Drops: {
 		Horrendous_Mouth: 3500
 		Sharpened_Cuspid: 2000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83189,7 +83189,7 @@ mob_db: (
 	Drops: {
 		Skel_Bone: 3500
 		Manacles: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83233,7 +83233,7 @@ mob_db: (
 	Drops: {
 		Realgar_Wine: 1000
 		Immortal_Heart: 2000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83277,7 +83277,7 @@ mob_db: (
 	Drops: {
 		Realgar_Wine: 5000
 		Exorcize_Herb: 5000
-		Gray_Piece: 1500
+		Gray_Shard: 1500
 	}
 },
 {
@@ -83321,7 +83321,7 @@ mob_db: (
 	Drops: {
 		Petite_DiablOfs_Horn: 2500
 		Tendon: 2500
-		Gray_Piece: 1500
+		Gray_Shard: 1500
 	}
 },
 {
@@ -83366,8 +83366,8 @@ mob_db: (
 	DamageMotion: 360
 	Drops: {
 		Evil_Horn: 2000
-		Gray_Piece: 10000
-		Gray_Piece: 10000
+		Gray_Shard: 10000
+		Gray_Shard: 10000
 	}
 },
 //2960,MM_FLAMECROSS
@@ -83571,10 +83571,10 @@ mob_db: (
 		Needle_Of_Alarm: 3000
 		Memorize_Book_: 10
 		Brigan: 3000
-		Twisted_Key_of_Time: 3000
-		Cyclops_Glasses: 20
+		Key_Of_Twisted_Time: 3000
+		One_Eyed_Glass_: 20
 		Quadrille_: 5
-		Menswear: 3
+		Lounge_Suit: 3
 		Timeholder_Card: 1
 	}
 },
@@ -83699,9 +83699,9 @@ mob_db: (
 	DamageMotion: 0
 	MvpExp: 0
 	Drops: {
-		Organic_Pumpkin: 5000
-		Organic_Pumpkin: 5000
-		Organic_Pumpkin: 1000
+		ORGANIC_PUMPKIN: 5000
+		ORGANIC_PUMPKIN: 5000
+		ORGANIC_PUMPKIN: 1000
 		Cigar: 100
 		Pumpkin_Head: 1000
 		Gift_Box_1: 100
@@ -83746,9 +83746,9 @@ mob_db: (
 	DamageMotion: 0
 	MvpExp: 0
 	Drops: {
-		Inorganic_Pumpkin: 5000
-		Inorganic_Pumpkin: 5000
-		Inorganic_Pumpkin: 1000
+		INORGANIC_PUMPKIN: 5000
+		INORGANIC_PUMPKIN: 5000
+		INORGANIC_PUMPKIN: 1000
 		Cigar: 100
 		Pumpkin_Head: 1000
 		Gift_Box_1: 100
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 505aa2603..dd7ebe87a 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -22426,9 +22426,9 @@ skill_db: (
 		State: "MadoGear"
 		Items: {
 			Pilebuncker: 0
-			Pilebunker_S: 0
-			Pilebunker_P: 0
-			Pilebunker_T: 0
+			Pilebuncker_S: 0
+			Pilebuncker_P: 0
+			Pilebuncker_T: 0
 		}
 	}
 },
@@ -38196,4 +38196,4 @@ skill_db: (
 	}
 	NumberOfHits: 0
 },
-)
\ No newline at end of file
+)