diff --git a/crosshair.s b/crosshair.s
index a600f9d..04ed0ff 100644
--- a/crosshair.s
+++ b/crosshair.s
@@ -14,6 +14,9 @@ crosshairGameObject:
 	.word 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 	.word 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
+crosshairBackgroundStale:
+	.word 0
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; updateCrosshair
@@ -115,6 +118,8 @@ protectCrosshair:
 	sta PARAML0
 	jsr protectGameObject
 
+	stz crosshairBackgroundStale
+
 protectCrosshairDone:
 	pla
 	rts
@@ -128,6 +133,9 @@ protectCrosshairDone:
 unrenderCrosshair:
 	pha
 
+	lda crosshairBackgroundStale
+	bne unrenderCrosshairDone
+
 	lda #crosshairGameObject
 	sta PARAML0
 	jsr unrenderGameObject
diff --git a/gamemanager.s b/gamemanager.s
index bac8e06..22eabbd 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -44,6 +44,8 @@ beginGameplay:
 	jsr renderInventory
 	jsr protectPlayers
 	jsr renderPlayers
+	ldy #0
+	jsr updateCrosshair
 
 	; Fade in from menu
 	lda #basePalette
@@ -95,8 +97,9 @@ gameplayLoopScroll:
 	bmi gameplayLoopAngleCheck
 
 	jsr scrollMap
+	ldy currentPlayer
 	jsr updateCrosshair
-
+	
 gameplayLoopAngleCheck:
 	lda projectileActive			; Skip interactivity during shots
 	bpl gameplayLoopRenderJmp
@@ -107,7 +110,7 @@ gameplayLoopRenderJmp:
 gameplayLoopAngle:
 	; Update aim angle if needed
 	lda angleDeltaRequested
-	beq gameplayLoopAim
+	beq gameplayLoopPower
 	jsr changeAngle
 
 gameplayLoopAim:
@@ -155,8 +158,11 @@ gameplayLoopRender:
 	beq gameplayLoopRenderPlayersAnyway
 	jsr unrenderPlayers
 	jsr protectPlayers
-	jsr unrenderCrosshair
+
+	lda dirtExplosionActive	; Crosshair is dirty if map scrolled and dirt is finished
+	bne gameplayLoopRenderPlayersAnyway
 	jsr protectCrosshair
+	jsr renderCrosshair
 
 gameplayLoopRenderPlayersAnyway:
 	jsr renderPlayers
@@ -297,8 +303,6 @@ endTurnHeader:
 	jsr renderPlayerHeader
 	jsr renderInventory
 	stz turnRequested
-
-	jsr protectCrosshair
 	rts
 
 endTurnFocusPlayer0:
@@ -338,6 +342,8 @@ scrollMap:
 	lda projectileActive		; Crosshair is visible if projectile isn't
 	beq scrollMapApplyScrolling
 	jsr unrenderCrosshair
+	lda #1
+	sta crosshairBackgroundStale
 
 scrollMapApplyScrolling:
 	pla
@@ -358,7 +364,6 @@ scrollMapApplyScrolling:
 	sta playersDirty
 	sta projectilesDirty
 	sta terrainDirty
-	sta crosshairDirty
 	rts
 
 
@@ -486,9 +491,7 @@ playerMoveRequested:
 terrainDirty:
 	.word 1
 playersDirty:
-	.word 0
-crosshairDirty:
-	.word 0
+	.word 1
 projectilesDirty:
 	.word 1
 inventoryDirty:
diff --git a/macros.s b/macros.s
index c24975f..0fd26a5 100644
--- a/macros.s
+++ b/macros.s
@@ -180,8 +180,8 @@
 	pha
 	lda breakpoint
 	beq nobrk
-	lda #1
-	sta $e1c029
+;	lda #1
+;	sta $e1c029
 	pla
 	brk
 nobrk: