Mercurial > repos > blastem

diff vdp.h @ 499:27345a67225d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Mike Pavone <pavone@retrodev.com>
date Tue, 29 Oct 2013 00:03:11 -0700
parents 8ac0eb05642c
children b76d2a628ab9
line wrap: on
line diff
--- a/vdp.h	Mon Oct 28 23:59:59 2013 -0700
+++ b/vdp.h	Tue Oct 29 00:03:11 2013 -0700
@@ -45,9 +45,10 @@
 #define FLAG_DMA_RUN       0x40
 #define FLAG_DMA_PROG      0x80
 
-#define FLAG2_VINT_PENDING 0x01
-#define FLAG2_HINT_PENDING 0x02
-#define FLAG2_READ_PENDING 0x04
+#define FLAG2_VINT_PENDING   0x01
+#define FLAG2_HINT_PENDING   0x02
+#define FLAG2_READ_PENDING   0x04
+#define FLAG2_SPRITE_COLLIDE 0x08
 
 #define DISPLAY_ENABLE 0x40