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 0000000..9e426b3 Binary files /dev/null and b/pk3DS.Core/Resources/romdata/byte/PlainRegion/SuMo.bin differ 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 0000000..7e122a4 Binary files /dev/null and b/pk3DS.Core/Resources/romdata/byte/PlainRegion/USUM.bin differ 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