video: fixed oam flickering when frame is skipped

diff --git a/src/defs.s b/src/defs.s
index 235030b0967a860748ab33db923c2f5c1f495c13..5a722cce634477e165df958da2e6631f2f411044 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -13,9 +13,9 @@
 
 #define NULL 0
 
-#define ACTS_MAX 32
+#define ACTS_MAX 12 
 #define MAP_OBJ_MAX 32
-#define RECT_MAX 32
+#define RECT_MAX 12 
 
 #define MAP_ROW_H 16 ; pixels per row
 

diff --git a/src/video.s b/src/video.s
index ec390d033472448f5e7b3db1d2c71be1d2fa6c17..833dafbcd1613c5306ee95e218ca3293d89b9cf9 100644 (file)
--- a/src/video.s
+++ b/src/video.s
@@ -5,19 +5,20 @@
   ; vblank handler
 vblank:
   push_all 
+
+  ; enable objects
+  ld a, [RLCD]
+  or a, LCDCF_OBJON
+  ld [RLCD], a
   
-  ; get inputs 
-  call poll_inputs
        
        ; skip if update has not yet finished
        ld a, [frame_ready]
        cp a, 1
        jp z, @skip_rest
 
-  ; enable objects
-  ld a, [RLCD]
-  or a, LCDCF_OBJON
-  ld [RLCD], a
+  ; get inputs 
+  call poll_inputs
        
        call video_map_perform_scroll