Merge pull request MokhaLeee#379 from FireEmblemUniverse/main

update

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
       run: |
         git clone https://github.com/MokhaLeee/FE-CLib-Mokha.git Tools/FE-CLib-Mokha
         git clone https://github.com/StanHash/FE-PyTools.git --recursive Tools/FE-PyTools
-        git clone https://github.com/StanHash/EventAssembler.git --recursive Tools/EventAssembler
+        git clone https://github.com/MokhaLeee/EventAssembler.git -b mokha-fix Tools/EventAssembler
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3

Contents/Texts/Source/texts/SkillSys.txt

@@ -38,3 +38,6 @@ Select a skill to remove and generate scroll[X]
 
 ## MSG_ThousandGoldSpent
 Spent 1000 Gold.[X]
+
+## MSG_PopupSkillLearned
+Acquired![.][X]

Contents/Texts/Source/texts/Skills_CombatArt.txt

@@ -106,3 +106,27 @@ Detonate[X]
 Detonate:[NL]
 Art: Strike a powerful pierced[NL]
 blow by sacrificing own weapon[X]
+
+## MSG_SKILL_COMBAT_BloodTribute_NAME
+BloodTribute[X]
+
+## MSG_SKILL_COMBAT_BloodTribute
+Blood Tribute:[NL]
+Art: Sacrifice 30% HP to deal[NL]
+more damage as the cost.[X]
+
+## MSG_SKILL_COMBAT_CrimsonStrike_NAME
+CrimsonStrike[X]
+
+## MSG_SKILL_COMBAT_CrimsonStrike
+Crimson Strike:[NL]
+Art: Sacrifice 50% HP to deal[NL]
+more damage as the cost.[X]
+
+## MSG_SKILL_COMBAT_VitalReckoning_NAME
+VitalReckoning[X]
+
+## MSG_SKILL_COMBAT_VitalReckoning
+Vital Reckoning:[NL]
+Art: Sacrifice 80% HP to deal[NL]
+more damage as the cost.[X]

Contents/Texts/Source/texts/misc.txt

@@ -1,8 +1,8 @@
 ## MSG_SkillEffect_PosReturn_Confirm
-Return?        [NL][Yes][X]
+Return?           [NL][Yes][X]
 
 ## MSG_SkillEffect_Lunge_Confirm
-Swap position?        [NL][Yes][X]
+Swap position?           [NL][Yes][X]
 
 ## MSG_GaidenBMagic_UM_NAME
  B.Mag[X]

Contents/Texts/Source/vanilla.txt

@@ -6874,7 +6874,7 @@ Renais as a troop leader. His strength,[.][LF]
 valor, and experience inspired many.[X]
 
 ## MSG_07E9
-Innes, King and Strategician[X]
+Innes, King[X]
 
 ## MSG_07EA
 As time went on, he succeeded his father,[.][LF]

Data/CombatArt/CombatArtInfo.c

@@ -433,4 +433,31 @@ const struct CombatArtInfo gCombatArtInfos[0x100] = {
 		.battle_status.display_en_n = true,
 		.double_attack = COMBART_DOUBLE_DISABLED,
 	},
+	[CID_BloodTribute] = {
+		.name = MSG_SKILL_COMBAT_BloodTribute_NAME,
+		.desc = MSG_SKILL_COMBAT_BloodTribute,
+		.icon = GFX_SkillIcon_WIP,
+		.wtype = CA_WTYPE_ANY,
+		.cost = 1,
+		.battle_status.display_en_n = true,
+		.double_attack = COMBART_DOUBLE_ENABLED,
+	},
+	[CID_CrimsonStrike] = {
+		.name = MSG_SKILL_COMBAT_CrimsonStrike_NAME,
+		.desc = MSG_SKILL_COMBAT_CrimsonStrike,
+		.icon = GFX_SkillIcon_WIP,
+		.wtype = CA_WTYPE_ANY,
+		.cost = 1,
+		.battle_status.display_en_n = true,
+		.double_attack = COMBART_DOUBLE_ENABLED,
+	},
+	[CID_VitalReckoning] = {
+		.name = MSG_SKILL_COMBAT_VitalReckoning_NAME,
+		.desc = MSG_SKILL_COMBAT_VitalReckoning,
+		.icon = GFX_SkillIcon_WIP,
+		.wtype = CA_WTYPE_ANY,
+		.cost = 1,
+		.battle_status.display_en_n = true,
+		.double_attack = COMBART_DOUBLE_ENABLED,
+	},
 };

Data/CombatArt/CombatArtSkill.c

@@ -104,4 +104,16 @@ const u8 gCombatArtSkillTable[MAX_SKILL_NUM + 1] = {
 #if defined(SID_COMBAT_Detonate) && (COMMON_SKILL_VALID(SID_COMBAT_Detonate))
 	[SID_COMBAT_Detonate] = CID_Detonate,
 #endif
+
+#if defined(SID_COMBAT_BloodTribute) && (COMMON_SKILL_VALID(SID_COMBAT_BloodTribute))
+	[SID_COMBAT_BloodTribute] = CID_BloodTribute,
+#endif
+
+#if defined(SID_COMBAT_CrimsonStrike) && (COMMON_SKILL_VALID(SID_COMBAT_CrimsonStrike))
+	[SID_COMBAT_CrimsonStrike] = CID_CrimsonStrike,
+#endif
+
+#if defined(SID_COMBAT_VitalReckoning) && (COMMON_SKILL_VALID(SID_COMBAT_VitalReckoning))
+	[SID_COMBAT_VitalReckoning] = CID_VitalReckoning,
+#endif
 };

Data/CombatArt/CombatArtWeapon.c

@@ -5,4 +5,5 @@
 const u8 gCombatArtWeaponTable[0x100] = {
 	[ITEM_SWORD_SLIM] = CID_Hexblade,
 	[ITEM_LANCE_SLIM] = CID_FrozenLance,
+	[ITEM_DARK_NOSFERATU] = CID_BloodTribute,
 };

Data/Data.event

@@ -34,6 +34,7 @@
 #include "GaidenMagic/GaidenMagicData.event"
 #include "GaidenMagic/GaidenMagicData.lyn.event"
 #include "MaxStatus/MaxStatus.lyn.event"
+#include "JobGrowth/JobGrowth.lyn.event"
 #include "Shield/ShieldConfig.lyn.event"
 
 #endif

Data/JobGrowth/JobGrowth.c

@@ -0,0 +1,4 @@
+#include <common-chax.h>
+#include <lvup.h>
+
+struct JobGrowthEnt const gJobGrowthList[0x100] = {};

Data/SkillSys/SkillAnimInfo.c

@@ -251,6 +251,18 @@ const u8 EfxSkillAnimPriority[MAX_SKILL_NUM + 1] = {
 #if (defined(SID_BloodReaver) && COMMON_SKILL_VALID(SID_BloodReaver))
 	[SID_BloodReaver] = EFX_PRIORITY_LOW,
 #endif
+
+#if (defined(SID_COMBAT_BloodTribute) && COMMON_SKILL_VALID(SID_COMBAT_BloodTribute))
+	[SID_COMBAT_BloodTribute] = EFX_PRIORITY_LOW,
+#endif
+
+#if (defined(SID_COMBAT_CrimsonStrike) && COMMON_SKILL_VALID(SID_COMBAT_CrimsonStrike))
+	[SID_COMBAT_CrimsonStrike] = EFX_PRIORITY_LOW,
+#endif
+
+#if (defined(SID_COMBAT_VitalReckoning) && COMMON_SKILL_VALID(SID_COMBAT_VitalReckoning))
+	[SID_COMBAT_VitalReckoning] = EFX_PRIORITY_LOW,
+#endif
 };
 
 struct EfxAnimConf const *const EfxSkillAnims[MAX_SKILL_NUM + 1] = {
@@ -501,4 +513,16 @@ struct EfxAnimConf const *const EfxSkillAnims[MAX_SKILL_NUM + 1] = {
 #if (defined(SID_BloodReaver) && COMMON_SKILL_VALID(SID_BloodReaver))
 	[SID_BloodReaver] = &EfxSkillVanilla,
 #endif
+
+#if (defined(SID_COMBAT_BloodTribute) && COMMON_SKILL_VALID(SID_COMBAT_BloodTribute))
+	[SID_COMBAT_BloodTribute] = &EfxSkillVanilla,
+#endif
+
+#if (defined(SID_COMBAT_CrimsonStrike) && COMMON_SKILL_VALID(SID_COMBAT_CrimsonStrike))
+	[SID_COMBAT_CrimsonStrike] = &EfxSkillVanilla,
+#endif
+
+#if (defined(SID_COMBAT_VitalReckoning) && COMMON_SKILL_VALID(SID_COMBAT_VitalReckoning))
+	[SID_COMBAT_VitalReckoning] = &EfxSkillVanilla,
+#endif
 };

Data/SkillSys/SkillExtraInfo.c

@@ -1122,4 +1122,16 @@ const struct SkillExtraInfo gSkillExtraInfo[MAX_SKILL_NUM + 1] = {
 #if (defined(SID_Witch) && COMMON_SKILL_VALID(SID_Witch))
 	[SID_Witch] = {{ 5 }},
 #endif
+
+#if (defined(SID_COMBAT_BloodTribute) && COMMON_SKILL_VALID(SID_COMBAT_BloodTribute))
+	[SID_COMBAT_BloodTribute] = {{ 30, 100 }},
+#endif
+
+#if (defined(SID_COMBAT_CrimsonStrike) && COMMON_SKILL_VALID(SID_COMBAT_CrimsonStrike))
+	[SID_COMBAT_CrimsonStrike] = {{ 50, 100 }},
+#endif
+
+#if (defined(SID_COMBAT_VitalReckoning) && COMMON_SKILL_VALID(SID_COMBAT_VitalReckoning))
+	[SID_COMBAT_VitalReckoning] = {{ 80, 100 }},
+#endif
 };

Data/SkillSys/SkillInfo.c

@@ -3825,4 +3825,28 @@ const struct SkillInfo gSkillInfos[MAX_SKILL_NUM + 1] = {
 		.icon = GFX_SkillIcon_WIP,
 	},
 #endif
+
+#if (defined(SID_COMBAT_BloodTribute) && COMMON_SKILL_VALID(SID_COMBAT_BloodTribute))
+	[SID_COMBAT_BloodTribute] = {
+		.name = MSG_SKILL_COMBAT_BloodTribute_NAME,
+		.desc = MSG_SKILL_COMBAT_BloodTribute,
+		.icon = GFX_SkillIcon_WIP,
+	},
+#endif
+
+#if (defined(SID_COMBAT_CrimsonStrike) && COMMON_SKILL_VALID(SID_COMBAT_CrimsonStrike))
+	[SID_COMBAT_CrimsonStrike] = {
+		.name = MSG_SKILL_COMBAT_CrimsonStrike_NAME,
+		.desc = MSG_SKILL_COMBAT_CrimsonStrike,
+		.icon = GFX_SkillIcon_WIP,
+	},
+#endif
+
+#if (defined(SID_COMBAT_VitalReckoning) && COMMON_SKILL_VALID(SID_COMBAT_VitalReckoning))
+	[SID_COMBAT_VitalReckoning] = {
+		.name = MSG_SKILL_COMBAT_VitalReckoning_NAME,
+		.desc = MSG_SKILL_COMBAT_VitalReckoning,
+		.icon = GFX_SkillIcon_WIP,
+	},
+#endif
 };

Data/SkillSys/SkillTable-generic.c

@@ -3,92 +3,93 @@
 #include "constants/skills.h"
 
 const struct SkillPreloadPConf gSkillPreloadPData[0x100] = {
-	[CHARACTER_EIRIKA] = {
-		.skills = {
+	[CHARACTER_EIRIKA] = {{
 #if (defined(SID_SpdBonus) && COMMON_SKILL_VALID(SID_SpdBonus))
-			[0] = SID_SpdBonus,
+		[0] = SID_SpdBonus,
 #endif
 
 #if (defined(SID_PosReturn) && COMMON_SKILL_VALID(SID_PosReturn))
-			[1] = SID_PosReturn,
+		[1] = SID_PosReturn,
 #endif
 
 #if (defined(SID_DoubleLion) && COMMON_SKILL_VALID(SID_DoubleLion))
-			[2] = SID_DoubleLion,
+		[2] = SID_DoubleLion,
 #endif
 
 #if (defined(SID_Desperation) && COMMON_SKILL_VALID(SID_Desperation))
-			[3] = SID_Desperation,
+		[3] = SID_Desperation,
 #endif
-		},
-	},
-	[CHARACTER_EPHRAIM] = {
-		.skills = {
+
+#if (defined(SID_RightfulGod) && COMMON_SKILL_VALID(SID_RightfulGod))
+		[10] = SID_RightfulGod,
+#endif
+	}},
+
+	[CHARACTER_EPHRAIM] = {{
 #if (defined(SID_StrBonus) && COMMON_SKILL_VALID(SID_StrBonus))
-			[0] = SID_StrBonus,
+		[0] = SID_StrBonus,
 #endif
-		},
-	},
+	}},
 
-	[CHARACTER_SETH] = {
-		.skills = {
+	[CHARACTER_SETH] = {{
 #if (defined(SID_Vantage) && COMMON_SKILL_VALID(SID_Vantage))
-			[0] = SID_Vantage,
+		[0] = SID_Vantage,
 #endif
-		},
-	},
+	}},
 
-	[CHARACTER_INNES] = {
-		.skills = {
+	[CHARACTER_INNES] = {{
 #if (defined(SID_RangeBonusBow2) && COMMON_SKILL_VALID(SID_RangeBonusBow2))
-			[0] = SID_RangeBonusBow2,
+		[0] = SID_RangeBonusBow2,
 #endif
 
 #if (defined(SID_Lunge) && COMMON_SKILL_VALID(SID_Lunge))
-			[1] = SID_Lunge,
+		[1] = SID_Lunge,
 #endif
-		},
-	},
+	}},
 
-	[CHARACTER_SALEH] = {
-		.skills = {
+	[CHARACTER_SALEH] = {{
 #if (defined(SID_RangeBonusBMag1) && COMMON_SKILL_VALID(SID_RangeBonusBMag1))
-			[0] = SID_RangeBonusBMag1,
+		[0] = SID_RangeBonusBMag1,
 #endif
 
 #if (defined(SID_RangeBonusBMag2) && COMMON_SKILL_VALID(SID_RangeBonusBMag2))
-			[1] = SID_RangeBonusBMag2,
+		[1] = SID_RangeBonusBMag2,
 #endif
 
 #if (defined(SID_Lunge) && COMMON_SKILL_VALID(SID_Lunge))
-			[2] = SID_Lunge,
+		[2] = SID_Lunge,
+#endif
+	}},
+
+	[CHARACTER_MYRRH] = {{
+#if (defined(SID_RangeBonusBMag1) && COMMON_SKILL_VALID(SID_RangeBonusBMag1))
+		[10] = SID_RangeBonusBMag1,
 #endif
-		},
-	},
+	}},
 
-	[CHARACTER_RIEV] = {
-		.skills = {
+	[CHARACTER_RIEV] = {{
 #if (defined(SID_Thunderstorm) && COMMON_SKILL_VALID(SID_Thunderstorm))
-			[0] = SID_Thunderstorm,
+		[0] = SID_Thunderstorm,
 #endif
-		},
-	},
+	}},
 };
 
 const struct SkillPreloadJConf gSkillPreloadJData[0x100] = {
-	[CLASS_SNIPER] = {
-		.skills = {
+	[CLASS_SNIPER] = {{
 #if (defined(SID_RangeBonusBow2) && COMMON_SKILL_VALID(SID_RangeBonusBow2))
-			[10] = SID_RangeBonusBow2,
+		[10] = SID_RangeBonusBow2,
 #endif
-		},
-	},
+	}},
 
-	[CLASS_SNIPER_F] = {
-		.skills = {
+	[CLASS_SNIPER_F] = {{
 #if (defined(SID_RangeBonusBow2) && COMMON_SKILL_VALID(SID_RangeBonusBow2))
-			[10] = SID_RangeBonusBow2,
+		[10] = SID_RangeBonusBow2,
+#endif
+	}},
+
+	[CLASS_MANAKETE_MYRRH] = {{
+#if (defined(SID_SuperLuck) && COMMON_SKILL_VALID(SID_SuperLuck))
+		[10] = SID_SuperLuck
 #endif
-		},
-	},
+	}},
 };

Data/SkillSys/SkillTable-item.c

@@ -6,6 +6,12 @@ const u16 gConstSkillTable_Item[0x100][2] = {
 	[ITEM_SWORD_SLIM] = {
 #if (defined(SID_RuinedBladePlus) && COMMON_SKILL_VALID(SID_RuinedBladePlus))
 		SID_RuinedBladePlus,
+#endif
+	},
+
+	[ITEM_DARK_NOSFERATU] = {
+#if (defined(SID_COMBAT_CrimsonStrike) && COMMON_SKILL_VALID(SID_COMBAT_CrimsonStrike))
+		SID_COMBAT_CrimsonStrike,
 #endif
 	},
 };

Data/SkillSys/SkillTable-job.c

@@ -3,6 +3,12 @@
 #include "constants/skills.h"
 
 const u16 gConstSkillTable_Job[0x100][2] = {
+	[CLASS_EPHRAIM_LORD] = {
+#if (defined(SID_COMBAT_VitalReckoning) && COMMON_SKILL_VALID(SID_COMBAT_VitalReckoning))
+		SID_COMBAT_VitalReckoning,
+#endif
+	},
+
 	[CLASS_EIRIKA_LORD] = {
 #if (defined(SID_Pass) && COMMON_SKILL_VALID(SID_Pass))
 		SID_Pass,
@@ -13,6 +19,12 @@ const u16 gConstSkillTable_Job[0x100][2] = {
 #endif
 	},
 
+	[CLASS_EPHRAIM_MASTER_LORD] = {
+#if (defined(SID_SpectrumBoost) && COMMON_SKILL_VALID(SID_SpectrumBoost))
+		SID_SpectrumBoost,
+#endif
+	},
+
 	[CLASS_PALADIN] = {
 #if (defined(SID_HoneCavalry) && COMMON_SKILL_VALID(SID_HoneCavalry))
 		SID_HoneCavalry,