Skip to content

Commit 2bc8a6d

Browse files
pkalipkali
authored
Merge pull request #162 from pkali/develop
Develop me baby
2 parents 37cb34b + fc1ab3b commit 2bc8a6d

46 files changed

Lines changed: 8929 additions & 6643 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
.project
22
*.bak
3-
scorch.lab
4-
scorch.lst
5-
textproc.lab
6-
textproc.lst
3+
*.lab
4+
*.lst
75
artwork/talk.as_

display_main_menu.asm renamed to Atari/display_main_menu.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
;-----------------------------------------------
55
; start of "variables" (RAM)
66
;-----------------------------------------------
7-
OptionsHere
7+
OptionsHere
88
; 0123456789012345678901234567890123456789
99
dta d"Players : 2 3 4 5 6 "
1010
dta d"Cash : none 2K 8K 12K 20K "

display_purchasedl.asm renamed to Atari/display_purchasedl.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DLPurTitleAddr
1515
.byte $50
1616
.byte $42
1717
.word purchaseTextBuffer
18-
.byte $00+$80
18+
.byte $00+$80
1919
.byte $20+$80,$10+$80,$42
2020
MoreUpdl
2121
.word EmptyLine

display_static.asm renamed to Atari/display_static.asm

Lines changed: 82 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,54 @@
88
;-----------------------------------------------
99
OptionsScreen
1010
dta d"Welcome to Scorch v. "
11-
build ; 4 bytes from scorch.asm (fancy method) :)
11+
build ; 4 bytes from scorch.asm (fancy method) :)
1212
dta d" (un)2000-2023"
1313

1414
.IF TARGET = 800
15-
dta d" Please select option with "
16-
dta $fe,$dc,$dd,$ff ; cursors in inverse
17-
dta d" and "
18-
dta d"Tab"*
19-
dta d" "
20-
dta d" Press "
21-
dta d"Return"*
22-
dta d" to proceed "
15+
dta d" Please select option with "
16+
dta $fe,$dc,$dd,$ff ; cursors in inverse
17+
dta d" and "
18+
dta d"Tab"*
19+
dta d" "
20+
dta d" Press "
21+
dta d"Return"*
22+
dta d" to proceed "
2323
.ELIF TARGET = 5200
24-
dta d" Please select option with joystick one "
25-
dta d" and press FIRE to proceed "
24+
dta d" Please select option with joystick one "
25+
dta d" and press FIRE to proceed "
2626
.ENDIF
2727
; 0123456789012345678901234567890123456789
2828
;-----------------------------------------------
2929
NameScreen
3030
.IF TARGET = 800
31-
dta d" Enter names of players "
31+
dta d" Enter names of players "
3232
.ELIF TARGET = 5200
33-
dta d"Hold "
34-
dta d "FIRE"*
35-
dta d " to enter player names "
33+
dta d"Hold "
34+
dta d "FIRE"*
35+
dta d " to enter player names "
3636
.ENDIF
3737
NameScreen3
3838
dta d" Human/Atari (difficulty level) "
3939
NameScreen5
4040
.IF TARGET = 800
41-
dta d"TAB"*
42-
dta d" - Port nr "
43-
dta $fe,$dc,$dd,$ff ; cursors in inverse
44-
dta d" - Difficulty"
45-
dta d" "
46-
dta d"INV"*
47-
dta d" - Shape "
48-
dta d"Return"*
49-
dta d" - Proceed "
41+
dta d"TAB"*
42+
dta d" - Port nr "
43+
dta $fe,$dc,$dd,$ff ; cursors in inverse
44+
dta d" - Difficulty"
45+
dta d" "
46+
dta d"INV"*
47+
dta d" - Shape "
48+
dta d"Return"*
49+
dta d" - Proceed "
5050
.ELIF TARGET = 5200
51-
dta d" "
52-
dta d"(5)"*
53-
dta d" - Port/Shape "
54-
dta d"Joy"*
55-
dta d" - Diffic. "
56-
dta d" "
57-
dta d"FIRE"*
58-
dta d" - Proceed "
51+
dta d" "
52+
dta d"(5)"*
53+
dta d" - Port/Shape "
54+
dta d"Joy"*
55+
dta d" - Diffic. "
56+
dta d" "
57+
dta d"FIRE"*
58+
dta d" - Proceed "
5959
.ENDIF
6060
;-----------------------------------------------
6161
MoreUp
@@ -73,51 +73,46 @@ MoreDown
7373
WeaponsDescription
7474
; 0123456789012345678901234567890123456789
7575
.IF TARGET = 800
76-
dta d"Tab"*
77-
dta d ": Defensive/Offensive weapon "
76+
dta d"Tab"*
77+
dta d ": Defensive/Offensive weapon "
7878
.ELIF TARGET = 5200
79-
dta d"Left"*
80-
dta d ": Defensive/Offensive weapon"
79+
dta d"Left"*
80+
dta d ": Defensive/Offensive weapon"
8181
.ENDIF
8282
PurchaseDescription
8383
; 0123456789012345678901234567890123456789
8484
.IF TARGET = 800
85-
dta d"Space"*
86-
dta d": Purchase "
87-
dta d"Return"*
88-
dta d": Finish "
85+
dta d"Space"*
86+
dta d": Purchase "
87+
dta d"Return"*
88+
dta d": Finish "
8989
.ELIF TARGET = 5200
90-
dta d"Right"*
91-
dta d": Purchase "
92-
dta d"FIRE"*
93-
dta d": Finish "
90+
dta d"Right"*
91+
dta d": Purchase "
92+
dta d"FIRE"*
93+
dta d": Finish "
9494
.ENDIF
9595
ActivateDescription
9696
; 0123456789012345678901234567890123456789
9797
.IF TARGET = 800
98-
dta d"Space"*
99-
dta d": Activate "
100-
dta d"Return"*
101-
dta d": Finish "
98+
dta d"Space"*
99+
dta d": Activate "
100+
dta d"Return"*
101+
dta d": Finish "
102102
.ELIF TARGET = 5200
103-
dta d"Right"*
104-
dta d": Activate "
105-
dta d"FIRE"*
106-
dta d": Finish "
103+
dta d"Right"*
104+
dta d": Activate "
105+
dta d"FIRE"*
106+
dta d": Finish "
107107
.ENDIF
108108
EmptyLine
109109
dta d" "
110110
;---------------------------------------------------
111111
OptionsTitle
112112
.IF TARGET = 800
113-
dta d" scorch "*
113+
dta d" scorch "*
114114
.ELIF TARGET = 5200
115-
dta d" scorch supersystem "*
116-
; dta d" scorch "*
117-
; dta d"5"
118-
; dta d"k"*
119-
; dta d"2"
120-
; dta d" "*
115+
dta d" scorch supersystem "*
121116
.ENDIF
122117
DifficultyTitle
123118
dta d" difficulty "*
@@ -135,7 +130,7 @@ GameOverTitle2
135130

136131
dl ; MAIN game display list
137132
.byte $70
138-
.byte $42
133+
.byte $42
139134
.word statusBuffer
140135
.byte $02, $02
141136
.byte $10+$80 ; 2 blank lines + DLI
@@ -182,19 +177,19 @@ dl ; MAIN game display list
182177
;-----------------------------------------------
183178
OptionsDL
184179
.byte $70
185-
.byte $47
186-
.word OptionsTitle
180+
.byte $47
181+
.word OptionsTitle
187182
.byte $70,$70
188183
.byte $42
189184
.word OptionsScreen
190185
.byte $30,$02,$02,$70
191-
.byte $42
192-
.word OptionsHere
193-
.byte $10
186+
.byte $42
187+
.word OptionsHere
188+
.byte $10
194189
:maxOptions-1 .by $02,$10
195-
:(9-maxOptions) .by $70,$10
196-
.byte $80
197-
.byte $60 ; to match moved sprites
190+
:(9-maxOptions) .by $70,$10
191+
.byte $80
192+
.byte $60 ; to match moved sprites
198193
.byte $4f
199194
.word (display+140*40)
200195
:21 .by $0f ;76
@@ -204,25 +199,25 @@ OptionsDL
204199
;Enter names of tanks DL
205200
NameDL
206201
.byte $70
207-
.byte $47
208-
.word DifficultyTitle
209-
.byte $70,$70 ; 16 empty lines
202+
.byte $47
203+
.word DifficultyTitle
204+
.byte $70,$70 ; 16 empty lines
210205
.byte $42
211206
.word NameScreen
212-
.byte $30 ; 4 empty lines
213-
.byte $42
214-
.word NameScreen2
215-
.byte $30+$80 ; 4 empty lines + DLI
216-
.byte $42
217-
.word NameScreen3
218-
.byte $10 ; 2 empty lines
219-
.byte $42
220-
.word NameScreen4
221-
.byte $02,$02
222-
.byte $30 ; 4 empty lines
223-
.byte $42
224-
.word NameScreen5
225-
.byte $02
207+
.byte $30 ; 4 empty lines
208+
.byte $42
209+
.word NameScreen2
210+
.byte $30+$80 ; 4 empty lines + DLI
211+
.byte $42
212+
.word NameScreen3
213+
.byte $10 ; 2 empty lines
214+
.byte $42
215+
.word NameScreen4
216+
.byte $02,$02
217+
.byte $30 ; 4 empty lines
218+
.byte $42
219+
.word NameScreen5
220+
.byte $02
226221
.byte $41
227222
.word NameDL
228223
; -------------------------------------------------
@@ -252,8 +247,8 @@ GameOverDL
252247
.byte $42
253248
.word GameOverResults
254249
:5 .byte $00+$80,$02
255-
.byte $01
256-
.word DLCreditsFragm
250+
.byte $01
251+
.word DLCreditsFragm
257252
; ---------------
258253
; end of "constants" (ROM)
259254
;-----------------------------------------------

display_status.asm renamed to Atari/display_status.asm

File renamed without changes.

0 commit comments

Comments
 (0)