From ec3ace043e26af9cbfee5df9849b22d4693149b2 Mon Sep 17 00:00:00 2001
From: tom-overton <tom.overton@outlook.com>
Date: Sat, 5 Oct 2019 18:51:30 -0700
Subject: [PATCH] Add support for recognizing SuMo and USUM

---
 pk3DS.Core/CTR/Exheader.cs                    |  24 +++++++++++++++++-
 .../romdata/byte/PlainRegion/SuMo.bin         | Bin 0 -> 1024 bytes
 .../romdata/byte/PlainRegion/USUM.bin         | Bin 0 -> 1024 bytes
 pk3DS.Core/Resources/romdata/txt/3dsgames.txt |   6 ++++-
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pk3DS.Core/Resources/romdata/byte/PlainRegion/SuMo.bin
 create mode 100644 pk3DS.Core/Resources/romdata/byte/PlainRegion/USUM.bin

diff --git a/pk3DS.Core/CTR/Exheader.cs b/pk3DS.Core/CTR/Exheader.cs
index 7a93359..44311ef 100644
--- a/pk3DS.Core/CTR/Exheader.cs
+++ b/pk3DS.Core/CTR/Exheader.cs
@@ -56,7 +56,17 @@ public string GetSerial()
 
         public bool isPokemon()
         {
-            return isORAS() || isXY();
+            return isORAS() || isXY() || isUSUM() || isSuMo();
+        }
+
+        public bool isUSUM()
+        {
+            return (TitleID & 0xFFFFFFFF) >> 8 == 0x1B50 || (TitleID & 0xFFFFFFFF) >> 8 == 0x1B51;
+        }
+
+        public bool isSuMo()
+        {
+            return (TitleID & 0xFFFFFFFF) >> 8 == 0x1648 || (TitleID & 0xFFFFFFFF) >> 8 == 0x175E;
         }
 
         public bool isORAS()
@@ -76,6 +86,18 @@ public string GetPokemonSerial()
             string name;
             switch ((TitleID & 0xFFFFFFFF) >> 8)
             {
+                case 0x1B51: 
+                    name = "A2BA"; // Ultra Moon
+                    break;
+                case 0x1B50:
+                    name = "A2AA"; // Ultra Sun
+                    break;
+                case 0x175E: // Moon
+                    name = "BNEA";
+                    break;
+                case 0x1648: // Sun
+                    name = "BNDA";
+                    break;
                 case 0x11C5: //Alpha Sapphire
                     name = "ECLA";
                     break;
diff --git a/pk3DS.Core/Resources/romdata/byte/PlainRegion/SuMo.bin b/pk3DS.Core/Resources/romdata/byte/PlainRegion/SuMo.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9e426b38686a87a70f472053eefdc98564e70f8d
GIT binary patch
literal 1024
zcmb7?ZEu1w6ovgiiwQ878NPKCmqsZL+)H9iQ%hZ%K}(=G+^-)Fx;Rji@$o*V=iYlR
z>ln^&Fv2Sz!_f6s5oroz+a?oY6UVZMRFZE->p!xYD6&sl@Ui8PJBv&W7gBSXC>O>{
z06fT9<6#l2!-3igmWtdB)Gp;U<XKhof;f$2GL*F1qsLhR$|y*3mR%G;zD*VTxYS@q
zOAV?-sJ;P;m+n*K%eJrG4c1nT)>N@s82fMJme|d%4;c2-I6@eA+(46f6q?GZR}l2%
zr|@}o1xE88G>u}q=a6a|b5<4ng{IZutY;((rAnS2%#2se{JJl~uM@8sX4>4B@AL(F
z-~4FlK|5D)DHB6Y3`+#aBJ{wbUH13&DgU|0S>lC35aQlbvzkXUUQoca*i$`-sHI2>
zEodsf2K@0*sFJCC08rtnEUTnoRI9@5W14nR9mCkkVHjxe0F_ZCrI7ES^lJ_BJUto<
JB{!r0ec!dCHS7QY

literal 0
HcmV?d00001

diff --git a/pk3DS.Core/Resources/romdata/byte/PlainRegion/USUM.bin b/pk3DS.Core/Resources/romdata/byte/PlainRegion/USUM.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7e122a4a24accaa58a5aa237e57d9f34954fd0bc
GIT binary patch
literal 1024
zcmb7?ZEJ%t6ovbLMnPT2ir+G0M`(?mb}vv$NMky}G!c!R-LIdbflk}P{CJ;}bMHOZ
zZ48%p7~zeNVd#3Bh%|+%ZIc<XiDOwrD#>?~?H}1f6xlZ|_|$U9gGJ_s3#qwGlndiE
z03PJ5@vw;1<3Q~NOGWMm>X7mp@~o<PL7YZ18%sKE>v2(lG76HMWmg4|?^DITt~FTD
zQiCcHYG{DswfhqJvg>R2gLPG-HC1dD#{LJnC$>eLCk%&av=GKUH_#*=g{E@u6$AtM
zIegvRfYEXQO{16|Ii#A#oK*#XqiHod>jlY5sgkEBGvf_2zaEP4`^;;GnK$?42YrP;
zHa}W=(#{QB%EV9;!x{my3O%qIEPKwodt7?yg+UPF!BexEM>Aefz_d70J&LHKND3`z
zDt<=%`BbQqseA-b;i)XEq+nF5!c1kF_EEKA9OO6*G<tx_sFG61Pf+@`26>*g#zM*6
H<bU5U&BZnL

literal 0
HcmV?d00001

diff --git a/pk3DS.Core/Resources/romdata/txt/3dsgames.txt b/pk3DS.Core/Resources/romdata/txt/3dsgames.txt
index c715534..c39217b 100644
--- a/pk3DS.Core/Resources/romdata/txt/3dsgames.txt
+++ b/pk3DS.Core/Resources/romdata/txt/3dsgames.txt
@@ -3573,4 +3573,8 @@
 000400000011BB00	JXQE	Johnny Dynamite
 0004000000158C00	JT7E	3D Thunder Blade
 0004000000158200	JT7P	3D Thunder Blade
-000400000016AC00	JWXE	Samurai Defender
\ No newline at end of file
+000400000016AC00	JWXE	Samurai Defender
+0004000000164800	BNDA	Pokémon™ Sun
+0004000000175E00	BNEA	Pokémon™ Moon
+00040000001B5000	A2AA	Pokémon™ Ultra Sun
+00040000001B5100	A2BA	Pokémon™ Ultra Moon
\ No newline at end of file