diff --git a/Definitions.event b/Definitions.event index 5bb085c2..7ae9ca7b 100644 --- a/Definitions.event +++ b/Definitions.event @@ -135,7 +135,6 @@ #define DorotheaMug BlankMug #define PetraMug BlankMug #define DedueMug BlankMug -#define FelixMug BlankMug #define AsheMug BlankMug #define IngridMug BlankMug #define IgnatzMug BlankMug diff --git a/Tables/NightmareModules/CharacterTable_FE13.csv b/Tables/NightmareModules/CharacterTable_FE13.csv index db6e902d..3b6c5ccf 100644 --- a/Tables/NightmareModules/CharacterTable_FE13.csv +++ b/Tables/NightmareModules/CharacterTable_FE13.csv @@ -41,7 +41,7 @@ Yarne,YarneName,YarneDesc,0x27,Taguel,YarneMug,0x00,WaterAffinity,0x33,10,10,6,2 Laurent,LaurentName,LaurentDesc,0x28,Mage,LaurentMug,0x00,FireAffinity,0x21,10,6,5,4,2,2,3,7,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,45,40,40,30,25,35,50,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Noire,NoireName,NoireDesc,0x29,Archer,NoireMug,0x00,WaterAffinity,0x0C,10,5,3,2,4,2,4,6,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,30,45,35,50,30,40,40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Nah,NahName,NahDesc,0x2A,Manakete_2_F,NahMug,0x00,DarkAffinity,0x30,10,3,2,3,4,2,2,5,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,70,35,45,35,45,40,70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 -Tiki,Tiki2Name,Tiki2Desc,0x2B,Manakete_2_F,TikiMug,0x00,EarthAffinity,0x38,20,14,10,8,10,8,6,12,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,80,40,35,30,45,45,80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 +Tiki,TikiFE13Name,TikiFE13Desc,0x2B,Manakete_2_F,TikiFE13Mug,0x00,EarthAffinity,0x38,20,14,10,8,10,8,6,12,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,80,40,35,30,45,45,80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Gangrel,GangrelName,GangrelDesc,0x2C,Trickster,GangrelMug,0x00,LightAffinity,0x23,6,20,11,12,14,10,8,10,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,40,40,50,50,30,30,30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Walhart,WalhartName,WalhartDesc,0x2D,Conqueror,WalhartMug,0x00,HeavenAffinity,0x27,20,31,19,16,16,15,9,20,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,75,60,30,30,45,25,45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Emmeryn,EmmerynName,EmmerynDesc,0x2E,Cleric,EmmerynMug,0x00,DarkAffinity,0x2B,8,14,12,12,12,5,10,8,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,45,55,40,40,25,35,70,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 diff --git a/Tables/NightmareModules/CharacterTable_FE16.csv b/Tables/NightmareModules/CharacterTable_FE16.csv index ab03b5c0..1a75a364 100644 --- a/Tables/NightmareModules/CharacterTable_FE16.csv +++ b/Tables/NightmareModules/CharacterTable_FE16.csv @@ -23,7 +23,7 @@ Raphael,RaphaelName,RaphaelDesc,0x15,Journeyman_1,RaphaelMug,0x00,HeavenAffinity Ignatz,IgnatzName,IgnatzDesc,0x16,Archer_F,IgnatzMug,0x00,ThunderAffinity,0x1A,1,8,5,4,5,2,4,5,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,35,35,50,50,25,35,55,0x0,0x0,0x0,0x0,0x0,0x0,0x88aeda4,0xc,0x0,0x0,0x0 Lysithea,LysitheaName,LysitheaDesc,0x17,Mage_F,LysitheaMug,0x00,WindAffinity,0x2D,12,7,7,4,4,2,2,2,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,20,60,60,50,10,25,15,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedbc,0x6,0x0,0x0,0x0 Marianne,MarianneName,MarianneDesc,0x18,Bishop_F,MarianneMug,0x00,WindAffinity,0x03,12,7,7,4,4,2,5,4,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,35,50,40,40,15,45,35,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedd4,0x5,0x0,0x0,0x0 -Hilda,HildaName,HildaDesc,0x19,Warrior,HildaMug,0x00,HeavenAffinity,0x04,10,9,6,3,5,4,2,4,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,50,45,30,50,35,20,35,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedec,0xb,0x0,0x0,0x0 +Hilda,HildaFE16Name,HildaFE16Desc,0x19,Warrior,HildaFE16Mug,0x00,HeavenAffinity,0x04,10,9,6,3,5,4,2,4,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,50,45,30,50,35,20,35,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedec,0xb,0x0,0x0,0x0 Leonie,LeonieName,LeonieDesc,0x1A,Cavalier_F,LeonieMug,0x00,HeavenAffinity,0x29,1,8,6,5,6,4,1,4,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,40,40,55,60,40,15,40,0x0,0x0,0x0,0x0,0x0,0x0,0x88aee04,0x4,0x0,0x0,0x0 Seteth,SetethName,SetethDesc,0x1B,WyvernRider,SetethMug,0x00,EarthAffinity,0x2C,10,9,6,5,3,4,2,4,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,50,45,50,50,30,25,25,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Flayn,FlaynName,FlaynDesc,0x1C,Priest,FlaynMug,0x00,FireAffinity,0x02,10,8,6,4,3,3,6,2,0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,25,55,45,35,25,50,15,0x0,0x0,0x0,0x0,0x0,0x0,0x88aee4c,0x0,0x0,0x0,0x0 diff --git a/Tables/NightmareModules/CharacterTable_FE6.csv b/Tables/NightmareModules/CharacterTable_FE6.csv index 59ccc309..f31c1dc7 100644 --- a/Tables/NightmareModules/CharacterTable_FE6.csv +++ b/Tables/NightmareModules/CharacterTable_FE6.csv @@ -54,7 +54,7 @@ Echidna,EchidnaName,EchidnaDesc,0x34,Hero_F,EchidnaMug,0x00,0x04,0x24,0x01,0x0D, Cecilia,CeciliaName,CeciliaDesc,0x35,Valkyrie,CeciliaMug,0x00,0x07,0x2A,0x01,0x0B,0x07,0x04,0x05,0x03,0x05,0x0A,0x00,0x00,0x00,0x00,0x00,0x00,0xC9,0x00,0x00,0x3C,0x23,0x2D,0x19,0x14,0x19,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Geese,GeeseName,GeeseDesc,0x36,Pirate,GeeseMug,0x00,0x01,0x1E,0x0A,0x0E,0x06,0x07,0x03,0x05,0x00,0x09,0x01,0x00,0x00,0x97,0x00,0x00,0x00,0x00,0x00,0x55,0x32,0x1E,0x28,0x14,0x0A,0x28,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Merlinus,MerlinusName,MerlinusDesc,0x37,Transporter,MerlinusMug,0x00,0x05,0x07,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x0A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x32,0x32,0x14,0x05,0x64,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 -Eliwood,EliwoodName,EliwoodDesc,0x38,Paladin,EliwoodMug,0x00,0x07,0x3C,0x14,0x19,0x12,0x10,0x0F,0x10,0x0C,0x0E,0x00,0xC9,0xFB,0x65,0x00,0x00,0x00,0x00,0x00,0x3C,0x14,0x1E,0x23,0x0F,0x05,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 +Eliwood,EliwoodName,EliwoodDesc,0x38,Paladin,EliwoodFE6Mug,0x00,0x07,0x3C,0x14,0x19,0x12,0x10,0x0F,0x10,0x0C,0x0E,0x00,0xC9,0xFB,0x65,0x00,0x00,0x00,0x00,0x00,0x3C,0x14,0x1E,0x23,0x0F,0x05,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 Guinivere,GuinivereName,GuinivereDesc,0x39,Sage_F,GuinivereMug,0x00,0x06,0x3E,0x14,0x0A,0x14,0x12,0x12,0x0A,0x14,0x18,0x00,0x00,0x00,0x00,0x00,0xC9,0x97,0xFB,0x00,0x3C,0x14,0x1E,0x23,0x0F,0x05,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 0A Citizen,CitizenName, CitizenDesc,0x3A,0x01,0x0,0x01,0x00,0x00,0x14,0x0A,0x14,0x12,0x12,0x0A,0x14,0x18,0x00,0x00,0x00,0x00,0x00,0xC9,0x97,0xFB,0x00,0x3C,0x14,0x1E,0x23,0x0F,0x05,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 0x3B Lyon's Summon,0x2f1,0x33d,0x3b,0x7,0x0,0x7,DarkAffinity,0x25,1,0,3,2,3,0,0,20,0,NoRank,NoRank,CRank,NoRank,NoRank,NoRank,NoRank,NoRank,0,60,45,30,0,0,60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 diff --git a/Text/Names.txt b/Text/Names.txt index 0b566300..28e0f46b 100644 --- a/Text/Names.txt +++ b/Text/Names.txt @@ -2874,9 +2874,9 @@ An enigmatic manakete who is[N] unusually together for her age.[N] Art by Garytop[X] -## Tiki2Name +## TikiFE13Name Tiki[X] -## Tiki2Desc +## TikiFE13Desc The calm and collected Voice[N] of the divine dragon.[N] Art by BatimaTheBat[X] @@ -3637,7 +3637,7 @@ Est[X] ## EstFe15Desc The youngest of the Whitewings.[N] Energetic and loves her sisters.[N] -Art by DiamondAppendix[X] +Art by Plant Academy[X] ## NomahName Nomah[X] @@ -3749,7 +3749,7 @@ Felix[X] ## FelixDesc A swordsman with a critical outlook.[N] Values strength above all else.[N] -Art by [X] +Art by Melia, Renoud[X] ## AsheName Ashe[X] @@ -3821,9 +3821,9 @@ A quiet student with a somber demeanor.[N] Deeply connected to nature.[N] Art by Garytop[X] -## HildaName +## HildaFE16Name Hilda[X] -## HildaDesc +## HildaFE16Desc A carefree noble with a lively nature.[N] Skilled yet often plays helpless.[N] Art by Garytop[X] diff --git a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_frames.dmp b/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_frames.dmp deleted file mode 100644 index 467a53da..00000000 Binary files a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_frames.dmp and /dev/null differ diff --git a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_minimug.dmp b/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_minimug.dmp deleted file mode 100644 index a55e04f6..00000000 Binary files a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_minimug.dmp and /dev/null differ diff --git a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_mug.dmp b/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_mug.dmp deleted file mode 100644 index 9b277b8c..00000000 Binary files a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_mug.dmp and /dev/null differ diff --git a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_palette.dmp b/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_palette.dmp deleted file mode 100644 index a9a12c7c..00000000 --- a/gfx/Portraits/Dmp/EstFe15_DiamondAppendix_palette.dmp +++ /dev/null @@ -1 +0,0 @@ -4O  (%}.,%?Goo 9gtR2 \ No newline at end of file diff --git a/gfx/Portraits/Est2_PlantAcademy.png b/gfx/Portraits/Est2_PlantAcademy.png deleted file mode 100644 index f5640519..00000000 Binary files a/gfx/Portraits/Est2_PlantAcademy.png and /dev/null differ diff --git a/gfx/Portraits/Generated.event b/gfx/Portraits/Generated.event index ccff320e..d7892b8a 100644 --- a/gfx/Portraits/Generated.event +++ b/gfx/Portraits/Generated.event @@ -1,6932 +1,6943 @@ //Generated! Do not edit! ALIGN 4 -Aversa_Garytop_F2EMugData: -#incbin "Dmp/Aversa_Garytop_F2E_mug.dmp" -#incbin "Dmp/Aversa_Garytop_F2E_frames.dmp" -#incbin "Dmp/Aversa_Garytop_F2E_palette.dmp" -#incbin "Dmp/Aversa_Garytop_F2E_minimug.dmp" +AversaMugData: +#incbin "png/FE13/Aversa_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Aversa_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Aversa_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Aversa_Garytop_F2E_minimug.dmp" #ifndef AversaMug #define AversaMug (FirstMugID+1) #endif -setMugEntry(AversaMug, Aversa_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(AversaMug, AversaMugData, 2, 5, 2, 3) ALIGN 4 -Basilio_Garytop_F2EMugData: -#incbin "Dmp/Basilio_Garytop_F2E_mug.dmp" -#incbin "Dmp/Basilio_Garytop_F2E_frames.dmp" -#incbin "Dmp/Basilio_Garytop_F2E_palette.dmp" -#incbin "Dmp/Basilio_Garytop_F2E_minimug.dmp" +BasilioMugData: +#incbin "png/FE13/Basilio_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Basilio_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Basilio_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Basilio_Garytop_F2E_minimug.dmp" #ifndef BasilioMug #define BasilioMug (FirstMugID+2) #endif -setMugEntry(BasilioMug, Basilio_Garytop_F2EMugData, 3, 4, 3, 2) +setMugEntry(BasilioMug, BasilioMugData, 3, 4, 3, 2) ALIGN 4 -Brady_ShadowFlygonMugData: -#incbin "Dmp/Brady_ShadowFlygon_mug.dmp" -#incbin "Dmp/Brady_ShadowFlygon_frames.dmp" -#incbin "Dmp/Brady_ShadowFlygon_palette.dmp" -#incbin "Dmp/Brady_ShadowFlygon_minimug.dmp" +BradyMugData: +#incbin "png/FE13/Brady_ShadowFlygon_mug.dmp" +#incbin "png/FE13/Brady_ShadowFlygon_frames.dmp" +#incbin "png/FE13/Brady_ShadowFlygon_palette.dmp" +#incbin "png/FE13/Brady_ShadowFlygon_minimug.dmp" #ifndef BradyMug #define BradyMug (FirstMugID+3) #endif -setMugEntry(BradyMug, Brady_ShadowFlygonMugData, 3, 5, 3, 3) +setMugEntry(BradyMug, BradyMugData, 3, 5, 3, 3) ALIGN 4 -Cherche_BuskHuskerMugData: -#incbin "Dmp/Cherche_BuskHusker_mug.dmp" -#incbin "Dmp/Cherche_BuskHusker_frames.dmp" -#incbin "Dmp/Cherche_BuskHusker_palette.dmp" -#incbin "Dmp/Cherche_BuskHusker_minimug.dmp" +ChercheMugData: +#incbin "png/FE13/Cherche_BuskHusker_mug.dmp" +#incbin "png/FE13/Cherche_BuskHusker_frames.dmp" +#incbin "png/FE13/Cherche_BuskHusker_palette.dmp" +#incbin "png/FE13/Cherche_BuskHusker_minimug.dmp" #ifndef ChercheMug #define ChercheMug (FirstMugID+4) #endif -setMugEntry(ChercheMug, Cherche_BuskHuskerMugData, 2, 5, 2, 3) +setMugEntry(ChercheMug, ChercheMugData, 2, 5, 2, 3) ALIGN 4 -Chrom_Atey_WasdyeMugData: -#incbin "Dmp/Chrom_Atey_Wasdye_mug.dmp" -#incbin "Dmp/Chrom_Atey_Wasdye_frames.dmp" -#incbin "Dmp/Chrom_Atey_Wasdye_palette.dmp" -#incbin "Dmp/Chrom_Atey_Wasdye_minimug.dmp" +ChromMugData: +#incbin "png/FE13/Chrom_Atey_Wasdye_mug.dmp" +#incbin "png/FE13/Chrom_Atey_Wasdye_frames.dmp" +#incbin "png/FE13/Chrom_Atey_Wasdye_palette.dmp" +#incbin "png/FE13/Chrom_Atey_Wasdye_minimug.dmp" #ifndef ChromMug #define ChromMug (FirstMugID+5) #endif -setMugEntry(ChromMug, Chrom_Atey_WasdyeMugData, 2, 5, 2, 3) +setMugEntry(ChromMug, ChromMugData, 2, 5, 2, 3) ALIGN 4 -Cordelia_Garytop_F2EMugData: -#incbin "Dmp/Cordelia_Garytop_F2E_mug.dmp" -#incbin "Dmp/Cordelia_Garytop_F2E_frames.dmp" -#incbin "Dmp/Cordelia_Garytop_F2E_palette.dmp" -#incbin "Dmp/Cordelia_Garytop_F2E_minimug.dmp" +CordeliaMugData: +#incbin "png/FE13/Cordelia_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Cordelia_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Cordelia_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Cordelia_Garytop_F2E_minimug.dmp" #ifndef CordeliaMug #define CordeliaMug (FirstMugID+6) #endif -setMugEntry(CordeliaMug, Cordelia_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(CordeliaMug, CordeliaMugData, 3, 5, 3, 3) ALIGN 4 -Cynthia_Garytop_F2EMugData: -#incbin "Dmp/Cynthia_Garytop_F2E_mug.dmp" -#incbin "Dmp/Cynthia_Garytop_F2E_frames.dmp" -#incbin "Dmp/Cynthia_Garytop_F2E_palette.dmp" -#incbin "Dmp/Cynthia_Garytop_F2E_minimug.dmp" +CynthiaMugData: +#incbin "png/FE13/Cynthia_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Cynthia_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Cynthia_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Cynthia_Garytop_F2E_minimug.dmp" #ifndef CynthiaMug #define CynthiaMug (FirstMugID+7) #endif -setMugEntry(CynthiaMug, Cynthia_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(CynthiaMug, CynthiaMugData, 3, 6, 3, 4) ALIGN 4 -Donnel_Garytop_F2EMugData: -#incbin "Dmp/Donnel_Garytop_F2E_mug.dmp" -#incbin "Dmp/Donnel_Garytop_F2E_frames.dmp" -#incbin "Dmp/Donnel_Garytop_F2E_palette.dmp" -#incbin "Dmp/Donnel_Garytop_F2E_minimug.dmp" +DonnelMugData: +#incbin "png/FE13/Donnel_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Donnel_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Donnel_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Donnel_Garytop_F2E_minimug.dmp" #ifndef DonnelMug #define DonnelMug (FirstMugID+8) #endif -setMugEntry(DonnelMug, Donnel_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(DonnelMug, DonnelMugData, 3, 6, 3, 4) ALIGN 4 -Emmeryn_Garytop_F2EMugData: -#incbin "Dmp/Emmeryn_Garytop_F2E_mug.dmp" -#incbin "Dmp/Emmeryn_Garytop_F2E_frames.dmp" -#incbin "Dmp/Emmeryn_Garytop_F2E_palette.dmp" -#incbin "Dmp/Emmeryn_Garytop_F2E_minimug.dmp" +EmmerynMugData: +#incbin "png/FE13/Emmeryn_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Emmeryn_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Emmeryn_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Emmeryn_Garytop_F2E_minimug.dmp" #ifndef EmmerynMug #define EmmerynMug (FirstMugID+9) #endif -setMugEntry(EmmerynMug, Emmeryn_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(EmmerynMug, EmmerynMugData, 2, 5, 2, 3) ALIGN 4 -Flavia_Garytop_F2EMugData: -#incbin "Dmp/Flavia_Garytop_F2E_mug.dmp" -#incbin "Dmp/Flavia_Garytop_F2E_frames.dmp" -#incbin "Dmp/Flavia_Garytop_F2E_palette.dmp" -#incbin "Dmp/Flavia_Garytop_F2E_minimug.dmp" +FlaviaMugData: +#incbin "png/FE13/Flavia_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Flavia_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Flavia_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Flavia_Garytop_F2E_minimug.dmp" #ifndef FlaviaMug #define FlaviaMug (FirstMugID+10) #endif -setMugEntry(FlaviaMug, Flavia_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(FlaviaMug, FlaviaMugData, 2, 5, 2, 3) ALIGN 4 -Frederick_Garytop_F2EMugData: -#incbin "Dmp/Frederick_Garytop_F2E_mug.dmp" -#incbin "Dmp/Frederick_Garytop_F2E_frames.dmp" -#incbin "Dmp/Frederick_Garytop_F2E_palette.dmp" -#incbin "Dmp/Frederick_Garytop_F2E_minimug.dmp" +FrederickMugData: +#incbin "png/FE13/Frederick_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Frederick_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Frederick_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Frederick_Garytop_F2E_minimug.dmp" #ifndef FrederickMug #define FrederickMug (FirstMugID+11) #endif -setMugEntry(FrederickMug, Frederick_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(FrederickMug, FrederickMugData, 3, 5, 3, 3) ALIGN 4 -Gaius_No_lolipop_during_conversations_Garytop_F2EMugData: -#incbin "Dmp/Gaius_No_lolipop_during_conversations_Garytop_F2E_mug.dmp" -#incbin "Dmp/Gaius_No_lolipop_during_conversations_Garytop_F2E_frames.dmp" -#incbin "Dmp/Gaius_No_lolipop_during_conversations_Garytop_F2E_palette.dmp" -#incbin "Dmp/Gaius_No_lolipop_during_conversations_Garytop_F2E_minimug.dmp" +GaiusMugData: +#incbin "png/FE13/Gaius_No_lolipop_during_conversations_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Gaius_No_lolipop_during_conversations_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Gaius_No_lolipop_during_conversations_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Gaius_No_lolipop_during_conversations_Garytop_F2E_minimug.dmp" #ifndef GaiusMug #define GaiusMug (FirstMugID+12) #endif -setMugEntry(GaiusMug, Gaius_No_lolipop_during_conversations_Garytop_F2EMugData, 3, 6, 3, 3) +setMugEntry(GaiusMug, GaiusMugData, 3, 6, 3, 3) ALIGN 4 -Gangrel_Garytop_F2EMugData: -#incbin "Dmp/Gangrel_Garytop_F2E_mug.dmp" -#incbin "Dmp/Gangrel_Garytop_F2E_frames.dmp" -#incbin "Dmp/Gangrel_Garytop_F2E_palette.dmp" -#incbin "Dmp/Gangrel_Garytop_F2E_minimug.dmp" +GangrelMugData: +#incbin "png/FE13/Gangrel_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Gangrel_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Gangrel_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Gangrel_Garytop_F2E_minimug.dmp" #ifndef GangrelMug #define GangrelMug (FirstMugID+13) #endif -setMugEntry(GangrelMug, Gangrel_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(GangrelMug, GangrelMugData, 3, 5, 3, 3) ALIGN 4 -Gerome_No_mask_Garytop_F2EMugData: -#incbin "Dmp/Gerome_No_mask_Garytop_F2E_mug.dmp" -#incbin "Dmp/Gerome_No_mask_Garytop_F2E_frames.dmp" -#incbin "Dmp/Gerome_No_mask_Garytop_F2E_palette.dmp" -#incbin "Dmp/Gerome_No_mask_Garytop_F2E_minimug.dmp" +GeromeMugData: +#incbin "png/FE13/Gerome_No_mask_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Gerome_No_mask_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Gerome_No_mask_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Gerome_No_mask_Garytop_F2E_minimug.dmp" #ifndef GeromeMug #define GeromeMug (FirstMugID+14) #endif -setMugEntry(GeromeMug, Gerome_No_mask_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(GeromeMug, GeromeMugData, 3, 5, 3, 3) ALIGN 4 -Gregor_Garytop_F2EMugData: -#incbin "Dmp/Gregor_Garytop_F2E_mug.dmp" -#incbin "Dmp/Gregor_Garytop_F2E_frames.dmp" -#incbin "Dmp/Gregor_Garytop_F2E_palette.dmp" -#incbin "Dmp/Gregor_Garytop_F2E_minimug.dmp" +GregorMugData: +#incbin "png/FE13/Gregor_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Gregor_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Gregor_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Gregor_Garytop_F2E_minimug.dmp" #ifndef GregorMug #define GregorMug (FirstMugID+15) #endif -setMugEntry(GregorMug, Gregor_Garytop_F2EMugData, 3, 4, 3, 2) +setMugEntry(GregorMug, GregorMugData, 3, 4, 3, 2) ALIGN 4 -Henry_Garytop_F2EMugData: -#incbin "Dmp/Henry_Garytop_F2E_mug.dmp" -#incbin "Dmp/Henry_Garytop_F2E_frames.dmp" -#incbin "Dmp/Henry_Garytop_F2E_palette.dmp" -#incbin "Dmp/Henry_Garytop_F2E_minimug.dmp" +HenryMugData: +#incbin "png/FE13/Henry_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Henry_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Henry_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Henry_Garytop_F2E_minimug.dmp" #ifndef HenryMug #define HenryMug (FirstMugID+16) #endif -setMugEntry(HenryMug, Henry_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(HenryMug, HenryMugData, 3, 5, 3, 3) ALIGN 4 -Inigo_CavalryUnits_F2EMugData: -#incbin "Dmp/Inigo_CavalryUnits_F2E_mug.dmp" -#incbin "Dmp/Inigo_CavalryUnits_F2E_frames.dmp" -#incbin "Dmp/Inigo_CavalryUnits_F2E_palette.dmp" -#incbin "Dmp/Inigo_CavalryUnits_F2E_minimug.dmp" +InigoMugData: +#incbin "png/FE13/Inigo_CavalryUnits_F2E_mug.dmp" +#incbin "png/FE13/Inigo_CavalryUnits_F2E_frames.dmp" +#incbin "png/FE13/Inigo_CavalryUnits_F2E_palette.dmp" +#incbin "png/FE13/Inigo_CavalryUnits_F2E_minimug.dmp" #ifndef InigoMug #define InigoMug (FirstMugID+17) #endif -setMugEntry(InigoMug, Inigo_CavalryUnits_F2EMugData, 3, 5, 3, 3) +setMugEntry(InigoMug, InigoMugData, 3, 5, 3, 3) ALIGN 4 -Kellam_Garytop_F2EMugData: -#incbin "Dmp/Kellam_Garytop_F2E_mug.dmp" -#incbin "Dmp/Kellam_Garytop_F2E_frames.dmp" -#incbin "Dmp/Kellam_Garytop_F2E_palette.dmp" -#incbin "Dmp/Kellam_Garytop_F2E_minimug.dmp" +KellamMugData: +#incbin "png/FE13/Kellam_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Kellam_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Kellam_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Kellam_Garytop_F2E_minimug.dmp" #ifndef KellamMug #define KellamMug (FirstMugID+18) #endif -setMugEntry(KellamMug, Kellam_Garytop_F2EMugData, 2, 4, 2, 2) +setMugEntry(KellamMug, KellamMugData, 2, 4, 2, 2) ALIGN 4 -Kjelle_Garytop_F2EMugData: -#incbin "Dmp/Kjelle_Garytop_F2E_mug.dmp" -#incbin "Dmp/Kjelle_Garytop_F2E_frames.dmp" -#incbin "Dmp/Kjelle_Garytop_F2E_palette.dmp" -#incbin "Dmp/Kjelle_Garytop_F2E_minimug.dmp" +KjelleMugData: +#incbin "png/FE13/Kjelle_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Kjelle_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Kjelle_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Kjelle_Garytop_F2E_minimug.dmp" #ifndef KjelleMug #define KjelleMug (FirstMugID+19) #endif -setMugEntry(KjelleMug, Kjelle_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(KjelleMug, KjelleMugData, 3, 5, 3, 3) ALIGN 4 -Laurent_Garytop_F2EMugData: -#incbin "Dmp/Laurent_Garytop_F2E_mug.dmp" -#incbin "Dmp/Laurent_Garytop_F2E_frames.dmp" -#incbin "Dmp/Laurent_Garytop_F2E_palette.dmp" -#incbin "Dmp/Laurent_Garytop_F2E_minimug.dmp" +LaurentMugData: +#incbin "png/FE13/Laurent_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Laurent_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Laurent_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Laurent_Garytop_F2E_minimug.dmp" #ifndef LaurentMug #define LaurentMug (FirstMugID+20) #endif -setMugEntry(LaurentMug, Laurent_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(LaurentMug, LaurentMugData, 3, 5, 3, 3) ALIGN 4 -Libra_RedBean_F2EMugData: -#incbin "Dmp/Libra_RedBean_F2E_mug.dmp" -#incbin "Dmp/Libra_RedBean_F2E_frames.dmp" -#incbin "Dmp/Libra_RedBean_F2E_palette.dmp" -#incbin "Dmp/Libra_RedBean_F2E_minimug.dmp" +LibraMugData: +#incbin "png/FE13/Libra_RedBean_F2E_mug.dmp" +#incbin "png/FE13/Libra_RedBean_F2E_frames.dmp" +#incbin "png/FE13/Libra_RedBean_F2E_palette.dmp" +#incbin "png/FE13/Libra_RedBean_F2E_minimug.dmp" #ifndef LibraMug #define LibraMug (FirstMugID+21) #endif -setMugEntry(LibraMug, Libra_RedBean_F2EMugData, 2, 5, 3, 3) +setMugEntry(LibraMug, LibraMugData, 2, 5, 3, 3) ALIGN 4 -Lissa_Garytop_F2EMugData: -#incbin "Dmp/Lissa_Garytop_F2E_mug.dmp" -#incbin "Dmp/Lissa_Garytop_F2E_frames.dmp" -#incbin "Dmp/Lissa_Garytop_F2E_palette.dmp" -#incbin "Dmp/Lissa_Garytop_F2E_minimug.dmp" +LissaMugData: +#incbin "png/FE13/Lissa_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Lissa_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Lissa_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Lissa_Garytop_F2E_minimug.dmp" #ifndef LissaMug #define LissaMug (FirstMugID+22) #endif -setMugEntry(LissaMug, Lissa_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(LissaMug, LissaMugData, 3, 6, 3, 4) ALIGN 4 -Lonqu_Garytop_F2EMugData: -#incbin "Dmp/Lonqu_Garytop_F2E_mug.dmp" -#incbin "Dmp/Lonqu_Garytop_F2E_frames.dmp" -#incbin "Dmp/Lonqu_Garytop_F2E_palette.dmp" -#incbin "Dmp/Lonqu_Garytop_F2E_minimug.dmp" +LonquMugData: +#incbin "png/FE13/Lonqu_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Lonqu_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Lonqu_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Lonqu_Garytop_F2E_minimug.dmp" #ifndef LonquMug #define LonquMug (FirstMugID+23) #endif -setMugEntry(LonquMug, Lonqu_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(LonquMug, LonquMugData, 3, 5, 3, 3) ALIGN 4 -Lucina_New_TheImperialKnightMugData: -#incbin "Dmp/Lucina_New_TheImperialKnight_mug.dmp" -#incbin "Dmp/Lucina_New_TheImperialKnight_frames.dmp" -#incbin "Dmp/Lucina_New_TheImperialKnight_palette.dmp" -#incbin "Dmp/Lucina_New_TheImperialKnight_minimug.dmp" +LucinaMugData: +#incbin "png/FE13/Lucina_New_TheImperialKnight_mug.dmp" +#incbin "png/FE13/Lucina_New_TheImperialKnight_frames.dmp" +#incbin "png/FE13/Lucina_New_TheImperialKnight_palette.dmp" +#incbin "png/FE13/Lucina_New_TheImperialKnight_minimug.dmp" #ifndef LucinaMug #define LucinaMug (FirstMugID+24) #endif -setMugEntry(LucinaMug, Lucina_New_TheImperialKnightMugData, 4, 6, 4, 4) +setMugEntry(LucinaMug, LucinaMugData, 4, 6, 4, 4) ALIGN 4 -Maribelle_No_hand_Garytop_F2EMugData: -#incbin "Dmp/Maribelle_No_hand_Garytop_F2E_mug.dmp" -#incbin "Dmp/Maribelle_No_hand_Garytop_F2E_frames.dmp" -#incbin "Dmp/Maribelle_No_hand_Garytop_F2E_palette.dmp" -#incbin "Dmp/Maribelle_No_hand_Garytop_F2E_minimug.dmp" +MaribelleMugData: +#incbin "png/FE13/Maribelle_No_hand_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Maribelle_No_hand_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Maribelle_No_hand_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Maribelle_No_hand_Garytop_F2E_minimug.dmp" #ifndef MaribelleMug #define MaribelleMug (FirstMugID+25) #endif -setMugEntry(MaribelleMug, Maribelle_No_hand_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(MaribelleMug, MaribelleMugData, 3, 6, 3, 4) ALIGN 4 -Miriel_Garytop_F2EMugData: -#incbin "Dmp/Miriel_Garytop_F2E_mug.dmp" -#incbin "Dmp/Miriel_Garytop_F2E_frames.dmp" -#incbin "Dmp/Miriel_Garytop_F2E_palette.dmp" -#incbin "Dmp/Miriel_Garytop_F2E_minimug.dmp" +MirielMugData: +#incbin "png/FE13/Miriel_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Miriel_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Miriel_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Miriel_Garytop_F2E_minimug.dmp" #ifndef MirielMug #define MirielMug (FirstMugID+26) #endif -setMugEntry(MirielMug, Miriel_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(MirielMug, MirielMugData, 3, 5, 3, 3) ALIGN 4 -Morgan_Redbean_F2EMugData: -#incbin "Dmp/Morgan_Redbean_F2E_mug.dmp" -#incbin "Dmp/Morgan_Redbean_F2E_frames.dmp" -#incbin "Dmp/Morgan_Redbean_F2E_palette.dmp" -#incbin "Dmp/Morgan_Redbean_F2E_minimug.dmp" +MorganMugData: +#incbin "png/FE13/Morgan_Redbean_F2E_mug.dmp" +#incbin "png/FE13/Morgan_Redbean_F2E_frames.dmp" +#incbin "png/FE13/Morgan_Redbean_F2E_palette.dmp" +#incbin "png/FE13/Morgan_Redbean_F2E_minimug.dmp" #ifndef MorganMug #define MorganMug (FirstMugID+27) #endif -setMugEntry(MorganMug, Morgan_Redbean_F2EMugData, 3, 6, 3, 4) +setMugEntry(MorganMug, MorganMugData, 3, 6, 3, 4) ALIGN 4 -Nah_Garytop_F2EMugData: -#incbin "Dmp/Nah_Garytop_F2E_mug.dmp" -#incbin "Dmp/Nah_Garytop_F2E_frames.dmp" -#incbin "Dmp/Nah_Garytop_F2E_palette.dmp" -#incbin "Dmp/Nah_Garytop_F2E_minimug.dmp" +NahMugData: +#incbin "png/FE13/Nah_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Nah_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Nah_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Nah_Garytop_F2E_minimug.dmp" #ifndef NahMug #define NahMug (FirstMugID+28) #endif -setMugEntry(NahMug, Nah_Garytop_F2EMugData, 3, 7, 3, 5) +setMugEntry(NahMug, NahMugData, 3, 7, 3, 5) ALIGN 4 -Noire_Garytop_F2EMugData: -#incbin "Dmp/Noire_Garytop_F2E_mug.dmp" -#incbin "Dmp/Noire_Garytop_F2E_frames.dmp" -#incbin "Dmp/Noire_Garytop_F2E_palette.dmp" -#incbin "Dmp/Noire_Garytop_F2E_minimug.dmp" +NoireMugData: +#incbin "png/FE13/Noire_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Noire_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Noire_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Noire_Garytop_F2E_minimug.dmp" #ifndef NoireMug #define NoireMug (FirstMugID+29) #endif -setMugEntry(NoireMug, Noire_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(NoireMug, NoireMugData, 3, 6, 3, 4) ALIGN 4 -Nowi_GarytopMugData: -#incbin "Dmp/Nowi_Garytop_mug.dmp" -#incbin "Dmp/Nowi_Garytop_frames.dmp" -#incbin "Dmp/Nowi_Garytop_palette.dmp" -#incbin "Dmp/Nowi_Garytop_minimug.dmp" +NowiMugData: +#incbin "png/FE13/Nowi_Garytop_mug.dmp" +#incbin "png/FE13/Nowi_Garytop_frames.dmp" +#incbin "png/FE13/Nowi_Garytop_palette.dmp" +#incbin "png/FE13/Nowi_Garytop_minimug.dmp" #ifndef NowiMug #define NowiMug (FirstMugID+30) #endif -setMugEntry(NowiMug, Nowi_GarytopMugData, 3, 7, 3, 5) +setMugEntry(NowiMug, NowiMugData, 3, 7, 3, 5) ALIGN 4 -Olivia_RedBean_F2EMugData: -#incbin "Dmp/Olivia_RedBean_F2E_mug.dmp" -#incbin "Dmp/Olivia_RedBean_F2E_frames.dmp" -#incbin "Dmp/Olivia_RedBean_F2E_palette.dmp" -#incbin "Dmp/Olivia_RedBean_F2E_minimug.dmp" +OliviaMugData: +#incbin "png/FE13/Olivia_RedBean_F2E_mug.dmp" +#incbin "png/FE13/Olivia_RedBean_F2E_frames.dmp" +#incbin "png/FE13/Olivia_RedBean_F2E_palette.dmp" +#incbin "png/FE13/Olivia_RedBean_F2E_minimug.dmp" #ifndef OliviaMug #define OliviaMug (FirstMugID+31) #endif -setMugEntry(OliviaMug, Olivia_RedBean_F2EMugData, 2, 6, 3, 4) +setMugEntry(OliviaMug, OliviaMugData, 2, 6, 3, 4) ALIGN 4 -Owain_BatimaTheBatMugData: -#incbin "Dmp/Owain_BatimaTheBat_mug.dmp" -#incbin "Dmp/Owain_BatimaTheBat_frames.dmp" -#incbin "Dmp/Owain_BatimaTheBat_palette.dmp" -#incbin "Dmp/Owain_BatimaTheBat_minimug.dmp" +OwainMugData: +#incbin "png/FE13/Owain_BatimaTheBat_mug.dmp" +#incbin "png/FE13/Owain_BatimaTheBat_frames.dmp" +#incbin "png/FE13/Owain_BatimaTheBat_palette.dmp" +#incbin "png/FE13/Owain_BatimaTheBat_minimug.dmp" #ifndef OwainMug #define OwainMug (FirstMugID+32) #endif -setMugEntry(OwainMug, Owain_BatimaTheBatMugData, 4, 6, 2, 4) +setMugEntry(OwainMug, OwainMugData, 4, 6, 2, 4) ALIGN 4 -Panne_Garytop_F2EMugData: -#incbin "Dmp/Panne_Garytop_F2E_mug.dmp" -#incbin "Dmp/Panne_Garytop_F2E_frames.dmp" -#incbin "Dmp/Panne_Garytop_F2E_palette.dmp" -#incbin "Dmp/Panne_Garytop_F2E_minimug.dmp" +PanneMugData: +#incbin "png/FE13/Panne_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Panne_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Panne_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Panne_Garytop_F2E_minimug.dmp" #ifndef PanneMug #define PanneMug (FirstMugID+33) #endif -setMugEntry(PanneMug, Panne_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(PanneMug, PanneMugData, 3, 5, 3, 3) ALIGN 4 -Priam_Version_2_Garytop_F2EMugData: -#incbin "Dmp/Priam_Version_2_Garytop_F2E_mug.dmp" -#incbin "Dmp/Priam_Version_2_Garytop_F2E_frames.dmp" -#incbin "Dmp/Priam_Version_2_Garytop_F2E_palette.dmp" -#incbin "Dmp/Priam_Version_2_Garytop_F2E_minimug.dmp" +PriamMugData: +#incbin "png/FE13/Priam_Version_2_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Priam_Version_2_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Priam_Version_2_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Priam_Version_2_Garytop_F2E_minimug.dmp" #ifndef PriamMug #define PriamMug (FirstMugID+34) #endif -setMugEntry(PriamMug, Priam_Version_2_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(PriamMug, PriamMugData, 3, 5, 3, 3) ALIGN 4 -Ricken_AteyMugData: -#incbin "Dmp/Ricken_Atey_mug.dmp" -#incbin "Dmp/Ricken_Atey_frames.dmp" -#incbin "Dmp/Ricken_Atey_palette.dmp" -#incbin "Dmp/Ricken_Atey_minimug.dmp" +RickenMugData: +#incbin "png/FE13/Ricken_Atey_mug.dmp" +#incbin "png/FE13/Ricken_Atey_frames.dmp" +#incbin "png/FE13/Ricken_Atey_palette.dmp" +#incbin "png/FE13/Ricken_Atey_minimug.dmp" #ifndef RickenMug #define RickenMug (FirstMugID+35) #endif -setMugEntry(RickenMug, Ricken_AteyMugData, 3, 6, 3, 4) +setMugEntry(RickenMug, RickenMugData, 3, 6, 3, 4) ALIGN 4 -Robin_Female_Lonkfromcalifornia_F2EMugData: -#incbin "Dmp/Robin_Female_Lonkfromcalifornia_F2E_mug.dmp" -#incbin "Dmp/Robin_Female_Lonkfromcalifornia_F2E_frames.dmp" -#incbin "Dmp/Robin_Female_Lonkfromcalifornia_F2E_palette.dmp" -#incbin "Dmp/Robin_Female_Lonkfromcalifornia_F2E_minimug.dmp" +RobinMugData: +#incbin "png/FE13/Robin_Female_Lonkfromcalifornia_F2E_mug.dmp" +#incbin "png/FE13/Robin_Female_Lonkfromcalifornia_F2E_frames.dmp" +#incbin "png/FE13/Robin_Female_Lonkfromcalifornia_F2E_palette.dmp" +#incbin "png/FE13/Robin_Female_Lonkfromcalifornia_F2E_minimug.dmp" #ifndef RobinMug #define RobinMug (FirstMugID+36) #endif -setMugEntry(RobinMug, Robin_Female_Lonkfromcalifornia_F2EMugData, 3, 5, 3, 3) +setMugEntry(RobinMug, RobinMugData, 3, 5, 3, 3) ALIGN 4 -Sayri_Obsidian_DaddyMugData: -#incbin "Dmp/Sayri_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Sayri_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Sayri_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Sayri_Obsidian_Daddy_minimug.dmp" +SayriMugData: +#incbin "png/FE13/Sayri_Obsidian_Daddy_mug.dmp" +#incbin "png/FE13/Sayri_Obsidian_Daddy_frames.dmp" +#incbin "png/FE13/Sayri_Obsidian_Daddy_palette.dmp" +#incbin "png/FE13/Sayri_Obsidian_Daddy_minimug.dmp" #ifndef SayriMug #define SayriMug (FirstMugID+37) #endif -setMugEntry(SayriMug, Sayri_Obsidian_DaddyMugData, 4, 6, 3, 4) +setMugEntry(SayriMug, SayriMugData, 4, 6, 3, 4) ALIGN 4 -Severa_Garytop_F2EMugData: -#incbin "Dmp/Severa_Garytop_F2E_mug.dmp" -#incbin "Dmp/Severa_Garytop_F2E_frames.dmp" -#incbin "Dmp/Severa_Garytop_F2E_palette.dmp" -#incbin "Dmp/Severa_Garytop_F2E_minimug.dmp" +SeveraMugData: +#incbin "png/FE13/Severa_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Severa_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Severa_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Severa_Garytop_F2E_minimug.dmp" #ifndef SeveraMug #define SeveraMug (FirstMugID+38) #endif -setMugEntry(SeveraMug, Severa_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(SeveraMug, SeveraMugData, 3, 6, 3, 4) ALIGN 4 -Stahl_Garytop_F2EMugData: -#incbin "Dmp/Stahl_Garytop_F2E_mug.dmp" -#incbin "Dmp/Stahl_Garytop_F2E_frames.dmp" -#incbin "Dmp/Stahl_Garytop_F2E_palette.dmp" -#incbin "Dmp/Stahl_Garytop_F2E_minimug.dmp" +StahlMugData: +#incbin "png/FE13/Stahl_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Stahl_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Stahl_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Stahl_Garytop_F2E_minimug.dmp" #ifndef StahlMug #define StahlMug (FirstMugID+39) #endif -setMugEntry(StahlMug, Stahl_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(StahlMug, StahlMugData, 2, 5, 2, 3) ALIGN 4 -Sully_Garytop_F2EMugData: -#incbin "Dmp/Sully_Garytop_F2E_mug.dmp" -#incbin "Dmp/Sully_Garytop_F2E_frames.dmp" -#incbin "Dmp/Sully_Garytop_F2E_palette.dmp" -#incbin "Dmp/Sully_Garytop_F2E_minimug.dmp" +SullyMugData: +#incbin "png/FE13/Sully_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Sully_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Sully_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Sully_Garytop_F2E_minimug.dmp" #ifndef SullyMug #define SullyMug (FirstMugID+40) #endif -setMugEntry(SullyMug, Sully_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(SullyMug, SullyMugData, 2, 5, 2, 3) ALIGN 4 -Sumia_BatimaTheBatMugData: -#incbin "Dmp/Sumia_BatimaTheBat_mug.dmp" -#incbin "Dmp/Sumia_BatimaTheBat_frames.dmp" -#incbin "Dmp/Sumia_BatimaTheBat_palette.dmp" -#incbin "Dmp/Sumia_BatimaTheBat_minimug.dmp" +SumiaMugData: +#incbin "png/FE13/Sumia_BatimaTheBat_mug.dmp" +#incbin "png/FE13/Sumia_BatimaTheBat_frames.dmp" +#incbin "png/FE13/Sumia_BatimaTheBat_palette.dmp" +#incbin "png/FE13/Sumia_BatimaTheBat_minimug.dmp" #ifndef SumiaMug #define SumiaMug (FirstMugID+41) #endif -setMugEntry(SumiaMug, Sumia_BatimaTheBatMugData, 2, 5, 2, 3) +setMugEntry(SumiaMug, SumiaMugData, 2, 5, 2, 3) ALIGN 4 -Tharja_Garytop_F2EMugData: -#incbin "Dmp/Tharja_Garytop_F2E_mug.dmp" -#incbin "Dmp/Tharja_Garytop_F2E_frames.dmp" -#incbin "Dmp/Tharja_Garytop_F2E_palette.dmp" -#incbin "Dmp/Tharja_Garytop_F2E_minimug.dmp" +TharjaMugData: +#incbin "png/FE13/Tharja_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Tharja_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Tharja_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Tharja_Garytop_F2E_minimug.dmp" #ifndef TharjaMug #define TharjaMug (FirstMugID+42) #endif -setMugEntry(TharjaMug, Tharja_Garytop_F2EMugData, 3, 5, 3, 4) +setMugEntry(TharjaMug, TharjaMugData, 3, 5, 3, 4) ALIGN 4 -Tiki_Adult_v2_BatimatheBatMugData: -#incbin "Dmp/Tiki_Adult_v2_BatimatheBat_mug.dmp" -#incbin "Dmp/Tiki_Adult_v2_BatimatheBat_frames.dmp" -#incbin "Dmp/Tiki_Adult_v2_BatimatheBat_palette.dmp" -#incbin "Dmp/Tiki_Adult_v2_BatimatheBat_minimug.dmp" -#ifndef TikiMug - #define TikiMug (FirstMugID+43) +TikiFE13MugData: +#incbin "png/FE13/TikiFE13_Adult_v2_BatimatheBat_mug.dmp" +#incbin "png/FE13/TikiFE13_Adult_v2_BatimatheBat_frames.dmp" +#incbin "png/FE13/TikiFE13_Adult_v2_BatimatheBat_palette.dmp" +#incbin "png/FE13/TikiFE13_Adult_v2_BatimatheBat_minimug.dmp" +#ifndef TikiFE13Mug + #define TikiFE13Mug (FirstMugID+43) #endif -setMugEntry(TikiMug, Tiki_Adult_v2_BatimatheBatMugData, 2, 6, 2, 4) +setMugEntry(TikiFE13Mug, TikiFE13MugData, 2, 6, 2, 4) ALIGN 4 -Vaike_Garytop_F2EMugData: -#incbin "Dmp/Vaike_Garytop_F2E_mug.dmp" -#incbin "Dmp/Vaike_Garytop_F2E_frames.dmp" -#incbin "Dmp/Vaike_Garytop_F2E_palette.dmp" -#incbin "Dmp/Vaike_Garytop_F2E_minimug.dmp" +VaikeMugData: +#incbin "png/FE13/Vaike_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Vaike_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Vaike_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Vaike_Garytop_F2E_minimug.dmp" #ifndef VaikeMug #define VaikeMug (FirstMugID+44) #endif -setMugEntry(VaikeMug, Vaike_Garytop_F2EMugData, 3, 4, 3, 2) +setMugEntry(VaikeMug, VaikeMugData, 3, 4, 3, 2) ALIGN 4 -Validar_Garytop_F2EMugData: -#incbin "Dmp/Validar_Garytop_F2E_mug.dmp" -#incbin "Dmp/Validar_Garytop_F2E_frames.dmp" -#incbin "Dmp/Validar_Garytop_F2E_palette.dmp" -#incbin "Dmp/Validar_Garytop_F2E_minimug.dmp" +ValidarMugData: +#incbin "png/FE13/Validar_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Validar_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Validar_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Validar_Garytop_F2E_minimug.dmp" #ifndef ValidarMug #define ValidarMug (FirstMugID+45) #endif -setMugEntry(ValidarMug, Validar_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(ValidarMug, ValidarMugData, 2, 5, 2, 3) ALIGN 4 -Virion_Garytop_F2EMugData: -#incbin "Dmp/Virion_Garytop_F2E_mug.dmp" -#incbin "Dmp/Virion_Garytop_F2E_frames.dmp" -#incbin "Dmp/Virion_Garytop_F2E_palette.dmp" -#incbin "Dmp/Virion_Garytop_F2E_minimug.dmp" +VirionMugData: +#incbin "png/FE13/Virion_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Virion_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Virion_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Virion_Garytop_F2E_minimug.dmp" #ifndef VirionMug #define VirionMug (FirstMugID+46) #endif -setMugEntry(VirionMug, Virion_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(VirionMug, VirionMugData, 3, 5, 3, 3) ALIGN 4 -Walhart_Garytop_F2EMugData: -#incbin "Dmp/Walhart_Garytop_F2E_mug.dmp" -#incbin "Dmp/Walhart_Garytop_F2E_frames.dmp" -#incbin "Dmp/Walhart_Garytop_F2E_palette.dmp" -#incbin "Dmp/Walhart_Garytop_F2E_minimug.dmp" +WalhartMugData: +#incbin "png/FE13/Walhart_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Walhart_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Walhart_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Walhart_Garytop_F2E_minimug.dmp" #ifndef WalhartMug #define WalhartMug (FirstMugID+47) #endif -setMugEntry(WalhartMug, Walhart_Garytop_F2EMugData, 2, 4, 2, 2) +setMugEntry(WalhartMug, WalhartMugData, 2, 4, 2, 2) ALIGN 4 -Yarne_Garytop_F2EMugData: -#incbin "Dmp/Yarne_Garytop_F2E_mug.dmp" -#incbin "Dmp/Yarne_Garytop_F2E_frames.dmp" -#incbin "Dmp/Yarne_Garytop_F2E_palette.dmp" -#incbin "Dmp/Yarne_Garytop_F2E_minimug.dmp" +YarneMugData: +#incbin "png/FE13/Yarne_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Yarne_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Yarne_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Yarne_Garytop_F2E_minimug.dmp" #ifndef YarneMug #define YarneMug (FirstMugID+48) #endif -setMugEntry(YarneMug, Yarne_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(YarneMug, YarneMugData, 2, 5, 2, 3) ALIGN 4 -Yenfay_Garytop_F2EMugData: -#incbin "Dmp/Yenfay_Garytop_F2E_mug.dmp" -#incbin "Dmp/Yenfay_Garytop_F2E_frames.dmp" -#incbin "Dmp/Yenfay_Garytop_F2E_palette.dmp" -#incbin "Dmp/Yenfay_Garytop_F2E_minimug.dmp" +YenfayMugData: +#incbin "png/FE13/Yenfay_Garytop_F2E_mug.dmp" +#incbin "png/FE13/Yenfay_Garytop_F2E_frames.dmp" +#incbin "png/FE13/Yenfay_Garytop_F2E_palette.dmp" +#incbin "png/FE13/Yenfay_Garytop_F2E_minimug.dmp" #ifndef YenfayMug #define YenfayMug (FirstMugID+49) #endif -setMugEntry(YenfayMug, Yenfay_Garytop_F2EMugData, 3, 4, 3, 2) +setMugEntry(YenfayMug, YenfayMugData, 3, 4, 3, 2) ALIGN 4 -ArthurFE14_SatoshiKuraMugData: -#incbin "Dmp/ArthurFE14_SatoshiKura_mug.dmp" -#incbin "Dmp/ArthurFE14_SatoshiKura_frames.dmp" -#incbin "Dmp/ArthurFE14_SatoshiKura_palette.dmp" -#incbin "Dmp/ArthurFE14_SatoshiKura_minimug.dmp" +ArthurFE14MugData: +#incbin "png/FE14/ArthurFE14_SatoshiKura_mug.dmp" +#incbin "png/FE14/ArthurFE14_SatoshiKura_frames.dmp" +#incbin "png/FE14/ArthurFE14_SatoshiKura_palette.dmp" +#incbin "png/FE14/ArthurFE14_SatoshiKura_minimug.dmp" #ifndef ArthurFE14Mug #define ArthurFE14Mug (FirstMugID+50) #endif -setMugEntry(ArthurFE14Mug, ArthurFE14_SatoshiKuraMugData, 3, 5, 3, 3) +setMugEntry(ArthurFE14Mug, ArthurFE14MugData, 3, 5, 3, 3) ALIGN 4 -Azura_BatimaTheBatMugData: -#incbin "Dmp/Azura_BatimaTheBat_mug.dmp" -#incbin "Dmp/Azura_BatimaTheBat_frames.dmp" -#incbin "Dmp/Azura_BatimaTheBat_palette.dmp" -#incbin "Dmp/Azura_BatimaTheBat_minimug.dmp" +AzuraMugData: +#incbin "png/FE14/Azura_BatimaTheBat_mug.dmp" +#incbin "png/FE14/Azura_BatimaTheBat_frames.dmp" +#incbin "png/FE14/Azura_BatimaTheBat_palette.dmp" +#incbin "png/FE14/Azura_BatimaTheBat_minimug.dmp" #ifndef AzuraMug #define AzuraMug (FirstMugID+51) #endif -setMugEntry(AzuraMug, Azura_BatimaTheBatMugData, 2, 5, 2, 3) +setMugEntry(AzuraMug, AzuraMugData, 2, 5, 2, 3) ALIGN 4 -Benny_JeyTheCount__F2EMugData: -#incbin "Dmp/Benny_JeyTheCount__F2E_mug.dmp" -#incbin "Dmp/Benny_JeyTheCount__F2E_frames.dmp" -#incbin "Dmp/Benny_JeyTheCount__F2E_palette.dmp" -#incbin "Dmp/Benny_JeyTheCount__F2E_minimug.dmp" +BennyMugData: +#incbin "png/FE14/Benny_JeyTheCount__F2E_mug.dmp" +#incbin "png/FE14/Benny_JeyTheCount__F2E_frames.dmp" +#incbin "png/FE14/Benny_JeyTheCount__F2E_palette.dmp" +#incbin "png/FE14/Benny_JeyTheCount__F2E_minimug.dmp" #ifndef BennyMug #define BennyMug (FirstMugID+52) #endif -setMugEntry(BennyMug, Benny_JeyTheCount__F2EMugData, 2, 5, 2, 3) +setMugEntry(BennyMug, BennyMugData, 2, 5, 2, 3) ALIGN 4 -Camilla_Jey_the_Count_F2EMugData: -#incbin "Dmp/Camilla_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Camilla_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Camilla_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Camilla_Jey_the_Count_F2E_minimug.dmp" +CamillaMugData: +#incbin "png/FE14/Camilla_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Camilla_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Camilla_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Camilla_Jey_the_Count_F2E_minimug.dmp" #ifndef CamillaMug #define CamillaMug (FirstMugID+53) #endif -setMugEntry(CamillaMug, Camilla_Jey_the_Count_F2EMugData, 2, 4, 4, 2) +setMugEntry(CamillaMug, CamillaMugData, 2, 4, 4, 2) ALIGN 4 -CorrinF_SomeDenseGuyMugData: -#incbin "Dmp/CorrinF_SomeDenseGuy_mug.dmp" -#incbin "Dmp/CorrinF_SomeDenseGuy_frames.dmp" -#incbin "Dmp/CorrinF_SomeDenseGuy_palette.dmp" -#incbin "Dmp/CorrinF_SomeDenseGuy_minimug.dmp" +CorrinFMugData: +#incbin "png/FE14/CorrinF_SomeDenseGuy_mug.dmp" +#incbin "png/FE14/CorrinF_SomeDenseGuy_frames.dmp" +#incbin "png/FE14/CorrinF_SomeDenseGuy_palette.dmp" +#incbin "png/FE14/CorrinF_SomeDenseGuy_minimug.dmp" #ifndef CorrinFMug #define CorrinFMug (FirstMugID+54) #endif -setMugEntry(CorrinFMug, CorrinF_SomeDenseGuyMugData, 3, 7, 3, 5) +setMugEntry(CorrinFMug, CorrinFMugData, 3, 7, 3, 5) ALIGN 4 -CorrinM_LenhMugData: -#incbin "Dmp/CorrinM_Lenh_mug.dmp" -#incbin "Dmp/CorrinM_Lenh_frames.dmp" -#incbin "Dmp/CorrinM_Lenh_palette.dmp" -#incbin "Dmp/CorrinM_Lenh_minimug.dmp" +CorrinMMugData: +#incbin "png/FE14/CorrinM_Lenh_mug.dmp" +#incbin "png/FE14/CorrinM_Lenh_frames.dmp" +#incbin "png/FE14/CorrinM_Lenh_palette.dmp" +#incbin "png/FE14/CorrinM_Lenh_minimug.dmp" #ifndef CorrinMMug #define CorrinMMug (FirstMugID+55) #endif -setMugEntry(CorrinMMug, CorrinM_LenhMugData, 2, 5, 2, 3) +setMugEntry(CorrinMMug, CorrinMMugData, 2, 5, 2, 3) ALIGN 4 -Effie_Jey_the_Count_F2EMugData: -#incbin "Dmp/Effie_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Effie_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Effie_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Effie_Jey_the_Count_F2E_minimug.dmp" +EffieMugData: +#incbin "png/FE14/Effie_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Effie_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Effie_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Effie_Jey_the_Count_F2E_minimug.dmp" #ifndef EffieMug #define EffieMug (FirstMugID+56) #endif -setMugEntry(EffieMug, Effie_Jey_the_Count_F2EMugData, 3, 5, 2, 3) +setMugEntry(EffieMug, EffieMugData, 3, 5, 2, 3) ALIGN 4 -Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2EMugData: -#incbin "Dmp/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_minimug.dmp" +EliseMugData: +#incbin "png/FE14/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2E_minimug.dmp" #ifndef EliseMug #define EliseMug (FirstMugID+57) #endif -setMugEntry(EliseMug, Elise_Vanilla_hair_double_ribbon_Jey_the_Count_F2EMugData, 3, 6, 3, 4) +setMugEntry(EliseMug, EliseMugData, 3, 6, 3, 4) ALIGN 4 -Felicia_Jey_the_Count_F2EMugData: -#incbin "Dmp/Felicia_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Felicia_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Felicia_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Felicia_Jey_the_Count_F2E_minimug.dmp" +FeliciaMugData: +#incbin "png/FE14/Felicia_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Felicia_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Felicia_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Felicia_Jey_the_Count_F2E_minimug.dmp" #ifndef FeliciaMug #define FeliciaMug (FirstMugID+58) #endif -setMugEntry(FeliciaMug, Felicia_Jey_the_Count_F2EMugData, 2, 6, 2, 4) +setMugEntry(FeliciaMug, FeliciaMugData, 2, 6, 2, 4) ALIGN 4 -Fuga_RenoudMugData: -#incbin "Dmp/Fuga_Renoud_mug.dmp" -#incbin "Dmp/Fuga_Renoud_frames.dmp" -#incbin "Dmp/Fuga_Renoud_palette.dmp" -#incbin "Dmp/Fuga_Renoud_minimug.dmp" +FugaMugData: +#incbin "png/FE14/Fuga_Renoud_mug.dmp" +#incbin "png/FE14/Fuga_Renoud_frames.dmp" +#incbin "png/FE14/Fuga_Renoud_palette.dmp" +#incbin "png/FE14/Fuga_Renoud_minimug.dmp" #ifndef FugaMug #define FugaMug (FirstMugID+59) #endif -setMugEntry(FugaMug, Fuga_RenoudMugData, 3, 4, 3, 2) +setMugEntry(FugaMug, FugaMugData, 3, 4, 3, 2) ALIGN 4 -Gunter_Sterling_GlovnerMugData: -#incbin "Dmp/Gunter_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Gunter_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Gunter_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Gunter_Sterling_Glovner_minimug.dmp" +GunterMugData: +#incbin "png/FE14/Gunter_Sterling_Glovner_mug.dmp" +#incbin "png/FE14/Gunter_Sterling_Glovner_frames.dmp" +#incbin "png/FE14/Gunter_Sterling_Glovner_palette.dmp" +#incbin "png/FE14/Gunter_Sterling_Glovner_minimug.dmp" #ifndef GunterMug #define GunterMug (FirstMugID+60) #endif -setMugEntry(GunterMug, Gunter_Sterling_GlovnerMugData, 2, 5, 2, 3) +setMugEntry(GunterMug, GunterMugData, 2, 5, 2, 3) ALIGN 4 -Hana_Jey_the_Count_F2EMugData: -#incbin "Dmp/Hana_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Hana_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Hana_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Hana_Jey_the_Count_F2E_minimug.dmp" +HanaMugData: +#incbin "png/FE14/Hana_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Hana_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Hana_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Hana_Jey_the_Count_F2E_minimug.dmp" #ifndef HanaMug #define HanaMug (FirstMugID+61) #endif -setMugEntry(HanaMug, Hana_Jey_the_Count_F2EMugData, 2, 6, 2, 4) +setMugEntry(HanaMug, HanaMugData, 2, 6, 2, 4) ALIGN 4 -Hinata_Sterling_GlovnerMugData: -#incbin "Dmp/Hinata_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Hinata_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Hinata_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Hinata_Sterling_Glovner_minimug.dmp" +HinataMugData: +#incbin "png/FE14/Hinata_Sterling_Glovner_mug.dmp" +#incbin "png/FE14/Hinata_Sterling_Glovner_frames.dmp" +#incbin "png/FE14/Hinata_Sterling_Glovner_palette.dmp" +#incbin "png/FE14/Hinata_Sterling_Glovner_minimug.dmp" #ifndef HinataMug #define HinataMug (FirstMugID+62) #endif -setMugEntry(HinataMug, Hinata_Sterling_GlovnerMugData, 2, 5, 2, 3) +setMugEntry(HinataMug, HinataMugData, 2, 5, 2, 3) ALIGN 4 -Hinoka_Garytop_F2EMugData: -#incbin "Dmp/Hinoka_Garytop_F2E_mug.dmp" -#incbin "Dmp/Hinoka_Garytop_F2E_frames.dmp" -#incbin "Dmp/Hinoka_Garytop_F2E_palette.dmp" -#incbin "Dmp/Hinoka_Garytop_F2E_minimug.dmp" +HinokaMugData: +#incbin "png/FE14/Hinoka_Garytop_F2E_mug.dmp" +#incbin "png/FE14/Hinoka_Garytop_F2E_frames.dmp" +#incbin "png/FE14/Hinoka_Garytop_F2E_palette.dmp" +#incbin "png/FE14/Hinoka_Garytop_F2E_minimug.dmp" #ifndef HinokaMug #define HinokaMug (FirstMugID+63) #endif -setMugEntry(HinokaMug, Hinoka_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(HinokaMug, HinokaMugData, 3, 6, 3, 4) ALIGN 4 -Hisame_RenoudMugData: -#incbin "Dmp/Hisame_Renoud_mug.dmp" -#incbin "Dmp/Hisame_Renoud_frames.dmp" -#incbin "Dmp/Hisame_Renoud_palette.dmp" -#incbin "Dmp/Hisame_Renoud_minimug.dmp" +HisameMugData: +#incbin "png/FE14/Hisame_Renoud_mug.dmp" +#incbin "png/FE14/Hisame_Renoud_frames.dmp" +#incbin "png/FE14/Hisame_Renoud_palette.dmp" +#incbin "png/FE14/Hisame_Renoud_minimug.dmp" #ifndef HisameMug #define HisameMug (FirstMugID+64) #endif -setMugEntry(HisameMug, Hisame_RenoudMugData, 3, 5, 3, 3) +setMugEntry(HisameMug, HisameMugData, 3, 5, 3, 3) ALIGN 4 -Ignatius_JeyTheCount_F2EMugData: -#incbin "Dmp/Ignatius_JeyTheCount_F2E_mug.dmp" -#incbin "Dmp/Ignatius_JeyTheCount_F2E_frames.dmp" -#incbin "Dmp/Ignatius_JeyTheCount_F2E_palette.dmp" -#incbin "Dmp/Ignatius_JeyTheCount_F2E_minimug.dmp" +IgnatiusMugData: +#incbin "png/FE14/Ignatius_JeyTheCount_F2E_mug.dmp" +#incbin "png/FE14/Ignatius_JeyTheCount_F2E_frames.dmp" +#incbin "png/FE14/Ignatius_JeyTheCount_F2E_palette.dmp" +#incbin "png/FE14/Ignatius_JeyTheCount_F2E_minimug.dmp" #ifndef IgnatiusMug #define IgnatiusMug (FirstMugID+65) #endif -setMugEntry(IgnatiusMug, Ignatius_JeyTheCount_F2EMugData, 3, 5, 2, 3) +setMugEntry(IgnatiusMug, IgnatiusMugData, 3, 5, 2, 3) ALIGN 4 -Jakob_JeyTheCount_F2EMugData: -#incbin "Dmp/Jakob_JeyTheCount_F2E_mug.dmp" -#incbin "Dmp/Jakob_JeyTheCount_F2E_frames.dmp" -#incbin "Dmp/Jakob_JeyTheCount_F2E_palette.dmp" -#incbin "Dmp/Jakob_JeyTheCount_F2E_minimug.dmp" +JakobMugData: +#incbin "png/FE14/Jakob_JeyTheCount_F2E_mug.dmp" +#incbin "png/FE14/Jakob_JeyTheCount_F2E_frames.dmp" +#incbin "png/FE14/Jakob_JeyTheCount_F2E_palette.dmp" +#incbin "png/FE14/Jakob_JeyTheCount_F2E_minimug.dmp" #ifndef JakobMug #define JakobMug (FirstMugID+66) #endif -setMugEntry(JakobMug, Jakob_JeyTheCount_F2EMugData, 2, 6, 2, 4) +setMugEntry(JakobMug, JakobMugData, 2, 6, 2, 4) ALIGN 4 -Kaden_VelvetKitsuneMugData: -#incbin "Dmp/Kaden_VelvetKitsune_mug.dmp" -#incbin "Dmp/Kaden_VelvetKitsune_frames.dmp" -#incbin "Dmp/Kaden_VelvetKitsune_palette.dmp" -#incbin "Dmp/Kaden_VelvetKitsune_minimug.dmp" +KadenMugData: +#incbin "png/FE14/Kaden_VelvetKitsune_mug.dmp" +#incbin "png/FE14/Kaden_VelvetKitsune_frames.dmp" +#incbin "png/FE14/Kaden_VelvetKitsune_palette.dmp" +#incbin "png/FE14/Kaden_VelvetKitsune_minimug.dmp" #ifndef KadenMug #define KadenMug (FirstMugID+67) #endif -setMugEntry(KadenMug, Kaden_VelvetKitsuneMugData, 2, 6, 2, 4) +setMugEntry(KadenMug, KadenMugData, 2, 6, 2, 4) ALIGN 4 -Kagero_NobodyMugData: -#incbin "Dmp/Kagero_Nobody_mug.dmp" -#incbin "Dmp/Kagero_Nobody_frames.dmp" -#incbin "Dmp/Kagero_Nobody_palette.dmp" -#incbin "Dmp/Kagero_Nobody_minimug.dmp" +KageroMugData: +#incbin "png/FE14/Kagero_Nobody_mug.dmp" +#incbin "png/FE14/Kagero_Nobody_frames.dmp" +#incbin "png/FE14/Kagero_Nobody_palette.dmp" +#incbin "png/FE14/Kagero_Nobody_minimug.dmp" #ifndef KageroMug #define KageroMug (FirstMugID+68) #endif -setMugEntry(KageroMug, Kagero_NobodyMugData, 4, 6, 4, 4) +setMugEntry(KageroMug, KageroMugData, 4, 6, 4, 4) ALIGN 4 -KanaF_Sterling_GlovnerMugData: -#incbin "Dmp/KanaF_Sterling_Glovner_mug.dmp" -#incbin "Dmp/KanaF_Sterling_Glovner_frames.dmp" -#incbin "Dmp/KanaF_Sterling_Glovner_palette.dmp" -#incbin "Dmp/KanaF_Sterling_Glovner_minimug.dmp" +KanaFMugData: +#incbin "png/FE14/KanaF_Sterling_Glovner_mug.dmp" +#incbin "png/FE14/KanaF_Sterling_Glovner_frames.dmp" +#incbin "png/FE14/KanaF_Sterling_Glovner_palette.dmp" +#incbin "png/FE14/KanaF_Sterling_Glovner_minimug.dmp" #ifndef KanaFMug #define KanaFMug (FirstMugID+69) #endif -setMugEntry(KanaFMug, KanaF_Sterling_GlovnerMugData, 3, 6, 3, 4) +setMugEntry(KanaFMug, KanaFMugData, 3, 6, 3, 4) ALIGN 4 -Kiragi_Sterling_GlovnerMugData: -#incbin "Dmp/Kiragi_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Kiragi_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Kiragi_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Kiragi_Sterling_Glovner_minimug.dmp" +KiragiMugData: +#incbin "png/FE14/Kiragi_Sterling_Glovner_mug.dmp" +#incbin "png/FE14/Kiragi_Sterling_Glovner_frames.dmp" +#incbin "png/FE14/Kiragi_Sterling_Glovner_palette.dmp" +#incbin "png/FE14/Kiragi_Sterling_Glovner_minimug.dmp" #ifndef KiragiMug #define KiragiMug (FirstMugID+70) #endif -setMugEntry(KiragiMug, Kiragi_Sterling_GlovnerMugData, 3, 6, 3, 4) +setMugEntry(KiragiMug, KiragiMugData, 3, 6, 3, 4) ALIGN 4 -Laslow_BatimaTheBatMugData: -#incbin "Dmp/Laslow_BatimaTheBat_mug.dmp" -#incbin "Dmp/Laslow_BatimaTheBat_frames.dmp" -#incbin "Dmp/Laslow_BatimaTheBat_palette.dmp" -#incbin "Dmp/Laslow_BatimaTheBat_minimug.dmp" +LaslowMugData: +#incbin "png/FE14/Laslow_BatimaTheBat_mug.dmp" +#incbin "png/FE14/Laslow_BatimaTheBat_frames.dmp" +#incbin "png/FE14/Laslow_BatimaTheBat_palette.dmp" +#incbin "png/FE14/Laslow_BatimaTheBat_minimug.dmp" #ifndef LaslowMug #define LaslowMug (FirstMugID+71) #endif -setMugEntry(LaslowMug, Laslow_BatimaTheBatMugData, 2, 5, 2, 3) +setMugEntry(LaslowMug, LaslowMugData, 2, 5, 2, 3) ALIGN 4 -Leo_GlaceoMugData: -#incbin "Dmp/Leo_Glaceo_mug.dmp" -#incbin "Dmp/Leo_Glaceo_frames.dmp" -#incbin "Dmp/Leo_Glaceo_palette.dmp" -#incbin "Dmp/Leo_Glaceo_minimug.dmp" +LeoMugData: +#incbin "png/FE14/Leo_Glaceo_mug.dmp" +#incbin "png/FE14/Leo_Glaceo_frames.dmp" +#incbin "png/FE14/Leo_Glaceo_palette.dmp" +#incbin "png/FE14/Leo_Glaceo_minimug.dmp" #ifndef LeoMug #define LeoMug (FirstMugID+72) #endif -setMugEntry(LeoMug, Leo_GlaceoMugData, 3, 5, 3, 3) +setMugEntry(LeoMug, LeoMugData, 3, 5, 3, 3) ALIGN 4 -Midori_NobodyMugData: -#incbin "Dmp/Midori_Nobody_mug.dmp" -#incbin "Dmp/Midori_Nobody_frames.dmp" -#incbin "Dmp/Midori_Nobody_palette.dmp" -#incbin "Dmp/Midori_Nobody_minimug.dmp" +MidoriMugData: +#incbin "png/FE14/Midori_Nobody_mug.dmp" +#incbin "png/FE14/Midori_Nobody_frames.dmp" +#incbin "png/FE14/Midori_Nobody_palette.dmp" +#incbin "png/FE14/Midori_Nobody_minimug.dmp" #ifndef MidoriMug #define MidoriMug (FirstMugID+73) #endif -setMugEntry(MidoriMug, Midori_NobodyMugData, 2, 6, 3, 4) +setMugEntry(MidoriMug, MidoriMugData, 2, 6, 3, 4) ALIGN 4 -Mikoto_FenrielMugData: -#incbin "Dmp/Mikoto_Fenriel_mug.dmp" -#incbin "Dmp/Mikoto_Fenriel_frames.dmp" -#incbin "Dmp/Mikoto_Fenriel_palette.dmp" -#incbin "Dmp/Mikoto_Fenriel_minimug.dmp" +MikotoMugData: +#incbin "png/FE14/Mikoto_Fenriel_mug.dmp" +#incbin "png/FE14/Mikoto_Fenriel_frames.dmp" +#incbin "png/FE14/Mikoto_Fenriel_palette.dmp" +#incbin "png/FE14/Mikoto_Fenriel_minimug.dmp" #ifndef MikotoMug #define MikotoMug (FirstMugID+74) #endif -setMugEntry(MikotoMug, Mikoto_FenrielMugData, 2, 6, 2, 4) +setMugEntry(MikotoMug, MikotoMugData, 2, 6, 2, 4) ALIGN 4 -Mitama_Sterling_GlovnerMugData: -#incbin "Dmp/Mitama_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Mitama_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Mitama_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Mitama_Sterling_Glovner_minimug.dmp" +MitamaMugData: +#incbin "png/FE14/Mitama_Sterling_Glovner_mug.dmp" +#incbin "png/FE14/Mitama_Sterling_Glovner_frames.dmp" +#incbin "png/FE14/Mitama_Sterling_Glovner_palette.dmp" +#incbin "png/FE14/Mitama_Sterling_Glovner_minimug.dmp" #ifndef MitamaMug #define MitamaMug (FirstMugID+75) #endif -setMugEntry(MitamaMug, Mitama_Sterling_GlovnerMugData, 3, 6, 3, 4) +setMugEntry(MitamaMug, MitamaMugData, 3, 6, 3, 4) ALIGN 4 -Mozu_NobodyMugData: -#incbin "Dmp/Mozu_Nobody_mug.dmp" -#incbin "Dmp/Mozu_Nobody_frames.dmp" -#incbin "Dmp/Mozu_Nobody_palette.dmp" -#incbin "Dmp/Mozu_Nobody_minimug.dmp" +MozuMugData: +#incbin "png/FE14/Mozu_Nobody_mug.dmp" +#incbin "png/FE14/Mozu_Nobody_frames.dmp" +#incbin "png/FE14/Mozu_Nobody_palette.dmp" +#incbin "png/FE14/Mozu_Nobody_minimug.dmp" #ifndef MozuMug #define MozuMug (FirstMugID+76) #endif -setMugEntry(MozuMug, Mozu_NobodyMugData, 3, 7, 4, 5) +setMugEntry(MozuMug, MozuMugData, 3, 7, 4, 5) ALIGN 4 -Nina_Jey_the_Count_F2EMugData: -#incbin "Dmp/Nina_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Nina_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Nina_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Nina_Jey_the_Count_F2E_minimug.dmp" +NinaMugData: +#incbin "png/FE14/Nina_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Nina_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Nina_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Nina_Jey_the_Count_F2E_minimug.dmp" #ifndef NinaMug #define NinaMug (FirstMugID+77) #endif -setMugEntry(NinaMug, Nina_Jey_the_Count_F2EMugData, 2, 6, 3, 4) +setMugEntry(NinaMug, NinaMugData, 2, 6, 3, 4) ALIGN 4 -Nyx_NobodyMugData: -#incbin "Dmp/Nyx_Nobody_mug.dmp" -#incbin "Dmp/Nyx_Nobody_frames.dmp" -#incbin "Dmp/Nyx_Nobody_palette.dmp" -#incbin "Dmp/Nyx_Nobody_minimug.dmp" +NyxMugData: +#incbin "png/FE14/Nyx_Nobody_mug.dmp" +#incbin "png/FE14/Nyx_Nobody_frames.dmp" +#incbin "png/FE14/Nyx_Nobody_palette.dmp" +#incbin "png/FE14/Nyx_Nobody_minimug.dmp" #ifndef NyxMug #define NyxMug (FirstMugID+78) #endif -setMugEntry(NyxMug, Nyx_NobodyMugData, 3, 5, 3, 3) +setMugEntry(NyxMug, NyxMugData, 3, 5, 3, 3) ALIGN 4 -Oboro_AteyMugData: -#incbin "Dmp/Oboro_Atey_mug.dmp" -#incbin "Dmp/Oboro_Atey_frames.dmp" -#incbin "Dmp/Oboro_Atey_palette.dmp" -#incbin "Dmp/Oboro_Atey_minimug.dmp" +OboroMugData: +#incbin "png/FE14/Oboro_Atey_mug.dmp" +#incbin "png/FE14/Oboro_Atey_frames.dmp" +#incbin "png/FE14/Oboro_Atey_palette.dmp" +#incbin "png/FE14/Oboro_Atey_minimug.dmp" #ifndef OboroMug #define OboroMug (FirstMugID+79) #endif -setMugEntry(OboroMug, Oboro_AteyMugData, 3, 6, 3, 4) +setMugEntry(OboroMug, OboroMugData, 3, 6, 3, 4) ALIGN 4 -Peri_Jey_The_Count_F2EMugData: -#incbin "Dmp/Peri_Jey_The_Count_F2E_mug.dmp" -#incbin "Dmp/Peri_Jey_The_Count_F2E_frames.dmp" -#incbin "Dmp/Peri_Jey_The_Count_F2E_palette.dmp" -#incbin "Dmp/Peri_Jey_The_Count_F2E_minimug.dmp" +PeriMugData: +#incbin "png/FE14/Peri_Jey_The_Count_F2E_mug.dmp" +#incbin "png/FE14/Peri_Jey_The_Count_F2E_frames.dmp" +#incbin "png/FE14/Peri_Jey_The_Count_F2E_palette.dmp" +#incbin "png/FE14/Peri_Jey_The_Count_F2E_minimug.dmp" #ifndef PeriMug #define PeriMug (FirstMugID+80) #endif -setMugEntry(PeriMug, Peri_Jey_The_Count_F2EMugData, 2, 5, 3, 3) +setMugEntry(PeriMug, PeriMugData, 2, 5, 3, 3) ALIGN 4 -Rinkah_Jey_the_Count_F2EMugData: -#incbin "Dmp/Rinkah_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Rinkah_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Rinkah_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Rinkah_Jey_the_Count_F2E_minimug.dmp" +RinkahMugData: +#incbin "png/FE14/Rinkah_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Rinkah_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Rinkah_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Rinkah_Jey_the_Count_F2E_minimug.dmp" #ifndef RinkahMug #define RinkahMug (FirstMugID+81) #endif -setMugEntry(RinkahMug, Rinkah_Jey_the_Count_F2EMugData, 2, 5, 2, 4) +setMugEntry(RinkahMug, RinkahMugData, 2, 5, 2, 4) ALIGN 4 -Ryoma_Version_2_Garytop_F2EMugData: -#incbin "Dmp/Ryoma_Version_2_Garytop_F2E_mug.dmp" -#incbin "Dmp/Ryoma_Version_2_Garytop_F2E_frames.dmp" -#incbin "Dmp/Ryoma_Version_2_Garytop_F2E_palette.dmp" -#incbin "Dmp/Ryoma_Version_2_Garytop_F2E_minimug.dmp" +RyomaMugData: +#incbin "png/FE14/Ryoma_Version_2_Garytop_F2E_mug.dmp" +#incbin "png/FE14/Ryoma_Version_2_Garytop_F2E_frames.dmp" +#incbin "png/FE14/Ryoma_Version_2_Garytop_F2E_palette.dmp" +#incbin "png/FE14/Ryoma_Version_2_Garytop_F2E_minimug.dmp" #ifndef RyomaMug #define RyomaMug (FirstMugID+82) #endif -setMugEntry(RyomaMug, Ryoma_Version_2_Garytop_F2EMugData, 2, 5, 2, 3) +setMugEntry(RyomaMug, RyomaMugData, 2, 5, 2, 3) ALIGN 4 -Sakura_hand_FenrielMugData: -#incbin "Dmp/Sakura_hand_Fenriel_mug.dmp" -#incbin "Dmp/Sakura_hand_Fenriel_frames.dmp" -#incbin "Dmp/Sakura_hand_Fenriel_palette.dmp" -#incbin "Dmp/Sakura_hand_Fenriel_minimug.dmp" +SakuraMugData: +#incbin "png/FE14/Sakura_hand_Fenriel_mug.dmp" +#incbin "png/FE14/Sakura_hand_Fenriel_frames.dmp" +#incbin "png/FE14/Sakura_hand_Fenriel_palette.dmp" +#incbin "png/FE14/Sakura_hand_Fenriel_minimug.dmp" #ifndef SakuraMug #define SakuraMug (FirstMugID+83) #endif -setMugEntry(SakuraMug, Sakura_hand_FenrielMugData, 4, 6, 4, 4) +setMugEntry(SakuraMug, SakuraMugData, 4, 6, 4, 4) ALIGN 4 -Scarlet_Jey_the_Count_F2EMugData: -#incbin "Dmp/Scarlet_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Scarlet_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Scarlet_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Scarlet_Jey_the_Count_F2E_minimug.dmp" +ScarletMugData: +#incbin "png/FE14/Scarlet_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Scarlet_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Scarlet_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Scarlet_Jey_the_Count_F2E_minimug.dmp" #ifndef ScarletMug #define ScarletMug (FirstMugID+84) #endif -setMugEntry(ScarletMug, Scarlet_Jey_the_Count_F2EMugData, 2, 6, 2, 4) +setMugEntry(ScarletMug, ScarletMugData, 2, 6, 2, 4) ALIGN 4 -Selkie_Sterling_GlovnerMugData: -#incbin "Dmp/Selkie_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Selkie_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Selkie_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Selkie_Sterling_Glovner_minimug.dmp" +SelkieMugData: +#incbin "png/FE14/Selkie_Sterling_Glovner_mug.dmp" +#incbin "png/FE14/Selkie_Sterling_Glovner_frames.dmp" +#incbin "png/FE14/Selkie_Sterling_Glovner_palette.dmp" +#incbin "png/FE14/Selkie_Sterling_Glovner_minimug.dmp" #ifndef SelkieMug #define SelkieMug (FirstMugID+85) #endif -setMugEntry(SelkieMug, Selkie_Sterling_GlovnerMugData, 3, 6, 3, 4) +setMugEntry(SelkieMug, SelkieMugData, 3, 6, 3, 4) ALIGN 4 -Setsuna_ThePontusAnderssonMugData: -#incbin "Dmp/Setsuna_ThePontusAndersson_mug.dmp" -#incbin "Dmp/Setsuna_ThePontusAndersson_frames.dmp" -#incbin "Dmp/Setsuna_ThePontusAndersson_palette.dmp" -#incbin "Dmp/Setsuna_ThePontusAndersson_minimug.dmp" +SetsunaMugData: +#incbin "png/FE14/Setsuna_ThePontusAndersson_mug.dmp" +#incbin "png/FE14/Setsuna_ThePontusAndersson_frames.dmp" +#incbin "png/FE14/Setsuna_ThePontusAndersson_palette.dmp" +#incbin "png/FE14/Setsuna_ThePontusAndersson_minimug.dmp" #ifndef SetsunaMug #define SetsunaMug (FirstMugID+86) #endif -setMugEntry(SetsunaMug, Setsuna_ThePontusAnderssonMugData, 2, 6, 3, 4) +setMugEntry(SetsunaMug, SetsunaMugData, 2, 6, 3, 4) ALIGN 4 -Shigure_LenhMugData: -#incbin "Dmp/Shigure_Lenh_mug.dmp" -#incbin "Dmp/Shigure_Lenh_frames.dmp" -#incbin "Dmp/Shigure_Lenh_palette.dmp" -#incbin "Dmp/Shigure_Lenh_minimug.dmp" +ShigureMugData: +#incbin "png/FE14/Shigure_Lenh_mug.dmp" +#incbin "png/FE14/Shigure_Lenh_frames.dmp" +#incbin "png/FE14/Shigure_Lenh_palette.dmp" +#incbin "png/FE14/Shigure_Lenh_minimug.dmp" #ifndef ShigureMug #define ShigureMug (FirstMugID+87) #endif -setMugEntry(ShigureMug, Shigure_LenhMugData, 4, 5, 4, 3) +setMugEntry(ShigureMug, ShigureMugData, 4, 5, 4, 3) ALIGN 4 -Shura_CardcafeMugData: -#incbin "Dmp/Shura_Cardcafe_mug.dmp" -#incbin "Dmp/Shura_Cardcafe_frames.dmp" -#incbin "Dmp/Shura_Cardcafe_palette.dmp" -#incbin "Dmp/Shura_Cardcafe_minimug.dmp" +ShuraMugData: +#incbin "png/FE14/Shura_Cardcafe_mug.dmp" +#incbin "png/FE14/Shura_Cardcafe_frames.dmp" +#incbin "png/FE14/Shura_Cardcafe_palette.dmp" +#incbin "png/FE14/Shura_Cardcafe_minimug.dmp" #ifndef ShuraMug #define ShuraMug (FirstMugID+88) #endif -setMugEntry(ShuraMug, Shura_CardcafeMugData, 3, 6, 3, 4) +setMugEntry(ShuraMug, ShuraMugData, 3, 6, 3, 4) ALIGN 4 -Silas_Jey_the_Count_F2EMugData: -#incbin "Dmp/Silas_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/Silas_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/Silas_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/Silas_Jey_the_Count_F2E_minimug.dmp" +SilasMugData: +#incbin "png/FE14/Silas_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE14/Silas_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE14/Silas_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE14/Silas_Jey_the_Count_F2E_minimug.dmp" #ifndef SilasMug #define SilasMug (FirstMugID+89) #endif -setMugEntry(SilasMug, Silas_Jey_the_Count_F2EMugData, 2, 5, 2, 3) +setMugEntry(SilasMug, SilasMugData, 2, 5, 2, 3) ALIGN 4 -Soleil_ZoruaMugData: -#incbin "Dmp/Soleil_Zorua_mug.dmp" -#incbin "Dmp/Soleil_Zorua_frames.dmp" -#incbin "Dmp/Soleil_Zorua_palette.dmp" -#incbin "Dmp/Soleil_Zorua_minimug.dmp" +SoleilMugData: +#incbin "png/FE14/Soleil_Zorua_mug.dmp" +#incbin "png/FE14/Soleil_Zorua_frames.dmp" +#incbin "png/FE14/Soleil_Zorua_palette.dmp" +#incbin "png/FE14/Soleil_Zorua_minimug.dmp" #ifndef SoleilMug #define SoleilMug (FirstMugID+90) #endif -setMugEntry(SoleilMug, Soleil_ZoruaMugData, 2, 6, 3, 4) +setMugEntry(SoleilMug, SoleilMugData, 2, 6, 3, 4) ALIGN 4 -Sophie_Sterling_GlovnerMugData: -#incbin "Dmp/Sophie_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Sophie_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Sophie_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Sophie_Sterling_Glovner_minimug.dmp" +SophieMugData: +#incbin "png/FE14/Sophie_Sterling_Glovner_mug.dmp" +#incbin "png/FE14/Sophie_Sterling_Glovner_frames.dmp" +#incbin "png/FE14/Sophie_Sterling_Glovner_palette.dmp" +#incbin "png/FE14/Sophie_Sterling_Glovner_minimug.dmp" #ifndef SophieMug #define SophieMug (FirstMugID+91) #endif -setMugEntry(SophieMug, Sophie_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(SophieMug, SophieMugData, 3, 5, 3, 3) ALIGN 4 -Subaki_BladeMugData: -#incbin "Dmp/Subaki_Blade_mug.dmp" -#incbin "Dmp/Subaki_Blade_frames.dmp" -#incbin "Dmp/Subaki_Blade_palette.dmp" -#incbin "Dmp/Subaki_Blade_minimug.dmp" +SubakiMugData: +#incbin "png/FE14/Subaki_Blade_mug.dmp" +#incbin "png/FE14/Subaki_Blade_frames.dmp" +#incbin "png/FE14/Subaki_Blade_palette.dmp" +#incbin "png/FE14/Subaki_Blade_minimug.dmp" #ifndef SubakiMug #define SubakiMug (FirstMugID+92) #endif -setMugEntry(SubakiMug, Subaki_BladeMugData, 2, 5, 3, 3) +setMugEntry(SubakiMug, SubakiMugData, 2, 5, 3, 3) ALIGN 4 -Takumi_FenrielMugData: -#incbin "Dmp/Takumi_Fenriel_mug.dmp" -#incbin "Dmp/Takumi_Fenriel_frames.dmp" -#incbin "Dmp/Takumi_Fenriel_palette.dmp" -#incbin "Dmp/Takumi_Fenriel_minimug.dmp" +TakumiMugData: +#incbin "png/FE14/Takumi_Fenriel_mug.dmp" +#incbin "png/FE14/Takumi_Fenriel_frames.dmp" +#incbin "png/FE14/Takumi_Fenriel_palette.dmp" +#incbin "png/FE14/Takumi_Fenriel_minimug.dmp" #ifndef TakumiMug #define TakumiMug (FirstMugID+93) #endif -setMugEntry(TakumiMug, Takumi_FenrielMugData, 3, 6, 3, 4) +setMugEntry(TakumiMug, TakumiMugData, 3, 6, 3, 4) ALIGN 4 -Xander_Garytop_F2EMugData: -#incbin "Dmp/Xander_Garytop_F2E_mug.dmp" -#incbin "Dmp/Xander_Garytop_F2E_frames.dmp" -#incbin "Dmp/Xander_Garytop_F2E_palette.dmp" -#incbin "Dmp/Xander_Garytop_F2E_minimug.dmp" +XanderMugData: +#incbin "png/FE14/Xander_Garytop_F2E_mug.dmp" +#incbin "png/FE14/Xander_Garytop_F2E_frames.dmp" +#incbin "png/FE14/Xander_Garytop_F2E_palette.dmp" +#incbin "png/FE14/Xander_Garytop_F2E_minimug.dmp" #ifndef XanderMug #define XanderMug (FirstMugID+94) #endif -setMugEntry(XanderMug, Xander_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(XanderMug, XanderMugData, 3, 5, 3, 3) ALIGN 4 -Alois_UltraxBladeMugData: -#incbin "Dmp/Alois_UltraxBlade_mug.dmp" -#incbin "Dmp/Alois_UltraxBlade_frames.dmp" -#incbin "Dmp/Alois_UltraxBlade_palette.dmp" -#incbin "Dmp/Alois_UltraxBlade_minimug.dmp" +AloisMugData: +#incbin "png/FE16/Alois_UltraxBlade_mug.dmp" +#incbin "png/FE16/Alois_UltraxBlade_frames.dmp" +#incbin "png/FE16/Alois_UltraxBlade_palette.dmp" +#incbin "png/FE16/Alois_UltraxBlade_minimug.dmp" #ifndef AloisMug #define AloisMug (FirstMugID+95) #endif -setMugEntry(AloisMug, Alois_UltraxBladeMugData, 2, 5, 3, 3) +setMugEntry(AloisMug, AloisMugData, 2, 5, 3, 3) ALIGN 4 -Annette_YasakoMugData: -#incbin "Dmp/Annette_Yasako_mug.dmp" -#incbin "Dmp/Annette_Yasako_frames.dmp" -#incbin "Dmp/Annette_Yasako_palette.dmp" -#incbin "Dmp/Annette_Yasako_minimug.dmp" +AnnetteMugData: +#incbin "png/FE16/Annette_Yasako_mug.dmp" +#incbin "png/FE16/Annette_Yasako_frames.dmp" +#incbin "png/FE16/Annette_Yasako_palette.dmp" +#incbin "png/FE16/Annette_Yasako_minimug.dmp" #ifndef AnnetteMug #define AnnetteMug (FirstMugID+96) #endif -setMugEntry(AnnetteMug, Annette_YasakoMugData, 3, 5, 3, 3) +setMugEntry(AnnetteMug, AnnetteMugData, 3, 5, 3, 3) ALIGN 4 -Bernadetta_Garytop_F2EMugData: -#incbin "Dmp/Bernadetta_Garytop_F2E_mug.dmp" -#incbin "Dmp/Bernadetta_Garytop_F2E_frames.dmp" -#incbin "Dmp/Bernadetta_Garytop_F2E_palette.dmp" -#incbin "Dmp/Bernadetta_Garytop_F2E_minimug.dmp" +BernadettaMugData: +#incbin "png/FE16/Bernadetta_Garytop_F2E_mug.dmp" +#incbin "png/FE16/Bernadetta_Garytop_F2E_frames.dmp" +#incbin "png/FE16/Bernadetta_Garytop_F2E_palette.dmp" +#incbin "png/FE16/Bernadetta_Garytop_F2E_minimug.dmp" #ifndef BernadettaMug #define BernadettaMug (FirstMugID+97) #endif -setMugEntry(BernadettaMug, Bernadetta_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(BernadettaMug, BernadettaMugData, 3, 6, 3, 4) ALIGN 4 -BylethM_Sterling_GlovnerMugData: -#incbin "Dmp/BylethM_Sterling_Glovner_mug.dmp" -#incbin "Dmp/BylethM_Sterling_Glovner_frames.dmp" -#incbin "Dmp/BylethM_Sterling_Glovner_palette.dmp" -#incbin "Dmp/BylethM_Sterling_Glovner_minimug.dmp" +BylethMMugData: +#incbin "png/FE16/BylethM_Sterling_Glovner_mug.dmp" +#incbin "png/FE16/BylethM_Sterling_Glovner_frames.dmp" +#incbin "png/FE16/BylethM_Sterling_Glovner_palette.dmp" +#incbin "png/FE16/BylethM_Sterling_Glovner_minimug.dmp" #ifndef BylethMMug #define BylethMMug (FirstMugID+98) #endif -setMugEntry(BylethMMug, BylethM_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(BylethMMug, BylethMMugData, 3, 5, 3, 3) ALIGN 4 -Catherine_Garytop_F2EMugData: -#incbin "Dmp/Catherine_Garytop_F2E_mug.dmp" -#incbin "Dmp/Catherine_Garytop_F2E_frames.dmp" -#incbin "Dmp/Catherine_Garytop_F2E_palette.dmp" -#incbin "Dmp/Catherine_Garytop_F2E_minimug.dmp" +CatherineMugData: +#incbin "png/FE16/Catherine_Garytop_F2E_mug.dmp" +#incbin "png/FE16/Catherine_Garytop_F2E_frames.dmp" +#incbin "png/FE16/Catherine_Garytop_F2E_palette.dmp" +#incbin "png/FE16/Catherine_Garytop_F2E_minimug.dmp" #ifndef CatherineMug #define CatherineMug (FirstMugID+99) #endif -setMugEntry(CatherineMug, Catherine_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(CatherineMug, CatherineMugData, 3, 5, 3, 3) ALIGN 4 -ClaudeFE16_Melia_CranJamMugData: -#incbin "Dmp/ClaudeFE16_Melia_CranJam_mug.dmp" -#incbin "Dmp/ClaudeFE16_Melia_CranJam_frames.dmp" -#incbin "Dmp/ClaudeFE16_Melia_CranJam_palette.dmp" -#incbin "Dmp/ClaudeFE16_Melia_CranJam_minimug.dmp" +ClaudeFE16MugData: +#incbin "png/FE16/ClaudeFE16_Melia_CranJam_mug.dmp" +#incbin "png/FE16/ClaudeFE16_Melia_CranJam_frames.dmp" +#incbin "png/FE16/ClaudeFE16_Melia_CranJam_palette.dmp" +#incbin "png/FE16/ClaudeFE16_Melia_CranJam_minimug.dmp" #ifndef ClaudeFE16Mug #define ClaudeFE16Mug (FirstMugID+100) #endif -setMugEntry(ClaudeFE16Mug, ClaudeFE16_Melia_CranJamMugData, 2, 5, 2, 3) +setMugEntry(ClaudeFE16Mug, ClaudeFE16MugData, 2, 5, 2, 3) ALIGN 4 -Dimitri_MeliaMugData: -#incbin "Dmp/Dimitri_Melia_mug.dmp" -#incbin "Dmp/Dimitri_Melia_frames.dmp" -#incbin "Dmp/Dimitri_Melia_palette.dmp" -#incbin "Dmp/Dimitri_Melia_minimug.dmp" +DimitriMugData: +#incbin "png/FE16/Dimitri_Melia_mug.dmp" +#incbin "png/FE16/Dimitri_Melia_frames.dmp" +#incbin "png/FE16/Dimitri_Melia_palette.dmp" +#incbin "png/FE16/Dimitri_Melia_minimug.dmp" #ifndef DimitriMug #define DimitriMug (FirstMugID+101) #endif -setMugEntry(DimitriMug, Dimitri_MeliaMugData, 2, 5, 2, 3) +setMugEntry(DimitriMug, DimitriMugData, 2, 5, 2, 3) ALIGN 4 -Edelgard_Emotion_1_Redbean_F2EMugData: -#incbin "Dmp/Edelgard_Emotion_1_Redbean_F2E_mug.dmp" -#incbin "Dmp/Edelgard_Emotion_1_Redbean_F2E_frames.dmp" -#incbin "Dmp/Edelgard_Emotion_1_Redbean_F2E_palette.dmp" -#incbin "Dmp/Edelgard_Emotion_1_Redbean_F2E_minimug.dmp" +EdelgardMugData: +#incbin "png/FE16/Edelgard_Emotion_1_Redbean_F2E_mug.dmp" +#incbin "png/FE16/Edelgard_Emotion_1_Redbean_F2E_frames.dmp" +#incbin "png/FE16/Edelgard_Emotion_1_Redbean_F2E_palette.dmp" +#incbin "png/FE16/Edelgard_Emotion_1_Redbean_F2E_minimug.dmp" #ifndef EdelgardMug #define EdelgardMug (FirstMugID+102) #endif -setMugEntry(EdelgardMug, Edelgard_Emotion_1_Redbean_F2EMugData, 3, 5, 3, 3) +setMugEntry(EdelgardMug, EdelgardMugData, 3, 5, 3, 3) + +ALIGN 4 +FelixMugData: +#incbin "png/FE16/Felix_Melia_Renoud_mug.dmp" +#incbin "png/FE16/Felix_Melia_Renoud_frames.dmp" +#incbin "png/FE16/Felix_Melia_Renoud_palette.dmp" +#incbin "png/FE16/Felix_Melia_Renoud_minimug.dmp" +#ifndef FelixMug + #define FelixMug (FirstMugID+103) +#endif +setMugEntry(FelixMug, FelixMugData, 3, 5, 3, 3) ALIGN 4 -Ferdinand_MeatOfJusticeMugData: -#incbin "Dmp/Ferdinand_MeatOfJustice_mug.dmp" -#incbin "Dmp/Ferdinand_MeatOfJustice_frames.dmp" -#incbin "Dmp/Ferdinand_MeatOfJustice_palette.dmp" -#incbin "Dmp/Ferdinand_MeatOfJustice_minimug.dmp" +FerdinandMugData: +#incbin "png/FE16/Ferdinand_MeatOfJustice_mug.dmp" +#incbin "png/FE16/Ferdinand_MeatOfJustice_frames.dmp" +#incbin "png/FE16/Ferdinand_MeatOfJustice_palette.dmp" +#incbin "png/FE16/Ferdinand_MeatOfJustice_minimug.dmp" #ifndef FerdinandMug - #define FerdinandMug (FirstMugID+103) + #define FerdinandMug (FirstMugID+104) #endif -setMugEntry(FerdinandMug, Ferdinand_MeatOfJusticeMugData, 6, 5, 5, 3) +setMugEntry(FerdinandMug, FerdinandMugData, 6, 5, 5, 3) ALIGN 4 -Flayn_Emotion_1_Redbean_F2EMugData: -#incbin "Dmp/Flayn_Emotion_1_Redbean_F2E_mug.dmp" -#incbin "Dmp/Flayn_Emotion_1_Redbean_F2E_frames.dmp" -#incbin "Dmp/Flayn_Emotion_1_Redbean_F2E_palette.dmp" -#incbin "Dmp/Flayn_Emotion_1_Redbean_F2E_minimug.dmp" +FlaynMugData: +#incbin "png/FE16/Flayn_Emotion_1_Redbean_F2E_mug.dmp" +#incbin "png/FE16/Flayn_Emotion_1_Redbean_F2E_frames.dmp" +#incbin "png/FE16/Flayn_Emotion_1_Redbean_F2E_palette.dmp" +#incbin "png/FE16/Flayn_Emotion_1_Redbean_F2E_minimug.dmp" #ifndef FlaynMug - #define FlaynMug (FirstMugID+104) + #define FlaynMug (FirstMugID+105) #endif -setMugEntry(FlaynMug, Flayn_Emotion_1_Redbean_F2EMugData, 2, 6, 3, 4) +setMugEntry(FlaynMug, FlaynMugData, 2, 6, 3, 4) ALIGN 4 -Hilda_Garytop_F2EMugData: -#incbin "Dmp/Hilda_Garytop_F2E_mug.dmp" -#incbin "Dmp/Hilda_Garytop_F2E_frames.dmp" -#incbin "Dmp/Hilda_Garytop_F2E_palette.dmp" -#incbin "Dmp/Hilda_Garytop_F2E_minimug.dmp" -#ifndef HildaMug - #define HildaMug (FirstMugID+105) +HildaFE16MugData: +#incbin "png/FE16/HildaFE16_Garytop_F2E_mug.dmp" +#incbin "png/FE16/HildaFE16_Garytop_F2E_frames.dmp" +#incbin "png/FE16/HildaFE16_Garytop_F2E_palette.dmp" +#incbin "png/FE16/HildaFE16_Garytop_F2E_minimug.dmp" +#ifndef HildaFE16Mug + #define HildaFE16Mug (FirstMugID+106) #endif -setMugEntry(HildaMug, Hilda_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(HildaFE16Mug, HildaFE16MugData, 3, 6, 3, 4) ALIGN 4 -Hubert_RaymondMugData: -#incbin "Dmp/Hubert_Raymond_mug.dmp" -#incbin "Dmp/Hubert_Raymond_frames.dmp" -#incbin "Dmp/Hubert_Raymond_palette.dmp" -#incbin "Dmp/Hubert_Raymond_minimug.dmp" +HubertMugData: +#incbin "png/FE16/Hubert_Raymond_mug.dmp" +#incbin "png/FE16/Hubert_Raymond_frames.dmp" +#incbin "png/FE16/Hubert_Raymond_palette.dmp" +#incbin "png/FE16/Hubert_Raymond_minimug.dmp" #ifndef HubertMug - #define HubertMug (FirstMugID+106) + #define HubertMug (FirstMugID+107) #endif -setMugEntry(HubertMug, Hubert_RaymondMugData, 4, 5, 4, 3) +setMugEntry(HubertMug, HubertMugData, 4, 5, 4, 3) ALIGN 4 -Leonie_Post_timeskip_TobikiMugData: -#incbin "Dmp/Leonie_Post_timeskip_Tobiki_mug.dmp" -#incbin "Dmp/Leonie_Post_timeskip_Tobiki_frames.dmp" -#incbin "Dmp/Leonie_Post_timeskip_Tobiki_palette.dmp" -#incbin "Dmp/Leonie_Post_timeskip_Tobiki_minimug.dmp" +LeonieMugData: +#incbin "png/FE16/Leonie_Post_timeskip_Tobiki_mug.dmp" +#incbin "png/FE16/Leonie_Post_timeskip_Tobiki_frames.dmp" +#incbin "png/FE16/Leonie_Post_timeskip_Tobiki_palette.dmp" +#incbin "png/FE16/Leonie_Post_timeskip_Tobiki_minimug.dmp" #ifndef LeonieMug - #define LeonieMug (FirstMugID+107) + #define LeonieMug (FirstMugID+108) #endif -setMugEntry(LeonieMug, Leonie_Post_timeskip_TobikiMugData, 3, 5, 3, 3) +setMugEntry(LeonieMug, LeonieMugData, 3, 5, 3, 3) ALIGN 4 -Linhardt__HyperGammaSpacesMugData: -#incbin "Dmp/Linhardt__HyperGammaSpaces_mug.dmp" -#incbin "Dmp/Linhardt__HyperGammaSpaces_frames.dmp" -#incbin "Dmp/Linhardt__HyperGammaSpaces_palette.dmp" -#incbin "Dmp/Linhardt__HyperGammaSpaces_minimug.dmp" +LinhardtMugData: +#incbin "png/FE16/Linhardt__HyperGammaSpaces_mug.dmp" +#incbin "png/FE16/Linhardt__HyperGammaSpaces_frames.dmp" +#incbin "png/FE16/Linhardt__HyperGammaSpaces_palette.dmp" +#incbin "png/FE16/Linhardt__HyperGammaSpaces_minimug.dmp" #ifndef LinhardtMug - #define LinhardtMug (FirstMugID+108) + #define LinhardtMug (FirstMugID+109) #endif -setMugEntry(LinhardtMug, Linhardt__HyperGammaSpacesMugData, 3, 5, 3, 3) +setMugEntry(LinhardtMug, LinhardtMugData, 3, 5, 3, 3) ALIGN 4 -LorenzFE16_TobikiMugData: -#incbin "Dmp/LorenzFE16_Tobiki_mug.dmp" -#incbin "Dmp/LorenzFE16_Tobiki_frames.dmp" -#incbin "Dmp/LorenzFE16_Tobiki_palette.dmp" -#incbin "Dmp/LorenzFE16_Tobiki_minimug.dmp" +LorenzFE16MugData: +#incbin "png/FE16/LorenzFE16_Tobiki_mug.dmp" +#incbin "png/FE16/LorenzFE16_Tobiki_frames.dmp" +#incbin "png/FE16/LorenzFE16_Tobiki_palette.dmp" +#incbin "png/FE16/LorenzFE16_Tobiki_minimug.dmp" #ifndef LorenzFE16Mug - #define LorenzFE16Mug (FirstMugID+109) + #define LorenzFE16Mug (FirstMugID+110) #endif -setMugEntry(LorenzFE16Mug, LorenzFE16_TobikiMugData, 3, 5, 3, 3) +setMugEntry(LorenzFE16Mug, LorenzFE16MugData, 3, 5, 3, 3) ALIGN 4 -Lysithea_Emotion_1_RedBean_F2EMugData: -#incbin "Dmp/Lysithea_Emotion_1_RedBean_F2E_mug.dmp" -#incbin "Dmp/Lysithea_Emotion_1_RedBean_F2E_frames.dmp" -#incbin "Dmp/Lysithea_Emotion_1_RedBean_F2E_palette.dmp" -#incbin "Dmp/Lysithea_Emotion_1_RedBean_F2E_minimug.dmp" +LysitheaMugData: +#incbin "png/FE16/Lysithea_Emotion_1_RedBean_F2E_mug.dmp" +#incbin "png/FE16/Lysithea_Emotion_1_RedBean_F2E_frames.dmp" +#incbin "png/FE16/Lysithea_Emotion_1_RedBean_F2E_palette.dmp" +#incbin "png/FE16/Lysithea_Emotion_1_RedBean_F2E_minimug.dmp" #ifndef LysitheaMug - #define LysitheaMug (FirstMugID+110) + #define LysitheaMug (FirstMugID+111) #endif -setMugEntry(LysitheaMug, Lysithea_Emotion_1_RedBean_F2EMugData, 3, 6, 4, 4) +setMugEntry(LysitheaMug, LysitheaMugData, 3, 6, 4, 4) ALIGN 4 -Manuela_Garytop_F2EMugData: -#incbin "Dmp/Manuela_Garytop_F2E_mug.dmp" -#incbin "Dmp/Manuela_Garytop_F2E_frames.dmp" -#incbin "Dmp/Manuela_Garytop_F2E_palette.dmp" -#incbin "Dmp/Manuela_Garytop_F2E_minimug.dmp" +ManuelaMugData: +#incbin "png/FE16/Manuela_Garytop_F2E_mug.dmp" +#incbin "png/FE16/Manuela_Garytop_F2E_frames.dmp" +#incbin "png/FE16/Manuela_Garytop_F2E_palette.dmp" +#incbin "png/FE16/Manuela_Garytop_F2E_minimug.dmp" #ifndef ManuelaMug - #define ManuelaMug (FirstMugID+111) + #define ManuelaMug (FirstMugID+112) #endif -setMugEntry(ManuelaMug, Manuela_Garytop_F2EMugData, 4, 5, 4, 3) +setMugEntry(ManuelaMug, ManuelaMugData, 4, 5, 4, 3) ALIGN 4 -Marianne_Garytop_F2EMugData: -#incbin "Dmp/Marianne_Garytop_F2E_mug.dmp" -#incbin "Dmp/Marianne_Garytop_F2E_frames.dmp" -#incbin "Dmp/Marianne_Garytop_F2E_palette.dmp" -#incbin "Dmp/Marianne_Garytop_F2E_minimug.dmp" +MarianneMugData: +#incbin "png/FE16/Marianne_Garytop_F2E_mug.dmp" +#incbin "png/FE16/Marianne_Garytop_F2E_frames.dmp" +#incbin "png/FE16/Marianne_Garytop_F2E_palette.dmp" +#incbin "png/FE16/Marianne_Garytop_F2E_minimug.dmp" #ifndef MarianneMug - #define MarianneMug (FirstMugID+112) + #define MarianneMug (FirstMugID+113) #endif -setMugEntry(MarianneMug, Marianne_Garytop_F2EMugData, 3, 6, 3, 4) +setMugEntry(MarianneMug, MarianneMugData, 3, 6, 3, 4) ALIGN 4 -Mercedes_BladeMugData: -#incbin "Dmp/Mercedes_Blade_mug.dmp" -#incbin "Dmp/Mercedes_Blade_frames.dmp" -#incbin "Dmp/Mercedes_Blade_palette.dmp" -#incbin "Dmp/Mercedes_Blade_minimug.dmp" +MercedesMugData: +#incbin "png/FE16/Mercedes_Blade_mug.dmp" +#incbin "png/FE16/Mercedes_Blade_frames.dmp" +#incbin "png/FE16/Mercedes_Blade_palette.dmp" +#incbin "png/FE16/Mercedes_Blade_minimug.dmp" #ifndef MercedesMug - #define MercedesMug (FirstMugID+113) + #define MercedesMug (FirstMugID+114) #endif -setMugEntry(MercedesMug, Mercedes_BladeMugData, 4, 5, 4, 3) +setMugEntry(MercedesMug, MercedesMugData, 4, 5, 4, 3) ALIGN 4 -Raphael_Three_Hopes_StitchMugData: -#incbin "Dmp/Raphael_Three_Hopes_Stitch_mug.dmp" -#incbin "Dmp/Raphael_Three_Hopes_Stitch_frames.dmp" -#incbin "Dmp/Raphael_Three_Hopes_Stitch_palette.dmp" -#incbin "Dmp/Raphael_Three_Hopes_Stitch_minimug.dmp" +RaphaelMugData: +#incbin "png/FE16/Raphael_Three_Hopes_Stitch_mug.dmp" +#incbin "png/FE16/Raphael_Three_Hopes_Stitch_frames.dmp" +#incbin "png/FE16/Raphael_Three_Hopes_Stitch_palette.dmp" +#incbin "png/FE16/Raphael_Three_Hopes_Stitch_minimug.dmp" #ifndef RaphaelMug - #define RaphaelMug (FirstMugID+114) + #define RaphaelMug (FirstMugID+115) #endif -setMugEntry(RaphaelMug, Raphael_Three_Hopes_StitchMugData, 3, 4, 3, 2) +setMugEntry(RaphaelMug, RaphaelMugData, 3, 4, 3, 2) ALIGN 4 -Shamir_WasdyeMugData: -#incbin "Dmp/Shamir_Wasdye_mug.dmp" -#incbin "Dmp/Shamir_Wasdye_frames.dmp" -#incbin "Dmp/Shamir_Wasdye_palette.dmp" -#incbin "Dmp/Shamir_Wasdye_minimug.dmp" +ShamirMugData: +#incbin "png/FE16/Shamir_Wasdye_mug.dmp" +#incbin "png/FE16/Shamir_Wasdye_frames.dmp" +#incbin "png/FE16/Shamir_Wasdye_palette.dmp" +#incbin "png/FE16/Shamir_Wasdye_minimug.dmp" #ifndef ShamirMug - #define ShamirMug (FirstMugID+115) + #define ShamirMug (FirstMugID+116) #endif -setMugEntry(ShamirMug, Shamir_WasdyeMugData, 4, 5, 4, 3) +setMugEntry(ShamirMug, ShamirMugData, 4, 5, 4, 3) ALIGN 4 -Sylvain_Three_Hopes_CavalryUnits_F2EMugData: -#incbin "Dmp/Sylvain_Three_Hopes_CavalryUnits_F2E_mug.dmp" -#incbin "Dmp/Sylvain_Three_Hopes_CavalryUnits_F2E_frames.dmp" -#incbin "Dmp/Sylvain_Three_Hopes_CavalryUnits_F2E_palette.dmp" -#incbin "Dmp/Sylvain_Three_Hopes_CavalryUnits_F2E_minimug.dmp" +SylvainMugData: +#incbin "png/FE16/Sylvain_Three_Hopes_CavalryUnits_F2E_mug.dmp" +#incbin "png/FE16/Sylvain_Three_Hopes_CavalryUnits_F2E_frames.dmp" +#incbin "png/FE16/Sylvain_Three_Hopes_CavalryUnits_F2E_palette.dmp" +#incbin "png/FE16/Sylvain_Three_Hopes_CavalryUnits_F2E_minimug.dmp" #ifndef SylvainMug - #define SylvainMug (FirstMugID+116) + #define SylvainMug (FirstMugID+117) #endif -setMugEntry(SylvainMug, Sylvain_Three_Hopes_CavalryUnits_F2EMugData, 3, 5, 3, 3) +setMugEntry(SylvainMug, SylvainMugData, 3, 5, 3, 3) ALIGN 4 -AlearF_Jey_the_Count_F2EMugData: -#incbin "Dmp/AlearF_Jey_the_Count_F2E_mug.dmp" -#incbin "Dmp/AlearF_Jey_the_Count_F2E_frames.dmp" -#incbin "Dmp/AlearF_Jey_the_Count_F2E_palette.dmp" -#incbin "Dmp/AlearF_Jey_the_Count_F2E_minimug.dmp" +AlearFMugData: +#incbin "png/FE17/AlearF_Jey_the_Count_F2E_mug.dmp" +#incbin "png/FE17/AlearF_Jey_the_Count_F2E_frames.dmp" +#incbin "png/FE17/AlearF_Jey_the_Count_F2E_palette.dmp" +#incbin "png/FE17/AlearF_Jey_the_Count_F2E_minimug.dmp" #ifndef AlearFMug - #define AlearFMug (FirstMugID+117) + #define AlearFMug (FirstMugID+118) #endif -setMugEntry(AlearFMug, AlearF_Jey_the_Count_F2EMugData, 3, 5, 3, 3) +setMugEntry(AlearFMug, AlearFMugData, 3, 5, 3, 3) ALIGN 4 -AlearM_CavalryUnitsMugData: -#incbin "Dmp/AlearM_CavalryUnits_mug.dmp" -#incbin "Dmp/AlearM_CavalryUnits_frames.dmp" -#incbin "Dmp/AlearM_CavalryUnits_palette.dmp" -#incbin "Dmp/AlearM_CavalryUnits_minimug.dmp" +AlearMMugData: +#incbin "png/FE17/AlearM_CavalryUnits_mug.dmp" +#incbin "png/FE17/AlearM_CavalryUnits_frames.dmp" +#incbin "png/FE17/AlearM_CavalryUnits_palette.dmp" +#incbin "png/FE17/AlearM_CavalryUnits_minimug.dmp" #ifndef AlearMMug - #define AlearMMug (FirstMugID+118) + #define AlearMMug (FirstMugID+119) #endif -setMugEntry(AlearMMug, AlearM_CavalryUnitsMugData, 3, 5, 3, 3) +setMugEntry(AlearMMug, AlearMMugData, 3, 5, 3, 3) ALIGN 4 -Amber_Sterling_GlovnerMugData: -#incbin "Dmp/Amber_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Amber_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Amber_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Amber_Sterling_Glovner_minimug.dmp" +AmberMugData: +#incbin "png/FE17/Amber_Sterling_Glovner_mug.dmp" +#incbin "png/FE17/Amber_Sterling_Glovner_frames.dmp" +#incbin "png/FE17/Amber_Sterling_Glovner_palette.dmp" +#incbin "png/FE17/Amber_Sterling_Glovner_minimug.dmp" #ifndef AmberMug - #define AmberMug (FirstMugID+119) + #define AmberMug (FirstMugID+120) #endif -setMugEntry(AmberMug, Amber_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(AmberMug, AmberMugData, 3, 5, 3, 3) ALIGN 4 -Citrinne_CavalryUnits_F2EMugData: -#incbin "Dmp/Citrinne_CavalryUnits_F2E_mug.dmp" -#incbin "Dmp/Citrinne_CavalryUnits_F2E_frames.dmp" -#incbin "Dmp/Citrinne_CavalryUnits_F2E_palette.dmp" -#incbin "Dmp/Citrinne_CavalryUnits_F2E_minimug.dmp" +CitrinneMugData: +#incbin "png/FE17/Citrinne_CavalryUnits_F2E_mug.dmp" +#incbin "png/FE17/Citrinne_CavalryUnits_F2E_frames.dmp" +#incbin "png/FE17/Citrinne_CavalryUnits_F2E_palette.dmp" +#incbin "png/FE17/Citrinne_CavalryUnits_F2E_minimug.dmp" #ifndef CitrinneMug - #define CitrinneMug (FirstMugID+120) + #define CitrinneMug (FirstMugID+121) #endif -setMugEntry(CitrinneMug, Citrinne_CavalryUnits_F2EMugData, 3, 5, 3, 3) +setMugEntry(CitrinneMug, CitrinneMugData, 3, 5, 3, 3) ALIGN 4 -Etie_KingCrimson_AthenaBaerMugData: -#incbin "Dmp/Etie_KingCrimson_AthenaBaer_mug.dmp" -#incbin "Dmp/Etie_KingCrimson_AthenaBaer_frames.dmp" -#incbin "Dmp/Etie_KingCrimson_AthenaBaer_palette.dmp" -#incbin "Dmp/Etie_KingCrimson_AthenaBaer_minimug.dmp" +EtieMugData: +#incbin "png/FE17/Etie_KingCrimson_AthenaBaer_mug.dmp" +#incbin "png/FE17/Etie_KingCrimson_AthenaBaer_frames.dmp" +#incbin "png/FE17/Etie_KingCrimson_AthenaBaer_palette.dmp" +#incbin "png/FE17/Etie_KingCrimson_AthenaBaer_minimug.dmp" #ifndef EtieMug - #define EtieMug (FirstMugID+121) + #define EtieMug (FirstMugID+122) #endif -setMugEntry(EtieMug, Etie_KingCrimson_AthenaBaerMugData, 4, 5, 4, 3) +setMugEntry(EtieMug, EtieMugData, 4, 5, 4, 3) ALIGN 4 -Goldmary_StitchMugData: -#incbin "Dmp/Goldmary_Stitch_mug.dmp" -#incbin "Dmp/Goldmary_Stitch_frames.dmp" -#incbin "Dmp/Goldmary_Stitch_palette.dmp" -#incbin "Dmp/Goldmary_Stitch_minimug.dmp" +GoldmaryMugData: +#incbin "png/FE17/Goldmary_Stitch_mug.dmp" +#incbin "png/FE17/Goldmary_Stitch_frames.dmp" +#incbin "png/FE17/Goldmary_Stitch_palette.dmp" +#incbin "png/FE17/Goldmary_Stitch_minimug.dmp" #ifndef GoldmaryMug - #define GoldmaryMug (FirstMugID+122) + #define GoldmaryMug (FirstMugID+123) #endif -setMugEntry(GoldmaryMug, Goldmary_StitchMugData, 3, 5, 3, 3) +setMugEntry(GoldmaryMug, GoldmaryMugData, 3, 5, 3, 3) ALIGN 4 -Ivy_KingCrimsonMugData: -#incbin "Dmp/Ivy_KingCrimson_mug.dmp" -#incbin "Dmp/Ivy_KingCrimson_frames.dmp" -#incbin "Dmp/Ivy_KingCrimson_palette.dmp" -#incbin "Dmp/Ivy_KingCrimson_minimug.dmp" +IvyMugData: +#incbin "png/FE17/Ivy_KingCrimson_mug.dmp" +#incbin "png/FE17/Ivy_KingCrimson_frames.dmp" +#incbin "png/FE17/Ivy_KingCrimson_palette.dmp" +#incbin "png/FE17/Ivy_KingCrimson_minimug.dmp" #ifndef IvyMug - #define IvyMug (FirstMugID+123) + #define IvyMug (FirstMugID+124) #endif -setMugEntry(IvyMug, Ivy_KingCrimsonMugData, 2, 6, 3, 4) +setMugEntry(IvyMug, IvyMugData, 2, 6, 3, 4) ALIGN 4 -Jade_Sterling_GlovnerMugData: -#incbin "Dmp/Jade_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Jade_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Jade_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Jade_Sterling_Glovner_minimug.dmp" +JadeMugData: +#incbin "png/FE17/Jade_Sterling_Glovner_mug.dmp" +#incbin "png/FE17/Jade_Sterling_Glovner_frames.dmp" +#incbin "png/FE17/Jade_Sterling_Glovner_palette.dmp" +#incbin "png/FE17/Jade_Sterling_Glovner_minimug.dmp" #ifndef JadeMug - #define JadeMug (FirstMugID+124) + #define JadeMug (FirstMugID+125) #endif -setMugEntry(JadeMug, Jade_Sterling_GlovnerMugData, 2, 5, 2, 3) +setMugEntry(JadeMug, JadeMugData, 2, 5, 2, 3) ALIGN 4 -Kagetsu_TobikiMugData: -#incbin "Dmp/Kagetsu_Tobiki_mug.dmp" -#incbin "Dmp/Kagetsu_Tobiki_frames.dmp" -#incbin "Dmp/Kagetsu_Tobiki_palette.dmp" -#incbin "Dmp/Kagetsu_Tobiki_minimug.dmp" +KagetsuMugData: +#incbin "png/FE17/Kagetsu_Tobiki_mug.dmp" +#incbin "png/FE17/Kagetsu_Tobiki_frames.dmp" +#incbin "png/FE17/Kagetsu_Tobiki_palette.dmp" +#incbin "png/FE17/Kagetsu_Tobiki_minimug.dmp" #ifndef KagetsuMug - #define KagetsuMug (FirstMugID+125) + #define KagetsuMug (FirstMugID+126) #endif -setMugEntry(KagetsuMug, Kagetsu_TobikiMugData, 6, 5, 5, 4) +setMugEntry(KagetsuMug, KagetsuMugData, 6, 5, 5, 4) ALIGN 4 -Lapis_ThornMugData: -#incbin "Dmp/Lapis_Thorn_mug.dmp" -#incbin "Dmp/Lapis_Thorn_frames.dmp" -#incbin "Dmp/Lapis_Thorn_palette.dmp" -#incbin "Dmp/Lapis_Thorn_minimug.dmp" +LapisMugData: +#incbin "png/FE17/Lapis_Thorn_mug.dmp" +#incbin "png/FE17/Lapis_Thorn_frames.dmp" +#incbin "png/FE17/Lapis_Thorn_palette.dmp" +#incbin "png/FE17/Lapis_Thorn_minimug.dmp" #ifndef LapisMug - #define LapisMug (FirstMugID+126) + #define LapisMug (FirstMugID+127) #endif -setMugEntry(LapisMug, Lapis_ThornMugData, 2, 6, 3, 4) +setMugEntry(LapisMug, LapisMugData, 2, 6, 3, 4) ALIGN 4 -Lindon_FEierMugData: -#incbin "Dmp/Lindon_FEier_mug.dmp" -#incbin "Dmp/Lindon_FEier_frames.dmp" -#incbin "Dmp/Lindon_FEier_palette.dmp" -#incbin "Dmp/Lindon_FEier_minimug.dmp" +LindonMugData: +#incbin "png/FE17/Lindon_FEier_mug.dmp" +#incbin "png/FE17/Lindon_FEier_frames.dmp" +#incbin "png/FE17/Lindon_FEier_palette.dmp" +#incbin "png/FE17/Lindon_FEier_minimug.dmp" #ifndef LindonMug - #define LindonMug (FirstMugID+127) + #define LindonMug (FirstMugID+128) #endif -setMugEntry(LindonMug, Lindon_FEierMugData, 3, 5, 3, 3) +setMugEntry(LindonMug, LindonMugData, 3, 5, 3, 3) ALIGN 4 -Merrin_TobikiMugData: -#incbin "Dmp/Merrin_Tobiki_mug.dmp" -#incbin "Dmp/Merrin_Tobiki_frames.dmp" -#incbin "Dmp/Merrin_Tobiki_palette.dmp" -#incbin "Dmp/Merrin_Tobiki_minimug.dmp" +MerrinMugData: +#incbin "png/FE17/Merrin_Tobiki_mug.dmp" +#incbin "png/FE17/Merrin_Tobiki_frames.dmp" +#incbin "png/FE17/Merrin_Tobiki_palette.dmp" +#incbin "png/FE17/Merrin_Tobiki_minimug.dmp" #ifndef MerrinMug - #define MerrinMug (FirstMugID+128) + #define MerrinMug (FirstMugID+129) #endif -setMugEntry(MerrinMug, Merrin_TobikiMugData, 4, 5, 4, 3) +setMugEntry(MerrinMug, MerrinMugData, 4, 5, 4, 3) ALIGN 4 -Saphir_Garytop_F2EMugData: -#incbin "Dmp/Saphir_Garytop_F2E_mug.dmp" -#incbin "Dmp/Saphir_Garytop_F2E_frames.dmp" -#incbin "Dmp/Saphir_Garytop_F2E_palette.dmp" -#incbin "Dmp/Saphir_Garytop_F2E_minimug.dmp" +SaphirMugData: +#incbin "png/FE17/Saphir_Garytop_F2E_mug.dmp" +#incbin "png/FE17/Saphir_Garytop_F2E_frames.dmp" +#incbin "png/FE17/Saphir_Garytop_F2E_palette.dmp" +#incbin "png/FE17/Saphir_Garytop_F2E_minimug.dmp" #ifndef SaphirMug - #define SaphirMug (FirstMugID+129) + #define SaphirMug (FirstMugID+130) #endif -setMugEntry(SaphirMug, Saphir_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(SaphirMug, SaphirMugData, 3, 5, 3, 3) ALIGN 4 -Veyle_Sterling_GlovnerMugData: -#incbin "Dmp/Veyle_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Veyle_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Veyle_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Veyle_Sterling_Glovner_minimug.dmp" +VeyleMugData: +#incbin "png/FE17/Veyle_Sterling_Glovner_mug.dmp" +#incbin "png/FE17/Veyle_Sterling_Glovner_frames.dmp" +#incbin "png/FE17/Veyle_Sterling_Glovner_palette.dmp" +#incbin "png/FE17/Veyle_Sterling_Glovner_minimug.dmp" #ifndef VeyleMug - #define VeyleMug (FirstMugID+130) + #define VeyleMug (FirstMugID+131) #endif -setMugEntry(VeyleMug, Veyle_Sterling_GlovnerMugData, 4, 6, 4, 4) +setMugEntry(VeyleMug, VeyleMugData, 4, 6, 4, 4) ALIGN 4 -Yunaka_RedBean_F2EMugData: -#incbin "Dmp/Yunaka_RedBean_F2E_mug.dmp" -#incbin "Dmp/Yunaka_RedBean_F2E_frames.dmp" -#incbin "Dmp/Yunaka_RedBean_F2E_palette.dmp" -#incbin "Dmp/Yunaka_RedBean_F2E_minimug.dmp" +YunakaMugData: +#incbin "png/FE17/Yunaka_RedBean_F2E_mug.dmp" +#incbin "png/FE17/Yunaka_RedBean_F2E_frames.dmp" +#incbin "png/FE17/Yunaka_RedBean_F2E_palette.dmp" +#incbin "png/FE17/Yunaka_RedBean_F2E_minimug.dmp" #ifndef YunakaMug - #define YunakaMug (FirstMugID+131) + #define YunakaMug (FirstMugID+132) #endif -setMugEntry(YunakaMug, Yunaka_RedBean_F2EMugData, 3, 5, 3, 3) +setMugEntry(YunakaMug, YunakaMugData, 3, 5, 3, 3) ALIGN 4 -Abel_Luminescent_BladeMugData: -#incbin "Dmp/Abel_Luminescent_Blade_mug.dmp" -#incbin "Dmp/Abel_Luminescent_Blade_frames.dmp" -#incbin "Dmp/Abel_Luminescent_Blade_palette.dmp" -#incbin "Dmp/Abel_Luminescent_Blade_minimug.dmp" +AbelMugData: +#incbin "png/FE1FE3FE11FE12/Abel_Luminescent_Blade_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Abel_Luminescent_Blade_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Abel_Luminescent_Blade_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Abel_Luminescent_Blade_minimug.dmp" #ifndef AbelMug - #define AbelMug (FirstMugID+132) + #define AbelMug (FirstMugID+133) #endif -setMugEntry(AbelMug, Abel_Luminescent_BladeMugData, 3, 5, 3, 3) +setMugEntry(AbelMug, AbelMugData, 3, 5, 3, 3) ALIGN 4 -Arlen_KannaMugData: -#incbin "Dmp/Arlen_Kanna_mug.dmp" -#incbin "Dmp/Arlen_Kanna_frames.dmp" -#incbin "Dmp/Arlen_Kanna_palette.dmp" -#incbin "Dmp/Arlen_Kanna_minimug.dmp" +ArlenMugData: +#incbin "png/FE1FE3FE11FE12/Arlen_Kanna_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Arlen_Kanna_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Arlen_Kanna_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Arlen_Kanna_minimug.dmp" #ifndef ArlenMug - #define ArlenMug (FirstMugID+133) + #define ArlenMug (FirstMugID+134) #endif -setMugEntry(ArlenMug, Arlen_KannaMugData, 3, 4, 3, 2) +setMugEntry(ArlenMug, ArlenMugData, 3, 4, 3, 2) ALIGN 4 -Arran_ThornMugData: -#incbin "Dmp/Arran_Thorn_mug.dmp" -#incbin "Dmp/Arran_Thorn_frames.dmp" -#incbin "Dmp/Arran_Thorn_palette.dmp" -#incbin "Dmp/Arran_Thorn_minimug.dmp" +ArranMugData: +#incbin "png/FE1FE3FE11FE12/Arran_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Arran_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Arran_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Arran_Thorn_minimug.dmp" #ifndef ArranMug - #define ArranMug (FirstMugID+134) + #define ArranMug (FirstMugID+135) #endif -setMugEntry(ArranMug, Arran_ThornMugData, 3, 5, 3, 3) +setMugEntry(ArranMug, ArranMugData, 3, 5, 3, 3) ALIGN 4 -Astram_GratedShtick_Cardcafe_Nickt_CranjamMugData: -#incbin "Dmp/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_mug.dmp" -#incbin "Dmp/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_frames.dmp" -#incbin "Dmp/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_palette.dmp" -#incbin "Dmp/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_minimug.dmp" +AstramMugData: +#incbin "png/FE1FE3FE11FE12/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Astram_GratedShtick_Cardcafe_Nickt_Cranjam_minimug.dmp" #ifndef AstramMug - #define AstramMug (FirstMugID+135) + #define AstramMug (FirstMugID+136) #endif -setMugEntry(AstramMug, Astram_GratedShtick_Cardcafe_Nickt_CranjamMugData, 3, 6, 3, 4) +setMugEntry(AstramMug, AstramMugData, 3, 6, 3, 4) ALIGN 4 -Athena_Redbean_F2EMugData: -#incbin "Dmp/Athena_Redbean_F2E_mug.dmp" -#incbin "Dmp/Athena_Redbean_F2E_frames.dmp" -#incbin "Dmp/Athena_Redbean_F2E_palette.dmp" -#incbin "Dmp/Athena_Redbean_F2E_minimug.dmp" +AthenaMugData: +#incbin "png/FE1FE3FE11FE12/Athena_Redbean_F2E_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Athena_Redbean_F2E_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Athena_Redbean_F2E_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Athena_Redbean_F2E_minimug.dmp" #ifndef AthenaMug - #define AthenaMug (FirstMugID+136) + #define AthenaMug (FirstMugID+137) #endif -setMugEntry(AthenaMug, Athena_Redbean_F2EMugData, 3, 5, 4, 3) +setMugEntry(AthenaMug, AthenaMugData, 3, 5, 4, 3) ALIGN 4 -Bantu_ThornMugData: -#incbin "Dmp/Bantu_Thorn_mug.dmp" -#incbin "Dmp/Bantu_Thorn_frames.dmp" -#incbin "Dmp/Bantu_Thorn_palette.dmp" -#incbin "Dmp/Bantu_Thorn_minimug.dmp" +BantuMugData: +#incbin "png/FE1FE3FE11FE12/Bantu_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Bantu_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Bantu_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Bantu_Thorn_minimug.dmp" #ifndef BantuMug - #define BantuMug (FirstMugID+137) + #define BantuMug (FirstMugID+138) #endif -setMugEntry(BantuMug, Bantu_ThornMugData, 2, 6, 2, 4) +setMugEntry(BantuMug, BantuMugData, 2, 6, 2, 4) ALIGN 4 -Barst_ThornMugData: -#incbin "Dmp/Barst_Thorn_mug.dmp" -#incbin "Dmp/Barst_Thorn_frames.dmp" -#incbin "Dmp/Barst_Thorn_palette.dmp" -#incbin "Dmp/Barst_Thorn_minimug.dmp" +BarstMugData: +#incbin "png/FE1FE3FE11FE12/Barst_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Barst_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Barst_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Barst_Thorn_minimug.dmp" #ifndef BarstMug - #define BarstMug (FirstMugID+138) + #define BarstMug (FirstMugID+139) #endif -setMugEntry(BarstMug, Barst_ThornMugData, 2, 5, 2, 3) +setMugEntry(BarstMug, BarstMugData, 2, 5, 2, 3) ALIGN 4 -Beck_ThornMugData: -#incbin "Dmp/Beck_Thorn_mug.dmp" -#incbin "Dmp/Beck_Thorn_frames.dmp" -#incbin "Dmp/Beck_Thorn_palette.dmp" -#incbin "Dmp/Beck_Thorn_minimug.dmp" +BeckMugData: +#incbin "png/FE1FE3FE11FE12/Beck_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Beck_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Beck_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Beck_Thorn_minimug.dmp" #ifndef BeckMug - #define BeckMug (FirstMugID+139) + #define BeckMug (FirstMugID+140) #endif -setMugEntry(BeckMug, Beck_ThornMugData, 4, 4, 4, 2) +setMugEntry(BeckMug, BeckMugData, 4, 4, 4, 2) ALIGN 4 BlankMugData: -#incbin "Dmp/Blank_mug.dmp" -#incbin "Dmp/Blank_frames.dmp" -#incbin "Dmp/Blank_palette.dmp" -#incbin "Dmp/Blank_minimug.dmp" +#incbin "png/FE1FE3FE11FE12/Blank_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Blank_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Blank_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Blank_minimug.dmp" #ifndef BlankMug - #define BlankMug (FirstMugID+140) + #define BlankMug (FirstMugID+141) #endif setMugEntry(BlankMug, BlankMugData, 2, 5, 3, 3) ALIGN 4 -Boah_ThornMugData: -#incbin "Dmp/Boah_Thorn_mug.dmp" -#incbin "Dmp/Boah_Thorn_frames.dmp" -#incbin "Dmp/Boah_Thorn_palette.dmp" -#incbin "Dmp/Boah_Thorn_minimug.dmp" +BoahMugData: +#incbin "png/FE1FE3FE11FE12/Boah_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Boah_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Boah_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Boah_Thorn_minimug.dmp" #ifndef BoahMug - #define BoahMug (FirstMugID+141) + #define BoahMug (FirstMugID+142) #endif -setMugEntry(BoahMug, Boah_ThornMugData, 5, 5, 5, 3) +setMugEntry(BoahMug, BoahMugData, 5, 5, 5, 3) ALIGN 4 -Bord_Frigid_NicktMugData: -#incbin "Dmp/Bord_Frigid_Nickt_mug.dmp" -#incbin "Dmp/Bord_Frigid_Nickt_frames.dmp" -#incbin "Dmp/Bord_Frigid_Nickt_palette.dmp" -#incbin "Dmp/Bord_Frigid_Nickt_minimug.dmp" +BordMugData: +#incbin "png/FE1FE3FE11FE12/Bord_Frigid_Nickt_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Bord_Frigid_Nickt_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Bord_Frigid_Nickt_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Bord_Frigid_Nickt_minimug.dmp" #ifndef BordMug - #define BordMug (FirstMugID+142) + #define BordMug (FirstMugID+143) #endif -setMugEntry(BordMug, Bord_Frigid_NicktMugData, 3, 6, 3, 3) +setMugEntry(BordMug, BordMugData, 3, 6, 3, 3) ALIGN 4 -Caeda_Blueyguy_NicktMugData: -#incbin "Dmp/Caeda_Blueyguy_Nickt_mug.dmp" -#incbin "Dmp/Caeda_Blueyguy_Nickt_frames.dmp" -#incbin "Dmp/Caeda_Blueyguy_Nickt_palette.dmp" -#incbin "Dmp/Caeda_Blueyguy_Nickt_minimug.dmp" +CaedaMugData: +#incbin "png/FE1FE3FE11FE12/Caeda_Blueyguy_Nickt_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Caeda_Blueyguy_Nickt_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Caeda_Blueyguy_Nickt_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Caeda_Blueyguy_Nickt_minimug.dmp" #ifndef CaedaMug - #define CaedaMug (FirstMugID+143) + #define CaedaMug (FirstMugID+144) #endif -setMugEntry(CaedaMug, Caeda_Blueyguy_NicktMugData, 3, 6, 3, 4) +setMugEntry(CaedaMug, CaedaMugData, 3, 6, 3, 4) ALIGN 4 -Caesar_ThornMugData: -#incbin "Dmp/Caesar_Thorn_mug.dmp" -#incbin "Dmp/Caesar_Thorn_frames.dmp" -#incbin "Dmp/Caesar_Thorn_palette.dmp" -#incbin "Dmp/Caesar_Thorn_minimug.dmp" +CaesarMugData: +#incbin "png/FE1FE3FE11FE12/Caesar_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Caesar_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Caesar_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Caesar_Thorn_minimug.dmp" #ifndef CaesarMug - #define CaesarMug (FirstMugID+144) + #define CaesarMug (FirstMugID+145) #endif -setMugEntry(CaesarMug, Caesar_ThornMugData, 3, 5, 3, 3) +setMugEntry(CaesarMug, CaesarMugData, 3, 5, 3, 3) ALIGN 4 -Cain_Xenith_Nickt_BlazeMugData: -#incbin "Dmp/Cain_Xenith_Nickt_Blaze_mug.dmp" -#incbin "Dmp/Cain_Xenith_Nickt_Blaze_frames.dmp" -#incbin "Dmp/Cain_Xenith_Nickt_Blaze_palette.dmp" -#incbin "Dmp/Cain_Xenith_Nickt_Blaze_minimug.dmp" +CainMugData: +#incbin "png/FE1FE3FE11FE12/Cain_Xenith_Nickt_Blaze_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Cain_Xenith_Nickt_Blaze_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Cain_Xenith_Nickt_Blaze_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Cain_Xenith_Nickt_Blaze_minimug.dmp" #ifndef CainMug - #define CainMug (FirstMugID+145) + #define CainMug (FirstMugID+146) #endif -setMugEntry(CainMug, Cain_Xenith_Nickt_BlazeMugData, 3, 5, 3, 3) +setMugEntry(CainMug, CainMugData, 3, 5, 3, 3) ALIGN 4 -Camus_Garytop_F2EMugData: -#incbin "Dmp/Camus_Garytop_F2E_mug.dmp" -#incbin "Dmp/Camus_Garytop_F2E_frames.dmp" -#incbin "Dmp/Camus_Garytop_F2E_palette.dmp" -#incbin "Dmp/Camus_Garytop_F2E_minimug.dmp" +CamusMugData: +#incbin "png/FE1FE3FE11FE12/Camus_Garytop_F2E_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Camus_Garytop_F2E_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Camus_Garytop_F2E_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Camus_Garytop_F2E_minimug.dmp" #ifndef CamusMug - #define CamusMug (FirstMugID+146) + #define CamusMug (FirstMugID+147) #endif -setMugEntry(CamusMug, Camus_Garytop_F2EMugData, 2, 4, 2, 2) +setMugEntry(CamusMug, CamusMugData, 2, 4, 2, 2) ALIGN 4 -Castor_ThornMugData: -#incbin "Dmp/Castor_Thorn_mug.dmp" -#incbin "Dmp/Castor_Thorn_frames.dmp" -#incbin "Dmp/Castor_Thorn_palette.dmp" -#incbin "Dmp/Castor_Thorn_minimug.dmp" +CastorMugData: +#incbin "png/FE1FE3FE11FE12/Castor_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Castor_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Castor_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Castor_Thorn_minimug.dmp" #ifndef CastorMug - #define CastorMug (FirstMugID+147) + #define CastorMug (FirstMugID+148) #endif -setMugEntry(CastorMug, Castor_ThornMugData, 4, 5, 4, 3) +setMugEntry(CastorMug, CastorMugData, 4, 5, 4, 3) ALIGN 4 -Catria_RedBeanMugData: -#incbin "Dmp/Catria_RedBean_mug.dmp" -#incbin "Dmp/Catria_RedBean_frames.dmp" -#incbin "Dmp/Catria_RedBean_palette.dmp" -#incbin "Dmp/Catria_RedBean_minimug.dmp" +CatriaMugData: +#incbin "png/FE1FE3FE11FE12/Catria_RedBean_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Catria_RedBean_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Catria_RedBean_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Catria_RedBean_minimug.dmp" #ifndef CatriaMug - #define CatriaMug (FirstMugID+148) + #define CatriaMug (FirstMugID+149) #endif -setMugEntry(CatriaMug, Catria_RedBeanMugData, 2, 5, 3, 3) +setMugEntry(CatriaMug, CatriaMugData, 2, 5, 3, 3) ALIGN 4 -Cecil_Obsidian_DaddyMugData: -#incbin "Dmp/Cecil_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Cecil_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Cecil_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Cecil_Obsidian_Daddy_minimug.dmp" +CecilMugData: +#incbin "png/FE1FE3FE11FE12/Cecil_Obsidian_Daddy_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Cecil_Obsidian_Daddy_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Cecil_Obsidian_Daddy_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Cecil_Obsidian_Daddy_minimug.dmp" #ifndef CecilMug - #define CecilMug (FirstMugID+149) + #define CecilMug (FirstMugID+150) #endif -setMugEntry(CecilMug, Cecil_Obsidian_DaddyMugData, 4, 6, 3, 4) +setMugEntry(CecilMug, CecilMugData, 4, 6, 3, 4) ALIGN 4 -Cord_frigid_nickt_glaceoMugData: -#incbin "Dmp/Cord_frigid_nickt_glaceo_mug.dmp" -#incbin "Dmp/Cord_frigid_nickt_glaceo_frames.dmp" -#incbin "Dmp/Cord_frigid_nickt_glaceo_palette.dmp" -#incbin "Dmp/Cord_frigid_nickt_glaceo_minimug.dmp" +CordMugData: +#incbin "png/FE1FE3FE11FE12/Cord_frigid_nickt_glaceo_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Cord_frigid_nickt_glaceo_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Cord_frigid_nickt_glaceo_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Cord_frigid_nickt_glaceo_minimug.dmp" #ifndef CordMug - #define CordMug (FirstMugID+150) + #define CordMug (FirstMugID+151) #endif -setMugEntry(CordMug, Cord_frigid_nickt_glaceoMugData, 2, 5, 2, 3) +setMugEntry(CordMug, CordMugData, 2, 5, 2, 3) ALIGN 4 -Darros_FEierMugData: -#incbin "Dmp/Darros_FEier_mug.dmp" -#incbin "Dmp/Darros_FEier_frames.dmp" -#incbin "Dmp/Darros_FEier_palette.dmp" -#incbin "Dmp/Darros_FEier_minimug.dmp" +DarrosMugData: +#incbin "png/FE1FE3FE11FE12/Darros_FEier_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Darros_FEier_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Darros_FEier_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Darros_FEier_minimug.dmp" #ifndef DarrosMug - #define DarrosMug (FirstMugID+151) + #define DarrosMug (FirstMugID+152) #endif -setMugEntry(DarrosMug, Darros_FEierMugData, 2, 4, 3, 2) +setMugEntry(DarrosMug, DarrosMugData, 2, 4, 3, 2) ALIGN 4 -Dice_Emperor_HaardinMugData: -#incbin "Dmp/Dice_Emperor_Haardin_mug.dmp" -#incbin "Dmp/Dice_Emperor_Haardin_frames.dmp" -#incbin "Dmp/Dice_Emperor_Haardin_palette.dmp" -#incbin "Dmp/Dice_Emperor_Haardin_minimug.dmp" +DiceMugData: +#incbin "png/FE1FE3FE11FE12/Dice_Emperor_Haardin_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Dice_Emperor_Haardin_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Dice_Emperor_Haardin_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Dice_Emperor_Haardin_minimug.dmp" #ifndef DiceMug - #define DiceMug (FirstMugID+152) + #define DiceMug (FirstMugID+153) #endif -setMugEntry(DiceMug, Dice_Emperor_HaardinMugData, 2, 5, 3, 3) +setMugEntry(DiceMug, DiceMugData, 2, 5, 3, 3) ALIGN 4 -Dolph_ThornMugData: -#incbin "Dmp/Dolph_Thorn_mug.dmp" -#incbin "Dmp/Dolph_Thorn_frames.dmp" -#incbin "Dmp/Dolph_Thorn_palette.dmp" -#incbin "Dmp/Dolph_Thorn_minimug.dmp" +DolphMugData: +#incbin "png/FE1FE3FE11FE12/Dolph_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Dolph_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Dolph_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Dolph_Thorn_minimug.dmp" #ifndef DolphMug - #define DolphMug (FirstMugID+153) + #define DolphMug (FirstMugID+154) #endif -setMugEntry(DolphMug, Dolph_ThornMugData, 4, 4, 3, 2) +setMugEntry(DolphMug, DolphMugData, 4, 4, 3, 2) ALIGN 4 -Draug_ThornMugData: -#incbin "Dmp/Draug_Thorn_mug.dmp" -#incbin "Dmp/Draug_Thorn_frames.dmp" -#incbin "Dmp/Draug_Thorn_palette.dmp" -#incbin "Dmp/Draug_Thorn_minimug.dmp" +DraugMugData: +#incbin "png/FE1FE3FE11FE12/Draug_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Draug_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Draug_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Draug_Thorn_minimug.dmp" #ifndef DraugMug - #define DraugMug (FirstMugID+154) + #define DraugMug (FirstMugID+155) #endif -setMugEntry(DraugMug, Draug_ThornMugData, 2, 5, 2, 3) +setMugEntry(DraugMug, DraugMugData, 2, 5, 2, 3) ALIGN 4 -Elice_ThornMugData: -#incbin "Dmp/Elice_Thorn_mug.dmp" -#incbin "Dmp/Elice_Thorn_frames.dmp" -#incbin "Dmp/Elice_Thorn_palette.dmp" -#incbin "Dmp/Elice_Thorn_minimug.dmp" +EliceMugData: +#incbin "png/FE1FE3FE11FE12/Elice_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Elice_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Elice_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Elice_Thorn_minimug.dmp" #ifndef EliceMug - #define EliceMug (FirstMugID+155) + #define EliceMug (FirstMugID+156) #endif -setMugEntry(EliceMug, Elice_ThornMugData, 2, 6, 2, 4) +setMugEntry(EliceMug, EliceMugData, 2, 6, 2, 4) ALIGN 4 -Est_RedBeanMugData: -#incbin "Dmp/Est_RedBean_mug.dmp" -#incbin "Dmp/Est_RedBean_frames.dmp" -#incbin "Dmp/Est_RedBean_palette.dmp" -#incbin "Dmp/Est_RedBean_minimug.dmp" +EstMugData: +#incbin "png/FE1FE3FE11FE12/Est_RedBean_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Est_RedBean_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Est_RedBean_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Est_RedBean_minimug.dmp" #ifndef EstMug - #define EstMug (FirstMugID+156) + #define EstMug (FirstMugID+157) #endif -setMugEntry(EstMug, Est_RedBeanMugData, 2, 5, 3, 3) +setMugEntry(EstMug, EstMugData, 2, 5, 3, 3) ALIGN 4 -Etzel_ThornMugData: -#incbin "Dmp/Etzel_Thorn_mug.dmp" -#incbin "Dmp/Etzel_Thorn_frames.dmp" -#incbin "Dmp/Etzel_Thorn_palette.dmp" -#incbin "Dmp/Etzel_Thorn_minimug.dmp" +EtzelMugData: +#incbin "png/FE1FE3FE11FE12/Etzel_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Etzel_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Etzel_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Etzel_Thorn_minimug.dmp" #ifndef EtzelMug - #define EtzelMug (FirstMugID+157) + #define EtzelMug (FirstMugID+158) #endif -setMugEntry(EtzelMug, Etzel_ThornMugData, 4, 5, 4, 3) +setMugEntry(EtzelMug, EtzelMugData, 4, 5, 4, 3) ALIGN 4 -Frey_ThornMugData: -#incbin "Dmp/Frey_Thorn_mug.dmp" -#incbin "Dmp/Frey_Thorn_frames.dmp" -#incbin "Dmp/Frey_Thorn_palette.dmp" -#incbin "Dmp/Frey_Thorn_minimug.dmp" +FreyMugData: +#incbin "png/FE1FE3FE11FE12/Frey_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Frey_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Frey_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Frey_Thorn_minimug.dmp" #ifndef FreyMug - #define FreyMug (FirstMugID+158) + #define FreyMug (FirstMugID+159) #endif -setMugEntry(FreyMug, Frey_ThornMugData, 3, 5, 3, 3) +setMugEntry(FreyMug, FreyMugData, 3, 5, 3, 3) ALIGN 4 -Frost_SaintRubenioMugData: -#incbin "Dmp/Frost_SaintRubenio_mug.dmp" -#incbin "Dmp/Frost_SaintRubenio_frames.dmp" -#incbin "Dmp/Frost_SaintRubenio_palette.dmp" -#incbin "Dmp/Frost_SaintRubenio_minimug.dmp" +FrostMugData: +#incbin "png/FE1FE3FE11FE12/Frost_SaintRubenio_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Frost_SaintRubenio_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Frost_SaintRubenio_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Frost_SaintRubenio_minimug.dmp" #ifndef FrostMug - #define FrostMug (FirstMugID+159) + #define FrostMug (FirstMugID+160) #endif -setMugEntry(FrostMug, Frost_SaintRubenioMugData, 4, 6, 4, 4) +setMugEntry(FrostMug, FrostMugData, 4, 6, 4, 4) ALIGN 4 -Gordin_ThornMugData: -#incbin "Dmp/Gordin_Thorn_mug.dmp" -#incbin "Dmp/Gordin_Thorn_frames.dmp" -#incbin "Dmp/Gordin_Thorn_palette.dmp" -#incbin "Dmp/Gordin_Thorn_minimug.dmp" +GordinMugData: +#incbin "png/FE1FE3FE11FE12/Gordin_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Gordin_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Gordin_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Gordin_Thorn_minimug.dmp" #ifndef GordinMug - #define GordinMug (FirstMugID+160) + #define GordinMug (FirstMugID+161) #endif -setMugEntry(GordinMug, Gordin_ThornMugData, 2, 5, 2, 3) +setMugEntry(GordinMug, GordinMugData, 2, 5, 2, 3) ALIGN 4 -Gotoh_ThornMugData: -#incbin "Dmp/Gotoh_Thorn_mug.dmp" -#incbin "Dmp/Gotoh_Thorn_frames.dmp" -#incbin "Dmp/Gotoh_Thorn_palette.dmp" -#incbin "Dmp/Gotoh_Thorn_minimug.dmp" +GotohMugData: +#incbin "png/FE1FE3FE11FE12/Gotoh_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Gotoh_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Gotoh_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Gotoh_Thorn_minimug.dmp" #ifndef GotohMug - #define GotohMug (FirstMugID+161) + #define GotohMug (FirstMugID+162) #endif -setMugEntry(GotohMug, Gotoh_ThornMugData, 2, 5, 2, 2) +setMugEntry(GotohMug, GotohMugData, 2, 5, 2, 2) ALIGN 4 -Hardin_ThornMugData: -#incbin "Dmp/Hardin_Thorn_mug.dmp" -#incbin "Dmp/Hardin_Thorn_frames.dmp" -#incbin "Dmp/Hardin_Thorn_palette.dmp" -#incbin "Dmp/Hardin_Thorn_minimug.dmp" +HardinMugData: +#incbin "png/FE1FE3FE11FE12/Hardin_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Hardin_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Hardin_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Hardin_Thorn_minimug.dmp" #ifndef HardinMug - #define HardinMug (FirstMugID+162) + #define HardinMug (FirstMugID+163) #endif -setMugEntry(HardinMug, Hardin_ThornMugData, 2, 5, 2, 3) +setMugEntry(HardinMug, HardinMugData, 2, 5, 2, 3) ALIGN 4 -Horace_ThornMugData: -#incbin "Dmp/Horace_Thorn_mug.dmp" -#incbin "Dmp/Horace_Thorn_frames.dmp" -#incbin "Dmp/Horace_Thorn_palette.dmp" -#incbin "Dmp/Horace_Thorn_minimug.dmp" +HoraceMugData: +#incbin "png/FE1FE3FE11FE12/Horace_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Horace_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Horace_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Horace_Thorn_minimug.dmp" #ifndef HoraceMug - #define HoraceMug (FirstMugID+163) + #define HoraceMug (FirstMugID+164) #endif -setMugEntry(HoraceMug, Horace_ThornMugData, 3, 5, 3, 3) +setMugEntry(HoraceMug, HoraceMugData, 3, 5, 3, 3) ALIGN 4 -Jagen_ThornMugData: -#incbin "Dmp/Jagen_Thorn_mug.dmp" -#incbin "Dmp/Jagen_Thorn_frames.dmp" -#incbin "Dmp/Jagen_Thorn_palette.dmp" -#incbin "Dmp/Jagen_Thorn_minimug.dmp" +JagenMugData: +#incbin "png/FE1FE3FE11FE12/Jagen_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Jagen_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Jagen_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Jagen_Thorn_minimug.dmp" #ifndef JagenMug - #define JagenMug (FirstMugID+164) + #define JagenMug (FirstMugID+165) #endif -setMugEntry(JagenMug, Jagen_ThornMugData, 2, 5, 2, 2) +setMugEntry(JagenMug, JagenMugData, 2, 5, 2, 2) ALIGN 4 -Jake_ThornMugData: -#incbin "Dmp/Jake_Thorn_mug.dmp" -#incbin "Dmp/Jake_Thorn_frames.dmp" -#incbin "Dmp/Jake_Thorn_palette.dmp" -#incbin "Dmp/Jake_Thorn_minimug.dmp" +JakeMugData: +#incbin "png/FE1FE3FE11FE12/Jake_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Jake_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Jake_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Jake_Thorn_minimug.dmp" #ifndef JakeMug - #define JakeMug (FirstMugID+165) + #define JakeMug (FirstMugID+166) #endif -setMugEntry(JakeMug, Jake_ThornMugData, 4, 5, 4, 3) +setMugEntry(JakeMug, JakeMugData, 4, 5, 4, 3) ALIGN 4 -Jeorge_ThornMugData: -#incbin "Dmp/Jeorge_Thorn_mug.dmp" -#incbin "Dmp/Jeorge_Thorn_frames.dmp" -#incbin "Dmp/Jeorge_Thorn_palette.dmp" -#incbin "Dmp/Jeorge_Thorn_minimug.dmp" +JeorgeMugData: +#incbin "png/FE1FE3FE11FE12/Jeorge_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Jeorge_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Jeorge_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Jeorge_Thorn_minimug.dmp" #ifndef JeorgeMug - #define JeorgeMug (FirstMugID+166) + #define JeorgeMug (FirstMugID+167) #endif -setMugEntry(JeorgeMug, Jeorge_ThornMugData, 4, 6, 3, 3) +setMugEntry(JeorgeMug, JeorgeMugData, 4, 6, 3, 3) ALIGN 4 -Jubelo_RohanMugData: -#incbin "Dmp/Jubelo_Rohan_mug.dmp" -#incbin "Dmp/Jubelo_Rohan_frames.dmp" -#incbin "Dmp/Jubelo_Rohan_palette.dmp" -#incbin "Dmp/Jubelo_Rohan_minimug.dmp" +JubeloMugData: +#incbin "png/FE1FE3FE11FE12/Jubelo_Rohan_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Jubelo_Rohan_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Jubelo_Rohan_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Jubelo_Rohan_minimug.dmp" #ifndef JubeloMug - #define JubeloMug (FirstMugID+167) + #define JubeloMug (FirstMugID+168) #endif -setMugEntry(JubeloMug, Jubelo_RohanMugData, 3, 7, 3, 5) +setMugEntry(JubeloMug, JubeloMugData, 3, 7, 3, 5) ALIGN 4 -Julian_ThornMugData: -#incbin "Dmp/Julian_Thorn_mug.dmp" -#incbin "Dmp/Julian_Thorn_frames.dmp" -#incbin "Dmp/Julian_Thorn_palette.dmp" -#incbin "Dmp/Julian_Thorn_minimug.dmp" +JulianMugData: +#incbin "png/FE1FE3FE11FE12/Julian_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Julian_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Julian_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Julian_Thorn_minimug.dmp" #ifndef JulianMug - #define JulianMug (FirstMugID+168) + #define JulianMug (FirstMugID+169) #endif -setMugEntry(JulianMug, Julian_ThornMugData, 4, 5, 4, 3) +setMugEntry(JulianMug, JulianMugData, 4, 5, 4, 3) ALIGN 4 -Katarina_Obsidian_DaddyMugData: -#incbin "Dmp/Katarina_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Katarina_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Katarina_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Katarina_Obsidian_Daddy_minimug.dmp" +KatarinaMugData: +#incbin "png/FE1FE3FE11FE12/Katarina_Obsidian_Daddy_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Katarina_Obsidian_Daddy_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Katarina_Obsidian_Daddy_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Katarina_Obsidian_Daddy_minimug.dmp" #ifndef KatarinaMug - #define KatarinaMug (FirstMugID+169) + #define KatarinaMug (FirstMugID+170) #endif -setMugEntry(KatarinaMug, Katarina_Obsidian_DaddyMugData, 2, 5, 3, 3) +setMugEntry(KatarinaMug, KatarinaMugData, 2, 5, 3, 3) ALIGN 4 -Kris_Atey_ArcthMugData: -#incbin "Dmp/Kris_Atey_Arcth_mug.dmp" -#incbin "Dmp/Kris_Atey_Arcth_frames.dmp" -#incbin "Dmp/Kris_Atey_Arcth_palette.dmp" -#incbin "Dmp/Kris_Atey_Arcth_minimug.dmp" +KrisMugData: +#incbin "png/FE1FE3FE11FE12/Kris_Atey_Arcth_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Kris_Atey_Arcth_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Kris_Atey_Arcth_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Kris_Atey_Arcth_minimug.dmp" #ifndef KrisMug - #define KrisMug (FirstMugID+170) + #define KrisMug (FirstMugID+171) #endif -setMugEntry(KrisMug, Kris_Atey_ArcthMugData, 3, 5, 3, 3) +setMugEntry(KrisMug, KrisMugData, 3, 5, 3, 3) ALIGN 4 -Lena_ThornMugData: -#incbin "Dmp/Lena_Thorn_mug.dmp" -#incbin "Dmp/Lena_Thorn_frames.dmp" -#incbin "Dmp/Lena_Thorn_palette.dmp" -#incbin "Dmp/Lena_Thorn_minimug.dmp" +LenaMugData: +#incbin "png/FE1FE3FE11FE12/Lena_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Lena_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Lena_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Lena_Thorn_minimug.dmp" #ifndef LenaMug - #define LenaMug (FirstMugID+171) + #define LenaMug (FirstMugID+172) #endif -setMugEntry(LenaMug, Lena_ThornMugData, 4, 5, 4, 3) +setMugEntry(LenaMug, LenaMugData, 4, 5, 4, 3) ALIGN 4 -Linde_MK404MugData: -#incbin "Dmp/Linde_MK404_mug.dmp" -#incbin "Dmp/Linde_MK404_frames.dmp" -#incbin "Dmp/Linde_MK404_palette.dmp" -#incbin "Dmp/Linde_MK404_minimug.dmp" +LindeMugData: +#incbin "png/FE1FE3FE11FE12/Linde_MK404_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Linde_MK404_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Linde_MK404_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Linde_MK404_minimug.dmp" #ifndef LindeMug - #define LindeMug (FirstMugID+172) + #define LindeMug (FirstMugID+173) #endif -setMugEntry(LindeMug, Linde_MK404MugData, 3, 6, 3, 4) +setMugEntry(LindeMug, LindeMugData, 3, 6, 3, 4) ALIGN 4 -Lorenz_Sterling_GlovnerMugData: -#incbin "Dmp/Lorenz_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Lorenz_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Lorenz_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Lorenz_Sterling_Glovner_minimug.dmp" +LorenzMugData: +#incbin "png/FE1FE3FE11FE12/Lorenz_Sterling_Glovner_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Lorenz_Sterling_Glovner_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Lorenz_Sterling_Glovner_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Lorenz_Sterling_Glovner_minimug.dmp" #ifndef LorenzMug - #define LorenzMug (FirstMugID+173) + #define LorenzMug (FirstMugID+174) #endif -setMugEntry(LorenzMug, Lorenz_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(LorenzMug, LorenzMugData, 3, 5, 3, 3) ALIGN 4 -Macellan_ThornMugData: -#incbin "Dmp/Macellan_Thorn_mug.dmp" -#incbin "Dmp/Macellan_Thorn_frames.dmp" -#incbin "Dmp/Macellan_Thorn_palette.dmp" -#incbin "Dmp/Macellan_Thorn_minimug.dmp" +MacellanMugData: +#incbin "png/FE1FE3FE11FE12/Macellan_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Macellan_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Macellan_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Macellan_Thorn_minimug.dmp" #ifndef MacellanMug - #define MacellanMug (FirstMugID+174) + #define MacellanMug (FirstMugID+175) #endif -setMugEntry(MacellanMug, Macellan_ThornMugData, 5, 4, 5, 2) +setMugEntry(MacellanMug, MacellanMugData, 5, 4, 5, 2) ALIGN 4 -Malice_LuminescentbladeMugData: -#incbin "Dmp/Malice_Luminescentblade_mug.dmp" -#incbin "Dmp/Malice_Luminescentblade_frames.dmp" -#incbin "Dmp/Malice_Luminescentblade_palette.dmp" -#incbin "Dmp/Malice_Luminescentblade_minimug.dmp" +MaliceMugData: +#incbin "png/FE1FE3FE11FE12/Malice_Luminescentblade_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Malice_Luminescentblade_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Malice_Luminescentblade_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Malice_Luminescentblade_minimug.dmp" #ifndef MaliceMug - #define MaliceMug (FirstMugID+175) + #define MaliceMug (FirstMugID+176) #endif -setMugEntry(MaliceMug, Malice_LuminescentbladeMugData, 4, 4, 4, 2) +setMugEntry(MaliceMug, MaliceMugData, 4, 4, 4, 2) ALIGN 4 -Maria_RedBean_F2EMugData: -#incbin "Dmp/Maria_RedBean_F2E_mug.dmp" -#incbin "Dmp/Maria_RedBean_F2E_frames.dmp" -#incbin "Dmp/Maria_RedBean_F2E_palette.dmp" -#incbin "Dmp/Maria_RedBean_F2E_minimug.dmp" +MariaMugData: +#incbin "png/FE1FE3FE11FE12/Maria_RedBean_F2E_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Maria_RedBean_F2E_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Maria_RedBean_F2E_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Maria_RedBean_F2E_minimug.dmp" #ifndef MariaMug - #define MariaMug (FirstMugID+176) + #define MariaMug (FirstMugID+177) #endif -setMugEntry(MariaMug, Maria_RedBean_F2EMugData, 2, 7, 3, 5) +setMugEntry(MariaMug, MariaMugData, 2, 7, 3, 5) ALIGN 4 -Marisha_GarytopMugData: -#incbin "Dmp/Marisha_Garytop_mug.dmp" -#incbin "Dmp/Marisha_Garytop_frames.dmp" -#incbin "Dmp/Marisha_Garytop_palette.dmp" -#incbin "Dmp/Marisha_Garytop_minimug.dmp" +MarishaMugData: +#incbin "png/FE1FE3FE11FE12/Marisha_Garytop_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Marisha_Garytop_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Marisha_Garytop_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Marisha_Garytop_minimug.dmp" #ifndef MarishaMug - #define MarishaMug (FirstMugID+177) + #define MarishaMug (FirstMugID+178) #endif -setMugEntry(MarishaMug, Marisha_GarytopMugData, 3, 6, 3, 4) +setMugEntry(MarishaMug, MarishaMugData, 3, 6, 3, 4) ALIGN 4 -Marth_BatimaTheBatMugData: -#incbin "Dmp/Marth_BatimaTheBat_mug.dmp" -#incbin "Dmp/Marth_BatimaTheBat_frames.dmp" -#incbin "Dmp/Marth_BatimaTheBat_palette.dmp" -#incbin "Dmp/Marth_BatimaTheBat_minimug.dmp" +MarthMugData: +#incbin "png/FE1FE3FE11FE12/Marth_BatimaTheBat_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Marth_BatimaTheBat_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Marth_BatimaTheBat_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Marth_BatimaTheBat_minimug.dmp" #ifndef MarthMug - #define MarthMug (FirstMugID+178) + #define MarthMug (FirstMugID+179) #endif -setMugEntry(MarthMug, Marth_BatimaTheBatMugData, 2, 5, 3, 3) +setMugEntry(MarthMug, MarthMugData, 2, 5, 3, 3) ALIGN 4 -Matthis_ThornMugData: -#incbin "Dmp/Matthis_Thorn_mug.dmp" -#incbin "Dmp/Matthis_Thorn_frames.dmp" -#incbin "Dmp/Matthis_Thorn_palette.dmp" -#incbin "Dmp/Matthis_Thorn_minimug.dmp" +MatthisMugData: +#incbin "png/FE1FE3FE11FE12/Matthis_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Matthis_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Matthis_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Matthis_Thorn_minimug.dmp" #ifndef MatthisMug - #define MatthisMug (FirstMugID+179) + #define MatthisMug (FirstMugID+180) #endif -setMugEntry(MatthisMug, Matthis_ThornMugData, 3, 5, 3, 3) +setMugEntry(MatthisMug, MatthisMugData, 3, 5, 3, 3) ALIGN 4 -Merric_ThornMugData: -#incbin "Dmp/Merric_Thorn_mug.dmp" -#incbin "Dmp/Merric_Thorn_frames.dmp" -#incbin "Dmp/Merric_Thorn_palette.dmp" -#incbin "Dmp/Merric_Thorn_minimug.dmp" +MerricMugData: +#incbin "png/FE1FE3FE11FE12/Merric_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Merric_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Merric_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Merric_Thorn_minimug.dmp" #ifndef MerricMug - #define MerricMug (FirstMugID+180) + #define MerricMug (FirstMugID+181) #endif -setMugEntry(MerricMug, Merric_ThornMugData, 3, 5, 3, 3) +setMugEntry(MerricMug, MerricMugData, 3, 5, 3, 3) ALIGN 4 -Michalis_Version_2_BuskHuskerMugData: -#incbin "Dmp/Michalis_Version_2_BuskHusker_mug.dmp" -#incbin "Dmp/Michalis_Version_2_BuskHusker_frames.dmp" -#incbin "Dmp/Michalis_Version_2_BuskHusker_palette.dmp" -#incbin "Dmp/Michalis_Version_2_BuskHusker_minimug.dmp" +MichalisMugData: +#incbin "png/FE1FE3FE11FE12/Michalis_Version_2_BuskHusker_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Michalis_Version_2_BuskHusker_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Michalis_Version_2_BuskHusker_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Michalis_Version_2_BuskHusker_minimug.dmp" #ifndef MichalisMug - #define MichalisMug (FirstMugID+181) + #define MichalisMug (FirstMugID+182) #endif -setMugEntry(MichalisMug, Michalis_Version_2_BuskHuskerMugData, 3, 4, 3, 2) +setMugEntry(MichalisMug, MichalisMugData, 3, 4, 3, 2) ALIGN 4 -Midia_VilkMugData: -#incbin "Dmp/Midia_Vilk_mug.dmp" -#incbin "Dmp/Midia_Vilk_frames.dmp" -#incbin "Dmp/Midia_Vilk_palette.dmp" -#incbin "Dmp/Midia_Vilk_minimug.dmp" +MidiaMugData: +#incbin "png/FE1FE3FE11FE12/Midia_Vilk_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Midia_Vilk_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Midia_Vilk_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Midia_Vilk_minimug.dmp" #ifndef MidiaMug - #define MidiaMug (FirstMugID+182) + #define MidiaMug (FirstMugID+183) #endif -setMugEntry(MidiaMug, Midia_VilkMugData, 2, 6, 3, 4) +setMugEntry(MidiaMug, MidiaMugData, 2, 6, 3, 4) ALIGN 4 -Minerva_WasdyeMugData: -#incbin "Dmp/Minerva_Wasdye_mug.dmp" -#incbin "Dmp/Minerva_Wasdye_frames.dmp" -#incbin "Dmp/Minerva_Wasdye_palette.dmp" -#incbin "Dmp/Minerva_Wasdye_minimug.dmp" +MinervaMugData: +#incbin "png/FE1FE3FE11FE12/Minerva_Wasdye_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Minerva_Wasdye_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Minerva_Wasdye_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Minerva_Wasdye_minimug.dmp" #ifndef MinervaMug - #define MinervaMug (FirstMugID+183) + #define MinervaMug (FirstMugID+184) #endif -setMugEntry(MinervaMug, Minerva_WasdyeMugData, 3, 5, 3, 3) +setMugEntry(MinervaMug, MinervaMugData, 3, 5, 3, 3) ALIGN 4 -Nagi_ThornMugData: -#incbin "Dmp/Nagi_Thorn_mug.dmp" -#incbin "Dmp/Nagi_Thorn_frames.dmp" -#incbin "Dmp/Nagi_Thorn_palette.dmp" -#incbin "Dmp/Nagi_Thorn_minimug.dmp" +NagiMugData: +#incbin "png/FE1FE3FE11FE12/Nagi_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Nagi_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Nagi_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Nagi_Thorn_minimug.dmp" #ifndef NagiMug - #define NagiMug (FirstMugID+184) + #define NagiMug (FirstMugID+185) #endif -setMugEntry(NagiMug, Nagi_ThornMugData, 2, 4, 2, 2) +setMugEntry(NagiMug, NagiMugData, 2, 4, 2, 2) ALIGN 4 -Navarre_version_1_BuskHuskerMugData: -#incbin "Dmp/Navarre_version_1_BuskHusker_mug.dmp" -#incbin "Dmp/Navarre_version_1_BuskHusker_frames.dmp" -#incbin "Dmp/Navarre_version_1_BuskHusker_palette.dmp" -#incbin "Dmp/Navarre_version_1_BuskHusker_minimug.dmp" +NavarreMugData: +#incbin "png/FE1FE3FE11FE12/Navarre_version_1_BuskHusker_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Navarre_version_1_BuskHusker_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Navarre_version_1_BuskHusker_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Navarre_version_1_BuskHusker_minimug.dmp" #ifndef NavarreMug - #define NavarreMug (FirstMugID+185) + #define NavarreMug (FirstMugID+186) #endif -setMugEntry(NavarreMug, Navarre_version_1_BuskHuskerMugData, 3, 5, 3, 3) +setMugEntry(NavarreMug, NavarreMugData, 3, 5, 3, 3) ALIGN 4 -Norne_MK404_NicktMugData: -#incbin "Dmp/Norne_MK404_Nickt_mug.dmp" -#incbin "Dmp/Norne_MK404_Nickt_frames.dmp" -#incbin "Dmp/Norne_MK404_Nickt_palette.dmp" -#incbin "Dmp/Norne_MK404_Nickt_minimug.dmp" +NorneMugData: +#incbin "png/FE1FE3FE11FE12/Norne_MK404_Nickt_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Norne_MK404_Nickt_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Norne_MK404_Nickt_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Norne_MK404_Nickt_minimug.dmp" #ifndef NorneMug - #define NorneMug (FirstMugID+186) + #define NorneMug (FirstMugID+187) #endif -setMugEntry(NorneMug, Norne_MK404_NicktMugData, 2, 5, 2, 3) +setMugEntry(NorneMug, NorneMugData, 2, 5, 2, 3) ALIGN 4 -Nyna_SquidorskyMugData: -#incbin "Dmp/Nyna_Squidorsky_mug.dmp" -#incbin "Dmp/Nyna_Squidorsky_frames.dmp" -#incbin "Dmp/Nyna_Squidorsky_palette.dmp" -#incbin "Dmp/Nyna_Squidorsky_minimug.dmp" +NynaMugData: +#incbin "png/FE1FE3FE11FE12/Nyna_Squidorsky_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Nyna_Squidorsky_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Nyna_Squidorsky_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Nyna_Squidorsky_minimug.dmp" #ifndef NynaMug - #define NynaMug (FirstMugID+187) + #define NynaMug (FirstMugID+188) #endif -setMugEntry(NynaMug, Nyna_SquidorskyMugData, 3, 6, 3, 4) +setMugEntry(NynaMug, NynaMugData, 3, 6, 3, 4) ALIGN 4 -Ogma_CircleEverywhere_NicktMugData: -#incbin "Dmp/Ogma_CircleEverywhere_Nickt_mug.dmp" -#incbin "Dmp/Ogma_CircleEverywhere_Nickt_frames.dmp" -#incbin "Dmp/Ogma_CircleEverywhere_Nickt_palette.dmp" -#incbin "Dmp/Ogma_CircleEverywhere_Nickt_minimug.dmp" +OgmaMugData: +#incbin "png/FE1FE3FE11FE12/Ogma_CircleEverywhere_Nickt_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Ogma_CircleEverywhere_Nickt_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Ogma_CircleEverywhere_Nickt_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Ogma_CircleEverywhere_Nickt_minimug.dmp" #ifndef OgmaMug - #define OgmaMug (FirstMugID+188) + #define OgmaMug (FirstMugID+189) #endif -setMugEntry(OgmaMug, Ogma_CircleEverywhere_NicktMugData, 2, 5, 2, 3) +setMugEntry(OgmaMug, OgmaMugData, 2, 5, 2, 3) ALIGN 4 -Palla_Obsidian_DaddyMugData: -#incbin "Dmp/Palla_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Palla_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Palla_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Palla_Obsidian_Daddy_minimug.dmp" +PallaMugData: +#incbin "png/FE1FE3FE11FE12/Palla_Obsidian_Daddy_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Palla_Obsidian_Daddy_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Palla_Obsidian_Daddy_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Palla_Obsidian_Daddy_minimug.dmp" #ifndef PallaMug - #define PallaMug (FirstMugID+189) + #define PallaMug (FirstMugID+190) #endif -setMugEntry(PallaMug, Palla_Obsidian_DaddyMugData, 2, 5, 3, 4) +setMugEntry(PallaMug, PallaMugData, 2, 5, 3, 4) ALIGN 4 -Phina_BatimaTheBatMugData: -#incbin "Dmp/Phina_BatimaTheBat_mug.dmp" -#incbin "Dmp/Phina_BatimaTheBat_frames.dmp" -#incbin "Dmp/Phina_BatimaTheBat_palette.dmp" -#incbin "Dmp/Phina_BatimaTheBat_minimug.dmp" +PhinaMugData: +#incbin "png/FE1FE3FE11FE12/Phina_BatimaTheBat_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Phina_BatimaTheBat_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Phina_BatimaTheBat_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Phina_BatimaTheBat_minimug.dmp" #ifndef PhinaMug - #define PhinaMug (FirstMugID+190) + #define PhinaMug (FirstMugID+191) #endif -setMugEntry(PhinaMug, Phina_BatimaTheBatMugData, 2, 6, 2, 4) +setMugEntry(PhinaMug, PhinaMugData, 2, 6, 2, 4) ALIGN 4 -Radd_version_1_ZoruaMugData: -#incbin "Dmp/Radd_version_1_Zorua_mug.dmp" -#incbin "Dmp/Radd_version_1_Zorua_frames.dmp" -#incbin "Dmp/Radd_version_1_Zorua_palette.dmp" -#incbin "Dmp/Radd_version_1_Zorua_minimug.dmp" +RaddMugData: +#incbin "png/FE1FE3FE11FE12/Radd_version_1_Zorua_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Radd_version_1_Zorua_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Radd_version_1_Zorua_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Radd_version_1_Zorua_minimug.dmp" #ifndef RaddMug - #define RaddMug (FirstMugID+191) + #define RaddMug (FirstMugID+192) #endif -setMugEntry(RaddMug, Radd_version_1_ZoruaMugData, 2, 6, 3, 4) +setMugEntry(RaddMug, RaddMugData, 2, 6, 3, 4) ALIGN 4 -Rickard_ThornMugData: -#incbin "Dmp/Rickard_Thorn_mug.dmp" -#incbin "Dmp/Rickard_Thorn_frames.dmp" -#incbin "Dmp/Rickard_Thorn_palette.dmp" -#incbin "Dmp/Rickard_Thorn_minimug.dmp" +RickardMugData: +#incbin "png/FE1FE3FE11FE12/Rickard_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Rickard_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Rickard_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Rickard_Thorn_minimug.dmp" #ifndef RickardMug - #define RickardMug (FirstMugID+192) + #define RickardMug (FirstMugID+193) #endif -setMugEntry(RickardMug, Rickard_ThornMugData, 4, 5, 4, 3) +setMugEntry(RickardMug, RickardMugData, 4, 5, 4, 3) ALIGN 4 -Roger_ThornMugData: -#incbin "Dmp/Roger_Thorn_mug.dmp" -#incbin "Dmp/Roger_Thorn_frames.dmp" -#incbin "Dmp/Roger_Thorn_palette.dmp" -#incbin "Dmp/Roger_Thorn_minimug.dmp" +RogerMugData: +#incbin "png/FE1FE3FE11FE12/Roger_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Roger_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Roger_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Roger_Thorn_minimug.dmp" #ifndef RogerMug - #define RogerMug (FirstMugID+193) + #define RogerMug (FirstMugID+194) #endif -setMugEntry(RogerMug, Roger_ThornMugData, 2, 5, 3, 3) +setMugEntry(RogerMug, RogerMugData, 2, 5, 3, 3) ALIGN 4 -Roshea_Alusq_DerTheVaporeonMugData: -#incbin "Dmp/Roshea_Alusq_DerTheVaporeon_mug.dmp" -#incbin "Dmp/Roshea_Alusq_DerTheVaporeon_frames.dmp" -#incbin "Dmp/Roshea_Alusq_DerTheVaporeon_palette.dmp" -#incbin "Dmp/Roshea_Alusq_DerTheVaporeon_minimug.dmp" +RosheaMugData: +#incbin "png/FE1FE3FE11FE12/Roshea_Alusq_DerTheVaporeon_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Roshea_Alusq_DerTheVaporeon_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Roshea_Alusq_DerTheVaporeon_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Roshea_Alusq_DerTheVaporeon_minimug.dmp" #ifndef RosheaMug - #define RosheaMug (FirstMugID+194) + #define RosheaMug (FirstMugID+195) #endif -setMugEntry(RosheaMug, Roshea_Alusq_DerTheVaporeonMugData, 2, 5, 2, 3) +setMugEntry(RosheaMug, RosheaMugData, 2, 5, 2, 3) ALIGN 4 -Samson_ThornMugData: -#incbin "Dmp/Samson_Thorn_mug.dmp" -#incbin "Dmp/Samson_Thorn_frames.dmp" -#incbin "Dmp/Samson_Thorn_palette.dmp" -#incbin "Dmp/Samson_Thorn_minimug.dmp" +SamsonMugData: +#incbin "png/FE1FE3FE11FE12/Samson_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Samson_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Samson_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Samson_Thorn_minimug.dmp" #ifndef SamsonMug - #define SamsonMug (FirstMugID+195) + #define SamsonMug (FirstMugID+196) #endif -setMugEntry(SamsonMug, Samson_ThornMugData, 2, 5, 2, 3) +setMugEntry(SamsonMug, SamsonMugData, 2, 5, 2, 3) ALIGN 4 -Samuel_Renoud_Xenith_Card_FEier_Blueey_NicktMugData: -#incbin "Dmp/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_mug.dmp" -#incbin "Dmp/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_frames.dmp" -#incbin "Dmp/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_palette.dmp" -#incbin "Dmp/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_minimug.dmp" +SamuelMugData: +#incbin "png/FE1FE3FE11FE12/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Samuel_Renoud_Xenith_Card_FEier_Blueey_Nickt_minimug.dmp" #ifndef SamuelMug - #define SamuelMug (FirstMugID+196) + #define SamuelMug (FirstMugID+197) #endif -setMugEntry(SamuelMug, Samuel_Renoud_Xenith_Card_FEier_Blueey_NicktMugData, 4, 5, 4, 3) +setMugEntry(SamuelMug, SamuelMugData, 4, 5, 4, 3) ALIGN 4 -Sedgar_DerTheVaporeonMugData: -#incbin "Dmp/Sedgar_DerTheVaporeon_mug.dmp" -#incbin "Dmp/Sedgar_DerTheVaporeon_frames.dmp" -#incbin "Dmp/Sedgar_DerTheVaporeon_palette.dmp" -#incbin "Dmp/Sedgar_DerTheVaporeon_minimug.dmp" +SedgarMugData: +#incbin "png/FE1FE3FE11FE12/Sedgar_DerTheVaporeon_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Sedgar_DerTheVaporeon_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Sedgar_DerTheVaporeon_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Sedgar_DerTheVaporeon_minimug.dmp" #ifndef SedgarMug - #define SedgarMug (FirstMugID+197) + #define SedgarMug (FirstMugID+198) #endif -setMugEntry(SedgarMug, Sedgar_DerTheVaporeonMugData, 2, 5, 3, 3) +setMugEntry(SedgarMug, SedgarMugData, 2, 5, 3, 3) ALIGN 4 -Sheena_BuskHuskerMugData: -#incbin "Dmp/Sheena_BuskHusker_mug.dmp" -#incbin "Dmp/Sheena_BuskHusker_frames.dmp" -#incbin "Dmp/Sheena_BuskHusker_palette.dmp" -#incbin "Dmp/Sheena_BuskHusker_minimug.dmp" +SheenaMugData: +#incbin "png/FE1FE3FE11FE12/Sheena_BuskHusker_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Sheena_BuskHusker_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Sheena_BuskHusker_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Sheena_BuskHusker_minimug.dmp" #ifndef SheenaMug - #define SheenaMug (FirstMugID+198) + #define SheenaMug (FirstMugID+199) #endif -setMugEntry(SheenaMug, Sheena_BuskHuskerMugData, 3, 5, 3, 3) +setMugEntry(SheenaMug, SheenaMugData, 3, 5, 3, 3) ALIGN 4 -Sirius_AteyMugData: -#incbin "Dmp/Sirius_Atey_mug.dmp" -#incbin "Dmp/Sirius_Atey_frames.dmp" -#incbin "Dmp/Sirius_Atey_palette.dmp" -#incbin "Dmp/Sirius_Atey_minimug.dmp" +SiriusMugData: +#incbin "png/FE1FE3FE11FE12/Sirius_Atey_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Sirius_Atey_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Sirius_Atey_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Sirius_Atey_minimug.dmp" #ifndef SiriusMug - #define SiriusMug (FirstMugID+199) + #define SiriusMug (FirstMugID+200) #endif -setMugEntry(SiriusMug, Sirius_AteyMugData, 4, 6, 4, 4) +setMugEntry(SiriusMug, SiriusMugData, 4, 6, 4, 4) ALIGN 4 -Tiki_version_2_BatimaTheBatMugData: -#incbin "Dmp/Tiki_version_2_BatimaTheBat_mug.dmp" -#incbin "Dmp/Tiki_version_2_BatimaTheBat_frames.dmp" -#incbin "Dmp/Tiki_version_2_BatimaTheBat_palette.dmp" -#incbin "Dmp/Tiki_version_2_BatimaTheBat_minimug.dmp" +TikiMugData: +#incbin "png/FE1FE3FE11FE12/Tiki_version_2_BatimaTheBat_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Tiki_version_2_BatimaTheBat_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Tiki_version_2_BatimaTheBat_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Tiki_version_2_BatimaTheBat_minimug.dmp" #ifndef TikiMug - #define TikiMug (FirstMugID+200) + #define TikiMug (FirstMugID+201) #endif -setMugEntry(TikiMug, Tiki_version_2_BatimaTheBatMugData, 2, 7, 2, 5) +setMugEntry(TikiMug, TikiMugData, 2, 7, 2, 5) ALIGN 4 -Tomas_ThornMugData: -#incbin "Dmp/Tomas_Thorn_mug.dmp" -#incbin "Dmp/Tomas_Thorn_frames.dmp" -#incbin "Dmp/Tomas_Thorn_palette.dmp" -#incbin "Dmp/Tomas_Thorn_minimug.dmp" +TomasMugData: +#incbin "png/FE1FE3FE11FE12/Tomas_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Tomas_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Tomas_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Tomas_Thorn_minimug.dmp" #ifndef TomasMug - #define TomasMug (FirstMugID+201) + #define TomasMug (FirstMugID+202) #endif -setMugEntry(TomasMug, Tomas_ThornMugData, 4, 5, 4, 3) +setMugEntry(TomasMug, TomasMugData, 4, 5, 4, 3) ALIGN 4 -Vyland_Zmr_Peerless_Blueey_NicktMugData: -#incbin "Dmp/Vyland_Zmr_Peerless_Blueey_Nickt_mug.dmp" -#incbin "Dmp/Vyland_Zmr_Peerless_Blueey_Nickt_frames.dmp" -#incbin "Dmp/Vyland_Zmr_Peerless_Blueey_Nickt_palette.dmp" -#incbin "Dmp/Vyland_Zmr_Peerless_Blueey_Nickt_minimug.dmp" +VylandMugData: +#incbin "png/FE1FE3FE11FE12/Vyland_Zmr_Peerless_Blueey_Nickt_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Vyland_Zmr_Peerless_Blueey_Nickt_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Vyland_Zmr_Peerless_Blueey_Nickt_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Vyland_Zmr_Peerless_Blueey_Nickt_minimug.dmp" #ifndef VylandMug - #define VylandMug (FirstMugID+202) + #define VylandMug (FirstMugID+203) #endif -setMugEntry(VylandMug, Vyland_Zmr_Peerless_Blueey_NicktMugData, 3, 5, 3, 3) +setMugEntry(VylandMug, VylandMugData, 3, 5, 3, 3) ALIGN 4 -Warren_Thorn_AthenaBaerMugData: -#incbin "Dmp/Warren_Thorn_AthenaBaer_mug.dmp" -#incbin "Dmp/Warren_Thorn_AthenaBaer_frames.dmp" -#incbin "Dmp/Warren_Thorn_AthenaBaer_palette.dmp" -#incbin "Dmp/Warren_Thorn_AthenaBaer_minimug.dmp" +WarrenMugData: +#incbin "png/FE1FE3FE11FE12/Warren_Thorn_AthenaBaer_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Warren_Thorn_AthenaBaer_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Warren_Thorn_AthenaBaer_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Warren_Thorn_AthenaBaer_minimug.dmp" #ifndef WarrenMug - #define WarrenMug (FirstMugID+203) + #define WarrenMug (FirstMugID+204) #endif -setMugEntry(WarrenMug, Warren_Thorn_AthenaBaerMugData, 4, 5, 3, 3) +setMugEntry(WarrenMug, WarrenMugData, 4, 5, 3, 3) ALIGN 4 -Wendell_ThornMugData: -#incbin "Dmp/Wendell_Thorn_mug.dmp" -#incbin "Dmp/Wendell_Thorn_frames.dmp" -#incbin "Dmp/Wendell_Thorn_palette.dmp" -#incbin "Dmp/Wendell_Thorn_minimug.dmp" +WendellMugData: +#incbin "png/FE1FE3FE11FE12/Wendell_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Wendell_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Wendell_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Wendell_Thorn_minimug.dmp" #ifndef WendellMug - #define WendellMug (FirstMugID+204) + #define WendellMug (FirstMugID+205) #endif -setMugEntry(WendellMug, Wendell_ThornMugData, 4, 6, 4, 4) +setMugEntry(WendellMug, WendellMugData, 4, 6, 4, 4) ALIGN 4 -Wolf_DerTheVaporeon_NicktMugData: -#incbin "Dmp/Wolf_DerTheVaporeon_Nickt_mug.dmp" -#incbin "Dmp/Wolf_DerTheVaporeon_Nickt_frames.dmp" -#incbin "Dmp/Wolf_DerTheVaporeon_Nickt_palette.dmp" -#incbin "Dmp/Wolf_DerTheVaporeon_Nickt_minimug.dmp" +WolfMugData: +#incbin "png/FE1FE3FE11FE12/Wolf_DerTheVaporeon_Nickt_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Wolf_DerTheVaporeon_Nickt_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Wolf_DerTheVaporeon_Nickt_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Wolf_DerTheVaporeon_Nickt_minimug.dmp" #ifndef WolfMug - #define WolfMug (FirstMugID+205) + #define WolfMug (FirstMugID+206) #endif -setMugEntry(WolfMug, Wolf_DerTheVaporeon_NicktMugData, 3, 5, 3, 3) +setMugEntry(WolfMug, WolfMugData, 3, 5, 3, 3) ALIGN 4 -Wrys_BlueyguyMugData: -#incbin "Dmp/Wrys_Blueyguy_mug.dmp" -#incbin "Dmp/Wrys_Blueyguy_frames.dmp" -#incbin "Dmp/Wrys_Blueyguy_palette.dmp" -#incbin "Dmp/Wrys_Blueyguy_minimug.dmp" +WrysMugData: +#incbin "png/FE1FE3FE11FE12/Wrys_Blueyguy_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Wrys_Blueyguy_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Wrys_Blueyguy_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Wrys_Blueyguy_minimug.dmp" #ifndef WrysMug - #define WrysMug (FirstMugID+206) + #define WrysMug (FirstMugID+207) #endif -setMugEntry(WrysMug, Wrys_BlueyguyMugData, 2, 5, 2, 3) +setMugEntry(WrysMug, WrysMugData, 2, 5, 2, 3) ALIGN 4 -Xane_ShadowFlygonMugData: -#incbin "Dmp/Xane_ShadowFlygon_mug.dmp" -#incbin "Dmp/Xane_ShadowFlygon_frames.dmp" -#incbin "Dmp/Xane_ShadowFlygon_palette.dmp" -#incbin "Dmp/Xane_ShadowFlygon_minimug.dmp" +XaneMugData: +#incbin "png/FE1FE3FE11FE12/Xane_ShadowFlygon_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Xane_ShadowFlygon_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Xane_ShadowFlygon_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Xane_ShadowFlygon_minimug.dmp" #ifndef XaneMug - #define XaneMug (FirstMugID+207) + #define XaneMug (FirstMugID+208) #endif -setMugEntry(XaneMug, Xane_ShadowFlygonMugData, 4, 6, 3, 4) +setMugEntry(XaneMug, XaneMugData, 4, 6, 3, 4) ALIGN 4 -Ymir_ThornMugData: -#incbin "Dmp/Ymir_Thorn_mug.dmp" -#incbin "Dmp/Ymir_Thorn_frames.dmp" -#incbin "Dmp/Ymir_Thorn_palette.dmp" -#incbin "Dmp/Ymir_Thorn_minimug.dmp" +YmirMugData: +#incbin "png/FE1FE3FE11FE12/Ymir_Thorn_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Ymir_Thorn_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Ymir_Thorn_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Ymir_Thorn_minimug.dmp" #ifndef YmirMug - #define YmirMug (FirstMugID+208) + #define YmirMug (FirstMugID+209) #endif -setMugEntry(YmirMug, Ymir_ThornMugData, 2, 4, 2, 2) +setMugEntry(YmirMug, YmirMugData, 2, 4, 2, 2) ALIGN 4 -Yuliya_DonkinDoMugData: -#incbin "Dmp/Yuliya_DonkinDo_mug.dmp" -#incbin "Dmp/Yuliya_DonkinDo_frames.dmp" -#incbin "Dmp/Yuliya_DonkinDo_palette.dmp" -#incbin "Dmp/Yuliya_DonkinDo_minimug.dmp" +YuliyaMugData: +#incbin "png/FE1FE3FE11FE12/Yuliya_DonkinDo_mug.dmp" +#incbin "png/FE1FE3FE11FE12/Yuliya_DonkinDo_frames.dmp" +#incbin "png/FE1FE3FE11FE12/Yuliya_DonkinDo_palette.dmp" +#incbin "png/FE1FE3FE11FE12/Yuliya_DonkinDo_minimug.dmp" #ifndef YuliyaMug - #define YuliyaMug (FirstMugID+209) + #define YuliyaMug (FirstMugID+210) #endif -setMugEntry(YuliyaMug, Yuliya_DonkinDoMugData, 2, 6, 3, 4) +setMugEntry(YuliyaMug, YuliyaMugData, 2, 6, 3, 4) ALIGN 4 -Alm_AteyMugData: -#incbin "Dmp/Alm_Atey_mug.dmp" -#incbin "Dmp/Alm_Atey_frames.dmp" -#incbin "Dmp/Alm_Atey_palette.dmp" -#incbin "Dmp/Alm_Atey_minimug.dmp" +AlmMugData: +#incbin "png/FE2FE15/Alm_Atey_mug.dmp" +#incbin "png/FE2FE15/Alm_Atey_frames.dmp" +#incbin "png/FE2FE15/Alm_Atey_palette.dmp" +#incbin "png/FE2FE15/Alm_Atey_minimug.dmp" #ifndef AlmMug - #define AlmMug (FirstMugID+210) + #define AlmMug (FirstMugID+211) #endif -setMugEntry(AlmMug, Alm_AteyMugData, 3, 6, 3, 4) +setMugEntry(AlmMug, AlmMugData, 3, 6, 3, 4) ALIGN 4 -Celica_AteyMugData: -#incbin "Dmp/Celica_Atey_mug.dmp" -#incbin "Dmp/Celica_Atey_frames.dmp" -#incbin "Dmp/Celica_Atey_palette.dmp" -#incbin "Dmp/Celica_Atey_minimug.dmp" +CelicaMugData: +#incbin "png/FE2FE15/Celica_Atey_mug.dmp" +#incbin "png/FE2FE15/Celica_Atey_frames.dmp" +#incbin "png/FE2FE15/Celica_Atey_palette.dmp" +#incbin "png/FE2FE15/Celica_Atey_minimug.dmp" #ifndef CelicaMug - #define CelicaMug (FirstMugID+211) + #define CelicaMug (FirstMugID+212) #endif -setMugEntry(CelicaMug, Celica_AteyMugData, 3, 6, 3, 4) +setMugEntry(CelicaMug, CelicaMugData, 3, 6, 3, 4) ALIGN 4 -Delthea_RedBeanMugData: -#incbin "Dmp/Delthea_RedBean_mug.dmp" -#incbin "Dmp/Delthea_RedBean_frames.dmp" -#incbin "Dmp/Delthea_RedBean_palette.dmp" -#incbin "Dmp/Delthea_RedBean_minimug.dmp" +DeltheaMugData: +#incbin "png/FE2FE15/Delthea_RedBean_mug.dmp" +#incbin "png/FE2FE15/Delthea_RedBean_frames.dmp" +#incbin "png/FE2FE15/Delthea_RedBean_palette.dmp" +#incbin "png/FE2FE15/Delthea_RedBean_minimug.dmp" #ifndef DeltheaMug - #define DeltheaMug (FirstMugID+212) + #define DeltheaMug (FirstMugID+213) #endif -setMugEntry(DeltheaMug, Delthea_RedBeanMugData, 2, 6, 3, 4) +setMugEntry(DeltheaMug, DeltheaMugData, 2, 6, 3, 4) ALIGN 4 -EstFe15_DiamondAppendixMugData: -#incbin "Dmp/EstFe15_DiamondAppendix_mug.dmp" -#incbin "Dmp/EstFe15_DiamondAppendix_frames.dmp" -#incbin "Dmp/EstFe15_DiamondAppendix_palette.dmp" -#incbin "Dmp/EstFe15_DiamondAppendix_minimug.dmp" +EstFe15MugData: +#incbin "png/FE2FE15/EstFe15_PlantAcademy_mug.dmp" +#incbin "png/FE2FE15/EstFe15_PlantAcademy_frames.dmp" +#incbin "png/FE2FE15/EstFe15_PlantAcademy_palette.dmp" +#incbin "png/FE2FE15/EstFe15_PlantAcademy_minimug.dmp" #ifndef EstFe15Mug - #define EstFe15Mug (FirstMugID+213) + #define EstFe15Mug (FirstMugID+214) #endif -setMugEntry(EstFe15Mug, EstFe15_DiamondAppendixMugData, 2, 6, 3, 4) +setMugEntry(EstFe15Mug, EstFe15MugData, 2, 6, 3, 4) ALIGN 4 -Genny_Orihara_SakiMugData: -#incbin "Dmp/Genny_Orihara_Saki_mug.dmp" -#incbin "Dmp/Genny_Orihara_Saki_frames.dmp" -#incbin "Dmp/Genny_Orihara_Saki_palette.dmp" -#incbin "Dmp/Genny_Orihara_Saki_minimug.dmp" +GennyMugData: +#incbin "png/FE2FE15/Genny_Orihara_Saki_mug.dmp" +#incbin "png/FE2FE15/Genny_Orihara_Saki_frames.dmp" +#incbin "png/FE2FE15/Genny_Orihara_Saki_palette.dmp" +#incbin "png/FE2FE15/Genny_Orihara_Saki_minimug.dmp" #ifndef GennyMug - #define GennyMug (FirstMugID+214) + #define GennyMug (FirstMugID+215) #endif -setMugEntry(GennyMug, Genny_Orihara_SakiMugData, 3, 6, 3, 4) +setMugEntry(GennyMug, GennyMugData, 3, 6, 3, 4) ALIGN 4 -Gray_Gaiden_style_GabrielKnightMugData: -#incbin "Dmp/Gray_Gaiden_style_GabrielKnight_mug.dmp" -#incbin "Dmp/Gray_Gaiden_style_GabrielKnight_frames.dmp" -#incbin "Dmp/Gray_Gaiden_style_GabrielKnight_palette.dmp" -#incbin "Dmp/Gray_Gaiden_style_GabrielKnight_minimug.dmp" +GrayMugData: +#incbin "png/FE2FE15/Gray_Gaiden_style_GabrielKnight_mug.dmp" +#incbin "png/FE2FE15/Gray_Gaiden_style_GabrielKnight_frames.dmp" +#incbin "png/FE2FE15/Gray_Gaiden_style_GabrielKnight_palette.dmp" +#incbin "png/FE2FE15/Gray_Gaiden_style_GabrielKnight_minimug.dmp" #ifndef GrayMug - #define GrayMug (FirstMugID+215) + #define GrayMug (FirstMugID+216) #endif -setMugEntry(GrayMug, Gray_Gaiden_style_GabrielKnightMugData, 3, 5, 3, 3) +setMugEntry(GrayMug, GrayMugData, 3, 5, 3, 3) ALIGN 4 -Kliff_Gaiden_style_GabrielKnightMugData: -#incbin "Dmp/Kliff_Gaiden_style_GabrielKnight_mug.dmp" -#incbin "Dmp/Kliff_Gaiden_style_GabrielKnight_frames.dmp" -#incbin "Dmp/Kliff_Gaiden_style_GabrielKnight_palette.dmp" -#incbin "Dmp/Kliff_Gaiden_style_GabrielKnight_minimug.dmp" +KliffMugData: +#incbin "png/FE2FE15/Kliff_Gaiden_style_GabrielKnight_mug.dmp" +#incbin "png/FE2FE15/Kliff_Gaiden_style_GabrielKnight_frames.dmp" +#incbin "png/FE2FE15/Kliff_Gaiden_style_GabrielKnight_palette.dmp" +#incbin "png/FE2FE15/Kliff_Gaiden_style_GabrielKnight_minimug.dmp" #ifndef KliffMug - #define KliffMug (FirstMugID+216) + #define KliffMug (FirstMugID+217) #endif -setMugEntry(KliffMug, Kliff_Gaiden_style_GabrielKnightMugData, 3, 6, 3, 4) +setMugEntry(KliffMug, KliffMugData, 3, 6, 3, 4) ALIGN 4 -Lukas_BladeMugData: -#incbin "Dmp/Lukas_Blade_mug.dmp" -#incbin "Dmp/Lukas_Blade_frames.dmp" -#incbin "Dmp/Lukas_Blade_palette.dmp" -#incbin "Dmp/Lukas_Blade_minimug.dmp" +LukasMugData: +#incbin "png/FE2FE15/Lukas_Blade_mug.dmp" +#incbin "png/FE2FE15/Lukas_Blade_frames.dmp" +#incbin "png/FE2FE15/Lukas_Blade_palette.dmp" +#incbin "png/FE2FE15/Lukas_Blade_minimug.dmp" #ifndef LukasMug - #define LukasMug (FirstMugID+217) + #define LukasMug (FirstMugID+218) #endif -setMugEntry(LukasMug, Lukas_BladeMugData, 3, 5, 3, 3) +setMugEntry(LukasMug, LukasMugData, 3, 5, 3, 3) ALIGN 4 -Mathilda_BuskHuskerMugData: -#incbin "Dmp/Mathilda_BuskHusker_mug.dmp" -#incbin "Dmp/Mathilda_BuskHusker_frames.dmp" -#incbin "Dmp/Mathilda_BuskHusker_palette.dmp" -#incbin "Dmp/Mathilda_BuskHusker_minimug.dmp" +MathildaMugData: +#incbin "png/FE2FE15/Mathilda_BuskHusker_mug.dmp" +#incbin "png/FE2FE15/Mathilda_BuskHusker_frames.dmp" +#incbin "png/FE2FE15/Mathilda_BuskHusker_palette.dmp" +#incbin "png/FE2FE15/Mathilda_BuskHusker_minimug.dmp" #ifndef MathildaMug - #define MathildaMug (FirstMugID+218) + #define MathildaMug (FirstMugID+219) #endif -setMugEntry(MathildaMug, Mathilda_BuskHuskerMugData, 2, 5, 2, 3) +setMugEntry(MathildaMug, MathildaMugData, 2, 5, 2, 3) ALIGN 4 -Python_NorikinsMugData: -#incbin "Dmp/Python_Norikins_mug.dmp" -#incbin "Dmp/Python_Norikins_frames.dmp" -#incbin "Dmp/Python_Norikins_palette.dmp" -#incbin "Dmp/Python_Norikins_minimug.dmp" +PythonMugData: +#incbin "png/FE2FE15/Python_Norikins_mug.dmp" +#incbin "png/FE2FE15/Python_Norikins_frames.dmp" +#incbin "png/FE2FE15/Python_Norikins_palette.dmp" +#incbin "png/FE2FE15/Python_Norikins_minimug.dmp" #ifndef PythonMug - #define PythonMug (FirstMugID+219) + #define PythonMug (FirstMugID+220) #endif -setMugEntry(PythonMug, Python_NorikinsMugData, 5, 6, 5, 4) +setMugEntry(PythonMug, PythonMugData, 5, 6, 5, 4) ALIGN 4 -Saber_What_Is_An_AubinMugData: -#incbin "Dmp/Saber_What_Is_An_Aubin_mug.dmp" -#incbin "Dmp/Saber_What_Is_An_Aubin_frames.dmp" -#incbin "Dmp/Saber_What_Is_An_Aubin_palette.dmp" -#incbin "Dmp/Saber_What_Is_An_Aubin_minimug.dmp" +SaberMugData: +#incbin "png/FE2FE15/Saber_What_Is_An_Aubin_mug.dmp" +#incbin "png/FE2FE15/Saber_What_Is_An_Aubin_frames.dmp" +#incbin "png/FE2FE15/Saber_What_Is_An_Aubin_palette.dmp" +#incbin "png/FE2FE15/Saber_What_Is_An_Aubin_minimug.dmp" #ifndef SaberMug - #define SaberMug (FirstMugID+220) + #define SaberMug (FirstMugID+221) #endif -setMugEntry(SaberMug, Saber_What_Is_An_AubinMugData, 3, 4, 3, 2) +setMugEntry(SaberMug, SaberMugData, 3, 4, 3, 2) ALIGN 4 -Silque_BladeMugData: -#incbin "Dmp/Silque_Blade_mug.dmp" -#incbin "Dmp/Silque_Blade_frames.dmp" -#incbin "Dmp/Silque_Blade_palette.dmp" -#incbin "Dmp/Silque_Blade_minimug.dmp" +SilqueMugData: +#incbin "png/FE2FE15/Silque_Blade_mug.dmp" +#incbin "png/FE2FE15/Silque_Blade_frames.dmp" +#incbin "png/FE2FE15/Silque_Blade_palette.dmp" +#incbin "png/FE2FE15/Silque_Blade_minimug.dmp" #ifndef SilqueMug - #define SilqueMug (FirstMugID+221) + #define SilqueMug (FirstMugID+222) #endif -setMugEntry(SilqueMug, Silque_BladeMugData, 3, 6, 3, 4) +setMugEntry(SilqueMug, SilqueMugData, 3, 6, 3, 4) ALIGN 4 -Sonya_WasdyeMugData: -#incbin "Dmp/Sonya_Wasdye_mug.dmp" -#incbin "Dmp/Sonya_Wasdye_frames.dmp" -#incbin "Dmp/Sonya_Wasdye_palette.dmp" -#incbin "Dmp/Sonya_Wasdye_minimug.dmp" +SonyaMugData: +#incbin "png/FE2FE15/Sonya_Wasdye_mug.dmp" +#incbin "png/FE2FE15/Sonya_Wasdye_frames.dmp" +#incbin "png/FE2FE15/Sonya_Wasdye_palette.dmp" +#incbin "png/FE2FE15/Sonya_Wasdye_minimug.dmp" #ifndef SonyaMug - #define SonyaMug (FirstMugID+222) + #define SonyaMug (FirstMugID+223) #endif -setMugEntry(SonyaMug, Sonya_WasdyeMugData, 4, 5, 4, 3) +setMugEntry(SonyaMug, SonyaMugData, 4, 5, 4, 3) ALIGN 4 -Tobin_Gaiden_style_GabrielKnightMugData: -#incbin "Dmp/Tobin_Gaiden_style_GabrielKnight_mug.dmp" -#incbin "Dmp/Tobin_Gaiden_style_GabrielKnight_frames.dmp" -#incbin "Dmp/Tobin_Gaiden_style_GabrielKnight_palette.dmp" -#incbin "Dmp/Tobin_Gaiden_style_GabrielKnight_minimug.dmp" +TobinMugData: +#incbin "png/FE2FE15/Tobin_Gaiden_style_GabrielKnight_mug.dmp" +#incbin "png/FE2FE15/Tobin_Gaiden_style_GabrielKnight_frames.dmp" +#incbin "png/FE2FE15/Tobin_Gaiden_style_GabrielKnight_palette.dmp" +#incbin "png/FE2FE15/Tobin_Gaiden_style_GabrielKnight_minimug.dmp" #ifndef TobinMug - #define TobinMug (FirstMugID+223) + #define TobinMug (FirstMugID+224) #endif -setMugEntry(TobinMug, Tobin_Gaiden_style_GabrielKnightMugData, 3, 5, 3, 3) +setMugEntry(TobinMug, TobinMugData, 3, 5, 3, 3) ALIGN 4 -Zeke_Garytop_F2EMugData: -#incbin "Dmp/Zeke_Garytop_F2E_mug.dmp" -#incbin "Dmp/Zeke_Garytop_F2E_frames.dmp" -#incbin "Dmp/Zeke_Garytop_F2E_palette.dmp" -#incbin "Dmp/Zeke_Garytop_F2E_minimug.dmp" +ZekeMugData: +#incbin "png/FE2FE15/Zeke_Garytop_F2E_mug.dmp" +#incbin "png/FE2FE15/Zeke_Garytop_F2E_frames.dmp" +#incbin "png/FE2FE15/Zeke_Garytop_F2E_palette.dmp" +#incbin "png/FE2FE15/Zeke_Garytop_F2E_minimug.dmp" #ifndef ZekeMug - #define ZekeMug (FirstMugID+224) + #define ZekeMug (FirstMugID+225) #endif -setMugEntry(ZekeMug, Zeke_Garytop_F2EMugData, 2, 4, 2, 2) +setMugEntry(ZekeMug, ZekeMugData, 2, 4, 2, 2) ALIGN 4 -Alec_AteyMugData: -#incbin "Dmp/Alec_Atey_mug.dmp" -#incbin "Dmp/Alec_Atey_frames.dmp" -#incbin "Dmp/Alec_Atey_palette.dmp" -#incbin "Dmp/Alec_Atey_minimug.dmp" +AlecMugData: +#incbin "png/FE4FE5/Alec_Atey_mug.dmp" +#incbin "png/FE4FE5/Alec_Atey_frames.dmp" +#incbin "png/FE4FE5/Alec_Atey_palette.dmp" +#incbin "png/FE4FE5/Alec_Atey_minimug.dmp" #ifndef AlecMug - #define AlecMug (FirstMugID+225) + #define AlecMug (FirstMugID+226) #endif -setMugEntry(AlecMug, Alec_AteyMugData, 3, 6, 3, 4) +setMugEntry(AlecMug, AlecMugData, 3, 6, 3, 4) ALIGN 4 -Aless_New_version_MeliaMugData: -#incbin "Dmp/Aless_New_version_Melia_mug.dmp" -#incbin "Dmp/Aless_New_version_Melia_frames.dmp" -#incbin "Dmp/Aless_New_version_Melia_palette.dmp" -#incbin "Dmp/Aless_New_version_Melia_minimug.dmp" +AlessMugData: +#incbin "png/FE4FE5/Aless_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Aless_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Aless_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Aless_New_version_Melia_minimug.dmp" #ifndef AlessMug - #define AlessMug (FirstMugID+226) + #define AlessMug (FirstMugID+227) #endif -setMugEntry(AlessMug, Aless_New_version_MeliaMugData, 3, 5, 3, 3) +setMugEntry(AlessMug, AlessMugData, 3, 5, 3, 3) ALIGN 4 -Altena_MeliaMugData: -#incbin "Dmp/Altena_Melia_mug.dmp" -#incbin "Dmp/Altena_Melia_frames.dmp" -#incbin "Dmp/Altena_Melia_palette.dmp" -#incbin "Dmp/Altena_Melia_minimug.dmp" +AltenaMugData: +#incbin "png/FE4FE5/Altena_Melia_mug.dmp" +#incbin "png/FE4FE5/Altena_Melia_frames.dmp" +#incbin "png/FE4FE5/Altena_Melia_palette.dmp" +#incbin "png/FE4FE5/Altena_Melia_minimug.dmp" #ifndef AltenaMug - #define AltenaMug (FirstMugID+227) + #define AltenaMug (FirstMugID+228) #endif -setMugEntry(AltenaMug, Altena_MeliaMugData, 2, 5, 2, 3) +setMugEntry(AltenaMug, AltenaMugData, 2, 5, 2, 3) ALIGN 4 -Alva_DongusMugData: -#incbin "Dmp/Alva_Dongus_mug.dmp" -#incbin "Dmp/Alva_Dongus_frames.dmp" -#incbin "Dmp/Alva_Dongus_palette.dmp" -#incbin "Dmp/Alva_Dongus_minimug.dmp" +AlvaMugData: +#incbin "png/FE4FE5/Alva_Dongus_mug.dmp" +#incbin "png/FE4FE5/Alva_Dongus_frames.dmp" +#incbin "png/FE4FE5/Alva_Dongus_palette.dmp" +#incbin "png/FE4FE5/Alva_Dongus_minimug.dmp" #ifndef AlvaMug - #define AlvaMug (FirstMugID+228) + #define AlvaMug (FirstMugID+229) #endif -setMugEntry(AlvaMug, Alva_DongusMugData, 3, 5, 3, 3) +setMugEntry(AlvaMug, AlvaMugData, 3, 5, 3, 3) ALIGN 4 -Amalda_Sterling_GlovnerMugData: -#incbin "Dmp/Amalda_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Amalda_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Amalda_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Amalda_Sterling_Glovner_minimug.dmp" +AmaldaMugData: +#incbin "png/FE4FE5/Amalda_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Amalda_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Amalda_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Amalda_Sterling_Glovner_minimug.dmp" #ifndef AmaldaMug - #define AmaldaMug (FirstMugID+229) + #define AmaldaMug (FirstMugID+230) #endif -setMugEntry(AmaldaMug, Amalda_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(AmaldaMug, AmaldaMugData, 3, 5, 3, 3) ALIGN 4 -Amid_MeliaMugData: -#incbin "Dmp/Amid_Melia_mug.dmp" -#incbin "Dmp/Amid_Melia_frames.dmp" -#incbin "Dmp/Amid_Melia_palette.dmp" -#incbin "Dmp/Amid_Melia_minimug.dmp" +AmidMugData: +#incbin "png/FE4FE5/Amid_Melia_mug.dmp" +#incbin "png/FE4FE5/Amid_Melia_frames.dmp" +#incbin "png/FE4FE5/Amid_Melia_palette.dmp" +#incbin "png/FE4FE5/Amid_Melia_minimug.dmp" #ifndef AmidMug - #define AmidMug (FirstMugID+230) + #define AmidMug (FirstMugID+231) #endif -setMugEntry(AmidMug, Amid_MeliaMugData, 4, 5, 4, 3) +setMugEntry(AmidMug, AmidMugData, 4, 5, 4, 3) ALIGN 4 -Arden_MarymoryMugData: -#incbin "Dmp/Arden_Marymory_mug.dmp" -#incbin "Dmp/Arden_Marymory_frames.dmp" -#incbin "Dmp/Arden_Marymory_palette.dmp" -#incbin "Dmp/Arden_Marymory_minimug.dmp" +ArdenMugData: +#incbin "png/FE4FE5/Arden_Marymory_mug.dmp" +#incbin "png/FE4FE5/Arden_Marymory_frames.dmp" +#incbin "png/FE4FE5/Arden_Marymory_palette.dmp" +#incbin "png/FE4FE5/Arden_Marymory_minimug.dmp" #ifndef ArdenMug - #define ArdenMug (FirstMugID+231) + #define ArdenMug (FirstMugID+232) #endif -setMugEntry(ArdenMug, Arden_MarymoryMugData, 2, 5, 3, 3) +setMugEntry(ArdenMug, ArdenMugData, 2, 5, 3, 3) ALIGN 4 -Arion_MeliaMugData: -#incbin "Dmp/Arion_Melia_mug.dmp" -#incbin "Dmp/Arion_Melia_frames.dmp" -#incbin "Dmp/Arion_Melia_palette.dmp" -#incbin "Dmp/Arion_Melia_minimug.dmp" +ArionMugData: +#incbin "png/FE4FE5/Arion_Melia_mug.dmp" +#incbin "png/FE4FE5/Arion_Melia_frames.dmp" +#incbin "png/FE4FE5/Arion_Melia_palette.dmp" +#incbin "png/FE4FE5/Arion_Melia_minimug.dmp" #ifndef ArionMug - #define ArionMug (FirstMugID+232) + #define ArionMug (FirstMugID+233) #endif -setMugEntry(ArionMug, Arion_MeliaMugData, 2, 5, 2, 3) +setMugEntry(ArionMug, ArionMugData, 2, 5, 2, 3) ALIGN 4 -Arthur_New_version_MeliaMugData: -#incbin "Dmp/Arthur_New_version_Melia_mug.dmp" -#incbin "Dmp/Arthur_New_version_Melia_frames.dmp" -#incbin "Dmp/Arthur_New_version_Melia_palette.dmp" -#incbin "Dmp/Arthur_New_version_Melia_minimug.dmp" +ArthurMugData: +#incbin "png/FE4FE5/Arthur_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Arthur_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Arthur_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Arthur_New_version_Melia_minimug.dmp" #ifndef ArthurMug - #define ArthurMug (FirstMugID+233) + #define ArthurMug (FirstMugID+234) #endif -setMugEntry(ArthurMug, Arthur_New_version_MeliaMugData, 3, 5, 3, 3) +setMugEntry(ArthurMug, ArthurMugData, 3, 5, 3, 3) ALIGN 4 -Arvis_AteyMugData: -#incbin "Dmp/Arvis_Atey_mug.dmp" -#incbin "Dmp/Arvis_Atey_frames.dmp" -#incbin "Dmp/Arvis_Atey_palette.dmp" -#incbin "Dmp/Arvis_Atey_minimug.dmp" +ArvisMugData: +#incbin "png/FE4FE5/Arvis_Atey_mug.dmp" +#incbin "png/FE4FE5/Arvis_Atey_frames.dmp" +#incbin "png/FE4FE5/Arvis_Atey_palette.dmp" +#incbin "png/FE4FE5/Arvis_Atey_minimug.dmp" #ifndef ArvisMug - #define ArvisMug (FirstMugID+234) + #define ArvisMug (FirstMugID+235) #endif -setMugEntry(ArvisMug, Arvis_AteyMugData, 3, 4, 3, 2) +setMugEntry(ArvisMug, ArvisMugData, 3, 4, 3, 2) ALIGN 4 -Asaello_MeliaMugData: -#incbin "Dmp/Asaello_Melia_mug.dmp" -#incbin "Dmp/Asaello_Melia_frames.dmp" -#incbin "Dmp/Asaello_Melia_palette.dmp" -#incbin "Dmp/Asaello_Melia_minimug.dmp" +AsaelloMugData: +#incbin "png/FE4FE5/Asaello_Melia_mug.dmp" +#incbin "png/FE4FE5/Asaello_Melia_frames.dmp" +#incbin "png/FE4FE5/Asaello_Melia_palette.dmp" +#incbin "png/FE4FE5/Asaello_Melia_minimug.dmp" #ifndef AsaelloMug - #define AsaelloMug (FirstMugID+235) + #define AsaelloMug (FirstMugID+236) #endif -setMugEntry(AsaelloMug, Asaello_MeliaMugData, 3, 5, 3, 3) +setMugEntry(AsaelloMug, AsaelloMugData, 3, 5, 3, 3) ALIGN 4 -Asbel_MeliaMugData: -#incbin "Dmp/Asbel_Melia_mug.dmp" -#incbin "Dmp/Asbel_Melia_frames.dmp" -#incbin "Dmp/Asbel_Melia_palette.dmp" -#incbin "Dmp/Asbel_Melia_minimug.dmp" +AsbelMugData: +#incbin "png/FE4FE5/Asbel_Melia_mug.dmp" +#incbin "png/FE4FE5/Asbel_Melia_frames.dmp" +#incbin "png/FE4FE5/Asbel_Melia_palette.dmp" +#incbin "png/FE4FE5/Asbel_Melia_minimug.dmp" #ifndef AsbelMug - #define AsbelMug (FirstMugID+236) + #define AsbelMug (FirstMugID+237) #endif -setMugEntry(AsbelMug, Asbel_MeliaMugData, 3, 7, 4, 5) +setMugEntry(AsbelMug, AsbelMugData, 3, 7, 4, 5) ALIGN 4 -Ayra_luminescentbladeMugData: -#incbin "Dmp/Ayra_luminescentblade_mug.dmp" -#incbin "Dmp/Ayra_luminescentblade_frames.dmp" -#incbin "Dmp/Ayra_luminescentblade_palette.dmp" -#incbin "Dmp/Ayra_luminescentblade_minimug.dmp" +AyraMugData: +#incbin "png/FE4FE5/Ayra_luminescentblade_mug.dmp" +#incbin "png/FE4FE5/Ayra_luminescentblade_frames.dmp" +#incbin "png/FE4FE5/Ayra_luminescentblade_palette.dmp" +#incbin "png/FE4FE5/Ayra_luminescentblade_minimug.dmp" #ifndef AyraMug - #define AyraMug (FirstMugID+237) + #define AyraMug (FirstMugID+238) #endif -setMugEntry(AyraMug, Ayra_luminescentbladeMugData, 3, 5, 3, 3) +setMugEntry(AyraMug, AyraMugData, 3, 5, 3, 3) ALIGN 4 -Azel_WAveMugData: -#incbin "Dmp/Azel_WAve_mug.dmp" -#incbin "Dmp/Azel_WAve_frames.dmp" -#incbin "Dmp/Azel_WAve_palette.dmp" -#incbin "Dmp/Azel_WAve_minimug.dmp" +AzelMugData: +#incbin "png/FE4FE5/Azel_WAve_mug.dmp" +#incbin "png/FE4FE5/Azel_WAve_frames.dmp" +#incbin "png/FE4FE5/Azel_WAve_palette.dmp" +#incbin "png/FE4FE5/Azel_WAve_minimug.dmp" #ifndef AzelMug - #define AzelMug (FirstMugID+238) + #define AzelMug (FirstMugID+239) #endif -setMugEntry(AzelMug, Azel_WAveMugData, 2, 6, 3, 4) +setMugEntry(AzelMug, AzelMugData, 2, 6, 3, 4) ALIGN 4 -Beowolf_EdenMugData: -#incbin "Dmp/Beowolf_Eden_mug.dmp" -#incbin "Dmp/Beowolf_Eden_frames.dmp" -#incbin "Dmp/Beowolf_Eden_palette.dmp" -#incbin "Dmp/Beowolf_Eden_minimug.dmp" +BeowolfMugData: +#incbin "png/FE4FE5/Beowolf_Eden_mug.dmp" +#incbin "png/FE4FE5/Beowolf_Eden_frames.dmp" +#incbin "png/FE4FE5/Beowolf_Eden_palette.dmp" +#incbin "png/FE4FE5/Beowolf_Eden_minimug.dmp" #ifndef BeowolfMug - #define BeowolfMug (FirstMugID+239) + #define BeowolfMug (FirstMugID+240) #endif -setMugEntry(BeowolfMug, Beowolf_EdenMugData, 2, 5, 2, 3) +setMugEntry(BeowolfMug, BeowolfMugData, 2, 5, 2, 3) ALIGN 4 -Blume_Version_2_Sterling_GlovnerMugData: -#incbin "Dmp/Blume_Version_2_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Blume_Version_2_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Blume_Version_2_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Blume_Version_2_Sterling_Glovner_minimug.dmp" +BlumeMugData: +#incbin "png/FE4FE5/Blume_Version_2_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Blume_Version_2_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Blume_Version_2_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Blume_Version_2_Sterling_Glovner_minimug.dmp" #ifndef BlumeMug - #define BlumeMug (FirstMugID+240) + #define BlumeMug (FirstMugID+241) #endif -setMugEntry(BlumeMug, Blume_Version_2_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(BlumeMug, BlumeMugData, 3, 5, 3, 3) ALIGN 4 -Briggid_Redbean_F2EMugData: -#incbin "Dmp/Briggid_Redbean_F2E_mug.dmp" -#incbin "Dmp/Briggid_Redbean_F2E_frames.dmp" -#incbin "Dmp/Briggid_Redbean_F2E_palette.dmp" -#incbin "Dmp/Briggid_Redbean_F2E_minimug.dmp" +BriggidMugData: +#incbin "png/FE4FE5/Briggid_Redbean_F2E_mug.dmp" +#incbin "png/FE4FE5/Briggid_Redbean_F2E_frames.dmp" +#incbin "png/FE4FE5/Briggid_Redbean_F2E_palette.dmp" +#incbin "png/FE4FE5/Briggid_Redbean_F2E_minimug.dmp" #ifndef BriggidMug - #define BriggidMug (FirstMugID+241) + #define BriggidMug (FirstMugID+242) #endif -setMugEntry(BriggidMug, Briggid_Redbean_F2EMugData, 2, 5, 3, 3) +setMugEntry(BriggidMug, BriggidMugData, 2, 5, 3, 3) ALIGN 4 -Brighton_Sterling_GlovnerMugData: -#incbin "Dmp/Brighton_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Brighton_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Brighton_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Brighton_Sterling_Glovner_minimug.dmp" +BrightonMugData: +#incbin "png/FE4FE5/Brighton_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Brighton_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Brighton_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Brighton_Sterling_Glovner_minimug.dmp" #ifndef BrightonMug - #define BrightonMug (FirstMugID+242) + #define BrightonMug (FirstMugID+243) #endif -setMugEntry(BrightonMug, Brighton_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(BrightonMug, BrightonMugData, 3, 5, 3, 3) ALIGN 4 -Bucks_CanDyMugData: -#incbin "Dmp/Bucks_CanDy_mug.dmp" -#incbin "Dmp/Bucks_CanDy_frames.dmp" -#incbin "Dmp/Bucks_CanDy_palette.dmp" -#incbin "Dmp/Bucks_CanDy_minimug.dmp" +BucksMugData: +#incbin "png/FE4FE5/Bucks_CanDy_mug.dmp" +#incbin "png/FE4FE5/Bucks_CanDy_frames.dmp" +#incbin "png/FE4FE5/Bucks_CanDy_palette.dmp" +#incbin "png/FE4FE5/Bucks_CanDy_minimug.dmp" #ifndef BucksMug - #define BucksMug (FirstMugID+243) + #define BucksMug (FirstMugID+244) #endif -setMugEntry(BucksMug, Bucks_CanDyMugData, 3, 5, 3, 3) +setMugEntry(BucksMug, BucksMugData, 3, 5, 3, 3) ALIGN 4 -Cain2_DongusMugData: -#incbin "Dmp/Cain2_Dongus_mug.dmp" -#incbin "Dmp/Cain2_Dongus_frames.dmp" -#incbin "Dmp/Cain2_Dongus_palette.dmp" -#incbin "Dmp/Cain2_Dongus_minimug.dmp" +Cain2MugData: +#incbin "png/FE4FE5/Cain2_Dongus_mug.dmp" +#incbin "png/FE4FE5/Cain2_Dongus_frames.dmp" +#incbin "png/FE4FE5/Cain2_Dongus_palette.dmp" +#incbin "png/FE4FE5/Cain2_Dongus_minimug.dmp" #ifndef Cain2Mug - #define Cain2Mug (FirstMugID+244) + #define Cain2Mug (FirstMugID+245) #endif -setMugEntry(Cain2Mug, Cain2_DongusMugData, 3, 5, 3, 3) +setMugEntry(Cain2Mug, Cain2MugData, 3, 5, 3, 3) ALIGN 4 -Carrion_GanondorfMugData: -#incbin "Dmp/Carrion_Ganondorf_mug.dmp" -#incbin "Dmp/Carrion_Ganondorf_frames.dmp" -#incbin "Dmp/Carrion_Ganondorf_palette.dmp" -#incbin "Dmp/Carrion_Ganondorf_minimug.dmp" +CarrionMugData: +#incbin "png/FE4FE5/Carrion_Ganondorf_mug.dmp" +#incbin "png/FE4FE5/Carrion_Ganondorf_frames.dmp" +#incbin "png/FE4FE5/Carrion_Ganondorf_palette.dmp" +#incbin "png/FE4FE5/Carrion_Ganondorf_minimug.dmp" #ifndef CarrionMug - #define CarrionMug (FirstMugID+245) + #define CarrionMug (FirstMugID+246) #endif -setMugEntry(CarrionMug, Carrion_GanondorfMugData, 2, 6, 3, 4) +setMugEntry(CarrionMug, CarrionMugData, 2, 6, 3, 4) ALIGN 4 -Ced_New_version_MeliaMugData: -#incbin "Dmp/Ced_New_version_Melia_mug.dmp" -#incbin "Dmp/Ced_New_version_Melia_frames.dmp" -#incbin "Dmp/Ced_New_version_Melia_palette.dmp" -#incbin "Dmp/Ced_New_version_Melia_minimug.dmp" +CedMugData: +#incbin "png/FE4FE5/Ced_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Ced_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Ced_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Ced_New_version_Melia_minimug.dmp" #ifndef CedMug - #define CedMug (FirstMugID+246) + #define CedMug (FirstMugID+247) #endif -setMugEntry(CedMug, Ced_New_version_MeliaMugData, 3, 5, 3, 3) +setMugEntry(CedMug, CedMugData, 3, 5, 3, 3) ALIGN 4 -Claude_AteyMugData: -#incbin "Dmp/Claude_Atey_mug.dmp" -#incbin "Dmp/Claude_Atey_frames.dmp" -#incbin "Dmp/Claude_Atey_palette.dmp" -#incbin "Dmp/Claude_Atey_minimug.dmp" +ClaudeMugData: +#incbin "png/FE4FE5/Claude_Atey_mug.dmp" +#incbin "png/FE4FE5/Claude_Atey_frames.dmp" +#incbin "png/FE4FE5/Claude_Atey_palette.dmp" +#incbin "png/FE4FE5/Claude_Atey_minimug.dmp" #ifndef ClaudeMug - #define ClaudeMug (FirstMugID+247) + #define ClaudeMug (FirstMugID+248) #endif -setMugEntry(ClaudeMug, Claude_AteyMugData, 2, 5, 2, 3) +setMugEntry(ClaudeMug, ClaudeMugData, 2, 5, 2, 3) ALIGN 4 -Codda_Norikins_F2EMugData: -#incbin "Dmp/Codda_Norikins_F2E_mug.dmp" -#incbin "Dmp/Codda_Norikins_F2E_frames.dmp" -#incbin "Dmp/Codda_Norikins_F2E_palette.dmp" -#incbin "Dmp/Codda_Norikins_F2E_minimug.dmp" +CoddaMugData: +#incbin "png/FE4FE5/Codda_Norikins_F2E_mug.dmp" +#incbin "png/FE4FE5/Codda_Norikins_F2E_frames.dmp" +#incbin "png/FE4FE5/Codda_Norikins_F2E_palette.dmp" +#incbin "png/FE4FE5/Codda_Norikins_F2E_minimug.dmp" #ifndef CoddaMug - #define CoddaMug (FirstMugID+248) + #define CoddaMug (FirstMugID+249) #endif -setMugEntry(CoddaMug, Codda_Norikins_F2EMugData, 2, 6, 4, 4) +setMugEntry(CoddaMug, CoddaMugData, 2, 6, 4, 4) ALIGN 4 -Coirpre_MeliaMugData: -#incbin "Dmp/Coirpre_Melia_mug.dmp" -#incbin "Dmp/Coirpre_Melia_frames.dmp" -#incbin "Dmp/Coirpre_Melia_palette.dmp" -#incbin "Dmp/Coirpre_Melia_minimug.dmp" +CoirpreMugData: +#incbin "png/FE4FE5/Coirpre_Melia_mug.dmp" +#incbin "png/FE4FE5/Coirpre_Melia_frames.dmp" +#incbin "png/FE4FE5/Coirpre_Melia_palette.dmp" +#incbin "png/FE4FE5/Coirpre_Melia_minimug.dmp" #ifndef CoirpreMug - #define CoirpreMug (FirstMugID+249) + #define CoirpreMug (FirstMugID+250) #endif -setMugEntry(CoirpreMug, Coirpre_MeliaMugData, 3, 6, 3, 4) +setMugEntry(CoirpreMug, CoirpreMugData, 3, 6, 3, 4) ALIGN 4 -Conomor_Sterling_GlovnerMugData: -#incbin "Dmp/Conomor_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Conomor_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Conomor_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Conomor_Sterling_Glovner_minimug.dmp" +ConomorMugData: +#incbin "png/FE4FE5/Conomor_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Conomor_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Conomor_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Conomor_Sterling_Glovner_minimug.dmp" #ifndef ConomorMug - #define ConomorMug (FirstMugID+250) + #define ConomorMug (FirstMugID+251) #endif -setMugEntry(ConomorMug, Conomor_Sterling_GlovnerMugData, 2, 5, 2, 3) +setMugEntry(ConomorMug, ConomorMugData, 2, 5, 2, 3) ALIGN 4 -Coruta_UltraxBladeMugData: -#incbin "Dmp/Coruta_UltraxBlade_mug.dmp" -#incbin "Dmp/Coruta_UltraxBlade_frames.dmp" -#incbin "Dmp/Coruta_UltraxBlade_palette.dmp" -#incbin "Dmp/Coruta_UltraxBlade_minimug.dmp" +CorutaMugData: +#incbin "png/FE4FE5/Coruta_UltraxBlade_mug.dmp" +#incbin "png/FE4FE5/Coruta_UltraxBlade_frames.dmp" +#incbin "png/FE4FE5/Coruta_UltraxBlade_palette.dmp" +#incbin "png/FE4FE5/Coruta_UltraxBlade_minimug.dmp" #ifndef CorutaMug - #define CorutaMug (FirstMugID+251) + #define CorutaMug (FirstMugID+252) #endif -setMugEntry(CorutaMug, Coruta_UltraxBladeMugData, 2, 5, 2, 3) +setMugEntry(CorutaMug, CorutaMugData, 2, 5, 2, 3) ALIGN 4 -Creidne_MeliaMugData: -#incbin "Dmp/Creidne_Melia_mug.dmp" -#incbin "Dmp/Creidne_Melia_frames.dmp" -#incbin "Dmp/Creidne_Melia_palette.dmp" -#incbin "Dmp/Creidne_Melia_minimug.dmp" +CreidneMugData: +#incbin "png/FE4FE5/Creidne_Melia_mug.dmp" +#incbin "png/FE4FE5/Creidne_Melia_frames.dmp" +#incbin "png/FE4FE5/Creidne_Melia_palette.dmp" +#incbin "png/FE4FE5/Creidne_Melia_minimug.dmp" #ifndef CreidneMug - #define CreidneMug (FirstMugID+252) + #define CreidneMug (FirstMugID+253) #endif -setMugEntry(CreidneMug, Creidne_MeliaMugData, 3, 6, 3, 4) +setMugEntry(CreidneMug, CreidneMugData, 3, 6, 3, 4) ALIGN 4 -Dagdar_CanDyMugData: -#incbin "Dmp/Dagdar_CanDy_mug.dmp" -#incbin "Dmp/Dagdar_CanDy_frames.dmp" -#incbin "Dmp/Dagdar_CanDy_palette.dmp" -#incbin "Dmp/Dagdar_CanDy_minimug.dmp" +DagdarMugData: +#incbin "png/FE4FE5/Dagdar_CanDy_mug.dmp" +#incbin "png/FE4FE5/Dagdar_CanDy_frames.dmp" +#incbin "png/FE4FE5/Dagdar_CanDy_palette.dmp" +#incbin "png/FE4FE5/Dagdar_CanDy_minimug.dmp" #ifndef DagdarMug - #define DagdarMug (FirstMugID+253) + #define DagdarMug (FirstMugID+254) #endif -setMugEntry(DagdarMug, Dagdar_CanDyMugData, 2, 5, 2, 3) +setMugEntry(DagdarMug, DagdarMugData, 2, 5, 2, 3) ALIGN 4 -Daisy_MeliaMugData: -#incbin "Dmp/Daisy_Melia_mug.dmp" -#incbin "Dmp/Daisy_Melia_frames.dmp" -#incbin "Dmp/Daisy_Melia_palette.dmp" -#incbin "Dmp/Daisy_Melia_minimug.dmp" +DaisyMugData: +#incbin "png/FE4FE5/Daisy_Melia_mug.dmp" +#incbin "png/FE4FE5/Daisy_Melia_frames.dmp" +#incbin "png/FE4FE5/Daisy_Melia_palette.dmp" +#incbin "png/FE4FE5/Daisy_Melia_minimug.dmp" #ifndef DaisyMug - #define DaisyMug (FirstMugID+254) + #define DaisyMug (FirstMugID+255) #endif -setMugEntry(DaisyMug, Daisy_MeliaMugData, 3, 6, 3, 4) +setMugEntry(DaisyMug, DaisyMugData, 3, 6, 3, 4) ALIGN 4 -Dalsin_MeliaMugData: -#incbin "Dmp/Dalsin_Melia_mug.dmp" -#incbin "Dmp/Dalsin_Melia_frames.dmp" -#incbin "Dmp/Dalsin_Melia_palette.dmp" -#incbin "Dmp/Dalsin_Melia_minimug.dmp" +DalsinMugData: +#incbin "png/FE4FE5/Dalsin_Melia_mug.dmp" +#incbin "png/FE4FE5/Dalsin_Melia_frames.dmp" +#incbin "png/FE4FE5/Dalsin_Melia_palette.dmp" +#incbin "png/FE4FE5/Dalsin_Melia_minimug.dmp" #ifndef DalsinMug - #define DalsinMug (FirstMugID+255) + #define DalsinMug (FirstMugID+257) #endif -setMugEntry(DalsinMug, Dalsin_MeliaMugData, 2, 5, 3, 3) +setMugEntry(DalsinMug, DalsinMugData, 2, 5, 3, 3) ALIGN 4 -Dalvan_MeliaMugData: -#incbin "Dmp/Dalvan_Melia_mug.dmp" -#incbin "Dmp/Dalvan_Melia_frames.dmp" -#incbin "Dmp/Dalvan_Melia_palette.dmp" -#incbin "Dmp/Dalvan_Melia_minimug.dmp" +DalvanMugData: +#incbin "png/FE4FE5/Dalvan_Melia_mug.dmp" +#incbin "png/FE4FE5/Dalvan_Melia_frames.dmp" +#incbin "png/FE4FE5/Dalvan_Melia_palette.dmp" +#incbin "png/FE4FE5/Dalvan_Melia_minimug.dmp" #ifndef DalvanMug - #define DalvanMug (FirstMugID+257) + #define DalvanMug (FirstMugID+258) #endif -setMugEntry(DalvanMug, Dalvan_MeliaMugData, 3, 5, 3, 3) +setMugEntry(DalvanMug, DalvanMugData, 3, 5, 3, 3) ALIGN 4 -Danann_MeliaMugData: -#incbin "Dmp/Danann_Melia_mug.dmp" -#incbin "Dmp/Danann_Melia_frames.dmp" -#incbin "Dmp/Danann_Melia_palette.dmp" -#incbin "Dmp/Danann_Melia_minimug.dmp" +DanannMugData: +#incbin "png/FE4FE5/Danann_Melia_mug.dmp" +#incbin "png/FE4FE5/Danann_Melia_frames.dmp" +#incbin "png/FE4FE5/Danann_Melia_palette.dmp" +#incbin "png/FE4FE5/Danann_Melia_minimug.dmp" #ifndef DanannMug - #define DanannMug (FirstMugID+258) + #define DanannMug (FirstMugID+259) #endif -setMugEntry(DanannMug, Danann_MeliaMugData, 2, 4, 3, 2) +setMugEntry(DanannMug, DanannMugData, 2, 4, 3, 2) ALIGN 4 -Deen_AteyMugData: -#incbin "Dmp/Deen_Atey_mug.dmp" -#incbin "Dmp/Deen_Atey_frames.dmp" -#incbin "Dmp/Deen_Atey_palette.dmp" -#incbin "Dmp/Deen_Atey_minimug.dmp" +DeenMugData: +#incbin "png/FE4FE5/Deen_Atey_mug.dmp" +#incbin "png/FE4FE5/Deen_Atey_frames.dmp" +#incbin "png/FE4FE5/Deen_Atey_palette.dmp" +#incbin "png/FE4FE5/Deen_Atey_minimug.dmp" #ifndef DeenMug - #define DeenMug (FirstMugID+259) + #define DeenMug (FirstMugID+260) #endif -setMugEntry(DeenMug, Deen_AteyMugData, 2, 4, 2, 2) +setMugEntry(DeenMug, DeenMugData, 2, 4, 2, 2) ALIGN 4 -Deirdre_Atey_WasdyeMugData: -#incbin "Dmp/Deirdre_Atey_Wasdye_mug.dmp" -#incbin "Dmp/Deirdre_Atey_Wasdye_frames.dmp" -#incbin "Dmp/Deirdre_Atey_Wasdye_palette.dmp" -#incbin "Dmp/Deirdre_Atey_Wasdye_minimug.dmp" +DeirdreMugData: +#incbin "png/FE4FE5/Deirdre_Atey_Wasdye_mug.dmp" +#incbin "png/FE4FE5/Deirdre_Atey_Wasdye_frames.dmp" +#incbin "png/FE4FE5/Deirdre_Atey_Wasdye_palette.dmp" +#incbin "png/FE4FE5/Deirdre_Atey_Wasdye_minimug.dmp" #ifndef DeirdreMug - #define DeirdreMug (FirstMugID+260) + #define DeirdreMug (FirstMugID+261) #endif -setMugEntry(DeirdreMug, Deirdre_Atey_WasdyeMugData, 4, 6, 4, 4) +setMugEntry(DeirdreMug, DeirdreMugData, 4, 6, 4, 4) ALIGN 4 -Diarmuid_MeliaMugData: -#incbin "Dmp/Diarmuid_Melia_mug.dmp" -#incbin "Dmp/Diarmuid_Melia_frames.dmp" -#incbin "Dmp/Diarmuid_Melia_palette.dmp" -#incbin "Dmp/Diarmuid_Melia_minimug.dmp" +DiarmuidMugData: +#incbin "png/FE4FE5/Diarmuid_Melia_mug.dmp" +#incbin "png/FE4FE5/Diarmuid_Melia_frames.dmp" +#incbin "png/FE4FE5/Diarmuid_Melia_palette.dmp" +#incbin "png/FE4FE5/Diarmuid_Melia_minimug.dmp" #ifndef DiarmuidMug - #define DiarmuidMug (FirstMugID+261) + #define DiarmuidMug (FirstMugID+262) #endif -setMugEntry(DiarmuidMug, Diarmuid_MeliaMugData, 2, 5, 2, 3) +setMugEntry(DiarmuidMug, DiarmuidMugData, 2, 5, 2, 3) ALIGN 4 -DiMaggio_WAveMugData: -#incbin "Dmp/DiMaggio_WAve_mug.dmp" -#incbin "Dmp/DiMaggio_WAve_frames.dmp" -#incbin "Dmp/DiMaggio_WAve_palette.dmp" -#incbin "Dmp/DiMaggio_WAve_minimug.dmp" +DiMaggioMugData: +#incbin "png/FE4FE5/DiMaggio_WAve_mug.dmp" +#incbin "png/FE4FE5/DiMaggio_WAve_frames.dmp" +#incbin "png/FE4FE5/DiMaggio_WAve_palette.dmp" +#incbin "png/FE4FE5/DiMaggio_WAve_minimug.dmp" #ifndef DiMaggioMug - #define DiMaggioMug (FirstMugID+262) + #define DiMaggioMug (FirstMugID+263) #endif -setMugEntry(DiMaggioMug, DiMaggio_WAveMugData, 3, 5, 3, 3) +setMugEntry(DiMaggioMug, DiMaggioMugData, 3, 5, 3, 3) ALIGN 4 -Dimna_MeliaMugData: -#incbin "Dmp/Dimna_Melia_mug.dmp" -#incbin "Dmp/Dimna_Melia_frames.dmp" -#incbin "Dmp/Dimna_Melia_palette.dmp" -#incbin "Dmp/Dimna_Melia_minimug.dmp" +DimnaMugData: +#incbin "png/FE4FE5/Dimna_Melia_mug.dmp" +#incbin "png/FE4FE5/Dimna_Melia_frames.dmp" +#incbin "png/FE4FE5/Dimna_Melia_palette.dmp" +#incbin "png/FE4FE5/Dimna_Melia_minimug.dmp" #ifndef DimnaMug - #define DimnaMug (FirstMugID+263) + #define DimnaMug (FirstMugID+264) #endif -setMugEntry(DimnaMug, Dimna_MeliaMugData, 3, 6, 3, 4) +setMugEntry(DimnaMug, DimnaMugData, 3, 6, 3, 4) ALIGN 4 -Edain_TAS20XXMugData: -#incbin "Dmp/Edain_TAS20XX_mug.dmp" -#incbin "Dmp/Edain_TAS20XX_frames.dmp" -#incbin "Dmp/Edain_TAS20XX_palette.dmp" -#incbin "Dmp/Edain_TAS20XX_minimug.dmp" +EdainMugData: +#incbin "png/FE4FE5/Edain_TAS20XX_mug.dmp" +#incbin "png/FE4FE5/Edain_TAS20XX_frames.dmp" +#incbin "png/FE4FE5/Edain_TAS20XX_palette.dmp" +#incbin "png/FE4FE5/Edain_TAS20XX_minimug.dmp" #ifndef EdainMug - #define EdainMug (FirstMugID+264) + #define EdainMug (FirstMugID+265) #endif -setMugEntry(EdainMug, Edain_TAS20XXMugData, 3, 5, 3, 3) +setMugEntry(EdainMug, EdainMugData, 3, 5, 3, 3) ALIGN 4 -Eda_AteyMugData: -#incbin "Dmp/Eda_Atey_mug.dmp" -#incbin "Dmp/Eda_Atey_frames.dmp" -#incbin "Dmp/Eda_Atey_palette.dmp" -#incbin "Dmp/Eda_Atey_minimug.dmp" +EdaMugData: +#incbin "png/FE4FE5/Eda_Atey_mug.dmp" +#incbin "png/FE4FE5/Eda_Atey_frames.dmp" +#incbin "png/FE4FE5/Eda_Atey_palette.dmp" +#incbin "png/FE4FE5/Eda_Atey_minimug.dmp" #ifndef EdaMug - #define EdaMug (FirstMugID+265) + #define EdaMug (FirstMugID+266) #endif -setMugEntry(EdaMug, Eda_AteyMugData, 3, 6, 3, 4) +setMugEntry(EdaMug, EdaMugData, 3, 6, 3, 4) ALIGN 4 -Erinrys_FreefallMugData: -#incbin "Dmp/Erinrys_Freefall_mug.dmp" -#incbin "Dmp/Erinrys_Freefall_frames.dmp" -#incbin "Dmp/Erinrys_Freefall_palette.dmp" -#incbin "Dmp/Erinrys_Freefall_minimug.dmp" +ErinrysMugData: +#incbin "png/FE4FE5/Erinrys_Freefall_mug.dmp" +#incbin "png/FE4FE5/Erinrys_Freefall_frames.dmp" +#incbin "png/FE4FE5/Erinrys_Freefall_palette.dmp" +#incbin "png/FE4FE5/Erinrys_Freefall_minimug.dmp" #ifndef ErinrysMug - #define ErinrysMug (FirstMugID+266) + #define ErinrysMug (FirstMugID+267) #endif -setMugEntry(ErinrysMug, Erinrys_FreefallMugData, 3, 5, 3, 3) +setMugEntry(ErinrysMug, ErinrysMugData, 3, 5, 3, 3) ALIGN 4 -Ethlin_WAveMugData: -#incbin "Dmp/Ethlin_WAve_mug.dmp" -#incbin "Dmp/Ethlin_WAve_frames.dmp" -#incbin "Dmp/Ethlin_WAve_palette.dmp" -#incbin "Dmp/Ethlin_WAve_minimug.dmp" +EthlinMugData: +#incbin "png/FE4FE5/Ethlin_WAve_mug.dmp" +#incbin "png/FE4FE5/Ethlin_WAve_frames.dmp" +#incbin "png/FE4FE5/Ethlin_WAve_palette.dmp" +#incbin "png/FE4FE5/Ethlin_WAve_minimug.dmp" #ifndef EthlinMug - #define EthlinMug (FirstMugID+267) + #define EthlinMug (FirstMugID+268) #endif -setMugEntry(EthlinMug, Ethlin_WAveMugData, 2, 6, 3, 4) +setMugEntry(EthlinMug, EthlinMugData, 2, 6, 3, 4) ALIGN 4 -Eyvel_MeliaMugData: -#incbin "Dmp/Eyvel_Melia_mug.dmp" -#incbin "Dmp/Eyvel_Melia_frames.dmp" -#incbin "Dmp/Eyvel_Melia_palette.dmp" -#incbin "Dmp/Eyvel_Melia_minimug.dmp" +EyvelMugData: +#incbin "png/FE4FE5/Eyvel_Melia_mug.dmp" +#incbin "png/FE4FE5/Eyvel_Melia_frames.dmp" +#incbin "png/FE4FE5/Eyvel_Melia_palette.dmp" +#incbin "png/FE4FE5/Eyvel_Melia_minimug.dmp" #ifndef EyvelMug - #define EyvelMug (FirstMugID+268) + #define EyvelMug (FirstMugID+269) #endif -setMugEntry(EyvelMug, Eyvel_MeliaMugData, 2, 5, 3, 3) +setMugEntry(EyvelMug, EyvelMugData, 2, 5, 3, 3) ALIGN 4 -Febail_MeliaMugData: -#incbin "Dmp/Febail_Melia_mug.dmp" -#incbin "Dmp/Febail_Melia_frames.dmp" -#incbin "Dmp/Febail_Melia_palette.dmp" -#incbin "Dmp/Febail_Melia_minimug.dmp" +FebailMugData: +#incbin "png/FE4FE5/Febail_Melia_mug.dmp" +#incbin "png/FE4FE5/Febail_Melia_frames.dmp" +#incbin "png/FE4FE5/Febail_Melia_palette.dmp" +#incbin "png/FE4FE5/Febail_Melia_minimug.dmp" #ifndef FebailMug - #define FebailMug (FirstMugID+269) + #define FebailMug (FirstMugID+270) #endif -setMugEntry(FebailMug, Febail_MeliaMugData, 3, 5, 3, 3) +setMugEntry(FebailMug, FebailMugData, 3, 5, 3, 3) ALIGN 4 -Fee_New_version_MeliaMugData: -#incbin "Dmp/Fee_New_version_Melia_mug.dmp" -#incbin "Dmp/Fee_New_version_Melia_frames.dmp" -#incbin "Dmp/Fee_New_version_Melia_palette.dmp" -#incbin "Dmp/Fee_New_version_Melia_minimug.dmp" +FeeMugData: +#incbin "png/FE4FE5/Fee_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Fee_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Fee_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Fee_New_version_Melia_minimug.dmp" #ifndef FeeMug - #define FeeMug (FirstMugID+270) + #define FeeMug (FirstMugID+271) #endif -setMugEntry(FeeMug, Fee_New_version_MeliaMugData, 2, 6, 3, 4) +setMugEntry(FeeMug, FeeMugData, 2, 6, 3, 4) ALIGN 4 -Fergus_CranJamMugData: -#incbin "Dmp/Fergus_CranJam_mug.dmp" -#incbin "Dmp/Fergus_CranJam_frames.dmp" -#incbin "Dmp/Fergus_CranJam_palette.dmp" -#incbin "Dmp/Fergus_CranJam_minimug.dmp" +FergusMugData: +#incbin "png/FE4FE5/Fergus_CranJam_mug.dmp" +#incbin "png/FE4FE5/Fergus_CranJam_frames.dmp" +#incbin "png/FE4FE5/Fergus_CranJam_palette.dmp" +#incbin "png/FE4FE5/Fergus_CranJam_minimug.dmp" #ifndef FergusMug - #define FergusMug (FirstMugID+271) + #define FergusMug (FirstMugID+272) #endif -setMugEntry(FergusMug, Fergus_CranJamMugData, 2, 5, 3, 3) +setMugEntry(FergusMug, FergusMugData, 2, 5, 3, 3) ALIGN 4 -Fin_New_version_MeliaMugData: -#incbin "Dmp/Fin_New_version_Melia_mug.dmp" -#incbin "Dmp/Fin_New_version_Melia_frames.dmp" -#incbin "Dmp/Fin_New_version_Melia_palette.dmp" -#incbin "Dmp/Fin_New_version_Melia_minimug.dmp" +FinMugData: +#incbin "png/FE4FE5/Fin_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Fin_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Fin_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Fin_New_version_Melia_minimug.dmp" #ifndef FinMug - #define FinMug (FirstMugID+272) + #define FinMug (FirstMugID+273) #endif -setMugEntry(FinMug, Fin_New_version_MeliaMugData, 2, 5, 2, 3) +setMugEntry(FinMug, FinMugData, 2, 5, 2, 3) ALIGN 4 -Fred_MeliaMugData: -#incbin "Dmp/Fred_Melia_mug.dmp" -#incbin "Dmp/Fred_Melia_frames.dmp" -#incbin "Dmp/Fred_Melia_palette.dmp" -#incbin "Dmp/Fred_Melia_minimug.dmp" +FredMugData: +#incbin "png/FE4FE5/Fred_Melia_mug.dmp" +#incbin "png/FE4FE5/Fred_Melia_frames.dmp" +#incbin "png/FE4FE5/Fred_Melia_palette.dmp" +#incbin "png/FE4FE5/Fred_Melia_minimug.dmp" #ifndef FredMug - #define FredMug (FirstMugID+273) + #define FredMug (FirstMugID+274) #endif -setMugEntry(FredMug, Fred_MeliaMugData, 2, 5, 3, 3) +setMugEntry(FredMug, FredMugData, 2, 5, 3, 3) ALIGN 4 -Fury_Sterling_GlovnerMugData: -#incbin "Dmp/Fury_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Fury_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Fury_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Fury_Sterling_Glovner_minimug.dmp" +FuryMugData: +#incbin "png/FE4FE5/Fury_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Fury_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Fury_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Fury_Sterling_Glovner_minimug.dmp" #ifndef FuryMug - #define FuryMug (FirstMugID+274) + #define FuryMug (FirstMugID+275) #endif -setMugEntry(FuryMug, Fury_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(FuryMug, FuryMugData, 3, 5, 3, 3) ALIGN 4 -Galzus_StitchMugData: -#incbin "Dmp/Galzus_Stitch_mug.dmp" -#incbin "Dmp/Galzus_Stitch_frames.dmp" -#incbin "Dmp/Galzus_Stitch_palette.dmp" -#incbin "Dmp/Galzus_Stitch_minimug.dmp" +GalzusMugData: +#incbin "png/FE4FE5/Galzus_Stitch_mug.dmp" +#incbin "png/FE4FE5/Galzus_Stitch_frames.dmp" +#incbin "png/FE4FE5/Galzus_Stitch_palette.dmp" +#incbin "png/FE4FE5/Galzus_Stitch_minimug.dmp" #ifndef GalzusMug - #define GalzusMug (FirstMugID+275) + #define GalzusMug (FirstMugID+276) #endif -setMugEntry(GalzusMug, Galzus_StitchMugData, 3, 5, 3, 3) +setMugEntry(GalzusMug, GalzusMugData, 3, 5, 3, 3) ALIGN 4 -Halvan_Version_2_Sterling_GlovnerMugData: -#incbin "Dmp/Halvan_Version_2_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Halvan_Version_2_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Halvan_Version_2_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Halvan_Version_2_Sterling_Glovner_minimug.dmp" +HalvanMugData: +#incbin "png/FE4FE5/Halvan_Version_2_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Halvan_Version_2_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Halvan_Version_2_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Halvan_Version_2_Sterling_Glovner_minimug.dmp" #ifndef HalvanMug - #define HalvanMug (FirstMugID+276) + #define HalvanMug (FirstMugID+277) #endif -setMugEntry(HalvanMug, Halvan_Version_2_Sterling_GlovnerMugData, 2, 5, 2, 3) +setMugEntry(HalvanMug, HalvanMugData, 2, 5, 2, 3) ALIGN 4 -Hannibal_MeliaMugData: -#incbin "Dmp/Hannibal_Melia_mug.dmp" -#incbin "Dmp/Hannibal_Melia_frames.dmp" -#incbin "Dmp/Hannibal_Melia_palette.dmp" -#incbin "Dmp/Hannibal_Melia_minimug.dmp" +HannibalMugData: +#incbin "png/FE4FE5/Hannibal_Melia_mug.dmp" +#incbin "png/FE4FE5/Hannibal_Melia_frames.dmp" +#incbin "png/FE4FE5/Hannibal_Melia_palette.dmp" +#incbin "png/FE4FE5/Hannibal_Melia_minimug.dmp" #ifndef HannibalMug - #define HannibalMug (FirstMugID+277) + #define HannibalMug (FirstMugID+278) #endif -setMugEntry(HannibalMug, Hannibal_MeliaMugData, 2, 5, 2, 3) +setMugEntry(HannibalMug, HannibalMugData, 2, 5, 2, 3) ALIGN 4 -Harold_UltraxBladeMugData: -#incbin "Dmp/Harold_UltraxBlade_mug.dmp" -#incbin "Dmp/Harold_UltraxBlade_frames.dmp" -#incbin "Dmp/Harold_UltraxBlade_palette.dmp" -#incbin "Dmp/Harold_UltraxBlade_minimug.dmp" +HaroldMugData: +#incbin "png/FE4FE5/Harold_UltraxBlade_mug.dmp" +#incbin "png/FE4FE5/Harold_UltraxBlade_frames.dmp" +#incbin "png/FE4FE5/Harold_UltraxBlade_palette.dmp" +#incbin "png/FE4FE5/Harold_UltraxBlade_minimug.dmp" #ifndef HaroldMug - #define HaroldMug (FirstMugID+278) + #define HaroldMug (FirstMugID+279) #endif -setMugEntry(HaroldMug, Harold_UltraxBladeMugData, 2, 5, 2, 3) +setMugEntry(HaroldMug, HaroldMugData, 2, 5, 2, 3) ALIGN 4 -Hawk_Sterling_GlovnerMugData: -#incbin "Dmp/Hawk_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Hawk_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Hawk_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Hawk_Sterling_Glovner_minimug.dmp" +HawkMugData: +#incbin "png/FE4FE5/Hawk_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Hawk_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Hawk_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Hawk_Sterling_Glovner_minimug.dmp" #ifndef HawkMug - #define HawkMug (FirstMugID+279) + #define HawkMug (FirstMugID+280) #endif -setMugEntry(HawkMug, Hawk_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(HawkMug, HawkMugData, 3, 5, 3, 3) ALIGN 4 -Hicks_Sterling_GlovnerMugData: -#incbin "Dmp/Hicks_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Hicks_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Hicks_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Hicks_Sterling_Glovner_minimug.dmp" +HicksMugData: +#incbin "png/FE4FE5/Hicks_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Hicks_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Hicks_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Hicks_Sterling_Glovner_minimug.dmp" #ifndef HicksMug - #define HicksMug (FirstMugID+280) + #define HicksMug (FirstMugID+281) #endif -setMugEntry(HicksMug, Hicks_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(HicksMug, HicksMugData, 3, 5, 3, 3) ALIGN 4 -Hilda_Older_Sterling_GlovnerMugData: -#incbin "Dmp/Hilda_Older_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Hilda_Older_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Hilda_Older_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Hilda_Older_Sterling_Glovner_minimug.dmp" +HildaMugData: +#incbin "png/FE4FE5/Hilda_Older_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Hilda_Older_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Hilda_Older_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Hilda_Older_Sterling_Glovner_minimug.dmp" #ifndef HildaMug - #define HildaMug (FirstMugID+281) + #define HildaMug (FirstMugID+282) #endif -setMugEntry(HildaMug, Hilda_Older_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(HildaMug, HildaMugData, 3, 5, 3, 3) ALIGN 4 -Holyn_Version_2_Atey_Melia_RenoudMugData: -#incbin "Dmp/Holyn_Version_2_Atey_Melia_Renoud_mug.dmp" -#incbin "Dmp/Holyn_Version_2_Atey_Melia_Renoud_frames.dmp" -#incbin "Dmp/Holyn_Version_2_Atey_Melia_Renoud_palette.dmp" -#incbin "Dmp/Holyn_Version_2_Atey_Melia_Renoud_minimug.dmp" +HolynMugData: +#incbin "png/FE4FE5/Holyn_Version_2_Atey_Melia_Renoud_mug.dmp" +#incbin "png/FE4FE5/Holyn_Version_2_Atey_Melia_Renoud_frames.dmp" +#incbin "png/FE4FE5/Holyn_Version_2_Atey_Melia_Renoud_palette.dmp" +#incbin "png/FE4FE5/Holyn_Version_2_Atey_Melia_Renoud_minimug.dmp" #ifndef HolynMug - #define HolynMug (FirstMugID+282) + #define HolynMug (FirstMugID+283) #endif -setMugEntry(HolynMug, Holyn_Version_2_Atey_Melia_RenoudMugData, 3, 5, 3, 3) +setMugEntry(HolynMug, HolynMugData, 3, 5, 3, 3) ALIGN 4 -Homer_WasdyeMugData: -#incbin "Dmp/Homer_Wasdye_mug.dmp" -#incbin "Dmp/Homer_Wasdye_frames.dmp" -#incbin "Dmp/Homer_Wasdye_palette.dmp" -#incbin "Dmp/Homer_Wasdye_minimug.dmp" +HomerMugData: +#incbin "png/FE4FE5/Homer_Wasdye_mug.dmp" +#incbin "png/FE4FE5/Homer_Wasdye_frames.dmp" +#incbin "png/FE4FE5/Homer_Wasdye_palette.dmp" +#incbin "png/FE4FE5/Homer_Wasdye_minimug.dmp" #ifndef HomerMug - #define HomerMug (FirstMugID+283) + #define HomerMug (FirstMugID+284) #endif -setMugEntry(HomerMug, Homer_WasdyeMugData, 3, 6, 3, 4) +setMugEntry(HomerMug, HomerMugData, 3, 6, 3, 4) ALIGN 4 -Ilios_Obsidian_DaddyMugData: -#incbin "Dmp/Ilios_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Ilios_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Ilios_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Ilios_Obsidian_Daddy_minimug.dmp" +IliosMugData: +#incbin "png/FE4FE5/Ilios_Obsidian_Daddy_mug.dmp" +#incbin "png/FE4FE5/Ilios_Obsidian_Daddy_frames.dmp" +#incbin "png/FE4FE5/Ilios_Obsidian_Daddy_palette.dmp" +#incbin "png/FE4FE5/Ilios_Obsidian_Daddy_minimug.dmp" #ifndef IliosMug - #define IliosMug (FirstMugID+284) + #define IliosMug (FirstMugID+285) #endif -setMugEntry(IliosMug, Ilios_Obsidian_DaddyMugData, 3, 5, 3, 3) +setMugEntry(IliosMug, IliosMugData, 3, 5, 3, 3) ALIGN 4 -Ishtar_BladeMugData: -#incbin "Dmp/Ishtar_Blade_mug.dmp" -#incbin "Dmp/Ishtar_Blade_frames.dmp" -#incbin "Dmp/Ishtar_Blade_palette.dmp" -#incbin "Dmp/Ishtar_Blade_minimug.dmp" +IshtarMugData: +#incbin "png/FE4FE5/Ishtar_Blade_mug.dmp" +#incbin "png/FE4FE5/Ishtar_Blade_frames.dmp" +#incbin "png/FE4FE5/Ishtar_Blade_palette.dmp" +#incbin "png/FE4FE5/Ishtar_Blade_minimug.dmp" #ifndef IshtarMug - #define IshtarMug (FirstMugID+285) + #define IshtarMug (FirstMugID+286) #endif -setMugEntry(IshtarMug, Ishtar_BladeMugData, 3, 6, 3, 4) +setMugEntry(IshtarMug, IshtarMugData, 3, 6, 3, 4) ALIGN 4 -Ishtore_Sterling_GlovnerMugData: -#incbin "Dmp/Ishtore_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Ishtore_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Ishtore_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Ishtore_Sterling_Glovner_minimug.dmp" +IshtoreMugData: +#incbin "png/FE4FE5/Ishtore_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Ishtore_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Ishtore_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Ishtore_Sterling_Glovner_minimug.dmp" #ifndef IshtoreMug - #define IshtoreMug (FirstMugID+286) + #define IshtoreMug (FirstMugID+287) #endif -setMugEntry(IshtoreMug, Ishtore_Sterling_GlovnerMugData, 4, 5, 4, 3) +setMugEntry(IshtoreMug, IshtoreMugData, 4, 5, 4, 3) ALIGN 4 -Iucharba_New_version_MeliaMugData: -#incbin "Dmp/Iucharba_New_version_Melia_mug.dmp" -#incbin "Dmp/Iucharba_New_version_Melia_frames.dmp" -#incbin "Dmp/Iucharba_New_version_Melia_palette.dmp" -#incbin "Dmp/Iucharba_New_version_Melia_minimug.dmp" +IucharbaMugData: +#incbin "png/FE4FE5/Iucharba_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Iucharba_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Iucharba_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Iucharba_New_version_Melia_minimug.dmp" #ifndef IucharbaMug - #define IucharbaMug (FirstMugID+287) + #define IucharbaMug (FirstMugID+288) #endif -setMugEntry(IucharbaMug, Iucharba_New_version_MeliaMugData, 2, 5, 3, 3) +setMugEntry(IucharbaMug, IucharbaMugData, 2, 5, 3, 3) ALIGN 4 -Iuchar_New_version_MeliaMugData: -#incbin "Dmp/Iuchar_New_version_Melia_mug.dmp" -#incbin "Dmp/Iuchar_New_version_Melia_frames.dmp" -#incbin "Dmp/Iuchar_New_version_Melia_palette.dmp" -#incbin "Dmp/Iuchar_New_version_Melia_minimug.dmp" +IucharMugData: +#incbin "png/FE4FE5/Iuchar_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Iuchar_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Iuchar_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Iuchar_New_version_Melia_minimug.dmp" #ifndef IucharMug - #define IucharMug (FirstMugID+288) + #define IucharMug (FirstMugID+289) #endif -setMugEntry(IucharMug, Iuchar_New_version_MeliaMugData, 3, 5, 3, 3) +setMugEntry(IucharMug, IucharMugData, 3, 5, 3, 3) ALIGN 4 -Jamka_NobodyMugData: -#incbin "Dmp/Jamka_Nobody_mug.dmp" -#incbin "Dmp/Jamka_Nobody_frames.dmp" -#incbin "Dmp/Jamka_Nobody_palette.dmp" -#incbin "Dmp/Jamka_Nobody_minimug.dmp" +JamkaMugData: +#incbin "png/FE4FE5/Jamka_Nobody_mug.dmp" +#incbin "png/FE4FE5/Jamka_Nobody_frames.dmp" +#incbin "png/FE4FE5/Jamka_Nobody_palette.dmp" +#incbin "png/FE4FE5/Jamka_Nobody_minimug.dmp" #ifndef JamkaMug - #define JamkaMug (FirstMugID+289) + #define JamkaMug (FirstMugID+290) #endif -setMugEntry(JamkaMug, Jamka_NobodyMugData, 3, 5, 3, 3) +setMugEntry(JamkaMug, JamkaMugData, 3, 5, 3, 3) ALIGN 4 -Jeanne_MeliaMugData: -#incbin "Dmp/Jeanne_Melia_mug.dmp" -#incbin "Dmp/Jeanne_Melia_frames.dmp" -#incbin "Dmp/Jeanne_Melia_palette.dmp" -#incbin "Dmp/Jeanne_Melia_minimug.dmp" +JeanneMugData: +#incbin "png/FE4FE5/Jeanne_Melia_mug.dmp" +#incbin "png/FE4FE5/Jeanne_Melia_frames.dmp" +#incbin "png/FE4FE5/Jeanne_Melia_palette.dmp" +#incbin "png/FE4FE5/Jeanne_Melia_minimug.dmp" #ifndef JeanneMug - #define JeanneMug (FirstMugID+290) + #define JeanneMug (FirstMugID+291) #endif -setMugEntry(JeanneMug, Jeanne_MeliaMugData, 2, 6, 3, 4) +setMugEntry(JeanneMug, JeanneMugData, 2, 6, 3, 4) ALIGN 4 -Johalva_MeliaMugData: -#incbin "Dmp/Johalva_Melia_mug.dmp" -#incbin "Dmp/Johalva_Melia_frames.dmp" -#incbin "Dmp/Johalva_Melia_palette.dmp" -#incbin "Dmp/Johalva_Melia_minimug.dmp" +JohalvaMugData: +#incbin "png/FE4FE5/Johalva_Melia_mug.dmp" +#incbin "png/FE4FE5/Johalva_Melia_frames.dmp" +#incbin "png/FE4FE5/Johalva_Melia_palette.dmp" +#incbin "png/FE4FE5/Johalva_Melia_minimug.dmp" #ifndef JohalvaMug - #define JohalvaMug (FirstMugID+291) + #define JohalvaMug (FirstMugID+292) #endif -setMugEntry(JohalvaMug, Johalva_MeliaMugData, 2, 5, 3, 3) +setMugEntry(JohalvaMug, JohalvaMugData, 2, 5, 3, 3) ALIGN 4 -Johan_MeliaMugData: -#incbin "Dmp/Johan_Melia_mug.dmp" -#incbin "Dmp/Johan_Melia_frames.dmp" -#incbin "Dmp/Johan_Melia_palette.dmp" -#incbin "Dmp/Johan_Melia_minimug.dmp" +JohanMugData: +#incbin "png/FE4FE5/Johan_Melia_mug.dmp" +#incbin "png/FE4FE5/Johan_Melia_frames.dmp" +#incbin "png/FE4FE5/Johan_Melia_palette.dmp" +#incbin "png/FE4FE5/Johan_Melia_minimug.dmp" #ifndef JohanMug - #define JohanMug (FirstMugID+292) + #define JohanMug (FirstMugID+293) #endif -setMugEntry(JohanMug, Johan_MeliaMugData, 3, 5, 3, 3) +setMugEntry(JohanMug, JohanMugData, 3, 5, 3, 3) ALIGN 4 -Julia_AteyMugData: -#incbin "Dmp/Julia_Atey_mug.dmp" -#incbin "Dmp/Julia_Atey_frames.dmp" -#incbin "Dmp/Julia_Atey_palette.dmp" -#incbin "Dmp/Julia_Atey_minimug.dmp" +JuliaMugData: +#incbin "png/FE4FE5/Julia_Atey_mug.dmp" +#incbin "png/FE4FE5/Julia_Atey_frames.dmp" +#incbin "png/FE4FE5/Julia_Atey_palette.dmp" +#incbin "png/FE4FE5/Julia_Atey_minimug.dmp" #ifndef JuliaMug - #define JuliaMug (FirstMugID+293) + #define JuliaMug (FirstMugID+294) #endif -setMugEntry(JuliaMug, Julia_AteyMugData, 3, 6, 3, 4) +setMugEntry(JuliaMug, JuliaMugData, 3, 6, 3, 4) ALIGN 4 -Julius_canigetfrozenMugData: -#incbin "Dmp/Julius_canigetfrozen_mug.dmp" -#incbin "Dmp/Julius_canigetfrozen_frames.dmp" -#incbin "Dmp/Julius_canigetfrozen_palette.dmp" -#incbin "Dmp/Julius_canigetfrozen_minimug.dmp" +JuliusMugData: +#incbin "png/FE4FE5/Julius_canigetfrozen_mug.dmp" +#incbin "png/FE4FE5/Julius_canigetfrozen_frames.dmp" +#incbin "png/FE4FE5/Julius_canigetfrozen_palette.dmp" +#incbin "png/FE4FE5/Julius_canigetfrozen_minimug.dmp" #ifndef JuliusMug - #define JuliusMug (FirstMugID+294) + #define JuliusMug (FirstMugID+295) #endif -setMugEntry(JuliusMug, Julius_canigetfrozenMugData, 3, 5, 3, 3) +setMugEntry(JuliusMug, JuliusMugData, 3, 5, 3, 3) ALIGN 4 -Karin_MeliaMugData: -#incbin "Dmp/Karin_Melia_mug.dmp" -#incbin "Dmp/Karin_Melia_frames.dmp" -#incbin "Dmp/Karin_Melia_palette.dmp" -#incbin "Dmp/Karin_Melia_minimug.dmp" +KarinMugData: +#incbin "png/FE4FE5/Karin_Melia_mug.dmp" +#incbin "png/FE4FE5/Karin_Melia_frames.dmp" +#incbin "png/FE4FE5/Karin_Melia_palette.dmp" +#incbin "png/FE4FE5/Karin_Melia_minimug.dmp" #ifndef KarinMug - #define KarinMug (FirstMugID+295) + #define KarinMug (FirstMugID+296) #endif -setMugEntry(KarinMug, Karin_MeliaMugData, 2, 6, 3, 4) +setMugEntry(KarinMug, KarinMugData, 2, 6, 3, 4) ALIGN 4 -Kempf_Obsidian_DaddyMugData: -#incbin "Dmp/Kempf_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Kempf_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Kempf_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Kempf_Obsidian_Daddy_minimug.dmp" +KempfMugData: +#incbin "png/FE4FE5/Kempf_Obsidian_Daddy_mug.dmp" +#incbin "png/FE4FE5/Kempf_Obsidian_Daddy_frames.dmp" +#incbin "png/FE4FE5/Kempf_Obsidian_Daddy_palette.dmp" +#incbin "png/FE4FE5/Kempf_Obsidian_Daddy_minimug.dmp" #ifndef KempfMug - #define KempfMug (FirstMugID+296) + #define KempfMug (FirstMugID+297) #endif -setMugEntry(KempfMug, Kempf_Obsidian_DaddyMugData, 3, 5, 3, 3) +setMugEntry(KempfMug, KempfMugData, 3, 5, 3, 3) ALIGN 4 -Kurth_Brown_Hair_Sterling_GlovnerMugData: -#incbin "Dmp/Kurth_Brown_Hair_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Kurth_Brown_Hair_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Kurth_Brown_Hair_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Kurth_Brown_Hair_Sterling_Glovner_minimug.dmp" +KurthMugData: +#incbin "png/FE4FE5/Kurth_Brown_Hair_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Kurth_Brown_Hair_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Kurth_Brown_Hair_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Kurth_Brown_Hair_Sterling_Glovner_minimug.dmp" #ifndef KurthMug - #define KurthMug (FirstMugID+297) + #define KurthMug (FirstMugID+298) #endif -setMugEntry(KurthMug, Kurth_Brown_Hair_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(KurthMug, KurthMugData, 3, 5, 3, 3) ALIGN 4 -Lachesis_Version_5_Obsidian_DaddyMugData: -#incbin "Dmp/Lachesis_Version_5_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Lachesis_Version_5_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Lachesis_Version_5_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Lachesis_Version_5_Obsidian_Daddy_minimug.dmp" +LachesisMugData: +#incbin "png/FE4FE5/Lachesis_Version_5_Obsidian_Daddy_mug.dmp" +#incbin "png/FE4FE5/Lachesis_Version_5_Obsidian_Daddy_frames.dmp" +#incbin "png/FE4FE5/Lachesis_Version_5_Obsidian_Daddy_palette.dmp" +#incbin "png/FE4FE5/Lachesis_Version_5_Obsidian_Daddy_minimug.dmp" #ifndef LachesisMug - #define LachesisMug (FirstMugID+298) + #define LachesisMug (FirstMugID+299) #endif -setMugEntry(LachesisMug, Lachesis_Version_5_Obsidian_DaddyMugData, 4, 6, 3, 4) +setMugEntry(LachesisMug, LachesisMugData, 4, 6, 3, 4) ALIGN 4 -Lamia_SaintRubenioMugData: -#incbin "Dmp/Lamia_SaintRubenio_mug.dmp" -#incbin "Dmp/Lamia_SaintRubenio_frames.dmp" -#incbin "Dmp/Lamia_SaintRubenio_palette.dmp" -#incbin "Dmp/Lamia_SaintRubenio_minimug.dmp" +LamiaMugData: +#incbin "png/FE4FE5/Lamia_SaintRubenio_mug.dmp" +#incbin "png/FE4FE5/Lamia_SaintRubenio_frames.dmp" +#incbin "png/FE4FE5/Lamia_SaintRubenio_palette.dmp" +#incbin "png/FE4FE5/Lamia_SaintRubenio_minimug.dmp" #ifndef LamiaMug - #define LamiaMug (FirstMugID+299) + #define LamiaMug (FirstMugID+300) #endif -setMugEntry(LamiaMug, Lamia_SaintRubenioMugData, 2, 4, 2, 2) +setMugEntry(LamiaMug, LamiaMugData, 2, 4, 2, 2) ALIGN 4 -Lana_MeliaMugData: -#incbin "Dmp/Lana_Melia_mug.dmp" -#incbin "Dmp/Lana_Melia_frames.dmp" -#incbin "Dmp/Lana_Melia_palette.dmp" -#incbin "Dmp/Lana_Melia_minimug.dmp" +LanaMugData: +#incbin "png/FE4FE5/Lana_Melia_mug.dmp" +#incbin "png/FE4FE5/Lana_Melia_frames.dmp" +#incbin "png/FE4FE5/Lana_Melia_palette.dmp" +#incbin "png/FE4FE5/Lana_Melia_minimug.dmp" #ifndef LanaMug - #define LanaMug (FirstMugID+300) + #define LanaMug (FirstMugID+301) #endif -setMugEntry(LanaMug, Lana_MeliaMugData, 4, 6, 4, 4) +setMugEntry(LanaMug, LanaMugData, 4, 6, 4, 4) ALIGN 4 -Lara_MeliaMugData: -#incbin "Dmp/Lara_Melia_mug.dmp" -#incbin "Dmp/Lara_Melia_frames.dmp" -#incbin "Dmp/Lara_Melia_palette.dmp" -#incbin "Dmp/Lara_Melia_minimug.dmp" +LaraMugData: +#incbin "png/FE4FE5/Lara_Melia_mug.dmp" +#incbin "png/FE4FE5/Lara_Melia_frames.dmp" +#incbin "png/FE4FE5/Lara_Melia_palette.dmp" +#incbin "png/FE4FE5/Lara_Melia_minimug.dmp" #ifndef LaraMug - #define LaraMug (FirstMugID+301) + #define LaraMug (FirstMugID+302) #endif -setMugEntry(LaraMug, Lara_MeliaMugData, 2, 6, 2, 4) +setMugEntry(LaraMug, LaraMugData, 2, 6, 2, 4) ALIGN 4 -Larcei_New_version_MeliaMugData: -#incbin "Dmp/Larcei_New_version_Melia_mug.dmp" -#incbin "Dmp/Larcei_New_version_Melia_frames.dmp" -#incbin "Dmp/Larcei_New_version_Melia_palette.dmp" -#incbin "Dmp/Larcei_New_version_Melia_minimug.dmp" +LarceiMugData: +#incbin "png/FE4FE5/Larcei_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Larcei_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Larcei_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Larcei_New_version_Melia_minimug.dmp" #ifndef LarceiMug - #define LarceiMug (FirstMugID+302) + #define LarceiMug (FirstMugID+303) #endif -setMugEntry(LarceiMug, Larcei_New_version_MeliaMugData, 3, 6, 3, 4) +setMugEntry(LarceiMug, LarceiMugData, 3, 6, 3, 4) ALIGN 4 -Laylea_MeliaMugData: -#incbin "Dmp/Laylea_Melia_mug.dmp" -#incbin "Dmp/Laylea_Melia_frames.dmp" -#incbin "Dmp/Laylea_Melia_palette.dmp" -#incbin "Dmp/Laylea_Melia_minimug.dmp" +LayleaMugData: +#incbin "png/FE4FE5/Laylea_Melia_mug.dmp" +#incbin "png/FE4FE5/Laylea_Melia_frames.dmp" +#incbin "png/FE4FE5/Laylea_Melia_palette.dmp" +#incbin "png/FE4FE5/Laylea_Melia_minimug.dmp" #ifndef LayleaMug - #define LayleaMug (FirstMugID+303) + #define LayleaMug (FirstMugID+304) #endif -setMugEntry(LayleaMug, Laylea_MeliaMugData, 3, 6, 3, 4) +setMugEntry(LayleaMug, LayleaMugData, 3, 6, 3, 4) ALIGN 4 -Leif_New_version_MeliaMugData: -#incbin "Dmp/Leif_New_version_Melia_mug.dmp" -#incbin "Dmp/Leif_New_version_Melia_frames.dmp" -#incbin "Dmp/Leif_New_version_Melia_palette.dmp" -#incbin "Dmp/Leif_New_version_Melia_minimug.dmp" +LeifMugData: +#incbin "png/FE4FE5/Leif_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Leif_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Leif_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Leif_New_version_Melia_minimug.dmp" #ifndef LeifMug - #define LeifMug (FirstMugID+304) + #define LeifMug (FirstMugID+305) #endif -setMugEntry(LeifMug, Leif_New_version_MeliaMugData, 3, 6, 3, 4) +setMugEntry(LeifMug, LeifMugData, 3, 6, 3, 4) ALIGN 4 -Lene_New_version_MeliaMugData: -#incbin "Dmp/Lene_New_version_Melia_mug.dmp" -#incbin "Dmp/Lene_New_version_Melia_frames.dmp" -#incbin "Dmp/Lene_New_version_Melia_palette.dmp" -#incbin "Dmp/Lene_New_version_Melia_minimug.dmp" +LeneMugData: +#incbin "png/FE4FE5/Lene_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Lene_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Lene_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Lene_New_version_Melia_minimug.dmp" #ifndef LeneMug - #define LeneMug (FirstMugID+305) + #define LeneMug (FirstMugID+306) #endif -setMugEntry(LeneMug, Lene_New_version_MeliaMugData, 3, 6, 3, 4) +setMugEntry(LeneMug, LeneMugData, 3, 6, 3, 4) ALIGN 4 -Lester_New_version_MeliaMugData: -#incbin "Dmp/Lester_New_version_Melia_mug.dmp" -#incbin "Dmp/Lester_New_version_Melia_frames.dmp" -#incbin "Dmp/Lester_New_version_Melia_palette.dmp" -#incbin "Dmp/Lester_New_version_Melia_minimug.dmp" +LesterMugData: +#incbin "png/FE4FE5/Lester_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Lester_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Lester_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Lester_New_version_Melia_minimug.dmp" #ifndef LesterMug - #define LesterMug (FirstMugID+306) + #define LesterMug (FirstMugID+307) #endif -setMugEntry(LesterMug, Lester_New_version_MeliaMugData, 2, 5, 2, 3) +setMugEntry(LesterMug, LesterMugData, 2, 5, 2, 3) ALIGN 4 -Levin_AteyMugData: -#incbin "Dmp/Levin_Atey_mug.dmp" -#incbin "Dmp/Levin_Atey_frames.dmp" -#incbin "Dmp/Levin_Atey_palette.dmp" -#incbin "Dmp/Levin_Atey_minimug.dmp" +LevinMugData: +#incbin "png/FE4FE5/Levin_Atey_mug.dmp" +#incbin "png/FE4FE5/Levin_Atey_frames.dmp" +#incbin "png/FE4FE5/Levin_Atey_palette.dmp" +#incbin "png/FE4FE5/Levin_Atey_minimug.dmp" #ifndef LevinMug - #define LevinMug (FirstMugID+307) + #define LevinMug (FirstMugID+308) #endif -setMugEntry(LevinMug, Levin_AteyMugData, 3, 5, 3, 3) +setMugEntry(LevinMug, LevinMugData, 3, 5, 3, 3) ALIGN 4 -Lex_Sterling_GlovnerMugData: -#incbin "Dmp/Lex_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Lex_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Lex_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Lex_Sterling_Glovner_minimug.dmp" +LexMugData: +#incbin "png/FE4FE5/Lex_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Lex_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Lex_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Lex_Sterling_Glovner_minimug.dmp" #ifndef LexMug - #define LexMug (FirstMugID+308) + #define LexMug (FirstMugID+309) #endif -setMugEntry(LexMug, Lex_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(LexMug, LexMugData, 3, 5, 3, 3) ALIGN 4 -Lifis_MeliaMugData: -#incbin "Dmp/Lifis_Melia_mug.dmp" -#incbin "Dmp/Lifis_Melia_frames.dmp" -#incbin "Dmp/Lifis_Melia_palette.dmp" -#incbin "Dmp/Lifis_Melia_minimug.dmp" +LifisMugData: +#incbin "png/FE4FE5/Lifis_Melia_mug.dmp" +#incbin "png/FE4FE5/Lifis_Melia_frames.dmp" +#incbin "png/FE4FE5/Lifis_Melia_palette.dmp" +#incbin "png/FE4FE5/Lifis_Melia_minimug.dmp" #ifndef LifisMug - #define LifisMug (FirstMugID+309) + #define LifisMug (FirstMugID+310) #endif -setMugEntry(LifisMug, Lifis_MeliaMugData, 2, 6, 3, 4) +setMugEntry(LifisMug, LifisMugData, 2, 6, 3, 4) ALIGN 4 -Linda_GatorMugData: -#incbin "Dmp/Linda_Gator_mug.dmp" -#incbin "Dmp/Linda_Gator_frames.dmp" -#incbin "Dmp/Linda_Gator_palette.dmp" -#incbin "Dmp/Linda_Gator_minimug.dmp" +LindaMugData: +#incbin "png/FE4FE5/Linda_Gator_mug.dmp" +#incbin "png/FE4FE5/Linda_Gator_frames.dmp" +#incbin "png/FE4FE5/Linda_Gator_palette.dmp" +#incbin "png/FE4FE5/Linda_Gator_minimug.dmp" #ifndef LindaMug - #define LindaMug (FirstMugID+310) + #define LindaMug (FirstMugID+311) #endif -setMugEntry(LindaMug, Linda_GatorMugData, 2, 6, 3, 4) +setMugEntry(LindaMug, LindaMugData, 2, 6, 3, 4) ALIGN 4 -Linoan_AteyMugData: -#incbin "Dmp/Linoan_Atey_mug.dmp" -#incbin "Dmp/Linoan_Atey_frames.dmp" -#incbin "Dmp/Linoan_Atey_palette.dmp" -#incbin "Dmp/Linoan_Atey_minimug.dmp" +LinoanMugData: +#incbin "png/FE4FE5/Linoan_Atey_mug.dmp" +#incbin "png/FE4FE5/Linoan_Atey_frames.dmp" +#incbin "png/FE4FE5/Linoan_Atey_palette.dmp" +#incbin "png/FE4FE5/Linoan_Atey_minimug.dmp" #ifndef LinoanMug - #define LinoanMug (FirstMugID+311) + #define LinoanMug (FirstMugID+312) #endif -setMugEntry(LinoanMug, Linoan_AteyMugData, 3, 6, 3, 4) +setMugEntry(LinoanMug, LinoanMugData, 3, 6, 3, 4) ALIGN 4 -Lithis_Levin64_CranJamMugData: -#incbin "Dmp/Lithis_Levin64_CranJam_mug.dmp" -#incbin "Dmp/Lithis_Levin64_CranJam_frames.dmp" -#incbin "Dmp/Lithis_Levin64_CranJam_palette.dmp" -#incbin "Dmp/Lithis_Levin64_CranJam_minimug.dmp" +LithisMugData: +#incbin "png/FE4FE5/Lithis_Levin64_CranJam_mug.dmp" +#incbin "png/FE4FE5/Lithis_Levin64_CranJam_frames.dmp" +#incbin "png/FE4FE5/Lithis_Levin64_CranJam_palette.dmp" +#incbin "png/FE4FE5/Lithis_Levin64_CranJam_minimug.dmp" #ifndef LithisMug - #define LithisMug (FirstMugID+312) + #define LithisMug (FirstMugID+313) #endif -setMugEntry(LithisMug, Lithis_Levin64_CranJamMugData, 3, 5, 3, 3) +setMugEntry(LithisMug, LithisMugData, 3, 5, 3, 3) ALIGN 4 -Liza_Sterling_GlovnerMugData: -#incbin "Dmp/Liza_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Liza_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Liza_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Liza_Sterling_Glovner_minimug.dmp" +LizaMugData: +#incbin "png/FE4FE5/Liza_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Liza_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Liza_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Liza_Sterling_Glovner_minimug.dmp" #ifndef LizaMug - #define LizaMug (FirstMugID+313) + #define LizaMug (FirstMugID+314) #endif -setMugEntry(LizaMug, Liza_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(LizaMug, LizaMugData, 3, 5, 3, 3) ALIGN 4 -Loptyr_Manakete_form_JeyTheCount_F2EMugData: -#incbin "Dmp/Loptyr_Manakete_form_JeyTheCount_F2E_mug.dmp" -#incbin "Dmp/Loptyr_Manakete_form_JeyTheCount_F2E_frames.dmp" -#incbin "Dmp/Loptyr_Manakete_form_JeyTheCount_F2E_palette.dmp" -#incbin "Dmp/Loptyr_Manakete_form_JeyTheCount_F2E_minimug.dmp" +LoptyrMugData: +#incbin "png/FE4FE5/Loptyr_Manakete_form_JeyTheCount_F2E_mug.dmp" +#incbin "png/FE4FE5/Loptyr_Manakete_form_JeyTheCount_F2E_frames.dmp" +#incbin "png/FE4FE5/Loptyr_Manakete_form_JeyTheCount_F2E_palette.dmp" +#incbin "png/FE4FE5/Loptyr_Manakete_form_JeyTheCount_F2E_minimug.dmp" #ifndef LoptyrMug - #define LoptyrMug (FirstMugID+314) + #define LoptyrMug (FirstMugID+315) #endif -setMugEntry(LoptyrMug, Loptyr_Manakete_form_JeyTheCount_F2EMugData, 2, 4, 2, 2) +setMugEntry(LoptyrMug, LoptyrMugData, 2, 4, 2, 2) ALIGN 4 -Machyua_MeliaMugData: -#incbin "Dmp/Machyua_Melia_mug.dmp" -#incbin "Dmp/Machyua_Melia_frames.dmp" -#incbin "Dmp/Machyua_Melia_palette.dmp" -#incbin "Dmp/Machyua_Melia_minimug.dmp" +MachyuaMugData: +#incbin "png/FE4FE5/Machyua_Melia_mug.dmp" +#incbin "png/FE4FE5/Machyua_Melia_frames.dmp" +#incbin "png/FE4FE5/Machyua_Melia_palette.dmp" +#incbin "png/FE4FE5/Machyua_Melia_minimug.dmp" #ifndef MachyuaMug - #define MachyuaMug (FirstMugID+315) + #define MachyuaMug (FirstMugID+316) #endif -setMugEntry(MachyuaMug, Machyua_MeliaMugData, 3, 5, 3, 3) +setMugEntry(MachyuaMug, MachyuaMugData, 3, 5, 3, 3) ALIGN 4 -Magorn_UltraxBladeMugData: -#incbin "Dmp/Magorn_UltraxBlade_mug.dmp" -#incbin "Dmp/Magorn_UltraxBlade_frames.dmp" -#incbin "Dmp/Magorn_UltraxBlade_palette.dmp" -#incbin "Dmp/Magorn_UltraxBlade_minimug.dmp" +MagornMugData: +#incbin "png/FE4FE5/Magorn_UltraxBlade_mug.dmp" +#incbin "png/FE4FE5/Magorn_UltraxBlade_frames.dmp" +#incbin "png/FE4FE5/Magorn_UltraxBlade_palette.dmp" +#incbin "png/FE4FE5/Magorn_UltraxBlade_minimug.dmp" #ifndef MagornMug - #define MagornMug (FirstMugID+316) + #define MagornMug (FirstMugID+317) #endif -setMugEntry(MagornMug, Magorn_UltraxBladeMugData, 2, 5, 2, 3) +setMugEntry(MagornMug, MagornMugData, 2, 5, 2, 3) ALIGN 4 -Mana_MeliaMugData: -#incbin "Dmp/Mana_Melia_mug.dmp" -#incbin "Dmp/Mana_Melia_frames.dmp" -#incbin "Dmp/Mana_Melia_palette.dmp" -#incbin "Dmp/Mana_Melia_minimug.dmp" +ManaMugData: +#incbin "png/FE4FE5/Mana_Melia_mug.dmp" +#incbin "png/FE4FE5/Mana_Melia_frames.dmp" +#incbin "png/FE4FE5/Mana_Melia_palette.dmp" +#incbin "png/FE4FE5/Mana_Melia_minimug.dmp" #ifndef ManaMug - #define ManaMug (FirstMugID+317) + #define ManaMug (FirstMugID+318) #endif -setMugEntry(ManaMug, Mana_MeliaMugData, 4, 6, 4, 4) +setMugEntry(ManaMug, ManaMugData, 4, 6, 4, 4) ALIGN 4 -Manfroy_MeliaMugData: -#incbin "Dmp/Manfroy_Melia_mug.dmp" -#incbin "Dmp/Manfroy_Melia_frames.dmp" -#incbin "Dmp/Manfroy_Melia_palette.dmp" -#incbin "Dmp/Manfroy_Melia_minimug.dmp" +ManfroyMugData: +#incbin "png/FE4FE5/Manfroy_Melia_mug.dmp" +#incbin "png/FE4FE5/Manfroy_Melia_frames.dmp" +#incbin "png/FE4FE5/Manfroy_Melia_palette.dmp" +#incbin "png/FE4FE5/Manfroy_Melia_minimug.dmp" #ifndef ManfroyMug - #define ManfroyMug (FirstMugID+318) + #define ManfroyMug (FirstMugID+319) #endif -setMugEntry(ManfroyMug, Manfroy_MeliaMugData, 3, 5, 3, 3) +setMugEntry(ManfroyMug, ManfroyMugData, 3, 5, 3, 3) ALIGN 4 -Mareeta_CavalryUnits_F2EMugData: -#incbin "Dmp/Mareeta_CavalryUnits_F2E_mug.dmp" -#incbin "Dmp/Mareeta_CavalryUnits_F2E_frames.dmp" -#incbin "Dmp/Mareeta_CavalryUnits_F2E_palette.dmp" -#incbin "Dmp/Mareeta_CavalryUnits_F2E_minimug.dmp" +MareetaMugData: +#incbin "png/FE4FE5/Mareeta_CavalryUnits_F2E_mug.dmp" +#incbin "png/FE4FE5/Mareeta_CavalryUnits_F2E_frames.dmp" +#incbin "png/FE4FE5/Mareeta_CavalryUnits_F2E_palette.dmp" +#incbin "png/FE4FE5/Mareeta_CavalryUnits_F2E_minimug.dmp" #ifndef MareetaMug - #define MareetaMug (FirstMugID+319) + #define MareetaMug (FirstMugID+320) #endif -setMugEntry(MareetaMug, Mareeta_CavalryUnits_F2EMugData, 3, 5, 3, 3) +setMugEntry(MareetaMug, MareetaMugData, 3, 5, 3, 3) ALIGN 4 -Marty_FE8_colours_VilkalizerMugData: -#incbin "Dmp/Marty_FE8_colours_Vilkalizer_mug.dmp" -#incbin "Dmp/Marty_FE8_colours_Vilkalizer_frames.dmp" -#incbin "Dmp/Marty_FE8_colours_Vilkalizer_palette.dmp" -#incbin "Dmp/Marty_FE8_colours_Vilkalizer_minimug.dmp" +MartyMugData: +#incbin "png/FE4FE5/Marty_FE8_colours_Vilkalizer_mug.dmp" +#incbin "png/FE4FE5/Marty_FE8_colours_Vilkalizer_frames.dmp" +#incbin "png/FE4FE5/Marty_FE8_colours_Vilkalizer_palette.dmp" +#incbin "png/FE4FE5/Marty_FE8_colours_Vilkalizer_minimug.dmp" #ifndef MartyMug - #define MartyMug (FirstMugID+320) + #define MartyMug (FirstMugID+321) #endif -setMugEntry(MartyMug, Marty_FE8_colours_VilkalizerMugData, 2, 5, 3, 2) +setMugEntry(MartyMug, MartyMugData, 2, 5, 3, 2) ALIGN 4 -Midayle_ZoisiteMugData: -#incbin "Dmp/Midayle_Zoisite_mug.dmp" -#incbin "Dmp/Midayle_Zoisite_frames.dmp" -#incbin "Dmp/Midayle_Zoisite_palette.dmp" -#incbin "Dmp/Midayle_Zoisite_minimug.dmp" +MidayleMugData: +#incbin "png/FE4FE5/Midayle_Zoisite_mug.dmp" +#incbin "png/FE4FE5/Midayle_Zoisite_frames.dmp" +#incbin "png/FE4FE5/Midayle_Zoisite_palette.dmp" +#incbin "png/FE4FE5/Midayle_Zoisite_minimug.dmp" #ifndef MidayleMug - #define MidayleMug (FirstMugID+321) + #define MidayleMug (FirstMugID+322) #endif -setMugEntry(MidayleMug, Midayle_ZoisiteMugData, 3, 6, 3, 4) +setMugEntry(MidayleMug, MidayleMugData, 3, 6, 3, 4) ALIGN 4 -Miranda_Sterling_GlovnerMugData: -#incbin "Dmp/Miranda_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Miranda_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Miranda_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Miranda_Sterling_Glovner_minimug.dmp" +MirandaMugData: +#incbin "png/FE4FE5/Miranda_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Miranda_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Miranda_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Miranda_Sterling_Glovner_minimug.dmp" #ifndef MirandaMug - #define MirandaMug (FirstMugID+322) + #define MirandaMug (FirstMugID+323) #endif -setMugEntry(MirandaMug, Miranda_Sterling_GlovnerMugData, 3, 6, 3, 4) +setMugEntry(MirandaMug, MirandaMugData, 3, 6, 3, 4) ALIGN 4 -Misha_claire45MugData: -#incbin "Dmp/Misha_claire45_mug.dmp" -#incbin "Dmp/Misha_claire45_frames.dmp" -#incbin "Dmp/Misha_claire45_palette.dmp" -#incbin "Dmp/Misha_claire45_minimug.dmp" +MishaMugData: +#incbin "png/FE4FE5/Misha_claire45_mug.dmp" +#incbin "png/FE4FE5/Misha_claire45_frames.dmp" +#incbin "png/FE4FE5/Misha_claire45_palette.dmp" +#incbin "png/FE4FE5/Misha_claire45_minimug.dmp" #ifndef MishaMug - #define MishaMug (FirstMugID+323) + #define MishaMug (FirstMugID+324) #endif -setMugEntry(MishaMug, Misha_claire45MugData, 3, 5, 3, 3) +setMugEntry(MishaMug, MishaMugData, 3, 5, 3, 3) ALIGN 4 -Mueller_CanDyMugData: -#incbin "Dmp/Mueller_CanDy_mug.dmp" -#incbin "Dmp/Mueller_CanDy_frames.dmp" -#incbin "Dmp/Mueller_CanDy_palette.dmp" -#incbin "Dmp/Mueller_CanDy_minimug.dmp" +MuellerMugData: +#incbin "png/FE4FE5/Mueller_CanDy_mug.dmp" +#incbin "png/FE4FE5/Mueller_CanDy_frames.dmp" +#incbin "png/FE4FE5/Mueller_CanDy_palette.dmp" +#incbin "png/FE4FE5/Mueller_CanDy_minimug.dmp" #ifndef MuellerMug - #define MuellerMug (FirstMugID+324) + #define MuellerMug (FirstMugID+325) #endif -setMugEntry(MuellerMug, Mueller_CanDyMugData, 3, 5, 3, 3) +setMugEntry(MuellerMug, MuellerMugData, 3, 5, 3, 3) ALIGN 4 -Muirne_MeliaMugData: -#incbin "Dmp/Muirne_Melia_mug.dmp" -#incbin "Dmp/Muirne_Melia_frames.dmp" -#incbin "Dmp/Muirne_Melia_palette.dmp" -#incbin "Dmp/Muirne_Melia_minimug.dmp" +MuirneMugData: +#incbin "png/FE4FE5/Muirne_Melia_mug.dmp" +#incbin "png/FE4FE5/Muirne_Melia_frames.dmp" +#incbin "png/FE4FE5/Muirne_Melia_palette.dmp" +#incbin "png/FE4FE5/Muirne_Melia_minimug.dmp" #ifndef MuirneMug - #define MuirneMug (FirstMugID+325) + #define MuirneMug (FirstMugID+326) #endif -setMugEntry(MuirneMug, Muirne_MeliaMugData, 4, 6, 4, 4) +setMugEntry(MuirneMug, MuirneMugData, 4, 6, 4, 4) ALIGN 4 -Munnir_Sterling_GlovnerMugData: -#incbin "Dmp/Munnir_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Munnir_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Munnir_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Munnir_Sterling_Glovner_minimug.dmp" +MunnirMugData: +#incbin "png/FE4FE5/Munnir_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Munnir_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Munnir_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Munnir_Sterling_Glovner_minimug.dmp" #ifndef MunnirMug - #define MunnirMug (FirstMugID+326) + #define MunnirMug (FirstMugID+327) #endif -setMugEntry(MunnirMug, Munnir_Sterling_GlovnerMugData, 3, 4, 3, 2) +setMugEntry(MunnirMug, MunnirMugData, 3, 4, 3, 2) ALIGN 4 -Musar_UltraxBladeMugData: -#incbin "Dmp/Musar_UltraxBlade_mug.dmp" -#incbin "Dmp/Musar_UltraxBlade_frames.dmp" -#incbin "Dmp/Musar_UltraxBlade_palette.dmp" -#incbin "Dmp/Musar_UltraxBlade_minimug.dmp" +MusarMugData: +#incbin "png/FE4FE5/Musar_UltraxBlade_mug.dmp" +#incbin "png/FE4FE5/Musar_UltraxBlade_frames.dmp" +#incbin "png/FE4FE5/Musar_UltraxBlade_palette.dmp" +#incbin "png/FE4FE5/Musar_UltraxBlade_minimug.dmp" #ifndef MusarMug - #define MusarMug (FirstMugID+327) + #define MusarMug (FirstMugID+328) #endif -setMugEntry(MusarMug, Musar_UltraxBladeMugData, 2, 5, 2, 3) +setMugEntry(MusarMug, MusarMugData, 2, 5, 2, 3) ALIGN 4 -Nanna_ZelkamiMugData: -#incbin "Dmp/Nanna_Zelkami_mug.dmp" -#incbin "Dmp/Nanna_Zelkami_frames.dmp" -#incbin "Dmp/Nanna_Zelkami_palette.dmp" -#incbin "Dmp/Nanna_Zelkami_minimug.dmp" +NannaMugData: +#incbin "png/FE4FE5/Nanna_Zelkami_mug.dmp" +#incbin "png/FE4FE5/Nanna_Zelkami_frames.dmp" +#incbin "png/FE4FE5/Nanna_Zelkami_palette.dmp" +#incbin "png/FE4FE5/Nanna_Zelkami_minimug.dmp" #ifndef NannaMug - #define NannaMug (FirstMugID+328) + #define NannaMug (FirstMugID+329) #endif -setMugEntry(NannaMug, Nanna_ZelkamiMugData, 4, 6, 4, 4) +setMugEntry(NannaMug, NannaMugData, 4, 6, 4, 4) ALIGN 4 -Naoise_Obsidian_DaddyMugData: -#incbin "Dmp/Naoise_Obsidian_Daddy_mug.dmp" -#incbin "Dmp/Naoise_Obsidian_Daddy_frames.dmp" -#incbin "Dmp/Naoise_Obsidian_Daddy_palette.dmp" -#incbin "Dmp/Naoise_Obsidian_Daddy_minimug.dmp" +NaoiseMugData: +#incbin "png/FE4FE5/Naoise_Obsidian_Daddy_mug.dmp" +#incbin "png/FE4FE5/Naoise_Obsidian_Daddy_frames.dmp" +#incbin "png/FE4FE5/Naoise_Obsidian_Daddy_palette.dmp" +#incbin "png/FE4FE5/Naoise_Obsidian_Daddy_minimug.dmp" #ifndef NaoiseMug - #define NaoiseMug (FirstMugID+329) + #define NaoiseMug (FirstMugID+330) #endif -setMugEntry(NaoiseMug, Naoise_Obsidian_DaddyMugData, 3, 5, 3, 3) +setMugEntry(NaoiseMug, NaoiseMugData, 3, 5, 3, 3) ALIGN 4 -Oifey_New_version_MeliaMugData: -#incbin "Dmp/Oifey_New_version_Melia_mug.dmp" -#incbin "Dmp/Oifey_New_version_Melia_frames.dmp" -#incbin "Dmp/Oifey_New_version_Melia_palette.dmp" -#incbin "Dmp/Oifey_New_version_Melia_minimug.dmp" +OifeyMugData: +#incbin "png/FE4FE5/Oifey_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Oifey_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Oifey_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Oifey_New_version_Melia_minimug.dmp" #ifndef OifeyMug - #define OifeyMug (FirstMugID+330) + #define OifeyMug (FirstMugID+331) #endif -setMugEntry(OifeyMug, Oifey_New_version_MeliaMugData, 3, 5, 3, 3) +setMugEntry(OifeyMug, OifeyMugData, 3, 5, 3, 3) ALIGN 4 -Olthoff_SaintRubenioMugData: -#incbin "Dmp/Olthoff_SaintRubenio_mug.dmp" -#incbin "Dmp/Olthoff_SaintRubenio_frames.dmp" -#incbin "Dmp/Olthoff_SaintRubenio_palette.dmp" -#incbin "Dmp/Olthoff_SaintRubenio_minimug.dmp" +OlthoffMugData: +#incbin "png/FE4FE5/Olthoff_SaintRubenio_mug.dmp" +#incbin "png/FE4FE5/Olthoff_SaintRubenio_frames.dmp" +#incbin "png/FE4FE5/Olthoff_SaintRubenio_palette.dmp" +#incbin "png/FE4FE5/Olthoff_SaintRubenio_minimug.dmp" #ifndef OlthoffMug - #define OlthoffMug (FirstMugID+331) + #define OlthoffMug (FirstMugID+332) #endif -setMugEntry(OlthoffMug, Olthoff_SaintRubenioMugData, 2, 6, 2, 4) +setMugEntry(OlthoffMug, OlthoffMugData, 2, 6, 2, 4) ALIGN 4 -Olwen_Garytop_F2EMugData: -#incbin "Dmp/Olwen_Garytop_F2E_mug.dmp" -#incbin "Dmp/Olwen_Garytop_F2E_frames.dmp" -#incbin "Dmp/Olwen_Garytop_F2E_palette.dmp" -#incbin "Dmp/Olwen_Garytop_F2E_minimug.dmp" +OlwenMugData: +#incbin "png/FE4FE5/Olwen_Garytop_F2E_mug.dmp" +#incbin "png/FE4FE5/Olwen_Garytop_F2E_frames.dmp" +#incbin "png/FE4FE5/Olwen_Garytop_F2E_palette.dmp" +#incbin "png/FE4FE5/Olwen_Garytop_F2E_minimug.dmp" #ifndef OlwenMug - #define OlwenMug (FirstMugID+332) + #define OlwenMug (FirstMugID+333) #endif -setMugEntry(OlwenMug, Olwen_Garytop_F2EMugData, 4, 6, 4, 4) +setMugEntry(OlwenMug, OlwenMugData, 4, 6, 4, 4) ALIGN 4 -Osian_Sterling_ClovnerMugData: -#incbin "Dmp/Osian_Sterling_Clovner_mug.dmp" -#incbin "Dmp/Osian_Sterling_Clovner_frames.dmp" -#incbin "Dmp/Osian_Sterling_Clovner_palette.dmp" -#incbin "Dmp/Osian_Sterling_Clovner_minimug.dmp" +OsianMugData: +#incbin "png/FE4FE5/Osian_Sterling_Clovner_mug.dmp" +#incbin "png/FE4FE5/Osian_Sterling_Clovner_frames.dmp" +#incbin "png/FE4FE5/Osian_Sterling_Clovner_palette.dmp" +#incbin "png/FE4FE5/Osian_Sterling_Clovner_minimug.dmp" #ifndef OsianMug - #define OsianMug (FirstMugID+333) + #define OsianMug (FirstMugID+334) #endif -setMugEntry(OsianMug, Osian_Sterling_ClovnerMugData, 3, 5, 3, 3) +setMugEntry(OsianMug, OsianMugData, 3, 5, 3, 3) ALIGN 4 -Papilio_UltraxBladeMugData: -#incbin "Dmp/Papilio_UltraxBlade_mug.dmp" -#incbin "Dmp/Papilio_UltraxBlade_frames.dmp" -#incbin "Dmp/Papilio_UltraxBlade_palette.dmp" -#incbin "Dmp/Papilio_UltraxBlade_minimug.dmp" +PapilioMugData: +#incbin "png/FE4FE5/Papilio_UltraxBlade_mug.dmp" +#incbin "png/FE4FE5/Papilio_UltraxBlade_frames.dmp" +#incbin "png/FE4FE5/Papilio_UltraxBlade_palette.dmp" +#incbin "png/FE4FE5/Papilio_UltraxBlade_minimug.dmp" #ifndef PapilioMug - #define PapilioMug (FirstMugID+334) + #define PapilioMug (FirstMugID+335) #endif -setMugEntry(PapilioMug, Papilio_UltraxBladeMugData, 2, 5, 2, 3) +setMugEntry(PapilioMug, PapilioMugData, 2, 5, 2, 3) ALIGN 4 -Patty_MeliaMugData: -#incbin "Dmp/Patty_Melia_mug.dmp" -#incbin "Dmp/Patty_Melia_frames.dmp" -#incbin "Dmp/Patty_Melia_palette.dmp" -#incbin "Dmp/Patty_Melia_minimug.dmp" +PattyMugData: +#incbin "png/FE4FE5/Patty_Melia_mug.dmp" +#incbin "png/FE4FE5/Patty_Melia_frames.dmp" +#incbin "png/FE4FE5/Patty_Melia_palette.dmp" +#incbin "png/FE4FE5/Patty_Melia_minimug.dmp" #ifndef PattyMug - #define PattyMug (FirstMugID+335) + #define PattyMug (FirstMugID+336) #endif -setMugEntry(PattyMug, Patty_MeliaMugData, 3, 6, 3, 4) +setMugEntry(PattyMug, PattyMugData, 3, 6, 3, 4) ALIGN 4 -Perne_Sterling_GlovnerMugData: -#incbin "Dmp/Perne_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Perne_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Perne_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Perne_Sterling_Glovner_minimug.dmp" +PerneMugData: +#incbin "png/FE4FE5/Perne_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Perne_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Perne_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Perne_Sterling_Glovner_minimug.dmp" #ifndef PerneMug - #define PerneMug (FirstMugID+336) + #define PerneMug (FirstMugID+337) #endif -setMugEntry(PerneMug, Perne_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(PerneMug, PerneMugData, 3, 5, 3, 3) ALIGN 4 -Quan_Garytop_F2EMugData: -#incbin "Dmp/Quan_Garytop_F2E_mug.dmp" -#incbin "Dmp/Quan_Garytop_F2E_frames.dmp" -#incbin "Dmp/Quan_Garytop_F2E_palette.dmp" -#incbin "Dmp/Quan_Garytop_F2E_minimug.dmp" +QuanMugData: +#incbin "png/FE4FE5/Quan_Garytop_F2E_mug.dmp" +#incbin "png/FE4FE5/Quan_Garytop_F2E_frames.dmp" +#incbin "png/FE4FE5/Quan_Garytop_F2E_palette.dmp" +#incbin "png/FE4FE5/Quan_Garytop_F2E_minimug.dmp" #ifndef QuanMug - #define QuanMug (FirstMugID+337) + #define QuanMug (FirstMugID+338) #endif -setMugEntry(QuanMug, Quan_Garytop_F2EMugData, 3, 5, 3, 3) +setMugEntry(QuanMug, QuanMugData, 3, 5, 3, 3) ALIGN 4 -Ralph_Sterling_GlovnerMugData: -#incbin "Dmp/Ralph_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Ralph_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Ralph_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Ralph_Sterling_Glovner_minimug.dmp" +RalphMugData: +#incbin "png/FE4FE5/Ralph_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Ralph_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Ralph_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Ralph_Sterling_Glovner_minimug.dmp" #ifndef RalphMug - #define RalphMug (FirstMugID+338) + #define RalphMug (FirstMugID+339) #endif -setMugEntry(RalphMug, Ralph_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(RalphMug, RalphMugData, 3, 5, 3, 3) ALIGN 4 -Raydrick_Sterling_GlovnerMugData: -#incbin "Dmp/Raydrick_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Raydrick_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Raydrick_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Raydrick_Sterling_Glovner_minimug.dmp" +RaydrickMugData: +#incbin "png/FE4FE5/Raydrick_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Raydrick_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Raydrick_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Raydrick_Sterling_Glovner_minimug.dmp" #ifndef RaydrickMug - #define RaydrickMug (FirstMugID+339) + #define RaydrickMug (FirstMugID+340) #endif -setMugEntry(RaydrickMug, Raydrick_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(RaydrickMug, RaydrickMugData, 3, 5, 3, 3) ALIGN 4 -Reinhardt__HyperGammaSpaces_ArcthMugData: -#incbin "Dmp/Reinhardt__HyperGammaSpaces_Arcth_mug.dmp" -#incbin "Dmp/Reinhardt__HyperGammaSpaces_Arcth_frames.dmp" -#incbin "Dmp/Reinhardt__HyperGammaSpaces_Arcth_palette.dmp" -#incbin "Dmp/Reinhardt__HyperGammaSpaces_Arcth_minimug.dmp" +ReinhardtMugData: +#incbin "png/FE4FE5/Reinhardt__HyperGammaSpaces_Arcth_mug.dmp" +#incbin "png/FE4FE5/Reinhardt__HyperGammaSpaces_Arcth_frames.dmp" +#incbin "png/FE4FE5/Reinhardt__HyperGammaSpaces_Arcth_palette.dmp" +#incbin "png/FE4FE5/Reinhardt__HyperGammaSpaces_Arcth_minimug.dmp" #ifndef ReinhardtMug - #define ReinhardtMug (FirstMugID+340) + #define ReinhardtMug (FirstMugID+341) #endif -setMugEntry(ReinhardtMug, Reinhardt__HyperGammaSpaces_ArcthMugData, 3, 5, 3, 3) +setMugEntry(ReinhardtMug, ReinhardtMugData, 3, 5, 3, 3) ALIGN 4 -Ridale_UltraxBladeMugData: -#incbin "Dmp/Ridale_UltraxBlade_mug.dmp" -#incbin "Dmp/Ridale_UltraxBlade_frames.dmp" -#incbin "Dmp/Ridale_UltraxBlade_palette.dmp" -#incbin "Dmp/Ridale_UltraxBlade_minimug.dmp" +RidaleMugData: +#incbin "png/FE4FE5/Ridale_UltraxBlade_mug.dmp" +#incbin "png/FE4FE5/Ridale_UltraxBlade_frames.dmp" +#incbin "png/FE4FE5/Ridale_UltraxBlade_palette.dmp" +#incbin "png/FE4FE5/Ridale_UltraxBlade_minimug.dmp" #ifndef RidaleMug - #define RidaleMug (FirstMugID+341) + #define RidaleMug (FirstMugID+342) #endif -setMugEntry(RidaleMug, Ridale_UltraxBladeMugData, 2, 5, 2, 3) +setMugEntry(RidaleMug, RidaleMugData, 2, 5, 2, 3) ALIGN 4 -Robert_DongusMugData: -#incbin "Dmp/Robert_Dongus_mug.dmp" -#incbin "Dmp/Robert_Dongus_frames.dmp" -#incbin "Dmp/Robert_Dongus_palette.dmp" -#incbin "Dmp/Robert_Dongus_minimug.dmp" +RobertMugData: +#incbin "png/FE4FE5/Robert_Dongus_mug.dmp" +#incbin "png/FE4FE5/Robert_Dongus_frames.dmp" +#incbin "png/FE4FE5/Robert_Dongus_palette.dmp" +#incbin "png/FE4FE5/Robert_Dongus_minimug.dmp" #ifndef RobertMug - #define RobertMug (FirstMugID+342) + #define RobertMug (FirstMugID+343) #endif -setMugEntry(RobertMug, Robert_DongusMugData, 4, 5, 4, 3) +setMugEntry(RobertMug, RobertMugData, 4, 5, 4, 3) ALIGN 4 -Roddlevan_MeliaMugData: -#incbin "Dmp/Roddlevan_Melia_mug.dmp" -#incbin "Dmp/Roddlevan_Melia_frames.dmp" -#incbin "Dmp/Roddlevan_Melia_palette.dmp" -#incbin "Dmp/Roddlevan_Melia_minimug.dmp" +RoddlevanMugData: +#incbin "png/FE4FE5/Roddlevan_Melia_mug.dmp" +#incbin "png/FE4FE5/Roddlevan_Melia_frames.dmp" +#incbin "png/FE4FE5/Roddlevan_Melia_palette.dmp" +#incbin "png/FE4FE5/Roddlevan_Melia_minimug.dmp" #ifndef RoddlevanMug - #define RoddlevanMug (FirstMugID+343) + #define RoddlevanMug (FirstMugID+344) #endif -setMugEntry(RoddlevanMug, Roddlevan_MeliaMugData, 3, 5, 3, 3) +setMugEntry(RoddlevanMug, RoddlevanMugData, 3, 5, 3, 3) ALIGN 4 -Ronan_Miguel_RojoMugData: -#incbin "Dmp/Ronan_Miguel_Rojo_mug.dmp" -#incbin "Dmp/Ronan_Miguel_Rojo_frames.dmp" -#incbin "Dmp/Ronan_Miguel_Rojo_palette.dmp" -#incbin "Dmp/Ronan_Miguel_Rojo_minimug.dmp" +RonanMugData: +#incbin "png/FE4FE5/Ronan_Miguel_Rojo_mug.dmp" +#incbin "png/FE4FE5/Ronan_Miguel_Rojo_frames.dmp" +#incbin "png/FE4FE5/Ronan_Miguel_Rojo_palette.dmp" +#incbin "png/FE4FE5/Ronan_Miguel_Rojo_minimug.dmp" #ifndef RonanMug - #define RonanMug (FirstMugID+344) + #define RonanMug (FirstMugID+345) #endif -setMugEntry(RonanMug, Ronan_Miguel_RojoMugData, 2, 5, 3, 3) +setMugEntry(RonanMug, RonanMugData, 2, 5, 3, 3) ALIGN 4 -Rumei_CanDyMugData: -#incbin "Dmp/Rumei_CanDy_mug.dmp" -#incbin "Dmp/Rumei_CanDy_frames.dmp" -#incbin "Dmp/Rumei_CanDy_palette.dmp" -#incbin "Dmp/Rumei_CanDy_minimug.dmp" +RumeiMugData: +#incbin "png/FE4FE5/Rumei_CanDy_mug.dmp" +#incbin "png/FE4FE5/Rumei_CanDy_frames.dmp" +#incbin "png/FE4FE5/Rumei_CanDy_palette.dmp" +#incbin "png/FE4FE5/Rumei_CanDy_minimug.dmp" #ifndef RumeiMug - #define RumeiMug (FirstMugID+345) + #define RumeiMug (FirstMugID+346) #endif -setMugEntry(RumeiMug, Rumei_CanDyMugData, 3, 5, 3, 3) +setMugEntry(RumeiMug, RumeiMugData, 3, 5, 3, 3) ALIGN 4 -Safy_MeliaMugData: -#incbin "Dmp/Safy_Melia_mug.dmp" -#incbin "Dmp/Safy_Melia_frames.dmp" -#incbin "Dmp/Safy_Melia_palette.dmp" -#incbin "Dmp/Safy_Melia_minimug.dmp" +SafyMugData: +#incbin "png/FE4FE5/Safy_Melia_mug.dmp" +#incbin "png/FE4FE5/Safy_Melia_frames.dmp" +#incbin "png/FE4FE5/Safy_Melia_palette.dmp" +#incbin "png/FE4FE5/Safy_Melia_minimug.dmp" #ifndef SafyMug - #define SafyMug (FirstMugID+346) + #define SafyMug (FirstMugID+347) #endif -setMugEntry(SafyMug, Safy_MeliaMugData, 3, 6, 3, 4) +setMugEntry(SafyMug, SafyMugData, 3, 6, 3, 4) ALIGN 4 -Salas_Atey_ArcthMugData: -#incbin "Dmp/Salas_Atey_Arcth_mug.dmp" -#incbin "Dmp/Salas_Atey_Arcth_frames.dmp" -#incbin "Dmp/Salas_Atey_Arcth_palette.dmp" -#incbin "Dmp/Salas_Atey_Arcth_minimug.dmp" +SalasMugData: +#incbin "png/FE4FE5/Salas_Atey_Arcth_mug.dmp" +#incbin "png/FE4FE5/Salas_Atey_Arcth_frames.dmp" +#incbin "png/FE4FE5/Salas_Atey_Arcth_palette.dmp" +#incbin "png/FE4FE5/Salas_Atey_Arcth_minimug.dmp" #ifndef SalasMug - #define SalasMug (FirstMugID+347) + #define SalasMug (FirstMugID+348) #endif -setMugEntry(SalasMug, Salas_Atey_ArcthMugData, 3, 5, 3, 3) +setMugEntry(SalasMug, SalasMugData, 3, 5, 3, 3) ALIGN 4 -Scathach_New_version_MeliaMugData: -#incbin "Dmp/Scathach_New_version_Melia_mug.dmp" -#incbin "Dmp/Scathach_New_version_Melia_frames.dmp" -#incbin "Dmp/Scathach_New_version_Melia_palette.dmp" -#incbin "Dmp/Scathach_New_version_Melia_minimug.dmp" +ScathachMugData: +#incbin "png/FE4FE5/Scathach_New_version_Melia_mug.dmp" +#incbin "png/FE4FE5/Scathach_New_version_Melia_frames.dmp" +#incbin "png/FE4FE5/Scathach_New_version_Melia_palette.dmp" +#incbin "png/FE4FE5/Scathach_New_version_Melia_minimug.dmp" #ifndef ScathachMug - #define ScathachMug (FirstMugID+348) + #define ScathachMug (FirstMugID+349) #endif -setMugEntry(ScathachMug, Scathach_New_version_MeliaMugData, 2, 6, 3, 4) +setMugEntry(ScathachMug, ScathachMugData, 2, 6, 3, 4) ALIGN 4 -Seimto_CanDyMugData: -#incbin "Dmp/Seimto_CanDy_mug.dmp" -#incbin "Dmp/Seimto_CanDy_frames.dmp" -#incbin "Dmp/Seimto_CanDy_palette.dmp" -#incbin "Dmp/Seimto_CanDy_minimug.dmp" +SeimtoMugData: +#incbin "png/FE4FE5/Seimto_CanDy_mug.dmp" +#incbin "png/FE4FE5/Seimto_CanDy_frames.dmp" +#incbin "png/FE4FE5/Seimto_CanDy_palette.dmp" +#incbin "png/FE4FE5/Seimto_CanDy_minimug.dmp" #ifndef SeimtoMug - #define SeimtoMug (FirstMugID+349) + #define SeimtoMug (FirstMugID+350) #endif -setMugEntry(SeimtoMug, Seimto_CanDyMugData, 3, 5, 3, 3) +setMugEntry(SeimtoMug, SeimtoMugData, 3, 5, 3, 3) ALIGN 4 -Selphina_MeliaMugData: -#incbin "Dmp/Selphina_Melia_mug.dmp" -#incbin "Dmp/Selphina_Melia_frames.dmp" -#incbin "Dmp/Selphina_Melia_palette.dmp" -#incbin "Dmp/Selphina_Melia_minimug.dmp" +SelphinaMugData: +#incbin "png/FE4FE5/Selphina_Melia_mug.dmp" +#incbin "png/FE4FE5/Selphina_Melia_frames.dmp" +#incbin "png/FE4FE5/Selphina_Melia_palette.dmp" +#incbin "png/FE4FE5/Selphina_Melia_minimug.dmp" #ifndef SelphinaMug - #define SelphinaMug (FirstMugID+350) + #define SelphinaMug (FirstMugID+351) #endif -setMugEntry(SelphinaMug, Selphina_MeliaMugData, 2, 5, 2, 3) +setMugEntry(SelphinaMug, SelphinaMugData, 2, 5, 2, 3) ALIGN 4 -Shanan_MeliaMugData: -#incbin "Dmp/Shanan_Melia_mug.dmp" -#incbin "Dmp/Shanan_Melia_frames.dmp" -#incbin "Dmp/Shanan_Melia_palette.dmp" -#incbin "Dmp/Shanan_Melia_minimug.dmp" +ShananMugData: +#incbin "png/FE4FE5/Shanan_Melia_mug.dmp" +#incbin "png/FE4FE5/Shanan_Melia_frames.dmp" +#incbin "png/FE4FE5/Shanan_Melia_palette.dmp" +#incbin "png/FE4FE5/Shanan_Melia_minimug.dmp" #ifndef ShananMug - #define ShananMug (FirstMugID+351) + #define ShananMug (FirstMugID+352) #endif -setMugEntry(ShananMug, Shanan_MeliaMugData, 2, 5, 2, 3) +setMugEntry(ShananMug, ShananMugData, 2, 5, 2, 3) ALIGN 4 -Shannam_MeliaMugData: -#incbin "Dmp/Shannam_Melia_mug.dmp" -#incbin "Dmp/Shannam_Melia_frames.dmp" -#incbin "Dmp/Shannam_Melia_palette.dmp" -#incbin "Dmp/Shannam_Melia_minimug.dmp" +ShannamMugData: +#incbin "png/FE4FE5/Shannam_Melia_mug.dmp" +#incbin "png/FE4FE5/Shannam_Melia_frames.dmp" +#incbin "png/FE4FE5/Shannam_Melia_palette.dmp" +#incbin "png/FE4FE5/Shannam_Melia_minimug.dmp" #ifndef ShannamMug - #define ShannamMug (FirstMugID+352) + #define ShannamMug (FirstMugID+353) #endif -setMugEntry(ShannamMug, Shannam_MeliaMugData, 2, 5, 2, 3) +setMugEntry(ShannamMug, ShannamMugData, 2, 5, 2, 3) ALIGN 4 -Sharlow_MeliaMugData: -#incbin "Dmp/Sharlow_Melia_mug.dmp" -#incbin "Dmp/Sharlow_Melia_frames.dmp" -#incbin "Dmp/Sharlow_Melia_palette.dmp" -#incbin "Dmp/Sharlow_Melia_minimug.dmp" +SharlowMugData: +#incbin "png/FE4FE5/Sharlow_Melia_mug.dmp" +#incbin "png/FE4FE5/Sharlow_Melia_frames.dmp" +#incbin "png/FE4FE5/Sharlow_Melia_palette.dmp" +#incbin "png/FE4FE5/Sharlow_Melia_minimug.dmp" #ifndef SharlowMug - #define SharlowMug (FirstMugID+353) + #define SharlowMug (FirstMugID+354) #endif -setMugEntry(SharlowMug, Sharlow_MeliaMugData, 3, 6, 3, 4) +setMugEntry(SharlowMug, SharlowMugData, 3, 6, 3, 4) ALIGN 4 -Shiva_Atey_RenoudMugData: -#incbin "Dmp/Shiva_Atey_Renoud_mug.dmp" -#incbin "Dmp/Shiva_Atey_Renoud_frames.dmp" -#incbin "Dmp/Shiva_Atey_Renoud_palette.dmp" -#incbin "Dmp/Shiva_Atey_Renoud_minimug.dmp" +ShivaMugData: +#incbin "png/FE4FE5/Shiva_Atey_Renoud_mug.dmp" +#incbin "png/FE4FE5/Shiva_Atey_Renoud_frames.dmp" +#incbin "png/FE4FE5/Shiva_Atey_Renoud_palette.dmp" +#incbin "png/FE4FE5/Shiva_Atey_Renoud_minimug.dmp" #ifndef ShivaMug - #define ShivaMug (FirstMugID+354) + #define ShivaMug (FirstMugID+355) #endif -setMugEntry(ShivaMug, Shiva_Atey_RenoudMugData, 3, 5, 3, 3) +setMugEntry(ShivaMug, ShivaMugData, 3, 5, 3, 3) ALIGN 4 -Sigurd_AteyMugData: -#incbin "Dmp/Sigurd_Atey_mug.dmp" -#incbin "Dmp/Sigurd_Atey_frames.dmp" -#incbin "Dmp/Sigurd_Atey_palette.dmp" -#incbin "Dmp/Sigurd_Atey_minimug.dmp" +SigurdMugData: +#incbin "png/FE4FE5/Sigurd_Atey_mug.dmp" +#incbin "png/FE4FE5/Sigurd_Atey_frames.dmp" +#incbin "png/FE4FE5/Sigurd_Atey_palette.dmp" +#incbin "png/FE4FE5/Sigurd_Atey_minimug.dmp" #ifndef SigurdMug - #define SigurdMug (FirstMugID+355) + #define SigurdMug (FirstMugID+356) #endif -setMugEntry(SigurdMug, Sigurd_AteyMugData, 3, 5, 3, 3) +setMugEntry(SigurdMug, SigurdMugData, 3, 5, 3, 3) ALIGN 4 -Sylvia_TAS20xx_FenrielMugData: -#incbin "Dmp/Sylvia_TAS20xx_Fenriel_mug.dmp" -#incbin "Dmp/Sylvia_TAS20xx_Fenriel_frames.dmp" -#incbin "Dmp/Sylvia_TAS20xx_Fenriel_palette.dmp" -#incbin "Dmp/Sylvia_TAS20xx_Fenriel_minimug.dmp" +SylviaMugData: +#incbin "png/FE4FE5/Sylvia_TAS20xx_Fenriel_mug.dmp" +#incbin "png/FE4FE5/Sylvia_TAS20xx_Fenriel_frames.dmp" +#incbin "png/FE4FE5/Sylvia_TAS20xx_Fenriel_palette.dmp" +#incbin "png/FE4FE5/Sylvia_TAS20xx_Fenriel_minimug.dmp" #ifndef SylviaMug - #define SylviaMug (FirstMugID+356) + #define SylviaMug (FirstMugID+357) #endif -setMugEntry(SylviaMug, Sylvia_TAS20xx_FenrielMugData, 4, 5, 4, 3) +setMugEntry(SylviaMug, SylviaMugData, 4, 5, 4, 3) ALIGN 4 -Tailtiu_BladeMugData: -#incbin "Dmp/Tailtiu_Blade_mug.dmp" -#incbin "Dmp/Tailtiu_Blade_frames.dmp" -#incbin "Dmp/Tailtiu_Blade_palette.dmp" -#incbin "Dmp/Tailtiu_Blade_minimug.dmp" +TailtiuMugData: +#incbin "png/FE4FE5/Tailtiu_Blade_mug.dmp" +#incbin "png/FE4FE5/Tailtiu_Blade_frames.dmp" +#incbin "png/FE4FE5/Tailtiu_Blade_palette.dmp" +#incbin "png/FE4FE5/Tailtiu_Blade_minimug.dmp" #ifndef TailtiuMug - #define TailtiuMug (FirstMugID+357) + #define TailtiuMug (FirstMugID+358) #endif -setMugEntry(TailtiuMug, Tailtiu_BladeMugData, 3, 6, 3, 4) +setMugEntry(TailtiuMug, TailtiuMugData, 3, 6, 3, 4) ALIGN 4 -Tanya_Version_2_WasdyeMugData: -#incbin "Dmp/Tanya_Version_2_Wasdye_mug.dmp" -#incbin "Dmp/Tanya_Version_2_Wasdye_frames.dmp" -#incbin "Dmp/Tanya_Version_2_Wasdye_palette.dmp" -#incbin "Dmp/Tanya_Version_2_Wasdye_minimug.dmp" +TanyaMugData: +#incbin "png/FE4FE5/Tanya_Version_2_Wasdye_mug.dmp" +#incbin "png/FE4FE5/Tanya_Version_2_Wasdye_frames.dmp" +#incbin "png/FE4FE5/Tanya_Version_2_Wasdye_palette.dmp" +#incbin "png/FE4FE5/Tanya_Version_2_Wasdye_minimug.dmp" #ifndef TanyaMug - #define TanyaMug (FirstMugID+358) + #define TanyaMug (FirstMugID+359) #endif -setMugEntry(TanyaMug, Tanya_Version_2_WasdyeMugData, 4, 6, 4, 4) +setMugEntry(TanyaMug, TanyaMugData, 4, 6, 4, 4) ALIGN 4 -Thrud_Sterling_GlovnerMugData: -#incbin "Dmp/Thrud_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Thrud_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Thrud_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Thrud_Sterling_Glovner_minimug.dmp" +ThrudMugData: +#incbin "png/FE4FE5/Thrud_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Thrud_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Thrud_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Thrud_Sterling_Glovner_minimug.dmp" #ifndef ThrudMug - #define ThrudMug (FirstMugID+359) + #define ThrudMug (FirstMugID+360) #endif -setMugEntry(ThrudMug, Thrud_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(ThrudMug, ThrudMugData, 3, 5, 3, 3) ALIGN 4 -Tiltyu_AteyMugData: -#incbin "Dmp/Tiltyu_Atey_mug.dmp" -#incbin "Dmp/Tiltyu_Atey_frames.dmp" -#incbin "Dmp/Tiltyu_Atey_palette.dmp" -#incbin "Dmp/Tiltyu_Atey_minimug.dmp" +TiltyuMugData: +#incbin "png/FE4FE5/Tiltyu_Atey_mug.dmp" +#incbin "png/FE4FE5/Tiltyu_Atey_frames.dmp" +#incbin "png/FE4FE5/Tiltyu_Atey_palette.dmp" +#incbin "png/FE4FE5/Tiltyu_Atey_minimug.dmp" #ifndef TiltyuMug - #define TiltyuMug (FirstMugID+360) + #define TiltyuMug (FirstMugID+361) #endif -setMugEntry(TiltyuMug, Tiltyu_AteyMugData, 3, 7, 3, 5) +setMugEntry(TiltyuMug, TiltyuMugData, 3, 7, 3, 5) ALIGN 4 -Travant_AteyMugData: -#incbin "Dmp/Travant_Atey_mug.dmp" -#incbin "Dmp/Travant_Atey_frames.dmp" -#incbin "Dmp/Travant_Atey_palette.dmp" -#incbin "Dmp/Travant_Atey_minimug.dmp" +TravantMugData: +#incbin "png/FE4FE5/Travant_Atey_mug.dmp" +#incbin "png/FE4FE5/Travant_Atey_frames.dmp" +#incbin "png/FE4FE5/Travant_Atey_palette.dmp" +#incbin "png/FE4FE5/Travant_Atey_minimug.dmp" #ifndef TravantMug - #define TravantMug (FirstMugID+361) + #define TravantMug (FirstMugID+362) #endif -setMugEntry(TravantMug, Travant_AteyMugData, 2, 4, 2, 2) +setMugEntry(TravantMug, TravantMugData, 2, 4, 2, 2) ALIGN 4 -Tristan_MeliaMugData: -#incbin "Dmp/Tristan_Melia_mug.dmp" -#incbin "Dmp/Tristan_Melia_frames.dmp" -#incbin "Dmp/Tristan_Melia_palette.dmp" -#incbin "Dmp/Tristan_Melia_minimug.dmp" +TristanMugData: +#incbin "png/FE4FE5/Tristan_Melia_mug.dmp" +#incbin "png/FE4FE5/Tristan_Melia_frames.dmp" +#incbin "png/FE4FE5/Tristan_Melia_palette.dmp" +#incbin "png/FE4FE5/Tristan_Melia_minimug.dmp" #ifndef TristanMug - #define TristanMug (FirstMugID+362) + #define TristanMug (FirstMugID+363) #endif -setMugEntry(TristanMug, Tristan_MeliaMugData, 2, 5, 2, 3) +setMugEntry(TristanMug, TristanMugData, 2, 5, 2, 3) ALIGN 4 -Troude_Version_2_Sterling_GlovnerMugData: -#incbin "Dmp/Troude_Version_2_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Troude_Version_2_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Troude_Version_2_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Troude_Version_2_Sterling_Glovner_minimug.dmp" +TroudeMugData: +#incbin "png/FE4FE5/Troude_Version_2_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Troude_Version_2_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Troude_Version_2_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Troude_Version_2_Sterling_Glovner_minimug.dmp" #ifndef TroudeMug - #define TroudeMug (FirstMugID+363) + #define TroudeMug (FirstMugID+364) #endif -setMugEntry(TroudeMug, Troude_Version_2_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(TroudeMug, TroudeMugData, 3, 5, 3, 3) ALIGN 4 -Vaja_Sterling_GlovnerMugData: -#incbin "Dmp/Vaja_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Vaja_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Vaja_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Vaja_Sterling_Glovner_minimug.dmp" +VajaMugData: +#incbin "png/FE4FE5/Vaja_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Vaja_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Vaja_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Vaja_Sterling_Glovner_minimug.dmp" #ifndef VajaMug - #define VajaMug (FirstMugID+364) + #define VajaMug (FirstMugID+365) #endif -setMugEntry(VajaMug, Vaja_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(VajaMug, VajaMugData, 3, 5, 3, 3) ALIGN 4 -Weismann_Version_2_Sterling_GlovnerMugData: -#incbin "Dmp/Weismann_Version_2_Sterling_Glovner_mug.dmp" -#incbin "Dmp/Weismann_Version_2_Sterling_Glovner_frames.dmp" -#incbin "Dmp/Weismann_Version_2_Sterling_Glovner_palette.dmp" -#incbin "Dmp/Weismann_Version_2_Sterling_Glovner_minimug.dmp" +WeismannMugData: +#incbin "png/FE4FE5/Weismann_Version_2_Sterling_Glovner_mug.dmp" +#incbin "png/FE4FE5/Weismann_Version_2_Sterling_Glovner_frames.dmp" +#incbin "png/FE4FE5/Weismann_Version_2_Sterling_Glovner_palette.dmp" +#incbin "png/FE4FE5/Weismann_Version_2_Sterling_Glovner_minimug.dmp" #ifndef WeismannMug - #define WeismannMug (FirstMugID+365) + #define WeismannMug (FirstMugID+366) #endif -setMugEntry(WeismannMug, Weismann_Version_2_Sterling_GlovnerMugData, 3, 5, 3, 3) +setMugEntry(WeismannMug, WeismannMugData, 3, 5, 3, 3) ALIGN 4 -Xavier_TheGreatNothingMugData: -#incbin "Dmp/Xavier_TheGreatNothing_mug.dmp" -#incbin "Dmp/Xavier_TheGreatNothing_frames.dmp" -#incbin "Dmp/Xavier_TheGreatNothing_palette.dmp" -#incbin "Dmp/Xavier_TheGreatNothing_minimug.dmp" +XavierMugData: +#incbin "png/FE4FE5/Xavier_TheGreatNothing_mug.dmp" +#incbin "png/FE4FE5/Xavier_TheGreatNothing_frames.dmp" +#incbin "png/FE4FE5/Xavier_TheGreatNothing_palette.dmp" +#incbin "png/FE4FE5/Xavier_TheGreatNothing_minimug.dmp" #ifndef XavierMug - #define XavierMug (FirstMugID+366) + #define XavierMug (FirstMugID+367) #endif -setMugEntry(XavierMug, Xavier_TheGreatNothingMugData, 3, 4, 3, 2) +setMugEntry(XavierMug, XavierMugData, 3, 4, 3, 2) ALIGN 4 -Zane_WAveMugData: -#incbin "Dmp/Zane_WAve_mug.dmp" -#incbin "Dmp/Zane_WAve_frames.dmp" -#incbin "Dmp/Zane_WAve_palette.dmp" -#incbin "Dmp/Zane_WAve_minimug.dmp" +ZaneMugData: +#incbin "png/FE4FE5/Zane_WAve_mug.dmp" +#incbin "png/FE4FE5/Zane_WAve_frames.dmp" +#incbin "png/FE4FE5/Zane_WAve_palette.dmp" +#incbin "png/FE4FE5/Zane_WAve_minimug.dmp" #ifndef ZaneMug - #define ZaneMug (FirstMugID+367) + #define ZaneMug (FirstMugID+368) #endif -setMugEntry(ZaneMug, Zane_WAveMugData, 3, 5, 3, 3) +setMugEntry(ZaneMug, ZaneMugData, 3, 5, 3, 3) ALIGN 4 AlenMugData: -#incbin "Dmp/Alen_mug.dmp" -#incbin "Dmp/Alen_frames.dmp" -#incbin "Dmp/Alen_palette.dmp" -#incbin "Dmp/Alen_minimug.dmp" +#incbin "png/FE6/Alen_mug.dmp" +#incbin "png/FE6/Alen_frames.dmp" +#incbin "png/FE6/Alen_palette.dmp" +#incbin "png/FE6/Alen_minimug.dmp" #ifndef AlenMug - #define AlenMug (FirstMugID+368) + #define AlenMug (FirstMugID+369) #endif setMugEntry(AlenMug, AlenMugData, 2, 5, 3, 3) ALIGN 4 AnnaMugData: -#incbin "Dmp/Anna_mug.dmp" -#incbin "Dmp/Anna_frames.dmp" -#incbin "Dmp/Anna_palette.dmp" -#incbin "Dmp/Anna_minimug.dmp" +#incbin "png/FE6/Anna_mug.dmp" +#incbin "png/FE6/Anna_frames.dmp" +#incbin "png/FE6/Anna_palette.dmp" +#incbin "png/FE6/Anna_minimug.dmp" #ifndef AnnaMug - #define AnnaMug (FirstMugID+369) + #define AnnaMug (FirstMugID+370) #endif setMugEntry(AnnaMug, AnnaMugData, 2, 5, 3, 3) ALIGN 4 ArcardoMugData: -#incbin "Dmp/Arcardo_mug.dmp" -#incbin "Dmp/Arcardo_frames.dmp" -#incbin "Dmp/Arcardo_palette.dmp" -#incbin "Dmp/Arcardo_minimug.dmp" +#incbin "png/FE6/Arcardo_mug.dmp" +#incbin "png/FE6/Arcardo_frames.dmp" +#incbin "png/FE6/Arcardo_palette.dmp" +#incbin "png/FE6/Arcardo_minimug.dmp" #ifndef ArcardoMug - #define ArcardoMug (FirstMugID+370) + #define ArcardoMug (FirstMugID+371) #endif setMugEntry(ArcardoMug, ArcardoMugData, 2, 5, 3, 3) ALIGN 4 AstolfoMugData: -#incbin "Dmp/Astolfo_mug.dmp" -#incbin "Dmp/Astolfo_frames.dmp" -#incbin "Dmp/Astolfo_palette.dmp" -#incbin "Dmp/Astolfo_minimug.dmp" +#incbin "png/FE6/Astolfo_mug.dmp" +#incbin "png/FE6/Astolfo_frames.dmp" +#incbin "png/FE6/Astolfo_palette.dmp" +#incbin "png/FE6/Astolfo_minimug.dmp" #ifndef AstolfoMug - #define AstolfoMug (FirstMugID+371) + #define AstolfoMug (FirstMugID+372) #endif setMugEntry(AstolfoMug, AstolfoMugData, 2, 5, 2, 3) ALIGN 4 BartheMugData: -#incbin "Dmp/Barthe_mug.dmp" -#incbin "Dmp/Barthe_frames.dmp" -#incbin "Dmp/Barthe_palette.dmp" -#incbin "Dmp/Barthe_minimug.dmp" +#incbin "png/FE6/Barthe_mug.dmp" +#incbin "png/FE6/Barthe_frames.dmp" +#incbin "png/FE6/Barthe_palette.dmp" +#incbin "png/FE6/Barthe_minimug.dmp" #ifndef BartheMug - #define BartheMug (FirstMugID+372) + #define BartheMug (FirstMugID+373) #endif setMugEntry(BartheMug, BartheMugData, 2, 4, 2, 2) ALIGN 4 BartreMugData: -#incbin "Dmp/Bartre_mug.dmp" -#incbin "Dmp/Bartre_frames.dmp" -#incbin "Dmp/Bartre_palette.dmp" -#incbin "Dmp/Bartre_minimug.dmp" +#incbin "png/FE6/Bartre_mug.dmp" +#incbin "png/FE6/Bartre_frames.dmp" +#incbin "png/FE6/Bartre_palette.dmp" +#incbin "png/FE6/Bartre_minimug.dmp" #ifndef BartreMug - #define BartreMug (FirstMugID+373) + #define BartreMug (FirstMugID+374) #endif setMugEntry(BartreMug, BartreMugData, 2, 5, 2, 2) ALIGN 4 BorsMugData: -#incbin "Dmp/Bors_mug.dmp" -#incbin "Dmp/Bors_frames.dmp" -#incbin "Dmp/Bors_palette.dmp" -#incbin "Dmp/Bors_minimug.dmp" +#incbin "png/FE6/Bors_mug.dmp" +#incbin "png/FE6/Bors_frames.dmp" +#incbin "png/FE6/Bors_palette.dmp" +#incbin "png/FE6/Bors_minimug.dmp" #ifndef BorsMug - #define BorsMug (FirstMugID+374) + #define BorsMug (FirstMugID+375) #endif setMugEntry(BorsMug, BorsMugData, 2, 4, 3, 2) ALIGN 4 BrunnyaMugData: -#incbin "Dmp/Brunnya_mug.dmp" -#incbin "Dmp/Brunnya_frames.dmp" -#incbin "Dmp/Brunnya_palette.dmp" -#incbin "Dmp/Brunnya_minimug.dmp" +#incbin "png/FE6/Brunnya_mug.dmp" +#incbin "png/FE6/Brunnya_frames.dmp" +#incbin "png/FE6/Brunnya_palette.dmp" +#incbin "png/FE6/Brunnya_minimug.dmp" #ifndef BrunnyaMug - #define BrunnyaMug (FirstMugID+375) + #define BrunnyaMug (FirstMugID+376) #endif setMugEntry(BrunnyaMug, BrunnyaMugData, 2, 5, 3, 3) ALIGN 4 CathMugData: -#incbin "Dmp/Cath_mug.dmp" -#incbin "Dmp/Cath_frames.dmp" -#incbin "Dmp/Cath_palette.dmp" -#incbin "Dmp/Cath_minimug.dmp" +#incbin "png/FE6/Cath_mug.dmp" +#incbin "png/FE6/Cath_frames.dmp" +#incbin "png/FE6/Cath_palette.dmp" +#incbin "png/FE6/Cath_minimug.dmp" #ifndef CathMug - #define CathMug (FirstMugID+376) + #define CathMug (FirstMugID+377) #endif setMugEntry(CathMug, CathMugData, 2, 6, 3, 4) ALIGN 4 CeciliaMugData: -#incbin "Dmp/Cecilia_mug.dmp" -#incbin "Dmp/Cecilia_frames.dmp" -#incbin "Dmp/Cecilia_palette.dmp" -#incbin "Dmp/Cecilia_minimug.dmp" +#incbin "png/FE6/Cecilia_mug.dmp" +#incbin "png/FE6/Cecilia_frames.dmp" +#incbin "png/FE6/Cecilia_palette.dmp" +#incbin "png/FE6/Cecilia_minimug.dmp" #ifndef CeciliaMug - #define CeciliaMug (FirstMugID+377) + #define CeciliaMug (FirstMugID+378) #endif setMugEntry(CeciliaMug, CeciliaMugData, 2, 5, 3, 3) ALIGN 4 ChadMugData: -#incbin "Dmp/Chad_mug.dmp" -#incbin "Dmp/Chad_frames.dmp" -#incbin "Dmp/Chad_palette.dmp" -#incbin "Dmp/Chad_minimug.dmp" +#incbin "png/FE6/Chad_mug.dmp" +#incbin "png/FE6/Chad_frames.dmp" +#incbin "png/FE6/Chad_palette.dmp" +#incbin "png/FE6/Chad_minimug.dmp" #ifndef ChadMug - #define ChadMug (FirstMugID+378) + #define ChadMug (FirstMugID+379) #endif setMugEntry(ChadMug, ChadMugData, 2, 6, 3, 4) ALIGN 4 ClarineMugData: -#incbin "Dmp/Clarine_mug.dmp" -#incbin "Dmp/Clarine_frames.dmp" -#incbin "Dmp/Clarine_palette.dmp" -#incbin "Dmp/Clarine_minimug.dmp" +#incbin "png/FE6/Clarine_mug.dmp" +#incbin "png/FE6/Clarine_frames.dmp" +#incbin "png/FE6/Clarine_palette.dmp" +#incbin "png/FE6/Clarine_minimug.dmp" #ifndef ClarineMug - #define ClarineMug (FirstMugID+379) + #define ClarineMug (FirstMugID+380) #endif setMugEntry(ClarineMug, ClarineMugData, 2, 6, 3, 4) ALIGN 4 DamasMugData: -#incbin "Dmp/Damas_mug.dmp" -#incbin "Dmp/Damas_frames.dmp" -#incbin "Dmp/Damas_palette.dmp" -#incbin "Dmp/Damas_minimug.dmp" +#incbin "png/FE6/Damas_mug.dmp" +#incbin "png/FE6/Damas_frames.dmp" +#incbin "png/FE6/Damas_palette.dmp" +#incbin "png/FE6/Damas_minimug.dmp" #ifndef DamasMug - #define DamasMug (FirstMugID+380) + #define DamasMug (FirstMugID+381) #endif setMugEntry(DamasMug, DamasMugData, 2, 5, 2, 3) ALIGN 4 DayanMugData: -#incbin "Dmp/Dayan_mug.dmp" -#incbin "Dmp/Dayan_frames.dmp" -#incbin "Dmp/Dayan_palette.dmp" -#incbin "Dmp/Dayan_minimug.dmp" +#incbin "png/FE6/Dayan_mug.dmp" +#incbin "png/FE6/Dayan_frames.dmp" +#incbin "png/FE6/Dayan_palette.dmp" +#incbin "png/FE6/Dayan_minimug.dmp" #ifndef DayanMug - #define DayanMug (FirstMugID+381) + #define DayanMug (FirstMugID+382) #endif setMugEntry(DayanMug, DayanMugData, 2, 5, 3, 3) ALIGN 4 DebiasMugData: -#incbin "Dmp/Debias_mug.dmp" -#incbin "Dmp/Debias_frames.dmp" -#incbin "Dmp/Debias_palette.dmp" -#incbin "Dmp/Debias_minimug.dmp" +#incbin "png/FE6/Debias_mug.dmp" +#incbin "png/FE6/Debias_frames.dmp" +#incbin "png/FE6/Debias_palette.dmp" +#incbin "png/FE6/Debias_minimug.dmp" #ifndef DebiasMug - #define DebiasMug (FirstMugID+382) + #define DebiasMug (FirstMugID+383) #endif setMugEntry(DebiasMug, DebiasMugData, 2, 5, 2, 3) ALIGN 4 DieckMugData: -#incbin "Dmp/Dieck_mug.dmp" -#incbin "Dmp/Dieck_frames.dmp" -#incbin "Dmp/Dieck_palette.dmp" -#incbin "Dmp/Dieck_minimug.dmp" +#incbin "png/FE6/Dieck_mug.dmp" +#incbin "png/FE6/Dieck_frames.dmp" +#incbin "png/FE6/Dieck_palette.dmp" +#incbin "png/FE6/Dieck_minimug.dmp" #ifndef DieckMug - #define DieckMug (FirstMugID+383) + #define DieckMug (FirstMugID+384) #endif setMugEntry(DieckMug, DieckMugData, 2, 5, 2, 3) ALIGN 4 DorothyMugData: -#incbin "Dmp/Dorothy_mug.dmp" -#incbin "Dmp/Dorothy_frames.dmp" -#incbin "Dmp/Dorothy_palette.dmp" -#incbin "Dmp/Dorothy_minimug.dmp" +#incbin "png/FE6/Dorothy_mug.dmp" +#incbin "png/FE6/Dorothy_frames.dmp" +#incbin "png/FE6/Dorothy_palette.dmp" +#incbin "png/FE6/Dorothy_minimug.dmp" #ifndef DorothyMug - #define DorothyMug (FirstMugID+384) + #define DorothyMug (FirstMugID+385) #endif setMugEntry(DorothyMug, DorothyMugData, 2, 5, 3, 3) ALIGN 4 DoryMugData: -#incbin "Dmp/Dory_mug.dmp" -#incbin "Dmp/Dory_frames.dmp" -#incbin "Dmp/Dory_palette.dmp" -#incbin "Dmp/Dory_minimug.dmp" +#incbin "png/FE6/Dory_mug.dmp" +#incbin "png/FE6/Dory_frames.dmp" +#incbin "png/FE6/Dory_palette.dmp" +#incbin "png/FE6/Dory_minimug.dmp" #ifndef DoryMug - #define DoryMug (FirstMugID+385) + #define DoryMug (FirstMugID+386) #endif setMugEntry(DoryMug, DoryMugData, 2, 5, 3, 3) ALIGN 4 DouglasMugData: -#incbin "Dmp/Douglas_mug.dmp" -#incbin "Dmp/Douglas_frames.dmp" -#incbin "Dmp/Douglas_palette.dmp" -#incbin "Dmp/Douglas_minimug.dmp" +#incbin "png/FE6/Douglas_mug.dmp" +#incbin "png/FE6/Douglas_frames.dmp" +#incbin "png/FE6/Douglas_palette.dmp" +#incbin "png/FE6/Douglas_minimug.dmp" #ifndef DouglasMug - #define DouglasMug (FirstMugID+386) + #define DouglasMug (FirstMugID+387) #endif setMugEntry(DouglasMug, DouglasMugData, 2, 5, 3, 3) ALIGN 4 EchidnaMugData: -#incbin "Dmp/Echidna_mug.dmp" -#incbin "Dmp/Echidna_frames.dmp" -#incbin "Dmp/Echidna_palette.dmp" -#incbin "Dmp/Echidna_minimug.dmp" +#incbin "png/FE6/Echidna_mug.dmp" +#incbin "png/FE6/Echidna_frames.dmp" +#incbin "png/FE6/Echidna_palette.dmp" +#incbin "png/FE6/Echidna_minimug.dmp" #ifndef EchidnaMug - #define EchidnaMug (FirstMugID+387) + #define EchidnaMug (FirstMugID+388) #endif setMugEntry(EchidnaMug, EchidnaMugData, 2, 5, 3, 3) ALIGN 4 EinMugData: -#incbin "Dmp/Ein_mug.dmp" -#incbin "Dmp/Ein_frames.dmp" -#incbin "Dmp/Ein_palette.dmp" -#incbin "Dmp/Ein_minimug.dmp" +#incbin "png/FE6/Ein_mug.dmp" +#incbin "png/FE6/Ein_frames.dmp" +#incbin "png/FE6/Ein_palette.dmp" +#incbin "png/FE6/Ein_minimug.dmp" #ifndef EinMug - #define EinMug (FirstMugID+388) + #define EinMug (FirstMugID+389) #endif setMugEntry(EinMug, EinMugData, 2, 5, 3, 3) ALIGN 4 ElenMugData: -#incbin "Dmp/Elen_mug.dmp" -#incbin "Dmp/Elen_frames.dmp" -#incbin "Dmp/Elen_palette.dmp" -#incbin "Dmp/Elen_minimug.dmp" +#incbin "png/FE6/Elen_mug.dmp" +#incbin "png/FE6/Elen_frames.dmp" +#incbin "png/FE6/Elen_palette.dmp" +#incbin "png/FE6/Elen_minimug.dmp" #ifndef ElenMug - #define ElenMug (FirstMugID+389) + #define ElenMug (FirstMugID+390) #endif setMugEntry(ElenMug, ElenMugData, 2, 6, 3, 4) ALIGN 4 ElffinMugData: -#incbin "Dmp/Elffin_mug.dmp" -#incbin "Dmp/Elffin_frames.dmp" -#incbin "Dmp/Elffin_palette.dmp" -#incbin "Dmp/Elffin_minimug.dmp" +#incbin "png/FE6/Elffin_mug.dmp" +#incbin "png/FE6/Elffin_frames.dmp" +#incbin "png/FE6/Elffin_palette.dmp" +#incbin "png/FE6/Elffin_minimug.dmp" #ifndef ElffinMug - #define ElffinMug (FirstMugID+390) + #define ElffinMug (FirstMugID+391) #endif setMugEntry(ElffinMug, ElffinMugData, 2, 5, 2, 3) ALIGN 4 -Eliwood_OldMugData: -#incbin "Dmp/Eliwood_Old_mug.dmp" -#incbin "Dmp/Eliwood_Old_frames.dmp" -#incbin "Dmp/Eliwood_Old_palette.dmp" -#incbin "Dmp/Eliwood_Old_minimug.dmp" -#ifndef EliwoodMug - #define EliwoodMug (FirstMugID+391) +EliwoodFE6MugData: +#incbin "png/FE6/EliwoodFE6_mug.dmp" +#incbin "png/FE6/EliwoodFE6_frames.dmp" +#incbin "png/FE6/EliwoodFE6_palette.dmp" +#incbin "png/FE6/EliwoodFE6_minimug.dmp" +#ifndef EliwoodFE6Mug + #define EliwoodFE6Mug (FirstMugID+392) #endif -setMugEntry(EliwoodMug, Eliwood_OldMugData, 2, 5, 3, 3) +setMugEntry(EliwoodFE6Mug, EliwoodFE6MugData, 2, 5, 3, 3) ALIGN 4 ErikMugData: -#incbin "Dmp/Erik_mug.dmp" -#incbin "Dmp/Erik_frames.dmp" -#incbin "Dmp/Erik_palette.dmp" -#incbin "Dmp/Erik_minimug.dmp" +#incbin "png/FE6/Erik_mug.dmp" +#incbin "png/FE6/Erik_frames.dmp" +#incbin "png/FE6/Erik_palette.dmp" +#incbin "png/FE6/Erik_minimug.dmp" #ifndef ErikMug - #define ErikMug (FirstMugID+392) + #define ErikMug (FirstMugID+393) #endif setMugEntry(ErikMug, ErikMugData, 2, 5, 3, 3) ALIGN 4 FaeMugData: -#incbin "Dmp/Fae_mug.dmp" -#incbin "Dmp/Fae_frames.dmp" -#incbin "Dmp/Fae_palette.dmp" -#incbin "Dmp/Fae_minimug.dmp" +#incbin "png/FE6/Fae_mug.dmp" +#incbin "png/FE6/Fae_frames.dmp" +#incbin "png/FE6/Fae_palette.dmp" +#incbin "png/FE6/Fae_minimug.dmp" #ifndef FaeMug - #define FaeMug (FirstMugID+393) + #define FaeMug (FirstMugID+394) #endif setMugEntry(FaeMug, FaeMugData, 3, 7, 3, 5) ALIGN 4 FirMugData: -#incbin "Dmp/Fir_mug.dmp" -#incbin "Dmp/Fir_frames.dmp" -#incbin "Dmp/Fir_palette.dmp" -#incbin "Dmp/Fir_minimug.dmp" +#incbin "png/FE6/Fir_mug.dmp" +#incbin "png/FE6/Fir_frames.dmp" +#incbin "png/FE6/Fir_palette.dmp" +#incbin "png/FE6/Fir_minimug.dmp" #ifndef FirMug - #define FirMug (FirstMugID+394) + #define FirMug (FirstMugID+395) #endif setMugEntry(FirMug, FirMugData, 2, 6, 3, 4) ALIGN 4 FlaerMugData: -#incbin "Dmp/Flaer_mug.dmp" -#incbin "Dmp/Flaer_frames.dmp" -#incbin "Dmp/Flaer_palette.dmp" -#incbin "Dmp/Flaer_minimug.dmp" +#incbin "png/FE6/Flaer_mug.dmp" +#incbin "png/FE6/Flaer_frames.dmp" +#incbin "png/FE6/Flaer_palette.dmp" +#incbin "png/FE6/Flaer_minimug.dmp" #ifndef FlaerMug - #define FlaerMug (FirstMugID+395) + #define FlaerMug (FirstMugID+396) #endif setMugEntry(FlaerMug, FlaerMugData, 2, 5, 3, 3) ALIGN 4 GalleMugData: -#incbin "Dmp/Galle_mug.dmp" -#incbin "Dmp/Galle_frames.dmp" -#incbin "Dmp/Galle_palette.dmp" -#incbin "Dmp/Galle_minimug.dmp" +#incbin "png/FE6/Galle_mug.dmp" +#incbin "png/FE6/Galle_frames.dmp" +#incbin "png/FE6/Galle_palette.dmp" +#incbin "png/FE6/Galle_minimug.dmp" #ifndef GalleMug - #define GalleMug (FirstMugID+396) + #define GalleMug (FirstMugID+397) #endif setMugEntry(GalleMug, GalleMugData, 2, 5, 3, 3) ALIGN 4 GarrettMugData: -#incbin "Dmp/Garrett_mug.dmp" -#incbin "Dmp/Garrett_frames.dmp" -#incbin "Dmp/Garrett_palette.dmp" -#incbin "Dmp/Garrett_minimug.dmp" +#incbin "png/FE6/Garrett_mug.dmp" +#incbin "png/FE6/Garrett_frames.dmp" +#incbin "png/FE6/Garrett_palette.dmp" +#incbin "png/FE6/Garrett_minimug.dmp" #ifndef GarrettMug - #define GarrettMug (FirstMugID+397) + #define GarrettMug (FirstMugID+398) #endif setMugEntry(GarrettMug, GarrettMugData, 2, 4, 3, 2) ALIGN 4 GeeseMugData: -#incbin "Dmp/Geese_mug.dmp" -#incbin "Dmp/Geese_frames.dmp" -#incbin "Dmp/Geese_palette.dmp" -#incbin "Dmp/Geese_minimug.dmp" +#incbin "png/FE6/Geese_mug.dmp" +#incbin "png/FE6/Geese_frames.dmp" +#incbin "png/FE6/Geese_palette.dmp" +#incbin "png/FE6/Geese_minimug.dmp" #ifndef GeeseMug - #define GeeseMug (FirstMugID+398) + #define GeeseMug (FirstMugID+399) #endif setMugEntry(GeeseMug, GeeseMugData, 2, 5, 3, 3) ALIGN 4 GonzalezMugData: -#incbin "Dmp/Gonzalez_mug.dmp" -#incbin "Dmp/Gonzalez_frames.dmp" -#incbin "Dmp/Gonzalez_palette.dmp" -#incbin "Dmp/Gonzalez_minimug.dmp" +#incbin "png/FE6/Gonzalez_mug.dmp" +#incbin "png/FE6/Gonzalez_frames.dmp" +#incbin "png/FE6/Gonzalez_palette.dmp" +#incbin "png/FE6/Gonzalez_minimug.dmp" #ifndef GonzalezMug - #define GonzalezMug (FirstMugID+399) + #define GonzalezMug (FirstMugID+400) #endif setMugEntry(GonzalezMug, GonzalezMugData, 2, 5, 2, 3) ALIGN 4 GuerreroMugData: -#incbin "Dmp/Guerrero_mug.dmp" -#incbin "Dmp/Guerrero_frames.dmp" -#incbin "Dmp/Guerrero_palette.dmp" -#incbin "Dmp/Guerrero_minimug.dmp" +#incbin "png/FE6/Guerrero_mug.dmp" +#incbin "png/FE6/Guerrero_frames.dmp" +#incbin "png/FE6/Guerrero_palette.dmp" +#incbin "png/FE6/Guerrero_minimug.dmp" #ifndef GuerreroMug - #define GuerreroMug (FirstMugID+400) + #define GuerreroMug (FirstMugID+401) #endif setMugEntry(GuerreroMug, GuerreroMugData, 2, 5, 3, 3) ALIGN 4 GuinivereMugData: -#incbin "Dmp/Guinivere_mug.dmp" -#incbin "Dmp/Guinivere_frames.dmp" -#incbin "Dmp/Guinivere_palette.dmp" -#incbin "Dmp/Guinivere_minimug.dmp" +#incbin "png/FE6/Guinivere_mug.dmp" +#incbin "png/FE6/Guinivere_frames.dmp" +#incbin "png/FE6/Guinivere_palette.dmp" +#incbin "png/FE6/Guinivere_minimug.dmp" #ifndef GuinivereMug - #define GuinivereMug (FirstMugID+401) + #define GuinivereMug (FirstMugID+402) #endif setMugEntry(GuinivereMug, GuinivereMugData, 3, 6, 3, 4) ALIGN 4 GwendolynMugData: -#incbin "Dmp/Gwendolyn_mug.dmp" -#incbin "Dmp/Gwendolyn_frames.dmp" -#incbin "Dmp/Gwendolyn_palette.dmp" -#incbin "Dmp/Gwendolyn_minimug.dmp" +#incbin "png/FE6/Gwendolyn_mug.dmp" +#incbin "png/FE6/Gwendolyn_frames.dmp" +#incbin "png/FE6/Gwendolyn_palette.dmp" +#incbin "png/FE6/Gwendolyn_minimug.dmp" #ifndef GwendolynMug - #define GwendolynMug (FirstMugID+402) + #define GwendolynMug (FirstMugID+403) #endif setMugEntry(GwendolynMug, GwendolynMugData, 2, 6, 3, 4) ALIGN 4 GwynevreMugData: -#incbin "Dmp/Gwynevre_mug.dmp" -#incbin "Dmp/Gwynevre_frames.dmp" -#incbin "Dmp/Gwynevre_palette.dmp" -#incbin "Dmp/Gwynevre_minimug.dmp" +#incbin "png/FE6/Gwynevre_mug.dmp" +#incbin "png/FE6/Gwynevre_frames.dmp" +#incbin "png/FE6/Gwynevre_palette.dmp" +#incbin "png/FE6/Gwynevre_minimug.dmp" #ifndef GwynevreMug - #define GwynevreMug (FirstMugID+403) + #define GwynevreMug (FirstMugID+404) #endif setMugEntry(GwynevreMug, GwynevreMugData, 2, 6, 3, 4) ALIGN 4 -Hector_OldMugData: -#incbin "Dmp/Hector_Old_mug.dmp" -#incbin "Dmp/Hector_Old_frames.dmp" -#incbin "Dmp/Hector_Old_palette.dmp" -#incbin "Dmp/Hector_Old_minimug.dmp" -#ifndef HectorMug - #define HectorMug (FirstMugID+404) +HectorFE6MugData: +#incbin "png/FE6/HectorFE6_mug.dmp" +#incbin "png/FE6/HectorFE6_frames.dmp" +#incbin "png/FE6/HectorFE6_palette.dmp" +#incbin "png/FE6/HectorFE6_minimug.dmp" +#ifndef HectorFE6Mug + #define HectorFE6Mug (FirstMugID+405) #endif -setMugEntry(HectorMug, Hector_OldMugData, 2, 5, 3, 2) +setMugEntry(HectorFE6Mug, HectorFE6MugData, 2, 5, 3, 2) ALIGN 4 HenningMugData: -#incbin "Dmp/Henning_mug.dmp" -#incbin "Dmp/Henning_frames.dmp" -#incbin "Dmp/Henning_palette.dmp" -#incbin "Dmp/Henning_minimug.dmp" +#incbin "png/FE6/Henning_mug.dmp" +#incbin "png/FE6/Henning_frames.dmp" +#incbin "png/FE6/Henning_palette.dmp" +#incbin "png/FE6/Henning_minimug.dmp" #ifndef HenningMug - #define HenningMug (FirstMugID+405) + #define HenningMug (FirstMugID+406) #endif setMugEntry(HenningMug, HenningMugData, 2, 5, 3, 3) ALIGN 4 HughMugData: -#incbin "Dmp/Hugh_mug.dmp" -#incbin "Dmp/Hugh_frames.dmp" -#incbin "Dmp/Hugh_palette.dmp" -#incbin "Dmp/Hugh_minimug.dmp" +#incbin "png/FE6/Hugh_mug.dmp" +#incbin "png/FE6/Hugh_frames.dmp" +#incbin "png/FE6/Hugh_palette.dmp" +#incbin "png/FE6/Hugh_minimug.dmp" #ifndef HughMug - #define HughMug (FirstMugID+406) + #define HughMug (FirstMugID+407) #endif setMugEntry(HughMug, HughMugData, 2, 5, 3, 3) ALIGN 4 IdunnMugData: -#incbin "Dmp/Idunn_mug.dmp" -#incbin "Dmp/Idunn_frames.dmp" -#incbin "Dmp/Idunn_palette.dmp" -#incbin "Dmp/Idunn_minimug.dmp" +#incbin "png/FE6/Idunn_mug.dmp" +#incbin "png/FE6/Idunn_frames.dmp" +#incbin "png/FE6/Idunn_palette.dmp" +#incbin "png/FE6/Idunn_minimug.dmp" #ifndef IdunnMug - #define IdunnMug (FirstMugID+407) + #define IdunnMug (FirstMugID+408) #endif setMugEntry(IdunnMug, IdunnMugData, 2, 6, 3, 4) ALIGN 4 -Idunn_DragonMugData: -#incbin "Dmp/Idunn_Dragon_mug.dmp" -#incbin "Dmp/Idunn_Dragon_frames.dmp" -#incbin "Dmp/Idunn_Dragon_palette.dmp" -#incbin "Dmp/Idunn_Dragon_minimug.dmp" -#ifndef IdunnMug - #define IdunnMug (FirstMugID+408) +IdunnDragonMugData: +#incbin "png/FE6/IdunnDragon_mug.dmp" +#incbin "png/FE6/IdunnDragon_frames.dmp" +#incbin "png/FE6/IdunnDragon_palette.dmp" +#incbin "png/FE6/IdunnDragon_minimug.dmp" +#ifndef IdunnDragonMug + #define IdunnDragonMug (FirstMugID+409) #endif -setMugEntry(IdunnMug, Idunn_DragonMugData, 2, 6, 3, 4) +setMugEntry(IdunnDragonMug, IdunnDragonMugData, 2, 6, 3, 4) ALIGN 4 -Idunn_HoodMugData: -#incbin "Dmp/Idunn_Hood_mug.dmp" -#incbin "Dmp/Idunn_Hood_frames.dmp" -#incbin "Dmp/Idunn_Hood_palette.dmp" -#incbin "Dmp/Idunn_Hood_minimug.dmp" -#ifndef IdunnMug - #define IdunnMug (FirstMugID+409) +IdunnHoodMugData: +#incbin "png/FE6/IdunnHood_mug.dmp" +#incbin "png/FE6/IdunnHood_frames.dmp" +#incbin "png/FE6/IdunnHood_palette.dmp" +#incbin "png/FE6/IdunnHood_minimug.dmp" +#ifndef IdunnHoodMug + #define IdunnHoodMug (FirstMugID+410) #endif -setMugEntry(IdunnMug, Idunn_HoodMugData, 2, 6, 3, 4) +setMugEntry(IdunnHoodMug, IdunnHoodMugData, 2, 6, 3, 4) ALIGN 4 IgreneMugData: -#incbin "Dmp/Igrene_mug.dmp" -#incbin "Dmp/Igrene_frames.dmp" -#incbin "Dmp/Igrene_palette.dmp" -#incbin "Dmp/Igrene_minimug.dmp" +#incbin "png/FE6/Igrene_mug.dmp" +#incbin "png/FE6/Igrene_frames.dmp" +#incbin "png/FE6/Igrene_palette.dmp" +#incbin "png/FE6/Igrene_minimug.dmp" #ifndef IgreneMug - #define IgreneMug (FirstMugID+410) + #define IgreneMug (FirstMugID+411) #endif setMugEntry(IgreneMug, IgreneMugData, 2, 5, 3, 3) ALIGN 4 JahnMugData: -#incbin "Dmp/Jahn_mug.dmp" -#incbin "Dmp/Jahn_frames.dmp" -#incbin "Dmp/Jahn_palette.dmp" -#incbin "Dmp/Jahn_minimug.dmp" +#incbin "png/FE6/Jahn_mug.dmp" +#incbin "png/FE6/Jahn_frames.dmp" +#incbin "png/FE6/Jahn_palette.dmp" +#incbin "png/FE6/Jahn_minimug.dmp" #ifndef JahnMug - #define JahnMug (FirstMugID+411) + #define JahnMug (FirstMugID+412) #endif setMugEntry(JahnMug, JahnMugData, 3, 5, 3, 3) ALIGN 4 JunoMugData: -#incbin "Dmp/Juno_mug.dmp" -#incbin "Dmp/Juno_frames.dmp" -#incbin "Dmp/Juno_palette.dmp" -#incbin "Dmp/Juno_minimug.dmp" +#incbin "png/FE6/Juno_mug.dmp" +#incbin "png/FE6/Juno_frames.dmp" +#incbin "png/FE6/Juno_palette.dmp" +#incbin "png/FE6/Juno_minimug.dmp" #ifndef JunoMug - #define JunoMug (FirstMugID+412) + #define JunoMug (FirstMugID+413) #endif setMugEntry(JunoMug, JunoMugData, 2, 5, 3, 3) ALIGN 4 KarelMugData: -#incbin "Dmp/Karel_mug.dmp" -#incbin "Dmp/Karel_frames.dmp" -#incbin "Dmp/Karel_palette.dmp" -#incbin "Dmp/Karel_minimug.dmp" +#incbin "png/FE6/Karel_mug.dmp" +#incbin "png/FE6/Karel_frames.dmp" +#incbin "png/FE6/Karel_palette.dmp" +#incbin "png/FE6/Karel_minimug.dmp" #ifndef KarelMug - #define KarelMug (FirstMugID+413) + #define KarelMug (FirstMugID+414) #endif setMugEntry(KarelMug, KarelMugData, 2, 5, 3, 3) ALIGN 4 KelMugData: -#incbin "Dmp/Kel_mug.dmp" -#incbin "Dmp/Kel_frames.dmp" -#incbin "Dmp/Kel_palette.dmp" -#incbin "Dmp/Kel_minimug.dmp" +#incbin "png/FE6/Kel_mug.dmp" +#incbin "png/FE6/Kel_frames.dmp" +#incbin "png/FE6/Kel_palette.dmp" +#incbin "png/FE6/Kel_minimug.dmp" #ifndef KelMug - #define KelMug (FirstMugID+414) + #define KelMug (FirstMugID+415) #endif setMugEntry(KelMug, KelMugData, 2, 5, 3, 3) ALIGN 4 KleinMugData: -#incbin "Dmp/Klein_mug.dmp" -#incbin "Dmp/Klein_frames.dmp" -#incbin "Dmp/Klein_palette.dmp" -#incbin "Dmp/Klein_minimug.dmp" +#incbin "png/FE6/Klein_mug.dmp" +#incbin "png/FE6/Klein_frames.dmp" +#incbin "png/FE6/Klein_palette.dmp" +#incbin "png/FE6/Klein_minimug.dmp" #ifndef KleinMug - #define KleinMug (FirstMugID+415) + #define KleinMug (FirstMugID+416) #endif setMugEntry(KleinMug, KleinMugData, 2, 5, 3, 3) ALIGN 4 LanceMugData: -#incbin "Dmp/Lance_mug.dmp" -#incbin "Dmp/Lance_frames.dmp" -#incbin "Dmp/Lance_palette.dmp" -#incbin "Dmp/Lance_minimug.dmp" +#incbin "png/FE6/Lance_mug.dmp" +#incbin "png/FE6/Lance_frames.dmp" +#incbin "png/FE6/Lance_palette.dmp" +#incbin "png/FE6/Lance_minimug.dmp" #ifndef LanceMug - #define LanceMug (FirstMugID+416) + #define LanceMug (FirstMugID+417) #endif setMugEntry(LanceMug, LanceMugData, 2, 5, 3, 3) ALIGN 4 LarumMugData: -#incbin "Dmp/Larum_mug.dmp" -#incbin "Dmp/Larum_frames.dmp" -#incbin "Dmp/Larum_palette.dmp" -#incbin "Dmp/Larum_minimug.dmp" +#incbin "png/FE6/Larum_mug.dmp" +#incbin "png/FE6/Larum_frames.dmp" +#incbin "png/FE6/Larum_palette.dmp" +#incbin "png/FE6/Larum_minimug.dmp" #ifndef LarumMug - #define LarumMug (FirstMugID+417) + #define LarumMug (FirstMugID+418) #endif setMugEntry(LarumMug, LarumMugData, 2, 6, 3, 4) ALIGN 4 LeganceMugData: -#incbin "Dmp/Legance_mug.dmp" -#incbin "Dmp/Legance_frames.dmp" -#incbin "Dmp/Legance_palette.dmp" -#incbin "Dmp/Legance_minimug.dmp" +#incbin "png/FE6/Legance_mug.dmp" +#incbin "png/FE6/Legance_frames.dmp" +#incbin "png/FE6/Legance_palette.dmp" +#incbin "png/FE6/Legance_minimug.dmp" #ifndef LeganceMug - #define LeganceMug (FirstMugID+418) + #define LeganceMug (FirstMugID+419) #endif setMugEntry(LeganceMug, LeganceMugData, 2, 5, 2, 3) ALIGN 4 LilinaMugData: -#incbin "Dmp/Lilina_mug.dmp" -#incbin "Dmp/Lilina_frames.dmp" -#incbin "Dmp/Lilina_palette.dmp" -#incbin "Dmp/Lilina_minimug.dmp" +#incbin "png/FE6/Lilina_mug.dmp" +#incbin "png/FE6/Lilina_frames.dmp" +#incbin "png/FE6/Lilina_palette.dmp" +#incbin "png/FE6/Lilina_minimug.dmp" #ifndef LilinaMug - #define LilinaMug (FirstMugID+419) + #define LilinaMug (FirstMugID+420) #endif setMugEntry(LilinaMug, LilinaMugData, 2, 6, 3, 4) ALIGN 4 LotMugData: -#incbin "Dmp/Lot_mug.dmp" -#incbin "Dmp/Lot_frames.dmp" -#incbin "Dmp/Lot_palette.dmp" -#incbin "Dmp/Lot_minimug.dmp" +#incbin "png/FE6/Lot_mug.dmp" +#incbin "png/FE6/Lot_frames.dmp" +#incbin "png/FE6/Lot_palette.dmp" +#incbin "png/FE6/Lot_minimug.dmp" #ifndef LotMug - #define LotMug (FirstMugID+420) + #define LotMug (FirstMugID+421) #endif setMugEntry(LotMug, LotMugData, 2, 5, 3, 3) ALIGN 4 LughMugData: -#incbin "Dmp/Lugh_mug.dmp" -#incbin "Dmp/Lugh_frames.dmp" -#incbin "Dmp/Lugh_palette.dmp" -#incbin "Dmp/Lugh_minimug.dmp" +#incbin "png/FE6/Lugh_mug.dmp" +#incbin "png/FE6/Lugh_frames.dmp" +#incbin "png/FE6/Lugh_palette.dmp" +#incbin "png/FE6/Lugh_minimug.dmp" #ifndef LughMug - #define LughMug (FirstMugID+421) + #define LughMug (FirstMugID+422) #endif setMugEntry(LughMug, LughMugData, 2, 6, 3, 4) ALIGN 4 MaggieMugData: -#incbin "Dmp/Maggie_mug.dmp" -#incbin "Dmp/Maggie_frames.dmp" -#incbin "Dmp/Maggie_palette.dmp" -#incbin "Dmp/Maggie_minimug.dmp" +#incbin "png/FE6/Maggie_mug.dmp" +#incbin "png/FE6/Maggie_frames.dmp" +#incbin "png/FE6/Maggie_palette.dmp" +#incbin "png/FE6/Maggie_minimug.dmp" #ifndef MaggieMug - #define MaggieMug (FirstMugID+422) + #define MaggieMug (FirstMugID+423) #endif setMugEntry(MaggieMug, MaggieMugData, 2, 5, 3, 3) ALIGN 4 MarcusMugData: -#incbin "Dmp/Marcus_mug.dmp" -#incbin "Dmp/Marcus_frames.dmp" -#incbin "Dmp/Marcus_palette.dmp" -#incbin "Dmp/Marcus_minimug.dmp" +#incbin "png/FE6/Marcus_mug.dmp" +#incbin "png/FE6/Marcus_frames.dmp" +#incbin "png/FE6/Marcus_palette.dmp" +#incbin "png/FE6/Marcus_minimug.dmp" #ifndef MarcusMug - #define MarcusMug (FirstMugID+423) + #define MarcusMug (FirstMugID+424) #endif setMugEntry(MarcusMug, MarcusMugData, 2, 5, 2, 3) ALIGN 4 MartelMugData: -#incbin "Dmp/Martel_mug.dmp" -#incbin "Dmp/Martel_frames.dmp" -#incbin "Dmp/Martel_palette.dmp" -#incbin "Dmp/Martel_minimug.dmp" +#incbin "png/FE6/Martel_mug.dmp" +#incbin "png/FE6/Martel_frames.dmp" +#incbin "png/FE6/Martel_palette.dmp" +#incbin "png/FE6/Martel_minimug.dmp" #ifndef MartelMug - #define MartelMug (FirstMugID+424) + #define MartelMug (FirstMugID+425) #endif setMugEntry(MartelMug, MartelMugData, 3, 5, 3, 3) ALIGN 4 MeladyMugData: -#incbin "Dmp/Melady_mug.dmp" -#incbin "Dmp/Melady_frames.dmp" -#incbin "Dmp/Melady_palette.dmp" -#incbin "Dmp/Melady_minimug.dmp" +#incbin "png/FE6/Melady_mug.dmp" +#incbin "png/FE6/Melady_frames.dmp" +#incbin "png/FE6/Melady_palette.dmp" +#incbin "png/FE6/Melady_minimug.dmp" #ifndef MeladyMug - #define MeladyMug (FirstMugID+425) + #define MeladyMug (FirstMugID+426) #endif setMugEntry(MeladyMug, MeladyMugData, 2, 5, 4, 3) ALIGN 4 MerlinusMugData: -#incbin "Dmp/Merlinus_mug.dmp" -#incbin "Dmp/Merlinus_frames.dmp" -#incbin "Dmp/Merlinus_palette.dmp" -#incbin "Dmp/Merlinus_minimug.dmp" +#incbin "png/FE6/Merlinus_mug.dmp" +#incbin "png/FE6/Merlinus_frames.dmp" +#incbin "png/FE6/Merlinus_palette.dmp" +#incbin "png/FE6/Merlinus_minimug.dmp" #ifndef MerlinusMug - #define MerlinusMug (FirstMugID+426) + #define MerlinusMug (FirstMugID+427) #endif setMugEntry(MerlinusMug, MerlinusMugData, 2, 5, 2, 3) ALIGN 4 MessengerMugData: -#incbin "Dmp/Messenger_mug.dmp" -#incbin "Dmp/Messenger_frames.dmp" -#incbin "Dmp/Messenger_palette.dmp" -#incbin "Dmp/Messenger_minimug.dmp" +#incbin "png/FE6/Messenger_mug.dmp" +#incbin "png/FE6/Messenger_frames.dmp" +#incbin "png/FE6/Messenger_palette.dmp" +#incbin "png/FE6/Messenger_minimug.dmp" #ifndef MessengerMug - #define MessengerMug (FirstMugID+427) + #define MessengerMug (FirstMugID+428) #endif setMugEntry(MessengerMug, MessengerMugData, 2, 6, 3, 4) ALIGN 4 MonkeMugData: -#incbin "Dmp/Monke_mug.dmp" -#incbin "Dmp/Monke_frames.dmp" -#incbin "Dmp/Monke_palette.dmp" -#incbin "Dmp/Monke_minimug.dmp" +#incbin "png/FE6/Monke_mug.dmp" +#incbin "png/FE6/Monke_frames.dmp" +#incbin "png/FE6/Monke_palette.dmp" +#incbin "png/FE6/Monke_minimug.dmp" #ifndef MonkeMug - #define MonkeMug (FirstMugID+428) + #define MonkeMug (FirstMugID+429) #endif setMugEntry(MonkeMug, MonkeMugData, 2, 5, 3, 3) ALIGN 4 MordredMugData: -#incbin "Dmp/Mordred_mug.dmp" -#incbin "Dmp/Mordred_frames.dmp" -#incbin "Dmp/Mordred_palette.dmp" -#incbin "Dmp/Mordred_minimug.dmp" +#incbin "png/FE6/Mordred_mug.dmp" +#incbin "png/FE6/Mordred_frames.dmp" +#incbin "png/FE6/Mordred_palette.dmp" +#incbin "png/FE6/Mordred_minimug.dmp" #ifndef MordredMug - #define MordredMug (FirstMugID+429) + #define MordredMug (FirstMugID+430) #endif setMugEntry(MordredMug, MordredMugData, 3, 6, 4, 4) ALIGN 4 MurdockMugData: -#incbin "Dmp/Murdock_mug.dmp" -#incbin "Dmp/Murdock_frames.dmp" -#incbin "Dmp/Murdock_palette.dmp" -#incbin "Dmp/Murdock_minimug.dmp" +#incbin "png/FE6/Murdock_mug.dmp" +#incbin "png/FE6/Murdock_frames.dmp" +#incbin "png/FE6/Murdock_palette.dmp" +#incbin "png/FE6/Murdock_minimug.dmp" #ifndef MurdockMug - #define MurdockMug (FirstMugID+430) + #define MurdockMug (FirstMugID+431) #endif setMugEntry(MurdockMug, MurdockMugData, 2, 4, 3, 2) ALIGN 4 NarcianMugData: -#incbin "Dmp/Narcian_mug.dmp" -#incbin "Dmp/Narcian_frames.dmp" -#incbin "Dmp/Narcian_palette.dmp" -#incbin "Dmp/Narcian_minimug.dmp" +#incbin "png/FE6/Narcian_mug.dmp" +#incbin "png/FE6/Narcian_frames.dmp" +#incbin "png/FE6/Narcian_palette.dmp" +#incbin "png/FE6/Narcian_minimug.dmp" #ifndef NarcianMug - #define NarcianMug (FirstMugID+431) + #define NarcianMug (FirstMugID+432) #endif setMugEntry(NarcianMug, NarcianMugData, 2, 5, 3, 3) ALIGN 4 NiimeMugData: -#incbin "Dmp/Niime_mug.dmp" -#incbin "Dmp/Niime_frames.dmp" -#incbin "Dmp/Niime_palette.dmp" -#incbin "Dmp/Niime_minimug.dmp" +#incbin "png/FE6/Niime_mug.dmp" +#incbin "png/FE6/Niime_frames.dmp" +#incbin "png/FE6/Niime_palette.dmp" +#incbin "png/FE6/Niime_minimug.dmp" #ifndef NiimeMug - #define NiimeMug (FirstMugID+432) + #define NiimeMug (FirstMugID+433) #endif setMugEntry(NiimeMug, NiimeMugData, 2, 6, 2, 4) ALIGN 4 NoahMugData: -#incbin "Dmp/Noah_mug.dmp" -#incbin "Dmp/Noah_frames.dmp" -#incbin "Dmp/Noah_palette.dmp" -#incbin "Dmp/Noah_minimug.dmp" +#incbin "png/FE6/Noah_mug.dmp" +#incbin "png/FE6/Noah_frames.dmp" +#incbin "png/FE6/Noah_palette.dmp" +#incbin "png/FE6/Noah_minimug.dmp" #ifndef NoahMug - #define NoahMug (FirstMugID+433) + #define NoahMug (FirstMugID+434) #endif setMugEntry(NoahMug, NoahMugData, 2, 5, 3, 3) ALIGN 4 NordMugData: -#incbin "Dmp/Nord_mug.dmp" -#incbin "Dmp/Nord_frames.dmp" -#incbin "Dmp/Nord_palette.dmp" -#incbin "Dmp/Nord_minimug.dmp" +#incbin "png/FE6/Nord_mug.dmp" +#incbin "png/FE6/Nord_frames.dmp" +#incbin "png/FE6/Nord_palette.dmp" +#incbin "png/FE6/Nord_minimug.dmp" #ifndef NordMug - #define NordMug (FirstMugID+434) + #define NordMug (FirstMugID+435) #endif setMugEntry(NordMug, NordMugData, 2, 6, 3, 4) ALIGN 4 OatesMugData: -#incbin "Dmp/Oates_mug.dmp" -#incbin "Dmp/Oates_frames.dmp" -#incbin "Dmp/Oates_palette.dmp" -#incbin "Dmp/Oates_minimug.dmp" +#incbin "png/FE6/Oates_mug.dmp" +#incbin "png/FE6/Oates_frames.dmp" +#incbin "png/FE6/Oates_palette.dmp" +#incbin "png/FE6/Oates_minimug.dmp" #ifndef OatesMug - #define OatesMug (FirstMugID+435) + #define OatesMug (FirstMugID+436) #endif setMugEntry(OatesMug, OatesMugData, 2, 6, 2, 4) ALIGN 4 OgierMugData: -#incbin "Dmp/Ogier_mug.dmp" -#incbin "Dmp/Ogier_frames.dmp" -#incbin "Dmp/Ogier_palette.dmp" -#incbin "Dmp/Ogier_minimug.dmp" +#incbin "png/FE6/Ogier_mug.dmp" +#incbin "png/FE6/Ogier_frames.dmp" +#incbin "png/FE6/Ogier_palette.dmp" +#incbin "png/FE6/Ogier_minimug.dmp" #ifndef OgierMug - #define OgierMug (FirstMugID+436) + #define OgierMug (FirstMugID+437) #endif setMugEntry(OgierMug, OgierMugData, 2, 6, 3, 4) ALIGN 4 OrloMugData: -#incbin "Dmp/Orlo_mug.dmp" -#incbin "Dmp/Orlo_frames.dmp" -#incbin "Dmp/Orlo_palette.dmp" -#incbin "Dmp/Orlo_minimug.dmp" +#incbin "png/FE6/Orlo_mug.dmp" +#incbin "png/FE6/Orlo_frames.dmp" +#incbin "png/FE6/Orlo_palette.dmp" +#incbin "png/FE6/Orlo_minimug.dmp" #ifndef OrloMug - #define OrloMug (FirstMugID+437) + #define OrloMug (FirstMugID+438) #endif setMugEntry(OrloMug, OrloMugData, 3, 5, 3, 3) ALIGN 4 PercevalMugData: -#incbin "Dmp/Perceval_mug.dmp" -#incbin "Dmp/Perceval_frames.dmp" -#incbin "Dmp/Perceval_palette.dmp" -#incbin "Dmp/Perceval_minimug.dmp" +#incbin "png/FE6/Perceval_mug.dmp" +#incbin "png/FE6/Perceval_frames.dmp" +#incbin "png/FE6/Perceval_palette.dmp" +#incbin "png/FE6/Perceval_minimug.dmp" #ifndef PercevalMug - #define PercevalMug (FirstMugID+438) + #define PercevalMug (FirstMugID+439) #endif setMugEntry(PercevalMug, PercevalMugData, 2, 5, 2, 3) ALIGN 4 PeresMugData: -#incbin "Dmp/Peres_mug.dmp" -#incbin "Dmp/Peres_frames.dmp" -#incbin "Dmp/Peres_palette.dmp" -#incbin "Dmp/Peres_minimug.dmp" +#incbin "png/FE6/Peres_mug.dmp" +#incbin "png/FE6/Peres_frames.dmp" +#incbin "png/FE6/Peres_palette.dmp" +#incbin "png/FE6/Peres_minimug.dmp" #ifndef PeresMug - #define PeresMug (FirstMugID+439) + #define PeresMug (FirstMugID+440) #endif setMugEntry(PeresMug, PeresMugData, 2, 6, 2, 4) ALIGN 4 PriestMugData: -#incbin "Dmp/Priest_mug.dmp" -#incbin "Dmp/Priest_frames.dmp" -#incbin "Dmp/Priest_palette.dmp" -#incbin "Dmp/Priest_minimug.dmp" +#incbin "png/FE6/Priest_mug.dmp" +#incbin "png/FE6/Priest_frames.dmp" +#incbin "png/FE6/Priest_palette.dmp" +#incbin "png/FE6/Priest_minimug.dmp" #ifndef PriestMug - #define PriestMug (FirstMugID+440) + #define PriestMug (FirstMugID+441) #endif setMugEntry(PriestMug, PriestMugData, 2, 5, 2, 3) ALIGN 4 RaighMugData: -#incbin "Dmp/Raigh_mug.dmp" -#incbin "Dmp/Raigh_frames.dmp" -#incbin "Dmp/Raigh_palette.dmp" -#incbin "Dmp/Raigh_minimug.dmp" +#incbin "png/FE6/Raigh_mug.dmp" +#incbin "png/FE6/Raigh_frames.dmp" +#incbin "png/FE6/Raigh_palette.dmp" +#incbin "png/FE6/Raigh_minimug.dmp" #ifndef RaighMug - #define RaighMug (FirstMugID+441) + #define RaighMug (FirstMugID+442) #endif setMugEntry(RaighMug, RaighMugData, 2, 6, 3, 4) ALIGN 4 RaithMugData: -#incbin "Dmp/Raith_mug.dmp" -#incbin "Dmp/Raith_frames.dmp" -#incbin "Dmp/Raith_palette.dmp" -#incbin "Dmp/Raith_minimug.dmp" +#incbin "png/FE6/Raith_mug.dmp" +#incbin "png/FE6/Raith_frames.dmp" +#incbin "png/FE6/Raith_palette.dmp" +#incbin "png/FE6/Raith_minimug.dmp" #ifndef RaithMug - #define RaithMug (FirstMugID+442) + #define RaithMug (FirstMugID+443) #endif setMugEntry(RaithMug, RaithMugData, 2, 5, 3, 3) ALIGN 4 RandyMugData: -#incbin "Dmp/Randy_mug.dmp" -#incbin "Dmp/Randy_frames.dmp" -#incbin "Dmp/Randy_palette.dmp" -#incbin "Dmp/Randy_minimug.dmp" +#incbin "png/FE6/Randy_mug.dmp" +#incbin "png/FE6/Randy_frames.dmp" +#incbin "png/FE6/Randy_palette.dmp" +#incbin "png/FE6/Randy_minimug.dmp" #ifndef RandyMug - #define RandyMug (FirstMugID+443) + #define RandyMug (FirstMugID+444) #endif setMugEntry(RandyMug, RandyMugData, 2, 5, 3, 3) ALIGN 4 RoartzMugData: -#incbin "Dmp/Roartz_mug.dmp" -#incbin "Dmp/Roartz_frames.dmp" -#incbin "Dmp/Roartz_palette.dmp" -#incbin "Dmp/Roartz_minimug.dmp" +#incbin "png/FE6/Roartz_mug.dmp" +#incbin "png/FE6/Roartz_frames.dmp" +#incbin "png/FE6/Roartz_palette.dmp" +#incbin "png/FE6/Roartz_minimug.dmp" #ifndef RoartzMug - #define RoartzMug (FirstMugID+444) + #define RoartzMug (FirstMugID+445) #endif setMugEntry(RoartzMug, RoartzMugData, 2, 5, 2, 3) ALIGN 4 RoseMugData: -#incbin "Dmp/Rose_mug.dmp" -#incbin "Dmp/Rose_frames.dmp" -#incbin "Dmp/Rose_palette.dmp" -#incbin "Dmp/Rose_minimug.dmp" +#incbin "png/FE6/Rose_mug.dmp" +#incbin "png/FE6/Rose_frames.dmp" +#incbin "png/FE6/Rose_palette.dmp" +#incbin "png/FE6/Rose_minimug.dmp" #ifndef RoseMug - #define RoseMug (FirstMugID+445) + #define RoseMug (FirstMugID+446) #endif setMugEntry(RoseMug, RoseMugData, 2, 5, 3, 3) ALIGN 4 RoyMugData: -#incbin "Dmp/Roy_mug.dmp" -#incbin "Dmp/Roy_frames.dmp" -#incbin "Dmp/Roy_palette.dmp" -#incbin "Dmp/Roy_minimug.dmp" +#incbin "png/FE6/Roy_mug.dmp" +#incbin "png/FE6/Roy_frames.dmp" +#incbin "png/FE6/Roy_palette.dmp" +#incbin "png/FE6/Roy_minimug.dmp" #ifndef RoyMug - #define RoyMug (FirstMugID+446) + #define RoyMug (FirstMugID+447) #endif setMugEntry(RoyMug, RoyMugData, 2, 6, 3, 4) ALIGN 4 RutgerMugData: -#incbin "Dmp/Rutger_mug.dmp" -#incbin "Dmp/Rutger_frames.dmp" -#incbin "Dmp/Rutger_palette.dmp" -#incbin "Dmp/Rutger_minimug.dmp" +#incbin "png/FE6/Rutger_mug.dmp" +#incbin "png/FE6/Rutger_frames.dmp" +#incbin "png/FE6/Rutger_palette.dmp" +#incbin "png/FE6/Rutger_minimug.dmp" #ifndef RutgerMug - #define RutgerMug (FirstMugID+447) + #define RutgerMug (FirstMugID+448) #endif setMugEntry(RutgerMug, RutgerMugData, 2, 5, 2, 3) ALIGN 4 RuudMugData: -#incbin "Dmp/Ruud_mug.dmp" -#incbin "Dmp/Ruud_frames.dmp" -#incbin "Dmp/Ruud_palette.dmp" -#incbin "Dmp/Ruud_minimug.dmp" +#incbin "png/FE6/Ruud_mug.dmp" +#incbin "png/FE6/Ruud_frames.dmp" +#incbin "png/FE6/Ruud_palette.dmp" +#incbin "png/FE6/Ruud_minimug.dmp" #ifndef RuudMug - #define RuudMug (FirstMugID+448) + #define RuudMug (FirstMugID+449) #endif setMugEntry(RuudMug, RuudMugData, 3, 5, 4, 3) ALIGN 4 SaulMugData: -#incbin "Dmp/Saul_mug.dmp" -#incbin "Dmp/Saul_frames.dmp" -#incbin "Dmp/Saul_palette.dmp" -#incbin "Dmp/Saul_minimug.dmp" +#incbin "png/FE6/Saul_mug.dmp" +#incbin "png/FE6/Saul_frames.dmp" +#incbin "png/FE6/Saul_palette.dmp" +#incbin "png/FE6/Saul_minimug.dmp" #ifndef SaulMug - #define SaulMug (FirstMugID+449) + #define SaulMug (FirstMugID+450) #endif setMugEntry(SaulMug, SaulMugData, 2, 5, 3, 3) ALIGN 4 ScottMugData: -#incbin "Dmp/Scott_mug.dmp" -#incbin "Dmp/Scott_frames.dmp" -#incbin "Dmp/Scott_palette.dmp" -#incbin "Dmp/Scott_minimug.dmp" +#incbin "png/FE6/Scott_mug.dmp" +#incbin "png/FE6/Scott_frames.dmp" +#incbin "png/FE6/Scott_palette.dmp" +#incbin "png/FE6/Scott_minimug.dmp" #ifndef ScottMug - #define ScottMug (FirstMugID+450) + #define ScottMug (FirstMugID+451) #endif setMugEntry(ScottMug, ScottMugData, 2, 5, 3, 3) ALIGN 4 ShannaMugData: -#incbin "Dmp/Shanna_mug.dmp" -#incbin "Dmp/Shanna_frames.dmp" -#incbin "Dmp/Shanna_palette.dmp" -#incbin "Dmp/Shanna_minimug.dmp" +#incbin "png/FE6/Shanna_mug.dmp" +#incbin "png/FE6/Shanna_frames.dmp" +#incbin "png/FE6/Shanna_palette.dmp" +#incbin "png/FE6/Shanna_minimug.dmp" #ifndef ShannaMug - #define ShannaMug (FirstMugID+451) + #define ShannaMug (FirstMugID+452) #endif setMugEntry(ShannaMug, ShannaMugData, 2, 6, 3, 4) ALIGN 4 SiguneMugData: -#incbin "Dmp/Sigune_mug.dmp" -#incbin "Dmp/Sigune_frames.dmp" -#incbin "Dmp/Sigune_palette.dmp" -#incbin "Dmp/Sigune_minimug.dmp" +#incbin "png/FE6/Sigune_mug.dmp" +#incbin "png/FE6/Sigune_frames.dmp" +#incbin "png/FE6/Sigune_palette.dmp" +#incbin "png/FE6/Sigune_minimug.dmp" #ifndef SiguneMug - #define SiguneMug (FirstMugID+452) + #define SiguneMug (FirstMugID+453) #endif setMugEntry(SiguneMug, SiguneMugData, 2, 5, 3, 3) ALIGN 4 SinMugData: -#incbin "Dmp/Sin_mug.dmp" -#incbin "Dmp/Sin_frames.dmp" -#incbin "Dmp/Sin_palette.dmp" -#incbin "Dmp/Sin_minimug.dmp" +#incbin "png/FE6/Sin_mug.dmp" +#incbin "png/FE6/Sin_frames.dmp" +#incbin "png/FE6/Sin_palette.dmp" +#incbin "png/FE6/Sin_minimug.dmp" #ifndef SinMug - #define SinMug (FirstMugID+453) + #define SinMug (FirstMugID+454) #endif setMugEntry(SinMug, SinMugData, 2, 5, 3, 3) ALIGN 4 SophiaMugData: -#incbin "Dmp/Sophia_mug.dmp" -#incbin "Dmp/Sophia_frames.dmp" -#incbin "Dmp/Sophia_palette.dmp" -#incbin "Dmp/Sophia_minimug.dmp" +#incbin "png/FE6/Sophia_mug.dmp" +#incbin "png/FE6/Sophia_frames.dmp" +#incbin "png/FE6/Sophia_palette.dmp" +#incbin "png/FE6/Sophia_minimug.dmp" #ifndef SophiaMug - #define SophiaMug (FirstMugID+454) + #define SophiaMug (FirstMugID+455) #endif setMugEntry(SophiaMug, SophiaMugData, 2, 6, 3, 4) ALIGN 4 SueMugData: -#incbin "Dmp/Sue_mug.dmp" -#incbin "Dmp/Sue_frames.dmp" -#incbin "Dmp/Sue_palette.dmp" -#incbin "Dmp/Sue_minimug.dmp" +#incbin "png/FE6/Sue_mug.dmp" +#incbin "png/FE6/Sue_frames.dmp" +#incbin "png/FE6/Sue_palette.dmp" +#incbin "png/FE6/Sue_minimug.dmp" #ifndef SueMug - #define SueMug (FirstMugID+455) + #define SueMug (FirstMugID+456) #endif setMugEntry(SueMug, SueMugData, 2, 5, 3, 3) ALIGN 4 TheaMugData: -#incbin "Dmp/Thea_mug.dmp" -#incbin "Dmp/Thea_frames.dmp" -#incbin "Dmp/Thea_palette.dmp" -#incbin "Dmp/Thea_minimug.dmp" +#incbin "png/FE6/Thea_mug.dmp" +#incbin "png/FE6/Thea_frames.dmp" +#incbin "png/FE6/Thea_palette.dmp" +#incbin "png/FE6/Thea_minimug.dmp" #ifndef TheaMug - #define TheaMug (FirstMugID+456) + #define TheaMug (FirstMugID+457) #endif setMugEntry(TheaMug, TheaMugData, 3, 6, 3, 4) ALIGN 4 TickMugData: -#incbin "Dmp/Tick_mug.dmp" -#incbin "Dmp/Tick_frames.dmp" -#incbin "Dmp/Tick_palette.dmp" -#incbin "Dmp/Tick_minimug.dmp" +#incbin "png/FE6/Tick_mug.dmp" +#incbin "png/FE6/Tick_frames.dmp" +#incbin "png/FE6/Tick_palette.dmp" +#incbin "png/FE6/Tick_minimug.dmp" #ifndef TickMug - #define TickMug (FirstMugID+457) + #define TickMug (FirstMugID+458) #endif setMugEntry(TickMug, TickMugData, 2, 5, 3, 3) ALIGN 4 TrecMugData: -#incbin "Dmp/Trec_mug.dmp" -#incbin "Dmp/Trec_frames.dmp" -#incbin "Dmp/Trec_palette.dmp" -#incbin "Dmp/Trec_minimug.dmp" +#incbin "png/FE6/Trec_mug.dmp" +#incbin "png/FE6/Trec_frames.dmp" +#incbin "png/FE6/Trec_palette.dmp" +#incbin "png/FE6/Trec_minimug.dmp" #ifndef TrecMug - #define TrecMug (FirstMugID+458) + #define TrecMug (FirstMugID+459) #endif setMugEntry(TrecMug, TrecMugData, 2, 5, 3, 3) ALIGN 4 WagnerMugData: -#incbin "Dmp/Wagner_mug.dmp" -#incbin "Dmp/Wagner_frames.dmp" -#incbin "Dmp/Wagner_palette.dmp" -#incbin "Dmp/Wagner_minimug.dmp" +#incbin "png/FE6/Wagner_mug.dmp" +#incbin "png/FE6/Wagner_frames.dmp" +#incbin "png/FE6/Wagner_palette.dmp" +#incbin "png/FE6/Wagner_minimug.dmp" #ifndef WagnerMug - #define WagnerMug (FirstMugID+459) + #define WagnerMug (FirstMugID+460) #endif setMugEntry(WagnerMug, WagnerMugData, 2, 6, 3, 4) ALIGN 4 WardMugData: -#incbin "Dmp/Ward_mug.dmp" -#incbin "Dmp/Ward_frames.dmp" -#incbin "Dmp/Ward_palette.dmp" -#incbin "Dmp/Ward_minimug.dmp" +#incbin "png/FE6/Ward_mug.dmp" +#incbin "png/FE6/Ward_frames.dmp" +#incbin "png/FE6/Ward_palette.dmp" +#incbin "png/FE6/Ward_minimug.dmp" #ifndef WardMug - #define WardMug (FirstMugID+460) + #define WardMug (FirstMugID+461) #endif setMugEntry(WardMug, WardMugData, 2, 5, 2, 3) ALIGN 4 WilliamMugData: -#incbin "Dmp/William_mug.dmp" -#incbin "Dmp/William_frames.dmp" -#incbin "Dmp/William_palette.dmp" -#incbin "Dmp/William_minimug.dmp" +#incbin "png/FE6/William_mug.dmp" +#incbin "png/FE6/William_frames.dmp" +#incbin "png/FE6/William_palette.dmp" +#incbin "png/FE6/William_minimug.dmp" #ifndef WilliamMug - #define WilliamMug (FirstMugID+461) + #define WilliamMug (FirstMugID+462) #endif setMugEntry(WilliamMug, WilliamMugData, 2, 6, 3, 3) ALIGN 4 WindhamMugData: -#incbin "Dmp/Windham_mug.dmp" -#incbin "Dmp/Windham_frames.dmp" -#incbin "Dmp/Windham_palette.dmp" -#incbin "Dmp/Windham_minimug.dmp" +#incbin "png/FE6/Windham_mug.dmp" +#incbin "png/FE6/Windham_frames.dmp" +#incbin "png/FE6/Windham_palette.dmp" +#incbin "png/FE6/Windham_minimug.dmp" #ifndef WindhamMug - #define WindhamMug (FirstMugID+462) + #define WindhamMug (FirstMugID+463) #endif setMugEntry(WindhamMug, WindhamMugData, 3, 5, 3, 3) ALIGN 4 WoltMugData: -#incbin "Dmp/Wolt_mug.dmp" -#incbin "Dmp/Wolt_frames.dmp" -#incbin "Dmp/Wolt_palette.dmp" -#incbin "Dmp/Wolt_minimug.dmp" +#incbin "png/FE6/Wolt_mug.dmp" +#incbin "png/FE6/Wolt_frames.dmp" +#incbin "png/FE6/Wolt_palette.dmp" +#incbin "png/FE6/Wolt_minimug.dmp" #ifndef WoltMug - #define WoltMug (FirstMugID+463) + #define WoltMug (FirstMugID+464) #endif setMugEntry(WoltMug, WoltMugData, 2, 6, 3, 4) ALIGN 4 YoderMugData: -#incbin "Dmp/Yoder_mug.dmp" -#incbin "Dmp/Yoder_frames.dmp" -#incbin "Dmp/Yoder_palette.dmp" -#incbin "Dmp/Yoder_minimug.dmp" +#incbin "png/FE6/Yoder_mug.dmp" +#incbin "png/FE6/Yoder_frames.dmp" +#incbin "png/FE6/Yoder_palette.dmp" +#incbin "png/FE6/Yoder_minimug.dmp" #ifndef YoderMug - #define YoderMug (FirstMugID+464) + #define YoderMug (FirstMugID+465) #endif setMugEntry(YoderMug, YoderMugData, 2, 5, 3, 3) ALIGN 4 ZeissMugData: -#incbin "Dmp/Zeiss_mug.dmp" -#incbin "Dmp/Zeiss_frames.dmp" -#incbin "Dmp/Zeiss_palette.dmp" -#incbin "Dmp/Zeiss_minimug.dmp" +#incbin "png/FE6/Zeiss_mug.dmp" +#incbin "png/FE6/Zeiss_frames.dmp" +#incbin "png/FE6/Zeiss_palette.dmp" +#incbin "png/FE6/Zeiss_minimug.dmp" #ifndef ZeissMug - #define ZeissMug (FirstMugID+465) + #define ZeissMug (FirstMugID+466) #endif setMugEntry(ZeissMug, ZeissMugData, 2, 5, 2, 3) ALIGN 4 ZelotMugData: -#incbin "Dmp/Zelot_mug.dmp" -#incbin "Dmp/Zelot_frames.dmp" -#incbin "Dmp/Zelot_palette.dmp" -#incbin "Dmp/Zelot_minimug.dmp" +#incbin "png/FE6/Zelot_mug.dmp" +#incbin "png/FE6/Zelot_frames.dmp" +#incbin "png/FE6/Zelot_palette.dmp" +#incbin "png/FE6/Zelot_minimug.dmp" #ifndef ZelotMug - #define ZelotMug (FirstMugID+466) + #define ZelotMug (FirstMugID+467) #endif setMugEntry(ZelotMug, ZelotMugData, 2, 5, 3, 3) ALIGN 4 ZephielMugData: -#incbin "Dmp/Zephiel_mug.dmp" -#incbin "Dmp/Zephiel_frames.dmp" -#incbin "Dmp/Zephiel_palette.dmp" -#incbin "Dmp/Zephiel_minimug.dmp" +#incbin "png/FE6/Zephiel_mug.dmp" +#incbin "png/FE6/Zephiel_frames.dmp" +#incbin "png/FE6/Zephiel_palette.dmp" +#incbin "png/FE6/Zephiel_minimug.dmp" #ifndef ZephielMug - #define ZephielMug (FirstMugID+467) + #define ZephielMug (FirstMugID+468) #endif setMugEntry(ZephielMug, ZephielMugData, 4, 4, 4, 2) ALIGN 4 ZinqueMugData: -#incbin "Dmp/Zinque_mug.dmp" -#incbin "Dmp/Zinque_frames.dmp" -#incbin "Dmp/Zinque_palette.dmp" -#incbin "Dmp/Zinque_minimug.dmp" +#incbin "png/FE6/Zinque_mug.dmp" +#incbin "png/FE6/Zinque_frames.dmp" +#incbin "png/FE6/Zinque_palette.dmp" +#incbin "png/FE6/Zinque_minimug.dmp" #ifndef ZinqueMug - #define ZinqueMug (FirstMugID+468) + #define ZinqueMug (FirstMugID+469) #endif setMugEntry(ZinqueMug, ZinqueMugData, 2, 5, 3, 3) ALIGN 4 AthosMugData: -#incbin "Dmp/Athos_mug.dmp" -#incbin "Dmp/Athos_frames.dmp" -#incbin "Dmp/Athos_palette.dmp" -#incbin "Dmp/Athos_minimug.dmp" +#incbin "png/FE7/Athos_mug.dmp" +#incbin "png/FE7/Athos_frames.dmp" +#incbin "png/FE7/Athos_palette.dmp" +#incbin "png/FE7/Athos_minimug.dmp" #ifndef AthosMug - #define AthosMug (FirstMugID+469) + #define AthosMug (FirstMugID+470) #endif setMugEntry(AthosMug, AthosMugData, 2, 4, 3, 2) ALIGN 4 Bartre2MugData: -#incbin "Dmp/Bartre2_mug.dmp" -#incbin "Dmp/Bartre2_frames.dmp" -#incbin "Dmp/Bartre2_palette.dmp" -#incbin "Dmp/Bartre2_minimug.dmp" +#incbin "png/FE7/Bartre2_mug.dmp" +#incbin "png/FE7/Bartre2_frames.dmp" +#incbin "png/FE7/Bartre2_palette.dmp" +#incbin "png/FE7/Bartre2_minimug.dmp" #ifndef Bartre2Mug - #define Bartre2Mug (FirstMugID+470) + #define Bartre2Mug (FirstMugID+471) #endif setMugEntry(Bartre2Mug, Bartre2MugData, 2, 5, 2, 3) ALIGN 4 BramimondMugData: -#incbin "Dmp/Bramimond_mug.dmp" -#incbin "Dmp/Bramimond_frames.dmp" -#incbin "Dmp/Bramimond_palette.dmp" -#incbin "Dmp/Bramimond_minimug.dmp" +#incbin "png/FE7/Bramimond_mug.dmp" +#incbin "png/FE7/Bramimond_frames.dmp" +#incbin "png/FE7/Bramimond_palette.dmp" +#incbin "png/FE7/Bramimond_minimug.dmp" #ifndef BramimondMug - #define BramimondMug (FirstMugID+471) + #define BramimondMug (FirstMugID+472) #endif setMugEntry(BramimondMug, BramimondMugData, 2, 6, 3, 3) ALIGN 4 CanasMugData: -#incbin "Dmp/Canas_mug.dmp" -#incbin "Dmp/Canas_frames.dmp" -#incbin "Dmp/Canas_palette.dmp" -#incbin "Dmp/Canas_minimug.dmp" +#incbin "png/FE7/Canas_mug.dmp" +#incbin "png/FE7/Canas_frames.dmp" +#incbin "png/FE7/Canas_palette.dmp" +#incbin "png/FE7/Canas_minimug.dmp" #ifndef CanasMug - #define CanasMug (FirstMugID+472) + #define CanasMug (FirstMugID+473) #endif setMugEntry(CanasMug, CanasMugData, 2, 5, 3, 3) ALIGN 4 DartMugData: -#incbin "Dmp/Dart_mug.dmp" -#incbin "Dmp/Dart_frames.dmp" -#incbin "Dmp/Dart_palette.dmp" -#incbin "Dmp/Dart_minimug.dmp" +#incbin "png/FE7/Dart_mug.dmp" +#incbin "png/FE7/Dart_frames.dmp" +#incbin "png/FE7/Dart_palette.dmp" +#incbin "png/FE7/Dart_minimug.dmp" #ifndef DartMug - #define DartMug (FirstMugID+473) + #define DartMug (FirstMugID+474) #endif setMugEntry(DartMug, DartMugData, 3, 5, 3, 3) ALIGN 4 DorcasMugData: -#incbin "Dmp/Dorcas_mug.dmp" -#incbin "Dmp/Dorcas_frames.dmp" -#incbin "Dmp/Dorcas_palette.dmp" -#incbin "Dmp/Dorcas_minimug.dmp" +#incbin "png/FE7/Dorcas_mug.dmp" +#incbin "png/FE7/Dorcas_frames.dmp" +#incbin "png/FE7/Dorcas_palette.dmp" +#incbin "png/FE7/Dorcas_minimug.dmp" #ifndef DorcasMug - #define DorcasMug (FirstMugID+474) + #define DorcasMug (FirstMugID+475) #endif setMugEntry(DorcasMug, DorcasMugData, 2, 4, 3, 2) ALIGN 4 ElbertMugData: -#incbin "Dmp/Elbert_mug.dmp" -#incbin "Dmp/Elbert_frames.dmp" -#incbin "Dmp/Elbert_palette.dmp" -#incbin "Dmp/Elbert_minimug.dmp" +#incbin "png/FE7/Elbert_mug.dmp" +#incbin "png/FE7/Elbert_frames.dmp" +#incbin "png/FE7/Elbert_palette.dmp" +#incbin "png/FE7/Elbert_minimug.dmp" #ifndef ElbertMug - #define ElbertMug (FirstMugID+475) + #define ElbertMug (FirstMugID+476) #endif setMugEntry(ElbertMug, ElbertMugData, 2, 5, 3, 3) ALIGN 4 EleanoraMugData: -#incbin "Dmp/Eleanora_mug.dmp" -#incbin "Dmp/Eleanora_frames.dmp" -#incbin "Dmp/Eleanora_palette.dmp" -#incbin "Dmp/Eleanora_minimug.dmp" +#incbin "png/FE7/Eleanora_mug.dmp" +#incbin "png/FE7/Eleanora_frames.dmp" +#incbin "png/FE7/Eleanora_palette.dmp" +#incbin "png/FE7/Eleanora_minimug.dmp" #ifndef EleanoraMug - #define EleanoraMug (FirstMugID+476) + #define EleanoraMug (FirstMugID+477) #endif setMugEntry(EleanoraMug, EleanoraMugData, 1, 5, 2, 3) ALIGN 4 EliwoodMugData: -#incbin "Dmp/Eliwood_mug.dmp" -#incbin "Dmp/Eliwood_frames.dmp" -#incbin "Dmp/Eliwood_palette.dmp" -#incbin "Dmp/Eliwood_minimug.dmp" +#incbin "png/FE7/Eliwood_mug.dmp" +#incbin "png/FE7/Eliwood_frames.dmp" +#incbin "png/FE7/Eliwood_palette.dmp" +#incbin "png/FE7/Eliwood_minimug.dmp" #ifndef EliwoodMug - #define EliwoodMug (FirstMugID+477) + #define EliwoodMug (FirstMugID+478) #endif setMugEntry(EliwoodMug, EliwoodMugData, 2, 5, 3, 3) ALIGN 4 ErkMugData: -#incbin "Dmp/Erk_mug.dmp" -#incbin "Dmp/Erk_frames.dmp" -#incbin "Dmp/Erk_palette.dmp" -#incbin "Dmp/Erk_minimug.dmp" +#incbin "png/FE7/Erk_mug.dmp" +#incbin "png/FE7/Erk_frames.dmp" +#incbin "png/FE7/Erk_palette.dmp" +#incbin "png/FE7/Erk_minimug.dmp" #ifndef ErkMug - #define ErkMug (FirstMugID+478) + #define ErkMug (FirstMugID+479) #endif setMugEntry(ErkMug, ErkMugData, 2, 6, 3, 4) ALIGN 4 FargusMugData: -#incbin "Dmp/Fargus_mug.dmp" -#incbin "Dmp/Fargus_frames.dmp" -#incbin "Dmp/Fargus_palette.dmp" -#incbin "Dmp/Fargus_minimug.dmp" +#incbin "png/FE7/Fargus_mug.dmp" +#incbin "png/FE7/Fargus_frames.dmp" +#incbin "png/FE7/Fargus_palette.dmp" +#incbin "png/FE7/Fargus_minimug.dmp" #ifndef FargusMug - #define FargusMug (FirstMugID+479) + #define FargusMug (FirstMugID+480) #endif setMugEntry(FargusMug, FargusMugData, 2, 5, 3, 3) ALIGN 4 FarinaMugData: -#incbin "Dmp/Farina_mug.dmp" -#incbin "Dmp/Farina_frames.dmp" -#incbin "Dmp/Farina_palette.dmp" -#incbin "Dmp/Farina_minimug.dmp" +#incbin "png/FE7/Farina_mug.dmp" +#incbin "png/FE7/Farina_frames.dmp" +#incbin "png/FE7/Farina_palette.dmp" +#incbin "png/FE7/Farina_minimug.dmp" #ifndef FarinaMug - #define FarinaMug (FirstMugID+480) + #define FarinaMug (FirstMugID+481) #endif setMugEntry(FarinaMug, FarinaMugData, 2, 5, 3, 3) ALIGN 4 FioraMugData: -#incbin "Dmp/Fiora_mug.dmp" -#incbin "Dmp/Fiora_frames.dmp" -#incbin "Dmp/Fiora_palette.dmp" -#incbin "Dmp/Fiora_minimug.dmp" +#incbin "png/FE7/Fiora_mug.dmp" +#incbin "png/FE7/Fiora_frames.dmp" +#incbin "png/FE7/Fiora_palette.dmp" +#incbin "png/FE7/Fiora_minimug.dmp" #ifndef FioraMug - #define FioraMug (FirstMugID+481) + #define FioraMug (FirstMugID+482) #endif setMugEntry(FioraMug, FioraMugData, 2, 5, 3, 3) ALIGN 4 FlorinaMugData: -#incbin "Dmp/Florina_mug.dmp" -#incbin "Dmp/Florina_frames.dmp" -#incbin "Dmp/Florina_palette.dmp" -#incbin "Dmp/Florina_minimug.dmp" +#incbin "png/FE7/Florina_mug.dmp" +#incbin "png/FE7/Florina_frames.dmp" +#incbin "png/FE7/Florina_palette.dmp" +#incbin "png/FE7/Florina_minimug.dmp" #ifndef FlorinaMug - #define FlorinaMug (FirstMugID+482) + #define FlorinaMug (FirstMugID+483) #endif setMugEntry(FlorinaMug, FlorinaMugData, 2, 7, 3, 5) ALIGN 4 GeitzMugData: -#incbin "Dmp/Geitz_mug.dmp" -#incbin "Dmp/Geitz_frames.dmp" -#incbin "Dmp/Geitz_palette.dmp" -#incbin "Dmp/Geitz_minimug.dmp" +#incbin "png/FE7/Geitz_mug.dmp" +#incbin "png/FE7/Geitz_frames.dmp" +#incbin "png/FE7/Geitz_palette.dmp" +#incbin "png/FE7/Geitz_minimug.dmp" #ifndef GeitzMug - #define GeitzMug (FirstMugID+483) + #define GeitzMug (FirstMugID+484) #endif setMugEntry(GeitzMug, GeitzMugData, 2, 5, 3, 3) ALIGN 4 GuyMugData: -#incbin "Dmp/Guy_mug.dmp" -#incbin "Dmp/Guy_frames.dmp" -#incbin "Dmp/Guy_palette.dmp" -#incbin "Dmp/Guy_minimug.dmp" +#incbin "png/FE7/Guy_mug.dmp" +#incbin "png/FE7/Guy_frames.dmp" +#incbin "png/FE7/Guy_palette.dmp" +#incbin "png/FE7/Guy_minimug.dmp" #ifndef GuyMug - #define GuyMug (FirstMugID+484) + #define GuyMug (FirstMugID+485) #endif setMugEntry(GuyMug, GuyMugData, 2, 6, 3, 4) ALIGN 4 HarkenMugData: -#incbin "Dmp/Harken_mug.dmp" -#incbin "Dmp/Harken_frames.dmp" -#incbin "Dmp/Harken_palette.dmp" -#incbin "Dmp/Harken_minimug.dmp" +#incbin "png/FE7/Harken_mug.dmp" +#incbin "png/FE7/Harken_frames.dmp" +#incbin "png/FE7/Harken_palette.dmp" +#incbin "png/FE7/Harken_minimug.dmp" #ifndef HarkenMug - #define HarkenMug (FirstMugID+485) + #define HarkenMug (FirstMugID+486) #endif setMugEntry(HarkenMug, HarkenMugData, 2, 5, 3, 3) ALIGN 4 HawkeyeMugData: -#incbin "Dmp/Hawkeye_mug.dmp" -#incbin "Dmp/Hawkeye_frames.dmp" -#incbin "Dmp/Hawkeye_palette.dmp" -#incbin "Dmp/Hawkeye_minimug.dmp" +#incbin "png/FE7/Hawkeye_mug.dmp" +#incbin "png/FE7/Hawkeye_frames.dmp" +#incbin "png/FE7/Hawkeye_palette.dmp" +#incbin "png/FE7/Hawkeye_minimug.dmp" #ifndef HawkeyeMug - #define HawkeyeMug (FirstMugID+486) + #define HawkeyeMug (FirstMugID+487) #endif setMugEntry(HawkeyeMug, HawkeyeMugData, 2, 4, 2, 2) ALIGN 4 HeathMugData: -#incbin "Dmp/Heath_mug.dmp" -#incbin "Dmp/Heath_frames.dmp" -#incbin "Dmp/Heath_palette.dmp" -#incbin "Dmp/Heath_minimug.dmp" +#incbin "png/FE7/Heath_mug.dmp" +#incbin "png/FE7/Heath_frames.dmp" +#incbin "png/FE7/Heath_palette.dmp" +#incbin "png/FE7/Heath_minimug.dmp" #ifndef HeathMug - #define HeathMug (FirstMugID+487) + #define HeathMug (FirstMugID+488) #endif setMugEntry(HeathMug, HeathMugData, 3, 5, 3, 3) ALIGN 4 HectorMugData: -#incbin "Dmp/Hector_mug.dmp" -#incbin "Dmp/Hector_frames.dmp" -#incbin "Dmp/Hector_palette.dmp" -#incbin "Dmp/Hector_minimug.dmp" +#incbin "png/FE7/Hector_mug.dmp" +#incbin "png/FE7/Hector_frames.dmp" +#incbin "png/FE7/Hector_palette.dmp" +#incbin "png/FE7/Hector_minimug.dmp" #ifndef HectorMug - #define HectorMug (FirstMugID+488) + #define HectorMug (FirstMugID+489) #endif setMugEntry(HectorMug, HectorMugData, 2, 4, 3, 2) ALIGN 4 IsadoraMugData: -#incbin "Dmp/Isadora_mug.dmp" -#incbin "Dmp/Isadora_frames.dmp" -#incbin "Dmp/Isadora_palette.dmp" -#incbin "Dmp/Isadora_minimug.dmp" +#incbin "png/FE7/Isadora_mug.dmp" +#incbin "png/FE7/Isadora_frames.dmp" +#incbin "png/FE7/Isadora_palette.dmp" +#incbin "png/FE7/Isadora_minimug.dmp" #ifndef IsadoraMug - #define IsadoraMug (FirstMugID+489) + #define IsadoraMug (FirstMugID+490) #endif setMugEntry(IsadoraMug, IsadoraMugData, 2, 6, 3, 4) ALIGN 4 JaffarMugData: -#incbin "Dmp/Jaffar_mug.dmp" -#incbin "Dmp/Jaffar_frames.dmp" -#incbin "Dmp/Jaffar_palette.dmp" -#incbin "Dmp/Jaffar_minimug.dmp" +#incbin "png/FE7/Jaffar_mug.dmp" +#incbin "png/FE7/Jaffar_frames.dmp" +#incbin "png/FE7/Jaffar_palette.dmp" +#incbin "png/FE7/Jaffar_minimug.dmp" #ifndef JaffarMug - #define JaffarMug (FirstMugID+490) + #define JaffarMug (FirstMugID+491) #endif setMugEntry(JaffarMug, JaffarMugData, 2, 5, 2, 3) ALIGN 4 Karel2MugData: -#incbin "Dmp/Karel2_mug.dmp" -#incbin "Dmp/Karel2_frames.dmp" -#incbin "Dmp/Karel2_palette.dmp" -#incbin "Dmp/Karel2_minimug.dmp" +#incbin "png/FE7/Karel2_mug.dmp" +#incbin "png/FE7/Karel2_frames.dmp" +#incbin "png/FE7/Karel2_palette.dmp" +#incbin "png/FE7/Karel2_minimug.dmp" #ifndef Karel2Mug - #define Karel2Mug (FirstMugID+491) + #define Karel2Mug (FirstMugID+492) #endif setMugEntry(Karel2Mug, Karel2MugData, 2, 5, 3, 3) ALIGN 4 KarlaMugData: -#incbin "Dmp/Karla_mug.dmp" -#incbin "Dmp/Karla_frames.dmp" -#incbin "Dmp/Karla_palette.dmp" -#incbin "Dmp/Karla_minimug.dmp" +#incbin "png/FE7/Karla_mug.dmp" +#incbin "png/FE7/Karla_frames.dmp" +#incbin "png/FE7/Karla_palette.dmp" +#incbin "png/FE7/Karla_minimug.dmp" #ifndef KarlaMug - #define KarlaMug (FirstMugID+492) + #define KarlaMug (FirstMugID+493) #endif setMugEntry(KarlaMug, KarlaMugData, 2, 5, 3, 3) ALIGN 4 KentMugData: -#incbin "Dmp/Kent_mug.dmp" -#incbin "Dmp/Kent_frames.dmp" -#incbin "Dmp/Kent_palette.dmp" -#incbin "Dmp/Kent_minimug.dmp" +#incbin "png/FE7/Kent_mug.dmp" +#incbin "png/FE7/Kent_frames.dmp" +#incbin "png/FE7/Kent_palette.dmp" +#incbin "png/FE7/Kent_minimug.dmp" #ifndef KentMug - #define KentMug (FirstMugID+493) + #define KentMug (FirstMugID+494) #endif setMugEntry(KentMug, KentMugData, 2, 5, 3, 3) ALIGN 4 LegaultMugData: -#incbin "Dmp/Legault_mug.dmp" -#incbin "Dmp/Legault_frames.dmp" -#incbin "Dmp/Legault_palette.dmp" -#incbin "Dmp/Legault_minimug.dmp" +#incbin "png/FE7/Legault_mug.dmp" +#incbin "png/FE7/Legault_frames.dmp" +#incbin "png/FE7/Legault_palette.dmp" +#incbin "png/FE7/Legault_minimug.dmp" #ifndef LegaultMug - #define LegaultMug (FirstMugID+494) + #define LegaultMug (FirstMugID+495) #endif setMugEntry(LegaultMug, LegaultMugData, 2, 4, 3, 2) ALIGN 4 LeilaMugData: -#incbin "Dmp/Leila_mug.dmp" -#incbin "Dmp/Leila_frames.dmp" -#incbin "Dmp/Leila_palette.dmp" -#incbin "Dmp/Leila_minimug.dmp" +#incbin "png/FE7/Leila_mug.dmp" +#incbin "png/FE7/Leila_frames.dmp" +#incbin "png/FE7/Leila_palette.dmp" +#incbin "png/FE7/Leila_minimug.dmp" #ifndef LeilaMug - #define LeilaMug (FirstMugID+495) + #define LeilaMug (FirstMugID+496) #endif setMugEntry(LeilaMug, LeilaMugData, 2, 6, 3, 4) ALIGN 4 LouiseMugData: -#incbin "Dmp/Louise_mug.dmp" -#incbin "Dmp/Louise_frames.dmp" -#incbin "Dmp/Louise_palette.dmp" -#incbin "Dmp/Louise_minimug.dmp" +#incbin "png/FE7/Louise_mug.dmp" +#incbin "png/FE7/Louise_frames.dmp" +#incbin "png/FE7/Louise_palette.dmp" +#incbin "png/FE7/Louise_minimug.dmp" #ifndef LouiseMug - #define LouiseMug (FirstMugID+496) + #define LouiseMug (FirstMugID+497) #endif setMugEntry(LouiseMug, LouiseMugData, 2, 6, 3, 4) ALIGN 4 LowenMugData: -#incbin "Dmp/Lowen_mug.dmp" -#incbin "Dmp/Lowen_frames.dmp" -#incbin "Dmp/Lowen_palette.dmp" -#incbin "Dmp/Lowen_minimug.dmp" +#incbin "png/FE7/Lowen_mug.dmp" +#incbin "png/FE7/Lowen_frames.dmp" +#incbin "png/FE7/Lowen_palette.dmp" +#incbin "png/FE7/Lowen_minimug.dmp" #ifndef LowenMug - #define LowenMug (FirstMugID+497) + #define LowenMug (FirstMugID+498) #endif setMugEntry(LowenMug, LowenMugData, 2, 5, 3, 3) ALIGN 4 LuciusMugData: -#incbin "Dmp/Lucius_mug.dmp" -#incbin "Dmp/Lucius_frames.dmp" -#incbin "Dmp/Lucius_palette.dmp" -#incbin "Dmp/Lucius_minimug.dmp" +#incbin "png/FE7/Lucius_mug.dmp" +#incbin "png/FE7/Lucius_frames.dmp" +#incbin "png/FE7/Lucius_palette.dmp" +#incbin "png/FE7/Lucius_minimug.dmp" #ifndef LuciusMug - #define LuciusMug (FirstMugID+498) + #define LuciusMug (FirstMugID+499) #endif setMugEntry(LuciusMug, LuciusMugData, 2, 5, 3, 3) ALIGN 4 LynMugData: -#incbin "Dmp/Lyn_mug.dmp" -#incbin "Dmp/Lyn_frames.dmp" -#incbin "Dmp/Lyn_palette.dmp" -#incbin "Dmp/Lyn_minimug.dmp" +#incbin "png/FE7/Lyn_mug.dmp" +#incbin "png/FE7/Lyn_frames.dmp" +#incbin "png/FE7/Lyn_palette.dmp" +#incbin "png/FE7/Lyn_minimug.dmp" #ifndef LynMug - #define LynMug (FirstMugID+499) + #define LynMug (FirstMugID+500) #endif setMugEntry(LynMug, LynMugData, 2, 6, 3, 4) ALIGN 4 Marcus2MugData: -#incbin "Dmp/Marcus2_mug.dmp" -#incbin "Dmp/Marcus2_frames.dmp" -#incbin "Dmp/Marcus2_palette.dmp" -#incbin "Dmp/Marcus2_minimug.dmp" +#incbin "png/FE7/Marcus2_mug.dmp" +#incbin "png/FE7/Marcus2_frames.dmp" +#incbin "png/FE7/Marcus2_palette.dmp" +#incbin "png/FE7/Marcus2_minimug.dmp" #ifndef Marcus2Mug - #define Marcus2Mug (FirstMugID+500) + #define Marcus2Mug (FirstMugID+501) #endif setMugEntry(Marcus2Mug, Marcus2MugData, 2, 5, 3, 3) ALIGN 4 MatthewMugData: -#incbin "Dmp/Matthew_mug.dmp" -#incbin "Dmp/Matthew_frames.dmp" -#incbin "Dmp/Matthew_palette.dmp" -#incbin "Dmp/Matthew_minimug.dmp" +#incbin "png/FE7/Matthew_mug.dmp" +#incbin "png/FE7/Matthew_frames.dmp" +#incbin "png/FE7/Matthew_palette.dmp" +#incbin "png/FE7/Matthew_minimug.dmp" #ifndef MatthewMug - #define MatthewMug (FirstMugID+501) + #define MatthewMug (FirstMugID+502) #endif setMugEntry(MatthewMug, MatthewMugData, 2, 5, 3, 3) ALIGN 4 Merlinus2MugData: -#incbin "Dmp/Merlinus2_mug.dmp" -#incbin "Dmp/Merlinus2_frames.dmp" -#incbin "Dmp/Merlinus2_palette.dmp" -#incbin "Dmp/Merlinus2_minimug.dmp" +#incbin "png/FE7/Merlinus2_mug.dmp" +#incbin "png/FE7/Merlinus2_frames.dmp" +#incbin "png/FE7/Merlinus2_palette.dmp" +#incbin "png/FE7/Merlinus2_minimug.dmp" #ifndef Merlinus2Mug - #define Merlinus2Mug (FirstMugID+502) + #define Merlinus2Mug (FirstMugID+503) #endif setMugEntry(Merlinus2Mug, Merlinus2MugData, 2, 5, 2, 3) ALIGN 4 NatalieMugData: -#incbin "Dmp/Natalie_mug.dmp" -#incbin "Dmp/Natalie_frames.dmp" -#incbin "Dmp/Natalie_palette.dmp" -#incbin "Dmp/Natalie_minimug.dmp" +#incbin "png/FE7/Natalie_mug.dmp" +#incbin "png/FE7/Natalie_frames.dmp" +#incbin "png/FE7/Natalie_palette.dmp" +#incbin "png/FE7/Natalie_minimug.dmp" #ifndef NatalieMug - #define NatalieMug (FirstMugID+503) + #define NatalieMug (FirstMugID+504) #endif setMugEntry(NatalieMug, NatalieMugData, 2, 6, 3, 4) ALIGN 4 NergalMugData: -#incbin "Dmp/Nergal_mug.dmp" -#incbin "Dmp/Nergal_frames.dmp" -#incbin "Dmp/Nergal_palette.dmp" -#incbin "Dmp/Nergal_minimug.dmp" +#incbin "png/FE7/Nergal_mug.dmp" +#incbin "png/FE7/Nergal_frames.dmp" +#incbin "png/FE7/Nergal_palette.dmp" +#incbin "png/FE7/Nergal_minimug.dmp" #ifndef NergalMug - #define NergalMug (FirstMugID+504) + #define NergalMug (FirstMugID+505) #endif setMugEntry(NergalMug, NergalMugData, 3, 4, 3, 2) ALIGN 4 NilsMugData: -#incbin "Dmp/Nils_mug.dmp" -#incbin "Dmp/Nils_frames.dmp" -#incbin "Dmp/Nils_palette.dmp" -#incbin "Dmp/Nils_minimug.dmp" +#incbin "png/FE7/Nils_mug.dmp" +#incbin "png/FE7/Nils_frames.dmp" +#incbin "png/FE7/Nils_palette.dmp" +#incbin "png/FE7/Nils_minimug.dmp" #ifndef NilsMug - #define NilsMug (FirstMugID+505) + #define NilsMug (FirstMugID+506) #endif setMugEntry(NilsMug, NilsMugData, 2, 7, 3, 5) ALIGN 4 NinianMugData: -#incbin "Dmp/Ninian_mug.dmp" -#incbin "Dmp/Ninian_frames.dmp" -#incbin "Dmp/Ninian_palette.dmp" -#incbin "Dmp/Ninian_minimug.dmp" +#incbin "png/FE7/Ninian_mug.dmp" +#incbin "png/FE7/Ninian_frames.dmp" +#incbin "png/FE7/Ninian_palette.dmp" +#incbin "png/FE7/Ninian_minimug.dmp" #ifndef NinianMug - #define NinianMug (FirstMugID+506) + #define NinianMug (FirstMugID+507) #endif setMugEntry(NinianMug, NinianMugData, 3, 6, 4, 4) ALIGN 4 NinoMugData: -#incbin "Dmp/Nino_mug.dmp" -#incbin "Dmp/Nino_frames.dmp" -#incbin "Dmp/Nino_palette.dmp" -#incbin "Dmp/Nino_minimug.dmp" +#incbin "png/FE7/Nino_mug.dmp" +#incbin "png/FE7/Nino_frames.dmp" +#incbin "png/FE7/Nino_palette.dmp" +#incbin "png/FE7/Nino_minimug.dmp" #ifndef NinoMug - #define NinoMug (FirstMugID+507) + #define NinoMug (FirstMugID+508) #endif setMugEntry(NinoMug, NinoMugData, 2, 6, 3, 4) ALIGN 4 OswinMugData: -#incbin "Dmp/Oswin_mug.dmp" -#incbin "Dmp/Oswin_frames.dmp" -#incbin "Dmp/Oswin_palette.dmp" -#incbin "Dmp/Oswin_minimug.dmp" +#incbin "png/FE7/Oswin_mug.dmp" +#incbin "png/FE7/Oswin_frames.dmp" +#incbin "png/FE7/Oswin_palette.dmp" +#incbin "png/FE7/Oswin_minimug.dmp" #ifndef OswinMug - #define OswinMug (FirstMugID+508) + #define OswinMug (FirstMugID+509) #endif setMugEntry(OswinMug, OswinMugData, 2, 4, 3, 2) ALIGN 4 PentMugData: -#incbin "Dmp/Pent_mug.dmp" -#incbin "Dmp/Pent_frames.dmp" -#incbin "Dmp/Pent_palette.dmp" -#incbin "Dmp/Pent_minimug.dmp" +#incbin "png/FE7/Pent_mug.dmp" +#incbin "png/FE7/Pent_frames.dmp" +#incbin "png/FE7/Pent_palette.dmp" +#incbin "png/FE7/Pent_minimug.dmp" #ifndef PentMug - #define PentMug (FirstMugID+509) + #define PentMug (FirstMugID+510) #endif setMugEntry(PentMug, PentMugData, 3, 5, 4, 3) ALIGN 4 PriscillaMugData: -#incbin "Dmp/Priscilla_mug.dmp" -#incbin "Dmp/Priscilla_frames.dmp" -#incbin "Dmp/Priscilla_palette.dmp" -#incbin "Dmp/Priscilla_minimug.dmp" +#incbin "png/FE7/Priscilla_mug.dmp" +#incbin "png/FE7/Priscilla_frames.dmp" +#incbin "png/FE7/Priscilla_palette.dmp" +#incbin "png/FE7/Priscilla_minimug.dmp" #ifndef PriscillaMug - #define PriscillaMug (FirstMugID+510) + #define PriscillaMug (FirstMugID+511) #endif setMugEntry(PriscillaMug, PriscillaMugData, 2, 6, 3, 4) ALIGN 4 RathMugData: -#incbin "Dmp/Rath_mug.dmp" -#incbin "Dmp/Rath_frames.dmp" -#incbin "Dmp/Rath_palette.dmp" -#incbin "Dmp/Rath_minimug.dmp" +#incbin "png/FE7/Rath_mug.dmp" +#incbin "png/FE7/Rath_frames.dmp" +#incbin "png/FE7/Rath_palette.dmp" +#incbin "png/FE7/Rath_minimug.dmp" #ifndef RathMug - #define RathMug (FirstMugID+511) + #define RathMug (FirstMugID+513) #endif setMugEntry(RathMug, RathMugData, 2, 5, 3, 3) ALIGN 4 RavenMugData: -#incbin "Dmp/Raven_mug.dmp" -#incbin "Dmp/Raven_frames.dmp" -#incbin "Dmp/Raven_palette.dmp" -#incbin "Dmp/Raven_minimug.dmp" +#incbin "png/FE7/Raven_mug.dmp" +#incbin "png/FE7/Raven_frames.dmp" +#incbin "png/FE7/Raven_palette.dmp" +#incbin "png/FE7/Raven_minimug.dmp" #ifndef RavenMug - #define RavenMug (FirstMugID+513) + #define RavenMug (FirstMugID+514) #endif setMugEntry(RavenMug, RavenMugData, 2, 5, 3, 3) ALIGN 4 RebeccaMugData: -#incbin "Dmp/Rebecca_mug.dmp" -#incbin "Dmp/Rebecca_frames.dmp" -#incbin "Dmp/Rebecca_palette.dmp" -#incbin "Dmp/Rebecca_minimug.dmp" +#incbin "png/FE7/Rebecca_mug.dmp" +#incbin "png/FE7/Rebecca_frames.dmp" +#incbin "png/FE7/Rebecca_palette.dmp" +#incbin "png/FE7/Rebecca_minimug.dmp" #ifndef RebeccaMug - #define RebeccaMug (FirstMugID+514) + #define RebeccaMug (FirstMugID+515) #endif setMugEntry(RebeccaMug, RebeccaMugData, 2, 6, 3, 4) ALIGN 4 RenaultMugData: -#incbin "Dmp/Renault_mug.dmp" -#incbin "Dmp/Renault_frames.dmp" -#incbin "Dmp/Renault_palette.dmp" -#incbin "Dmp/Renault_minimug.dmp" +#incbin "png/FE7/Renault_mug.dmp" +#incbin "png/FE7/Renault_frames.dmp" +#incbin "png/FE7/Renault_palette.dmp" +#incbin "png/FE7/Renault_minimug.dmp" #ifndef RenaultMug - #define RenaultMug (FirstMugID+515) + #define RenaultMug (FirstMugID+516) #endif setMugEntry(RenaultMug, RenaultMugData, 2, 5, 3, 3) ALIGN 4 SainMugData: -#incbin "Dmp/Sain_mug.dmp" -#incbin "Dmp/Sain_frames.dmp" -#incbin "Dmp/Sain_palette.dmp" -#incbin "Dmp/Sain_minimug.dmp" +#incbin "png/FE7/Sain_mug.dmp" +#incbin "png/FE7/Sain_frames.dmp" +#incbin "png/FE7/Sain_palette.dmp" +#incbin "png/FE7/Sain_minimug.dmp" #ifndef SainMug - #define SainMug (FirstMugID+516) + #define SainMug (FirstMugID+517) #endif setMugEntry(SainMug, SainMugData, 2, 5, 3, 3) ALIGN 4 SerraMugData: -#incbin "Dmp/Serra_mug.dmp" -#incbin "Dmp/Serra_frames.dmp" -#incbin "Dmp/Serra_palette.dmp" -#incbin "Dmp/Serra_minimug.dmp" +#incbin "png/FE7/Serra_mug.dmp" +#incbin "png/FE7/Serra_frames.dmp" +#incbin "png/FE7/Serra_palette.dmp" +#incbin "png/FE7/Serra_minimug.dmp" #ifndef SerraMug - #define SerraMug (FirstMugID+517) + #define SerraMug (FirstMugID+518) #endif setMugEntry(SerraMug, SerraMugData, 2, 6, 3, 4) ALIGN 4 UtherMugData: -#incbin "Dmp/Uther_mug.dmp" -#incbin "Dmp/Uther_frames.dmp" -#incbin "Dmp/Uther_palette.dmp" -#incbin "Dmp/Uther_minimug.dmp" +#incbin "png/FE7/Uther_mug.dmp" +#incbin "png/FE7/Uther_frames.dmp" +#incbin "png/FE7/Uther_palette.dmp" +#incbin "png/FE7/Uther_minimug.dmp" #ifndef UtherMug - #define UtherMug (FirstMugID+518) + #define UtherMug (FirstMugID+519) #endif setMugEntry(UtherMug, UtherMugData, 3, 4, 4, 2) ALIGN 4 VaidaMugData: -#incbin "Dmp/Vaida_mug.dmp" -#incbin "Dmp/Vaida_frames.dmp" -#incbin "Dmp/Vaida_palette.dmp" -#incbin "Dmp/Vaida_minimug.dmp" +#incbin "png/FE7/Vaida_mug.dmp" +#incbin "png/FE7/Vaida_frames.dmp" +#incbin "png/FE7/Vaida_palette.dmp" +#incbin "png/FE7/Vaida_minimug.dmp" #ifndef VaidaMug - #define VaidaMug (FirstMugID+519) + #define VaidaMug (FirstMugID+520) #endif setMugEntry(VaidaMug, VaidaMugData, 2, 5, 3, 3) ALIGN 4 VillagerMugData: -#incbin "Dmp/Villager_mug.dmp" -#incbin "Dmp/Villager_frames.dmp" -#incbin "Dmp/Villager_palette.dmp" -#incbin "Dmp/Villager_minimug.dmp" +#incbin "png/FE7/Villager_mug.dmp" +#incbin "png/FE7/Villager_frames.dmp" +#incbin "png/FE7/Villager_palette.dmp" +#incbin "png/FE7/Villager_minimug.dmp" #ifndef VillagerMug - #define VillagerMug (FirstMugID+520) + #define VillagerMug (FirstMugID+521) #endif setMugEntry(VillagerMug, VillagerMugData, 2, 6, 3, 4) ALIGN 4 WallaceMugData: -#incbin "Dmp/Wallace_mug.dmp" -#incbin "Dmp/Wallace_frames.dmp" -#incbin "Dmp/Wallace_palette.dmp" -#incbin "Dmp/Wallace_minimug.dmp" +#incbin "png/FE7/Wallace_mug.dmp" +#incbin "png/FE7/Wallace_frames.dmp" +#incbin "png/FE7/Wallace_palette.dmp" +#incbin "png/FE7/Wallace_minimug.dmp" #ifndef WallaceMug - #define WallaceMug (FirstMugID+521) + #define WallaceMug (FirstMugID+522) #endif setMugEntry(WallaceMug, WallaceMugData, 2, 4, 2, 2) ALIGN 4 WilMugData: -#incbin "Dmp/Wil_mug.dmp" -#incbin "Dmp/Wil_frames.dmp" -#incbin "Dmp/Wil_palette.dmp" -#incbin "Dmp/Wil_minimug.dmp" +#incbin "png/FE7/Wil_mug.dmp" +#incbin "png/FE7/Wil_frames.dmp" +#incbin "png/FE7/Wil_palette.dmp" +#incbin "png/FE7/Wil_minimug.dmp" #ifndef WilMug - #define WilMug (FirstMugID+522) + #define WilMug (FirstMugID+523) #endif setMugEntry(WilMug, WilMugData, 2, 5, 3, 3) ALIGN 4 -Zephiel_KidMugData: -#incbin "Dmp/Zephiel_Kid_mug.dmp" -#incbin "Dmp/Zephiel_Kid_frames.dmp" -#incbin "Dmp/Zephiel_Kid_palette.dmp" -#incbin "Dmp/Zephiel_Kid_minimug.dmp" -#ifndef ZephielMug - #define ZephielMug (FirstMugID+523) +ZephielFE7MugData: +#incbin "png/FE7/ZephielFE7_mug.dmp" +#incbin "png/FE7/ZephielFE7_frames.dmp" +#incbin "png/FE7/ZephielFE7_palette.dmp" +#incbin "png/FE7/ZephielFE7_minimug.dmp" +#ifndef ZephielFE7Mug + #define ZephielFE7Mug (FirstMugID+524) #endif -setMugEntry(ZephielMug, Zephiel_KidMugData, 2, 6, 3, 4) +setMugEntry(ZephielFE7Mug, ZephielFE7MugData, 2, 6, 3, 4) ALIGN 4 AmeliaMugData: -#incbin "Dmp/Amelia_mug.dmp" -#incbin "Dmp/Amelia_frames.dmp" -#incbin "Dmp/Amelia_palette.dmp" -#incbin "Dmp/Amelia_minimug.dmp" +#incbin "png/FE8/Amelia_mug.dmp" +#incbin "png/FE8/Amelia_frames.dmp" +#incbin "png/FE8/Amelia_palette.dmp" +#incbin "png/FE8/Amelia_minimug.dmp" #ifndef AmeliaMug - #define AmeliaMug (FirstMugID+524) + #define AmeliaMug (FirstMugID+525) #endif setMugEntry(AmeliaMug, AmeliaMugData, 2, 6, 3, 4) ALIGN 4 ArturMugData: -#incbin "Dmp/Artur_mug.dmp" -#incbin "Dmp/Artur_frames.dmp" -#incbin "Dmp/Artur_palette.dmp" -#incbin "Dmp/Artur_minimug.dmp" +#incbin "png/FE8/Artur_mug.dmp" +#incbin "png/FE8/Artur_frames.dmp" +#incbin "png/FE8/Artur_palette.dmp" +#incbin "png/FE8/Artur_minimug.dmp" #ifndef ArturMug - #define ArturMug (FirstMugID+525) + #define ArturMug (FirstMugID+526) #endif setMugEntry(ArturMug, ArturMugData, 2, 5, 3, 3) ALIGN 4 CaellachMugData: -#incbin "Dmp/Caellach_mug.dmp" -#incbin "Dmp/Caellach_frames.dmp" -#incbin "Dmp/Caellach_palette.dmp" -#incbin "Dmp/Caellach_minimug.dmp" +#incbin "png/FE8/Caellach_mug.dmp" +#incbin "png/FE8/Caellach_frames.dmp" +#incbin "png/FE8/Caellach_palette.dmp" +#incbin "png/FE8/Caellach_minimug.dmp" #ifndef CaellachMug - #define CaellachMug (FirstMugID+526) + #define CaellachMug (FirstMugID+527) #endif setMugEntry(CaellachMug, CaellachMugData, 2, 5, 3, 3) ALIGN 4 ColmMugData: -#incbin "Dmp/Colm_mug.dmp" -#incbin "Dmp/Colm_frames.dmp" -#incbin "Dmp/Colm_palette.dmp" -#incbin "Dmp/Colm_minimug.dmp" +#incbin "png/FE8/Colm_mug.dmp" +#incbin "png/FE8/Colm_frames.dmp" +#incbin "png/FE8/Colm_palette.dmp" +#incbin "png/FE8/Colm_minimug.dmp" #ifndef ColmMug - #define ColmMug (FirstMugID+527) + #define ColmMug (FirstMugID+528) #endif setMugEntry(ColmMug, ColmMugData, 3, 5, 3, 3) ALIGN 4 CormagMugData: -#incbin "Dmp/Cormag_mug.dmp" -#incbin "Dmp/Cormag_frames.dmp" -#incbin "Dmp/Cormag_palette.dmp" -#incbin "Dmp/Cormag_minimug.dmp" +#incbin "png/FE8/Cormag_mug.dmp" +#incbin "png/FE8/Cormag_frames.dmp" +#incbin "png/FE8/Cormag_palette.dmp" +#incbin "png/FE8/Cormag_minimug.dmp" #ifndef CormagMug - #define CormagMug (FirstMugID+528) + #define CormagMug (FirstMugID+529) #endif setMugEntry(CormagMug, CormagMugData, 2, 5, 3, 3) ALIGN 4 DozlaMugData: -#incbin "Dmp/Dozla_mug.dmp" -#incbin "Dmp/Dozla_frames.dmp" -#incbin "Dmp/Dozla_palette.dmp" -#incbin "Dmp/Dozla_minimug.dmp" +#incbin "png/FE8/Dozla_mug.dmp" +#incbin "png/FE8/Dozla_frames.dmp" +#incbin "png/FE8/Dozla_palette.dmp" +#incbin "png/FE8/Dozla_minimug.dmp" #ifndef DozlaMug - #define DozlaMug (FirstMugID+529) + #define DozlaMug (FirstMugID+530) #endif setMugEntry(DozlaMug, DozlaMugData, 2, 6, 3, 4) ALIGN 4 DuesselMugData: -#incbin "Dmp/Duessel_mug.dmp" -#incbin "Dmp/Duessel_frames.dmp" -#incbin "Dmp/Duessel_palette.dmp" -#incbin "Dmp/Duessel_minimug.dmp" +#incbin "png/FE8/Duessel_mug.dmp" +#incbin "png/FE8/Duessel_frames.dmp" +#incbin "png/FE8/Duessel_palette.dmp" +#incbin "png/FE8/Duessel_minimug.dmp" #ifndef DuesselMug - #define DuesselMug (FirstMugID+530) + #define DuesselMug (FirstMugID+531) #endif setMugEntry(DuesselMug, DuesselMugData, 2, 5, 3, 3) ALIGN 4 EirikaMugData: -#incbin "Dmp/Eirika_mug.dmp" -#incbin "Dmp/Eirika_frames.dmp" -#incbin "Dmp/Eirika_palette.dmp" -#incbin "Dmp/Eirika_minimug.dmp" +#incbin "png/FE8/Eirika_mug.dmp" +#incbin "png/FE8/Eirika_frames.dmp" +#incbin "png/FE8/Eirika_palette.dmp" +#incbin "png/FE8/Eirika_minimug.dmp" #ifndef EirikaMug - #define EirikaMug (FirstMugID+531) + #define EirikaMug (FirstMugID+532) #endif setMugEntry(EirikaMug, EirikaMugData, 2, 6, 3, 4) ALIGN 4 EphraimMugData: -#incbin "Dmp/Ephraim_mug.dmp" -#incbin "Dmp/Ephraim_frames.dmp" -#incbin "Dmp/Ephraim_palette.dmp" -#incbin "Dmp/Ephraim_minimug.dmp" +#incbin "png/FE8/Ephraim_mug.dmp" +#incbin "png/FE8/Ephraim_frames.dmp" +#incbin "png/FE8/Ephraim_palette.dmp" +#incbin "png/FE8/Ephraim_minimug.dmp" #ifndef EphraimMug - #define EphraimMug (FirstMugID+532) + #define EphraimMug (FirstMugID+533) #endif setMugEntry(EphraimMug, EphraimMugData, 2, 5, 3, 3) ALIGN 4 EwanMugData: -#incbin "Dmp/Ewan_mug.dmp" -#incbin "Dmp/Ewan_frames.dmp" -#incbin "Dmp/Ewan_palette.dmp" -#incbin "Dmp/Ewan_minimug.dmp" +#incbin "png/FE8/Ewan_mug.dmp" +#incbin "png/FE8/Ewan_frames.dmp" +#incbin "png/FE8/Ewan_palette.dmp" +#incbin "png/FE8/Ewan_minimug.dmp" #ifndef EwanMug - #define EwanMug (FirstMugID+533) + #define EwanMug (FirstMugID+534) #endif setMugEntry(EwanMug, EwanMugData, 3, 7, 3, 5) ALIGN 4 FadoMugData: -#incbin "Dmp/Fado_mug.dmp" -#incbin "Dmp/Fado_frames.dmp" -#incbin "Dmp/Fado_palette.dmp" -#incbin "Dmp/Fado_minimug.dmp" +#incbin "png/FE8/Fado_mug.dmp" +#incbin "png/FE8/Fado_frames.dmp" +#incbin "png/FE8/Fado_palette.dmp" +#incbin "png/FE8/Fado_minimug.dmp" #ifndef FadoMug - #define FadoMug (FirstMugID+534) + #define FadoMug (FirstMugID+535) #endif setMugEntry(FadoMug, FadoMugData, 2, 5, 3, 3) ALIGN 4 FordeMugData: -#incbin "Dmp/Forde_mug.dmp" -#incbin "Dmp/Forde_frames.dmp" -#incbin "Dmp/Forde_palette.dmp" -#incbin "Dmp/Forde_minimug.dmp" +#incbin "png/FE8/Forde_mug.dmp" +#incbin "png/FE8/Forde_frames.dmp" +#incbin "png/FE8/Forde_palette.dmp" +#incbin "png/FE8/Forde_minimug.dmp" #ifndef FordeMug - #define FordeMug (FirstMugID+535) + #define FordeMug (FirstMugID+536) #endif setMugEntry(FordeMug, FordeMugData, 2, 5, 3, 3) ALIGN 4 FranzMugData: -#incbin "Dmp/Franz_mug.dmp" -#incbin "Dmp/Franz_frames.dmp" -#incbin "Dmp/Franz_palette.dmp" -#incbin "Dmp/Franz_minimug.dmp" +#incbin "png/FE8/Franz_mug.dmp" +#incbin "png/FE8/Franz_frames.dmp" +#incbin "png/FE8/Franz_palette.dmp" +#incbin "png/FE8/Franz_minimug.dmp" #ifndef FranzMug - #define FranzMug (FirstMugID+536) + #define FranzMug (FirstMugID+537) #endif setMugEntry(FranzMug, FranzMugData, 2, 6, 3, 4) ALIGN 4 GarciaMugData: -#incbin "Dmp/Garcia_mug.dmp" -#incbin "Dmp/Garcia_frames.dmp" -#incbin "Dmp/Garcia_palette.dmp" -#incbin "Dmp/Garcia_minimug.dmp" +#incbin "png/FE8/Garcia_mug.dmp" +#incbin "png/FE8/Garcia_frames.dmp" +#incbin "png/FE8/Garcia_palette.dmp" +#incbin "png/FE8/Garcia_minimug.dmp" #ifndef GarciaMug - #define GarciaMug (FirstMugID+537) + #define GarciaMug (FirstMugID+538) #endif setMugEntry(GarciaMug, GarciaMugData, 2, 5, 3, 3) ALIGN 4 GerikMugData: -#incbin "Dmp/Gerik_mug.dmp" -#incbin "Dmp/Gerik_frames.dmp" -#incbin "Dmp/Gerik_palette.dmp" -#incbin "Dmp/Gerik_minimug.dmp" +#incbin "png/FE8/Gerik_mug.dmp" +#incbin "png/FE8/Gerik_frames.dmp" +#incbin "png/FE8/Gerik_palette.dmp" +#incbin "png/FE8/Gerik_minimug.dmp" #ifndef GerikMug - #define GerikMug (FirstMugID+538) + #define GerikMug (FirstMugID+539) #endif setMugEntry(GerikMug, GerikMugData, 2, 4, 3, 2) ALIGN 4 GilliamMugData: -#incbin "Dmp/Gilliam_mug.dmp" -#incbin "Dmp/Gilliam_frames.dmp" -#incbin "Dmp/Gilliam_palette.dmp" -#incbin "Dmp/Gilliam_minimug.dmp" +#incbin "png/FE8/Gilliam_mug.dmp" +#incbin "png/FE8/Gilliam_frames.dmp" +#incbin "png/FE8/Gilliam_palette.dmp" +#incbin "png/FE8/Gilliam_minimug.dmp" #ifndef GilliamMug - #define GilliamMug (FirstMugID+539) + #define GilliamMug (FirstMugID+540) #endif setMugEntry(GilliamMug, GilliamMugData, 2, 5, 3, 3) ALIGN 4 GlenMugData: -#incbin "Dmp/Glen_mug.dmp" -#incbin "Dmp/Glen_frames.dmp" -#incbin "Dmp/Glen_palette.dmp" -#incbin "Dmp/Glen_minimug.dmp" +#incbin "png/FE8/Glen_mug.dmp" +#incbin "png/FE8/Glen_frames.dmp" +#incbin "png/FE8/Glen_palette.dmp" +#incbin "png/FE8/Glen_minimug.dmp" #ifndef GlenMug - #define GlenMug (FirstMugID+540) + #define GlenMug (FirstMugID+541) #endif setMugEntry(GlenMug, GlenMugData, 2, 5, 3, 3) ALIGN 4 HaydenMugData: -#incbin "Dmp/Hayden_mug.dmp" -#incbin "Dmp/Hayden_frames.dmp" -#incbin "Dmp/Hayden_palette.dmp" -#incbin "Dmp/Hayden_minimug.dmp" +#incbin "png/FE8/Hayden_mug.dmp" +#incbin "png/FE8/Hayden_frames.dmp" +#incbin "png/FE8/Hayden_palette.dmp" +#incbin "png/FE8/Hayden_minimug.dmp" #ifndef HaydenMug - #define HaydenMug (FirstMugID+541) + #define HaydenMug (FirstMugID+542) #endif setMugEntry(HaydenMug, HaydenMugData, 2, 5, 3, 3) ALIGN 4 InnesMugData: -#incbin "Dmp/Innes_mug.dmp" -#incbin "Dmp/Innes_frames.dmp" -#incbin "Dmp/Innes_palette.dmp" -#incbin "Dmp/Innes_minimug.dmp" +#incbin "png/FE8/Innes_mug.dmp" +#incbin "png/FE8/Innes_frames.dmp" +#incbin "png/FE8/Innes_palette.dmp" +#incbin "png/FE8/Innes_minimug.dmp" #ifndef InnesMug - #define InnesMug (FirstMugID+542) + #define InnesMug (FirstMugID+543) #endif setMugEntry(InnesMug, InnesMugData, 2, 5, 3, 3) ALIGN 4 IsmaireMugData: -#incbin "Dmp/Ismaire_mug.dmp" -#incbin "Dmp/Ismaire_frames.dmp" -#incbin "Dmp/Ismaire_palette.dmp" -#incbin "Dmp/Ismaire_minimug.dmp" +#incbin "png/FE8/Ismaire_mug.dmp" +#incbin "png/FE8/Ismaire_frames.dmp" +#incbin "png/FE8/Ismaire_palette.dmp" +#incbin "png/FE8/Ismaire_minimug.dmp" #ifndef IsmaireMug - #define IsmaireMug (FirstMugID+543) + #define IsmaireMug (FirstMugID+544) #endif setMugEntry(IsmaireMug, IsmaireMugData, 2, 6, 3, 4) ALIGN 4 JoshuaMugData: -#incbin "Dmp/Joshua_mug.dmp" -#incbin "Dmp/Joshua_frames.dmp" -#incbin "Dmp/Joshua_palette.dmp" -#incbin "Dmp/Joshua_minimug.dmp" +#incbin "png/FE8/Joshua_mug.dmp" +#incbin "png/FE8/Joshua_frames.dmp" +#incbin "png/FE8/Joshua_palette.dmp" +#incbin "png/FE8/Joshua_minimug.dmp" #ifndef JoshuaMug - #define JoshuaMug (FirstMugID+544) + #define JoshuaMug (FirstMugID+545) #endif setMugEntry(JoshuaMug, JoshuaMugData, 2, 5, 3, 3) ALIGN 4 KnollMugData: -#incbin "Dmp/Knoll_mug.dmp" -#incbin "Dmp/Knoll_frames.dmp" -#incbin "Dmp/Knoll_palette.dmp" -#incbin "Dmp/Knoll_minimug.dmp" +#incbin "png/FE8/Knoll_mug.dmp" +#incbin "png/FE8/Knoll_frames.dmp" +#incbin "png/FE8/Knoll_palette.dmp" +#incbin "png/FE8/Knoll_minimug.dmp" #ifndef KnollMug - #define KnollMug (FirstMugID+545) + #define KnollMug (FirstMugID+546) #endif setMugEntry(KnollMug, KnollMugData, 2, 5, 3, 3) ALIGN 4 KyleMugData: -#incbin "Dmp/Kyle_mug.dmp" -#incbin "Dmp/Kyle_frames.dmp" -#incbin "Dmp/Kyle_palette.dmp" -#incbin "Dmp/Kyle_minimug.dmp" +#incbin "png/FE8/Kyle_mug.dmp" +#incbin "png/FE8/Kyle_frames.dmp" +#incbin "png/FE8/Kyle_palette.dmp" +#incbin "png/FE8/Kyle_minimug.dmp" #ifndef KyleMug - #define KyleMug (FirstMugID+546) + #define KyleMug (FirstMugID+547) #endif setMugEntry(KyleMug, KyleMugData, 2, 5, 3, 3) ALIGN 4 LarachelMugData: -#incbin "Dmp/Larachel_mug.dmp" -#incbin "Dmp/Larachel_frames.dmp" -#incbin "Dmp/Larachel_palette.dmp" -#incbin "Dmp/Larachel_minimug.dmp" +#incbin "png/FE8/Larachel_mug.dmp" +#incbin "png/FE8/Larachel_frames.dmp" +#incbin "png/FE8/Larachel_palette.dmp" +#incbin "png/FE8/Larachel_minimug.dmp" #ifndef LarachelMug - #define LarachelMug (FirstMugID+547) + #define LarachelMug (FirstMugID+548) #endif setMugEntry(LarachelMug, LarachelMugData, 2, 6, 3, 4) ALIGN 4 LuteMugData: -#incbin "Dmp/Lute_mug.dmp" -#incbin "Dmp/Lute_frames.dmp" -#incbin "Dmp/Lute_palette.dmp" -#incbin "Dmp/Lute_minimug.dmp" +#incbin "png/FE8/Lute_mug.dmp" +#incbin "png/FE8/Lute_frames.dmp" +#incbin "png/FE8/Lute_palette.dmp" +#incbin "png/FE8/Lute_minimug.dmp" #ifndef LuteMug - #define LuteMug (FirstMugID+548) + #define LuteMug (FirstMugID+549) #endif setMugEntry(LuteMug, LuteMugData, 2, 6, 3, 4) ALIGN 4 LyonMugData: -#incbin "Dmp/Lyon_mug.dmp" -#incbin "Dmp/Lyon_frames.dmp" -#incbin "Dmp/Lyon_palette.dmp" -#incbin "Dmp/Lyon_minimug.dmp" +#incbin "png/FE8/Lyon_mug.dmp" +#incbin "png/FE8/Lyon_frames.dmp" +#incbin "png/FE8/Lyon_palette.dmp" +#incbin "png/FE8/Lyon_minimug.dmp" #ifndef LyonMug - #define LyonMug (FirstMugID+549) + #define LyonMug (FirstMugID+550) #endif setMugEntry(LyonMug, LyonMugData, 2, 5, 3, 3) ALIGN 4 MarisaMugData: -#incbin "Dmp/Marisa_mug.dmp" -#incbin "Dmp/Marisa_frames.dmp" -#incbin "Dmp/Marisa_palette.dmp" -#incbin "Dmp/Marisa_minimug.dmp" +#incbin "png/FE8/Marisa_mug.dmp" +#incbin "png/FE8/Marisa_frames.dmp" +#incbin "png/FE8/Marisa_palette.dmp" +#incbin "png/FE8/Marisa_minimug.dmp" #ifndef MarisaMug - #define MarisaMug (FirstMugID+550) + #define MarisaMug (FirstMugID+551) #endif setMugEntry(MarisaMug, MarisaMugData, 2, 6, 3, 4) ALIGN 4 MoulderMugData: -#incbin "Dmp/Moulder_mug.dmp" -#incbin "Dmp/Moulder_frames.dmp" -#incbin "Dmp/Moulder_palette.dmp" -#incbin "Dmp/Moulder_minimug.dmp" +#incbin "png/FE8/Moulder_mug.dmp" +#incbin "png/FE8/Moulder_frames.dmp" +#incbin "png/FE8/Moulder_palette.dmp" +#incbin "png/FE8/Moulder_minimug.dmp" #ifndef MoulderMug - #define MoulderMug (FirstMugID+551) + #define MoulderMug (FirstMugID+552) #endif setMugEntry(MoulderMug, MoulderMugData, 2, 5, 3, 3) ALIGN 4 MyrrhMugData: -#incbin "Dmp/Myrrh_mug.dmp" -#incbin "Dmp/Myrrh_frames.dmp" -#incbin "Dmp/Myrrh_palette.dmp" -#incbin "Dmp/Myrrh_minimug.dmp" +#incbin "png/FE8/Myrrh_mug.dmp" +#incbin "png/FE8/Myrrh_frames.dmp" +#incbin "png/FE8/Myrrh_palette.dmp" +#incbin "png/FE8/Myrrh_minimug.dmp" #ifndef MyrrhMug - #define MyrrhMug (FirstMugID+552) + #define MyrrhMug (FirstMugID+553) #endif setMugEntry(MyrrhMug, MyrrhMugData, 2, 7, 3, 5) ALIGN 4 NatashaMugData: -#incbin "Dmp/Natasha_mug.dmp" -#incbin "Dmp/Natasha_frames.dmp" -#incbin "Dmp/Natasha_palette.dmp" -#incbin "Dmp/Natasha_minimug.dmp" +#incbin "png/FE8/Natasha_mug.dmp" +#incbin "png/FE8/Natasha_frames.dmp" +#incbin "png/FE8/Natasha_palette.dmp" +#incbin "png/FE8/Natasha_minimug.dmp" #ifndef NatashaMug - #define NatashaMug (FirstMugID+553) + #define NatashaMug (FirstMugID+554) #endif setMugEntry(NatashaMug, NatashaMugData, 2, 6, 3, 4) ALIGN 4 NeimiMugData: -#incbin "Dmp/Neimi_mug.dmp" -#incbin "Dmp/Neimi_frames.dmp" -#incbin "Dmp/Neimi_palette.dmp" -#incbin "Dmp/Neimi_minimug.dmp" +#incbin "png/FE8/Neimi_mug.dmp" +#incbin "png/FE8/Neimi_frames.dmp" +#incbin "png/FE8/Neimi_palette.dmp" +#incbin "png/FE8/Neimi_minimug.dmp" #ifndef NeimiMug - #define NeimiMug (FirstMugID+554) + #define NeimiMug (FirstMugID+555) #endif setMugEntry(NeimiMug, NeimiMugData, 2, 6, 3, 4) ALIGN 4 OrsonMugData: -#incbin "Dmp/Orson_mug.dmp" -#incbin "Dmp/Orson_frames.dmp" -#incbin "Dmp/Orson_palette.dmp" -#incbin "Dmp/Orson_minimug.dmp" +#incbin "png/FE8/Orson_mug.dmp" +#incbin "png/FE8/Orson_frames.dmp" +#incbin "png/FE8/Orson_palette.dmp" +#incbin "png/FE8/Orson_minimug.dmp" #ifndef OrsonMug - #define OrsonMug (FirstMugID+555) + #define OrsonMug (FirstMugID+556) #endif setMugEntry(OrsonMug, OrsonMugData, 2, 5, 3, 3) ALIGN 4 RennacMugData: -#incbin "Dmp/Rennac_mug.dmp" -#incbin "Dmp/Rennac_frames.dmp" -#incbin "Dmp/Rennac_palette.dmp" -#incbin "Dmp/Rennac_minimug.dmp" +#incbin "png/FE8/Rennac_mug.dmp" +#incbin "png/FE8/Rennac_frames.dmp" +#incbin "png/FE8/Rennac_palette.dmp" +#incbin "png/FE8/Rennac_minimug.dmp" #ifndef RennacMug - #define RennacMug (FirstMugID+556) + #define RennacMug (FirstMugID+557) #endif setMugEntry(RennacMug, RennacMugData, 2, 5, 3, 3) ALIGN 4 RievMugData: -#incbin "Dmp/Riev_mug.dmp" -#incbin "Dmp/Riev_frames.dmp" -#incbin "Dmp/Riev_palette.dmp" -#incbin "Dmp/Riev_minimug.dmp" +#incbin "png/FE8/Riev_mug.dmp" +#incbin "png/FE8/Riev_frames.dmp" +#incbin "png/FE8/Riev_palette.dmp" +#incbin "png/FE8/Riev_minimug.dmp" #ifndef RievMug - #define RievMug (FirstMugID+557) + #define RievMug (FirstMugID+558) #endif setMugEntry(RievMug, RievMugData, 2, 7, 2, 5) ALIGN 4 RossMugData: -#incbin "Dmp/Ross_mug.dmp" -#incbin "Dmp/Ross_frames.dmp" -#incbin "Dmp/Ross_palette.dmp" -#incbin "Dmp/Ross_minimug.dmp" +#incbin "png/FE8/Ross_mug.dmp" +#incbin "png/FE8/Ross_frames.dmp" +#incbin "png/FE8/Ross_palette.dmp" +#incbin "png/FE8/Ross_minimug.dmp" #ifndef RossMug - #define RossMug (FirstMugID+558) + #define RossMug (FirstMugID+559) #endif setMugEntry(RossMug, RossMugData, 3, 6, 3, 4) ALIGN 4 SalehMugData: -#incbin "Dmp/Saleh_mug.dmp" -#incbin "Dmp/Saleh_frames.dmp" -#incbin "Dmp/Saleh_palette.dmp" -#incbin "Dmp/Saleh_minimug.dmp" +#incbin "png/FE8/Saleh_mug.dmp" +#incbin "png/FE8/Saleh_frames.dmp" +#incbin "png/FE8/Saleh_palette.dmp" +#incbin "png/FE8/Saleh_minimug.dmp" #ifndef SalehMug - #define SalehMug (FirstMugID+559) + #define SalehMug (FirstMugID+560) #endif setMugEntry(SalehMug, SalehMugData, 2, 5, 3, 3) ALIGN 4 SelenaMugData: -#incbin "Dmp/Selena_mug.dmp" -#incbin "Dmp/Selena_frames.dmp" -#incbin "Dmp/Selena_palette.dmp" -#incbin "Dmp/Selena_minimug.dmp" +#incbin "png/FE8/Selena_mug.dmp" +#incbin "png/FE8/Selena_frames.dmp" +#incbin "png/FE8/Selena_palette.dmp" +#incbin "png/FE8/Selena_minimug.dmp" #ifndef SelenaMug - #define SelenaMug (FirstMugID+560) + #define SelenaMug (FirstMugID+561) #endif setMugEntry(SelenaMug, SelenaMugData, 2, 5, 3, 3) ALIGN 4 SethMugData: -#incbin "Dmp/Seth_mug.dmp" -#incbin "Dmp/Seth_frames.dmp" -#incbin "Dmp/Seth_palette.dmp" -#incbin "Dmp/Seth_minimug.dmp" +#incbin "png/FE8/Seth_mug.dmp" +#incbin "png/FE8/Seth_frames.dmp" +#incbin "png/FE8/Seth_palette.dmp" +#incbin "png/FE8/Seth_minimug.dmp" #ifndef SethMug - #define SethMug (FirstMugID+561) + #define SethMug (FirstMugID+562) #endif setMugEntry(SethMug, SethMugData, 2, 5, 3, 3) ALIGN 4 SyreneMugData: -#incbin "Dmp/Syrene_mug.dmp" -#incbin "Dmp/Syrene_frames.dmp" -#incbin "Dmp/Syrene_palette.dmp" -#incbin "Dmp/Syrene_minimug.dmp" +#incbin "png/FE8/Syrene_mug.dmp" +#incbin "png/FE8/Syrene_frames.dmp" +#incbin "png/FE8/Syrene_palette.dmp" +#incbin "png/FE8/Syrene_minimug.dmp" #ifndef SyreneMug - #define SyreneMug (FirstMugID+562) + #define SyreneMug (FirstMugID+563) #endif setMugEntry(SyreneMug, SyreneMugData, 2, 5, 3, 3) ALIGN 4 TanaMugData: -#incbin "Dmp/Tana_mug.dmp" -#incbin "Dmp/Tana_frames.dmp" -#incbin "Dmp/Tana_palette.dmp" -#incbin "Dmp/Tana_minimug.dmp" +#incbin "png/FE8/Tana_mug.dmp" +#incbin "png/FE8/Tana_frames.dmp" +#incbin "png/FE8/Tana_palette.dmp" +#incbin "png/FE8/Tana_minimug.dmp" #ifndef TanaMug - #define TanaMug (FirstMugID+563) + #define TanaMug (FirstMugID+564) #endif setMugEntry(TanaMug, TanaMugData, 2, 6, 3, 4) ALIGN 4 TethysMugData: -#incbin "Dmp/Tethys_mug.dmp" -#incbin "Dmp/Tethys_frames.dmp" -#incbin "Dmp/Tethys_palette.dmp" -#incbin "Dmp/Tethys_minimug.dmp" +#incbin "png/FE8/Tethys_mug.dmp" +#incbin "png/FE8/Tethys_frames.dmp" +#incbin "png/FE8/Tethys_palette.dmp" +#incbin "png/FE8/Tethys_minimug.dmp" #ifndef TethysMug - #define TethysMug (FirstMugID+564) + #define TethysMug (FirstMugID+565) #endif setMugEntry(TethysMug, TethysMugData, 2, 6, 3, 4) ALIGN 4 ValterMugData: -#incbin "Dmp/Valter_mug.dmp" -#incbin "Dmp/Valter_frames.dmp" -#incbin "Dmp/Valter_palette.dmp" -#incbin "Dmp/Valter_minimug.dmp" +#incbin "png/FE8/Valter_mug.dmp" +#incbin "png/FE8/Valter_frames.dmp" +#incbin "png/FE8/Valter_palette.dmp" +#incbin "png/FE8/Valter_minimug.dmp" #ifndef ValterMug - #define ValterMug (FirstMugID+565) + #define ValterMug (FirstMugID+566) #endif setMugEntry(ValterMug, ValterMugData, 2, 4, 3, 2) ALIGN 4 VanessaMugData: -#incbin "Dmp/Vanessa_mug.dmp" -#incbin "Dmp/Vanessa_frames.dmp" -#incbin "Dmp/Vanessa_palette.dmp" -#incbin "Dmp/Vanessa_minimug.dmp" +#incbin "png/FE8/Vanessa_mug.dmp" +#incbin "png/FE8/Vanessa_frames.dmp" +#incbin "png/FE8/Vanessa_palette.dmp" +#incbin "png/FE8/Vanessa_minimug.dmp" #ifndef VanessaMug - #define VanessaMug (FirstMugID+566) + #define VanessaMug (FirstMugID+567) #endif setMugEntry(VanessaMug, VanessaMugData, 2, 6, 3, 4) ALIGN 4 -Aran_NickT_StitchMugData: -#incbin "Dmp/Aran_NickT_Stitch_mug.dmp" -#incbin "Dmp/Aran_NickT_Stitch_frames.dmp" -#incbin "Dmp/Aran_NickT_Stitch_palette.dmp" -#incbin "Dmp/Aran_NickT_Stitch_minimug.dmp" +AranMugData: +#incbin "png/FE9FE10/Aran_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Aran_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Aran_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Aran_NickT_Stitch_minimug.dmp" #ifndef AranMug - #define AranMug (FirstMugID+567) + #define AranMug (FirstMugID+568) #endif -setMugEntry(AranMug, Aran_NickT_StitchMugData, 3, 6, 3, 3) +setMugEntry(AranMug, AranMugData, 3, 6, 3, 3) ALIGN 4 -Astrid_NickT_StitchMugData: -#incbin "Dmp/Astrid_NickT_Stitch_mug.dmp" -#incbin "Dmp/Astrid_NickT_Stitch_frames.dmp" -#incbin "Dmp/Astrid_NickT_Stitch_palette.dmp" -#incbin "Dmp/Astrid_NickT_Stitch_minimug.dmp" +AstridMugData: +#incbin "png/FE9FE10/Astrid_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Astrid_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Astrid_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Astrid_NickT_Stitch_minimug.dmp" #ifndef AstridMug - #define AstridMug (FirstMugID+568) + #define AstridMug (FirstMugID+569) #endif -setMugEntry(AstridMug, Astrid_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(AstridMug, AstridMugData, 3, 5, 3, 3) ALIGN 4 -Bastian_NickT_StitchMugData: -#incbin "Dmp/Bastian_NickT_Stitch_mug.dmp" -#incbin "Dmp/Bastian_NickT_Stitch_frames.dmp" -#incbin "Dmp/Bastian_NickT_Stitch_palette.dmp" -#incbin "Dmp/Bastian_NickT_Stitch_minimug.dmp" +BastianMugData: +#incbin "png/FE9FE10/Bastian_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Bastian_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Bastian_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Bastian_NickT_Stitch_minimug.dmp" #ifndef BastianMug - #define BastianMug (FirstMugID+569) + #define BastianMug (FirstMugID+570) #endif -setMugEntry(BastianMug, Bastian_NickT_StitchMugData, 3, 4, 3, 2) +setMugEntry(BastianMug, BastianMugData, 3, 4, 3, 2) ALIGN 4 -Boyd_Younger_NickT_StitchMugData: -#incbin "Dmp/Boyd_Younger_NickT_Stitch_mug.dmp" -#incbin "Dmp/Boyd_Younger_NickT_Stitch_frames.dmp" -#incbin "Dmp/Boyd_Younger_NickT_Stitch_palette.dmp" -#incbin "Dmp/Boyd_Younger_NickT_Stitch_minimug.dmp" +BoydMugData: +#incbin "png/FE9FE10/Boyd_Younger_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Boyd_Younger_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Boyd_Younger_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Boyd_Younger_NickT_Stitch_minimug.dmp" #ifndef BoydMug - #define BoydMug (FirstMugID+570) + #define BoydMug (FirstMugID+571) #endif -setMugEntry(BoydMug, Boyd_Younger_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(BoydMug, BoydMugData, 3, 5, 3, 3) ALIGN 4 -Brom_NickT_StitchMugData: -#incbin "Dmp/Brom_NickT_Stitch_mug.dmp" -#incbin "Dmp/Brom_NickT_Stitch_frames.dmp" -#incbin "Dmp/Brom_NickT_Stitch_palette.dmp" -#incbin "Dmp/Brom_NickT_Stitch_minimug.dmp" +BromMugData: +#incbin "png/FE9FE10/Brom_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Brom_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Brom_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Brom_NickT_Stitch_minimug.dmp" #ifndef BromMug - #define BromMug (FirstMugID+571) + #define BromMug (FirstMugID+572) #endif -setMugEntry(BromMug, Brom_NickT_StitchMugData, 3, 4, 2, 2) +setMugEntry(BromMug, BromMugData, 3, 4, 2, 2) ALIGN 4 -Caineghis_Part_1_NickTStitchMugData: -#incbin "Dmp/Caineghis_Part_1_NickTStitch_mug.dmp" -#incbin "Dmp/Caineghis_Part_1_NickTStitch_frames.dmp" -#incbin "Dmp/Caineghis_Part_1_NickTStitch_palette.dmp" -#incbin "Dmp/Caineghis_Part_1_NickTStitch_minimug.dmp" +CaineghisMugData: +#incbin "png/FE9FE10/Caineghis_Part_1_NickTStitch_mug.dmp" +#incbin "png/FE9FE10/Caineghis_Part_1_NickTStitch_frames.dmp" +#incbin "png/FE9FE10/Caineghis_Part_1_NickTStitch_palette.dmp" +#incbin "png/FE9FE10/Caineghis_Part_1_NickTStitch_minimug.dmp" #ifndef CaineghisMug - #define CaineghisMug (FirstMugID+572) + #define CaineghisMug (FirstMugID+573) #endif -setMugEntry(CaineghisMug, Caineghis_Part_1_NickTStitchMugData, 4, 5, 4, 3) +setMugEntry(CaineghisMug, CaineghisMugData, 4, 5, 4, 3) ALIGN 4 -Calill_No_eyeshadow_NickT_StitchMugData: -#incbin "Dmp/Calill_No_eyeshadow_NickT_Stitch_mug.dmp" -#incbin "Dmp/Calill_No_eyeshadow_NickT_Stitch_frames.dmp" -#incbin "Dmp/Calill_No_eyeshadow_NickT_Stitch_palette.dmp" -#incbin "Dmp/Calill_No_eyeshadow_NickT_Stitch_minimug.dmp" +CalillMugData: +#incbin "png/FE9FE10/Calill_No_eyeshadow_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Calill_No_eyeshadow_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Calill_No_eyeshadow_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Calill_No_eyeshadow_NickT_Stitch_minimug.dmp" #ifndef CalillMug - #define CalillMug (FirstMugID+573) + #define CalillMug (FirstMugID+574) #endif -setMugEntry(CalillMug, Calill_No_eyeshadow_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(CalillMug, CalillMugData, 3, 5, 3, 3) ALIGN 4 -Devdan_NickT_StitchMugData: -#incbin "Dmp/Devdan_NickT_Stitch_mug.dmp" -#incbin "Dmp/Devdan_NickT_Stitch_frames.dmp" -#incbin "Dmp/Devdan_NickT_Stitch_palette.dmp" -#incbin "Dmp/Devdan_NickT_Stitch_minimug.dmp" +DevdanMugData: +#incbin "png/FE9FE10/Devdan_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Devdan_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Devdan_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Devdan_NickT_Stitch_minimug.dmp" #ifndef DevdanMug - #define DevdanMug (FirstMugID+574) + #define DevdanMug (FirstMugID+575) #endif -setMugEntry(DevdanMug, Devdan_NickT_StitchMugData, 3, 4, 3, 2) +setMugEntry(DevdanMug, DevdanMugData, 3, 4, 3, 2) ALIGN 4 -Edward_NickT_StitchMugData: -#incbin "Dmp/Edward_NickT_Stitch_mug.dmp" -#incbin "Dmp/Edward_NickT_Stitch_frames.dmp" -#incbin "Dmp/Edward_NickT_Stitch_palette.dmp" -#incbin "Dmp/Edward_NickT_Stitch_minimug.dmp" +EdwardMugData: +#incbin "png/FE9FE10/Edward_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Edward_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Edward_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Edward_NickT_Stitch_minimug.dmp" #ifndef EdwardMug - #define EdwardMug (FirstMugID+575) + #define EdwardMug (FirstMugID+576) #endif -setMugEntry(EdwardMug, Edward_NickT_StitchMugData, 4, 6, 4, 4) +setMugEntry(EdwardMug, EdwardMugData, 4, 6, 4, 4) ALIGN 4 -Elincia_NickT_StitchMugData: -#incbin "Dmp/Elincia_NickT_Stitch_mug.dmp" -#incbin "Dmp/Elincia_NickT_Stitch_frames.dmp" -#incbin "Dmp/Elincia_NickT_Stitch_palette.dmp" -#incbin "Dmp/Elincia_NickT_Stitch_minimug.dmp" +ElinciaMugData: +#incbin "png/FE9FE10/Elincia_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Elincia_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Elincia_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Elincia_NickT_Stitch_minimug.dmp" #ifndef ElinciaMug - #define ElinciaMug (FirstMugID+576) + #define ElinciaMug (FirstMugID+577) #endif -setMugEntry(ElinciaMug, Elincia_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(ElinciaMug, ElinciaMugData, 3, 5, 3, 3) ALIGN 4 -Ena_NickT_StitchMugData: -#incbin "Dmp/Ena_NickT_Stitch_mug.dmp" -#incbin "Dmp/Ena_NickT_Stitch_frames.dmp" -#incbin "Dmp/Ena_NickT_Stitch_palette.dmp" -#incbin "Dmp/Ena_NickT_Stitch_minimug.dmp" +EnaMugData: +#incbin "png/FE9FE10/Ena_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Ena_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Ena_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Ena_NickT_Stitch_minimug.dmp" #ifndef EnaMug - #define EnaMug (FirstMugID+577) + #define EnaMug (FirstMugID+578) #endif -setMugEntry(EnaMug, Ena_NickT_StitchMugData, 4, 5, 3, 3) +setMugEntry(EnaMug, EnaMugData, 4, 5, 3, 3) ALIGN 4 -Fiona_NickT_StitchMugData: -#incbin "Dmp/Fiona_NickT_Stitch_mug.dmp" -#incbin "Dmp/Fiona_NickT_Stitch_frames.dmp" -#incbin "Dmp/Fiona_NickT_Stitch_palette.dmp" -#incbin "Dmp/Fiona_NickT_Stitch_minimug.dmp" +FionaMugData: +#incbin "png/FE9FE10/Fiona_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Fiona_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Fiona_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Fiona_NickT_Stitch_minimug.dmp" #ifndef FionaMug - #define FionaMug (FirstMugID+578) + #define FionaMug (FirstMugID+579) #endif -setMugEntry(FionaMug, Fiona_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(FionaMug, FionaMugData, 3, 5, 3, 3) ALIGN 4 -Gareth_Part_1_NickTStitchMugData: -#incbin "Dmp/Gareth_Part_1_NickTStitch_mug.dmp" -#incbin "Dmp/Gareth_Part_1_NickTStitch_frames.dmp" -#incbin "Dmp/Gareth_Part_1_NickTStitch_palette.dmp" -#incbin "Dmp/Gareth_Part_1_NickTStitch_minimug.dmp" +GarethMugData: +#incbin "png/FE9FE10/Gareth_Part_1_NickTStitch_mug.dmp" +#incbin "png/FE9FE10/Gareth_Part_1_NickTStitch_frames.dmp" +#incbin "png/FE9FE10/Gareth_Part_1_NickTStitch_palette.dmp" +#incbin "png/FE9FE10/Gareth_Part_1_NickTStitch_minimug.dmp" #ifndef GarethMug - #define GarethMug (FirstMugID+579) + #define GarethMug (FirstMugID+580) #endif -setMugEntry(GarethMug, Gareth_Part_1_NickTStitchMugData, 5, 5, 5, 3) +setMugEntry(GarethMug, GarethMugData, 5, 5, 5, 3) ALIGN 4 -Gatrie_Quotedotlass_Electric_Serge_TrybelMugData: -#incbin "Dmp/Gatrie_Quotedotlass_Electric_Serge_Trybel_mug.dmp" -#incbin "Dmp/Gatrie_Quotedotlass_Electric_Serge_Trybel_frames.dmp" -#incbin "Dmp/Gatrie_Quotedotlass_Electric_Serge_Trybel_palette.dmp" -#incbin "Dmp/Gatrie_Quotedotlass_Electric_Serge_Trybel_minimug.dmp" +GatrieMugData: +#incbin "png/FE9FE10/Gatrie_Quotedotlass_Electric_Serge_Trybel_mug.dmp" +#incbin "png/FE9FE10/Gatrie_Quotedotlass_Electric_Serge_Trybel_frames.dmp" +#incbin "png/FE9FE10/Gatrie_Quotedotlass_Electric_Serge_Trybel_palette.dmp" +#incbin "png/FE9FE10/Gatrie_Quotedotlass_Electric_Serge_Trybel_minimug.dmp" #ifndef GatrieMug - #define GatrieMug (FirstMugID+580) + #define GatrieMug (FirstMugID+581) #endif -setMugEntry(GatrieMug, Gatrie_Quotedotlass_Electric_Serge_TrybelMugData, 3, 5, 3, 3) +setMugEntry(GatrieMug, GatrieMugData, 3, 5, 3, 3) ALIGN 4 -Geoffrey_NickT_StitchMugData: -#incbin "Dmp/Geoffrey_NickT_Stitch_mug.dmp" -#incbin "Dmp/Geoffrey_NickT_Stitch_frames.dmp" -#incbin "Dmp/Geoffrey_NickT_Stitch_palette.dmp" -#incbin "Dmp/Geoffrey_NickT_Stitch_minimug.dmp" +GeoffreyMugData: +#incbin "png/FE9FE10/Geoffrey_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Geoffrey_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Geoffrey_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Geoffrey_NickT_Stitch_minimug.dmp" #ifndef GeoffreyMug - #define GeoffreyMug (FirstMugID+581) + #define GeoffreyMug (FirstMugID+582) #endif -setMugEntry(GeoffreyMug, Geoffrey_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(GeoffreyMug, GeoffreyMugData, 3, 5, 3, 3) ALIGN 4 -Giffca_NickT_StitchMugData: -#incbin "Dmp/Giffca_NickT_Stitch_mug.dmp" -#incbin "Dmp/Giffca_NickT_Stitch_frames.dmp" -#incbin "Dmp/Giffca_NickT_Stitch_palette.dmp" -#incbin "Dmp/Giffca_NickT_Stitch_minimug.dmp" +GiffcaMugData: +#incbin "png/FE9FE10/Giffca_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Giffca_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Giffca_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Giffca_NickT_Stitch_minimug.dmp" #ifndef GiffcaMug - #define GiffcaMug (FirstMugID+582) + #define GiffcaMug (FirstMugID+583) #endif -setMugEntry(GiffcaMug, Giffca_NickT_StitchMugData, 3, 4, 3, 2) +setMugEntry(GiffcaMug, GiffcaMugData, 3, 4, 3, 2) ALIGN 4 -Haar_Version_2_NickT_StitchMugData: -#incbin "Dmp/Haar_Version_2_NickT_Stitch_mug.dmp" -#incbin "Dmp/Haar_Version_2_NickT_Stitch_frames.dmp" -#incbin "Dmp/Haar_Version_2_NickT_Stitch_palette.dmp" -#incbin "Dmp/Haar_Version_2_NickT_Stitch_minimug.dmp" +HaarMugData: +#incbin "png/FE9FE10/Haar_Version_2_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Haar_Version_2_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Haar_Version_2_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Haar_Version_2_NickT_Stitch_minimug.dmp" #ifndef HaarMug - #define HaarMug (FirstMugID+583) + #define HaarMug (FirstMugID+584) #endif -setMugEntry(HaarMug, Haar_Version_2_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(HaarMug, HaarMugData, 3, 5, 3, 3) ALIGN 4 -Heather_Alex_the_RetrogamerMugData: -#incbin "Dmp/Heather_Alex_the_Retrogamer_mug.dmp" -#incbin "Dmp/Heather_Alex_the_Retrogamer_frames.dmp" -#incbin "Dmp/Heather_Alex_the_Retrogamer_palette.dmp" -#incbin "Dmp/Heather_Alex_the_Retrogamer_minimug.dmp" +HeatherMugData: +#incbin "png/FE9FE10/Heather_Alex_the_Retrogamer_mug.dmp" +#incbin "png/FE9FE10/Heather_Alex_the_Retrogamer_frames.dmp" +#incbin "png/FE9FE10/Heather_Alex_the_Retrogamer_palette.dmp" +#incbin "png/FE9FE10/Heather_Alex_the_Retrogamer_minimug.dmp" #ifndef HeatherMug - #define HeatherMug (FirstMugID+584) + #define HeatherMug (FirstMugID+585) #endif -setMugEntry(HeatherMug, Heather_Alex_the_RetrogamerMugData, 2, 6, 3, 4) +setMugEntry(HeatherMug, HeatherMugData, 2, 6, 3, 4) ALIGN 4 -Ike_Hero_CaringcarrotMugData: -#incbin "Dmp/Ike_Hero_Caringcarrot_mug.dmp" -#incbin "Dmp/Ike_Hero_Caringcarrot_frames.dmp" -#incbin "Dmp/Ike_Hero_Caringcarrot_palette.dmp" -#incbin "Dmp/Ike_Hero_Caringcarrot_minimug.dmp" +IkeMugData: +#incbin "png/FE9FE10/Ike_Hero_Caringcarrot_mug.dmp" +#incbin "png/FE9FE10/Ike_Hero_Caringcarrot_frames.dmp" +#incbin "png/FE9FE10/Ike_Hero_Caringcarrot_palette.dmp" +#incbin "png/FE9FE10/Ike_Hero_Caringcarrot_minimug.dmp" #ifndef IkeMug - #define IkeMug (FirstMugID+585) + #define IkeMug (FirstMugID+586) #endif -setMugEntry(IkeMug, Ike_Hero_CaringcarrotMugData, 3, 5, 3, 3) +setMugEntry(IkeMug, IkeMugData, 3, 5, 3, 3) ALIGN 4 -Ilyana_Older_NickT_StitchMugData: -#incbin "Dmp/Ilyana_Older_NickT_Stitch_mug.dmp" -#incbin "Dmp/Ilyana_Older_NickT_Stitch_frames.dmp" -#incbin "Dmp/Ilyana_Older_NickT_Stitch_palette.dmp" -#incbin "Dmp/Ilyana_Older_NickT_Stitch_minimug.dmp" +IlyanaMugData: +#incbin "png/FE9FE10/Ilyana_Older_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Ilyana_Older_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Ilyana_Older_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Ilyana_Older_NickT_Stitch_minimug.dmp" #ifndef IlyanaMug - #define IlyanaMug (FirstMugID+586) + #define IlyanaMug (FirstMugID+587) #endif -setMugEntry(IlyanaMug, Ilyana_Older_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(IlyanaMug, IlyanaMugData, 3, 5, 3, 3) ALIGN 4 -Janaff_NickT_StitchMugData: -#incbin "Dmp/Janaff_NickT_Stitch_mug.dmp" -#incbin "Dmp/Janaff_NickT_Stitch_frames.dmp" -#incbin "Dmp/Janaff_NickT_Stitch_palette.dmp" -#incbin "Dmp/Janaff_NickT_Stitch_minimug.dmp" +JanaffMugData: +#incbin "png/FE9FE10/Janaff_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Janaff_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Janaff_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Janaff_NickT_Stitch_minimug.dmp" #ifndef JanaffMug - #define JanaffMug (FirstMugID+587) + #define JanaffMug (FirstMugID+588) #endif -setMugEntry(JanaffMug, Janaff_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(JanaffMug, JanaffMugData, 3, 5, 3, 3) ALIGN 4 -Jill_NickT_StitchMugData: -#incbin "Dmp/Jill_NickT_Stitch_mug.dmp" -#incbin "Dmp/Jill_NickT_Stitch_frames.dmp" -#incbin "Dmp/Jill_NickT_Stitch_palette.dmp" -#incbin "Dmp/Jill_NickT_Stitch_minimug.dmp" +JillMugData: +#incbin "png/FE9FE10/Jill_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Jill_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Jill_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Jill_NickT_Stitch_minimug.dmp" #ifndef JillMug - #define JillMug (FirstMugID+588) + #define JillMug (FirstMugID+589) #endif -setMugEntry(JillMug, Jill_NickT_StitchMugData, 3, 6, 2, 4) +setMugEntry(JillMug, JillMugData, 3, 6, 2, 4) ALIGN 4 -Kieran_NickT_StitchMugData: -#incbin "Dmp/Kieran_NickT_Stitch_mug.dmp" -#incbin "Dmp/Kieran_NickT_Stitch_frames.dmp" -#incbin "Dmp/Kieran_NickT_Stitch_palette.dmp" -#incbin "Dmp/Kieran_NickT_Stitch_minimug.dmp" +KieranMugData: +#incbin "png/FE9FE10/Kieran_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Kieran_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Kieran_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Kieran_NickT_Stitch_minimug.dmp" #ifndef KieranMug - #define KieranMug (FirstMugID+589) + #define KieranMug (FirstMugID+590) #endif -setMugEntry(KieranMug, Kieran_NickT_StitchMugData, 4, 5, 3, 3) +setMugEntry(KieranMug, KieranMugData, 4, 5, 3, 3) ALIGN 4 -Kurthnaga_NickT_StitchMugData: -#incbin "Dmp/Kurthnaga_NickT_Stitch_mug.dmp" -#incbin "Dmp/Kurthnaga_NickT_Stitch_frames.dmp" -#incbin "Dmp/Kurthnaga_NickT_Stitch_palette.dmp" -#incbin "Dmp/Kurthnaga_NickT_Stitch_minimug.dmp" +KurthnagaMugData: +#incbin "png/FE9FE10/Kurthnaga_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Kurthnaga_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Kurthnaga_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Kurthnaga_NickT_Stitch_minimug.dmp" #ifndef KurthnagaMug - #define KurthnagaMug (FirstMugID+590) + #define KurthnagaMug (FirstMugID+591) #endif -setMugEntry(KurthnagaMug, Kurthnaga_NickT_StitchMugData, 4, 6, 3, 4) +setMugEntry(KurthnagaMug, KurthnagaMugData, 4, 6, 3, 4) ALIGN 4 -Kyza_QuotedotlassMugData: -#incbin "Dmp/Kyza_Quotedotlass_mug.dmp" -#incbin "Dmp/Kyza_Quotedotlass_frames.dmp" -#incbin "Dmp/Kyza_Quotedotlass_palette.dmp" -#incbin "Dmp/Kyza_Quotedotlass_minimug.dmp" +KyzaMugData: +#incbin "png/FE9FE10/Kyza_Quotedotlass_mug.dmp" +#incbin "png/FE9FE10/Kyza_Quotedotlass_frames.dmp" +#incbin "png/FE9FE10/Kyza_Quotedotlass_palette.dmp" +#incbin "png/FE9FE10/Kyza_Quotedotlass_minimug.dmp" #ifndef KyzaMug - #define KyzaMug (FirstMugID+591) + #define KyzaMug (FirstMugID+592) #endif -setMugEntry(KyzaMug, Kyza_QuotedotlassMugData, 4, 5, 4, 3) +setMugEntry(KyzaMug, KyzaMugData, 4, 5, 4, 3) ALIGN 4 -Largo_NickT_StitchMugData: -#incbin "Dmp/Largo_NickT_Stitch_mug.dmp" -#incbin "Dmp/Largo_NickT_Stitch_frames.dmp" -#incbin "Dmp/Largo_NickT_Stitch_palette.dmp" -#incbin "Dmp/Largo_NickT_Stitch_minimug.dmp" +LargoMugData: +#incbin "png/FE9FE10/Largo_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Largo_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Largo_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Largo_NickT_Stitch_minimug.dmp" #ifndef LargoMug - #define LargoMug (FirstMugID+592) + #define LargoMug (FirstMugID+593) #endif -setMugEntry(LargoMug, Largo_NickT_StitchMugData, 3, 4, 3, 2) +setMugEntry(LargoMug, LargoMugData, 3, 4, 3, 2) ALIGN 4 -Laura_NickT_StitchMugData: -#incbin "Dmp/Laura_NickT_Stitch_mug.dmp" -#incbin "Dmp/Laura_NickT_Stitch_frames.dmp" -#incbin "Dmp/Laura_NickT_Stitch_palette.dmp" -#incbin "Dmp/Laura_NickT_Stitch_minimug.dmp" +LauraMugData: +#incbin "png/FE9FE10/Laura_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Laura_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Laura_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Laura_NickT_Stitch_minimug.dmp" #ifndef LauraMug - #define LauraMug (FirstMugID+593) + #define LauraMug (FirstMugID+594) #endif -setMugEntry(LauraMug, Laura_NickT_StitchMugData, 4, 6, 3, 4) +setMugEntry(LauraMug, LauraMugData, 4, 6, 3, 4) ALIGN 4 -Leanne_Quotedotlass_Electric_SergeMugData: -#incbin "Dmp/Leanne_Quotedotlass_Electric_Serge_mug.dmp" -#incbin "Dmp/Leanne_Quotedotlass_Electric_Serge_frames.dmp" -#incbin "Dmp/Leanne_Quotedotlass_Electric_Serge_palette.dmp" -#incbin "Dmp/Leanne_Quotedotlass_Electric_Serge_minimug.dmp" +LeanneMugData: +#incbin "png/FE9FE10/Leanne_Quotedotlass_Electric_Serge_mug.dmp" +#incbin "png/FE9FE10/Leanne_Quotedotlass_Electric_Serge_frames.dmp" +#incbin "png/FE9FE10/Leanne_Quotedotlass_Electric_Serge_palette.dmp" +#incbin "png/FE9FE10/Leanne_Quotedotlass_Electric_Serge_minimug.dmp" #ifndef LeanneMug - #define LeanneMug (FirstMugID+594) + #define LeanneMug (FirstMugID+595) #endif -setMugEntry(LeanneMug, Leanne_Quotedotlass_Electric_SergeMugData, 3, 6, 3, 4) +setMugEntry(LeanneMug, LeanneMugData, 3, 6, 3, 4) ALIGN 4 -Leonardo_NickT_StitchMugData: -#incbin "Dmp/Leonardo_NickT_Stitch_mug.dmp" -#incbin "Dmp/Leonardo_NickT_Stitch_frames.dmp" -#incbin "Dmp/Leonardo_NickT_Stitch_palette.dmp" -#incbin "Dmp/Leonardo_NickT_Stitch_minimug.dmp" +LeonardoMugData: +#incbin "png/FE9FE10/Leonardo_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Leonardo_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Leonardo_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Leonardo_NickT_Stitch_minimug.dmp" #ifndef LeonardoMug - #define LeonardoMug (FirstMugID+595) + #define LeonardoMug (FirstMugID+596) #endif -setMugEntry(LeonardoMug, Leonardo_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(LeonardoMug, LeonardoMugData, 3, 5, 3, 3) ALIGN 4 -Lethe_NickT_StitchMugData: -#incbin "Dmp/Lethe_NickT_Stitch_mug.dmp" -#incbin "Dmp/Lethe_NickT_Stitch_frames.dmp" -#incbin "Dmp/Lethe_NickT_Stitch_palette.dmp" -#incbin "Dmp/Lethe_NickT_Stitch_minimug.dmp" +LetheMugData: +#incbin "png/FE9FE10/Lethe_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Lethe_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Lethe_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Lethe_NickT_Stitch_minimug.dmp" #ifndef LetheMug - #define LetheMug (FirstMugID+596) + #define LetheMug (FirstMugID+597) #endif -setMugEntry(LetheMug, Lethe_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(LetheMug, LetheMugData, 3, 5, 3, 3) ALIGN 4 -Lucia_Quotedotlass_Electric_SergeMugData: -#incbin "Dmp/Lucia_Quotedotlass_Electric_Serge_mug.dmp" -#incbin "Dmp/Lucia_Quotedotlass_Electric_Serge_frames.dmp" -#incbin "Dmp/Lucia_Quotedotlass_Electric_Serge_palette.dmp" -#incbin "Dmp/Lucia_Quotedotlass_Electric_Serge_minimug.dmp" +LuciaMugData: +#incbin "png/FE9FE10/Lucia_Quotedotlass_Electric_Serge_mug.dmp" +#incbin "png/FE9FE10/Lucia_Quotedotlass_Electric_Serge_frames.dmp" +#incbin "png/FE9FE10/Lucia_Quotedotlass_Electric_Serge_palette.dmp" +#incbin "png/FE9FE10/Lucia_Quotedotlass_Electric_Serge_minimug.dmp" #ifndef LuciaMug - #define LuciaMug (FirstMugID+597) + #define LuciaMug (FirstMugID+598) #endif -setMugEntry(LuciaMug, Lucia_Quotedotlass_Electric_SergeMugData, 3, 6, 3, 4) +setMugEntry(LuciaMug, LuciaMugData, 3, 6, 3, 4) ALIGN 4 -Lyre_QuotedotlassMugData: -#incbin "Dmp/Lyre_Quotedotlass_mug.dmp" -#incbin "Dmp/Lyre_Quotedotlass_frames.dmp" -#incbin "Dmp/Lyre_Quotedotlass_palette.dmp" -#incbin "Dmp/Lyre_Quotedotlass_minimug.dmp" +LyreMugData: +#incbin "png/FE9FE10/Lyre_Quotedotlass_mug.dmp" +#incbin "png/FE9FE10/Lyre_Quotedotlass_frames.dmp" +#incbin "png/FE9FE10/Lyre_Quotedotlass_palette.dmp" +#incbin "png/FE9FE10/Lyre_Quotedotlass_minimug.dmp" #ifndef LyreMug - #define LyreMug (FirstMugID+598) + #define LyreMug (FirstMugID+599) #endif -setMugEntry(LyreMug, Lyre_QuotedotlassMugData, 3, 6, 3, 4) +setMugEntry(LyreMug, LyreMugData, 3, 6, 3, 4) ALIGN 4 -Makalov_NickT_StitchMugData: -#incbin "Dmp/Makalov_NickT_Stitch_mug.dmp" -#incbin "Dmp/Makalov_NickT_Stitch_frames.dmp" -#incbin "Dmp/Makalov_NickT_Stitch_palette.dmp" -#incbin "Dmp/Makalov_NickT_Stitch_minimug.dmp" +MakalovMugData: +#incbin "png/FE9FE10/Makalov_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Makalov_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Makalov_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Makalov_NickT_Stitch_minimug.dmp" #ifndef MakalovMug - #define MakalovMug (FirstMugID+599) + #define MakalovMug (FirstMugID+600) #endif -setMugEntry(MakalovMug, Makalov_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(MakalovMug, MakalovMugData, 3, 5, 3, 3) ALIGN 4 -Marcia_Older_QuotedotlassMugData: -#incbin "Dmp/Marcia_Older_Quotedotlass_mug.dmp" -#incbin "Dmp/Marcia_Older_Quotedotlass_frames.dmp" -#incbin "Dmp/Marcia_Older_Quotedotlass_palette.dmp" -#incbin "Dmp/Marcia_Older_Quotedotlass_minimug.dmp" +MarciaMugData: +#incbin "png/FE9FE10/Marcia_Older_Quotedotlass_mug.dmp" +#incbin "png/FE9FE10/Marcia_Older_Quotedotlass_frames.dmp" +#incbin "png/FE9FE10/Marcia_Older_Quotedotlass_palette.dmp" +#incbin "png/FE9FE10/Marcia_Older_Quotedotlass_minimug.dmp" #ifndef MarciaMug - #define MarciaMug (FirstMugID+600) + #define MarciaMug (FirstMugID+601) #endif -setMugEntry(MarciaMug, Marcia_Older_QuotedotlassMugData, 3, 5, 3, 3) +setMugEntry(MarciaMug, MarciaMugData, 3, 5, 3, 3) ALIGN 4 -Meg_NickT_StitchMugData: -#incbin "Dmp/Meg_NickT_Stitch_mug.dmp" -#incbin "Dmp/Meg_NickT_Stitch_frames.dmp" -#incbin "Dmp/Meg_NickT_Stitch_palette.dmp" -#incbin "Dmp/Meg_NickT_Stitch_minimug.dmp" +MegMugData: +#incbin "png/FE9FE10/Meg_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Meg_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Meg_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Meg_NickT_Stitch_minimug.dmp" #ifndef MegMug - #define MegMug (FirstMugID+601) + #define MegMug (FirstMugID+602) #endif -setMugEntry(MegMug, Meg_NickT_StitchMugData, 3, 6, 3, 4) +setMugEntry(MegMug, MegMugData, 3, 6, 3, 4) ALIGN 4 -Mia_FE_10_DesignQuotedotlass_Electric_SergeMugData: -#incbin "Dmp/Mia_FE_10_DesignQuotedotlass_Electric_Serge_mug.dmp" -#incbin "Dmp/Mia_FE_10_DesignQuotedotlass_Electric_Serge_frames.dmp" -#incbin "Dmp/Mia_FE_10_DesignQuotedotlass_Electric_Serge_palette.dmp" -#incbin "Dmp/Mia_FE_10_DesignQuotedotlass_Electric_Serge_minimug.dmp" +MiaMugData: +#incbin "png/FE9FE10/Mia_FE_10_DesignQuotedotlass_Electric_Serge_mug.dmp" +#incbin "png/FE9FE10/Mia_FE_10_DesignQuotedotlass_Electric_Serge_frames.dmp" +#incbin "png/FE9FE10/Mia_FE_10_DesignQuotedotlass_Electric_Serge_palette.dmp" +#incbin "png/FE9FE10/Mia_FE_10_DesignQuotedotlass_Electric_Serge_minimug.dmp" #ifndef MiaMug - #define MiaMug (FirstMugID+602) + #define MiaMug (FirstMugID+603) #endif -setMugEntry(MiaMug, Mia_FE_10_DesignQuotedotlass_Electric_SergeMugData, 3, 5, 3, 3) +setMugEntry(MiaMug, MiaMugData, 3, 5, 3, 3) ALIGN 4 -Micaiah_NickT_StitchMugData: -#incbin "Dmp/Micaiah_NickT_Stitch_mug.dmp" -#incbin "Dmp/Micaiah_NickT_Stitch_frames.dmp" -#incbin "Dmp/Micaiah_NickT_Stitch_palette.dmp" -#incbin "Dmp/Micaiah_NickT_Stitch_minimug.dmp" +MicaiahMugData: +#incbin "png/FE9FE10/Micaiah_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Micaiah_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Micaiah_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Micaiah_NickT_Stitch_minimug.dmp" #ifndef MicaiahMug - #define MicaiahMug (FirstMugID+603) + #define MicaiahMug (FirstMugID+604) #endif -setMugEntry(MicaiahMug, Micaiah_NickT_StitchMugData, 3, 6, 3, 4) +setMugEntry(MicaiahMug, MicaiahMugData, 3, 6, 3, 4) ALIGN 4 -Mist_FE10_design_Quotedotlass_Electric_SergeMugData: -#incbin "Dmp/Mist_FE10_design_Quotedotlass_Electric_Serge_mug.dmp" -#incbin "Dmp/Mist_FE10_design_Quotedotlass_Electric_Serge_frames.dmp" -#incbin "Dmp/Mist_FE10_design_Quotedotlass_Electric_Serge_palette.dmp" -#incbin "Dmp/Mist_FE10_design_Quotedotlass_Electric_Serge_minimug.dmp" +MistMugData: +#incbin "png/FE9FE10/Mist_FE10_design_Quotedotlass_Electric_Serge_mug.dmp" +#incbin "png/FE9FE10/Mist_FE10_design_Quotedotlass_Electric_Serge_frames.dmp" +#incbin "png/FE9FE10/Mist_FE10_design_Quotedotlass_Electric_Serge_palette.dmp" +#incbin "png/FE9FE10/Mist_FE10_design_Quotedotlass_Electric_Serge_minimug.dmp" #ifndef MistMug - #define MistMug (FirstMugID+604) + #define MistMug (FirstMugID+605) #endif -setMugEntry(MistMug, Mist_FE10_design_Quotedotlass_Electric_SergeMugData, 3, 6, 3, 4) +setMugEntry(MistMug, MistMugData, 3, 6, 3, 4) ALIGN 4 -Mordecai_NickT_StitchMugData: -#incbin "Dmp/Mordecai_NickT_Stitch_mug.dmp" -#incbin "Dmp/Mordecai_NickT_Stitch_frames.dmp" -#incbin "Dmp/Mordecai_NickT_Stitch_palette.dmp" -#incbin "Dmp/Mordecai_NickT_Stitch_minimug.dmp" +MordecaiMugData: +#incbin "png/FE9FE10/Mordecai_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Mordecai_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Mordecai_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Mordecai_NickT_Stitch_minimug.dmp" #ifndef MordecaiMug - #define MordecaiMug (FirstMugID+605) + #define MordecaiMug (FirstMugID+606) #endif -setMugEntry(MordecaiMug, Mordecai_NickT_StitchMugData, 3, 5, 3, 2) +setMugEntry(MordecaiMug, MordecaiMugData, 3, 5, 3, 2) ALIGN 4 -Muarim_Version_2_NickT_StitchMugData: -#incbin "Dmp/Muarim_Version_2_NickT_Stitch_mug.dmp" -#incbin "Dmp/Muarim_Version_2_NickT_Stitch_frames.dmp" -#incbin "Dmp/Muarim_Version_2_NickT_Stitch_palette.dmp" -#incbin "Dmp/Muarim_Version_2_NickT_Stitch_minimug.dmp" +MuarimMugData: +#incbin "png/FE9FE10/Muarim_Version_2_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Muarim_Version_2_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Muarim_Version_2_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Muarim_Version_2_NickT_Stitch_minimug.dmp" #ifndef MuarimMug - #define MuarimMug (FirstMugID+606) + #define MuarimMug (FirstMugID+607) #endif -setMugEntry(MuarimMug, Muarim_Version_2_NickT_StitchMugData, 2, 5, 2, 2) +setMugEntry(MuarimMug, MuarimMugData, 2, 5, 2, 2) ALIGN 4 -Naesala_NickT_StitchMugData: -#incbin "Dmp/Naesala_NickT_Stitch_mug.dmp" -#incbin "Dmp/Naesala_NickT_Stitch_frames.dmp" -#incbin "Dmp/Naesala_NickT_Stitch_palette.dmp" -#incbin "Dmp/Naesala_NickT_Stitch_minimug.dmp" +NaesalaMugData: +#incbin "png/FE9FE10/Naesala_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Naesala_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Naesala_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Naesala_NickT_Stitch_minimug.dmp" #ifndef NaesalaMug - #define NaesalaMug (FirstMugID+607) + #define NaesalaMug (FirstMugID+608) #endif -setMugEntry(NaesalaMug, Naesala_NickT_StitchMugData, 2, 4, 2, 2) +setMugEntry(NaesalaMug, NaesalaMugData, 2, 4, 2, 2) ALIGN 4 -Nailah_NickT_StitchMugData: -#incbin "Dmp/Nailah_NickT_Stitch_mug.dmp" -#incbin "Dmp/Nailah_NickT_Stitch_frames.dmp" -#incbin "Dmp/Nailah_NickT_Stitch_palette.dmp" -#incbin "Dmp/Nailah_NickT_Stitch_minimug.dmp" +NailahMugData: +#incbin "png/FE9FE10/Nailah_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Nailah_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Nailah_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Nailah_NickT_Stitch_minimug.dmp" #ifndef NailahMug - #define NailahMug (FirstMugID+608) + #define NailahMug (FirstMugID+609) #endif -setMugEntry(NailahMug, Nailah_NickT_StitchMugData, 4, 5, 4, 3) +setMugEntry(NailahMug, NailahMugData, 4, 5, 4, 3) ALIGN 4 -Nasir_NickT_StitchMugData: -#incbin "Dmp/Nasir_NickT_Stitch_mug.dmp" -#incbin "Dmp/Nasir_NickT_Stitch_frames.dmp" -#incbin "Dmp/Nasir_NickT_Stitch_palette.dmp" -#incbin "Dmp/Nasir_NickT_Stitch_minimug.dmp" +NasirMugData: +#incbin "png/FE9FE10/Nasir_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Nasir_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Nasir_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Nasir_NickT_Stitch_minimug.dmp" #ifndef NasirMug - #define NasirMug (FirstMugID+609) + #define NasirMug (FirstMugID+610) #endif -setMugEntry(NasirMug, Nasir_NickT_StitchMugData, 4, 4, 3, 2) +setMugEntry(NasirMug, NasirMugData, 4, 4, 3, 2) ALIGN 4 -Nephenee_NickT_StitchMugData: -#incbin "Dmp/Nephenee_NickT_Stitch_mug.dmp" -#incbin "Dmp/Nephenee_NickT_Stitch_frames.dmp" -#incbin "Dmp/Nephenee_NickT_Stitch_palette.dmp" -#incbin "Dmp/Nephenee_NickT_Stitch_minimug.dmp" +NepheneeMugData: +#incbin "png/FE9FE10/Nephenee_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Nephenee_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Nephenee_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Nephenee_NickT_Stitch_minimug.dmp" #ifndef NepheneeMug - #define NepheneeMug (FirstMugID+610) + #define NepheneeMug (FirstMugID+611) #endif -setMugEntry(NepheneeMug, Nephenee_NickT_StitchMugData, 3, 6, 3, 4) +setMugEntry(NepheneeMug, NepheneeMugData, 3, 6, 3, 4) ALIGN 4 -Nolan_NickT_StitchMugData: -#incbin "Dmp/Nolan_NickT_Stitch_mug.dmp" -#incbin "Dmp/Nolan_NickT_Stitch_frames.dmp" -#incbin "Dmp/Nolan_NickT_Stitch_palette.dmp" -#incbin "Dmp/Nolan_NickT_Stitch_minimug.dmp" +NolanMugData: +#incbin "png/FE9FE10/Nolan_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Nolan_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Nolan_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Nolan_NickT_Stitch_minimug.dmp" #ifndef NolanMug - #define NolanMug (FirstMugID+611) + #define NolanMug (FirstMugID+612) #endif -setMugEntry(NolanMug, Nolan_NickT_StitchMugData, 3, 4, 3, 2) +setMugEntry(NolanMug, NolanMugData, 3, 4, 3, 2) ALIGN 4 -Oscar_Version_2_NickT_StitchMugData: -#incbin "Dmp/Oscar_Version_2_NickT_Stitch_mug.dmp" -#incbin "Dmp/Oscar_Version_2_NickT_Stitch_frames.dmp" -#incbin "Dmp/Oscar_Version_2_NickT_Stitch_palette.dmp" -#incbin "Dmp/Oscar_Version_2_NickT_Stitch_minimug.dmp" +OscarMugData: +#incbin "png/FE9FE10/Oscar_Version_2_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Oscar_Version_2_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Oscar_Version_2_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Oscar_Version_2_NickT_Stitch_minimug.dmp" #ifndef OscarMug - #define OscarMug (FirstMugID+612) + #define OscarMug (FirstMugID+613) #endif -setMugEntry(OscarMug, Oscar_Version_2_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(OscarMug, OscarMugData, 3, 5, 3, 3) ALIGN 4 -Pelleas_Quotedotlass_Electric_SergeMugData: -#incbin "Dmp/Pelleas_Quotedotlass_Electric_Serge_mug.dmp" -#incbin "Dmp/Pelleas_Quotedotlass_Electric_Serge_frames.dmp" -#incbin "Dmp/Pelleas_Quotedotlass_Electric_Serge_palette.dmp" -#incbin "Dmp/Pelleas_Quotedotlass_Electric_Serge_minimug.dmp" +PelleasMugData: +#incbin "png/FE9FE10/Pelleas_Quotedotlass_Electric_Serge_mug.dmp" +#incbin "png/FE9FE10/Pelleas_Quotedotlass_Electric_Serge_frames.dmp" +#incbin "png/FE9FE10/Pelleas_Quotedotlass_Electric_Serge_palette.dmp" +#incbin "png/FE9FE10/Pelleas_Quotedotlass_Electric_Serge_minimug.dmp" #ifndef PelleasMug - #define PelleasMug (FirstMugID+613) + #define PelleasMug (FirstMugID+614) #endif -setMugEntry(PelleasMug, Pelleas_Quotedotlass_Electric_SergeMugData, 4, 5, 4, 3) +setMugEntry(PelleasMug, PelleasMugData, 4, 5, 4, 3) ALIGN 4 -Rafiel_NickT_StitchMugData: -#incbin "Dmp/Rafiel_NickT_Stitch_mug.dmp" -#incbin "Dmp/Rafiel_NickT_Stitch_frames.dmp" -#incbin "Dmp/Rafiel_NickT_Stitch_palette.dmp" -#incbin "Dmp/Rafiel_NickT_Stitch_minimug.dmp" +RafielMugData: +#incbin "png/FE9FE10/Rafiel_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Rafiel_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Rafiel_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Rafiel_NickT_Stitch_minimug.dmp" #ifndef RafielMug - #define RafielMug (FirstMugID+614) + #define RafielMug (FirstMugID+615) #endif -setMugEntry(RafielMug, Rafiel_NickT_StitchMugData, 3, 6, 2, 4) +setMugEntry(RafielMug, RafielMugData, 3, 6, 2, 4) ALIGN 4 -Ranulf_NickT_StitchMugData: -#incbin "Dmp/Ranulf_NickT_Stitch_mug.dmp" -#incbin "Dmp/Ranulf_NickT_Stitch_frames.dmp" -#incbin "Dmp/Ranulf_NickT_Stitch_palette.dmp" -#incbin "Dmp/Ranulf_NickT_Stitch_minimug.dmp" +RanulfMugData: +#incbin "png/FE9FE10/Ranulf_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Ranulf_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Ranulf_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Ranulf_NickT_Stitch_minimug.dmp" #ifndef RanulfMug - #define RanulfMug (FirstMugID+615) + #define RanulfMug (FirstMugID+616) #endif -setMugEntry(RanulfMug, Ranulf_NickT_StitchMugData, 3, 5, 2, 3) +setMugEntry(RanulfMug, RanulfMugData, 3, 5, 2, 3) ALIGN 4 -Reyson_NickT_StitchMugData: -#incbin "Dmp/Reyson_NickT_Stitch_mug.dmp" -#incbin "Dmp/Reyson_NickT_Stitch_frames.dmp" -#incbin "Dmp/Reyson_NickT_Stitch_palette.dmp" -#incbin "Dmp/Reyson_NickT_Stitch_minimug.dmp" +ReysonMugData: +#incbin "png/FE9FE10/Reyson_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Reyson_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Reyson_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Reyson_NickT_Stitch_minimug.dmp" #ifndef ReysonMug - #define ReysonMug (FirstMugID+616) + #define ReysonMug (FirstMugID+617) #endif -setMugEntry(ReysonMug, Reyson_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(ReysonMug, ReysonMugData, 3, 5, 3, 3) ALIGN 4 -Rhys_Version_1_NickT_StitchMugData: -#incbin "Dmp/Rhys_Version_1_NickT_Stitch_mug.dmp" -#incbin "Dmp/Rhys_Version_1_NickT_Stitch_frames.dmp" -#incbin "Dmp/Rhys_Version_1_NickT_Stitch_palette.dmp" -#incbin "Dmp/Rhys_Version_1_NickT_Stitch_minimug.dmp" +RhysMugData: +#incbin "png/FE9FE10/Rhys_Version_1_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Rhys_Version_1_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Rhys_Version_1_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Rhys_Version_1_NickT_Stitch_minimug.dmp" #ifndef RhysMug - #define RhysMug (FirstMugID+617) + #define RhysMug (FirstMugID+618) #endif -setMugEntry(RhysMug, Rhys_Version_1_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(RhysMug, RhysMugData, 3, 5, 3, 3) ALIGN 4 -Rolf_Quotedotlass_Electric_SergeMugData: -#incbin "Dmp/Rolf_Quotedotlass_Electric_Serge_mug.dmp" -#incbin "Dmp/Rolf_Quotedotlass_Electric_Serge_frames.dmp" -#incbin "Dmp/Rolf_Quotedotlass_Electric_Serge_palette.dmp" -#incbin "Dmp/Rolf_Quotedotlass_Electric_Serge_minimug.dmp" +RolfMugData: +#incbin "png/FE9FE10/Rolf_Quotedotlass_Electric_Serge_mug.dmp" +#incbin "png/FE9FE10/Rolf_Quotedotlass_Electric_Serge_frames.dmp" +#incbin "png/FE9FE10/Rolf_Quotedotlass_Electric_Serge_palette.dmp" +#incbin "png/FE9FE10/Rolf_Quotedotlass_Electric_Serge_minimug.dmp" #ifndef RolfMug - #define RolfMug (FirstMugID+618) + #define RolfMug (FirstMugID+619) #endif -setMugEntry(RolfMug, Rolf_Quotedotlass_Electric_SergeMugData, 3, 6, 3, 4) +setMugEntry(RolfMug, RolfMugData, 3, 6, 3, 4) ALIGN 4 -Shinon_Version_1_NickT_StitchMugData: -#incbin "Dmp/Shinon_Version_1_NickT_Stitch_mug.dmp" -#incbin "Dmp/Shinon_Version_1_NickT_Stitch_frames.dmp" -#incbin "Dmp/Shinon_Version_1_NickT_Stitch_palette.dmp" -#incbin "Dmp/Shinon_Version_1_NickT_Stitch_minimug.dmp" +ShinonMugData: +#incbin "png/FE9FE10/Shinon_Version_1_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Shinon_Version_1_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Shinon_Version_1_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Shinon_Version_1_NickT_Stitch_minimug.dmp" #ifndef ShinonMug - #define ShinonMug (FirstMugID+619) + #define ShinonMug (FirstMugID+620) #endif -setMugEntry(ShinonMug, Shinon_Version_1_NickT_StitchMugData, 5, 6, 6, 4) +setMugEntry(ShinonMug, ShinonMugData, 5, 6, 6, 4) ALIGN 4 -Soren_FE10_design_Quotedotlass_Electric_SergeMugData: -#incbin "Dmp/Soren_FE10_design_Quotedotlass_Electric_Serge_mug.dmp" -#incbin "Dmp/Soren_FE10_design_Quotedotlass_Electric_Serge_frames.dmp" -#incbin "Dmp/Soren_FE10_design_Quotedotlass_Electric_Serge_palette.dmp" -#incbin "Dmp/Soren_FE10_design_Quotedotlass_Electric_Serge_minimug.dmp" +SorenMugData: +#incbin "png/FE9FE10/Soren_FE10_design_Quotedotlass_Electric_Serge_mug.dmp" +#incbin "png/FE9FE10/Soren_FE10_design_Quotedotlass_Electric_Serge_frames.dmp" +#incbin "png/FE9FE10/Soren_FE10_design_Quotedotlass_Electric_Serge_palette.dmp" +#incbin "png/FE9FE10/Soren_FE10_design_Quotedotlass_Electric_Serge_minimug.dmp" #ifndef SorenMug - #define SorenMug (FirstMugID+620) + #define SorenMug (FirstMugID+621) #endif -setMugEntry(SorenMug, Soren_FE10_design_Quotedotlass_Electric_SergeMugData, 4, 5, 4, 3) +setMugEntry(SorenMug, SorenMugData, 4, 5, 4, 3) ALIGN 4 -Sothe_Older_NickT_StitchMugData: -#incbin "Dmp/Sothe_Older_NickT_Stitch_mug.dmp" -#incbin "Dmp/Sothe_Older_NickT_Stitch_frames.dmp" -#incbin "Dmp/Sothe_Older_NickT_Stitch_palette.dmp" -#incbin "Dmp/Sothe_Older_NickT_Stitch_minimug.dmp" +SotheMugData: +#incbin "png/FE9FE10/Sothe_Older_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Sothe_Older_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Sothe_Older_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Sothe_Older_NickT_Stitch_minimug.dmp" #ifndef SotheMug - #define SotheMug (FirstMugID+621) + #define SotheMug (FirstMugID+622) #endif -setMugEntry(SotheMug, Sothe_Older_NickT_StitchMugData, 4, 5, 3, 3) +setMugEntry(SotheMug, SotheMugData, 4, 5, 3, 3) ALIGN 4 -Stefan_QuoteDotLass_MattiatorMugData: -#incbin "Dmp/Stefan_QuoteDotLass_Mattiator_mug.dmp" -#incbin "Dmp/Stefan_QuoteDotLass_Mattiator_frames.dmp" -#incbin "Dmp/Stefan_QuoteDotLass_Mattiator_palette.dmp" -#incbin "Dmp/Stefan_QuoteDotLass_Mattiator_minimug.dmp" +StefanMugData: +#incbin "png/FE9FE10/Stefan_QuoteDotLass_Mattiator_mug.dmp" +#incbin "png/FE9FE10/Stefan_QuoteDotLass_Mattiator_frames.dmp" +#incbin "png/FE9FE10/Stefan_QuoteDotLass_Mattiator_palette.dmp" +#incbin "png/FE9FE10/Stefan_QuoteDotLass_Mattiator_minimug.dmp" #ifndef StefanMug - #define StefanMug (FirstMugID+622) + #define StefanMug (FirstMugID+623) #endif -setMugEntry(StefanMug, Stefan_QuoteDotLass_MattiatorMugData, 3, 5, 3, 3) +setMugEntry(StefanMug, StefanMugData, 3, 5, 3, 3) ALIGN 4 -Tanith_NickT_GhostbladeMugData: -#incbin "Dmp/Tanith_NickT_Ghostblade_mug.dmp" -#incbin "Dmp/Tanith_NickT_Ghostblade_frames.dmp" -#incbin "Dmp/Tanith_NickT_Ghostblade_palette.dmp" -#incbin "Dmp/Tanith_NickT_Ghostblade_minimug.dmp" +TanithMugData: +#incbin "png/FE9FE10/Tanith_NickT_Ghostblade_mug.dmp" +#incbin "png/FE9FE10/Tanith_NickT_Ghostblade_frames.dmp" +#incbin "png/FE9FE10/Tanith_NickT_Ghostblade_palette.dmp" +#incbin "png/FE9FE10/Tanith_NickT_Ghostblade_minimug.dmp" #ifndef TanithMug - #define TanithMug (FirstMugID+623) + #define TanithMug (FirstMugID+624) #endif -setMugEntry(TanithMug, Tanith_NickT_GhostbladeMugData, 2, 5, 2, 3) +setMugEntry(TanithMug, TanithMugData, 2, 5, 2, 3) ALIGN 4 -Tauroneo_Version_2_NickT_StitchMugData: -#incbin "Dmp/Tauroneo_Version_2_NickT_Stitch_mug.dmp" -#incbin "Dmp/Tauroneo_Version_2_NickT_Stitch_frames.dmp" -#incbin "Dmp/Tauroneo_Version_2_NickT_Stitch_palette.dmp" -#incbin "Dmp/Tauroneo_Version_2_NickT_Stitch_minimug.dmp" +TauroneoMugData: +#incbin "png/FE9FE10/Tauroneo_Version_2_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Tauroneo_Version_2_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Tauroneo_Version_2_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Tauroneo_Version_2_NickT_Stitch_minimug.dmp" #ifndef TauroneoMug - #define TauroneoMug (FirstMugID+624) + #define TauroneoMug (FirstMugID+625) #endif -setMugEntry(TauroneoMug, Tauroneo_Version_2_NickT_StitchMugData, 3, 5, 3, 2) +setMugEntry(TauroneoMug, TauroneoMugData, 3, 5, 3, 2) ALIGN 4 -Tibarn_NickT_StitchMugData: -#incbin "Dmp/Tibarn_NickT_Stitch_mug.dmp" -#incbin "Dmp/Tibarn_NickT_Stitch_frames.dmp" -#incbin "Dmp/Tibarn_NickT_Stitch_palette.dmp" -#incbin "Dmp/Tibarn_NickT_Stitch_minimug.dmp" +TibarnMugData: +#incbin "png/FE9FE10/Tibarn_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Tibarn_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Tibarn_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Tibarn_NickT_Stitch_minimug.dmp" #ifndef TibarnMug - #define TibarnMug (FirstMugID+625) + #define TibarnMug (FirstMugID+626) #endif -setMugEntry(TibarnMug, Tibarn_NickT_StitchMugData, 4, 5, 4, 3) +setMugEntry(TibarnMug, TibarnMugData, 4, 5, 4, 3) ALIGN 4 -Titania_Version_2_NickT_StitchMugData: -#incbin "Dmp/Titania_Version_2_NickT_Stitch_mug.dmp" -#incbin "Dmp/Titania_Version_2_NickT_Stitch_frames.dmp" -#incbin "Dmp/Titania_Version_2_NickT_Stitch_palette.dmp" -#incbin "Dmp/Titania_Version_2_NickT_Stitch_minimug.dmp" +TitaniaMugData: +#incbin "png/FE9FE10/Titania_Version_2_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Titania_Version_2_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Titania_Version_2_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Titania_Version_2_NickT_Stitch_minimug.dmp" #ifndef TitaniaMug - #define TitaniaMug (FirstMugID+626) + #define TitaniaMug (FirstMugID+627) #endif -setMugEntry(TitaniaMug, Titania_Version_2_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(TitaniaMug, TitaniaMugData, 3, 5, 3, 3) ALIGN 4 -Tormod_Older_NickT_StitchMugData: -#incbin "Dmp/Tormod_Older_NickT_Stitch_mug.dmp" -#incbin "Dmp/Tormod_Older_NickT_Stitch_frames.dmp" -#incbin "Dmp/Tormod_Older_NickT_Stitch_palette.dmp" -#incbin "Dmp/Tormod_Older_NickT_Stitch_minimug.dmp" +TormodMugData: +#incbin "png/FE9FE10/Tormod_Older_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Tormod_Older_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Tormod_Older_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Tormod_Older_NickT_Stitch_minimug.dmp" #ifndef TormodMug - #define TormodMug (FirstMugID+627) + #define TormodMug (FirstMugID+628) #endif -setMugEntry(TormodMug, Tormod_Older_NickT_StitchMugData, 4, 5, 3, 3) +setMugEntry(TormodMug, TormodMugData, 4, 5, 3, 3) ALIGN 4 -Ulki_NickT_StitchMugData: -#incbin "Dmp/Ulki_NickT_Stitch_mug.dmp" -#incbin "Dmp/Ulki_NickT_Stitch_frames.dmp" -#incbin "Dmp/Ulki_NickT_Stitch_palette.dmp" -#incbin "Dmp/Ulki_NickT_Stitch_minimug.dmp" +UlkiMugData: +#incbin "png/FE9FE10/Ulki_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Ulki_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Ulki_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Ulki_NickT_Stitch_minimug.dmp" #ifndef UlkiMug - #define UlkiMug (FirstMugID+628) + #define UlkiMug (FirstMugID+629) #endif -setMugEntry(UlkiMug, Ulki_NickT_StitchMugData, 2, 5, 2, 3) +setMugEntry(UlkiMug, UlkiMugData, 2, 5, 2, 3) ALIGN 4 -Vika_Quotedotlass_Ghostblade_F2EMugData: -#incbin "Dmp/Vika_Quotedotlass_Ghostblade_F2E_mug.dmp" -#incbin "Dmp/Vika_Quotedotlass_Ghostblade_F2E_frames.dmp" -#incbin "Dmp/Vika_Quotedotlass_Ghostblade_F2E_palette.dmp" -#incbin "Dmp/Vika_Quotedotlass_Ghostblade_F2E_minimug.dmp" +VikaMugData: +#incbin "png/FE9FE10/Vika_Quotedotlass_Ghostblade_F2E_mug.dmp" +#incbin "png/FE9FE10/Vika_Quotedotlass_Ghostblade_F2E_frames.dmp" +#incbin "png/FE9FE10/Vika_Quotedotlass_Ghostblade_F2E_palette.dmp" +#incbin "png/FE9FE10/Vika_Quotedotlass_Ghostblade_F2E_minimug.dmp" #ifndef VikaMug - #define VikaMug (FirstMugID+629) + #define VikaMug (FirstMugID+630) #endif -setMugEntry(VikaMug, Vika_Quotedotlass_Ghostblade_F2EMugData, 2, 6, 3, 4) +setMugEntry(VikaMug, VikaMugData, 2, 6, 3, 4) ALIGN 4 -Volke_NickT_StitchMugData: -#incbin "Dmp/Volke_NickT_Stitch_mug.dmp" -#incbin "Dmp/Volke_NickT_Stitch_frames.dmp" -#incbin "Dmp/Volke_NickT_Stitch_palette.dmp" -#incbin "Dmp/Volke_NickT_Stitch_minimug.dmp" +VolkeMugData: +#incbin "png/FE9FE10/Volke_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Volke_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Volke_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Volke_NickT_Stitch_minimug.dmp" #ifndef VolkeMug - #define VolkeMug (FirstMugID+630) + #define VolkeMug (FirstMugID+631) #endif -setMugEntry(VolkeMug, Volke_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(VolkeMug, VolkeMugData, 3, 5, 3, 3) ALIGN 4 -Volug_NickT_StitchMugData: -#incbin "Dmp/Volug_NickT_Stitch_mug.dmp" -#incbin "Dmp/Volug_NickT_Stitch_frames.dmp" -#incbin "Dmp/Volug_NickT_Stitch_palette.dmp" -#incbin "Dmp/Volug_NickT_Stitch_minimug.dmp" +VolugMugData: +#incbin "png/FE9FE10/Volug_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Volug_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Volug_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Volug_NickT_Stitch_minimug.dmp" #ifndef VolugMug - #define VolugMug (FirstMugID+631) + #define VolugMug (FirstMugID+632) #endif -setMugEntry(VolugMug, Volug_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(VolugMug, VolugMugData, 3, 5, 3, 3) ALIGN 4 -Zihark_Version_2_NickT_StitchMugData: -#incbin "Dmp/Zihark_Version_2_NickT_Stitch_mug.dmp" -#incbin "Dmp/Zihark_Version_2_NickT_Stitch_frames.dmp" -#incbin "Dmp/Zihark_Version_2_NickT_Stitch_palette.dmp" -#incbin "Dmp/Zihark_Version_2_NickT_Stitch_minimug.dmp" +ZiharkMugData: +#incbin "png/FE9FE10/Zihark_Version_2_NickT_Stitch_mug.dmp" +#incbin "png/FE9FE10/Zihark_Version_2_NickT_Stitch_frames.dmp" +#incbin "png/FE9FE10/Zihark_Version_2_NickT_Stitch_palette.dmp" +#incbin "png/FE9FE10/Zihark_Version_2_NickT_Stitch_minimug.dmp" #ifndef ZiharkMug - #define ZiharkMug (FirstMugID+632) + #define ZiharkMug (FirstMugID+633) #endif -setMugEntry(ZiharkMug, Zihark_Version_2_NickT_StitchMugData, 3, 5, 3, 3) +setMugEntry(ZiharkMug, ZiharkMugData, 3, 5, 3, 3) diff --git a/gfx/Portraits/Png/FE2FE15/EstFe15_DiamondAppendix.png b/gfx/Portraits/Png/FE2FE15/EstFe15_DiamondAppendix.png deleted file mode 100644 index 6e768d22..00000000 Binary files a/gfx/Portraits/Png/FE2FE15/EstFe15_DiamondAppendix.png and /dev/null differ diff --git a/gfx/Portraits/ProcessPortraits - Copy.cmd b/gfx/Portraits/ProcessPortraits - Copy.cmd deleted file mode 100644 index b9833ef6..00000000 --- a/gfx/Portraits/ProcessPortraits - Copy.cmd +++ /dev/null @@ -1,29 +0,0 @@ -@echo off - -@fixfilenames.py - -@set "PortraitFormatter=%~dp0/../../EventAssembler/Tools/PortraitFormatter.exe" - -@cd %~dp0/Png - -@dir *.png /b/s > png.txt -@echo Using Portrait Formatter.exe -@rem for /f "tokens=*" %%m in (png.txt) do ("%PortraitFormatter%" "%%m") - -@cd %~dp0 -@fastmuggen.py - -@cd %~dp0/Png -@rem @del png.txt - -@cd %~dp0 - -@echo Moving .dmp files into folder -for /r %%a in (*.dmp) do ( -@copy "%%a" "%~dp0Dmp" > nul -@del "%%a" -) - -echo Done! - -pause \ No newline at end of file diff --git a/gfx/Portraits/ProcessPortraits.cmd b/gfx/Portraits/ProcessPortraits.cmd index 5a6ee8f8..86820788 100644 --- a/gfx/Portraits/ProcessPortraits.cmd +++ b/gfx/Portraits/ProcessPortraits.cmd @@ -1,26 +1,12 @@ @echo off @fixfilenames.py -@set "PortraitFormatter=%~dp0/../../EventAssembler/Tools/PortraitFormatter.exe" +@echo making stuff +make -@cd %~dp0/Png -@dir *.png /b/s > png.txt -@echo Using Portrait Formatter.exe -@for /f "tokens=*" %%m in (png.txt) do ("%PortraitFormatter%" "%%m") - -@cd %~dp0 +@echo generating installer @fastmuggen.py -@cd %~dp0/Png -@del png.txt - -@cd %~dp0 - -@echo Moving .dmp files into folder -for /r %%a in (*.dmp) do ( -@copy "%%a" "%~dp0Dmp" > nul -@del "%%a" -) echo Done! diff --git a/gfx/Portraits/fastmuggen.py b/gfx/Portraits/fastmuggen.py index 02a2fb05..6082b97c 100644 --- a/gfx/Portraits/fastmuggen.py +++ b/gfx/Portraits/fastmuggen.py @@ -26,43 +26,51 @@ def cv_locate_eye_mouse_pos(arr): min_mouth_diff = mouth_diff return min_mouth[0], min_mouth[1], min_eye[0], min_eye[1] +# Setting up output file +installer = open("Generated.event", "w") +# Writing header for the installer +installer.write("//Generated! Do not edit!\n\n") -#setting up files -mugs = open("Png/png.txt","r") -installer = open("Generated.event","w") -#going through each line of png.txt to generate installer -line = mugs.readline() -c = 1 -installer.write("//Generated! Do not edit!\n\n") - -while line: - #grab the mug name - mug = line.split(".") - mug[0] = Path(mug[0]).stem - name = mug[0].split("_") - #write labels and incbins now that we know the name - print(name[0]) +# Find all .png files recursively in the `png` folder +png_files = list(Path("png").rglob("*.png")) + +# Initialize counter +c = 1 + +for png_file in png_files: + # Extract file path and name information + mug_path = png_file + mug_name = mug_path.stem + base_name = mug_name.split("_")[0] # Get the first part before the first `_` + relative_path = mug_path.parent + + # Normalize paths to use forward slashes + normalized_relative_path = relative_path.as_posix() + + # Write labels and #incbin directives using the base name installer.write("ALIGN 4\n") - installer.write(mug[0] + "MugData:\n") - installer.write("#incbin \"Dmp/" + mug[0] + "_mug.dmp\"\n") - installer.write("#incbin \"Dmp/" + mug[0] + "_frames.dmp\"\n") - installer.write("#incbin \"Dmp/" + mug[0] + "_palette.dmp\"\n") - installer.write("#incbin \"Dmp/" + mug[0] + "_minimug.dmp\"\n") - - installer.write("#ifndef "+name[0]+"Mug\n #define "+name[0]+"Mug (FirstMugID+"+str(c)+")\n#endif\n") - image = Image.open(line.strip()).quantize(16) - arr = numpy.array(image.getdata(), dtype='