RE CV: try new item pickup change

biorand · Mar 16, 2024 · 9452419 · 9452419
1 parent 22bb9f8
commit 9452419
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/IntelOrca.Biohazard.BioRand/RECV/ReCvRandomiser.cs b/IntelOrca.Biohazard.BioRand/RECV/ReCvRandomiser.cs
@@ -235,6 +235,7 @@ public override void Generate(RandoConfig config, IRandoProgress progress, FileR
                     SetDoorSkip();
                 FixRifleStacking();
                 SetItemQuantityPickup(config, new Rng(config.Seed));
+                HackItemPickup();
 
                 // base.Generate(config, progress, fileRepository);
 
@@ -480,6 +481,14 @@ private void FixRifleStacking()
             bw.Write((byte)0x16);
         }
 
+        private void HackItemPickup()
+        {
+            var ms = new MemoryStream(_elf);
+            var bw = new BinaryWriter(ms);
+            ms.Position = ConvertAddress(0x266E30);
+            bw.Write((byte)0x06);
+        }
+
         private void SetSpecialSlotItem(byte item)
         {
             var ms = new MemoryStream(_elf);

diff --git a/IntelOrca.Biohazard.BioRand/Rdt.cs b/IntelOrca.Biohazard.BioRand/Rdt.cs
@@ -254,7 +254,7 @@ private void SetItem(byte id, byte? itemId, short? globalId, ushort type, ushort
                     if (rdtBuilder.Items.Count > itemId)
                     {
                         var item = rdtBuilder.Items[itemId.Value];
-                        item.Type = type;
+                        item.Type = (item.Type & 0xFFFF) | (type << 16);
                         rdtBuilder.Items[itemId.Value] = item;
                         RdtFile = rdtBuilder.ToRdt();
                     }
@@ -528,6 +528,21 @@ public void Save()
                 postMod();
             }
 
+            if (Version == BioVersion.BiohazardCv)
+            {
+                var rdtCv = ((RdtCv)RdtFile).ToBuilder();
+                for (var i = 0; i < rdtCv.Items.Count; i++)
+                {
+                    var item = rdtCv.Items[i];
+                    if (((item.Type >> 16) & 0xFFFF) == 0)
+                    {
+                        item.Type |= (item.Type << 16);
+                    }
+                    rdtCv.Items[i] = item;
+                }
+                RdtFile = rdtCv.ToRdt();
+            }
+
             if (ModifiedPath != null)
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(ModifiedPath)!);