diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:42 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:42 -0500 |
| commit | 5df6fa5c08a19fb89308f6131dceef721cc5a3d0 (patch) | |
| tree | 5aaaa5828622b42023320e211cffd3dd4bb3feb8 /src/shop.c | |
| parent | aa8299821dca148ecfd5d6bfb77641043e01da5c (diff) | |
Unify 'map object' and 'field object' terms into 'event object'
Diffstat (limited to 'src/shop.c')
| -rw-r--r-- | src/shop.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/shop.c b/src/shop.c index 62c8c9a87..88719e25e 100644 --- a/src/shop.c +++ b/src/shop.c @@ -447,25 +447,25 @@ static void Shop_LoadViewportObjects(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); playerHeight = PlayerGetZCoord(); for (y = 0; y < 16; y++) - gMartViewportObjects[y][MAP_OBJ_ID] = 16; + gMartViewportObjects[y][EVENT_OBJ_ID] = 16; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) { - u8 mapObjId = GetFieldObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight); + u8 eventObjId = GetEventObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight); - if (mapObjId != 16) + if (eventObjId != 16) { - gMartViewportObjects[r8][MAP_OBJ_ID] = mapObjId; + gMartViewportObjects[r8][EVENT_OBJ_ID] = eventObjId; gMartViewportObjects[r8][X_COORD] = x; gMartViewportObjects[r8][Y_COORD] = y; - if (gMapObjects[mapObjId].facingDirection == DIR_SOUTH) + if (gEventObjects[eventObjId].facingDirection == DIR_SOUTH) gMartViewportObjects[r8][ANIM_NUM] = 0; - if (gMapObjects[mapObjId].facingDirection == DIR_NORTH) + if (gEventObjects[eventObjId].facingDirection == DIR_NORTH) gMartViewportObjects[r8][ANIM_NUM] = 1; - if (gMapObjects[mapObjId].facingDirection == DIR_WEST) + if (gEventObjects[eventObjId].facingDirection == DIR_WEST) gMartViewportObjects[r8][ANIM_NUM] = 2; - if (gMapObjects[mapObjId].facingDirection == DIR_EAST) + if (gEventObjects[eventObjId].facingDirection == DIR_EAST) gMartViewportObjects[r8][ANIM_NUM] = 3; r8++; } @@ -479,11 +479,11 @@ static void Shop_AnimViewportObjects(void) for (i = 0; i < 16; i++) // max objects? { - if (gMartViewportObjects[i][MAP_OBJ_ID] == 16) + if (gMartViewportObjects[i][EVENT_OBJ_ID] == 16) continue; - StartSpriteAnim(&gSprites[AddPseudoFieldObject( - gMapObjects[gMartViewportObjects[i][MAP_OBJ_ID]].graphicsId, + StartSpriteAnim(&gSprites[AddPseudoEventObject( + gEventObjects[gMartViewportObjects[i][EVENT_OBJ_ID]].graphicsId, SpriteCallbackDummy, (u16)gMartViewportObjects[i][X_COORD] * 16 + 8, (u16)gMartViewportObjects[i][Y_COORD] * 16 + 32, |