From fcb0be70f7bf7e7d08a841de1e77bc9f130bfc43 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sat, 24 Nov 2012 17:37:40 +0000
Subject: [PATCH] gba: cycle counter for frame timing was completely busted,
 now fixed, and frames take the expected approximately 280k cycles to complete

---
 BizHawk.MultiClient/output/dll/libmeteor.dll | Bin 129024 -> 129024 bytes
 libmeteor/source/clock.cpp                   |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/BizHawk.MultiClient/output/dll/libmeteor.dll b/BizHawk.MultiClient/output/dll/libmeteor.dll
index 3e03b60010300c8a627e5d14302cc14de24423f2..22b48154ef3c9c95b71d9ed8afcd8908808f7b8a 100644
GIT binary patch
delta 284
zcmZqpz~1nIeFFz0^I_JFlermvnOH?OM={0(DyLbqhCOE#;BT^GWMBvjf6dvuM1=te
zy8rWUKf%ab0F;}2AxOHO??u~h28L$a2%rE%-KT{)KwA6wVi47OpkCqy$MygJ!Gf$c
zK!c#-buSji02SE&|Np<fL=LDN!~-f9-ggDacyUCK5ojVvjG^xB!UVWVC7?<W52#YS
zH${bE-<Idi#lhQ)gBcx7Kpxn>y`8a@LvYUR$3i{7<Q;Y&bDj{j>9#53cHaq%%e9yf
z0abk8#dum+ey814ySsKT?B3e_v1764wwJV5w%4(@vUj%kvk$XR+5Yexqr4^ngQs$r

delta 252
zcmZqpz~1nIeFFz0v$_6;$=r;-OcsYWM={0(O7U+$!N^<ioKYannl%ha@i!SVGBAXN
zcmJP!Ge}xps5eE0;YIgv28L$a2%t1W-KT{)KwA6wVi47OpkAu`{|oNPqQQzb@<72D
zh@i-XeOG|27smt{ff_-A40Uf8CID&M|NsBjm#6@hf_OmvlD)GTfTrgMZ_f{AbTt7v
zaQpUl##Ro&bH#1^OOhVDZ!4am9q?eEA=`G}35?6Nn9YDHzVBi@EiAv=?vULTyZd%e
h?7rLmw_~#xvsbX!v^TeRwD++Ou}|9m@EoJOCIJ1lVa)&l

diff --git a/libmeteor/source/clock.cpp b/libmeteor/source/clock.cpp
index 4600a7250e..66201b1813 100644
--- a/libmeteor/source/clock.cpp
+++ b/libmeteor/source/clock.cpp
@@ -35,12 +35,14 @@ namespace AMeteor
 	{
 		unsigned short tocommit;
 
-		m_count += m_cycles;
+		//m_count += m_cycles;
 
 		// this loop is here because a timer can trigger a dma which will take a
 		// long time, during this time the lcd must draw and the timers continue
 		while (m_cycles >= m_first)
 		{
+			m_count += m_cycles;
+
 			tocommit = m_cycles;
 			m_cycles = 0;