Merge remote-tracking branch 'YamaArashi/master'

Conflicts:
	constants/misc_constants.asm
	engine/battle/core.asm
	engine/menu/pokedex.asm
	engine/town_map.asm
	home.asm
	hram.asm

1 files changed, 9 insertions, 9 deletions

diff --git a/engine/turn_sprite.asm b/engine/turn_sprite.asm
index ecd8cf02..84037cfe 100755
--- a/engine/turn_sprite.asm
+++ b/engine/turn_sprite.asm
@@ -1,25 +1,25 @@
-Func_13074: ; 13074 (4:7074)
+UpdateSpriteFacingOffsetAndDelayMovement: ; 13074 (4:7074)
 	ld h, $c2
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $8
 	ld l, a
-	ld a, $7f
-	ld [hl], a
+	ld a, $7f ; maximum movement delay
+	ld [hl], a ; c2x8 (movement delay)
 	dec h
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $9
 	ld l, a
-	ld a, [hld]
+	ld a, [hld] ; c1x9 (facing direction)
 	ld b, a
 	xor a
 	ld [hld], a
-	ld [hl], a
+	ld [hl], a ; c1x8 (walk animation frame)
 	ld a, [H_CURRENTSPRITEOFFSET]
 	add $2
 	ld l, a
-	ld a, [hl]
-	or b
+	ld a, [hl] ; c1x2 (facing and animation table offset)
+	or b ; or in the facing direction
 	ld [hld], a
-	ld a, $2
-	ld [hl], a
+	ld a, $2 ; delayed movement status
+	ld [hl], a ; c1x1 (movement status)
 	ret