merge with master, fix conflicts

This commit is contained in:
DizzyEggg committed 2017-10-20 10:49:21 +02:00
commit b65da491a9
60 files changed
+6252 -10191

No files matched your search

+2
View File
@@ -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