diff --git a/games/sb/Makefile b/games/sb/Makefile index 75e274d7..36e5adc5 100644 --- a/games/sb/Makefile +++ b/games/sb/Makefile @@ -38,6 +38,8 @@ fn.o: fn.s zx02_optim.s duet.s hgr_sprite_mask.s hgr_sprite.s hgr_tables.s \ zp.inc hardware.inc \ fn_sound/fortnight.ed \ fn_graphics/a2_fortnight.hgr.zx02 \ + fn_graphics/a2_fortnight_99.hgr.zx02 \ + fn_graphics/a2_fortnight_100.hgr.zx02 \ fn_graphics/a2_fortnight_rat1.hgr.zx02 \ fn_graphics/a2_fortnight_rat2.hgr.zx02 \ fn_graphics/disk_sprites.inc diff --git a/games/sb/fn.s b/games/sb/fn.s index 88e7b182..ec12389a 100644 --- a/games/sb/fn.s +++ b/games/sb/fn.s @@ -197,6 +197,80 @@ time_loop: done_floppy: bit KEYRESET ; clear the keyboard buffer + + ;========================== + ; Show 99% + ;========================== + + bit PAGE2 + + lda #fn_99_image + sta ZX0_src+1 + lda #$20 + jsr full_decomp + + lda #24 + sta SPRITE_X + + lda #disk_sprite7 + sta INH + + lda #disk_mask7 + sta MASKH + + lda #$00 + sta DRAW_PAGE + + jsr hgr_draw_sprite_mask_and_save + + + bit PAGE1 + + jsr long_wait + + + ;========================== + ; Show 100% + ;========================== + + lda #fn_100_image + sta ZX0_src+1 + lda #$40 + + jsr full_decomp + + lda #26 + sta SPRITE_X + + lda #disk_sprite0 + sta INH + + lda #disk_mask0 + sta MASKH + + lda #$20 + sta DRAW_PAGE + + jsr hgr_draw_sprite_mask_and_save + + bit PAGE2 + + jsr long_wait + +; jsr wait_until_keypress + ;========================== ; "breakdancing" rat ;========================== @@ -256,6 +330,15 @@ inc_frame: no_frame_oflo: rts +long_wait: + ldx #10 +long_wait_loop: + lda #255 + jsr WAIT + dex + bne long_wait_loop + rts + .include "zx02_optim.s" .include "hgr_sprite.s" @@ -270,6 +353,12 @@ music: fn_image: .incbin "fn_graphics/a2_fortnight.hgr.zx02" +fn_99_image: + .incbin "fn_graphics/a2_fortnight_99.hgr.zx02" +fn_100_image: + .incbin "fn_graphics/a2_fortnight_100.hgr.zx02" + + rat1_image: .incbin "fn_graphics/a2_fortnight_rat1.hgr.zx02" rat2_image: diff --git a/games/sb/fn_graphics/Makefile b/games/sb/fn_graphics/Makefile index a0e058f8..42ae8ef9 100644 --- a/games/sb/fn_graphics/Makefile +++ b/games/sb/fn_graphics/Makefile @@ -11,6 +11,8 @@ PNG2SPRITES = ../../../utils/gr-utils/png2sprites HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite all: a2_fortnight.hgr.zx02 \ + a2_fortnight_99.hgr.zx02 \ + a2_fortnight_100.hgr.zx02 \ a2_fortnight_rat1.hgr.zx02 \ a2_fortnight_rat2.hgr.zx02 \ disk_sprites.inc @@ -41,11 +43,20 @@ disk_sprites.inc: a2_fortnight_sprites.png #### -a2_fortnight.hgr.zx02: a2_fortnight.hgr - $(ZX02) a2_fortnight.hgr a2_fortnight.hgr.zx02 +a2_fortnight_99.hgr.zx02: a2_fortnight_99.hgr + $(ZX02) a2_fortnight_99.hgr a2_fortnight_99.hgr.zx02 + +a2_fortnight_99.hgr: a2_fortnight_99.png + $(PNG_TO_HGR) a2_fortnight_99.png > a2_fortnight_99.hgr + +#### + +a2_fortnight_100.hgr.zx02: a2_fortnight_100.hgr + $(ZX02) a2_fortnight_100.hgr a2_fortnight_100.hgr.zx02 + +a2_fortnight_100.hgr: a2_fortnight_100.png + $(PNG_TO_HGR) a2_fortnight_100.png > a2_fortnight_100.hgr -a2_fortnight.hgr: a2_fortnight.png - $(PNG_TO_HGR) a2_fortnight.png > a2_fortnight.hgr #### diff --git a/games/sb/fn_graphics/a2_fortnight.png b/games/sb/fn_graphics/a2_fortnight.png index f7f840e9..d3228979 100644 Binary files a/games/sb/fn_graphics/a2_fortnight.png and b/games/sb/fn_graphics/a2_fortnight.png differ diff --git a/games/sb/fn_graphics/a2_fortnight_100.png b/games/sb/fn_graphics/a2_fortnight_100.png new file mode 100644 index 00000000..b1976f8a Binary files /dev/null and b/games/sb/fn_graphics/a2_fortnight_100.png differ diff --git a/games/sb/fn_graphics/a2_fortnight_99.png b/games/sb/fn_graphics/a2_fortnight_99.png new file mode 100644 index 00000000..d43f602c Binary files /dev/null and b/games/sb/fn_graphics/a2_fortnight_99.png differ