fix One-on-One with Mockingboard

2024-06-25 03:29:50 +00:00 · 2023-12-28 15:11:16 -08:00 · 2023-12-28 15:11:16 -08:00 · 672a89034e
commit 672a89034e
parent d27658d23f
41 changed files with 48 additions and 45 deletions
--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1796475
+         !be24  1796581
         !le16      527
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1784735
+         !be24  1784857
         !le16      978
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1777919
+         !be24  1778041
         !le16      228
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1779256
+         !be24  1779378
         !le16      472
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1780907
+         !be24  1781029
         !le16      427
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1783149
+         !be24  1783271
         !le16      723
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1797002
+         !be24  1797108
         !le16      306
--- a/src/index/credits.idx.a
+++ b/src/index/credits.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1797652
+         !be24  1797758
         !le16      336
--- a/src/index/decrunch.idx.a
+++ b/src/index/decrunch.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1797988
+         !be24  1798094
         !le16      303
--- a/src/index/demo.idx.a
+++ b/src/index/demo.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1543588
+         !be24  1543710
         !le16       69
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1788353
+         !be24  1788475
         !le16     1640
--- a/src/index/dgr.fizzle.idx.a
+++ b/src/index/dgr.fizzle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1797384
+         !be24  1797490
         !le16       67
--- a/src/index/dhgr.idx.a
+++ b/src/index/dhgr.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1795645
+         !be24  1795763
         !le16      766
--- a/src/index/dtitle.idx.a
+++ b/src/index/dtitle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1793893
+         !be24  1794015
         !le16      229
--- a/src/index/fx.idx.a
+++ b/src/index/fx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1785713
+         !be24  1785835
         !le16     2640
--- a/src/index/gamehelp.idx.a
+++ b/src/index/gamehelp.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1790351
+         !be24  1790473
         !le16      863
--- a/src/index/gr.fizzle.idx.a
+++ b/src/index/gr.fizzle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1797308
+         !be24  1797414
         !le16       76
--- a/src/index/gr.idx.a
+++ b/src/index/gr.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1796411
+         !be24  1796529
         !le16       52
--- a/src/index/helptext.idx.a
+++ b/src/index/helptext.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1797451
+         !be24  1797557
         !le16      201
--- a/src/index/hgr0.idx.a
+++ b/src/index/hgr0.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1794122
+         !be24  1794244
         !le16      335
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1794457
+         !be24  1794579
         !le16       69
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1794526
+         !be24  1794648
         !le16       81
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1794607
+         !be24  1794729
         !le16       93
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1794700
+         !be24  1794822
         !le16      667
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1795367
+         !be24  1795489
         !le16      274
--- a/src/index/joystick.idx.a
+++ b/src/index/joystick.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1798291
+         !be24  1798397
         !le16     2370
--- a/src/index/miniattract0.idx.a
+++ b/src/index/miniattract0.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1792334
+         !be24  1792456
         !le16      412
--- a/src/index/miniattract1.idx.a
+++ b/src/index/miniattract1.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1792746
+         !be24  1792868
         !le16      455
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1783872
+         !be24  1783994
         !le16      863
--- a/src/index/res.cover.idx.a
+++ b/src/index/res.cover.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24   462891
+         !be24  462940
         !le16     8184
--- a/src/index/res.help.idx.a
+++ b/src/index/res.help.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24   479267
+         !be24  479316
         !le16     8184
--- a/src/index/res.title.idx.a
+++ b/src/index/res.title.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24   471075
+         !be24  471124
         !le16     8192
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1777294
+         !be24  1777416
         !le16      625
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1778147
+         !be24  1778269
         !le16     1109
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1779728
+         !be24  1779850
         !le16     1179
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1781334
+         !be24  1781456
         !le16     1815
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1789993
+         !be24  1790115
         !le16      358
--- a/src/index/slideshow.idx.a
+++ b/src/index/slideshow.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1791214
+         !be24  1791336
         !le16     1120
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1793201
+         !be24  1793323
         !le16      692
--- a/src/index/xsingle.idx.a
+++ b/src/index/xsingle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  1777022
+         !be24  1777144
         !le16      272
--- a/src/prelaunch/one.on.one.a
+++ b/src/prelaunch/one.on.one.a
@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2020 by qkumba
+;(c) 2020, 2023 by qkumba

 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/ONE.ON.ONE",plain
@ -11,6 +11,7 @@
         jsr   EnableAccelerator
         lda   MockingboardStuff
         cmp   #1
+         and   #7
         ora   #$C0
         php
         pha
@ -25,11 +26,8 @@
         plp
         php
         bcc   skipmb
-         plp
-         cli              ; enable MB music on title
-         php
         cmp   #$C4
-         beq   skipmb
+         beq   skipmb1

         sta   $E9BC      ; Replace #$C4 with configured slot
         ldy   #00
@ -40,6 +38,11 @@
 +        iny
         bne   -

+skipmb1
+         plp
+         cli              ; enable MB music on title
+         php
+
 skipmb
         +READ_RAM2_WRITE_RAM2
         jsr   DisableAccelerator