call HideLaunchArtworkLC2 instead of HideLaunchArtwork

2025-04-11 12:38:05 +00:00 · 2025-02-15 19:37:00 -05:00 · 2025-02-15 19:37:00 -05:00 · 9a111ed189
commit 9a111ed189
parent 7bafbf64a3
83 changed files with 88 additions and 132 deletions
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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
--- 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
--- 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 ", *
--- 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 {
--- 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 {
--- 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
--- 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 {
--- 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
--- 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
--- a/src/prelaunch/lancaster.a
+++ b/src/prelaunch/lancaster.a
@ -7,7 +7,7 @@

    !source "src/macros.a"

-         jsr   HideLaunchArtwork
+         +HIDE_ARTWORK
         lda   #<cheat
         sta   $10da
         lda   #>cheat
--- 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 {
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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 {
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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 {
--- 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 {
--- 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
--- 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
--- 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   +
--- 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 {
--- 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

--- 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
         sta   $40A3
         lda   #>callback
--- 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

 +
--- 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 {
--- 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
--- 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 {
--- 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 {
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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 {
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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 {
--- 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
--- 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 {
--- 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
--- 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

--- 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
         sta   $B748
         lda   #>callback1
@ -52,7 +51,7 @@ callback1
         lda   #>callback2
         sta   $BD08
 +
-         +DISABLE_ACCEL
+         +DISABLE_ACCEL_AND_HIDE_ARTWORK
         jmp   $9D84

 !if * > HideLaunchArtwork {
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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

--- 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 {
--- 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
--- 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
--- 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   #<hook1
--- a/src/prelaunch/pegasus.ii.a
+++ b/src/prelaunch/pegasus.ii.a
@ -15,8 +15,7 @@
         sta   $BD08
         lda   #<callback
         sta   $BD07
-         +DISABLE_ACCEL
-         jsr   HideLaunchArtwork
+         +DISABLE_ACCEL_AND_HIDE_ARTWORK
         jmp   $B700

 callback
--- a/src/prelaunch/pengo.a
+++ b/src/prelaunch/pengo.a
@ -20,8 +20,8 @@
         sta   $14CC      ; patch - don't increase lives
 +
         jsr   DisableAccelerator
+         jsr   HideLaunchArtworkLC2
         +READ_ROM_NO_WRITE
-         jsr   HideLaunchArtwork
         jmp   $800

 !if * > HideLaunchArtwork {
--- 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 {
--- 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
--- 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
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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 {
--- 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 {
--- 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