diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-13 22:22:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 22:22:43 -0400 |
| commit | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (patch) | |
| tree | 6cbdbe8e87708ffca6a49d6b507ed6341b26f4e2 /src/item_use.c | |
| parent | 6c5d1c4a3de2f1a2d1855a542a6a5d53e4daf936 (diff) | |
| parent | 68cf5eb3cbff3b0eac6cd348c7e6c594c287d67b (diff) | |
Merge pull request #10 from pret/master
sync with source repo
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/item_use.c b/src/item_use.c index 4e76ea434..1f33144b2 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -34,6 +34,8 @@ #include "string_util.h" #include "strings.h" #include "task.h" +#include "constants/bg_event_constants.h" +#include "constants/map_types.h" #include "constants/species.h" #include "constants/vars.h" @@ -335,12 +337,12 @@ 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 + FLAG_HIDDEN_ITEMS_START)) + if ((events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM) && !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; + distanceX = (u16)events->bgEvents[i].x + 7; newDistanceX = distanceX - x; - distanceY = (u16)events -> bgEvents[i].y + 7; + distanceY = (u16)events->bgEvents[i].y + 7; newDistanceY = distanceY - y; // is item in range? @@ -365,7 +367,7 @@ bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y) for (i = 0; i < bgEventCount; i++) { - 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 (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && 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 + FLAG_HIDDEN_ITEMS_START)) return TRUE; |