From 46a8b0fb29e4b6ba0535350f7eb0b4681b026749 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 2 Dec 2019 16:51:24 -0500 Subject: finish object event rename --- src/event_object_lock.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 src/event_object_lock.c (limited to 'src/event_object_lock.c') diff --git a/src/event_object_lock.c b/src/event_object_lock.c new file mode 100644 index 000000000..e9de984f1 --- /dev/null +++ b/src/event_object_lock.c @@ -0,0 +1,115 @@ +#include "global.h" +#include "task.h" +#include "field_player_avatar.h" +#include "event_object_movement.h" +#include "script_movement.h" +#include "event_object_80688E4.h" +#include "event_data.h" +#include "event_object_lock.h" + +bool8 walkrun_is_standing_still(void) +{ + if (gPlayerAvatar.running1 == 1) + return FALSE; + else + return TRUE; +} + +void sub_8069570(u8 taskId) +{ + if (walkrun_is_standing_still()) + { + sub_805C270(); + DestroyTask(taskId); + } +} + +bool8 sub_8069590(void) +{ + if (FuncIsActiveTask(sub_8069570)) + return FALSE; + else + { + sub_805C780(); + return TRUE; + } +} + +void ScriptFreezeObjectEvents(void) +{ + FreezeEventObjects(); + CreateTask(sub_8069570, 80); +} + +void sub_80695CC(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + + if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE) + { + sub_805C270(); + task->data[0] = 1; + } + + if (task->data[1] == 0 && !gObjectEvents[gSelectedObjectEvent].mapobj_bit_1) + { + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); + task->data[1] = 1; + } + + if (task->data[0] && task->data[1]) + DestroyTask(taskId); +} + +bool8 sub_8069648(void) +{ + if (FuncIsActiveTask(sub_80695CC)) + return FALSE; + else + { + sub_805C780(); + return TRUE; + } +} + +void LockSelectedObjectEvent(void) +{ + u8 taskId; + + FreezeObjectEventsExceptOne(gSelectedObjectEvent); + taskId = CreateTask(sub_80695CC, 80); + if (!gObjectEvents[gSelectedObjectEvent].mapobj_bit_1) + { + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); + gTasks[taskId].data[1] = 1; + } +} + +void sub_80696C0(void) +{ + u8 fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]); + sub_80974D8(); + UnfreezeObjectEvents(); +} + +void sub_80696F0(void) +{ + u8 fieldObjectId; + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]); + sub_80974D8(); + UnfreezeObjectEvents(); +} + +void sub_8069740(void) +{ + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); +} + +void sub_8069768(void) +{ + ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]); +} -- cgit v1.2.3 From ddaa88390e53665c6ac73af5e1a2f519dbddb5c6 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 18:49:34 -0500 Subject: eventobject -> objectevent take 3 --- src/event_object_lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/event_object_lock.c') diff --git a/src/event_object_lock.c b/src/event_object_lock.c index e9de984f1..23131067e 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -37,7 +37,7 @@ bool8 sub_8069590(void) void ScriptFreezeObjectEvents(void) { - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_8069570, 80); } -- cgit v1.2.3 From fabe354c015e0d587353093debafff6f44d6ab07 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 20:16:40 -0500 Subject: final pass at unifying on object event --- src/event_object_lock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/event_object_lock.c') diff --git a/src/event_object_lock.c b/src/event_object_lock.c index 23131067e..17ec57b20 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -87,19 +87,19 @@ void LockSelectedObjectEvent(void) void sub_80696C0(void) { - u8 fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]); + u8 objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); sub_80974D8(); UnfreezeObjectEvents(); } void sub_80696F0(void) { - u8 fieldObjectId; + u8 objectEventId; if (gObjectEvents[gSelectedObjectEvent].active) ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); - fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]); + objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]); sub_80974D8(); UnfreezeObjectEvents(); } -- cgit v1.2.3