Ask for confirmation for resetting or quitting the game in in-game menu

Closes #1561

Author: RocketRobz

retail/arm9/source/conf_sd.cpp

@@ -610,6 +610,11 @@ void getIgmStrings(configuration* conf, bool b4ds) {
 	setIgmString(lang.fetch("TITLES", "JUMP_ADDRESS", "Jump to Address").c_str(), igmText->jumpAddress);
 	setIgmString(lang.fetch("TITLES", "SELECT_BANK", "Select VRAM Bank").c_str(), igmText->selectBank);
 	setIgmString(lang.fetch("TITLES", "COUNT", "Count:").c_str(), igmText->count);
+	setIgmString(lang.fetch("TITLES", "A_YES", "A: Yes").c_str(), igmText->aYes);
+	setIgmString(lang.fetch("TITLES", "B_NO", "B: No").c_str(), igmText->bNo);
+
+	setIgmString(lang.fetch("MESSAGES", "RESET_GAME", "Are you sure you want to reset the game?").c_str(), igmText->resetGameMessage);
+	setIgmString(lang.fetch("MESSAGES", "QUIT_GAME", "Are you sure you want to quit the game?").c_str(), igmText->quitGameMessage);
 
 	setIgmString(lang.fetch("MENU", "RETURN_TO_GAME", "Return to Game").c_str(), igmText->menu[0]);
 	setIgmString(lang.fetch("MENU", "RESET_GAME", "Reset Game").c_str(), igmText->menu[1]);

retail/cardenginei/arm9_igm/source/card_engine_header.s

@@ -24,7 +24,7 @@
 
 #Text is placed here
 igmText:
-.space 0xEA0
+.space 0xF40
 .align 4
 
 sharedAddr:

retail/cardenginei/arm9_igm/source/inGameMenu.c

@@ -106,7 +106,7 @@ void printRight(int x, int y, const unsigned char *str, FontPalette palette, boo
 		*(dst--) = *(--str) | palette << 12;
 }
 
-void printMsg(int y, const unsigned char *str, FontPalette palette, bool main) {
+int printMsg(int y, const unsigned char *str, FontPalette palette, bool main) {
 	u16 *dst = main ? BG_MAP_RAM(15) : BG_MAP_RAM_SUB(15);
 	while(*str) {
 		bool endFound = false;
@@ -143,6 +143,7 @@ void printMsg(int y, const unsigned char *str, FontPalette palette, bool main) {
 		}
 		if (y == 0x18) break;
 	}
+	return y;
 }
 
 void printChar(int x, int y, unsigned char c, FontPalette palette, bool main) {
@@ -237,6 +238,40 @@ void clearScreen(bool main) {
 	toncset16(main ? BG_MAP_RAM(15) : BG_MAP_RAM_SUB(15), 0, 0x300);
 }
 
+bool boolQuestion(const unsigned char *str) {
+	clearScreen(false);
+
+	const int y = printMsg(0, str, FONT_WHITE, false) + 1;
+	if (igmText.rtl) {
+		printRight(0x20, y, igmText.aYes, FONT_WHITE, false);
+		printRight(0x20, y+1, igmText.bNo, FONT_WHITE, false);
+	} else {
+		print(0, y, igmText.aYes, FONT_WHITE, false);
+		print(0, y+1, igmText.bNo, FONT_WHITE, false);
+	}
+
+	do {
+		while (REG_VCOUNT != 191) mySwiDelay(100);
+		while (REG_VCOUNT == 191) mySwiDelay(100);
+	} while(KEYS & KEY_A);
+
+	waitKeys(KEY_A | KEY_B);
+
+	if (KEYS & KEY_A) {
+		do {
+			while (REG_VCOUNT != 191) mySwiDelay(100);
+			while (REG_VCOUNT == 191) mySwiDelay(100);
+		} while(KEYS & KEY_A);
+		return true;
+	} else {
+		do {
+			while (REG_VCOUNT != 191) mySwiDelay(100);
+			while (REG_VCOUNT == 191) mySwiDelay(100);
+		} while(KEYS & KEY_B);
+	}
+	return false;
+}
+
 #define VRAM_x(bank) ((u16*)(0x6800000 + (0x0020000 * (bank))))
 #define VRAM_x_CR(bank) (((vu8*)0x04000240)[bank])
 
@@ -949,11 +984,13 @@ u32 inGameMenu(s32 *mainScreen, u32 consoleModel, s32 *exceptionRegisters) {
 					while (sharedAddr[4] != 0) swiDelay(100);
 					break;
 				case MENU_RESET:
-					extern bool exceptionPrinted;
-					exceptionPrinted = false;
-					res = 0x52534554; // TESR
-					sharedAddr[3] = res;
-					sharedAddr[4] = 0x54455352; // RSET
+					if (boolQuestion(igmText.resetGameMessage)) {
+						extern bool exceptionPrinted;
+						exceptionPrinted = false;
+						res = 0x52534554; // TESR
+						sharedAddr[3] = res;
+						sharedAddr[4] = 0x54455352; // RSET
+					}
 					break;
 				case MENU_SCREENSHOT:
 					screenshot();
@@ -983,9 +1020,11 @@ u32 inGameMenu(s32 *mainScreen, u32 consoleModel, s32 *exceptionRegisters) {
 					ramViewer();
 					break;
 				case MENU_QUIT:
-					res = 0x54495845; // EXIT
-					sharedAddr[3] = res;
-					sharedAddr[4] = 0x54495551; // QUIT
+					if (boolQuestion(igmText.quitGameMessage)) {
+						res = 0x54495845; // EXIT
+						sharedAddr[3] = res;
+						sharedAddr[4] = 0x54495551; // QUIT
+					}
 					break;
 				default:
 					break;

retail/common/include/igm_text.h

@@ -14,7 +14,11 @@ struct IgmText {
 	unsigned char jumpAddress[20];
 	unsigned char selectBank[20];
 	unsigned char count[14];
+	unsigned char aYes[16];
+	unsigned char bNo[16];
 	unsigned char menu[8][20];
+	unsigned char resetGameMessage[64];
+	unsigned char quitGameMessage[64];
 	unsigned char optionsLabels[6][20];
 	unsigned char optionsValues[7][20];
 	unsigned char optionsDescriptions[6][192];
@@ -29,7 +33,7 @@ struct IgmText {
 };
 
 #ifdef __cplusplus
-static_assert(sizeof(IgmText) == 0xEA0, "IgmText is too big! Allocate more space in the in-game menu header");
+static_assert(sizeof(IgmText) == 0xF40, "IgmText is too big! Allocate more space in the in-game menu header");
 
 enum class IgmFont : u8 {
 	arabic = 0,

retail/nitrofiles/languages/en/in_game_menu.ini

@@ -3,6 +3,12 @@ RAM_VIEWER=RAM Viewer
 JUMP_ADDRESS=Jump to Address
 SELECT_BANK=Select VRAM Bank
 COUNT=Count:
+A_YES=A: Yes
+B_NO=B: No
+
+[MESSAGES]
+RESET_GAME=Are you sure you want to reset the game?
+QUIT_GAME=Are you sure you want to quit the game?
 
 [MENU]
 RETURN_TO_GAME=Return to Game