dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve review comments

Browse Source
This commit is contained in:
PikalaxALT
2019-10-03 14:01:57 -04:00
parent 26d940dfeb
commit a56a90d998
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.fieldmap.h
+2 -2
View File
@@ -122,10 +122,10 @@ struct CoordEvent
struct HiddenItemStruct struct HiddenItemStruct
{ {
u32 field_00:16; u32 quantity:16;
u32 hiddenItemId:8; // flag offset to determine flag lookup u32 hiddenItemId:8; // flag offset to determine flag lookup
u32 field_03_0:7; u32 field_03_0:7;
u32 field_03_7:1; u32 isUnderfoot:1;
}; };
union BgUnion union BgUnion
src/itemfinder.c
+11 -11
View File
@@ -16,7 +16,7 @@
static void Task_NoResponse_CleanUp(u8 taskId); static void Task_NoResponse_CleanUp(u8 taskId);
static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId); static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId);
static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId); static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId);
static bool8 HiddenItemIsWithinRangeOfPlayer(struct MapEvents *events, u8 taskId); static bool8 HiddenItemIsWithinRangeOfPlayer(struct MapEvents * events, u8 taskId);
static void SetUnderfootHiddenItem(u8 taskId, struct HiddenItemStruct hiddenItem); static void SetUnderfootHiddenItem(u8 taskId, struct HiddenItemStruct hiddenItem);
static void SetNormalHiddenItem(u8 taskId); static void SetNormalHiddenItem(u8 taskId);
static void FindHiddenItemsInConnectedMaps(u8 taskId); static void FindHiddenItemsInConnectedMaps(u8 taskId);
@@ -158,7 +158,7 @@ static void Task_NoResponse_CleanUp(u8 taskId)
static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId) static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
u8 direction; u8 direction;
if (tDingTimer % 25 == 0) if (tDingTimer % 25 == 0)
{ {
@@ -181,7 +181,7 @@ static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId)
static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId) static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
if (tDingTimer % 25 == 0) if (tDingTimer % 25 == 0)
{ {
if (tNumDingsRemaining == 0) if (tNumDingsRemaining == 0)
@@ -200,7 +200,7 @@ static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId)
tDingTimer++; tDingTimer++;
} }
static bool8 HiddenItemIsWithinRangeOfPlayer(struct MapEvents *events, u8 taskId) static bool8 HiddenItemIsWithinRangeOfPlayer(struct MapEvents * events, u8 taskId)
{ {
s16 x, y, i, dx, dy; s16 x, y, i, dx, dy;
PlayerGetDestCoords(&x, &y); PlayerGetDestCoords(&x, &y);
@@ -241,7 +241,7 @@ static bool8 HiddenItemIsWithinRangeOfPlayer(struct MapEvents *events, u8 taskId
static void SetUnderfootHiddenItem(u8 taskId, struct HiddenItemStruct hiddenItem) static void SetUnderfootHiddenItem(u8 taskId, struct HiddenItemStruct hiddenItem)
{ {
s16 * data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
gSpecialVar_0x8004 = GetHiddenItemAttr(hiddenItem, 1); gSpecialVar_0x8004 = GetHiddenItemAttr(hiddenItem, 1);
gSpecialVar_0x8005 = GetHiddenItemAttr(hiddenItem, 0); gSpecialVar_0x8005 = GetHiddenItemAttr(hiddenItem, 0);
gSpecialVar_0x8006 = 1; gSpecialVar_0x8006 = 1;
@@ -255,7 +255,7 @@ static void SetUnderfootHiddenItem(u8 taskId, struct HiddenItemStruct hiddenItem
static void SetNormalHiddenItem(u8 taskId) static void SetNormalHiddenItem(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
s16 absY = tItemY; s16 absY = tItemY;
s16 absX = tItemX; s16 absX = tItemX;
@@ -285,10 +285,10 @@ static void SetNormalHiddenItem(u8 taskId)
} }
} }
static bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y) static bool8 HiddenItemAtPos(struct MapEvents * events, s16 x, s16 y)
{ {
u8 bgEventCount = events->bgEventCount; u8 bgEventCount = events->bgEventCount;
struct BgEvent *bgEvents = events->bgEvents; struct BgEvent * bgEvents = events->bgEvents;
u16 eventFlag; u16 eventFlag;
int i; int i;
@@ -312,7 +312,7 @@ static bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y)
static bool8 HiddenItemInConnectedMapAtPos(struct MapConnection * connection, s32 x, s32 y) static bool8 HiddenItemInConnectedMapAtPos(struct MapConnection * connection, s32 x, s32 y)
{ {
const struct MapHeader *mapHeader; const struct MapHeader * mapHeader;
u16 localX, localY; u16 localX, localY;
u32 localOffset; u32 localOffset;
s32 localLength; s32 localLength;
@@ -321,7 +321,7 @@ static bool8 HiddenItemInConnectedMapAtPos(struct MapConnection * connection, s3
switch (connection->direction) switch (connection->direction)
{ {
// same weird temp variable behavior seen in HiddenItemAtPos // same weird temp variable behavior seen in HiddenItemAtPos
case 2: case 2:
localOffset = connection->offset + 7; localOffset = connection->offset + 7;
localX = x - localOffset; localX = x - localOffset;
@@ -373,7 +373,7 @@ static void FindHiddenItemsInConnectedMaps(u8 taskId)
|| var2 > curY || var2 > curY
|| curY >= height) || curY >= height)
{ {
struct MapConnection *conn = GetMapConnectionAtPos(curX, curY); struct MapConnection * conn = GetMapConnectionAtPos(curX, curY);
if (conn != NULL && HiddenItemInConnectedMapAtPos(conn, curX, curY) == TRUE) if (conn != NULL && HiddenItemInConnectedMapAtPos(conn, curX, curY) == TRUE)
RegisterHiddenItemRelativeCoordsIfCloser(taskId, curX - x, curY - y); RegisterHiddenItemRelativeCoordsIfCloser(taskId, curX - x, curY - y);
} }