From ac9ce9a20c402f7e62e732b5eddd38d882f9fa1b Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Wed, 1 Jun 2016 14:07:35 +1000 Subject: [PATCH] added paletteC --- 028.bs/Makefile | 2 ++ 028.bs/assets/palette.txt | 4 ++-- 028.bs/assets/paletteE_background.pal | 8 ++++++++ 028.bs/assets/paletteE_foreground_flags.pal | 9 +++++++++ 028.bs/assets/paletteE_foreground_playarea.pal | 8 ++++++++ 028.bs/game1.s | 5 +++-- 6 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 028.bs/assets/paletteE_background.pal create mode 100644 028.bs/assets/paletteE_foreground_flags.pal create mode 100644 028.bs/assets/paletteE_foreground_playarea.pal diff --git a/028.bs/Makefile b/028.bs/Makefile index 33c26c5..70211a6 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -6,6 +6,7 @@ paletteA_BACKGROUND_COLOR_LONG=000 153 238 255 paletteB_BACKGROUND_COLOR_LONG=000 000 102 187 paletteC_BACKGROUND_COLOR_LONG=210 002 053 255 paletteD_BACKGROUND_COLOR_LONG=134 134 134 255 +paletteE_BACKGROUND_COLOR_LONG=000 153 238 255 MAX_P61_SIZE=$(shell ls -Sl assets/P61.* | awk '{print $$5}' | head -1) @@ -319,6 +320,7 @@ out/main.o: $(IMAGEDATA) \ out/paletteB_playarea_fade.s out/paletteB_flags_fade.s out/paletteB_foreground-palette-table.s out/paletteB_tileFade.s\ out/paletteC_playarea_fade.s out/paletteC_flags_fade.s out/paletteC_foreground-palette-table.s out/paletteC_tileFade.s\ out/paletteD_playarea_fade.s out/paletteD_flags_fade.s out/paletteD_foreground-palette-table.s out/paletteD_tileFade.s\ + out/paletteE_playarea_fade.s out/paletteE_flags_fade.s out/paletteE_foreground-palette-table.s out/paletteE_tileFade.s\ out/panelFade.s out/jump.raw out/falling.raw out/chaching.raw out/whoosh.raw out/yay.raw diff --git a/028.bs/assets/palette.txt b/028.bs/assets/palette.txt index 3a9a6f3..a06d763 100644 --- a/028.bs/assets/palette.txt +++ b/028.bs/assets/palette.txt @@ -17,8 +17,8 @@ flags # safe tile #1 # safe tile #2 # flag color #3 -# normal tile #2 (not used ?) -# pathway (not used ?) +# normal tile #2 +# pathway background ---------- diff --git a/028.bs/assets/paletteE_background.pal b/028.bs/assets/paletteE_background.pal new file mode 100644 index 0000000..6d0af34 --- /dev/null +++ b/028.bs/assets/paletteE_background.pal @@ -0,0 +1,8 @@ +000 000 014 255 +029 192 255 255 +121 235 255 255 +071 174 192 255 +213 213 213 255 +210 000 039 255 +154 154 154 255 +000 000 000 000 diff --git a/028.bs/assets/paletteE_foreground_flags.pal b/028.bs/assets/paletteE_foreground_flags.pal new file mode 100644 index 0000000..234ce5b --- /dev/null +++ b/028.bs/assets/paletteE_foreground_flags.pal @@ -0,0 +1,9 @@ +000 153 238 255 +093 053 053 255 +073 043 043 255 +081 155 013 255 +046 116 002 255 +144 083 083 255 +113 181 024 255 +016 132 233 255 + diff --git a/028.bs/assets/paletteE_foreground_playarea.pal b/028.bs/assets/paletteE_foreground_playarea.pal new file mode 100644 index 0000000..e26eba6 --- /dev/null +++ b/028.bs/assets/paletteE_foreground_playarea.pal @@ -0,0 +1,8 @@ +000 153 238 255 +253 174 017 255 +233 216 100 255 +081 155 013 255 +046 116 002 255 +113 181 024 255 +168 230 057 255 +016 132 233 255 diff --git a/028.bs/game1.s b/028.bs/game1.s index 8e395b9..762eaad 100644 --- a/028.bs/game1.s +++ b/028.bs/game1.s @@ -902,7 +902,7 @@ BlitCountdown: Level 1,"WELCOME TO BLOCKY SKIES!",75,2*2,12,10,"PHEW!, LEVEL 1 COMPLETE!",A,99,0,1,pig Level 2,"HAVING FUN YET?",70,2*2,12,10,"LEVEL 2",B,98,2,0,robot Level 3,"GIDDY UP!",50,4*2,8,6,"GETTING FASTER!, LEVEL 3 COMPLETE!",C,98,2,0,pig - Level 4,"LETS GO?",25,4*2,8,6,"LEVEL 4 COMPLETE",C,98,2,0,robot + Level 4,"LETS GO?",200,4*2,8,6,"LEVEL 4 COMPLETE",E,99,2,0,cow Level 5,"KABOOM?!",200,4*2,8,6,"PHEW!!! LEVEL 5 COMPLETE!",D,99,1,0,tank Level 6,"WHAT? WHAT?!",50,4*2,8,6,"NICE! LEVEL 6 COMPLETE!",A,98,1,0,cow @@ -910,7 +910,8 @@ BlitCountdown: Palette A Palette B Palette C - Palette D + Palette D + Palette E levelData: ds.b (level2End-level2Start)+1024