From c36ddf2c5dec2f37cb84d3acd97a7d0f066f7db8 Mon Sep 17 00:00:00 2001
From: RocketRobz <bobesh8@gmail.com>
Date: Tue, 1 Sep 2020 01:06:19 -0600
Subject: [PATCH] Add Captain Viridian from *VVVVVV*

---
 .../All Seasons/zoom0/Captain Viridian.png    | Bin 0 -> 1087 bytes
 .../All Seasons/zoom1/Captain Viridian.png    | Bin 0 -> 1222 bytes
 .../All Seasons/zoom2/Captain Viridian.png    | Bin 0 -> 1317 bytes
 3ds/assets/gfx_chars/vvvvvv_Viridian.t3s      |   4 +++
 README.md                                     |   1 +
 include/vvvvvvCharNames.h                     |  13 +++++++++
 .../graphics/char/vvvvvv_Viridian.png         | Bin 0 -> 1208 bytes
 source/screens/photoStudio.cpp                |  24 +++++++++++++++-
 source/vvvvvvCharNames.c                      |  26 ++++++++++++++++++
 9 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom0/Captain Viridian.png
 create mode 100644 3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom1/Captain Viridian.png
 create mode 100644 3ds/assets/gfx_chars/characters/VVVVVV/All Seasons/zoom2/Captain Viridian.png
 create mode 100644 3ds/assets/gfx_chars/vvvvvv_Viridian.t3s
 create mode 100644 include/vvvvvvCharNames.h
 create mode 100644 nds/nitrofiles/graphics/char/vvvvvv_Viridian.png
 create mode 100644 source/vvvvvvCharNames.c

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 0000000000000000000000000000000000000000..047beccec56b8405c1b93d5af22f76e463caf15a
GIT binary patch
literal 1087
zcmeAS@N?(olHy`uVBq!ia0y~yU{(OKKX9-C$sfxYZZR;huz9*ThE&{od)F}Ukb?m0
z1^!1dC6+$t945CJKQVZ@BjQpZi?>_Zj8dETUr%I6zkWYGT?nX|24KOVgMtiSO8)Mu
z?XUUw^z9p2mJ1gy3IZ((y<^8{Vz}$$jKzYCFC3Yf7#OBlS~4+A`pK5G&N1?LHAB^f
z2B0z~4h9AV5JM;J5r>2DvINErtWp9D3=Ry8KyLyW4M*QFGAf*Wz5n0_c9sSgkU=7s
z8W<)#*|;#`c1MN{!;D3YK&7W<?Bu&}<we_}d;AUaOca0yNN)FM@QJ!TA;SWuWXD{l
zj8o<c3_T0LI(F1DWhA|>wlq;<u+4A)I)Raefk6Po0ND$6zz%DWlaFhL)bHi2eI2}m
zVZ}m_R=9k`nQM^@llJ_R=AC_x(F1I)V(<oric>MoiKj#v&V#*}3KaJZH5c1I|M_eI
zh~pX<fZpIx09pn2|DBl*OdEpdZ-2f2-sz8Z`zqWS-%MbGISAykQ81iCV3vgiQ^Va~
pAO17mn6+3L=u>za!|Cf|KN)A0dS^;Kn;rvF<LT<>vd$@?2>>i7pKSmD

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..be68385de7d16c604d5d3e685e5c5b8f03883392
GIT binary patch
literal 1222
zcmeAS@N?(olHy`uVBq!ia0y~yU{(OKKX9-C$sfxYZZR;h^m@8DhE&{oduL<rVFQ7-
zK*I|$uS|T>63$8*^;qdH3sDR@(aNm#eDeL(!AGuh$aDO;%mUO*1MsK)5etLit!?t_
z1eUMs&R1|~;8zD)!@|M9px}VasEc4=lsK~L>fXq+OcIB=Ve*VjP=z4Ig|mJP6AoY1
z_6c8Kk^28XBQAAdlR+9d1b|kcFj%zw7!2HQe>*JtZZ*(7Y6lqNK+Zr>gQCl!0VoX;
zfin~?ykTLmyi%&U?n4B~Acna4;xKt8U@(Fef*1=nH?dAQvRT{zX87hcQH*yc<4~sU
z#~^U{RPdTN+KCL2m5hwog2#$mfx&!gZR%++(F3+P)hIJKZdxCbnx4w7(1ydZ%?wNi
z9igkMH_u`<z@Y~20RaV|-$6b>VKguRT?i6EW!yUj4VLqNYJtJ>p7p`i3haJ?M?NUj
z;c*3GG&mgPWGKqGUAN;<a%pVMWd@-SOwecqI|?2TC7XpA41BMz_lW$+lrU>g12%Uu
z?2kCe#E~Sb^=)4G`Z~sfbJ!CV+yN-j4o?xN_QD;Iztn>9z|Qr1W!D{uuhqM1F7}`W
pdw_%WV}v0%RDq5j{-9y{SKc?Z-cl{?w|hap^>p=fS?83{1OVA9wSfQt

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1a26ee1aff7cbcac8b958b637aac4c99db5880e4
GIT binary patch
literal 1317
zcmeAS@N?(olHy`uVBq!ia0y~yU{(OKKX9-C$sfxYZZR;hyzz8#45_&F_U^{QBMKs}
zfe!;?Q?!nm3IsQI2f8I&d{tXL({+;IoZyD${f#y44|KVKT4@bVZ_+u)$#Cy<^~!Yz
zmR}O9&1U@fqlk%t!Jz?YGZPCohJXT4>THiP<6$F(6CONLOp8A-0d;T)Kow&$K;|sC
z`-+9(`-@zUb=w!ZeP^7}EDlqT#}<$j*g6=afq@Ysg34GXG>1VV^qzMqtJ}nFFJ|-d
z9OUL;U{G)XI+PLUG)xA_jbJGh2H4Y>&JT{9%kV%hv-_avJmvRGcQGCKxu*fB9p)xX
z2H0^K=^X+O)Y5rxOPcI?evTpLFcD5_C_A=>flp%F;?{>A4dHPP*c=IWHrTaWjQdzV
z7_<rAH~zzZ!CYT~fdOne3()(R3~)HylFVkZNchn&)+WdpSIGzrPmp4;6ea@{dKb=F
z2pQ-wH}xD@plHBFj1}0;AwL!t_^%dbxTBnFIOk*er?^$wyNnM66XSAXZA{Pt=7Dz;
zzX!!Wv;^h>Wk$URtSs2l87M8ngVka8RZfOyS8iXJx6rM@vVy3P6i__C$Xr?XU2HF}
z9n&A8;*0u$d62VV^`9v*v5fOxTC4q6W|&S){&i>oCPtL3ijpzmnE)I-I}Yi4HhV8)
TnkV}jsEfhV)z4*}Q$iB}U4X_|

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..9bbeb6b7be166ce00960fc05aa4a0511fb495696
GIT binary patch
literal 1208
zcmeAS@N?(olHy`uVBq!ia0y~yU<5Lm95|SPRH%%{QXmx=;1l8sq+53%f}`n&T7d{C
z2n21r55UFY44^E8J?&5jL?uK7NOtboIpyHw^k3~3K+WPML4Lsu2L0y?&Kr0%EV&VJ
z;JN*`ere7dD>S7yxo_Xjz`*?9)5S5Q;?|oR2mM|f2sm8aD7$x`O6wt}w*UWwR$cJu
z$UD{M`fQH>j)}78S-=kZ)A;<~+2Sk4PtAj;OtyD1ooV^q&dB|J@kIvRMd{x<)Ev$-
zWM>yYyK^hb#NnrRK*KA>sGL`EO|`veZ*{Ys5S$(OiDS#WO3B&YY59TYtd32Zo!VpS
zm9<mz$JhMd4VLDcYa41E4(@MYVB*;D=6%D`jD~IdnOE^SGfm+uF#VL~;;a1m&hMQi
z4Vp=-q!MJO+a6f@#KI=Ej#a~ohf~4fC4;_vdE6o)##QVU|I44-f?bT0c<_Gj+;@9i
zRhR!S_Y3s=$?&uvs<a?w{a?lPg(14~mmaNP5m->rP`LGp^Rz-y_sRQ3+?9cjt9iLm
zy3#o5I;(&K10xHF;FEb^^LE~+XPLL=a<gds7ZG!4@c;HMb!nmk*MSdrcCCnLjgt8I
zSN=+Xve^+g-8`%3zo*@N8vn$|(iyCsr9(PlzWEzw7L82ZE4zU<u<#dLyX4hfBrf34
zFoSU#vykfgDF@kA4)velP-tKfU%YAS`YQ~JH^qC!YibHHvT#T${Bbq-lN-Rm$i%)O
z{=jrah_fJu3n-K{?Aodl1~mS<nCs#muo+AsgB~(H@n7r5SNk+TUHAO4KNdyTezi?I
zrVez#nW9;#Kr<9v8j|NtS<9g6-<KKkxpN(}i^N1hn5Usm7kjW}_TD|Zd;XOCnR0AH
z_1=qmy^hdeVPdy<`!8b)yCSw&cyMk@wCz&EFVRy?*g(#0n84Wg(|P~Zf9L)mnfLqu
zikE(zKqms-d0^`P6I=I95bFYQz#>p$G0TnV-u<-;b*?Bfx5V?qV*~84B({nb`^zMZ
z9Q>q}*04h~3RoUkvy`{=2|F}=oLGO<oj$WLuR<>Cw9gOUV2JrXw+<!W54d-GXR>HZ
zqDI4_Ol7Bl!Y%*)_j6r6=%5?f^5y9r%gd2M9&t`}3j)mFGs@JRW(Rw4n<Lbx59Afs
zAHn8l1_Pr5cj_#wcsUKW#`L?-lVn0tbwGn*=PRSNQ*9g0&$6r!59;}}cxP~z1VqJ$
z$BHHpmVk)D{@vS|?|h09X`j}(VuEupk{NI&4@1Gd7dt~UV}qwx<^L>R`F)xdTn@~*
apnQNkq36iDD83giAOTNTKbLh*2~7ZSaJ0ez

literal 0
HcmV?d00001

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 <stdbool.h>
+
+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