From 3da897168a19c45f7cf199827d2df66aed3dbce8 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 11 Jun 2018 00:08:39 -0400 Subject: [PATCH] tfv: move around some of the files --- tfv/Makefile | 42 +++++++------ tfv/{ => art}/Apple II Lowres.gpl | 0 tfv/{ => art}/belair.png | Bin tfv/{ => art}/collegep.png | Bin tfv/{ => art}/demo.png | Bin tfv/{ => art}/dining.png | Bin tfv/{ => art}/harfco.png | Bin tfv/{ => art}/landing.png | Bin tfv/{ => art}/map.png | Bin tfv/{ => art}/math_office.png | Bin tfv/{ => art}/metro.png | Bin tfv/{ => art}/sprites.piskel | 0 tfv/{ => art}/sprites.png | Bin tfv/{ => art}/talbot.png | Bin tfv/{ => art}/title.piskel | 0 tfv/{ => art}/title.png | Bin tfv/{ => art}/umcp.png | Bin tfv/{ => art}/video_hr.png | Bin tfv/{ => art}/worldmap.piskel | 0 tfv/{ => art}/worldmap.png | Bin tfv/{ => music}/FIGHTING.ED | 0 tfv/{ => music}/HIGHWIND.ED | Bin tfv/tfv_old.s | 98 ------------------------------ 23 files changed, 22 insertions(+), 118 deletions(-) rename tfv/{ => art}/Apple II Lowres.gpl (100%) rename tfv/{ => art}/belair.png (100%) rename tfv/{ => art}/collegep.png (100%) rename tfv/{ => art}/demo.png (100%) rename tfv/{ => art}/dining.png (100%) rename tfv/{ => art}/harfco.png (100%) rename tfv/{ => art}/landing.png (100%) rename tfv/{ => art}/map.png (100%) rename tfv/{ => art}/math_office.png (100%) rename tfv/{ => art}/metro.png (100%) rename tfv/{ => art}/sprites.piskel (100%) rename tfv/{ => art}/sprites.png (100%) rename tfv/{ => art}/talbot.png (100%) rename tfv/{ => art}/title.piskel (100%) rename tfv/{ => art}/title.png (100%) rename tfv/{ => art}/umcp.png (100%) rename tfv/{ => art}/video_hr.png (100%) rename tfv/{ => art}/worldmap.piskel (100%) rename tfv/{ => art}/worldmap.png (100%) rename tfv/{ => music}/FIGHTING.ED (100%) rename tfv/{ => music}/HIGHWIND.ED (100%) delete mode 100644 tfv/tfv_old.s diff --git a/tfv/Makefile b/tfv/Makefile index 2f7686ec..de169cb5 100644 --- a/tfv/Makefile +++ b/tfv/Makefile @@ -4,6 +4,8 @@ DOS33 = ../dos33fs-utils/dos33 PNG2GR = ../gr-utils/png2gr PNG2RLE = ../gr-utils/png2rle +ARTDIR = ./art + all: tfv.dsk $(PNG2RLE): @@ -12,32 +14,32 @@ $(PNG2RLE): $(DOS33): cd ../dos33fs-utils && make -tfv.dsk: $(DOS33) TFV HIGHWIND.ED FIGHTING.ED +tfv.dsk: $(DOS33) TFV $(DOS33) -y tfv.dsk BSAVE -a 0x1000 TFV # $(DOS33) -y tfv.dsk BSAVE -a 0x2000 HIGHWIND.ED # $(DOS33) -y tfv.dsk BSAVE -a 0x2000 FIGHTING.ED tfv_backgrounds.inc: $(PNG2RLE) \ - title.png map.png \ - landing.png harfco.png \ - belair.png \ - math_office.png video_hr.png \ - collegep.png \ - umcp.png \ - dining.png metro.png talbot.png - $(PNG2RLE) asm title.png title_rle > tfv_backgrounds.inc - $(PNG2RLE) asm map.png map_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm landing.png landing_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm harfco.png harfco_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm belair.png belair_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm math_office.png math_office_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm video_hr.png video_hr_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm collegep.png collegep_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm umcp.png umcp_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm dining.png dining_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm metro.png metro_rle >> tfv_backgrounds.inc - $(PNG2RLE) asm talbot.png talbot_rle >> tfv_backgrounds.inc + $(ARTDIR)/title.png $(ARTDIR)/map.png \ + $(ARTDIR)/landing.png $(ARTDIR)/harfco.png \ + $(ARTDIR)/belair.png \ + $(ARTDIR)/math_office.png $(ARTDIR)/video_hr.png \ + $(ARTDIR)/collegep.png \ + $(ARTDIR)/umcp.png \ + $(ARTDIR)/dining.png $(ARTDIR)/metro.png $(ARTDIR)/talbot.png + $(PNG2RLE) asm $(ARTDIR)/title.png title_rle > tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/map.png map_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/landing.png landing_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/harfco.png harfco_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/belair.png belair_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/math_office.png math_office_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/video_hr.png video_hr_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/collegep.png collegep_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/umcp.png umcp_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/dining.png dining_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/metro.png metro_rle >> tfv_backgrounds.inc + $(PNG2RLE) asm $(ARTDIR)/talbot.png talbot_rle >> tfv_backgrounds.inc ### diff --git a/tfv/Apple II Lowres.gpl b/tfv/art/Apple II Lowres.gpl similarity index 100% rename from tfv/Apple II Lowres.gpl rename to tfv/art/Apple II Lowres.gpl diff --git a/tfv/belair.png b/tfv/art/belair.png similarity index 100% rename from tfv/belair.png rename to tfv/art/belair.png diff --git a/tfv/collegep.png b/tfv/art/collegep.png similarity index 100% rename from tfv/collegep.png rename to tfv/art/collegep.png diff --git a/tfv/demo.png b/tfv/art/demo.png similarity index 100% rename from tfv/demo.png rename to tfv/art/demo.png diff --git a/tfv/dining.png b/tfv/art/dining.png similarity index 100% rename from tfv/dining.png rename to tfv/art/dining.png diff --git a/tfv/harfco.png b/tfv/art/harfco.png similarity index 100% rename from tfv/harfco.png rename to tfv/art/harfco.png diff --git a/tfv/landing.png b/tfv/art/landing.png similarity index 100% rename from tfv/landing.png rename to tfv/art/landing.png diff --git a/tfv/map.png b/tfv/art/map.png similarity index 100% rename from tfv/map.png rename to tfv/art/map.png diff --git a/tfv/math_office.png b/tfv/art/math_office.png similarity index 100% rename from tfv/math_office.png rename to tfv/art/math_office.png diff --git a/tfv/metro.png b/tfv/art/metro.png similarity index 100% rename from tfv/metro.png rename to tfv/art/metro.png diff --git a/tfv/sprites.piskel b/tfv/art/sprites.piskel similarity index 100% rename from tfv/sprites.piskel rename to tfv/art/sprites.piskel diff --git a/tfv/sprites.png b/tfv/art/sprites.png similarity index 100% rename from tfv/sprites.png rename to tfv/art/sprites.png diff --git a/tfv/talbot.png b/tfv/art/talbot.png similarity index 100% rename from tfv/talbot.png rename to tfv/art/talbot.png diff --git a/tfv/title.piskel b/tfv/art/title.piskel similarity index 100% rename from tfv/title.piskel rename to tfv/art/title.piskel diff --git a/tfv/title.png b/tfv/art/title.png similarity index 100% rename from tfv/title.png rename to tfv/art/title.png diff --git a/tfv/umcp.png b/tfv/art/umcp.png similarity index 100% rename from tfv/umcp.png rename to tfv/art/umcp.png diff --git a/tfv/video_hr.png b/tfv/art/video_hr.png similarity index 100% rename from tfv/video_hr.png rename to tfv/art/video_hr.png diff --git a/tfv/worldmap.piskel b/tfv/art/worldmap.piskel similarity index 100% rename from tfv/worldmap.piskel rename to tfv/art/worldmap.piskel diff --git a/tfv/worldmap.png b/tfv/art/worldmap.png similarity index 100% rename from tfv/worldmap.png rename to tfv/art/worldmap.png diff --git a/tfv/FIGHTING.ED b/tfv/music/FIGHTING.ED similarity index 100% rename from tfv/FIGHTING.ED rename to tfv/music/FIGHTING.ED diff --git a/tfv/HIGHWIND.ED b/tfv/music/HIGHWIND.ED similarity index 100% rename from tfv/HIGHWIND.ED rename to tfv/music/HIGHWIND.ED diff --git a/tfv/tfv_old.s b/tfv/tfv_old.s deleted file mode 100644 index d91c86c4..00000000 --- a/tfv/tfv_old.s +++ /dev/null @@ -1,98 +0,0 @@ - ;================= - ; load RLE image - ;================= - ; Output is BASH/BASL - ; Input is in GBASH/GBASL -load_rle_gr: - lda #$0 - tax - tay ; init X and Y to 0 - - sta CV ; ycoord=0 - - lda (GBASL),y ; load xsize - sta CH - iny ; (we should check if we had - ; bad luck and overflows page) - - iny ; skip ysize - -rle_loop: - lda (GBASL),y ; load run value - cmp #$ff ; if 0xff - beq rle_done ; we are done - sta RUN - iny ; point to next value - bne rle_yskip1 ; if overflow, increment address - inc GBASH -rle_yskip1: - lda (GBASL),y ; load value to write - iny - bne rle_yskip2 - inc GBASH -rle_yskip2: - sty TEMP2 ; save y for later - pha - lda #$0 - tay - pla ; convoluted way to set y to 0 - -rle_run_loop: - sta (BASL),y ; write out the value - inc BASL ; increment the pointer - bne rle_skip3 ; if wrapped - inc BASH ; then increment the high value -rle_skip3: - inx ; increment the X value - cpx CH ; compare against the image width - bcc rle_not_eol ; if less then keep going - - pha ; save out value on stack - - lda BASL ; cheat to avoid a 16-bit add - cmp #$a7 ; we are adding 0x58 to get - bcc rle_add_skip ; to the next line - inc BASH -rle_add_skip: - clc - adc #$58 ; actually do the 0x58 add - sta BASL ; and store it back - - inc CV ; add 2 to ypos - inc CV ; each "line" is two high - - lda CV ; load value - cmp #15 ; if it's greater than 14 it wraps - bcc rle_no_wrap ; Thanks Woz - - lda #$0 ; we wrapped, so set to zero - sta CV - - ; when wrapping have to sub 0x3d8 - sec ; this is a 16-bit subtract routine - lda BASL - sbc #$d8 ; LSB - sta BASL - lda BASH ; MSB - sbc #$3 ; - sta BASH - -rle_no_wrap: - lda #$0 ; set X value back to zero - tax - pla ; restore value to write from stack - -rle_not_eol: - dec RUN ; decrement run value - bne rle_run_loop ; if not zero, keep looping - - ldy TEMP2 ; restore the input pointer - sec - bcs rle_loop ; and branch always - -rle_done: - lda #$15 ; move the cursor somewhere sane - sta CV - rts - -