diff --git a/duke/Makefile b/duke/Makefile index f176a9f0..819b02b0 100644 --- a/duke/Makefile +++ b/duke/Makefile @@ -12,6 +12,7 @@ duke.dsk: HELLO DUKE cp empty.dsk duke.dsk $(DOS33) -y duke.dsk SAVE A HELLO $(DOS33) -y duke.dsk BSAVE -a 0x2000 DUKE + $(DOS33) -y duke.dsk BSAVE -a 0x4000 ./title/NEW_TITLEC.BIN TITLE ### @@ -37,6 +38,9 @@ duke.o: duke.s zp.inc hardware.inc duke.s \ graphics/duke_graphics.inc: cd graphics && make +title/new_title.lzsa: + cd title && make + maps/level1_map.lzsa: cd maps && make @@ -46,5 +50,5 @@ clean: rm -f *~ *.o *.lst HELLO DUKE cd graphics && make clean cd maps && make clean - + cd title && make clean diff --git a/duke/draw_duke.s b/duke/draw_duke.s index 5781250b..5307057e 100644 --- a/duke/draw_duke.s +++ b/duke/draw_duke.s @@ -1,9 +1,58 @@ + + ;========================= + ; move duke + ;========================= move_duke: + + lda DUKE_WALKING + beq done_move_duke + + lda DUKE_DIRECTION + bmi move_left + + lda DUKE_X + cmp #22 + bcc duke_walk_right + +duke_scroll_right: + + inc TILEMAP_X + + jsr copy_tilemap_subset + + jmp done_move_duke + +duke_walk_right: + inc DUKE_X + + jmp done_move_duke + +move_left: + + lda DUKE_X + cmp #14 + bcs duke_walk_left + +duke_scroll_left: + + dec TILEMAP_X + + jsr copy_tilemap_subset + + jmp done_move_duke + +duke_walk_left: + dec DUKE_X + + jmp done_move_duke + +done_move_duke: + rts - + ;========================= ; draw duke - + ;========================= draw_duke: lda DUKE_X diff --git a/duke/hello.bas b/duke/hello.bas index 3cf8c0d3..145ea099 100644 --- a/duke/hello.bas +++ b/duke/hello.bas @@ -1,4 +1,4 @@ 5 HOME -10 PRINT "LOADING DUKE V0.01" +10 PRINT "LOADING DUKE V0.02" 20 PRINT:PRINT 30 PRINT CHR$(4);"BRUN DUKE" diff --git a/duke/title/Makefile b/duke/title/Makefile new file mode 100644 index 00000000..adfdf7fa --- /dev/null +++ b/duke/title/Makefile @@ -0,0 +1,30 @@ +#include ../Makefile.inc + +B2D = ../../bmp2dhr/b2d +PNG2GR = ../../gr-utils/png2gr +LZSA = ~/research/lzsa/lzsa/lzsa + + +all: new_title.lzsa + +#### + +duke_title.lzsa: DUKE_TITLEC.BIN + $(LZSA) -r -f2 DUKE_TITLEC.BIN duke_title.lzsa + +DUKE_TITLEC.BIN: duke_title.bmp + $(B2D) duke_title.bmp HGR -d + +#### + +new_title.lzsa: NEW_TITLEC.BIN + $(LZSA) -r -f2 NEW_TITLEC.BIN new_title.lzsa + +NEW_TITLEC.BIN: new_title.bmp + $(B2D) new_title.bmp HGR + + +#### + +clean: + rm -f *~ *.o *.lst diff --git a/duke/title/new_title.bmp b/duke/title/new_title.bmp new file mode 100644 index 00000000..d065c3d4 Binary files /dev/null and b/duke/title/new_title.bmp differ diff --git a/duke/title/new_title.png b/duke/title/new_title.png new file mode 100644 index 00000000..22fe632e Binary files /dev/null and b/duke/title/new_title.png differ