Fixes for merge

In particular controller related
Craftyawesome · Jun 2, 2024 · be116f5 · be116f5
1 parent d09bdc8
commit be116f5
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 159 deletions.
diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
@@ -39,8 +39,3 @@ jobs:
       with:
         name: update_nro
         path: bin/Switch/Release/kartswitch_*.update.nro.zip
-    - name: Upload update zip
-      uses: actions/upload-artifact@v2
-      with:
-        name: update
-        path: bin/Switch/Release/kartswitch_*.update.zip
diff --git a/downloadassets.sh b/downloadassets.sh
@@ -1,16 +1,11 @@
 #!/bin/sh
-INSTALLERURL="https://github.com/STJr/Kart-Public/releases/download/v1.3/srb2kart-v13-Installer.exe"
-PATCHURL="https://github.com/STJr/Kart-Public/releases/download/v1.3/srb2kart-v13-patcher.exe"
+INSTALLERURL="https://github.com/STJr/Kart-Public/releases/download/v1.6/srb2kart-v16-Installer.exe"
+PATCHURL="https://github.com/STJr/Kart-Public/releases/download/v1.6/srb2kart-v16-patcher.exe"
 DOWNLOADCMD="curl -Lo"
 
 cd assets
 rm *.srb *.kart *.pk3 *.dta *.wad
 ${DOWNLOADCMD} kartinstaller.exe ${INSTALLERURL}
-7z e -y -aoa kartinstaller.exe "*.srb" "*.kart" "*.pk3" "*.dta" "*.wad"
+7z x -y -aoa kartinstaller.exe "*.srb" "*.kart" "*.pk3" "*.dta" "*.wad"
 rm kartinstaller.exe
-cd patch
-rm *.srb *.kart *.pk3 *.dta *.wad
-${DOWNLOADCMD} kartpatcher.exe ${PATCHURL}
-7z e -y -aoa kartpatcher.exe "*.srb" "*.kart" "*.pk3" "*.dta" "*.wad"
-rm kartpatcher.exe
 cd ../..
diff --git a/src/g_game.c b/src/g_game.c
@@ -491,13 +491,8 @@ consvar_t cv_moveaxis = {"joyaxis_move", "None", CV_SAVE, joyaxis_cons_t, NULL,
 consvar_t cv_brakeaxis = {"joyaxis_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_aimaxis = {"joyaxis_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_lookaxis = {"joyaxis_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#ifdef __SWITCH__
-consvar_t cv_fireaxis = {"joyaxis_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis = {"joyaxis_drift", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#else
 consvar_t cv_fireaxis = {"joyaxis_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_driftaxis = {"joyaxis_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#endif
 consvar_t cv_lookbackaxis = {"joyaxis_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_xdeadzone = {"joy_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_ydeadzone = {"joy_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -507,13 +502,8 @@ consvar_t cv_moveaxis2 = {"joyaxis2_move", "None", CV_SAVE, joyaxis_cons_t, NULL
 consvar_t cv_brakeaxis2 = {"joyaxis2_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_aimaxis2 = {"joyaxis2_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_lookaxis2 = {"joyaxis2_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#ifdef __SWITCH__
-consvar_t cv_fireaxis2 = {"joyaxis2_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis2 = {"joyaxis2_drift", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#else
 consvar_t cv_fireaxis2 = {"joyaxis2_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_driftaxis2 = {"joyaxis2_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#endif
 consvar_t cv_lookbackaxis2 = {"joyaxis2_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_xdeadzone2 = {"joy2_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_ydeadzone2 = {"joy2_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -523,13 +513,8 @@ consvar_t cv_moveaxis3 = {"joyaxis3_move", "None", CV_SAVE, joyaxis_cons_t, NULL
 consvar_t cv_brakeaxis3 = {"joyaxis3_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_aimaxis3 = {"joyaxis3_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_lookaxis3 = {"joyaxis3_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#ifdef __SWITCH__
-consvar_t cv_fireaxis3 = {"joyaxis3_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis3 = {"joyaxis3_drift", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#else
 consvar_t cv_fireaxis3 = {"joyaxis3_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_driftaxis3 = {"joyaxis3_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#endif
 consvar_t cv_lookbackaxis3 = {"joyaxis3_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_xdeadzone3 = {"joy3_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_ydeadzone3 = {"joy3_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -539,13 +524,8 @@ consvar_t cv_moveaxis4 = {"joyaxis4_move", "None", CV_SAVE, joyaxis_cons_t, NULL
 consvar_t cv_brakeaxis4 = {"joyaxis4_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_aimaxis4 = {"joyaxis4_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_lookaxis4 = {"joyaxis4_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#ifdef __SWITCH__
-consvar_t cv_fireaxis4 = {"joyaxis4_fire", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis4 = {"joyaxis4_drift", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#else
 consvar_t cv_fireaxis4 = {"joyaxis4_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_driftaxis4 = {"joyaxis4_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#endif
 consvar_t cv_lookbackaxis4 = {"joyaxis4_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_xdeadzone4 = {"joy4_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_ydeadzone4 = {"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

diff --git a/src/g_input.c b/src/g_input.c
@@ -441,22 +441,21 @@ static keyname_t keynames[] =
 	{KEY_JOY1+19, "JOYMHOME_CC"},
 #define NOMOREJOYBTN_1S
 #elif defined (__SWITCH__)
-	{KEY_JOY1+0,  "JOYA"},
-	{KEY_JOY1+1,  "JOYB"},
-	{KEY_JOY1+2,  "JOYX"},
-	{KEY_JOY1+3,  "JOYY"},
-	{KEY_JOY1+4,  "JOYSTICKL"},
-	{KEY_JOY1+5,  "JOYSTICKR"},
-	{KEY_JOY1+6,  "JOYL"},
-	{KEY_JOY1+7,  "JOYR"},
-	{KEY_JOY1+8,  "JOYZL"},
-	{KEY_JOY1+9,  "JOYZR"},
-	{KEY_JOY1+10, "JOYPLUS"},
-	{KEY_JOY1+11, "JOYMINUS"},
-	{KEY_JOY1+12, "JOYLEFT"},
-	{KEY_JOY1+13, "JOYUP"},
-	{KEY_JOY1+14, "JOYRIGHT"},
-	{KEY_JOY1+15, "JOYDOWN"},
+	{KEY_JOY1+0,  "JOYB"},
+	{KEY_JOY1+1,  "JOYA"},
+	{KEY_JOY1+2,  "JOYY"},
+	{KEY_JOY1+3,  "JOYX"},
+	{KEY_JOY1+4,  "JOYMINUS"},
+	{KEY_JOY1+5,  "J5"}, //?
+	{KEY_JOY1+6,  "JOYPLUS"},
+	{KEY_JOY1+7,  "JOYSTICKL"},
+	{KEY_JOY1+8,  "JOYSTICKR"},
+	{KEY_JOY1+9,  "JOYL"},
+	{KEY_JOY1+10, "JOYR"},
+	{KEY_HAT1+0,  "DPAD_UP"},
+	{KEY_HAT1+1,  "DPAD_DOWN"},
+	{KEY_HAT1+2,  "DPAD_LEFT"},
+	{KEY_HAT1+3,  "DPAD_RIGHT"},
 #define NOMOREJOYBTN_1S
 #else
 	{KEY_JOY1+0, "JOY1"},
@@ -650,22 +649,21 @@ static keyname_t keynames[] =
 	{KEY_DBLJOY1+19, "DBLJOYMHOME_CC"},
 #define NOMOREJOYBTN_1DBL
 #elif defined (__SWITCH__)
-	{KEY_DBLJOY1+0,  "DBLJOYA"},
-	{KEY_DBLJOY1+1,  "DBLJOYB"},
-	{KEY_DBLJOY1+2,  "DBLJOYX"},
-	{KEY_DBLJOY1+3,  "DBLJOYY"},
-	{KEY_DBLJOY1+4,  "DBLJOYSTICKL"},
-	{KEY_DBLJOY1+5,  "DBLJOYSTICKR"},
-	{KEY_DBLJOY1+6,  "DBLJOYL"},
-	{KEY_DBLJOY1+7,  "DBLJOYR"},
-	{KEY_DBLJOY1+8,  "DBLJOYZL"},
-	{KEY_DBLJOY1+9,  "DBLJOYZR"},
-	{KEY_DBLJOY1+10, "DBLJOYPLUS"},
-	{KEY_DBLJOY1+11, "DBLJOYMINUS"},
-	{KEY_DBLJOY1+12, "DBLJOYLEFT"},
-	{KEY_DBLJOY1+13, "DBLJOYUP"},
-	{KEY_DBLJOY1+14, "DBLJOYRIGHT"},
-	{KEY_DBLJOY1+15, "DBLJOYDOWN"},
+	{KEY_DBLJOY1+0,  "DBLJOYB"},
+	{KEY_DBLJOY1+1,  "DBLJOYA"},
+	{KEY_DBLJOY1+2,  "DBLJOYY"},
+	{KEY_DBLJOY1+3,  "DBLJOYX"},
+	{KEY_DBLJOY1+4,  "DBLJOYMINUS"},
+	{KEY_DBLJOY1+5,  "DBLJ5"}, //?
+	{KEY_DBLJOY1+6,  "DBLJOYPLUS"},
+	{KEY_DBLJOY1+7,  "DBLJOYSTICKL"},
+	{KEY_DBLJOY1+8,  "DBLJOYSTICKR"},
+	{KEY_DBLJOY1+9,  "DBLJOYL"},
+	{KEY_DBLJOY1+10, "DBLJOYR"},
+	{KEY_DBLHAT1+0,  "DBLDPAD_UP"},
+	{KEY_DBLHAT1+1,  "DBLDPAD_DOWN"},
+	{KEY_DBLHAT1+2,  "DBLDPAD_LEFT"},
+	{KEY_DBLHAT1+3,  "DBLDPAD_RIGHT"},
 #define NOMOREJOYBTN_1DBL
 #else
 	{KEY_DBLJOY1+0, "DBLJOY1"},
@@ -1335,18 +1333,16 @@ void G_Controldefault(UINT8 player)
 	{
 		// Main controls
 		#ifdef __SWITCH__
-			gamecontrol[gc_accelerate ][0] = KEY_JOY1+1;  //B
-			gamecontrol[gc_lookback   ][0] = KEY_JOY1+3;  //Y
-			gamecontrol[gc_brake      ][0] = KEY_JOY1+0;  //A
-			gamecontrol[gc_fire       ][0] = KEY_JOY1+8;  //ZL
-			gamecontrol[gc_fire       ][1] = KEY_JOY1+6;  //L
-			gamecontrol[gc_drift      ][0] = KEY_JOY1+9;  //ZR
-			gamecontrol[gc_drift      ][1] = KEY_JOY1+7;  //R
-
-			gamecontrol[gc_pause      ][0] = KEY_JOY1+10; //Plus
-			gamecontrol[gc_systemmenu ][0] = KEY_JOY1+11; //Minus
-			gamecontrol[gc_viewpoint  ][0] = KEY_JOY1+2;  //X
-			gamecontrol[gc_scores     ][0] = KEY_JOY1+13; //UP
+			gamecontrol[gc_accelerate ][0] = KEY_JOY1+0;  //B
+			gamecontrol[gc_lookback   ][0] = KEY_JOY1+2;  //Y
+			gamecontrol[gc_brake      ][0] = KEY_JOY1+1;  //A
+			gamecontrol[gc_fire       ][0] = KEY_JOY1+9;  //L
+			gamecontrol[gc_drift      ][0] = KEY_JOY1+10;  //R
+
+			gamecontrol[gc_pause      ][0] = KEY_JOY1+6; //Plus
+			gamecontrol[gc_systemmenu ][0] = KEY_JOY1+4; //Minus
+			gamecontrol[gc_viewpoint  ][0] = KEY_JOY1+3;  //X
+			gamecontrol[gc_scores     ][0] = KEY_HAT1+0; //UP
 
 			// gamecontrol[gc_talkkey   ][1] = KEY_JOY1+15; //DOWN
 		#else
@@ -1372,56 +1368,31 @@ void G_Controldefault(UINT8 player)
 
 	if (player == 0 || player == 2)
 	{
-		// Player 2 controls
-		#ifdef __SWITCH__
-			gamecontrolbis[gc_accelerate ][0] = KEY_2JOY1+1;  //B
-			gamecontrolbis[gc_lookback   ][0] = KEY_2JOY1+3;  //Y
-			gamecontrolbis[gc_brake      ][0] = KEY_2JOY1+0;  //A
-			gamecontrolbis[gc_fire       ][0] = KEY_2JOY1+8;  //ZL
-			gamecontrolbis[gc_drift      ][0] = KEY_2JOY1+9;  //ZR
-		#else
-			gamecontrolbis[gc_accelerate ][0] = KEY_2JOY1+0; // A
-			gamecontrolbis[gc_lookback   ][0] = KEY_2JOY1+2; // X
-			gamecontrolbis[gc_brake      ][0] = KEY_2JOY1+1; // B
-			gamecontrolbis[gc_fire       ][0] = KEY_2JOY1+9; // LB
-			gamecontrolbis[gc_drift      ][0] = KEY_2JOY1+10; // RB
-		#endif
+		gamecontrolbis[gc_accelerate ][0] = KEY_2JOY1+0; // A
+		gamecontrolbis[gc_lookback   ][0] = KEY_2JOY1+2; // X
+		gamecontrolbis[gc_brake      ][0] = KEY_2JOY1+1; // B
+		gamecontrolbis[gc_fire       ][0] = KEY_2JOY1+9; // LB
+		gamecontrolbis[gc_drift      ][0] = KEY_2JOY1+10; // RB
 	}
 
 	if (player == 0 || player == 3)
 	{
 		// Player 3 controls
-		#ifdef __SWITCH__
-			gamecontrol3[gc_accelerate ][0] = KEY_3JOY1+1;  //B
-			gamecontrol3[gc_lookback   ][0] = KEY_3JOY1+3;  //Y
-			gamecontrol3[gc_brake      ][0] = KEY_3JOY1+0;  //A
-			gamecontrol3[gc_fire       ][0] = KEY_3JOY1+8;  //ZL
-			gamecontrol3[gc_drift      ][0] = KEY_3JOY1+9;  //ZR
-		#else
-			gamecontrol3[gc_accelerate ][0] = KEY_3JOY1+0; // A
-			gamecontrol3[gc_lookback   ][0] = KEY_3JOY1+2; // X
-			gamecontrol3[gc_brake      ][0] = KEY_3JOY1+1; // B
-			gamecontrol3[gc_fire       ][0] = KEY_3JOY1+9; // LB
-			gamecontrol3[gc_drift      ][0] = KEY_3JOY1+10; // RB
-		#endif
+		gamecontrol3[gc_accelerate ][0] = KEY_3JOY1+0; // A
+		gamecontrol3[gc_lookback   ][0] = KEY_3JOY1+2; // X
+		gamecontrol3[gc_brake      ][0] = KEY_3JOY1+1; // B
+		gamecontrol3[gc_fire       ][0] = KEY_3JOY1+9; // LB
+		gamecontrol3[gc_drift      ][0] = KEY_3JOY1+10; // RB
 	}
 
 	if (player == 0 || player == 4)
 	{
 		// Player 4 controls
-		#ifdef __SWITCH__
-			gamecontrol4[gc_accelerate ][0] = KEY_4JOY1+1;  //B
-			gamecontrol4[gc_lookback   ][0] = KEY_4JOY1+3;  //Y
-			gamecontrol4[gc_brake      ][0] = KEY_4JOY1+0;  //A
-			gamecontrol4[gc_fire       ][0] = KEY_4JOY1+8;  //ZL
-			gamecontrol4[gc_drift      ][0] = KEY_4JOY1+9;  //ZR
-		#else
-			gamecontrol4[gc_accelerate ][0] = KEY_4JOY1+0; // A
-			gamecontrol4[gc_lookback   ][0] = KEY_4JOY1+2; // X
-			gamecontrol4[gc_brake      ][0] = KEY_4JOY1+1; // B
-			gamecontrol4[gc_fire       ][0] = KEY_4JOY1+9; // LB
-			gamecontrol4[gc_drift      ][0] = KEY_4JOY1+10; // RB
-		#endif
+		gamecontrol4[gc_accelerate ][0] = KEY_4JOY1+0; // A
+		gamecontrol4[gc_lookback   ][0] = KEY_4JOY1+2; // X
+		gamecontrol4[gc_brake      ][0] = KEY_4JOY1+1; // B
+		gamecontrol4[gc_fire       ][0] = KEY_4JOY1+9; // LB
+		gamecontrol4[gc_drift      ][0] = KEY_4JOY1+10; // RB
 	}
 }
 

diff --git a/src/g_input.h b/src/g_input.h
@@ -45,9 +45,9 @@
 #define JOYAXISSET   5  // 5 Sets of 2 axises
 #elif defined (__SWITCH__)
 #define MOUSEBUTTONS 3
-#define JOYBUTTONS   16 // 16 buttons
-#define JOYHATS      0  // 0 hat
-#define JOYAXISSET   2  // 2 Sets of 2 axises
+#define JOYBUTTONS   11 // 11 buttons
+#define JOYHATS      1  // 1 hat
+#define JOYAXISSET   3
 #else
 #define MOUSEBUTTONS 8
 #define JOYBUTTONS   32 // 32 buttons

diff --git a/src/m_menu.c b/src/m_menu.c
@@ -2590,26 +2590,12 @@ boolean M_Responder(event_t *ev)
 				break;
 			#ifdef __SWITCH__
 				// FIXME
-				case KEY_JOY1 + 1: // B
-					ch = KEY_ENTER;
-					break;
-				case KEY_JOY1 + 11: // Minus
+				//case KEY_JOY1 + 1: // A
+					//ch = KEY_ENTER;
+					//break;
+				case KEY_JOY1 + 4: // Minus
 					ch = KEY_ESCAPE;
 					break;
-
-				// "D-pad"
-				case KEY_JOY1 + 13:
-					ch = KEY_UPARROW;
-					break;
-				case KEY_JOY1 + 15:
-					ch = KEY_DOWNARROW;
-					break;
-				case KEY_JOY1 + 12:
-					ch = KEY_LEFTARROW;
-					break;
-				case KEY_JOY1 + 14:
-					ch = KEY_RIGHTARROW;
-					break;
 			#endif
 		}
 	}

diff --git a/src/sdl/SRB2Switch/Makefile.cfg b/src/sdl/SRB2Switch/Makefile.cfg
@@ -10,7 +10,7 @@ $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>dev
 endif
 
 SRB2NAME?=kartswitch
-SRB2VERSION?=1.3
+SRB2VERSION?=1.6
 EXENAME?=$(SRB2NAME).elf
 DBGNAME?=$(SRB2NAME).elf.debug
 NRONAME?=$(SRB2NAME).nro
@@ -80,17 +80,14 @@ SDL_CONFIG=/bin/true
 SDL_CFLAGS=
 SDL_LDFLAGS=
 
+ZIPSTEPS=1
+
 $(BIN)/$(NRONAME): $(BIN)/$(EXENAME)
 	@echo Preparing $(NRONAME)...
-	$(NACPTOOL) --create "Sonic Robo Blast 2 Kart" "Kart Krew, carstene1ns, heyjoeway" "$(SRB2VERSION)" $(BIN)/srb2.nacp
+	$(NACPTOOL) --create "Sonic Robo Blast 2 Kart" "Kart Krew, Craftyawesome, carstene1ns, heyjoeway" "$(SRB2VERSION)" $(BIN)/srb2.nacp
 	$(ELF2NRO) $(BIN)/$(EXENAME) $(BIN)/$(NRONAME) --icon=$(ICONJPG) --nacp=$(BIN)/srb2.nacp
-
-	@echo Generating $(NROUPDATEZIPNAME)...
-	$(MKDIR) $(APPDIR)
-	$(CP) $(BIN)/$(NRONAME) $(APPDIR)/$(NRONAME)
-	(cd $(BIN) && zip -r -9 $(NROUPDATEZIPNAME) switch)
-	$(REMOVE) -r $(APPDIR)
-
+
+ifdef ZIPSTEPS
 	@echo Generating $(FULLZIPNAME)...
 	$(MKDIR) $(APPDIR)
 	$(CP) $(BIN)/$(NRONAME) $(APPDIR)/$(NRONAME)
@@ -102,15 +99,4 @@ $(BIN)/$(NRONAME): $(BIN)/$(EXENAME)
 	-$(CP) $(ASSETSDIR)/*.wad $(APPDIR)
 	(cd $(BIN) && zip -r -9 $(FULLZIPNAME) switch)
 	$(REMOVE) -r $(APPDIR)
-
-	@echo Generating $(PATCHZIPNAME)...
-	$(MKDIR) $(APPDIR)
-	$(CP) $(BIN)/$(NRONAME) $(APPDIR)/$(NRONAME)
-	-$(CP) $(ASSETSDIR)/patch/*.cfg $(APPDIR)
-	-$(CP) $(ASSETSDIR)/patch/*.srb $(APPDIR)
-	-$(CP) $(ASSETSDIR)/patch/*.kart $(APPDIR)
-	-$(CP) $(ASSETSDIR)/patch/*.pk3 $(APPDIR)
-	-$(CP) $(ASSETSDIR)/patch/*.dta $(APPDIR)
-	-$(CP) $(ASSETSDIR)/patch/*.wad $(APPDIR)
-	(cd $(BIN) && zip -r -9 $(PATCHZIPNAME) switch)
-	$(REMOVE) -r $(APPDIR)
+endif