Merge branch 'master' of https://github.com/pret/pokeemerald into assert

2 files changed, 16 insertions, 0 deletions

diff --git a/include/field_camera.h b/include/field_camera.h
index a8559e1c2..f68c67854 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -24,5 +24,6 @@ extern u16 gUnknown_03005DE8;
 
 void DrawWholeMapView(void);
 void CurrentMapDrawMetatileAt(int x, int y);
+void DrawDoorMetatileAt(int x, int y, u16 *arr);
 
 #endif //GUARD_FIELD_CAMERA_H
diff --git a/include/field_door.h b/include/field_door.h
index f1dfc551d..8b4955cac 100644
--- a/include/field_door.h
+++ b/include/field_door.h
@@ -1,6 +1,21 @@
 #ifndef GUARD_FIELDDOOR_H
 #define GUARD_FIELDDOOR_H
 
+struct DoorGraphics
+{
+    u16 metatileNum;
+    u8 sound;
+    u8 size;
+    const void *tiles;
+    const void *palette;
+};
+
+struct DoorAnimFrame
+{
+    u8 time;
+    u16 offset;
+};
+
 void FieldSetDoorOpened(u32, u32);
 void FieldSetDoorClosed(u32, u32);
 s8 FieldAnimateDoorClose(u32, u32);