Revert "cut some more"

This reverts commit ab3311fd26aba4253894b5a25668ba52475d4621.
This commit is contained in:
Vince Weaver 2019-05-30 10:53:48 -04:00
parent 2694e6efca
commit 79b9b17bac
3 changed files with 78 additions and 52 deletions

View File

@ -41,10 +41,9 @@ skip_inc_hi:
bne clear_fire_loop
lda #7
;fall through
;jsr fire_setline
jsr fire_setline
;rts
rts
@ -119,6 +118,7 @@ fire_fb_update_loop:
; get random number Q 0..3
; Q used to see if whether we grab same lower value or if decrement
lda SEEDL ; 3
and #$3 ; 2
sta FIRE_Q ; 3
@ -245,8 +245,8 @@ skip_fb2_inc1:
inx ; 2
cpx #(FIRE_YSIZE-1) ; 2
;beq fire_update_done ; 2/3
bne fire_fb_update ; 3
beq fire_update_done ; 2/3
jmp fire_fb_update ; 3
fire_update_done:

View File

@ -15,8 +15,28 @@ clear_screens:
lda #$4
sta DRAW_PAGE
jsr clear_top
jmp clear_bottom
jsr clear_bottom
rts
clear_bottoms:
;===================================
; Clear bottom of page 0
;===================================
lda #$0
sta DRAW_PAGE
jsr clear_bottom
;===================================
; Clear bottom of page 1
;===================================
lda #$4
sta DRAW_PAGE
jsr clear_bottom
rts
@ -74,22 +94,6 @@ no_draw_bottom:
clear_bottoms:
;===================================
; Clear bottom of page 0
;===================================
lda #$0
sta DRAW_PAGE
jsr clear_bottom
;===================================
; Clear bottom of page 1
;===================================
lda #$4
sta DRAW_PAGE
; fall through
;=========================================================
; clear_bottom
@ -139,7 +143,9 @@ clear_screens_notext:
lda #$4
sta DRAW_PAGE
; fall through
jsr clear_all
rts
;=========================================================

View File

@ -205,7 +205,7 @@ done_play:
lda #7
jsr fire_setline
bmi start_interrupts
jmp start_interrupts
@ -326,13 +326,12 @@ upcase:
beq no_uppercase
ldy #$1e
;;lda #>(PT3_LOC+$1E) ; point to header title
sta OUTH
upcase_loop:
lda PT3_LOC,Y
cmp #$60
bcc not_lowercase ; blt
sec
sbc #$20
sta PT3_LOC,Y
not_lowercase:
@ -343,10 +342,12 @@ not_lowercase:
no_uppercase:
; print title
lda #>(PT3_LOC+$1E) ; point to header title
sta OUTH
lda #<(PT3_LOC+$1E)
sta OUTL
lda #20 ; VTAB 20: HTAB 4
lda #20 ; VTAB 20: HTAB from file
sta CV
lda #4
sta CH
@ -355,10 +356,15 @@ no_uppercase:
; Print Author
lda #>(PT3_LOC+$42) ; point to header title
sta OUTH
lda #<(PT3_LOC+$42)
sta OUTL
inc CV ; VTAB 21: HTAB 4
lda #21 ; VTAB 21: HTAB from file
sta CV
lda #4
sta CH
jsr print_both_pages ; print, tail call
; Print clock
@ -402,7 +408,9 @@ no_uppercase:
lda #<(which_song_string)
sta OUTL
lda #0 ; HTAB 1
lda #23 ; VTAB 23: HTAB 1
sta CV
lda #0
sta CH
jsr print_both_pages ; print, tail call
@ -415,7 +423,9 @@ no_uppercase:
lda #<(mhz_string)
sta OUTL
lda #34 ; HTAB 34
lda #23 ; VTAB 23: HTAB 34
sta CV
lda #34
sta CH
jsr print_both_pages ; print, tail call
@ -425,7 +435,7 @@ no_uppercase:
beq set_1MHz
lda #'7'+$80
bne done_MHz ; branch always
jmp done_MHz
set_1MHz:
lda #'0'+$80
@ -466,6 +476,7 @@ done_MHz:
; Time is just number of frames/50Hz
lda #$0
sta current_line
sta current_subframe
sta current_pattern
@ -504,34 +515,37 @@ fc_pattern_good:
lda #0
sta current_line
sta current_subframe
beq frame_count_loop ; branch always
jmp frame_count_loop
fc_line_good:
inc current_subframe ; subframe++
lda current_subframe
eor pt3_speed ; if we hit pt3_speed, move to next
cmp pt3_speed ; if we hit pt3_speed, move to next
bne fc_do_frame
fc_next_line:
sta current_subframe ; reset subframe to 0
lda #0 ; reset subframe to 0
sta current_subframe
inc current_line ; and increment line
lda current_line
eor #64 ; always end at 64.
cmp #64 ; always end at 64.
bne fc_do_frame ; is this always needed?
fc_next_pattern:
sta current_line ; reset line to 0
lda #0 ; reset line to 0
sta current_line
inc current_pattern ; increment pattern
fc_do_frame:
inc time_frame
lda time_frame
eor #50
bne frame_count_loop
cmp #50
bne fc_bayern
lda #0
sta time_frame
; see if overflow low s
@ -550,7 +564,7 @@ fc_do_frame:
lda #'0'+$80
sta $7D0+13+9
sta $BD0+13+9
bne clear_low_s
jmp clear_low_s
inc_high_s:
inc $7D0+13+9
@ -561,7 +575,7 @@ clear_low_s:
sta $7D0+13+10
sta $BD0+13+10
bne inc_done
jmp inc_done
inc_low_s:
inc $7D0+13+10
@ -580,7 +594,9 @@ done_counting:
sta DONE_PLAYING
sta current_pattern
jmp pt3_init_song
jsr pt3_init_song
rts
@ -601,15 +617,16 @@ done_counting:
get_filename:
ldy #0
ldx WHICH_FILE
lda #<song_list ; point to filename
sta INL
lda #>song_list
sta INH
ldx WHICH_FILE
beq filename_found
get_filename_loop:
cpx #0
beq filename_found
inner_loop:
iny
@ -619,16 +636,16 @@ inner_loop:
iny
dex
bne get_filename_loop
jmp get_filename_loop
filename_found:
tya
clc
adc INL
sta INL
bcc skip_inh_inc
inc INH
skip_inh_inc:
lda INH
adc #0
sta INH
rts
@ -639,7 +656,8 @@ increment_file:
inc WHICH_FILE
lda WHICH_FILE
cmp #NUM_FILES
eor done_increment
bne done_increment
lda #0
sta WHICH_FILE
done_increment:
rts
@ -665,11 +683,13 @@ done_decrement:
; trashes X
convert_decimal:
ldx #'0'+$80
stx which_1s
stx which_10s
tax
tax ; special case zero
lda #'0'+$80
sta which_1s
sta which_10s
txa ; special case zero
beq conv_decimal_done
conv_decimal_loop:
inc which_1s