diff --git a/res/DEMO/BU b/res/DEMO/BU index 83819c837..2b8147ace 100755 Binary files a/res/DEMO/BU and b/res/DEMO/BU differ diff --git a/res/DEMO/NIGHT.STALKER b/res/DEMO/NIGHT.STALKER index eaea446e3..b05aefcbc 100755 Binary files a/res/DEMO/NIGHT.STALKER and b/res/DEMO/NIGHT.STALKER differ diff --git a/res/DEMO/ROBOTRON.2084 b/res/DEMO/ROBOTRON.2084 index 56e77f884..eb7626946 100644 Binary files a/res/DEMO/ROBOTRON.2084 and b/res/DEMO/ROBOTRON.2084 differ diff --git a/res/DEMO/_FileInformation.txt b/res/DEMO/_FileInformation.txt index 5835a902c..d8b723371 100644 --- a/res/DEMO/_FileInformation.txt +++ b/res/DEMO/_FileInformation.txt @@ -52,7 +52,7 @@ LODE.RUNNER=Type(06),AuxType(0200),Access(C3) LOST.TOMB=Type(06),AuxType(0300),Access(C3) MC=Type(06),AuxType(0200),Access(C3) MOON.PATROL=Type(06),AuxType(0200),Access(C3) -NIGHT.STALKER=Type(06),AuxType(A000),Access(C3) +NIGHT.STALKER=Type(06),AuxType(BD00),Access(C3) NI=Type(06),AuxType(0300),Access(C3) N.O.R.A.D=Type(06),AuxType(0330),Access(C3) NIBBLER=Type(06),AuxType(0300),Access(C3) @@ -65,7 +65,7 @@ PLASMANIA=Type(06),AuxType(0200),Access(C3) PHASER.FIRE=Type(06),AuxType(B200),Access(C3) POOYAN=Type(06),AuxType(0300),Access(C3) REPTON=Type(06),AuxType(0200),Access(C3) -ROBOTRON.2084=Type(06),AuxType(BF70),Access(C3) +ROBOTRON.2084=Type(06),AuxType(9000),Access(C3) SAMMY.LIGHTFOOT=Type(06),AuxType(BA00),Access(C3) SERPENTINE=Type(06),AuxType(0300),Access(C3) SHORT.CIRCUIT=Type(06),AuxType(0210),Access(C3) diff --git a/res/GAMES.CONF b/res/GAMES.CONF index e6c9f1ad3..70be03857 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -93,7 +93,7 @@ 00070,BR=Buck Rogers: Planet of Zoom 00071,BUG.ATTACK=Bug Attack 00011,BUG.BATTLE=Bug Battle -00030,BU=BurgerTime +00031,BU=BurgerTime 00011,BUTCHERBOB.86=ButcherBob '86 00011,BUZZARD.BAIT=Buzzard Bait 00000,CV=C'est La Vie @@ -296,7 +296,7 @@ 00041,NIBBLER=Nibbler 00001,NIGHT.CRAWLER=Night Crawler 00070,NM=Night Mission Pinball -00010,NIGHT.STALKER=Night Stalker +00011,NIGHT.STALKER=Night Stalker 00010,NI=Nightmare Gallery 00011,OM=O'Riley's Mine 00010,OID.ZONE=Oid Zone @@ -357,7 +357,7 @@ 00051,ROADBLOCK=Roadblock 01170,ROBOCOP=Robocop 00011,ROBOT.BATTLE=Robot Battle -00010,ROBOTRON.2084=Robotron 2084 +00011,ROBOTRON.2084=Robotron 2084 00010,ROUND.ABOUT=Round About 00010,RUN.FOR.IT=Run For It 00011,RUSSKI.DUCK=Russki Duck diff --git a/src/demo/burgertime.a b/src/demo/burgertime.a index b598e2fb1..c4ef6d587 100644 --- a/src/demo/burgertime.a +++ b/src/demo/burgertime.a @@ -8,29 +8,15 @@ !source "src/constants.a" ; no code in these !source "src/macros.a" - +READ_RAM2_WRITE_RAM2 - jsr EnableAccelerator - -;+LOAD_FILE_KEEP_DIR - ldx #0 ; read to main memory - stx ldrhi - stx ldrlo - +LDADDR title - jsr iLoadFileDirect - - ldx #5-1 ; we also need to copy the length byte -- lda newpath,x - sta $BFD0,x - dex - bpl - + +ENABLE_ACCEL + +LOAD_XSINGLE title lda #$60 sta $3ec9 sta $3f09 jsr $3e97 ; decompress - jsr DisableAccelerator - +READ_ROM_NO_WRITE + +DISABLE_ACCEL lda #$4C sta $653F @@ -75,12 +61,8 @@ jmp $a300 -newpath - !byte 4 - !text "X/BU" - title !byte x_e-x_b -x_b !text "X/BU/BU" +x_b !text "BU" x_e !if * > $3F0 { diff --git a/src/demo/night.stalker.a b/src/demo/night.stalker.a index c1c7af754..0fd89779e 100644 --- a/src/demo/night.stalker.a +++ b/src/demo/night.stalker.a @@ -3,7 +3,7 @@ !cpu 6502 !to "res/DEMO/NIGHT.STALKER",plain -*=$a000 +*=$BD00 !source "src/constants.a" ; no code in these !source "src/macros.a" @@ -18,10 +18,8 @@ eor #$A5 sta $618E ; fix reset checksum ; (game picks up vectors from un-initialized memory) - +READ_RAM2_WRITE_RAM2 - jsr EnableAccelerator - +LOAD_FILE_AT night_stalker, $00 - +READ_ROM_NO_WRITE + +ENABLE_ACCEL + +LOAD_XSINGLE title lda #$60 sta $6017 sta $603F @@ -100,6 +98,6 @@ patch !byte $20,$30,$AB,$CE,$24,$03,$D0,$03,$4C,$00,$01,$60,$AD,$6F,$03,$05,$ } x_e -night_stalker - !byte 29 - !text "X/NIGHT.STALKER/NIGHT.STALKER" +title !byte xx_e-xx_b +xx_b !text "NIGHT.STALKER" +xx_e diff --git a/src/demo/robotron.a b/src/demo/robotron.a index 29c2108ea..e81c53b6f 100644 --- a/src/demo/robotron.a +++ b/src/demo/robotron.a @@ -3,20 +3,13 @@ !cpu 6502 !to "res/DEMO/ROBOTRON.2084",plain -*=$BF70 +*=$9000 !source "src/constants.a" ; no code in these !source "src/macros.a" - +READ_RAM2_WRITE_RAM2 - jsr EnableAccelerator - -;+LOAD_FILE_KEEP_DIR - ldx #0 ; read to main memory - stx ldrhi - stx ldrlo - +LDADDR title - jsr iLoadFileDirect + +ENABLE_ACCEL + +LOAD_XSINGLE title lda # $C000 { diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 2c525f173..897680c4c 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 14996180 + !be24 15037276 !le16 5108 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index aa77280e0..fd860f52e 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 14943903 + !be24 14984999 !le16 5562 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index bb7e00238..ab3e7a0b5 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 14879883 + !be24 14920979 !le16 3932 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index b505fe8f6..1e17230e5 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 14893722 + !be24 14934818 !le16 4354 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 23d09802a..12d37ab59 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 14911012 + !be24 14952108 !le16 5527 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index b6503e194..aaff800bf 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 14930798 + !be24 14971894 !le16 6146 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index d5d057393..48367c34c 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 15001288 + !be24 15042384 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 2ccaf6254..82bdf6be7 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 15002042 + !be24 15043138 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 0faef95ac..c152af413 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 15002490 + !be24 15043586 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 8b16950b2..4c872172c 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 14952105 + !be24 14993201 !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index ad29d4efd..0c65f66f2 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 15001774 + !be24 15042870 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index d6a415c60..512a6aa31 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 14996121 + !be24 15037217 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 2b185bf42..a3adc0a89 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 14994587 + !be24 15035683 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 9273d4304..a150d39ad 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 14979746 + !be24 15020842 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index d628b39e2..ef65392b5 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 14949465 + !be24 14990561 !le16 2640 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index bf840f0ef..bcb8c6c58 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 14954103 + !be24 14995199 !le16 6959 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 1fb1fac77..94fec2634 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 15001698 + !be24 15042794 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 40ad70f42..c1941a124 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 14996024 + !be24 15037120 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index c497e06e9..e88fe5627 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 15001841 + !be24 15042937 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index b3e296709..94b9a5b33 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 14980283 + !be24 15021379 !le16 4645 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index d92751adb..b8cb7337e 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 14984928 + !be24 15026024 !le16 1702 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index e4a955e9c..b4627a37e 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 14986630 + !be24 15027726 !le16 1087 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 1f2a8421c..31a3b3d00 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 14987717 + !be24 15028813 !le16 3279 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 55527c081..77ef41fe0 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 14990996 + !be24 15032092 !le16 2998 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index afde70bcd..09fc8a3b4 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 14993994 + !be24 15035090 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index bb907db46..aa62e9913 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 14994473 + !be24 15035569 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 6b13660cc..f0b8c21bb 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 15002793 + !be24 15043889 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index b566f7ff1..ae889a5d7 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 14966279 + !be24 15007375 !le16 4692 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index 774168a1d..a845e5b66 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 14970971 + !be24 15012067 !le16 2271 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 601319255..8b7a8bedd 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 14936944 + !be24 14978040 !le16 6959 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 1ad00485b..bfff6f61a 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 14870850 + !be24 14911946 !le16 9033 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 24cb357e4..8fd40084d 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 14883815 + !be24 14924911 !le16 9907 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index fda2a04fb..f70d9f850 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 14898076 + !be24 14939172 !le16 12936 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 4c93c9d1e..8e4107066 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 14916539 + !be24 14957635 !le16 14259 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index cfcb9f325..59d53bc43 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 14953745 + !be24 14994841 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 356191a42..de34dc2b9 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 14961062 + !be24 15002158 !le16 5217 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index fd1198d5f..6b963f31b 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 14973242 + !be24 15014338 !le16 6504 diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a index 00daa06b2..e2955315a 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 14866985 - !le16 3865 + !be24 14908045 + !le16 3901