Reorganize test code, add libX16Test submodule

Author: CJLove

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "libX16"]
 	path = libX16
 	url = https://github.com/CJLove/libX16
+[submodule "libX16Test"]
+	path = libX16Test
+	url = https://github.com/CJLove/libX16Test

Issues.md

@@ -3,7 +3,6 @@
 
 # Rough plans
 - Longer term: consider incorporating tilesets and concepts from LodeRunner Mad Monks Revenge
-- Figure out sound
 - Support for jumping to specific level
 - Add game editor?  This would require kernal SAVE support from banked RAM
 

README.md

@@ -2,7 +2,7 @@
 
 This in-progress port is based on other open source LodeRunner ports: [LodeRunner TotalRecall](https://github.com/SimonHung/LodeRunner_TotalRecall) and [LodeRunner for Roku](https://github.com/lvcabral/Lode-Runner-Roku).
 
-This port is (so far :) ) being written in C using the [CC65](https://cc65.github.io/) toolchain.  Also using the [libX16](https://github.com/CJLove/libX16) library for various utility functions.
+This port is (so far :smile:) being written in C using the [CC65](https://cc65.github.io/) toolchain.  Also using the [libX16](https://github.com/CJLove/libX16) library for various utility functions and using the [libX16Test](https://github.com/CJLove/libX16Test) library for unit tests.
 
 ![](runner.gif)
 
@@ -23,6 +23,14 @@ make all
 ```
 
 ## Test programs
+Test programs can be built from the test directory:
+```bash
+cd libX16Test/src
+make
+cd ../../test
+make all
+```
+
 * `test_levels.prg` - browse levels in any supported world.  Use the `+` and `-` keys to browse the next and previous levels.  Use `1` - `5` to change worlds (Classic, Championship, Professional, Fanbook, Revenge).  Use `c` to "complete" any given level (changing hidden ladder tiles to regular ladder tiles)
 
 * `test_runner.prg` - tests the runner's animations and basic movements on level 1.  Use the `j` and `k` for left/right, `i` and `m` for up/down.  Debug information about the current surrounding tiles and the runner's current position are displayed to the right.

libX16Test

@@ -1,8 +1,8 @@
 .PHONY: all clean
 
-LIBRARIES := ../libX16/lib
+LIBRARIES := -L ../libX16/lib
 
-INCLUDE := ../libX16/include
+INCLUDES := -I ../libX16/include
 
 SRC = \
 	loader.c screen.c levels.c runner.c key.c guard.c splash.c sound.c
@@ -13,27 +13,7 @@ OBJ = $(SRC:%.c=%.o)
 #	cl65 -t cx16 -I $(INCLUDE) -Oi $<
 
 lode_runner: mainloop.c $(SRC)
-	cl65 -t cx16 --listing test.txt -I $(INCLUDE) -L $(LIBRARIES) -Oi -o lode_runner.prg mainloop.c $(SRC) libX16.lib cx16.lib
-
-test_keys: test_keys.c $(SRC)
-	cl65 -t cx16 -I $(INCLUDE) -L $(LIBRARIES) -Oi -o test_keys.prg test_keys.c $(SRC) libX16.lib cx16.lib
-
-
-test_levels: test_levels.c $(SRC)
-	cl65 -t cx16 -I $(INCLUDE) -L $(LIBRARIES) -Oi -o test_levels.prg test_levels.c $(SRC) libX16.lib cx16.lib
-
-test_runner: test_runner.c $(SRC)
-	cl65 -t cx16 -I $(INCLUDE) -L $(LIBRARIES) -Oi -o test_runner.prg test_runner.c $(SRC) libX16.lib cx16.lib
-
-test_tiles: test_tiles.c $(SRC)
-	cl65 -t cx16 -I $(INCLUDE) -L $(LIBRARIES) -Oi -o test_tiles.prg test_tiles.c $(SRC) libX16.lib cx16.lib
-
-test_splash: test_splash.c $(SRC)
-	cl65 -t cx16 -I $(INCLUDE) -L $(LIBRARIES) -Oi -o test_splash.prg test_splash.c $(SRC) libX16.lib cx16.lib
-
-
-test_sprites: test_sprites.c $(SRC)
-	cl65 -t cx16 -I $(INCLUDE) -L $(LIBRARIES) -Oi -o test_sprites.prg test_sprites.c $(SRC) libX16.lib cx16.lib
+	cl65 -t cx16 --listing test.txt $(INCLUDES) $(LIBRARIES) -Oi -o lode_runner.prg mainloop.c $(SRC) libX16.lib cx16.lib
 
 PALETTE.BIN: ../assets/palette.txt
 	../scripts/ascii2bin.py --input ../assets/palette.txt --output PALETTE.BIN --addr 1000

src/Makefile

@@ -0,0 +1,64 @@
+.PHONY: all clean
+
+LIBRARIES := -L ../libX16/lib
+
+INCLUDES := -I ../libX16/include -I ../src
+
+SRC = \
+	../src/loader.c ../src/screen.c ../src/levels.c ../src/runner.c ../src/key.c ../src/guard.c ../src/splash.c ../src/sound.c
+
+test_keys: test_keys.c $(SRC)
+	cl65 -t cx16 $(INCLUDES) $(LIBRARIES) -Oi -o test_keys.prg test_keys.c $(SRC) libX16.lib cx16.lib
+
+test_levels: test_levels.c $(SRC)
+	cl65 -t cx16 $(INCLUDES) $(LIBRARIES) -Oi -o test_levels.prg test_levels.c $(SRC) libX16.lib cx16.lib
+
+test_runner: test_runner.c $(SRC)
+	cl65 -t cx16 $(INCLUDES) $(LIBRARIES) -Oi -o test_runner.prg test_runner.c $(SRC) libX16.lib cx16.lib
+
+test_tiles: test_tiles.c $(SRC)
+	cl65 -t cx16 $(INCLUDES) $(LIBRARIES) -Oi -o test_tiles.prg test_tiles.c $(SRC) libX16.lib cx16.lib
+
+test_splash: test_splash.c $(SRC)
+	cl65 -t cx16 $(INCLUDES) $(LIBRARIES) -Oi -o test_splash.prg test_splash.c $(SRC) libX16.lib cx16.lib
+
+test_sprites: test_sprites.c $(SRC)
+	cl65 -t cx16 $(INCLUDES) $(LIBRARIES) -Oi -o test_sprites.prg test_sprites.c $(SRC) libX16.lib cx16.lib
+
+PALETTE.BIN: ../assets/palette.txt
+	../scripts/ascii2bin.py --input ../assets/palette.txt --output PALETTE.BIN --addr 1000
+
+SPLASH.BIN: ../assets/splash.txt
+	../scripts/ascii2bin.py --input ../assets/splash.txt --output SPLASH.BIN --addr a000
+
+TILES.BIN: ../assets/tiles.txt
+	../scripts/graphic.py --input ../assets/tiles.txt --output TILES.BIN --x 8 --y 8 --bpp 2 --addr 0000
+
+CLASSIC.BIN: ../assets/classic.json ../scripts/levels.py
+	../scripts/levels.py --input ../assets/classic.json --output CLASSIC.BIN
+
+CHAMP.BIN: ../assets/championship.json ../scripts/levels.py
+	../scripts/levels.py --input ../assets/championship.json --output CHAMP.BIN
+
+PRO.BIN: ../assets/professional.json ../scripts/levels.py
+	../scripts/levels.py --input ../assets/professional.json --output PRO.BIN
+
+FANBOOK.BIN: ../assets/fanbook.json ../scripts/levels.py
+	../scripts/levels.py --input ../assets/fanbook.json --output FANBOOK.BIN
+
+REVENGE.BIN: ../assets/revenge.json ../scripts/levels.py
+	../scripts/levels.py --input ../assets/revenge.json --output REVENGE.BIN
+
+CUSTOM.BIN: ../assets/custom.json ../scripts/levels.py
+	../scripts/levels.py --input ../assets/custom.json --output CUSTOM.BIN
+
+
+SPRITES.BIN: ../assets/sprites.txt ../scripts/graphic.py
+	../scripts/graphic.py --input ../assets/sprites.txt --output SPRITES.BIN --x 8 --y 8 --bpp 4 --addr e000
+
+clean:
+	rm -f *.prg *.o
+
+all: bins test_keys test_levels test_runner test_tiles test_splash test_sprites
+
+bins: CLASSIC.BIN CHAMP.BIN PRO.BIN FANBOOK.BIN REVENGE.BIN SPRITES.BIN TILES.BIN PALETTE.BIN CUSTOM.BIN SPLASH.BIN