diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
| commit | 8c5d8a550780ec370f340ad2537c5ec418740839 (patch) | |
| tree | b2763c4d325426183f9f7d9aefc27d0e2d9c9d9a /include/gba/types.h | |
| parent | 86a26c9282f03c751fc67e7da6e0d4014f69a688 (diff) | |
| parent | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/gba/types.h')
| -rw-r--r-- | include/gba/types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gba/types.h b/include/gba/types.h index fd8a20a4c..96e057ab7 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -34,7 +34,7 @@ struct PlttData u16 g:5; // green u16 b:5; // blue u16 unused_15:1; -}; +} /*__attribute__((packed))*/; struct OamData { |