diff --git a/Common/MB-Macros.a b/Common/MB-Macros.a index 1b67b86..7df21aa 100644 --- a/Common/MB-Macros.a +++ b/Common/MB-Macros.a @@ -179,7 +179,7 @@ InitExit2: ;-------------------------------------- !if USE_PHASOR { -PHASOR_CS_MASK = AY_CS2 ; Phasor: b4=1 (don't select), b3=0 (select) +PHASOR_CS_MASK = AY_CS1 ; Phasor: b4=0 (select), b3=1 (not select) } else { PHASOR_CS_MASK = 0 } diff --git a/Cybernoid/build.bat b/Cybernoid/build.bat index f158ff9..2c85168 100644 --- a/Cybernoid/build.bat +++ b/Cybernoid/build.bat @@ -1,6 +1,6 @@ acme.exe -DUSE_PHASOR=1 cybernoid.a @REM copy cybernoid.labels %APPLEWIN_DBG%\A2_USER1.sym -move /y Cybernoid CYBERNOID.PH +move /y CYBERNOID CYBERNOID.PH acme.exe -DUSE_PHASOR=0 cybernoid.a copy cybernoid.labels %APPLEWIN_DBG%\A2_USER1.sym diff --git a/Cybernoid2/Cybernoid2.a b/Cybernoid2/Cybernoid2.a index 88deece..a8a6944 100644 --- a/Cybernoid2/Cybernoid2.a +++ b/Cybernoid2/Cybernoid2.a @@ -1,17 +1,19 @@ ;ACME 0.85 !cpu 6502 ; Compatible with all Apple2's -!to "Cybernoid2", plain +!to "CYBERNOID2", plain !sl "Cybernoid2.labels" *=$6000 ;------------------------------------------------------------------------------ -!source "..\Common\Z80-Macros.a" -!source "..\Common\ZP-Macros.a" -!source "..\Common\AppleDefs.a" -!source "..\Common\MockingboardDefs.a" -!source "..\Common\MB-Macros.a" +;USE_PHASOR = 0 ; defined on command line + +!source "..\\Common\\Z80-Macros.a" +!source "..\\Common\\ZP-Macros.a" +!source "..\\Common\\AppleDefs.a" +!source "..\\Common\\MockingboardDefs.a" +!source "..\\Common\\MB-Macros.a" ;------------------------------------------------------------------------------ @@ -937,7 +939,12 @@ lf700: ; . Envelopes are not used, so no E-Periods to convert !macro ZX2MB .period { - !word .period*10227/17734 +!if USE_PHASOR { + !word .period*20358/17734 ; Phasor 2MHz ((PAL:14.25045e6 / 7) / 100) +}else{ + !word .period*10227/17734 ; Mockingboard 1MHz ((NTSC:14.3181818e6 / 14) / 100) +} +; !word .period } +ZX2MB $0000 diff --git a/Cybernoid2/build.bat b/Cybernoid2/build.bat index 14b23fb..80f851f 100644 --- a/Cybernoid2/build.bat +++ b/Cybernoid2/build.bat @@ -1,4 +1,6 @@ -D:\Apple][\acme085\acme.exe cybernoid2.a -D:\Apple][\InsertBIN2AWS\debug\InsertBIN2AWS.exe cybernoid2 6000 cybernoid2.aws -java -jar "D:\Apple][\Apple Commander\ac\AppleCommander-1.3.3.9-ac.jar" -d cybernoid2 ..\ReleaseDSK\Cybernoid.dsk -cat cybernoid2 | java -jar "D:\Apple][\Apple Commander\ac\AppleCommander-1.3.3.9-ac.jar" -p Cybernoid2 bin 24576 ..\ReleaseDSK\Cybernoid.dsk \ No newline at end of file +acme.exe -DUSE_PHASOR=1 cybernoid2.a +@REM copy cybernoid2.labels %APPLEWIN_DBG%\A2_USER1.sym +move /y CYBERNOID2 CYBERNOID2.PH + +acme.exe -DUSE_PHASOR=0 cybernoid2.a +copy cybernoid2.labels %APPLEWIN_DBG%\A2_USER1.sym