diff options
| author | garak <garakmon@gmail.com> | 2019-12-17 20:16:40 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 20:16:40 -0500 |
| commit | fabe354c015e0d587353093debafff6f44d6ab07 (patch) | |
| tree | a8c099310a5154e6d87b5a9d67754d48d52bc89c /src/quest_log.c | |
| parent | ddaa88390e53665c6ac73af5e1a2f519dbddb5c6 (diff) | |
final pass at unifying on object event
Diffstat (limited to 'src/quest_log.c')
| -rw-r--r-- | src/quest_log.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quest_log.c b/src/quest_log.c index 7448e4b87..6b25150f3 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1532,12 +1532,12 @@ void sub_8112450(void) void sub_811246C(struct Sprite *sprite) { - struct ObjectEvent *mapObject = &gObjectEvents[sprite->data[0]]; - if (mapObject->localId == 0xFF) + struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->localId == 0xFF) { if (gUnknown_203AF9A[0][0] != 0xFF) { - ObjectEventSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]); + ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[0][0]); gUnknown_203AF9A[0][0] = 0xFF; } if (gUnknown_203AF9A[0][1] != 0xFF) @@ -1545,16 +1545,16 @@ void sub_811246C(struct Sprite *sprite) sub_8150454(); gUnknown_203AF9A[0][1] = 0xFF; } - sub_8063E28(mapObject, sprite); + sub_8063E28(objectEvent, sprite); } else { - if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF) + if (gUnknown_203AF9A[objectEvent->localId][0] != 0xFF) { - ObjectEventSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]); - gUnknown_203AF9A[mapObject->localId][0] = 0xFF; + ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[objectEvent->localId][0]); + gUnknown_203AF9A[objectEvent->localId][0] = 0xFF; } - sub_8063E28(mapObject, sprite); + sub_8063E28(objectEvent, sprite); } } |