From 97d244867c7eb13fab7b15414b60c4a659dc0a22 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 12 Jun 2024 16:53:42 -0400 Subject: [PATCH] fish: add ripples --- games/sb/fish/fish.s | 43 +++++++++ games/sb/fish/graphics/Makefile | 13 +-- games/sb/fish/graphics/boat_sprites.png | Bin 5259 -> 5486 bytes games/sb/fish/random16.s | 119 ++++++++++++++++++++++++ games/sb/fish/zp.inc | 7 +- games/sb/qload.s | 2 +- 6 files changed, 174 insertions(+), 10 deletions(-) create mode 100644 games/sb/fish/random16.s diff --git a/games/sb/fish/fish.s b/games/sb/fish/fish.s index 12c66ea8..2c308324 100644 --- a/games/sb/fish/fish.s +++ b/games/sb/fish/fish.s @@ -289,6 +289,38 @@ main_loop: ;=========================== ; draw ripples + ; should we do this last? + + lda FRAME + and #$3 + tax + + lda ripple_l_sprites_l,X + sta INL + lda ripple_l_sprites_h,X + sta INH + + lda #8 + sta SPRITE_X + lda #136 + sta SPRITE_Y + jsr hgr_draw_sprite + + lda FRAME + and #$3 + tax + + lda ripple_r_sprites_l,X + sta INL + lda ripple_r_sprites_h,X + sta INH + + lda #32 + sta SPRITE_X + lda #139 + sta SPRITE_Y + jsr hgr_draw_sprite + ;=========================== ; draw strong bad @@ -896,6 +928,7 @@ bg_data: .include "play_sounds.s" .include "text_print.s" .include "gr_offsets.s" + .include "random16.s" .include "graphics/boat_sprites.inc" .include "graphics/strongbad_sprites.inc" @@ -1013,3 +1046,13 @@ bubble_mask_table_h: .byte >big_bubble_mask,>big_bubble_mask .byte >med2_bubble_mask,>med2_bubble_mask +ripple_l_sprites_l: + .byte ripple_l1_sprite,>ripple_l2_sprite,>ripple_l3_sprite,>ripple_none_sprite + +ripple_r_sprites_l: + .byte ripple_r1_sprite,>ripple_r2_sprite,>ripple_r3_sprite,>ripple_none_sprite + diff --git a/games/sb/fish/graphics/Makefile b/games/sb/fish/graphics/Makefile index e18a44f7..d552c304 100644 --- a/games/sb/fish/graphics/Makefile +++ b/games/sb/fish/graphics/Makefile @@ -40,6 +40,13 @@ boat_sprites.inc: boat_sprites.png $(HGR_SPRITE) -s -l boat1_sprite boat_sprites.png 0 0 188 45 > boat_sprites.inc $(HGR_SPRITE) -s -l boat2_sprite boat_sprites.png 0 46 188 91 >> boat_sprites.inc $(HGR_SPRITE) -s -l boat3_sprite boat_sprites.png 0 92 188 137 >> boat_sprites.inc + $(HGR_SPRITE) -s -l ripple_l1_sprite boat_sprites.png 0 142 13 146 >> boat_sprites.inc + $(HGR_SPRITE) -s -l ripple_l2_sprite boat_sprites.png 0 156 13 160 >> boat_sprites.inc + $(HGR_SPRITE) -s -l ripple_l3_sprite boat_sprites.png 0 171 13 175 >> boat_sprites.inc + $(HGR_SPRITE) -s -l ripple_r1_sprite boat_sprites.png 168 144 181 148 >> boat_sprites.inc + $(HGR_SPRITE) -s -l ripple_r2_sprite boat_sprites.png 168 159 181 163 >> boat_sprites.inc + $(HGR_SPRITE) -s -l ripple_r3_sprite boat_sprites.png 168 174 181 178 >> boat_sprites.inc + $(HGR_SPRITE) -s -l ripple_none_sprite boat_sprites.png 0 168 6 169 >> boat_sprites.inc #### @@ -83,12 +90,6 @@ fish_sprites.inc: fish_sprites.png $(HGR_SPRITE) -s -l big_bubble_mask fish_sprites.png 0 101 6 104 >> fish_sprites.inc $(HGR_SPRITE) -s -l med2_bubble_mask fish_sprites.png 0 108 6 110 >> fish_sprites.inc - - - - - - #### clean: diff --git a/games/sb/fish/graphics/boat_sprites.png b/games/sb/fish/graphics/boat_sprites.png index bfcdde5157078aca58d60a300e64b2800117bea6..2d721a824735e99566905c41e620f710924be30c 100644 GIT binary patch delta 785 zcmV+s1Md8bDefweM1Nb3!!QW^_bK)Wylms+I87q$4SM`eV%%&hRazvEVS-^GX?yE|$UNtUaZRtmwaS(6UOY1ncilbtvM50CGBdc+$NP>Nee*d+K3JbaG0MH8O+v(UR! zhnKGpy$8SC`6UX9e-;V_%A+%_@gNGRgd!X9BNUb9^)}l2o?9)=ufEttSBkO=fvX%U6A;Z>$1yloC^;7d1ly1r{;;n#6qEsjqpTVq`QpV>D$qEn+t^ zGA%SRHZ(0^FgIc?VKOr^Ib||7Fk)pjlWPY}2r)G}H8(mlF|)u2ZU_V#P{9h5G7v%s P6FDDlx#Tgkdk_!=aIsn7 delta 731 zcmV<10wn$JDvK$QM1N5ZgD?pF?eOU6*zxzYbj~G9Mp6n-`gmYkpN}ow zc4OzHQ*o_p^Wih;;d|l{$1yloQn<%JTqiu((}Y2VzJo4atE`L zp%PCMM-)|~d?D+y!g-6cTB)(tJ^2fRd2MBx>omhiU=d45L4=GN%Ba9Xlva%t6KUFy zd-#VPe~Mf(xyoSVSU?pjB*zc_2fw>D3x89SZc;D~1YT_WV-)D#1)6o+{yw(t<_X|` z2ClTWzuEw1KS{5*wa5|BzYSbmw>5bWxZDATo^;8O9LY~pC=`JAGy0|+FmMa>uDQLn z_Hp_EWT>m;4RCM>j1?(+-Q(RooxS~grq$mM-I;RH|6LM#000emX;fHrSWQeiW3#&g zfdV99HZd_bVrFD5HaIh6Ei_{^W-Vf7G%+nWVmCNuI50A0Gc{q8UXOR_MAGIC ; 2 + sta SEEDH ; 3 + lda SEEDL ; 3 + eor #