diff options
author | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
commit | 06bf25405c98257e47953b5d3c327e314ea371b3 (patch) | |
tree | 81be5b612621bdd74f632dbedb9f85c4d1d203b9 /include/field_camera.h | |
parent | 282cae4a9fbd019a973fb6618337d29a61f97f42 (diff) | |
parent | be05c5bd52769b58316986bd7451cb2483571099 (diff) |
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
include/use_pokeblock.h
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); |