diff --git a/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom0/R.O.B..png b/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom0/R.O.B..png new file mode 100644 index 0000000..4badc31 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom0/R.O.B..png differ diff --git a/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom1/R.O.B..png b/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom1/R.O.B..png new file mode 100644 index 0000000..d754688 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom1/R.O.B..png differ diff --git a/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom2/R.O.B..png b/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom2/R.O.B..png new file mode 100644 index 0000000..fbd1f52 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/NES/All Seasons/zoom2/R.O.B..png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Yoshi.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Yoshi.png new file mode 100644 index 0000000..36168b9 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Yoshi.png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Yoshi.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Yoshi.png new file mode 100644 index 0000000..aada151 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Yoshi.png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Yoshi.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Yoshi.png new file mode 100644 index 0000000..02fb9cc Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Yoshi.png differ diff --git a/3ds/assets/gfx_chars/nes_ROB.t3s b/3ds/assets/gfx_chars/nes_ROB.t3s new file mode 100644 index 0000000..8552442 --- /dev/null +++ b/3ds/assets/gfx_chars/nes_ROB.t3s @@ -0,0 +1,4 @@ +--atlas -f rgba -z auto +"characters/NES/All Seasons/zoom0/R.O.B..png" +"characters/NES/All Seasons/zoom1/R.O.B..png" +"characters/NES/All Seasons/zoom2/R.O.B..png" diff --git a/3ds/assets/gfx_chars/sm_Yoshi.t3s b/3ds/assets/gfx_chars/sm_Yoshi.t3s new file mode 100644 index 0000000..b2e4cea --- /dev/null +++ b/3ds/assets/gfx_chars/sm_Yoshi.t3s @@ -0,0 +1,4 @@ +--atlas -f rgba -z auto +"characters/Super Mario/All Seasons/zoom0/Yoshi.png" +"characters/Super Mario/All Seasons/zoom1/Yoshi.png" +"characters/Super Mario/All Seasons/zoom2/Yoshi.png" diff --git a/include/nesCharNames.h b/include/nesCharNames.h new file mode 100644 index 0000000..814ec0b --- /dev/null +++ b/include/nesCharNames.h @@ -0,0 +1,14 @@ +#ifndef _ROCKET_PHOTO_SHOOT_NES_CHAR_NAMES_HPP +#define _ROCKET_PHOTO_SHOOT_NES_CHAR_NAMES_HPP + +extern const char* nesCharacterNames[]; +extern const char* famiCharacterNames[]; + +extern bool nesCharacterGenders[]; + +extern const char* nesCharacterFileNamesSpring[]; +extern const char* nesCharacterFileNamesSummer[]; +extern const char* nesCharacterFileNamesFall[]; +extern const char* nesCharacterFileNamesWinter[]; + +#endif \ No newline at end of file diff --git a/include/screens/photoStudio.hpp b/include/screens/photoStudio.hpp index 63207c9..7823ddb 100644 --- a/include/screens/photoStudio.hpp +++ b/include/screens/photoStudio.hpp @@ -24,10 +24,12 @@ private: const char* import_characterName(void) const; const char* import_characterFileName(void) const; const char* import_SS2CharacterNames(int i) const; + const char* NESCharacterNames(int i) const; const char* ss1Title(void) const; const char* ss2Title(void) const; const char* ss3Title(void) const; const char* ss4Title(void) const; + const char* nesTitle(void) const; const char* bgGameTitle(void) const; const char* charGameTitle(void) const; bool charGender(int i) const; diff --git a/nds/nitrofiles/graphics/char/nes_ROB.png b/nds/nitrofiles/graphics/char/nes_ROB.png new file mode 100644 index 0000000..7df366d Binary files /dev/null and b/nds/nitrofiles/graphics/char/nes_ROB.png differ diff --git a/nds/nitrofiles/graphics/char/sm_Yoshi.png b/nds/nitrofiles/graphics/char/sm_Yoshi.png new file mode 100644 index 0000000..9b54454 Binary files /dev/null and b/nds/nitrofiles/graphics/char/sm_Yoshi.png differ diff --git a/source/nesCharNames.c b/source/nesCharNames.c new file mode 100644 index 0000000..e467bdb --- /dev/null +++ b/source/nesCharNames.c @@ -0,0 +1,26 @@ +#include + +const char* nesCharacterNames[] = { + "R.O.B.", +}; + +const char* famiCharacterNames[] = { + "Robot", +}; + +bool nesCharacterGenders[] = { + true, // Male +}; + +const char* nesCharacterFileNamesSpring[] = { + "nes_ROB", +}; +const char* nesCharacterFileNamesSummer[] = { + "nes_ROB", +}; +const char* nesCharacterFileNamesFall[] = { + "nes_ROB", +}; +const char* nesCharacterFileNamesWinter[] = { + "nes_ROB", +}; \ No newline at end of file diff --git a/source/screens/photoStudio.cpp b/source/screens/photoStudio.cpp index 8647d82..6e76c6c 100644 --- a/source/screens/photoStudio.cpp +++ b/source/screens/photoStudio.cpp @@ -19,6 +19,7 @@ #include "sc5CharNames.h" #include "vvvvvvCharNames.h" #include "kirbyCharNames.h" +#include "nesCharNames.h" #include "logobgnames.h" #include "import_ss1bgnames.h" @@ -68,6 +69,7 @@ static u8 charPageOrder[] = { 7, // Jet Force Gemini 15, // Kirby series 12, // Metroid Series + 16, // Nintendo Entertainment System 10, // Pac-Man series 6, // Sonic the Hedgehog series 13, // Space Channel 5 @@ -145,11 +147,12 @@ void PhotoStudio::getMaxChars() { import_totalCharacters = 3; break; case 5: - import_totalCharacters = 5; + import_totalCharacters = 6; break; case 11: case 14: case 15: + case 16: import_totalCharacters = 0; break; case 6: @@ -221,6 +224,8 @@ const char* PhotoStudio::import_characterName(void) const { return vvvvvvCharacterNames[importCharacterList_cursorPosition[currentCharNum]]; case 15: return kirbyCharacterNames[importCharacterList_cursorPosition[currentCharNum]]; + case 16: + return nesCharacterNames[importCharacterList_cursorPosition[currentCharNum]]; } return "null"; } @@ -383,6 +388,17 @@ const char* PhotoStudio::import_characterFileName(void) const { case 3: return kirbyCharacterFileNamesWinter[importCharacterList_cursorPosition[currentCharNum]]; } + case 16: + switch (seasonNo[currentCharNum]) { + case 0: + return nesCharacterFileNamesSpring[importCharacterList_cursorPosition[currentCharNum]]; + case 1: + return nesCharacterFileNamesSummer[importCharacterList_cursorPosition[currentCharNum]]; + case 2: + return nesCharacterFileNamesFall[importCharacterList_cursorPosition[currentCharNum]]; + case 3: + return nesCharacterFileNamesWinter[importCharacterList_cursorPosition[currentCharNum]]; + } } return "null"; } @@ -401,6 +417,21 @@ const char* PhotoStudio::import_SS2CharacterNames(int i) const { #endif } +const char* PhotoStudio::NESCharacterNames(int i) const { + #ifdef _3DS + switch (sysRegion) { + default: + return nesCharacterNames[i]; + case CFG_REGION_JPN: + case CFG_REGION_CHN: + case CFG_REGION_KOR: + return famiCharacterNames[i]; + } + #else + return nesCharacterNames[i]; + #endif +} + const char* PhotoStudio::ss1Title(void) const { #ifdef _3DS switch (sysRegion) { @@ -473,6 +504,21 @@ const char* PhotoStudio::ss4Title(void) const { #endif } +const char* PhotoStudio::nesTitle(void) const { + #ifdef _3DS + switch (sysRegion) { + default: + return "Nintendo Entertainment System"; + case CFG_REGION_JPN: + case CFG_REGION_CHN: + case CFG_REGION_KOR: + return "Family Computer"; + } + #else + return "NES/Famicom"; + #endif +} + const char* PhotoStudio::bgGameTitle(void) const { switch (bgPageOrder[photo_highlightedGame]) { case 0: @@ -527,6 +573,8 @@ const char* PhotoStudio::charGameTitle(void) const { return "VVVVVV"; case 15: return "Kirby series"; + case 16: + return nesTitle(); } return "???"; } @@ -565,6 +613,8 @@ bool PhotoStudio::charGender(int i) const { return vvvvvvCharacterGenders[i]; case 15: return kirbyCharacterGenders[i]; + case 16: + return nesCharacterGenders[i]; } return true; } @@ -623,6 +673,8 @@ const char* PhotoStudio::charName(int i) const { return vvvvvvCharacterNames[i]; case 15: return kirbyCharacterNames[i]; + case 16: + return NESCharacterNames(i); } return "???"; } diff --git a/source/smCharNames.c b/source/smCharNames.c index 64d3a35..e1f53bb 100644 --- a/source/smCharNames.c +++ b/source/smCharNames.c @@ -7,6 +7,7 @@ const char* smCharacterNames[] = { "Waluigi", "Peach", "Daisy", + "Yoshi", }; bool smCharacterGenders[] = { @@ -16,6 +17,7 @@ bool smCharacterGenders[] = { true, // Male false, // Female false, // Female + true, // Male }; const char* smCharacterFileNamesSpring[] = { @@ -25,6 +27,7 @@ const char* smCharacterFileNamesSpring[] = { "sm_Waluigi", "sm_Peach", "sm_Daisy", + "sm_Yoshi", }; const char* smCharacterFileNamesSummer[] = { "sm_Mario", @@ -33,6 +36,7 @@ const char* smCharacterFileNamesSummer[] = { "sm_Waluigi", "sm_Peach", "sm_Daisy", + "sm_Yoshi", }; const char* smCharacterFileNamesFall[] = { "sm_Mario", @@ -41,6 +45,7 @@ const char* smCharacterFileNamesFall[] = { "sm_Waluigi", "sm_Peach", "sm_Daisy", + "sm_Yoshi", }; const char* smCharacterFileNamesWinter[] = { "sm_Mario", @@ -49,4 +54,5 @@ const char* smCharacterFileNamesWinter[] = { "sm_Waluigi", "sm_Peach", "sm_Daisy", + "sm_Yoshi", }; \ No newline at end of file