Optimize gfx_PrintStringXY and gfx_SetTextConfig

Author: runer112

src/graphx/graphx.asm

@@ -2950,26 +2950,6 @@ gfx_SetFontHeight:
 ;  Previous font height
 	setSmcBytes _TextHeight
 
-;-------------------------------------------------------------------------------
-_PrintStringXY_Clip:
-; Places a string at the given coordinates
-; Arguments:
-;  arg0 : Pointer to string
-;  arg1 : Text X Pos
-;  arg2 : Text Y Pos
-; Returns:
-;  None
-	ld	iy,3
-	lea	bc,iy
-	add	iy,sp
-	lea	hl,iy+3
-	ld	de,_TextXPos
-	ldir				; copy in the y location
-	ld	hl,(hl)
-	ld	(_TextYPos),hl		; set new y pos
-	ld	hl,(iy)
-	jr	_DrawCharacters		; jump to the main string handler
-
 ;-------------------------------------------------------------------------------
 gfx_PrintStringXY:
 ; Places a string at the given coordinates
@@ -2979,21 +2959,12 @@ gfx_PrintStringXY:
 ;  arg2 : Text Y Pos
 ; Returns:
 ;  None
-	jp	_PrintStringXY
-__PrintStringXY = $-3
-_PrintStringXY:
-	ld	hl,9
-	add	hl,sp
-	ld	a,(hl)
-	ld	(_TextYPos),a
-	dec	hl
-	dec	hl
-	ld	de,_TextXPos + 1
-	ldd
-	ldd
-	dec	hl
-	dec	hl
-	ld	hl,(hl)
+	pop	iy			; iy = return vector
+	pop	bc			; bc = str
+	call	gfx_SetTextXY
+	push	bc
+	ex	(sp),hl			; hl = str
+	push	iy
 ;	jr	_DrawCharacters		; emulated by dummifying next instructions:
 	db	$01			; pop de \ ex (sp),hl \ push de -> ld bc,*
 
@@ -3064,35 +3035,18 @@ gfx_SetTextConfig:
 ;  arg0 : Configuration numbers
 ; Returns:
 ;  None
-	pop	hl
 	pop	de
+	ex	(sp),hl			; hl = config
 	push	de
-	push	hl
-	ld	a,e			; a = argument
-	dec	a			; 1 = TEXT_CLIP
-	jr	z,.setcliptext
-	dec	a			; 2 = TEXT_NOCLIP
-	ret	nz
-	ld	de,_PrintChar
-	ld	bc,_PrintStringXY
-	jr	.setunclippedtext	; set unclipped character routine
-.setcliptext:
-	ld	de,_PrintChar_Clip
-	ld	bc,_PrintStringXY_Clip
-.setunclippedtext:
-	ld	hl,PrintChar_0
-	ld	(hl),de			; holy crap what a hack
-	ld	hl,PrintChar_1
-	ld	(hl),de
-	ld	hl,PrintChar_2
-	ld	(hl),de			; modify all the interal routines to use the clipped text routine
-	push	bc
-	pop	hl
-	ld	(__PrintStringXY),hl	; change which text routines we want to use
-	xor	a,a
-	sbc	hl,hl
-	ld	(_TextYPos),hl
-	ld	(_TextXPos),hl		; reset the current posistions
+	dec	l			; l = config - 1
+	ld	hl,_PrintChar_Clip
+	jr	z,.writesmc		; z ==> config == gfx_text_clip
+; config == gfx_text_noclip
+	ld	hl,_PrintChar
+.writesmc:				; hl = PrintChar routine
+	ld	(PrintChar_0),hl
+	ld	(PrintChar_1),hl
+	ld	(PrintChar_2),hl
 	ret
 
 ;-------------------------------------------------------------------------------