diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-17 11:32:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-17 11:32:30 -0400 |
commit | 164590e37d67a385bf6479aafcbe5b351891bc0b (patch) | |
tree | c3d4cac1627512d166440ead47d9f2285c8b4044 /include/gba | |
parent | a4a3c1c9e5a0026415330eab9bea2f8f3e83e0a3 (diff) | |
parent | 1f39c34ca47e43b0afccaabe97d1df19e3f0b39b (diff) |
Merge pull request #1512 from GriffinRichards/minor-constants
Add some misc constants/usage
Diffstat (limited to 'include/gba')
-rw-r--r-- | include/gba/m4a_internal.h | 2 | ||||
-rw-r--r-- | include/gba/types.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index 2ccbb18f5..eeb79391b 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -313,6 +313,8 @@ struct MusicPlayerTrack #define MAX_MUSICPLAYER_TRACKS 16 +#define TRACKS_ALL 0xFFFF + #define TEMPORARY_FADE 0x0001 #define FADE_IN 0x0002 #define FADE_VOL_MAX 64 diff --git a/include/gba/types.h b/include/gba/types.h index 35d02e263..2e92bbe86 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -35,7 +35,7 @@ struct BgCnt { u16 priority:2; u16 charBaseBlock:2; - u16 dummy:2; + u16 dsCharBaseBlock:2; u16 mosaic:1; u16 palettes:1; u16 screenBaseBlock:5; |