diff --git a/games/tfv/tfv_battle_attack.s b/games/tfv/tfv_battle_attack.s
index 4627dba3..1ae0dd8f 100644
--- a/games/tfv/tfv_battle_attack.s
+++ b/games/tfv/tfv_battle_attack.s
@@ -5,6 +5,8 @@
 attack:
 	lda	#34
 	sta	HERO_X
+	lda	#20
+	sta	HERO_Y
 
 	lda	#$00
 	sta	DAMAGE_VAL_HI
@@ -20,45 +22,24 @@ attack_loop:
 
 	; draw hero
 
-	lda	#20
+	lda	HERO_Y
 	sta	YPOS
-
 	lda	HERO_X
 	sta	XPOS
 
+	; walk/run alternate frames
 	lsr
 	bcc	attack_draw_walk
 
 attack_draw_stand:
-	lda	#<tfv_stand_left_sprite
-	sta	INL
-	lda	#>tfv_stand_left_sprite
-	jmp	attack_actually_draw
+	jsr	draw_hero_and_sword
+	jmp	attack_done_draw
 
 attack_draw_walk:
-	lda	#<tfv_walk_left_sprite
-	sta	INL
-	lda	#>tfv_walk_left_sprite
+	jsr	draw_hero_walk_and_sword
 
-attack_actually_draw:
-	sta	INH
-	jsr	put_sprite_crop
 
-	;=========================
-	; draw sword
-
-	lda	HERO_X
-	sec
-	sbc	#5
-	sta	XPOS
-	; ypos already 20?
-
-	lda	#<tfv_led_sword_sprite
-	sta	INL
-	lda	#>tfv_led_sword_sprite
-	sta	INH
-
-	jsr	put_sprite_crop
+attack_done_draw:
 
 
 	;=========================
@@ -85,6 +66,10 @@ attack_actually_draw:
 	cmp	#10			; repeat until 10
 	bne	attack_loop
 
+
+
+
+
 	;======================
 	; attack done
 
@@ -115,5 +100,3 @@ attack_actually_draw:
 	sta	HERO_X
 
 	rts
-
-
diff --git a/games/tfv/tfv_battle_draw_hero.s b/games/tfv/tfv_battle_draw_hero.s
index 68424318..4b674417 100644
--- a/games/tfv/tfv_battle_draw_hero.s
+++ b/games/tfv/tfv_battle_draw_hero.s
@@ -58,6 +58,28 @@ draw_hero_down:
 	jmp	put_sprite_crop		; tail call
 
 
+
+	;============================
+	; draw hero walk and sword
+	;============================
+	; draws at HERO_X,HERO_Y
+
+draw_hero_walk_and_sword:
+
+	lda	HERO_X
+	sta	XPOS
+	lda	HERO_Y
+	sta	YPOS
+
+	lda	#<tfv_walk_left_sprite
+	sta	INL
+	lda	#>tfv_walk_left_sprite
+	sta	INH
+
+	jsr	put_sprite_crop
+
+	jmp	draw_hero_sword
+
 	;============================
 	; draw hero and sword
 	;============================
@@ -77,6 +99,7 @@ draw_hero_and_sword:
 
 	jsr	put_sprite_crop
 
+draw_hero_sword:
 	; grsim_put_sprite(tfv_led_sword,ax-5,20);
 	lda	HERO_X
 	sec