diff --git a/asm/main.asm b/asm/main.asm index 90b3b6c..343af23 100644 --- a/asm/main.asm +++ b/asm/main.asm @@ -655,7 +655,7 @@ PALETTE_FADE_STEPS = 16 ; include the nula logo. Try to keep this simple and small in size to maximize disk space. .logo_image_data -INCBIN "output/logo/nula.png.bbc.exo" +INCBIN "gallery/output/logo/nula.png.bbc.exo" .end diff --git a/bbcnula1.asm b/bbcnula1.asm index a244169..d3b4b36 100644 --- a/bbcnula1.asm +++ b/bbcnula1.asm @@ -1,4 +1,4 @@ INCLUDE "asm/main.asm" -INCLUDE "output/volume1/config.asm" \ No newline at end of file +INCLUDE "gallery/output/volume1/config.asm" \ No newline at end of file diff --git a/bbcnula1.ssd b/bbcnula1.ssd index 0e30fb4..47c44d4 100644 Binary files a/bbcnula1.ssd and b/bbcnula1.ssd differ diff --git a/bbcnula2.asm b/bbcnula2.asm index 4af3368..dab3bd8 100644 --- a/bbcnula2.asm +++ b/bbcnula2.asm @@ -1,4 +1,4 @@ INCLUDE "asm/main.asm" -INCLUDE "output/volume2/config.asm" \ No newline at end of file +INCLUDE "gallery/output/volume2/config.asm" \ No newline at end of file diff --git a/bbcnula2.ssd b/bbcnula2.ssd index 7c89596..3a34915 100644 Binary files a/bbcnula2.ssd and b/bbcnula2.ssd differ diff --git a/bbcnula3.asm b/bbcnula3.asm index 595278e..0b7ab2f 100644 --- a/bbcnula3.asm +++ b/bbcnula3.asm @@ -1,4 +1,4 @@ INCLUDE "asm/main.asm" -INCLUDE "output/volume3/config.asm" \ No newline at end of file +INCLUDE "gallery/output/volume3/config.asm" \ No newline at end of file diff --git a/bbcnula3.ssd b/bbcnula3.ssd index 5addbba..731e3e9 100644 Binary files a/bbcnula3.ssd and b/bbcnula3.ssd differ diff --git a/assets.json b/gallery/assets.json similarity index 100% rename from assets.json rename to gallery/assets.json diff --git a/compile.py b/gallery/compile.py similarity index 94% rename from compile.py rename to gallery/compile.py index 5d95395..de60859 100644 --- a/compile.py +++ b/gallery/compile.py @@ -18,6 +18,7 @@ OUTPUT_FORMAT = "png" FORCE_UPDATE = False # has to be True atm because configs dont get build properly otherwise (TODO!) EXO_COMPRESS = True +BEEBASM_ROOT = "gallery/" # bbc file format # [version] @@ -190,7 +191,7 @@ def exportMode2(imagefilename): num_files = beeb_asm_config.count("PUTFILE") + 1 beeb_filename = "A." + '{num:02d}'.format(num=num_files) - config = 'PUTFILE "' + output_filename + '", "' + beeb_filename + '", &' + load_address + ', &' + exec_address + '\n' + config = 'PUTFILE "' + BEEBASM_ROOT + output_filename + '", "' + beeb_filename + '", &' + load_address + ', &' + exec_address + '\n' beeb_asm_config += config #return beeb_asm_config @@ -211,7 +212,7 @@ def updateConfig(imagefilename, beeb_asm_config): num_files = beeb_asm_config.count("PUTFILE") + 1 beeb_filename = "A." + '{num:02d}'.format(num=num_files) - config = 'PUTFILE "' + output_filename + '", "' + beeb_filename + '", &' + load_address + ', &' + exec_address + '\n' + config = 'PUTFILE "' + BEEBASM_ROOT + output_filename + '", "' + beeb_filename + '", &' + load_address + ', &' + exec_address + '\n' beeb_asm_config += config return beeb_asm_config @@ -702,3 +703,36 @@ def checkObjectForUpdate(obj, key, value): asset_manager = AssetManager("assets.json") asset_manager.compile() + +# hacky script to auto-update the readme with thumbnails of the converted images +if True: + + rootdir = "output/" + my_file = "../readme.md" + + gallery_md = '\n' + + for root, directories, filenames in os.walk(rootdir): + #for directory in directories: + # print os.path.join(root, directory) + volume = root[root.rfind('/')+1:] + if len(volume) > 0: + gallery_md += "\n---\n### " + volume + "\n" + + for filename in filenames: + if filename[-4:] == '.png': + f = os.path.join(root,filename) + f = f.replace('\\', '/') + f = f.replace(rootdir, '') + s = "\n" + gallery_md += s + + file = open(my_file, "r") + readme = file.read() + offset = readme.find("") + readme = readme[:offset+6] + readme += gallery_md + file = open(my_file, "w") + file.write(readme) + + print "readme.md updated." \ No newline at end of file diff --git a/exomizer.exe b/gallery/exomizer.exe similarity index 100% rename from exomizer.exe rename to gallery/exomizer.exe diff --git a/gallery/imagelist.md b/gallery/imagelist.md new file mode 100644 index 0000000..f6b3f5f --- /dev/null +++ b/gallery/imagelist.md @@ -0,0 +1 @@ +ECHO is off. diff --git a/images/logo/nula.PNG b/gallery/images/logo/nula.PNG similarity index 100% rename from images/logo/nula.PNG rename to gallery/images/logo/nula.PNG diff --git a/images/volume1/aladdin.png b/gallery/images/volume1/aladdin.png similarity index 100% rename from images/volume1/aladdin.png rename to gallery/images/volume1/aladdin.png diff --git a/images/volume1/bb.png b/gallery/images/volume1/bb.png similarity index 100% rename from images/volume1/bb.png rename to gallery/images/volume1/bb.png diff --git a/images/volume1/castle.png b/gallery/images/volume1/castle.png similarity index 100% rename from images/volume1/castle.png rename to gallery/images/volume1/castle.png diff --git a/images/volume1/chess.png b/gallery/images/volume1/chess.png similarity index 100% rename from images/volume1/chess.png rename to gallery/images/volume1/chess.png diff --git a/images/volume1/chuckrock.png b/gallery/images/volume1/chuckrock.png similarity index 100% rename from images/volume1/chuckrock.png rename to gallery/images/volume1/chuckrock.png diff --git a/images/volume1/dd.png b/gallery/images/volume1/dd.png similarity index 100% rename from images/volume1/dd.png rename to gallery/images/volume1/dd.png diff --git a/images/volume1/doom.png b/gallery/images/volume1/doom.png similarity index 100% rename from images/volume1/doom.png rename to gallery/images/volume1/doom.png diff --git a/images/volume1/flashback.png b/gallery/images/volume1/flashback.png similarity index 100% rename from images/volume1/flashback.png rename to gallery/images/volume1/flashback.png diff --git a/images/volume1/gng.png b/gallery/images/volume1/gng.png similarity index 100% rename from images/volume1/gng.png rename to gallery/images/volume1/gng.png diff --git a/images/volume1/gods.png b/gallery/images/volume1/gods.png similarity index 100% rename from images/volume1/gods.png rename to gallery/images/volume1/gods.png diff --git a/images/volume1/lemmings.png b/gallery/images/volume1/lemmings.png similarity index 100% rename from images/volume1/lemmings.png rename to gallery/images/volume1/lemmings.png diff --git a/images/volume1/lotus.png b/gallery/images/volume1/lotus.png similarity index 100% rename from images/volume1/lotus.png rename to gallery/images/volume1/lotus.png diff --git a/images/volume1/minecraft.png b/gallery/images/volume1/minecraft.png similarity index 100% rename from images/volume1/minecraft.png rename to gallery/images/volume1/minecraft.png diff --git a/images/volume1/monkey.png b/gallery/images/volume1/monkey.png similarity index 100% rename from images/volume1/monkey.png rename to gallery/images/volume1/monkey.png diff --git a/images/volume1/outrun2.png b/gallery/images/volume1/outrun2.png similarity index 100% rename from images/volume1/outrun2.png rename to gallery/images/volume1/outrun2.png diff --git a/images/volume1/pokemon.png b/gallery/images/volume1/pokemon.png similarity index 100% rename from images/volume1/pokemon.png rename to gallery/images/volume1/pokemon.png diff --git a/images/volume1/pokemonblue.png b/gallery/images/volume1/pokemonblue.png similarity index 100% rename from images/volume1/pokemonblue.png rename to gallery/images/volume1/pokemonblue.png diff --git a/images/volume1/populous2.png b/gallery/images/volume1/populous2.png similarity index 100% rename from images/volume1/populous2.png rename to gallery/images/volume1/populous2.png diff --git a/images/volume1/rainbow.png b/gallery/images/volume1/rainbow.png similarity index 100% rename from images/volume1/rainbow.png rename to gallery/images/volume1/rainbow.png diff --git a/images/volume1/roadrash.png b/gallery/images/volume1/roadrash.png similarity index 100% rename from images/volume1/roadrash.png rename to gallery/images/volume1/roadrash.png diff --git a/images/volume1/sf.png b/gallery/images/volume1/sf.png similarity index 100% rename from images/volume1/sf.png rename to gallery/images/volume1/sf.png diff --git a/images/volume1/smw.png b/gallery/images/volume1/smw.png similarity index 100% rename from images/volume1/smw.png rename to gallery/images/volume1/smw.png diff --git a/images/volume1/smw2.png b/gallery/images/volume1/smw2.png similarity index 100% rename from images/volume1/smw2.png rename to gallery/images/volume1/smw2.png diff --git a/images/volume1/sonic.png b/gallery/images/volume1/sonic.png similarity index 100% rename from images/volume1/sonic.png rename to gallery/images/volume1/sonic.png diff --git a/images/volume1/storm.png b/gallery/images/volume1/storm.png similarity index 100% rename from images/volume1/storm.png rename to gallery/images/volume1/storm.png diff --git a/images/volume1/swiv.png b/gallery/images/volume1/swiv.png similarity index 100% rename from images/volume1/swiv.png rename to gallery/images/volume1/swiv.png diff --git a/images/volume1/xenon2.png b/gallery/images/volume1/xenon2.png similarity index 100% rename from images/volume1/xenon2.png rename to gallery/images/volume1/xenon2.png diff --git a/images/volume1/zarch.png b/gallery/images/volume1/zarch.png similarity index 100% rename from images/volume1/zarch.png rename to gallery/images/volume1/zarch.png diff --git a/images/volume1/zelda.png b/gallery/images/volume1/zelda.png similarity index 100% rename from images/volume1/zelda.png rename to gallery/images/volume1/zelda.png diff --git a/images/volume1/zool.png b/gallery/images/volume1/zool.png similarity index 100% rename from images/volume1/zool.png rename to gallery/images/volume1/zool.png diff --git a/images/volume2/archimedes.png b/gallery/images/volume2/archimedes.png similarity index 100% rename from images/volume2/archimedes.png rename to gallery/images/volume2/archimedes.png diff --git a/images/volume2/beeb.png b/gallery/images/volume2/beeb.png similarity index 100% rename from images/volume2/beeb.png rename to gallery/images/volume2/beeb.png diff --git a/images/volume2/birds.png b/gallery/images/volume2/birds.png similarity index 100% rename from images/volume2/birds.png rename to gallery/images/volume2/birds.png diff --git a/images/volume2/cube.png b/gallery/images/volume2/cube.png similarity index 100% rename from images/volume2/cube.png rename to gallery/images/volume2/cube.png diff --git a/images/volume2/diamond.png b/gallery/images/volume2/diamond.png similarity index 100% rename from images/volume2/diamond.png rename to gallery/images/volume2/diamond.png diff --git a/images/volume2/elite.png b/gallery/images/volume2/elite.png similarity index 100% rename from images/volume2/elite.png rename to gallery/images/volume2/elite.png diff --git a/images/volume2/floyd.png b/gallery/images/volume2/floyd.png similarity index 100% rename from images/volume2/floyd.png rename to gallery/images/volume2/floyd.png diff --git a/images/volume2/fractal.png b/gallery/images/volume2/fractal.png similarity index 100% rename from images/volume2/fractal.png rename to gallery/images/volume2/fractal.png diff --git a/images/volume2/ghostbusters.png b/gallery/images/volume2/ghostbusters.png similarity index 100% rename from images/volume2/ghostbusters.png rename to gallery/images/volume2/ghostbusters.png diff --git a/images/volume2/graphics.png b/gallery/images/volume2/graphics.png similarity index 100% rename from images/volume2/graphics.png rename to gallery/images/volume2/graphics.png diff --git a/images/volume2/homer.png b/gallery/images/volume2/homer.png similarity index 100% rename from images/volume2/homer.png rename to gallery/images/volume2/homer.png diff --git a/images/volume2/laser.png b/gallery/images/volume2/laser.png similarity index 100% rename from images/volume2/laser.png rename to gallery/images/volume2/laser.png diff --git a/images/volume2/logo.png b/gallery/images/volume2/logo.png similarity index 100% rename from images/volume2/logo.png rename to gallery/images/volume2/logo.png diff --git a/images/volume2/marbles.png b/gallery/images/volume2/marbles.png similarity index 100% rename from images/volume2/marbles.png rename to gallery/images/volume2/marbles.png diff --git a/images/volume2/mario.png b/gallery/images/volume2/mario.png similarity index 100% rename from images/volume2/mario.png rename to gallery/images/volume2/mario.png diff --git a/images/volume2/neon.png b/gallery/images/volume2/neon.png similarity index 100% rename from images/volume2/neon.png rename to gallery/images/volume2/neon.png diff --git a/images/volume2/ray1.png b/gallery/images/volume2/ray1.png similarity index 100% rename from images/volume2/ray1.png rename to gallery/images/volume2/ray1.png diff --git a/images/volume2/ray2.png b/gallery/images/volume2/ray2.png similarity index 100% rename from images/volume2/ray2.png rename to gallery/images/volume2/ray2.png diff --git a/images/volume2/simpsons.png b/gallery/images/volume2/simpsons.png similarity index 100% rename from images/volume2/simpsons.png rename to gallery/images/volume2/simpsons.png diff --git a/images/volume2/spidey.png b/gallery/images/volume2/spidey.png similarity index 100% rename from images/volume2/spidey.png rename to gallery/images/volume2/spidey.png diff --git a/images/volume2/teapot.png b/gallery/images/volume2/teapot.png similarity index 100% rename from images/volume2/teapot.png rename to gallery/images/volume2/teapot.png diff --git a/images/volume2/terminator.png b/gallery/images/volume2/terminator.png similarity index 100% rename from images/volume2/terminator.png rename to gallery/images/volume2/terminator.png diff --git a/images/volume2/tron.png b/gallery/images/volume2/tron.png similarity index 100% rename from images/volume2/tron.png rename to gallery/images/volume2/tron.png diff --git a/images/volume2/trooper.png b/gallery/images/volume2/trooper.png similarity index 100% rename from images/volume2/trooper.png rename to gallery/images/volume2/trooper.png diff --git a/images/volume2/tut.png b/gallery/images/volume2/tut.png similarity index 100% rename from images/volume2/tut.png rename to gallery/images/volume2/tut.png diff --git a/images/volume2/woody.png b/gallery/images/volume2/woody.png similarity index 100% rename from images/volume2/woody.png rename to gallery/images/volume2/woody.png diff --git a/images/volume3/earth.png b/gallery/images/volume3/earth.png similarity index 100% rename from images/volume3/earth.png rename to gallery/images/volume3/earth.png diff --git a/images/volume3/fashion.png b/gallery/images/volume3/fashion.png similarity index 100% rename from images/volume3/fashion.png rename to gallery/images/volume3/fashion.png diff --git a/images/volume3/lenna.png b/gallery/images/volume3/lenna.png similarity index 100% rename from images/volume3/lenna.png rename to gallery/images/volume3/lenna.png diff --git a/images/volume3/lighthouse.png b/gallery/images/volume3/lighthouse.png similarity index 100% rename from images/volume3/lighthouse.png rename to gallery/images/volume3/lighthouse.png diff --git a/images/volume3/monalisa.png b/gallery/images/volume3/monalisa.png similarity index 100% rename from images/volume3/monalisa.png rename to gallery/images/volume3/monalisa.png diff --git a/images/volume3/moon.png b/gallery/images/volume3/moon.png similarity index 100% rename from images/volume3/moon.png rename to gallery/images/volume3/moon.png diff --git a/images/volume3/parrot.png b/gallery/images/volume3/parrot.png similarity index 100% rename from images/volume3/parrot.png rename to gallery/images/volume3/parrot.png diff --git a/images/volume3/sharbat.png b/gallery/images/volume3/sharbat.png similarity index 100% rename from images/volume3/sharbat.png rename to gallery/images/volume3/sharbat.png diff --git a/images/volume3/tiger.png b/gallery/images/volume3/tiger.png similarity index 100% rename from images/volume3/tiger.png rename to gallery/images/volume3/tiger.png diff --git a/images/wip/crossy.png b/gallery/images/wip/crossy.png similarity index 100% rename from images/wip/crossy.png rename to gallery/images/wip/crossy.png diff --git a/images/wip/parrots.png b/gallery/images/wip/parrots.png similarity index 100% rename from images/wip/parrots.png rename to gallery/images/wip/parrots.png diff --git a/images/wip/populous.png b/gallery/images/wip/populous.png similarity index 100% rename from images/wip/populous.png rename to gallery/images/wip/populous.png diff --git a/images/wip/teapot.png b/gallery/images/wip/teapot.png similarity index 100% rename from images/wip/teapot.png rename to gallery/images/wip/teapot.png diff --git a/images/wip/test.png b/gallery/images/wip/test.png similarity index 100% rename from images/wip/test.png rename to gallery/images/wip/test.png diff --git a/images/wip/tut2.png b/gallery/images/wip/tut2.png similarity index 100% rename from images/wip/tut2.png rename to gallery/images/wip/tut2.png diff --git a/gallery/makemd.bat b/gallery/makemd.bat new file mode 100644 index 0000000..b9a1f96 --- /dev/null +++ b/gallery/makemd.bat @@ -0,0 +1,5 @@ +@echo off +echo >imagelist.md +cd output +for /r %%x in (*.png) do echo "" >>imagelist.md +pause diff --git a/gallery/output/imagelist.md b/gallery/output/imagelist.md new file mode 100644 index 0000000..c24c1d9 --- /dev/null +++ b/gallery/output/imagelist.md @@ -0,0 +1,72 @@ +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" +"" diff --git a/gallery/output/logo/config.asm b/gallery/output/logo/config.asm new file mode 100644 index 0000000..c0b2f0b --- /dev/null +++ b/gallery/output/logo/config.asm @@ -0,0 +1 @@ +PUTFILE "gallery/output/logo/nula.png.bbc.exo", "A.01", &74ea, &2fc0 diff --git a/output/logo/nula.png b/gallery/output/logo/nula.png similarity index 100% rename from output/logo/nula.png rename to gallery/output/logo/nula.png diff --git a/output/logo/nula.png.bbc b/gallery/output/logo/nula.png.bbc similarity index 100% rename from output/logo/nula.png.bbc rename to gallery/output/logo/nula.png.bbc diff --git a/output/logo/nula.png.bbc.exo b/gallery/output/logo/nula.png.bbc.exo similarity index 100% rename from output/logo/nula.png.bbc.exo rename to gallery/output/logo/nula.png.bbc.exo diff --git a/output/meta.json b/gallery/output/meta.json similarity index 100% rename from output/meta.json rename to gallery/output/meta.json diff --git a/output/volume1/aladdin.png b/gallery/output/volume1/aladdin.png similarity index 100% rename from output/volume1/aladdin.png rename to gallery/output/volume1/aladdin.png diff --git a/output/volume1/aladdin.png.bbc b/gallery/output/volume1/aladdin.png.bbc similarity index 100% rename from output/volume1/aladdin.png.bbc rename to gallery/output/volume1/aladdin.png.bbc diff --git a/output/volume1/aladdin.png.bbc.exo b/gallery/output/volume1/aladdin.png.bbc.exo similarity index 100% rename from output/volume1/aladdin.png.bbc.exo rename to gallery/output/volume1/aladdin.png.bbc.exo diff --git a/output/volume1/bb.png b/gallery/output/volume1/bb.png similarity index 100% rename from output/volume1/bb.png rename to gallery/output/volume1/bb.png diff --git a/output/volume1/bb.png.bbc b/gallery/output/volume1/bb.png.bbc similarity index 100% rename from output/volume1/bb.png.bbc rename to gallery/output/volume1/bb.png.bbc diff --git a/output/volume1/bb.png.bbc.exo b/gallery/output/volume1/bb.png.bbc.exo similarity index 100% rename from output/volume1/bb.png.bbc.exo rename to gallery/output/volume1/bb.png.bbc.exo diff --git a/output/volume1/castle.png b/gallery/output/volume1/castle.png similarity index 100% rename from output/volume1/castle.png rename to gallery/output/volume1/castle.png diff --git a/output/volume1/castle.png.bbc b/gallery/output/volume1/castle.png.bbc similarity index 100% rename from output/volume1/castle.png.bbc rename to gallery/output/volume1/castle.png.bbc diff --git a/output/volume1/castle.png.bbc.exo b/gallery/output/volume1/castle.png.bbc.exo similarity index 100% rename from output/volume1/castle.png.bbc.exo rename to gallery/output/volume1/castle.png.bbc.exo diff --git a/output/volume1/chess.png b/gallery/output/volume1/chess.png similarity index 100% rename from output/volume1/chess.png rename to gallery/output/volume1/chess.png diff --git a/output/volume1/chess.png.bbc b/gallery/output/volume1/chess.png.bbc similarity index 100% rename from output/volume1/chess.png.bbc rename to gallery/output/volume1/chess.png.bbc diff --git a/output/volume1/chess.png.bbc.exo b/gallery/output/volume1/chess.png.bbc.exo similarity index 100% rename from output/volume1/chess.png.bbc.exo rename to gallery/output/volume1/chess.png.bbc.exo diff --git a/output/volume1/chuckrock.png b/gallery/output/volume1/chuckrock.png similarity index 100% rename from output/volume1/chuckrock.png rename to gallery/output/volume1/chuckrock.png diff --git a/output/volume1/chuckrock.png.bbc b/gallery/output/volume1/chuckrock.png.bbc similarity index 100% rename from output/volume1/chuckrock.png.bbc rename to gallery/output/volume1/chuckrock.png.bbc diff --git a/output/volume1/chuckrock.png.bbc.exo b/gallery/output/volume1/chuckrock.png.bbc.exo similarity index 100% rename from output/volume1/chuckrock.png.bbc.exo rename to gallery/output/volume1/chuckrock.png.bbc.exo diff --git a/gallery/output/volume1/config.asm b/gallery/output/volume1/config.asm new file mode 100644 index 0000000..b969933 --- /dev/null +++ b/gallery/output/volume1/config.asm @@ -0,0 +1,30 @@ +PUTFILE "gallery/output/volume1/aladdin.png.bbc.exo", "A.01", &690a, &2fc0 +PUTFILE "gallery/output/volume1/bb.png.bbc.exo", "A.02", &77f8, &2fc0 +PUTFILE "gallery/output/volume1/castle.png.bbc.exo", "A.03", &56bb, &2fc0 +PUTFILE "gallery/output/volume1/chess.png.bbc.exo", "A.04", &5e6b, &2fc0 +PUTFILE "gallery/output/volume1/chuckrock.png.bbc.exo", "A.05", &67d7, &2fc0 +PUTFILE "gallery/output/volume1/dd.png.bbc.exo", "A.06", &6c58, &2fc0 +PUTFILE "gallery/output/volume1/doom.png.bbc.exo", "A.07", &5b3f, &2fc0 +PUTFILE "gallery/output/volume1/flashback.png.bbc.exo", "A.08", &5dc0, &2fc0 +PUTFILE "gallery/output/volume1/gng.png.bbc.exo", "A.09", &6305, &2fc0 +PUTFILE "gallery/output/volume1/gods.png.bbc.exo", "A.10", &5a94, &2fc0 +PUTFILE "gallery/output/volume1/lemmings.png.bbc.exo", "A.11", &61e2, &2fc0 +PUTFILE "gallery/output/volume1/lotus.png.bbc.exo", "A.12", &763b, &2fc0 +PUTFILE "gallery/output/volume1/minecraft.png.bbc.exo", "A.13", &52d7, &2fc0 +PUTFILE "gallery/output/volume1/monkey.png.bbc.exo", "A.14", &5e30, &2fc0 +PUTFILE "gallery/output/volume1/outrun2.png.bbc.exo", "A.15", &60f9, &2fc0 +PUTFILE "gallery/output/volume1/pokemon.png.bbc.exo", "A.16", &67e7, &2fc0 +PUTFILE "gallery/output/volume1/pokemonblue.png.bbc.exo", "A.17", &7030, &2fc0 +PUTFILE "gallery/output/volume1/populous2.png.bbc.exo", "A.18", &69f5, &2fc0 +PUTFILE "gallery/output/volume1/rainbow.png.bbc.exo", "A.19", &7779, &2fc0 +PUTFILE "gallery/output/volume1/roadrash.png.bbc.exo", "A.20", &6a28, &2fc0 +PUTFILE "gallery/output/volume1/sf.png.bbc.exo", "A.21", &6165, &2fc0 +PUTFILE "gallery/output/volume1/smw.png.bbc.exo", "A.22", &6b26, &2fc0 +PUTFILE "gallery/output/volume1/smw2.png.bbc.exo", "A.23", &742e, &2fc0 +PUTFILE "gallery/output/volume1/sonic.png.bbc.exo", "A.24", &6b47, &2fc0 +PUTFILE "gallery/output/volume1/storm.png.bbc.exo", "A.25", &6b19, &2fc0 +PUTFILE "gallery/output/volume1/swiv.png.bbc.exo", "A.26", &5ca0, &2fc0 +PUTFILE "gallery/output/volume1/xenon2.png.bbc.exo", "A.27", &6af1, &2fc0 +PUTFILE "gallery/output/volume1/zarch.png.bbc.exo", "A.28", &7813, &2fc0 +PUTFILE "gallery/output/volume1/zelda.png.bbc.exo", "A.29", &7409, &2fc0 +PUTFILE "gallery/output/volume1/zool.png.bbc.exo", "A.30", &70e8, &2fc0 diff --git a/output/volume1/dd.png b/gallery/output/volume1/dd.png similarity index 100% rename from output/volume1/dd.png rename to gallery/output/volume1/dd.png diff --git a/output/volume1/dd.png.bbc b/gallery/output/volume1/dd.png.bbc similarity index 100% rename from output/volume1/dd.png.bbc rename to gallery/output/volume1/dd.png.bbc diff --git a/output/volume1/dd.png.bbc.exo b/gallery/output/volume1/dd.png.bbc.exo similarity index 100% rename from output/volume1/dd.png.bbc.exo rename to gallery/output/volume1/dd.png.bbc.exo diff --git a/output/volume1/doom.png b/gallery/output/volume1/doom.png similarity index 100% rename from output/volume1/doom.png rename to gallery/output/volume1/doom.png diff --git a/output/volume1/doom.png.bbc b/gallery/output/volume1/doom.png.bbc similarity index 100% rename from output/volume1/doom.png.bbc rename to gallery/output/volume1/doom.png.bbc diff --git a/output/volume1/doom.png.bbc.exo b/gallery/output/volume1/doom.png.bbc.exo similarity index 100% rename from output/volume1/doom.png.bbc.exo rename to gallery/output/volume1/doom.png.bbc.exo diff --git a/output/volume1/flashback.png b/gallery/output/volume1/flashback.png similarity index 100% rename from output/volume1/flashback.png rename to gallery/output/volume1/flashback.png diff --git a/output/volume1/flashback.png.bbc b/gallery/output/volume1/flashback.png.bbc similarity index 100% rename from output/volume1/flashback.png.bbc rename to gallery/output/volume1/flashback.png.bbc diff --git a/output/volume1/flashback.png.bbc.exo b/gallery/output/volume1/flashback.png.bbc.exo similarity index 100% rename from output/volume1/flashback.png.bbc.exo rename to gallery/output/volume1/flashback.png.bbc.exo diff --git a/output/volume1/gng.png b/gallery/output/volume1/gng.png similarity index 100% rename from output/volume1/gng.png rename to gallery/output/volume1/gng.png diff --git a/output/volume1/gng.png.bbc b/gallery/output/volume1/gng.png.bbc similarity index 100% rename from output/volume1/gng.png.bbc rename to gallery/output/volume1/gng.png.bbc diff --git a/output/volume1/gng.png.bbc.exo b/gallery/output/volume1/gng.png.bbc.exo similarity index 100% rename from output/volume1/gng.png.bbc.exo rename to gallery/output/volume1/gng.png.bbc.exo diff --git a/output/volume1/gods.png b/gallery/output/volume1/gods.png similarity index 100% rename from output/volume1/gods.png rename to gallery/output/volume1/gods.png diff --git a/output/volume1/gods.png.bbc b/gallery/output/volume1/gods.png.bbc similarity index 100% rename from output/volume1/gods.png.bbc rename to gallery/output/volume1/gods.png.bbc diff --git a/output/volume1/gods.png.bbc.exo b/gallery/output/volume1/gods.png.bbc.exo similarity index 100% rename from output/volume1/gods.png.bbc.exo rename to gallery/output/volume1/gods.png.bbc.exo diff --git a/output/volume1/lemmings.png b/gallery/output/volume1/lemmings.png similarity index 100% rename from output/volume1/lemmings.png rename to gallery/output/volume1/lemmings.png diff --git a/output/volume1/lemmings.png.bbc b/gallery/output/volume1/lemmings.png.bbc similarity index 100% rename from output/volume1/lemmings.png.bbc rename to gallery/output/volume1/lemmings.png.bbc diff --git a/output/volume1/lemmings.png.bbc.exo b/gallery/output/volume1/lemmings.png.bbc.exo similarity index 100% rename from output/volume1/lemmings.png.bbc.exo rename to gallery/output/volume1/lemmings.png.bbc.exo diff --git a/output/volume1/lotus.png b/gallery/output/volume1/lotus.png similarity index 100% rename from output/volume1/lotus.png rename to gallery/output/volume1/lotus.png diff --git a/output/volume1/lotus.png.bbc b/gallery/output/volume1/lotus.png.bbc similarity index 100% rename from output/volume1/lotus.png.bbc rename to gallery/output/volume1/lotus.png.bbc diff --git a/output/volume1/lotus.png.bbc.exo b/gallery/output/volume1/lotus.png.bbc.exo similarity index 100% rename from output/volume1/lotus.png.bbc.exo rename to gallery/output/volume1/lotus.png.bbc.exo diff --git a/output/volume1/minecraft.png b/gallery/output/volume1/minecraft.png similarity index 100% rename from output/volume1/minecraft.png rename to gallery/output/volume1/minecraft.png diff --git a/output/volume1/minecraft.png.bbc b/gallery/output/volume1/minecraft.png.bbc similarity index 100% rename from output/volume1/minecraft.png.bbc rename to gallery/output/volume1/minecraft.png.bbc diff --git a/output/volume1/minecraft.png.bbc.exo b/gallery/output/volume1/minecraft.png.bbc.exo similarity index 100% rename from output/volume1/minecraft.png.bbc.exo rename to gallery/output/volume1/minecraft.png.bbc.exo diff --git a/output/volume1/monkey.png b/gallery/output/volume1/monkey.png similarity index 100% rename from output/volume1/monkey.png rename to gallery/output/volume1/monkey.png diff --git a/output/volume1/monkey.png.bbc b/gallery/output/volume1/monkey.png.bbc similarity index 100% rename from output/volume1/monkey.png.bbc rename to gallery/output/volume1/monkey.png.bbc diff --git a/output/volume1/monkey.png.bbc.exo b/gallery/output/volume1/monkey.png.bbc.exo similarity index 100% rename from output/volume1/monkey.png.bbc.exo rename to gallery/output/volume1/monkey.png.bbc.exo diff --git a/output/volume1/outrun2.png b/gallery/output/volume1/outrun2.png similarity index 100% rename from output/volume1/outrun2.png rename to gallery/output/volume1/outrun2.png diff --git a/output/volume1/outrun2.png.bbc b/gallery/output/volume1/outrun2.png.bbc similarity index 100% rename from output/volume1/outrun2.png.bbc rename to gallery/output/volume1/outrun2.png.bbc diff --git a/output/volume1/outrun2.png.bbc.exo b/gallery/output/volume1/outrun2.png.bbc.exo similarity index 100% rename from output/volume1/outrun2.png.bbc.exo rename to gallery/output/volume1/outrun2.png.bbc.exo diff --git a/output/volume1/pokemon.png b/gallery/output/volume1/pokemon.png similarity index 100% rename from output/volume1/pokemon.png rename to gallery/output/volume1/pokemon.png diff --git a/output/volume1/pokemon.png.bbc b/gallery/output/volume1/pokemon.png.bbc similarity index 100% rename from output/volume1/pokemon.png.bbc rename to gallery/output/volume1/pokemon.png.bbc diff --git a/output/volume1/pokemon.png.bbc.exo b/gallery/output/volume1/pokemon.png.bbc.exo similarity index 100% rename from output/volume1/pokemon.png.bbc.exo rename to gallery/output/volume1/pokemon.png.bbc.exo diff --git a/output/volume1/pokemonblue.png b/gallery/output/volume1/pokemonblue.png similarity index 100% rename from output/volume1/pokemonblue.png rename to gallery/output/volume1/pokemonblue.png diff --git a/output/volume1/pokemonblue.png.bbc b/gallery/output/volume1/pokemonblue.png.bbc similarity index 100% rename from output/volume1/pokemonblue.png.bbc rename to gallery/output/volume1/pokemonblue.png.bbc diff --git a/output/volume1/pokemonblue.png.bbc.exo b/gallery/output/volume1/pokemonblue.png.bbc.exo similarity index 100% rename from output/volume1/pokemonblue.png.bbc.exo rename to gallery/output/volume1/pokemonblue.png.bbc.exo diff --git a/output/volume1/populous2.png b/gallery/output/volume1/populous2.png similarity index 100% rename from output/volume1/populous2.png rename to gallery/output/volume1/populous2.png diff --git a/output/volume1/populous2.png.bbc b/gallery/output/volume1/populous2.png.bbc similarity index 100% rename from output/volume1/populous2.png.bbc rename to gallery/output/volume1/populous2.png.bbc diff --git a/output/volume1/populous2.png.bbc.exo b/gallery/output/volume1/populous2.png.bbc.exo similarity index 100% rename from output/volume1/populous2.png.bbc.exo rename to gallery/output/volume1/populous2.png.bbc.exo diff --git a/output/volume1/rainbow.png b/gallery/output/volume1/rainbow.png similarity index 100% rename from output/volume1/rainbow.png rename to gallery/output/volume1/rainbow.png diff --git a/output/volume1/rainbow.png.bbc b/gallery/output/volume1/rainbow.png.bbc similarity index 100% rename from output/volume1/rainbow.png.bbc rename to gallery/output/volume1/rainbow.png.bbc diff --git a/output/volume1/rainbow.png.bbc.exo b/gallery/output/volume1/rainbow.png.bbc.exo similarity index 100% rename from output/volume1/rainbow.png.bbc.exo rename to gallery/output/volume1/rainbow.png.bbc.exo diff --git a/output/volume1/roadrash.png b/gallery/output/volume1/roadrash.png similarity index 100% rename from output/volume1/roadrash.png rename to gallery/output/volume1/roadrash.png diff --git a/output/volume1/roadrash.png.bbc b/gallery/output/volume1/roadrash.png.bbc similarity index 100% rename from output/volume1/roadrash.png.bbc rename to gallery/output/volume1/roadrash.png.bbc diff --git a/output/volume1/roadrash.png.bbc.exo b/gallery/output/volume1/roadrash.png.bbc.exo similarity index 100% rename from output/volume1/roadrash.png.bbc.exo rename to gallery/output/volume1/roadrash.png.bbc.exo diff --git a/output/volume1/sf.png b/gallery/output/volume1/sf.png similarity index 100% rename from output/volume1/sf.png rename to gallery/output/volume1/sf.png diff --git a/output/volume1/sf.png.bbc b/gallery/output/volume1/sf.png.bbc similarity index 100% rename from output/volume1/sf.png.bbc rename to gallery/output/volume1/sf.png.bbc diff --git a/output/volume1/sf.png.bbc.exo b/gallery/output/volume1/sf.png.bbc.exo similarity index 100% rename from output/volume1/sf.png.bbc.exo rename to gallery/output/volume1/sf.png.bbc.exo diff --git a/output/volume1/smw.png b/gallery/output/volume1/smw.png similarity index 100% rename from output/volume1/smw.png rename to gallery/output/volume1/smw.png diff --git a/output/volume1/smw.png.bbc b/gallery/output/volume1/smw.png.bbc similarity index 100% rename from output/volume1/smw.png.bbc rename to gallery/output/volume1/smw.png.bbc diff --git a/output/volume1/smw.png.bbc.exo b/gallery/output/volume1/smw.png.bbc.exo similarity index 100% rename from output/volume1/smw.png.bbc.exo rename to gallery/output/volume1/smw.png.bbc.exo diff --git a/output/volume1/smw2.png b/gallery/output/volume1/smw2.png similarity index 100% rename from output/volume1/smw2.png rename to gallery/output/volume1/smw2.png diff --git a/output/volume1/smw2.png.bbc b/gallery/output/volume1/smw2.png.bbc similarity index 100% rename from output/volume1/smw2.png.bbc rename to gallery/output/volume1/smw2.png.bbc diff --git a/output/volume1/smw2.png.bbc.exo b/gallery/output/volume1/smw2.png.bbc.exo similarity index 100% rename from output/volume1/smw2.png.bbc.exo rename to gallery/output/volume1/smw2.png.bbc.exo diff --git a/output/volume1/sonic.png b/gallery/output/volume1/sonic.png similarity index 100% rename from output/volume1/sonic.png rename to gallery/output/volume1/sonic.png diff --git a/output/volume1/sonic.png.bbc b/gallery/output/volume1/sonic.png.bbc similarity index 100% rename from output/volume1/sonic.png.bbc rename to gallery/output/volume1/sonic.png.bbc diff --git a/output/volume1/sonic.png.bbc.exo b/gallery/output/volume1/sonic.png.bbc.exo similarity index 100% rename from output/volume1/sonic.png.bbc.exo rename to gallery/output/volume1/sonic.png.bbc.exo diff --git a/output/volume1/storm.png b/gallery/output/volume1/storm.png similarity index 100% rename from output/volume1/storm.png rename to gallery/output/volume1/storm.png diff --git a/output/volume1/storm.png.bbc b/gallery/output/volume1/storm.png.bbc similarity index 100% rename from output/volume1/storm.png.bbc rename to gallery/output/volume1/storm.png.bbc diff --git a/output/volume1/storm.png.bbc.exo b/gallery/output/volume1/storm.png.bbc.exo similarity index 100% rename from output/volume1/storm.png.bbc.exo rename to gallery/output/volume1/storm.png.bbc.exo diff --git a/output/volume1/swiv.png b/gallery/output/volume1/swiv.png similarity index 100% rename from output/volume1/swiv.png rename to gallery/output/volume1/swiv.png diff --git a/output/volume1/swiv.png.bbc b/gallery/output/volume1/swiv.png.bbc similarity index 100% rename from output/volume1/swiv.png.bbc rename to gallery/output/volume1/swiv.png.bbc diff --git a/output/volume1/swiv.png.bbc.exo b/gallery/output/volume1/swiv.png.bbc.exo similarity index 100% rename from output/volume1/swiv.png.bbc.exo rename to gallery/output/volume1/swiv.png.bbc.exo diff --git a/output/volume1/xenon2.png b/gallery/output/volume1/xenon2.png similarity index 100% rename from output/volume1/xenon2.png rename to gallery/output/volume1/xenon2.png diff --git a/output/volume1/xenon2.png.bbc b/gallery/output/volume1/xenon2.png.bbc similarity index 100% rename from output/volume1/xenon2.png.bbc rename to gallery/output/volume1/xenon2.png.bbc diff --git a/output/volume1/xenon2.png.bbc.exo b/gallery/output/volume1/xenon2.png.bbc.exo similarity index 100% rename from output/volume1/xenon2.png.bbc.exo rename to gallery/output/volume1/xenon2.png.bbc.exo diff --git a/output/volume1/zarch.png b/gallery/output/volume1/zarch.png similarity index 100% rename from output/volume1/zarch.png rename to gallery/output/volume1/zarch.png diff --git a/output/volume1/zarch.png.bbc b/gallery/output/volume1/zarch.png.bbc similarity index 100% rename from output/volume1/zarch.png.bbc rename to gallery/output/volume1/zarch.png.bbc diff --git a/output/volume1/zarch.png.bbc.exo b/gallery/output/volume1/zarch.png.bbc.exo similarity index 100% rename from output/volume1/zarch.png.bbc.exo rename to gallery/output/volume1/zarch.png.bbc.exo diff --git a/output/volume1/zelda.png b/gallery/output/volume1/zelda.png similarity index 100% rename from output/volume1/zelda.png rename to gallery/output/volume1/zelda.png diff --git a/output/volume1/zelda.png.bbc b/gallery/output/volume1/zelda.png.bbc similarity index 100% rename from output/volume1/zelda.png.bbc rename to gallery/output/volume1/zelda.png.bbc diff --git a/output/volume1/zelda.png.bbc.exo b/gallery/output/volume1/zelda.png.bbc.exo similarity index 100% rename from output/volume1/zelda.png.bbc.exo rename to gallery/output/volume1/zelda.png.bbc.exo diff --git a/output/volume1/zool.png b/gallery/output/volume1/zool.png similarity index 100% rename from output/volume1/zool.png rename to gallery/output/volume1/zool.png diff --git a/output/volume1/zool.png.bbc b/gallery/output/volume1/zool.png.bbc similarity index 100% rename from output/volume1/zool.png.bbc rename to gallery/output/volume1/zool.png.bbc diff --git a/output/volume1/zool.png.bbc.exo b/gallery/output/volume1/zool.png.bbc.exo similarity index 100% rename from output/volume1/zool.png.bbc.exo rename to gallery/output/volume1/zool.png.bbc.exo diff --git a/output/volume2/archimedes.png b/gallery/output/volume2/archimedes.png similarity index 100% rename from output/volume2/archimedes.png rename to gallery/output/volume2/archimedes.png diff --git a/output/volume2/archimedes.png.bbc b/gallery/output/volume2/archimedes.png.bbc similarity index 100% rename from output/volume2/archimedes.png.bbc rename to gallery/output/volume2/archimedes.png.bbc diff --git a/output/volume2/archimedes.png.bbc.exo b/gallery/output/volume2/archimedes.png.bbc.exo similarity index 100% rename from output/volume2/archimedes.png.bbc.exo rename to gallery/output/volume2/archimedes.png.bbc.exo diff --git a/output/volume2/beeb.png b/gallery/output/volume2/beeb.png similarity index 100% rename from output/volume2/beeb.png rename to gallery/output/volume2/beeb.png diff --git a/output/volume2/beeb.png.bbc b/gallery/output/volume2/beeb.png.bbc similarity index 100% rename from output/volume2/beeb.png.bbc rename to gallery/output/volume2/beeb.png.bbc diff --git a/output/volume2/beeb.png.bbc.exo b/gallery/output/volume2/beeb.png.bbc.exo similarity index 100% rename from output/volume2/beeb.png.bbc.exo rename to gallery/output/volume2/beeb.png.bbc.exo diff --git a/output/volume2/birds.png b/gallery/output/volume2/birds.png similarity index 100% rename from output/volume2/birds.png rename to gallery/output/volume2/birds.png diff --git a/output/volume2/birds.png.bbc b/gallery/output/volume2/birds.png.bbc similarity index 100% rename from output/volume2/birds.png.bbc rename to gallery/output/volume2/birds.png.bbc diff --git a/output/volume2/birds.png.bbc.exo b/gallery/output/volume2/birds.png.bbc.exo similarity index 100% rename from output/volume2/birds.png.bbc.exo rename to gallery/output/volume2/birds.png.bbc.exo diff --git a/gallery/output/volume2/config.asm b/gallery/output/volume2/config.asm new file mode 100644 index 0000000..0427cb5 --- /dev/null +++ b/gallery/output/volume2/config.asm @@ -0,0 +1,26 @@ +PUTFILE "gallery/output/volume2/simpsons.png.bbc.exo", "A.01", &67af, &2fc0 +PUTFILE "gallery/output/volume2/floyd.png.bbc.exo", "A.02", &7bc0, &2fc0 +PUTFILE "gallery/output/volume2/archimedes.png.bbc.exo", "A.03", &7d13, &2fc0 +PUTFILE "gallery/output/volume2/diamond.png.bbc.exo", "A.04", &6649, &2fc0 +PUTFILE "gallery/output/volume2/neon.png.bbc.exo", "A.05", &6a28, &2fc0 +PUTFILE "gallery/output/volume2/homer.png.bbc.exo", "A.06", &703a, &2fc0 +PUTFILE "gallery/output/volume2/tut.png.bbc.exo", "A.07", &503c, &2fc0 +PUTFILE "gallery/output/volume2/beeb.png.bbc.exo", "A.08", &581a, &2fc0 +PUTFILE "gallery/output/volume2/birds.png.bbc.exo", "A.09", &5517, &2fc0 +PUTFILE "gallery/output/volume2/elite.png.bbc.exo", "A.10", &69d8, &2fc0 +PUTFILE "gallery/output/volume2/fractal.png.bbc.exo", "A.11", &4fc2, &2fc0 +PUTFILE "gallery/output/volume2/ghostbusters.png.bbc.exo", "A.12", &633f, &2fc0 +PUTFILE "gallery/output/volume2/graphics.png.bbc.exo", "A.13", &57ab, &2fc0 +PUTFILE "gallery/output/volume2/laser.png.bbc.exo", "A.14", &5811, &2fc0 +PUTFILE "gallery/output/volume2/logo.png.bbc.exo", "A.15", &7967, &2fc0 +PUTFILE "gallery/output/volume2/marbles.png.bbc.exo", "A.16", &69ac, &2fc0 +PUTFILE "gallery/output/volume2/mario.png.bbc.exo", "A.17", &72d8, &2fc0 +PUTFILE "gallery/output/volume2/ray1.png.bbc.exo", "A.18", &6cf2, &2fc0 +PUTFILE "gallery/output/volume2/ray2.png.bbc.exo", "A.19", &6faf, &2fc0 +PUTFILE "gallery/output/volume2/spidey.png.bbc.exo", "A.20", &6e63, &2fc0 +PUTFILE "gallery/output/volume2/teapot.png.bbc.exo", "A.21", &52a7, &2fc0 +PUTFILE "gallery/output/volume2/terminator.png.bbc.exo", "A.22", &624f, &2fc0 +PUTFILE "gallery/output/volume2/tron.png.bbc.exo", "A.23", &5699, &2fc0 +PUTFILE "gallery/output/volume2/trooper.png.bbc.exo", "A.24", &5555, &2fc0 +PUTFILE "gallery/output/volume2/woody.png.bbc.exo", "A.25", &63e0, &2fc0 +PUTFILE "gallery/output/volume2/cube.png.bbc.exo", "A.26", &73b8, &2fc0 diff --git a/output/volume2/cube.png b/gallery/output/volume2/cube.png similarity index 100% rename from output/volume2/cube.png rename to gallery/output/volume2/cube.png diff --git a/output/volume2/cube.png.bbc b/gallery/output/volume2/cube.png.bbc similarity index 100% rename from output/volume2/cube.png.bbc rename to gallery/output/volume2/cube.png.bbc diff --git a/output/volume2/cube.png.bbc.exo b/gallery/output/volume2/cube.png.bbc.exo similarity index 100% rename from output/volume2/cube.png.bbc.exo rename to gallery/output/volume2/cube.png.bbc.exo diff --git a/output/volume2/diamond.png b/gallery/output/volume2/diamond.png similarity index 100% rename from output/volume2/diamond.png rename to gallery/output/volume2/diamond.png diff --git a/output/volume2/diamond.png.bbc b/gallery/output/volume2/diamond.png.bbc similarity index 100% rename from output/volume2/diamond.png.bbc rename to gallery/output/volume2/diamond.png.bbc diff --git a/output/volume2/diamond.png.bbc.exo b/gallery/output/volume2/diamond.png.bbc.exo similarity index 100% rename from output/volume2/diamond.png.bbc.exo rename to gallery/output/volume2/diamond.png.bbc.exo diff --git a/output/volume2/elite.png b/gallery/output/volume2/elite.png similarity index 100% rename from output/volume2/elite.png rename to gallery/output/volume2/elite.png diff --git a/output/volume2/elite.png.bbc b/gallery/output/volume2/elite.png.bbc similarity index 100% rename from output/volume2/elite.png.bbc rename to gallery/output/volume2/elite.png.bbc diff --git a/output/volume2/elite.png.bbc.exo b/gallery/output/volume2/elite.png.bbc.exo similarity index 100% rename from output/volume2/elite.png.bbc.exo rename to gallery/output/volume2/elite.png.bbc.exo diff --git a/output/volume2/floyd.png b/gallery/output/volume2/floyd.png similarity index 100% rename from output/volume2/floyd.png rename to gallery/output/volume2/floyd.png diff --git a/output/volume2/floyd.png.bbc b/gallery/output/volume2/floyd.png.bbc similarity index 100% rename from output/volume2/floyd.png.bbc rename to gallery/output/volume2/floyd.png.bbc diff --git a/output/volume2/floyd.png.bbc.exo b/gallery/output/volume2/floyd.png.bbc.exo similarity index 100% rename from output/volume2/floyd.png.bbc.exo rename to gallery/output/volume2/floyd.png.bbc.exo diff --git a/output/volume2/fractal.png b/gallery/output/volume2/fractal.png similarity index 100% rename from output/volume2/fractal.png rename to gallery/output/volume2/fractal.png diff --git a/output/volume2/fractal.png.bbc b/gallery/output/volume2/fractal.png.bbc similarity index 100% rename from output/volume2/fractal.png.bbc rename to gallery/output/volume2/fractal.png.bbc diff --git a/output/volume2/fractal.png.bbc.exo b/gallery/output/volume2/fractal.png.bbc.exo similarity index 100% rename from output/volume2/fractal.png.bbc.exo rename to gallery/output/volume2/fractal.png.bbc.exo diff --git a/output/volume2/ghostbusters.png b/gallery/output/volume2/ghostbusters.png similarity index 100% rename from output/volume2/ghostbusters.png rename to gallery/output/volume2/ghostbusters.png diff --git a/output/volume2/ghostbusters.png.bbc b/gallery/output/volume2/ghostbusters.png.bbc similarity index 100% rename from output/volume2/ghostbusters.png.bbc rename to gallery/output/volume2/ghostbusters.png.bbc diff --git a/output/volume2/ghostbusters.png.bbc.exo b/gallery/output/volume2/ghostbusters.png.bbc.exo similarity index 100% rename from output/volume2/ghostbusters.png.bbc.exo rename to gallery/output/volume2/ghostbusters.png.bbc.exo diff --git a/output/volume2/graphics.png b/gallery/output/volume2/graphics.png similarity index 100% rename from output/volume2/graphics.png rename to gallery/output/volume2/graphics.png diff --git a/output/volume2/graphics.png.bbc b/gallery/output/volume2/graphics.png.bbc similarity index 100% rename from output/volume2/graphics.png.bbc rename to gallery/output/volume2/graphics.png.bbc diff --git a/output/volume2/graphics.png.bbc.exo b/gallery/output/volume2/graphics.png.bbc.exo similarity index 100% rename from output/volume2/graphics.png.bbc.exo rename to gallery/output/volume2/graphics.png.bbc.exo diff --git a/output/volume2/homer.png b/gallery/output/volume2/homer.png similarity index 100% rename from output/volume2/homer.png rename to gallery/output/volume2/homer.png diff --git a/output/volume2/homer.png.bbc b/gallery/output/volume2/homer.png.bbc similarity index 100% rename from output/volume2/homer.png.bbc rename to gallery/output/volume2/homer.png.bbc diff --git a/output/volume2/homer.png.bbc.exo b/gallery/output/volume2/homer.png.bbc.exo similarity index 100% rename from output/volume2/homer.png.bbc.exo rename to gallery/output/volume2/homer.png.bbc.exo diff --git a/output/volume2/laser.png b/gallery/output/volume2/laser.png similarity index 100% rename from output/volume2/laser.png rename to gallery/output/volume2/laser.png diff --git a/output/volume2/laser.png.bbc b/gallery/output/volume2/laser.png.bbc similarity index 100% rename from output/volume2/laser.png.bbc rename to gallery/output/volume2/laser.png.bbc diff --git a/output/volume2/laser.png.bbc.exo b/gallery/output/volume2/laser.png.bbc.exo similarity index 100% rename from output/volume2/laser.png.bbc.exo rename to gallery/output/volume2/laser.png.bbc.exo diff --git a/output/volume2/logo.png b/gallery/output/volume2/logo.png similarity index 100% rename from output/volume2/logo.png rename to gallery/output/volume2/logo.png diff --git a/output/volume2/logo.png.bbc b/gallery/output/volume2/logo.png.bbc similarity index 100% rename from output/volume2/logo.png.bbc rename to gallery/output/volume2/logo.png.bbc diff --git a/output/volume2/logo.png.bbc.exo b/gallery/output/volume2/logo.png.bbc.exo similarity index 100% rename from output/volume2/logo.png.bbc.exo rename to gallery/output/volume2/logo.png.bbc.exo diff --git a/output/volume2/marbles.png b/gallery/output/volume2/marbles.png similarity index 100% rename from output/volume2/marbles.png rename to gallery/output/volume2/marbles.png diff --git a/output/volume2/marbles.png.bbc b/gallery/output/volume2/marbles.png.bbc similarity index 100% rename from output/volume2/marbles.png.bbc rename to gallery/output/volume2/marbles.png.bbc diff --git a/output/volume2/marbles.png.bbc.exo b/gallery/output/volume2/marbles.png.bbc.exo similarity index 100% rename from output/volume2/marbles.png.bbc.exo rename to gallery/output/volume2/marbles.png.bbc.exo diff --git a/output/volume2/mario.png b/gallery/output/volume2/mario.png similarity index 100% rename from output/volume2/mario.png rename to gallery/output/volume2/mario.png diff --git a/output/volume2/mario.png.bbc b/gallery/output/volume2/mario.png.bbc similarity index 100% rename from output/volume2/mario.png.bbc rename to gallery/output/volume2/mario.png.bbc diff --git a/output/volume2/mario.png.bbc.exo b/gallery/output/volume2/mario.png.bbc.exo similarity index 100% rename from output/volume2/mario.png.bbc.exo rename to gallery/output/volume2/mario.png.bbc.exo diff --git a/output/volume2/neon.png b/gallery/output/volume2/neon.png similarity index 100% rename from output/volume2/neon.png rename to gallery/output/volume2/neon.png diff --git a/output/volume2/neon.png.bbc b/gallery/output/volume2/neon.png.bbc similarity index 100% rename from output/volume2/neon.png.bbc rename to gallery/output/volume2/neon.png.bbc diff --git a/output/volume2/neon.png.bbc.exo b/gallery/output/volume2/neon.png.bbc.exo similarity index 100% rename from output/volume2/neon.png.bbc.exo rename to gallery/output/volume2/neon.png.bbc.exo diff --git a/output/volume2/ray1.png b/gallery/output/volume2/ray1.png similarity index 100% rename from output/volume2/ray1.png rename to gallery/output/volume2/ray1.png diff --git a/output/volume2/ray1.png.bbc b/gallery/output/volume2/ray1.png.bbc similarity index 100% rename from output/volume2/ray1.png.bbc rename to gallery/output/volume2/ray1.png.bbc diff --git a/output/volume2/ray1.png.bbc.exo b/gallery/output/volume2/ray1.png.bbc.exo similarity index 100% rename from output/volume2/ray1.png.bbc.exo rename to gallery/output/volume2/ray1.png.bbc.exo diff --git a/output/volume2/ray2.png b/gallery/output/volume2/ray2.png similarity index 100% rename from output/volume2/ray2.png rename to gallery/output/volume2/ray2.png diff --git a/output/volume2/ray2.png.bbc b/gallery/output/volume2/ray2.png.bbc similarity index 100% rename from output/volume2/ray2.png.bbc rename to gallery/output/volume2/ray2.png.bbc diff --git a/output/volume2/ray2.png.bbc.exo b/gallery/output/volume2/ray2.png.bbc.exo similarity index 100% rename from output/volume2/ray2.png.bbc.exo rename to gallery/output/volume2/ray2.png.bbc.exo diff --git a/output/volume2/simpsons.png b/gallery/output/volume2/simpsons.png similarity index 100% rename from output/volume2/simpsons.png rename to gallery/output/volume2/simpsons.png diff --git a/output/volume2/simpsons.png.bbc b/gallery/output/volume2/simpsons.png.bbc similarity index 100% rename from output/volume2/simpsons.png.bbc rename to gallery/output/volume2/simpsons.png.bbc diff --git a/output/volume2/simpsons.png.bbc.exo b/gallery/output/volume2/simpsons.png.bbc.exo similarity index 100% rename from output/volume2/simpsons.png.bbc.exo rename to gallery/output/volume2/simpsons.png.bbc.exo diff --git a/output/volume2/spidey.png b/gallery/output/volume2/spidey.png similarity index 100% rename from output/volume2/spidey.png rename to gallery/output/volume2/spidey.png diff --git a/output/volume2/spidey.png.bbc b/gallery/output/volume2/spidey.png.bbc similarity index 100% rename from output/volume2/spidey.png.bbc rename to gallery/output/volume2/spidey.png.bbc diff --git a/output/volume2/spidey.png.bbc.exo b/gallery/output/volume2/spidey.png.bbc.exo similarity index 100% rename from output/volume2/spidey.png.bbc.exo rename to gallery/output/volume2/spidey.png.bbc.exo diff --git a/output/volume2/teapot.png b/gallery/output/volume2/teapot.png similarity index 100% rename from output/volume2/teapot.png rename to gallery/output/volume2/teapot.png diff --git a/output/volume2/teapot.png.bbc b/gallery/output/volume2/teapot.png.bbc similarity index 100% rename from output/volume2/teapot.png.bbc rename to gallery/output/volume2/teapot.png.bbc diff --git a/output/volume2/teapot.png.bbc.exo b/gallery/output/volume2/teapot.png.bbc.exo similarity index 100% rename from output/volume2/teapot.png.bbc.exo rename to gallery/output/volume2/teapot.png.bbc.exo diff --git a/output/volume2/terminator.png b/gallery/output/volume2/terminator.png similarity index 100% rename from output/volume2/terminator.png rename to gallery/output/volume2/terminator.png diff --git a/output/volume2/terminator.png.bbc b/gallery/output/volume2/terminator.png.bbc similarity index 100% rename from output/volume2/terminator.png.bbc rename to gallery/output/volume2/terminator.png.bbc diff --git a/output/volume2/terminator.png.bbc.exo b/gallery/output/volume2/terminator.png.bbc.exo similarity index 100% rename from output/volume2/terminator.png.bbc.exo rename to gallery/output/volume2/terminator.png.bbc.exo diff --git a/output/volume2/tron.png b/gallery/output/volume2/tron.png similarity index 100% rename from output/volume2/tron.png rename to gallery/output/volume2/tron.png diff --git a/output/volume2/tron.png.bbc b/gallery/output/volume2/tron.png.bbc similarity index 100% rename from output/volume2/tron.png.bbc rename to gallery/output/volume2/tron.png.bbc diff --git a/output/volume2/tron.png.bbc.exo b/gallery/output/volume2/tron.png.bbc.exo similarity index 100% rename from output/volume2/tron.png.bbc.exo rename to gallery/output/volume2/tron.png.bbc.exo diff --git a/output/volume2/trooper.png b/gallery/output/volume2/trooper.png similarity index 100% rename from output/volume2/trooper.png rename to gallery/output/volume2/trooper.png diff --git a/output/volume2/trooper.png.bbc b/gallery/output/volume2/trooper.png.bbc similarity index 100% rename from output/volume2/trooper.png.bbc rename to gallery/output/volume2/trooper.png.bbc diff --git a/output/volume2/trooper.png.bbc.exo b/gallery/output/volume2/trooper.png.bbc.exo similarity index 100% rename from output/volume2/trooper.png.bbc.exo rename to gallery/output/volume2/trooper.png.bbc.exo diff --git a/output/volume2/tut.png b/gallery/output/volume2/tut.png similarity index 100% rename from output/volume2/tut.png rename to gallery/output/volume2/tut.png diff --git a/output/volume2/tut.png.bbc b/gallery/output/volume2/tut.png.bbc similarity index 100% rename from output/volume2/tut.png.bbc rename to gallery/output/volume2/tut.png.bbc diff --git a/output/volume2/tut.png.bbc.exo b/gallery/output/volume2/tut.png.bbc.exo similarity index 100% rename from output/volume2/tut.png.bbc.exo rename to gallery/output/volume2/tut.png.bbc.exo diff --git a/output/volume2/woody.png b/gallery/output/volume2/woody.png similarity index 100% rename from output/volume2/woody.png rename to gallery/output/volume2/woody.png diff --git a/output/volume2/woody.png.bbc b/gallery/output/volume2/woody.png.bbc similarity index 100% rename from output/volume2/woody.png.bbc rename to gallery/output/volume2/woody.png.bbc diff --git a/output/volume2/woody.png.bbc.exo b/gallery/output/volume2/woody.png.bbc.exo similarity index 100% rename from output/volume2/woody.png.bbc.exo rename to gallery/output/volume2/woody.png.bbc.exo diff --git a/gallery/output/volume3/config.asm b/gallery/output/volume3/config.asm new file mode 100644 index 0000000..1c8f64c --- /dev/null +++ b/gallery/output/volume3/config.asm @@ -0,0 +1,9 @@ +PUTFILE "gallery/output/volume3/earth.png.bbc.exo", "A.01", &6285, &2fc0 +PUTFILE "gallery/output/volume3/fashion.png.bbc.exo", "A.02", &540a, &2fc0 +PUTFILE "gallery/output/volume3/lenna.png.bbc.exo", "A.03", &53e1, &2fc0 +PUTFILE "gallery/output/volume3/lighthouse.png.bbc.exo", "A.04", &5104, &2fc0 +PUTFILE "gallery/output/volume3/monalisa.png.bbc.exo", "A.05", &668b, &2fc0 +PUTFILE "gallery/output/volume3/moon.png.bbc.exo", "A.06", &5621, &2fc0 +PUTFILE "gallery/output/volume3/parrot.png.bbc.exo", "A.07", &52f1, &2fc0 +PUTFILE "gallery/output/volume3/sharbat.png.bbc.exo", "A.08", &671e, &2fc0 +PUTFILE "gallery/output/volume3/tiger.png.bbc.exo", "A.09", &4b79, &2fc0 diff --git a/output/volume3/earth.png b/gallery/output/volume3/earth.png similarity index 100% rename from output/volume3/earth.png rename to gallery/output/volume3/earth.png diff --git a/output/volume3/earth.png.bbc b/gallery/output/volume3/earth.png.bbc similarity index 100% rename from output/volume3/earth.png.bbc rename to gallery/output/volume3/earth.png.bbc diff --git a/output/volume3/earth.png.bbc.exo b/gallery/output/volume3/earth.png.bbc.exo similarity index 100% rename from output/volume3/earth.png.bbc.exo rename to gallery/output/volume3/earth.png.bbc.exo diff --git a/output/volume3/fashion.png b/gallery/output/volume3/fashion.png similarity index 100% rename from output/volume3/fashion.png rename to gallery/output/volume3/fashion.png diff --git a/output/volume3/fashion.png.bbc b/gallery/output/volume3/fashion.png.bbc similarity index 100% rename from output/volume3/fashion.png.bbc rename to gallery/output/volume3/fashion.png.bbc diff --git a/output/volume3/fashion.png.bbc.exo b/gallery/output/volume3/fashion.png.bbc.exo similarity index 100% rename from output/volume3/fashion.png.bbc.exo rename to gallery/output/volume3/fashion.png.bbc.exo diff --git a/output/volume3/lenna.png b/gallery/output/volume3/lenna.png similarity index 100% rename from output/volume3/lenna.png rename to gallery/output/volume3/lenna.png diff --git a/output/volume3/lenna.png.bbc b/gallery/output/volume3/lenna.png.bbc similarity index 100% rename from output/volume3/lenna.png.bbc rename to gallery/output/volume3/lenna.png.bbc diff --git a/output/volume3/lenna.png.bbc.exo b/gallery/output/volume3/lenna.png.bbc.exo similarity index 100% rename from output/volume3/lenna.png.bbc.exo rename to gallery/output/volume3/lenna.png.bbc.exo diff --git a/output/volume3/lighthouse.png b/gallery/output/volume3/lighthouse.png similarity index 100% rename from output/volume3/lighthouse.png rename to gallery/output/volume3/lighthouse.png diff --git a/output/volume3/lighthouse.png.bbc b/gallery/output/volume3/lighthouse.png.bbc similarity index 100% rename from output/volume3/lighthouse.png.bbc rename to gallery/output/volume3/lighthouse.png.bbc diff --git a/output/volume3/lighthouse.png.bbc.exo b/gallery/output/volume3/lighthouse.png.bbc.exo similarity index 100% rename from output/volume3/lighthouse.png.bbc.exo rename to gallery/output/volume3/lighthouse.png.bbc.exo diff --git a/output/volume3/monalisa.png b/gallery/output/volume3/monalisa.png similarity index 100% rename from output/volume3/monalisa.png rename to gallery/output/volume3/monalisa.png diff --git a/output/volume3/monalisa.png.bbc b/gallery/output/volume3/monalisa.png.bbc similarity index 100% rename from output/volume3/monalisa.png.bbc rename to gallery/output/volume3/monalisa.png.bbc diff --git a/output/volume3/monalisa.png.bbc.exo b/gallery/output/volume3/monalisa.png.bbc.exo similarity index 100% rename from output/volume3/monalisa.png.bbc.exo rename to gallery/output/volume3/monalisa.png.bbc.exo diff --git a/output/volume3/moon.png b/gallery/output/volume3/moon.png similarity index 100% rename from output/volume3/moon.png rename to gallery/output/volume3/moon.png diff --git a/output/volume3/moon.png.bbc b/gallery/output/volume3/moon.png.bbc similarity index 100% rename from output/volume3/moon.png.bbc rename to gallery/output/volume3/moon.png.bbc diff --git a/output/volume3/moon.png.bbc.exo b/gallery/output/volume3/moon.png.bbc.exo similarity index 100% rename from output/volume3/moon.png.bbc.exo rename to gallery/output/volume3/moon.png.bbc.exo diff --git a/output/volume3/parrot.png b/gallery/output/volume3/parrot.png similarity index 100% rename from output/volume3/parrot.png rename to gallery/output/volume3/parrot.png diff --git a/output/volume3/parrot.png.bbc b/gallery/output/volume3/parrot.png.bbc similarity index 100% rename from output/volume3/parrot.png.bbc rename to gallery/output/volume3/parrot.png.bbc diff --git a/output/volume3/parrot.png.bbc.exo b/gallery/output/volume3/parrot.png.bbc.exo similarity index 100% rename from output/volume3/parrot.png.bbc.exo rename to gallery/output/volume3/parrot.png.bbc.exo diff --git a/output/volume3/sharbat.png b/gallery/output/volume3/sharbat.png similarity index 100% rename from output/volume3/sharbat.png rename to gallery/output/volume3/sharbat.png diff --git a/output/volume3/sharbat.png.bbc b/gallery/output/volume3/sharbat.png.bbc similarity index 100% rename from output/volume3/sharbat.png.bbc rename to gallery/output/volume3/sharbat.png.bbc diff --git a/output/volume3/sharbat.png.bbc.exo b/gallery/output/volume3/sharbat.png.bbc.exo similarity index 100% rename from output/volume3/sharbat.png.bbc.exo rename to gallery/output/volume3/sharbat.png.bbc.exo diff --git a/output/volume3/tiger.png b/gallery/output/volume3/tiger.png similarity index 100% rename from output/volume3/tiger.png rename to gallery/output/volume3/tiger.png diff --git a/output/volume3/tiger.png.bbc b/gallery/output/volume3/tiger.png.bbc similarity index 100% rename from output/volume3/tiger.png.bbc rename to gallery/output/volume3/tiger.png.bbc diff --git a/output/volume3/tiger.png.bbc.exo b/gallery/output/volume3/tiger.png.bbc.exo similarity index 100% rename from output/volume3/tiger.png.bbc.exo rename to gallery/output/volume3/tiger.png.bbc.exo diff --git a/gallery/output/wip/config.asm b/gallery/output/wip/config.asm new file mode 100644 index 0000000..007a6f2 --- /dev/null +++ b/gallery/output/wip/config.asm @@ -0,0 +1,6 @@ +PUTFILE "gallery/output/wip/crossy.png.bbc.exo", "A.01", &6f22, &2fc0 +PUTFILE "gallery/output/wip/parrots.png.bbc.exo", "A.02", &69e1, &2fc0 +PUTFILE "gallery/output/wip/populous.png.bbc.exo", "A.03", &6a07, &2fc0 +PUTFILE "gallery/output/wip/teapot.png.bbc.exo", "A.04", &7680, &2fc0 +PUTFILE "gallery/output/wip/test.png.bbc.exo", "A.05", &7f17, &2fc0 +PUTFILE "gallery/output/wip/tut2.png.bbc.exo", "A.06", &593b, &2fc0 diff --git a/output/wip/crossy.png b/gallery/output/wip/crossy.png similarity index 100% rename from output/wip/crossy.png rename to gallery/output/wip/crossy.png diff --git a/output/wip/crossy.png.bbc b/gallery/output/wip/crossy.png.bbc similarity index 100% rename from output/wip/crossy.png.bbc rename to gallery/output/wip/crossy.png.bbc diff --git a/output/wip/crossy.png.bbc.exo b/gallery/output/wip/crossy.png.bbc.exo similarity index 100% rename from output/wip/crossy.png.bbc.exo rename to gallery/output/wip/crossy.png.bbc.exo diff --git a/output/wip/parrots.png b/gallery/output/wip/parrots.png similarity index 100% rename from output/wip/parrots.png rename to gallery/output/wip/parrots.png diff --git a/output/wip/parrots.png.bbc b/gallery/output/wip/parrots.png.bbc similarity index 100% rename from output/wip/parrots.png.bbc rename to gallery/output/wip/parrots.png.bbc diff --git a/output/wip/parrots.png.bbc.exo b/gallery/output/wip/parrots.png.bbc.exo similarity index 100% rename from output/wip/parrots.png.bbc.exo rename to gallery/output/wip/parrots.png.bbc.exo diff --git a/output/wip/populous.png b/gallery/output/wip/populous.png similarity index 100% rename from output/wip/populous.png rename to gallery/output/wip/populous.png diff --git a/output/wip/populous.png.bbc b/gallery/output/wip/populous.png.bbc similarity index 100% rename from output/wip/populous.png.bbc rename to gallery/output/wip/populous.png.bbc diff --git a/output/wip/populous.png.bbc.exo b/gallery/output/wip/populous.png.bbc.exo similarity index 100% rename from output/wip/populous.png.bbc.exo rename to gallery/output/wip/populous.png.bbc.exo diff --git a/output/wip/teapot.png b/gallery/output/wip/teapot.png similarity index 100% rename from output/wip/teapot.png rename to gallery/output/wip/teapot.png diff --git a/output/wip/teapot.png.bbc b/gallery/output/wip/teapot.png.bbc similarity index 100% rename from output/wip/teapot.png.bbc rename to gallery/output/wip/teapot.png.bbc diff --git a/output/wip/teapot.png.bbc.exo b/gallery/output/wip/teapot.png.bbc.exo similarity index 100% rename from output/wip/teapot.png.bbc.exo rename to gallery/output/wip/teapot.png.bbc.exo diff --git a/output/wip/test.png b/gallery/output/wip/test.png similarity index 100% rename from output/wip/test.png rename to gallery/output/wip/test.png diff --git a/output/wip/test.png.bbc b/gallery/output/wip/test.png.bbc similarity index 100% rename from output/wip/test.png.bbc rename to gallery/output/wip/test.png.bbc diff --git a/output/wip/test.png.bbc.exo b/gallery/output/wip/test.png.bbc.exo similarity index 100% rename from output/wip/test.png.bbc.exo rename to gallery/output/wip/test.png.bbc.exo diff --git a/output/wip/tut2.png b/gallery/output/wip/tut2.png similarity index 100% rename from output/wip/tut2.png rename to gallery/output/wip/tut2.png diff --git a/output/wip/tut2.png.bbc b/gallery/output/wip/tut2.png.bbc similarity index 100% rename from output/wip/tut2.png.bbc rename to gallery/output/wip/tut2.png.bbc diff --git a/output/wip/tut2.png.bbc.exo b/gallery/output/wip/tut2.png.bbc.exo similarity index 100% rename from output/wip/tut2.png.bbc.exo rename to gallery/output/wip/tut2.png.bbc.exo diff --git a/pngquant.exe b/gallery/pngquant.exe similarity index 100% rename from pngquant.exe rename to gallery/pngquant.exe diff --git a/pngquant.txt b/gallery/pngquant.txt similarity index 100% rename from pngquant.txt rename to gallery/pngquant.txt diff --git a/gallery/update_readme.py b/gallery/update_readme.py new file mode 100644 index 0000000..56a0096 --- /dev/null +++ b/gallery/update_readme.py @@ -0,0 +1,36 @@ +from os import listdir +from os.path import isfile, join +import os + +# hacky script to auto-update the readme with thumbnails of the converted images + + +rootdir = "output/" +my_file = "../readme.md" + +gallery_md = '\n' + +for root, directories, filenames in os.walk(rootdir): + #for directory in directories: + # print os.path.join(root, directory) + volume = root[root.rfind('/')+1:] + if len(volume) > 0: + gallery_md += "\n---\n### " + volume + "\n" + + for filename in filenames: + if filename[-4:] == '.png': + f = os.path.join(root,filename) + f = f.replace('\\', '/') + f = f.replace(rootdir, '') + s = "\n" + gallery_md += s + +file = open(my_file, "r") +readme = file.read() +offset = readme.find("") +readme = readme[:offset+6] +readme += gallery_md +file = open(my_file, "w") +file.write(readme) + +print "readme.md updated." diff --git a/makeall.bat b/makeall.bat new file mode 100644 index 0000000..e25a710 --- /dev/null +++ b/makeall.bat @@ -0,0 +1,6 @@ +cd gallery +compile.py +cd .. +BeebAsm.exe -v -i bbcnula1.asm -do bbcnula1.ssd -opt 2 +BeebAsm.exe -v -i bbcnula2.asm -do bbcnula2.ssd -opt 2 +BeebAsm.exe -v -i bbcnula3.asm -do bbcnula3.ssd -opt 2 diff --git a/output/logo/config.asm b/output/logo/config.asm deleted file mode 100644 index fd40731..0000000 --- a/output/logo/config.asm +++ /dev/null @@ -1 +0,0 @@ -PUTFILE "output/logo/nula.png.bbc.exo", "A.01", &74ea, &2fc0 diff --git a/output/volume1/config.asm b/output/volume1/config.asm deleted file mode 100644 index 19c05ab..0000000 --- a/output/volume1/config.asm +++ /dev/null @@ -1,30 +0,0 @@ -PUTFILE "output/volume1/aladdin.png.bbc.exo", "A.01", &690a, &2fc0 -PUTFILE "output/volume1/bb.png.bbc.exo", "A.02", &77f8, &2fc0 -PUTFILE "output/volume1/castle.png.bbc.exo", "A.03", &56bb, &2fc0 -PUTFILE "output/volume1/chess.png.bbc.exo", "A.04", &5e6b, &2fc0 -PUTFILE "output/volume1/chuckrock.png.bbc.exo", "A.05", &67d7, &2fc0 -PUTFILE "output/volume1/dd.png.bbc.exo", "A.06", &6c58, &2fc0 -PUTFILE "output/volume1/doom.png.bbc.exo", "A.07", &5b3f, &2fc0 -PUTFILE "output/volume1/flashback.png.bbc.exo", "A.08", &5dc0, &2fc0 -PUTFILE "output/volume1/gng.png.bbc.exo", "A.09", &6305, &2fc0 -PUTFILE "output/volume1/gods.png.bbc.exo", "A.10", &5a94, &2fc0 -PUTFILE "output/volume1/lemmings.png.bbc.exo", "A.11", &61e2, &2fc0 -PUTFILE "output/volume1/lotus.png.bbc.exo", "A.12", &763b, &2fc0 -PUTFILE "output/volume1/minecraft.png.bbc.exo", "A.13", &52d7, &2fc0 -PUTFILE "output/volume1/monkey.png.bbc.exo", "A.14", &5e30, &2fc0 -PUTFILE "output/volume1/outrun2.png.bbc.exo", "A.15", &60f9, &2fc0 -PUTFILE "output/volume1/pokemon.png.bbc.exo", "A.16", &67e7, &2fc0 -PUTFILE "output/volume1/pokemonblue.png.bbc.exo", "A.17", &7030, &2fc0 -PUTFILE "output/volume1/populous2.png.bbc.exo", "A.18", &69f5, &2fc0 -PUTFILE "output/volume1/rainbow.png.bbc.exo", "A.19", &7779, &2fc0 -PUTFILE "output/volume1/roadrash.png.bbc.exo", "A.20", &6a28, &2fc0 -PUTFILE "output/volume1/sf.png.bbc.exo", "A.21", &6165, &2fc0 -PUTFILE "output/volume1/smw.png.bbc.exo", "A.22", &6b26, &2fc0 -PUTFILE "output/volume1/smw2.png.bbc.exo", "A.23", &742e, &2fc0 -PUTFILE "output/volume1/sonic.png.bbc.exo", "A.24", &6b47, &2fc0 -PUTFILE "output/volume1/storm.png.bbc.exo", "A.25", &6b19, &2fc0 -PUTFILE "output/volume1/swiv.png.bbc.exo", "A.26", &5ca0, &2fc0 -PUTFILE "output/volume1/xenon2.png.bbc.exo", "A.27", &6af1, &2fc0 -PUTFILE "output/volume1/zarch.png.bbc.exo", "A.28", &7813, &2fc0 -PUTFILE "output/volume1/zelda.png.bbc.exo", "A.29", &7409, &2fc0 -PUTFILE "output/volume1/zool.png.bbc.exo", "A.30", &70e8, &2fc0 diff --git a/output/volume2/config.asm b/output/volume2/config.asm deleted file mode 100644 index 2ea5d91..0000000 --- a/output/volume2/config.asm +++ /dev/null @@ -1,26 +0,0 @@ -PUTFILE "output/volume2/simpsons.png.bbc.exo", "A.01", &67af, &2fc0 -PUTFILE "output/volume2/floyd.png.bbc.exo", "A.02", &7bc0, &2fc0 -PUTFILE "output/volume2/archimedes.png.bbc.exo", "A.03", &7d13, &2fc0 -PUTFILE "output/volume2/diamond.png.bbc.exo", "A.04", &6649, &2fc0 -PUTFILE "output/volume2/neon.png.bbc.exo", "A.05", &6a28, &2fc0 -PUTFILE "output/volume2/homer.png.bbc.exo", "A.06", &703a, &2fc0 -PUTFILE "output/volume2/tut.png.bbc.exo", "A.07", &503c, &2fc0 -PUTFILE "output/volume2/beeb.png.bbc.exo", "A.08", &581a, &2fc0 -PUTFILE "output/volume2/birds.png.bbc.exo", "A.09", &5517, &2fc0 -PUTFILE "output/volume2/elite.png.bbc.exo", "A.10", &69d8, &2fc0 -PUTFILE "output/volume2/fractal.png.bbc.exo", "A.11", &4fc2, &2fc0 -PUTFILE "output/volume2/ghostbusters.png.bbc.exo", "A.12", &633f, &2fc0 -PUTFILE "output/volume2/graphics.png.bbc.exo", "A.13", &57ab, &2fc0 -PUTFILE "output/volume2/laser.png.bbc.exo", "A.14", &5811, &2fc0 -PUTFILE "output/volume2/logo.png.bbc.exo", "A.15", &7967, &2fc0 -PUTFILE "output/volume2/marbles.png.bbc.exo", "A.16", &69ac, &2fc0 -PUTFILE "output/volume2/mario.png.bbc.exo", "A.17", &72d8, &2fc0 -PUTFILE "output/volume2/ray1.png.bbc.exo", "A.18", &6cf2, &2fc0 -PUTFILE "output/volume2/ray2.png.bbc.exo", "A.19", &6faf, &2fc0 -PUTFILE "output/volume2/spidey.png.bbc.exo", "A.20", &6e63, &2fc0 -PUTFILE "output/volume2/teapot.png.bbc.exo", "A.21", &52a7, &2fc0 -PUTFILE "output/volume2/terminator.png.bbc.exo", "A.22", &624f, &2fc0 -PUTFILE "output/volume2/tron.png.bbc.exo", "A.23", &5699, &2fc0 -PUTFILE "output/volume2/trooper.png.bbc.exo", "A.24", &5555, &2fc0 -PUTFILE "output/volume2/woody.png.bbc.exo", "A.25", &63e0, &2fc0 -PUTFILE "output/volume2/cube.png.bbc.exo", "A.26", &73b8, &2fc0 diff --git a/output/volume3/config.asm b/output/volume3/config.asm deleted file mode 100644 index 9f80a6a..0000000 --- a/output/volume3/config.asm +++ /dev/null @@ -1,9 +0,0 @@ -PUTFILE "output/volume3/earth.png.bbc.exo", "A.01", &6285, &2fc0 -PUTFILE "output/volume3/fashion.png.bbc.exo", "A.02", &540a, &2fc0 -PUTFILE "output/volume3/lenna.png.bbc.exo", "A.03", &53e1, &2fc0 -PUTFILE "output/volume3/lighthouse.png.bbc.exo", "A.04", &5104, &2fc0 -PUTFILE "output/volume3/monalisa.png.bbc.exo", "A.05", &668b, &2fc0 -PUTFILE "output/volume3/moon.png.bbc.exo", "A.06", &5621, &2fc0 -PUTFILE "output/volume3/parrot.png.bbc.exo", "A.07", &52f1, &2fc0 -PUTFILE "output/volume3/sharbat.png.bbc.exo", "A.08", &671e, &2fc0 -PUTFILE "output/volume3/tiger.png.bbc.exo", "A.09", &4b79, &2fc0 diff --git a/output/wip/config.asm b/output/wip/config.asm deleted file mode 100644 index e5dd7fe..0000000 --- a/output/wip/config.asm +++ /dev/null @@ -1,6 +0,0 @@ -PUTFILE "output/wip/crossy.png.bbc.exo", "A.01", &6f22, &2fc0 -PUTFILE "output/wip/parrots.png.bbc.exo", "A.02", &69e1, &2fc0 -PUTFILE "output/wip/populous.png.bbc.exo", "A.03", &6a07, &2fc0 -PUTFILE "output/wip/teapot.png.bbc.exo", "A.04", &7680, &2fc0 -PUTFILE "output/wip/test.png.bbc.exo", "A.05", &7f17, &2fc0 -PUTFILE "output/wip/tut2.png.bbc.exo", "A.06", &593b, &2fc0 diff --git a/readme.md b/readme.md index 4a4e36a..dbd19c5 100644 --- a/readme.md +++ b/readme.md @@ -1,12 +1,308 @@ -## TODO +# BBC Micro VideoNuLA Gallery Demos +By [simondotm](https://github.com/simondotm/bbc-nula/), with thanks to RobC for the hardware itself, and [KieranHJ](https://github.com/kieranhj/) for the B-Em NULA hack. -Fade on/off screens -Reset Nula palette on BREAK -Support dither option and other options -Document in readme.md -Add music player +This project demonstrates the capabilities of the enhanced ULA board created for the BBC Micro by RobC by presenting a slide show of 16-colour MODE 2 images that have been colour quantized to use the most optimal 16-colour palette from the NuLA 12-bit range of 4096 colours. +See the thread on [Stardot forums](http://stardot.org.uk/forums/viewtopic.php?f=3&t=12150&sid=87a683dc7df121a211b4ddda498500e6) for more information about VideoNuLA. +## About MODE 2 +The original BBC Micro has a 4-bits-per-pixel display mode, but it is low resolution - 160x256. In theory, it was always capable of displaying 16 unique colours, however the original Video output ULA was only capable of 1 bit/2 level RGB output, so 8 of the colour palette entries were primary colours (black, red, green, yellow, blue, magenta, cyan, white), and the other 8 were 'flashing' variants. +Competitor hardware such as the Amstrad CPC 464 by comparison had 3-level RGB, enabling a palette of 27 colours. Even this small improvement in RGB colour range provided a much more superior display. +The VideoNuLA hardware modification replaces the original ULA with one that has 4-bit RGB output, enabling each of the 16-colours to be reprogrammed with a 12-bit RGB colour palette instead. +So even though the display pixel resolution remains low, the vastly superior quality of graphics that can be rendered with the improved colour bit-depth is frankly amazing. + +## About this project +The project simply converts a collection of source images to optimized 16-colour PNG images, which are then converted to BBC Micro screen display format, compressed and assembled into 'volumes' as `.SSD` disk images along with a 6502 gallery program. + +*Note for Linux/Mac users: this project was written on a Windows system, so I've no idea how easy it is to port.* + +### How it works + +There are two parts to the project: + +1. The gallery image compiler script +2. The 6502/BBC Micro gallery player program + +### Image Compiler + +The compiler is a python script that scans all folders and files listed in the `gallery/assets.json` configuration file, processes them, and puts the processed output PNG files into the `gallery/output` folder. + +For each file, the script performs the following operations: +* Load (and optionally resize) the source image +* Run the image file through `pngquant` to generate the 16-colour optimized PNG version of the source file +* Convert the optimized PNG to MODE 2 pixel screen `.BBC` format +* Compress the `.BBC` file using [Exomizer](https://bitbucket.org/magli143/exomizer/wiki/Home) + +#### PngQuant + +Converting an image from 24-bit RGB (16M colours) to a mere 16-colours requires a bit of colour quantizing code voodoo, and there are various techniques for doing this. However, I have found over the years that none can match the quality of [PngQuant](https://pngquant.org/). It's simply awesome so much of the credit for the quality of the galleries here is thanks to their good work, not mine. :) + +PngQuant supports a neat option called `--posterize N` where N is the number of bits available per R/G/B component. This allows the colour quantizer to fully optimize palette choices for the target bit depth, whereas other quantizers can sometimes 'waste' palette entries that are 8-bit colour depth, but not discernable on more primitive hardware. + +PngQuant also supports an optional floyd steinberg dither. It's one of the better dithers as it has weighting algorithms that reduce the presence of colour bleed that is often seen with standard error diffusion. Some images work well dithered, some do not. Dithering often has a dramatic impact on the compressed output file size too. + +#### BBC File Format +The `.BBC` file format output by the compiler script is essentially a MODE2 screen file format, however since the NuLA requires a 16-colour palette to be set, I cooked up a file format for the gallery player that adds a 64-byte header to the start of the file that contains meta data about the image file: + +``` +[00] - version (1) +[01] - screen mode (2) +[02] - pixel width of image +[03] - pixel height of image (where 0=256) +[04]... +[15] - 12 bytes of padding +[16] - 16 bytes of 'remapped' BBC palette, each byte represents the BBC colour palette that is closest match to the NULA palette that follows. In this way, it's possible to approximately render these BBC files on standard machines. +[31]... +[32] - 32 bytes of 'NULA' palette data. 16 x 2 bytes, where the format is [nR][GB] [4 bits index|4 bits red][4 bits green|4 bits blue] +[63]... +[64] - 20Kb of screen pixel data follows. +``` + +#### Exomizer + +The `.BBC` images are compressed using Exomizer. This step allows us to pack far more images onto one 200Kb SSD disk than we might otherwise - typical compression is >50%, but the downside is that the gallery code has to do a bit more work load, unpack and display the images on the BBC Micro. + + +### Gallery Player + +My main motivation for this project was to see how some awesome 'proper' 16-colour images would be on a BBC Micro enhanced with a NuLA. + +I knew I'd not be short of images to try out, so I cooked up a general purpose 6502/BBC Micro gallery program that could be easily re-used across lots of `.SSD` 'volumes. + +The program works by automatically presenting a slideshow of all image files it can find on a disk called `A.NN` where `NN` is a serial number from `01` and so on. When the program can't find the next number, it simply resets back to `01`. + +#### Decompression +Each compressed `.BBC.EXO` screen file is loaded into memory, unpacked, and displayed. The Exomizer decompression isn't all that fast, but it works well. + +The gallery program is compatible with BBC Micro but has enhancements for sideways RAM or BBC Master/Compact Shadow RAM. + +On a standard BBC Micro, the unpacking is slightly tricky, since the way Exomizer works it cannot support 'in place' decompression. So the file is loaded at the bottom of display RAM, unpacked to 256 bytes BEFORE screen RAM, and then relocated to &3000. + +With sideways RAM installed, the program loads the packed image to a SWR bank (therefore the compressed images must always be <16kb) and unpacks it directly to display RAM &3000 (actually 64 bytes before that &2FC0 due to the header), but does not need to relocate. + +On a Master, the program takes advantage of Shadow RAM to create a double buffer effect. The hardware can display one image whilst the next image is being loaded and unpacked to the current 'shadow' buffer, which allows a more seamless slide show. + +On the non-Master versions, we have to hide the display during image loading & unpacking, otherwise you'd see all of the garbage being loaded and unpacked into memory! + +#### Faders +It occurred to me quite late one day that the way NuLA works as an RGB palette register, it would be possible to implement fading by interpolating the palette every vsync. So, there is now some code to do that - it can fade from any given palette to black or vice versa. I was pretty blown away with how easy that was to do with NuLA and how well it worked, it's pretty cool to see a smooth fade working on a good old Beeb! + +Have a dig around in the code if you are interested in how it works. It's basically a simple 256-byte look up table. + +### Building the disks + +Each gallery 'volume' is assembled using one `BeebAsm` source file. + +``` +; include the generic gallery player source code +INCLUDE "asm/main.asm" +; include the config file containing the list of images to go on this gallery disk +INCLUDE "gallery/output/volume1/config.asm" +``` + + +The `config.asm` file is automatically created by the `compile.py` compiler script, so make sure you run this before assembling any disks. + +The way the compiler script works is that for each subfolder within the root `gallery` folder, the script auto-creates a `config.asm` file containing the `BeebAsm` assembler code to store the compressed files onto an `SSD` disk image. It auto calculates the correct load addresses for the compressed files too (since they often change and are a pain to compute by hand). + +``` +PUTFILE "gallery/output/volume2/simpsons.png.bbc.exo", "A.01", &67af, &2fc0 +PUTFILE "gallery/output/volume2/floyd.png.bbc.exo", "A.02", &7bc0, &2fc0 +PUTFILE "gallery/output/volume2/archimedes.png.bbc.exo", "A.03", &7d13, &2fc0 +... etc +``` + +You can build the `SSD` disks using `BeebAsm` eg. +``` +BeebAsm.exe -v -i bbcnula1.asm -do bbcnula1.ssd -opt 2 +``` +Or for your convenience I added a: +``` +makeall.bat +``` +Or you can use my fancy [Beeb VSC](https://marketplace.visualstudio.com/items?itemName=simondotm.beeb-vsc) BeebAsm extension for Visual Studio Code. + +## Making your own gallery compilations +Feel free to clone this repo and make your own NuLA galleries. + +### Preparing your images +First thing to do is get a collection of images ready for your gallery as follows: +1. Create a new folder in `gallery/images` and call it `mygallery` or something +1. Put some images you like into this folder, and ensure they are 24-bit PNG +3. Resize/Resample all of your images (using GIMP or Photoshop or similar) to 320x256 so that they are aspect correct. If they are tricky sizes, I tended to add black borders or letter box them, but they ultimately **have** to be 320x256 images +4. Now resize the images again to 160x256, but this time remove any aspect lock. They will look horizontally squashed on your PC, but that's fine, because MODE2 pixels are rectangular, not square. They'll turn out just fine on the Beeb, I promise! +5. Note that in the above "resize" steps make sure you use a decent interpolation filter (Linear/Cubic) so that you don't get jaggy edges after the resize, and also make sure the image format is RGB not Indexed pixel format before the resize - again to prevent jaggy edges. +6. Save the processed image - replacing your source image (otherwise the compiler script will try and compile your source image as well which will be the wrong size and everything will go wonky) + +You can usually fit about 20-30 images on one `.SSD` disk, depending on how well they compress. The maximum is 30, due to DFS limitations (31 including the `!Boot` file). + +### Processing the Images + +Next, run `compile.py`: +* The script will initially auto detect the new folder and stop +* Run it again, and it will now proceed to process all of the new images it has found in `gallery/images/mygallery` and put the optimized BBC versions into `gallery/output/mygallery` along with a handy config.asm file. + +### Assembling the Images + +Next, either create a new `bbcnulaX.asm` file in the root, or modify an existing `.asm` file so that it includes your new `config.asm` file eg.: +``` +INCLUDE "asm/main.asm" +INCLUDE "gallery/output/mygallery/config.asm" +``` + +Now you can build your disk image: +``` +BeebAsm.exe -v -i bbcnulaX.asm -do bbcnulaX.ssd -opt 2 +``` +Voila! You should have `bbcnulaX.ssd` all ready to go! + +### Other notes + +#### Overriding image compiler settings +You can add override settings to the `gallery/assets.json` file for the `compile.py` script to use on a per-folder or per-file basis by adding properties to the folder or file object eg.: + +``` +{ + "root": { + \\ override settings for all files in 'mygallery' folder + "mygallery": { + "dither": 0 + }, + \\ override settings just for 'mygallery/test.png' file + "mygallery/test.png": { + "dither": 1 + }, + + ... +``` + +Options are: +* `scale

` - scale image by p% (default 100%) +* `width ` - scale image proportionally to fixed pixel width, will scale up or down +* `height ` - scale image proportionally to fixed pixel height, will scale up or down +* `palette <0-256>` - reduce image to an indexed palette image of N colours (PNG images compress over 40% using this option) +* `dither <0/1>` - dither the image + +If only `width` or `height` is specified, aspect is maintained + +If `width` AND `height` is specified, aspect is not maintained + +Any specifed `width` or `height` overrides any `scale` setting + +#### Compiler Note: +Note that `compile.py` only compile files that have been updated or had properties in `assets.json` changed since it was last run - bit of a convenience thing as I'm impatient like that, so don't be alarmed if you run it twice and on the second run it doesn't appear to do anything. + +If you want to force a full recompile for any reason, there are two options: +1. delete all of the files in the `gallery/output` folder to force a rebuild +2. change the `FORCE_UPDATE` setting in `compile.py` to `True` + +The script isn't that smart however, if you move files around in the `gallery/images` folder you'll end up with crud files in the `gallery/output` folder, in which case cleaning the `gallery/output` folders is the best course of action. + +## And Finally... + +You can report any issues [here](https://github.com/simondotm/bbc-nula/issues). + +**Have fun!** + + + + +--- + +#### !!! +*Don't remove the \ tag or modify below here, as `compile.py` uses it to auto generate the gallery below.* + +## Demo Disk Gallery +For your viewing pleasure, here are the gallery volumes I've created so far. The images below are the 16-colour MODE2 versions, and this is 100% what you actually see on a real BBC Micro with the NuLA mod installed! + + + +--- +### logo + + +--- +### volume1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +--- +### volume2 + + + + + + + + + + + + + + + + + + + + + + + + + + + +--- +### volume3 + + + + + + + + + + +--- +### wip + + + + + +