diff --git a/zsnes/src/cpu/regs.inc b/zsnes/src/cpu/regs.inc index 4ef4a14e..19a1680d 100644 --- a/zsnes/src/cpu/regs.inc +++ b/zsnes/src/cpu/regs.inc @@ -30,10 +30,6 @@ EXTSYM snesmouse EXTSYM cycphb,joycontren,totlines EXTSYM DosExit,invalid,numinst,previdmode,printhex,printnum -%ifdef OPENSPC -EXTSYM SPC_PORT0W, SPC_PORT1W, SPC_PORT2W, SPC_PORT3W -%endif - @@ -990,10 +986,6 @@ reg213Fr: ; Sound Reg #1 reg2140r: -%ifdef OPENSPC - mov al,[SPC_PORT0W] - ret -%else cmp byte[spcon],0 je .nosound inc dword[SPC700read] @@ -1031,14 +1023,9 @@ reg2140r: mov al,[xa] .n ret -%endif ; Sound Reg #2 reg2141r: -%ifdef OPENSPC - mov al,[SPC_PORT1W] - ret -%else cmp byte[spcon],0 je .nosound inc dword[SPC700read] @@ -1068,14 +1055,9 @@ reg2141r: mov al,[xa] .n ret -%endif ; Sound Reg #3 reg2142r: -%ifdef OPENSPC - mov al,[SPC_PORT2W] - ret -%else cmp byte[spcon],0 je .nosound inc dword[SPC700read] @@ -1104,14 +1086,9 @@ reg2142r: mov al,[xa+1] .n ret -%endif ; Sound Reg #4 reg2143r: -%ifdef OPENSPC - mov al,[SPC_PORT3W] - ret -%else cmp byte[spcon],0 je .nosound inc dword[SPC700read] @@ -1136,7 +1113,6 @@ reg2143r: .notfound mov al,[xa+1] ret -%endif reg2144r: xor al,al diff --git a/zsnes/src/cpu/regsw.inc b/zsnes/src/cpu/regsw.inc index c8705c28..9b8af173 100644 --- a/zsnes/src/cpu/regsw.inc +++ b/zsnes/src/cpu/regsw.inc @@ -32,9 +32,6 @@ EXTSYM opexec358,opexec358cph EXTSYM hdmarestart EXTSYM printhex8 -%ifdef OPENSPC -EXTSYM SPC_PORT0R, SPC_PORT1R, SPC_PORT2R, SPC_PORT3R -%endif @@ -1351,13 +1348,9 @@ reg2140w: jne .n mov byte[nmirept],0 .n -%ifdef OPENSPC - mov byte[SPC_PORT0R],al -%else mov byte[spcRam+0F4h],al inc dword[SPC700write] reenablespc -%endif ret ; cmp dword[cycpbl],0FFFFh ; ja .spcreset @@ -1369,13 +1362,9 @@ reg2140w: ; Sound Register #2 reg2141w: mov byte[sndwrit],1 -%ifdef OPENSPC - mov byte[SPC_PORT1R],al -%else mov byte[spcRam+0F5h],al inc dword[SPC700write] reenablespc -%endif ret ; cmp dword[cycpbl],0FFFFh ; ja .spcreset @@ -1387,13 +1376,9 @@ reg2141w: ; Sound Register #3 reg2142w: mov byte[sndwrit],1 -%ifdef OPENSPC - mov byte[SPC_PORT2R],al -%else mov byte[spcRam+0F6h],al inc dword[SPC700write] reenablespc -%endif ret ; cmp dword[cycpbl],0FFFFh ; ja .spcreset @@ -1405,13 +1390,9 @@ reg2142w: ; Sound Register #4 reg2143w: mov byte[sndwrit],1 -%ifdef OPENSPC - mov byte[SPC_PORT3R],al -%else mov byte[spcRam+0F7h],al inc dword[SPC700write] reenablespc -%endif ret ; cmp dword[cycpbl],0FFFFh ; ja .spcreset