From 5320812dffa43177f18a6213dc9f1e4f8d0943dc Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 13 Jan 2021 23:33:05 -0500
Subject: [PATCH] tfv: covert all of overworld to put_sprite_crop

---
 games/tfv/tfv_overworld.s | 10 ++---
 games/tfv/tfv_sprites.inc | 92 +++++++++++++++++++--------------------
 games/tfv/tfv_world.s     |  2 +-
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/games/tfv/tfv_overworld.s b/games/tfv/tfv_overworld.s
index 1ef6eb6d..833ca194 100644
--- a/games/tfv/tfv_overworld.s
+++ b/games/tfv/tfv_overworld.s
@@ -367,7 +367,7 @@ back_not_palm2:
 
 back_scatter_sprite:
 
-	jsr	put_sprite
+	jsr	put_sprite_crop
 
 no_back_scatter:
 	;========================
@@ -466,7 +466,7 @@ done_walking:
 	lda	TFV_Y
 	sta	YPOS
 
-	jsr	put_sprite
+	jsr	put_sprite_crop
 
 
 ;	if (direction==-1) {
@@ -593,7 +593,7 @@ fore_not_palm2:
 
 fore_scatter_sprite:
 
-	jsr	put_sprite
+	jsr	put_sprite_crop
 
 no_fore_scatter:
 
@@ -723,7 +723,7 @@ fore_no_forest:
 	lda	#4
 	sta	YPOS
 
-	jsr	put_sprite	; grsim_put_sprite(lightning,25,4);
+	jsr	put_sprite_crop	; grsim_put_sprite(lightning,25,4);
 
 	;=============================
 	; Hurt hit points if in range?
@@ -1154,7 +1154,7 @@ mountain_loop:
 	adc	#2
 	sta	YPOS
 
-	jsr	put_sprite
+	jsr	put_sprite_crop
 
 	pla
 	clc
diff --git a/games/tfv/tfv_sprites.inc b/games/tfv/tfv_sprites.inc
index 4d01c358..e23bda74 100644
--- a/games/tfv/tfv_sprites.inc
+++ b/games/tfv/tfv_sprites.inc
@@ -2,9 +2,9 @@
 
 ;tb1_sprite:
 ;	.byte $8,$4
-;	.byte $55,$50,$00,$00,$00,$00,$00,$00
-;	.byte $55,$55,$55,$00,$00,$00,$00,$00
-;	.byte $ff,$1f,$4f,$2f,$ff,$22,$20,$00
+;	.byte $55,$5A,$AA,$AA,$AA,$AA,$AA,$AA
+;	.byte $55,$55,$55,$AA,$AA,$AA,$AA,$AA
+;	.byte $ff,$1f,$4f,$2f,$ff,$22,$2A,$AA
 ;	.byte $5f,$5f,$5f,$5f,$ff,$f2,$f2,$f2
 
 
@@ -88,66 +88,66 @@ tfv_victory_sprite:
 ; Palm Tree
 
 palm_tree:
-	.byte $08,$07
-	.byte $00,$00,$00,$00,$00,$40,$04,$40
-	.byte $00,$40,$04,$44,$84,$40,$00,$00
-	.byte $04,$00,$40,$05,$88,$00,$04,$40
-	.byte $00,$44,$00,$00,$08,$80,$00,$00
-	.byte $00,$00,$00,$00,$00,$88,$00,$00
-	.byte $00,$00,$00,$00,$80,$08,$00,$00
-	.byte $00,$00,$00,$00,$88,$00,$00,$00
+	.byte 8,7
+	.byte $AA,$AA,$AA,$AA,$AA,$4A,$A4,$4A
+	.byte $AA,$4A,$A4,$44,$84,$4A,$AA,$AA
+	.byte $A4,$AA,$4A,$A5,$88,$AA,$A4,$4A
+	.byte $AA,$44,$AA,$AA,$A8,$8A,$AA,$AA
+	.byte $AA,$AA,$AA,$AA,$AA,$88,$AA,$AA
+	.byte $AA,$AA,$AA,$AA,$8A,$A8,$AA,$AA
+	.byte $AA,$AA,$AA,$AA,$88,$AA,$AA,$AA
 
 ; Pine Tree
 
 pine_tree:
-	.byte $07,$06
-	.byte $00,$00,$00,$44,$00,$00,$00
-	.byte $00,$00,$00,$44,$00,$00,$00
-	.byte $00,$00,$44,$44,$44,$00,$00
-	.byte $00,$04,$44,$44,$44,$04,$00
-	.byte $04,$04,$04,$84,$04,$04,$04
-	.byte $00,$00,$00,$88,$00,$00,$00
+	.byte 7,6
+	.byte $AA,$AA,$AA,$44,$AA,$AA,$AA
+	.byte $AA,$AA,$AA,$44,$AA,$AA,$AA
+	.byte $AA,$AA,$44,$44,$44,$AA,$AA
+	.byte $AA,$A4,$44,$44,$44,$A4,$AA
+	.byte $A4,$A4,$A4,$84,$A4,$A4,$A4
+	.byte $AA,$AA,$AA,$88,$AA,$AA,$AA
 
 ; Snowy Tree
 
 snowy_tree:
-	.byte $07,$06
-	.byte $00,$00,$00,$77,$00,$00,$00
-	.byte $00,$00,$00,$77,$00,$00,$00
-	.byte $00,$00,$77,$44,$44,$00,$00
-	.byte $00,$07,$44,$44,$44,$04,$00
-	.byte $07,$04,$04,$84,$04,$04,$04
-	.byte $00,$00,$00,$88,$00,$00,$00
+	.byte 7,6
+	.byte $AA,$AA,$AA,$77,$AA,$AA,$AA
+	.byte $AA,$AA,$AA,$77,$AA,$AA,$AA
+	.byte $AA,$AA,$77,$44,$44,$AA,$AA
+	.byte $AA,$A7,$44,$44,$44,$A4,$AA
+	.byte $A7,$A4,$A4,$84,$A4,$A4,$A4
+	.byte $AA,$AA,$AA,$88,$AA,$AA,$AA
 
 ; Cactus
 cactus:
-	.byte $05,$06
-	.byte $00,$00,$44,$00,$00
-	.byte $44,$00,$44,$00,$40
-	.byte $44,$00,$44,$00,$44
-	.byte $04,$04,$44,$04,$04
-	.byte $00,$00,$44,$00,$00
-	.byte $00,$00,$44,$00,$00
+	.byte 5,6
+	.byte $AA,$AA,$44,$AA,$AA
+	.byte $44,$AA,$44,$AA,$4A
+	.byte $44,$AA,$44,$AA,$44
+	.byte $A4,$A4,$44,$A4,$A4
+	.byte $AA,$AA,$44,$AA,$AA
+	.byte $AA,$AA,$44,$AA,$AA
 
 ; Mountain
 
 mountain:
-	.byte $0d,$07
-	.byte $00,$00,$00,$00,$00,$70,$f7,$70,$00,$00,$00,$00,$00
-	.byte $00,$00,$00,$00,$77,$ff,$ff,$77,$00,$00,$00,$00,$00
-	.byte $00,$00,$00,$90,$8D,$88,$48,$58,$85,$50,$00,$00,$00
-	.byte $00,$00,$D0,$9D,$88,$88,$88,$48,$88,$55,$50,$00,$00
-	.byte $00,$D0,$89,$88,$88,$89,$88,$88,$88,$88,$85,$75,$00
-	.byte $D0,$89,$98,$88,$98,$88,$84,$88,$88,$88,$85,$88,$55
-	.byte $00,$00,$08,$08,$08,$08,$08,$88,$88,$88,$08,$00,$00
+	.byte 13,7
+	.byte $AA,$AA,$AA,$AA,$AA,$7A,$f7,$7A,$AA,$AA,$AA,$AA,$AA
+	.byte $AA,$AA,$AA,$AA,$77,$ff,$ff,$77,$AA,$AA,$AA,$AA,$AA
+	.byte $AA,$AA,$AA,$9A,$8D,$88,$48,$58,$85,$5A,$AA,$AA,$AA
+	.byte $AA,$AA,$DA,$9D,$88,$88,$88,$48,$88,$55,$5A,$AA,$AA
+	.byte $AA,$DA,$89,$88,$88,$89,$88,$88,$88,$88,$85,$75,$AA
+	.byte $DA,$89,$98,$88,$98,$88,$84,$88,$88,$88,$85,$88,$55
+	.byte $AA,$AA,$A8,$A8,$A8,$A8,$A8,$88,$88,$88,$A8,$AA,$AA
 
 ;Lightning, @25,4 */
 
 lightning:
-	.byte $06,$05
-	.byte $00,$00,$dd,$00,$00,$00
-	.byte $00,$00,$00,$dd,$00,$00
-	.byte $00,$00,$dd,$00,$dd,$00
-	.byte $00,$dd,$00,$00,$dd,$00
-	.byte $dd,$00,$00,$0d,$00,$dd
+	.byte 6,5
+	.byte $AA,$AA,$dd,$AA,$AA,$AA
+	.byte $AA,$AA,$AA,$dd,$AA,$AA
+	.byte $AA,$AA,$dd,$AA,$dd,$AA
+	.byte $AA,$dd,$AA,$AA,$dd,$AA
+	.byte $dd,$AA,$AA,$Ad,$AA,$dd
 
diff --git a/games/tfv/tfv_world.s b/games/tfv/tfv_world.s
index 32444d4c..05bc733e 100644
--- a/games/tfv/tfv_world.s
+++ b/games/tfv/tfv_world.s
@@ -44,7 +44,7 @@
 .include "gr_pageflip.s"
 .include "keyboard.s"
 .include "joystick.s"
-.include "gr_putsprite.s"
+;.include "gr_putsprite.s"
 .include "gr_putsprite_crop.s"
 .include "text_print.s"
 .include "gr_copy.s"