diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
| commit | aa9a45c16fbaee2fffc94e4741e0a1f203b244bc (patch) | |
| tree | 9bdd507453e9b51ff52216d9f04bda62ac799cfb /src/item_use.c | |
| parent | ed245b677addbb7f5c748193301507de7fed6ec4 (diff) | |
Rebrand 'map object' and 'field object' to 'event object'
Diffstat (limited to 'src/item_use.c')
| -rwxr-xr-x | src/item_use.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/item_use.c b/src/item_use.c index 82d96606a..2044a8c87 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -579,15 +579,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY) void sub_80FDA24(u8 direction) { - FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - FieldObjectClearAnim(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - npc_sync_anim_pause_bits(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + EventObjectClearAnim(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + npc_sync_anim_pause_bits(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); PlayerTurnInPlace(direction); } void sub_80FDA94(u8 taskId) { - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) + if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); } @@ -595,7 +595,7 @@ void sub_80FDADC(u8 taskId) { s16 *data = gTasks[taskId].data; - if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE + if (EventObjectCheckIfSpecialAnimFinishedOrInactive(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE || data[2] == FALSE) { sub_80FDA24(gUnknown_085920E4[data[5]]); @@ -727,8 +727,8 @@ bool8 sub_80FDE2C(void) u8 objId; GetXYCoordsOneStepInFrontOfPlayer(&x, &y); z = PlayerGetZCoord(); - objId = GetFieldObjectIdByXYZ(x, y, z); - if (objId == 16 || gMapObjects[objId].graphicsId != 0xE4) + objId = GetEventObjectIdByXYZ(x, y, z); + if (objId == 16 || gEventObjects[objId].graphicsId != 0xE4) return FALSE; else return TRUE; |