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

This commit is contained in:
frankmilliron 2022-05-29 08:53:11 -07:00 committed by GitHub
commit b2eab7bcf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 132 additions and 48 deletions

View File

@ -3,7 +3,7 @@
~
revision 05 / serial number 20220519
revision 05 / serial number 20220529
~

View File

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

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11535720
!be24 11536232
!le16 4626

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11486803
!be24 11487315
!le16 5343

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11427069
!be24 11427581
!le16 3654

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11439880
!be24 11440392
!le16 4074

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11455930
!be24 11456442
!le16 5245

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11474474
!be24 11474986
!le16 5880

View File

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

View File

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

View File

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

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11494292
!be24 11494804
!le16 1242

View File

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

View File

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

View File

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

View File

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

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11492146
!be24 11492658
!le16 2146

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11495892
!be24 11496404
!le16 6449

View File

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

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11535580
!be24 11536092
!le16 81

View File

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

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11520281
!be24 11520793
!le16 4511

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11524792
!be24 11525304
!le16 1591

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11526383
!be24 11526895
!le16 1053

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11527436
!be24 11527948
!le16 3237

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11530673
!be24 11531185
!le16 2877

View File

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

View File

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

View File

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

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11507297
!be24 11507809
!le16 3658

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11510955
!be24 11511467
!le16 2795

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11480354
!be24 11480866
!le16 6449

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 3720192
!be24 3720704
!le16 8192

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 3736576
!be24 3737088
!le16 8192

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 3728384
!be24 3728896
!le16 8192

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11418786
!be24 11419298
!le16 8283

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11430723
!be24 11431235
!le16 9157

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11443954
!be24 11444466
!le16 11976

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11461175
!be24 11461687
!le16 13299

View File

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

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11502341
!be24 11502853
!le16 4956

View File

@ -4,5 +4,5 @@
; This file is automatically generated
;
!byte 0
!be24 11513750
!be24 11514262
!le16 5994

View File

@ -0,0 +1,27 @@
;license:MIT
;(c) 2020 by Tom Greene
!cpu 6502
!to "build/PRELAUNCH.INDEXED/DANGEROUS.DAVE",plain
*=$106
!source "src/prelaunch/common.a"
; the game calls the Applesoft RND function in ROM
; so we need to copy the seed into ZP, otherwise it
; will get stuck in an infinite loop
ldx #$04
- lda seed,x
sta $C9,x
dex
bpl -
jmp $200
seed
!byte $80, $4F, $C7, $52, $FF
!if * > $1C0 {
!error "code is too large, ends at ", *
}

View File

@ -36,8 +36,9 @@ callback1
pha
lda #<(callback2 - 1)
pha
+
jmp $60D6
+
jmp $60D2
callback2
lda #$ad

View File

@ -0,0 +1,36 @@
;license:MIT
;(c) 2022 by qkumba
!cpu 6502
!to "build/PRELAUNCH.INDEXED/SPELLWIELDER",plain
*=$106
!source "src/prelaunch/common.a"
lda #<callback1
sta $77A2
lda #>callback1
sta $77A3
jmp $6C00 ; decompress
callback1
lda #<callback2
sta $2200
lda #>callback2
sta $2201
lda #$A6
sta $2204
lda #$FA
sta $2205 ; reset vector
jmp $2000
callback2
lda #$A6
sta $8778
lda #$FA
sta $877A ; reset vector
jmp $BE00
!if * > $1C0 {
!error "code is too large, ends at ", *
}

View File

@ -1,5 +1,5 @@
;license:MIT
;(c) 2021 by qkumba/xot
;(c) 2021-2022 by qkumba/xot
!cpu 6502
!to "build/PRELAUNCH.INDEXED/SPUTNIK.ATTACK",plain
@ -13,20 +13,36 @@
sta $93D9
jsr $6900 ; decompress
+GET_MACHINE_STATUS
+READ_RAM2_NO_WRITE
lda MachineStatus
and #CHEATS_ENABLED
beq +
lda #$A5
sta $6B37 ; inf. lives
sta $6724 ; inf. shields
+
+DISABLE_ACCEL
lda #<callback
sta $BD3E
lda #>callback
sta $BD3F
jsr DisableAccelerator
+READ_ROM_NO_WRITE
- lda $C000
bpl -
lda $C010
jmp $8A60
callback
lda $BE4A
ora $BE4B
beq +
jsr $BF00
!byte $CE
!word $BE47
+
rts
!if * > $1C0 {
!error "code is too large, ends at ", *
}

View File

@ -16,7 +16,6 @@ callback
lda #$a5
sta $D433 ; patch - don't decrease lives
+
jsr DisableAccelerator
jmp $D000
++
@ -26,11 +25,16 @@ callback
jsr $1000 ; decompress
dex
jsr $D300 ; decompress more
lda #$60
sta $A0F7
jsr $A000
jsr DisableAccelerator
lda #<callback
sta $A17A
lda #>callback
sta $A17B
jmp $A000 ; decompress
ldy #0
jmp $A0F9 ; decompress
!if * > $1C0 {
!error "code is too large, ends at ", *