From a281f6b808a372233f4d92d345be6411f730f5b2 Mon Sep 17 00:00:00 2001 From: 4am Date: Sat, 15 Feb 2025 20:05:08 -0500 Subject: [PATCH] call HideLaunchArtworkLC2 instead of HideLaunchArtwork --- src/prelaunch/space.eggs.a | 2 +- src/prelaunch/space.kadet.a | 3 +-- src/prelaunch/space.quarks.a | 2 +- src/prelaunch/space.raiders.a | 3 +-- src/prelaunch/spectre.a | 3 +-- src/prelaunch/spider.raid.a | 3 +-- src/prelaunch/spiderbot.a | 3 +-- src/prelaunch/spindizzy.a | 2 +- src/prelaunch/spy.vs.spy.2.a | 3 +-- src/prelaunch/spy.vs.spy.3.a | 3 +-- src/prelaunch/spy.vs.spy.a | 3 +-- src/prelaunch/spys.demise.a | 3 +-- src/prelaunch/star.avenger.a | 3 +-- src/prelaunch/star.blazer.a | 3 +-- src/prelaunch/star.cruiser.a | 3 +-- src/prelaunch/star.dance.a | 2 +- src/prelaunch/star.maze.a | 3 +-- src/prelaunch/star.thief.a | 2 +- src/prelaunch/starblaster.a | 2 +- src/prelaunch/stargate.a | 2 +- src/prelaunch/starglider.a | 2 +- src/prelaunch/starmines.a | 3 +-- src/prelaunch/stellar.7.a | 2 +- src/prelaunch/succession.a | 2 +- src/prelaunch/suicide.a | 2 +- src/prelaunch/super.bunny.a | 3 +-- src/prelaunch/super.taxman.2.a | 2 +- src/prelaunch/swashbuckler.a | 2 +- src/prelaunch/sword.of.sheol.a | 2 +- src/prelaunch/tapper.a | 3 +-- src/prelaunch/technocop.a | 2 +- src/prelaunch/teleport.a | 2 +- src/prelaunch/tharolian.tunls.a | 3 +-- src/prelaunch/the.goonies.a | 2 +- src/prelaunch/the.heist.a | 3 +-- src/prelaunch/the.human.fly.a | 3 +-- src/prelaunch/the.last.ninja.a | 2 +- src/prelaunch/the.snapper.a | 2 +- src/prelaunch/the.space.ark.a | 3 +-- src/prelaunch/thief.a | 3 +-- src/prelaunch/thunder.bombs.a | 2 +- src/prelaunch/thunderhead.a | 2 +- src/prelaunch/tom.sawyer.a | 2 +- src/prelaunch/track.attack.a | 3 +-- src/prelaunch/trolls.tribs.a | 2 +- src/prelaunch/tubeway.a | 3 +-- src/prelaunch/up.n.down.a | 2 +- src/prelaunch/victory.road.a | 3 +-- src/prelaunch/vindicator.a | 3 +-- src/prelaunch/vortex.a | 2 +- src/prelaunch/voyage.valkyrie.a | 3 +-- src/prelaunch/wargle.a | 3 +-- src/prelaunch/warp.destroyer.a | 2 +- src/prelaunch/wavy.navy.a | 3 +-- src/prelaunch/wayout.a | 3 +-- src/prelaunch/whomper.stomper.a | 2 +- src/prelaunch/willy.byte.a | 2 +- src/prelaunch/wings.of.fury.a | 3 +-- src/prelaunch/wolfen84.a | 5 ++--- src/prelaunch/xevious.a | 3 +-- src/prelaunch/zargs.a | 2 +- src/prelaunch/zaxxon.a | 2 +- src/prelaunch/zenith.a | 3 +-- src/prelaunch/zoo.master.a | 2 +- src/prelaunch/zp.a | 2 +- 65 files changed, 66 insertions(+), 99 deletions(-) diff --git a/src/prelaunch/space.eggs.a b/src/prelaunch/space.eggs.a index 3f662a914..f9a41ec31 100644 --- a/src/prelaunch/space.eggs.a +++ b/src/prelaunch/space.eggs.a @@ -21,7 +21,7 @@ dec $1BBA ; don't decrease lives + jsr DisableAccelerator - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE jmp $4880 ; run it diff --git a/src/prelaunch/space.kadet.a b/src/prelaunch/space.kadet.a index 5cb4d6453..2bbe4f25f 100644 --- a/src/prelaunch/space.kadet.a +++ b/src/prelaunch/space.kadet.a @@ -25,8 +25,7 @@ hook2 lda #hook3 sta $9A7A+2 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $800 ; show title hook3 lda #0 diff --git a/src/prelaunch/space.quarks.a b/src/prelaunch/space.quarks.a index 6249c0083..a4b3159ea 100755 --- a/src/prelaunch/space.quarks.a +++ b/src/prelaunch/space.quarks.a @@ -23,8 +23,8 @@ sta $1196 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $203 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/space.raiders.a b/src/prelaunch/space.raiders.a index da3a1dbe3..d9b05a7a5 100755 --- a/src/prelaunch/space.raiders.a +++ b/src/prelaunch/space.raiders.a @@ -14,8 +14,7 @@ lda #1 sta $401A ; reset vector patch - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $4000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/spectre.a b/src/prelaunch/spectre.a index 0b393c61c..e34ff3a0b 100644 --- a/src/prelaunch/spectre.a +++ b/src/prelaunch/spectre.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #>(callback-1) sta $5F08 lda #<(callback-1) diff --git a/src/prelaunch/spider.raid.a b/src/prelaunch/spider.raid.a index e8a001f7c..5ec7074c1 100644 --- a/src/prelaunch/spider.raid.a +++ b/src/prelaunch/spider.raid.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $3F0E diff --git a/src/prelaunch/spiderbot.a b/src/prelaunch/spiderbot.a index e72c58971..517553071 100644 --- a/src/prelaunch/spiderbot.a +++ b/src/prelaunch/spiderbot.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK inc $3F4 ; force reboot lda #$60 sta $6085 diff --git a/src/prelaunch/spindizzy.a b/src/prelaunch/spindizzy.a index 4bf2fcea9..cae0e8746 100644 --- a/src/prelaunch/spindizzy.a +++ b/src/prelaunch/spindizzy.a @@ -31,9 +31,9 @@ sta $99AF ; kill timer + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE sta $C05F ; fix //c and //c+ HGR color - jsr HideLaunchArtwork jmp $9300 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/spy.vs.spy.2.a b/src/prelaunch/spy.vs.spy.2.a index f6183d989..1caae7035 100644 --- a/src/prelaunch/spy.vs.spy.2.a +++ b/src/prelaunch/spy.vs.spy.2.a @@ -15,8 +15,7 @@ sta $DE3 jsr $C24 jsr $BCFC ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $DC1 +ENABLE_ACCEL jsr $BCFC ; decompress diff --git a/src/prelaunch/spy.vs.spy.3.a b/src/prelaunch/spy.vs.spy.3.a index d64dbdc01..84a81687c 100644 --- a/src/prelaunch/spy.vs.spy.3.a +++ b/src/prelaunch/spy.vs.spy.3.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK +LC_REBOOT lda #$60 sta $20BB diff --git a/src/prelaunch/spy.vs.spy.a b/src/prelaunch/spy.vs.spy.a index 3ec0268d1..9408eb265 100644 --- a/src/prelaunch/spy.vs.spy.a +++ b/src/prelaunch/spy.vs.spy.a @@ -14,8 +14,7 @@ sta $408E jsr $4000 jsr $4097 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $4046 +ENABLE_ACCEL jsr $4097 ; decompress diff --git a/src/prelaunch/spys.demise.a b/src/prelaunch/spys.demise.a index 1c14e3221..e5ccf30d3 100644 --- a/src/prelaunch/spys.demise.a +++ b/src/prelaunch/spys.demise.a @@ -19,8 +19,7 @@ sta $6D8A ; patch - don't decrease lives sta $6DDA ; patch - don't increase lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/star.avenger.a b/src/prelaunch/star.avenger.a index f09f6af7e..dafffe08b 100644 --- a/src/prelaunch/star.avenger.a +++ b/src/prelaunch/star.avenger.a @@ -11,8 +11,7 @@ lda #$60 sta $82D jsr $800 ; decompress - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $A111 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/star.blazer.a b/src/prelaunch/star.blazer.a index 5fba98ea4..31c400cf2 100644 --- a/src/prelaunch/star.blazer.a +++ b/src/prelaunch/star.blazer.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $722A sta $725D diff --git a/src/prelaunch/star.cruiser.a b/src/prelaunch/star.cruiser.a index d23fc96c6..7be6eb195 100644 --- a/src/prelaunch/star.cruiser.a +++ b/src/prelaunch/star.cruiser.a @@ -20,8 +20,7 @@ sta $61C8 ; patch - don't decrease lives sta $62D8 ; patch - don't increase lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $67B0 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/star.dance.a b/src/prelaunch/star.dance.a index dae2861bf..f37e09642 100644 --- a/src/prelaunch/star.dance.a +++ b/src/prelaunch/star.dance.a @@ -27,8 +27,8 @@ hook lda #0 sta $1272 ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $7000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/star.maze.a b/src/prelaunch/star.maze.a index e40aa0ef3..1d0f03e8e 100644 --- a/src/prelaunch/star.maze.a +++ b/src/prelaunch/star.maze.a @@ -21,8 +21,7 @@ lda #$A5 sta $87D0 + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $79D3 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/star.thief.a b/src/prelaunch/star.thief.a index 2bb695b3a..ecf056706 100644 --- a/src/prelaunch/star.thief.a +++ b/src/prelaunch/star.thief.a @@ -21,8 +21,8 @@ sta $70F2 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $6801 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/starblaster.a b/src/prelaunch/starblaster.a index ebec30d11..1082e5112 100755 --- a/src/prelaunch/starblaster.a +++ b/src/prelaunch/starblaster.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK ;+ENABLE_ACCEL ; can't - shows title right away lda #$60 ; hook sta $9318 diff --git a/src/prelaunch/stargate.a b/src/prelaunch/stargate.a index eb74a3966..0669eba23 100644 --- a/src/prelaunch/stargate.a +++ b/src/prelaunch/stargate.a @@ -38,8 +38,8 @@ sta $1E98 ; patch - don't decrease bombs + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $5000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/starglider.a b/src/prelaunch/starglider.a index aa7a1aa64..b8a095e31 100644 --- a/src/prelaunch/starglider.a +++ b/src/prelaunch/starglider.a @@ -18,7 +18,7 @@ jsr $800 ; decompress jsr DisableAccelerator - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 jsr $BA7B ldx #5 diff --git a/src/prelaunch/starmines.a b/src/prelaunch/starmines.a index a4e1126ea..0dfbc00e9 100644 --- a/src/prelaunch/starmines.a +++ b/src/prelaunch/starmines.a @@ -15,8 +15,7 @@ stx $1FC9 inx stx $1FCE ; reset fix - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $800 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/stellar.7.a b/src/prelaunch/stellar.7.a index 86dac005f..ab5969c97 100755 --- a/src/prelaunch/stellar.7.a +++ b/src/prelaunch/stellar.7.a @@ -33,8 +33,8 @@ sta $AE72 + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $AE27 callback diff --git a/src/prelaunch/succession.a b/src/prelaunch/succession.a index c44b4e218..dea4b2027 100644 --- a/src/prelaunch/succession.a +++ b/src/prelaunch/succession.a @@ -22,8 +22,8 @@ sta $6CC6 ; patch - don't increase lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $6000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/suicide.a b/src/prelaunch/suicide.a index ede676bd5..9e736f85e 100644 --- a/src/prelaunch/suicide.a +++ b/src/prelaunch/suicide.a @@ -21,8 +21,8 @@ dec $4B5B ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $1000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/super.bunny.a b/src/prelaunch/super.bunny.a index 8a759195b..dacd24843 100644 --- a/src/prelaunch/super.bunny.a +++ b/src/prelaunch/super.bunny.a @@ -19,8 +19,7 @@ lda #>callback sta $BD27 + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $B700 callback diff --git a/src/prelaunch/super.taxman.2.a b/src/prelaunch/super.taxman.2.a index 0d152a5f7..7a9db5412 100644 --- a/src/prelaunch/super.taxman.2.a +++ b/src/prelaunch/super.taxman.2.a @@ -32,8 +32,8 @@ hook lda #0 sta $9549 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $4000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/swashbuckler.a b/src/prelaunch/swashbuckler.a index 95316388c..86f46818f 100755 --- a/src/prelaunch/swashbuckler.a +++ b/src/prelaunch/swashbuckler.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK ;+ENABLE_ACCEL ; can't lda #$60 sta $332C ; stop1 diff --git a/src/prelaunch/sword.of.sheol.a b/src/prelaunch/sword.of.sheol.a index bc426b596..a2c3978a9 100644 --- a/src/prelaunch/sword.of.sheol.a +++ b/src/prelaunch/sword.of.sheol.a @@ -24,8 +24,8 @@ sta $6BDE ; patch - don't decrease armour + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $50F !if * > HideLaunchArtwork { diff --git a/src/prelaunch/tapper.a b/src/prelaunch/tapper.a index 032fc9d3a..ef294a46b 100644 --- a/src/prelaunch/tapper.a +++ b/src/prelaunch/tapper.a @@ -14,8 +14,7 @@ lda #$60 sta $851 jsr $800 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK lda #cheat diff --git a/src/prelaunch/technocop.a b/src/prelaunch/technocop.a index 9c20a67d2..af239187b 100644 --- a/src/prelaunch/technocop.a +++ b/src/prelaunch/technocop.a @@ -31,7 +31,7 @@ lda #$FB sta $FA87 + jsr DisableAccelerator - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 jmp $F800 cheat_b diff --git a/src/prelaunch/teleport.a b/src/prelaunch/teleport.a index 0646229b6..2778e4a36 100644 --- a/src/prelaunch/teleport.a +++ b/src/prelaunch/teleport.a @@ -20,8 +20,8 @@ sta $507C ; patch - don't increase lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $803 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/tharolian.tunls.a b/src/prelaunch/tharolian.tunls.a index 5cd2b1d96..a9025fbce 100644 --- a/src/prelaunch/tharolian.tunls.a +++ b/src/prelaunch/tharolian.tunls.a @@ -17,8 +17,7 @@ sta $9608 lda #>callback sta $9609 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jsr $60A7 jmp $609C diff --git a/src/prelaunch/the.goonies.a b/src/prelaunch/the.goonies.a index 99bb9c1e0..64c932afc 100644 --- a/src/prelaunch/the.goonies.a +++ b/src/prelaunch/the.goonies.a @@ -22,8 +22,8 @@ sta $624 + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork lda #0 jmp $55C diff --git a/src/prelaunch/the.heist.a b/src/prelaunch/the.heist.a index a1a55fded..4aebb81d9 100644 --- a/src/prelaunch/the.heist.a +++ b/src/prelaunch/the.heist.a @@ -15,8 +15,7 @@ jmp $4000 ; decompress callback - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $A05 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/the.human.fly.a b/src/prelaunch/the.human.fly.a index d9dc33801..e45f4ad94 100644 --- a/src/prelaunch/the.human.fly.a +++ b/src/prelaunch/the.human.fly.a @@ -20,8 +20,7 @@ sta $87F lda #0 sta $880 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $D566 callback diff --git a/src/prelaunch/the.last.ninja.a b/src/prelaunch/the.last.ninja.a index 4645eae29..499b3d46d 100644 --- a/src/prelaunch/the.last.ninja.a +++ b/src/prelaunch/the.last.ninja.a @@ -11,7 +11,7 @@ lda #$60 sta $9F7 jsr $800 ; load DOS - jsr HideLaunchArtwork + +HIDE_ARTWORK inx stx $FA ; fix sound lda #$60 diff --git a/src/prelaunch/the.snapper.a b/src/prelaunch/the.snapper.a index ea9f99385..c6416a231 100644 --- a/src/prelaunch/the.snapper.a +++ b/src/prelaunch/the.snapper.a @@ -26,8 +26,8 @@ dec $920 ; patch - don't decrease time + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp ($20) keys !scrxor $80, "JLIK" ; left, right, up, down diff --git a/src/prelaunch/the.space.ark.a b/src/prelaunch/the.space.ark.a index 3a7612874..54295a043 100644 --- a/src/prelaunch/the.space.ark.a +++ b/src/prelaunch/the.space.ark.a @@ -14,12 +14,11 @@ lda #$60 sta $A2C jsr $800 ; load "DOS" - jsr HideLaunchArtwork lda #$60 sta $B7A7 jsr $B700 ; decompress - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK lda #0 jmp $B7A9 diff --git a/src/prelaunch/thief.a b/src/prelaunch/thief.a index 08323dbe5..570e4fc66 100644 --- a/src/prelaunch/thief.a +++ b/src/prelaunch/thief.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $4BA3 jsr $4B50 ; decompress diff --git a/src/prelaunch/thunder.bombs.a b/src/prelaunch/thunder.bombs.a index 2485e0055..b610d175f 100644 --- a/src/prelaunch/thunder.bombs.a +++ b/src/prelaunch/thunder.bombs.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #$60 sta $887F lda # HideLaunchArtwork { diff --git a/src/prelaunch/tom.sawyer.a b/src/prelaunch/tom.sawyer.a index 71a5315db..d9f41f8ee 100644 --- a/src/prelaunch/tom.sawyer.a +++ b/src/prelaunch/tom.sawyer.a @@ -24,8 +24,8 @@ callback sta $7322 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $4071 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/track.attack.a b/src/prelaunch/track.attack.a index d86e1d4a3..79ff8ff03 100644 --- a/src/prelaunch/track.attack.a +++ b/src/prelaunch/track.attack.a @@ -11,7 +11,6 @@ lda #$60 sta $9C9 jsr $800 ; load "DOS" - jsr HideLaunchArtwork lda #callback @@ -22,7 +21,7 @@ callback pha txa pha - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK pla tax pla diff --git a/src/prelaunch/trolls.tribs.a b/src/prelaunch/trolls.tribs.a index 2ccf279ee..fe4aa0135 100644 --- a/src/prelaunch/trolls.tribs.a +++ b/src/prelaunch/trolls.tribs.a @@ -10,7 +10,7 @@ lda #$60 sta $4060 jsr $4000 ; decompress - jsr HideLaunchArtwork + +HIDE_ARTWORK lda #1 sta $6056 +LC_REBOOT diff --git a/src/prelaunch/tubeway.a b/src/prelaunch/tubeway.a index d553fe3d7..f82833141 100644 --- a/src/prelaunch/tubeway.a +++ b/src/prelaunch/tubeway.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $6C30 jsr $4EC6 ; decompress diff --git a/src/prelaunch/up.n.down.a b/src/prelaunch/up.n.down.a index 6c645c574..321017b91 100755 --- a/src/prelaunch/up.n.down.a +++ b/src/prelaunch/up.n.down.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK inc $3F4 ; reboot during title screen lda #$03 ; reset vector to $103 diff --git a/src/prelaunch/victory.road.a b/src/prelaunch/victory.road.a index db9654c42..b305e5a2d 100644 --- a/src/prelaunch/victory.road.a +++ b/src/prelaunch/victory.road.a @@ -19,11 +19,10 @@ callback jmp $D000 ++ - jsr HideLaunchArtwork lda #$60 sta $33C jsr $300 - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK inc $3F4 ; force reboot on reset during title screen lda #$D0 sta $119C diff --git a/src/prelaunch/vindicator.a b/src/prelaunch/vindicator.a index 1a197ab33..76918c8a5 100755 --- a/src/prelaunch/vindicator.a +++ b/src/prelaunch/vindicator.a @@ -28,8 +28,7 @@ sta $5F31 ; patch - don't decrease lives + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $4000 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/vortex.a b/src/prelaunch/vortex.a index 97bbfded2..954f0dd6f 100644 --- a/src/prelaunch/vortex.a +++ b/src/prelaunch/vortex.a @@ -22,8 +22,8 @@ hook +NEW_RESET_VECTOR $BFF0 dec $EA8 ; patch - don't decrease lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $D566 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/voyage.valkyrie.a b/src/prelaunch/voyage.valkyrie.a index 886f21954..dc280e1cb 100644 --- a/src/prelaunch/voyage.valkyrie.a +++ b/src/prelaunch/voyage.valkyrie.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK +NEW_RESET_VECTOR $180 lda #callback1 sta $B749 - jsr HideLaunchArtwork jmp $B700 callback1 @@ -60,7 +59,7 @@ callback1 lda #>callback2 sta $BD08 + - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $9D84 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/warp.destroyer.a b/src/prelaunch/warp.destroyer.a index 1394b7de7..c4af11948 100644 --- a/src/prelaunch/warp.destroyer.a +++ b/src/prelaunch/warp.destroyer.a @@ -34,7 +34,7 @@ sta $64AC ; patch - don't increase damage + jsr DisableAccelerator - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE lda #0 jmp $896 diff --git a/src/prelaunch/wavy.navy.a b/src/prelaunch/wavy.navy.a index 5fe771283..1fcae0462 100644 --- a/src/prelaunch/wavy.navy.a +++ b/src/prelaunch/wavy.navy.a @@ -22,8 +22,7 @@ lda #$d0 ; disable AN1 access on IIe-class sta $AE8 ; otherwise UltraWarp dies + - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $800 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/wayout.a b/src/prelaunch/wayout.a index 57f80a0b6..b4893079c 100644 --- a/src/prelaunch/wayout.a +++ b/src/prelaunch/wayout.a @@ -12,7 +12,6 @@ lda #$60 sta $206A jsr $2000 ; decompress - jsr HideLaunchArtwork lda #$60 sta $97DE jsr $979B ; decompress more @@ -22,7 +21,7 @@ lda #$20 sta $8D75 +RESET_VECTOR $100 - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $8D75 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/whomper.stomper.a b/src/prelaunch/whomper.stomper.a index e4061de5b..0fb79c221 100644 --- a/src/prelaunch/whomper.stomper.a +++ b/src/prelaunch/whomper.stomper.a @@ -20,8 +20,8 @@ sta $BBCC ; patch - don't increase lives + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE - jsr HideLaunchArtwork jmp $B407 !if * > HideLaunchArtwork { diff --git a/src/prelaunch/willy.byte.a b/src/prelaunch/willy.byte.a index 26c8c22e5..ddab6bee6 100644 --- a/src/prelaunch/willy.byte.a +++ b/src/prelaunch/willy.byte.a @@ -7,9 +7,9 @@ !source "src/macros.a" - jsr HideLaunchArtwork +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator + jsr HideLaunchArtworkLC2 +LOAD_FILE_AT willybyte_mb, $D000 +READ_ROM_NO_WRITE ldx #(accel_e - accel) diff --git a/src/prelaunch/wings.of.fury.a b/src/prelaunch/wings.of.fury.a index 0d81e4b9c..741417002 100644 --- a/src/prelaunch/wings.of.fury.a +++ b/src/prelaunch/wings.of.fury.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #callback diff --git a/src/prelaunch/wolfen84.a b/src/prelaunch/wolfen84.a index ca4454891..0824dc4c1 100755 --- a/src/prelaunch/wolfen84.a +++ b/src/prelaunch/wolfen84.a @@ -12,7 +12,7 @@ brunpatch lda $AA76 ; check second character of filename cmp #$C9 ; = I, filename = @INIT - bne + + bne + ldx #$01 ; Patch it to return to TR stx $0DFF ; instead of exiting to BASIC @@ -58,8 +58,7 @@ callback lda #>patch sta $A396 - +DISABLE_ACCEL - jsr HideLaunchArtwork + +DISABLE_ACCEL_AND_HIDE_ARTWORK jmp $9D84 diff --git a/src/prelaunch/xevious.a b/src/prelaunch/xevious.a index f8dce9fa1..76a8b0525 100755 --- a/src/prelaunch/xevious.a +++ b/src/prelaunch/xevious.a @@ -7,7 +7,6 @@ !source "src/macros.a" - jsr HideLaunchArtwork +ENABLE_ACCEL +READ_RAM2_WRITE_RAM2 @@ -31,7 +30,7 @@ reset jmp $FAA6 patch1 - +DISABLE_ACCEL + +DISABLE_ACCEL_AND_HIDE_ARTWORK lda #patch2 diff --git a/src/prelaunch/zargs.a b/src/prelaunch/zargs.a index c2aeeae91..4c3e8d806 100644 --- a/src/prelaunch/zargs.a +++ b/src/prelaunch/zargs.a @@ -24,7 +24,7 @@ callback dec $9FA7 ; don't decrease lives + jsr DisableAccelerator - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 +READ_ROM_NO_WRITE jmp $6000 diff --git a/src/prelaunch/zaxxon.a b/src/prelaunch/zaxxon.a index dba267f73..0b11108ef 100644 --- a/src/prelaunch/zaxxon.a +++ b/src/prelaunch/zaxxon.a @@ -41,7 +41,7 @@ sty $1a40 sty $1a61 + +READ_RAM2_WRITE_RAM2 - jsr HideLaunchArtwork + jsr HideLaunchArtworkLC2 ldy #0 jmp $41D0 diff --git a/src/prelaunch/zenith.a b/src/prelaunch/zenith.a index 816726694..ec241ccde 100644 --- a/src/prelaunch/zenith.a +++ b/src/prelaunch/zenith.a @@ -7,8 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork - +ENABLE_ACCEL + +ENABLE_ACCEL_AND_HIDE_ARTWORK lda #$60 sta $403E jsr $4000 ; decompress diff --git a/src/prelaunch/zoo.master.a b/src/prelaunch/zoo.master.a index eb64385b1..e1260ac6b 100644 --- a/src/prelaunch/zoo.master.a +++ b/src/prelaunch/zoo.master.a @@ -11,7 +11,6 @@ lda #$60 sta $60A4 jsr $6000 ; decompress - jsr HideLaunchArtwork +RESET_VECTOR_HALF $100 lda #$60 sta $89F @@ -26,6 +25,7 @@ sta $48A1 + jsr DisableAccelerator + jsr HideLaunchArtworkLC2 lda MockingboardStuff +READ_ROM_NO_WRITE bmi + diff --git a/src/prelaunch/zp.a b/src/prelaunch/zp.a index b477f563d..93b638b3e 100644 --- a/src/prelaunch/zp.a +++ b/src/prelaunch/zp.a @@ -7,7 +7,7 @@ !source "src/macros.a" - jsr HideLaunchArtwork + +HIDE_ARTWORK +NEW_RESET_VECTOR $180 lda #$60