Merge branch 'master' of github.com:pret/pokeemerald

2017-10-21 20:20:52 -05:00
parent 667914075b afd42c8e14
commit b8f23aa20d
194 changed files with 13648 additions and 24632 deletions
@@ -527,6 +527,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