Fix #2387

For real this time

romsel_dsimenutheme/arm9/source/fileBrowse.cpp

@@ -607,9 +607,10 @@ void updateBoxArt(void) {
 
 	if (ms().theme == TWLSettings::ETheme3DS && rocketVideo_playVideo) {
 		rocketVideo_playVideo = false;
-		while (dmaBusy(1)) swiDelay(100); // Wait for frame to finish rendering
+		while (dmaBusy(1)); // Wait for frame to finish rendering
+		tex().drawOverRotatingCubes(); // Clear top screen cubes for 3DS theme
 	}
-	clearBoxArt(); // and clear top screen cubes for 3DS theme
+	clearBoxArt();
 
 	if (isDirectory[CURPOS]) {
 		if (ms().theme == TWLSettings::ETheme3DS && !rocketVideo_playVideo) {

romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.cpp

@@ -1139,6 +1139,21 @@ void ThemeTextures::drawOverBoxArt(uint photoWidth, uint photoHeight) {
 	boxArtWidth = boxArtHeight = 0;
 }
 
+// Redraw background over the rotating cubes bounds
+void ThemeTextures::drawOverRotatingCubes() {
+	// if (!rotatingCubesLoaded) return;
+
+	extern u8 rocketVideo_height;
+	extern int rocketVideo_videoYpos;
+
+	beginBgSubModify();
+	for (uint y = 0; y < rocketVideo_height; y++) {
+		uint offset = (rocketVideo_videoYpos + y) * SCREEN_WIDTH;
+		tonccpy(_bgSubBuffer + offset, _topBorderBuffer + offset, sizeof(u16) * SCREEN_WIDTH);
+	}
+	commitBgSubModify();
+}
+
 ITCM_CODE void ThemeTextures::drawVolumeImage(int volumeLevel) {
 	if (!dsiFeatures())
 		return;

romsel_dsimenutheme/arm9/source/graphics/ThemeTextures.h

@@ -80,6 +80,7 @@ class ThemeTextures
 	void loadBoxArtToMem(const char *filename, int num);
 	void drawBoxArt(const char* filename, bool inMem);
 	void drawOverBoxArt(uint photoWidth, uint photoHeight);
+	void drawOverRotatingCubes();
 
 	void drawVolumeImage(int volumeLevel);
 	void drawVolumeImageMacro(int volumeLevel);