merge Norikins stuff

Veslyquix · Dec 2, 2024 · 7bf2239 · 7bf2239
1 parent ca53079
commit 7bf2239
Show file tree

Hide file tree

Showing 71 changed files with 673 additions and 496 deletions.
diff --git a/Definitions.event b/Definitions.event
@@ -61,7 +61,7 @@
 #endif 
 
 #ifdef _FE7_ 
-
+#define UseMonsterWeapons 0x4 
 #define LordMovCost 0x8BE3888
 #define LordRainMovCost 0x8BE3CD9
 #define LordSnowMovCost 0x8BE40E9
@@ -121,6 +121,7 @@
 #define gCharacterData 0x8BDCE4C
 #endif 
 #ifdef _FE6_ 
+#define UseMonsterWeapons 0x4 
 #define LordMovCost 0x860C648
 #define DefaultMovCost 0x860C67B
 #define FighterMovCost 0x860C6E1
@@ -324,6 +325,11 @@
 #define Brigand MountainThief 
 #define FalcoKnight FalconKnight 
 
+
+#define Prince Lord 
+#define MagicSeal Mage 
+#define TransporterHorse Storage
+
 #define Ranger Nomad 
 #define MageKnight Valkyrie
 
@@ -402,6 +408,9 @@
 #define Transporter Knight 
 #define Archsage Sage 
 
+#define MagicSeal Mage 
+#define TransporterHorse Tent
+
 #endif 
 
 

diff --git a/Patches/FE6/Tables/ClassFE6Form_0060A0E8.csv b/Patches/FE6/Tables/ClassFE6Form_0060A0E8.csv
diff --git a/Patches/FE6/Tables/ClassFE6Form_0060A0E8.event b/Patches/FE6/Tables/ClassFE6Form_0060A0E8.event
diff --git a/Patches/FE7/Tables/ClassForm_00BE015C.csv b/Patches/FE7/Tables/ClassForm_00BE015C.csv
diff --git a/Patches/FE7/Tables/ClassForm_00BE015C.event b/Patches/FE7/Tables/ClassForm_00BE015C.event
diff --git a/Tables/TableDefinitions.event b/Tables/TableDefinitions.event
@@ -93,7 +93,7 @@
 #define IsBoss 0x00008000
 #define UnlockLock1 0x00010000
 #define SwordmasterUnlock 0x00020000
-#define UseMonsterWeapons 0x00040000
+// #define UseMonsterWeapons 0x00040000
 #ifdef _FE7_
   #define Morph 0x00080000
 #endif

diff --git a/gfx/Chicken_Laurent.png b/gfx/Chicken_Laurent.png
diff --git a/gfx/MapSprites/GeneratedInstaller.event b/gfx/MapSprites/GeneratedInstaller.event
diff --git a/gfx/MapSprites/Installer.event b/gfx/MapSprites/Installer.event
diff --git a/gfx/MapSprites/MMS/Brighid_Hector_Axe_Shin19walk.png b/gfx/MapSprites/MMS/Brighid_Hector_Axe_Shin19walk.png
diff --git a/gfx/MapSprites/MMS/Cantor2_Norikins_move.png b/gfx/MapSprites/MMS/Cantor2_Norikins_move.png
diff --git a/gfx/MapSprites/MMS/Chicken_Pikmin1211_walk.png b/gfx/MapSprites/MMS/Chicken_Pikmin1211_walk.png
diff --git a/gfx/MapSprites/MMS/Fencer_Blade_LordAnnoyingAnonwalk.png b/gfx/MapSprites/MMS/Fencer_Blade_LordAnnoyingAnonwalk.png
diff --git a/gfx/MapSprites/MMS/HeavyInfantry_EphraimSnewpingwalk.png b/gfx/MapSprites/MMS/HeavyInfantry_EphraimSnewpingwalk.png
diff --git a/gfx/MapSprites/MMS/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarwalk.png b/gfx/MapSprites/MMS/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarwalk.png
diff --git a/gfx/MapSprites/MMS/Magician_EliwoodTyTheBubwalk.png b/gfx/MapSprites/MMS/Magician_EliwoodTyTheBubwalk.png
diff --git a/gfx/MapSprites/MMS/Parson_Priest_M_Caped_Staff_topazlightwalk.png b/gfx/MapSprites/MMS/Parson_Priest_M_Caped_Staff_topazlightwalk.png
diff --git a/gfx/MapSprites/MMS/RedMage2_Sage_Hat_TopazlightUnknownwalk.png b/gfx/MapSprites/MMS/RedMage2_Sage_Hat_TopazlightUnknownwalk.png
diff --git a/...MapSprites/MMS/US_Infantry_Amydwalk_1.png → ...MapSprites/MMS/Sandworm_Norikins_move.png b/...MapSprites/MMS/US_Infantry_Amydwalk_1.png → ...MapSprites/MMS/Sandworm_Norikins_move.png
diff --git a/gfx/MapSprites/MMS/Sentinel_Halberdier_Aruka_Kenpuhuwalk.png b/gfx/MapSprites/MMS/Sentinel_Halberdier_Aruka_Kenpuhuwalk.png
diff --git a/gfx/MapSprites/MMS/WarCleric_F_Staff_SkidMarc25walk.png b/gfx/MapSprites/MMS/WarCleric_F_Staff_SkidMarc25walk.png
diff --git a/gfx/MapSprites/SMS/Brighid_Hector_Axe_Shin19stand.png b/gfx/MapSprites/SMS/Brighid_Hector_Axe_Shin19stand.png
diff --git a/gfx/MapSprites/SMS/Cantor2_Norikins_stand.png b/gfx/MapSprites/SMS/Cantor2_Norikins_stand.png
diff --git a/gfx/MapSprites/SMS/Chicken_Pikmin1211_stand.png b/gfx/MapSprites/SMS/Chicken_Pikmin1211_stand.png
diff --git a/gfx/MapSprites/SMS/Fencer_Blade_LordAnnoyingAnonstand.png b/gfx/MapSprites/SMS/Fencer_Blade_LordAnnoyingAnonstand.png
diff --git a/gfx/MapSprites/SMS/US_Infantry_Amydstand.png → ...S/HeavyInfantry_Ephraim_Snewpingstand.png b/gfx/MapSprites/SMS/US_Infantry_Amydstand.png → ...S/HeavyInfantry_Ephraim_Snewpingstand.png
diff --git a/gfx/MapSprites/SMS/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarstand.png b/gfx/MapSprites/SMS/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarstand.png
diff --git a/gfx/MapSprites/SMS/Magician_Eliwood_16x16_TyTheBubstand.png b/gfx/MapSprites/SMS/Magician_Eliwood_16x16_TyTheBubstand.png
diff --git a/gfx/MapSprites/SMS/Parson_Priest_M_Caped_Staff_topazlightstand.png b/gfx/MapSprites/SMS/Parson_Priest_M_Caped_Staff_topazlightstand.png
diff --git a/gfx/MapSprites/SMS/RedMage2_Sage_Hat_TopazlightUnknownstand.png b/gfx/MapSprites/SMS/RedMage2_Sage_Hat_TopazlightUnknownstand.png
diff --git a/gfx/MapSprites/SMS/Sandworm_Norikins_stand.png b/gfx/MapSprites/SMS/Sandworm_Norikins_stand.png
diff --git a/gfx/MapSprites/SMS/Sentinel_Halberdier_Aruka_Kenpuhustand.png b/gfx/MapSprites/SMS/Sentinel_Halberdier_Aruka_Kenpuhustand.png
diff --git a/gfx/MapSprites/SMS/WarCleric_F_Staff_SkidMarc25stand.png b/gfx/MapSprites/SMS/WarCleric_F_Staff_SkidMarc25stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/Brighid_Hector Axe {Shin19}-stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/Brighid_Hector Axe {Shin19}-stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/Cantor2_Norikins_stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/Cantor2_Norikins_stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/Chicken_Pikmin1211_stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/Chicken_Pikmin1211_stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/Fencer_Blade Lord{AnnoyingAnon}-stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/Fencer_Blade Lord{AnnoyingAnon}-stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/HeavyInfantry_Ephraim {Snewping}-stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/HeavyInfantry_Ephraim {Snewping}-stand.png
diff --git a/...R Map Sprites/SMS/LegionKing_Lance {EN, L95, Pikmin, Der, Huichelaar}-stand.png b/...R Map Sprites/SMS/LegionKing_Lance {EN, L95, Pikmin, Der, Huichelaar}-stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/Magician_Eliwood 16x16 {TyTheBub}-stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/Magician_Eliwood 16x16 {TyTheBub}-stand.png
diff --git a/...prites/SRR Map Sprites/SMS/Parson_Priest (M) Caped Staff {topazlight}-stand.png b/...prites/SRR Map Sprites/SMS/Parson_Priest (M) Caped Staff {topazlight}-stand.png
diff --git a/...pSprites/SRR Map Sprites/SMS/RedMage2_Sage (Hat) {Topazlight,Unknown}-stand.png b/...pSprites/SRR Map Sprites/SMS/RedMage2_Sage (Hat) {Topazlight,Unknown}-stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/Sandworm_Norikins_stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/Sandworm_Norikins_stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/Sentinel_Halberdier_{Aruka, Kenpuhu}-stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/Sentinel_Halberdier_{Aruka, Kenpuhu}-stand.png
diff --git a/gfx/MapSprites/SRR Map Sprites/SMS/WarCleric (F) Staff {SkidMarc25}-stand.png b/gfx/MapSprites/SRR Map Sprites/SMS/WarCleric (F) Staff {SkidMarc25}-stand.png
diff --git a/...apSprites/SMS/War_Monk_M_Axe_Derstand.png → gfx/MapSprites/War_Monk_M_Axe_Derstand.png b/...apSprites/SMS/War_Monk_M_Axe_Derstand.png → gfx/MapSprites/War_Monk_M_Axe_Derstand.png
diff --git a/...MapSprites/MMS/War_Monk_M_Axe_Derwalk.png → gfx/MapSprites/War_Monk_M_Axe_Derwalk.png b/...MapSprites/MMS/War_Monk_M_Axe_Derwalk.png → gfx/MapSprites/War_Monk_M_Axe_Derwalk.png
diff --git a/gfx/MapSprites/dmp/Brighid_Hector_Axe_Shin19stand.dmp b/gfx/MapSprites/dmp/Brighid_Hector_Axe_Shin19stand.dmp
diff --git a/gfx/MapSprites/dmp/Brighid_Hector_Axe_Shin19walk.dmp b/gfx/MapSprites/dmp/Brighid_Hector_Axe_Shin19walk.dmp
diff --git a/gfx/MapSprites/dmp/Cantor2_Norikins_move.dmp b/gfx/MapSprites/dmp/Cantor2_Norikins_move.dmp
diff --git a/gfx/MapSprites/dmp/Cantor2_Norikins_stand.dmp b/gfx/MapSprites/dmp/Cantor2_Norikins_stand.dmp
diff --git a/gfx/MapSprites/dmp/Chicken_Pikmin1211_stand.dmp b/gfx/MapSprites/dmp/Chicken_Pikmin1211_stand.dmp
diff --git a/gfx/MapSprites/dmp/Chicken_Pikmin1211_walk.dmp b/gfx/MapSprites/dmp/Chicken_Pikmin1211_walk.dmp
diff --git a/gfx/MapSprites/dmp/Fencer_Blade_LordAnnoyingAnonstand.dmp b/gfx/MapSprites/dmp/Fencer_Blade_LordAnnoyingAnonstand.dmp
diff --git a/gfx/MapSprites/dmp/Fencer_Blade_LordAnnoyingAnonwalk.dmp b/gfx/MapSprites/dmp/Fencer_Blade_LordAnnoyingAnonwalk.dmp
diff --git a/gfx/MapSprites/dmp/HeavyInfantry_EphraimSnewpingwalk.dmp b/gfx/MapSprites/dmp/HeavyInfantry_EphraimSnewpingwalk.dmp
diff --git a/gfx/MapSprites/dmp/HeavyInfantry_Ephraim_Snewpingstand.dmp b/gfx/MapSprites/dmp/HeavyInfantry_Ephraim_Snewpingstand.dmp
diff --git a/gfx/MapSprites/dmp/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarstand.dmp b/gfx/MapSprites/dmp/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarstand.dmp
diff --git a/gfx/MapSprites/dmp/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarwalk.dmp b/gfx/MapSprites/dmp/LegionKing_Lance_EN_L95_Pikmin_Der_Huichelaarwalk.dmp
diff --git a/gfx/MapSprites/dmp/Magician_EliwoodTyTheBubwalk.dmp b/gfx/MapSprites/dmp/Magician_EliwoodTyTheBubwalk.dmp
diff --git a/gfx/MapSprites/dmp/Magician_Eliwood_16x16_TyTheBubstand.dmp b/gfx/MapSprites/dmp/Magician_Eliwood_16x16_TyTheBubstand.dmp
diff --git a/gfx/MapSprites/dmp/Parson_Priest_M_Caped_Staff_topazlightstand.dmp b/gfx/MapSprites/dmp/Parson_Priest_M_Caped_Staff_topazlightstand.dmp
diff --git a/gfx/MapSprites/dmp/Parson_Priest_M_Caped_Staff_topazlightwalk.dmp b/gfx/MapSprites/dmp/Parson_Priest_M_Caped_Staff_topazlightwalk.dmp
diff --git a/gfx/MapSprites/dmp/RedMage2_Sage_Hat_TopazlightUnknownstand.dmp b/gfx/MapSprites/dmp/RedMage2_Sage_Hat_TopazlightUnknownstand.dmp
diff --git a/gfx/MapSprites/dmp/RedMage2_Sage_Hat_TopazlightUnknownwalk.dmp b/gfx/MapSprites/dmp/RedMage2_Sage_Hat_TopazlightUnknownwalk.dmp
diff --git a/gfx/MapSprites/dmp/Sandworm_Norikins_move.dmp b/gfx/MapSprites/dmp/Sandworm_Norikins_move.dmp
diff --git a/gfx/MapSprites/dmp/Sandworm_Norikins_stand.dmp b/gfx/MapSprites/dmp/Sandworm_Norikins_stand.dmp
diff --git a/gfx/MapSprites/dmp/Sentinel_Halberdier_Aruka_Kenpuhustand.dmp b/gfx/MapSprites/dmp/Sentinel_Halberdier_Aruka_Kenpuhustand.dmp
diff --git a/gfx/MapSprites/dmp/Sentinel_Halberdier_Aruka_Kenpuhuwalk.dmp b/gfx/MapSprites/dmp/Sentinel_Halberdier_Aruka_Kenpuhuwalk.dmp
diff --git a/gfx/MapSprites/dmp/WarCleric_F_Staff_SkidMarc25stand.dmp b/gfx/MapSprites/dmp/WarCleric_F_Staff_SkidMarc25stand.dmp
diff --git a/gfx/MapSprites/dmp/WarCleric_F_Staff_SkidMarc25walk.dmp b/gfx/MapSprites/dmp/WarCleric_F_Staff_SkidMarc25walk.dmp