Add some SST studio BGs

assets/gfx_charprevbg/bg_beigeWithCircles.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_beigeWithCircles.png"

assets/gfx_charprevbg/bg_bigHearts.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_bigHearts.png"

assets/gfx_charprevbg/bg_cafe2Fall.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_cafe2Fall.png"

assets/gfx_charprevbg/bg_cafe2Spring.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_cafe2Spring.png"

assets/gfx_charprevbg/bg_cafe2Summer.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_cafe2Summer.png"

assets/gfx_charprevbg/bg_cafe2Winter.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_cafe2Winter.png"

assets/gfx_charprevbg/bg_circlePattern.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_circlePattern.png"

assets/gfx_charprevbg/bg_circleWindows.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_circleWindows.png"

assets/gfx_charprevbg/bg_downtownFall.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_downtownFall.png"

assets/gfx_charprevbg/bg_downtownSpring.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_downtownSpring.png"

assets/gfx_charprevbg/bg_downtownSummer.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_downtownSummer.png"

assets/gfx_charprevbg/bg_downtownWinter.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_downtownWinter.png"

assets/gfx_charprevbg/bg_gradientPurple.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_gradientPurple.png"

assets/gfx_charprevbg/bg_greenBirds.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_greenBirds.png"

assets/gfx_charprevbg/bg_park2Fall.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_park2Fall.png"

assets/gfx_charprevbg/bg_park2Spring.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_park2Spring.png"

assets/gfx_charprevbg/bg_park2Summer.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_park2Summer.png"

assets/gfx_charprevbg/bg_park2Winter.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_park2Winter.png"

assets/gfx_charprevbg/bg_pinkShine.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_pinkShine.png"

assets/gfx_charprevbg/bg_smallHearts.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_smallHearts.png"

assets/gfx_charprevbg/bg_snowflakes.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_snowflakes.png"

assets/gfx_charprevbg/bg_white.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_white.png"

assets/gfx_charprevbg/bg_yellow.t3s

@@ -0,0 +1 @@
+-f rgba -z auto "bg_yellow.png"

include/import_ss2bgnames.h

@@ -0,0 +1,49 @@
+const char* import_ss2BgNames[] {
+	"White",
+	"Snowflakes",
+	"Pink Shine",
+	"Beige with Circles",
+	"Gradient Purple",
+	"Green Birds",
+	"Circle Pattern",
+	"Circle Windows",
+	"Big Hearts",
+	"Small Hearts",
+	"Park (Spring)",
+	"Park (Summer)",
+	"Park (Fall)",
+	"Park (Winter)",
+	"Downtown (Spring)",
+	"Downtown (Summer)",
+	"Downtown (Fall)",
+	"Downtown (Winter)",
+	"Cafe (Spring)",
+	"Cafe (Summer)",
+	"Cafe (Fall)",
+	"Cafe (Winter)",
+};
+
+int import_ss2BgNums[] {
+	16,
+	18,
+	19,
+	20,
+	21,
+	22,
+	23,
+	24,
+	25,
+	26,
+	27,
+	28,
+	29,
+	30,
+	31,
+	32,
+	33,
+	34,
+	35,
+	36,
+	37,
+	38,
+};

include/import_ss3bgnames.h

@@ -1,4 +1,6 @@
 const char* import_ss3BgNames[] {
+	"White",
+	"Yellow",
 	"Blue",
 	"Tropica Beach",
 	"Primrose Park",
@@ -9,6 +11,8 @@ const char* import_ss3BgNames[] {
 };
 
 int import_ss3BgNums[] {
+	16,
+	17,
 	0,
 	12,
 	13,

include/import_ss4bgnames.h

@@ -1,4 +1,6 @@
 const char* import_ss4BgNames[] {
+	"White",
+	"Yellow",
 	"Blue",
 	"NIN10 Pro.",
 	"Beautician",
@@ -12,6 +14,8 @@ const char* import_ss4BgNames[] {
 };
 
 int import_ss4BgNums[] {
+	16,
+	17,
 	0,
 	3,
 	4,

source/gfx.cpp

@@ -97,6 +97,75 @@ void GFX::loadBgSprite(void) {
 		case 15:
 			bgPath = "romfs:/gfx/bgNight_mapleCrescent.t3x";
 			break;
+		case 16:
+			bgPath = "romfs:/gfx/bg_white.t3x";
+			break;
+		case 17:
+			bgPath = "romfs:/gfx/bg_yellow.t3x";
+			break;
+		case 18:
+			bgPath = "romfs:/gfx/bg_snowflakes.t3x";
+			break;
+		case 19:
+			bgPath = "romfs:/gfx/bg_pinkShine.t3x";
+			break;
+		case 20:
+			bgPath = "romfs:/gfx/bg_beigeWithCircles.t3x";
+			break;
+		case 21:
+			bgPath = "romfs:/gfx/bg_gradientPurple.t3x";
+			break;
+		case 22:
+			bgPath = "romfs:/gfx/bg_greenBirds.t3x";
+			break;
+		case 23:
+			bgPath = "romfs:/gfx/bg_circlePattern.t3x";
+			break;
+		case 24:
+			bgPath = "romfs:/gfx/bg_circleWindows.t3x";
+			break;
+		case 25:
+			bgPath = "romfs:/gfx/bg_bigHearts.t3x";
+			break;
+		case 26:
+			bgPath = "romfs:/gfx/bg_smallHearts.t3x";
+			break;
+		case 27:
+			bgPath = "romfs:/gfx/bg_park2Spring.t3x";
+			break;
+		case 28:
+			bgPath = "romfs:/gfx/bg_park2Summer.t3x";
+			break;
+		case 29:
+			bgPath = "romfs:/gfx/bg_park2Fall.t3x";
+			break;
+		case 30:
+			bgPath = "romfs:/gfx/bg_park2Winter.t3x";
+			break;
+		case 31:
+			bgPath = "romfs:/gfx/bg_downtownSpring.t3x";
+			break;
+		case 32:
+			bgPath = "romfs:/gfx/bg_downtownSummer.t3x";
+			break;
+		case 33:
+			bgPath = "romfs:/gfx/bg_downtownFall.t3x";
+			break;
+		case 34:
+			bgPath = "romfs:/gfx/bg_downtownWinter.t3x";
+			break;
+		case 35:
+			bgPath = "romfs:/gfx/bg_cafe2Spring.t3x";
+			break;
+		case 36:
+			bgPath = "romfs:/gfx/bg_cafe2Summer.t3x";
+			break;
+		case 37:
+			bgPath = "romfs:/gfx/bg_cafe2Fall.t3x";
+			break;
+		case 38:
+			bgPath = "romfs:/gfx/bg_cafe2Winter.t3x";
+			break;
 	}
 	bgSprite		= C2D_SpriteSheetLoad(bgPath);
 	doBgSpriteFree	= true;

source/screens/photoStudio.cpp

@@ -10,6 +10,7 @@
 #include "import_ss3charnames.h"
 #include "import_ss4charnames.h"
 
+#include "import_ss2bgnames.h"
 #include "import_ss3bgnames.h"
 #include "import_ss4bgnames.h"
 
@@ -26,11 +27,11 @@ void PhotoStudio::getList() {
 void PhotoStudio::getMaxChars() {
 	if (this->subScreenMode == 1) {
 		if (photo_highlightedGame == 3) {
-			import_totalCharacters = 9;
+			import_totalCharacters = 11;
 		} else if (photo_highlightedGame == 2) {
-			import_totalCharacters = 6;
+			import_totalCharacters = 8;
 		} else if (photo_highlightedGame == 1) {
-			import_totalCharacters = 0;
+			import_totalCharacters = 21;
 		} else if (photo_highlightedGame == 0) {
 			import_totalCharacters = 0;
 		}
@@ -331,7 +332,7 @@ void PhotoStudio::Draw(void) const {
 				Gui::DrawString(32, i2, 0.65, BLACK, import_ss3BgNames[i]);
 			} else if (photo_highlightedGame == 1) {
 				GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
-				//Gui::DrawString(32, i2, 0.65, BLACK, import_SS2CharacterNames(i));
+				Gui::DrawString(32, i2, 0.65, BLACK, import_ss2BgNames[i]);
 			} else if (photo_highlightedGame == 0) {
 				GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
 				//Gui::DrawString(32, i2, 0.65, BLACK, import_ss1CharacterNames[i]);
@@ -523,6 +524,9 @@ void PhotoStudio::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
 					this->bgList_cursorPositionOnScreen = 0;
 				}
 				switch (this->photo_highlightedGame) {
+					case 1:
+						studioBg = import_ss2BgNums[this->bgList_cursorPosition];
+						break;
 					case 2:
 						studioBg = import_ss3BgNums[this->bgList_cursorPosition];
 						break;
@@ -554,6 +558,9 @@ void PhotoStudio::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
 					this->bgList_cursorPositionOnScreen = 2;
 				}
 				switch (this->photo_highlightedGame) {
+					case 1:
+						studioBg = import_ss2BgNums[this->bgList_cursorPosition];
+						break;
 					case 2:
 						studioBg = import_ss3BgNums[this->bgList_cursorPosition];
 						break;
@@ -594,6 +601,9 @@ void PhotoStudio::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
 			this->import_bgShownFirst = 0;
 			this->getMaxChars();
 			switch (this->photo_highlightedGame) {
+				case 1:
+					studioBg = import_ss2BgNums[this->bgList_cursorPosition];
+					break;
 				case 2:
 					studioBg = import_ss3BgNums[this->bgList_cursorPosition];
 					break;
@@ -666,12 +676,6 @@ void PhotoStudio::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
 		if ((hDown & KEY_B) || ((hDown & KEY_TOUCH) && touchingBackButton())) {
 			sndBack();
 			highlightedGame = 1;
-			this->characterList_cursorPosition = 0;
-			this->characterList_cursorPositionOnScreen = 0;
-			this->characterShownFirst = 0;
-			this->characterChangeMenu_cursorPosition = 0;
-			this->characterChangeMenu_cursorPositionOnScreen = 0;
-			this->characterChangeMenu_optionShownFirst = 0;
 			Gui::setScreen(std::make_unique<titleScreen>(), true);
 		}