diff --git a/ArcFormats/NonColor/ArcDAT.cs b/ArcFormats/NonColor/ArcDAT.cs index 1b062511..c67d9389 100644 --- a/ArcFormats/NonColor/ArcDAT.cs +++ b/ArcFormats/NonColor/ArcDAT.cs @@ -355,6 +355,7 @@ namespace GameRes.Formats.NonColor uint Extend8Bit (byte v) { + // 0xFF -> -1 -> 0xFFFFFFFF return ExtendByteSign ? (uint)(int)(sbyte)v : v; } diff --git a/ArcFormats/Properties/AssemblyInfo.cs b/ArcFormats/Properties/AssemblyInfo.cs index f63342e8..864df4ef 100644 --- a/ArcFormats/Properties/AssemblyInfo.cs +++ b/ArcFormats/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.2.42.1834")] -[assembly: AssemblyFileVersion ("1.2.42.1834")] +[assembly: AssemblyVersion ("1.2.42.1887")] +[assembly: AssemblyFileVersion ("1.2.42.1887")] diff --git a/ArcFormats/Resources/Formats.dat b/ArcFormats/Resources/Formats.dat index 182847bb..cd6c56c5 100644 Binary files a/ArcFormats/Resources/Formats.dat and b/ArcFormats/Resources/Formats.dat differ diff --git a/GARbro.sln b/GARbro.sln index 1bdbb6a9..f4b7578f 100644 --- a/GARbro.sln +++ b/GARbro.sln @@ -76,6 +76,7 @@ Global {C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Debug|Any CPU.Build.0 = Debug|Any CPU {C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU + {C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU {C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Release|Any CPU.ActiveCfg = Release|Any CPU {C79E82A8-8D32-485D-8442-2D4F71FBB5D5}.Release|Any CPU.Build.0 = Release|Any CPU {73B6C693-9846-4D33-8300-A80239FCFFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/Legacy/Dice/ImageRBP.cs b/Legacy/Dice/ImageRBP.cs index b4c6ff68..2a90df8f 100644 --- a/Legacy/Dice/ImageRBP.cs +++ b/Legacy/Dice/ImageRBP.cs @@ -27,6 +27,8 @@ using System.ComponentModel.Composition; using System.IO; using System.Windows.Media; +// [000623][Marimo] Setsunai + namespace GameRes.Formats.Dice { internal class RbpMetaData : ImageMetaData diff --git a/Legacy/KeroQ/ImageKGD.cs b/Legacy/KeroQ/ImageKGD.cs index 6394a0d2..2ac93d8c 100644 --- a/Legacy/KeroQ/ImageKGD.cs +++ b/Legacy/KeroQ/ImageKGD.cs @@ -127,8 +127,8 @@ namespace GameRes.Formats.KeroQ Buffer.BlockCopy (buffer, 1, pixels, dst, stride); dst += stride; } - PixelFormat format = 24 == info.BPP ? PixelFormats.Bgr24 : PixelFormats.Bgr32; - return ImageData.Create (info, PixelFormats.Bgr24, null, pixels); + PixelFormat format = 24 == info.BPP ? PixelFormats.Bgr24 : PixelFormats.Bgra32; + return ImageData.Create (info, PixelFormats.Bgr24, null, pixels, stride); } } diff --git a/Legacy/Speed/ImageDAT.cs b/Legacy/Speed/ImageDAT.cs index f5b3848d..dd7b8ff4 100644 --- a/Legacy/Speed/ImageDAT.cs +++ b/Legacy/Speed/ImageDAT.cs @@ -28,6 +28,8 @@ using System.IO; using System.Windows.Media; using System.Windows.Media.Imaging; +// [010719][Studio Jikkenshitsu] Shin Gekka Bijin ~Hitori Shizuka + namespace GameRes.Formats.Speed { internal class SpMetaData : ImageMetaData @@ -46,7 +48,7 @@ namespace GameRes.Formats.Speed public SpDatFormat () { Extensions = new string[0]; - Signatures = new uint[] { 0x010003, 0x010007, 0 }; + Signatures = new uint[] { 0x010003, 0x010007, 0x01000B, 0 }; } public override ImageMetaData ReadMetaData (IBinaryStream file) @@ -55,7 +57,7 @@ namespace GameRes.Formats.Speed if (header.ToInt32 (4) != 0) return null; int flags = header.ToUInt16 (0); - if ((flags & ~7) != 0) + if ((flags & ~0xF) != 0) return null; return new SpMetaData { Width = header.ToUInt16 (0x16), diff --git a/Legacy/Weapon/ArcDAT.cs b/Legacy/Weapon/ArcDAT.cs index 715e9cee..b2878a47 100644 --- a/Legacy/Weapon/ArcDAT.cs +++ b/Legacy/Weapon/ArcDAT.cs @@ -29,6 +29,8 @@ using System.ComponentModel.Composition; using System.IO; using System.Windows.Media; +// [000331][WEAPON] Seido Techou + namespace GameRes.Formats.Weapon { internal class CgEntry : Entry diff --git a/Legacy/hmp/ImageMBP.cs b/Legacy/hmp/ImageMBP.cs index 09ac25c4..2c063207 100644 --- a/Legacy/hmp/ImageMBP.cs +++ b/Legacy/hmp/ImageMBP.cs @@ -27,6 +27,7 @@ using System.ComponentModel.Composition; using System.IO; using System.Windows.Media; +// [000421][Sepia] Rinjin Mousou ~Danchizoku no Hirusagari~ // [000623][Sweet] Depaga ~Service Angel~ namespace GameRes.Formats.Hmp diff --git a/docs/supported.html b/docs/supported.html index ebe863a4..824ce90a 100644 --- a/docs/supported.html +++ b/docs/supported.html @@ -307,6 +307,7 @@ Crime Rhyme series
Damegane
Dare mo ga Kanojo o Neratteru
Distance
+Ero Mangaka-san to Binbou Shimai
ExE
Fair Child
Fantasical
@@ -374,6 +375,7 @@ Riddle Joker
Riding Incubus
Royal Garden ~Otome ni Koi Suru Ouji no Gikyoku~
Rui wa Tomo o Yobu
+Ryuukishi Bloody†Saga
Sakura Sakura
Sanoba Witch
Se-kirara
@@ -485,6 +487,7 @@ Ren no Koi
*.ald-Alice Soft Boku dake no Hokenshitsu
Daiteikoku
+Hisui no Hitomi
Majo no Shokuzai
Momoiro Guardian
Pastel Chime 3 Bind Seeker
@@ -617,6 +620,7 @@ Re: Rem Plus ShiinaRio v2.50
Ryoumaden ~Houkago no Rakuen~ ShiinaRio v2.47
Sabae no Ou ShiinaRio v2.36
Saimin Seikatsu ~Kousoku Dakara Shikatanai!?~ ShiinaRio v2.47
+Sensei! Shite Ageru ShiinaRio v2.48
Shinigami no Testament ShiinaRio v2.49
Shinseki no Oba-san ~Hanare no Netsujo, Honke no Gosai~ ShiinaRio v2.36
Shojo MamaShiinaRio v2.49
@@ -755,6 +759,7 @@ Chijoku no Kankei ~Inkou Kyoushi~
Chijoku no Kankei 2
Jii -Nozoki no Houshuu-
Keibiin 2
+Iinari Aneiro ~Onee-chan sae Ireba Ii!~
Itazura ZERO
Mariko-sanchi no Seijijou ~Oba-san wa Boku no Mono~
Oira wa Bandai 2
@@ -863,6 +868,7 @@ RPG Gakuen
*.crmCRXB *.pcmXPCM *.pakCHERRY PACK 2.0
CHERRY PACK 3.0
-Cherry +Angel's Lesson
Double
Exile ~Blood Royal 2~
Gakuen ~Nerawareta Chitai~
@@ -1055,6 +1061,7 @@ Saikyou Goshujin-sama! -Mighty My Master-
Saiminjutsu Re
Soredemo Tsuma o Aishiteru
Summoner Princess Artemina 2 -Tatakae! Apologue-
+Wanko no Yomeiri ~Inu no Shippo e Youkoso!~
Wizard Links
*.medMD @@ -1117,6 +1124,7 @@ Uchi no Kanojo
*.grpAiFS *.dat
*.cg-ACTGS Bin Can Darling
+Niji o Mitsuketara Oshiete.
Oreiro Ganbou
Otome Smile
Tadashiki Himehajime
@@ -1202,6 +1210,7 @@ Shiawase Kazoku-bu
*.mskMSK0 *.mv2MV2X *.g2
*.stx-GLib2 +Aniyome Dakara!
Hikikomori Muke Hitozuma-sensei
Hitozuma Net Auction
@@ -1668,6 +1677,7 @@ Ura Seitokai yo, Koumon o Seiatsu Seyo!
Idol★Harem
Inkou Karen Doukoukai
Minami-kun no Junan ~Kyousei Seitenkan Gorankou~
+Nami no Mani Mani ~Sazanami Shinryoujo~
*.mgdMGD *.dat+*.db-IGS @@ -1676,6 +1686,7 @@ Maou no Ingu
*.binKARCadath DA Pantsu!!
Doreijou
+Hiretsu
*.kgfKGF *.arcDAF\x1A @@ -1750,6 +1761,7 @@ Ryoujoku Joshi Gakuen
*.wsmWSM1
WSM2
WSM3
WSM4 *BC *.pakGraphic PackDatacromwell +Anagan Oyako
Ikenie Reijou
Keraku no Ou
Tremolo
@@ -1926,6 +1938,9 @@ Ryoujoku Ukeoinin Tsuboshi
*.mmaARC!MNP Izayoi Renka
+*.redRE0Ocarina +Stay ~Anata no Tonari ni~
+

1 Non-encrypted only

diff --git a/docs/version.xml b/docs/version.xml index 0a3cf183..1fa39887 100644 --- a/docs/version.xml +++ b/docs/version.xml @@ -17,10 +17,18 @@ 122 - https://github.com/morkt/GARbro/raw/master/ArcFormats/Resources/Formats.dat + https://github.com/morkt/GARbro/raw/7778b1c8206caadddba9a3dcb2e93d099c28f286/ArcFormats/Resources/Formats.dat + + 123 + https://github.com/morkt/GARbro/raw/master/ArcFormats/Resources/Formats.dat + + + + +