diff --git a/Code/edit.asm b/Code/edit.asm
index 16990fc..89ec1b9 100644
--- a/Code/edit.asm
+++ b/Code/edit.asm
@@ -1,7 +1,7 @@
 INCLUDE "hardware.inc"
 INCLUDE "utils.inc"
 
-SPRITE_ANIM_DELAY EQU 12
+SPRITE_ANIM_DELAY EQU 6
 REPEAT_START_DELAY EQU 16
 REPEAT_DELAY EQU 3
 	
@@ -37,14 +37,14 @@ EditOldBuffer:
 	ldh a, [SelectX]
 	sla a
 	sla a
-	add a, 8
+	add a, 7
 	ld b, a
 	
 	; compute cursor Y position
 	ldh a, [SelectY]
 	sla a
 	sla a
-	add a, 16
+	add a, 15
 	ld c, a
 	
 	; update and load sprite animation
@@ -54,7 +54,10 @@ EditOldBuffer:
 	jr nz, .same
 	ldh a, [SpriteAnimation]
 	inc a
-	and a, 3
+	cp a, (SpriteTilesEnd - SpriteTiles) / 16
+	jr nz, .writeAnim
+	ld a, 0
+.writeAnim
 	ldh [SpriteAnimation], a
 	ld a, SPRITE_ANIM_DELAY
 	ldh [SpriteDelay], a
diff --git a/Graphics/SpriteTiles.bin b/Graphics/SpriteTiles.bin
index d4e61b6..53f9d33 100644
Binary files a/Graphics/SpriteTiles.bin and b/Graphics/SpriteTiles.bin differ
diff --git a/Graphics/SpriteTiles.gbr b/Graphics/SpriteTiles.gbr
index d38a6a3..7d60b8b 100644
Binary files a/Graphics/SpriteTiles.gbr and b/Graphics/SpriteTiles.gbr differ
diff --git a/rom.gb b/rom.gb
index 67477bd..ddbceb4 100644
Binary files a/rom.gb and b/rom.gb differ