Skip to content
This repository has been archived by the owner on Dec 28, 2023. It is now read-only.

Commit

Permalink
Update dolphin detection; print warning about vWii (#4)
Browse files Browse the repository at this point in the history 
* update timestamp

* add beter dolphin detection, remove shitty method

* Fix very bad error I almost made

I removed a line I shouldn't have

* bump version number

* print warning about vWii
  • Loading branch information
urmum-69 authored Sep 19, 2020
1 parent 0efc2ef commit 449ddbc
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 129 deletions.
2 changes: 1 addition & 1 deletion meta.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<app version="1.1">
<name>RiiConnect24 Mail Patcher</name>
<coder>Spotlight</coder>
<version>v1.1</version>
<version>v1.3</version>
<release_date>201804210000</release_date>
<short_description>Patches your nwc24msg.cfg to use Wii Mail!</short_description>
<long_description>This tool will patch your nwc24msg.cfg file to use Wii Mail with RiiConnect24. It will only take a couple seconds and makes the whole process easy.
Expand Down
144 changes: 16 additions & 128 deletions source/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static GXRModeObj* rmode = NULL;

//---------------------------------------------------------------------------------
int main(int argc, char** argv) {
//---------------------------------------------------------------------------------
//---------------------------------------------------------------------------------

VIDEO_Init();
WPAD_Init();
Expand All @@ -37,130 +37,25 @@ int main(int argc, char** argv) {
if (rmode->viTVMode & VI_NON_INTERLACE) VIDEO_WaitVSync();

printf("\n:------------------------------------------------:\n");
printf(": RiiConnect24 Mail Patcher - (C) Spotlight v1.2 :\n: Compiled on 2020/08/02 at 7:14PM :\n");
printf(": RiiConnect24 Mail Patcher - (C) Spotlight v1.3 :\n: Compiled on 2020/09/19 at 9:13PM :\n");
printf(":------------------------------------------------:\n");

printf("Connecting to the Internet... OK\n");
// The console understands VT terminal escape codes
// This positions the cursor on row 2, column 0
// we can use variables for this with format codes too
// e.g. printf ("\x1b[%d;%dH", row, column );
// textPos(2, 2);
//
// printf("===Network status===");
//
// if (initNetwork()) {
// textPos(2, 4);
// printf("Connected, yay!");
//
// char ipAddress[16] = "";
// char netmask[16] = "";
// char gateway[16] = "";
//
// s32 error = if_config(ipAddress, netmask, gateway, true, 50);
//
// textPos(2, 5);
//
// if (error >= 0) {
// printf("IP: %s, NM: %s, GW: %s", ipAddress, netmask, gateway);
//
// textPos(0, 6);
//
// char response[2048];
// getRequest("rc24.xyz", "/robots.txt", 443, &response, sizeof(response));
// printf("%s\n", response);
// } else {
// printf("An error has occured while trying to get the network data, wooooops :/");
// }
//
// } else {
// printf("Not connected :/");
// }

// textPos(24, 0);
// printf("===NAND Access & Network Test===\n\n");

// if (initNetwork()) {
// printf("Connected, making the request...\n");
//
// char response[2048];
// if (getRequest("rc24.xyz", "/robots.txt", 443, &response, sizeof(response)) >= 0) {
// printf("Request successful !\n");
//
// s32 file = ISFS_Open("/shared2/wc24/teste.txt", ISFS_OPEN_RW);
// printf("ISFS_Open: %li\n", file);
//
// error = ISFS_Write(file, response, strlen(response));
// printf("ISFS_Write: %li\n", error);
//
// error = ISFS_Close(file);
// printf("ISFS_Close: %li\n", error);
// } else {
// printf("Request error !\n");
// }
// } else {
// printf("Couldn't connect to internet !\n");
// }

// static char buffer[1024] = "";
// BYTE sha256[SHA256_BLOCK_SIZE];
// NAND_ReadFile("/shared2/wc24/nwc24msg.cfg", buffer, 1024);
// calcSHA256(sha256, buffer, 1024);
//
// for (int i = 0; i < SHA256_BLOCK_SIZE; i++)
// printf("%.1x", sha256[i]);xdelta3

// s64 fc = getFriendCode();
// char fcChar[16];
// sprintf(fcChar, "%lli", fc);
// textPos(21, 14);
// printf("Your Wii Number is ");
// for (int i = 0; i < 4; i++) {
// char separate[5] = "";
// memcpy(&separate, fcChar + (4 * i), 0x4);
// printf("%s", separate);
//
// if (i < 3)
// printf("-");
// }
// printf("\n");
// textPos(23, 16);
// printf("Press HOME/START to return to HSC.\n");

// static u8 buffer[6] = "";
// s32 error = NAND_ReadFile("/test.txt", buffer, 6);
// printf("ReadFile1: %li\n", error);
//
// for (int i = 0; i < sizeof(buffer); i++)
// printf("%x", buffer[i]);
//
// printf("\n");
//
// static u8 patchf[41] = "";
// error = NAND_ReadFile("/wfs/slt", patchf, 41);
// printf("ReadFile2: %li\n", error);
//
// for (int i = 0; i < sizeof(patchf); i++)
// printf("%x", patchf[i]);
//
// printf("\n");
//
// uint8_t patchedOutput[6];
// memset(patchedOutput, 0, 6);
// usize_t gotOutput = 0;
// // uint8_t diff[] = {0xD6, 0xC3, 0xC4, 0x00, 0x05, 0x02, 0x10, 0x74, 0x2E, 0x74, 0x78, 0x74,
// 0x2F, 0x2F, 0x74, 0x65, 0x73, 0x74, 0x2E, 0x74, 0x78, 0x74, 0x2F, 0x04, 0x10, 0x06, 0x00,
// 0x06, 0x01, 0x00, 0x08, 0x7A, 0x02, 0x28, 0x73, 0x61, 0x6C, 0x69, 0x74, 0x0A, 0x07};
// // uint8_t origin[] = {0x73, 0x61, 0x6C, 0x75, 0x74, 0x0A};
// // uint8_t changed[] = {0x73, 0x61, 0x6C, 0x69, 0x74, 0x0A};
// uint8_t tst[64] = "";
// int errInt = xd3_decode_memory(patchf, 39, buffer, 6, tst, &gotOutput, 64, 0);
// // int errInt = xd3_encode_memory(buffer, 6, patchf, 6, tst, &gotOutput, 1024, 0);
// printf("decode: %i\n", errInt);
//
// for (int i = 0; i < sizeof(tst); i++)
// printf("%.2x", tst[i]);

if (isDolphin()) {
printf(":---------------------------------------------------------------:\n"
": Dolphin is not supported! :\n"
": This tool can only run on a real Nintendo Wii Console. :\n"
":---------------------------------------------------------------:\n");
sleep(5);
exit(0);
} else if (CheckvWii()){
printf(":---------------------------------------------------------------:\n"
": vWii Detected :\n"
": This tool will still patch your nwc24msg.cfg, but you will be :\n"
": Unable to fully utilize Wii mail :\n"
":---------------------------------------------------------------:\n");
}
printf("\nPatching...\n\n");

s32 systemVersion = getSystemMenuVersion();
Expand All @@ -180,13 +75,6 @@ int main(int argc, char** argv) {
printf("\nIf you're repatching, contact us and provide this info:\n");
printf("\nYour friend code: w");
printf("%016llu\n", friendCode);
} else if (friendCode == 0000000000000000) { // Detect dolphin and don't patch
printf("\033[3A:---------------------------------------------------------------:\n"
": Dolphin is not supported! :\n"
": This tool can only run on a real Nintendo Wii Console. :\n"
":---------------------------------------------------------------:\n");
sleep(5);
exit(0);
} else if (error != 0) {
printf("There was an error while patching.\nPlease make a screenshot of this error message and send it\nto a developer.\n");
printf("\nContact using:\n- Discord: https://discord.gg/b4Y7jfD\n Wait time: Short, send a Direct Message to a developer.\n- E-Mail: [email protected]\n Wait time: up to 24 hours, sometimes longer\n");
Expand Down
26 changes: 26 additions & 0 deletions source/nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@

static bool isNANDInitialised = false;

bool isDolphin(void) {
s32 checkDolphin;
checkDolphin = IOS_Open("/dev/dolphin", IPC_OPEN_NONE);
if (checkDolphin >= 0)
return true;
else
return false;
}


bool CheckvWii (void) { // Function taken from priiloader
s32 ret;
u32 x;

//check if the vWii NandLoader is installed ( 0x200 & 0x201)
ret = ES_GetTitleContentsCount(0x0000000100000200ll, &x);

if (ret < 0)
return false; // title was never installed

if (x <= 0)
return false; // title was installed but deleted via Channel Management

return true;
}

s32 NAND_Init() {
s32 error = ISFS_Initialize();

Expand Down
3 changes: 3 additions & 0 deletions source/nand.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
s32 NAND_Init();
s32 NAND_Exit();

bool isDolphin(void);
bool CheckvWii(void);

bool NAND_IsFilePresent(const char *filePath);
s32 NAND_ReadFile(const char *filePath, void *buffer, u32 bufferLength);
s32 NAND_WriteFile(const char *filePath, const void *buffer, u32 bufferLength, bool createFile);
Expand Down

0 comments on commit 449ddbc

Please sign in to comment.