Fix some DSi theme inaccuracies

#2474
DS-Homebrew · Sep 28, 2024 · aacff55 · aacff55
1 parent 2be2601
commit aacff55
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/romsel_dsimenutheme/arm9/source/graphics/graphics.cpp b/romsel_dsimenutheme/arm9/source/graphics/graphics.cpp
@@ -132,6 +132,7 @@ int titleboxXmovespeed[8] = {12, 10, 8, 8, 8, 8, 6, 4};
 int titleboxXpos[2] = {0};
 int titleboxXdest[2] = {0};
 int titleboxYpos = 85; // 85, when dropped down
+int iconYposOnTitleBox = 12;
 int titlewindowXpos[2] = {0};
 int titlewindowXdest[2] = {0};
 int titleboxXspeed = 3; // higher is SLOWER
@@ -844,7 +845,7 @@ void vBlankHandler() {
 				 &tex().buttonarrowImage()[2 + scrollWindowTouched]);
 			glSprite(0, 171, GL_FLIP_NONE, &tex().buttonarrowImage()[0 + buttonArrowTouched[0]]);
 			glSprite(224, 171, GL_FLIP_H, &tex().buttonarrowImage()[0 + buttonArrowTouched[1]]);
-			glSprite(72 - titleboxXpos[ms().secondaryDevice], 81, GL_FLIP_NONE, tex().braceImage());
+			glSprite(66 - titleboxXpos[ms().secondaryDevice], 81, GL_FLIP_NONE, tex().braceImage());
 		}
 
 		if (displayGameIcons) {
@@ -929,7 +930,7 @@ void vBlankHandler() {
 									 GL_FLIP_NONE, tex().folderImage());
 						if (customIcon[i])
 							drawIcon(iconXpos - titleboxXpos[ms().secondaryDevice],
-									 (titleboxYpos + 12) + titleboxYposDropDown[i % 5],
+									 (titleboxYpos + iconYposOnTitleBox) + titleboxYposDropDown[i % 5],
 									 i);
 					} else if (!applaunchprep || CURPOS != i) { // Only draw the icon if we're not launching the selcted app
 						if (!bnrSysSettings[i]) {
@@ -949,7 +950,7 @@ void vBlankHandler() {
 									 GL_FLIP_NONE, &tex().settingsImage()[1]);
 						else
 							drawIcon(iconXpos - titleboxXpos[ms().secondaryDevice],
-										(titleboxYpos + 12) + titleboxYposDropDown[i % 5],
+										(titleboxYpos + iconYposOnTitleBox) + titleboxYposDropDown[i % 5],
 										i);
 					}
 				} else {
@@ -975,7 +976,7 @@ void vBlankHandler() {
 								 GL_FLIP_NONE, tex().folderImage());
 					if (customIcon[movingApp])
 						drawIcon(112,
-								 (titleboxYpos + 12) - movingAppYpos + titleboxYposDropDown[movingApp % 5],
+								 (titleboxYpos + iconYposOnTitleBox) - movingAppYpos + titleboxYposDropDown[movingApp % 5],
 								 -1);
 				} else {
 					if (!bnrSysSettings[movingApp]) {
@@ -993,12 +994,12 @@ void vBlankHandler() {
 								 (titleboxYpos - 1) - movingAppYpos + titleboxYposDropDown[movingApp % 5],
 								 GL_FLIP_NONE, &tex().settingsImage()[1]);
 					else
-						drawIcon(112, (titleboxYpos + 12) - movingAppYpos + titleboxYposDropDown[movingApp % 5], -1);
+						drawIcon(112, (titleboxYpos + iconYposOnTitleBox) - movingAppYpos + titleboxYposDropDown[movingApp % 5], -1);
 				}
 			}
 
 			if (ms().theme == TWLSettings::EThemeDSi) {
-				glSprite(spawnedboxXpos + titleboxXspacing + 10 - titleboxXpos[ms().secondaryDevice], 81, GL_FLIP_H, tex().braceImage());
+				glSprite(spawnedboxXpos + titleboxXspacing + 20 - titleboxXpos[ms().secondaryDevice], 81, GL_FLIP_H, tex().braceImage());
 			}
 
 			if (movingApp != -1 && ms().theme == TWLSettings::EThemeDSi && showMovingArrow) {
@@ -1504,6 +1505,7 @@ void graphicsInit() {
 
 	if (ms().theme == TWLSettings::EThemeDSi) {
 		titleboxXspeed = 8;
+		iconYposOnTitleBox = 13;
 	}
 
 	for (int i = 0; i < 5; i++) {