VSync BENCHMARKs and avoid AdvanceRandom in tests (rh-hideout#3866)

Fervstheone · Dec 30, 2023 · ed850d3 · ed850d3
1 parent ab900e3
commit ed850d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/test/test.h b/include/test/test.h
@@ -166,6 +166,9 @@ struct Benchmark { s32 ticks; };
 static inline void BenchmarkStart(void)
 {
  gTestRunnerState.inBenchmark = TRUE;
+ // Wait for a v-blank so that comparing two benchmarks is not affected
+ // by the v-count (different numbers of IRQs may run).
+ VBlankIntrWait();
  REG_TM3CNT = (TIMER_ENABLE | TIMER_64CLK) << 16;
 }
 

diff --git a/src/main.c b/src/main.c
@@ -23,6 +23,7 @@
 #include "intro.h"
 #include "main.h"
 #include "trainer_hill.h"
+#include "test_runner.h"
 #include "constants/rgb.h"
 
 static void VBlankIntr(void);
@@ -372,7 +373,7 @@ static void VBlankIntr(void)
  m4aSoundMain();
  TryReceiveLinkBattleData();
 
- if (!gMain.inBattle || !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED)))
+ if (!gTestRunnerEnabled && (!gMain.inBattle || !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED))))
  AdvanceRandom();
 
  UpdateWirelessStatusIndicatorSprite();