diff --git a/vaporlock/doubledouble/Makefile b/vaporlock/doubledouble/Makefile index 45e1b079..2f9121e6 100644 --- a/vaporlock/doubledouble/Makefile +++ b/vaporlock/doubledouble/Makefile @@ -26,7 +26,7 @@ double.o: double.s \ zp.inc hardware.inc pt3_lib_mockingboard_detect.s \ pt3_lib_mockingboard_setup.s pt3_lib_detect_model.s \ zx02_optim.s copy_400.s gr_offsets.s vblank.s \ - lc_detect.s text_print.s title.s gr_fast_clear.s \ + text_print.s title.s gr_fast_clear.s \ interrupt_handler.s pt3_lib_mockingboard_patch.s \ wait_a_bit.s wait.s pt3_lib_init.s \ music/fighting.zx02 \ diff --git a/vaporlock/doubledouble/double.s b/vaporlock/doubledouble/double.s index a2247f0b..67b79b1b 100644 --- a/vaporlock/doubledouble/double.s +++ b/vaporlock/doubledouble/double.s @@ -14,7 +14,6 @@ double: jsr detect_appleii_model - ;====================== ; machine workarounds ;====================== @@ -117,11 +116,6 @@ done_setup_vblank: not_gs: - ;========================================= - ; detect if we have a language card (64k) - ; and load sound into it if possible - ;========================================= - lda #0 sta SOUND_STATUS ; clear out, sound enabled @@ -132,28 +126,6 @@ not_gs: and #$80 ; only bit 7 is affected bne skip_all_checks ; rest is floating bus - - jsr detect_language_card - bcs no_language_card - -yes_language_card: - ; update status - lda #'6'|$80 - sta $7d0+11 ; 23,11 - lda #'4'|$80 - sta $7d0+12 ; 23,12 - - ; update sound status - lda SOUND_STATUS - ora #SOUND_IN_LC - sta SOUND_STATUS - - jmp done_language_card - -no_language_card: - -done_language_card: - ;=================================== ; Detect Mockingboard ;=================================== @@ -608,7 +580,6 @@ config_string: .include "gr_offsets.s" -.include "lc_detect.s" .include "text_print.s" .include "title.s" .include "gr_fast_clear.s" diff --git a/vaporlock/doubledouble/lc_detect.s b/vaporlock/doubledouble/lc_detect.s deleted file mode 100644 index 3123a6ae..00000000 --- a/vaporlock/doubledouble/lc_detect.s +++ /dev/null @@ -1,40 +0,0 @@ -; Code from TotalReplay by 4am and qkumba - -;------------------------------------------------------------------------------ -; Has64K -; Checks whether computer has functioning language card (64K) -; -; in: none -; out: C clear if 64K detected -; C set if 64K not detected -; all other flags and registers clobbered -; ROM in memory (not LC RAM bank) -;------------------------------------------------------------------------------ - -detect_language_card: - - ; enable language card - ; READ_RAM1_WRITE_RAM1 - - bit $C08B - bit $C08B - - lda #$AA ; test #1 for $D0 page - sta $D000 - eor $D000 - bne no_lc - lsr $D000 ; test #2 for $D0 page - lda #$55 - eor $D000 - bne no_lc - clc - bcc done_detect - -no_lc: - sec - -done_detect: - ; READ_ROM_NO_WRITE - bit $C08A - - rts