made small optimizations to multiple routines

Author: ZERICO2005

src/graphx/graphx.asm

@@ -907,7 +907,7 @@ gfx_Rectangle_NoClip:
 						 ; de = ti.lcdWidth
 	sbc	hl,de			; hl = &buf[y+height-1][x]
 	pop	bc			; bc = width
-	jp	_HorizLine_NoClip_Draw	; draw bottom horizontal line
+	jr	_HorizLine_NoClip_Draw	; draw bottom horizontal line
 
 ;-------------------------------------------------------------------------------
 gfx_HorizLine:
@@ -1233,7 +1233,7 @@ gfx_FillEllipse:
 	ld	hl,_ellipse_ret
 	ld	(_ellipse_loop_draw_1),hl
 	jr	_Ellipse
-	
+
 ;-------------------------------------------------------------------------------
 gfx_Ellipse_NoClip:
 	ld	hl,_SetPixel_NoClip_NoWait
@@ -1281,7 +1281,7 @@ _Ellipse:
 	add	ix,sp
 	lea	hl,ix - 42
 	ld	sp,hl
-	
+
 ; First, setup all the variables
 	ld	a,(ix + 12)
 	or	a,a
@@ -1366,7 +1366,7 @@ _Ellipse:
 	ld	de,(ix - el_y)
 	call	_MultiplyHLDE
 	ld	(ix - el_comp_b),hl
-	
+
 	wait_quick
 
 .main_loop1:
@@ -2512,9 +2512,7 @@ gfx_GetClipRegion:
 	ld	hl,3
 	add	hl,sp
 	ld	iy,(hl)
-	dec	iy
-	dec	iy
-	dec	iy
+	lea	iy, iy - 3
 	call	_ClipRegion		; get the clipping region
 	sbc	a,a			; return false if offscreen (0)
 	inc	a
@@ -2899,15 +2897,15 @@ gfx_GetSprite:
 	sbc	a,a
 	inc	a
 	ld	b,a			; the amount to add to get to the next line
-	ld	(.offset),bc
+	push	bc
+	pop	iy
 	ld	a,(de)
 	inc	de
 .loop:
 	ld	bc,0
 .amount := $-3
 	ldir				; copy the data into the struct data
-	ld	bc,0
-.offset := $-3
+	lea	bc,iy			; (.offset)
 	add	hl,bc
 	dec	a
 	jr	nz,.loop
@@ -3220,20 +3218,7 @@ _Tilemap:
 	ld	(ix-3),h
 	sbc	hl,bc
 	ld	(ix-12),hl
-	jp	.yloop
-
-.xres := $+3
-.loop:
-	ld	(ix-1),0
-	ld	hl,0
-.xoffset := $-3
-	ld	(ix-7),hl
-	ld	l,(iy+t_width)
-	ld	h,(ix-4)
-	mlt	hl
-	ld	(.ynext),hl
-	xor	a,a
-	jr	.xloop
+	jr	.yloop
 
 .xloopinner:
 	or	a,a
@@ -3289,7 +3274,20 @@ _Tilemap:
 .yloop:
 	ld	a,(iy+t_draw_height)
 	cp	a,(ix-3)
-	jp	nz,.loop
+	jr	z,.finish_loop
+.xres := $+3
+; .loop:
+	ld	(ix-1),0
+	ld	hl,0
+.xoffset := $-3
+	ld	(ix-7),hl
+	ld	l,(iy+t_width)
+	ld	h,(ix-4)
+	mlt	hl
+	ld	(.ynext),hl
+	xor	a,a
+	jr	.xloop
+.finish_loop:
 	ld	sp,ix
 	pop	ix
 	ret
@@ -3856,8 +3854,7 @@ gfx_GetStringWidth:
 ; Returns:
 ;  Width of string in pixels
 	pop	de
-	pop	hl
-	push	hl			; hl -> string
+	ex	(sp), hl		; hl -> string
 	push	de
 	ld	de,0
 .loop:
@@ -3881,10 +3878,11 @@ gfx_GetCharWidth:
 ;  arg0 : Character
 ; Returns:
 ;  Width of character in pixels
-	ld	iy,0
-	lea	de,iy
-	add	iy,sp
-	ld	a,(iy+3)		; a = character
+	ld	hl, 3
+	add	hl, sp
+	ld	a, (hl)			; a = character
+	sbc	hl, hl
+	ex	de, hl
 _GetCharWidth:
 	sbc	hl,hl
 	ld	l,a
@@ -3997,8 +3995,7 @@ gfx_SetFontData:
 ; Returns:
 ;  Pointer to previous font data
 	pop	de
-	pop	hl
-	push	hl			; hl -> custom font data
+	ex	(sp), hl		; hl -> custom font data
 	push	de
 	add	hl,de
 	or	a,a
@@ -4049,8 +4046,7 @@ gfx_SetFontSpacing:
 ; Returns:
 ;  None
 	pop	de
-	pop	hl
-	push	hl			; hl -> custom font width
+	ex	(sp), hl		; hl -> custom font width
 	push	de
 	add	hl,de
 	or	a,a
@@ -4071,10 +4067,9 @@ gfx_SetMonospaceFont:
 	pop	hl
 	pop	de
 	push	de
-	push	hl
 	ld	a,e			; a = width
 	ld	(_TextFixedWidth),a	; store the value of the monospace width
-	ret
+	jp	(hl)
 
 ;-------------------------------------------------------------------------------
 gfx_FillTriangle_NoClip:
@@ -4146,7 +4141,7 @@ _FillTriangle:
 	ld	hl,(ix+9)
 	or	a,a
 	sbc	hl,de
-	jp	nz,.notflat
+	jr	nz,.notflat
 	ld	bc,(ix+6)		; x0
 	ld	(ix-6),bc		; a = x0
 	ld	(ix-3),bc		; b = x0;
@@ -4197,29 +4192,6 @@ _FillTriangle:
 	jp	p,.cmp30
 	jp	pe,.cmp31
 	jr	.cmp32
-.cmp30:
-	jp	po,.cmp31
-.cmp32:
-	ld	bc,(ix+18)
-	ld	(ix-6),bc
-.cmp31:
-	ld	de,(ix-3)
-	ld	hl,(ix-6)
-	or	a,a
-	sbc	hl,de
-	inc	hl
-	push	hl
-	ld	bc,(ix+9)
-	push	bc
-	push	de
-	call	0			; horizline(a, y0, b-a+1);
-.line0 := $-3
-	pop	bc
-	pop	bc
-	pop	bc
-	ld	sp,ix
-	pop	ix
-	ret				; return;
 .notflat:
 	ld	bc,(ix+6)		; x0
 	ld	hl,(ix+12)
@@ -4252,14 +4224,34 @@ _FillTriangle:
 	jr	nz,.elselast		; if (y1 == y2) { last = y1; }
 	ld	(ix-24),bc
 	jr	.sublast
+.cmp30:
+	jp	po,.cmp31
+.cmp32:
+	ld	bc,(ix+18)
+	ld	(ix-6),bc
+.cmp31:
+	ld	de,(ix-3)
+	ld	hl,(ix-6)
+	or	a,a
+	sbc	hl,de
+	inc	hl
+	push	hl
+	ld	bc,(ix+9)
+	push	bc
+	push	de
+	call	0			; horizline(a, y0, b-a+1);
+.line0 := $-3
+	ld	sp,ix
+	pop	ix
+	ret				; return;
 .elselast:
 	ld	bc,(ix+15)		; else { last = y1-1; }
 	dec	bc
 	ld	(ix-24),bc
 .sublast:
 	ld	bc,(ix+9)
 	ld	(ix-12),bc		; for (y = y0; y <= last; y++)
-	jp	.firstloopstart
+	jr	.firstloopstart
 .firstloop:
 	ld	hl,(ix-15)
 	ld	bc,(ix-33)
@@ -4336,7 +4328,7 @@ _FillTriangle:
 	ld	de,(ix-21)
 	call	_MultiplyHLDE		; sb = dx02 * (y - y0);
 	ld	(ix-18),hl
-	jp	.secondloopstart	; for(; y <= y2; y++)
+	jr	.secondloopstart	; for(; y <= y2; y++)
 .secondloop:
 	ld	hl,(ix-15)
 	ld	bc,(ix-39)
@@ -4837,8 +4829,7 @@ gfx_ScaleSprite:
 	pop	de			; de->tgt_data
 	ld	iy,0
 	ld	iyl,a
-	ld	a,c			; du = bc:iyl
-	ld	(du),a			; ixl = target_height
+	ld	ixh,c			; (.du) = bc:iyl, ixl = target_height
 
 ; b = out_loop_times
 ; de = target buffer adress
@@ -4848,9 +4839,9 @@ ScaleWidth := $+2
 	ld	iyh, 0
 	xor	a,a
 	ld	b,a
-	ld	c,0
-du := $-1
-.loop:	ldi
+	ld	c,ixh	; (.du)
+.loop:
+	ldi
 	add	a,iyl
 	adc	hl,bc			; xu += du
 	inc	bc			; bc:iyl is du
@@ -6410,6 +6401,7 @@ _Maximum:
 ; Oututs:
 ;  HL=max number
 	or	a,a
+.no_carry:
 	sbc	hl,de
 	add	hl,de
 	jp	p,.skip
@@ -6428,6 +6420,7 @@ _Minimum:
 ; Oututs:
 ;  HL=min number
 	or	a,a
+.no_carry:
 	sbc	hl,de
 	ex	de,hl
 	jp	p,.skip
@@ -6465,7 +6458,7 @@ smcWord _XMax
 smcWord _YMin
 .YMin := $-3
 	ld	de,(iy+6)
-	call	_Maximum
+	call	_Maximum.no_carry
 	ld	(iy+6),hl
 	ld	hl,ti.lcdHeight
 smcWord _YMax
@@ -6734,7 +6727,7 @@ _DefaultCharSpacing:
 	db	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
 
 _DefaultTextData:
-	db	$00,$00,$00,$00,$00,$00,$00,$00 ;  
+	db	$00,$00,$00,$00,$00,$00,$00,$00 ; 0
 	db	$7E,$81,$A5,$81,$BD,$BD,$81,$7E ; ☺
 	db	$7E,$FF,$DB,$FF,$C3,$C3,$FF,$7E ; ☻
 	db	$6C,$FE,$FE,$FE,$7C,$38,$10,$00 ; ♥
@@ -6766,7 +6759,7 @@ _DefaultTextData:
 	db	$00,$24,$66,$FF,$66,$24,$00,$00 ; ↔
 	db	$00,$18,$3C,$7E,$FF,$FF,$00,$00 ; ▲
 	db	$00,$FF,$FF,$7E,$3C,$18,$00,$00 ; ▼
-	db	$00,$00,$00,$00,$00,$00,$00,$00 ;
+	db	$00,$00,$00,$00,$00,$00,$00,$00 ; _
 	db	$C0,$C0,$C0,$C0,$C0,$00,$C0,$00 ; !
 	db	$D8,$D8,$D8,$00,$00,$00,$00,$00 ; "
 	db	$6C,$6C,$FE,$6C,$FE,$6C,$6C,$00 ; #
@@ -6861,7 +6854,7 @@ _DefaultTextData:
 	db	$C0,$C0,$C0,$00,$C0,$C0,$C0,$00 ; |
 	db	$E0,$30,$30,$1C,$30,$30,$E0,$00 ; }
 	db	$76,$DC,$00,$00,$00,$00,$00,$00 ; ~
-	db	$00,$10,$38,$6C,$C6,$C6,$FE,$00 ; △
+	db	$00,$10,$38,$6C,$C6,$C6,$FE,$00 ; Δ
 
 _LcdTiming:
 ;	db	14 shl 2		; PPL shl 2