diff --git a/res/DEMO/AGENT.U.S.A b/res/DEMO/AGENT.U.S.A index c1f59bfe5..43252deeb 100644 Binary files a/res/DEMO/AGENT.U.S.A and b/res/DEMO/AGENT.U.S.A differ diff --git a/res/DEMO/DINO.EGGS b/res/DEMO/DINO.EGGS index 427151c6d..26e2c8f72 100755 Binary files a/res/DEMO/DINO.EGGS and b/res/DEMO/DINO.EGGS differ diff --git a/res/DEMO/FALCONS b/res/DEMO/FALCONS index 7e5f4ec6e..62593f1de 100755 Binary files a/res/DEMO/FALCONS and b/res/DEMO/FALCONS differ diff --git a/res/DEMO/REPTON b/res/DEMO/REPTON index 82c14ecb7..4f90f3f86 100755 Binary files a/res/DEMO/REPTON and b/res/DEMO/REPTON differ diff --git a/res/DEMO/THUNDER.BOMBS b/res/DEMO/THUNDER.BOMBS index 9809faba5..4213c2c06 100755 Binary files a/res/DEMO/THUNDER.BOMBS and b/res/DEMO/THUNDER.BOMBS differ diff --git a/src/demo/agent.u.s.a.a b/src/demo/agent.u.s.a.a index 37f04a632..b721c76e4 100644 --- a/src/demo/agent.u.s.a.a +++ b/src/demo/agent.u.s.a.a @@ -9,7 +9,6 @@ !source "src/macros.a" +READ_RAM2_WRITE_RAM2 - jsr EnableAccelerator +LOAD_FILE_AT title, $00 +READ_ROM_NO_WRITE @@ -19,12 +18,12 @@ ldx #5 - lda $100,x - sta reset,x + sta $300,x dex bpl - sec rol $3F3 ; point to $300 instead - jsr $FB6F ; reset vector checksum (bank ROM in) + jsr $FB6F lda #$EA sta $15DD @@ -44,12 +43,8 @@ lda #$D0 sta $AC64 ; disable sound - +DISABLE_ACCEL - jmp $837 -reset !byte $00,$00,$00,$00,$00,$00 - title !byte x_e-x_b x_b !text "X/AGENT.U.S.A/AGENT.U.S.A" x_e diff --git a/src/demo/dino.eggs.a b/src/demo/dino.eggs.a index a869861d1..a615c6212 100644 --- a/src/demo/dino.eggs.a +++ b/src/demo/dino.eggs.a @@ -10,7 +10,6 @@ +GAME_REQUIRES_JOYSTICK +READ_RAM2_WRITE_RAM2 - jsr EnableAccelerator ;+LOAD_FILE_KEEP_DIR ldx #0 ; read to main memory @@ -42,8 +41,6 @@ sta $0863 ; disable sound - +DISABLE_ACCEL - jmp $A892 newpath diff --git a/src/demo/falcons.a b/src/demo/falcons.a index 17817d82c..d26272360 100644 --- a/src/demo/falcons.a +++ b/src/demo/falcons.a @@ -9,7 +9,6 @@ !source "src/macros.a" +READ_RAM2_WRITE_RAM2 - jsr EnableAccelerator +LOAD_FILE_AT title, $00 lda #$60 @@ -29,8 +28,6 @@ sta $9FF7+2 sta $9FDC+2 ; set exits - +DISABLE_ACCEL - jmp $6000 title !byte x_e-x_b diff --git a/src/demo/repton.a b/src/demo/repton.a index 6684edc89..92ef4d4fe 100644 --- a/src/demo/repton.a +++ b/src/demo/repton.a @@ -9,7 +9,6 @@ !source "src/macros.a" +READ_RAM2_WRITE_RAM2 - jsr EnableAccelerator ;+LOAD_FILE_KEEP_DIR ldx #0 ; read to main memory @@ -44,8 +43,6 @@ dex bpl - ; exit at end of demo cycle - +DISABLE_ACCEL - jmp $0767 patch1 !byte $10,$13,$4C,$00,$01 diff --git a/src/demo/thunder.bombs.a b/src/demo/thunder.bombs.a index 35729cc59..44a21c168 100644 --- a/src/demo/thunder.bombs.a +++ b/src/demo/thunder.bombs.a @@ -31,7 +31,7 @@ sta $8819+1 lda #>callback sta $8819+2 - jsr $87F9 ; load/title + jsr $87F9 ; load, show title lda #$60 sta $7818 @@ -63,10 +63,10 @@ callback bit $C000 ldx #$30 - bit $C055 lda #$0B - jsr $FCA8 + jsr fakewait bit $C054 lda #$0B - jsr $FCA8 + jsr fakewait bit $C000 bmi exit dey @@ -76,6 +76,15 @@ callback bit $C000 jmp $8839 exit jmp $100 +fakewait sec +wait1 pha +wait2 sbc #$01 + bne wait2 + pla + sbc #$01 + bne wait1 + rts + newpath !byte 15 !text "X/THUNDER.BOMBS" diff --git a/src/prelaunch/agent.u.s.a.a b/src/prelaunch/agent.u.s.a.a index 9bf1b6441..e1655ab6c 100644 --- a/src/prelaunch/agent.u.s.a.a +++ b/src/prelaunch/agent.u.s.a.a @@ -7,7 +7,6 @@ !source "src/prelaunch/common.a" - +ENABLE_ACCEL lda #$60 sta $36D3 jsr $366D ; decompress @@ -21,7 +20,6 @@ rol $3F3 ; point to $300 instead jsr $FB6F - +DISABLE_ACCEL jmp $837 !if * > $1C0 { diff --git a/src/prelaunch/dino.eggs.a b/src/prelaunch/dino.eggs.a index ea1503297..ad69c2504 100644 --- a/src/prelaunch/dino.eggs.a +++ b/src/prelaunch/dino.eggs.a @@ -7,7 +7,6 @@ !source "src/prelaunch/common.a" - +ENABLE_ACCEL lda #$60 sta $2186 jsr $2100 ; decompress @@ -16,7 +15,7 @@ beq + lda #$ad sta $1895 ; patch - don't decrease lives -+ +DISABLE_ACCEL ++ jmp $A892 !if * > $1C0 { diff --git a/src/prelaunch/falcons.a b/src/prelaunch/falcons.a index d9af807e4..00b26796e 100644 --- a/src/prelaunch/falcons.a +++ b/src/prelaunch/falcons.a @@ -7,7 +7,6 @@ !source "src/prelaunch/common.a" - +ENABLE_ACCEL lda #$60 sta $3f0b jsr $3eba ; decompress @@ -24,7 +23,6 @@ dec $9d19 ; patch - don't decrease lives dec $9d06 ; patch - don't decrease lives + - +DISABLE_ACCEL jmp $6000 !if * > $1C0 { diff --git a/src/prelaunch/thunder.bombs.a b/src/prelaunch/thunder.bombs.a index a89c113a2..1ef36f1ac 100644 --- a/src/prelaunch/thunder.bombs.a +++ b/src/prelaunch/thunder.bombs.a @@ -9,7 +9,13 @@ lda #$60 sta $887F - jsr $87F9 ; load/title + lda #fakewait + sta $8823+2 + sta $882B+2 ; fix timing of title screen on //gs + jsr $87F9 ; load, show title +ENABLE_ACCEL lda #$60 @@ -17,7 +23,8 @@ jsr $7800 ; unpack/setup lda #0 - sta $3F2 + sta $3F2 ; reset vector + +READ_RAM2_NO_WRITE lda MockingboardStuff +READ_ROM_NO_WRITE @@ -44,6 +51,15 @@ lda $323 jmp $781B +fakewait sec +wait1 pha +wait2 sbc #$01 + bne wait2 + pla + sbc #$01 + bne wait1 + rts + !if * > $1C0 { !error "code is too large, ends at ", * }