From e27fdac9a4c327867da4a859e75ac3984aa97518 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Mon, 25 Mar 2019 13:01:44 -0400
Subject: [PATCH] ootw: update beast sprites

---
 ootw/TODO                                     |  2 +-
 ootw/beast.s                                  |  4 +-
 .../beast-20190126-142310.piskel              |  0
 ootw/ootw_graphics/sprites/sprites_beast.inc  | 48 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)
 rename ootw/ootw_graphics/{beast => sprites}/beast-20190126-142310.piskel (100%)

diff --git a/ootw/TODO b/ootw/TODO
index 838d6396..f942db9f 100644
--- a/ootw/TODO
+++ b/ootw/TODO
@@ -50,7 +50,7 @@ cutscenes:
 + death by beast
 
 Level/Checkpoint #2:
-+ Intro movie
 + Swing in the cage
 + Ability to pick up gun, with all that entails
 + Elevator ride, view of city?
++ 1-bit audio recording of friend talking
diff --git a/ootw/beast.s b/ootw/beast.s
index 3036e42d..9fd1a117 100644
--- a/ootw/beast.s
+++ b/ootw/beast.s
@@ -17,7 +17,7 @@ setup_beast:
 	beq	setup_beast_left
 
 setup_beast_right:
-	lda	#-8
+	lda	#248		; -8 = 248
 	sta	BEAST_X
 	jmp	setup_no_beast
 
@@ -112,7 +112,7 @@ b_standing:
 
 b_running:
 	lda	BEAST_GAIT
-	cmp	#16
+	cmp	#18
 	bcc	brun_gait_fine	; blt
 
 	lda	#0
diff --git a/ootw/ootw_graphics/beast/beast-20190126-142310.piskel b/ootw/ootw_graphics/sprites/beast-20190126-142310.piskel
similarity index 100%
rename from ootw/ootw_graphics/beast/beast-20190126-142310.piskel
rename to ootw/ootw_graphics/sprites/beast-20190126-142310.piskel
diff --git a/ootw/ootw_graphics/sprites/sprites_beast.inc b/ootw/ootw_graphics/sprites/sprites_beast.inc
index 3a4a9784..86c41347 100644
--- a/ootw/ootw_graphics/sprites/sprites_beast.inc
+++ b/ootw/ootw_graphics/sprites/sprites_beast.inc
@@ -27,7 +27,7 @@ beast_run_progression:
 	.word	beast_running6
 	.word	beast_running7
 	.word	beast_running8
-
+	.word	beast_standing
 
 
 beast_running1:	; piskel2
@@ -45,7 +45,7 @@ beast_running2:	; piskel3
 	.byte	$00,$00,$00,$00,$00,$00,$0a,$aa,$aa
 	.byte	$00,$00,$00,$00,$00,$00,$00,$00,$aa
 	.byte	$aa,$aa,$00,$00,$00,$00,$00,$00,$aa
-	.byte	$0a,$0a,$0a,$aa,$aa,$a0,$00,$00,$0a
+	.byte	$a0,$a0,$a0,$aa,$aa,$a0,$00,$00,$0a
 	.byte	$aa,$aa,$aa,$aa,$aa,$aa,$aa,$00,$00
 
 beast_running3:	; piskel4
@@ -54,7 +54,7 @@ beast_running3:	; piskel4
 	.byte	$0a,$00,$00,$00,$00,$00,$0a,$aa,$aa
 	.byte	$00,$00,$00,$00,$00,$00,$00,$00,$aa
 	.byte	$a0,$00,$00,$00,$00,$00,$00,$00,$aa
-	.byte	$00,$a0,$0a,$aa,$aa,$a0,$a0,$00,$00
+	.byte	$aa,$0a,$00,$aa,$aa,$a0,$a0,$00,$00
 	.byte	$a0,$a0,$aa,$aa,$aa,$aa,$aa,$aa,$aa
 
 beast_running4:	; piskel5
@@ -76,28 +76,28 @@ beast_running5:	; piskel6
 	.byte	$aa,$aa,$00,$aa,$aa,$aa,$00,$a0,$00
 
 beast_running6:	; piskel7
-	.byte	$8,$6
-	.byte	$aa,$aa,$0a,$0a,$aa,$aa,$aa,$aa
-	.byte	$0a,$00,$00,$00,$00,$0a,$0a,$aa
-	.byte	$00,$00,$00,$00,$00,$00,$00,$00
-	.byte	$a0,$00,$00,$00,$00,$00,$00,$00
-	.byte	$aa,$aa,$00,$0a,$aa,$00,$00,$00
-	.byte	$aa,$aa,$aa,$00,$aa,$00,$a0,$aa
+	.byte	$9,$6
+	.byte	$aa,$aa,$0a,$0a,$aa,$aa,$aa,$aa,$aa
+	.byte	$0a,$00,$00,$00,$00,$0a,$0a,$aa,$aa
+	.byte	$00,$00,$00,$00,$00,$00,$00,$00,$aa
+	.byte	$a0,$00,$00,$00,$00,$00,$00,$00,$aa
+	.byte	$aa,$aa,$00,$0a,$aa,$00,$00,$00,$aa
+	.byte	$aa,$aa,$aa,$00,$aa,$00,$a0,$aa,$aa
 
 beast_running7:	; piskel8
-	.byte	$8,$6
-	.byte	$aa,$aa,$0a,$0a,$aa,$aa,$aa,$aa
-	.byte	$0a,$00,$00,$00,$00,$0a,$0a,$aa
-	.byte	$00,$00,$00,$00,$00,$00,$00,$00
-	.byte	$00,$00,$00,$00,$00,$00,$00,$00
-	.byte	$aa,$a0,$a0,$00,$aa,$00,$00,$a0
-	.byte	$aa,$aa,$aa,$00,$00,$00,$aa,$aa
+	.byte	$9,$6
+	.byte	$aa,$aa,$0a,$0a,$aa,$aa,$aa,$aa,$aa
+	.byte	$0a,$00,$00,$00,$00,$0a,$0a,$aa,$aa
+	.byte	$00,$00,$00,$00,$00,$00,$00,$00,$aa
+	.byte	$00,$00,$00,$00,$00,$00,$00,$00,$aa
+	.byte	$aa,$a0,$a0,$00,$aa,$00,$00,$a0,$aa
+	.byte	$aa,$aa,$aa,$00,$00,$00,$aa,$aa,$aa
 
 beast_running8:	; piskel9
-	.byte	$8,$6
-	.byte	$aa,$aa,$0a,$0a,$aa,$aa,$aa,$aa
-	.byte	$0a,$00,$00,$00,$00,$0a,$0a,$aa
-	.byte	$00,$00,$00,$00,$00,$00,$00,$00
-	.byte	$00,$00,$00,$00,$00,$00,$00,$00
-	.byte	$aa,$a0,$00,$aa,$aa,$aa,$00,$a0
-	.byte	$aa,$aa,$00,$a0,$aa,$aa,$00,$aa
+	.byte	$9,$6
+	.byte	$aa,$aa,$0a,$0a,$aa,$aa,$aa,$aa,$aa
+	.byte	$0a,$00,$00,$00,$00,$0a,$0a,$aa,$aa
+	.byte	$00,$00,$00,$00,$00,$00,$00,$00,$aa
+	.byte	$00,$00,$00,$00,$00,$00,$00,$00,$aa
+	.byte	$aa,$a0,$00,$aa,$aa,$aa,$00,$a0,$aa
+	.byte	$aa,$aa,$00,$a0,$aa,$aa,$00,$aa,$aa