video: disabling oam on window

diff --git a/src/hw.inc b/src/hw.inc
index 81d3cc1e54443a19870cd1263168ebdf80e80a12..e781a94ebb4b37699ddac284617fb2e8a1d638ad 100644 (file)
--- a/src/hw.inc
+++ b/src/hw.inc
@@ -59,6 +59,7 @@
 ; interrupt enabled
 #define IE 0xFFFF
 #define IVBLANK 0b00000001
+#define ILCD 0b00000010
 
 ; location where code for dma needs to be memcyp'd to
 .def int DMAFN = 0xFF80 

diff --git a/src/jmp.inc b/src/jmp.inc
index 423680dcf7c72a748874889d00afc4240bd66ee4..26d62f5d34ac26598b130dda8a941d7ff185ce38 100644 (file)
--- a/src/jmp.inc
+++ b/src/jmp.inc
@@ -41,7 +41,6 @@ vec_vblank:
 ; STA 0x48
 ;=============
 vec_stat:
-  BREAK
   ; disable objects
   push af
   ld a, [RLCD]

diff --git a/src/sys.s b/src/sys.s
index 1648bafcd736fbcaae4503531f12a73958225413..b881cba3e655ec6602bbd357ebd1aaa47b203e61 100644 (file)
--- a/src/sys.s
+++ b/src/sys.s
@@ -19,7 +19,7 @@ panic:
 
 enableinterrupts:
   ; enable interrupts 
-  ld a, IVBLANK
+  ld a, IVBLANK | ILCD
   ld [IE], a
   ei 
   ret

diff --git a/src/unit.s b/src/unit.s
index c74ddd035eb7375a92bd0b7a24182d0189fdd414..10b75d9567a58d722fa7fcccaafac65a9ba85626 100644 (file)
--- a/src/unit.s
+++ b/src/unit.s
@@ -220,13 +220,6 @@ unit_generic_draw:
   sub a, b
   ld [hl+], a
 
-  ; if the position is inside the window set PRIO bit
-  cp a, 128 ; window start position in pixels
-  jr c, @not_on_window REL
-    ld a, OAM_FPRIO
-    ld [TMP_OAMFLAG_PRIO], a
-
-@not_on_window:
   ; set x pos
   inc de
   ld a, [de]