From bd3d11c70548ce3f3754f84f1530934dc550aeee Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Tue, 24 May 2016 17:40:28 +1000 Subject: [PATCH] wip - more generic background bobs --- 028.bs/Makefile | 11 +- 028.bs/P6112-Options.i | 2 +- 028.bs/assets/background.png | Bin 2551 -> 2531 bytes 028.bs/background.s | 59 ++++++-- 028.bs/baloon.s | 254 ----------------------------------- 028.bs/blit.s | 3 - 028.bs/bob.i | 49 +++++++ 028.bs/bob.s | 194 ++++++++++++++++++++++++++ 028.bs/game1.s | 24 ++-- 028.bs/image.s | 30 +++-- 028.bs/splash.s | 24 +++- 11 files changed, 343 insertions(+), 307 deletions(-) delete mode 100644 028.bs/baloon.s create mode 100644 028.bs/bob.i create mode 100644 028.bs/bob.s diff --git a/028.bs/Makefile b/028.bs/Makefile index ec16511..99db8b0 100644 --- a/028.bs/Makefile +++ b/028.bs/Makefile @@ -14,7 +14,7 @@ BASE_ADDRESS=4000 # note: this must be high enough not to conflict with MFMbufE BOOTBLOCK_ASM=alpine_bootblock.s -OBJS=out/init.o out/utils.o out/image.o out/blit.o out/joystick.o out/player.o out/items.o out/blitmtext.o out/blitmtext85.o out/blittext.o out/music.o out/P6112-Play.o out/splash.o out/background.o out/sound.o out/trackloader.o out/disk.o out/counter.o out/map.o out/message.o out/menu.o out/credits.o out/baloon.o +OBJS=out/init.o out/utils.o out/image.o out/blit.o out/joystick.o out/player.o out/items.o out/blitmtext.o out/blitmtext85.o out/blittext.o out/music.o out/P6112-Play.o out/splash.o out/background.o out/sound.o out/trackloader.o out/disk.o out/counter.o out/map.o out/message.o out/menu.o out/credits.o out/bob.o IMAGES=foreground.png \ background.png \ @@ -76,12 +76,12 @@ IMAGES=foreground.png \ font8x85.png\ splash.png\ splashSave.png\ - baloonMask.png\ + backgroundMask-mask.png\ countdown.png IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin)) -VASM_EXTRA_ARGS=-DSFX=1 -DBALOON_BOB=1 -DMAX_P61_SIZE=$(MAX_P61_SIZE) -allmp +VASM_EXTRA_ARGS=-DSFX=1 -DMAX_P61_SIZE=$(MAX_P61_SIZE) -allmp LINKER_OPTIONS=-T link.script.x @@ -219,9 +219,8 @@ out/splashSave.bin: assets/splash.png out/splash.bin ../tools/croppa/out/croppa --input=assets/splash.png --output=out/splashSave.png --width=96 --height=64 --rows=1 --cols=1 --dx=0 --dy=0 --x=112 --y=150 $(IMAGECON) --input out/splashSave.png $(IMAGECON_ARGS) --output-bitplanes --output-grey-palette-asm --output-palette-asm --output-palette --output out/splashSave --colors=32 --output-copperlist --full-color-palette-file --use-palette=out/splash.pal -out/baloonMask.bin: assets/background.png - #../tools/croppa/out/croppa --input=assets/background.png --output=out/baloonMask.png --width=48 --height=32 --rows=1 --cols=1 --dx=0 --dy=0 --x=0 --y=64 - $(IMAGECON) --input assets/baloonMask.png $(IMAGECON_ARGS) --output-mask --output out/baloonMask --colors=8 --transparent-color=0,0,0 --output-png --palette-offset=8 +out/backgroundMask-mask.bin: assets/background.png + $(IMAGECON) --input assets/background.png $(IMAGECON_ARGS) --output-mask --output out/backgroundMask --output-png --colors=8 --transparent-color=0,0,14 --output-png --palette-offset=8 out/splash.bin: assets/splash.png $(IMAGECON) --input $< $(IMAGECON_ARGS) --output-bitplanes --output-grey-palette-asm --output-palette-asm --output-palette --output out/splash --colors=32 --output-copperlist --full-color-palette-file diff --git a/028.bs/P6112-Options.i b/028.bs/P6112-Options.i index e65ded3..a120d34 100644 --- a/028.bs/P6112-Options.i +++ b/028.bs/P6112-Options.i @@ -5,7 +5,7 @@ P61mode =2 ;Try other modes ONLY IF there are no Fxx commands >= 20. ;; --- options common to all P61modes --- -usecode=-1;$8000 ;CHANGE! to the USE hexcode from P61con for a big +usecode=$8159|$800D40D|$1559;$8000 ;CHANGE! to the USE hexcode from P61con for a big ;CPU-time gain! (See module usecodes at end of source) ;Multiple songs, single playroutine? Just "OR" the ;usecodes together! diff --git a/028.bs/assets/background.png b/028.bs/assets/background.png index 85dd4978b1fc8c9500881a5f5be3bb46e99c418f..63d42eda9a68476a6d12649bd290ad609a378f40 100644 GIT binary patch delta 1404 zcmV-?1%vwc6XO%GJp_M|Nklp)^nn14B`mkQlPw^(p<4RThQi1X1c(6@TX$w+GO_irt5_|8 z09rr^R2$L>0yLDY60Qy{poDS_o$~cG)@EYs8a`XHF%UokDV>b1J9#MsuqBH2uF(SQ zJ|_?Wwnw}%Wep4i)*V1U@@qce2N_)8B1S;WlE{GAb_Am3b0~J)0a^Kh27|AGyzKuuIh*DA-QDFNk9IIXVQzv7 zlQ0M?lPCxpf5ESVZ*Fb|Z?^1r`@_w^gzpWAnOb`E@%G=s{&;a5^o{?ydF<~fUtV4f zy4-(C4So3cFQM;HzHc55Y94QX4s$uVxOhL@IzN9i%xMz*GKg>9Znv~2Y2*YLGn}ME zNr)$2nv_J~iI=jH2t4spRuX|HUdnPJ@We|wP6VDie<{cF5v%}D&OhAl-OVGw-rid+ zm>EMLxdN>5n=@{Wo)UXQr=RRm6$qVvlBFsTI{hR|RUmZwN!C??(CH^RR|P_+pX4Yf z!3sb^Zc~aeR5wE-&sghi+gQ28g>P#d7~ zPqLvle^BiqkeqWPFX@g9{MxOL-E;Txv5i1-1>j*gwsKawwXu7APYZKi3FOI_{_{#8 zPrj7pl|Y_+Da$K?#F)$S2SWb($7S4{S8jP|-8u;1P&nXE@M%dLgj%J*V! z3xQSN1-Lf@ydBs|=v;3WRRA*b_2M;6F*b_89;yn^Xv}b%A@C2+7HI39*rvAt0000< KMNUMnLSTY1MU{~N delta 1424 zcmV;B1#kM}6ZaFaJp_NHNkl1jS5WWC)Qc+Ow1d%9GfldfII*L3*UH}@N zfCgS550Qc{9SB8GQ6SwDP*70u00_a=s{gD6l=GX57BX94Y99-i<~_BokWq zyNcBu2%rVzK(!*BAV5XQ%He9)0&*zV&?(=ZhT2SMUBhQfHaY@GAf=O`btf-n0JcQY z-Zff)y_~3e1Ok7k!fnr3*8=RhHqRs3hNPCzx|DDI`e+}Z+TR1T4rYzgOOq9Vl0u^ofVHnR zNdP)kG_F0#zW5infY2!`m4s4uePCN$TTB3pLDl3_=m3AoSW*+a$rd0%!}T}9_>z9k^|42QkYWzV+0$n|phG40`uyeQ zdakz-`^f$n2_jUiN<_T{@05X7>ph+3V`Vi<5puP|eJq{5z zw0@|q{i~z|SOP98PZ_c$B|w=F^sGvfrm(!^(4?^6BS2|~QUnDZ@d)$?5Wm%iWQee# zbsJHX^CBq$QkKY+y2`<8-*Qp{*bmp9hoxYN-XlP1hwP=OZIAXp7k|9}xp=(RiU7V2 zUTfz6#|;9204qme<>B`p0>|*!?Y@jH4cfV3=>X6$q=zSZ= z%l@C!^GTlH-CcF^Xa^k><|e3<90)9v6$lxBD*y?(O)*MIxf}UjejjsN2zUv=T}4UfXtXo;wg4Vx z%N4-a2B`cK7QQw><)37IZGg%@$@kSAaI&ntmE`BIiw0(tVKEUyF-V=l`d2>IJTF5~9Ba?3;O)