Separating RWS 0x809 and RWS 0x80D variant C

doc/FORMATS.md

@@ -1330,18 +1330,18 @@ different internally (encrypted, different versions, etc) and not always can be
   - Konami RWAX header [*RWAX*]
   - *rwax*: `.rwx`
   - Codecs: PCM16LE
-- **rws.c**
+- **rws_809.c**
   - RenderWare RWS header [*RWS*]
-  - *rws*: `.rws`
+  - *rws_809*: `.rws`
+  - Codecs: PSX NGC_DSP PCM16BE PCM16LE
+- **rws_80d.c**
+  - RenderWare RWS header [*RWS*]
+  - *rws_80d*: `.rws`
   - Codecs: PCM16_int PCM16BE PCM16LE PSX NGC_DSP XBOX_IMA
 - **rwsd.c**
   - Nintendo RWSD header (single stream) [*RWSD*]
   - *rwsd*: `.brwsd .rwsd`
   - Codecs: PCM8 PCM16BE NGC_DSP
-- **rws_mono.c**
-  - RenderWare RWS header [*RWS*]
-  - *rws_mono*: `.rws`
-  - Codecs: PSX PCM16BE PCM16LE
 - **rxws.c**
   - Sony RXWS header [*RXWS*]
   - *rxws*: `.xwb .xws + .xwh .xwb`

src/libvgmstream.vcxproj

@@ -599,9 +599,9 @@
     <ClCompile Include="meta\rsd.c" />
     <ClCompile Include="meta\rstm_rockstar.c" />
     <ClCompile Include="meta\rwax.c" />
-    <ClCompile Include="meta\rws.c" />
+    <ClCompile Include="meta\rws_809.c" />
+    <ClCompile Include="meta\rws_80d.c" />
     <ClCompile Include="meta\rwsd.c" />
-    <ClCompile Include="meta\rws_mono.c" />
     <ClCompile Include="meta\rxws.c" />
     <ClCompile Include="meta\s3v.c" />
     <ClCompile Include="meta\sab.c" />

src/libvgmstream.vcxproj.filters

@@ -1618,15 +1618,15 @@
     <ClCompile Include="meta\rwax.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\rws.c">
+    <ClCompile Include="meta\rws_809.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="meta\rws_80d.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="meta\rwsd.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\rws_mono.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\rxws.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/rws_809.c

@@ -81,7 +81,7 @@ VGMSTREAM* init_vgmstream_rws_809(STREAMFILE* sf) {
             /* (header_offset + 0x3C + misc_data_size) + 0x00 to +0x18 has the target format
              * info which in most cases would probably be identical to the input format info */
 
-            /* misc_data_size * 2 should be 0xC0 if it exists */
+            /* (misc_data_size * 2) should be 0xC0 if it exists */
             stream_name_offset = header_offset + 0x7C + (misc_data_size * 2);
             read_string(stream_name, STREAM_NAME_SIZE, stream_name_offset, sf);
 
@@ -112,7 +112,7 @@ VGMSTREAM* init_vgmstream_rws_809(STREAMFILE* sf) {
     vgmstream->num_streams = total_subsongs;
     vgmstream->interleave_block_size = interleave;
 
-    /* Seems to be the same as in rws.c, maybe merge the two switches into one function? */
+    /* Seems to be the same as in rws_80d.c, maybe merge the two switches into one function? */
     switch (codec_uuid) {
         case 0xD01BD217: /* {D01BD217-3587-4EED-B9D9-B8E86EA9B995}: PCM Signed 16-bit */
             vgmstream->num_samples = pcm16_bytes_to_samples(stream_size, channels);