diff --git a/src/prelaunch/pulsar.ii.a b/src/prelaunch/pulsar.ii.a index 2d6250b06..c30ba3214 100644 --- a/src/prelaunch/pulsar.ii.a +++ b/src/prelaunch/pulsar.ii.a @@ -16,7 +16,7 @@ callback0 jmp $3FF8 ; decompress callback1 - jsr HideLaunchArtwork + +HIDE_ARTWORK jsr $BE00 +GET_MACHINE_STATUS and #CHEATS_ENABLED diff --git a/src/prelaunch/puyo.puyo.a b/src/prelaunch/puyo.puyo.a index 0c1a9bd97..1f209faa7 100644 --- a/src/prelaunch/puyo.puyo.a +++ b/src/prelaunch/puyo.puyo.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK +LC_REBOOT lda #$4C diff --git a/src/prelaunch/qix.a b/src/prelaunch/qix.a index a97a0cc29..f0b7ab94b 100644 --- a/src/prelaunch/qix.a +++ b/src/prelaunch/qix.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK inc $3F4 ; force reboot lda # HideLaunchArtwork { diff --git a/src/prelaunch/rampage.a b/src/prelaunch/rampage.a index 383603e71..8c3870086 100644 --- a/src/prelaunch/rampage.a +++ b/src/prelaunch/rampage.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK +GET_MACHINE_STATUS and #CHEATS_ENABLED php diff --git a/src/prelaunch/randamn.a b/src/prelaunch/randamn.a index 8639ac7e5..d96e8a3b7 100644 --- a/src/prelaunch/randamn.a +++ b/src/prelaunch/randamn.a @@ -40,8 +40,8 @@ callback +DISABLE_ACCEL jmp $808 cont + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $822 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/rb.a b/src/prelaunch/rb.a index 152c48abe..e4b33f133 100644 --- a/src/prelaunch/rb.a +++ b/src/prelaunch/rb.a @@ -7,8 +7,8 @@ !source "src/macros.a" - jsr HideLaunchArtwork +READ_RAM2_NO_WRITE + jsr HideLaunchArtworkLC2 lda WaitForVBL cmp #$60 diff --git a/src/prelaunch/realm.imposs.a b/src/prelaunch/realm.imposs.a index 4d88f3a71..0d774df86 100644 --- a/src/prelaunch/realm.imposs.a +++ b/src/prelaunch/realm.imposs.a @@ -24,9 +24,9 @@ + +READ_RAM2_WRITE_RAM2 jsr DisableAccelerator + jsr HideLaunchArtworkLC2 sta $C05F ; fix //c and //c+ HGR color +READ_RAM1_WRITE_RAM1 - jsr HideLaunchArtwork jmp $1953 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/renegade.a b/src/prelaunch/renegade.a index b4cb10731..07aead59e 100644 --- a/src/prelaunch/renegade.a +++ b/src/prelaunch/renegade.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK inc $3F4 ; force reboot +GET_MACHINE_STATUS and #CHEATS_ENABLED diff --git a/src/prelaunch/repton.a b/src/prelaunch/repton.a index ff03099a1..e1c041f84 100644 --- a/src/prelaunch/repton.a +++ b/src/prelaunch/repton.a @@ -21,8 +21,7 @@ lda #$60 sta $86D jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $BA03 callback diff --git a/src/prelaunch/rescue.raiders.a b/src/prelaunch/rescue.raiders.a index 0edf25e2c..82f6edb6b 100755 --- a/src/prelaunch/rescue.raiders.a +++ b/src/prelaunch/rescue.raiders.a @@ -9,9 +9,9 @@ +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator + jsr HideLaunchArtworkLC2 +LOAD_FILE_AT rraiders_mb, $300 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $300 rraiders_mb diff --git a/src/prelaunch/ribbit.a b/src/prelaunch/ribbit.a index 47f66509a..f45be4a46 100644 --- a/src/prelaunch/ribbit.a +++ b/src/prelaunch/ribbit.a @@ -20,8 +20,8 @@ sta $6589 ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/roach.hotel.a b/src/prelaunch/roach.hotel.a index 43d340e28..a66a16886 100644 --- a/src/prelaunch/roach.hotel.a +++ b/src/prelaunch/roach.hotel.a @@ -21,8 +21,7 @@ jmp $800 ; decompress callback1 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp ($202) callback2 diff --git a/src/prelaunch/roadblock.a b/src/prelaunch/roadblock.a index 388cabe4d..aabd35daf 100644 --- a/src/prelaunch/roadblock.a +++ b/src/prelaunch/roadblock.a @@ -19,8 +19,8 @@ sta $15D0 ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $810 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/robocop.a b/src/prelaunch/robocop.a index 2eb797c2e..719babc7b 100644 --- a/src/prelaunch/robocop.a +++ b/src/prelaunch/robocop.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #$60 sta $33C jsr $300 diff --git a/src/prelaunch/robot.battle.a b/src/prelaunch/robot.battle.a index 9a5d827eb..24ada5466 100644 --- a/src/prelaunch/robot.battle.a +++ b/src/prelaunch/robot.battle.a @@ -19,8 +19,8 @@ sta $7930 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/roger.rabbit.a b/src/prelaunch/roger.rabbit.a index d03a3952d..f3db87319 100644 --- a/src/prelaunch/roger.rabbit.a +++ b/src/prelaunch/roger.rabbit.a @@ -60,8 +60,7 @@ lda #>@cheat sta $1A18 + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $1000 @path !byte @path_e-@path_b diff --git a/src/prelaunch/round.about.a b/src/prelaunch/round.about.a index 60e188a2e..3d5783e31 100644 --- a/src/prelaunch/round.about.a +++ b/src/prelaunch/round.about.a @@ -27,9 +27,8 @@ lda #$2A sta $4000 ; remove activity indicator - - +DISABLE_ACCEL - jsr HideLaunchArtwork + + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $7000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/run.for.money.a b/src/prelaunch/run.for.money.a index 0386d226a..205101bef 100644 --- a/src/prelaunch/run.for.money.a +++ b/src/prelaunch/run.for.money.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $897 jsr $800 ; decompress diff --git a/src/prelaunch/russki.duck.a b/src/prelaunch/russki.duck.a index be34a152a..aa16ab0fa 100644 --- a/src/prelaunch/russki.duck.a +++ b/src/prelaunch/russki.duck.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $3EDB jsr $3E8A ; decompress diff --git a/src/prelaunch/sabotage.a b/src/prelaunch/sabotage.a index 2fb8dc290..0441c72da 100755 --- a/src/prelaunch/sabotage.a +++ b/src/prelaunch/sabotage.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 ; hook1 sta $4020 jsr $4000 ; decompress1 diff --git a/src/prelaunch/sammy.lightfoot.a b/src/prelaunch/sammy.lightfoot.a index f9f593cfe..61fefc70b 100644 --- a/src/prelaunch/sammy.lightfoot.a +++ b/src/prelaunch/sammy.lightfoot.a @@ -26,8 +26,7 @@ sta $209 sta $211 sta $21C - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $B7A1 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/saracen.a b/src/prelaunch/saracen.a index e3b1c30f6..975858f5e 100644 --- a/src/prelaunch/saracen.a +++ b/src/prelaunch/saracen.a @@ -11,7 +11,7 @@ lda #$60 sta $21F8 jsr $2000 ; load "DOS" - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #callback diff --git a/src/prelaunch/seafox.a b/src/prelaunch/seafox.a index 97ee4ebfd..8116e5183 100644 --- a/src/prelaunch/seafox.a +++ b/src/prelaunch/seafox.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $4939 sta $495A diff --git a/src/prelaunch/serpentine.a b/src/prelaunch/serpentine.a index f1cce5e58..8aece7bdb 100644 --- a/src/prelaunch/serpentine.a +++ b/src/prelaunch/serpentine.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK +NEW_RESET_VECTOR $3C0 ldx #(patch_e-patch)-1 - lda patch,x diff --git a/src/prelaunch/shamus.a b/src/prelaunch/shamus.a index d05d3a201..f908bf517 100644 --- a/src/prelaunch/shamus.a +++ b/src/prelaunch/shamus.a @@ -20,8 +20,8 @@ sta $77EC ; patch - don't increase lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $747C !if * > HideLaunchArtwork { diff --git a/src/prelaunch/sheila.a b/src/prelaunch/sheila.a index e17ff0875..ff09df765 100644 --- a/src/prelaunch/sheila.a +++ b/src/prelaunch/sheila.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $C85 diff --git a/src/prelaunch/short.circuit.a b/src/prelaunch/short.circuit.a index 533aa9836..527785bff 100644 --- a/src/prelaunch/short.circuit.a +++ b/src/prelaunch/short.circuit.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $207C jsr $2000 ; decompress diff --git a/src/prelaunch/situation.crtcl.a b/src/prelaunch/situation.crtcl.a index 2ddc8b699..bd7766e55 100644 --- a/src/prelaunch/situation.crtcl.a +++ b/src/prelaunch/situation.crtcl.a @@ -7,12 +7,12 @@ !source "src/macros.a" - jsr HideLaunchArtwork lda #$60 sta $336 jsr $300 +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator + jsr HideLaunchArtworkLC2 +LOAD_FILE_AT sitcrit_cheat, $BC00 +READ_ROM_NO_WRITE lda #0 diff --git a/src/prelaunch/skyfox.a b/src/prelaunch/skyfox.a index 83cdf53e0..944b4c0ab 100755 --- a/src/prelaunch/skyfox.a +++ b/src/prelaunch/skyfox.a @@ -35,8 +35,7 @@ nopatch rts + - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK inc $80 ; requires a non-zero value for the RNG lda #$60 sta $7E3A diff --git a/src/prelaunch/snack.attack.a b/src/prelaunch/snack.attack.a index bf3c3713f..a0693575f 100755 --- a/src/prelaunch/snack.attack.a +++ b/src/prelaunch/snack.attack.a @@ -11,8 +11,7 @@ lda #$60 sta $82E jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $BD1C ; title screen diff --git a/src/prelaunch/snake.byte.a b/src/prelaunch/snake.byte.a index e1b0afeaf..9855f5656 100644 --- a/src/prelaunch/snake.byte.a +++ b/src/prelaunch/snake.byte.a @@ -22,6 +22,7 @@ dec $78A8 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +LC_REBOOT +READ_ROM_NO_WRITE ldx #0 @@ -29,7 +30,6 @@ inx stx $7a19 inc $7A26 - jsr HideLaunchArtwork jmp $7680 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/sneakers.a b/src/prelaunch/sneakers.a index af3de1e47..90ecd7f80 100755 --- a/src/prelaunch/sneakers.a +++ b/src/prelaunch/sneakers.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $84c7 jsr $3ffa ; decompress diff --git a/src/prelaunch/snoggle.a b/src/prelaunch/snoggle.a index 516891610..cf87a249d 100644 --- a/src/prelaunch/snoggle.a +++ b/src/prelaunch/snoggle.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK +USES_TEXT_PAGE_2 jmp $4a00 diff --git a/src/prelaunch/soko.ban.a b/src/prelaunch/soko.ban.a index 239c3d22b..f4f7e5d6d 100644 --- a/src/prelaunch/soko.ban.a +++ b/src/prelaunch/soko.ban.a @@ -11,12 +11,12 @@ lda #$60 sta $A17 jsr $800 ; load "DOS" - jsr HideLaunchArtwork lda #$60 sta $EC38 jsr $EC00 ; set up vectors inc $3F4 ; reboot jsr DisableAccelerator + jsr HideLaunchArtworkLC2 jmp $F6C5 !if * > HideLaunchArtwork {