From c169073eed4f0362ef42170098a141a2fcbd71d0 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Sat, 18 Jul 2015 20:49:52 -0700
Subject: misc

---
 engine/items/itemfinder.asm | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'engine/items/itemfinder.asm')

diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm
index 96abecd3..51277632 100755
--- a/engine/items/itemfinder.asm
+++ b/engine/items/itemfinder.asm
@@ -1,14 +1,14 @@
 HiddenItemNear: ; 7481f (1d:481f)
 	ld hl, HiddenItemCoords
-	ld b, $0
-.asm_74824
-	ld de, $0003
+	ld b, 0
+.loop
+	ld de, 3
 	ld a, [W_CURMAP]
 	call IsInRestOfArray
 	ret nc ; return if current map has no hidden items
 	push bc
 	push hl
-	ld hl, wd6f0
+	ld hl, wObtainedHiddenItemsFlags
 	ld c, b
 	ld b, $2
 	predef FlagActionPredef
@@ -22,28 +22,30 @@ HiddenItemNear: ; 7481f (1d:481f)
 	inc hl
 	ld e, [hl]
 	inc hl
-	jr nz, .asm_74824
+	jr nz, .loop ; if the item has already been obtained
+; check if the item is within 4-5 tiles (depending on the direction of item)
 	ld a, [W_YCOORD]
-	call Func_7486b
+	call Sub5ClampTo0
 	cp d
-	jr nc, .asm_74824
+	jr nc, .loop
 	ld a, [W_YCOORD]
-	add $4
+	add 4
 	cp d
-	jr c, .asm_74824
+	jr c, .loop
 	ld a, [W_XCOORD]
-	call Func_7486b
+	call Sub5ClampTo0
 	cp e
-	jr nc, .asm_74824
+	jr nc, .loop
 	ld a, [W_XCOORD]
-	add $5
+	add 5
 	cp e
-	jr c, .asm_74824
+	jr c, .loop
 	scf
 	ret
 
-Func_7486b: ; 7486b (1d:486b)
-	sub $5
+Sub5ClampTo0: ; 7486b (1d:486b)
+; subtract 5 but clamp to 0
+	sub 5
 	cp $f0
 	ret c
 	xor a
-- 
cgit v1.3.1-sl0p