Compare commits
5 Commits
d9eaa1c1fb
...
1e7baa10b6
Author | SHA1 | Date |
---|---|---|
thepikachugamer | 1e7baa10b6 | |
Naim2000 | d11b6381e4 | |
Naim2000 | 3ca05bb55d | |
thepikachugamer | 608d954afe | |
MikeIsAStar | 13dd003f3d |
|
@ -29,7 +29,7 @@ typedef struct
|
||||||
} cIOSInfo;
|
} cIOSInfo;
|
||||||
// _Static_assert(sizeof(cIOSInfo) == 0x40, "Incorrect cIOSInfo struct size, do i really need to pack this..?");
|
// _Static_assert(sizeof(cIOSInfo) == 0x40, "Incorrect cIOSInfo struct size, do i really need to pack this..?");
|
||||||
|
|
||||||
#define IS_WIIU (*(vu16*)0xCD005A0 == 0xCAFE)
|
#define IS_WIIU (*(vu16*)0xCD0005A0 == 0xCAFE)
|
||||||
|
|
||||||
extern u32 boot2version;
|
extern u32 boot2version;
|
||||||
|
|
||||||
|
|
14
source/wad.c
14
source/wad.c
|
@ -187,16 +187,17 @@ static bool GetRegionFromTXT(char* region)
|
||||||
{
|
{
|
||||||
start++;
|
start++;
|
||||||
|
|
||||||
if (!strncmp(start, "JPN", 3))
|
if (!strncmp(start, "JPN", 3) || !strncmp(start, "TWN", 3) || !strncmp(start, "ROC", 3))
|
||||||
*region = 'J';
|
*region = 'J';
|
||||||
else if (!strncmp(start, "TWN", 3))
|
else if (!strncmp(start, "USA", 3) || !strncmp(start, "BRA", 3) || !strncmp(start, "HKG", 3) ||
|
||||||
*region = 'J';
|
!strncmp(start, "ASI", 3) || !strncmp(start, "LTN", 3) || !strncmp(start, "SAF", 3))
|
||||||
else if (!strncmp(start, "USA", 3))
|
|
||||||
*region = 'U';
|
*region = 'U';
|
||||||
else if (!strncmp(start, "EUR", 3))
|
else if (!strncmp(start, "EUR", 3) || !strncmp(start, "AUS", 3))
|
||||||
*region = 'E';
|
*region = 'E';
|
||||||
else if (!strncmp(start, "KOR", 3))
|
else if (!strncmp(start, "KOR", 3))
|
||||||
*region = 'K';
|
*region = 'K';
|
||||||
|
else if (!strncmp(start, "CHN", 3))
|
||||||
|
printf("Error! GetRegionFromTXT: Unhandled product area \"CHN\"!\n");
|
||||||
|
|
||||||
if (*region != 0)
|
if (*region != 0)
|
||||||
{
|
{
|
||||||
|
@ -728,9 +729,6 @@ s32 Wad_Install(FILE *fp)
|
||||||
__aligned(0x20)
|
__aligned(0x20)
|
||||||
cIOSInfo build_tag = {};
|
cIOSInfo build_tag = {};
|
||||||
|
|
||||||
printf("build_tag@%p\n", &build_tag);
|
|
||||||
__asm__ volatile ( ".long -1" );
|
|
||||||
|
|
||||||
ret = FSOPReadOpenFile(fp, (void*)&build_tag, content0_offset, sizeof(cIOSInfo));
|
ret = FSOPReadOpenFile(fp, (void*)&build_tag, content0_offset, sizeof(cIOSInfo));
|
||||||
if (ret != 1)
|
if (ret != 1)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
Loading…
Reference in New Issue