From dca40eeceafc06ebe27ff783fb5e28c1a928d5df Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 1 Jun 2023 16:50:41 -0400 Subject: [PATCH] sb: rename the fn files --- games/sb/Makefile | 32 +++++++++--------- games/sb/duet.s | 20 +++++------ games/sb/{fn.s => rat.s} | 26 +++++++++----- .../sb/{fn_graphics => rat_graphics}/Makefile | 0 .../a2_break.png | Bin .../a2_fortnight.png | Bin .../a2_fortnight_100.png | Bin .../a2_fortnight_99.png | Bin .../a2_fortnight_rat1.png | Bin .../a2_fortnight_rat2.png | Bin .../a2_fortnight_sprites.png | Bin games/sb/{fn_sound => rat_sound}/Makefile | 0 .../sb/{fn_sound => rat_sound}/fortnight.txt | 0 games/sb/zp.inc | 16 ++++++++- 14 files changed, 58 insertions(+), 36 deletions(-) rename games/sb/{fn.s => rat.s} (92%) rename games/sb/{fn_graphics => rat_graphics}/Makefile (100%) rename games/sb/{fn_graphics => rat_graphics}/a2_break.png (100%) rename games/sb/{fn_graphics => rat_graphics}/a2_fortnight.png (100%) rename games/sb/{fn_graphics => rat_graphics}/a2_fortnight_100.png (100%) rename games/sb/{fn_graphics => rat_graphics}/a2_fortnight_99.png (100%) rename games/sb/{fn_graphics => rat_graphics}/a2_fortnight_rat1.png (100%) rename games/sb/{fn_graphics => rat_graphics}/a2_fortnight_rat2.png (100%) rename games/sb/{fn_graphics => rat_graphics}/a2_fortnight_sprites.png (100%) rename games/sb/{fn_sound => rat_sound}/Makefile (100%) rename games/sb/{fn_sound => rat_sound}/fortnight.txt (100%) diff --git a/games/sb/Makefile b/games/sb/Makefile index fbbd3d15..078b7c04 100644 --- a/games/sb/Makefile +++ b/games/sb/Makefile @@ -12,7 +12,7 @@ all: sb.dsk #### -sb.dsk: QBOOT QLOAD TITLE DUCK_POND SB FN +sb.dsk: QBOOT QLOAD TITLE DUCK_POND SB RAT cp $(EMPTY_DISK) sb.dsk $(DOS33_RAW) sb.dsk 0 0 QBOOT 0 1 $(DOS33_RAW) sb.dsk 0 2 QBOOT 1 1 @@ -21,10 +21,10 @@ sb.dsk: QBOOT QLOAD TITLE DUCK_POND SB FN $(DOS33_RAW) sb.dsk 2 0 TITLE 0 0 $(DOS33_RAW) sb.dsk 5 0 DUCK_POND 0 0 $(DOS33_RAW) sb.dsk 8 0 SB 0 0 - $(DOS33_RAW) sb.dsk 11 0 FN 0 0 + $(DOS33_RAW) sb.dsk 11 0 RAT 0 0 # $(DOS33) -y sb.dsk BSAVE -a 0x1000 DUCK_POND # $(DOS33) -y sb.dsk BSAVE -a 0x0c00 SB -# $(DOS33) -y sb.dsk BSAVE -a 0x6000 FN +# $(DOS33) -y sb.dsk BSAVE -a 0x6000 RAT #### @@ -55,20 +55,20 @@ sb.o: sb.s zx02_optim.s \ #### -FN: fn.o - ld65 -o FN fn.o -C $(LINKER_SCRIPTS)/apple2_6000.inc +RAT: rat.o + ld65 -o RAT rat.o -C $(LINKER_SCRIPTS)/apple2_6000.inc -fn.o: fn.s zx02_optim.s duet.s hgr_sprite_mask.s hgr_sprite.s hgr_tables.s \ +rat.o: rat.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/a2_break.hgr.zx02 \ - fn_graphics/disk_sprites.inc - ca65 -o fn.o fn.s -l fn.lst + rat_sound/fortnight.ed \ + rat_graphics/a2_fortnight.hgr.zx02 \ + rat_graphics/a2_fortnight_99.hgr.zx02 \ + rat_graphics/a2_fortnight_100.hgr.zx02 \ + rat_graphics/a2_fortnight_rat1.hgr.zx02 \ + rat_graphics/a2_fortnight_rat2.hgr.zx02 \ + rat_graphics/a2_break.hgr.zx02 \ + rat_graphics/disk_sprites.inc + ca65 -o rat.o rat.s -l rat.lst #### @@ -108,4 +108,4 @@ HELLO: hello.bas #### clean: - rm -f *.lst *.o TITLE SB FN DUCK_POND *~ + rm -f *.lst *.o TITLE SB RAT DUCK_POND *~ diff --git a/games/sb/duet.s b/games/sb/duet.s index 982c63c6..82e1f23d 100644 --- a/games/sb/duet.s +++ b/games/sb/duet.s @@ -26,16 +26,16 @@ ; These are all "Free" zero page locations -FREQ1 = $06 -FREQ2 = $07 -DURATION = $08 -INSTRUMENT1 = $09 -INSTRUMENT2 = $1D -MADDRL = $1E -MADDRH = $1F -LOC4E = $4E -COUNT256 = $4F -WHICH_PAGE = $50 +;FREQ1 = $06 +;FREQ2 = $07 +;DURATION = $08 +;INSTRUMENT1 = $09 +;INSTRUMENT2 = $1D +;MADDRL = $1E +;MADDRH = $1F +;LOC4E = $4E +;COUNT256 = $4F +;WHICH_PAGE = $50 play_ed: LDA #$01 ; 900: A9 01 ; 2 *!* diff --git a/games/sb/fn.s b/games/sb/rat.s similarity index 92% rename from games/sb/fn.s rename to games/sb/rat.s index b92a6ea9..4912dc4a 100644 --- a/games/sb/fn.s +++ b/games/sb/rat.s @@ -1,3 +1,5 @@ +; Breakdancing RAT +; ; Animation from SBEMAIL #152 ; ; Yet Another HR project @@ -316,7 +318,13 @@ rat_loop: jsr wait_until_keypress - jmp fortnight_start + + lda #0 + sta WHICH_LOAD + + rts + +; jmp fortnight_start wait_until_keypress: @@ -351,24 +359,24 @@ long_wait_loop: .include "duet.s" music: - .incbin "fn_sound/fortnight.ed" + .incbin "rat_sound/fortnight.ed" fn_image: - .incbin "fn_graphics/a2_fortnight.hgr.zx02" + .incbin "rat_graphics/a2_fortnight.hgr.zx02" fn_99_image: - .incbin "fn_graphics/a2_fortnight_99.hgr.zx02" + .incbin "rat_graphics/a2_fortnight_99.hgr.zx02" fn_100_image: - .incbin "fn_graphics/a2_fortnight_100.hgr.zx02" + .incbin "rat_graphics/a2_fortnight_100.hgr.zx02" rat1_image: - .incbin "fn_graphics/a2_fortnight_rat1.hgr.zx02" + .incbin "rat_graphics/a2_fortnight_rat1.hgr.zx02" rat2_image: - .incbin "fn_graphics/a2_fortnight_rat2.hgr.zx02" + .incbin "rat_graphics/a2_fortnight_rat2.hgr.zx02" break_image: - .incbin "fn_graphics/a2_break.hgr.zx02" + .incbin "rat_graphics/a2_break.hgr.zx02" - .include "fn_graphics/disk_sprites.inc" + .include "rat_graphics/disk_sprites.inc" floppy_x: .byte 10,12,14,16 diff --git a/games/sb/fn_graphics/Makefile b/games/sb/rat_graphics/Makefile similarity index 100% rename from games/sb/fn_graphics/Makefile rename to games/sb/rat_graphics/Makefile diff --git a/games/sb/fn_graphics/a2_break.png b/games/sb/rat_graphics/a2_break.png similarity index 100% rename from games/sb/fn_graphics/a2_break.png rename to games/sb/rat_graphics/a2_break.png diff --git a/games/sb/fn_graphics/a2_fortnight.png b/games/sb/rat_graphics/a2_fortnight.png similarity index 100% rename from games/sb/fn_graphics/a2_fortnight.png rename to games/sb/rat_graphics/a2_fortnight.png diff --git a/games/sb/fn_graphics/a2_fortnight_100.png b/games/sb/rat_graphics/a2_fortnight_100.png similarity index 100% rename from games/sb/fn_graphics/a2_fortnight_100.png rename to games/sb/rat_graphics/a2_fortnight_100.png diff --git a/games/sb/fn_graphics/a2_fortnight_99.png b/games/sb/rat_graphics/a2_fortnight_99.png similarity index 100% rename from games/sb/fn_graphics/a2_fortnight_99.png rename to games/sb/rat_graphics/a2_fortnight_99.png diff --git a/games/sb/fn_graphics/a2_fortnight_rat1.png b/games/sb/rat_graphics/a2_fortnight_rat1.png similarity index 100% rename from games/sb/fn_graphics/a2_fortnight_rat1.png rename to games/sb/rat_graphics/a2_fortnight_rat1.png diff --git a/games/sb/fn_graphics/a2_fortnight_rat2.png b/games/sb/rat_graphics/a2_fortnight_rat2.png similarity index 100% rename from games/sb/fn_graphics/a2_fortnight_rat2.png rename to games/sb/rat_graphics/a2_fortnight_rat2.png diff --git a/games/sb/fn_graphics/a2_fortnight_sprites.png b/games/sb/rat_graphics/a2_fortnight_sprites.png similarity index 100% rename from games/sb/fn_graphics/a2_fortnight_sprites.png rename to games/sb/rat_graphics/a2_fortnight_sprites.png diff --git a/games/sb/fn_sound/Makefile b/games/sb/rat_sound/Makefile similarity index 100% rename from games/sb/fn_sound/Makefile rename to games/sb/rat_sound/Makefile diff --git a/games/sb/fn_sound/fortnight.txt b/games/sb/rat_sound/fortnight.txt similarity index 100% rename from games/sb/fn_sound/fortnight.txt rename to games/sb/rat_sound/fortnight.txt diff --git a/games/sb/zp.inc b/games/sb/zp.inc index f3262b63..b0783122 100644 --- a/games/sb/zp.inc +++ b/games/sb/zp.inc @@ -28,7 +28,21 @@ H2 = $2C V2 = $2D MASK = $2E COLOR = $30 - ;INVFLG = $32 + + +; Electric Duet ZP usage +FREQ1 = $06 +FREQ2 = $07 +DURATION = $08 +INSTRUMENT1 = $09 +INSTRUMENT2 = $1D +MADDRL = $1E +MADDRH = $1F +LOC4E = $4E +COUNT256 = $4F +WHICH_PAGE = $50 + + ; dos33 zero page = 26-2f, 35-38, 3e 3f 40-4d ; overlap applesoft 67-6a,6f,70,af,b0,ca-cd,d8