Merge pull request #801 from bladeoner/sa1

SA1 Hack Super Mario RPG and Kirby's Dreamland 3
This commit is contained in:
dborth 2019-01-15 18:10:19 -07:00 committed by GitHub
commit 1d2e9c8836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions

View File

@ -3700,6 +3700,14 @@ void CMemory::ApplyROMFixes (void)
match_id ("A35") || // Mechwarrior 3050 / Battle Tech 3050
match_na ("DOOM TROOPERS")) // Doom Troopers
Timings.APUAllowTimeOverflow = TRUE;
if (match_id("ARWJ") || match_id("ARWE") || // Super Mario RPG
match_id("AFJJ") || match_id("AFJE")) { // Kirby's Dream Land 3
Settings.OneClockCycle = 8;
}
else {
Settings.OneClockCycle = 6;
}
#endif
}

View File

@ -69,15 +69,12 @@
#define SNES_MAX_PAL_VCOUNTER 312
#define SNES_HCOUNTER_MAX 341
#ifndef ALLOW_CPU_OVERCLOCK
#define ONE_CYCLE 6
#define SLOW_ONE_CYCLE 8
#define TWO_CYCLES 12
#else
#ifdef GEKKO
#define ONE_CYCLE (Settings.OneClockCycle)
#define SLOW_ONE_CYCLE (Settings.OneSlowClockCycle)
#define TWO_CYCLES (Settings.TwoClockCycles)
#endif
#define ONE_DOT_CYCLE 4
#define SNES_CYCLES_PER_SCANLINE (SNES_HCOUNTER_MAX * ONE_DOT_CYCLE)