ootw: kicking finally works

ootw/ootw_cavern.s

@@ -413,13 +413,45 @@ slugg2_gait:	.byte	0
 draw_slugs:
 
 	lda	slugg0_out
-	bne	check_attack		; don't draw if not there
+	bne	check_kicked		; don't draw if not there
 	jmp	slug_done
 
+check_kicked:
+	lda	slugg0_out		; only kick if normal
+	cmp	#1
+	bne	check_attack
+
+	;==================
+	; see if kicked
+
+	lda	KICKING
+	beq	check_attack
+
+	lda	PHYSICIST_X
+	sec
+	sbc	slugg0_x		; -4 to +4
+	clc
+	adc	#4
+	and	#$f8
+	bne	not_kicked
+kicked:
+	lda	#2
+	sta	slugg0_out
+	lda	#10
+	sta	slugg0_dieing
+	lda	DIRECTION
+	sta	slugg0_dir
+
+not_kicked:
+
 check_attack:
 	;==================
 	; see if attack
 
+	lda	slugg0_out
+	cmp	#1
+	bne	no_attack
+
 	lda	PHYSICIST_X
 	sec
 	sbc	slugg0_x		; -2 to +2
@@ -482,18 +514,23 @@ slug_no_move:
 	lda	slugg0_dieing
 	beq	check_draw_attacking
 slug_exploding:
+	tax					; urgh can't forget tax
 	lda	slug_die_progression,X
 	sta	INL
 	lda	slug_die_progression+1,X
 	sta	INH
 
+	bit	SPEAKER
+
 	lda	FRAMEL
-	and	#$1f
+	and	#$f
 	bne	no_progress
 
+	bit	SPEAKER
+
 	dec	slugg0_dieing
 	dec	slugg0_dieing
-	bpl	no_progress
+	bne	no_progress
 	jmp	remove_slug
 
 no_progress:

ootw/ootw_sprites.inc

@@ -302,37 +302,39 @@ slug2:
 	.byte	$0a,$a0,$0a,$aa
 
 slug_die_progression:
-	.word	slug_die4
-	.word	slug_die3
-	.word	slug_die2
-	.word	slug_die1
+	.word	slug_die4	; 0
+	.word	slug_die4	; 2
+	.word	slug_die3	; 4
+	.word	slug_die2	; 6
+	.word	slug_die1	; 8
+	.word	slug_die1	; 10
 
 slug_die1:
 	.byte	$4,$4
 	.byte	$aa,$aa,$aa,$aa
 	.byte	$aa,$aa,$aa,$aa
-	.byte	$aa,$aa,$0a,$aa
-	.byte	$aa,$aa,$0a,$aa
+	.byte	$0a,$aa,$aa,$aa
+	.byte	$aa,$0a,$aa,$aa
 
 slug_die2:
 	.byte	$4,$4
 	.byte	$aa,$aa,$aa,$aa
-	.byte	$aa,$aa,$0a,$aa
-	.byte	$aa,$aa,$aa,$0a
-	.byte	$aa,$aa,$aa,$0a
+	.byte	$0a,$aa,$aa,$aa
+	.byte	$aa,$0a,$aa,$aa
+	.byte	$aa,$aa,$a0,$aa
 
 slug_die3:
-	.byte	$5,$4
-	.byte	$aa,$aa,$aa,$aa,$aa
-	.byte	$aa,$aa,$aa,$a0,$aa
-	.byte	$aa,$aa,$aa,$aa,$a0
-	.byte	$aa,$aa,$aa,$aa,$aa
+	.byte	$4,$4
+	.byte	$0a,$aa,$aa,$aa
+	.byte	$aa,$aa,$0a,$aa
+	.byte	$aa,$aa,$aa,$0a
+	.byte	$aa,$aa,$aa,$aa
 
 slug_die4:
 	.byte	$5,$4
 	.byte	$aa,$aa,$aa,$aa,$aa
-	.byte	$aa,$aa,$aa,$aa,$aa
 	.byte	$aa,$aa,$aa,$a0,$aa
+	.byte	$aa,$aa,$aa,$aa,$a0
 	.byte	$aa,$aa,$aa,$aa,$aa