diff --git a/src/xtn/2/what.asm b/src/xtn/2/what.asm index 0f190cc..0e16537 100644 --- a/src/xtn/2/what.asm +++ b/src/xtn/2/what.asm @@ -77,7 +77,7 @@ orgadr = $9000 ; org orgadr -MyVersion = $21 +MyVersion = $22 MinVersion = $10 DvxAuxtype = $8001 @@ -183,9 +183,7 @@ pr_name_type: lda info_ftype jsr xprint_ftype jsr maybe_aux - jsr xmess - asc " " - .byte 0 + xmessage_cstr " " lda path+1 ldy path jsr xprint_path @@ -228,6 +226,7 @@ maybe_stype: tax styp1: lda stypes,x beq @done + ora #$80 jsr cout inx bne styp1 @@ -354,22 +353,16 @@ is_vstore: jmp show_vstore is_binii: - jsr xmess - asc " Binary II [v" - .byte 0 + xmessage_cstr " Binary II [v" ldy filebuff2+126 lda #0 jsr xprdec_2 - jsr xmess - asc "]; contains " - .byte 0 + xmessage_cstr "]; contains " ldy filebuff2+127 iny lda #0 jsr xprdec_2 - jsr xmess - asc " file" - .byte 0 + xmessage_cstr " file" ldy filebuff2+127 iny lda #0 @@ -382,9 +375,7 @@ mw1: lda filebuff2+128,x bne mwx dex bpl mw1 - jsr xmess - asc " [WARNING: 2nd 128 bytes are identical to 1st 128!]" - .byte cr,0 + xmessage_cstr_cr " [WARNING: 2nd 128 bytes are identical to 1st 128!]" mwx: rts check_binii: @@ -455,6 +446,7 @@ show_vstore: asc " Stored-volume image (vstore/vrestore)" .byte cr cstr " File #" + ldy filebuff2+$40 lda #0 jsr xprdec_2 @@ -494,7 +486,7 @@ notvs: sec rts HdrImg: .byte $60 - asc "VSTORE [Davex]" ; [TODO] verify high-bit status from original vstore files + asc "VSTORE [Davex]" ; Verified in Davex 1.26 that the high bits are clear here. ;********************************************* type_list: @@ -614,216 +606,100 @@ eof_val: ;********************************************* ;********************************************* guess_2a: - jsr xmess - asc " Apple II Source Code" - .byte 13,0 + xmessage_cstr_cr " Apple II Source Code" rts guess_2b: - jsr xmess - asc " Apple II Object Code" - .byte 13,0 + xmessage_cstr_cr " Apple II Object Code" rts guess_2c: - jsr xmess - asc " Apple II Interpreted Code" - .byte 13,0 + xmessage_cstr_cr " Apple II Interpreted Code" rts guess_2d: - jsr xmess - asc " Apple II Language Data" - .byte 13,0 + xmessage_cstr_cr " Apple II Language Data" rts -guess_42: jsr xmess - - - asc " File Type Names" - - .byte 13,0 +guess_42: + xmessage_cstr_cr " File Type Names" rts -guess_50: jsr xmess - - - asc " IIgs Word Processor" - - .byte 13,0 +guess_50: + xmessage_cstr_cr " IIgs Word Processor" rts -guess_51: jsr xmess - - - asc " IIgs Spreadsheet" - - .byte 13,0 +guess_51: + xmessage_cstr_cr " IIgs Spreadsheet" rts -guess_52: jsr xmess - - - asc " IIgs Data Base" - - .byte 13,0 +guess_52: + xmessage_cstr_cr " IIgs Data Base" rts -guess_53: jsr xmess - - - asc " Drawing" - - .byte 13,0 +guess_53: + xmessage_cstr_cr " Drawing" rts -guess_54: jsr xmess - - - asc " Desktop Publishing" - - .byte 13,0 +guess_54: + xmessage_cstr_cr " Desktop Publishing" rts -guess_55: jsr xmess - - - asc " Hypermedia" - - .byte 13,0 +guess_55: + xmessage_cstr_cr " Hypermedia" rts -guess_56: jsr xmess - - - asc " Educational Data" - - .byte 13,0 +guess_56: + xmessage_cstr_cr " Educational Data" rts -guess_58: jsr xmess - - - asc " Help File" - - .byte 13,0 +guess_58: + xmessage_cstr_cr " Help File" rts -guess_59: jsr xmess - - - asc " Communications File" - - .byte 13,0 +guess_59: + xmessage_cstr_cr " Communications File" rts -guess_5a: jsr xmess - - - asc " Configuration File" - - .byte 13,0 +guess_5a: + xmessage_cstr_cr " Configuration File" rts -guess_5b: jsr xmess - - - asc " Animation File" - - .byte 13,0 +guess_5b: + xmessage_cstr_cr " Animation File" rts -guess_5c: jsr xmess - - - asc " Multimedia document" - - .byte 13,0 +guess_5c: + xmessage_cstr_cr " Multimedia document" rts -guess_doc: jsr xmess - - - asc " GS/OS document" - - .byte 13,0 +guess_doc: + xmessage_cstr_cr " GS/OS document" rts -guess_c5: jsr xmess - - - asc " Object-oriented graphics" - - .byte 13,0 +guess_c5: + xmessage_cstr_cr " Object-oriented graphics" rts -guess_cdv: jsr xmess - - - asc " Control Panel document" - - .byte 13,0 +guess_cdv: + xmessage_cstr_cr " Control Panel document" rts -guess_d5: jsr xmess - - - asc " Music sequence" - - .byte 13,0 +guess_d5: + xmessage_cstr_cr " Music sequence" rts -guess_d6: jsr xmess - - - asc " Instrument" - - .byte 13,0 +guess_d6: + xmessage_cstr_cr " Instrument" rts -guess_d7: jsr xmess - - - asc " MIDI data" - - .byte 13,0 +guess_d7: + xmessage_cstr_cr " MIDI data" rts -guess_d8: jsr xmess - - - asc " Audio IFF document" - - .byte 13,0 +guess_d8: + xmessage_cstr_cr " Audio IFF document" rts -guess_db: jsr xmess - - - asc " DB Master document" - - .byte 13,0 +guess_db: + xmessage_cstr_cr " DB Master document" rts -guess_e0: jsr xmess - - - asc " Archival Library: " - - .byte 0 +guess_e0: + xmessage_cstr " Archival Library: " ;%%% jmp crout -guess_e2: jsr xmess - - - asc " AppleTalk data" - - .byte 13,0 +guess_e2: + xmessage_cstr_cr " AppleTalk data" rts -guess_f0: jsr xmess - - - asc " BASIC command" - - .byte 13,0 +guess_f0: + xmessage_cstr_cr " BASIC command" rts -guess_f9: jsr xmess - - - asc " GS/OS system file" - - .byte 13,0 +guess_f9: + xmessage_cstr_cr " GS/OS system file" rts ; -guess_bdf: jsr xmess - - - asc " IIgs BASIC data file" - - .byte cr,0 +guess_bdf: + xmessage_cstr_cr " IIgs BASIC data file" rts ; -guess_bas: jsr xmess - - - asc " Applesoft BASIC program" - - .byte cr,0 +guess_bas: + xmessage_cstr_cr " Applesoft BASIC program" lda filebuff2 ora filebuff2+1 beq wbok @@ -838,18 +714,12 @@ warnbas: tax pha txa pha - jsr xmess - - - asc " [Warning! Aux-type should be $" - - .byte 0 + xmessage_cstr " [Warning! Aux-type should be $" pla jsr prbyte pla jsr prbyte - jsr xmess - .byte $80+']',cr,0 + xmessage_cstr_cr "]" rts ; ; compute correct aux-type (=load address) for a BAS file; first @@ -881,25 +751,19 @@ scaneol: rts guess_bad: - jsr xmess - asc " bad file" - .byte cr,0 + xmessage_cstr_cr " bad file" rts guess_sys: jsr check_alias8 bcc was_alias - jsr xmess - asc " ProDOS 8 application" - .byte cr,0 + xmessage_cstr_cr " ProDOS 8 application" was_alias: jsr chk_startup cmp #0 beq gsysz pha - jsr xmess - asc " [" - .byte 0 + xmessage_cstr " [" pla tay lda #0 @@ -949,7 +813,7 @@ check_alias8: bne g8no jsr xmess asc " sysalias for " - .byte $A2 + .byte $A2 ; double quote .byte 0 lda #>(filebuff2+$E5) ldy #pntx-1 + lda #>(pntx-1) pha lda #