diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /engine/items/itemfinder.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'engine/items/itemfinder.asm')
| -rwxr-xr-x | engine/items/itemfinder.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 5da72388..d638b0b8 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -3,7 +3,7 @@ HiddenItemNear: ; 7481f (1d:481f) ld b, 0 .loop ld de, 3 - ld a, [W_CURMAP] + ld a, [wCurMap] call IsInRestOfArray ret nc ; return if current map has no hidden items push bc @@ -24,19 +24,19 @@ HiddenItemNear: ; 7481f (1d:481f) inc hl 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] + ld a, [wYCoord] call Sub5ClampTo0 cp d jr nc, .loop - ld a, [W_YCOORD] + ld a, [wYCoord] add 4 cp d jr c, .loop - ld a, [W_XCOORD] + ld a, [wXCoord] call Sub5ClampTo0 cp e jr nc, .loop - ld a, [W_XCOORD] + ld a, [wXCoord] add 5 cp e jr c, .loop |