diff --git a/src/demo/apple.invader.a b/src/demo/apple.invader.a index cb5299a14..6d39fc60a 100644 --- a/src/demo/apple.invader.a +++ b/src/demo/apple.invader.a @@ -22,6 +22,9 @@ sta $6020 jsr $6002 ; decompress + lda #$D0 + sta $1C37 ; kill occasional sound + ldx #$D8 ; move location from $3F2 to $3D8 stx $1113 ; (program uses reset vector for storage) stx $1245 @@ -44,6 +47,19 @@ stx $1DE8 stx $1E5A ; reset vector fix + inx ; move location from $3FE to $3DB + stx $4AF9 ; (program uses IRQ vector for storage) + stx $4B0F + stx $5B69 + stx $5B7F + inx ; move location from $3FF to $3DC + stx $4B02 + stx $4B07 + stx $4B14 + stx $5B72 + stx $5B77 + stx $5B84 ; IRQ vector fix + lda #$4C sta $46C0 ldx #0 diff --git a/src/demo/conan.a b/src/demo/conan.a index 25821ebc6..f4e6623c2 100644 --- a/src/demo/conan.a +++ b/src/demo/conan.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2022 by qkumba +;(c) 2022 by qkumba/Frank M. !cpu 6502 !to "build/DEMO/CONAN#060200",plain @@ -17,13 +17,18 @@ lda #$60 sta $BD40 jsr $BCCF - lda #1 ; reset vector fix - sta $7C01 ; to $3F3 + + lda #0 ; vector fixes + sta $7C09 ; to $3FE - IRQ + lda #1 + sta $7C01 ; to $3F3 - reset + sta $7C0B ; to $3FF - IRQ lda #$A4 - sta $7C02 ; to $3F4 (doesn't change $3F2) + sta $7C02 ; to $3F4 - reset ($3F2 doesn't change) + lda #$4C sta $7C2C - jsr $5FF8 ; decompress + jsr $5FF8 ; decompress, run intro sta $80F6 jsr $826 lda #$60 diff --git a/src/demo/gamma.goblins.a b/src/demo/gamma.goblins.a index d4ddb6739..3801a5e72 100644 --- a/src/demo/gamma.goblins.a +++ b/src/demo/gamma.goblins.a @@ -9,6 +9,7 @@ !source "src/macros.a" +GAME_REQUIRES_JOYSTICK + +USES_TEXT_PAGE_2 +ENABLE_ACCEL_LC +LOAD_XSINGLE title diff --git a/src/demo/pacman.a b/src/demo/pacman.a index c68ef6979..42cacd160 100644 --- a/src/demo/pacman.a +++ b/src/demo/pacman.a @@ -11,6 +11,7 @@ +ENABLE_ACCEL_LC +LOAD_XSINGLE title + +USES_TEXT_PAGE_2 +NEW_RESET_VECTOR $280 lda #$60 @@ -20,7 +21,7 @@ lda #$80 sta $103F lda #2 - sta $104A ; reset vector patch + sta $104A ; reset/IRQ vector patch ldx #3-1 - lda patch,x diff --git a/src/demo/thunder.bombs.a b/src/demo/thunder.bombs.a index 54700c04e..ad19d4314 100644 --- a/src/demo/thunder.bombs.a +++ b/src/demo/thunder.bombs.a @@ -25,7 +25,8 @@ jsr $7800 ; unpack/setup lda #0 - sta $3F2 ; reset vector + sta $3F2 ; reset vector B8F2 + sta $3FE ; IRQ vector B8FE ldx #3-1 - lda patch2,x @@ -43,10 +44,10 @@ callback bit $C000 ldx #$30 - bit $C055 lda #$0B - jsr $FCA8 + jsr fakewait ; fix timing of title screen on //gs bit $C054 lda #$0B - jsr $FCA8 + jsr fakewait bit $C000 bmi exit dey @@ -54,6 +55,15 @@ callback bit $C000 dex bne - jmp $8839 + +fakewait sec +wait1 pha +wait2 sbc #$01 + bne wait2 + pla + sbc #$01 + bne wait1 + rts exit patch2 !byte $4C,$00,$01 diff --git a/src/prelaunch/conan.a b/src/prelaunch/conan.a index 590268ecc..12fe8d4c0 100755 --- a/src/prelaunch/conan.a +++ b/src/prelaunch/conan.a @@ -15,13 +15,16 @@ sta $bd40 jsr $bc94 - lda #1 ; reset vector fix - sta $7C01 ; to $3F3 + lda #0 ; vector fixes + sta $7C09 ; to $3FE - IRQ + lda #1 + sta $7C01 ; to $3F3 - reset + sta $7C0B ; to $3FF - IRQ lda #$A4 - sta $7C02 ; to $3F4 (doesn't change $3F2) + sta $7C02 ; to $3F4 - reset ($3F2 doesn't change) +DISABLE_ACCEL - jsr $5ff8 ; run intro + jsr $5ff8 ; decompress, run intro +ENABLE_ACCEL lda #$6c diff --git a/src/prelaunch/gamma.goblins.a b/src/prelaunch/gamma.goblins.a index f92314b5e..235091191 100755 --- a/src/prelaunch/gamma.goblins.a +++ b/src/prelaunch/gamma.goblins.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2019 by 4am/Frank M. +;(c) 2019-2022 by 4am/Frank M. !cpu 6502 !to "build/PRELAUNCH.INDEXED/GAMMA.GOBLINS",plain @@ -21,7 +21,7 @@ lda #$00 sta $7F62 ; patch - don't increase lives + - +RESET_VECTOR $100 + +RESET_AND_IRQ_VECTOR $100 +DISABLE_ACCEL lda #$00 tay diff --git a/src/prelaunch/pacman.a b/src/prelaunch/pacman.a index 68c532c14..8b649f6bc 100644 --- a/src/prelaunch/pacman.a +++ b/src/prelaunch/pacman.a @@ -17,7 +17,7 @@ lda #$80 sta $103F lda #2 - sta $104A ; reset vector patch + sta $104A ; reset/IRQ vector patch +READ_RAM2_NO_WRITE lda MachineStatus diff --git a/src/prelaunch/thunder.bombs.a b/src/prelaunch/thunder.bombs.a index 13ccdaf79..8c0da1378 100644 --- a/src/prelaunch/thunder.bombs.a +++ b/src/prelaunch/thunder.bombs.a @@ -23,7 +23,8 @@ jsr $7800 ; unpack/setup lda #0 - sta $3F2 ; reset vector + sta $3F2 ; reset vector B8F2 + sta $3FE ; IRQ vector B8FE +READ_RAM2_NO_WRITE lda MockingboardStuff