From 7653b91d600e66a2be47b96a00c4e4530f8d4c70 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Sat, 16 Apr 2016 12:24:51 +1000 Subject: [PATCH] scoreboard panel --- 028.game2/Makefile | 16 +++---- 028.game2/assets/foregroundTilemap.png | Bin 0 -> 5008 bytes 028.game2/assets/panel.png | Bin 0 -> 915 bytes 028.game2/game1.s | 58 +++++++++++++++++++++---- 028.game2/image.s | 18 ++++++++ 028.game2/init.s | 10 ++--- 028.game2/tilemap-copper-list.s | 25 +++++++++++ 7 files changed, 105 insertions(+), 22 deletions(-) create mode 100644 028.game2/assets/foregroundTilemap.png create mode 100644 028.game2/assets/panel.png create mode 100644 028.game2/tilemap-copper-list.s diff --git a/028.game2/Makefile b/028.game2/Makefile index f5e1fa6..6b49486 100644 --- a/028.game2/Makefile +++ b/028.game2/Makefile @@ -11,12 +11,8 @@ NUM_COLORS=8 BOOTBLOCK_ASM=alpine_bootblock.s OBJS=out/init.o out/utils.o out/image.o out/blit.o out/joystick.o -#IMAGES=gigi_full.png -#IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin)) -#SIZEDIMAGEDATA=$(addprefix out/, $(IMAGES:.png=.sized.png)) - -TILEMAPS=foreground.png background.png -TILEMAPDATA=$(addprefix out/, $(TILEMAPS:.png=.bin)) +IMAGES=foreground.png background.png panel.png +IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin)) VASM_EXTRA_ARGS=-DNUM_COLORS=$(NUM_COLORS) @@ -39,7 +35,11 @@ out/background.bin: assets/tilemap.png $(IMAGECON) --use-palette=assets/background.pal --input $< $(IMAGECON_ARGS) --colors $(NUM_COLORS) --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-grey-palette --output-palette --output-png --output out/background out/tilemap-palette.s: assets/tilemap.png - $(IMAGECON) --use-palette=assets/palette.pal --full-color-palette-file --input=assets/tilemap.png --output-palette-asm --output=out/tilemap + $(IMAGECON) --use-palette=assets/palette.pal --full-color-palette-file --input=assets/tilemap.png --output-palette-asm --output=out/tilemap --output-copperlist + +out/panel.bin: assets/panel.png + $(IMAGECON) --input $< $(IMAGECON_ARGS) --colors 16 --output-bitplanes --output-palette --full-color-palette-file --output-palette-asm --output-palette --output-png --output-copperlist --output out/panel + out/foreground-map.s: foreground.tmx ../tools/mapgen/out/mapgen --depth=3 --input=foreground.tmx @@ -50,5 +50,5 @@ out/background-map.s: background.tmx mv background-map.s out out/blit.o: constants.i macros.i -out/main.o: out/background-map.s out/foreground-map.s $(TILEMAPDATA) $(IMAGEDATA) constants.i macros.i Makefile link.script.x assets/palette.pal out/tilemap-palette.s +out/main.o: out/background-map.s out/foreground-map.s $(IMAGEDATA) constants.i macros.i Makefile link.script.x assets/palette.pal out/tilemap-palette.s out/init.o: constants.i Makefile \ No newline at end of file diff --git a/028.game2/assets/foregroundTilemap.png b/028.game2/assets/foregroundTilemap.png new file mode 100644 index 0000000000000000000000000000000000000000..798d77b5349a463687313bda0d7f1c5414e2c64f GIT binary patch literal 5008 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 literal 0 HcmV?d00001 diff --git a/028.game2/assets/panel.png b/028.game2/assets/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..128306b37b7c671600aa7ba353d63618be4ac7ab GIT binary patch literal 915 zcmV;E18n?>P)M9{`0@Ac ze-Qu}Ed&^V00RI41^@yKK!5>&00RI41^@yKK!5>&00RI41|YxyK!5>&00TfftnGeZ z{O%`j#jjfJIY$8FsKCecI;lA6**pWlLoq3(H_PqX`fWP4*Xyva)FT|dPLhs>#bRA) z*=~bp9V|R;fJ^BOQW25Z5`8Jdqedt3DW4nv)V|bQ6ELzh@afJuOK-6P|7N(j9yYB= z*8HQ=lI}h)wBMmF6$7l7I`!5I|4T3R4dpi*#nmIfI@mTIiZC?ZLZ8x`SKwNPyU=uL z-VoaE_{u3}SVXq^pCy6u{8x+R32oV{4FFU${n#*Kt$(-7>u02G-*I z>bK3TWR$(8!J2vi&IPzqa)+tC*8Ibof26z5ruI8$xKfIH;cD%@|6t)Md8tM>|DgN4 ze|}{2Qu`a<-}v<%=`Ob$R8+WEfc3cySJJEdzncI2Dj%Zu5^1<6$0xD;|8HlqT4>Sl zNZ?*+}I?ga?zY%S^i{A1iG8+Gs0C>0nmttIuFzE$&+yEQCUUY5v`oqBR^@{lM z<2PFad#!tiH%$`w@#7!JKk-c7U+P8i+VK6Q`0?W(&d-1302na@7~nYqeBn8PULGO9 zj~{>E{ukxBNo4RuVc;sG{`m3ZAI|@}TD{xKPNLYJDmfg)wwtDhB#M>m%w~={Bw_Sz zPu0~GcHpX+GsTY||3LnUNO^zkTs6<81m!wePfuihO`Xjp#|?D+`0)?pe_gHKMI@Uf z4&O;V_u0f?&zyYnu$^f(Ni_8jT(z3ouIC=&Z`+yT$B%y?zm=w6#p$7b|D8_^RZ$p) z=N=phT;+Ri-bej@#*ZI=@BVUtZ`fK3qx!17_|wt=@Z-ndtAEmQZ@lC2;m41^i=PKM p07eV}1|Yxy@E3I5!~%dn