ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename event_obj_lock to event_object_lock

Browse Source
This commit is contained in:
GriffinR 2019-12-06 02:55:30 -05:00
parent c51e0f3bae
commit 1b30f0c973
9 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/event_obj_lock.h → include/event_object_lock.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_EVENT_OBJ_LOCK_H #ifndef GUARD_EVENT_OBJECT_LOCK_H
#define GUARD_EVENT_OBJ_LOCK_H #define GUARD_EVENT_OBJECT_LOCK_H
bool8 sub_80983C4(void); bool8 sub_80983C4(void);
void ScriptFreezeObjectEvents(void); void ScriptFreezeObjectEvents(void);
@ -10,4 +10,4 @@ bool8 sub_8098734(void);
void ScriptUnfreezeObjectEvents(void); void ScriptUnfreezeObjectEvents(void);
void sub_8098524(void); void sub_8098524(void);
#endif // GUARD_EVENT_OBJ_LOCK_H #endif // GUARD_EVENT_OBJECT_LOCK_H

2
ld_script.txt
View File

@ -113,7 +113,7 @@ SECTIONS {
src/field_player_avatar.o(.text); src/field_player_avatar.o(.text);
src/event_object_movement.o(.text); src/event_object_movement.o(.text);
src/field_message_box.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/text_window.o(.text);
src/script.o(.text); src/script.o(.text);
src/scrcmd.o(.text); src/scrcmd.o(.text);

2
src/event_obj_lock.c → src/event_object_lock.c
View File

@ -1,8 +1,8 @@
#include "global.h" #include "global.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_lock.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "event_obj_lock.h"
#include "script_movement.h" #include "script_movement.h"
#include "task.h" #include "task.h"
#include "trainer_see.h" #include "trainer_see.h"

3
src/field_screen_effect.c
View File

@ -5,6 +5,7 @@
#include "field_camera.h" #include "field_camera.h"
#include "field_door.h" #include "field_door.h"
#include "field_effect.h" #include "field_effect.h"
#include "event_object_lock.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "field_screen_effect.h" #include "field_screen_effect.h"
@ -17,7 +18,6 @@
#include "main.h" #include "main.h"
#include "menu.h" #include "menu.h"
#include "mirage_tower.h" #include "mirage_tower.h"
#include "event_obj_lock.h"
#include "metatile_behavior.h" #include "metatile_behavior.h"
#include "palette.h" #include "palette.h"
#include "overworld.h" #include "overworld.h"
@ -31,7 +31,6 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "trainer_hill.h" #include "trainer_hill.h"
#include "event_obj_lock.h"
#include "fldeff.h" #include "fldeff.h"
extern const u16 gOrbEffectBackgroundLayerFlags[]; extern const u16 gOrbEffectBackgroundLayerFlags[];

2
src/fldeff_cut.c
View File

@ -1,5 +1,5 @@
#include "global.h" #include "global.h"
#include "event_obj_lock.h" #include "event_object_lock.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "faraway_island.h" #include "faraway_island.h"
#include "field_camera.h" #include "field_camera.h"

2
src/item_use.c
View File

@ -9,6 +9,7 @@
#include "coins.h" #include "coins.h"
#include "data.h" #include "data.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_lock.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "field_effect.h" #include "field_effect.h"
@ -41,7 +42,6 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "event_obj_lock.h"
extern u8 BerryTree_EventScript_ItemUsePlantBerry[]; extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
extern u8 BerryTree_EventScript_ItemUseWailmerPail[]; extern u8 BerryTree_EventScript_ItemUseWailmerPail[];

2
src/scrcmd.c
View File

@ -13,6 +13,7 @@
#include "event_data.h" #include "event_data.h"
#include "field_door.h" #include "field_door.h"
#include "field_effect.h" #include "field_effect.h"
#include "event_object_lock.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "field_message_box.h" #include "field_message_box.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
@ -24,7 +25,6 @@
#include "item.h" #include "item.h"
#include "lilycove_lady.h" #include "lilycove_lady.h"
#include "main.h" #include "main.h"
#include "event_obj_lock.h"
#include "menu.h" #include "menu.h"
#include "money.h" #include "money.h"
#include "mystery_event_script.h" #include "mystery_event_script.h"

2
src/start_menu.c
View File

@ -5,7 +5,7 @@
#include "bg.h" #include "bg.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "event_obj_lock.h" #include "event_object_lock.h"
#include "event_scripts.h" #include "event_scripts.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "field_effect.h" #include "field_effect.h"

2
src/union_room.c
View File

@ -10,7 +10,7 @@
#include "dynamic_placeholder_text_util.h" #include "dynamic_placeholder_text_util.h"
#include "easy_chat.h" #include "easy_chat.h"
#include "event_data.h" #include "event_data.h"
#include "event_obj_lock.h" #include "event_object_lock.h"
#include "field_control_avatar.h" #include "field_control_avatar.h"
#include "field_player_avatar.h" #include "field_player_avatar.h"
#include "field_screen_effect.h" #include "field_screen_effect.h"