Fix rebase conflicts, add private test ROM directory

- Remove undeclared cdBuf2/cdBuf3 from CDROMStateSave/Load
- Add test/roms/private/ for commercial ROMs (gitignored)

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: JoeMatt

.gitignore

@@ -9,3 +9,6 @@
 .build
 /.claude
 test/test_blitter_simd
+test/roms/private/*
+!test/roms/private/.gitkeep
+!test/roms/private/README.md

src/cdrom.c

@@ -1142,8 +1142,6 @@ size_t CDROMStateSave(uint8_t *buf)
 	STATE_SAVE_VAR(buf, txData);
 	STATE_SAVE_VAR(buf, rxDataBit);
 	STATE_SAVE_VAR(buf, firstTime);
-	STATE_SAVE_BUF(buf, cdBuf2, sizeof(cdBuf2));
-	STATE_SAVE_BUF(buf, cdBuf3, sizeof(cdBuf3));
 
 	return (size_t)(buf - start);
 }
@@ -1173,8 +1171,6 @@ size_t CDROMStateLoad(const uint8_t *buf)
 	STATE_LOAD_VAR(buf, txData);
 	STATE_LOAD_VAR(buf, rxDataBit);
 	STATE_LOAD_VAR(buf, firstTime);
-	STATE_LOAD_BUF(buf, cdBuf2, sizeof(cdBuf2));
-	STATE_LOAD_BUF(buf, cdBuf3, sizeof(cdBuf3));
 
 	return (size_t)(buf - start);
 }

test/roms/private/.gitkeep

@@ -0,0 +1,19 @@
+# Private Test ROMs
+
+This directory is for commercial ROM files used in local testing.
+Files here are git-ignored and must NOT be committed.
+
+## Expected files
+
+Place any of the following for game-specific testing:
+
+### Cartridge ROMs (.j64)
+- `doom.j64` — Doom (resolution hack testing, #85-related)
+- `avp.j64` — Alien vs Predator (map rendering, issue #85)
+- `cybermorph.j64` — Cybermorph (DSP voice test, issue #27)
+- `tempest2000.j64` — Tempest 2000 (performance testing)
+- `ironsoldier.j64` — Iron Soldier (black screen, issue #86)
+
+### CD images (.cue/.bin or .chd)
+- `bcd/` — Blue Lightning CD
+- Any Jaguar CD game in CUE/BIN or CHD format