Added prebuilt_menurop for v10.4. Added v10.4 version files under shu…

…fflehax_menuversions. Updated README regarding v10.4, etc. Updated some UI text in menuhax_manager. Updated the version to v2.2.
yellows8 · Jan 25, 2016 · bb61b68 · bb61b68
1 parent d43f875
commit bb61b68
Show file tree

Hide file tree

Showing 11 changed files with 253 additions and 15 deletions.
diff --git a/README.md b/README.md
diff --git a/menuhax_manager/Makefile b/menuhax_manager/Makefile
@@ -32,7 +32,7 @@ SOURCES		:=	source lodepng source/modules
 DATA		:=	data
 INCLUDES	:=	include lodepng source source/modules
 
-VERSION	:=	v2.1
+VERSION	:=	v2.2
 
 APP_TITLE	:=	menuhax_manager $(VERSION)
 APP_DESCRIPTION	:=	Tool for managing Home Menu haxx.

diff --git a/menuhax_manager/source/menuhax_manager.c b/menuhax_manager/source/menuhax_manager.c
@@ -1174,7 +1174,7 @@ Result setup_imagedisplay()
 			ret = archive_getfilesize(SDArchive, "sdmc:/3ds/menuhax_manager/imagedisplay.png", (u32*)&pngsize);
 			if(ret!=0)
 			{
-				printf("Failed to get the filesize of the SD PNG: 0x%08x.\n", (unsigned int)ret);
+				printf("Failed to get the filesize of the SD PNG: 0x%08x. The file probably doesn't exist on SD.\n", (unsigned int)ret);
 				return ret;
 			}
 
@@ -1452,7 +1452,7 @@ int main(int argc, char **argv)
 
 	close_extdata();
 
-	if(ret!=0)printf("An error occured. If this is an actual issue not related to user failure, please report this to here if it persists(or comment on an already existing issue if needed), with an image of your 3DS system with the bottom-screen: https://github.com/yellows8/3ds_homemenuhax/issues\n");
+	if(ret!=0)printf("An error occured. If this is an actual issue not related to user failure, please report this to here if it persists(or comment on an already existing issue if needed), with a screenshot: https://github.com/yellows8/3ds_homemenuhax/issues\n");
 
 	printf("Press the START button to exit.\n");
 	// Main loop

diff --git a/menurop_prebuilt/EUR/23554 b/menurop_prebuilt/EUR/23554
@@ -0,0 +1,58 @@
+#define STACKPIVOT_ADR 0x00100fb8
+#define ROP_LOADR4_FROMOBJR0 0x0010b3d8
+#define ROP_POPPC 0x0010201c
+#define POP_R0PC 0x00157950
+#define POP_R1PC 0x002372b4
+#define POP_R3PC 0x00102a80
+#define POP_R2R6PC 0x00150544
+#define POP_R4LR_BXR1 0x0011a34c
+#define POP_R4R8LR_BXR2 0x001334b8
+#define POP_R4R5R6PC 0x00101b74
+#define POP_R4FPPC 0x001035c0
+
+#define ROP_STR_R1TOR0 0x00104020
+#define ROP_STR_R0TOR1 0x00102968
+#define ROP_LDR_R0FROMR0 0x00118dc0
+#define ROP_LDRR1R1_STRR1R0 0x00214200
+#define ROP_MOVR1R3_BXIP 0x001cedc8
+#define ROP_ADDR0_TO_R1 0x0012b1b8
+#define ROP_LDRR1_FROMR5ARRAY_R4WORDINDEX 0x001038c4
+#define ROP_CMPR0R1 0x002a1be8
+
+#define ROP_INITOBJARRAY 0x0022c245
+
+#define MEMCPY 0x00153828
+#define MEMSET32_OTHER 0x00233b7c
+
+#define svcControlMemory 0x002359a4
+#define svcSleepThread 0x0012b17c
+
+#define SRV_GETSERVICEHANDLE 0x002359fc
+
+#define GXLOW_CMD4 0x0014bad4
+
+#define NSS_LaunchTitle 0x002314c4
+#define NSS_RebootSystem 0x001374c4
+
+#define CFGIPC_SecureInfoGetRegion 0x001378e8
+
+#define GSPGPU_Shutdown 0x0011a000
+#define GSPGPU_FlushDataCache 0x0014b9d0
+
+#define APT_SendParameter 0x00227980
+
+#define FS_MountSdmc 0x00118c4c
+
+#define IFile_Open 0x0022bdbc
+#define IFile_Close 0x0022fb54
+#define IFile_Read 0x0022bca8
+
+#define ROP_COND_THROWFATALERR 0x001028e4
+
+#define ORIGINALOBJPTR_BASELOADADR 0x0032e848
+
+#define FILEPATHPTR_THEME_SHUFFLE_BODYRD 0x0032f604
+#define FILEPATHPTR_THEME_REGULAR_THEMEMANAGE 0x0032f60c
+#define FILEPATHPTR_THEME_REGULAR_BODYCACHE 0x0032f610
+#define FILEPATHPTR_THEME_SHUFFLE_THEMEMANAGE 0x0032f618
+#define FILEPATHPTR_THEME_SHUFFLE_BODYCACHE 0x0032f61c
diff --git a/menurop_prebuilt/JPN/26626 b/menurop_prebuilt/JPN/26626
@@ -0,0 +1,58 @@
+#define STACKPIVOT_ADR 0x00100fb8
+#define ROP_LOADR4_FROMOBJR0 0x0010b3d8
+#define ROP_POPPC 0x0010201c
+#define POP_R0PC 0x00157950
+#define POP_R1PC 0x002372b4
+#define POP_R3PC 0x00102a80
+#define POP_R2R6PC 0x00150544
+#define POP_R4LR_BXR1 0x0011a34c
+#define POP_R4R8LR_BXR2 0x001334b8
+#define POP_R4R5R6PC 0x00101b74
+#define POP_R4FPPC 0x001035c0
+
+#define ROP_STR_R1TOR0 0x00104020
+#define ROP_STR_R0TOR1 0x00102968
+#define ROP_LDR_R0FROMR0 0x00118dc0
+#define ROP_LDRR1R1_STRR1R0 0x00214200
+#define ROP_MOVR1R3_BXIP 0x001cedc8
+#define ROP_ADDR0_TO_R1 0x0012b1b8
+#define ROP_LDRR1_FROMR5ARRAY_R4WORDINDEX 0x001038c4
+#define ROP_CMPR0R1 0x002a1be8
+
+#define ROP_INITOBJARRAY 0x0022c245
+
+#define MEMCPY 0x00153828
+#define MEMSET32_OTHER 0x00233b7c
+
+#define svcControlMemory 0x002359a4
+#define svcSleepThread 0x0012b17c
+
+#define SRV_GETSERVICEHANDLE 0x002359fc
+
+#define GXLOW_CMD4 0x0014bad4
+
+#define NSS_LaunchTitle 0x002314c4
+#define NSS_RebootSystem 0x001374c4
+
+#define CFGIPC_SecureInfoGetRegion 0x001378e8
+
+#define GSPGPU_Shutdown 0x0011a000
+#define GSPGPU_FlushDataCache 0x0014b9d0
+
+#define APT_SendParameter 0x00227980
+
+#define FS_MountSdmc 0x00118c4c
+
+#define IFile_Open 0x0022bdbc
+#define IFile_Close 0x0022fb54
+#define IFile_Read 0x0022bca8
+
+#define ROP_COND_THROWFATALERR 0x001028e4
+
+#define ORIGINALOBJPTR_BASELOADADR 0x0032e848
+
+#define FILEPATHPTR_THEME_SHUFFLE_BODYRD 0x0032f604
+#define FILEPATHPTR_THEME_REGULAR_THEMEMANAGE 0x0032f60c
+#define FILEPATHPTR_THEME_REGULAR_BODYCACHE 0x0032f610
+#define FILEPATHPTR_THEME_SHUFFLE_THEMEMANAGE 0x0032f618
+#define FILEPATHPTR_THEME_SHUFFLE_BODYCACHE 0x0032f61c
diff --git a/menurop_prebuilt/KOR/11266 b/menurop_prebuilt/KOR/11266
@@ -0,0 +1,58 @@
+#define STACKPIVOT_ADR 0x00100fb8
+#define ROP_LOADR4_FROMOBJR0 0x0010b3d8
+#define ROP_POPPC 0x0010201c
+#define POP_R0PC 0x00157950
+#define POP_R1PC 0x002371b8
+#define POP_R3PC 0x00102a80
+#define POP_R2R6PC 0x00150544
+#define POP_R4LR_BXR1 0x0011a34c
+#define POP_R4R8LR_BXR2 0x001334b8
+#define POP_R4R5R6PC 0x00101b74
+#define POP_R4FPPC 0x001035c0
+
+#define ROP_STR_R1TOR0 0x00104020
+#define ROP_STR_R0TOR1 0x00102968
+#define ROP_LDR_R0FROMR0 0x00118dc0
+#define ROP_LDRR1R1_STRR1R0 0x00214100
+#define ROP_MOVR1R3_BXIP 0x001cecf0
+#define ROP_ADDR0_TO_R1 0x0012b1b8
+#define ROP_LDRR1_FROMR5ARRAY_R4WORDINDEX 0x001038c4
+#define ROP_CMPR0R1 0x002a1acc
+
+#define ROP_INITOBJARRAY 0x0022c149
+
+#define MEMCPY 0x00153828
+#define MEMSET32_OTHER 0x00233a80
+
+#define svcControlMemory 0x002358a8
+#define svcSleepThread 0x0012b17c
+
+#define SRV_GETSERVICEHANDLE 0x00235900
+
+#define GXLOW_CMD4 0x0014bad4
+
+#define NSS_LaunchTitle 0x002313c8
+#define NSS_RebootSystem 0x001374c4
+
+#define CFGIPC_SecureInfoGetRegion 0x001378e8
+
+#define GSPGPU_Shutdown 0x0011a000
+#define GSPGPU_FlushDataCache 0x0014b9d0
+
+#define APT_SendParameter 0x00227880
+
+#define FS_MountSdmc 0x00118c4c
+
+#define IFile_Open 0x0022bcc0
+#define IFile_Close 0x0022fa58
+#define IFile_Read 0x0022bbac
+
+#define ROP_COND_THROWFATALERR 0x001028e4
+
+#define ORIGINALOBJPTR_BASELOADADR 0x0032d848
+
+#define FILEPATHPTR_THEME_SHUFFLE_BODYRD 0x0032e604
+#define FILEPATHPTR_THEME_REGULAR_THEMEMANAGE 0x0032e60c
+#define FILEPATHPTR_THEME_REGULAR_BODYCACHE 0x0032e610
+#define FILEPATHPTR_THEME_SHUFFLE_THEMEMANAGE 0x0032e618
+#define FILEPATHPTR_THEME_SHUFFLE_BODYCACHE 0x0032e61c
diff --git a/menurop_prebuilt/USA/24578 b/menurop_prebuilt/USA/24578
@@ -0,0 +1,58 @@
+#define STACKPIVOT_ADR 0x00100fb8
+#define ROP_LOADR4_FROMOBJR0 0x0010b3d8
+#define ROP_POPPC 0x0010201c
+#define POP_R0PC 0x00157950
+#define POP_R1PC 0x00237100
+#define POP_R3PC 0x00102a80
+#define POP_R2R6PC 0x00150544
+#define POP_R4LR_BXR1 0x0011a34c
+#define POP_R4R8LR_BXR2 0x001334b8
+#define POP_R4R5R6PC 0x00101b74
+#define POP_R4FPPC 0x001035c0
+
+#define ROP_STR_R1TOR0 0x00104020
+#define ROP_STR_R0TOR1 0x00102968
+#define ROP_LDR_R0FROMR0 0x00118dc0
+#define ROP_LDRR1R1_STRR1R0 0x0021404c
+#define ROP_MOVR1R3_BXIP 0x001cec48
+#define ROP_ADDR0_TO_R1 0x0012b1b8
+#define ROP_LDRR1_FROMR5ARRAY_R4WORDINDEX 0x001038c4
+#define ROP_CMPR0R1 0x002a1ae8
+
+#define ROP_INITOBJARRAY 0x0022c091
+
+#define MEMCPY 0x00153828
+#define MEMSET32_OTHER 0x002339c8
+
+#define svcControlMemory 0x002357f0
+#define svcSleepThread 0x0012b17c
+
+#define SRV_GETSERVICEHANDLE 0x00235848
+
+#define GXLOW_CMD4 0x0014bad4
+
+#define NSS_LaunchTitle 0x00231310
+#define NSS_RebootSystem 0x001374c4
+
+#define CFGIPC_SecureInfoGetRegion 0x001378e8
+
+#define GSPGPU_Shutdown 0x0011a000
+#define GSPGPU_FlushDataCache 0x0014b9d0
+
+#define APT_SendParameter 0x002277cc
+
+#define FS_MountSdmc 0x00118c4c
+
+#define IFile_Open 0x0022bc08
+#define IFile_Close 0x0022f9a0
+#define IFile_Read 0x0022baf4
+
+#define ROP_COND_THROWFATALERR 0x001028e4
+
+#define ORIGINALOBJPTR_BASELOADADR 0x0032d848
+
+#define FILEPATHPTR_THEME_SHUFFLE_BODYRD 0x0032e604
+#define FILEPATHPTR_THEME_REGULAR_THEMEMANAGE 0x0032e60c
+#define FILEPATHPTR_THEME_REGULAR_BODYCACHE 0x0032e610
+#define FILEPATHPTR_THEME_SHUFFLE_THEMEMANAGE 0x0032e618
+#define FILEPATHPTR_THEME_SHUFFLE_BODYCACHE 0x0032e61c
diff --git a/shufflehax_menuversions/EUR/23554 b/shufflehax_menuversions/EUR/23554
diff --git a/shufflehax_menuversions/JPN/26626 b/shufflehax_menuversions/JPN/26626
diff --git a/shufflehax_menuversions/KOR/11266 b/shufflehax_menuversions/KOR/11266
diff --git a/shufflehax_menuversions/USA/24578 b/shufflehax_menuversions/USA/24578