diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Waluigi.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Waluigi.png new file mode 100644 index 0000000..f5f885e Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Waluigi.png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Wario.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Wario.png new file mode 100644 index 0000000..c6515c7 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom0/Wario.png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Waluigi.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Waluigi.png new file mode 100644 index 0000000..2038d27 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Waluigi.png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Wario.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Wario.png new file mode 100644 index 0000000..ec53a7d Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom1/Wario.png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Waluigi.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Waluigi.png new file mode 100644 index 0000000..944bea9 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Waluigi.png differ diff --git a/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Wario.png b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Wario.png new file mode 100644 index 0000000..9fcf106 Binary files /dev/null and b/3ds/assets/gfx_chars/characters/Super Mario/All Seasons/zoom2/Wario.png differ diff --git a/3ds/assets/gfx_chars/sm_Waluigi.t3s b/3ds/assets/gfx_chars/sm_Waluigi.t3s new file mode 100644 index 0000000..2ac1727 --- /dev/null +++ b/3ds/assets/gfx_chars/sm_Waluigi.t3s @@ -0,0 +1,4 @@ +--atlas -f rgba -z auto +"characters/Super Mario/All Seasons/zoom0/Waluigi.png" +"characters/Super Mario/All Seasons/zoom1/Waluigi.png" +"characters/Super Mario/All Seasons/zoom2/Waluigi.png" diff --git a/3ds/assets/gfx_chars/sm_Wario.t3s b/3ds/assets/gfx_chars/sm_Wario.t3s new file mode 100644 index 0000000..c915db0 --- /dev/null +++ b/3ds/assets/gfx_chars/sm_Wario.t3s @@ -0,0 +1,4 @@ +--atlas -f rgba -z auto +"characters/Super Mario/All Seasons/zoom0/Wario.png" +"characters/Super Mario/All Seasons/zoom1/Wario.png" +"characters/Super Mario/All Seasons/zoom2/Wario.png" diff --git a/nds/nitrofiles/graphics/char/sm_Waluigi.png b/nds/nitrofiles/graphics/char/sm_Waluigi.png new file mode 100644 index 0000000..a0ae249 Binary files /dev/null and b/nds/nitrofiles/graphics/char/sm_Waluigi.png differ diff --git a/nds/nitrofiles/graphics/char/sm_Wario.png b/nds/nitrofiles/graphics/char/sm_Wario.png new file mode 100644 index 0000000..d7e03d7 Binary files /dev/null and b/nds/nitrofiles/graphics/char/sm_Wario.png differ diff --git a/source/screens/photoStudio.cpp b/source/screens/photoStudio.cpp index 29ea1a0..8647d82 100644 --- a/source/screens/photoStudio.cpp +++ b/source/screens/photoStudio.cpp @@ -142,9 +142,11 @@ void PhotoStudio::getMaxChars() { import_totalCharacters = 0xD; break; case 4: - case 5: import_totalCharacters = 3; break; + case 5: + import_totalCharacters = 5; + break; case 11: case 14: case 15: diff --git a/source/smCharNames.c b/source/smCharNames.c index 01148f3..64d3a35 100644 --- a/source/smCharNames.c +++ b/source/smCharNames.c @@ -3,11 +3,15 @@ const char* smCharacterNames[] = { "Mario", "Luigi", + "Wario", + "Waluigi", "Peach", "Daisy", }; bool smCharacterGenders[] = { + true, // Male + true, // Male true, // Male true, // Male false, // Female @@ -17,24 +21,32 @@ bool smCharacterGenders[] = { const char* smCharacterFileNamesSpring[] = { "sm_Mario", "sm_Luigi", + "sm_Wario", + "sm_Waluigi", "sm_Peach", "sm_Daisy", }; const char* smCharacterFileNamesSummer[] = { "sm_Mario", "sm_Luigi", + "sm_Wario", + "sm_Waluigi", "sm_Peach", "sm_Daisy", }; const char* smCharacterFileNamesFall[] = { "sm_Mario", "sm_Luigi", + "sm_Wario", + "sm_Waluigi", "sm_Peach", "sm_Daisy", }; const char* smCharacterFileNamesWinter[] = { "sm_Mario", "sm_Luigi", + "sm_Wario", + "sm_Waluigi", "sm_Peach", "sm_Daisy", }; \ No newline at end of file