sa: remove some more code

This commit is contained in:
Vince Weaver 2018-05-21 23:46:47 -04:00
parent f01fcb6827
commit 4aa73fc0eb
4 changed files with 24 additions and 76 deletions

View File

@ -1,2 +1,12 @@
initial: 2078
add ascii art: 9142
Memory Map
Lowmem: 4k
Code: 16k (8k=audio, 5k=lyrics, 3k=art)
Sound buffers: 14k
Sound buffer2: 14k?

View File

@ -10,8 +10,6 @@
; It then calculates if it is a BRK or not (which trashes A)
; Then it sets up the stack like an interrupt and calls 0x3fe
TIME_OFFSET EQU 13
interrupt_handler:
pha ; save A ; 3
; Should we save X and Y too?
@ -23,7 +21,7 @@ interrupt_handler:
lda DONE_PLAYING ; 3
beq mb_play_music ; if song done, don't play music ; 3/2nt
jmp check_keyboard ; 3
jmp exit_interrupt ; 3
;============
; 13
@ -246,7 +244,7 @@ done_interrupt:
ldy #$0
cmp (LYRICSL),Y
bne check_keyboard
bne exit_interrupt
;================================
; Frame matches, print the string
@ -288,21 +286,6 @@ done_lyric:
lda #0
adc LYRICSH
sta LYRICSH
check_keyboard:
jsr get_key
lda LASTKEY
beq exit_interrupt
cmp #(' '+$80)
bne done_key
key_space:
lda #$80
eor DONE_PLAYING
jmp quiet_exit
done_key:
jmp exit_interrupt
quiet_exit:

View File

@ -225,19 +225,8 @@ check_decompress:
check_done:
lda #$ff
bit DONE_PLAYING
beq main_loop ; if was all zeros, loop
bmi main_loop ; if high bit set, paused
; bvs minus_song ; if bit 6 set, then left pressed
; else, either song finished or
; right pressed
done_play:
lda #0
sta DONE_PLAYING
lda DONE_PLAYING
beq main_loop
forever_loop:
jmp forever_loop
@ -442,7 +431,6 @@ done_ascii:
.include "../asm_routines/mockingboard_a.s"
.include "../asm_routines/gr_fast_clear.s"
.include "../asm_routines/lz4_decode.s"
.include "../asm_routines/keypress_minimal.s"
.include "interrupt_handler.s"

View File

@ -36,14 +36,7 @@ DOSBUFL EQU $62
DOSBUFH EQU $63
FILEML EQU $64
FILEMH EQU $65
;TURNING EQU $60
;SCREEN_X EQU $61 ; not used?
;SCREEN_Y EQU $62
;ANGLE EQU $63
;HORIZ_SCALE_I EQU $64
;HORIZ_SCALE_F EQU $65
;FACTOR_I EQU $66
;FACTOR_F EQU $67
;DX_I EQU $68
@ -72,57 +65,32 @@ ENVELOPE_COARSE EQU $7C
ENVELOPE_SHAPE EQU $7D
COPY_OFFSET EQU $7E
DECODER_STATE EQU $7F
;SPACEY_I EQU $70
;SPACEY_F EQU $71
;CY_I EQU $72
;CY_F EQU $73
;TEMP_I EQU $74
;TEMP_F EQU $75
;DISTANCE_I EQU $76
;DISTANCE_F EQU $77
;SPACEZ_I EQU $78
;SPACEZ_F EQU $79
;DRAW_SPLASH EQU $7A
;SPEED EQU $7B
;SPLASH_COUNT EQU $7C
;OVER_LAND EQU $7D
;NUM1L EQU $7E
;NUM1H EQU $7F
CHUNKSIZE EQU $80
LZ4_DONE EQU $81
DECODE_ERROR EQU $82
A_COLOR EQU $83
B_COLOR EQU $84
C_COLOR EQU $85
;A_COLOR EQU $83
;B_COLOR EQU $84
;C_COLOR EQU $85
COPY_TIME EQU $86
DECOMPRESS_TIME EQU $87
TIME_TAKEN EQU $88
SCREEN_Y EQU $89
WHICH_FILE EQU $8A
;NUM2L EQU $80
;NUM2H EQU $81
;RESULT EQU $82 ; 83,84,85
;NEGATE EQU $86 ; UNUSED?
;LAST_SPACEX_I EQU $87
;LAST_SPACEY_I EQU $88
;LAST_MAP_COLOR EQU $89
;DRAW_SKY EQU $8A
COLOR_MASK EQU $8B
RASTERBARS_ON EQU $8C
;SCREEN_Y EQU $89
;WHICH_FILE EQU $8A
;COLOR_MASK EQU $8B
;RASTERBARS_ON EQU $8C
LYRICSL EQU $8D
LYRICSH EQU $8E
;KEY_COUNT EQU $8C
;KEY_OFFSET EQU $8D
;DRAW_BLUE_SKY EQU $8E
RANDOM_POINTER EQU $8F
;RANDOM_POINTER EQU $8F
FRAME_COUNT EQU $90
MB_VALUE EQU $91
;MB_CHUNK EQU $92
MB_ADDRL EQU $91
MB_ADDRH EQU $92
DONE_PLAYING EQU $93
;MB_FRAME_DIFF EQU $94
MB_CHUNK_OFFSET EQU $94
;LZSS_RL EQU $95
;LZSS_RH EQU $96
@ -158,7 +126,6 @@ LASTKEY EQU $F1
XPOS EQU $F3
YPOS EQU $F4
TEMP EQU $FA
;RUN EQU $FA
;TEMP2 EQU $FB
TEMPY EQU $FB
INL EQU $FC