Merrge

diff --cc custom.cpp
index 88b344775ed3c36469b833b04158884ce0373f39,27ce7ec3a242a3dc50a2b82eb6fda72d598d6cdf..b9af8fd912b4a2e587f8c231541ace7ec97f7813
--- 1/custom.cpp
--- 2/custom.cpp
+++ b/custom.cpp
@@@ -9965,21 -10411,11 +9965,24 @@@ static void update_fast_vb(void
        vb_fast = get_strobe_reg(0) != 0x3c;
  }
  
 +STATIC_INLINE void vsync_mark(void)
 +{
 +      if (vsync_linecnt) {
 +              vsync_lines = vsync_linecnt;
 +              linear_vpos_vblank_vsync = linear_vpos_vblank_lines_cnt;
 +              vsync_linecnt = 0;
 +              linear_vpos_prev[2] = linear_vpos_prev[1];
 +              linear_vpos_prev[1] = linear_vpos_prev[0];
 +              linear_vpos_prev[0] = vsync_lines;
 +              linear_vpos = 0;
 +      }
 +}
 +
  static void check_vsyncs_fast(void)
  {
+       bool pal = beamcon0_pal;
+       bool realpal = pal && !agnusa1000;
+ 
        if (agnus_vb == 2) {
                agnus_vb = 1;
                update_agnus_vb();