From d8487292811d786095cfee7e9ea4998d26a58317 Mon Sep 17 00:00:00 2001
From: olebeck <a@yuv.pink>
Date: Sat, 28 May 2022 17:30:19 +0200
Subject: [PATCH] fix vsync (somewhat)

---
 player/player.c    | 7 ++++---
 player/pocketlib.h | 9 ++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/player/player.c b/player/player.c
index adaa42b..c18c32d 100644
--- a/player/player.c
+++ b/player/player.c
@@ -43,13 +43,14 @@ void display() {
 #endif
 
 #ifdef __POCKETSTATION__
-#define FPS 24
-#define CLOCK_SPEED CLOCK_4M
+#define FPS 64
+#define CLOCK_SPEED CLOCK_8M
+#define VSYNC_COUNT (FRAMESKIP * (FPS/24))
 #include "pocketlib.h"
 
 static void display() {
     // ????
-    for(int i = 0; i<FRAMESKIP*2; i++) VSync();
+    VSync(VSYNC_COUNT);
     uint32_t *src = (uint32_t*)screen;
 	volatile unsigned int *dst = LCD_VRAM_ADRS;
 	int i = 32;
diff --git a/player/pocketlib.h b/player/pocketlib.h
index bd41ec4..f53c481 100644
--- a/player/pocketlib.h
+++ b/player/pocketlib.h
@@ -62,6 +62,9 @@ int		PadOnRelease, PadOnPress;
 #define CLOCK_4M				0x7
 #define CLOCK_8M				0x8
 
+#define TICK_PER_SEC			(15625 << CLOCK_SPEED)
+#define TICK_PER_FRAME			(TICK_PER_SEC / FPS)
+
 /**/
 
 #define TIMER0_START()			*((volatile unsigned int *)(0xA800008)) |=  0x4
@@ -159,7 +162,7 @@ void FIQ_Handler(void)
 /****************************************/
 // Sync Functions
 
-void VSync()
+void VSync(int count)
 {
 	register int	cnt = VCount;
 	register int	PadState = PAD_STATUS;
@@ -169,7 +172,7 @@ void VSync()
 	PadOnRelease &= PadOnPress;
 	PadOnPress = PadState;
 
-	while (VCount == cnt);	// Wait For IRQ Timer0
+	while (VCount < cnt + count);	// Wait For IRQ Timer0
 }
 
 /****************************************/
@@ -194,7 +197,7 @@ void PocketInit(void)
 	IRQ_ENABLE = IRQ_TIMER0 | FIQ_TIMER2;
 
 	// Start VSync Timer
-	TIMER0_SETCOUNT((15625 << CLOCK_SPEED) / FPS);
+	TIMER0_SETCOUNT(TICK_PER_FRAME);
 	TIMER0_START();
 
 	while (PAD_STATUS & PAD_BUTTON);	// Wait for Button Release (Button pressed when comming from Menu)