Simple cleanups in constants/data/macros and banks 1-4.

4 files changed, 15 insertions, 11 deletions

diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 3a196508..01d49d21 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -274,7 +274,7 @@ WillObjectBumpIntoSomeoneElse:
 	ld e, [hl]
 	jr IsNPCAtCoord
 
-Function70f4:
+Unreferenced_Function70f4:
 	ldh a, [hMapObjectIndexBuffer]
 	call GetObjectStruct
 	call .CheckWillBeFacingNPC
@@ -473,7 +473,7 @@ IsObjectMovingOffEdgeOfScreen:
 	scf
 	ret
 
-Function71f2:
+Unreferenced_Function71f2:
 	ld a, [wPlayerStandingMapX]
 	ld d, a
 	ld a, [wPlayerStandingMapY]
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 165a8479..bdf23ec4 100755
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -577,11 +577,14 @@ DoPlayerMovement::
 ; Standing
 	jr .update
 
-.d_down 	add hl, de
-.d_up   	add hl, de
-.d_left 	add hl, de
-.d_right	add hl, de
-
+.d_down
+	add hl, de
+.d_up
+	add hl, de
+.d_left
+	add hl, de
+.d_right
+	add hl, de
 .update
 	ld a, [hli]
 	ld [wWalkingDirection], a
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 28323eba..339f7ee0 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -107,8 +107,9 @@ RefreshPlayerCoords:
 	ld hl, wPlayerLastMapY
 	ld [hl], e
 	ld e, a
+; the next three lines are useless
 	ld a, [wObjectFollow_Leader]
-	cp $0
+	cp PLAYER
 	ret nz
 	ret
 
@@ -509,7 +510,7 @@ CopyTempObjectToObjectStruct:
 	ld [hl], a
 	ret
 
-TrainerWalkToPlayer::
+TrainerWalkToPlayer:
 	ldh a, [hLastTalked]
 	call InitMovementBuffer
 	ld a, movement_step_sleep
diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm
index d5c45cc4..a829cd4f 100755
--- a/engine/overworld/time.asm
+++ b/engine/overworld/time.asm
@@ -92,8 +92,8 @@ CheckDailyResetTimer::
 	ret nc
 	xor a
 	ld hl, wDailyFlags1
-	ld [hli], a
-	ld [hl], a
+	ld [hli], a ; wDailyFlags1
+	ld [hl], a  ; wDailyFlags2
 	jr RestartDailyResetTimer
 
 StartBugContestTimer: