text_demo: move some more things around

also fix bug in text demo, whole problem of shared asm includes
This commit is contained in:
Vince Weaver 2021-01-06 11:43:43 -05:00
parent fc189ee9d7
commit a1732840d1
14 changed files with 27 additions and 30 deletions

View File

@ -1,7 +1,9 @@
all: all:
cd lzsa_test && make cd lzsa_test && make
cd plaintext_asm && make
clean: clean:
cd lzsa_test && make clean cd lzsa_test && make clean
cd plaintext_asm && make clean
rm -f *~ rm -f *~

View File

@ -1,3 +1,6 @@
lzsa_test: lzsa_test:
some tests of lzsa decompression some tests of lzsa decompression
plaintext_asm:
trying to fit more assembly in basic program

View File

@ -1,7 +1,8 @@
include ../Makefile.inc include ../../Makefile.inc
DOS33 = ../utils/dos33fs-utils/dos33 DOS33 = ../../utils/dos33fs-utils/dos33
TOKENIZE = ../utils/asoft_basic-utils/tokenize_asoft TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
LINKERSCRIPTS = ../../linker_scripts
all: plain.dsk all: plain.dsk
@ -13,7 +14,7 @@ plain.dsk: PLAIN
### ###
PLAIN: plain.o PLAIN: plain.o
ld65 -o PLAIN plain.o -C ../linker_scripts/apple2_800.inc ld65 -o PLAIN plain.o -C $(LINKERSCRIPTS)/apple2_800.inc
plain.o: plain.s plain.o: plain.s
ca65 -o plain.o plain.s -l plain.lst ca65 -o plain.o plain.s -l plain.lst

View File

@ -0,0 +1,6 @@
trying to fit more executable code in a tweet
this was an experiment in plain-text machine code
it is possible but not really practical for 280 char payloads

View File

@ -12,15 +12,12 @@ $(DOS33):
cd ../../../utils/dos33fs-utils && make cd ../../../utils/dos33fs-utils && make
mode7.dsk: $(DOS33) MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \ mode7.dsk: $(DOS33) MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \
PLOT_TEST SKY_DEMO TEXT_DEMO PLOT_TEST SKY_DEMO
$(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_ISLAND $(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_ISLAND
$(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_CHECKERBOARD $(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_CHECKERBOARD
$(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_RAINBOW $(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_RAINBOW
$(DOS33) -y mode7.dsk BSAVE -a 0x1000 PLOT_TEST $(DOS33) -y mode7.dsk BSAVE -a 0x1000 PLOT_TEST
$(DOS33) -y mode7.dsk BSAVE -a 0x1000 SKY_DEMO $(DOS33) -y mode7.dsk BSAVE -a 0x1000 SKY_DEMO
$(DOS33) -y mode7.dsk BSAVE -a 0x1000 TEXT_DEMO
### ###
@ -90,16 +87,6 @@ sky_demo.o: sky_demo.s \
gr_setpage.s gr_setpage.s
ca65 -o sky_demo.o sky_demo.s -l sky_demo.lst ca65 -o sky_demo.o sky_demo.s -l sky_demo.lst
TEXT_DEMO: text_demo.o
ld65 -o TEXT_DEMO text_demo.o -C $(LINKERSCRIPTS)/apple2_1000.inc
text_demo.o: text_demo.s \
gr_scroll.s \
pageflip.s \
gr_setpage.s \
gr_fast_clear.s
ca65 -o text_demo.o text_demo.s -l text_demo.lst
scroller: scroller.o scroller: scroller.o
$(CC) $(LFLAGS) -o scroller scroller.o $(CC) $(LFLAGS) -o scroller scroller.o
@ -115,5 +102,5 @@ background.o: background.c
clean: clean:
rm -f *~ *.o scroller background \ rm -f *~ *.o scroller background \
MODE7 MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \ MODE7 MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \
PLOT_TEST SKY_DEMO TEXT_DEMO *.lst PLOT_TEST SKY_DEMO *.lst

View File

@ -1,2 +0,0 @@
some scratch files when working on textmode issues

View File

@ -51,14 +51,13 @@ outer_loop:
credit_loop: credit_loop:
ldy #0 ldy #0
lda (OUTL),Y
clc lda (OUTL),Y ; load x offset
clc ; and add 7 to it
adc #7 adc #7
sta CH sta CH
lda #22 lda #22 ; y hardcoded at 22
sta CV sta CV
lda #$f6 ; - 10 lda #$f6 ; - 10
@ -67,18 +66,19 @@ inner_loop:
jsr htab_vtab jsr htab_vtab
ldy #1 ldy #1 ; loop through the string
print_loop: print_loop:
lda (OUTL),Y lda (OUTL),Y
beq done_print beq done_print
clc clc
adc XX adc XX ; add -10
ora #$80 ora #$80 ; convert from ASCII
sta (BASL),Y sta (BASL),Y ; write to display
iny iny ; point to next
jmp print_loop jmp print_loop
done_print: done_print: