diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 03:01:37 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-12 18:35:27 -0600 |
| commit | 68fecc9f72bb15462cb4b7f007f0d699a75c29dd (patch) | |
| tree | 31ea7b3483b00c7915261f86ee419599c9c53f43 | |
| parent | 667c53e25b4db2c5fc3bcbdb50825843dfaded4e (diff) | |
Rename event_obj_lock to event_object_lock
| -rw-r--r-- | include/event_object_lock.h (renamed from include/event_obj_lock.h) | 6 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/braille_puzzles.c | 2 | ||||
| -rw-r--r-- | src/event_object_lock.c (renamed from src/event_obj_lock.c) | 2 | ||||
| -rw-r--r-- | src/field_fadetransition.c | 2 | ||||
| -rw-r--r-- | src/fldeff_cut.c | 2 | ||||
| -rw-r--r-- | src/item_use.c | 2 | ||||
| -rw-r--r-- | src/menu.c | 2 | ||||
| -rw-r--r-- | src/scrcmd.c | 2 | ||||
| -rw-r--r-- | src/start_menu.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/include/event_obj_lock.h b/include/event_object_lock.h index b2868cf76..c66db99f7 100644 --- a/include/event_obj_lock.h +++ b/include/event_object_lock.h @@ -1,5 +1,5 @@ -#ifndef GUARD_EVENT_OBJ_LOCK_H -#define GUARD_EVENT_OBJ_LOCK_H +#ifndef GUARD_EVENT_OBJECT_LOCK_H +#define GUARD_EVENT_OBJECT_LOCK_H bool8 walkrun_is_standing_still(void); void sub_8064CDC(u8 taskId); @@ -13,4 +13,4 @@ void unref_sub_8064E5C(void); void sub_8064EAC(void); void sub_8064ED4(void); -#endif // GUARD_EVENT_OBJ_LOCK_H +#endif // GUARD_EVENT_OBJECT_LOCK_H diff --git a/ld_script.txt b/ld_script.txt index 667d780da..e5451f9eb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -87,7 +87,7 @@ SECTIONS { src/field_player_avatar.o(.text); src/event_object_movement.o(.text); src/field_message_box.o(.text); - src/event_obj_lock.o(.text); + src/event_object_lock.o(.text); src/text_window.o(.text); src/script.o(.text); src/scrcmd.o(.text); 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_object_lock.c index 9be385cdf..9ffea9460 100644 --- a/src/event_obj_lock.c +++ b/src/event_object_lock.c @@ -1,5 +1,5 @@ #include "global.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_player_avatar.h" #include "script_movement.h" 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" |