diff --git a/games/sb/fish/fish.s b/games/sb/fish/fish.s index e860a2bf..a21411b6 100644 --- a/games/sb/fish/fish.s +++ b/games/sb/fish/fish.s @@ -257,48 +257,36 @@ main_loop: ; did part of the screen lda #$a0 - sta INH + sta bg_copy_in_smc+2 clc lda DRAW_PAGE adc #$20 - sta OUTH - - lda #$0 - sta INL - sta OUTL + sta bg_copy_out_smc+2 ldy #0 bg_copy_loop: - lda (INL),Y - sta (OUTL),Y + +bg_copy_in_smc: + lda $A000,Y +bg_copy_out_smc: + sta $2000,Y dey bne bg_copy_loop - inc INH - inc OUTH - lda INH + + inc bg_copy_in_smc+2 + inc bg_copy_out_smc+2 + lda bg_copy_in_smc+2 cmp #$C0 bne bg_copy_loop - -; lda #bg_data -; sta ZX0_src+1 - -; clc -; lda DRAW_PAGE -; adc #$20 - -; jsr full_decomp - inc FRAME ;========================== ; draw boat lda FRAME - lsr + lsr ; half the frame rate of rest ; lsr and #$3 tax @@ -387,7 +375,8 @@ draw_lure_animation: sta SPRITE_X lda #42 sta SPRITE_Y - jmp draw_common_animation + + jmp update_animation draw_jig_animation: ldx ANIMATION_COUNT diff --git a/games/sb/fish/graphics/Makefile b/games/sb/fish/graphics/Makefile index d552c304..8a94cc27 100644 --- a/games/sb/fish/graphics/Makefile +++ b/games/sb/fish/graphics/Makefile @@ -53,7 +53,7 @@ boat_sprites.inc: boat_sprites.png strongbad_sprites.inc: strongbad_sprites.png $(HGR_SPRITE) -s -l sb_sprite strongbad_sprites.png 0 0 55 66 > strongbad_sprites.inc $(HGR_SPRITE) -s -l sb_fish1_sprite strongbad_sprites.png 70 0 125 66 >> strongbad_sprites.inc - $(HGR_SPRITE) -s -l sb_fish2_sprite strongbad_sprites.png 140 0 195 66 >> strongbad_sprites.inc + $(HGR_SPRITE) -s -l sb_fish2_sprite strongbad_sprites.png 140 0 195 70 >> strongbad_sprites.inc $(HGR_SPRITE) -s -l sb_boat1_sprite strongbad_sprites.png 0 112 69 192 >> strongbad_sprites.inc $(HGR_SPRITE) -s -l sb_boat2_sprite strongbad_sprites.png 84 112 153 192 >> strongbad_sprites.inc $(HGR_SPRITE) -s -l sb_boat3_sprite strongbad_sprites.png 168 112 237 192 >> strongbad_sprites.inc diff --git a/games/sb/fish/graphics/strongbad_sprites.png b/games/sb/fish/graphics/strongbad_sprites.png index c19d8ab0..f51086d4 100644 Binary files a/games/sb/fish/graphics/strongbad_sprites.png and b/games/sb/fish/graphics/strongbad_sprites.png differ