bye bye ucf08

.github/workflows/build.yml

@@ -9,14 +9,17 @@ on:
         default: "ignore"
   push:
     branches:
-      - slippi
-      - ci
+      - "**"
   pull_request:
     paths-ignore:
       - "**.md"
     branches:
       - "**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   ubuntu64:
     name: "Loader Build"

SLIPPI.md

@@ -11,7 +11,7 @@ _Project Slippi Nintendont only officially supports the NTSC 1.02 version of Mel
 - Support for writing Slippi replays to a storage device (USB drive/SD card)
 - Support for streaming replay data over Wi-Fi or a USB Ethernet adapter
 - Allows users to toggle various codes before booting into Melee:
-	- Controller fixes (permanent UCF, stealth UCF, in-game toggleable UCF/Ardiuno fixes)
+	- Controller fixes (UCF 0.84 + stealth version)
 	- Stealth Tournament Mods (Neutral Spawns, hidden nametag when invisible, keep nametag during rotation)
 	- Tournament Mods (Stealth Mods, D-Pad for rumble, stage striking)
 	- Quality-of-life Mods (Tournament Mods, skip results, salty runback)

common/config/MeleeCodes.c

@@ -1,7 +1,5 @@
 #include "MeleeCodes.h"
 
-#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
 
@@ -41,27 +39,13 @@ const MeleeCodeOption cfOptionOff = {
 const MeleeCodeOption cfOptionUcf = {
 	2, // value
 	"UCF", // name
-	g_ucf_size, // codeLen
-	g_ucf, // code
+	g_ucf_084_size, // codeLen
+	g_ucf_084, // code
 };
 
 const MeleeCodeOption cfOptionStealthUcf = {
 	3, // value
 	"Stealth", // name
-	g_ucf_stealth_size, // codeLen
-	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
 };
@@ -70,8 +54,6 @@ 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"
@@ -80,19 +62,17 @@ 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",
+	"    Will enable UCF 0.84. Includes",
+	"    dashback, shield drop,",
+	"    wiggle out of tumble,",
+	"    1.0 cardinals, frame 1 SDI fix,",
+	"    and shield drop range up",
+	"    conditional increase.",
 	"",
 	"   [Stealth]",
-	"     Enables UCF 0.8 without the",
-	"     CSS text",
+	"    Enables UCF 0.84 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 5
+#define MELEE_CODES_CF_OPTION_COUNT 3
 #define MELEE_CODES_VERSION_OPTION_COUNT 2
 #define MELEE_CODES_MODS_OPTION_COUNT 4
 #define MELEE_CODES_LAG_REDUCTION_OPTION_COUNT 3

common/include/CommonConfig.h

@@ -5,7 +5,7 @@
 #include "Metadata.h"
 #include "../config/MeleeCodes.h"
 
-#define NIN_CFG_VERSION		0x0000000D
+#define NIN_CFG_VERSION		0x0000000E
 
 #define NIN_CFG_MAXPAD 4
 

loader/source/global.c

@@ -469,6 +469,19 @@ void UpdateNinCFG()
 		// 0 defaults are fine
 		ncfg->Version = 0xD;
 	}
+	if (ncfg->Version == 0xD)
+	{
+		switch(ncfg->MeleeCodeOptions[0])
+		{
+			case 3: // UCF 0.84 Old
+				ncfg->MeleeCodeOptions[0] = 1;
+				break;
+			case 4: // UCF 0.84 Stealth
+				ncfg->MeleeCodeOptions[0] = 2;
+				break;
+		}
+		ncfg->Version = 0xE;
+	}
 }
 
 int CreateNewFile(const char *Path, unsigned int size)