diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
| commit | 539d47279625a3d7a274726a02468bb5c1c56514 (patch) | |
| tree | 08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /include/gba/types.h | |
| parent | a58d9a16dd7e4f263ebccda50e70103e7490886b (diff) | |
| parent | fc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'include/gba/types.h')
| -rw-r--r-- | include/gba/types.h | 4 |
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 { |