From 68fecc9f72bb15462cb4b7f007f0d699a75c29dd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 6 Dec 2019 03:01:37 -0500 Subject: Rename event_obj_lock to event_object_lock --- src/braille_puzzles.c | 2 +- src/event_obj_lock.c | 117 --------------------------------------------- src/event_object_lock.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ src/field_fadetransition.c | 2 +- src/fldeff_cut.c | 2 +- src/item_use.c | 2 +- src/menu.c | 2 +- src/scrcmd.c | 2 +- src/start_menu.c | 2 +- 9 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 src/event_obj_lock.c create mode 100644 src/event_object_lock.c (limited to 'src') diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 18a9bd553..428d114c7 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -5,7 +5,7 @@ #include "field_effect.h" #include "fieldmap.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "rom6.h" #include "script.h" diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c deleted file mode 100644 index 9be385cdf..000000000 --- a/src/event_obj_lock.c +++ /dev/null @@ -1,117 +0,0 @@ -#include "global.h" -#include "event_obj_lock.h" -#include "event_object_movement.h" -#include "field_player_avatar.h" -#include "script_movement.h" -#include "task.h" - -extern u16 gSpecialVar_Facing; - -bool8 walkrun_is_standing_still(void) -{ - if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) - return FALSE; - else - return TRUE; -} - -void sub_8064CDC(u8 taskId) -{ - if (walkrun_is_standing_still()) - { - sub_80594C0(); - DestroyTask(taskId); - } -} - -bool8 sub_8064CFC(void) -{ - if (FuncIsActiveTask(sub_8064CDC)) - { - return FALSE; - } - else - { - sub_80597F4(); - return TRUE; - } -} - -void ScriptFreezeObjectEvents(void) -{ - FreezeObjectEvents(); - CreateTask(sub_8064CDC, 80); -} - -void sub_8064D38(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - if (!task->data[0] && walkrun_is_standing_still() == TRUE) - { - sub_80594C0(); - 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_8064DB4(void) -{ - if (FuncIsActiveTask(sub_8064D38)) - { - return FALSE; - } - else - { - sub_80597F4(); - return TRUE; - } -} - -void LockSelectedObjectEvent(void) -{ - u8 taskId; - FreezeObjectEventsExceptOne(gSelectedObjectEvent); - taskId = CreateTask(sub_8064D38, 80); - if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) - { - FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); - gTasks[taskId].data[1] = 1; - } -} - -void ScriptUnfreezeObjectEvents(void) -{ - u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); - sub_80A2178(); - UnfreezeObjectEvents(); -} - -void unref_sub_8064E5C(void) -{ - u8 playerObjectId; - - if (gObjectEvents[gSelectedObjectEvent].active) - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); - playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); - ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); - sub_80A2178(); - UnfreezeObjectEvents(); -} - -void sub_8064EAC(void) -{ - ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); -} - -void sub_8064ED4(void) -{ - ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); -} diff --git a/src/event_object_lock.c b/src/event_object_lock.c new file mode 100644 index 000000000..9ffea9460 --- /dev/null +++ b/src/event_object_lock.c @@ -0,0 +1,117 @@ +#include "global.h" +#include "event_object_lock.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "script_movement.h" +#include "task.h" + +extern u16 gSpecialVar_Facing; + +bool8 walkrun_is_standing_still(void) +{ + if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) + return FALSE; + else + return TRUE; +} + +void sub_8064CDC(u8 taskId) +{ + if (walkrun_is_standing_still()) + { + sub_80594C0(); + DestroyTask(taskId); + } +} + +bool8 sub_8064CFC(void) +{ + if (FuncIsActiveTask(sub_8064CDC)) + { + return FALSE; + } + else + { + sub_80597F4(); + return TRUE; + } +} + +void ScriptFreezeObjectEvents(void) +{ + FreezeObjectEvents(); + CreateTask(sub_8064CDC, 80); +} + +void sub_8064D38(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (!task->data[0] && walkrun_is_standing_still() == TRUE) + { + sub_80594C0(); + 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_8064DB4(void) +{ + if (FuncIsActiveTask(sub_8064D38)) + { + return FALSE; + } + else + { + sub_80597F4(); + return TRUE; + } +} + +void LockSelectedObjectEvent(void) +{ + u8 taskId; + FreezeObjectEventsExceptOne(gSelectedObjectEvent); + taskId = CreateTask(sub_8064D38, 80); + if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) + { + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); + gTasks[taskId].data[1] = 1; + } +} + +void ScriptUnfreezeObjectEvents(void) +{ + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + sub_80A2178(); + UnfreezeObjectEvents(); +} + +void unref_sub_8064E5C(void) +{ + u8 playerObjectId; + + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + sub_80A2178(); + UnfreezeObjectEvents(); +} + +void sub_8064EAC(void) +{ + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); +} + +void sub_8064ED4(void) +{ + ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); +} diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index a87c32dbe..2fbda69e3 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -11,7 +11,7 @@ #include "fldeff_flash.h" #include "link.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "metatile_behavior.h" #include "palette.h" #include "overworld.h" diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 23448cb93..567e75f2a 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -4,7 +4,7 @@ #include "event_object_movement.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "metatile_behavior.h" #include "pokemon_menu.h" #include "overworld.h" diff --git a/src/item_use.c b/src/item_use.c index 6659bd6d2..348806e06 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -17,7 +17,7 @@ #include "constants/items.h" #include "mail.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "menu_helpers.h" #include "metatile_behavior.h" diff --git a/src/menu.c b/src/menu.c index 869e5b3b3..5bb5f96d1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "menu.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu_cursor.h" #include "script.h" #include "constants/songs.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index 7ba527890..ec3d2c1bc 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -22,7 +22,7 @@ #include "fieldmap.h" #include "item.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_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 77f57966c..747f13b3a 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -9,7 +9,7 @@ #include "load_save.h" #include "m4a.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "new_game.h" #include "option_menu.h" -- cgit v1.2.3