Apple-2-Tools/4cade
1
0
Fork 0
mirror of https://github.com/a2-4am/4cade.git synced 2024-06-01 08:41:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'a2-4am:main' into GameHelp

Browse Source
This commit is contained in:
Andrew Roughan 2022-10-12 00:07:38 +11:00 committed by GitHub
commit 378f000f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
61 changed files with 150 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/buildsingle.js
View File

@ -12,6 +12,8 @@ while (!b.stdout.atendofstream)
entries.push(c)
}
entries.sort()
for (i = 0; i < entries.length; i++)
{
x.run('cmd /c move /y build\\X\\' + entries[i] + ' ' + WScript.Arguments(0), 0, 1)

11
bin/buildss.js
View File

@ -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")
{

1
res/ARTWORK.SHR.SCORES/LUNAR.EXPLORER Normal file
View File

@ -0,0 +1 @@
513.678129572902

BIN
res/ARTWORK.SHR.UNCOMPRESSED/LUNAR.EXPLORER Normal file
View File

Binary file not shown.

BIN
res/ARTWORK.SHR/LUNAR.EXPLORER Normal file
View File

Binary file not shown.

1
res/ATTRACT/LUNAR.EXPLORER
View File

@ -3,6 +3,7 @@
# This file is automatically generated
#
LUNAR.EXPLORER=C
LUNAR.EXPLORER=A
[eof]

2
res/CREDITS
View File

@ -3,7 +3,7 @@
~
revision 05 / serial number 20220726
revision 05 / serial number 20221003
~

2
res/GAMES.CONF
View File

@ -43,7 +43,7 @@
00011,APPLE.PANIC=Apple Panic
00011,APPLE.ZAP=Apple Zap
10011,AO=Apple-Oids
00071,AQUATRON=Aquatron
00070,AQUATRON=Aquatron
10070,AB=Arcade Boot Camp
10000,ARCHON=Archon
00000,ARCHON.II=Archon II

1
res/SS/SHR54.CONF
View File

@ -2,6 +2,7 @@
# super hi-res slideshow
#
LUNAR.EXPLORER
OI
AO
SPACE.KADET

BIN
res/dsk/round about PRODOS (san inc pack).po
View File

Binary file not shown.

BIN
res/dsk/space spikes PRODOS (san inc pack).po
View File

Binary file not shown.

2
src/4cade.init.a
View File

@ -284,7 +284,7 @@ LoadingBuild
} else {
LoadingVersion
!byte 12
!text "v5.0-alpha.4"
!text " v5.0-beta.1"
}
Loading64K
!byte 3

4
src/demo/crime.wave.a
View File

@ -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"

24
src/hw.mockingboard.a
View File

@ -26,8 +26,29 @@
; zp $80-$82 clobbered
; A/Y clobbered
;------------------------------------------------------------------------------
MAGIC_Z80_LOCATION=$FFD
GetMockingboardStuff
+ST16 @callback+1
; from mgcaret
; https://github.com/a2-4am/4cade/issues/483
; the Mockingboard init can accidentally enable the Softcard Z80
; and can crash the machine
; solved by loading a small Z80 routine at $0FFD (FFFDh in the Z80 space):
; $32 $00 $E4 $C3 FD FF which is
; NOP
; LD (E400h),A ; card is at $E400 due to memory translation
; JP FFFDh
; returns the system to 6502 mode and leaves it in the same state as the Z80 after RESET:
; ready to execute the instruction at 0000h (from the Z80 perspective)
ldx #5
- lda magic_z80_bytes, x
sta MAGIC_Z80_LOCATION, x
dex
bpl -
lda ROM_MACHINEID
cmp #$06
bne @not_iic
@ -259,3 +280,6 @@ GetMockingboardStuff
@callback
jmp $FDFD ; SMC
magic_z80_bytes
!byte $32, $00, $E4, $C3, $FD, $FF

17
src/hw.vbl.init.a
View File

@ -22,7 +22,7 @@ BuildVBLFunction
beq @build_iic ; //c family
lda romid_mac
cmp #ROMID_IIECARD
beq @build_none ; broken in some versions, disable
beq @build_iiecard ; Mac Apple IIe card
sec
jsr idroutine ; check for IIgs
bcs @NotGS
@ -45,6 +45,21 @@ BuildVBLFunction
lda #$4C
sta UnwaitForVBL
rts
@build_iiecard
lda $FBBE ; check IIe card software version because v2.2.2d1 is broken
cmp #$03 ; $03 = v2.2.x
bne @NotGS ; all other versions are ok
ldy #$08 ; Found v2.2.x but don't know which one, so test if VBL works
ldx #$00
- bit $C019
bmi @NotGS
dex
bne -
dey ; keep checking for ~22,000 cycles (a little over 1/50 of a second)
bne - ; if no VBL by then fall through to @build_none
@build_none
lda #$60
sta WaitForVBL

4
src/index/artwork.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15218757
!le16 5108
!be24 15209641
!le16 5129

2
src/index/attract.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15165216
!be24 15156100
!le16 5642

2
src/index/cache00.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15099714
!be24 15090598
!le16 4012

2
src/index/cache01.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15113863
!be24 15104747
!le16 4431

2
src/index/cache10.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15131566
!be24 15122450
!le16 5651

2
src/index/cache11.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15151812
!be24 15142696
!le16 6267

2
src/index/coverfade.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15223865
!be24 15214770
!le16 410

2
src/index/credits.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15224619
!be24 15215524
!le16 448

2
src/index/decrunch.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15225067
!be24 15215972
!le16 303

2
src/index/demo.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 12147163
!be24 12169884
!le16 1652

2
src/index/dfx.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15173498
!be24 15164382
!le16 1640

2
src/index/dgr.fizzle.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15224351
!be24 15215256
!le16 67

2
src/index/dgr.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15218698
!be24 15209582
!le16 59

2
src/index/dhgr.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15217164
!be24 15208048
!le16 1437

2
src/index/dtitle.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15201768
!be24 15192652
!le16 537

2
src/index/fx.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15170858
!be24 15161742
!le16 2640

2
src/index/gamehelp.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15175496
!be24 15166380
!le16 7137

2
src/index/gr.fizzle.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15224275
!be24 15215180
!le16 76

2
src/index/gr.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15218601
!be24 15209485
!le16 97

2
src/index/helptext.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15224418
!be24 15215323
!le16 201

2
src/index/hgr0.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15202305
!be24 15193189
!le16 4702

2
src/index/hgr1.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15207007
!be24 15197891
!le16 1715

2
src/index/hgr2.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15208722
!be24 15199606
!le16 1129

2
src/index/hgr3.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15209851
!be24 15200735
!le16 3388

2
src/index/hgr4.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15213239
!be24 15204123
!le16 3332

2
src/index/hgr5.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15216571
!be24 15207455
!le16 479

2
src/index/hgr6.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15217050
!be24 15207934
!le16 114

2
src/index/joystick.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15225370
!be24 15216275
!le16 2370

2
src/index/miniattract0.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15187945
!be24 15178829
!le16 4741

2
src/index/miniattract1.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15192686
!be24 15183570
!le16 2400

2
src/index/prelaunch.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15158079
!be24 15148963
!le16 7137

2
src/index/search00.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15090451
!be24 15081335
!le16 9263

2
src/index/search01.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15103726
!be24 15094610
!le16 10137

2
src/index/search10.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15118294
!be24 15109178
!le16 13272

2
src/index/search11.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15137217
!be24 15128101
!le16 14595

2
src/index/sfx.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15175138
!be24 15166022
!le16 358

2
src/index/slideshow.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15182633
!be24 15173517
!le16 5312

2
src/index/title.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15195086
!be24 15185970
!le16 6682

4
src/index/xsingle.idx.a
View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 15086446
!le16 4005
!be24 15077366
!le16 3969

17
src/prelaunch/flapple.bird.a
View File

@ -1,5 +1,5 @@
;license:MIT
;(c) 2020 by Frank M.
;(c) 2020, 2022 by Frank M., qkumba
!cpu 6502
!to "build/PRELAUNCH.INDEXED/FLAPPLE.BIRD",plain
@ -7,7 +7,20 @@
!source "src/prelaunch/common.a"
jmp $800
+READ_RAM2_NO_WRITE
jsr EnableAccelerator
lda #$60
sta $813
jsr $800
+READ_RAM1_NO_WRITE
lda WaitForVBL
eor #$60
bne @good_vbl ; if VBL disabled in TR
sta $2971 ; then disable VBL in game
@good_vbl
+DISABLE_ACCEL
jmp $2000
!if * > $1C0 {
!error "code is too large, ends at ", *

6
src/prelaunch/marble.madness.a
View File

@ -9,10 +9,10 @@
+ENABLE_ACCEL
lda #>(callback-1)
sta $4C9C
sta $4C76
lda #<(callback-1)
sta $4C9F
jmp $4A86 ; decompress
sta $4C79
jmp $4A53 ; decompress
reset
+READ_ROM_NO_WRITE

8
src/prelaunch/pipe.dream.a
View File

@ -10,17 +10,23 @@ my_vbl
!source "src/prelaunch/common.a"
+READ_RAM1_NO_WRITE
lda WaitForVBL
cmp #$60
beq @skip_vbl
lda WaitForVBL+1
sta @copy_vbl+1
lda WaitForVBL+2
sta @copy_vbl+2
@skip_vbl
lda MachineStatus
and #CHEATS_ENABLED
php
ldy #0
@copy_vbl
lda $d1d1,y ; SMC
lda WaitForVBL,y
; SMC, default to no VBL
sta my_vbl,y
iny
cmp #$60

23
src/prelaunch/prince.of.persia.a
View File

@ -15,21 +15,31 @@
and #CHEATS_ENABLED
sta cheat_smc1+1
sta cheat_smc2+1
lda WaitForVBL
cmp #$60
php
+READ_ROM_NO_WRITE
lda #$60
sta $13B8
jsr $1200 ; decompress
lda #<callback1
sta $FE06
lda #<callback2
sta $FD26
lda #>callback1
sta $FE07
sta $FD27
plp
bne @good_vbl
ldx #<callback3
stx $FD6A
sta $FD6B
@good_vbl
jmp $EE00
callback1
lda #<callback2
sta $FD26
lda #>callback2
sta $FD27
cheat_smc1
lda #0
beq +
@ -50,6 +60,11 @@ cheat_smc2
+
rts
callback3
lda #$60 ; if VBL disabled in TR
sta $4ED ; then disable VBL in game
jmp $F924
!if * > $1C0 {
!error "code is too large, ends at ", *
}

2
src/prelaunch/round.about.a
View File

@ -9,7 +9,7 @@
+ENABLE_ACCEL
lda #$60
sta $3D43
sta $3F48
jsr $800 ; decompress
+GET_MACHINE_STATUS

4
src/prelaunch/spikes.cheat.a
View File

@ -12,7 +12,7 @@
lda #$60
sta $99A
sta $A15
sta $A84
sta $A89
sta $BE3
jsr $900 ; decompress
lda #<callback3
@ -57,7 +57,7 @@ callback2
callback3
+READ_RAM2_NO_WRITE
jsr EnableAccelerator
jsr $BDFC
jsr $BE01
+READ_RAM2_NO_WRITE
lda MachineStatus

3
src/prelaunch/the.human.fly.a
View File

@ -1,5 +1,5 @@
;license:MIT
;(c) 2022 by qkumba
;(c) 2022 by qkumba, Frank M.
!cpu 6502
!to "build/PRELAUNCH.INDEXED/THE.HUMAN.FLY",plain
@ -33,6 +33,7 @@ callback
lda #$2c
sta $4D24 ; patch - don't decrease lives
+
+NEW_RESET_VECTOR $280
jsr DisableAccelerator
+READ_ROM_NO_WRITE
jmp $1100