RocketRobz/SavvyManager
1
Fork 0
mirror of https://github.com/RocketRobz/SavvyManager.git synced 2025-06-18 17:15:34 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove CinemaWide

Browse Source
This commit is contained in:
RocketRobz 2020-11-20 01:28:05 -07:00
parent aca2646570
commit 68d5303d01
7 changed files with 16 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gfx.cpp
View File

@ -10,7 +10,6 @@ static C2D_SpriteSheet chracterSprite;
static bool chracterSpriteLoaded = false;
extern int studioBg;
extern int cinemaWide;
extern int iFps;
extern bool showCursor;
@ -80,11 +79,10 @@ bool GFX::loadCharSprite(const char* t3xPathAllSeasons, const char* t3xPathOneSe
}
void GFX::showCharSprite(int zoomIn, int fadeAlpha, bool lightingEffects) {
int yPos = -((cinemaWide ? 168 : 240)*zoomIn);
if (cinemaWide) yPos += 36;
int yPos = -(240*zoomIn);
C2D_Image image = C2D_SpriteSheetGetImage(chracterSprite, 0);
if (!gfxIsWide() || cinemaWide) {
if (!gfxIsWide()) {
C3D_TexSetFilter(image.tex, GPU_LINEAR, GPU_LINEAR);
}
@ -94,7 +92,7 @@ void GFX::showCharSprite(int zoomIn, int fadeAlpha, bool lightingEffects) {
} else {
C2D_PlainImageTint(&tint, C2D_Color32(255, 255, 255, fadeAlpha), 1);
}
C2D_DrawImageAt(image, (cinemaWide ? 60 : 0), yPos-(shiftBySubPixel ? 0.5f : 0), 0.5f, &tint, (cinemaWide ? 0.35f : 0.5), (cinemaWide ? 0.7f : 1));
C2D_DrawImageAt(image, 0, yPos-(shiftBySubPixel ? 0.5f : 0), 0.5f, &tint, 0.5, 1);
}
void GFX::DrawGameSelSprite(int img, int x, int y, float ScaleX, float ScaleY) {

7
source/main.cpp
View File

@ -26,7 +26,6 @@ Handle threadRequest;
char verText[32];
int studioBg = 0;
bool cinemaWide = false;
int iFps = 60;
std::string currentMusicPack = "";
bool ss3DLCharactersBackedUp = false;
@ -51,7 +50,6 @@ void loadSettings(void) {
CIniFile settingsini(settingsIni);
//studioBg = settingsini.GetInt("SAVVY-MANAGER", "STUDIO_BG", studioBg);
cinemaWide = settingsini.GetInt("SAVVY-MANAGER", "CINEMA_WIDE", cinemaWide);
iFps = settingsini.GetInt("SAVVY-MANAGER", "FRAME_RATE", iFps);
currentMusicPack = settingsini.GetString("SS2", "CURRENT_MUSIC_PACK", currentMusicPack);
@ -61,7 +59,6 @@ void saveSettings(void) {
CIniFile settingsini(settingsIni);
//settingsini.SetInt("SAVVY-MANAGER", "STUDIO_BG", studioBg);
settingsini.SetInt("SAVVY-MANAGER", "CINEMA_WIDE", cinemaWide);
settingsini.SetInt("SAVVY-MANAGER", "FRAME_RATE", iFps);
settingsini.SetString("SS2", "CURRENT_MUSIC_PACK", currentMusicPack);
@ -118,7 +115,6 @@ bool showCursor = false;
int cursorAlpha = 0;
int ss1Logo = gameSelSprites_title1_idx;
int ss2Screenshot = gameShotSprites_title2_screenshot_idx;
int ss2Logo = gameSelSprites_title2_idx;
int ss1LogoXpos = 0;
int ssLogoXpos = 0;
@ -279,7 +275,6 @@ int main()
ss2Id = 0x000A9000;
ss3Id = 0x0016A100;
ss4Id = 0x00001C26;
//ss2Screenshot = gameShotSprites_title2_screenshotE_idx;
ss1Logo = gameSelSprites_title1_E_idx;
ss2Logo = gameSelSprites_title2_E_idx;
ss3Logo = gameSelSprites_title3_E_idx;
@ -291,7 +286,6 @@ int main()
ss2Id = 0x0005D100;
ss3Id = 0x0012D800;
ss4Id = 0x000019F6;
//ss2Screenshot = gameShotSprites_title2_screenshotJ_idx;
ss1Logo = gameSelSprites_title1_J_idx;
ss2Logo = gameSelSprites_title2_J_idx;
ss3Logo = gameSelSprites_title3_J_idx;
@ -299,7 +293,6 @@ int main()
break;
case CFG_REGION_KOR:
ss2Id = 0x000C4F00;
//ss2Screenshot = gameShotSprites_title2_screenshotJ_idx;
ss1Logo = gameSelSprites_title1_K_idx;
ss2Logo = gameSelSprites_title2_K_idx;
ss1LogoXpos = 64;

13
source/screens/characterChange.cpp
View File

@ -357,20 +357,15 @@ void CharacterChange::Draw(void) const {
preview();
if (showMessage && messageNo == 4) {
Gui::DrawString(8, (cinemaWide ? 174 : 210), 0.50, BLACK, removeBags ? " Keep bags" : " Remove bags");
Gui::DrawString(8, 210, 0.50, BLACK, removeBags ? " Keep bags" : " Remove bags");
// Selected season
Gui::DrawString(160, (cinemaWide ? 174 : 210), 0.65, BLACK, "L");
Gui::DrawStringCentered(0, (cinemaWide ? 174 : 210), 0.50, BLACK, seasonName());
Gui::DrawString(232, (cinemaWide ? 174 : 210), 0.65, BLACK, "R");
Gui::DrawString(160, 210, 0.65, BLACK, "L");
Gui::DrawStringCentered(0, 210, 0.50, BLACK, seasonName());
Gui::DrawString(232, 210, 0.65, BLACK, "R");
}
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect
if (cinemaWide) {
Gui::Draw_Rect(0, 0, 400, 36, C2D_Color32(0, 0, 0, 255));
Gui::Draw_Rect(0, 204, 400, 36, C2D_Color32(0, 0, 0, 255));
}
if (shiftBySubPixel) {
Gui::Draw_Rect(0, 239, 400, 1, C2D_Color32(0, 0, 0, 255));
return;

5
source/screens/emblemChange.cpp
View File

@ -185,11 +185,6 @@ void EmblemChange::Draw(void) const {
//drawEmblem(136, 56, true);
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect
if (cinemaWide) {
Gui::Draw_Rect(0, 0, 400, 36, C2D_Color32(0, 0, 0, 255));
Gui::Draw_Rect(0, 204, 400, 36, C2D_Color32(0, 0, 0, 255));
}
if (shiftBySubPixel) return;
Gui::ScreenDraw(Bottom);
Gui::Draw_Rect(0, 0, 320, 240, WHITE); // Fill gaps of BG

14
source/screens/gameSelect.cpp
View File

@ -8,7 +8,6 @@ extern u64 appID;
extern bool exiting;
extern int ss1Logo;
extern int ss2Screenshot;
extern int ss2Logo;
extern int ss1LogoXpos;
extern int ssLogoXpos;
@ -79,26 +78,21 @@ void GameSelect::Draw(void) const {
switch(highlightedGame) {
case 0:
default:
GFX::DrawGameShotSprite(gameShotSprites_title1_screenshot_idx, 0, (cinemaWide ? 8 : 0));
GFX::DrawGameShotSprite(gameShotSprites_title1_screenshot_idx, 0, 0);
break;
case 1:
GFX::DrawGameShotSprite(ss2Screenshot, 0, (cinemaWide ? 24 : 0));
GFX::DrawGameShotSprite(gameShotSprites_title2_screenshot_idx, 0, 0);
break;
case 2:
GFX::DrawGameShotSprite(gameShotSprites_title3_screenshot_idx, 0, (cinemaWide ? 24 : 0));
GFX::DrawGameShotSprite(gameShotSprites_title3_screenshot_idx, 0, 0);
break;
case 3:
GFX::DrawGameShotSprite(gameShotSprites_title4_screenshot_idx, 0, (cinemaWide ? 32 : 0));
GFX::DrawGameShotSprite(gameShotSprites_title4_screenshot_idx, 0, 0);
break;
}
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect
if (cinemaWide) {
Gui::Draw_Rect(0, 0, 400, 36, C2D_Color32(0, 0, 0, 255));
Gui::Draw_Rect(0, 204, 400, 36, C2D_Color32(0, 0, 0, 255));
}
if (shiftBySubPixel) {
Gui::Draw_Rect(0, 239, 400, 1, C2D_Color32(0, 0, 0, 255));
return;

9
source/screens/musicChange.cpp
View File

@ -36,16 +36,11 @@ void MusicChange::Draw(void) const {
}
}
Gui::DrawString(8, (cinemaWide ? 170 : 206), 0.50, BLACK, "Current music pack:");
Gui::DrawString(8, (cinemaWide ? 184 : 220), 0.50, BLACK, (currentMusicPack=="" ? "Original" : currentMusicPack.c_str()));
Gui::DrawString(8, 206, 0.50, BLACK, "Current music pack:");
Gui::DrawString(8, 220, 0.50, BLACK, (currentMusicPack=="" ? "Original" : currentMusicPack.c_str()));
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect
if (cinemaWide) {
Gui::Draw_Rect(0, 0, 400, 36, C2D_Color32(0, 0, 0, 255));
Gui::Draw_Rect(0, 204, 400, 36, C2D_Color32(0, 0, 0, 255));
}
if (shiftBySubPixel) return;
Gui::ScreenDraw(Bottom);
Gui::Draw_Rect(0, 0, 320, 240, WHITE); // Fill gaps of BG

22
source/screens/settings.cpp
View File

@ -2,7 +2,6 @@
#include "settings.hpp"
#include "screenvars.h"
char txt_cinemaWide[24];
char txt_frameRate[24];
void Settings::Draw(void) const {
@ -17,11 +16,6 @@ void Settings::Draw(void) const {
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect
if (cinemaWide) {
Gui::Draw_Rect(0, 0, 400, 36, C2D_Color32(0, 0, 0, 255));
Gui::Draw_Rect(0, 204, 400, 36, C2D_Color32(0, 0, 0, 255));
}
if (shiftBySubPixel) return;
Gui::ScreenDraw(Bottom);
Gui::Draw_Rect(0, 0, 320, 240, WHITE); // Fill gaps of BG
@ -43,10 +37,6 @@ void Settings::Draw(void) const {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
switch (i) {
case 0:
sprintf(txt_cinemaWide, "Aspect Ratio: %s", cinemaWide ? "Cinema" : "Normal");
Gui::DrawString(32, i2, 0.65, BLACK, txt_cinemaWide);
break;
case 1:
sprintf(txt_frameRate, "Frame Rate: %iFPS", iFps);
Gui::DrawString(32, i2, 0.65, BLACK, txt_frameRate);
break;
@ -61,13 +51,13 @@ void Settings::Draw(void) const {
GFX::DrawSprite(sprites_arrow_back_idx, 19, 195);
GFX::DrawSprite(sprites_button_b_idx, 44, 218);
GFX::drawCursor(this->cursorX, this->cursorY);
GFX::drawCursor(cursorX, cursorY);
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect
}
void Settings::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
if (showCursor) {
/*if (showCursor) {
if (hDown & KEY_UP) {
sndHighlight();
cursorPosition--;
@ -101,15 +91,12 @@ void Settings::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
cursorPositionOnScreen = 2;
}
}
}
}*/
if ((hDown & KEY_LEFT) && (cursorPosition <= numberOfSettings)) {
sndSelect();
switch (cursorPosition) {
case 0:
cinemaWide = !cinemaWide;
break;
case 1:
if (iFps==30) iFps = 24;
else if (iFps==24) iFps = 60;
else if (iFps==60) iFps = 30;
@ -122,9 +109,6 @@ void Settings::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
sndSelect();
switch (cursorPosition) {
case 0:
cinemaWide = !cinemaWide;
break;
case 1:
if (iFps==60) iFps = 24;
else if (iFps==24) iFps = 30;
else if (iFps==30) iFps = 60;