diff --git a/src/prelaunch/infiltrator.a b/src/prelaunch/infiltrator.a index ce07f88f0..199d5bf7e 100644 --- a/src/prelaunch/infiltrator.a +++ b/src/prelaunch/infiltrator.a @@ -7,15 +7,15 @@ !source "src/macros.a" - +READ_RAM1_WRITE_RAM1 + +READ_RAM2_WRITE_RAM2 +LC_REBOOT + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE lda #$B4 sta $98E lda #$EF sta $98D ; reset vector fix - jsr HideLaunchArtwork jmp $800 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/its.the.pits.a b/src/prelaunch/its.the.pits.a index 2f1c3d226..42002d8ea 100644 --- a/src/prelaunch/its.the.pits.a +++ b/src/prelaunch/its.the.pits.a @@ -32,8 +32,8 @@ sta $249E ; patch - don't increase lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $1800 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/jawbreaker.a b/src/prelaunch/jawbreaker.a index e1b5f3e24..58508427b 100644 --- a/src/prelaunch/jawbreaker.a +++ b/src/prelaunch/jawbreaker.a @@ -21,8 +21,7 @@ lda #$00 sta $6C71 ; patch - don't decrease lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/jawbreaker.ii.a b/src/prelaunch/jawbreaker.ii.a index 6fa2c1ed2..f484d8790 100644 --- a/src/prelaunch/jawbreaker.ii.a +++ b/src/prelaunch/jawbreaker.ii.a @@ -11,7 +11,6 @@ lda #$60 sta $85B jsr $800 ; decompress - jsr HideLaunchArtwork +GET_MACHINE_STATUS and #CHEATS_ENABLED beq + @@ -20,7 +19,7 @@ lda #>callback sta $35D + - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $301 callback diff --git a/src/prelaunch/joust.a b/src/prelaunch/joust.a index 159b378b5..2695500c1 100755 --- a/src/prelaunch/joust.a +++ b/src/prelaunch/joust.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $82f sta $85e diff --git a/src/prelaunch/juggler.a b/src/prelaunch/juggler.a index 2d3ccc586..0a0d44a6e 100755 --- a/src/prelaunch/juggler.a +++ b/src/prelaunch/juggler.a @@ -19,7 +19,7 @@ lda #$60 sta $7D1F - jsr HideLaunchArtwork + +HIDE_ARTWORK jsr $3FF5 ; unpack & show title lda #$60 diff --git a/src/prelaunch/jump.jet.a b/src/prelaunch/jump.jet.a index 327cadfa3..dc25eb3ec 100644 --- a/src/prelaunch/jump.jet.a +++ b/src/prelaunch/jump.jet.a @@ -24,8 +24,9 @@ callback sta $131D ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jmp HideLaunchArtwork + rts !if * > HideLaunchArtwork { !error "code is too large, ends at ", * diff --git a/src/prelaunch/jumpman.a b/src/prelaunch/jumpman.a index 40873eff2..bd97aa8fe 100755 --- a/src/prelaunch/jumpman.a +++ b/src/prelaunch/jumpman.a @@ -23,8 +23,7 @@ lda #1 sta $88E4 ; reset vector patch - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $8000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/jungle.hunt.a b/src/prelaunch/jungle.hunt.a index 815abda93..7a74be5ac 100755 --- a/src/prelaunch/jungle.hunt.a +++ b/src/prelaunch/jungle.hunt.a @@ -72,8 +72,7 @@ no_hook lda #>callback sta $1D2E - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $A00 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/kamikaze.a b/src/prelaunch/kamikaze.a index 7170abc02..c9113ffa2 100644 --- a/src/prelaunch/kamikaze.a +++ b/src/prelaunch/kamikaze.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $7B12 jsr $739A ; decompress diff --git a/src/prelaunch/kid.niki.a b/src/prelaunch/kid.niki.a index 38e44e4b7..f75dff6be 100755 --- a/src/prelaunch/kid.niki.a +++ b/src/prelaunch/kid.niki.a @@ -22,8 +22,7 @@ lda #$AD sta $BD34 ; patch - don't decrease lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $61E3 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/kung.fu.master.a b/src/prelaunch/kung.fu.master.a index 2db9ad6e8..bcf13e857 100644 --- a/src/prelaunch/kung.fu.master.a +++ b/src/prelaunch/kung.fu.master.a @@ -14,8 +14,7 @@ lda #$60 sta $9A0 jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK ldx #0 lda #$C4 jsr $BB00 diff --git a/src/prelaunch/lamb.chops.a b/src/prelaunch/lamb.chops.a index 9f967aacc..1e88c87fb 100644 --- a/src/prelaunch/lamb.chops.a +++ b/src/prelaunch/lamb.chops.a @@ -12,8 +12,7 @@ sta $87C sta $896 jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $300 +ENABLE_ACCEL jsr $87F diff --git a/src/prelaunch/lancaster.a b/src/prelaunch/lancaster.a index 1d6687886..c3dc79121 100644 --- a/src/prelaunch/lancaster.a +++ b/src/prelaunch/lancaster.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #cheat diff --git a/src/prelaunch/last.gladiator.a b/src/prelaunch/last.gladiator.a index 2985d7b22..186f6541f 100644 --- a/src/prelaunch/last.gladiator.a +++ b/src/prelaunch/last.gladiator.a @@ -11,7 +11,6 @@ lda #$60 sta $11EA jsr $1000 ; decompress - jsr HideLaunchArtwork lda #$4C sta $BC00 @@ -28,7 +27,7 @@ dex bpl - - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $11EF reset_b !pseudopc $240 { diff --git a/src/prelaunch/lazer.silk.a b/src/prelaunch/lazer.silk.a index 457b686bd..2f5bdee5b 100644 --- a/src/prelaunch/lazer.silk.a +++ b/src/prelaunch/lazer.silk.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $404B jsr $4000 ; decompress diff --git a/src/prelaunch/lemm.sir.a b/src/prelaunch/lemm.sir.a index 16e4a6683..0a7f6abcd 100644 --- a/src/prelaunch/lemm.sir.a +++ b/src/prelaunch/lemm.sir.a @@ -20,8 +20,8 @@ sta $BA5E ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $8C8 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/lemmings.a b/src/prelaunch/lemmings.a index ade49db25..009a7a3ea 100644 --- a/src/prelaunch/lemmings.a +++ b/src/prelaunch/lemmings.a @@ -15,8 +15,8 @@ +READ_RAM2_WRITE_RAM2 +NEW_RESET_VECTOR_64K $300 jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/little.comp.ppl.a b/src/prelaunch/little.comp.ppl.a index 9c7d52c1b..a7dc0e615 100644 --- a/src/prelaunch/little.comp.ppl.a +++ b/src/prelaunch/little.comp.ppl.a @@ -11,8 +11,7 @@ lda #$60 sta $A10 jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $6399 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/lock.n.chase.a b/src/prelaunch/lock.n.chase.a index 1c0907469..6a3cff8d4 100644 --- a/src/prelaunch/lock.n.chase.a +++ b/src/prelaunch/lock.n.chase.a @@ -12,7 +12,7 @@ sta $4326 sta $4345 jsr $800 ; decompress - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #$60 sta $647B jsr $6400 diff --git a/src/prelaunch/lode.runner.a b/src/prelaunch/lode.runner.a index 1b5ded607..c48e1a540 100644 --- a/src/prelaunch/lode.runner.a +++ b/src/prelaunch/lode.runner.a @@ -13,8 +13,7 @@ jsr $1F00 ; decompress dec $6AD1 inc $6ADA ; swap buttons - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $9050 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/lost.tomb.a b/src/prelaunch/lost.tomb.a index da73a6deb..d6b2bdb48 100644 --- a/src/prelaunch/lost.tomb.a +++ b/src/prelaunch/lost.tomb.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $82A jsr $800 ; decompress diff --git a/src/prelaunch/lunar.explorer.a b/src/prelaunch/lunar.explorer.a index e67bc58f4..62b17ca03 100644 --- a/src/prelaunch/lunar.explorer.a +++ b/src/prelaunch/lunar.explorer.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $83A jsr $800 ; decompress diff --git a/src/prelaunch/lunar.leepers.a b/src/prelaunch/lunar.leepers.a index c62872414..a47774321 100644 --- a/src/prelaunch/lunar.leepers.a +++ b/src/prelaunch/lunar.leepers.a @@ -25,8 +25,8 @@ sta $33E + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $6000 callback diff --git a/src/prelaunch/mad.rat.a b/src/prelaunch/mad.rat.a index 4397fd97d..94b9007b1 100644 --- a/src/prelaunch/mad.rat.a +++ b/src/prelaunch/mad.rat.a @@ -21,8 +21,7 @@ callback lda #$a5 sta $692D ; patch - don't decrease lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $91D0 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/marauder.a b/src/prelaunch/marauder.a index 10a1dc367..c1e78a978 100644 --- a/src/prelaunch/marauder.a +++ b/src/prelaunch/marauder.a @@ -12,7 +12,6 @@ lda #$60 sta $864 jsr $800 ; decompress - jsr HideLaunchArtwork +NEW_RESET_VECTOR $3B0 lda #$2C @@ -35,6 +34,7 @@ sta $B608 + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE jmp $B5B9 diff --git a/src/prelaunch/marble.madness.a b/src/prelaunch/marble.madness.a index 29892d271..27bd652d7 100644 --- a/src/prelaunch/marble.madness.a +++ b/src/prelaunch/marble.madness.a @@ -32,8 +32,8 @@ callback dec $898F ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $1000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/mario.bros.a b/src/prelaunch/mario.bros.a index 48d20700f..453bb661d 100755 --- a/src/prelaunch/mario.bros.a +++ b/src/prelaunch/mario.bros.a @@ -20,8 +20,7 @@ lda #1 sta $402F ; reset vector patch - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $4000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/mars.cars.a b/src/prelaunch/mars.cars.a index a925d2aef..b4f4b439c 100644 --- a/src/prelaunch/mars.cars.a +++ b/src/prelaunch/mars.cars.a @@ -11,8 +11,7 @@ lda #$4C sta $51CD jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $1100 +ENABLE_ACCEL diff --git a/src/prelaunch/mating.zone.a b/src/prelaunch/mating.zone.a index 009c3bd26..e1172c124 100644 --- a/src/prelaunch/mating.zone.a +++ b/src/prelaunch/mating.zone.a @@ -16,8 +16,7 @@ jsr $BD41 lda #$60 sta $B5DB - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $B59B lda $C054 +ENABLE_ACCEL diff --git a/src/prelaunch/matterhorn.a b/src/prelaunch/matterhorn.a index 25ac39ded..615d236bd 100644 --- a/src/prelaunch/matterhorn.a +++ b/src/prelaunch/matterhorn.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK +GET_MACHINE_STATUS and #CHEATS_ENABLED beq + diff --git a/src/prelaunch/maxwell.manor.a b/src/prelaunch/maxwell.manor.a index ca4dac2dc..567a1e425 100644 --- a/src/prelaunch/maxwell.manor.a +++ b/src/prelaunch/maxwell.manor.a @@ -18,7 +18,7 @@ callback +LC_REBOOT +READ_RAM2_WRITE_RAM2 jsr DisableAccelerator - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 jmp $21CD !if * > HideLaunchArtwork { diff --git a/src/prelaunch/megabots.a b/src/prelaunch/megabots.a index 3f5c9a1d7..aa6c4c4bb 100644 --- a/src/prelaunch/megabots.a +++ b/src/prelaunch/megabots.a @@ -12,8 +12,7 @@ sta $9F1 jsr $800 ; load DOS - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK ldx #$60 jmp $B700 diff --git a/src/prelaunch/microwave.a b/src/prelaunch/microwave.a index ef6b23cd2..4abcabef2 100644 --- a/src/prelaunch/microwave.a +++ b/src/prelaunch/microwave.a @@ -30,8 +30,7 @@ callback ++ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #callback diff --git a/src/prelaunch/miner.2049er.a b/src/prelaunch/miner.2049er.a index 4fd6f5b35..3cbe1f331 100644 --- a/src/prelaunch/miner.2049er.a +++ b/src/prelaunch/miner.2049er.a @@ -10,8 +10,7 @@ jmp + callback - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $0918 + diff --git a/src/prelaunch/miner.ii.a b/src/prelaunch/miner.ii.a index 7a08d6210..bd8b6daa5 100644 --- a/src/prelaunch/miner.ii.a +++ b/src/prelaunch/miner.ii.a @@ -21,8 +21,7 @@ callback lda #$bd sta $938 ; patch - don't decrease lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $8D9 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/mings.challenge.a b/src/prelaunch/mings.challenge.a index 0ada5892f..8fc9b809e 100644 --- a/src/prelaunch/mings.challenge.a +++ b/src/prelaunch/mings.challenge.a @@ -23,8 +23,8 @@ callback sta $B418 lda #>cheat sta $B419 -+ +DISABLE_ACCEL - jsr HideLaunchArtwork ++ + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $1183 cheat diff --git a/src/prelaunch/minit.man.a b/src/prelaunch/minit.man.a index 8bd814620..993495767 100644 --- a/src/prelaunch/minit.man.a +++ b/src/prelaunch/minit.man.a @@ -45,7 +45,6 @@ main lda #$60 sta $9FD jsr $800 ; load DOS - jsr HideLaunchArtwork lda #$A9 sta $BF24 lda #$01 @@ -55,7 +54,7 @@ main lda #>callback sta $BD27 + - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $B700 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/minotaur.a b/src/prelaunch/minotaur.a index 0f71b8c52..fb9bebcc7 100644 --- a/src/prelaunch/minotaur.a +++ b/src/prelaunch/minotaur.a @@ -18,8 +18,7 @@ lda #$37 sta $180 ; patch - enable cheat mode + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $FF8 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/monster.mash.a b/src/prelaunch/monster.mash.a index 81009e50d..36480dc33 100644 --- a/src/prelaunch/monster.mash.a +++ b/src/prelaunch/monster.mash.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $A16 jsr $800 ; load DOS diff --git a/src/prelaunch/montezuma.a b/src/prelaunch/montezuma.a index ad68a8b6a..a18b3ea24 100644 --- a/src/prelaunch/montezuma.a +++ b/src/prelaunch/montezuma.a @@ -17,8 +17,7 @@ lda #$a5 sta $6d0d + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $6004 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/moon.patrol.a b/src/prelaunch/moon.patrol.a index 5edea23dc..9e2f6b52b 100755 --- a/src/prelaunch/moon.patrol.a +++ b/src/prelaunch/moon.patrol.a @@ -21,8 +21,7 @@ + +NEW_RESET_VECTOR $280 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $919 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/mouskattack.a b/src/prelaunch/mouskattack.a index 2d4c67424..4e3676f7a 100644 --- a/src/prelaunch/mouskattack.a +++ b/src/prelaunch/mouskattack.a @@ -19,8 +19,8 @@ sta $58AC ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $813 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/movie.monster.a b/src/prelaunch/movie.monster.a index e30caf518..6728fce14 100644 --- a/src/prelaunch/movie.monster.a +++ b/src/prelaunch/movie.monster.a @@ -11,7 +11,7 @@ lda #$60 sta $9C7 jsr $800 ; find and load "DOS" - jsr HideLaunchArtwork + +HIDE_ARTWORK iny sty $B719 jsr $B700 diff --git a/src/prelaunch/mr.cool.a b/src/prelaunch/mr.cool.a index 6d88dd552..ef13c6f28 100644 --- a/src/prelaunch/mr.cool.a +++ b/src/prelaunch/mr.cool.a @@ -19,8 +19,8 @@ sta $4C47 ; patch - don't decrease lives sta $562F ; patch - don't increase lives -+ +DISABLE_ACCEL - jsr HideLaunchArtwork ++ + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $4000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/mr.do.a b/src/prelaunch/mr.do.a index 1d8f92a17..d505048be 100755 --- a/src/prelaunch/mr.do.a +++ b/src/prelaunch/mr.do.a @@ -32,7 +32,7 @@ cheat3 lda #$60 sta $83f - jsr HideLaunchArtwork + +HIDE_ARTWORK jsr $800 +GET_MACHINE_STATUS diff --git a/src/prelaunch/mr.robot.a b/src/prelaunch/mr.robot.a index 2de760754..e3dca16df 100755 --- a/src/prelaunch/mr.robot.a +++ b/src/prelaunch/mr.robot.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #$60 sta $0842 jsr $0800 ; decompress diff --git a/src/prelaunch/ms.pacman.a b/src/prelaunch/ms.pacman.a index d39b3e394..a511c58dc 100755 --- a/src/prelaunch/ms.pacman.a +++ b/src/prelaunch/ms.pacman.a @@ -24,8 +24,7 @@ lda #1 sta $202F ; reset vector patch - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $2000 cheat diff --git a/src/prelaunch/narnia.a b/src/prelaunch/narnia.a index 8496f452a..9239f7aee 100644 --- a/src/prelaunch/narnia.a +++ b/src/prelaunch/narnia.a @@ -11,8 +11,7 @@ lda #$60 sta $86AD jsr $3FF8 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $81E !if * > HideLaunchArtwork { diff --git a/src/prelaunch/neptune.a b/src/prelaunch/neptune.a index 8ca715125..9f1c0f003 100644 --- a/src/prelaunch/neptune.a +++ b/src/prelaunch/neptune.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $7E81 jsr $3FF8 ; decompress diff --git a/src/prelaunch/nibbler.a b/src/prelaunch/nibbler.a index 9278af615..87620d741 100644 --- a/src/prelaunch/nibbler.a +++ b/src/prelaunch/nibbler.a @@ -21,8 +21,8 @@ sta $12D3 ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $900 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/night.falls.a b/src/prelaunch/night.falls.a index c02068572..6f1c8d90a 100644 --- a/src/prelaunch/night.falls.a +++ b/src/prelaunch/night.falls.a @@ -19,8 +19,7 @@ callback2 jmp $FDF0 ++ - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK ldx #5 - lda $100,x diff --git a/src/prelaunch/night.mission.a b/src/prelaunch/night.mission.a index 265b456f3..91d68d66e 100644 --- a/src/prelaunch/night.mission.a +++ b/src/prelaunch/night.mission.a @@ -17,8 +17,8 @@ bne + inc $AFA ; force keyboard + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $0800 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/night.stalker.a b/src/prelaunch/night.stalker.a index 31b1089df..6e7ebacad 100755 --- a/src/prelaunch/night.stalker.a +++ b/src/prelaunch/night.stalker.a @@ -20,8 +20,7 @@ lda #$60 sta $2A5 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $283 +GET_MACHINE_STATUS and #CHEATS_ENABLED diff --git a/src/prelaunch/nightmare.a b/src/prelaunch/nightmare.a index e5e7d1ef1..ef4ae2f12 100644 --- a/src/prelaunch/nightmare.a +++ b/src/prelaunch/nightmare.a @@ -13,7 +13,6 @@ lda #$60 sta $404B jsr $4000 ; decompress - jsr HideLaunchArtwork ldx #(callback_e-callback)-1 - lda callback,x @@ -44,6 +43,7 @@ sta $8980 ; patch - don't increase lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE jmp $1206 diff --git a/src/prelaunch/oils.well.a b/src/prelaunch/oils.well.a index 84c31beaf..9e85ab3c4 100644 --- a/src/prelaunch/oils.well.a +++ b/src/prelaunch/oils.well.a @@ -32,7 +32,6 @@ main lda #$60 sta $9EF jsr $800 ; find and load "DOS" - jsr HideLaunchArtwork lda #callback1 @@ -52,7 +51,7 @@ callback1 lda #>callback2 sta $BD08 + - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $9D84 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/ootw.a b/src/prelaunch/ootw.a index a9d516559..e3fa920b6 100644 --- a/src/prelaunch/ootw.a +++ b/src/prelaunch/ootw.a @@ -11,7 +11,7 @@ sta $336 jsr $300 +USES_TEXT_PAGE_2 - jsr HideLaunchArtwork + +HIDE_ARTWORK jmp $800 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/orbitron.a b/src/prelaunch/orbitron.a index 40b7961b4..c92c86c96 100644 --- a/src/prelaunch/orbitron.a +++ b/src/prelaunch/orbitron.a @@ -7,8 +7,8 @@ !source "src/macros.a" - jsr HideLaunchArtwork +USES_TEXT_PAGE_2 + +HIDE_ARTWORK jmp $2000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/orileys.mine.a b/src/prelaunch/orileys.mine.a index 7990319d4..58cf8adae 100755 --- a/src/prelaunch/orileys.mine.a +++ b/src/prelaunch/orileys.mine.a @@ -30,8 +30,8 @@ sta $831C ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $8FD !if * > HideLaunchArtwork { diff --git a/src/prelaunch/outpost.a b/src/prelaunch/outpost.a index ab2b1fbd2..1afe18d78 100755 --- a/src/prelaunch/outpost.a +++ b/src/prelaunch/outpost.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK ;+ENABLE_ACCEL ; can't lda #$60 sta $3EF2 diff --git a/src/prelaunch/outworld.a b/src/prelaunch/outworld.a index 9af19f403..bbe1a541c 100755 --- a/src/prelaunch/outworld.a +++ b/src/prelaunch/outworld.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK +NEW_RESET_VECTOR $BFF0 jmp $27FD diff --git a/src/prelaunch/pacman.a b/src/prelaunch/pacman.a index e148b0712..cee492027 100644 --- a/src/prelaunch/pacman.a +++ b/src/prelaunch/pacman.a @@ -27,8 +27,7 @@ sta $5C0E ; patch - don't decrease lives sta $4135 ; patch - don't increase lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $1000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/pandoras.box.a b/src/prelaunch/pandoras.box.a index a4d62bf1f..3c1227de3 100644 --- a/src/prelaunch/pandoras.box.a +++ b/src/prelaunch/pandoras.box.a @@ -12,8 +12,7 @@ sta $833 sta $85A jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $85D +ENABLE_ACCEL jsr $836 diff --git a/src/prelaunch/paperboy.a b/src/prelaunch/paperboy.a index b91be5622..83557b842 100644 --- a/src/prelaunch/paperboy.a +++ b/src/prelaunch/paperboy.a @@ -7,9 +7,9 @@ !source "src/macros.a" - jsr HideLaunchArtwork +READ_RAM2_NO_WRITE jsr EnableAccelerator + jsr HideLaunchArtworkLC2 lda MachineStatus and #CHEATS_ENABLED sta callback_b+(cheat_smc-callback)+1 diff --git a/src/prelaunch/peeping.tom.a b/src/prelaunch/peeping.tom.a index 81faef0b1..e362d27db 100644 --- a/src/prelaunch/peeping.tom.a +++ b/src/prelaunch/peeping.tom.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK ;+ENABLE_ACCEL ; shows title right away lda # HideLaunchArtwork { diff --git a/src/prelaunch/pest.patrol.a b/src/prelaunch/pest.patrol.a index f79465d20..1d31683ea 100644 --- a/src/prelaunch/pest.patrol.a +++ b/src/prelaunch/pest.patrol.a @@ -18,8 +18,7 @@ sta $5791 ; patch - don't decrease lives sta $5352 ; patch - don't increase lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $4003 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/phantoms.five.a b/src/prelaunch/phantoms.five.a index 988a104b2..213955661 100644 --- a/src/prelaunch/phantoms.five.a +++ b/src/prelaunch/phantoms.five.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK +NEW_RESET_VECTOR $340 +GET_MACHINE_STATUS and #CHEATS_ENABLED diff --git a/src/prelaunch/pharaohs.revng.a b/src/prelaunch/pharaohs.revng.a index dfd337da9..8dd6dcab6 100644 --- a/src/prelaunch/pharaohs.revng.a +++ b/src/prelaunch/pharaohs.revng.a @@ -16,7 +16,7 @@ and #CHEATS_ENABLED php jsr DisableAccelerator - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 +LC_REBOOT lda #$60 sta $85F diff --git a/src/prelaunch/phaser.fire.a b/src/prelaunch/phaser.fire.a index 577671263..ef3829991 100644 --- a/src/prelaunch/phaser.fire.a +++ b/src/prelaunch/phaser.fire.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #$60 sta $4074 jsr $4000 ; decompress diff --git a/src/prelaunch/photar.a b/src/prelaunch/photar.a index 5d5b50a43..b85dfd63a 100755 --- a/src/prelaunch/photar.a +++ b/src/prelaunch/photar.a @@ -18,8 +18,7 @@ sta $62 ; uses reset vector for setup code +RESET_VECTOR $100 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $3FA !if * > HideLaunchArtwork { diff --git a/src/prelaunch/pick.n.pile.a b/src/prelaunch/pick.n.pile.a index f373112a1..b703eddce 100644 --- a/src/prelaunch/pick.n.pile.a +++ b/src/prelaunch/pick.n.pile.a @@ -11,8 +11,7 @@ lda #$60 sta $83A jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $803F !if * > HideLaunchArtwork { diff --git a/src/prelaunch/picnic.paranoia.a b/src/prelaunch/picnic.paranoia.a index f6108327a..eb87d8e7a 100644 --- a/src/prelaunch/picnic.paranoia.a +++ b/src/prelaunch/picnic.paranoia.a @@ -30,8 +30,8 @@ callback dec $79B7 ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $78fb !if * > HideLaunchArtwork { diff --git a/src/prelaunch/pieman.a b/src/prelaunch/pieman.a index 4e54298bc..ee1ae2832 100755 --- a/src/prelaunch/pieman.a +++ b/src/prelaunch/pieman.a @@ -11,8 +11,7 @@ lda #$60 ; hook1 sta $3EA9 jsr $3E88 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 ; hook2 sta $A050 diff --git a/src/prelaunch/pig.pen.a b/src/prelaunch/pig.pen.a index 2b1ffca2d..91d40eaed 100644 --- a/src/prelaunch/pig.pen.a +++ b/src/prelaunch/pig.pen.a @@ -14,8 +14,7 @@ jsr $6500 ; decompress lda #$60 sta $936D - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $9340 ; show title screen +ENABLE_ACCEL jsr $9396 ; decompress more diff --git a/src/prelaunch/pipe.dream.a b/src/prelaunch/pipe.dream.a index d1a3aee38..c531c0da5 100644 --- a/src/prelaunch/pipe.dream.a +++ b/src/prelaunch/pipe.dream.a @@ -9,8 +9,8 @@ my_vbl !source "src/macros.a" - jsr HideLaunchArtwork - +READ_RAM1_NO_WRITE + +READ_RAM2_NO_WRITE + jsr HideLaunchArtworkLC2 lda WaitForVBL cmp #$60 beq @skip_vbl diff --git a/src/prelaunch/pitfall.ii.a b/src/prelaunch/pitfall.ii.a index a9faa1c75..8b84a3f5d 100644 --- a/src/prelaunch/pitfall.ii.a +++ b/src/prelaunch/pitfall.ii.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $3D34 jsr $0800 ; decompress diff --git a/src/prelaunch/plasmania.a b/src/prelaunch/plasmania.a index 582f70ece..5ddd3e0ed 100755 --- a/src/prelaunch/plasmania.a +++ b/src/prelaunch/plasmania.a @@ -39,8 +39,8 @@ callback1 sta $92D7 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/platoon.a b/src/prelaunch/platoon.a index 86fa3a2d4..b9c1486e6 100644 --- a/src/prelaunch/platoon.a +++ b/src/prelaunch/platoon.a @@ -17,7 +17,7 @@ jsr $1000 dex jsr $D300 - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 lda #$4C sta $852 jsr $800 diff --git a/src/prelaunch/pollywog.a b/src/prelaunch/pollywog.a index 2f20d9586..fc299ad55 100755 --- a/src/prelaunch/pollywog.a +++ b/src/prelaunch/pollywog.a @@ -12,8 +12,7 @@ lda #$60 ; RTS instead of JMP sta $846 jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $7957 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/pooyan.a b/src/prelaunch/pooyan.a index 77df1ae5c..0062a594c 100644 --- a/src/prelaunch/pooyan.a +++ b/src/prelaunch/pooyan.a @@ -20,8 +20,7 @@ sta $7D9A ; patch - don't decrease lives sta $758A ; patch - don't increase lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/prince.of.persia.a b/src/prelaunch/prince.of.persia.a index e0b9a4270..aaa78526d 100644 --- a/src/prelaunch/prince.of.persia.a +++ b/src/prelaunch/prince.of.persia.a @@ -11,6 +11,7 @@ +READ_RAM2_NO_WRITE jsr EnableAccelerator + jsr HideLaunchArtworkLC2 lda MachineStatus and #CHEATS_ENABLED php @@ -44,7 +45,6 @@ callback sta $2619 ; patch - don't decrease lives sta $c004 + - jsr HideLaunchArtwork +READ_RAM2_NO_WRITE jsr DisableAccelerator