Display box art for folders/directories

Closes #2625

Also: 3DS: Keep playing rotating cubes video if box art is not found

Author: RocketRobz

romsel_dsimenutheme/arm9/source/fileBrowse.cpp

@@ -616,23 +616,18 @@ void updateBoxArt(void) {
 	showSTARTborder = true;
 	if (ms().theme == TWLSettings::EThemeHBL || ms().macroMode || !ms().showBoxArt || boxArtLoaded) return;
 
-	if (ms().theme == TWLSettings::ETheme3DS && rocketVideo_playVideo) {
-		rocketVideo_playVideo = false;
-		while (dmaBusy(1)); // Wait for frame to finish rendering
-		tex().drawOverRotatingCubes(); // Clear top screen cubes for 3DS theme
+	if (ms().theme != TWLSettings::ETheme3DS) {
+		clearBoxArt();
 	}
-	clearBoxArt();
 
-	if (isDirectory[CURPOS]) {
+	sprintf(boxArtPath, "%s:/_nds/TWiLightMenu/boxart/%s.png", sys().isRunFromSD() ? "sd" : "fat", boxArtFilename);
+	if (!isDirectory[CURPOS] && (bnrRomType[CURPOS] == 0) && (access(boxArtPath, F_OK) != 0)) {
+		sprintf(boxArtPath, "%s:/_nds/TWiLightMenu/boxart/%s.png", sys().isRunFromSD() ? "sd" : "fat", gameTid[CURPOS]);
+	}
+	if (!tex().drawBoxArt(boxArtPath, (dsiFeatures() && ms().showBoxArt == 2))) { // Load box art
 		if (ms().theme == TWLSettings::ETheme3DS && !rocketVideo_playVideo) {
 			rocketVideo_playVideo = true;
 		}
-	} else {
-		sprintf(boxArtPath, "%s:/_nds/TWiLightMenu/boxart/%s.png", sys().isRunFromSD() ? "sd" : "fat", boxArtFilename);
-		if ((bnrRomType[CURPOS] == 0) && (access(boxArtPath, F_OK) != 0)) {
-			sprintf(boxArtPath, "%s:/_nds/TWiLightMenu/boxart/%s.png", sys().isRunFromSD() ? "sd" : "fat", gameTid[CURPOS]);
-		}
-		tex().drawBoxArt(boxArtPath, (dsiFeatures() && ms().showBoxArt == 2)); // Load box art
 	}
 	boxArtLoaded = true;
 }

romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.cpp

@@ -983,10 +983,8 @@ void ThemeTextures::loadBoxArtToMem(const char *filename, int num) {
 	fclose(file);
 }
 
-void ThemeTextures::drawBoxArt(const char *filename, bool inMem) {
-	if (inMem ? !boxArtFound[CURPOS] : access(filename, F_OK) != 0) return;
-
-	beginBgSubModify();
+bool ThemeTextures::drawBoxArt(const char *filename, bool inMem) {
+	if (inMem ? !boxArtFound[CURPOS] : access(filename, F_OK) != 0) return false;
 
 	std::vector<unsigned char> image;
 	uint imageXpos, imageYpos;
@@ -996,7 +994,20 @@ void ThemeTextures::drawBoxArt(const char *filename, bool inMem) {
 		lodepng::decode(image, boxArtWidth, boxArtHeight, filename);
 	}
 	bool alternatePixel = false;
-	if (boxArtWidth > 256 || boxArtHeight > 192) return;
+	if (boxArtWidth > 256 || boxArtHeight > 192) return false;
+
+	if (ms().theme == TWLSettings::ETheme3DS && rocketVideo_playVideo) {
+		rocketVideo_playVideo = false;
+		while (dmaBusy(1)); // Wait for frame to finish rendering
+		drawOverRotatingCubes(); // Clear top screen cubes for 3DS theme
+	}
+
+	if (ms().theme == TWLSettings::ETheme3DS) {
+		extern uint photoWidth, photoHeight;
+		tex().drawOverBoxArt(photoWidth, photoHeight);
+	}
+
+	beginBgSubModify();
 
 	u16* bmpImageBuffer = new u16[256 * 192];
 	u16* bmpImageBuffer2 = boxArtColorDeband ? new u16[256 * 192] : NULL;
@@ -1103,6 +1114,8 @@ void ThemeTextures::drawBoxArt(const char *filename, bool inMem) {
 	if (boxArtColorDeband) {
 		delete[] bmpImageBuffer2;
 	}
+
+	return true;
 }
 
 #define MAX_PHOTO_WIDTH 208

romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.h

@@ -78,7 +78,7 @@ class ThemeTextures
 	void drawBottomBg(int bg);
 
 	void loadBoxArtToMem(const char *filename, int num);
-	void drawBoxArt(const char* filename, bool inMem);
+	bool drawBoxArt(const char* filename, bool inMem);
 	void drawOverBoxArt(uint photoWidth, uint photoHeight);
 	void drawOverRotatingCubes();