Skip to content

Commit b4f698d

Browse files
RocketRobzRocketRobz
committed
DS Classic Menu: Read custom BG from where TWLMenu++ runs
1 parent 2b4470f commit b4f698d

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎quickmenu/arm9/source/graphics/graphics.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -480,20 +480,20 @@ void bottomBgLoad() {
480480

481481
switch (ms().theme) {
482482
case TWLSettings::EThemeDSi: // DSi Theme
483-
sprintf(temp, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms().dsi_theme.c_str()));
484-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms().dsi_theme.c_str()), (ms().dsi_theme.c_str()));
483+
sprintf(temp, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().dsi_theme.c_str()));
484+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().dsi_theme.c_str()), (ms().dsi_theme.c_str()));
485485
break;
486486
case TWLSettings::ETheme3DS:
487-
sprintf(temp, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms()._3ds_theme.c_str()));
488-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms()._3ds_theme.c_str()), (ms()._3ds_theme.c_str()));
487+
sprintf(temp, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms()._3ds_theme.c_str()));
488+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms()._3ds_theme.c_str()), (ms()._3ds_theme.c_str()));
489489
break;
490490
case TWLSettings::EThemeR4:
491-
sprintf(temp, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms().r4_theme.c_str()));
492-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms().r4_theme.c_str()), (ms().r4_theme.c_str()));
491+
sprintf(temp, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().r4_theme.c_str()));
492+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().r4_theme.c_str()), (ms().r4_theme.c_str()));
493493
break;
494494
case TWLSettings::EThemeWood:
495-
sprintf(temp, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms().ak_theme.c_str()));
496-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/%s/quickmenu/bottombg.png", sdFound() ? "sd" : "fat", (ms().ak_theme.c_str()), (ms().ak_theme.c_str()));
495+
sprintf(temp, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().ak_theme.c_str()));
496+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/%s/quickmenu/bottombg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().ak_theme.c_str()), (ms().ak_theme.c_str()));
497497
break;
498498
case TWLSettings::EThemeSaturn:
499499
// sprintf(temp, "nitro:/graphics/bottombg_saturn.png");
@@ -1174,20 +1174,20 @@ void topBgLoad(void) {
11741174

11751175
switch (ms().theme) {
11761176
case TWLSettings::EThemeDSi: // DSi Theme
1177-
sprintf(temp, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms().dsi_theme.c_str()));
1178-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms().dsi_theme.c_str()), (ms().dsi_theme.c_str()));
1177+
sprintf(temp, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().dsi_theme.c_str()));
1178+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/dsimenu/themes/%s/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().dsi_theme.c_str()), (ms().dsi_theme.c_str()));
11791179
break;
11801180
case TWLSettings::ETheme3DS:
1181-
sprintf(temp, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms()._3ds_theme.c_str()));
1182-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms()._3ds_theme.c_str()), (ms()._3ds_theme.c_str()));
1181+
sprintf(temp, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms()._3ds_theme.c_str()));
1182+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/3dsmenu/themes/%s/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms()._3ds_theme.c_str()), (ms()._3ds_theme.c_str()));
11831183
break;
11841184
case TWLSettings::EThemeR4:
1185-
sprintf(temp, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms().r4_theme.c_str()));
1186-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms().r4_theme.c_str()), (ms().r4_theme.c_str()));
1185+
sprintf(temp, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().r4_theme.c_str()));
1186+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/r4menu/themes/%s/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().r4_theme.c_str()), (ms().r4_theme.c_str()));
11871187
break;
11881188
case TWLSettings::EThemeWood:
1189-
sprintf(temp, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms().ak_theme.c_str()));
1190-
sprintf(tempNested, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/%s/quickmenu/topbg.png", sdFound() ? "sd" : "fat", (ms().ak_theme.c_str()), (ms().ak_theme.c_str()));
1189+
sprintf(temp, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().ak_theme.c_str()));
1190+
sprintf(tempNested, "%s:/_nds/TWiLightMenu/akmenu/themes/%s/%s/quickmenu/topbg.png", sys().isRunFromSD() ? "sd" : "fat", (ms().ak_theme.c_str()), (ms().ak_theme.c_str()));
11911191
break;
11921192
case TWLSettings::EThemeSaturn:
11931193
// sprintf(temp, "nitro:/graphics/topbg_saturn.png");

0 commit comments

Comments
 (0)