Try fixing in-game menu open crash bug

DS-Homebrew · Jan 16, 2024 · 7319cf8 · 7319cf8
1 parent d29bdb4
commit 7319cf8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/retail/cardengine/arm7/source/inGameMenu.c b/retail/cardengine/arm7/source/inGameMenu.c
@@ -170,6 +170,7 @@ void inGameMenu(void) {
 
 	sharedAddr[0] = errorBak;
 	sharedAddr[4] = 0;
+	sharedAddr[5] = 0;
 	sharedAddr[7] -= 0x10000000; // Clear time receive flag
 	timeTillStatusRefresh = 7;
 

diff --git a/retail/cardenginei/arm7/source/inGameMenu.c b/retail/cardenginei/arm7/source/inGameMenu.c
@@ -219,6 +219,7 @@ void inGameMenu(void) {
 
 	sharedAddr[0] = errorBak;
 	sharedAddr[4] = 0;
+	sharedAddr[5] = 0;
 	sharedAddr[7] -= 0x10000000; // Clear time receive flag
 	timeTillStatusRefresh = 7;
 

diff --git a/retail/cardenginei/arm7_dsiware/source/inGameMenu.c b/retail/cardenginei/arm7_dsiware/source/inGameMenu.c
@@ -218,6 +218,7 @@ void inGameMenu(void) {
 
 	sharedAddr[0] = errorBak;
 	sharedAddr[4] = 0;
+	sharedAddr[5] = 0;
 	sharedAddr[7] -= 0x10000000; // Clear time receive flag
 	timeTillStatusRefresh = 7;
 

diff --git a/retail/cardenginei/arm9/source/cardengine.c b/retail/cardenginei/arm9/source/cardengine.c
@@ -1177,6 +1177,10 @@ extern void reset(u32 param, u32 tid2);
 void inGameMenu(s32* exRegisters) {
 	int oldIME = enterCriticalSection();
 
+	while (sharedAddr[5] != 0x4C4D4749) { // 'IGML'
+		while (REG_VCOUNT != 191) swiDelay(100);
+		while (REG_VCOUNT == 191) swiDelay(100);
+	}
 	while (sharedAddr[5] == 0x4C4D4749) { // 'IGML'
 		while (REG_VCOUNT != 191) swiDelay(100);
 		while (REG_VCOUNT == 191) swiDelay(100);

diff --git a/retail/cardenginei/arm9_dsiware/source/cardengine.c b/retail/cardenginei/arm9_dsiware/source/cardengine.c
@@ -221,6 +221,10 @@ void reset(u32 tid1, u32 tid2) {
 void inGameMenu(s32* exRegisters) {
 	int oldIME = enterCriticalSection();
 
+	while (sharedAddr[5] != 0x4C4D4749) { // 'IGML'
+		while (REG_VCOUNT != 191) swiDelay(100);
+		while (REG_VCOUNT == 191) swiDelay(100);
+	}
 	while (sharedAddr[5] == 0x4C4D4749) { // 'IGML'
 		while (REG_VCOUNT != 191) swiDelay(100);
 		while (REG_VCOUNT == 191) swiDelay(100);