Merge pull request #36 from cnkeats/feat/UCF-0.84

Add UCF 0.84

.github/workflows/build.yml

@@ -20,10 +20,10 @@ on:
 jobs:  
   ubuntu64:
     name: "Loader Build"
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: 'Fetch Git Tags'
@@ -59,13 +59,13 @@ jobs:
           cp -r ./ci/* ./release-artifact/apps/
       - name: "Publish Loader"
         if: success()
-        uses: actions/upload-artifact@v2-preview
+        uses: actions/upload-artifact@v3
         with:
           name: loader-${{ env.CURR_DATE }}-${{ env.GIT_HASH }}-${{ env.GIT_TAG }}
           path: "./artifact/"
       - name: "Publish Release Ready Loader"
         if: success()
-        uses: actions/upload-artifact@v2-preview
+        uses: actions/upload-artifact@v3
         with:
           name: release-${{ env.CURR_DATE }}-${{ env.GIT_HASH }}-${{ env.GIT_TAG }}
           path: "./release-artifact/"

common/config/MeleeCodes.c

@@ -2,6 +2,8 @@
 
 #include "../../kernel/gecko/g_ucf.h" // UCF codeset
 #include "../../kernel/gecko/g_ucf_stealth.h" // UCF Stealth
+#include "../../kernel/gecko/g_ucf_084.h" // UCF codeset
+#include "../../kernel/gecko/g_ucf_084_stealth.h" // UCF Stealth
 
 #include "../../kernel/gecko/g_pal.h" // PAL codeset
 
@@ -50,23 +52,47 @@ const MeleeCodeOption cfOptionStealthUcf = {
 	g_ucf_stealth, // code
 };
 
+const MeleeCodeOption cfOptionUcf084 = {
+	4, // value
+	"UCF 0.84 RC", // name
+	g_ucf_084_size, // codeLen
+	g_ucf_084, // code
+};
+
+const MeleeCodeOption cfOptionStealthUcf084 = {
+	5, // value
+	"Stealth 0.84", // name
+	g_ucf_084_stealth_size, // codeLen
+	g_ucf_084_stealth, // code
+};
+
 const MeleeCodeOption *cfOptions[MELEE_CODES_CF_OPTION_COUNT] = {
 	&cfOptionOff,
 	&cfOptionUcf,
 	&cfOptionStealthUcf,
+	&cfOptionUcf084,
+	&cfOptionStealthUcf084,
 };
 
+// an additional space was added to all lines to accomdate "Stealth 0.84"
+// we can remove them once 0.84 is the only option
 static const char *cfDescription[] = {
 	"The type of controller fix to apply",
 	"",
-	"  [UCF]",
-	"    Will enable UCF 0.8. Includes",
-	"    dashback, shield drop, and",
-	"    wiggle out of tumble.",
+	"   [UCF]",
+	"     Will enable UCF 0.8. Includes",
+	"     dashback, shield drop, and",
+	"     wiggle out of tumble",
 	"",
-	"  [Stealth]",
-	"    Enables UCF 0.8 without the",
-	"    CSS text",
+	"   [Stealth]",
+	"     Enables UCF 0.8 without the",
+	"     CSS text",
+	"",
+	"   [UCF 0.84 RC]",
+	"     UCF 0.84 Release candidate. Adds",
+	"     1.0 cardinals, frame 1 SDI fix,",
+	"     dbooc fix, and shield drop",
+	"     range up conditional increase.",
 	NULL
 };
 

common/config/MeleeCodes.h

@@ -1,7 +1,7 @@
 #ifndef _MELEE_CODES_H
 #define _MELEE_CODES_H
 
-#define MELEE_CODES_CF_OPTION_COUNT 3
+#define MELEE_CODES_CF_OPTION_COUNT 5
 #define MELEE_CODES_VERSION_OPTION_COUNT 2
 #define MELEE_CODES_MODS_OPTION_COUNT 4
 #define MELEE_CODES_LAG_REDUCTION_OPTION_COUNT 3
@@ -40,7 +40,7 @@ typedef struct MeleeCodeLineItem
 {
 	const int identifier; // unique identifier for a line item
 	const char *name;
-	const char *const *description;
+	const char *const *description; // max lines is 18, line length should be <= 36
 	const int defaultValue;
 	const int optionCount;
 	const MeleeCodeOption **options;