Identify more flag bits (#464)

5 files changed, 22 insertions, 22 deletions

diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm
index 8acbb04f..75c46474 100644
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -162,7 +162,7 @@ LoadMapSpriteTilePatterns:
 	pop de
 	ld b, a
 	ld a, [wFontLoaded]
-	bit 0, a ; reloading upper half of tile patterns after displaying text?
+	bit BIT_FONT_LOADED, a ; reloading upper half of tile patterns after displaying text?
 	jr nz, .skipFirstLoad ; if so, skip loading data into the lower half
 	ld a, b
 	ld b, 0
@@ -183,7 +183,7 @@ LoadMapSpriteTilePatterns:
 	inc d
 .noCarry3
 	ld a, [wFontLoaded]
-	bit 0, a ; reloading upper half of tile patterns after displaying text?
+	bit BIT_FONT_LOADED, a ; reloading upper half of tile patterns after displaying text?
 	jr nz, .loadWhileLCDOn
 	pop af
 	pop hl
@@ -268,7 +268,7 @@ InitOutsideMapSprites:
 	call nc, GetSplitMapSpriteSetID ; if so, choose the appropriate one
 	ld b, a ; b = spriteSetID
 	ld a, [wFontLoaded]
-	bit 0, a ; reloading upper half of tile patterns after displaying text?
+	bit BIT_FONT_LOADED, a ; reloading upper half of tile patterns after displaying text?
 	jr nz, .loadSpriteSet ; if so, forcibly reload the sprite set
 	ld a, [wSpriteSetID]
 	cp b ; has the sprite set ID changed?
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 1ca24f6a..5f95cf6c 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -57,7 +57,7 @@ UpdatePlayerSprite:
 .next
 	ld [wSpritePlayerStateData1FacingDirection], a
 	ld a, [wFontLoaded]
-	bit 0, a
+	bit BIT_FONT_LOADED, a
 	jr nz, .notMoving
 .moving
 	ld a, [wMovementFlags]
@@ -135,11 +135,11 @@ UpdateNPCSprite:
 	ld l, a
 	inc l
 	ld a, [hl]        ; x#SPRITESTATEDATA1_MOVEMENTSTATUS
-	bit 7, a ; is the face player flag set?
+	bit BIT_FACE_PLAYER, a
 	jp nz, MakeNPCFacePlayer
 	ld b, a
 	ld a, [wFontLoaded]
-	bit 0, a
+	bit BIT_FONT_LOADED, a
 	jp nz, notYetMoving
 	ld a, b
 	cp $2
@@ -412,7 +412,7 @@ MakeNPCFacePlayer:
 	ld a, [wStatusFlags3]
 	bit BIT_NO_NPC_FACE_PLAYER, a
 	jr nz, notYetMoving
-	res 7, [hl]
+	res BIT_FACE_PLAYER, [hl]
 	ld a, [wPlayerDirection]
 	bit PLAYER_DIR_BIT_UP, a
 	jr z, .notFacingDown
diff --git a/engine/overworld/pathfinding.asm b/engine/overworld/pathfinding.asm
index d067345e..58fa1da9 100644
--- a/engine/overworld/pathfinding.asm
+++ b/engine/overworld/pathfinding.asm
@@ -16,7 +16,7 @@ FindPathToPlayer:
 	and a
 	jr nz, .stillHasYProgress
 	ldh a, [hFindPathFlags]
-	set 0, a ; current end of path matches the player's Y coordinate
+	set BIT_PATH_FOUND_Y, a
 	ldh [hFindPathFlags], a
 .stillHasYProgress
 	ldh a, [hFindPathXProgress]
@@ -27,11 +27,11 @@ FindPathToPlayer:
 	and a
 	jr nz, .stillHasXProgress
 	ldh a, [hFindPathFlags]
-	set 1, a ; current end of path matches the player's X coordinate
+	set BIT_PATH_FOUND_X, a
 	ldh [hFindPathFlags], a
 .stillHasXProgress
 	ldh a, [hFindPathFlags]
-	cp $3 ; has the end of the path reached the player's position?
+	cp (1 << BIT_PATH_FOUND_X) | (1 << BIT_PATH_FOUND_Y)
 	jr z, .done
 ; Compare whether the X distance between the player and the current of the path
 ; is greater or if the Y distance is. Then, try to reduce whichever is greater.
@@ -40,7 +40,7 @@ FindPathToPlayer:
 	jr c, .yDistanceGreater
 ; x distance is greater
 	ldh a, [hNPCPlayerRelativePosFlags]
-	bit 1, a
+	bit BIT_PLAYER_LOWER_X, a
 	jr nz, .playerIsLeftOfNPC
 	ld d, NPC_MOVEMENT_RIGHT
 	jr .next1
@@ -53,7 +53,7 @@ FindPathToPlayer:
 	jr .storeDirection
 .yDistanceGreater
 	ldh a, [hNPCPlayerRelativePosFlags]
-	bit 0, a
+	bit BIT_PLAYER_LOWER_Y, a
 	jr nz, .playerIsAboveNPC
 	ld d, NPC_MOVEMENT_DOWN
 	jr .next2
@@ -97,15 +97,15 @@ CalcPositionOfPlayerRelativeToNPC:
 .NPCNorthOfPlayer
 	push hl
 	ld hl, hNPCPlayerRelativePosFlags
-	bit 0, [hl]
-	set 0, [hl]
+	bit BIT_PLAYER_LOWER_Y, [hl]
+	set BIT_PLAYER_LOWER_Y, [hl]
 	pop hl
 	jr .divideYDistance
 .NPCSouthOfOrAlignedWithPlayer
 	push hl
 	ld hl, hNPCPlayerRelativePosFlags
-	bit 0, [hl]
-	res 0, [hl]
+	bit BIT_PLAYER_LOWER_Y, [hl]
+	res BIT_PLAYER_LOWER_Y, [hl]
 	pop hl
 .divideYDistance
 	push hl
@@ -125,15 +125,15 @@ CalcPositionOfPlayerRelativeToNPC:
 .NPCWestOfPlayer
 	push hl
 	ld hl, hNPCPlayerRelativePosFlags
-	bit 1, [hl]
-	set 1, [hl]
+	bit BIT_PLAYER_LOWER_X, [hl]
+	set BIT_PLAYER_LOWER_X, [hl]
 	pop hl
 	jr .divideXDistance
 .NPCEastOfOrAlignedWithPlayer
 	push hl
 	ld hl, hNPCPlayerRelativePosFlags
-	bit 1, [hl]
-	res 1, [hl]
+	bit BIT_PLAYER_LOWER_X, [hl]
+	res BIT_PLAYER_LOWER_X, [hl]
 	pop hl
 .divideXDistance
 	ldh [hDividend2], a
diff --git a/engine/overworld/push_boulder.asm b/engine/overworld/push_boulder.asm
index ff481439..1773e818 100644
--- a/engine/overworld/push_boulder.asm
+++ b/engine/overworld/push_boulder.asm
@@ -18,7 +18,7 @@ TryPushingBoulder::
 	swap a
 	ld e, a
 	add hl, de
-	res 7, [hl]
+	res BIT_FACE_PLAYER, [hl]
 	call GetSpriteMovementByte2Pointer
 	ld a, [hl]
 	cp BOULDER_MOVEMENT_BYTE_2
diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm
index 303415c1..b20d490e 100644
--- a/engine/overworld/special_warps.asm
+++ b/engine/overworld/special_warps.asm
@@ -52,7 +52,7 @@ LoadSpecialWarpData:
 	bit BIT_DEBUG_MODE, a
 	; warp to wLastMap (PALLET_TOWN) for StartNewGameDebug
 	jr nz, .notNewGameWarp
-	bit 2, a
+	bit BIT_FLY_OR_DUNGEON_WARP, a
 	jr nz, .notNewGameWarp
 	ld hl, NewGameWarp
 .copyWarpData