rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not show cart disable message in DSiWarehax

Browse Source
This commit is contained in:
RocketRobz 2020-07-14 19:07:15 -06:00
parent 537efa45a3
commit 9ac93598db
3 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arm7/source/main.c
View File

@ -31,8 +31,7 @@
#include <string.h> #include <string.h>
void my_installSystemFIFO(void); void my_installSystemFIFO(void);
void my_sdmmc_get_cid(int devicenumber, u32 *cid);
unsigned int * SCFG_EXT=(unsigned int*)0x4004008;
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
void ReturntoDSiMenu() { void ReturntoDSiMenu() {
@ -123,7 +122,7 @@ int main() {
setPowerButtonCB(powerButtonCB); setPowerButtonCB(powerButtonCB);
if (isDSiMode()) { if (isDSiMode() /*|| ((REG_SCFG_EXT & BIT(17)) && (REG_SCFG_EXT & BIT(18)))*/) {
/*for (int i = 0; i < 8; i++) { /*for (int i = 0; i < 8; i++) {
*(u8*)(0x2FFFD00+i) = *(u8*)(0x4004D07-i); // Get ConsoleID *(u8*)(0x2FFFD00+i) = *(u8*)(0x4004D07-i); // Get ConsoleID
}*/ }*/
@ -154,7 +153,7 @@ int main() {
} }
} }
fifoSendValue32(FIFO_USER_03, *SCFG_EXT); fifoSendValue32(FIFO_USER_03, REG_SCFG_EXT);
fifoSendValue32(FIFO_USER_07, *(u16*)(0x4004700)); fifoSendValue32(FIFO_USER_07, *(u16*)(0x4004700));
fifoSendValue32(FIFO_USER_06, 1); fifoSendValue32(FIFO_USER_06, 1);

2
arm7/source/my_system.c
View File

@ -42,7 +42,7 @@ void my_installSystemFIFO(void) {
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
fifoSetValue32Handler(FIFO_PM, powerValueHandler, 0); fifoSetValue32Handler(FIFO_PM, powerValueHandler, 0);
//if (isDSiMode()) { //if (isDSiMode() || (REG_SCFG_EXT & BIT(18))) {
fifoSetValue32Handler(FIFO_SDMMC, my_sdmmcValueHandler, 0); fifoSetValue32Handler(FIFO_SDMMC, my_sdmmcValueHandler, 0);
fifoSetDatamsgHandler(FIFO_SDMMC, my_sdmmcMsgHandler, 0); fifoSetDatamsgHandler(FIFO_SDMMC, my_sdmmcMsgHandler, 0);
//} //}

50
arm9/source/main.cpp
View File

@ -169,19 +169,6 @@ int main(int argc, char **argv) {
printf ("https:/github.com/"); printf ("https:/github.com/");
printf ("\x1b[4;11H"); printf ("\x1b[4;11H");
printf ("RocketRobz/GodMode9i"); printf ("RocketRobz/GodMode9i");
if (isDSiMode()) {
printf ("\x1b[20;1H");
printf ("X Held - Disable NAND access");
printf ("\x1b[21;1H");
printf ("Y Held - Disable cart access");
printf ("\x1b[22;4H");
printf ("Do these if it crashes here");
}
// Display for 2 seconds
for (int i = 0; i < 60*2; i++) {
swiWaitForVBlank();
}
fifoWaitValue32(FIFO_USER_06); fifoWaitValue32(FIFO_USER_06);
if (fifoGetValue32(FIFO_USER_03) == 0) arm7SCFGLocked = true; if (fifoGetValue32(FIFO_USER_03) == 0) arm7SCFGLocked = true;
@ -190,10 +177,33 @@ int main(int argc, char **argv) {
fifoSendValue32(FIFO_USER_07, 0); fifoSendValue32(FIFO_USER_07, 0);
if (isDSiMode()) { if (isDSiMode()) {
if (!arm7SCFGLocked) {
printf ("\x1b[20;1H");
printf ("X Held - Disable NAND access");
printf ("\x1b[21;1H");
printf ("Y Held - Disable cart access");
printf ("\x1b[22;4H");
printf ("Do these if it crashes here");
} else {
printf ("\x1b[21;1H");
printf ("X Held - Disable NAND access");
printf ("\x1b[22;5H");
printf ("Do this if it crashes here");
}
}
// Display for 2 seconds
for (int i = 0; i < 60*2; i++) {
swiWaitForVBlank();
}
if (isDSiMode()) {
printf ("\x1b[20;1H");
printf (" ");
printf ("\x1b[21;1H"); printf ("\x1b[21;1H");
printf (" "); printf (" ");
printf ("\x1b[22;5H"); printf ("\x1b[22;4H");
printf (" "); // Clear "Y Held" text printf (" "); // Clear "Y Held" text
} }
printf ("\x1b[22;11H"); printf ("\x1b[22;11H");
printf ("mounting drive(s)..."); printf ("mounting drive(s)...");
@ -201,14 +211,14 @@ int main(int argc, char **argv) {
sysSetCartOwner (BUS_OWNER_ARM9); // Allow arm9 to access GBA ROM sysSetCartOwner (BUS_OWNER_ARM9); // Allow arm9 to access GBA ROM
if (*(u8*)(0x2FFFD08) == 0) { if (isDSiMode() || !isRegularDS) {
sdMounted = sdMount(); if (*(u8*)(0x2FFFD08) == 0) {
sdMounted = sdMount();
}
} }
if (isDSiMode()) { if (isDSiMode()) {
scanKeys(); scanKeys();
if (keysHeld() & KEY_Y) { yHeld = (keysHeld() & KEY_Y);
yHeld = true;
}
ramdrive1Mount(); ramdrive1Mount();
*(vu32*)(0x0DFFFE0C) = 0x474D3969; // Check for 32MB of RAM *(vu32*)(0x0DFFFE0C) = 0x474D3969; // Check for 32MB of RAM
if (*(vu32*)(0x0DFFFE0C) == 0x474D3969) { if (*(vu32*)(0x0DFFFE0C) == 0x474D3969) {