diff options
author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /include/field_camera.h | |
parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) |
fix merge conflicts
Diffstat (limited to 'include/field_camera.h')
-rw-r--r-- | include/field_camera.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/field_camera.h b/include/field_camera.h index 9021b579e..4ce207541 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -11,6 +11,8 @@ struct CameraSomething s32 unk14; }; +extern struct Camera gUnknown_0202E844; + void move_tilemap_camera_to_upper_left_corner(void); void sub_8057A58(void); void sub_8057B14(u16 *a, u16 *b); |