From 8bfee980177510447ca086c42819acfe5a171e37 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 5 Jul 2018 22:15:42 -0400
Subject: [PATCH] split: got bird sprite working

---
 split_screen/calc_freq.c     |  2 +-
 split_screen/credits.s       | 71 ++++++++++++++++++++----------------
 split_screen/tfv_sprites.inc | 44 ++++++++++++----------
 3 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/split_screen/calc_freq.c b/split_screen/calc_freq.c
index 8b1a80b0..e053a884 100644
--- a/split_screen/calc_freq.c
+++ b/split_screen/calc_freq.c
@@ -9,7 +9,7 @@ int main(int argc, char **argv) {
 //	desired=5196;
 //	desired=4547;
 //	desired=9685;
-	desired=3714;
+	desired=2331;
 
 
 	printf("You want %d cycles\n",desired);
diff --git a/split_screen/credits.s b/split_screen/credits.s
index 9a8417fa..09f00e4f 100644
--- a/split_screen/credits.s
+++ b/split_screen/credits.s
@@ -135,6 +135,15 @@ line_loop:
 	; the line (max 3 repeats in that case)
 
 vapor_lock_loop:
+	LDA #$A0
+zxloop:
+	LDX #$04
+wiloop:
+	CMP $C051
+	BNE zxloop
+	DEX
+	BNE wiloop
+
 	LDA #$44
 zloop:
 	LDX #$04
@@ -268,17 +277,29 @@ loop6:
 	; vertical blank
 
 	; want 4550-3 = 4547 cycles
-	;			1+y(6+5x)
-
 	; Try X=13 Y=64 cycles=4545 R2
 
+;	lda	#0							; 2
+;	ldy	#64							; 2
+loopE:
+;	ldx	#13							; 2
+loopF:
+;	dex								; 2
+;	bne	loopF							; 2nt/3
+;	dey								; 2
+;	bne	loopE							; 2nt/3
+
+
+
+
+;=========================================================================
 
 	; DRAW SPRITES
 	; do this during blanking interval
 
-	lda	#>blob					; 2
+	lda	#>bird_rider_stand_right		; 2
 	sta	INH					; 3
-	lda	#<blob					; 2
+	lda	#<bird_rider_stand_right		; 2
 	sta	INL					; 3
 
 	lda	#17					; 2
@@ -286,32 +307,27 @@ loop6:
 	lda	#30					; 2
 	sta	YPOS					; 3
 
-        jsr     put_sprite				; 6
+	jsr	put_sprite				; 6
 							;=========
 							; 26
 
-							; + 807
+							; + 2190
 							;========
-							; 833
+							; 2216
 
-	; blob= 833
-	; 4547 - 833
-	; 3714 is new number
-	; Try X=147 Y=5 cycles=3706 R 8
+	; 4547 - 2216
+	; 2331 is new number
+	; Try X=92 Y=5 cycles=2331
 
 
-	lda	#0							; 2
-	lda	#0							; 2
-	lda	#0							; 2
-	lda	#0							; 2
-
+;	lda	#0							; 2
+;	lda	#0							; 2
 	ldy	#5							; 2
 loop7:
-	ldx	#147							; 2
+	ldx	#92							; 2
 loop8:
 	dex								; 2
 	bne	loop8							; 2nt/3
-
 	dey								; 2
 	bne	loop7							; 2nt/3
 
@@ -339,28 +355,19 @@ wait_until_keypressed:
 	;    outerloop = 34 setup
 	;	X*innerloop
 	;	innerloop = 30 if $00 17+13(done)
-	;		    54 if if $XX 16+8+8+9(put_all)+13(done)
-	;		    69 if $X0 16+8+7+5+20(put_sprite_mask)+13(done)
 	;		    64 if $0X 16+7+8+20(put_sprite_mask)+13(done)
+	;		    69 if $X0 16+8+7+5+20(put_sprite_mask)+13(done)
+	;		    54 if if $XX 16+8+8+9(put_all)+13(done)
+
+
 	;       -1 for last iteration
 	;    18 (-1 for last)
 	;     6 return
 
 	; so cost = 28 + Y*(34+18)+ (INNER-X) -1 + 6
 	;         = 33 + Y*(52)+(INNER-X)
-	;	  = 33 + Y*(52)+ [30A + 54B + 68C + 64D]-X
+	;	  = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-X
 
-	; solid $XX, x=3, y=3, B=9
-	;	33 + 3*(52)+[54*9]-3 = 672
-	; solid $00, x=3, y=3, A=9
-	;	33 + 3*(52)+[30*9]-3 = 456
-	; solid $0X, x=3, y=3, D=9
-	;	33 + 3*(52)+[64*9]-3 = 762
-	; solid $X0, x=3, y=3, C=9
-	;	33 + 3*(52)+[69*9]-3 = 807
-
-	; bird_stand_right = X=6, Y=7 A=28 B=9 C=2 D=3
-	;	= 33 + 7*53+(30*28+53*9+68*2+63*3)-6 = 2040 cycles
 put_sprite:
 
 	ldy	#0		; byte 0 is xsize			; 2
diff --git a/split_screen/tfv_sprites.inc b/split_screen/tfv_sprites.inc
index e314b624..abfb47c3 100644
--- a/split_screen/tfv_sprites.inc
+++ b/split_screen/tfv_sprites.inc
@@ -1,29 +1,37 @@
-bird_stand_right:
+bird_rider_stand_right:
 	.byte $6,$7
-	.byte $00,$00,$00,$00,$00,$00
-	.byte $00,$00,$00,$00,$dd,$90
-	.byte $00,$00,$00,$00,$dd,$00
-	.byte $0d,$dd,$dd,$dd,$dd,$00
-	.byte $00,$00,$0d,$dd,$0d,$00
+	.byte $00,$dd,$bd,$00,$00,$00
+	.byte $00,$dd,$db,$00,$dd,$90
+	.byte $00,$00,$22,$02,$dd,$00
+	.byte $0d,$dd,$d2,$22,$dd,$00
+	.byte $00,$00,$0d,$82,$8d,$00
 	.byte $00,$00,$00,$99,$00,$00
 	.byte $00,$00,$00,$99,$90,$00
+	; 00=22 0X=3 X0=2 XX=15 
+	; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-Y
+	; = 33 + 7*52 + 30*22 + 64*3 + 69*2 + 54*15 - 7
+	; = 2190
 
-bird_walk_right:
+bird_rider_walk_right:
 	.byte $6,$7
-	.byte $00,$00,$00,$00,$00,$00
-	.byte $00,$00,$00,$00,$dd,$90
-	.byte $00,$00,$00,$00,$dd,$00
-	.byte $0d,$dd,$dd,$dd,$dd,$00
-	.byte $00,$00,$0d,$dd,$0d,$00
+	.byte $00,$dd,$bd,$00,$00,$00
+	.byte $00,$dd,$db,$00,$dd,$90
+	.byte $00,$00,$22,$02,$dd,$00
+	.byte $0d,$dd,$d2,$22,$dd,$00
+	.byte $00,$00,$0d,$82,$8d,$00
 	.byte $00,$00,$00,$99,$00,$00
 	.byte $00,$00,$99,$00,$99,$00
+	; 00=22 0X=3 X0=1 XX=16
 
 small_tree:
 	.byte $3,$3
 	.byte $00,$CC,$00
 	.byte $CC,$CC,$CC
 	.byte $00,$88,$00
-
+	; 00=4 0X=0 X0=0 XX=5
+	; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-X
+	; = 33 + 3*52 + [30*4 + 54*5]-3 = 576			++ works 
+ 
 big_tree:
 	.byte $5,$5
 	.byte $00,$00,$CC,$00,$00
@@ -31,10 +39,6 @@ big_tree:
 	.byte $00,$CC,$CC,$CC,$00
 	.byte $c0,$CC,$CC,$CC,$c0
 	.byte $00,$00,$88,$00,$00
-	
-
-blob:
-	.byte $3,$3
-	.byte $70,$80,$90
-	.byte $A0,$B0,$C0
-	.byte $D0,$E0,$F0
+	; 00=12 0X=0 X0=4 XX=9	
+	; = 33 + Y*(52)+ [30A + 64B + 69C + 54D]-X
+	; = 33 + 5*52 + 30*12 + 69*4 + 54*9 - 5 = 1410		++ works