]> Shamusworld >> Repos - thunder/blobdiff - src/thunder.cpp
Added save states; updated application icon.
[thunder] / src / thunder.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 17ea566..cb91ed1
@@ -1,66 +1,38 @@
 //
-// Thunder: A Rolling Thunder Emulator w/6809 debugger
+// Thunder: A Rolling Thunder Emulator
 //
-// by James L. Hammons
-// (c) 2004, 2009 Underground Software
+// by James Hammons
+// (C) 2004, 2023 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
-// ---  ----------  ------------------------------------------------------------
+// ---  ----------  -----------------------------------------------------------
 // JLH  07/23/2009  Added changelog ;-)
+// JLH  08/12/2009  Stabilized emulation so that it works
+// JLH  04/04/2014  Converted to SDL 2
+// JLH  04/17/2014  Removed a metric fuck-tonne of cruft, added YM2151 & MCU
+// JLH  01/13/2023  Finally fixed the sprite lag problem  :-D
+// JLH  01/13/2023  Added save states
 //
 
-#define THUNDER_VERSION       "0.9.9"
+#define THUNDER_VERSION                "1.2.2"
 
-#include <iostream>
-#include <iomanip>
-#include <fstream>
+#include <SDL2/SDL.h>
 #include <string>
-#include <new>
-#include <stdio.h>
 #include <stdlib.h>
-//#include <conio.h>                   // For getch()
-#include <curses.h>                    // For getch()
 #include <time.h>
-#include "SDL.h"                                                                               // Get yer SDL out...!
-#include "types.h"
-#include "v6809.h"
-#include "screen.h"
+#include "fileio.h"
 #include "gui.h"
 #include "log.h"
+#include "psg.h"
+#include "screen.h"
+#include "sound.h"
+#include "v63701.h"
+#include "v6809.h"
+#include "video.h"
+#include "ym2151.h"
 
-using namespace std;                                                                   // Yes!
-
-#if 0
-#define ROM1  "RT3-1B.ROM"
-#define ROM2  "RT3-2B.ROM"
-#define ROM3  "RT3-3.ROM"
-#define ROM4  "RT3-4.ROM"
-#define ROM5  "RT1-5.ROM"
-#define ROM6  "RT1-6.ROM"
-#define ROM7  "RT1-7.ROM"
-#define ROM8  "RT1-8.ROM"
-#define ROM9  "RT1-9.ROM"
-#define ROM10 "RT1-10.ROM"
-#define ROM11 "RT1-11.ROM"
-#define ROM12 "RT1-12.ROM"
-#define ROM13 "RT1-13.ROM"
-#define ROM14 "RT1-14.ROM"
-#define ROM15 "RT1-15.ROM"
-#define ROM16 "RT1-16.ROM"
-#define ROM17 "RT1-17.ROM"
-#define ROM18 "RT1-18.ROM"
-#define ROM19 "RT3-19.ROM"
-#define ROM20 "RT3-20.ROM"
-#define ROM21 "RT1-21.ROM"
-#define ROM22 "RT2-22.ROM"
-#define PROM1 "RT1-1.BIN"
-#define PROM2 "RT1-2.BIN"
-#define PROM3 "RT1-3.BIN"
-#define PROM4 "RT1-4.BIN"
-#define PROM5 "RT1-5.BIN"
-#else
 #define ROM1   "rt3-1b.9c"
 #define ROM2   "rt3-2b.12c"
 #define ROM3   "rt3-3.12d"
@@ -89,642 +61,219 @@ using namespace std;                                                                      // Yes!
 #define PROM4  "mb7138h.6v"
 #define PROM5  "mb7112e.6u"
 #define MCUROM "rt1-mcu.bin"
-#endif
 
 // Global defines
 
-SDL_Surface * screen;
-
-uint8 * gram, * grom;                                                  // Allocate RAM & ROM pointers
-uint8 gram1[0x10000], gram2[0x10000], grom1[0x10000], grom2[0x10000];  // Actual memory
-uint8 grom3[0x8000], grom4[0x8000], data_rom[0x40000], spr_rom[0x80000], voice_rom[0x20000];
-uint8 chr_rom[0x60000];                                                        // Character ROM pointer
+uint8_t gram1[0x10000], grom1[0x10000], grom2[0x10000];
+uint8_t grom3[0x8000], data_rom[0x40000], spr_rom[0x80000], voice_rom[0x20000];
+uint8_t charROM[0x60000];              // Character ROM
+uint8_t mcuMem[0x10000];               // 64K for MCU
 
+// CPU execution contexts
 V6809REGS cpu1, cpu2;
+V63701REGS mcu;
 
-bool trace1 = false;                 // ditto...
-bool looking_at_rom = true;         // true = R1, false = R2
-uint32 banksw1, banksw2;             // Bank switch addresses
-uint16 game_over_switch;              // Game over delay
-uint16 dpc;                           // Debug pc reg...
-bool show_scr = true;            // Whether or not to show background
-bool enable_cpu = true;          // Whether or not to enable CPUs
-bool irqGoA = true;              // IRQ switch for CPU #1
-bool irqGoB = true;              // IRQ switch for CPU #2
-
-uint16 refresh_ = 0;                // Crappy global screen stuff...
-bool refresh2 = true;
-
-uint32 psg_lens[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-uint8 * psg_adrs[16];
-uint32 voc_lens[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-uint8 * voc_adrs[32];
-uint32 fm_lens[14] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-uint8 * fm_adrs[14];
-
-fstream tr;    // Tracelog hook
-uint16    pcx;   // Where we at?
-
-static uint8 * keys;                                                   // SDL raw keyboard matrix
-
-static char op_mat1[256] = {
-  1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1,
-  0, 0, 5, 5, 0, 0, 4, 4, 0, 5, 8, 0, 8, 5, 6, 6,
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-  7, 7, 7, 7, 6, 6, 6, 6, 0, 5, 5, 5, 8, 5, 5, 5,
-  5, 0, 0, 5, 5, 0, 5, 5, 5, 5, 5, 0, 5, 5, 0, 5,
-  5, 0, 0, 5, 5, 0, 5, 5, 5, 5, 5, 0, 5, 5, 0, 5,
-  7, 0, 0, 7, 7, 0, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7,
-  2, 0, 0, 2, 2, 0, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2,
-  8, 8, 8, 9, 8, 8, 8, 0, 8, 8, 8, 8, 9, 3, 9, 0,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  8, 8, 8, 9, 8, 8, 8, 0, 8, 8, 8, 8, 9, 0, 9, 0,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
-op_mat2[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 9, 0,
-  0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1,
-  0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 7, 7,
-  0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 2,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2 },
-op_mat3[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0,
-  0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-  0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0,
-  0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-static char mnemonics[256][6] = {
-  "NEG  ","???  ","???  ","COM  ","LSR  ","???  ","ROR  ","ASR  ",
-  "LSL  ","ROL  ","DEC  ","???  ","INC  ","TST  ","JMP  ","CLR  ",
-  "PAGE1","PAGE2","NOP  ","SYNC ","???  ","???  ","LBRA ","LBSR ",
-  "???  ","DAA  ","ORCC ","???  ","ANDCC","SEX  ","EXG  ","TFR  ",
-  "BRA  ","BRN  ","BHI  ","BLS  ","BHS  ","BLO  ","BNE  ","BEQ  ",
-  "BVC  ","BVS  ","BPL  ","BMI  ","BGE  ","BLT  ","BGT  ","BLE  ",
-  "LEAX ","LEAY ","LEAS ","LEAU ","PSHS ","PULS ","PSHU ","PULU ",
-  "???  ","RTS  ","ABX  ","RTI  ","CWAI ","MUL  ","RESET","SWI  ",
-  "NEGA ","???  ","???  ","COMA ","LSRA ","???  ","RORA ","ASRA ",
-  "LSLA ","ROLA ","DECA ","???  ","INCA ","TSTA ","???  ","CLRA ",
-  "NEGB ","???  ","???  ","COMB ","LSRB ","???  ","RORB ","ASRB ",
-  "LSLB ","ROLB ","DECB ","???  ","INCB ","TSTB ","???  ","CLRB ",
-  "NEG  ","???  ","???  ","COM  ","LSR  ","???  ","ROR  ","ASR  ",
-  "LSL  ","ROL  ","DEC  ","???  ","INC  ","TST  ","JMP  ","CLR  ",
-  "NEG  ","???  ","???  ","COM  ","LSR  ","???  ","ROR  ","ASR  ",
-  "LSL  ","ROL  ","DEC  ","???  ","INC  ","TST  ","JMP  ","CLR  ",
-  "SUBA ","CMPA ","SCBA ","SUBD ","ANDA ","BITA ","LDA  ","???  ",
-  "EORA ","ADCA ","ORA  ","ADDA ","CMPX ","BSR  ","LDX  ","???  ",
-  "SUBA ","CMPA ","SBCA ","SUBD ","ANDA ","BITA ","LDA  ","STA  ",
-  "EORA ","ADCA ","ORA  ","ADDA ","CMPX ","JSR  ","LDX  ","STX  ",
-  "SUBA ","CMPA ","SBCA ","SUBD ","ANDA ","BITA ","LDA  ","STA  ",
-  "EORA ","ADCA ","ORA  ","ADDA ","CMPX ","JSR  ","LDX  ","STX  ",
-  "SUBA ","CMPA ","SBCA ","SUBD ","ANDA ","BITA ","LDA  ","STA  ",
-  "EORA ","ADCA ","ORA  ","ADDA ","CMPX ","JSR  ","LDX  ","STX  ",
-  "SUBB ","CMPB ","SCBB ","ADDD ","ANDB ","BITB ","LDB  ","???  ",
-  "EORB ","ADCB ","ORB  ","ADDB ","LDD  ","???  ","LDU  ","???  ",
-  "SUBB ","CMPB ","SBCB ","ADDD ","ANDB ","BITB ","LDB  ","STB  ",
-  "EORB ","ADCB ","ORB  ","ADDB ","LDD  ","STD  ","LDU  ","STU  ",
-  "SUBB ","CMPB ","SBCB ","ADDD ","ANDB ","BITB ","LDB  ","STB  ",
-  "EORB ","ADCB ","ORB  ","ADDB ","LDD  ","STD  ","LDU  ","STU  ",
-  "SUBB ","CMPB ","SBCB ","ADDD ","ANDB ","BITB ","LDB  ","STB  ",
-  "EORB ","ADCB ","ORB  ","ADDB ","LDD  ","STD  ","LDU  ","STU  " },
-mnemonics2[256][6] = {
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","LBRN ","LBHI ","LBLS ","LBHS ","LBLO ","LBNE ","LBEQ ",
-  "LBVC ","LBVS ","LBPL ","LBMI ","LBGE ","LBLT ","LBGT ","LBLE ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","SWI2 ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","CMPD ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPY ","???  ","LDY  ","???  ",
-  "???  ","???  ","???  ","CMPD ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPY ","???  ","LDY  ","STY  ",
-  "???  ","???  ","???  ","CMPD ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPY ","???  ","LDY  ","STY  ",
-  "???  ","???  ","???  ","CMPD ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPY ","???  ","LDY  ","STY  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","LDS  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","LDS  ","STS  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","LDS  ","STS  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","LDS  ","STS  " },
-mnemonics3[256][6] = {
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","SWI3 ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","CMPU ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPS ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","CMPU ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPS ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","CMPU ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPS ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","CMPU ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","CMPS ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  ",
-  "???  ","???  ","???  ","???  ","???  ","???  ","???  ","???  " },
-tregs[16][3] = {
-  "D",  "X", "Y",  "U",  "S",  "PC", "??", "??",
-  "A",  "B", "CC", "DP", "??", "??", "??", "??" },
-iregs[4][2] = {"X", "Y", "U", "S" };
+// Bank switch addresses
+uint32_t banksw1, banksw2;
+
+// MCU inputs
+Byte input1, input2, input3, input4, input5;
+
+// Miscellaneous stuff
+bool copySprites = false;
+const uint8_t stateHeader[20] = "THUNDERSAVESTATE1.0";
+
+// Function prototypes
+uint8_t MCUReadMemory(uint16_t address);
+void MCUWriteMemory(uint16_t address, uint8_t data);
 
 //
-// Read a byte from memory (without touching PC. Not a Fetch!)
+// Read a byte from memory
 //
-uint8 RdMem(uint16 addr)
+uint8_t MainReadMemory(uint16_t addr)
 {
-       uint8 b;
-
-       // $4000-4300 is RAM shared with the microcontroller...
+       uint8_t b;
 
        if (addr < 0x8000)
        {
-               if (addr > 0x5FFF)
-                       b = data_rom[banksw1 + (addr - 0x6000)];        // Get char data
-               else
-                       b = gram1[addr];
+               // Memory shared with MCU (CPU #1 only! CPU #2 does not)
+               if ((addr >= 0x4000) && (addr <= 0x43FF))
+                       return mcuMem[addr - 0x3000];
+
+               if (addr >= 0x6000)
+                       return data_rom[banksw1 + (addr - 0x6000)];     // Get char data
+
+               return gram1[addr];
        }
-       else
-               b = grom1[addr];
 
-       return b;
+       return grom1[addr];
 }
 
 //
 // Write a byte to memory
 //
-void WrMem(uint16 addr, uint8 b)
+void MainWriteMemory(uint16_t address, uint8_t data)
 {
-       extern bool disasm;
-       extern bool charbase;                                                           // Needed for screen. Extern it in it??
-  //extern uint16 sr, ur, xr, yr;            // Needed for tracelog
-  //extern uint16 pcr;
-/*  if ((addr>0x40FF) && (addr<0x4390))
-  {
-    tr << hex << addr << ":" << (int)b;
-    //for(int i=0; i<32; i++)
-    //{
-    //  if (gram1[0x4400+i]<0x10)  tr << "0";
-    //  tr << hex << (uint16)gram1[0x4400+i] << " ";
-    //}
-    tr << endl;
-  }//*/
-#if 1
-       if (addr == 0x4182)
-       {
-               WriteLog("\nWriteMem: CPU #1 writing $%02X to $4182!\n\n", b);
-       }
-#endif
-
-       if (addr == 0x6000)
-               SpawnSound(GAMESOUND, gram1[0x6200], 0);                // Do voice chan 1
-       if (addr == 0x6400)
-               SpawnSound(GAMESOUND, gram1[0x6600], 1);                // Do voice chan 2
-       if (addr == 0x6800)
-               banksw1 = (uint32)b << 13;                                              // Set char data bankswitch base address
-       if (addr > 0x4284 && addr < 0x42A5 && b)
-               SpawnSound(PSGSOUND, addr - 0x4285);                    // Do PSG sound on chans 2, 3
-       if (addr == 0x4380)
-       {
-               SpawnSound(FMSOUND, b);                                                 // Do FM sound on channel 4
-               if (b == 12)
-                       game_over_switch = 240;                                         // Set game over delay...
-       }
-       if (addr < 0x423D || addr > 0x425C)                                     // Protect writes to DSWs
-               gram1[addr] = b;
-       if (addr == 0x8800)
-               charbase = false;                                                               // Char banksw1
-       if (addr == 0x8C00)
-               charbase = true;                                                                // Char banksw2
-       if (addr == 0x8400)                                                                     // Frame go strobe? VBlank acknowledge?
-       {
-               if (refresh_++ == 1)                                                            // 30 Hz...
-               {
-                       BlitChar(screen, chr_rom, gram1);
-                       refresh_ = (refresh2 ? 1 : 0);                          // 60/30 Hz...
-               }
-//Seems they're more regular than this...
-//             irqGoA = true; // Will this work??? no...
-//             cpu1.cpuFlags |= V6809_ASSERT_LINE_IRQ;//wil wok???
-               // IRQ Ack (may also be frame go...
-//             cpu1.cpuFlags &= ~V6809_ASSERT_LINE_IRQ;
-#if 1
-       if (disasm)
-               WriteLog("WriteMem: CPU #1 Acknowledging IRQ...\n", b);
-#endif
-               ClearLineOfCurrentV6809(V6809_ASSERT_LINE_IRQ);
-       }
+       if (address == 0x6000)
+               SpawnSound(GAMESOUND, gram1[0x6200], 0);        // Do voice chan 1
+       if (address == 0x6400)
+               SpawnSound(GAMESOUND, gram1[0x6600], 1);        // Do voice chan 2
+       if (address == 0x6800)
+               banksw1 = (uint32_t)data << 13;                         // Set char data bankswitch base address
+
+       // Memory shared with MCU (CPU #1 only! CPU #2 does not)
+       if ((address >= 0x4000) && (address <= 0x43FF))
+               mcuMem[address - 0x3000] = data;
+       else
+               gram1[address] = data;
+
+       if (address == 0x5FF2)
+               copySprites = true;
+       if (address == 0x8800)
+               charBankSwitch = false;         // Char banksw1
+       if (address == 0x8C00)
+               charBankSwitch = true;          // Char banksw2
+       if (address == 0x8400)                  // Frame go strobe? VBlank acknowledge?
+               ClearLineOfCurrentV6809(V6809_LINE_IRQ); // IRQ Ack
 }
 
 //
-// Read a byte from memory (without touching PC. Not a Fetch!) (2nd processor)
+// Read a byte from memory (2nd processor)
 //
-uint8 RdMemB(uint16 addr)
+uint8_t SubReadMemory(uint16_t address)
 {
-//  extern uint16 cpu2.s, cpu2.u, cpu2.x, cpu2.y;            // Needed for tracelog
-       uint8 b;
-
-       if (addr < 0x8000)
+       if (address < 0x8000)
        {
-               if (addr < 0x2000)
-                       b = gram1[addr + 0x4000];
-               if (addr > 0x1FFF && addr < 0x6000)
-                       b = gram1[addr - 0x2000];
-               if (addr > 0x5FFF)
-                       b = grom3[banksw2 + (addr - 0x6000)];           // Correct?
+               if (address < 0x2000)
+                       return gram1[address + 0x4000];
+               else if ((address >= 0x2000) && (address < 0x6000))
+                       return gram1[address - 0x2000];
+               else if (address >= 0x6000)
+                       return grom3[banksw2 + (address - 0x6000)];
        }
-       else
-               b = grom2[addr];
-
-/*  if ((addr>0x3FFF) && (addr<0x4400))  tr << "R-" << hex << pcx << ": "
-                                        << addr << "-"
-                                        << (int)looking_at_rom
-                                        << " [" << (int)b
-                                        << "] XR:" << xr << " YR:" << yr
-                                        << " SR:" << sr << " UR:" << ur
-                                        << endl; //*/
-       return b;
+
+       return grom2[address];
 }
 
 //
 // Write a byte to memory (2nd processor)
 //
-void WrMemB(uint16 addr, uint8 b)
+void SubWriteMemory(uint16_t address, uint8_t data)
 {
-       extern bool disasm;
-       extern bool charbase;
-  //extern uint16 sr, ur, xr, yr;            // Needed for tracelog
-  //extern uint16 pcr;
-/*  if ((addr>0x00FF) && (addr<0x0390))
-  {
-    tr << hex << addr << ":" << (int)b;
-    //for(int i=0; i<32; i++)
-    //{
-    //  if (gram1[0x4400+i]<0x10)  tr << "0";
-    //  tr << hex << (uint16)gram1[0x4400+i] << " ";
-    //}
-    tr << endl;
-  }//*/
-#if 1
-       if (addr == 0x0182)
+       // Set sprite data bank switch
+       if (address == 0xD803)
+               banksw2 = (uint32_t)(data & 0x03) << 13;
+
+       if (address < 0x2000)
+               gram1[address + 0x4000] = data;
+
+       if ((address >= 0x2000) && (address < 0x6000))
+               gram1[address - 0x2000] = data;
+
+       if (address == 0x1FF2)
+               copySprites = true;
+
+       if (address == 0x8800)
+               ClearLineOfCurrentV6809(V6809_LINE_IRQ); // IRQ Ack
+}
+
+uint8_t MCUReadMemory(uint16_t address)
+{
+       if (address < 0x20)
+               return InternalRegisterRead(address);
+       else if ((address >= 0x1000) && (address <= 0x113F))
+               return ReadPSG(address - 0x1000);
+       else if ((address >= 0x2000) && (address <= 0x2001))
+               return YMReadReg(0);
+       // Various joystick + buttons; all are active low.
+       else if (address == 0x2020)
+               return input1.byte;
+       else if (address == 0x2021)
+               return input2.byte;
+       // This is DSW1 & 2. All switch settings are active low.
+       else if (address == 0x2030)
+               return input4.byte;
+       else if (address == 0x2031)
+               return input5.byte;
+
+       return mcuMem[address];
+}
+
+void MCUWriteMemory(uint16_t address, uint8_t data)
+{
+       static uint8_t ymRegister;
+
+       if (address < 0x20)
        {
-               WriteLog("\nWriteMem: CPU #2 writing $%02X to $0182 ($4182)!\n\n", b);
+               InternalRegisterWrite(address, data);
+               return;
        }
-#endif
-
-// Bah. Dunno if this is accurate or not!
-//     if (addr == 0x8800)
-//             irqGoB = true;                                                                  // Will it work??? no...
-//             cpu2.cpuFlags |= V6809_ASSERT_LINE_IRQ;//wil wok???
-       if (addr == 0x6000)
-               SpawnSound(GAMESOUND, gram1[0x6200], 0);                // Do voice chan 1
-       if (addr == 0x6400)
-               SpawnSound(GAMESOUND, gram1[0x6600], 1);                // Do voice chan 2
-       if (addr > 0x0284 && addr < 0x02A5 && b)
-               SpawnSound(PSGSOUND, addr - 0x0285);                    // Do PSG sound on chans 2, 3
-       if (addr == 0xD803)
-               banksw2 = (uint32)(b & 0x03) << 13;                             // Set sprite data bank switch
-       if (addr == 0x0380)
+       else if (((address >= 0x4000) && (address <= 0xBFFF))
+               || (address >= 0xF000))
+               return;
+       else if ((address >= 0x1000) && (address <= 0x113F))
        {
-               SpawnSound(FMSOUND, b);                                                 // Do FM sound on chan 4
-               if (b == 12)
-                       game_over_switch = 240;                                         // Set game over delay...
+               WritePSG(address - 0x1000, data);
+               return;
        }
-       if (addr < 0x023D || addr > 0x025C)                                     // Protect writes against DSWs
+       else if (address == 0x2000)
        {
-               if (addr < 0x2000)
-                       gram1[addr + 0x4000] = b;
-               if (addr > 0x1FFF && addr < 0x6000)
-                       gram1[addr - 0x2000] = b;
-               if (addr > 0x5FFF)
-                       gram1[addr] = b;
+               ymRegister = data;
+               return;
        }
-       if (addr == 0x8800)
+       else if (address == 0x2001)
        {
-               // IRQ Ack (may also be frame go...)
-//             cpu2.cpuFlags &= ~V6809_ASSERT_LINE_IRQ;
-#if 1
-       if (disasm)
-               WriteLog("WriteMem: CPU #2 Acknowledging IRQ...\n", b);
-#endif
-               ClearLineOfCurrentV6809(V6809_ASSERT_LINE_IRQ);
+               YMWriteReg(0, ymRegister, data);
+               return;
        }
+
+       // RAM is from $0 - $3FFF, $C000 - $EFFF
+       mcuMem[address] = data;
 }
 
-//
-// Display bytes in mem in hex
-//
-void DisplayBytes(uint16 src, unsigned long dst)
+uint8_t V63701ReadPort1(void)
 {
-  uint8 cnt;
-  unsigned long i;
-
-  WriteLog("%04X: ", src);
-  cnt = 0;                               // Init counter...
-  if (src > dst)  dst += 0x10000;        // That should fix the FFFF bug...
-  for(i=src; i<dst; i++)
-  {
-    WriteLog("%02X ", (uint8)(looking_at_rom ? RdMem(i) : RdMemB(i)));
-    cnt++;                               // Bump counter...
-  }
-  for(i=cnt; i<5; i++)                   // Pad the leftover spaces...
-  {
-    WriteLog("   ");
-  }
+//     printf("V63701ReadPort1: Read $%02X...\n", input3.byte);
+       return input3.byte;
 }
 
-// temp crap...
-uint8 Fetch(void) { return RdMem(dpc); }
-uint16 FetchW(void) { return (uint16)((RdMem(dpc) << 8) | RdMem(dpc+1)); }
-uint8 FetchB(void) { return RdMemB(dpc); }
-uint16 FetchWB(void) { return (uint16)((RdMemB(dpc) << 8) | RdMemB(dpc+1)); }
-
-//
-// Decode a 6809 instruction at 'addr'
-//
-void Decode_6809()
+uint8_t V63701ReadPort2(void)
 {
-  uint8 (* DFetch)();           // Decode Fetch() pointer...
-  uint16 (* DFetchW)();          // Decode FetchW() pointer...
-  DFetch  = (looking_at_rom ? Fetch : FetchB);
-  DFetchW = (looking_at_rom ? FetchW : FetchWB);
-
-/*  extern*/ uint16 pcr, pcrB;              // Pull in 'pcr' from '6809.cpp'
-  uint16 pc_save = pcr, pcB_save = pcrB;
-  pcr  = dpc;  pcrB = dpc;
-  uint8 opcode = DFetch();             // Get the opcode ('fetch' cycle)
-  uint8 opcode2, operand;
-  uint16 loperand;
-  uint8 admode = op_mat1[opcode];     // addressing mode
-  char outbuf[80], mnem[6], tmp[30];
-
-  strcpy(mnem, mnemonics[opcode]);  // Copy page 1 opcode
-  if (opcode == 0x10)             // Extended opcode?
-  {
-    opcode2 = DFetch();     // Then get next byte
-    admode = op_mat2[opcode2];    // And use it as index into 'op_mat2'
-    strcpy(mnem, mnemonics2[opcode2]);  // Overwrite mnemonic
-  }
-  if (opcode == 0x11)             // Same as above...
-  {
-    opcode2 = DFetch();
-    admode = op_mat3[opcode2];
-    strcpy(mnem, mnemonics3[opcode2]);  // Overwrite mnemonic
-  }
-  switch(admode)                  // Decode it...
-  {
-    case 0:  // Illegal
-    { sprintf(outbuf, "???");  break; }
-    case 1:  // Zero page
-    { operand = DFetch();   // Get ZP address
-      sprintf(outbuf, "%s $%02X", mnem, operand);
-      break; }
-    case 2:  // Absolute
-    { loperand = DFetchW(); // Get ABS address
-      sprintf(outbuf, "%s $%04X", mnem, loperand);
-      break; }
-    case 3:  // Relative
-    { operand = DFetch();   // Get offset
-      uint16 tmpc = (looking_at_rom ? pcr : pcrB);
-      sprintf(outbuf, "%s $%04X", mnem, tmpc+(int16)(int8)operand);
-      break; }
-    case 4:  // Long Relative
-    { loperand = DFetchW(); // Get long offset
-      uint16 tmpc = (looking_at_rom ? pcr : pcrB);
-      sprintf(outbuf, "%s $%04X", mnem, tmpc+(int16)loperand);
-      break; }
-    case 5:  // Inherent
-    { sprintf(outbuf, "%s ", mnem);
-      break; }
-    case 6:  // Txfr/exchg/push/pull
-    { operand = DFetch();   // Get txfr/exg/push/pull byte
-      if ((opcode == 0x1E) || (opcode == 0x1F))  // Is it TXF/EXG?
-      {
-        sprintf(tmp, "%s,%s", tregs[operand>>4], tregs[operand&0x0F]);
-      }
-      else
-      {
-        tmp[0] = 0;
-        if (operand&0x01)  strcat(tmp, "CC ");
-        if (operand&0x02)  strcat(tmp, "A ");
-        if (operand&0x04)  strcat(tmp, "B ");
-        if (operand&0x08)  strcat(tmp, "DP ");
-        if (operand&0x10)  strcat(tmp, "X ");
-        if (operand&0x20)  strcat(tmp, "Y ");
-        if (operand&0x40)  (((opcode==0x34)||(opcode==0x35))
-                       ? strcat(tmp, "U ") : strcat(tmp, "S "));
-        if (operand&0x80)  strcat(tmp, "PC");
-      }
-      sprintf(outbuf, "%s %s", mnem, tmp);
-      break; }
-    case 7:  // Indexed (the tough one!)
-    { operand = DFetch();   // Get IDX byte
-      uint8 reg = ((operand & 0x60) >> 5), idxind = ((operand & 0x10) >> 4),
-           lo_nyb = (operand & 0x0F),  boff;
-      uint16 woff;
-
-      strcpy(tmp, "??");
-      if (!(operand & 0x80))      // Hi bit set? Then decode 4 bit offset
-      {
-        sprintf(tmp, "(%d),%s", (idxind ? -(16-lo_nyb) : lo_nyb),
-                iregs[reg]);
-      }
-      else   // Add the ($nnnn,R) code dude...
-      {
-        if (idxind)
-        {
-          switch(lo_nyb)
-          {
-            case 1:   sprintf(tmp, "(,%s++)", iregs[reg]);  break;
-            case 3:   sprintf(tmp, "(,--%s)", iregs[reg]);  break;
-            case 4:   sprintf(tmp, "(,%s)", iregs[reg]);  break;
-            case 5:   sprintf(tmp, "(B,%s)", iregs[reg]);  break;
-            case 6:   sprintf(tmp, "(A,%s)", iregs[reg]);  break;
-            case 8:
-            { boff = DFetch();  sprintf(tmp, "($%02X,%s)", boff,
-                                       iregs[reg]);  break; }
-            case 9:
-            { woff = DFetchW();  sprintf(tmp, "($%04X,%s)", woff,
-                                        iregs[reg]);  break; }
-            case 11:  sprintf(tmp, "(D,%s)", iregs[reg]);  break;
-            case 12:
-            { boff = DFetch();  sprintf(tmp, "($%02X,PC)", boff);  break; }
-            case 13:
-            { woff = DFetchW();  sprintf(tmp, "($%04X,PC)", woff);  break; }
-            case 15:
-            { woff = DFetchW();  sprintf(tmp, "[$%04X]", woff);  break; }
-            default:  strcpy(tmp, "??");
-          }
-        }
-        else
-        {
-          switch(lo_nyb)
-          {
-            case 0:   sprintf(tmp, ",%s+", iregs[reg]);  break;
-            case 1:   sprintf(tmp, ",%s++", iregs[reg]);  break;
-            case 2:   sprintf(tmp, ",-%s", iregs[reg]);  break;
-            case 3:   sprintf(tmp, ",--%s", iregs[reg]);  break;
-            case 4:   sprintf(tmp, ",%s", iregs[reg]);  break;
-            case 5:   sprintf(tmp, "(B),%s", iregs[reg]);  break;
-            case 6:   sprintf(tmp, "(A),%s", iregs[reg]);  break;
-            case 8:
-            { boff = DFetch();  sprintf(tmp, "($%02X),%s", boff,
-                                       iregs[reg]);  break; }
-            case 9:
-            { woff = DFetchW();  sprintf(tmp, "($%04X),%s", woff,
-                                       iregs[reg]);  break; }
-            case 11:  sprintf(tmp, "(D),%s", iregs[reg]);  break;
-            case 12:
-            { boff = DFetch();  sprintf(tmp, "($%02X),PC", boff);  break; }
-            case 13:
-            { woff = DFetchW();  sprintf(tmp, "($%04X),PC", woff);  break; }
-            default:  strcpy(tmp, "??");
-          }
-        }
-      }
-      sprintf(outbuf, "%s %s", mnem, tmp);
-      break; }
-    case 8:  // Immediate
-    { operand = DFetch();   // Get IMM byte
-      sprintf(outbuf, "%s #$%02X", mnem, operand);
-      break; }
-    case 9:  // Long Immediate
-    { loperand = DFetchW(); // Get IMM word
-      sprintf(outbuf, "%s #$%04X", mnem, loperand);
-      break; }
-  }
-  DisplayBytes(dpc, (looking_at_rom ? pcr : pcrB));  // Show bytes
-  WriteLog(outbuf); WriteLog("\n");     // display opcode & addressing, etc
-  dpc = (looking_at_rom ? pcr : pcrB);  // Advance debug PC
-  pcr = pc_save;  pcrB = pcB_save;  // Restore PCs
+       return 0xFF;
 }
 
-//
-// Convert hex to dec
-//
-uint16 htod(char *str)
+void V63701WritePort1(uint8_t data)
 {
-  uint16 value = 0;
-  int len = strlen(str);
-
-  for(int i=0; i<len; i++)
-  {
-    if (str[i]>='0' && str[i]<='9')
-    {
-      value = (value<<4) | (unsigned)(str[i]-'0');
-    }
-    if (str[i]>='a' && str[i]<='f')
-    {
-      value = (value<<4) | (unsigned)(str[i]-'a')+10;
-    }
-    if (str[i]>='A' && str[i]<='F')
-    {
-      value = (value<<4) | (unsigned)(str[i]-'A')+10;
-    }
-  }
-  return(value);
+//     printf("V63701WritePort1: Wrote $%02X...\n", data);
 }
 
-//
-// Load 32K file into ROM image space
-//
-bool Load32KImg(char * filename, uint16 address)
+void V63701WritePort2(uint8_t data)
 {
-  ifstream ff;
-  char ch;
-
-  ff.open(filename, ios::binary | ios::in);  // Open 'da file...
-  if (ff)
-  {
-    for(long i=0; i<32768; i++)                // Read it in...
-    {
-      ff.get(ch);
-      grom[address+i] = ch;
-    }
-    ff.close();                                // Close 'da file...
-  }
-  return(ff);
+//     printf("V63701WritePort2: Wrote $%02X...\n", data);
 }
 
 //
 // Generic Load file into image space
 // (No error checking performed!  Responsibility of caller!)
 //
-bool LoadImg(const char * filename, uint8 * mem, uint32 address, uint32 length)
+bool LoadImg(const char * filename, uint8_t * mem, uint32_t address, uint32_t length)
 {
-  ifstream ff;
-  char path[80];
-  char ch;
-
-  strcpy(path, "./ROMs/");
-  strcat(path, filename);
-//  ff.open(filename, ios::binary | ios::in);  // Open 'da file...
-  ff.open(path, ios::binary | ios::in);       // Open 'da file...
-  if (ff)
-  {
-    for(uint32 i=0; i<length; i++)             // Read it in...
-    {
-      ff.get(ch);
-      mem[address+i] = ch;
-    }
-    ff.close();                               // Close 'da file...
-  }
-  return(ff);
+       char path[128];
+
+       strcpy(path, "./ROMs/");
+       strcat(path, filename);
+       FILE * file = fopen(path, "rb");
+
+       if (!file)
+       {
+               printf("Could not open file \"%s\"!\n", filename);
+               return false;
+       }
+
+       size_t ignored = fread(&mem[address], 1, length, file);
+       fclose(file);
+
+       return true;
 }
 
 //
@@ -732,605 +281,560 @@ bool LoadImg(const char * filename, uint8 * mem, uint32 address, uint32 length)
 //
 bool ReadColorPROMs(void)
 {
-  fstream ff1, ff2;
-//  uint8 ch;
-  char ch;
-  extern uint8 palette[768];     // Screen physical palette
-  extern uint8 ccolor[256][8];   // Character color PROM values
-  extern uint8 scolor[128][16];  // Sprite color PROM values
-
-  ff1.open("./ROMs/"PROM3, ios::binary|ios::in);
-  if (ff1)
-  {
-    for(int i=0; i<256; i++) // Load char pallete with PROM values
-    {
-      for(int j=0; j<8; j++)
-      {
-        ff1.get(ch);
-        ccolor[i][j] = (uint8)ch;
-      }
-    }
-    ff1.close();
-  }
-  ff1.open("./ROMs/"PROM4, ios::binary|ios::in);
-  if (ff1)
-  {
-    for(int i=0; i<128; i++) // Load sprite pallete with PROM values
-    {
-      for(int j=0; j<16; j++)
-      {
-        ff1.get(ch);
-        scolor[i][j] = (uint8)ch;
-      }
-    }
-    ff1.close();
-  }
-
-  ff1.open("./ROMs/"PROM1, ios::binary|ios::in);
-  ff2.open("./ROMs/"PROM2, ios::binary|ios::in);
-  if (ff1)    // If open was successful...
-  {
-    for(int i=0; i<768; i+=3)
-    {
-      ff1.get(ch);
-      palette[i]   = (uint8)(ch&0x0F);
-      palette[i+1] = (uint8)(ch>>4);
-      ff2.get(ch);
-      palette[i+2] = (uint8)ch;
-    }
-
-    // Do palette stretching here... I.e. add 0 to hinyb 0, 1 to hinyb 1, etc.
-
-    for(int i=0; i<768; i++)
-      palette[i] = ((palette[i]<<4)&0xF0) | (palette[i]&0x0F);
-
-    ff1.close();
-    ff2.close();
-  }
-  return ff1;
-}
+       FILE * file1 = fopen("./ROMs/" PROM3, "rb");
 
-//
-// Unpack font data
-//
-bool UnpackFonts(void)
-{
-//  uint8 b1, b2, b3;
-  char b1, b2, b3;
-  fstream f1, f2;
-  //0x4000 $800 chars
-  f1.open("./ROMs/"ROM7, ios::binary | ios::in);
-  f2.open("./ROMs/"ROM8, ios::binary | ios::in);
-  if ((!f1) || (!f2))  return false;  // Return if not found...
-  for(long i=0; i<0x40000; i+=64)
-  {
-    for(int j=0; j<64; j+=8)
-    {
-      f1.get(b1);  f1.get(b2);  f2.get(b3);
-      b3 ^= 0xFF; // Invert top data...
-      chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
-      chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
-      chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
-      chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
-      chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
-      chr_rom[i+j+5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
-      chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
-      chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
-    }
-  }
-  f1.close();
-  f2.close();
-
-  f1.open("./ROMs/"ROM5, ios::binary | ios::in);
-  f2.open("./ROMs/"ROM6, ios::binary | ios::in);
-  for(long i=0x40000; i<0x60000; i+=64)
-  {
-    for(int j=0; j<64; j+=8)
-    {
-      f1.get(b1);  f1.get(b2);  f2.get(b3);
-      b3 ^= 0xFF;                             // Invert top data
-      chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
-      chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
-      chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
-      chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
-      chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
-      chr_rom[i+j+5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
-      chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
-      chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
-    }
-  }
-  f1.close();
-  f2.close();
-  return true;                                // Made it!
-}
+       if (file1)
+       {
+               for(int i=0; i<256; i++) // Load char pallete with PROM values
+                       for(int j=0; j<8; j++)
+                               ccolor[i][j] = (uint8_t)fgetc(file1);
 
-//
-// Get length of sample from WAV format
-//
-uint32 GetWAVLength(fstream &file)
-{
-       char ch;
-       uint32 len;
+               fclose(file1);
+       }
+
+       file1 = fopen("./ROMs/" PROM4, "rb");
+
+       if (file1)
+       {
+               for(int i=0; i<128; i++) // Load sprite pallete with PROM values
+                       for(int j=0; j<16; j++)
+                               scolor[i][j] = (uint8_t)fgetc(file1);
 
-       file.ignore(16);                                                                        // Skip header BS
+               fclose(file1);
+       }
+
+       file1 = fopen("./ROMs/" PROM1, "rb");
+       FILE * file2 = fopen("./ROMs/" PROM2, "rb");
 
-       for(int i=0; i<2; i++)
+       // If open was successful...
+       if (file1 && file2)
        {
-               file.get(ch);  len = (int)(uint8)ch;
-               file.get(ch);  len |= (int)(uint8)ch << 8;
-               file.get(ch);  len |= (int)(uint8)ch << 16;
-               file.get(ch);  len |= (int)(uint8)ch << 24;
+               // Palette is 12-bit RGB, we stretch it to 24-bit
+               for(int i=0; i<256; i++)
+               {
+                       uint8_t c1 = fgetc(file1);
+                       uint8_t c2 = fgetc(file2);
+                       uint8_t r = (uint8_t)c1 & 0x0F;
+                       uint8_t g = (uint8_t)c1 >> 4;
+                       uint8_t b = (uint8_t)c2;
+                       palette[i] = 0xFF000000 | (b << 20) | (b << 16) | (g << 12) | (g << 8) | (r << 4) | r;
+               }
 
-               file.ignore(len + 4);                                                   // Skip intermediate data
+               fclose(file1);
+               fclose(file2);
        }
 
-       file.get(ch);  len = (int)(uint8)ch;                                    // & finally get length of data
-       file.get(ch);  len |= (int)(uint8)ch << 8;
-       file.get(ch);  len |= (int)(uint8)ch << 16;
-       file.get(ch);  len |= (int)(uint8)ch << 24;
+       // PROM5 has the following in it (tile address decoder):
+       // 00:  00 20 40 60  02 22 42 62  04 24 44 64  06 26 46 66
+       // 10:  88 A8 C8 E8  8A AA CA EA  8C AC CC EC  8E AE CE EE
 
-       return len;
+       if (!file1)
+       {
+               printf("Could not open PROM files!\n");
+               return false;
+       }
+
+       return true;
 }
 
 //
-// Load PSG samples from disk
+// Unpack font data
 //
-void LoadPSGs(void)
+bool UnpackFonts(void)
 {
-       char file[40];
-       char ch;
-       uint32 len;
+       // 0x4000 $800 chars
+       FILE * file1 = fopen("./ROMs/" ROM7, "rb");
+       FILE * file2 = fopen("./ROMs/" ROM8, "rb");
 
-       for(int i=0; i<16; i++)
+       if (!file1 || !file2)
        {
-               fstream fp;
-
-               psg_adrs[i] = NULL;                                                             // Zero out pointer
-               sprintf(file, "./sounds/psg%i.wav", i);                 // Create filename
-
-               fp.open(file, ios::binary | ios::in);                   // Attempt to open it...
+               printf("Could not open either " ROM7 " or " ROM8 "!\n");
+               return false;
+       }
 
-               if (fp)
+       for(long i=0; i<0x40000; i+=64)
+       {
+               for(int j=0; j<64; j+=8)
                {
-                       len = GetWAVLength(fp);                                         // Get WAV data length...
+                       uint8_t b1 = (uint8_t)fgetc(file1);
+                       uint8_t b2 = (uint8_t)fgetc(file1);
+                       uint8_t b3 = (uint8_t)fgetc(file2) ^ 0xFF;
+                       charROM[i + j + 0] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
+                       charROM[i + j + 1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
+                       charROM[i + j + 2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
+                       charROM[i + j + 3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
+                       charROM[i + j + 4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
+                       charROM[i + j + 5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
+                       charROM[i + j + 6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
+                       charROM[i + j + 7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
+               }
+       }
 
-                       psg_adrs[i] = new uint8[len];                           // Attempt to allocate space...
+       fclose(file1);
+       fclose(file2);
 
-                       if (psg_adrs[i] != NULL)
-                       {
-                               for(int j=0; j<(signed)len; j++)
-                               {
-                                       fp.get(ch);
-                                       psg_adrs[i][j] = ch;                            // & load it in...
-                               }
+       file1 = fopen("./ROMs/" ROM5, "rb");
+       file2 = fopen("./ROMs/" ROM6, "rb");
 
-                               psg_lens[i] = len;
-//                             cout << "Found sample file: " << file << "\t[Length: " << dec << len << "]" << endl;
-                               printf("Found sample file: %s\t[Length: %u]\n", file, len);
-                       }
+       if (!file1 || !file2)
+       {
+               printf("Could not open either " ROM5 " or " ROM6 "!\n");
+               return false;
+       }
 
-                       fp.close();
+       for(long i=0x40000; i<0x60000; i+=64)
+       {
+               for(int j=0; j<64; j+=8)
+               {
+                       uint8_t b1 = (uint8_t)fgetc(file1);
+                       uint8_t b2 = (uint8_t)fgetc(file1);
+                       uint8_t b3 = (uint8_t)fgetc(file2) ^ 0xFF;
+                       charROM[i + j + 0] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
+                       charROM[i + j + 1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
+                       charROM[i + j + 2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
+                       charROM[i + j + 3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
+                       charROM[i + j + 4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
+                       charROM[i + j + 5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
+                       charROM[i + j + 6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
+                       charROM[i + j + 7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
                }
        }
+
+       fclose(file1);
+       fclose(file2);
+
+       return true;
 }
 
-//
-// Load FM samples from disk
-//
-void LoadFMs(void)
+void SaveThunderState(const char * filename)
 {
-       char file[200];
-       char ch;
-       uint32 len;
+       WriteLog("Main: Saving Thunder state...\n");
+       FILE * file = fopen(filename, "wb");
 
-       for(int i=0; i<14; i++)
+       if (!file)
        {
-               fstream fp;
+               WriteLog("Could not open file \"%s\" for writing!\n", filename);
+               return;
+       }
 
-               fm_adrs[i] = NULL;                                                              // Zero out pointer
-               sprintf(file, "./sounds/fm%i.wav", i);                  // Create filename
+       // Write out header
+       size_t ignored = fwrite(stateHeader, 1, 19, file);
 
-               fp.open(file, ios::binary | ios::in);                   // Attempt to open it...
+       // Write out CPUs' state
+       ignored = fwrite(&cpu1, 1, sizeof(cpu1), file);
+       ignored = fwrite(&cpu2, 1, sizeof(cpu2), file);
+       ignored = fwrite(&mcu, 1, sizeof(mcu), file);
 
-               if (fp)
-               {
-                       len = GetWAVLength(fp);                                         // Get WAV length...
+       // Write out main memory
+       ignored = fwrite(gram1, 1, 0x10000, file);
+       ignored = fwrite(mcuMem, 1, 0x10000, file);
 
-                       fm_adrs[i] = new uint8[len];                                    // Attempt to allocate space...
+       // Write out state variables
+       WriteLong(file, banksw1);
+       WriteLong(file, banksw2);
+       fputc((uint8_t)copySprites, file);
+       fputc(input1.byte, file);
+       fputc(input2.byte, file);
+       fputc(input3.byte, file);
+       fputc(input4.byte, file);
+       fputc(input5.byte, file);
 
-                       if (fm_adrs[i] != NULL)
-                       {
-                               for(int j=0; j<(signed)len; j++)
-                               {
-                                       fp.get(ch);
-                                       fm_adrs[i][j] = ch;                                     // & load it in...
-                               }
+       PSGSaveState(file);
+       YMSaveState(file);
 
-                               fm_lens[i] = len;
-//                             cout << "Found sample file: " << file << " [Length: " << dec << len << "]" << endl;
-                               printf("Found sample file: %s\t[Length: %u]\n", file, len);
-                       }
-
-                       fp.close();
-               }
-       }
+       fclose(file);
 }
 
-//
-// Main loop
-//
-int main(int argc, char * argv[])
+bool LoadThunderState(const char * filename)
 {
-       InitLog("thunder.log");
+       WriteLog("Main: Loading Thunder state...\n");
+       FILE * file = fopen(filename, "rb");
 
-extern bool disasm;    // From 'V6809.CPP'
-       extern bool charbase;                                           // From 'SCREEN.CPP'
-       charbase = false;
-
-  char lbuff[80];
-  fstream ff;                       // Declare fstream without file hooks...
-  bool brk = false, brk2 = false;   // Breakpoint set flag
-  uint16 brkpnt, brkpnt2;             // Where the breakpoint is...
-  bool running;                     // CPU running state flag...
-  bool self_test = false;           // Self-test switch
-  bool scr_type = false;            // false=chars, true=pixels
-  uint16 debounce = 0;                // Key de-bounce counter
-  uint16 fire_debounce = 0;           // Fire button debounce counter
-//  bool refresh2 = true;             // Default to 60 Hz...
-  uint8 x;                           // General placeholder...
-  bool active = true;                                          // Program running flag
-
-  SDL_Event event;                                                             // SDL "event"
-  extern uint8 palette[768];                                   // Screen physical palette
-  uint32 ticks, oldTicks;
-
-       cout << endl << "THUNDER v"THUNDER_VERSION" ";
-       cout << "by James Hammons" << endl;
-       cout << "Serial #20090723 / Prerelease" << endl;
-       cout << "(C) 2003, 2009 Underground Software" << endl << endl;
-
-       cout << "This emulator is free software. If you paid for it you were RIPPED OFF"
-               << endl << endl;
-
-       cout << "Initializing SDL..." << endl;
-
-       if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER) < 0)
+       if (!file)
        {
-               cout << "Couldn't initialize SDL: " << SDL_GetError() << endl;
-               return -1;
+               WriteLog("Could not open file \"%s\" for reading!\n", filename);
+               return false;
        }
 
-       SDL_WM_SetCaption("Thunder v"THUNDER_VERSION" ", "Thunder");
-
-       keys = SDL_GetKeyState(NULL);                           // Get the SDL keyboard matrix
+       uint8_t buffer[19];
+       size_t ignored = fread(buffer, 1, 19, file);
 
-  gram = gram1;  grom = grom1;           // Needed only for debugger
+       // Sanity check...
+       if (memcmp(buffer, stateHeader, 19) != 0)
+       {
+               fclose(file);
+               WriteLog("File \"%s\" is not a valid Thunder save state file!\n", filename);
+               return false;
+       }
 
-  for(long i=0; i<0x10000; i++)
-  {
-    gram[i] = 0;  grom[i] = 0;           // Zero out memory
-    gram2[i] = 0;  grom2[i] = 0;
-  }
-  game_over_switch = 0;   // Init game over delay
-//  cpu1.a = 0; cpu1.b = 0; cpu1.cc = 0; cpu1.dp = 0; cpu1.x = 0; cpu1.y = 0; cpu1.s = 0; ur = 0; cpu1.pc = 0;
+       // Read CPUs' state
+       ignored = fread(&cpu1, 1, sizeof(cpu1), file);
+       ignored = fread(&cpu2, 1, sizeof(cpu2), file);
+       ignored = fread(&mcu, 1, sizeof(mcu), file);
 
-  cout << "Loading ROMs..." << endl;
-//  LoadCMOS();                            // Load CMOS at $CC00-$CFFF
-  if (!ReadColorPROMs())                   // Load virtual PROMs
-  { cout << "Could not open PROM files!" << endl;  return -1; }
+       // Read main memory
+       ignored = fread(gram1, 1, 0x10000, file);
+       ignored = fread(mcuMem, 1, 0x10000, file);
 
-  if (!LoadImg(ROM1, grom1, 0x8000, 0x8000)) // Load $8000-$FFFF 1st ROM
-  { cout << "Could not open file '" << ROM1 << "'!" << endl;  return -1; }
+       // Read in state variables
+       banksw1 = ReadLong(file);
+       banksw2 = ReadLong(file);
+       copySprites = (bool)fgetc(file);
+       input1.byte = fgetc(file);
+       input2.byte = fgetc(file);
+       input3.byte = fgetc(file);
+       input4.byte = fgetc(file);
+       input5.byte = fgetc(file);
 
-  if (!LoadImg(ROM2, grom2, 0x8000, 0x8000)) // Load $8000-$FFFF 2nd ROM
-  { cout << "Could not open file '" << ROM2 << "'!" << endl;  return -1; }
+       PSGLoadState(file);
+       YMLoadState(file);
 
-  if (!LoadImg(ROM3, grom3, 0, 0x8000))      // Load 3rd ROM into its own space
-  { cout << "Could not open file '" << ROM3 << "'!" << endl;  return -1; }
+       fclose(file);
 
-  if (!LoadImg(ROM4, grom4, 0, 0x8000))      // Load 4rd ROM into its own space
-  { cout << "Could not open file '" << ROM4 << "'!" << endl;  return -1; }
+       // Make sure things are in a sane state before execution :-P
+       cpu1.RdMem = MainReadMemory;
+       cpu1.WrMem = MainWriteMemory;
 
-  if (!LoadImg(ROM17, data_rom, 0,       0x10000))  // Load 17th ROM
-  { cout << "Could not open file '" << ROM17 << "'!" << endl;  return -1; }
+       cpu2.RdMem = SubReadMemory;
+       cpu2.WrMem = SubWriteMemory;
 
-  if (!LoadImg(ROM18, data_rom, 0x10000, 0x10000))  // Load 18th ROM
-  { cout << "Could not open file '" << ROM18 << "'!" << endl;  return -1; }
+       mcu.RdMem = MCUReadMemory;
+       mcu.WrMem = MCUWriteMemory;
 
-  if (!LoadImg(ROM19, data_rom, 0x20000, 0x10000))  // Load 19th ROM
-  { cout << "Could not open file '" << ROM19 << "'!" << endl;  return -1; }
+       return true;
+}
 
-  if (!LoadImg(ROM20, data_rom, 0x30000, 0x10000))  // Load 20th ROM
-  { cout << "Could not open file '" << ROM20 << "'!" << endl;  return -1; }
+//
+// Main loop
+//
+int main(int argc, char * argv[])
+{
+       InitLog("thunder.log");
 
-  if (!LoadImg(ROM9,  spr_rom, 0,       0x10000))   // Load 9th ROM
-  { cout << "Could not open file '" << ROM9 << "'!" << endl;  return -1; }
+       bool running;                                   // CPU running state flag...
+       SDL_Event event;                                // SDL "event"
+       uint32_t ticks, oldTicks;
+       uint8_t frameTickCount = 0;
 
-  if (!LoadImg(ROM10, spr_rom, 0x10000, 0x10000))   // Load 10th ROM
-  { cout << "Could not open file '" << ROM10 << "'!" << endl;  return -1; }
+       printf("THUNDER v" THUNDER_VERSION " by James Hammons\n");
+       printf("Serial #20230113 / Prerelease\n");
+       printf("© 2003, 2023 Underground Software\n\n");
+       printf("This emulator is free software. If you paid for it you were RIPPED OFF\n\n");
 
-  if (!LoadImg(ROM11, spr_rom, 0x20000, 0x10000))   // Load 11th ROM
-  { cout << "Could not open file '" << ROM11 << "'!" << endl;  return -1; }
+//     SDL_WM_SetCaption("Thunder v"THUNDER_VERSION" ", "Thunder");
 
-  if (!LoadImg(ROM12, spr_rom, 0x30000, 0x10000))   // Load 12th ROM
-  { cout << "Could not open file '" << ROM12 << "'!" << endl;  return -1; }
+       printf("Loading ROMs...\n");
 
-  if (!LoadImg(ROM13, spr_rom, 0x40000, 0x10000))   // Load 13th ROM
-  { cout << "Could not open file '" << ROM13 << "'!" << endl;  return -1; }
+       if (!ReadColorPROMs())
+               return -1;
 
-  if (!LoadImg(ROM14, spr_rom, 0x50000, 0x10000))   // Load 14th ROM
-  { cout << "Could not open file '" << ROM14 << "'!" << endl;  return -1; }
+       // Load $8000-$FFFF 1st ROM
+       if (!LoadImg(ROM1, grom1, 0x8000, 0x8000))
+               return -1;
 
-  if (!LoadImg(ROM15, spr_rom, 0x60000, 0x10000))   // Load 15th ROM
-  { cout << "Could not open file '" << ROM15 << "'!" << endl;  return -1; }
+        // Load $8000-$FFFF 2nd ROM
+       if (!LoadImg(ROM2, grom2, 0x8000, 0x8000))
+               return -1;
 
-  if (!LoadImg(ROM16, spr_rom, 0x70000, 0x10000))   // Load 16th ROM
-  { cout << "Could not open file '" << ROM16 << "'!" << endl;  return -1; }
+       // Load 3rd ROM into its own space
+       if (!LoadImg(ROM3, grom3, 0, 0x8000))
+               return -1;
 
-  if (!LoadImg(ROM21, voice_rom, 0, 0x10000))  // Load 21st ROM
-  { cout << "Could not open file '" << ROM21 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM17, data_rom, 0,       0x10000))
+               return -1;
 
-  if (!LoadImg(ROM22, voice_rom, 0x10000, 0x10000))  // Load 22nd ROM
-  { cout << "Could not open file '" << ROM22 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM18, data_rom, 0x10000, 0x10000))
+               return -1;
 
-  if (!UnpackFonts())                         // Load 5, 6, 7, 8th ROMs
-  {
-    cout << "Could not open font files!" << endl;
-    return -1;
-  }
+       if (!LoadImg(ROM19, data_rom, 0x20000, 0x10000))
+               return -1;
 
-       // Load samples if they're there...
-       LoadPSGs();
-       LoadFMs();
+       if (!LoadImg(ROM20, data_rom, 0x30000, 0x10000))
+               return -1;
 
-  // Quick 'n' Dirty voice dump (sound 0x0E)
-/*  uint32 adc = (voice_rom[26]<<8) | voice_rom[27];
-  bool doneWitIt = false;
-  int crh = 0;
-  while (!doneWitIt)
-  {
-    if (voice_rom[adc] < 0x10)  tr << "0";
-    tr << hex << (int)voice_rom[adc] << " ";
-    if (crh++ > 24)  { crh = 0;  tr << endl; }
-    if ((voice_rom[adc] == 0xFF) && (voice_rom[adc-1] != 0x00))
-      doneWitIt = true;
-    adc++;
-  }//*/
+       if (!LoadImg(ROM9,  spr_rom, 0,       0x10000))
+               return -1;
 
-       // Set up V6809 execution contexts
+       if (!LoadImg(ROM10, spr_rom, 0x10000, 0x10000))
+               return -1;
 
-       memset(&cpu1, 0, sizeof(V6809REGS));
-       cpu1.RdMem = RdMem;
-       cpu1.WrMem = WrMem;
-       cpu1.cpuFlags |= V6809_ASSERT_LINE_RESET;
+       if (!LoadImg(ROM11, spr_rom, 0x20000, 0x10000))
+               return -1;
 
-       memset(&cpu2, 0, sizeof(V6809REGS));
-       cpu2.RdMem = RdMemB;
-       cpu2.WrMem = WrMemB;
-       cpu2.cpuFlags |= V6809_ASSERT_LINE_RESET;
+       if (!LoadImg(ROM12, spr_rom, 0x30000, 0x10000))
+               return -1;
 
-       bool firstTime = true;                                                          // kludge...
+       if (!LoadImg(ROM13, spr_rom, 0x40000, 0x10000))
+               return -1;
 
-WriteLog("About to go to the main loop...\n");
-       while (active)
-       {
-               cout << ">";
-               if (firstTime)
-               {
-                       firstTime = false;                                                      // crappy kludge...
-                       lbuff[0] = 'r';
-                       lbuff[1] = 0;
-               }
-               else
-                       cin >> lbuff;
+       if (!LoadImg(ROM14, spr_rom, 0x50000, 0x10000))
+               return -1;
 
-               if (lbuff[0] == 'd')
-               {
-                       if (lbuff[1] != 0)
-                       {
-                               lbuff[0] = 32;
-                               dpc = htod(lbuff);
-                       }
-                       printf("%04X: ", dpc);
-                       uint16 pc_save = cpu1.pc, pcB_save = cpu2.pc;
-                       cpu1.pc = dpc;  cpu2.pc = dpc;
-                       for(int i=0; i<16; i++)
-                               printf("%02X ", (looking_at_rom ? Fetch() : FetchB()));
-                       cout << " ";
-                       cpu1.pc = dpc;  cpu2.pc = dpc;
-                       for(int i=0; i<16; i++)
-                       {
-                               uint8 a = (looking_at_rom ? Fetch() : FetchB());
-                               if (a<10)             cout << (char)(a+48);
-                               if ((a>9) && (a<37))  cout << (char)(a+55);
-                               if (a>36)             cout << ".";
-                       }
-                       cout << endl;
-                       dpc = (looking_at_rom ? cpu1.pc : cpu2.pc);
-                       cpu1.pc = pc_save;  cpu2.pc = pcB_save;
-               }
-               else if (lbuff[0] == 'e')
-               {
-                       if (lbuff[1] != 0)
-                       {
-                               lbuff[0] = 32;
-                               dpc = htod(lbuff);
-                       }
-                       printf("%04X: ", dpc);
-                       for(int i=0; i<16; i++)  printf("%02X ", (uint8)gram[dpc++]);
-                       cout << endl;
-               }
-               else if (lbuff[0] == 'l')
-               {
-                       if (lbuff[1] != 0)
-                       {
-                               lbuff[0] = 32;
-                               dpc = htod(lbuff);
-                       }
-                       for(int i=0; i<23; i++)
-                               Decode_6809();
-               }
-               else if (lbuff[0] == 't')
-               {
-                       if (lbuff[1] != 0)
-                       {
-                               lbuff[0] = 32;
-                               dpc = htod(lbuff);
-                       }
-                       if (looking_at_rom)
-                       {
-                               cpu1.pc = dpc;
-                               Decode_6809();
-                               Execute6809(&cpu1, 1);
-                               dpc = cpu1.pc;
-                               printf("A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
-                                       cpu1.a, cpu1.b, cpu1.cc, cpu1.dp, cpu1.x, cpu1.y, cpu1.s, cpu1.u, cpu1.pc);
-                               cout << " iclock=" << cpu1.clock << endl;
-                       }
-                       else
-                       {
-                               cpu2.pc = dpc;
-                               Decode_6809();
-                               Execute6809(&cpu2, 1);
-                               dpc = cpu2.pc;
-                               printf("A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
-                                       cpu2.a, cpu2.b, cpu2.cc, cpu2.dp, cpu2.x, cpu2.y, cpu2.s, cpu2.u, cpu2.pc);
-                               cout << " iclock=" << cpu2.clock << endl;
-                       }
-               }
-               else if ((lbuff[0] == 'r') || (lbuff[0] == 'c')) // Run/continue...
-               {
-WriteLog("Executing 'run' command...\n");
-                       uint32 my_clock = 0;
-                       running = true;                                                         // Set running status...
-                       trace1 = false;
-                       SetRefreshRate(refresh2);                                       // Tell GUI our refresh rate
-      //for(uint16 i=0; i<0x8000; i++)  gram2[i] = grom3[i]; //Temp
-
-                       if (lbuff[0] == 'r')                                            // If run, then reset CPUs
-                       {
-WriteLog("Executing secondary 'run' command...\n");
-#if 1
-                               // This is data that is supposed to come from the MCU... So that's why it hangs
-                               gram1[0x4182] = 0xA6;          // Temp kludge
-                               gram1[0x4184] = 0xA6;
-                               gram1[0x4183] = 0x00;          // More of the same
-                               gram1[0x4185] = 0x00;
-#endif
-                               banksw1 = 0;                   // Will this work?
-                               banksw2 = 0;
-//        iclock = 0;                // Reset instr clock #1...
-                               InitGUI();                 // Reset # of coins
+       if (!LoadImg(ROM15, spr_rom, 0x60000, 0x10000))
+               return -1;
 
-#if 0
-                               cpu1.pc = ((grom1[0xFFFE]<<8) | grom1[0xFFFF]); // Reset 6809 #1
-                               if (lbuff[1] != 0)
-                               {
-                               lbuff[0] = 32;  cpu1.pc = htod(lbuff);
-                               }
-                               else  cpu1.cc = 0xFF;                         // Set CC register
+       if (!LoadImg(ROM16, spr_rom, 0x70000, 0x10000))
+               return -1;
 
-                               cpu2.pc = ((grom2[0xFFFE]<<8) | grom2[0xFFFF]); // Reset 6809 #2
-                               cpu2.cc = 0xFF;                              // Set CC register
-                               while(iclock < 8000)  // was 17000, 20000, 5000
-                               {
-                               Execute6809(&cpu1, 1);  Execute6809(&cpu2, 1);
-                               }
-#endif
-#if 0
-WriteLog("--> CPU clock #1: %u\n", cpu1.clock);
-                               // Will *this* help video sync? NO
-                               while (cpu1.clock < 8000)                               // was 17000, 20000, 5000
-                               {
-                                       Execute6809(&cpu1, 1);
-                                       Execute6809(&cpu2, 1);
-                               }
-#endif
-                       }
+       if (!LoadImg(ROM21, voice_rom, 0, 0x10000))
+               return -1;
 
-WriteLog("About to set up screen...\n");
-//      if (!SetVESA2())  running = false;        // Set up screen
-                       // Set up screen (windowed)
-                       screen = SDL_SetVideoMode(640, 480, 8, SDL_SWSURFACE); //video_bpp, videoflags);
-                       if (screen == NULL)
-                       {
-                               cout << "Failed to initialize screen!" << endl;
-                               running = false;
-                       }
+       if (!LoadImg(ROM22, voice_rom, 0x10000, 0x10000))
+               return -1;
 
-                       SDL_Color colors[256];
-                       for(int i=0; i<256; i++)
-                       {
-                               colors[i].r = palette[i*3+0];
-                               colors[i].g = palette[i*3+1];
-                               colors[i].b = palette[i*3+2];
-                       }
-                       SDL_SetPalette(screen, SDL_LOGPAL | SDL_PHYSPAL, colors, 0, 256);
+       // Load 5, 6, 7, 8th ROMs
+       if (!UnpackFonts())
+               return -1;
 
-#if 0
-       // This confirms that we're getting video to the screen...
-       SDL_LockSurface(screen);
+       // Load MCU program + data
+       if (!LoadImg(MCUROM, mcuMem, 0xF000, 0x1000))
+               return -1;
 
-       uint8 pixel = 0;
-       uint8 * pixels = (uint8 *)(screen->pixels);
+       if (!LoadImg(ROM4, mcuMem, 0x4000, 0x8000))
+               return -1;
 
-       for(uint32 y=0; y<480; y++)
-               for(uint32 x=0; x<640; x++)
-                       pixels[(y * 640) + x] = pixel++;
+       // Set up V6809, V63701 execution contexts
+       memset(&cpu1, 0, sizeof(V6809REGS));
+       cpu1.RdMem = MainReadMemory;
+       cpu1.WrMem = MainWriteMemory;
+       cpu1.cpuFlags |= V6809_LINE_RESET;
 
-       SDL_UnlockSurface(screen);
-       SDL_UpdateRect(screen, 0, 0, 0, 0);
-#endif
+       memset(&cpu2, 0, sizeof(V6809REGS));
+       cpu2.RdMem = SubReadMemory;
+       cpu2.WrMem = SubWriteMemory;
+       cpu2.cpuFlags |= V6809_LINE_RESET;
+
+       memset(&mcu, 0, sizeof(V63701REGS));
+       mcu.RdMem = MCUReadMemory;
+       mcu.WrMem = MCUWriteMemory;
+       mcu.cpuFlags |= V63701_LINE_RESET;
+
+       running = true;
+
+       // Set all inputs to inactive...
+       input1.byte = input2.byte = input3.byte = 0xFF;
+       banksw1 = 0;
+       banksw2 = 0;
+       InitGUI();                 // Reset # of coins
+
+       // Set up DIP switches...
+       input4.bit.b0 = 1;              // DSW B-0: Continues (1 = 6, 0 = 3)
+       input4.bit.b1 = 1;              // DSW B-2: ???
+       input4.bit.b2 = 1;              // DSW B-4: Difficulty (1 = normal, 0 = easy)
+       input4.bit.b3 = 1;              // DSW B-6: Bonus lives (70K/200K = 1, 100K/300K = 0)
+       input4.bit.b4 = 1;              // DSW A-0: Coin #2 credit
+       input4.bit.b5 = 1;              // DSW A-2: Freeze mode (0 = freeze)
+       input4.bit.b6 = 1;              // DSW A-4: Attract mode sound (1 = on)
+       input4.bit.b7 = 1;              // DSW A-6: Coin #1 credit
+
+       input5.bit.b0 = 1;              // DSW B-1: Cabinet type (1 = A, 0 = B)
+       input5.bit.b1 = 0;              // DSW B-3: Level select (0 = on)
+       input5.bit.b2 = 0;              // DSW B-5: Time (1 = 120, 0 = 150)
+       input5.bit.b3 = 0;              // DSW B-7: Lives (1 = 3, 0 = 5)
+       input5.bit.b4 = 1;              // DSW A-1: Coin #2 credit
+       input5.bit.b5 = 1;              // DSW A-3: Invulnerability (0 = on)
+       input5.bit.b6 = 1;              // DSW A-5: Coin #1 credit
+       input5.bit.b7 = 1;              // DSW A-7: Service mode
 
-                       for(int i=0; i<256; i++)
-                               keys[i] = 0;                            // Clear keyboard buffer...
+WriteLog("About to set up screen...\n");
+       InitVideo();
 
-                       oldTicks = SDL_GetTicks();
+       oldTicks = SDL_GetTicks();
 
 WriteLog("About to set up audio...\n");
-                       // This crap SHOULD be in sound.cpp (not yet created)...
-                       SDL_AudioSpec desired, obtained;
-                       desired.freq = 22050;
-                       desired.format = AUDIO_U8;
-                       desired.channels = 1;
-                       desired.samples = 600;
-                       desired.callback = SoundFunc;
-                       desired.userdata = NULL;
-                       // Also, should check to see if it got the hardware it needed, correct sample size, etc.
-                       if (SDL_OpenAudio(&desired, &obtained) < 0)
-                       {
-                               cout << "Couldn't open audio: " << SDL_GetError() << endl;
-                               return -1;
-                       }
-                       SDL_PauseAudio(0);                                                      // Get that audio going!
+       InitSound();
 
 WriteLog("About to enter main loop...\n");
-                       while (running)
+       while (running)
+       {
+//             HandleGUIDebounce();                                    // Debounce GUI keys
+
+// Dipswitches are presented to the main CPUs as 0 or 1 at locations
+// $423D - $425B by the MCU
+
+               // SDL key handling...
+
+               SDL_Event event;
+
+               while (SDL_PollEvent(&event))
+               {
+                       switch (event.type)
                        {
-                               HandleGUIDebounce();                                    // Debounce GUI keys
-                               if (game_over_switch)
+                       case SDL_KEYDOWN:
+                               if (event.key.keysym.sym == SDLK_ESCAPE)
+                                       running = false;
+                               // Do PCX snapshot (F4)
+                               else if (event.key.keysym.sym == SDLK_F4)
                                {
-                                       game_over_switch--;  // Countdown...
-                                       if (game_over_switch == 0)
-                                               gram1[0x4380] = 0; // Kill music!
+//                                     SpawnSound(USERSOUND, SCAMERA);
+                                       SavePCXSnapshot();
                                }
-//testing... (works)
-//gram1[0x423D] = 1;
-                               //gram1[0x423D] = self_test;                    // Reset DSW1-1
-                               gram1[0x4268] = 0;                                              // Reset Video test
-                               gram1[0x427A] = 0;  gram1[0x427C] = 0;
-                               gram1[0x427B] = 0;  gram1[0x427D] = 0;
-                               gram1[0x427E] = 0;  gram1[0x427F] = 0;
-                               gram1[0x4280] = 0;  gram1[0x4281] = 0;
-                               gram1[0x4276] = 0;  gram1[0x426A] = 0;
-                               gram1[0x4278] = 0;  gram1[0x426C] = 0;
-                               gram1[0x4262] = 0;  gram1[0x4260] = 0;
-                               //gram1[0x4247] = 0;
-
-                               // SDL key handling...
-
-                               SDL_PumpEvents();                               // Force key events into the buffer.
+#if 1
+                               else if (event.key.keysym.sym == SDLK_5)
+                                       input1.bit.b5 = 0;
+                               else if (event.key.keysym.sym == SDLK_1)
+                                       input1.bit.b6 = 0;
+                               else if (event.key.keysym.sym == SDLK_2)
+                                       input2.bit.b6 = 0;
+                               else if (event.key.keysym.sym == SDLK_c)        // Left
+                                       input3.bit.b5 = 0;
+                               else if (event.key.keysym.sym == SDLK_z)        // Right
+                                       input3.bit.b4 = 0;
+                               else if (event.key.keysym.sym == SDLK_s)        // Up
+                                       input2.bit.b2 = 0;
+                               else if (event.key.keysym.sym == SDLK_x)        // Down
+                                       input1.bit.b2 = 0;
+                               else if (event.key.keysym.sym == SDLK_k)        // Jump
+                                       input1.bit.b1 = 0;
+                               else if (event.key.keysym.sym == SDLK_l)        // Fire
+                                       input3.bit.b3 = 0;
+
+                               else if (event.key.keysym.sym == SDLK_F1)       // Service mode
+                                       input5.bit.b7 = !input5.bit.b7;
+
+                               else if (event.key.keysym.sym == SDLK_q)
+                                       input4.bit.b7 = !input4.bit.b7;
+                               else if (event.key.keysym.sym == SDLK_w)
+                                       input5.bit.b6 = !input5.bit.b6;
+                               else if (event.key.keysym.sym == SDLK_e)
+                                       input5.bit.b5 = !input5.bit.b5;
+                               else if (event.key.keysym.sym == SDLK_r)
+                                       input5.bit.b4 = !input5.bit.b4;
+                               else if (event.key.keysym.sym == SDLK_t)
+                                       input5.bit.b3 = !input5.bit.b3;
+                               else if (event.key.keysym.sym == SDLK_y)
+                                       input5.bit.b2 = !input5.bit.b2;
+                               else if (event.key.keysym.sym == SDLK_u)
+                                       input5.bit.b1 = !input5.bit.b1;
+                               else if (event.key.keysym.sym == SDLK_i)
+                                       input5.bit.b0 = !input5.bit.b0;
+
+                               // Quick'n'Dirty save state handling...  :-P
+                               else if (event.key.keysym.sym == SDLK_F8)
+                                       SaveThunderState("thun0001.state");
+                               else if (event.key.keysym.sym == SDLK_F9)
+                                       LoadThunderState("thun0001.state");
 
+#else
+                               else if (event.key.keysym.sym == SDLK_1)
+                                       input1.bit.b0 = 0;
+                               else if (event.key.keysym.sym == SDLK_2)
+                                       input1.bit.b1 = 0;
+                               else if (event.key.keysym.sym == SDLK_3)
+                                       input1.bit.b2 = 0;
+                               else if (event.key.keysym.sym == SDLK_4)
+                                       input1.bit.b3 = 0;
+                               else if (event.key.keysym.sym == SDLK_5)
+                                       input1.bit.b4 = 0;
+                               else if (event.key.keysym.sym == SDLK_6)
+                                       input1.bit.b5 = 0;
+                               else if (event.key.keysym.sym == SDLK_7)
+                                       input1.bit.b6 = 0;
+                               else if (event.key.keysym.sym == SDLK_8)
+                                       input1.bit.b7 = 0;
+
+                               else if (event.key.keysym.sym == SDLK_q)
+                                       input2.bit.b0 = 0;
+                               else if (event.key.keysym.sym == SDLK_w)
+                                       input2.bit.b1 = 0;
+                               else if (event.key.keysym.sym == SDLK_e)
+                                       input2.bit.b2 = 0;
+                               else if (event.key.keysym.sym == SDLK_r)
+                                       input2.bit.b3 = 0;
+                               else if (event.key.keysym.sym == SDLK_t)
+                                       input2.bit.b4 = 0;
+                               else if (event.key.keysym.sym == SDLK_y)
+                                       input2.bit.b5 = 0;
+                               else if (event.key.keysym.sym == SDLK_u)
+                                       input2.bit.b6 = 0;
+                               else if (event.key.keysym.sym == SDLK_i)
+                                       input2.bit.b7 = 0;
+
+                               else if (event.key.keysym.sym == SDLK_a)
+                                       input3.bit.b0 = 0;
+                               else if (event.key.keysym.sym == SDLK_s)
+                                       input3.bit.b1 = 0;
+                               else if (event.key.keysym.sym == SDLK_d)
+                                       input3.bit.b2 = 0;
+                               else if (event.key.keysym.sym == SDLK_f)
+                                       input3.bit.b3 = 0;
+                               else if (event.key.keysym.sym == SDLK_g)
+                                       input3.bit.b4 = 0;
+#endif
+
+                               break;
+                       case SDL_KEYUP:
+#if 1
+                               if (event.key.keysym.sym == SDLK_5)
+                                       input1.bit.b5 = 1;
+                               else if (event.key.keysym.sym == SDLK_1)
+                                       input1.bit.b6 = 1;
+                               else if (event.key.keysym.sym == SDLK_2)
+                                       input2.bit.b6 = 1;
+                               else if (event.key.keysym.sym == SDLK_c)
+                                       input3.bit.b5 = 1;
+                               else if (event.key.keysym.sym == SDLK_z)
+                                       input3.bit.b4 = 1;
+                               else if (event.key.keysym.sym == SDLK_s)
+                                       input2.bit.b2 = 1;
+                               else if (event.key.keysym.sym == SDLK_x)
+                                       input1.bit.b2 = 1;
+                               else if (event.key.keysym.sym == SDLK_k)        // (Q)  Jump
+                                       input1.bit.b1 = 1;
+                               else if (event.key.keysym.sym == SDLK_l)        // (E) Fire
+                                       input3.bit.b3 = 1;
+#else
+                               if (event.key.keysym.sym == SDLK_1)
+                                       input1.bit.b0 = 1;
+                               else if (event.key.keysym.sym == SDLK_2)
+                                       input1.bit.b1 = 1;
+                               else if (event.key.keysym.sym == SDLK_3)
+                                       input1.bit.b2 = 1;
+                               else if (event.key.keysym.sym == SDLK_4)
+                                       input1.bit.b3 = 1;
+                               else if (event.key.keysym.sym == SDLK_5)
+                                       input1.bit.b4 = 1;
+                               else if (event.key.keysym.sym == SDLK_6)
+                                       input1.bit.b5 = 1;
+                               else if (event.key.keysym.sym == SDLK_7)
+                                       input1.bit.b6 = 1;
+                               else if (event.key.keysym.sym == SDLK_8)
+                                       input1.bit.b7 = 1;
+
+                               else if (event.key.keysym.sym == SDLK_q)
+                                       input2.bit.b0 = 1;
+                               else if (event.key.keysym.sym == SDLK_w)
+                                       input2.bit.b1 = 1;
+                               else if (event.key.keysym.sym == SDLK_e)
+                                       input2.bit.b2 = 1;
+                               else if (event.key.keysym.sym == SDLK_r)
+                                       input2.bit.b3 = 1;
+                               else if (event.key.keysym.sym == SDLK_t)
+                                       input2.bit.b4 = 1;
+                               else if (event.key.keysym.sym == SDLK_y)
+                                       input2.bit.b5 = 1;
+                               else if (event.key.keysym.sym == SDLK_u)
+                                       input2.bit.b6 = 1;
+                               else if (event.key.keysym.sym == SDLK_i)
+                                       input2.bit.b7 = 1;
+
+                               else if (event.key.keysym.sym == SDLK_a)
+                                       input3.bit.b0 = 1;
+                               else if (event.key.keysym.sym == SDLK_s)
+                                       input3.bit.b1 = 1;
+                               else if (event.key.keysym.sym == SDLK_d)
+                                       input3.bit.b2 = 1;
+                               else if (event.key.keysym.sym == SDLK_f)
+                                       input3.bit.b3 = 1;
+                               else if (event.key.keysym.sym == SDLK_g)
+                                       input3.bit.b4 = 1;
+#endif
+
+                               break;
+                       }
+               }
+
+#if 0
                                if (keys[SDLK_ESCAPE])
                                        running = false;                     // ESC to exit...
 
@@ -1385,6 +889,7 @@ WriteLog("About to enter main loop...\n");
                                                        DeactivateGUI();
                                                else
                                                        ActivateGUI();
+
                                                debounce = 10;
                                        }
                                }
@@ -1431,29 +936,39 @@ WriteLog("About to enter main loop...\n");
                                }
                                if (keys[SDLK_RETURN])                                                  // Return
                                {
-                                       uint8 retval = UserSelectedSomething();
+                                       uint8_t retval = UserSelectedSomething();
+
                                        if (retval == EXIT)
                                                running = false;
+
                                        if (retval == REFRESH)
                                        {
                                                refresh2 = !refresh2;
                                                SetRefreshRate(refresh2);
                                        }
                                }
+
                                if (keys[SDLK_1])
                                        gram1[0x427A] = 1;                      // (1)
+
                                if (keys[SDLK_2])
                                        gram1[0x427C] = 1;                      // (2)
+
                                if (keys[SDLK_3])
                                        gram1[0x427E] = 1;                      // (3)
+
                                if (keys[SDLK_5])
                                        gram1[0x4280] = 1;                      // (5)
+
                                if (keys[SDLK_q] | keys[29])
                                        gram1[0x4276] = 1;                      // (Q)  Jump
+
                                if (keys[SDLK_w])
                                        gram1[0x426A] = 1;                      // (W)
+
                                if (fire_debounce)
                                        fire_debounce--;
+
                                if (keys[SDLK_e] | keys[56])    // (E) Fire
                                {
                                        if (!fire_debounce)
@@ -1466,66 +981,39 @@ WriteLog("About to enter main loop...\n");
                                                        fire_debounce = 2;
                                        }
                                }
+
                                if (keys[SDLK_r])
                                        gram1[0x426C] = 1;                      // (R)
+
                                if (keys[SDLK_t])
                                        gram1[0x4262] = 1;                      // (T)
+
                                if (keys[SDLK_y])
                                        gram1[0x4260] = 1;                      // (Y)
+
                                if (keys[SDLK_F10])
                                        gram1[0x41A5]++;                        // Coin? (F10)
+
                                if (keys[SDLK_z])
                                        gram1[0x4189]++;                        // ? (Z) credits l dig
+
                                if (keys[SDLK_x])
                                        gram1[0x418A]++;                        // ? (X) credits r dig
+
                                if (keys[SDLK_c])
                                        gram1[0x418C]++;                        // ? (C) Start
+
                                if (keys[SDLK_v])
                                        gram1[0x418D]++;                        // ? (V)
+
                                if (keys[SDLK_F7])
                                        SpawnSound(USERSOUND, 0);       // Do user sound (F7)
-//                             if (keys[SDLK_F8])
-//                             {
-//                                     gram1[0x4380] = 0;                      // (F8) kill music (this worx)
-//                                     charbase = false;                       // Switch chars out...
-//                             }
-//                             if (keys[SDLK_F9])  gram1[0x4285] = 1;          // (F9) strobe unknown loc
-                               if (keys[SDLK_F11])                             // (F11)
-                               {
-                                       Execute6809(&cpu1, 10);
-                                       Execute6809(&cpu2, 10);
-                               }
-//                     }
-//F12 is used above, but the values are ignored. So we'll do it here too.
-                               if (keys[SDLK_F12])
-                               {
-                                       cpu1.cpuFlags |= V6809_ASSERT_LINE_RESET;
-                                       cpu2.cpuFlags |= V6809_ASSERT_LINE_RESET;
-                               }
-                               if (keys[SDLK_d])                               // (D) start disassembly
-                                       disasm = true;
-#if 0
-       if (keys[SDLK_k])
-               gram1[0x5606] = 0x00;
-       if (keys[SDLK_l])
-       {
-               gram1[0x5607] = 0x01; // Hangs here... (CPU #1 waiting...)
-               WriteLog("\nMAIN: Stuffed $01 in $5607!!!\n\n");
-       }
-       if (keys[SDLK_o])
-       {
-               gram1[0x5FF3] = 0x02;
-               WriteLog("\nMAIN: Stuffed $02 in $5FF3!!!\n\n");
-       }
 #endif
 
-
-                               if (enable_cpu)
-//                             if (true)
-                               {
-                                       // We can do this here because we're not executing the cores yet.
-                                       cpu1.cpuFlags |= V6809_ASSERT_LINE_IRQ;
-                                       cpu2.cpuFlags |= V6809_ASSERT_LINE_IRQ;
+               // We can do this here because we're not executing the cores yet.
+               cpu1.cpuFlags |= V6809_LINE_IRQ;
+               cpu2.cpuFlags |= V6809_LINE_IRQ;
+               mcu.cpuFlags |= V63701_LINE_IRQ;
 //                                     while (cpu1.clock < 25000)
 // 1.538 MHz = 25633.333... cycles per frame (1/60 s)
 // 25600 cycles/frame
@@ -1534,277 +1022,48 @@ WriteLog("About to enter main loop...\n");
 // 40 works, until it doesn't... :-P
 // 640 * 40
 // 800 * 32
+// 20 seems to work...  :-)
 // Interesting, putting IRQs at 30 Hz makes it run at the correct speed. Still hangs in the demo, though.
-                                       for(uint32 i=0; i<640; i++)
-//                                     for(uint32 i=0; i<1280; i++)
-                                       {
-                                               // Gay, but what are ya gonna do?
-                                               // There's better ways, such as keeping track of when slave writes to master, etc...
-                                               Execute6809(&cpu1, 40);
-                                               Execute6809(&cpu2, 40);
-                                       }
-                               } // END: enable_cpu
-
-//        if (refresh_++ == 1)                // 30 Hz...
-//        {
-//          if (scr_type)
-//            BlitWilliamsScreen(gram1);     // Display the screen...
-//          else
-//            BlitChar(screen, chr_rom, gram1);
-//          refresh_ = (refresh2 ? 1 : 0);    // 60/30 Hz...
-//        }
-
-#if 1
-//temp, for testing...
-BlitChar(screen, chr_rom, gram1);
-#endif
-                               // Speed throttling happens here...
-                               while (SDL_GetTicks() - oldTicks < 16)  // Actually, it's 16.66... Need to account for that somehow
-//                             while (SDL_GetTicks() - oldTicks < 32)  // Actually, it's 16.66... Need to account for that somehow
-                                       SDL_Delay(1);                           // Release our timeslice...
-
-                               oldTicks = SDL_GetTicks();
-//cout << "Finished frame..." << endl;
-                       }
-
-//      Stop_audio_output();
-//      ReleaseTimer();
-//      ReleaseKeyboard();               // Release the interrupt...
-//      RestoreOldMode();                // Restore screen
-                       if (brk && (cpu1.pc == brkpnt))
-                               cout << "CPU 1: Break at " << hex << cpu1.pc << endl;
-                       if (brk2 && (cpu2.pc == brkpnt2))
-                               cout << "CPU 2: Break at " << hex << cpu2.pc << endl;
-
-                       lbuff[0] = 'q';                         // Temp kludge...
-               }
-               else if (lbuff[0] == 'b')  // Set/clear breakpoint
+//             for(int i=0; i<640; i++)
+               for(int i=0; i<1280; i++)
                {
-                       if (lbuff[1] != 0)
-                       {
-                               lbuff[0] = 32;
-                               brkpnt = htod(lbuff);
-                               brk = true;
-                               cout << "Breakpoint #1 set at " << hex << brkpnt << dec << endl;
-                       }
-                       else
-                       {
-                               brk = false;
-                               cout << "Breakpoint cleared" << endl;
-                       }
+                       // Gay, but what are ya gonna do?
+                       // There's better ways, such as keeping track of when slave writes to master, etc...
+//                     Execute6809(&cpu1, 40);
+//                     Execute6809(&cpu2, 40);
+                       Execute6809(&cpu1, 20);
+                       Execute6809(&cpu2, 20);
+
+                       // MCU runs at 1,536,000 Hz
+                       // 1536000 / 60 / 640 == 40
+//                     Execute63701(&mcu, 40);
+                       Execute63701(&mcu, 20);
                }
-               else if (lbuff[0] == 'a')  // Set/clear breakpoint #2
-               {
-                       if (lbuff[1] != 0)
-                       {
-                               lbuff[0] = 32;
-                               brkpnt2 = htod(lbuff);
-                               brk2 = true;
-                               cout << "Breakpoint #2 set at " << hex << brkpnt2 << dec << endl;
-                       }
-                       else
-                       {
-                               brk2 = false;
-                               cout << "Breakpoint cleared" << endl;
-                       }
-               }
-               else if (lbuff[0] == 'i')  // Inspect registers
-               {
-      printf("CPU1: A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
-              cpu1.a, cpu1.b, cpu1.cc, cpu1.dp, cpu1.x, cpu1.y, cpu1.s, cpu1.u, cpu1.pc);
-      cout << " iclk=" << dec << cpu1.clock << endl;
-      printf("CPU2: A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
-              cpu2.a, cpu2.b, cpu2.cc, cpu2.dp, cpu2.x, cpu2.y, cpu2.s, cpu2.u, cpu2.pc);
-      cout << " iclk=" << dec << cpu2.clock << endl;
-      if (brk)
-        cout << "Breakpoint #1 set at " << hex << brkpnt << dec << endl;
-      if (brk2)
-        cout << "Breakpoint #2 set at " << hex << brkpnt2 << dec << endl;
-    }
-               else if (strncmp(lbuff, "swap", 4) == 0)  // Swap ROMs
-    {
-      looking_at_rom = !looking_at_rom;
-      cout << "Swapped:  Looking at ";
-      (looking_at_rom ? cout << "ROM #1" : cout << "ROM #2");
-      cout << endl;
-    }
-               else if (strncmp(lbuff, "seek", 4) == 0)  // Seek non-zero bytes in RAM
-    {
-      if (lbuff[4] != 0)
-      {
-        for(int i=0; i<4; i++)
-          lbuff[i] = 32;
-        dpc = htod(lbuff);
-      }
-      do
-      {
-        x = gram1[dpc++];
-      }
-      while ((x == 0) && (dpc != 0xFFFF)); // Keep going until something found
-      dpc--;
-
-      printf("%04X: ", dpc);       // Show data found...
-      for(int i=0; i<16; i++)
-        printf("%02X ", gram1[(uint16)(dpc+i)]);
-      cout << " ";
-      for(int i=0; i<16; i++)
-      {
-        uint8 a = gram1[dpc++];
-        if (a<10)
-          cout << (char)(a+48);
-        if ((a>9) && (a<37))
-          cout << (char)(a+55);
-        if (a>36)
-          cout << ".";
-      }
-      cout << endl;
-    }
-               else if (lbuff[0] == 'v')    // View screen
+
+               BlitChar(charROM, gram1);
+
+               // Make sure that the sprite RAM lags by one frame...  :-)
+               if (copySprites)
                {
-//                     SetVESA2();                           // Set up screen
-                       BlitChar(screen, chr_rom, gram1);
-                       getch();
-//                     RestoreOldMode();
+                       CopySprites();
+                       copySprites = false;
                }
 
-               if (lbuff[0] == 'q')
-                       active = false; //break;  // Quit
-       }
+               frameTickCount++;
 
-       SDL_Quit();                                                                     // Shut down SDL
+               if (frameTickCount == 3)
+                       frameTickCount = 0;
 
-       for(int i=0; i<16; i++)
-               if (psg_adrs[i])
-                       delete[] psg_adrs[i];                           // Deallocate if loaded
+               // Speed throttling happens here...
+               // Actually, it's 16.66... Need to account for that somehow [DONE]
+               while (SDL_GetTicks() - oldTicks < (16 + (frameTickCount == 2 ? 1 : 0)))
+                       SDL_Delay(1);                           // Release our timeslice...
 
-       for(int i=0; i<14; i++)
-               if (fm_adrs[i])
-                       delete[] fm_adrs[i];                            // Deallocate if loaded
+               oldTicks = SDL_GetTicks();
+       }
 
+       SDL_Quit();
        LogDone();
 
        return 1;
 }
-
-#if 0
-Rolling Thunder Memory map
---------------------------
-Most of the decoding is done by custom chips (CUS47 and CUS41), so the memory
-map is inferred by program behaviour. The customs also handle internally irq
-and watchdog.
-The main CPU memory map is the same in all games because CUS47 is used by all
-games. The sub CPU and sound CPU, on the other hand, change because CUS41 is
-replaced by other chips.
-All RAM is shared between main and sub CPU, except for sound RAM which is shared
-between main and sound CPU; the portion of object RAM that is overlapped by sound
-RAM is used exclusively by the sub CPU.
-
-MAIN CPU:
-
-Address             Dir Data     Name      Description
-------------------- --- -------- --------- -----------------------
-000x xxxx xxxx xxxx R/W xxxxxxxx SCROLL0   tilemap 0/1 RAM (shared with sub CPU)
-001x xxxx xxxx xxxx R/W xxxxxxxx SCROLL1   tilemap 2/3 RAM (shared with sub CPU)
-0100 00xx xxxx xxxx R/W xxxxxxxx SOUND     sound RAM (through CUS30, shared with MCU)
-0100 0000 xxxx xxxx R/W xxxxxxxx           portion holding the sound wave data
-0100 0001 00xx xxxx R/W xxxxxxxx           portion holding the sound registers
-010x xxxx xxxx xxxx R/W xxxxxxxx OBJECT    work RAM (shared with sub CPU) [1]
-0101 1xxx xxxx xxxx R/W xxxxxxxx           portion holding sprite registers
-011x xxxx xxxx xxxx R   xxxxxxxx ROM 9D    program ROM (banked) [2]
-1xxx xxxx xxxx xxxx R   xxxxxxxx ROM 9C    program ROM
-1000 00-- ---- ----   W --------           watchdog reset (RES generated by CUS47)
-1000 01-- ---- ----   W --------           main CPU irq acknowledge (IRQ generated by CUS47)
-1000 1x-- ---- ----   W -------- BANK      tile gfx bank select (data is in A10) (latch in CUS47)
-1001 00-- ---- -x0x   W xxxxxxxx LATCH0    tilemap 0/1 X scroll + priority
-1001 00-- ---- -x10   W xxxxxxxx LATCH0    tilemap 0/1 Y scroll
-1001 00-- ---- --11   W ------xx BAMNKM    ROM 9D bank select
-1001 01-- ---- -x0x   W xxxxxxxx LATCH1    tilemap 2/3 X scroll + priority
-1001 01-- ---- -x10   W xxxxxxxx LATCH1    tilemap 2/3 Y scroll
-1001 01-- ---- --11   W ------xx BAMNKS    ROM 12D bank select
-1100 00-- ---- ----   W xxxxxxxx BACKCOLOR background color
-
-[1] Note that this is partially overlapped by sound RAM
-[2] In Rolling Thunder and others, replaced by the ROM/voice expansion board
-
-
-SUB CPU:
-
-Address             Dir Data     Name      Description
-------------------- --- -------- --------- -----------------------
-000x xxxx xxxx xxxx R/W xxxxxxxx SUBOBJ    work RAM (shared with main CPU)
-0001 1xxx xxxx xxxx R/W xxxxxxxx           portion holding sprite registers
-001x xxxx xxxx xxxx R/W xxxxxxxx SUBSCR0   tilemap 0/1 RAM (shared with main CPU)
-010x xxxx xxxx xxxx R/W xxxxxxxx SUBSCR1   tilemap 2/3 RAM (shared with main CPU)
-011x xxxx xxxx xxxx R   xxxxxxxx ROM 12D   program ROM (banked) [1]
-1xxx xxxx xxxx xxxx R   xxxxxxxx ROM 12C   program ROM
-1000 0--- ---- ----   W --------           watchdog reset (MRESET generated by CUS41)
-1000 1--- ---- ----   W --------           main CPU irq acknowledge (generated by CUS41)
-1101 0--- ---- -x0x   W xxxxxxxx LATCH0    tilemap 0/1 X scroll + priority
-1101 0--- ---- -x10   W xxxxxxxx LATCH0    tilemap 0/1 Y scroll
-1101 0--- ---- --11   W ------xx BAMNKM    ROM 9D bank select
-1101 1--- ---- -x0x   W xxxxxxxx LATCH1    tilemap 2/3 X scroll + priority
-1101 1--- ---- -x10   W xxxxxxxx LATCH1    tilemap 2/3 Y scroll
-1101 1--- ---- --11   W ------xx BAMNKS    ROM 12D bank select
-
-[1] Only used by Rolling Thunder
-
-
-MCU:
-
-Address             Dir Data     Name      Description
-------------------- --- -------- --------- -----------------------
-0000 0000 xxxx xxxx                        MCU internal registers, timers, ports and RAM
-0001 xxxx xxxx xxxx R/W xxxxxxxx RAM 3F    sound RAM (through CUS30, partially shared with main CPU)
-0001 0000 xxxx xxxx R/W xxxxxxxx           portion holding the sound wave data
-0001 0001 00xx xxxx R/W xxxxxxxx           portion holding the sound registers
-0010 0--- --00 ---x R/W xxxxxxxx YMCS      YM2151
-0010 0--- --01 ----                        n.c.
-0010 0--- --10 ---- R   xxxxxxxx PORTA     switch inputs
-0010 0--- --11 ---- R   xxxxxxxx PORTB     dip switches
-01xx xxxx xxxx xxxx R   xxxxxxxx ROM 6B    program ROM (lower half)
-10xx xxxx xxxx xxxx R   xxxxxxxx ROM 6B    program ROM (upper half)
-1011 0--- ---- ----   W                    unknown (CUS41)
-1011 1--- ---- ----   W                    unknown (CUS41)
-1111 xxxx xxxx xxxx R   xxxxxxxx           MCU internal ROM
-
-
-Notes:
------
-- we are using an unusually high CPU interleave factor (800) to avoid hangs
-  in rthunder. The two 6809 in this game synchronize using a semaphore at
-  5606/5607 (CPU1) 1606/1607 (CPU2). CPU1 clears 5606, does some quick things,
-  and then increments 5606. While it does its quick things (which require
-  about 40 clock cycles) it expects CPU2 to clear 5607.
-  Raising the interleave factor to 1000 makes wndrmomo crash during attract
-  mode. I haven't investigated on the cause.
-
-- There are two watchdogs, one per CPU (or maybe three). Handling them
-  separately is necessary to allow entering service mode without manually
-  resetting in rthunder and genpeitd: only one of the CPUs stops writing to
-  the watchdog.
-
-- The sprite hardware buffers spriteram: the program writes the sprite list to
-  offsets 4-9 of every 16-byte block, then at the end writes to offset 0x1ff2 of
-  sprite RAM to signal the chip that the list is complete. The chip will copy
-  the list from 4-9 to 10-15 and use it from there. This has not been verified
-  on the real hardware, but it is the most logical way of doing it.
-  Emulating this behaviour and not using an external buffer is important in
-  rthunder: when you insert a coin, the whole sprite RAM is cleared, but 0x1ff2
-  is not written to. If we buffered spriteram to an external buffer, this would
-  cause dangling sprites because the buffer would not be updated.
-
-- spriteram buffering fixes sprite lag, but causes a glitch in rthunder when
-  entering a door. The *closed* door is made of tiles, but the *moving* door is
-  made of sprites. Since sprites are delayed by 1 frame, when you enter a door
-  there is one frame where neither the tile-based closed door nor the
-  sprite-based moving door is shown, so it flickers. This behavior has been
-  confirmed on a real PCB.
-
-TODO:
-----
-- The two unknown writes for the MCU are probably watchdog reset and irq acknowledge,
-  but they don't seem to work as expected. During the first few frames they are
-  written out of order and hooking them up in the usual way causes the MCU to
-  stop receiving interrupts.
-
-#endif