From ca5cf58d00e6589754dbd4317feef41ba768697c Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sun, 21 Apr 2024 03:34:20 -0500
Subject: [PATCH] change Bifurcator system ID

---
 demos/misc/biffy_bifurcator.fur    | Bin 1716 -> 1716 bytes
 papers/format.md                   |   2 ++
 src/engine/platform/bifurcator.cpp |   2 +-
 src/engine/sysDef.cpp              |   2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/demos/misc/biffy_bifurcator.fur b/demos/misc/biffy_bifurcator.fur
index bc36b5aefa4cbfdd423c5a01b3bac924e2da8b82..b77187e7e02249eb9b81ac9449d196537af384da 100644
GIT binary patch
delta 1618
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
QoJ`~97vtvt3CQM6Y$rb-VgLXD

delta 1613
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
LjGO-_{Nhc8a)%86

diff --git a/papers/format.md b/papers/format.md
index 58e30b441..5b05d7add 100644
--- a/papers/format.md
+++ b/papers/format.md
@@ -243,8 +243,10 @@ size | description
      |   - 0xd6: NDS - 16 channels
      |   - 0xd7: Game Boy Advance (direct) - 2 channels
      |   - 0xd8: Game Boy Advance (MinMod) - 16 channels
+     |   - 0xd9: Bifurcator - 4 channels
      |   - 0xde: YM2610B extended - 19 channels
      |   - 0xe0: QSound - 19 channels
+     |   - 0xf0: SID2 - 3 channels
      |   - 0xf1: 5E01 - 5 channels
      |   - 0xfc: Pong - 1 channel
      |   - 0xfd: Dummy System - 8 channels
diff --git a/src/engine/platform/bifurcator.cpp b/src/engine/platform/bifurcator.cpp
index 800f2b8f9..fbe10020a 100644
--- a/src/engine/platform/bifurcator.cpp
+++ b/src/engine/platform/bifurcator.cpp
@@ -54,7 +54,7 @@ void DivPlatformBifurcator::acquire(short** buf, size_t len) {
     for (int i=0; i<4; i++) {
       chan[i].audSub+=chan[i].freq;
       if (chan[i].audSub>=65536) {
-        long long newx=(long long)chan[i].curx*(chan[i].param+65536)/32768;
+        int64_t newx=(int64_t)chan[i].curx*(chan[i].param+65536)/32768;
         newx*=65536-chan[i].curx;
         chan[i].curx=(int)(newx/65536);
         chan[i].audSub&=65535;
diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp
index b7c62a9cf..af775e108 100644
--- a/src/engine/sysDef.cpp
+++ b/src/engine/sysDef.cpp
@@ -2092,7 +2092,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_BIFURCATOR]=new DivSysDef(
-    "Bifurcator", NULL, 0xf2, 0, 4, false, true, 0, false, 0, 0, 0,
+    "Bifurcator", NULL, 0xd9, 0, 4, false, true, 0, false, 0, 0, 0,
     "a fantasy sound chip using logistic map iterations to generate sound.",
     {"Channel 1", "Channel 2", "Channel 3", "Channel 4"},
     {"CH1", "CH2", "CH3", "CH4"},