diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 12:23:08 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 12:23:08 -0500 |
| commit | 9c934c966400813e8ed6c8a5c0f93fb8cdc12546 (patch) | |
| tree | 8e131411fca696d59f68a0116e59751e53d2b55b /include/field_door.h | |
| parent | 4c12ad00d21b43d0946b2a0ba3ee471af9262673 (diff) | |
| parent | 9a6c2c25d08ef157cc4800014651bd0c679f6fc5 (diff) | |
Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers
Diffstat (limited to 'include/field_door.h')
| -rw-r--r-- | include/field_door.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/include/field_door.h b/include/field_door.h index 8b4955cac..2e32005c6 100644 --- a/include/field_door.h +++ b/include/field_door.h @@ -1,20 +1,5 @@ -#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; -}; +#ifndef GUARD_FIELD_DOOR_H +#define GUARD_FIELD_DOOR_H void FieldSetDoorOpened(u32, u32); void FieldSetDoorClosed(u32, u32); @@ -23,4 +8,4 @@ s8 FieldAnimateDoorOpen(u32, u32); bool8 FieldIsDoorAnimationRunning(void); u32 GetDoorSoundEffect(u32 x, u32 y); -#endif +#endif //GUARD_FIELD_DOOR_H |