diff options
| author | garak <garakmon@gmail.com> | 2019-12-02 13:34:11 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 15:05:23 -0500 |
| commit | 36b2301fd262adc70fc89ecdd3a7a97549b5a6c9 (patch) | |
| tree | d87eb50b90952efd02d027fd04fb0d05432a1b50 /src/itemfinder.c | |
| parent | ebd3a1371757839c260256e2d8101fc6448b2915 (diff) | |
mostly standardize to object event to prep for disassembly
Diffstat (limited to 'src/itemfinder.c')
| -rw-r--r-- | src/itemfinder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/itemfinder.c b/src/itemfinder.c index 05072c49e..5ae30e6e4 100644 --- a/src/itemfinder.c +++ b/src/itemfinder.c @@ -325,23 +325,23 @@ static bool8 HiddenItemInConnectedMapAtPos(struct MapConnection * connection, s3 case 2: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = mapHeader->mapData->height - 7; + localLength = mapHeader->mapLayout->height - 7; localY = localLength + y; // additions are reversed for some reason break; case 1: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = gMapHeader.mapData->height + 7; + localLength = gMapHeader.mapLayout->height + 7; localY = y - localLength; break; case 3: - localLength = mapHeader->mapData->width - 7; + localLength = mapHeader->mapLayout->width - 7; localX = localLength + x; // additions are reversed for some reason localOffset = connection->offset + 7; localY = y - localOffset; break; case 4: - localLength = gMapHeader.mapData->width + 7; + localLength = gMapHeader.mapLayout->width + 7; localX = x - localLength; localOffset = connection->offset + 7; localY = y - localOffset; @@ -356,8 +356,8 @@ static void FindHiddenItemsInConnectedMaps(u8 taskId) { s16 x, y; s16 curX, curY; - s16 width = gMapHeader.mapData->width + 7; - s16 height = gMapHeader.mapData->height + 7; + s16 width = gMapHeader.mapLayout->width + 7; + s16 height = gMapHeader.mapLayout->height + 7; s16 var1 = 7; s16 var2 = 7; |