From 10ac8d512b7c9f48f6088d474c3f196e777cae93 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Thu, 18 Jul 2019 19:14:33 -0400
Subject: [PATCH] ootw: alien yelling sorta working

---
 ootw/alien.s                                 | 10 +++++-
 ootw/ootw_c2_cage.s                          | 15 ++++----
 ootw/ootw_graphics/sprites/sprites_alien.inc | 38 ++++++++++----------
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/ootw/alien.s b/ootw/alien.s
index 120ca964..2b213174 100644
--- a/ootw/alien.s
+++ b/ootw/alien.s
@@ -297,11 +297,19 @@ alien_draw_turning:
 
 alien_yelling:
 	lda	alien_state+ALIEN_GAIT,X
-	and	#$10
 
+	and	#$c0
+	bne	alien_yelling_no_waving
+
+	lda	alien_state+ALIEN_GAIT,X
+
+alien_yelling_no_waving:
+	and	#$10
+	lsr
 	lsr
 	lsr
 	and	#2
+
 	tay
 
 	lda	alien_yell_progression,Y
diff --git a/ootw/ootw_c2_cage.s b/ootw/ootw_c2_cage.s
index e21253b3..c9ab5148 100644
--- a/ootw/ootw_c2_cage.s
+++ b/ootw/ootw_c2_cage.s
@@ -50,12 +50,14 @@ cage_loop:
 
 	;================================
 	; copy background to current page
+	;================================
 
 	jsr	gr_copy_to_current
 
 
 	;=======================
 	; draw miners mining
+	;=======================
 
 	jsr	ootw_draw_miners
 
@@ -196,13 +198,13 @@ guard_shooting:
 
 	; guard shooting
 
-	lda	alien0_x
-	cmp	#21
-	bne	guard_move_and_draw
+;	lda	alien0_x
+;	cmp	#21
+;	bne	guard_move_and_draw
 
-	lda	#A_SHOOTING_UP
-	sta	alien0_state
-	jmp	guard_move_and_draw
+;	lda	#A_SHOOTING_UP
+;	sta	alien0_state
+;	jmp	guard_move_and_draw
 
 
 
@@ -210,7 +212,6 @@ guard_move_and_draw:
 
 	jsr	move_alien
 	jsr	draw_alien
-	jmp	done_cage_guard
 
 
 done_cage_guard:
diff --git a/ootw/ootw_graphics/sprites/sprites_alien.inc b/ootw/ootw_graphics/sprites/sprites_alien.inc
index d6ab1f5b..ed69f03e 100644
--- a/ootw/ootw_graphics/sprites/sprites_alien.inc
+++ b/ootw/ootw_graphics/sprites/sprites_alien.inc
@@ -42,7 +42,7 @@ alien_walk_progression:
 
 alien_walk_left1:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$5a,$00,$77,$aa
 	.byte $aa,$55,$10,$77,$aa
@@ -53,7 +53,7 @@ alien_walk_left1:
 
 alien_walk_left2:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$aa,$00,$77,$aa
 	.byte $aa,$5a,$77,$17,$aa
@@ -64,7 +64,7 @@ alien_walk_left2:
 
 alien_walk_left3:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$aa,$00,$77,$aa
 	.byte $aa,$aa,$77,$10,$aa
@@ -75,7 +75,7 @@ alien_walk_left3:
 
 alien_walk_left4:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$aa,$00,$77,$aa
 	.byte $aa,$aa,$77,$10,$aa
@@ -86,7 +86,7 @@ alien_walk_left4:
 
 alien_walk_left5:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$aa,$00,$77,$aa
 	.byte $aa,$aa,$77,$10,$aa
@@ -97,7 +97,7 @@ alien_walk_left5:
 
 alien_walk_left6:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$aa,$00,$77,$aa
 	.byte $aa,$aa,$77,$17,$5a
@@ -108,7 +108,7 @@ alien_walk_left6:
 
 alien_walk_left7:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$aa,$00,$77,$aa
 	.byte $aa,$aa,$10,$77,$aa
@@ -119,7 +119,7 @@ alien_walk_left7:
 
 alien_walk_left8:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $aa,$aa,$00,$77,$aa
 	.byte $aa,$5a,$10,$77,$7a
@@ -148,7 +148,7 @@ alien_walk_gun_progression:
 
 alien_walk_gun_left1:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $a0,$5a,$00,$77,$aa
 	.byte $aa,$aa,$10,$77,$aa
@@ -159,7 +159,7 @@ alien_walk_gun_left1:
 
 alien_walk_gun_left2:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $0a,$aa,$00,$77,$aa
 	.byte $aa,$5a,$77,$17,$aa
@@ -170,7 +170,7 @@ alien_walk_gun_left2:
 
 alien_walk_gun_left3:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $0a,$aa,$00,$77,$aa
 	.byte $aa,$aa,$77,$10,$aa
@@ -181,7 +181,7 @@ alien_walk_gun_left3:
 
 alien_walk_gun_left4:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $0a,$aa,$00,$77,$aa
 	.byte $aa,$a5,$77,$10,$aa
@@ -192,7 +192,7 @@ alien_walk_gun_left4:
 
 alien_walk_gun_left5:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $a0,$5a,$00,$77,$aa
 	.byte $aa,$aa,$77,$10,$aa
@@ -203,7 +203,7 @@ alien_walk_gun_left5:
 
 alien_walk_gun_left6:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $a0,$5a,$00,$77,$aa
 	.byte $aa,$aa,$77,$17,$aa
@@ -214,7 +214,7 @@ alien_walk_gun_left6:
 
 alien_walk_gun_left7:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $0a,$aa,$00,$77,$aa
 	.byte $aa,$a5,$10,$77,$aa
@@ -225,7 +225,7 @@ alien_walk_gun_left7:
 
 alien_walk_gun_left8:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $aa,$77,$07,$00,$aa
 	.byte $0a,$aa,$00,$77,$aa
 	.byte $aa,$a5,$10,$77,$7a
@@ -409,7 +409,7 @@ alien_yell_progression:
 
 alien_yelling_1:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $0a,$a7,$07,$00,$aa
 	.byte $00,$aa,$00,$77,$aa
 	.byte $aa,$55,$10,$77,$7a
@@ -420,7 +420,7 @@ alien_yelling_1:
 
 alien_yelling_2:
 	.byte $5,$8
-	.byte $aa,$7a,$57,$75,$aa
+	.byte $aa,$7a,$f7,$7f,$aa
 	.byte $00,$77,$07,$00,$aa
 	.byte $0a,$5a,$00,$77,$aa
 	.byte $aa,$a5,$10,$77,$7a
@@ -444,7 +444,7 @@ alien_shoot_up_progression:
 
 alien_shooting_up_sprite:
 	.byte $5,$8
-	.byte $00,$7a,$57,$75,$aa
+	.byte $00,$7a,$f7,$7f,$aa
 	.byte $00,$77,$07,$00,$aa
 	.byte $55,$aa,$00,$77,$aa
 	.byte $aa,$55,$10,$77,$7a