diff --git a/023.slideshow/Makefile b/023.slideshow/Makefile index 7de009e..e95693f 100644 --- a/023.slideshow/Makefile +++ b/023.slideshow/Makefile @@ -8,17 +8,20 @@ BOOTBLOCK_ASM=alpine_bootblock.s OBJS=out/init.o out/utils.o out/trackloader.o out/image.o -IMAGES=mr.png mr2.png mr3.png mr4.png mr5.png mr6.png mr7.png mr8.png +ifeq ($(INTERLACE),0) +NOINTERLACE_EXTRA=mr8.png +endif +IMAGES=mr.png mr2.png mr3.png mr4.png mr6.png mr9.png mr10.png $(NOINTERLACE_EXTRA) USERSTACK_ADDRESS=7fffc # userstack used by bootblock BASE_ADDRESS=10000 # if you change this you must also change link.script -#--use-palette=palettes/$*.pal +USE_PALETTES=--use-palette=palettes/$*.pal VASM_EXTRA_ARGS=-DSECONDS_WAIT=$(SECONDS_WAIT) -DINTERLACE=$(INTERLACE) -DHAM_MODE=$(HAM_MODE) ifeq ($(HAM_MODE),1) -IMAGECON_ARGS= --dither --ham +IMAGECON_ARGS= --dither --ham $(USE_PALETTES) IMAGEDATA=$(addprefix out/, $(IMAGES:.png=-ham.bin)) else IMAGECON_ARGS=--colors 32 --quantize diff --git a/023.slideshow/image.s b/023.slideshow/image.s index 0816948..223242d 100644 --- a/023.slideshow/image.s +++ b/023.slideshow/image.s @@ -119,11 +119,12 @@ imageLookupTable: ; configure slideshow here dc.l imageData6 dc.l endImageData6-imageData6 - if INTERLACE==0 + dc.l InstallColorPalette7 dc.l imageData7 dc.l endImageData7-imageData7 + if INTERLACE==0 dc.l InstallColorPalette8 dc.l imageData8 dc.l endImageData8-imageData8 @@ -169,17 +170,19 @@ InstallColorPalette4: include "out/mr4-palette.s" rts InstallColorPalette5: - include "out/mr5-palette.s" + include "out/mr9-palette.s" rts InstallColorPalette6: include "out/mr6-palette.s" rts InstallColorPalette7: - include "out/mr7-palette.s" + include "out/mr10-palette.s" rts + if INTERLACE==0 InstallColorPalette8: include "out/mr8-palette.s" - rts + rts + endif; INTERLACE==0 section .photo ; data in this section will not be loaded by the bootloader cnop 0,512 ; each image must be aligned to a sector boundary @@ -221,9 +224,9 @@ endImageData4: cnop 0,512 ; each image must be aligned to a sector boundary imageData5: if HAM_MODE==1 - incbin "out/mr5-ham.lz" + incbin "out/mr9-ham.lz" else - incbin "out/mr5.lz" + incbin "out/mr9.lz" endif endImageData5: @@ -236,16 +239,16 @@ imageData6: endif endImageData6: - if INTERLACE==0 cnop 0,512 ; each image must be aligned to a sector boundary imageData7: if HAM_MODE==1 - incbin "out/mr7-ham.lz" + incbin "out/mr10-ham.lz" else - incbin "out/mr7.lz" + incbin "out/mr10.lz" endif endImageData7: + if INTERLACE==0 cnop 0,512 ; each image must be aligned to a sector boundary imageData8: if HAM_MODE==1 diff --git a/023.slideshow/palettes/mr10.pal b/023.slideshow/palettes/mr10.pal new file mode 100644 index 0000000..1bab90f --- /dev/null +++ b/023.slideshow/palettes/mr10.pal @@ -0,0 +1,16 @@ +865 +222 +c97 +543 +011 +ecb +b75 +344 +689 +432 +754 +111 +233 +da8 +fed +455 diff --git a/023.slideshow/palettes/mr2.pal b/023.slideshow/palettes/mr2.pal new file mode 100644 index 0000000..1bab90f --- /dev/null +++ b/023.slideshow/palettes/mr2.pal @@ -0,0 +1,16 @@ +865 +222 +c97 +543 +011 +ecb +b75 +344 +689 +432 +754 +111 +233 +da8 +fed +455 diff --git a/023.slideshow/palettes/mr3.pal b/023.slideshow/palettes/mr3.pal new file mode 100644 index 0000000..cbc1362 --- /dev/null +++ b/023.slideshow/palettes/mr3.pal @@ -0,0 +1,16 @@ +9ac +244 +cef +28a +744 +122 +3ce +267 +cbd +978 +422 +b8c +def +133 +19c +111 diff --git a/023.slideshow/palettes/mr4.pal b/023.slideshow/palettes/mr4.pal new file mode 100644 index 0000000..1bab90f --- /dev/null +++ b/023.slideshow/palettes/mr4.pal @@ -0,0 +1,16 @@ +865 +222 +c97 +543 +011 +ecb +b75 +344 +689 +432 +754 +111 +233 +da8 +fed +455 diff --git a/023.slideshow/palettes/mr6.pal b/023.slideshow/palettes/mr6.pal new file mode 100644 index 0000000..1bab90f --- /dev/null +++ b/023.slideshow/palettes/mr6.pal @@ -0,0 +1,16 @@ +865 +222 +c97 +543 +011 +ecb +b75 +344 +689 +432 +754 +111 +233 +da8 +fed +455 diff --git a/023.slideshow/palettes/mr8.pal b/023.slideshow/palettes/mr8.pal new file mode 100644 index 0000000..1bab90f --- /dev/null +++ b/023.slideshow/palettes/mr8.pal @@ -0,0 +1,16 @@ +865 +222 +c97 +543 +011 +ecb +b75 +344 +689 +432 +754 +111 +233 +da8 +fed +455 diff --git a/023.slideshow/palettes/mr9.pal b/023.slideshow/palettes/mr9.pal new file mode 100644 index 0000000..1bab90f --- /dev/null +++ b/023.slideshow/palettes/mr9.pal @@ -0,0 +1,16 @@ +865 +222 +c97 +543 +011 +ecb +b75 +344 +689 +432 +754 +111 +233 +da8 +fed +455