From dcf93892a791ce3fdaa4bffa5e5d97f1aa1a0482 Mon Sep 17 00:00:00 2001 From: Lucas Scharenbroich Date: Thu, 26 Aug 2021 16:45:23 -0500 Subject: [PATCH] Reorg some more files and tweak paths --- demos/shell/App.Main.s | 12 +- demos/shell/App.Tile.s | 2440 ------------------------ demos/shell/App.s | 19 +- demos/shell/_FileInformation.txt | 1 + demos/shell/build-image.bat | 2 +- demos/shell/{ => gen}/App.TileMapBG0.s | 0 demos/shell/{ => gen}/App.TileMapBG1.s | 0 demos/shell/{ => gen}/App.TileSet.s | 0 demos/shell/package.json | 26 +- src/Core.s | 3 +- src/Memory.s | 1 + 11 files changed, 37 insertions(+), 2467 deletions(-) delete mode 100644 demos/shell/App.Tile.s create mode 100644 demos/shell/_FileInformation.txt rename demos/shell/{ => gen}/App.TileMapBG0.s (100%) rename demos/shell/{ => gen}/App.TileMapBG1.s (100%) rename demos/shell/{ => gen}/App.TileSet.s (100%) diff --git a/demos/shell/App.Main.s b/demos/shell/App.Main.s index 77cc117..745b698 100644 --- a/demos/shell/App.Main.s +++ b/demos/shell/App.Main.s @@ -8,8 +8,8 @@ use EDS.GSOS.MACS.s use Tool222.Macs.s use Util.Macs.s - use ./GTE.s - use ./Defs.s + use ../../src/GTE.s + use ../../src/Defs.s mx %00 @@ -452,6 +452,10 @@ qtRec adrl $0000 PUT font.s PUT Overlay.s - PUT App.TileMapBG0.s - PUT App.TileMapBG1.s + PUT gen/App.TileMapBG0.s + PUT gen/App.TileMapBG1.s + + + + diff --git a/demos/shell/App.Tile.s b/demos/shell/App.Tile.s deleted file mode 100644 index 0297d71..0000000 --- a/demos/shell/App.Tile.s +++ /dev/null @@ -1,2440 +0,0 @@ -; startIndex = 0 -; Palette: -; $0E51,$0EDB,$0000,$068F,$0BF1,$00A0,$0EEE,$0777,$0FA4,$0F59,$0E05,$0F30 -; Converting to BG0 format... -tiledata ENT - -; Reserved space (tile 0 is special... - ds 128 -; Tile ID 1 -; From image coordinates 0, 0 - hex 01111111 - hex 10000000 - hex 10000000 - hex 10000000 - hex 10000000 - hex 10000000 - hex 10000000 - hex 10000000 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 11111110 - hex 00000001 - hex 00000001 - hex 00000001 - hex 00000001 - hex 00000001 - hex 00000001 - hex 00000001 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 2 -; From image coordinates 8, 0 - hex 12011110 - hex 02100002 - hex 02100002 - hex 02100002 - hex 02120002 - hex 02022220 - hex 02111112 - hex 02100002 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 01111021 - hex 20000120 - hex 20000120 - hex 20000120 - hex 20002120 - hex 02222020 - hex 21111120 - hex 20000120 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 3 -; From image coordinates 16, 0 - hex 10000000 - hex 10000000 - hex 22000000 - hex 11220000 - hex 10112222 - hex 10001112 - hex 10000002 - hex 02222220 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 00000001 - hex 00000001 - hex 00000022 - hex 00002211 - hex 22221101 - hex 21110001 - hex 20000001 - hex 02222220 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 4 -; From image coordinates 24, 0 - hex 02100002 - hex 02100002 - hex 21000002 - hex 21000002 - hex 10000002 - hex 10000002 - hex 10000022 - hex 12222220 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 20000120 - hex 20000120 - hex 20000012 - hex 20000012 - hex 20000001 - hex 20000001 - hex 22000001 - hex 02222221 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 5 -; From image coordinates 32, 0 - hex 01111111 - hex 10111111 - hex 11011111 - hex 11101111 - hex 11110000 - hex 11110000 - hex 11110000 - hex 11110000 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 11111110 - hex 11111101 - hex 11111011 - hex 11110111 - hex 00001111 - hex 00001111 - hex 00001111 - hex 00001111 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 6 -; From image coordinates 40, 0 - hex 11111112 - hex 11111122 - hex 11111222 - hex 11112222 - hex 00002222 - hex 00002222 - hex 00002222 - hex 00002222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 21111111 - hex 22111111 - hex 22211111 - hex 22221111 - hex 22220000 - hex 22220000 - hex 22220000 - hex 22220000 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 7 -; From image coordinates 48, 0 - hex 11110000 - hex 11110000 - hex 11110000 - hex 11110000 - hex 11122222 - hex 11222222 - hex 12222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 00001111 - hex 00001111 - hex 00001111 - hex 00001111 - hex 22222111 - hex 22222211 - hex 22222221 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 8 -; From image coordinates 56, 0 - hex 00002222 - hex 00002222 - hex 00002222 - hex 00002222 - hex 22220222 - hex 22222022 - hex 22222202 - hex 22222220 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22220000 - hex 22220000 - hex 22220000 - hex 22220000 - hex 22202222 - hex 22022222 - hex 20222222 - hex 02222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 9 -; From image coordinates 64, 0 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 10 -; From image coordinates 72, 0 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - hex 43333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - hex 33333334 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 11 -; From image coordinates 80, 0 - hex 22222222 - hex 24444444 - hex 25555544 - hex 24445544 - hex 24445544 - hex 24445544 - hex 24445544 - hex 24445544 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22222222 - hex 44444442 - hex 44555552 - hex 44554442 - hex 44554442 - hex 44554442 - hex 44554442 - hex 44554442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 12 -; From image coordinates 88, 0 - hex 22222222 - hex 44444444 - hex 44445555 - hex 44445445 - hex 44445445 - hex 44445445 - hex 44445445 - hex 44445445 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22222222 - hex 44444444 - hex 55554444 - hex 54454444 - hex 54454444 - hex 54454444 - hex 54454444 - hex 54454444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 13 -; From image coordinates 96, 0 - hex 22222222 - hex 44444444 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22222222 - hex 44444444 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 14 -; From image coordinates 104, 0 - hex 22222222 - hex 44444442 - hex 55555552 - hex 54545442 - hex 55454442 - hex 54545442 - hex 55454442 - hex 54545442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22222222 - hex 24444444 - hex 25555555 - hex 24454545 - hex 24445455 - hex 24454545 - hex 24445455 - hex 24454545 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 15 -; From image coordinates 112, 0 - hex 24445544 - hex 24445544 - hex 24445544 - hex 24445544 - hex 24445544 - hex 24445544 - hex 22222222 - hex 33222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 44554442 - hex 44554442 - hex 44554442 - hex 44554442 - hex 44554442 - hex 44554442 - hex 22222222 - hex 22222233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 16 -; From image coordinates 120, 0 - hex 44445445 - hex 44445445 - hex 44445445 - hex 44445445 - hex 44445445 - hex 44445445 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 54454444 - hex 54454444 - hex 54454444 - hex 54454444 - hex 54454444 - hex 54454444 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 17 -; From image coordinates 128, 0 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 18 -; From image coordinates 136, 0 - hex 55454442 - hex 54545442 - hex 55454442 - hex 54545442 - hex 55454442 - hex 54545442 - hex 22222222 - hex 22222233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 24445455 - hex 24454545 - hex 24445455 - hex 24454545 - hex 24445455 - hex 24454545 - hex 22222222 - hex 33222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 19 -; From image coordinates 144, 0 - hex 33244455 - hex 33244455 - hex 33244455 - hex 33244455 - hex 33244455 - hex 33244455 - hex 33244455 - hex 33244455 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 55444233 - hex 55444233 - hex 55444233 - hex 55444233 - hex 55444233 - hex 55444233 - hex 55444233 - hex 55444233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 20 -; From image coordinates 152, 0 - hex 44444544 - hex 44444544 - hex 44444544 - hex 44444544 - hex 44444544 - hex 44444544 - hex 44444544 - hex 44444544 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 44544444 - hex 44544444 - hex 44544444 - hex 44544444 - hex 44544444 - hex 44544444 - hex 44544444 - hex 44544444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 21 -; From image coordinates 160, 0 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - hex 55555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 22 -; From image coordinates 168, 0 - hex 45444233 - hex 54544233 - hex 45444233 - hex 54544233 - hex 45444233 - hex 54544233 - hex 45444233 - hex 54544233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33244454 - hex 33244545 - hex 33244454 - hex 33244545 - hex 33244454 - hex 33244545 - hex 33244454 - hex 33244545 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 23 -; From image coordinates 176, 0 - hex 00000000 - hex 00002000 - hex 00002000 - hex 00002000 - hex 00020000 - hex 00020000 - hex 00020000 - hex 00000000 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 00000000 - hex 00020000 - hex 00020000 - hex 00020000 - hex 00002000 - hex 00002000 - hex 00002000 - hex 00000000 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 24 -; From image coordinates 184, 0 - hex 11110002 - hex 00010002 - hex 00010002 - hex 00012222 - hex 00010000 - hex 00010000 - hex 00010000 - hex 22211111 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 20001111 - hex 20001000 - hex 20001000 - hex 22221000 - hex 00001000 - hex 00001000 - hex 00001000 - hex 11111222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 25 -; From image coordinates 192, 0 - hex 00011111 - hex 00010000 - hex 00010000 - hex 22210000 - hex 00010000 - hex 00010000 - hex 00010000 - hex 11112222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 11111000 - hex 00001000 - hex 00001000 - hex 00001222 - hex 00001000 - hex 00001000 - hex 00001000 - hex 22221111 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 26 -; From image coordinates 200, 0 - hex 00000002 - hex 00000002 - hex 00000002 - hex 22222222 - hex 00020000 - hex 00020000 - hex 00020000 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 20000000 - hex 20000000 - hex 20000000 - hex 22222222 - hex 00002000 - hex 00002000 - hex 00002000 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 27 -; From image coordinates 208, 0 - hex 32222222 - hex 20000000 - hex 20200000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22222223 - hex 00000002 - hex 00000202 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 28 -; From image coordinates 216, 0 - hex 22222223 - hex 00000002 - hex 00000202 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 32222222 - hex 20000000 - hex 20200000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 29 -; From image coordinates 224, 0 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20200000 - hex 20000000 - hex 32222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000202 - hex 00000002 - hex 22222223 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 30 -; From image coordinates 232, 0 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000002 - hex 00000202 - hex 00000002 - hex 22222223 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20000000 - hex 20200000 - hex 20000000 - hex 32222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 31 -; From image coordinates 240, 0 - hex 11113333 - hex 00013333 - hex 00013333 - hex 00013333 - hex 00013333 - hex 00013333 - hex 00013333 - hex 22211111 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33331111 - hex 33331000 - hex 33331000 - hex 33331000 - hex 33331000 - hex 33331000 - hex 33331000 - hex 11111222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 32 -; From image coordinates 248, 0 - hex 33311111 - hex 33310000 - hex 33310000 - hex 33310000 - hex 33310000 - hex 33310000 - hex 33310000 - hex 11112222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 11111333 - hex 00001333 - hex 00001333 - hex 00001333 - hex 00001333 - hex 00001333 - hex 00001333 - hex 22221111 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 33 -; From image coordinates 256, 0 - hex 00000222 - hex 00022222 - hex 00222222 - hex 22222222 - hex 02222222 - hex 02222222 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22200000 - hex 22222000 - hex 22222200 - hex 22222222 - hex 22222220 - hex 22222220 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 34 -; From image coordinates 264, 0 - hex 22200002 - hex 22222002 - hex 22222202 - hex 22222222 - hex 22222220 - hex 22222220 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 20000222 - hex 20022222 - hex 20222222 - hex 22222222 - hex 02222222 - hex 02222222 - hex 22222222 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 35 -; From image coordinates 272, 0 - hex 33333322 - hex 33333245 - hex 33332455 - hex 33332455 - hex 33332555 - hex 33332555 - hex 33333255 - hex 33333322 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22333333 - hex 54233333 - hex 55423333 - hex 55423333 - hex 55523333 - hex 55523333 - hex 55233333 - hex 22333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 36 -; From image coordinates 280, 0 - hex 22333333 - hex 55233333 - hex 55523333 - hex 55523333 - hex 55523333 - hex 55523333 - hex 55233333 - hex 22333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333322 - hex 33333255 - hex 33332555 - hex 33332555 - hex 33332555 - hex 33332555 - hex 33333255 - hex 33333322 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 37 -; From image coordinates 288, 0 - hex 33322222 - hex 33244444 - hex 32444444 - hex 32444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22222333 - hex 44444233 - hex 44444423 - hex 44444423 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 38 -; From image coordinates 296, 0 - hex 22222222 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22222222 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 39 -; From image coordinates 304, 0 - hex 22222333 - hex 44444233 - hex 44444423 - hex 44444423 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33322222 - hex 33244444 - hex 32444444 - hex 32444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 40 -; From image coordinates 312, 0 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 41 -; From image coordinates 0, 8 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 42 -; From image coordinates 8, 8 - hex 33333322 - hex 33333244 - hex 33322444 - hex 33244444 - hex 33244444 - hex 33244444 - hex 32444554 - hex 24445444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22333333 - hex 44233333 - hex 44422333 - hex 44444233 - hex 44444233 - hex 44444233 - hex 45544423 - hex 44454442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 43 -; From image coordinates 16, 8 - hex 22333333 - hex 44233333 - hex 44423333 - hex 44423233 - hex 44442423 - hex 45444442 - hex 44544442 - hex 44444442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333322 - hex 33333244 - hex 33332444 - hex 33232444 - hex 32424444 - hex 24444454 - hex 24444544 - hex 24444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 44 -; From image coordinates 24, 8 - hex 33333222 - hex 33332444 - hex 33324444 - hex 33344444 - hex 32244444 - hex 24444444 - hex 24444444 - hex 32444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 22233333 - hex 44423333 - hex 44442333 - hex 44444333 - hex 44444223 - hex 44444442 - hex 44444442 - hex 44444423 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 45 -; From image coordinates 32, 8 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 46 -; From image coordinates 40, 8 - hex 23323333 - hex 23242333 - hex 42442333 - hex 44442323 - hex 44444242 - hex 44444442 - hex 44444442 - hex 44444423 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33332332 - hex 33324232 - hex 33324424 - hex 32324444 - hex 24244444 - hex 24444444 - hex 24444444 - hex 32444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 47 -; From image coordinates 48, 8 - hex 66726666 - hex 11726111 - hex 11726111 - hex 11726111 - hex 11726111 - hex 11726111 - hex 77727777 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 66662766 - hex 11162711 - hex 11162711 - hex 11162711 - hex 11162711 - hex 11162711 - hex 77772777 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 48 -; From image coordinates 56, 8 - hex 66666672 - hex 61111172 - hex 61111172 - hex 61111172 - hex 61111172 - hex 61111172 - hex 77777772 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 27666666 - hex 27111116 - hex 27111116 - hex 27111116 - hex 27111116 - hex 27111116 - hex 27777777 - hex 22222222 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 49 -; From image coordinates 64, 8 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444442 - hex 32444423 - hex 33222233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 24444442 - hex 32444423 - hex 33222233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 50 -; From image coordinates 72, 8 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444442 - hex 24444423 - hex 32222233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 24444444 - hex 32444442 - hex 33222223 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 51 -; From image coordinates 80, 8 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444442 - hex 24444425 - hex 52222255 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 44444444 - hex 24444444 - hex 52444442 - hex 55222225 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 52 -; From image coordinates 88, 8 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 24444442 - hex 32444423 - hex 33222233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444442 - hex 32444423 - hex 33222233 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 53 -; From image coordinates 96, 8 - hex 33333361 - hex 33333631 - hex 33333113 - hex 33361333 - hex 33311333 - hex 36133333 - hex 63133333 - hex 11333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 16333333 - hex 13633333 - hex 31133333 - hex 33316333 - hex 33311333 - hex 33333163 - hex 33333136 - hex 33333311 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 54 -; From image coordinates 104, 8 - hex 33332111 - hex 33332111 - hex 33332111 - hex 33332111 - hex 33332111 - hex 33332211 - hex 33333212 - hex 33332121 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 11123333 - hex 11123333 - hex 11123333 - hex 11123333 - hex 11123333 - hex 11223333 - hex 21233333 - hex 12123333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 55 -; From image coordinates 112, 8 - hex 11123333 - hex 12123333 - hex 12123333 - hex 12123333 - hex 12123333 - hex 11223333 - hex 21233333 - hex 12123333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33332111 - hex 33332121 - hex 33332121 - hex 33332121 - hex 33332121 - hex 33332211 - hex 33333212 - hex 33332121 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 56 -; From image coordinates 120, 8 - hex 33333332 - hex 33333325 - hex 33333255 - hex 33332555 - hex 33325555 - hex 33255555 - hex 32555555 - hex 25555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 23333333 - hex 52333333 - hex 55233333 - hex 55523333 - hex 55552333 - hex 55555233 - hex 55555523 - hex 55555552 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 57 -; From image coordinates 128, 8 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333222 - hex 33222555 - hex 22555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 22233333 - hex 55522233 - hex 55555522 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 58 -; From image coordinates 136, 8 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 22233333 - hex 55522233 - hex 55555522 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333333 - hex 33333222 - hex 33222555 - hex 22555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 59 -; From image coordinates 144, 8 - hex 23333333 - hex 52333333 - hex 55233333 - hex 55523333 - hex 55552333 - hex 55555233 - hex 55555523 - hex 55555552 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 33333332 - hex 33333325 - hex 33333255 - hex 33332555 - hex 33325555 - hex 33255555 - hex 32555555 - hex 25555555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 60 -; From image coordinates 152, 8 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 61 -; From image coordinates 160, 8 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - hex 44444442 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - hex 24444444 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 62 -; From image coordinates 168, 8 - hex 55555255 - hex 55552225 - hex 55552225 - hex 55552225 - hex 52252225 - hex 52255255 - hex 52255555 - hex 52255555 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 55255555 - hex 52225555 - hex 52225555 - hex 52225555 - hex 52225225 - hex 55255225 - hex 55555225 - hex 55555225 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 63 -; From image coordinates 176, 8 - hex 66666666 - hex 36666666 - hex 33666666 - hex 33366666 - hex 33336666 - hex 33333666 - hex 33333366 - hex 33333336 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 66666666 - hex 66666663 - hex 66666633 - hex 66666333 - hex 66663333 - hex 66633333 - hex 66333333 - hex 63333333 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - -; Tile ID 64 -; From image coordinates 184, 8 - hex 66666666 - hex 65555566 - hex 55656556 - hex 56656656 - hex 56555656 - hex 55565556 - hex 55555556 - hex 66555666 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - - hex 66666666 - hex 66555556 - hex 65565655 - hex 65665665 - hex 65655565 - hex 65556555 - hex 65555555 - hex 66655566 - - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - hex 00000000 - diff --git a/demos/shell/App.s b/demos/shell/App.s index 723676d..419314c 100644 --- a/demos/shell/App.s +++ b/demos/shell/App.s @@ -1,35 +1,36 @@ ; IIgs Game Engine - TYP $B3 ; S16 file + TYP $B3 ; S16 file DSK GTETestApp XPL ; Segment #1 -- Main execution block ASM App.Main.s - DS 0 ; Number of bytes of 0's to add at the end of the Segment - KND #$1100 ; Type and Attributes ($11=Static+Bank Relative,$00=Code) - ALI None ; Boundary Alignment (None) + DS 0 ; Number of bytes of 0's to add at the end of the Segment + KND #$1100 ; Type and Attributes ($11=Static+Bank Relative,$00=Code) + ALI None ; Boundary Alignment (None) SNA Main ; Segment #2 -- Core GTE Code - ASM Core.s + ASM ..\..\src\Core.s SNA Core ; Segment #3 -- 64KB Tile Memory - ASM App.TileSet.s + ASM gen\App.TileSet.s DS 0 - KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data) + KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data) ; ALI BANK SNA Tiles ; Segment #4 -- Rotation table data - ASM RotData.s + ASM ..\..\src\RotData.s DS 0 - KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data) + KND #$1001 ; Type and Attributes ($11=Static+Bank Relative,$01=Data) ALI BANK SNA RotData + diff --git a/demos/shell/_FileInformation.txt b/demos/shell/_FileInformation.txt new file mode 100644 index 0000000..4fffcad --- /dev/null +++ b/demos/shell/_FileInformation.txt @@ -0,0 +1 @@ +GTETestApp=Type(B3),AuxType(0000),VersionCreate(70),MinVersion(BE),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000) diff --git a/demos/shell/build-image.bat b/demos/shell/build-image.bat index afe2624..7e4da43 100644 --- a/demos/shell/build-image.bat +++ b/demos/shell/build-image.bat @@ -5,7 +5,7 @@ REM REM Pass the path of the Cadius tool as the first argument (%1) set CADIUS="%1" -set IMAGE="emu\\Target.2mg" +set IMAGE="..\\..\\emu\\Target.2mg" set FOLDER="/GTEDEV/Build" REM Cadius does not overwrite files, so clear the root folder first diff --git a/demos/shell/App.TileMapBG0.s b/demos/shell/gen/App.TileMapBG0.s similarity index 100% rename from demos/shell/App.TileMapBG0.s rename to demos/shell/gen/App.TileMapBG0.s diff --git a/demos/shell/App.TileMapBG1.s b/demos/shell/gen/App.TileMapBG1.s similarity index 100% rename from demos/shell/App.TileMapBG1.s rename to demos/shell/gen/App.TileMapBG1.s diff --git a/demos/shell/App.TileSet.s b/demos/shell/gen/App.TileSet.s similarity index 100% rename from demos/shell/App.TileSet.s rename to demos/shell/gen/App.TileSet.s diff --git a/demos/shell/package.json b/demos/shell/package.json index a8dae26..1306043 100644 --- a/demos/shell/package.json +++ b/demos/shell/package.json @@ -7,22 +7,24 @@ "merlin32": "C:\\Programs\\IIgsXDev\\bin\\Merlin32-1.1.10.exe", "cadius": "C:\\Programs\\IIgsXDev\\bin\\Cadius.exe", "gsport": "C:\\Programs\\gsport\\gsport_0.31\\GSPort.exe", - "macros": "C:\\Programs\\BrutalDeluxe\\Merlin32\\Library", - "crossrunner": "C:\\Programs\\Crossrunner\\Crossrunner.exe" + "macros": "../../macros", + "crossrunner": "C:\\Programs\\Crossrunner\\Crossrunner.exe", + "png2iigs": "../../tools/png2iigs.js", + "tiled2iigs": "../../tools/tiled2iigs.js" }, "scripts": { "test": "npm run build && build-image.bat %npm_package_config_cadius% && %npm_package_config_gsport%", - "debug": "%npm_package_config_crossrunner% src\\GTETestApp -Source src\\GTETestApp_S02_MAINSEG_Output.txt -Debug -CompatibilityLayer", - "build": "%npm_package_config_merlin32% -V .\\macros src\\App.s", + "debug": "%npm_package_config_crossrunner% GTETestApp -Source GTETestApp_S02_MAINSEG_Output.txt -Debug -CompatibilityLayer", + "build": "%npm_package_config_merlin32% -V %npm_package_config_macros% App.s", "build:watch": "watch \"npm run build\" src", - "build:assets-smw": "node ./tools/png2iigs.js ./assets/donut-plains-2-8-color.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-2-8-color-shift.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", - "build:assets-fatdog": "node ./tools/png2iigs.js ./assets/armada-7-color.png ./emu/bg1a.bin --start-index 8 && node ./tools/png2iigs.js ./assets/armada-7-color-shift.png ./emu/bg1b.bin --start-index 8 && node ./tools/png2iigs.js ./assets/armada-7-color-shuffle.png ./emu/fg1.bin --start-index 1", - "build:assets-plant": "node ./tools/png2iigs.js ./assets/plant.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", - "build:assets-woz": "node ./tools/png2iigs.js ./assets/woz.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", - "build:assets-woz-fatbits": "node ./tools/png2iigs.js ./assets/woz-pixelated.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", - "build:assets-color-cycle": "node ./tools/png2iigs.js ./assets/rotopattern.png ./emu/bg1a.bin --start-index 6 && node ./tools/png2iigs.js ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node ./tools/png2iigs.js ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", - "build:map": "node ./tools/tiled2iigs.js ./assets/tiled/world_1-1.json --output-dir ./src", - "build:tiles": "node ./tools/png2iigs.js ./assets/tilesets/smb-16.png --as-tile-data > src/App.TileSet.s" + "build:assets-smw": "node %npm_package_config_png2iigs% ./assets/donut-plains-2-8-color.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-2-8-color-shift.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", + "build:assets-fatdog": "node %npm_package_config_png2iigs% ./assets/armada-7-color.png ./emu/bg1a.bin --start-index 8 && node %npm_package_config_png2iigs% ./assets/armada-7-color-shift.png ./emu/bg1b.bin --start-index 8 && node %npm_package_config_png2iigs% ./assets/armada-7-color-shuffle.png ./emu/fg1.bin --start-index 1", + "build:assets-plant": "node %npm_package_config_png2iigs% ./assets/plant.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", + "build:assets-woz": "node %npm_package_config_png2iigs% ./assets/woz.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", + "build:assets-woz-fatbits": "node %npm_package_config_png2iigs% ./assets/woz-pixelated.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", + "build:assets-color-cycle": "node %npm_package_config_png2iigs% ./assets/rotopattern.png ./emu/bg1a.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/woz-shifted.png ./emu/bg1b.bin --start-index 6 && node %npm_package_config_png2iigs% ./assets/donut-plains-1-6-color.png ./emu/fg1.bin", + "build:map": "node %npm_package_config_tiled2iigs% ./assets/tiled/world_1-1.json --output-dir ./gen", + "build:tiles": "node %npm_package_config_png2iigs% ./assets/tilesets/smb-16.png --as-tile-data > ./gen/App.TileSet.s" }, "repository": { "type": "git", diff --git a/src/Core.s b/src/Core.s index f92f295..597b23b 100644 --- a/src/Core.s +++ b/src/Core.s @@ -363,7 +363,7 @@ ReadControl ENT pla rtl - put App.Init.s + put Memory.s put Graphics.s put Render.s put Timer.s @@ -378,3 +378,4 @@ ReadControl ENT put blitter/BG0.s put blitter/BG1.s put TileMap.s + diff --git a/src/Memory.s b/src/Memory.s index 1895785..af6c01b 100644 --- a/src/Memory.s +++ b/src/Memory.s @@ -143,3 +143,4 @@ AllocOneBank2 PushLong #0 _Deref rts +