From 8f1dcf07e598c6e3d34b5d255f04faff1667d83b Mon Sep 17 00:00:00 2001
From: Sylvie <35663410+Rangi42@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:51:44 -0400
Subject: Identify more flag bits (#464)

---
 engine/items/item_effects.asm | 10 +++++-----
 engine/items/town_map.asm     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engine/items')

diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 91462478..9643412c 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -691,7 +691,7 @@ ItemUseSurfboard:
 	ldh [hSpriteIndex], a
 	ld d, 16 ; talking range in pixels (normal range)
 	call IsSpriteInFrontOfPlayer2
-	res 7, [hl]
+	res BIT_FACE_PLAYER, [hl]
 	ldh a, [hSpriteIndex]
 	and a ; is there a sprite in the way?
 	jr nz, .cannotStopSurfing
@@ -1052,13 +1052,13 @@ ItemUseMedicine:
 	ld a, SFX_HEAL_HP
 	call PlaySoundWaitForCurrent
 	ldh a, [hUILayoutFlags]
-	set 0, a
+	set BIT_PARTY_MENU_HP_BAR, a
 	ldh [hUILayoutFlags], a
 	ld a, $02
 	ld [wHPBarType], a
 	predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled
 	ldh a, [hUILayoutFlags]
-	res 0, a
+	res BIT_PARTY_MENU_HP_BAR, a
 	ldh [hUILayoutFlags], a
 	pop af
 	ld b, a ; store heal amount (1/5 of max HP)
@@ -1202,13 +1202,13 @@ ItemUseMedicine:
 	ld a, SFX_HEAL_HP
 	call PlaySoundWaitForCurrent
 	ldh a, [hUILayoutFlags]
-	set 0, a
+	set BIT_PARTY_MENU_HP_BAR, a
 	ldh [hUILayoutFlags], a
 	ld a, $02
 	ld [wHPBarType], a
 	predef UpdateHPBar2 ; animate the HP bar lengthening
 	ldh a, [hUILayoutFlags]
-	res 0, a
+	res BIT_PARTY_MENU_HP_BAR, a
 	ldh [hUILayoutFlags], a
 	ld a, REVIVE_MSG
 	ld [wPartyMenuTypeOrMessageID], a
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index a9840268..6f2c050c 100644
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -75,9 +75,9 @@ DisplayTownMap:
 	jr z, .inputLoop
 	ld a, SFX_TINK
 	call PlaySound
-	bit 6, b
+	bit BIT_D_UP, b
 	jr nz, .pressedUp
-	bit 7, b
+	bit BIT_D_DOWN, b
 	jr nz, .pressedDown
 	xor a
 	ld [wTownMapSpriteBlinkingEnabled], a
@@ -196,13 +196,13 @@ LoadTownMap_Fly::
 	pop hl
 	and A_BUTTON | B_BUTTON | D_UP | D_DOWN
 	jr z, .inputLoop
-	bit 0, b
+	bit BIT_A_BUTTON, b
 	jr nz, .pressedA
 	ld a, SFX_TINK
 	call PlaySound
-	bit 6, b
+	bit BIT_D_UP, b
 	jr nz, .pressedUp
-	bit 7, b
+	bit BIT_D_DOWN, b
 	jr nz, .pressedDown
 	jr .pressedB
 .pressedA
-- 
cgit v1.3.1-sl0p