From 0301a7ff483115706504d463c86007c7e70f854f Mon Sep 17 00:00:00 2001 From: 4am Date: Sat, 25 May 2024 23:41:36 -0400 Subject: [PATCH] hard-code load address for all LOAD_FILE_AT callers --- src/demo/firebug.a | 2 +- src/demo/lady.tut.a | 2 +- src/demo/plasmania.a | 2 +- src/demo/tubeway.a | 2 +- 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/demo.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/fxdata.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 | 2 +- src/prelaunch/captn.goodnight.a | 2 +- src/prelaunch/cavrn.creatures.a | 2 +- src/prelaunch/situation.crtcl.a | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/demo/firebug.a b/src/demo/firebug.a index 159cc73fd..432ae4134 100644 --- a/src/demo/firebug.a +++ b/src/demo/firebug.a @@ -10,7 +10,7 @@ +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator - +LOAD_FILE_AT title, $00 + +LOAD_FILE_AT title, $2000 lda #$2C sta $2070 ; don't load "RECORD" (demo doesn't show high scores) diff --git a/src/demo/lady.tut.a b/src/demo/lady.tut.a index b635facff..32dca216a 100644 --- a/src/demo/lady.tut.a +++ b/src/demo/lady.tut.a @@ -10,7 +10,7 @@ +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator - +LOAD_FILE_AT title, $00 + +LOAD_FILE_AT title, $0800 ldx #5 - lda $100,x sta $70,x diff --git a/src/demo/plasmania.a b/src/demo/plasmania.a index 0137451e0..4a07e5363 100644 --- a/src/demo/plasmania.a +++ b/src/demo/plasmania.a @@ -9,7 +9,7 @@ !source "src/macros.a" +READ_RAM2_WRITE_RAM2 - +LOAD_FILE_AT title, $00 + +LOAD_FILE_AT title, $0800 lda #>(callback-1) sta $84E diff --git a/src/demo/tubeway.a b/src/demo/tubeway.a index 4a1be3bb3..9e64565d6 100644 --- a/src/demo/tubeway.a +++ b/src/demo/tubeway.a @@ -11,7 +11,7 @@ +GAME_REQUIRES_JOYSTICK +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator - +LOAD_FILE_AT title, $00 + +LOAD_FILE_AT title, $4EC6 lda #$4C sta $6BA8 sta $6C2D diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index a03a5b6c8..2ee083951 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 15940322 + !be24 15940340 !le16 5130 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 3f9f37b7c..81623b327 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 15885002 + !be24 15885020 !le16 5732 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index ff35a6417..c3027d670 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 15816769 + !be24 15816787 !le16 4194 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 28ee725b1..0bc5204ad 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 15831483 + !be24 15831501 !le16 4652 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index e7940fe9f..cb8b7af5c 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 15850198 + !be24 15850216 !le16 5621 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 869e54751..903c4057d 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 15871239 + !be24 15871257 !le16 6199 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index f8d33ef59..173b80765 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 15945452 + !be24 15945470 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 293d38872..b98d0ec0f 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 15946206 + !be24 15946224 !le16 449 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 0b4244aa9..2b17948f3 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 15946655 + !be24 15946673 !le16 303 diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a index 24af4eac9..145bd96ed 100644 --- a/src/index/demo.idx.a +++ b/src/index/demo.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 12712987 + !be24 12713005 !le16 1652 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index c18c89a4e..e03091f44 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 15893374 + !be24 15893392 !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index f6357b030..086d46584 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 15945938 + !be24 15945956 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 83074e850..b7ded8c28 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 15940263 + !be24 15940281 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 8490a85f5..519320a5e 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 15938683 + !be24 15938701 !le16 1426 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index fbd21c662..95520ed33 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 15923449 + !be24 15923467 !le16 557 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 5ffffd571..464619867 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 15890734 + !be24 15890752 !le16 2640 diff --git a/src/index/fxdata.idx.a b/src/index/fxdata.idx.a index 6e0cbcc3f..8efffd2d5 100644 --- a/src/index/fxdata.idx.a +++ b/src/index/fxdata.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15895372 + !be24 15895390 !le16 451 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 3b2ffd07a..81a259cb9 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 15895823 + !be24 15895841 !le16 7564 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 7e14577b8..a7e24f4af 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 15945862 + !be24 15945880 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 17ef93d79..2f8e2736b 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 15940109 + !be24 15940127 !le16 154 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 092dbe5c4..06fe6046f 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 15946005 + !be24 15946023 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index da68ba2da..8d9772cde 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 15924006 + !be24 15924024 !le16 4334 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 9f6f94e46..43ed4db2b 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 15928340 + !be24 15928358 !le16 1733 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index d52369e1b..70ed031a1 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 15930073 + !be24 15930091 !le16 1181 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 868d2d022..08c9341ea 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 15931254 + !be24 15931272 !le16 3394 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 78cb63c97..98422fb3d 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 15934648 + !be24 15934666 !le16 3429 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index 333a1c007..75af1b687 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 15938077 + !be24 15938095 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index e95455657..bcccf5fa6 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 15938556 + !be24 15938574 !le16 127 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index be880bf62..d2f681eb1 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 15946958 + !be24 15946976 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index b6581be9c..fb62385f5 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 15908792 + !be24 15908810 !le16 5083 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index 6bbdb6773..0c72f0deb 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 15913875 + !be24 15913893 !le16 2485 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 6f578f535..e6547bb56 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 15877438 + !be24 15877456 !le16 7564 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 98a88168d..beb656756 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 15807186 + !be24 15807204 !le16 9583 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index cd1445261..0e14ea25c 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 15820963 + !be24 15820981 !le16 10520 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 41a2a11e8..84fed0b66 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 15836135 + !be24 15836153 !le16 14063 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index e8de8087e..b3a2e6dcc 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 15855819 + !be24 15855837 !le16 15420 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 8325dfd2d..db9d533d3 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 15895014 + !be24 15895032 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index a22cee93f..56a342a06 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 15903387 + !be24 15903405 !le16 5405 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 5453094c7..57a2a11df 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 15916360 + !be24 15916378 !le16 7089 diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a index 9a2a59ec5..e460be3b6 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 15802838 + !be24 15802856 !le16 4348 diff --git a/src/prelaunch/captn.goodnight.a b/src/prelaunch/captn.goodnight.a index 1b07bb304..c126503fd 100755 --- a/src/prelaunch/captn.goodnight.a +++ b/src/prelaunch/captn.goodnight.a @@ -9,7 +9,7 @@ +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator - +LOAD_FILE_AT goodnight_cheat, 0 + +LOAD_FILE_AT goodnight_cheat, $0300 +READ_ROM_NO_WRITE jmp $300 diff --git a/src/prelaunch/cavrn.creatures.a b/src/prelaunch/cavrn.creatures.a index 37b985c5c..44966a07d 100644 --- a/src/prelaunch/cavrn.creatures.a +++ b/src/prelaunch/cavrn.creatures.a @@ -9,7 +9,7 @@ +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator - +LOAD_FILE_AT cavrn_cheat, 0 + +LOAD_FILE_AT cavrn_cheat, $0200 +READ_ROM_NO_WRITE jmp $200 diff --git a/src/prelaunch/situation.crtcl.a b/src/prelaunch/situation.crtcl.a index 048111ead..04e7c4d63 100644 --- a/src/prelaunch/situation.crtcl.a +++ b/src/prelaunch/situation.crtcl.a @@ -12,7 +12,7 @@ jsr $300 +READ_RAM2_WRITE_RAM2 jsr EnableAccelerator - +LOAD_FILE_AT sitcrit_cheat, 0 + +LOAD_FILE_AT sitcrit_cheat, $BC00 +READ_ROM_NO_WRITE lda #0 sta $8BF