.github/workflows/main.yml

@@ -4,44 +4,44 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache
-        id: cache-2
-        uses: actions/cache@v2
+        id: cache-1
+        uses: actions/cache@v3
         with:
           path: cache
-          key: ${{ runner.os }}-cache-2
+          key: ${{ runner.os }}-cache-1
 
-      - name: Download devkitPPC r39, libogc 2.3.1 and required tools
-        if: steps.cache-2.outputs.cache-hit != 'true'
+      - name: Download devkitPPC r42.2-1, libogc 2.4.0 and required tools
+        if: steps.cache-1.outputs.cache-hit != 'true'
         # general-tools is needed for bin2s and gamecube-tools is needed for elf2dol
         run: | 
           mkdir cache && cd cache
-          wget "https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r39-2-linux_x86_64.pkg.tar.xz"
+          wget "https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r42.2-1-linux_x86_64.pkg.tar.zst"
           wget "https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz"
-          wget "https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz"
+          wget "https://wii.leseratte10.de/devkitPro/file.php/libogc-2.4.0-1-any.pkg.tar.zst"
           wget "https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz"
           wget "https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz"
           cd ..
 
       - name: Extract downloaded files
         # general-tools is needed for bin2s and gamecube-tools is needed for elf2dol
         run: | 
-          tar -xf cache/devkitPPC-r39-2-linux_x86_64.pkg.tar.xz --strip-components=1
+          tar -xf cache/devkitPPC-r42.2-1-linux_x86_64.pkg.tar.zst --strip-components=1
           tar -xf cache/devkitppc-rules-1.1.1-1-any.pkg.tar.xz --strip-components=1
-          tar -xf cache/libogc-2.3.1-1-any.pkg.tar.xz --strip-components=1
+          tar -xf cache/libogc-2.4.0-1-any.pkg.tar.zst --strip-components=1
           tar -xf cache/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz --strip-components=1
           tar -xf cache/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz --strip-components=1
 
       - name: Compile
         run: |
           PATH=$(pwd)/devkitpro/devkitPPC/bin:$PATH DEVKITPPC=$(pwd)/devkitpro/devkitPPC DEVKITPRO=$(pwd)/devkitpro make
+
       - name: Package
-        id: pack
         run: |
           cp -r wii/apps apps
           mkdir -p apps/wiiflow/
@@ -51,12 +51,12 @@ jobs:
           mkdir -p wiiflow
           cp -r wii/wiiflow/Languages wiiflow/languages
           cp -r wii/wiiflow/themes_lite wiiflow/themes_lite
-          echo "::set-output name=sha::$(echo ${GITHUB_SHA} | head -c 7)"
+          echo "sha=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
 
       - name: Upload binaries
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with: 
-          name: wiiflow_lite_${{ steps.pack.outputs.sha }}
+          name: wiiflow_lite_${{ env.sha }}
           path: |
             apps
             wiiflow

README.md

@@ -22,6 +22,10 @@ Other wiiflow lite themes can be found on the wiki linked below. but they need t
 ## Useful Links
 [WiiFlow Lite GBATemp thread](https://gbatemp.net/threads/wiiflow-lite.422685/)
 
-[WiiFlow Wiki](https://sites.google.com/site/wiiflowiki4/)
+[WiiFlow Wiki](https://web.archive.org/web/20220414124727/https://sites.google.com/site/wiiflowiki4/)
+
+[Newer Wiki WIP](https://sites.google.com/view/wiiflow-wiki/welcome)
+
+[Github Wiki](https://github.com/Fledge68/WiiFlow_Lite/wiki)
 
 [Old Sourceforge Project Repository](https://sourceforge.net/projects/wiiflow-lite/)

portlibs/include/libfatversion.h

@@ -3,8 +3,8 @@
 
 #define _LIBFAT_MAJOR_	1
 #define _LIBFAT_MINOR_	1
-#define _LIBFAT_PATCH_	1
+#define _LIBFAT_PATCH_	5
 
-#define _LIBFAT_STRING "libFAT Release 1.1.1"
+#define _LIBFAT_STRING "libFAT Release 1.1.5"
 
 #endif // __LIBFATVERSION_H__

resources/app_booter/Makefile

@@ -37,7 +37,7 @@ INCLUDES	:=
 #---------------------------------------------------------------------------------
 MACHDEP := -mno-eabi -mno-sdata -mcpu=750
 CFLAGS	:= -Wall -W -O1 -ffreestanding -std=gnu99 -Wstrict-aliasing=2 $(MACHDEP) $(INCLUDE)
-LDFLAGS	:= -nostartfiles -nostdlib $(MACHDEP)
+LDFLAGS	:= -nostartfiles -nostdlib $(MACHDEP) -Wl,--no-warn-rwx-segments
 
 #---------------------------------------------------------------------------------
 # move loader to another location - THANKS CREDIAR - 0x81330000 for HBC

resources/wiiflow_game_booter/source/ChannelHandler.cpp

@@ -206,7 +206,7 @@ u32 LoadChannel(u64 title, bool dol, u32 *IOS)
 }
 
 void PatchChannel(u8 vidMode, GXRModeObj *vmode, bool vipatch, bool countryString, u8 patchVidModes, int aspectRatio, 
-				u32 returnTo, u8 private_server, const char *server_addr, bool patchFix480p, u8 deflicker, u8 bootType)
+				u32 returnTo, u8 private_server, const char *server_addr, u8 videoWidth, bool patchFix480p, u8 deflicker, u8 bootType)
 {
 	u8 vfilter_off[7] = {0, 0, 21, 22, 21, 0, 0};
 	u8 vfilter_low[7] = {4, 4, 16, 16, 16, 4, 4};
@@ -232,6 +232,9 @@ void PatchChannel(u8 vidMode, GXRModeObj *vmode, bool vipatch, bool countryStrin
 		if(hooktype != 0 && hookpatched == false)
 			hookpatched = dogamehooks(dolchunkoffset[i], dolchunksize[i], true);
 
+		if (videoWidth == WIDTH_FRAMEBUFFER)
+            patch_width(dolchunkoffset[i], dolchunksize[i]);
+
 		if (deflicker == DEFLICKER_ON_LOW)
 		{
 			patch_vfilters(dolchunkoffset[i], dolchunksize[i], vfilter_low);

resources/wiiflow_game_booter/source/ChannelHandler.hpp

@@ -14,7 +14,7 @@ typedef struct _dolheader
 } ATTRIBUTE_PACKED dolheader;
 
 void PatchChannel(u8 vidMode, GXRModeObj *vmode, bool vipatch, bool countryString, u8 patchVidModes, int aspectRatio, 
-					u32 returnTo, u8 private_server, const char *server_addr, bool patchFix480p, u8 deflicker, u8 bootType);
+					u32 returnTo, u8 private_server, const char *server_addr, u8 videoWidth, bool patchFix480p, u8 deflicker, u8 bootType);
 u32 LoadChannel(u64 title, bool dol, u32 *IOS);
 
 extern bool isForwarder;

resources/wiiflow_game_booter/source/Config.hpp

@@ -49,6 +49,7 @@ struct the_CFG {
 	s8 aspectRatio;
 	bool patchFix480p;
 	u8 deflicker;
+	u8 videoWidth;
 	u8 private_server;
 	char server_addr[24];
 	u8 *cheats;

resources/wiiflow_game_booter/source/apploader.c

@@ -13,6 +13,7 @@
 #include "gecko.h"
 #include "memory.h"
 #include "video_tinyload.h"
+#include "kirbypatch.h"
 
 /* Apploader function pointers */
 typedef int   (*app_main)(void **dst, int *size, int *offset);
@@ -25,8 +26,8 @@ static u8 *appldr = (u8*)0x81200000;
 static const char *GameID = (const char*)0x80000000;
 
 /* Constants */
-#define APPLDR_OFFSET	0x910
-#define APPLDR_CODE		0x918
+#define APPLDR_OFFSET	0x910// usblgx uses 0x2440 -huh?
+#define APPLDR_CODE		0x918// usblgx uses APPLDR_OFFSET + 0x20 - huh?
 
 void maindolpatches(void *dst, int len, u8 vidMode, GXRModeObj *vmode, bool vipatch, bool countryString, u8 patchVidModes, int aspectRatio, 
 					u32 returnTo, bool patchregion, u8 private_server, const char *server_addr, u8 deflicker, u8 bootType);
@@ -38,18 +39,19 @@ static void NewSuperMarioBrosPatch();
 static void Patch_23400_and_MKWii_vulnerability();
 bool hookpatched = false;
 
+// wiiflow uses a struct to hold the appldr hdr and usblgx uses a u32 buffer[32] array to hold it.
 /* Thanks Tinyload */
 static struct
 {
-	char revision[16];
-	void *entry;
-	s32 size;
-	s32 trailersize;
-	s32 padding;
-} apploader_hdr ATTRIBUTE_ALIGN(32);
+	char revision[16];//[0-3] 16 divided by 4 bytes = 4
+	void *entry;// [4] 4 bytes
+	s32 size;//[5] 4 bytes
+	s32 trailersize;// [6] 4 bytes
+	s32 padding;// [7] 4 bytes
+} apploader_hdr ATTRIBUTE_ALIGN(32);// 16+4+4+4+4=32 bytes
 
 u32 Apploader_Run(u8 vidMode, GXRModeObj *vmode, bool vipatch, bool countryString, u8 patchVidModes, int aspectRatio, u32 returnTo, 
-					bool patchregion , u8 private_server, const char *server_addr, bool patchFix480p, u8 deflicker, u8 bootType)
+					bool patchregion , u8 private_server, const char *server_addr, u8 videoWidth, bool patchFix480p, u8 deflicker, u8 bootType)
 {
 	//! Disable private server for games that still have official servers.
 	if(memcmp(GameID, "SC7", 3) == 0 || memcmp(GameID, "RJA", 3) == 0 ||
@@ -117,6 +119,12 @@ u32 Apploader_Run(u8 vidMode, GXRModeObj *vmode, bool vipatch, bool countryStrin
 		prog(20);
 	}
 	free_wip();
+
+	patch_kirby((u8 *)0x80000000);// can't be done during maindolpatches.
+
+	if(videoWidth == WIDTH_FRAMEBUFFER)
+		patch_width((void*)0x80000000, 0x900000);
+
 	if(hooktype != 0 && hookpatched)
 		ocarina_do_code();
 
@@ -152,35 +160,28 @@ void maindolpatches(void *dst, int len, u8 vidMode, GXRModeObj *vmode, bool vipa
 	u8 vfilter_medium[7] = {4, 8, 12, 16, 12, 8, 4};
 	u8 vfilter_high[7] = {8, 8, 10, 12, 10, 8, 8};
 
-	do_wip_code((u8 *)dst, len);
-	Remove_001_Protection(dst, len);
-	if(CurrentIOS.Type == IOS_TYPE_WANIN && CurrentIOS.Revision < 13)
-		Anti_002_fix(dst, len);
-	if((CurrentIOS.Type == IOS_TYPE_WANIN && CurrentIOS.Revision < 13) || CurrentIOS.Type == IOS_TYPE_HERMES)
-		patch_NoDiscinDrive(dst, len);
 	patchVideoModes(dst, len, vidMode, vmode, patchVidModes, bootType);
 
 	if(debuggerselect == 2)
 		Patch_fwrite(dst, len);
 	if(hooktype != 0 && hookpatched == false)
 		hookpatched = dogamehooks(dst, len, false);
-	if(patchVidModes > 0)
-		PatchVideoSneek(dst, len);
 	if(vipatch)
 		vidolpatcher(dst, len);
+	if(patchVidModes > 0)
+		PatchVideoSneek(dst, len);
 	if(configbytes[0] != 0xCD)
 		langpatcher(dst, len);
 	if(countryString)
 		PatchCountryStrings(dst, len); // Country Patch by WiiPower
-	if(aspectRatio != -1)
-		PatchAspectRatio(dst, len, aspectRatio);
-	if(returnTo)
-		PatchReturnTo(dst, len, returnTo);
+	do_wip_code((u8 *)dst, len);
+	Remove_001_Protection(dst, len);
+	if(CurrentIOS.Type == IOS_TYPE_WANIN && CurrentIOS.Revision < 13)
+		Anti_002_fix(dst, len);
+	if((CurrentIOS.Type == IOS_TYPE_WANIN && CurrentIOS.Revision < 13) || CurrentIOS.Type == IOS_TYPE_HERMES)
+		patch_NoDiscinDrive(dst, len);
 	if(patchregion)
 		PatchRegion(dst, len);
-	if(private_server)
-		PrivateServerPatcher(dst, len, private_server, serverAddr);
-
 	if(deflicker == DEFLICKER_ON_LOW)
 	{
 		patch_vfilters(dst, len, vfilter_low);
@@ -204,6 +205,12 @@ void maindolpatches(void *dst, int len, u8 vidMode, GXRModeObj *vmode, bool vipa
 		if (deflicker == DEFLICKER_OFF_EXTENDED)
 			deflicker_patch(dst, len);
 	}
+	if(returnTo)
+		PatchReturnTo(dst, len, returnTo);
+	if(aspectRatio != -1)
+		PatchAspectRatio(dst, len, aspectRatio);
+	if(private_server)
+		PrivateServerPatcher(dst, len, private_server, serverAddr);
 }
 
 static void patch_NoDiscinDrive(void *buffer, u32 len)

resources/wiiflow_game_booter/source/apploader.h

@@ -7,7 +7,7 @@ extern "C" {
 
 /* Prototypes */
 u32 Apploader_Run(u8 vidMode, GXRModeObj *vmode, bool vipatch, bool countryString, u8 patchVidModes, int aspectRatio, u32 returnTo, 
-					bool patchregion, u8 private_server, const char * server_addr, bool patchFix480p, u8 deflicker, u8 bootType);
+					bool patchregion, u8 private_server, const char * server_addr, u8 videoWidth, bool patchFix480p, u8 deflicker, u8 bootType);
 
 enum
 {
@@ -28,6 +28,13 @@ enum
 	DEFLICKER_ON_HIGH
 };
 
+enum
+{
+	WIDTH_AUTO,
+	WIDTH_FRAMEBUFFER,
+	WIDTH_MAX
+};
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

resources/wiiflow_game_booter/source/disc.c

@@ -42,9 +42,11 @@ void Disc_SetLowMem(void)
 	*OS_Thread			= 0x80431A80; // Thread Init
 	*Dev_Debugger		= 0x81800000; // Dev Debugger Monitor Address
 	*Simulated_Mem		= 0x01800000; // Simulated Memory Size
-	*GameID_Address		= 0x80000000; // Fix for Sam & Max (WiiPower)
 	*(vu32 *) 0xCD00643C = 0x00000000;	// 32Mhz on Bus
 
+	//if(CurrentIOS.Type != IOS_TYPE_HERMES && CurrentIOS.Revision >= 18)
+		*GameID_Address		= 0x80000000; // Fix for Sam & Max (WiiPower) and Back to the Future.
+
 	/* Copy Disc ID */
 	memcpy((void*)Online_Check, (void*)Disc_ID, 4);
 }
@@ -240,13 +242,14 @@ s32 Disc_SetUSB(const u8 *id, bool frag)
 	/* ENABLE USB in cIOS */
 	if(id)
 	{
-		if(frag)
+		if(frag)// true for wii games in wbfs folder
 			return set_frag_list();
+		/* for WBFS partitioned drives */
 		s32 part = -1;
 		if(CurrentIOS.Type == IOS_TYPE_HERMES)
 			part = wbfs_part_idx ? wbfs_part_idx - 1 : 0;
 		return WDVD_SetUSBMode(wbfsDev, (u8*)id, part);
 	}
-	/* DISABLE USB in cIOS */
+	/* DISABLE USB in cIOS for actual disc */
 	return WDVD_SetUSBMode(0, NULL, -1);
 }