From 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Dec 2019 02:55:30 -0500 Subject: Rename event_obj_lock to event_object_lock --- src/event_obj_lock.c | 187 ---------------------------------------------- src/event_object_lock.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++ src/field_screen_effect.c | 3 +- src/fldeff_cut.c | 2 +- src/item_use.c | 2 +- src/scrcmd.c | 2 +- src/start_menu.c | 2 +- src/union_room.c | 2 +- 8 files changed, 193 insertions(+), 194 deletions(-) delete mode 100644 src/event_obj_lock.c create mode 100644 src/event_object_lock.c (limited to 'src') diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c deleted file mode 100644 index ce808fc2a..000000000 --- a/src/event_obj_lock.c +++ /dev/null @@ -1,187 +0,0 @@ -#include "global.h" -#include "event_data.h" -#include "event_object_movement.h" -#include "field_player_avatar.h" -#include "event_obj_lock.h" -#include "script_movement.h" -#include "task.h" -#include "trainer_see.h" -#include "constants/event_objects.h" - -bool8 walkrun_is_standing_still(void) -{ - if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) - return FALSE; - else - return TRUE; -} - -static void sub_80983A4(u8 taskId) -{ - if (walkrun_is_standing_still()) - { - sub_808B864(); - DestroyTask(taskId); - } -} - -bool8 sub_80983C4(void) -{ - if (FuncIsActiveTask(sub_80983A4)) - { - return FALSE; - } - else - { - sub_808BCF4(); - return TRUE; - } -} - - -void ScriptFreezeObjectEvents(void) -{ - FreezeObjectEvents(); - CreateTask(sub_80983A4, 80); -} - -static void sub_8098400(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - if (!task->data[0] && walkrun_is_standing_still() == TRUE) - { - sub_808B864(); - task->data[0] = 1; - } - if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive) - { - FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); - task->data[1] = 1; - } - if (task->data[0] && task->data[1]) - DestroyTask(taskId); -} - -bool8 sub_809847C(void) -{ - if (FuncIsActiveTask(sub_8098400)) - { - return FALSE; - } - else - { - sub_808BCF4(); - return TRUE; - } -} - -void LockSelectedObjectEvent(void) -{ - u8 taskId; - FreezeObjectEventsExceptOne(gSelectedObjectEvent); - taskId = CreateTask(sub_8098400, 80); - if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) - { - FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); - gTasks[taskId].data[1] = 1; - } -} - -void ScriptUnfreezeObjectEvents(void) -{ - u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); - ScriptMovement_UnfreezeObjectEvents(); - UnfreezeObjectEvents(); -} - -void sub_8098524(void) -{ - u8 playerObjectId; - - if (gObjectEvents[gSelectedObjectEvent].active) - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); - playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); - ScriptMovement_UnfreezeObjectEvents(); - UnfreezeObjectEvents(); -} - -void Script_FacePlayer(void) -{ - ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); -} - -void Script_ClearHeldMovement(void) -{ - ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); -} - -static void sub_80985BC(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - u8 objectEventId = task->data[2]; - - if (!task->data[0] && walkrun_is_standing_still() == TRUE) - { - sub_808B864(); - task->data[0] = 1; - } - if (!task->data[1] && !gObjectEvents[objectEventId].singleMovementActive) - { - FreezeObjectEvent(&gObjectEvents[objectEventId]); - task->data[1] = 1; - } - if (task->data[0] && task->data[1]) - DestroyTask(taskId); -} - -void sub_8098630(void) -{ - u8 trainerObjectId1, trainerObjectId2, taskId; - trainerObjectId1 = GetChosenApproachingTrainerObjectEventId(0); - if(gNoOfApproachingTrainers == 2) - { - trainerObjectId2 = GetChosenApproachingTrainerObjectEventId(1); - sub_8098074(trainerObjectId1, trainerObjectId2); - taskId = CreateTask(sub_80985BC, 80); - gTasks[taskId].data[2] = trainerObjectId1; - if(!gObjectEvents[trainerObjectId1].singleMovementActive) - { - FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); - gTasks[taskId].data[1] = 1; - } - taskId = CreateTask(sub_80985BC, 81); - gTasks[taskId].data[2] = trainerObjectId2; - if(!gObjectEvents[trainerObjectId2].singleMovementActive) - { - FreezeObjectEvent(&gObjectEvents[trainerObjectId2]); - gTasks[taskId].data[1] = 1; - } - } - else - { - FreezeObjectEventsExceptOne(trainerObjectId1); - taskId = CreateTask(sub_80985BC, 80); - gTasks[taskId].data[2] = trainerObjectId1; - if(!gObjectEvents[trainerObjectId1].singleMovementActive) - { - FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); - gTasks[taskId].data[1] = 1; - } - } -} - -bool8 sub_8098734(void) -{ - if (FuncIsActiveTask(sub_80985BC)) - { - return FALSE; - } - else - { - sub_808BCF4(); - return TRUE; - } -} diff --git a/src/event_object_lock.c b/src/event_object_lock.c new file mode 100644 index 000000000..1f1be8d5a --- /dev/null +++ b/src/event_object_lock.c @@ -0,0 +1,187 @@ +#include "global.h" +#include "event_data.h" +#include "event_object_lock.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "script_movement.h" +#include "task.h" +#include "trainer_see.h" +#include "constants/event_objects.h" + +bool8 walkrun_is_standing_still(void) +{ + if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) + return FALSE; + else + return TRUE; +} + +static void sub_80983A4(u8 taskId) +{ + if (walkrun_is_standing_still()) + { + sub_808B864(); + DestroyTask(taskId); + } +} + +bool8 sub_80983C4(void) +{ + if (FuncIsActiveTask(sub_80983A4)) + { + return FALSE; + } + else + { + sub_808BCF4(); + return TRUE; + } +} + + +void ScriptFreezeObjectEvents(void) +{ + FreezeObjectEvents(); + CreateTask(sub_80983A4, 80); +} + +static void sub_8098400(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (!task->data[0] && walkrun_is_standing_still() == TRUE) + { + sub_808B864(); + task->data[0] = 1; + } + if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive) + { + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); + task->data[1] = 1; + } + if (task->data[0] && task->data[1]) + DestroyTask(taskId); +} + +bool8 sub_809847C(void) +{ + if (FuncIsActiveTask(sub_8098400)) + { + return FALSE; + } + else + { + sub_808BCF4(); + return TRUE; + } +} + +void LockSelectedObjectEvent(void) +{ + u8 taskId; + FreezeObjectEventsExceptOne(gSelectedObjectEvent); + taskId = CreateTask(sub_8098400, 80); + if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) + { + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); + gTasks[taskId].data[1] = 1; + } +} + +void ScriptUnfreezeObjectEvents(void) +{ + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); +} + +void sub_8098524(void) +{ + u8 playerObjectId; + + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); +} + +void Script_FacePlayer(void) +{ + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); +} + +void Script_ClearHeldMovement(void) +{ + ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); +} + +static void sub_80985BC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + u8 objectEventId = task->data[2]; + + if (!task->data[0] && walkrun_is_standing_still() == TRUE) + { + sub_808B864(); + task->data[0] = 1; + } + if (!task->data[1] && !gObjectEvents[objectEventId].singleMovementActive) + { + FreezeObjectEvent(&gObjectEvents[objectEventId]); + task->data[1] = 1; + } + if (task->data[0] && task->data[1]) + DestroyTask(taskId); +} + +void sub_8098630(void) +{ + u8 trainerObjectId1, trainerObjectId2, taskId; + trainerObjectId1 = GetChosenApproachingTrainerObjectEventId(0); + if(gNoOfApproachingTrainers == 2) + { + trainerObjectId2 = GetChosenApproachingTrainerObjectEventId(1); + sub_8098074(trainerObjectId1, trainerObjectId2); + taskId = CreateTask(sub_80985BC, 80); + gTasks[taskId].data[2] = trainerObjectId1; + if(!gObjectEvents[trainerObjectId1].singleMovementActive) + { + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); + gTasks[taskId].data[1] = 1; + } + taskId = CreateTask(sub_80985BC, 81); + gTasks[taskId].data[2] = trainerObjectId2; + if(!gObjectEvents[trainerObjectId2].singleMovementActive) + { + FreezeObjectEvent(&gObjectEvents[trainerObjectId2]); + gTasks[taskId].data[1] = 1; + } + } + else + { + FreezeObjectEventsExceptOne(trainerObjectId1); + taskId = CreateTask(sub_80985BC, 80); + gTasks[taskId].data[2] = trainerObjectId1; + if(!gObjectEvents[trainerObjectId1].singleMovementActive) + { + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); + gTasks[taskId].data[1] = 1; + } + } +} + +bool8 sub_8098734(void) +{ + if (FuncIsActiveTask(sub_80985BC)) + { + return FALSE; + } + else + { + sub_808BCF4(); + return TRUE; + } +} diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 3ec422c65..4b2f95ef0 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -5,6 +5,7 @@ #include "field_camera.h" #include "field_door.h" #include "field_effect.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_player_avatar.h" #include "field_screen_effect.h" @@ -17,7 +18,6 @@ #include "main.h" #include "menu.h" #include "mirage_tower.h" -#include "event_obj_lock.h" #include "metatile_behavior.h" #include "palette.h" #include "overworld.h" @@ -31,7 +31,6 @@ #include "constants/songs.h" #include "constants/rgb.h" #include "trainer_hill.h" -#include "event_obj_lock.h" #include "fldeff.h" extern const u16 gOrbEffectBackgroundLayerFlags[]; diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 4ab2a4396..3f9857897 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,5 +1,5 @@ #include "global.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "faraway_island.h" #include "field_camera.h" diff --git a/src/item_use.c b/src/item_use.c index 2211e1c70..54169db1c 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -9,6 +9,7 @@ #include "coins.h" #include "data.h" #include "event_data.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "fieldmap.h" #include "field_effect.h" @@ -41,7 +42,6 @@ #include "constants/items.h" #include "constants/songs.h" #include "constants/vars.h" -#include "event_obj_lock.h" extern u8 BerryTree_EventScript_ItemUsePlantBerry[]; extern u8 BerryTree_EventScript_ItemUseWailmerPail[]; diff --git a/src/scrcmd.c b/src/scrcmd.c index 07a68a553..f215b8541 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -13,6 +13,7 @@ #include "event_data.h" #include "field_door.h" #include "field_effect.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_message_box.h" #include "field_player_avatar.h" @@ -24,7 +25,6 @@ #include "item.h" #include "lilycove_lady.h" #include "main.h" -#include "event_obj_lock.h" #include "menu.h" #include "money.h" #include "mystery_event_script.h" diff --git a/src/start_menu.c b/src/start_menu.c index ae26f99b3..de6cec898 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -5,7 +5,7 @@ #include "bg.h" #include "event_data.h" #include "event_object_movement.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_scripts.h" #include "fieldmap.h" #include "field_effect.h" diff --git a/src/union_room.c b/src/union_room.c index f71120e59..ada2f0b46 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -10,7 +10,7 @@ #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "field_control_avatar.h" #include "field_player_avatar.h" #include "field_screen_effect.h" -- cgit v1.2.3