Pecus/scorch_src
1
0
Fork 0
mirror of https://github.com/Pecusx/scorch_src.git synced 2026-05-21 14:49:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from pkali/develop

Browse Source 
Colors on tanks names screen
This commit is contained in:
Pecusx
2022-05-14 20:33:59 +02:00
committed by GitHub
parent d9322221a3 08f7680563
commit 7dd3ecd2bf
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
display.asm
+3 -3
View File
@@ -40,8 +40,8 @@ NameDL
.byte $42 .byte $42
.word NameScreen .word NameScreen
.byte $30 .byte $30
.byte $02,$30,$2 .byte $02,$30+$80,$02
.byte $10,2,2,2,$30,2,2 .byte $10,$02,$02,$02,$30,$02,$02
.byte $41 .byte $41
.word NameDL .word NameDL
; ------------------------------------------------- ; -------------------------------------------------
@@ -154,7 +154,7 @@ NameAdr
dta d" " dta d" "
NamesOfLevels NamesOfLevels
dta d" HUMAN Moron Shooter " dta d" HUMAN Moron Shooter "
dta d" Poolshark Toosser Chooser " dta d" Poolshark Tosser Chooser "
dta d" Spoiler Cyborg Unknown " dta d" Spoiler Cyborg Unknown "
dta d" " dta d" "
dta d"Tab"* dta d"Tab"*
scorch.asm
+10 -8
View File
@@ -116,13 +116,14 @@ START
; Startup sequence ; Startup sequence
jsr Initialize jsr Initialize
VMAIN VBLinterrupt,6 ; jsr SetVBL
mwa #OptionsDL dlptrs mwa #OptionsDL dlptrs
lda dmactls lda dmactls
and #$fc and #$fc
ora #$02 ; normal screen width ora #$02 ; normal screen width
sta dmactls sta dmactls
VDLI DLIinterruptText.DLIinterruptNone ; jsr SetDLI for text screen without DLIs
jsr Options ;startup screen jsr Options ;startup screen
@@ -132,10 +133,13 @@ START
and #$fc and #$fc
ora #$01 ; narrow screen (32 chars) ora #$01 ; narrow screen (32 chars)
sta dmactls sta dmactls
VDLI DLIinterruptText ; jsr SetDLI for text (names) screen
mva #0 TankNr mva #0 TankNr
@ tax
@ jsr EnterPlayerName lda TankStatusColoursTable,x
sta colpf2s ; set color of player name line
jsr EnterPlayerName
inc TankNr inc TankNr
lda TankNr lda TankNr
cmp NumberOfPlayers cmp NumberOfPlayers
@@ -830,7 +834,7 @@ SetunPlots
lda TankColoursTable+3 lda TankColoursTable+3
sta $2c3 sta $2c3
LDA TankColoursTable+4 LDA TankColoursTable+4
STA COLPF3S ; WHAT THE FUCK ???? !!!! ???? STA COLPF3S ; joined missiles (5th tank)
mva #0 hscrol mva #0 hscrol
@@ -865,6 +869,7 @@ ClearResults
lda #0 ;starting song line 0-255 to A reg lda #0 ;starting song line 0-255 to A reg
jsr RASTERMUSICTRACKER ;Init jsr RASTERMUSICTRACKER ;Init
; ;
VMAIN VBLinterrupt,6 ;jsr SetVBL
rts rts
.endp .endp
@@ -873,10 +878,6 @@ DLIinterruptGraph .proc
pha pha
phy phy
ldy dliCounter ldy dliCounter
; bne NoFColorChange
; lda dliColorsFore
; sta COLPF2
;NoFColorChange
lda dliColorsBack,y lda dliColorsBack,y
ldy dliColorsFore ldy dliColorsFore
nop nop
@@ -897,6 +898,7 @@ DLIinterruptText .proc
mva #TextBackgroundColor colpf2 mva #TextBackgroundColor colpf2
mva #TextForegroundColor colpf3 mva #TextForegroundColor colpf3
pla pla
DLIinterruptNone
rti rti
.endp .endp
scorch.xex
BIN
View File
Binary file not shown.