diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 09:33:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 09:33:58 -0600 |
| commit | 86a36767dba19e84297047addf1d1d776e2efdec (patch) | |
| tree | f2aaa9e93f8b8671491eda458963aee1027924c2 /src/field/item_use.c | |
| parent | e3078400bbdb3e8416806127290b9a2d68cfb3b8 (diff) | |
| parent | d34de50d34d18ee64c95232202751532534c2ed9 (diff) | |
Merge pull request #501 from huderlem/event_macros
New map event macros
Diffstat (limited to 'src/field/item_use.c')
| -rw-r--r-- | src/field/item_use.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/field/item_use.c b/src/field/item_use.c index cf5f05eb9..e1fdddce0 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -14,6 +14,7 @@ #include "fieldmap.h" #include "item.h" #include "item_menu.h" +#include "constants/flags.h" #include "constants/items.h" #include "mail.h" #include "main.h" @@ -328,7 +329,7 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId) for (i = 0; i < events->bgEventCount; i++) { - if ((events -> bgEvents[i].kind == 7) && !FlagGet(events -> bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 600)) + if ((events -> bgEvents[i].kind == 7) && !FlagGet(events -> bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) { // do a distance lookup of each item so long as the index remains less than the objects on the current map. distanceX = (u16)events -> bgEvents[i].x + 7; @@ -360,7 +361,7 @@ bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y) { if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? { - if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 600)) + if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START)) return TRUE; else return FALSE; |