diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index 81f40c95..4210ffd9 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -6890,7 +6890,6 @@ PS_SOUND: ; POP BC RET - ; ; PRINT DEVICE NMEMONIC, DEVTYP/NUM SPECIFIED IN DE ; @@ -6926,18 +6925,18 @@ PS_PRT1: INC C ; BUMP COUNTER JR PS_PRT1 ; AND LOOP ; -; PAD 18 CHARACTER FIELD +; PAD 18 CHARACTER FIELD ; PS_PAD18: LD A,(PRTIDXCNT) - SUB 18 ; SUBTRACT FIELD WIDTH - NEG ; MAKE IT A POSITIVE NUMBER - JR PS_PAD ; PAD AS NEEDED + LD C,A + JR PS_PRT18A ; ; PRINT STRING AT HL IN 18 CHARACTER FIELD ; PS_PRT18: CALL PS_PRT ; PRINT $ TERM STRING AT (HL), C:=CHARS PRINTED +PS_PRT18A: LD A,18 ; 18 CHAR FIELD SUB C ; CALL PS_PAD ; PAD N SPACES (SPECIFIED IN A) diff --git a/Source/HBIOS/util.asm b/Source/HBIOS/util.asm index 0c914540..328edc65 100644 --- a/Source/HBIOS/util.asm +++ b/Source/HBIOS/util.asm @@ -140,8 +140,9 @@ PRTSTRD: ; PRINT A STRING INDIRECT: REFERENCED BY INDIRECT POINTER AT TOP OF STACK ; STRING MUST BE TERMINATED BY '$' ; USAGE: -; CALL PRTSTRI(MYSTRING) ; MYSTRING .DB "HELLO$" +; CALL PRTSTRI(MYSTRING) +; .DW MYSTRING ; PRTSTRI: EX (SP),HL @@ -366,13 +367,13 @@ WRITESTR: WRITESTR1: LD A,(DE) CP '$' ; TEST FOR STRING TERMINATOR - JP Z,WRITESTR2 + JR Z,WRITESTR2 CALL COUT LD A,(PRTIDXCNT) INC A LD (PRTIDXCNT),A INC DE - JP WRITESTR1 + JR WRITESTR1 WRITESTR2: POP AF RET