Commit `69b6715`

Nick Faro committed on Feb 2, 2023

Reorganize the HT repository at Toxa's suggestion

Basically make it slightly less cluttered, which will accomodate
the new upcoming manual well, fix a couple bugs, and update the build
script.

commit 69b67154131714411459e983dc8144fdb90ea6aa parent f67e079

96 changed files +895−1144

Modified.github/workflows/build.yml +14−11

         run: |
           sudo apt -qq update
           sudo apt install -yq lazarus libsdl2-dev bison
-          curl -Lo rgbds.tar.gz 'https://github.com/gbdev/rgbds/releases/download/v0.6.0/rgbds-0.6.0.tar.gz'
+          curl -Lo rgbds.tar.gz 'https://github.com/gbdev/rgbds/releases/download/v0.6.1/rgbds-0.6.1.tar.gz'
           tar xvf rgbds.tar.gz rgbds/{include,src,Makefile}
           cd rgbds
           make -j4 rgbasm rgblink rgbfix Q=
         shell: bash
         run: |
           choco install lazarus
-          curl -Lo 'sdl2.zip' 'https://www.libsdl.org/release/SDL2-2.0.22-win32-x64.zip'
+          curl -Lo 'sdl2.zip' 'https://github.com/libsdl-org/SDL/releases/download/release-2.26.2/SDL2-2.26.2-win32-x64.zip'
-          curl -Lo 'rgbds.zip' 'https://github.com/gbdev/rgbds/releases/download/v0.6.0/rgbds-0.6.0-win64.zip'
+          curl -Lo 'rgbds.zip' 'https://github.com/gbdev/rgbds/releases/download/v0.6.1/rgbds-0.6.1-win64.zip'
           unzip -d rgbds rgbds.zip rgb{asm,link,fix}.exe
       - name: Set up MSYS2
         run: | # The PATH manipulation is because the macOS and Windows installs do NOT put it in the PATH >_<
           export PATH="$PATH":/Applications/Lazarus:/c/lazarus
-          lazbuild --add-package-link rackctls/RackCtlsPkg.lpk
+          lazbuild --add-package-link src/rackctls/RackCtlsPkg.lpk
-          lazbuild --add-package-link bgrabitmap/bgrabitmap/bgrabitmappack.lpk
+          lazbuild --add-package-link src/bgrabitmap/bgrabitmap/bgrabitmappack.lpk
-          lazbuild hUGETracker.lpi --build-mode="Production ${{ matrix.name }}"
+          lazbuild src/hUGETracker.lpi --build-mode="Production ${{ matrix.name }}"
-          lazbuild uge2source/uge2source.lpi --build-mode=Release
+          lazbuild src/uge2source/uge2source.lpi --build-mode=Release
       - name: Package build
         shell: bash
         run: | # macOS does NOT have `realpath` :)
           mkdir packaging
-          for f in hUGETracker/{Resources/"Sample Songs",hUGEDriver,Resources/Fonts/PixeliteTTF.ttf,Resources/Keymaps}; do ln -sv "$PWD/$f" packaging; done
+          for f in hUGETracker/{sample-songs,src/hUGEDriver,fonts/PixeliteTTF.ttf,keymaps}; do ln -sv "$PWD/$f" packaging; done
           OBJ=`mktemp`
           HDOBJ=`mktemp`
-          rgbds/rgbasm -E -i hUGETracker/hUGEDriver -o "$HDOBJ" hUGETracker/hUGEDriver/hUGEDriver.asm
+          rgbds/rgbasm -E -i hUGETracker/src/hUGEDriver -o "$HDOBJ" hUGETracker/src/hUGEDriver/hUGEDriver.asm
-          rgbds/rgbasm -i hUGETracker/hUGEDriver/include -o "$OBJ" hUGETracker/halt.asm
+          rgbds/rgbasm -i hUGETracker/src/hUGEDriver/include -o "$OBJ" hUGETracker/src/halt.asm
           rgbds/rgblink -o packaging/halt.gb -n packaging/halt.sym "$OBJ" "$HDOBJ"
           rgbds/rgbfix -vp0xFF packaging/halt.gb
           rm "$OBJ" "$HDOBJ"
-          cp -v hUGETracker/Release/hUGETracker hUGETracker/uge2source/Release/uge2source packaging
+          cp -v hUGETracker/src/Release/hUGETracker hUGETracker/src/uge2source/Release/uge2source packaging
+          mv packaging/sample-songs "packaging/Sample Songs"
+          mv packaging/keymaps "packaging/Keymaps"
       - name: Extra Windows packaging
         if: matrix.name == 'Windows'

Modified.gitignore +1−0

`@@ -3,6 +3,7 @@ backup`
3	`ConverterBackup`	3	`ConverterBackup`
4	`**/backup`	4	`**/backup`
5	`lib`	5	`lib`
		6	`*.zip`
6	`*.exe`	7	`*.exe`
7	`*.dll`	8	`*.dll`
8	`*.lps`	9	`*.lps`

Modified.gitmodules +4−4

`@@ -1,12 +1,12 @@`
1	`[submodule "hUGEDriver"]`	1	`[submodule "hUGEDriver"]`
2	`path = hUGEDriver`	2	`path = src/hUGEDriver`
3	`url = http://github.com/SuperDisk/hUGEDriver`	3	`url = http://github.com/SuperDisk/hUGEDriver`
4	`[submodule "Pascal-SDL-2-Headers"]`	4	`[submodule "Pascal-SDL-2-Headers"]`
5	`path = Pascal-SDL-2-Headers`	5	`path = src/Pascal-SDL-2-Headers`
6	`url = https://github.com/ev1313/Pascal-SDL-2-Headers`	6	`url = https://github.com/ev1313/Pascal-SDL-2-Headers`
7	`[submodule "rackctls"]`	7	`[submodule "rackctls"]`
8	`path = rackctls`	8	`path = src/rackctls`
9	`url = https://github.com/olivluca/rackctls`	9	`url = https://github.com/olivluca/rackctls`
10	`[submodule "bgrabitmap"]`	10	`[submodule "bgrabitmap"]`
11	`path = bgrabitmap`	11	`path = src/bgrabitmap`
12	`url = https://github.com/bgrabitmap/bgrabitmap`	12	`url = https://github.com/bgrabitmap/bgrabitmap`

DeletedCPU/PROCS.INC +0−213

`@@ -1,213 +0,0 @@`
1	`procedure add16(Var first:Word;second:Word);`
2	`begin`
3	`qtemp.Q:=longint(first)+longint(second);`
4	`first:=qtemp.w1;`
5	`af.l:=(af.l and $C4) OR (qtemp.b2 and $38);`
6	`if qtemp.b3=0 then af.l:=af.l and 254 (* reset Cf *) else`
7	`af.l:=af.l or 1;(* set Cf *)`
8	`end;`
9
10	`procedure adc16(first,second:Word);`
11	`begin`
12	`qtemp.Q:=longint(first)+longint(second)+(af.l and 1);`
13	`af.l:=(qtemp.b2 and $B8);`
14	`if qtemp.b3=0 then af.l:=af.l and 254 (* reset Cf ) else af.l:=af.l or 1;( set Cf *)`
15	`if qtemp.w1>0 then af.l:=af.l and 191 (* reset Zf ) else af.l:=af.l or 64;( set Zf *)`
16	`if ((first XOR qtemp.w1) SHR 15>0) and`
17	`((first XOR second) SHR 15=0) then af.l:=af.l or 4 (* set Pf *) else`
18	`af.l:=af.l and 251;(* reset Pf *)`
19	`hl.W:=qtemp.w1;`
20	`end;`
21
22	`procedure sbc16(first,second:Word);`
23	`begin`
24	`qtemp.Q:=longint(first)-longint(second)-(af.l and 1);`
25	`af.l:=(qtemp.b2 and $B8) OR 2;`
26	`if qtemp.b4=0 then af.l:=af.l and 254 (* reset Cf ) else af.l:=af.l or 1;( set Cf *)`
27	`if qtemp.w1>0 then af.l:=af.l and 191 (* reset Zf ) else af.l:=af.l or 64;( set Zf *)`
28	`if ((first XOR qtemp.w1) SHR 15>0) and`
29	`((second XOR qtemp.w1) SHR 15=0) then af.l:=af.l or 4 (* set Pf *) else`
30	`af.l:=af.l and 251 ;(* reset Pf *)`
31	`hl.W:=qtemp.w1;`
32	`end;`
33
34	`procedure add8(Lo,Pls:Byte);`
35	`begin`
36	`ptemp.W:=Lo+Pls;`
37	`if ptemp.h=0 then`
38	`begin`
39	`ptemp.h:=ptemp.l;`
40	`ptemp.l:=ptemp.l and 254; (* reset Cf *)`
41	`end`
42	`else`
43	`begin`
44	`ptemp.h:=ptemp.l;`
45	`ptemp.l:=ptemp.l or 1;(* set Cf *)`
46	`end;`
47	`ptemp.l:=ptemp.l and 253;(* reset Nf *)`
48	`if ptemp.h>0 then`
49	`ptemp.l:=ptemp.l and 191 (* reset Zf *)`
50	`else`
51	`ptemp.l:=ptemp.l or 64;(* set Zf *)`
52	`if ((Lo XOR Pls XOR ptemp.h) and 16>0) then`
53	`ptemp.l:=ptemp.l or 16 (* set Hf *)`
54	`else`
55	`ptemp.l:=ptemp.l and 239;(* reset Hf *)`
56	`if ((Lo XOR ptemp.h) SHR 7>0) and ((Lo XOR Pls) SHR 7=0) then`
57	`ptemp.l:=ptemp.l or 4 (* set Pf *)`
58	`else`
59	`ptemp.l:=ptemp.l and 251;(* reset Pf *)`
60	`af.W:=ptemp.W;`
61	`end;`
62
63	`procedure sub8(Lo,Mns:Byte);`
64	`begin`
65	`ptemp.W:=Lo-Mns;`
66	`if ptemp.h=0 then`
67	`begin`
68	`ptemp.h:=ptemp.l;`
69	`ptemp.l:=ptemp.l and 254; (* reset Cf *)`
70	`end`
71	`else`
72	`begin`
73	`ptemp.h:=ptemp.l;`
74	`ptemp.l:=ptemp.l or 1;(* set Cf *)`
75	`end;`
76	`ptemp.l:=ptemp.l or 2; (* set Nf *)`
77	`if ptemp.h>0 then`
78	`ptemp.l:=ptemp.l and 191 (* reset Zf *)`
79	`else`
80	`ptemp.l:=ptemp.l or 64;(* set Zf *)`
81	`if (Lo XOR Mns XOR ptemp.h) and 16>0 then`
82	`ptemp.l:=ptemp.l or 16 (* set Hf *)`
83	`else`
84	`ptemp.l:=ptemp.l and 239;(* reset Hf *)`
85	`if ((Lo XOR ptemp.h) SHR 7>0) and ((Mns XOR ptemp.h) SHR 7=0)`
86	`then ptemp.l:=ptemp.l or 4 (* set Pf *)`
87	`else ptemp.l:=ptemp.l and 251;(* reset Pf *)`
88	`af.W:=ptemp.W;`
89	`end;`
90
91	`procedure adc8(Lo,Pls:Byte);`
92	`begin`
93	`ptemp.W:=Lo+Pls+(af.l and 1);`
94	`if ptemp.h=0 then`
95	`begin`
96	`ptemp.h:=ptemp.l;`
97	`ptemp.l:=ptemp.l and 254; (* reset Cf *)`
98	`end`
99	`else`
100	`begin`
101	`ptemp.h:=ptemp.l;`
102	`ptemp.l:=ptemp.l or 1;(* set Cf *)`
103	`end;`
104	`ptemp.l:=ptemp.l and 253;(* reset Nf *)`
105	`if ptemp.h>0 then`
106	`ptemp.l:=ptemp.l and 191(* reset Zf *)`
107	`else`
108	`ptemp.l:=ptemp.l or 64;(* set Zf *)`
109	`if (Lo XOR Pls XOR ptemp.h) and 16>0 then`
110	`ptemp.l:=ptemp.l or 16 (* set Hf *)`
111	`else`
112	`ptemp.l:=ptemp.l and 239;(* reset Hf *)`
113	`if ((Lo XOR ptemp.h) SHR 7>0) and ((Lo XOR Pls) SHR 7=0) then`
114	`ptemp.l:=ptemp.l or 4 (* set Pf *)`
115	`else ptemp.l:=ptemp.l and 251;(* reset Pf *)`
116	`af.W:=ptemp.W;`
117	`end;`
118
119	`procedure sbc8(Lo,Mns:Byte);`
120	`begin`
121	`ptemp.W:=Lo-Mns-(af.l and 1);`
122	`if ptemp.h=0 then`
123	`begin`
124	`ptemp.h:=ptemp.l;`
125	`ptemp.l:=ptemp.l and 254; (* reset Cf *)`
126	`end`
127	`else`
128	`begin`
129	`ptemp.h:=ptemp.l;`
130	`ptemp.l:=ptemp.l or 1;(* set Cf *)`
131	`end;`
132	`ptemp.l:=ptemp.l or 2; (* set Nf *)`
133	`if ptemp.h>0 then`
134	`ptemp.l:=ptemp.l and 191 (* reset Zf *)`
135	`else`
136	`ptemp.l:=ptemp.l or 64;(* set Zf *)`
137	`if (Lo XOR Mns XOR ptemp.h) and 16>0 then`
138	`ptemp.l:=ptemp.l or 16 (* set Hf *)`
139	`else`
140	`ptemp.l:=ptemp.l and 239;(* reset Hf *)`
141	`if ((Lo XOR ptemp.h) SHR 7>0) and ((Mns XOR ptemp.h) SHR 7=0)`
142	`then`
143	`ptemp.l:=ptemp.l or 4 (* set Pf *)`
144	`else ptemp.l:=ptemp.l and 251;(* reset Pf *)`
145	`af.W:=ptemp.W;`
146	`end;`
147
148	`procedure cp_sub8(Lo,Mns:Byte);`
149	`begin`
150	`ptemp.W:=Lo-Mns;`
151	`af.l:=(Mns and 40) OR (ptemp.l and 215) OR 2;`
152	`if ptemp.l>0 then af.l:=af.l and 191 (* reset Zf ) else af.l:=af.l or 64;( set Zf *)`
153	`if ptemp.h=0 then af.l:=af.l and 254 (* reset Cf ) else af.l:=af.l or 1;( set Cf *)`
154	`if (Lo XOR Mns XOR ptemp.l) and 16>0 then`
155	`af.l:=af.l or 16 (* set Hf *)`
156	`else`
157	`af.l:=af.l and 239;(* reset Hf *)`
158
159	`if ((Lo XOR ptemp.l) SHR 7>0) and ((Mns XOR ptemp.l) SHR 7=0) then`
160	`af.l:=af.l or 4 (* set Pf *) else`
161	`af.l:=af.l and 251 ;(* reset Pf *)`
162	`end;`
163
164	`procedure swap(var bval: Byte);`
165	`var`
166	`h: Byte;`
167	`begin`
168	`h := hi(bval);`
169	`bval := (bval shl 4) or h;`
170
171	`if bval = 0 then`
172	`af.l := 64`
173	`else`
174	`af.l := 0;`
175	`end;`
176
177	`procedure anda(bval:Byte);`
178	`begin`
179	`af.h:=af.h and bval;`
180	`af.l:=16 or (af.h and 236) or parity[af.h];`
181	`if af.h=0 then af.l:=af.l or 64 else af.l:=af.l and 191;`
182	`end;`
183
184	`procedure ora(bval:byte);`
185	`begin`
186	`af.h:=af.h or bval;`
187	`af.l:=(af.h and 236) or parity[af.h];`
188	`if af.h=0 then af.l:=af.l or 64 else af.l:=af.l and 191;`
189	`end;`
190
191	`procedure xora(bval:byte);`
192	`begin`
193	`af.h:=af.h xor bval;`
194	`af.l:=(af.h and 236) or parity[af.h];`
195	`if af.h=0 then af.l:=af.l or 64 else af.l:=af.l and 191;`
196	`end;`
197
198	`procedure copy_b53(btemp:Word);`
199	`Begin`
200	`af.l:=(af.l and 215) or (btemp and 40);`
201	`end;`
202
203	`procedure pop(var wpval:Word);`
204	`Begin`
205	`wpval:=wordpeek(sp_.W);`
206	`inc(sp_.W,2);`
207	`end;`
208
209	`procedure push(wpval:Word);`
210	`Begin`
211	`dec(sp_.W,2);`
212	`wordpoke(sp_.W,wpval);`
213	`end;`

ModifiedREADME.md +10−14

`@@ -11,10 +11,7 @@ If you want help using the tracker, driver, or just want to chat, join the [hUGE`
11		11
12	`# Build instructions`	12	`# Build instructions`
13		13
14	`The general build instructions are yet to be 100% solidified, but these steps will guide you in the right direction.`	14	`The only requirements to build hUGETracker are a recent version of [Lazarus](https://www.lazarus-ide.org/) for your platform, and [RGBDS.](https://rgbds.gbdev.io/)`
15
16	`The only requirements to build hUGETracker are a recent version of [Lazarus](https://www.lazarus-ide.org/) for your platform.`
17	`If you plan on building for other platforms than your own, you'll need the FPC crosscompilers for those platforms. (I recommend using [FPCUpDeluxe](https://github.com/LongDirtyAnimAlf/fpcupdeluxe) but honestly you probably don't need to do this)`
18		15
19	```bat	16	```bat
20	`:: Download this repo`	17	`:: Download this repo`
`@@ -24,19 +21,18 @@ git clone --recursive https://github.com/SuperDisk/hUGETracker`
24	`cd hUGETracker`	21	`cd hUGETracker`
25		22
26	`:: Let Lazarus know about the dependencies that HT uses`	23	`:: Let Lazarus know about the dependencies that HT uses`
27	`lazbuild --add-package-link rackctls/RackCtlsPkg.lpk`	24	`lazbuild --add-package-link src/rackctls/RackCtlsPkg.lpk`
28	`lazbuild --add-package-link bgrabitmap/bgrabitmap/bgrabitmappack.lpk`	25	`lazbuild --add-package-link src/bgrabitmap/bgrabitmap/bgrabitmappack.lpk`
29		26
30	`:: At this point if you want to develop HT, then open hUGETracker.lpi in Lazarus, make sure you're in the`	27	`:: At this point, you'll successfully be able to build hUGETracker.`
31	`:: Development build mode, and everything should build correctly. However, in order to allow for concurrent`	28	`:: However, in order to run properly, it needs some extra files (SDL, halt.gb, fonts, etc)`
32	`:: development on the tracker (this repo) and the sound driver (https://github.com/SuperDisk/hUGEDriver),`	29	`:: so run the following script to automatically set that up. If you're on Mac or Linux,`
33	`:: the hUGEDriver folder is not copied to the output directory, and you're expected to symlink it there yourself;`	30	`:: you can replicate the commands in it yourself.`
34	`:: Pick one of the following:`
35		31
36	`mklink/J lib\Development\x86_64-win64\hUGEDriver hUGEDriver`	32	`setup-windows.cmd`
37	`ln -s hUGEDriver lib/Development/x86_64-linux/hUGEDriver`
38		33
39	`:: If you just want to build a release for whatever platform you have, pick one of the following:`	34	`:: Now, you can either build and run hUGETracker from within Lazarus,`
		35	`:: or run one of the following to just build a binary:`
40		36
41	`lazbuild hUGETracker.lpi --build-mode="Production Windows"`	37	`lazbuild hUGETracker.lpi --build-mode="Production Windows"`
42	`lazbuild hUGETracker.lpi --build-mode="Production Mac"`	38	`lazbuild hUGETracker.lpi --build-mode="Production Mac"`

RenamedResources/Color Schemes/barryvan - TangoDark.colors → color-schemes/barryvan - TangoDark.colors +0−0