Remove definitions of shg_cur_part_size_{high,low}, there's other mucking about with those.

This commit is contained in:
Eric Smith 2021-04-09 13:31:52 -06:00
parent d3e64080a7
commit 1e88b54926

View File

@ -192,12 +192,15 @@ hw_reg_offset equ $88
; use. ; use.
; BEWARE: Even scratch use is questionable if interrupts are in use, ; BEWARE: Even scratch use is questionable if interrupts are in use,
; because an interrupt hander might use these. ; because an interrupt hander might use these.
shg_cur_part_size_high equ $0478 shg_0478 equ $0478
shg_cur_part_size_low equ $04f8 shg_04f8 equ $04f8
shg_0578 equ $0578 shg_0578 equ $0578
shg_05f8 equ $05f8 shg_05f8 equ $05f8
mslot1088 equ $0778 ; stores (slot*$10)+hw_reg_offset mslot1088 equ $0778 ; stores (slot*$10)+hw_reg_offset
; mslot appears to be the only global screen hole for which Apple ; mslot appears to be the only global screen hole for which Apple
; has defined a function. ; has defined a function.
mslot equ $07f8 ; stores $Cn, where n is the slot number mslot equ $07f8 ; stores $Cn, where n is the slot number
@ -508,7 +511,7 @@ Lc818: lda (Z45),y
inc D010c,x inc D010c,x
Lc825: dey Lc825: dey
bne Lc818 bne Lc818
sty shg_cur_part_size_low sty shg_04f8
sty shg_0578 sty shg_0578
sty shg_05f8 sty shg_05f8
tax tax
@ -546,7 +549,7 @@ ret_err_bad_cmd:
skip2 skip2
ret_err_bad_pcnt: ret_err_bad_pcnt:
lda #err_bad_pcnt lda #err_bad_pcnt
LC863: sta shg_cur_part_size_low LC863: sta shg_04f8
Lc866: ldx #$00 Lc866: ldx #$00
Lc868: pla Lc868: pla
sta Z42,x sta Z42,x
@ -555,7 +558,7 @@ Lc868: pla
bcc Lc868 bcc Lc868
ldy shg_05f8 ldy shg_05f8
ldx shg_0578 ldx shg_0578
lda shg_cur_part_size_low lda shg_04f8
bne Lc87c bne Lc87c
clc clc
Lc87c: rts Lc87c: rts
@ -1041,8 +1044,8 @@ Lcc0c: tya
prodos_status: prodos_status:
ldy mslot ldy mslot
jsr copy_s2g_part_size jsr copy_s2g_part_size
ldy shg_cur_part_size_high ldy shg_0478
ldx shg_cur_part_size_low ldx shg_04f8
prodos_format prodos_format
: lda #$00 : lda #$00
clc clc
@ -1213,6 +1216,7 @@ valid_dos_part_size_low:
Dcd35: fcb $23,$32 Dcd35: fcb $23,$32
Dcd37: fcb $10,$20 Dcd37: fcb $10,$20
Dcd39: fcb $02,$06 Dcd39: fcb $02,$06
Dcd3b: fcb $30,$40 Dcd3b: fcb $30,$40
@ -1227,7 +1231,7 @@ Scd3d:
jsr copy_s2g_part_size jsr copy_s2g_part_size
cmp #$10 cmp #$10
bcs Lcd4c bcs Lcd4c
lda shg_cur_part_size_high lda shg_0478
beq Lcd55 beq Lcd55
Lcd4c: lda shs_os_check,y Lcd4c: lda shs_os_check,y
@ -1254,11 +1258,11 @@ Lcd63: lda #os_dos ; set OS to DOS (but don't yet set OS check)
pha pha
lda shs_part_base_high,y lda shs_part_base_high,y
pha pha
stx shg_cur_part_size_low stx shg_04f8
jsr Scd16 jsr Scd16
ldy Dcfe2,x ldy Dcfe2,x
jsr Scdfb jsr Scdfb
ldx shg_cur_part_size_low ldx shg_04f8
ldy mslot ldy mslot
pla pla
sta shs_part_base_high,y sta shs_part_base_high,y
@ -1335,9 +1339,9 @@ Sce06: lda #$00
Lce0c: tya Lce0c: tya
pha pha
lda shg_cur_part_size_low lda shg_04f8
cmp #$01 cmp #$01
lda shg_cur_part_size_high lda shg_0478
sbc #$00 sbc #$00
lsr lsr
lsr lsr
@ -1439,9 +1443,9 @@ Lceaf: pha
bne Lceaf bne Lceaf
rts rts
Lcec5: lda shg_cur_part_size_low Lcec5: lda shg_04f8
sta hw_reg_data-hw_reg_offset,x sta hw_reg_data-hw_reg_offset,x
lda shg_cur_part_size_high lda shg_0478
Lcece: sta hw_reg_data-hw_reg_offset,x Lcece: sta hw_reg_data-hw_reg_offset,x
rts rts
@ -1465,7 +1469,7 @@ Lced9: lda #$00
Lcef4: tya Lcef4: tya
pha pha
ldy shg_cur_part_size_high ldy shg_0478
beq Lcf08 beq Lcf08
nop nop
Lcefc: tya Lcefc: tya
@ -1476,7 +1480,7 @@ Lcefc: tya
tay tay
dey dey
bne Lcefc bne Lcefc
Lcf08: lda shg_cur_part_size_low Lcf08: lda shg_04f8
pha pha
lsr lsr
lsr lsr
@ -1536,10 +1540,10 @@ Dcfe2: fcb $30,$5c
copy_s2g_part_size: copy_s2g_part_size:
lda shs_cur_part_size_high,y lda shs_cur_part_size_high,y
lsr lsr
sta shg_cur_part_size_high sta shg_0478
lda shs_cur_part_size_low,y lda shs_cur_part_size_low,y
ror ror
sta shg_cur_part_size_low ; leaves part_size_low in A sta shg_04f8 ; leaves part_size_low in A
rts rts
fillto $d000,$ff fillto $d000,$ff