diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-20 23:12:51 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-20 23:12:51 -0500 |
| commit | 82cb741d8b2b2d88c1e23d2d5ccf5443892538fa (patch) | |
| tree | c05b6424006d1d46a3d38c0205c1dfce986c6fdc /src/shop.c | |
| parent | ec3e86f1d2f78bb9fece0956e246862cea3c07b9 (diff) | |
Standardize EVENT_OBJECT to OBJECT_EVENT
Diffstat (limited to 'src/shop.c')
| -rwxr-xr-x | src/shop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shop.c b/src/shop.c index 7a51b32b8..465a581b2 100755 --- a/src/shop.c +++ b/src/shop.c @@ -797,7 +797,7 @@ static void BuyMenuCollectObjectEventData(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); for (y = 0; y < 16; y++) - gShopDataPtr->viewportObjects[y][EVENT_OBJ_ID] = 16; + gShopDataPtr->viewportObjects[y][OBJ_EVENT_ID] = 16; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) @@ -806,7 +806,7 @@ static void BuyMenuCollectObjectEventData(void) if (objEventId != 16) { - gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = objEventId; + gShopDataPtr->viewportObjects[r8][OBJ_EVENT_ID] = objEventId; gShopDataPtr->viewportObjects[r8][X_COORD] = x; gShopDataPtr->viewportObjects[r8][Y_COORD] = y; gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y); @@ -841,13 +841,13 @@ static void BuyMenuDrawObjectEvents(void) for (i = 0; i < 16; i++) // max objects? { - if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16) + if (gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID] == 16) continue; - graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID]].graphicsId); spriteId = AddPseudoObjectEvent( - gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, + gObjectEvents[gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID]].graphicsId, SpriteCallbackDummy, (u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8, (u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, |