Fix wrong bottom cart texture in quickmenu if using SLOT2 flashcart (#2491)

edo9300 · web-flow · commit 1d7e645b5a93 · 2024-11-23T13:24:47.000-07:00
If the current dldi is a slot2 dldi, properly display the right texture as "SLOT 2" entry in the ds quick menu instead of the "no cart inserted" one
diff --git a/quickmenu/arm9/source/graphics/graphics.cpp b/quickmenu/arm9/source/graphics/graphics.cpp
@@ -563,7 +563,7 @@ auto getMenuEntryTexture(MenuEntry entry) {
 			return &dlp_icons.images[0];
 		case MenuEntry::GBA:
 		{
-			bool hasGbaCart = sys().isRegularDS() && (((u8*)GBAROM)[0xB2] == 0x96);
+			bool hasGbaCart = sys().isRegularDS() && ((io_dldi_data->ioInterface.features & FEATURE_SLOT_GBA) || (((u8*)GBAROM)[0xB2] == 0x96));
 			if(hasGbaCart || sdFound()) {
 				if(initialTouchedPosition == MenuEntry::GBA) {
 					if(currentTouchedPosition != MenuEntry::GBA)

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ auto getMenuEntryTexture(MenuEntry entry) {`
`563`	`563`	`return &dlp_icons.images[0];`
`564`	`564`	`case MenuEntry::GBA:`
`565`	`565`	`{`
`566`		`- bool hasGbaCart = sys().isRegularDS() && (((u8*)GBAROM)[0xB2] == 0x96);`
	`566`	`+ bool hasGbaCart = sys().isRegularDS() && ((io_dldi_data->ioInterface.features & FEATURE_SLOT_GBA) \|\| (((u8*)GBAROM)[0xB2] == 0x96));`
`567`	`567`	`if(hasGbaCart \|\| sdFound()) {`
`568`	`568`	`if(initialTouchedPosition == MenuEntry::GBA) {`
`569`	`569`	`if(currentTouchedPosition != MenuEntry::GBA)`