Skip to content

Commit 14257ca

Browse files
markmoxonmarkmoxon
committed
Improved folder structure for build process
1 parent 3929427 commit 14257ca

File tree

166 files changed

+312
-234
lines changed

Some content is hidden

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

166 files changed

+312
-234
lines changed

‎1-source-files/README.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Source file for the 6502 Second Processor version of Elite
2+
3+
This folder contains the source files for the 6502 Second Processor version of Elite.
4+
5+
* [fonts](fonts) contains the binaries for the game's text font
6+
7+
* [images](images) contains the image binaries for the title screen and dashboard
8+
9+
* [main-sources](main-sources) contains the annotated source code
10+
11+
* [original-sources](original-sources) contains the original text sources from Ian Bell's personal website
12+
13+
---
14+
15+
Right on, Commanders!
16+
17+
_Mark Moxon_

‎binaries/P.FONT.bin ‎1-source-files/fonts/P.FONT.bin

File renamed without changes.

‎binaries/P.FONTEX.bin ‎1-source-files/fonts/P.FONTEX.bin

File renamed without changes.

‎1-source-files/fonts/README.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Font binaries for the 6502 Second Processor version of Elite
2+
3+
This folder contains the font binaries from the original sources for the 6502 Second Processor version of Elite on Ian Bell's personal website.
4+
5+
* P.FONT.bin is the standard BBC Micro font, extracted from the MOS ROM
6+
7+
* P.FONTEX.bin is the futuristic space-age font used in the Executive edition
8+
9+
---
10+
11+
Right on, Commanders!
12+
13+
_Mark Moxon_

‎binaries/P.DATE2P.bin ‎1-source-files/images/P.DATE2P.bin

File renamed without changes.

‎binaries/P.DIALS2P.bin ‎1-source-files/images/P.DIALS2P.bin

File renamed without changes.

‎1-source-files/images/README.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Image binaries for the 6502 Second Processor version of Elite
2+
3+
This folder contains the image binaries from the original sources for the 6502 Second Processor version of Elite on Ian Bell's personal website.
4+
5+
* P.DATE2P.bin is an unused image that was used to datestamp the title screen during development
6+
7+
* P.DIALS2P.bin is the dashboard image
8+
9+
* Z.(C)ASOFT.bin is the "(c) ACORNSOFT 1984" image for the bottom of the title screen
10+
11+
* Z.ACSOFT.bin is the "ACORNSOFT" image for the very top of the title screen
12+
13+
* Z.ELITE.bin is the "ELITE" image for the title screen
14+
15+
---
16+
17+
Right on, Commanders!
18+
19+
_Mark Moxon_

‎binaries/Z.(C)ASFT.bin ‎1-source-files/images/Z.(C)ASFT.bin

File renamed without changes.

‎binaries/Z.ACSOFT.bin ‎1-source-files/images/Z.ACSOFT.bin

File renamed without changes.

‎binaries/Z.ELITE.bin ‎1-source-files/images/Z.ELITE.bin

File renamed without changes.

‎sources/README.md ‎1-source-files/main-sources/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
This folder contains the annotated source code for the 6502 Second Processor version of Elite.
44

5-
The original source code from Ian Bell's personal website can be found in the `original_sources` folder.
6-
75
---
86

97
Right on, Commanders!

‎sources/elite-bcfs.asm ‎1-source-files/main-sources/elite-bcfs.asm

+34-34
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@
2222
\
2323
\ This source file produces the following binary files:
2424
\
25-
\ * output/P.CODE.unprot.bin
25+
\ * P.CODE.unprot.bin
2626
\
2727
\ after reading in the following files:
2828
\
29-
\ * output/ELTA.bin
30-
\ * output/ELTB.bin
31-
\ * output/ELTC.bin
32-
\ * output/ELTD.bin
33-
\ * output/ELTE.bin
34-
\ * output/ELTF.bin
35-
\ * output/ELTG.bin
36-
\ * output/ELTH.bin
37-
\ * output/ELTI.bin
38-
\ * output/ELTJ.bin
39-
\ * output/SHIPS.bin
40-
\ * output/WORDS.bin
29+
\ * ELTA.bin
30+
\ * ELTB.bin
31+
\ * ELTC.bin
32+
\ * ELTD.bin
33+
\ * ELTE.bin
34+
\ * ELTF.bin
35+
\ * ELTG.bin
36+
\ * ELTH.bin
37+
\ * ELTI.bin
38+
\ * ELTJ.bin
39+
\ * SHIPS.bin
40+
\ * WORDS.bin
4141
\
4242
\ ******************************************************************************
4343

44-
INCLUDE "sources/elite-header.h.asm"
44+
INCLUDE "1-source-files/main-sources/elite-header.h.asm"
4545

4646
_SOURCE_DISC = (_RELEASE = 1)
4747
_SNG45 = (_RELEASE = 2)
@@ -71,62 +71,62 @@ LOAD% = &1000 \ The load address of the main game code file, which is
7171
ORG CODE%
7272

7373
IF _SNG45
74-
INCBIN "extracted/sng45/workspaces/BCFS-MOS.bin"
74+
INCBIN "4-reference-binaries/sng45/workspaces/BCFS-MOS.bin"
7575
ELIF _EXECUTIVE
76-
INCBIN "extracted/executive/workspaces/BCFS-MOS.bin"
76+
INCBIN "4-reference-binaries/executive/workspaces/BCFS-MOS.bin"
7777
ELIF _SOURCE_DISC
78-
INCBIN "extracted/source-disc/workspaces/BCFS-MOS.bin"
78+
INCBIN "4-reference-binaries/source-disc/workspaces/BCFS-MOS.bin"
7979
ENDIF
8080

8181
.elitea
8282

8383
PRINT "elitea = ", ~P%
84-
INCBIN "output/ELTA.bin"
84+
INCBIN "3-assembled-output/ELTA.bin"
8585

8686
.eliteb
8787

8888
PRINT "eliteb = ", ~P%
89-
INCBIN "output/ELTB.bin"
89+
INCBIN "3-assembled-output/ELTB.bin"
9090

9191
.elitec
9292

9393
PRINT "elitec = ", ~P%
94-
INCBIN "output/ELTC.bin"
94+
INCBIN "3-assembled-output/ELTC.bin"
9595

9696
.elited
9797

9898
PRINT "elited = ", ~P%
99-
INCBIN "output/ELTD.bin"
99+
INCBIN "3-assembled-output/ELTD.bin"
100100

101101
.elitee
102102

103103
PRINT "elitee = ", ~P%
104-
INCBIN "output/ELTE.bin"
104+
INCBIN "3-assembled-output/ELTE.bin"
105105

106106
.elitef
107107

108108
PRINT "elitef = ", ~P%
109-
INCBIN "output/ELTF.bin"
109+
INCBIN "3-assembled-output/ELTF.bin"
110110

111111
.eliteg
112112

113113
PRINT "eliteg = ", ~P%
114-
INCBIN "output/ELTG.bin"
114+
INCBIN "3-assembled-output/ELTG.bin"
115115

116116
.eliteh
117117

118118
PRINT "eliteh = ", ~P%
119-
INCBIN "output/ELTH.bin"
119+
INCBIN "3-assembled-output/ELTH.bin"
120120

121121
.elitei
122122

123123
PRINT "elitei = ", ~P%
124-
INCBIN "output/ELTI.bin"
124+
INCBIN "3-assembled-output/ELTI.bin"
125125

126126
.elitej
127127

128128
PRINT "elitej = ", ~P%
129-
INCBIN "output/ELTJ.bin"
129+
INCBIN "3-assembled-output/ELTJ.bin"
130130

131131
F% = P%
132132
PRINT "F% = ", ~F%
@@ -135,29 +135,29 @@ PRINT "P% = ", ~P%
135135
.words
136136

137137
PRINT "words = ", ~P%
138-
INCBIN "output/WORDS.bin"
138+
INCBIN "3-assembled-output/WORDS.bin"
139139

140140
.ships
141141

142142
PRINT "ships = ", ~P%
143-
INCBIN "output/SHIPS.bin"
143+
INCBIN "3-assembled-output/SHIPS.bin"
144144

145145
IF _SNG45
146-
INCBIN "extracted/sng45/workspaces/BCFS-SHIPS.bin"
146+
INCBIN "4-reference-binaries/sng45/workspaces/BCFS-SHIPS.bin"
147147
ELIF _EXECUTIVE
148-
INCBIN "extracted/executive/workspaces/BCFS-SHIPS.bin"
148+
INCBIN "4-reference-binaries/executive/workspaces/BCFS-SHIPS.bin"
149149
ELIF _SOURCE_DISC
150-
INCBIN "extracted/source-disc/workspaces/BCFS-SHIPS.bin"
150+
INCBIN "4-reference-binaries/source-disc/workspaces/BCFS-SHIPS.bin"
151151
ENDIF
152152

153153
.end
154154

155155
\ ******************************************************************************
156156
\
157-
\ Save 6502sp/output/P.CODE.unprot.bin
157+
\ Save P.CODE.unprot.bin
158158
\
159159
\ ******************************************************************************
160160

161161
PRINT "P% = ", ~P%
162162
PRINT "S.P.CODE ", ~LOAD%, ~(F% + &0400 + &2200), " ", ~LOAD%, ~LOAD%
163-
SAVE "output/P.CODE.unprot.bin", CODE%, (F% + &0400 + &2200), LOAD%
163+
SAVE "3-assembled-output/P.CODE.unprot.bin", CODE%, (F% + &0400 + &2200), LOAD%

‎sources/elite-checksum.asm ‎1-source-files/main-sources/elite-checksum.asm

File renamed without changes.

‎sources/elite-disc.asm ‎1-source-files/main-sources/elite-disc.asm

+11-11
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,38 @@
3131
\
3232
\ ******************************************************************************
3333

34-
INCLUDE "sources/elite-header.h.asm"
34+
INCLUDE "1-source-files/main-sources/elite-header.h.asm"
3535

3636
_SOURCE_DISC = (_RELEASE = 1)
3737
_SNG45 = (_RELEASE = 2)
3838
_EXECUTIVE = (_RELEASE = 3)
3939

4040
IF _SNG45 OR _EXECUTIVE
41-
PUTFILE "output/ELITE.bin", "ELITE", &FF1FDC, &FF2085
41+
PUTFILE "3-assembled-output/ELITE.bin", "ELITE", &FF1FDC, &FF2085
4242
ELIF _SOURCE_DISC
43-
PUTFILE "output/ELITE.bin", "ELITE", &FF2000, &FF2085
43+
PUTFILE "3-assembled-output/ELITE.bin", "ELITE", &FF2000, &FF2085
4444
ENDIF
4545

46-
PUTFILE "output/ELITEa.bin", "I.ELITEa", &FF2000, &FF2000
46+
PUTFILE "3-assembled-output/ELITEa.bin", "I.ELITEa", &FF2000, &FF2000
4747

4848
IF _SNG45 OR _SOURCE_DISC
49-
PUTFILE "output/I.CODE.bin", "I.CODE", &FF2400, &FF2C89
49+
PUTFILE "3-assembled-output/I.CODE.bin", "I.CODE", &FF2400, &FF2C89
5050
ELIF _EXECUTIVE
51-
PUTFILE "output/I.CODE.bin", "I.CODE", &032400, &032C89
51+
PUTFILE "3-assembled-output/I.CODE.bin", "I.CODE", &032400, &032C89
5252
ENDIF
5353

5454
IF _REMOVE_CHECKSUMS
5555
IF _SNG45 OR _SOURCE_DISC
56-
PUTFILE "output/P.CODE.bin", "P.CODE", &001000, &0010D1
56+
PUTFILE "3-assembled-output/P.CODE.bin", "P.CODE", &001000, &0010D1
5757
ELIF _EXECUTIVE
58-
PUTFILE "output/P.CODE.bin", "P.CODE", &001000, &0010D3
58+
PUTFILE "3-assembled-output/P.CODE.bin", "P.CODE", &001000, &0010D3
5959
ENDIF
6060
ELSE
6161
IF _SNG45 OR _SOURCE_DISC
62-
PUTFILE "output/P.CODE.bin", "P.CODE", &001000, &00106A
62+
PUTFILE "3-assembled-output/P.CODE.bin", "P.CODE", &001000, &00106A
6363
ELIF _EXECUTIVE
64-
PUTFILE "output/P.CODE.bin", "P.CODE", &001000, &00106C
64+
PUTFILE "3-assembled-output/P.CODE.bin", "P.CODE", &001000, &00106C
6565
ENDIF
6666
ENDIF
6767

68-
PUTFILE "output/README.txt", "README", &FFFFFF, &FFFFFF
68+
PUTFILE "3-assembled-output/README.txt", "README", &FFFFFF, &FFFFFF

‎sources/elite-loader1.asm ‎1-source-files/main-sources/elite-loader1.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
\
2323
\ This source file produces the following binary file:
2424
\
25-
\ * output/ELITE.bin
25+
\ * ELITE.bin
2626
\
2727
\ ******************************************************************************
2828

29-
INCLUDE "sources/elite-header.h.asm"
29+
INCLUDE "1-source-files/main-sources/elite-header.h.asm"
3030

3131
_SOURCE_DISC = (_RELEASE = 1)
3232
_SNG45 = (_RELEASE = 2)
@@ -1259,9 +1259,9 @@ ENDIF
12591259

12601260
\ ******************************************************************************
12611261
\
1262-
\ Save output/ELITE.bin
1262+
\ Save ELITE.bin
12631263
\
12641264
\ ******************************************************************************
12651265

12661266
PRINT "S.ELITE ", ~CODE%, " ", ~P%, " ", ~LOAD%, " ", ~LOAD%
1267-
SAVE "output/ELITE.bin", CODE%, P%, LOAD%
1267+
SAVE "3-assembled-output/ELITE.bin", CODE%, P%, LOAD%

‎sources/elite-loader2.asm ‎1-source-files/main-sources/elite-loader2.asm

+14-14
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
\
2323
\ This source file produces the following binary file:
2424
\
25-
\ * output/ELITEa.bin
25+
\ * ELITEa.bin
2626
\
2727
\ after reading in the following files:
2828
\
29-
\ * binaries/P.DIALS2P.bin
30-
\ * binaries/P.DATE2P.bin
31-
\ * binaries/Z.ACSOFT.bin
32-
\ * binaries/Z.ELITE.bin
33-
\ * binaries/Z.(C)ASFT.bin
29+
\ * 1-source-files/images/P.DIALS2P.bin
30+
\ * 1-source-files/images/P.DATE2P.bin
31+
\ * 1-source-files/images/Z.ACSOFT.bin
32+
\ * 1-source-files/images/Z.ELITE.bin
33+
\ * 1-source-files/images/Z.(C)ASFT.bin
3434
\
3535
\ ******************************************************************************
3636

37-
INCLUDE "sources/elite-header.h.asm"
37+
INCLUDE "1-source-files/main-sources/elite-header.h.asm"
3838

3939
_SOURCE_DISC = (_RELEASE = 1)
4040
_SNG45 = (_RELEASE = 2)
@@ -307,29 +307,29 @@ ENDMACRO
307307

308308
.DIALS
309309

310-
INCBIN "binaries/P.DIALS2P.bin"
310+
INCBIN "1-source-files/images/P.DIALS2P.bin"
311311

312312
.DATE
313313

314-
INCBIN "binaries/P.DATE2P.bin"
314+
INCBIN "1-source-files/images/P.DATE2P.bin"
315315

316316
.ASOFT
317317

318-
INCBIN "binaries/Z.ACSOFT.bin"
318+
INCBIN "1-source-files/images/Z.ACSOFT.bin"
319319

320320
.ELITE
321321

322-
INCBIN "binaries/Z.ELITE.bin"
322+
INCBIN "1-source-files/images/Z.ELITE.bin"
323323

324324
.CpASOFT
325325

326-
INCBIN "binaries/Z.(C)ASFT.bin"
326+
INCBIN "1-source-files/images/Z.(C)ASFT.bin"
327327

328328
\ ******************************************************************************
329329
\
330-
\ Save output/ELITEa.bin
330+
\ Save ELITEa.bin
331331
\
332332
\ ******************************************************************************
333333

334334
PRINT "S.ELITEa ", ~CODE%, " ", ~P%, " ", ~LOAD%, " ", ~LOAD%
335-
SAVE "output/ELITEa.bin", CODE%, P%, LOAD%
335+
SAVE "3-assembled-output/ELITEa.bin", CODE%, P%, LOAD%

‎sources/elite-readme.asm ‎1-source-files/main-sources/elite-readme.asm

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
\
2323
\ This source file produces the following binary file:
2424
\
25-
\ * output/README.txt
25+
\ * README.txt
2626
\
2727
\ ******************************************************************************
2828

29-
INCLUDE "sources/elite-header.h.asm"
29+
INCLUDE "1-source-files/main-sources/elite-header.h.asm"
3030

3131
_SOURCE_DISC = (_RELEASE = 1)
3232
_SNG45 = (_RELEASE = 2)
@@ -64,5 +64,5 @@ ENDIF
6464
EQUS "---------------------------------------"
6565
EQUB 10, 13
6666

67-
SAVE "output/README.txt", readme, P%
67+
SAVE "3-assembled-output/README.txt", readme, P%
6868

0 commit comments

Comments
 (0)