diff --git a/assets/gfx_chars/characters/Conker series/All Seasons/zoom0/Cash.png b/assets/gfx_chars/characters/Conker series/All Seasons/zoom0/Cash.png new file mode 100644 index 0000000..f98f336 Binary files /dev/null and b/assets/gfx_chars/characters/Conker series/All Seasons/zoom0/Cash.png differ diff --git a/assets/gfx_chars/characters/Conker series/All Seasons/zoom1/Cash.png b/assets/gfx_chars/characters/Conker series/All Seasons/zoom1/Cash.png new file mode 100644 index 0000000..919126d Binary files /dev/null and b/assets/gfx_chars/characters/Conker series/All Seasons/zoom1/Cash.png differ diff --git a/assets/gfx_chars/characters/Conker series/All Seasons/zoom2/Cash.png b/assets/gfx_chars/characters/Conker series/All Seasons/zoom2/Cash.png new file mode 100644 index 0000000..8fbbef1 Binary files /dev/null and b/assets/gfx_chars/characters/Conker series/All Seasons/zoom2/Cash.png differ diff --git a/assets/gfx_chars/conker_Cash.t3s b/assets/gfx_chars/conker_Cash.t3s new file mode 100644 index 0000000..f6730b3 --- /dev/null +++ b/assets/gfx_chars/conker_Cash.t3s @@ -0,0 +1,4 @@ +--atlas -f rgba -z auto +"characters/Conker series/All Seasons/zoom0/Cash.png" +"characters/Conker series/All Seasons/zoom1/Cash.png" +"characters/Conker series/All Seasons/zoom2/Cash.png" diff --git a/source/conkerCharNames.c b/source/conkerCharNames.c index 586e874..7a6c978 100644 --- a/source/conkerCharNames.c +++ b/source/conkerCharNames.c @@ -2,7 +2,7 @@ const char* conkerCharacterNames[] = { "Conker", - "", + "Cash/Money", "", }; @@ -14,13 +14,17 @@ bool conkerCharacterGenders[] = { const char* conkerCharacterFileNamesSpring[] = { "conker_Conker", + "conker_Cash", }; const char* conkerCharacterFileNamesSummer[] = { "conker_Conker", + "conker_Cash", }; const char* conkerCharacterFileNamesFall[] = { "conker_Conker", + "conker_Cash", }; const char* conkerCharacterFileNamesWinter[] = { "conker_Conker", + "conker_Cash", }; \ No newline at end of file diff --git a/source/screens/photoStudio.cpp b/source/screens/photoStudio.cpp index 28c39f3..5fceb62 100644 --- a/source/screens/photoStudio.cpp +++ b/source/screens/photoStudio.cpp @@ -79,7 +79,7 @@ void PhotoStudio::getMaxChars() { } else if (charPageOrder[highlightedGame] == 9) { import_totalCharacters = 0; } else if (charPageOrder[highlightedGame] == 8) { - import_totalCharacters = 0; + import_totalCharacters = 1; } else if (charPageOrder[highlightedGame] == 7) { import_totalCharacters = 1; } else if (charPageOrder[highlightedGame] == 6) {