diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-01-07 18:39:27 -0500 |
| commit | f7eef0735bb70a7fed17b6fabb15f30c092209bc (patch) | |
| tree | 17f9256f07ff23163cf13af85fdc36847549cbbe /include/map_obj_lock.h | |
| parent | f50bc217ae5daeb2c2788f502f604e3684249256 (diff) | |
| parent | 8f7400809626c0f72dfe751665126f94181fd7c1 (diff) | |
Merge branch 'master' into trainer_tower
Diffstat (limited to 'include/map_obj_lock.h')
| -rw-r--r-- | include/map_obj_lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h index c8e075658..2927ca26d 100644 --- a/include/map_obj_lock.h +++ b/include/map_obj_lock.h @@ -3,9 +3,9 @@ #include "global.h" -bool8 sub_80983C4(void); +bool8 sub_8069590(void); void ScriptFreezeMapObjects(void); -bool8 sub_809847C(void); +bool8 sub_8069648(void); void LockSelectedMapObject(void); void sub_8098630(void); bool8 sub_8098734(void); |