ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert handling of broken F8 ROMs; we can turn off randomization to make them work.

This commit is contained in:
Stephen Anthony 2017-12-20 14:47:17 -03:30
parent 63b3b2ab1e
commit 81179ab34f
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/emucore/CartF8.cxx
View File

@ -22,8 +22,7 @@
CartridgeF8::CartridgeF8(const BytePtr& image, uInt32 size, const string& md5, CartridgeF8::CartridgeF8(const BytePtr& image, uInt32 size, const string& md5,
const Settings& settings) const Settings& settings)
: Cartridge(settings), : Cartridge(settings),
myBankOffset(0), myBankOffset(0)
myHardcodedStartBank(false)
{ {
// Copy the ROM image into my buffer // Copy the ROM image into my buffer
memcpy(myImage, image.get(), std::min(8192u, size)); memcpy(myImage, image.get(), std::min(8192u, size));
@ -31,23 +30,21 @@ CartridgeF8::CartridgeF8(const BytePtr& image, uInt32 size, const string& md5,
// Normally bank 1 is the reset bank, unless we're dealing with ROMs // Normally bank 1 is the reset bank, unless we're dealing with ROMs
// that have been incorrectly created with banks in the opposite order // that have been incorrectly created with banks in the opposite order
myHardcodedStartBank = myStartBank =
md5 == "bc24440b59092559a1ec26055fd1270e" || // Private Eye [a] (md5 == "bc24440b59092559a1ec26055fd1270e" || // Private Eye [a]
md5 == "75ea60884c05ba496473c23a58edf12f" || // 8-in-1 Yars Revenge md5 == "75ea60884c05ba496473c23a58edf12f" || // 8-in-1 Yars Revenge
md5 == "75ee371ccfc4f43e7d9b8f24e1266b55" || // Snow White md5 == "75ee371ccfc4f43e7d9b8f24e1266b55" || // Snow White
md5 == "74c8a6f20f8adaa7e05183f796eda796" || // Tricade Demo md5 == "74c8a6f20f8adaa7e05183f796eda796" || // Tricade Demo
md5 == "9905f9f4706223dadee84f6867ede8e3" || // Challenge md5 == "9905f9f4706223dadee84f6867ede8e3" || // Challenge
md5 == "3c7a7b3a0a7e6319b2fa0f923ef6c9af"; // Racer Prototype md5 == "3c7a7b3a0a7e6319b2fa0f923ef6c9af") // Racer Prototype
? 0 : 1;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF8::reset() void CartridgeF8::reset()
{ {
// Define random startup bank (only for those not hardcoded) // define random startup bank
if(myHardcodedStartBank) randomizeStartBank();
myStartBank = 0;
else
randomizeStartBank();
// Upon reset we switch to the reset bank // Upon reset we switch to the reset bank
bank(myStartBank); bank(myStartBank);
@ -173,7 +170,6 @@ bool CartridgeF8::save(Serializer& out) const
{ {
out.putString(name()); out.putString(name());
out.putShort(myBankOffset); out.putShort(myBankOffset);
out.putBool(myHardcodedStartBank);
} }
catch(...) catch(...)
{ {
@ -193,7 +189,6 @@ bool CartridgeF8::load(Serializer& in)
return false; return false;
myBankOffset = in.getShort(); myBankOffset = in.getShort();
myHardcodedStartBank = in.getBool();
} }
catch(...) catch(...)
{ {

3
src/emucore/CartF8.hxx
View File

@ -156,9 +156,6 @@ class CartridgeF8 : public Cartridge
// Indicates the offset into the ROM image (aligns to current bank) // Indicates the offset into the ROM image (aligns to current bank)
uInt16 myBankOffset; uInt16 myBankOffset;
// Certain ROMs have hardcoded start banks
bool myHardcodedStartBank;
private: private:
// Following constructors and assignment operators not supported // Following constructors and assignment operators not supported
CartridgeF8() = delete; CartridgeF8() = delete;