diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
| commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
| tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /include/gba/io_reg.h | |
| parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
merge with master, fix conflicts
Diffstat (limited to 'include/gba/io_reg.h')
| -rw-r--r-- | include/gba/io_reg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 5234e5b6c..f8c89fdbd 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -521,6 +521,8 @@ #define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled #define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled +// BLDCNT + // SOUNDCNT_H #define SOUND_CGB_MIX_QUARTER 0x0000 #define SOUND_CGB_MIX_HALF 0x0001 |