diff --git a/.FE6_Installer.event b/.FE6_Installer.event index 7f752708..480219c3 100644 --- a/.FE6_Installer.event +++ b/.FE6_Installer.event @@ -1,14 +1,15 @@ #ifndef callHackNew #define callHackNew(offset) "BYTE $01 $4B $9E $46 $00 $F8 $01 $E0; POIN (offset|0x1)" #endif - +#include "EAstdlib.event" +#include "Definitions.event" +#include "Extensions/Hack Installation.txt" #ifdef VeslyBuildfile +#include "gfx/Installer.event" #include "TextFE6/repointedTextTable.event" #endif // #define setText(textID, offset) "PUSH; ORG (TextTable+4*textID); POIN (offset); POP" -#include "EAstdlib.event" -#include "Definitions.event" -#include "Extensions/Hack Installation.txt" + #ifndef PROC_CALL_ROUTINE_2 #define PROC_CALL_ROUTINE_2(aprRoutine) "SHORT 0x16 0; POIN aprRoutine" #endif diff --git a/.FE7_Installer.event b/.FE7_Installer.event index ea5fb630..3cd14bcd 100644 --- a/.FE7_Installer.event +++ b/.FE7_Installer.event @@ -3,12 +3,27 @@ #endif //#define SKILLSYS_INSTALLED //#define STRMAG_INSTALLED + + + #ifdef VeslyBuildfile +SomeLabelHere: #include "Text/repointedTextTable.event" +ALIGN 4 +EndOfText: #endif + #include "EAstdlib.event" #include "Definitions.event" #include "Extensions/Hack Installation.txt" + + +#ifdef VeslyBuildfile +#include "gfx/Installer.event" +MESSAGE Graphics end at currentoffset +#endif + + #ifndef PROC_CALL_ROUTINE_2 #define PROC_CALL_ROUTINE_2(aprRoutine) "SHORT 0x16 0; POIN aprRoutine" #endif @@ -17,7 +32,6 @@ #define gCharacterData 0x8BDCE4C #endif #ifdef VeslyBuildfile - #include "gfx/Installer.event" #include "Tables/TableInstaller.event" #else #define gCharacterDataFE1 0x8BDCE4C diff --git a/MAKE_Tables.cmd b/MAKE_CharTables.cmd similarity index 100% rename from MAKE_Tables.cmd rename to MAKE_CharTables.cmd diff --git a/MakeTables.bat b/MAKE_ClassTables.bat similarity index 100% rename from MakeTables.bat rename to MAKE_ClassTables.bat diff --git a/MAKE_fe7.cmd b/MAKE_fe7.cmd index 6f24422b..6b7af6c6 100644 --- a/MAKE_fe7.cmd +++ b/MAKE_fe7.cmd @@ -6,7 +6,7 @@ @rem defining buildfile config -set "source_rom=%~dp0fe7.gba" +set "source_rom=%~dp0fe7cache.gba" set "main_event=%~dp0RomBuildfile.event" diff --git a/MAKE_fe7cache.cmd b/MAKE_fe7cache.cmd new file mode 100644 index 00000000..25960c75 --- /dev/null +++ b/MAKE_fe7cache.cmd @@ -0,0 +1,50 @@ +@echo off + +@rem USAGE: "MAKE HACK_full.cmd" [quick] +@rem If first argument is "quick", then this will not update text, tables, maps, or generate a patch +@rem "MACK HACK_quick.cmd" simply calls this but with the quick argument, for convenience + +@rem defining buildfile config + +set "source_rom=%~dp0fe7.gba" + +set "main_event=%~dp0RomBuildfileCache.event" + +set "target_rom=%~dp0fe7cache.gba" +set "target_sym=%~dp0fe7cache.sym" + +@rem defining tools + +set "c2ea=%~dp0Tools\C2EA\c2ea" +set "textprocess=%~dp0Tools\TextProcess\text-process-classic" +set "ups=%~dp0Tools\ups\ups" +set "parsefile=%~dp0EventAssembler\Tools\ParseFileUTF8.exe" +set "tmx2ea=%~dp0Tools\tmx2ea\tmx2ea" +set symcombo=%~dp0Tools\sym\SymCombo.exe + +@rem set %~dp0 into a variable because batch is stupid and messes with it when using conditionals? + +set "base_dir=%~dp0" + +@rem do the actual building + +echo Copying ROM + +copy "%source_rom%" "%target_rom%" + +echo: +echo Assembling + +cd "%base_dir%EventAssembler" +ColorzCore A FE7 "-output:%target_rom%" "-input:%main_event%" --nocash-sym + + +echo: +echo Generating sym file + +echo: | ( "%symcombo%" "%target_sym%" "%target_sym%" "fe7.sym" ) + +echo: +echo Done! + +pause diff --git a/Patches/FE7/Tables/ClassForm_00BE015C.csv b/Patches/FE7/Tables/ClassForm_00BE015C.csv index ef5a29b2..79ca4f76 100644 --- a/Patches/FE7/Tables/ClassForm_00BE015C.csv +++ b/Patches/FE7/Tables/ClassForm_00BE015C.csv @@ -127,7 +127,7 @@ Mage,0x4aa,0x23c,124,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20 Mage,0x4aa,0x23c,125,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 Mage,0x4aa,0x23c,126,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 Mage,0x4aa,0x23c,127,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 -Mage,0x4aa,0x23c,128,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 +asdf,0x4aa,0x23c,128,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 Mage,0x4aa,0x23c,129,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 Mage,0x4aa,0x23c,130,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 Mage,0x4aa,0x23c,131,0x22,0x1a,0,0xc8,0x18,16,1,2,3,3,3,6,5,60,20,20,20,20,20,20,0x3,55,55,40,35,5,30,20,0,0,0,0,0,0,0x0,0x0,0x0,0x0,0,0,0,0,0,31,0,0,0x8c99284,0x8be3a90,0x8be3ee1,0x8be42f1,0x8be44f9,0x8be453a,0x8be457b,0x0 diff --git a/RomBuildfileCache.event b/RomBuildfileCache.event new file mode 100644 index 00000000..926984aa --- /dev/null +++ b/RomBuildfileCache.event @@ -0,0 +1,38 @@ + +#define VeslyBuildfile +#define Reskin +//#define RepointChMenu +#ifndef FreeSpace + #ifdef _FE6_ + #define FreeSpace 0x840000 + #endif + #ifdef _FE7_ + #define FreeSpace 0x1000000 + #endif + #ifdef _FE8_ + #define FreeSpace 0x1000000 + #endif + ORG FreeSpace +#endif +#include "EAstdlib.event" +#include "Definitions.event" +#define MAKE_CACHE_ROM +#ifdef VeslyBuildfile + ORG CURRENTOFFSET + 0x30000 // 0.2mb for text + #include "gfx/Anims/Installer.event" +#endif + + + + + + + + +ALIGN 32 +WORD 0 0 0 0 0 0 0 0 + + + + + diff --git a/Tables/NightmareModules/CharacterTable_FE13.event b/Tables/NightmareModules/CharacterTable_FE13.event index 81d138c9..a1663f63 100644 --- a/Tables/NightmareModules/CharacterTable_FE13.event +++ b/Tables/NightmareModules/CharacterTable_FE13.event @@ -46,7 +46,7 @@ _C2EA_CharacterTable_FE13(YarneName,YarneDesc,0x27,Taguel,YarneMug,0x0,WaterAffi _C2EA_CharacterTable_FE13(LaurentName,LaurentDesc,0x28,Mage,LaurentMug,0x0,FireAffinity,0x21,0xa,0x6,0x5,0x4,0x2,0x2,0x3,0x7,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2d,0x28,0x28,0x1e,0x19,0x23,0x32,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE13(NoireName,NoireDesc,0x29,Archer,NoireMug,0x0,WaterAffinity,0xc,0xa,0x5,0x3,0x2,0x4,0x2,0x4,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x2d,0x23,0x32,0x1e,0x28,0x28,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE13(NahName,NahDesc,0x2a,Manakete_2_F,NahMug,0x0,DarkAffinity,0x30,0xa,0x3,0x2,0x3,0x4,0x2,0x2,0x5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x46,0x23,0x2d,0x23,0x2d,0x28,0x46,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) -_C2EA_CharacterTable_FE13(Tiki2Name,Tiki2Desc,0x2b,Manakete_2_F,TikiMug,0x0,EarthAffinity,0x38,0x14,0xe,0xa,0x8,0xa,0x8,0x6,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50,0x28,0x23,0x1e,0x2d,0x2d,0x50,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) +_C2EA_CharacterTable_FE13(TikiFE13Name,TikiFE13Desc,0x2b,Manakete_2_F,TikiFE13Mug,0x0,EarthAffinity,0x38,0x14,0xe,0xa,0x8,0xa,0x8,0x6,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50,0x28,0x23,0x1e,0x2d,0x2d,0x50,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE13(GangrelName,GangrelDesc,0x2c,Trickster,GangrelMug,0x0,LightAffinity,0x23,0x6,0x14,0xb,0xc,0xe,0xa,0x8,0xa,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x28,0x28,0x32,0x32,0x1e,0x1e,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE13(WalhartName,WalhartDesc,0x2d,Conqueror,WalhartMug,0x0,HeavenAffinity,0x27,0x14,0x1f,0x13,0x10,0x10,0xf,0x9,0x14,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4b,0x3c,0x1e,0x1e,0x2d,0x19,0x2d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE13(EmmerynName,EmmerynDesc,0x2e,Cleric,EmmerynMug,0x0,DarkAffinity,0x2b,0x8,0xe,0xc,0xc,0xc,0x5,0xa,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2d,0x37,0x28,0x28,0x19,0x23,0x46,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) diff --git a/Tables/NightmareModules/CharacterTable_FE16.event b/Tables/NightmareModules/CharacterTable_FE16.event index 31ae19b7..eddcdf4c 100644 --- a/Tables/NightmareModules/CharacterTable_FE16.event +++ b/Tables/NightmareModules/CharacterTable_FE16.event @@ -28,7 +28,7 @@ _C2EA_CharacterTable_FE16(RaphaelName,RaphaelDesc,0x15,Journeyman_1,RaphaelMug,0 _C2EA_CharacterTable_FE16(IgnatzName,IgnatzDesc,0x16,Archer_F,IgnatzMug,0x0,ThunderAffinity,0x1a,0x1,0x8,0x5,0x4,0x5,0x2,0x4,0x5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x23,0x23,0x32,0x32,0x19,0x23,0x37,0x0,0x0,0x0,0x0,0x0,0x0,0x88aeda4,0xc,0x0,0x0,0x0) _C2EA_CharacterTable_FE16(LysitheaName,LysitheaDesc,0x17,Mage_F,LysitheaMug,0x0,WindAffinity,0x2d,0xc,0x7,0x7,0x4,0x4,0x2,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14,0x3c,0x3c,0x32,0xa,0x19,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedbc,0x6,0x0,0x0,0x0) _C2EA_CharacterTable_FE16(MarianneName,MarianneDesc,0x18,Bishop_F,MarianneMug,0x0,WindAffinity,0x3,0xc,0x7,0x7,0x4,0x4,0x2,0x5,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x23,0x32,0x28,0x28,0xf,0x2d,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedd4,0x5,0x0,0x0,0x0) -_C2EA_CharacterTable_FE16(HildaName,HildaDesc,0x19,Warrior,HildaMug,0x0,HeavenAffinity,0x4,0xa,0x9,0x6,0x3,0x5,0x4,0x2,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x2d,0x1e,0x32,0x23,0x14,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedec,0xb,0x0,0x0,0x0) +_C2EA_CharacterTable_FE16(HildaFE16Name,HildaFE16Desc,0x19,Warrior,HildaFE16Mug,0x0,HeavenAffinity,0x4,0xa,0x9,0x6,0x3,0x5,0x4,0x2,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x2d,0x1e,0x32,0x23,0x14,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x88aedec,0xb,0x0,0x0,0x0) _C2EA_CharacterTable_FE16(LeonieName,LeonieDesc,0x1a,Cavalier_F,LeonieMug,0x0,HeavenAffinity,0x29,0x1,0x8,0x6,0x5,0x6,0x4,0x1,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x28,0x28,0x37,0x3c,0x28,0xf,0x28,0x0,0x0,0x0,0x0,0x0,0x0,0x88aee04,0x4,0x0,0x0,0x0) _C2EA_CharacterTable_FE16(SetethName,SetethDesc,0x1b,WyvernRider,SetethMug,0x0,EarthAffinity,0x2c,0xa,0x9,0x6,0x5,0x3,0x4,0x2,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x2d,0x32,0x32,0x1e,0x19,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE16(FlaynName,FlaynDesc,0x1c,Priest,FlaynMug,0x0,FireAffinity,0x2,0xa,0x8,0x6,0x4,0x3,0x3,0x6,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x19,0x37,0x2d,0x23,0x19,0x32,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x88aee4c,0x0,0x0,0x0,0x0) diff --git a/Tables/NightmareModules/CharacterTable_FE6.event b/Tables/NightmareModules/CharacterTable_FE6.event index 301621a6..ac082875 100644 --- a/Tables/NightmareModules/CharacterTable_FE6.event +++ b/Tables/NightmareModules/CharacterTable_FE6.event @@ -59,7 +59,7 @@ _C2EA_CharacterTable_FE6(EchidnaName,EchidnaDesc,0x34,Hero_F,EchidnaMug,0x0,0x4, _C2EA_CharacterTable_FE6(CeciliaName,CeciliaDesc,0x35,Valkyrie,CeciliaMug,0x0,0x7,0x2a,0x1,0xb,0x7,0x4,0x5,0x3,0x5,0xa,0x0,0x0,0x0,0x0,0x0,0x0,0xc9,0x0,0x0,0x3c,0x23,0x2d,0x19,0x14,0x19,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE6(GeeseName,GeeseDesc,0x36,Pirate,GeeseMug,0x0,0x1,0x1e,0xa,0xe,0x6,0x7,0x3,0x5,0x0,0x9,0x1,0x0,0x0,0x97,0x0,0x0,0x0,0x0,0x0,0x55,0x32,0x1e,0x28,0x14,0xa,0x28,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE6(MerlinusName,MerlinusDesc,0x37,Transporter,MerlinusMug,0x0,0x5,0x7,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x64,0x0,0x32,0x32,0x14,0x5,0x64,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) -_C2EA_CharacterTable_FE6(EliwoodName,EliwoodDesc,0x38,Paladin,EliwoodMug,0x0,0x7,0x3c,0x14,0x19,0x12,0x10,0xf,0x10,0xc,0xe,0x0,0xc9,0xfb,0x65,0x0,0x0,0x0,0x0,0x0,0x3c,0x14,0x1e,0x23,0xf,0x5,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) +_C2EA_CharacterTable_FE6(EliwoodName,EliwoodDesc,0x38,Paladin,EliwoodFE6Mug,0x0,0x7,0x3c,0x14,0x19,0x12,0x10,0xf,0x10,0xc,0xe,0x0,0xc9,0xfb,0x65,0x0,0x0,0x0,0x0,0x0,0x3c,0x14,0x1e,0x23,0xf,0x5,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE6(GuinivereName,GuinivereDesc,0x39,Sage_F,GuinivereMug,0x0,0x6,0x3e,0x14,0xa,0x14,0x12,0x12,0xa,0x14,0x18,0x0,0x0,0x0,0x0,0x0,0xc9,0x97,0xfb,0x0,0x3c,0x14,0x1e,0x23,0xf,0x5,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE6(CitizenName, CitizenDesc,0x3a,0x1,0x0,0x1,0x0,0x0,0x14,0xa,0x14,0x12,0x12,0xa,0x14,0x18,0x0,0x0,0x0,0x0,0x0,0xc9,0x97,0xfb,0x0,0x3c,0x14,0x1e,0x23,0xf,0x5,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) _C2EA_CharacterTable_FE6(0x2f1,0x33d,0x3b,0x7,0x0,0x7,DarkAffinity,0x25,0x1,0x0,0x3,0x2,0x3,0x0,0x0,0x14,0x0,NoRank,NoRank,CRank,NoRank,NoRank,NoRank,NoRank,NoRank,0x0,0x3c,0x2d,0x1e,0x0,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0) diff --git a/gfx/Anims/Installer.event b/gfx/Anims/Installer.event index 9b491084..432c0b5f 100644 --- a/gfx/Anims/Installer.event +++ b/gfx/Anims/Installer.event @@ -1,5 +1,18 @@ + + +// #define MAKE_CACHE_ROM +MESSAGE CURRENTOFFSET +MESSAGE "Installing Animations" +#ifdef MAKE_CACHE_ROM #include "Internals.event" +#include "GeneratedInstaller.event" +#else +ORG $600000 + CURRENTOFFSET +#endif +MESSAGE CURRENTOFFSET + + #define WepTypeAnim(Animation, typeID) "{ Label: ; ORG Label + (typeID * 4); BYTE typeID 0x01 ; SHORT Animation; ORG Label; }" #define ItemAnim(Animation, itemID) "{ Label: ; ORG Label + (14 * 4); BYTE itemID 0 ; SHORT Animation; ORG Label; }" @@ -43,9 +56,6 @@ weaponAnimEnd -MESSAGE "Installing Animations" -//#include "GeneratedInstaller.event" - diff --git a/gfx/Installer.event b/gfx/Installer.event index ced653ac..4d88e4c8 100644 --- a/gfx/Installer.event +++ b/gfx/Installer.event @@ -1,6 +1,6 @@ +#include "Anims/Installer.event" #include "Portraits/Installer.event" //#include "ClassCards/Installer.event" -#include "Anims/Installer.event" #include "MapSprites/Installer.event" diff --git a/gfx/Portraits/Installer.event b/gfx/Portraits/Installer.event index 8fb447b3..0d843e1f 100644 --- a/gfx/Portraits/Installer.event +++ b/gfx/Portraits/Installer.event @@ -7,6 +7,13 @@ // 0x1104, 0x1404 mouth #endif +#ifndef _FE6_ +#ifdef SetMugEntry + #undef SetMugEntry +#endif +#define SetMugEntry(mugEntry, mugLocation, mouthX, mouthY, eyeX, eyeY)"PUSH; ORG NewPortraitTable+mugEntry*0x1C; POIN mugLocation; POIN mugLocation+0x1624; POIN mugLocation+0x1604; POIN mugLocation+0x1004; BYTE 0 0 0 0; BYTE mouthX mouthY eyeX eyeY; BYTE 1 0 1 0; POP" +#endif + // #define FirstMugID 0xAC #define FirstMugID 0x100