diff --git a/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom0/Captain Viridian.png b/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom0/Captain Viridian.png new file mode 100644 index 0000000..047becc Binary files /dev/null and b/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom0/Captain Viridian.png differ diff --git a/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom1/Captain Viridian.png b/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom1/Captain Viridian.png new file mode 100644 index 0000000..be68385 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom1/Captain Viridian.png differ diff --git a/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom2/Captain Viridian.png b/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom2/Captain Viridian.png new file mode 100644 index 0000000..1a26ee1 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom2/Captain Viridian.png differ diff --git a/3ds/assets/gfx_chars/vvvvvv_Viridian.t3s b/3ds/assets/gfx_chars/vvvvvv_Viridian.t3s new file mode 100644 index 0000000..999075b --- /dev/null +++ b/3ds/assets/gfx_chars/vvvvvv_Viridian.t3s @@ -0,0 +1,4 @@ +--atlas -f rgba -z auto +"characters/VVVVVV/All Seasons/zoom0/Captain Viridian.png" +"characters/VVVVVV/All Seasons/zoom1/Captain Viridian.png" +"characters/VVVVVV/All Seasons/zoom2/Captain Viridian.png" diff --git a/README.md b/README.md index f43c19b..275fa6c 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ and more! # Characters and Locations by * Namco +* Nicalis * Nintendo * Rare * RocketRobz* diff --git a/include/vvvvvvCharNames.h b/include/vvvvvvCharNames.h new file mode 100644 index 0000000..b78a2cf --- /dev/null +++ b/include/vvvvvvCharNames.h @@ -0,0 +1,13 @@ +#ifndef _ROCKET_PHOTO_SHOOT_VVVVVV_CHAR_NAMES_HPP +#define _ROCKET_PHOTO_SHOOT_VVVVVV_CHAR_NAMES_HPP + +extern const char* vvvvvvCharacterNames[]; + +extern bool vvvvvvCharacterGenders[]; + +extern const char* vvvvvvCharacterFileNamesSpring[]; +extern const char* vvvvvvCharacterFileNamesSummer[]; +extern const char* vvvvvvCharacterFileNamesFall[]; +extern const char* vvvvvvCharacterFileNamesWinter[]; + +#endif \ No newline at end of file diff --git a/nds/nitrofiles/graphics/char/vvvvvv_Viridian.png b/nds/nitrofiles/graphics/char/vvvvvv_Viridian.png new file mode 100644 index 0000000..9bbeb6b Binary files /dev/null and b/nds/nitrofiles/graphics/char/vvvvvv_Viridian.png differ diff --git a/source/screens/photoStudio.cpp b/source/screens/photoStudio.cpp index 9a71f38..ee8d699 100644 --- a/source/screens/photoStudio.cpp +++ b/source/screens/photoStudio.cpp @@ -17,6 +17,7 @@ #include "swapCharNames.h" #include "metroidCharNames.h" #include "sc5CharNames.h" +#include "vvvvvvCharNames.h" #include "logobgnames.h" #include "import_ss1bgnames.h" @@ -73,7 +74,8 @@ static u8 charPageOrder[] = { 2, // Style Savvy: Fashion Forward 3, // Style Savvy: Styling Star 5, // Super Mario series - 11}; // Swapnote/Swapdoodle + 11, // Swapnote/Swapdoodle + 14}; // VVVVVV static int metalXpos = 0; #ifdef NDS @@ -142,6 +144,7 @@ void PhotoStudio::getMaxChars() { import_totalCharacters = 3; break; case 11: + case 14: import_totalCharacters = 0; break; case 6: @@ -204,6 +207,8 @@ const char* PhotoStudio::import_characterName(void) const { return metroidCharacterNames[importCharacterList_cursorPosition[currentCharNum]]; case 13: return sc5CharacterNames[importCharacterList_cursorPosition[currentCharNum]]; + case 14: + return vvvvvvCharacterNames[importCharacterList_cursorPosition[currentCharNum]]; } return "null"; } @@ -342,6 +347,17 @@ const char* PhotoStudio::import_characterFileName(void) const { case 3: return sc5CharacterFileNamesWinter[importCharacterList_cursorPosition[currentCharNum]]; } + case 14: + switch (seasonNo[currentCharNum]) { + case 0: + return vvvvvvCharacterFileNamesSpring[importCharacterList_cursorPosition[currentCharNum]]; + case 1: + return vvvvvvCharacterFileNamesSummer[importCharacterList_cursorPosition[currentCharNum]]; + case 2: + return vvvvvvCharacterFileNamesFall[importCharacterList_cursorPosition[currentCharNum]]; + case 3: + return vvvvvvCharacterFileNamesWinter[importCharacterList_cursorPosition[currentCharNum]]; + } } return "null"; } @@ -482,6 +498,8 @@ const char* PhotoStudio::charGameTitle(void) const { return "Metroid series"; case 13: return "Space Channel 5"; + case 14: + return "VVVVVV"; } return "???"; } @@ -516,6 +534,8 @@ bool PhotoStudio::charGender(int i) const { return metroidCharacterGenders[i]; case 13: return sc5CharacterGenders[i]; + case 14: + return vvvvvvCharacterGenders[i]; } return true; } @@ -570,6 +590,8 @@ const char* PhotoStudio::charName(int i) const { return metroidCharacterNames[i]; case 13: return sc5CharacterNames[i]; + case 14: + return vvvvvvCharacterNames[i]; } return "???"; } diff --git a/source/vvvvvvCharNames.c b/source/vvvvvvCharNames.c new file mode 100644 index 0000000..fb99fd6 --- /dev/null +++ b/source/vvvvvvCharNames.c @@ -0,0 +1,26 @@ +#include + +const char* vvvvvvCharacterNames[] = { + "Captain Viridian", + "", + "", +}; + +bool vvvvvvCharacterGenders[] = { + true, // Male + true, // Male + true, // Male +}; + +const char* vvvvvvCharacterFileNamesSpring[] = { + "vvvvvv_Viridian", +}; +const char* vvvvvvCharacterFileNamesSummer[] = { + "vvvvvv_Viridian", +}; +const char* vvvvvvCharacterFileNamesFall[] = { + "vvvvvv_Viridian", +}; +const char* vvvvvvCharacterFileNamesWinter[] = { + "vvvvvv_Viridian", +}; \ No newline at end of file