From d758fc265b7cbd3d73940264b1aaad720de07ed6 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 6 Jun 2024 01:19:31 -0400 Subject: [PATCH] fish: work on graphics --- games/sb/fish/fish.s | 10 +++++++++- games/sb/fish/graphics/Makefile | 10 +++++++++- games/sb/fish/graphics/boat1.png | Bin 0 -> 1812 bytes games/sb/fish/graphics/boat2.png | Bin 0 -> 1797 bytes games/sb/fish/graphics/boat2_sb.png | Bin 0 -> 2101 bytes games/sb/fish/graphics/boat3.png | Bin 0 -> 1904 bytes 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 games/sb/fish/graphics/boat1.png create mode 100644 games/sb/fish/graphics/boat2.png create mode 100644 games/sb/fish/graphics/boat2_sb.png create mode 100644 games/sb/fish/graphics/boat3.png diff --git a/games/sb/fish/fish.s b/games/sb/fish/fish.s index 44ce5555..0e34abc0 100644 --- a/games/sb/fish/fish.s +++ b/games/sb/fish/fish.s @@ -9,6 +9,13 @@ .include "zp.inc" .include "hardware.inc" +; NOTES FROM WIKI +; green fish 50 or 100 +; grey fish 100 points +; red fish 400 or 500 +; bubbles easier to catch? +; grey = lures, red green = jigs + ; NOTES ; page1= $2000-$5fff @@ -362,7 +369,8 @@ done_flip: bg_data: - .incbin "graphics/fish_bg.hgr.zx02" +; .incbin "graphics/fish_bg.hgr.zx02" + .incbin "graphics/boat2_sb.hgr.zx02" .include "hgr_tables.s" .include "zx02_optim.s" diff --git a/games/sb/fish/graphics/Makefile b/games/sb/fish/graphics/Makefile index e65f9cb1..d6333b44 100644 --- a/games/sb/fish/graphics/Makefile +++ b/games/sb/fish/graphics/Makefile @@ -4,7 +4,7 @@ ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite -all: fish_title.hgr.zx02 fish_bg.hgr.zx02 +all: fish_title.hgr.zx02 fish_bg.hgr.zx02 boat2_sb.hgr.zx02 # sb_sprites.inc @@ -25,6 +25,14 @@ fish_bg.hgr.zx02: fish_bg.hgr fish_bg.hgr: fish_bg.png $(PNG_TO_HGR) fish_bg.png > fish_bg.hgr +#### + +boat2_sb.hgr.zx02: boat2_sb.hgr + $(ZX02) boat2_sb.hgr boat2_sb.hgr.zx02 + +boat2_sb.hgr: boat2_sb.png + $(PNG_TO_HGR) boat2_sb.png > boat2_sb.hgr + #### diff --git a/games/sb/fish/graphics/boat1.png b/games/sb/fish/graphics/boat1.png new file mode 100644 index 0000000000000000000000000000000000000000..a8854bc210d5db96635178166016e126f35042d6 GIT binary patch literal 1812 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 literal 0 HcmV?d00001 diff --git a/games/sb/fish/graphics/boat2_sb.png b/games/sb/fish/graphics/boat2_sb.png new file mode 100644 index 0000000000000000000000000000000000000000..afecd01811fc1a1e78111931b0436e902957f76d GIT binary patch literal 2101 zcmV-52+H?~P)EX>4Tx04R}tkv&MmKpe$iQ;Q-M2MdaHh){L0i;6hbDionYsTEpvFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0Yam~RI@7vsG4P@ z6LB${TNS%s5kMG&7{R#2OnokuO2Tt|-NVP%yC~1{KKJM7Q}QMQd?Im->4rtTK|Hf* z>74h8L#!kz#OK5l23?T&k?XR{Z=8z`3p_JqWYY7*A!4!E!Ey()lA#h$6Gs$PqkJLj zvch?bvs$UK);;+PgL!Rbnd>yeNMI35NI`^*8p^1^LX=jG6ccIMk9+us9e;{kGP%lN z5bWxZDATo^;8O9LY~pC=`JAGy0|+FmMa>uDQLn_Hp_EWT>m;4RCM> zj1?(+-Q(RooxS~grq$mM-I;RHL8|yS0000IP)t-s0000R%K_vx{{R2~&07H*n*NcW zLm2=7010qNS#tmY3ljhU3ljkVnw%H_000McNliru=mrJ_4g;O3C+q+K02y>eSad^g zZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00sd`L_t(|+U=VQmfIi@mTZA7 zX#ZR3#KxG9011oW=7gLx?M(f-eG-xo4CwWo4_*%%c#tskEMO;&wW?m4eK zS)3Ew393vYul#Ybpf{uHFc8Lso{za}KGmOjn?cDlS*Xs0M+Zkv_{ zO=SWMNtDSl=BB5q!~Cg1r{|DBnY8DqW9jg`S>DPJy;Y&zPLe0$4oh2^Ftp0(VVbiE z8H`LB4`a)6z-$o%lUSwVYYcN z+jC$J8azZ9yzK;Rc!V<8l@X&%h1sV!@PjE~j(YPMFjv*N6sDwE4il}KmcvAA+vh0b z9OTQxPbjmkSLXOES7u*R`o{EfW#X2?dS%|)gr2>kqc965QfB)iWneI}9lc&tvV;k# z|NaPO+Uq?>$#R#6LP|j<<9LvdGY8B5XL(r)1yhOy=8Smc`+Kd+XHfXzcB{a%(7_^j zlRXTAb%1ToDt7#CooT4EWD+hMi{#$~~8K1`^5 zojZ5htzd9N85efiOBioK)!PQ*P|os4L!~f#&YBN{0w!KTC8<*nqaCULp6}*ZR4{{; zL(Xy(SYg#Y=)kx`lkBPi9E%tR<17aa%JWiPmL`k{s5qPjXA9%IJS6|UFm*BdlEGZ< zCW84$&h<-SyfAYxRLTUCJ_CmC!}Pt3^HttoZo)`Bo{wy-^ZI|B_v<{=fWZZGM_q_2jjtZD*zvonixu)~^?E_%wj4vsS+C3Ywxd(H7&4j7JXrLnBtYtfLb|K zp-ExdK~WhlnlA!*c+YNyJ zlXGb#x6FsZQ()+tx^n*3Pw%i$vNV$1bAR8XachVqd2mq)V+d39r$}oh{T@`kjA=H@ z`0Df)O!Waw3nncmjD?B)R1IS-OcN$7veOh$CIc&$j-5UX)3s9$Q*mHJnA#d8D}X8e z%Oo=?VM;xXHl6Fe=z5>G^fap-@CU*`0Mqqfng~O@AdE0(FjTD}s8@8r+DertRhE%i z_%j!VDtRw!4y9Jg+pl(~Nm?+d!qBy+c~VSA_1wX!F|&^U~3VikWH>$sc^ zOw@PQ&nmLZR@X5vt~W1$iN094a2&(*vx?YuwE+x9VeEbbDrzgz(9AZh&ddD)lO4u; f4K>r9S6i5Wy*l!RFqw-100000NkvXXu0mjf)W_Ye literal 0 HcmV?d00001 diff --git a/games/sb/fish/graphics/boat3.png b/games/sb/fish/graphics/boat3.png new file mode 100644 index 0000000000000000000000000000000000000000..193b87f56e95f1701adaf33c2dc926279b09c30a GIT binary patch literal 1904 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