From e2f4de3d2d3938ba86154fb2848a5f60650e11e8 Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Wed, 5 Oct 2022 22:06:51 -0700 Subject: [PATCH] sync --- bin/buildss.js | 11 ++++++++++- src/demo/crime.wave.a | 4 ++-- src/index/artwork.idx.a | 2 +- src/index/attract.idx.a | 2 +- src/index/cache00.idx.a | 2 +- src/index/cache01.idx.a | 2 +- src/index/cache10.idx.a | 2 +- src/index/cache11.idx.a | 2 +- src/index/coverfade.idx.a | 2 +- src/index/credits.idx.a | 2 +- src/index/decrunch.idx.a | 2 +- src/index/dfx.idx.a | 2 +- src/index/dgr.fizzle.idx.a | 2 +- src/index/dgr.idx.a | 2 +- src/index/dhgr.idx.a | 2 +- src/index/dtitle.idx.a | 2 +- src/index/fx.idx.a | 2 +- src/index/gamehelp.idx.a | 2 +- src/index/gr.fizzle.idx.a | 2 +- src/index/gr.idx.a | 2 +- src/index/helptext.idx.a | 2 +- src/index/hgr0.idx.a | 2 +- src/index/hgr1.idx.a | 2 +- src/index/hgr2.idx.a | 2 +- src/index/hgr3.idx.a | 2 +- src/index/hgr4.idx.a | 2 +- src/index/hgr5.idx.a | 2 +- src/index/hgr6.idx.a | 2 +- src/index/joystick.idx.a | 2 +- src/index/miniattract0.idx.a | 2 +- src/index/miniattract1.idx.a | 2 +- src/index/prelaunch.idx.a | 2 +- src/index/search00.idx.a | 2 +- src/index/search01.idx.a | 2 +- src/index/search10.idx.a | 2 +- src/index/search11.idx.a | 2 +- src/index/sfx.idx.a | 2 +- src/index/slideshow.idx.a | 2 +- src/index/title.idx.a | 2 +- src/index/xsingle.idx.a | 4 ++-- 40 files changed, 51 insertions(+), 42 deletions(-) diff --git a/bin/buildss.js b/bin/buildss.js index 2b770aa0d..576b76e2a 100644 --- a/bin/buildss.js +++ b/bin/buildss.js @@ -52,7 +52,16 @@ for (i = 0; i < entries.length; i++) size = ((Math.floor(c / 512) == Math.floor((c + size) / 512)) ? size : (((c + size + 511) & -512) - c)) } - groups += "!byte " + (entries[i].length + 7) + "\n" + "!byte " + entries[i].length + "\n" + "!text \"" + entries[i] + "\"\n" + "!be24 " + c + "\n" + "!le16 " + size + "\n" + r = entries[i].indexOf("#06") + + if (r == -1) + { + groups += "!byte " + (entries[i].length + 7) + "\n" + "!byte " + entries[i].length + "\n" + "!text \"" + entries[i] + "\"\n" + "!be24 " + c + "\n" + "!le16 " + size + "\n" + } + else + { + groups += "!byte " + (entries[i].substr(0, r).length + 9) + "\n" + "!byte " + entries[i].substr(0, r).length + "\n" + "!text \"" + entries[i].substr(0, r) + "\"\n" + "!be24 " + c + "\n" + "!le16 " + size + "\n" + "!le16 $" + entries[i].substr(r + 3) + "\n" + } if (typeof(q) == "object") { diff --git a/src/demo/crime.wave.a b/src/demo/crime.wave.a index 4856004d6..5aa9d0a0d 100644 --- a/src/demo/crime.wave.a +++ b/src/demo/crime.wave.a @@ -2,8 +2,8 @@ ;(c) 2021-2022 by Frank M., qkumba !cpu 6502 -!to "build/DEMO/CRIME.WAVE#06BE00",plain -*=$BE00 +!to "build/DEMO/CRIME.WAVE#06BD00",plain +*=$BD00 !source "src/constants.a" ; no code in these !source "src/macros.a" diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 4b402ab62..f526e9f3d 100644 --- a/src/index/artwork.idx.a +++ b/src/index/artwork.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15240994 + !be24 15224591 !le16 5129 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 46bff0123..c0216ffb2 100644 --- a/src/index/attract.idx.a +++ b/src/index/attract.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15187453 + !be24 15171050 !le16 5642 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 5a28a77a6..e229d537f 100644 --- a/src/index/cache00.idx.a +++ b/src/index/cache00.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15121951 + !be24 15105548 !le16 4012 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index dbed46789..25cb93ce0 100644 --- a/src/index/cache01.idx.a +++ b/src/index/cache01.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15136100 + !be24 15119697 !le16 4431 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index d7781f5c2..c7c9ba54a 100644 --- a/src/index/cache10.idx.a +++ b/src/index/cache10.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15153803 + !be24 15137400 !le16 5651 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 8f21ea8ac..d8b5df4d9 100644 --- a/src/index/cache11.idx.a +++ b/src/index/cache11.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15174049 + !be24 15157646 !le16 6267 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index d6a8553f3..a3216cd25 100644 --- a/src/index/coverfade.idx.a +++ b/src/index/coverfade.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15246123 + !be24 15229720 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index c70b344d2..529ee1218 100644 --- a/src/index/credits.idx.a +++ b/src/index/credits.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15246877 + !be24 15230474 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index e532e3534..d52aa702d 100644 --- a/src/index/decrunch.idx.a +++ b/src/index/decrunch.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15247325 + !be24 15230922 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index fc96e98ab..2f1f206e2 100644 --- a/src/index/dfx.idx.a +++ b/src/index/dfx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15195735 + !be24 15179332 !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 880c13d69..30c124ef7 100644 --- 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 15246609 + !be24 15230206 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 25f805f92..64de2e62e 100644 --- a/src/index/dgr.idx.a +++ b/src/index/dgr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15240935 + !be24 15224532 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 87a3f2048..3e30d9172 100644 --- a/src/index/dhgr.idx.a +++ b/src/index/dhgr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15239401 + !be24 15222998 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 28d5746c4..1b770034c 100644 --- a/src/index/dtitle.idx.a +++ b/src/index/dtitle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15224005 + !be24 15207602 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index e2c3dd042..718aa126a 100644 --- a/src/index/fx.idx.a +++ b/src/index/fx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15193095 + !be24 15176692 !le16 2640 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 6d3659a97..580d1c81d 100644 --- a/src/index/gamehelp.idx.a +++ b/src/index/gamehelp.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15197733 + !be24 15181330 !le16 7137 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index f69e10e99..b044d1f6f 100644 --- 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 15246533 + !be24 15230130 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index dccd3f594..50a6bd6fb 100644 --- a/src/index/gr.idx.a +++ b/src/index/gr.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15240838 + !be24 15224435 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index eed8054a3..39497b230 100644 --- a/src/index/helptext.idx.a +++ b/src/index/helptext.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15246676 + !be24 15230273 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 9882e8261..28e939afb 100644 --- a/src/index/hgr0.idx.a +++ b/src/index/hgr0.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15224542 + !be24 15208139 !le16 4702 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 391dd58a9..deb687917 100644 --- a/src/index/hgr1.idx.a +++ b/src/index/hgr1.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15229244 + !be24 15212841 !le16 1715 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index f7e5967d2..d3897b08c 100644 --- a/src/index/hgr2.idx.a +++ b/src/index/hgr2.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15230959 + !be24 15214556 !le16 1129 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 95a4d857b..d657af6eb 100644 --- a/src/index/hgr3.idx.a +++ b/src/index/hgr3.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15232088 + !be24 15215685 !le16 3388 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 5c7fd5a40..a297f0860 100644 --- a/src/index/hgr4.idx.a +++ b/src/index/hgr4.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15235476 + !be24 15219073 !le16 3332 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index 1508d8037..29292a27f 100644 --- a/src/index/hgr5.idx.a +++ b/src/index/hgr5.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15238808 + !be24 15222405 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index 2df6050dc..9f5efc3b7 100644 --- a/src/index/hgr6.idx.a +++ b/src/index/hgr6.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15239287 + !be24 15222884 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 9c90c62cf..b3bcfa4e3 100644 --- a/src/index/joystick.idx.a +++ b/src/index/joystick.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15247628 + !be24 15231225 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 37f7ff212..c94862eee 100644 --- a/src/index/miniattract0.idx.a +++ b/src/index/miniattract0.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15210182 + !be24 15193779 !le16 4741 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index d49a31730..9339df8e1 100644 --- a/src/index/miniattract1.idx.a +++ b/src/index/miniattract1.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15214923 + !be24 15198520 !le16 2400 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 66afcea02..b9d7baaee 100644 --- a/src/index/prelaunch.idx.a +++ b/src/index/prelaunch.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15180316 + !be24 15163913 !le16 7137 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index eaa7a0ab1..2e66806f5 100644 --- a/src/index/search00.idx.a +++ b/src/index/search00.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15112688 + !be24 15096285 !le16 9263 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 79af999f5..d13258664 100644 --- a/src/index/search01.idx.a +++ b/src/index/search01.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15125963 + !be24 15109560 !le16 10137 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index dbc5b2f50..7ab533862 100644 --- a/src/index/search10.idx.a +++ b/src/index/search10.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15140531 + !be24 15124128 !le16 13272 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 8bf877a60..4ff87c54f 100644 --- a/src/index/search11.idx.a +++ b/src/index/search11.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15159454 + !be24 15143051 !le16 14595 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 121dbf892..996327a48 100644 --- a/src/index/sfx.idx.a +++ b/src/index/sfx.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15197375 + !be24 15180972 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 07d6cee97..f348f7226 100644 --- a/src/index/slideshow.idx.a +++ b/src/index/slideshow.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15204870 + !be24 15188467 !le16 5312 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index a5f8d327a..15657f84c 100644 --- a/src/index/title.idx.a +++ b/src/index/title.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15217323 + !be24 15200920 !le16 6682 diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a index 2e7dc72ad..83e48ff15 100644 --- a/src/index/xsingle.idx.a +++ b/src/index/xsingle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15108683 - !le16 4005 + !be24 15092299 + !le16 3986