Merge pull request #4 from MokhaLeee/cskillsys-dev

Adaptation to cskillsystem
laqieer · Aug 26, 2024 · 9b2f60b · 9b2f60b
2 parents af9550e + 452d545
commit 9b2f60b
Show file tree

Hide file tree

Showing 8 changed files with 1,291 additions and 1 deletion.
diff --git a/FEBuilderGBA/FEBuilderGBA.csproj b/FEBuilderGBA/FEBuilderGBA.csproj
@@ -1003,6 +1003,12 @@
     <Compile Include="SkillConfigSkillSystemForm.Designer.cs">
       <DependentUpon>SkillConfigSkillSystemForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SkillConfigFE8UCSkillSys09xForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SkillConfigFE8UCSkillSys09xForm.Designer.cs">
+      <DependentUpon>SkillConfigFE8UCSkillSys09xForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="SongExchangeForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -2243,6 +2249,9 @@
     <EmbeddedResource Include="RAMRewriteToolForm.resx">
       <DependentUpon>RAMRewriteToolForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SkillConfigFE8UCSkillSys09xForm.resx">
+      <DependentUpon>SkillConfigFE8UCSkillSys09xForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SongInstrumentDirectSoundForm.resx">
       <DependentUpon>SongInstrumentDirectSoundForm.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/FEBuilderGBA/InputFormRef.cs b/FEBuilderGBA/InputFormRef.cs
@@ -8227,6 +8227,10 @@ public static string GetSkillName(uint num)
             {
                 return SkillConfigFE8NVer2SkillForm.GetSkillText(num);
             }
+            else if (skill == PatchUtil.skill_system_enum.CSkillSys09x)
+            {
+                return SkillConfigCSkillSystem09xForm.GetSkillName(num);
+            }
             else
             {
                 return R.Error("スキル拡張がありません");

diff --git a/FEBuilderGBA/MainFE8Form.cs b/FEBuilderGBA/MainFE8Form.cs
@@ -643,6 +643,10 @@ private void SkillConfigButton_Click(object sender, EventArgs e)
             else if (skill == PatchUtil.skill_system_enum.FE8N_ver3)
             {
             }
+            else if (skill == PatchUtil.skill_system_enum.CSkillSys09x)
+            {
+                InputFormRef.JumpForm<SkillConfigCSkillSystem09xForm>();
+            }
             else
             {
                 R.ShowStopError(R._("スキル拡張がありません。\r\nスキル拡張パッチをインストールしてから利用してください。"));
@@ -666,6 +670,7 @@ private void SkillAssignmentUnitButton_Click(object sender, EventArgs e)
                 || skill == PatchUtil.skill_system_enum.FE8N_ver2
                 || skill == PatchUtil.skill_system_enum.FE8N_ver3
                 || skill == PatchUtil.skill_system_enum.yugudora
+                || skill == PatchUtil.skill_system_enum.CSkillSys09x
                 )
             {
                 //NOP
@@ -698,7 +703,9 @@ private void SkillAssignmentClassButton_Click(object sender, EventArgs e)
                 InputFormRef.JumpForm<SkillConfigFE8NVer2SkillForm>();
             }
             else if (skill == PatchUtil.skill_system_enum.FE8N
-                || skill == PatchUtil.skill_system_enum.yugudora)
+                || skill == PatchUtil.skill_system_enum.yugudora
+                || skill == PatchUtil.skill_system_enum.CSkillSys09x
+            )
             {
                 //NOP
                 R.ShowStopError(R._("この機能は、FE8NVer2からのみ利用できます。"));

diff --git a/FEBuilderGBA/PatchUtil.cs b/FEBuilderGBA/PatchUtil.cs
@@ -72,6 +72,10 @@ public static uint GetLevelMaxCaps()
                 {//不明なので31とする
                     g_LevelMaxCaps = 31;
                 }
+                if (PatchUtil.SearchSkillSystem() == PatchUtil.skill_system_enum.CSkillSys09x)
+                {// UNIT_LEVEL_MAX_RE
+                    g_LevelMaxCaps = 25;
+                }
                 if (PatchUtil.SearchGrowsMod() == PatchUtil.growth_mod_enum.Vennou)
                 {//不明なので31とする
                     g_LevelMaxCaps = 31;
@@ -166,6 +170,7 @@ public enum skill_system_enum
             yugudora,       //for FE8J   FE8Nのカスタマイズ
             midori,         //for FE8J   初期から独自スキルを実装していた拡張
             SkillSystem,    //for FE8U
+            CSkillSys09x,   //for FE8U
             NoCache = (int)NO_CACHE
         };
         static skill_system_enum g_Cache_skill_system_enum = skill_system_enum.NoCache;
@@ -184,6 +189,7 @@ static skill_system_enum SearchSkillSystemLow()
                 new PatchTableSt{ name="FE8N",	ver = "FE8J", addr = 0x89268,data = new byte[]{0x00 ,0x4B ,0x9F ,0x46}},
                 new PatchTableSt{ name="midori",	ver = "FE8J", addr = 0xFE58E0,data = new byte[]{0x05 ,0x1C ,0x00 ,0xF0 ,0x25 ,0xF8 ,0x01 ,0x29 ,0x04 ,0xD0 ,0x28 ,0x1C ,0x00 ,0xF0 ,0x28 ,0xF8}},
                 new PatchTableSt{ name="SkillSystem",	ver = "FE8U", addr = 0x2ACF8,data = new byte[]{0x70 ,0x47}},
+                new PatchTableSt{ name="CSkillSys09x",	ver = "FE8U", addr = 0xB2A604,data = new byte[]{0x43, 0x53, 0x4B, 0x49, 0x4C, 0x4C, 0x53, 0x59, 0x53, 0x5F, 0x4B, 0x2D, 0x30, 0x39, 0x78, 0x00}},
             };
 
             string version = Program.ROM.RomInfo.VersionToFilename;
@@ -223,6 +229,10 @@ static skill_system_enum SearchSkillSystemLow()
                 {
                     return skill_system_enum.SkillSystem;
                 }
+                if (t.name == "CSkillSys09x")
+                {
+                    return skill_system_enum.CSkillSys09x;
+                }
             }
             return skill_system_enum.NO;
         }