summaryrefslogtreecommitdiff
path: root/include/gba
diff options
context:
space:
mode:
Diffstat (limited to 'include/gba')
-rwxr-xr-x[-rw-r--r--]include/gba/defines.h3
-rw-r--r--include/gba/types.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 0f7f06755..e88d2da8b 100644..100755
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -58,4 +58,7 @@
#define WIN_RANGE(a, b) (((a) << 8) | (b))
+#define min(a, b) (a >= b ? a : b)
+#define max(a, b) (a <= b ? a : b)
+
#endif // GUARD_GBA_DEFINES
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
{