force default video swap in the home menu/friend list

+ reduced swap cooldown
OatmealDome · Jul 24, 2017 · 808aca7 · 808aca7
1 parent 6255c56
commit 808aca7
Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ If you're playing with Splatoon's enhanced swapping controls:
 
 ### Special thanks:
 
-+ Maschell for HID to VPAD and the audio swap
++ Maschell for development contribution and the audio swap
 + Dimok for function_hooks and the pygecko server
 + Brienj for the IP selector and initial UI
 + /u/MachMatic for the banner background

diff --git a/src/main.c b/src/main.c
@@ -208,8 +208,8 @@ int Menu_Main()
                 PRINT_TEXT2(0, 3, "Creators:");
                 PRINT_TEXT2(2, 5, "* Oatmealdome and Yahya14");
                 PRINT_TEXT2(0, 7, "Special Thanks:");
-                PRINT_TEXT2(2, 9, "* Maschell for HID to VPAD and the audio swap");
-                PRINT_TEXT2(2, 10, "* Dimok for function_hooks and the pygecko server");
+                PRINT_TEXT2(2, 9, "* Maschell for development contribution and the audio swap");
+                PRINT_TEXT2(2, 10, "* Dimok, Chadderz, etc for function_hooks and pygecko");
                 PRINT_TEXT2(2, 11, "* brienj for the IP selector and initial UI");
                 PRINT_TEXT2(2, 12, "* /u/MachMatic for the banner background");
                 PRINT_TEXT2(2, 13, "* BKOOL999 for testing the Swap DRC app");

diff --git a/src/patcher/video_swapping_function_patcher.cpp b/src/patcher/video_swapping_function_patcher.cpp
@@ -16,7 +16,7 @@ DECL(void, GX2CopyColorBufferToScanBuffer, GX2ColorBuffer *colorBuffer, s32 scan
 	// 0x1 = swap
 
 	// check drc swap and force the drcMode to default when inkstrike is activated
-	if (drcMode == 0 || gSwapForce) {
+	if (drcMode == 0 || gSwapForce || gAppStatus == 2) {
 		real_GX2CopyColorBufferToScanBuffer(colorBuffer, scan_target);
 	}
 	else {

diff --git a/src/patcher/vpad_function_patcher.cpp b/src/patcher/vpad_function_patcher.cpp
@@ -21,7 +21,7 @@ DECL(int, VPADRead, int chan, VPADData *buffer, u32 buffer_size, s32 *error) {
 	if (((bCombo[0] == (VPAD_BUTTON_MINUS | VPAD_BUTTON_L)) ||
 		(bCombo[1] == VPAD_BUTTON_TV)) && (
 		gHomeCoolDown == 0 && (gAppStatus != 2))) {
-        gHomeCoolDown = bCombo[0]? 0x20 : 0x5A;
+        gHomeCoolDown = bCombo[0]? 0x1E : 0x48;
 		drcSwap();
 	}
 	else if (gHomeCoolDown > 0) {