merge some stuff

Definitions.event

@@ -250,7 +250,6 @@ Enchanter
 #define CelineMug BlankMug
 #define ChloeMug BlankMug
 #define LouisMug BlankMug
-#define AlcrystMug BlankMug
 #define DiamantMug BlankMug
 #define ZelkovMug BlankMug
 #define FogadoMug BlankMug
@@ -269,9 +268,14 @@ Enchanter
 #define GregoryMug BlankMug
 #define MadelineMug BlankMug
 
-// fe16 
-#define IngridMug BlankMug
+// fe16
 #define CyrilMug BlankMug
+#define JeritzaMug BlankMug 
+#define YuriMug BlankMug 
+#define BalthusMug BlankMug 
+#define HapiMug BlankMug 
+#define ConstanceMug BlankMug 
+
 
 // fe15 
 #define ClairMug BlankMug
@@ -296,6 +300,7 @@ Enchanter
 
 // fe14 
 #define SelenaFE14Mug BlankMug 
+#define BerukaMug BlankMug 
 #define YukimuraMug BlankMug 
 #define KanaMMug BlankMug 
 #define DwyerMug BlankMug 
@@ -311,12 +316,14 @@ Enchanter
 #define OdinMug BlankMug 
 
 // fe4/5 
-#define DewMug BlankMug 
-#define SalemMug BlankMug 
-#define SleufMug BlankMug 
+#define DewMug BlankMug
 #define SaraMug BlankMug 
 
 
+
+
+
+
 // ?? 
 #define BlackKnightMug BlankMug
 #define DanvedMug BlankMug
@@ -337,6 +344,8 @@ Enchanter
 
 
 
+
+
 // #define FireAffinity 1
 // #define ThunderAffinity 2
 // #define WindAffinity 3
@@ -447,8 +456,8 @@ Enchanter
 #define MageKnight_F Valkyrie 
 #define WyvernRider_F WyvernKnight_F
 #define Summoner Druid 
-#define Necromancer DarkPrince 
-#define FalconKnight FalcoKnight 
+#define Necromancer DarkPrince
+#define FalconKnight FalcoKnight  
 #endif 
 
 
@@ -520,7 +529,6 @@ Enchanter
     #define DragonKnight_F WyvernKnight_F
 #endif 
 #define DragonRider WyvernRider 
-#define DragonRider_F WyvernRider_F
 #ifdef _FE8_
     #define ArchKnight Cavalier
 #else
@@ -563,6 +571,7 @@ Enchanter
     #define ThiefFighter Rogue
 #endif
 #define PegasusRider PegasusKnight 
+#define SwordArmour Knight
 #define AxeArmour Knight 
 #define LoputoMage Shaman
 
@@ -589,7 +598,6 @@ Enchanter
     #define BowKnight_F Nomad_F
 #endif
 #define SwordKnight Cavalier
-#define SwordArmour Knight
 #define SwordArmour_F Knight_F
 // #define Halberdier Knight 
 #define Heron Bard
@@ -679,6 +687,24 @@ Enchanter
 
 
 
+#define Trickster_F Trickster 
+#define Samurai_F Samurai 
+#define SpearFighter_F SpearFighter 
+#define Ninja_F Ninja 
+#define DarkMage_F DarkMage 
+#ifndef _FE8_ 
+    #define WyvernKnight_F WyvernKnight 
+    #define Ranger_F Ranger 
+#endif 
+
+#define Wolfskin_F Wolfskin 
+#define SwordFighter_F Swordmaster 
+
+#define DragonRider_F DragonRider 
+#define ChromLord Lord 
+#define Taguel_F Taguel 
+#define LucinaLord Lord 
+
 
 
 

Readme.md

@@ -410,7 +410,7 @@ Robert portrait by Dongus
 Fred portrait by Melia    
 Olwen portrait by Garytop    
 Mareeta portrait by CavalryUnits    
-Salem portrait by [Unknown Artist]    
+Salem portrait by TheGreatNothing  
 Perne portrait by Sterling Glovner    
 Tina portrait by WiiSportsRemote    
 Troude portrait by Sterling Glovner    
@@ -421,7 +421,7 @@ Homer portrait by Wasdye
 Linoan portrait by Linoan    
 Ralph portrait by Sterling_Glovner    
 Ilios portrait by Obsidian_Daddy    
-Sleuf portrait by [Unknown Artist]    
+Sleuf portrait by TheGreatNothing 
 Misha portrait by claire45    
 Sara portrait by [Unknown Artist]    
 Shannam portrait by Melia    
@@ -689,7 +689,7 @@ Ashe portrait by Glaciemnox
 Sylvain portrait by CavalryUnits    
 Mercedes portrait by Blade    
 Annette portrait by Yasako    
-Ingrid (no art credited)    
+Ingrid portrait by AtelierLabs
 Lorenz (FE16) portrait by Tobiki    
 Raphael portrait by Stitch    
 Ignatz portrait by Glaciemnox   
@@ -722,7 +722,7 @@ Celine (no art credited)
 Chloe (no art credited)    
 Louis (no art credited)    
 Yunaka portrait by RedBean    
-Alcryst (no art credited)    
+Alcryst portrait by Rammerrush   
 Citrinne portrait by CavalryUnits    
 Lapis portrait by Thorn    
 Diamant (no art credited)    

Text/Names.txt

@@ -1209,7 +1209,7 @@ Salem[X]
 ## SalemDesc  
 A wise sage with deep knowledge.[N]
 Uses his magic to guide and protect.[N]
-Art by [X]
+Art by TheGreatNothing[X]
 
 ## PerneName  
 Perne[X]
@@ -1286,7 +1286,7 @@ Sleuf[X]
 ## SleufDesc  
 A wise sage with deep magical knowledge.[N]
 Guides allies with his intellect.[N]
-Art by [X]
+Art by TheGreatNothing[X]
 
 ## MishaName  
 Misha[X]
@@ -3959,7 +3959,7 @@ Ingrid[X]
 ## IngridDesc  
 A knight with a strong sense of duty.[N]
 Strives to honor her family name.[N]
-Art by [X]
+Art by AtelierLabs[X]
 
 ## LorenzFE16Name  
 Lorenz[X]
@@ -4073,6 +4073,40 @@ A devoted worker and Rhea's attendant.[N]
 Eager to improve and protect others.[N]
 Art by [X]
 
+## JeritzaName  
+Jeritza[X]
+## JeritzaDesc  
+General of the Adrestian Empire.[N]
+Skilled, and harbors a dark past.[N]
+Art by [X]
+
+## YuriName  
+Yuri[X]
+## YuriDesc  
+Leader of the Ashen Wolf House.[N]
+A valiant defender of the weak.[N]
+Art by HyperGammaSpaces[X]
+
+## BalthusName  
+Balthus[X]
+## BalthusDesc  
+Former noble who ran away to Abyss.[N]
+Revels in competition.[N]
+Art by [X]
+
+## HapiName  
+Hapi[X]
+## HapiDesc  
+An apathetic young woman whose sighs[N]
+have the ability to draw monsters to her.[N]
+Art by JeyTheCount[X]
+
+## ConstanceName  
+Constance[X]
+## ConstanceDesc  
+Young lady of the fallen Imperial house[N]
+of Nuvelle. Has an overbearing attitude.[N]
+Art by Atey[X]
 
 // fe17 
 
@@ -4162,7 +4196,7 @@ Alcryst[X]
 ## AlcrystDesc  
 A reserved prince skilled with a bow.[N]
 Often modest about his abilities.[N]
-Art by [X]
+Art by Rammerrush[X]
 
 ## CitrinneName  
 Citrinne[X]