diff --git a/app/camera shutter_data/e08/d08/e0808181.au b/app/camera shutter_data/e08/d08/e0808181.au deleted file mode 100644 index 7f5d60c..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808181.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808305.au b/app/camera shutter_data/e08/d08/e0808305.au deleted file mode 100644 index 7f5d60c..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808305.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e080833a.au b/app/camera shutter_data/e08/d08/e080833a.au deleted file mode 100644 index 292aef5..0000000 Binary files a/app/camera shutter_data/e08/d08/e080833a.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e08083d3.au b/app/camera shutter_data/e08/d08/e08083d3.au deleted file mode 100644 index a4a8ac6..0000000 Binary files a/app/camera shutter_data/e08/d08/e08083d3.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808542.au b/app/camera shutter_data/e08/d08/e0808542.au deleted file mode 100644 index 05520b5..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808542.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e08085cd.au b/app/camera shutter_data/e08/d08/e08085cd.au deleted file mode 100644 index 2ec32d7..0000000 Binary files a/app/camera shutter_data/e08/d08/e08085cd.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e08087cd.au b/app/camera shutter_data/e08/d08/e08087cd.au deleted file mode 100644 index a4a8ac6..0000000 Binary files a/app/camera shutter_data/e08/d08/e08087cd.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e08087e1.au b/app/camera shutter_data/e08/d08/e08087e1.au deleted file mode 100644 index 292aef5..0000000 Binary files a/app/camera shutter_data/e08/d08/e08087e1.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e08087f6.au b/app/camera shutter_data/e08/d08/e08087f6.au deleted file mode 100644 index 2ec32d7..0000000 Binary files a/app/camera shutter_data/e08/d08/e08087f6.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808a59.au b/app/camera shutter_data/e08/d08/e0808a59.au deleted file mode 100644 index 05520b5..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808a59.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808bb6.au b/app/camera shutter_data/e08/d08/e0808bb6.au deleted file mode 100644 index 292aef5..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808bb6.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808dda.au b/app/camera shutter_data/e08/d08/e0808dda.au deleted file mode 100644 index a4a8ac6..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808dda.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808e04.au b/app/camera shutter_data/e08/d08/e0808e04.au deleted file mode 100644 index 2ec32d7..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808e04.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808f2b.au b/app/camera shutter_data/e08/d08/e0808f2b.au deleted file mode 100644 index 7f5d60c..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808f2b.au and /dev/null differ diff --git a/app/camera shutter_data/e08/d08/e0808f4a.au b/app/camera shutter_data/e08/d08/e0808f4a.au deleted file mode 100644 index 05520b5..0000000 Binary files a/app/camera shutter_data/e08/d08/e0808f4a.au and /dev/null differ diff --git a/assets/gfx/emblem_back.png b/assets/gfx/emblem_back.png deleted file mode 100644 index ac025b5..0000000 Binary files a/assets/gfx/emblem_back.png and /dev/null differ diff --git a/assets/gfx/item_button.png b/assets/gfx/item_button.png index 0994bd7..ee9d721 100644 Binary files a/assets/gfx/item_button.png and b/assets/gfx/item_button.png differ diff --git a/assets/gfx/phone_bg.png b/assets/gfx/phone_bg.png deleted file mode 100644 index 3f5df01..0000000 Binary files a/assets/gfx/phone_bg.png and /dev/null differ diff --git a/assets/gfx/photo_bg.png b/assets/gfx/photo_bg.png index 879b2fa..eeec50c 100644 Binary files a/assets/gfx/photo_bg.png and b/assets/gfx/photo_bg.png differ diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s index 1f70e5f..048d0db 100644 --- a/assets/gfx/sprites.t3s +++ b/assets/gfx/sprites.t3s @@ -8,15 +8,14 @@ button_shadow.png button_msg.png button_msg_shadow.png cursor.png -emblem_back.png icon_female.png icon_male.png icon_msg.png icon_question.png item_button.png -phone_bg.png photo_bg.png logo_horiHD.png logo_rocketrobz.png +title.png logo_UniversalCore.png homeicon.png diff --git a/assets/gfx/title.png b/assets/gfx/title.png new file mode 100644 index 0000000..aec5921 Binary files /dev/null and b/assets/gfx/title.png differ diff --git a/resources/title.xcf b/resources/title.xcf index 7df618b..ce9621c 100644 Binary files a/resources/title.xcf and b/resources/title.xcf differ diff --git a/source/screens/photoStudio.cpp b/source/screens/photoStudio.cpp index a8a41bd..79c7095 100644 --- a/source/screens/photoStudio.cpp +++ b/source/screens/photoStudio.cpp @@ -205,15 +205,10 @@ void PhotoStudio::Draw(void) const { if (this->displayStudioBg) { GFX::showBgSprite(zoomIn); + } else if (this->showScrollingBg) { + GFX::DrawSprite(sprites_title_idx, 0, 0, 0.5); } else { - Gui::Draw_Rect(0, 0, 400, 240, WHITE); // Fill gaps of BG - if (this->showScrollingBg) { - for(int w = 0; w < 7; w++) { - for(int h = 0; h < 3; h++) { - GFX::DrawSprite(sprites_phone_bg_idx, -72+bg_xPos+w*72, bg_yPos+h*136); - } - } - } + Gui::Draw_Rect(0, 0, 400, 240, WHITE); } if (this->previewCharacter) { if (this->previewCharacterFound) { @@ -246,29 +241,29 @@ void PhotoStudio::Draw(void) const { // Game name switch (this->char_highlightedGame) { case 4: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, "Your character files"); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, "Your character files"); break; case 3: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss4Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss4Title()); break; case 2: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss3Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss3Title()); break; case 1: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss2Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss2Title()); break; case 0: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss1Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss1Title()); break; } - Gui::DrawString(8, 8, 0.50, BLACK, "<"); - Gui::DrawString(304, 8, 0.50, BLACK, ">"); + Gui::DrawString(8, 8, 0.50, WHITE, "<"); + Gui::DrawString(304, 8, 0.50, WHITE, ">"); if (char_highlightedGame != 4) { // Selected season - Gui::DrawString(120-32, 208, 0.65, BLACK, "L"); - Gui::DrawStringCentered(-32, 210, 0.50, BLACK, this->seasonName()); - Gui::DrawString(192-32, 208, 0.65, BLACK, "R"); + Gui::DrawString(120-32, 208, 0.65, WHITE, "L"); + Gui::DrawStringCentered(-32, 210, 0.50, WHITE, this->seasonName()); + Gui::DrawString(192-32, 208, 0.65, WHITE, "R"); } Gui::DrawString(192, 208, 0.65, BLUE, "SELECT: Robz"); @@ -280,23 +275,23 @@ void PhotoStudio::Draw(void) const { if (i >= numberOfExportedCharacters) break; GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); GFX::DrawSprite((getExportedCharacterGender(i) ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8); - Gui::DrawString(64, i2, 0.65, BLACK, getExportedCharacterName(i)); + Gui::DrawString(64, i2, 0.65, WHITE, getExportedCharacterName(i)); } else if (char_highlightedGame == 3) { GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); GFX::DrawSprite((import_ss4CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8); - Gui::DrawString(64, i2, 0.65, BLACK, import_ss4CharacterNames[i]); + Gui::DrawString(64, i2, 0.65, WHITE, import_ss4CharacterNames[i]); } else if (char_highlightedGame == 2) { GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); GFX::DrawSprite((import_ss3CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8); - Gui::DrawString(64, i2, 0.65, BLACK, import_ss3CharacterNames[i]); + Gui::DrawString(64, i2, 0.65, WHITE, import_ss3CharacterNames[i]); } else if (char_highlightedGame == 1) { GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); GFX::DrawSprite((import_ss2CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx)/*+import_ss2CharacterTieColors[i]*/, 12, i2-8); - Gui::DrawString(64, i2, 0.65, BLACK, import_SS2CharacterNames(i)); + Gui::DrawString(64, i2, 0.65, WHITE, import_SS2CharacterNames(i)); } else if (char_highlightedGame == 0) { GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); GFX::DrawSprite((import_ss1CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8); - Gui::DrawString(64, i2, 0.65, BLACK, import_ss1CharacterNames[i]); + Gui::DrawString(64, i2, 0.65, WHITE, import_ss1CharacterNames[i]); } i2 += 48; } @@ -307,23 +302,23 @@ void PhotoStudio::Draw(void) const { // Game name switch (this->photo_highlightedGame) { case 4: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, "Your character files"); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, "Your character files"); break; case 3: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss4Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss4Title()); break; case 2: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss3Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss3Title()); break; case 1: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss2Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss2Title()); break; case 0: - Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss1Title()); + Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss1Title()); break; } - Gui::DrawString(8, 8, 0.50, BLACK, "<"); - Gui::DrawString(304, 8, 0.50, BLACK, ">"); + Gui::DrawString(8, 8, 0.50, WHITE, "<"); + Gui::DrawString(304, 8, 0.50, WHITE, ">"); /*if (photo_highlightedGame != 4) { // Selected season @@ -337,16 +332,16 @@ void PhotoStudio::Draw(void) const { for (int i = import_bgShownFirst; i < import_bgShownFirst+3; i++) { if (photo_highlightedGame == 3) { GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); - Gui::DrawString(32, i2, 0.65, BLACK, import_ss4BgNames[i]); + Gui::DrawString(32, i2, 0.65, WHITE, import_ss4BgNames[i]); } else if (photo_highlightedGame == 2) { GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); - Gui::DrawString(32, i2, 0.65, BLACK, import_ss3BgNames[i]); + Gui::DrawString(32, i2, 0.65, WHITE, 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_ss2BgNames[i]); + Gui::DrawString(32, i2, 0.65, WHITE, 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_ss1BgNames[i]); + Gui::DrawString(32, i2, 0.65, WHITE, import_ss1BgNames[i]); } i2 += 48; } @@ -354,17 +349,17 @@ void PhotoStudio::Draw(void) const { } else { this->cursorY = 64+(48*this->characterChangeMenu_cursorPositionOnScreen); - Gui::DrawString(8, 8, 0.50, BLACK, "What do you want to do?"); + Gui::DrawString(8, 8, 0.50, WHITE, "What do you want to do?"); - Gui::DrawString(192, 206, 0.65, BLACK, ": Take photo"); + Gui::DrawString(192, 206, 0.65, WHITE, ": Take photo"); int i2 = 0; i2 += 48; GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); - Gui::DrawString(32, i2, 0.65, BLACK, "Change location"); + Gui::DrawString(32, i2, 0.65, WHITE, "Change location"); i2 += 48; GFX::DrawSprite(sprites_item_button_idx, 16, i2-20); - Gui::DrawString(32, i2, 0.65, BLACK, "Change character"); + Gui::DrawString(32, i2, 0.65, WHITE, "Change character"); } if (this->subScreenMode != 0) { diff --git a/source/screens/settings.cpp b/source/screens/settings.cpp index 1d4f7e1..8de0eff 100644 --- a/source/screens/settings.cpp +++ b/source/screens/settings.cpp @@ -8,12 +8,7 @@ char txt_frameRate[24]; void Settings::Draw(void) const { Gui::ScreenDraw(Top); - Gui::Draw_Rect(0, 0, 400, 240, WHITE); // Fill gaps of BG - for(int w = 0; w < 7; w++) { - for(int h = 0; h < 3; h++) { - GFX::DrawSprite(sprites_phone_bg_idx, -72+bg_xPos+w*72, bg_yPos+h*136); - } - } + GFX::DrawSprite(sprites_title_idx, 0, 0, 0.5); if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect @@ -24,17 +19,12 @@ void Settings::Draw(void) const { if (shiftBySubPixel) return; Gui::ScreenDraw(Bottom); - Gui::Draw_Rect(0, 0, 320, 240, WHITE); // Fill gaps of BG - for(int w = 0; w < 7; w++) { - for(int h = 0; h < 3; h++) { - GFX::DrawSprite(sprites_phone_bg_idx, -76+bg_xPos+w*72, bg_yPos+h*136); - } - } + GFX::DrawSprite(sprites_photo_bg_idx, 0, 0); this->cursorX = 248; this->cursorY = 64+(48*cursorPositionOnScreen); - Gui::DrawStringCentered(0, 8, 0.55, BLACK, "Settings"); + Gui::DrawStringCentered(0, 8, 0.55, WHITE, "Settings"); int i2 = 48; for (int i = settingShownFirst; i < settingShownFirst+3; i++) { @@ -44,11 +34,11 @@ void Settings::Draw(void) const { switch (i) { case 0: sprintf(txt_cinemaWide, "Aspect Ratio: %s", cinemaWide ? "Cinema" : "Normal"); - Gui::DrawString(32, i2, 0.65, BLACK, txt_cinemaWide); + Gui::DrawString(32, i2, 0.65, WHITE, txt_cinemaWide); break; case 1: sprintf(txt_frameRate, "Frame Rate: %iFPS", iFps); - Gui::DrawString(32, i2, 0.65, BLACK, txt_frameRate); + Gui::DrawString(32, i2, 0.65, WHITE, txt_frameRate); break; default: break;