diff --git a/games/sb/fish/fish.s b/games/sb/fish/fish.s index d36d3c97..1942f8b9 100644 --- a/games/sb/fish/fish.s +++ b/games/sb/fish/fish.s @@ -372,9 +372,9 @@ handle_red_fish: lda RED_FISH_STATE_PTR bpl handle_grey_fish ; positive means fish is active - ; create new red fish - lda #0 - sta RED_FISH_STATE_PTR + ; create new red/big fish +; lda #0 +; sta RED_FISH_STATE_PTR lda #FISH_SPRITE_LONG sta RED_FISH_SPRITE @@ -388,9 +388,9 @@ handle_grey_fish: lda GREY_FISH_STATE_PTR bpl handle_green_fish ; positive means fish is active - ; create new grey fish -; lda #0 -; sta GREY_FISH_STATE_PTR + ; create new grey/left fish + lda #0 + sta GREY_FISH_STATE_PTR lda #FISH_SPRITE_LEFT sta GREY_FISH_SPRITE @@ -404,7 +404,7 @@ handle_green_fish: lda GREEN_FISH_STATE_PTR bpl done_handle_fish ; positive means fish is active - ; create new green fish + ; create new green/right fish ; lda #0 ; sta GREEN_FISH_STATE_PTR @@ -672,7 +672,8 @@ done_update_fish: ; set up sprite - ldx #0 + lda RED_FISH_SPRITE,X + tax lda fish_sprite_table_l,X sta INL @@ -751,10 +752,10 @@ fish_sprite_table_h: .byte >big_fish_sprite,>left_fish_sprite,>right_fish_sprite .byte >red_fish_sprite,>grey_fish_sprite,>green_fish_sprite fish_mask_table_l: - .byte red_fish_mask,>grey_fish_mask,>green_fish_mask + .byte >big_fish_mask,>left_fish_mask,>right_fish_mask .byte >red_fish_mask,>grey_fish_mask,>green_fish_mask diff --git a/games/sb/fish/graphics/Makefile b/games/sb/fish/graphics/Makefile index ac3fbcc2..95fe2f09 100644 --- a/games/sb/fish/graphics/Makefile +++ b/games/sb/fish/graphics/Makefile @@ -57,12 +57,15 @@ fish_sprites.inc: fish_sprites.png $(HGR_SPRITE) -s -l grey_fish_sprite fish_sprites.png 0 0 20 7 > fish_sprites.inc $(HGR_SPRITE) -s -l green_fish_sprite fish_sprites.png 0 9 20 16 >> fish_sprites.inc $(HGR_SPRITE) -s -l red_fish_sprite fish_sprites.png 0 18 27 25 >> fish_sprites.inc - $(HGR_SPRITE) -s -l grey_fish_mask fish_sprites.png 42 29 62 36 >> fish_sprites.inc - $(HGR_SPRITE) -s -l green_fish_mask fish_sprites.png 42 38 62 45 >> fish_sprites.inc - $(HGR_SPRITE) -s -l red_fish_mask fish_sprites.png 42 47 69 54 >> fish_sprites.inc + $(HGR_SPRITE) -s -l grey_fish_mask fish_sprites.png 42 0 62 7 >> fish_sprites.inc + $(HGR_SPRITE) -s -l green_fish_mask fish_sprites.png 42 9 62 16 >> fish_sprites.inc + $(HGR_SPRITE) -s -l red_fish_mask fish_sprites.png 42 18 69 25 >> fish_sprites.inc $(HGR_SPRITE) -s -l left_fish_sprite fish_sprites.png 0 29 20 36 >> fish_sprites.inc $(HGR_SPRITE) -s -l right_fish_sprite fish_sprites.png 0 38 20 45 >> fish_sprites.inc $(HGR_SPRITE) -s -l big_fish_sprite fish_sprites.png 0 47 27 54 >> fish_sprites.inc + $(HGR_SPRITE) -s -l left_fish_mask fish_sprites.png 42 29 62 36 >> fish_sprites.inc + $(HGR_SPRITE) -s -l right_fish_mask fish_sprites.png 42 38 62 45 >> fish_sprites.inc + $(HGR_SPRITE) -s -l big_fish_mask fish_sprites.png 42 47 69 54 >> fish_sprites.inc $(HGR_SPRITE) -s -l zero_sprite fish_sprites.png 0 72 6 79 >> fish_sprites.inc $(HGR_SPRITE) -s -l one_sprite fish_sprites.png 14 72 20 79 >> fish_sprites.inc $(HGR_SPRITE) -s -l two_sprite fish_sprites.png 28 72 34 79 >> fish_sprites.inc diff --git a/games/sb/fish/graphics/fish_sprites.inc b/games/sb/fish/graphics/fish_sprites.inc new file mode 100644 index 00000000..7f74925e --- /dev/null +++ b/games/sb/fish/graphics/fish_sprites.inc @@ -0,0 +1,220 @@ +; 0 0 20 7 +grey_fish_sprite: + .byte $03,$07 + .byte $D5,$2A,$D5 + .byte $51,$2A,$55 + .byte $51,$2A,$55 + .byte $55,$2F,$55 + .byte $5F,$2B,$55 + .byte $55,$2A,$55 + .byte $55,$2A,$55 +; 0 9 20 16 +green_fish_sprite: + .byte $03,$07 + .byte $D5,$54,$5A + .byte $1A,$55,$62 + .byte $2A,$55,$62 + .byte $29,$7D,$6A + .byte $29,$75,$7E + .byte $2A,$55,$6A + .byte $5A,$54,$5A +; 0 18 27 25 +red_fish_sprite: + .byte $04,$07 + .byte $D6,$D4,$AA,$AD + .byte $9A,$D5,$AA,$B1 + .byte $AA,$D5,$AE,$B1 + .byte $A9,$D5,$AF,$D5 + .byte $A9,$D5,$AE,$F5 + .byte $9A,$D5,$AA,$D5 + .byte $D6,$D4,$AA,$AD +; 42 0 62 7 +grey_fish_mask: + .byte $03,$07 + .byte $70,$7F,$00 + .byte $7C,$7F,$33 + .byte $7F,$7F,$3F + .byte $7F,$7F,$0F + .byte $7F,$7F,$0F + .byte $7F,$7F,$3F + .byte $7C,$7F,$33 +; 42 9 62 16 +green_fish_mask: + .byte $03,$07 + .byte $00,$7E,$0F + .byte $4F,$7F,$3F + .byte $7F,$7F,$3F + .byte $7C,$7F,$3F + .byte $7C,$7F,$3F + .byte $7F,$7F,$3F + .byte $0F,$7E,$0F +; 42 18 69 25 +red_fish_mask: + .byte $04,$07 + .byte $03,$7E,$7F,$07 + .byte $4F,$7F,$7F,$1F + .byte $7F,$7F,$7F,$1F + .byte $7C,$7F,$7F,$7F + .byte $7C,$7F,$7F,$7F + .byte $4F,$7F,$7F,$7F + .byte $03,$7E,$7F,$07 +; 0 29 20 36 +left_fish_sprite: + .byte $03,$07 + .byte $CA,$88,$AA + .byte $92,$A2,$88 + .byte $C4,$88,$91 + .byte $91,$A2,$A4 + .byte $C4,$88,$A1 + .byte $91,$A2,$84 + .byte $C6,$88,$99 +; 0 38 20 45 +right_fish_sprite: + .byte $03,$07 + .byte $AA,$89,$A1 + .byte $A1,$A2,$84 + .byte $C4,$88,$91 + .byte $92,$A2,$84 + .byte $C6,$88,$91 + .byte $91,$A2,$84 + .byte $A4,$89,$A1 +; 0 47 27 54 +big_fish_sprite: + .byte $04,$07 + .byte $A9,$A3,$C4,$D0 + .byte $E4,$88,$91,$C2 + .byte $91,$A2,$C4,$C8 + .byte $C6,$88,$91,$A2 + .byte $92,$A2,$C4,$88 + .byte $E4,$88,$91,$A2 + .byte $A9,$A3,$C4,$D0 +; 42 29 62 36 +left_fish_mask: + .byte $03,$07 + .byte $30,$66,$00 + .byte $4C,$19,$33 + .byte $33,$66,$0C + .byte $4C,$19,$03 + .byte $33,$66,$0C + .byte $4C,$19,$33 + .byte $30,$66,$00 +; 42 38 62 45 +right_fish_mask: + .byte $03,$07 + .byte $00,$66,$0C + .byte $4C,$19,$33 + .byte $33,$66,$0C + .byte $4C,$19,$33 + .byte $30,$66,$0C + .byte $4C,$19,$33 + .byte $03,$66,$0C +; 42 47 69 54 +big_fish_mask: + .byte $04,$07 + .byte $00,$18,$33,$06 + .byte $03,$66,$4C,$19 + .byte $4C,$19,$33,$06 + .byte $30,$66,$4C,$19 + .byte $4C,$19,$33,$66 + .byte $03,$66,$4C,$19 + .byte $00,$18,$33,$06 +; 0 72 6 79 +zero_sprite: + .byte $01,$07 + .byte $1C + .byte $36 + .byte $36 + .byte $36 + .byte $36 + .byte $36 + .byte $1C +; 14 72 20 79 +one_sprite: + .byte $01,$07 + .byte $18 + .byte $1C + .byte $18 + .byte $18 + .byte $18 + .byte $18 + .byte $18 +; 28 72 34 79 +two_sprite: + .byte $01,$07 + .byte $1E + .byte $30 + .byte $30 + .byte $1C + .byte $06 + .byte $06 + .byte $3E +; 42 72 48 79 +three_sprite: + .byte $01,$07 + .byte $1E + .byte $30 + .byte $30 + .byte $1C + .byte $30 + .byte $30 + .byte $1E +; 56 72 62 79 +four_sprite: + .byte $01,$07 + .byte $30 + .byte $38 + .byte $3C + .byte $3E + .byte $30 + .byte $30 + .byte $30 +; 0 80 6 87 +five_sprite: + .byte $01,$07 + .byte $3E + .byte $06 + .byte $1E + .byte $30 + .byte $30 + .byte $30 + .byte $1E +; 14 80 20 87 +six_sprite: + .byte $01,$07 + .byte $3C + .byte $06 + .byte $1E + .byte $36 + .byte $36 + .byte $36 + .byte $1C +; 28 80 34 87 +seven_sprite: + .byte $01,$07 + .byte $3E + .byte $30 + .byte $18 + .byte $18 + .byte $0C + .byte $0C + .byte $0C +; 42 80 48 87 +eight_sprite: + .byte $01,$07 + .byte $1C + .byte $36 + .byte $36 + .byte $1C + .byte $36 + .byte $36 + .byte $1C +; 56 80 62 87 +nine_sprite: + .byte $01,$07 + .byte $3C + .byte $36 + .byte $36 + .byte $36 + .byte $3C + .byte $30 + .byte $1E