summaryrefslogtreecommitdiff
path: root/include/gba/types.h
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-04-07 20:20:22 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-04-07 20:20:22 -0400
commit50350cc2e1c26082f9d852e97e1698f7254d4145 (patch)
tree3217b352dae2be8da75ad08a8d94ddc7f81a5017 /include/gba/types.h
parent1360b3a477f1107785900cd0c4e73ebf018f058c (diff)
parenta4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff)
Merge branch 'master' into contest-ai-cleanup
Diffstat (limited to 'include/gba/types.h')
-rw-r--r--include/gba/types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gba/types.h b/include/gba/types.h
index cb370c785..9f2594703 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -107,8 +107,8 @@ struct OamData
#define SPRITE_SIZE_16x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE))
#define SPRITE_SIZE_32x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE))
-#define SPRITE_SIZE(dim) (SPRITE_SIZE_##dim >> 2)
-#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0xFF)
+#define SPRITE_SIZE(dim) ((SPRITE_SIZE_##dim >> 2) & 0x03)
+#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0x03)
struct BgAffineSrcData
{