From 4d2594cb24b7e67cde4e1373c9a2b5e0ae7ff473 Mon Sep 17 00:00:00 2001
From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com>
Date: Wed, 3 Sep 2025 17:56:09 +0200
Subject: Label and constant cleanup (#528)

* Label cleanup, add some constants instead of raw numbers

* Rename load/save game functions to be more explicit
---
 engine/pokemon/bills_pc.asm      | 5 +++--
 engine/pokemon/status_screen.asm | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'engine/pokemon')

diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index ea21e8e2..6d522377 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -151,7 +151,7 @@ BillsPCMenu:
 	ld c, 9
 	call TextBoxBorder
 	ld a, [wCurrentBoxNum]
-	and $7f
+	and BOX_NUM_MASK
 	cp 9
 	jr c, .singleDigitBoxNum
 ; two digit box num
@@ -236,7 +236,7 @@ BillsPCDeposit:
 	call WaitForSoundToFinish
 	ld hl, wBoxNumString
 	ld a, [wCurrentBoxNum]
-	and $7f
+	and BOX_NUM_MASK
 	cp 9
 	jr c, .singleDigitBoxNum
 	sub 9
@@ -538,6 +538,7 @@ JustAMomentText::
 	text_far _JustAMomentText
 	text_end
 
+UnusedOpenBillsPC: ; unreferenced
 	ld a, [wSpritePlayerStateData1FacingDirection]
 	cp SPRITE_FACING_UP
 	ret nz
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index a68f9b38..344e7802 100644
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -427,7 +427,7 @@ StatusScreen2:
 	ld a, $1
 	ldh [hAutoBGTransferEnabled], a
 	call Delay3
-	call WaitForTextScrollButtonPress ; wait for button
+	call WaitForTextScrollButtonPress
 	pop af
 	ldh [hTileAnimations], a
 	ld hl, wStatusFlags2
-- 
cgit v1.3.1-sl0p