From d3a5733886ec9d901306983b047e8565cff1fa71 Mon Sep 17 00:00:00 2001 From: goyuken Date: Fri, 30 May 2014 18:20:05 +0000 Subject: [PATCH] bizswan: controls work --- .../Consoles/WonderSwan/WonderSwan.cs | 2 +- output/dll/bizswan.dll | Bin 83968 -> 84480 bytes wonderswan/bizswan/bizswan.vcxproj | 1 - wonderswan/bizswan/bizswan.vcxproj.filters | 3 --- wonderswan/gfx.cpp | 6 +++++- wonderswan/gfx.h | 3 +++ wonderswan/memory.cpp | 1 - wonderswan/memory.h | 2 -- wonderswan/system.cpp | 11 +---------- wonderswan/v30mz-ea.inc | 0 10 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 wonderswan/v30mz-ea.inc diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index ed2fdcccf8..ce15e8f2eb 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan public static readonly ControllerDefinition WonderSwanController = new ControllerDefinition { Name = "WonderSwan Controller", - BoolButtons = { "Up X, Down X, Left X, Right X, Up Y, Down Y, Left Y, Right Y, Start, B, A, Power" } + BoolButtons = { "Up X", "Down X", "Left X", "Right X", "Up Y", "Down Y", "Left Y", "Right Y", "Start", "B", "A", "Power" } }; public ControllerDefinition ControllerDefinition { get { return WonderSwanController; } } public IController Controller { get; set; } diff --git a/output/dll/bizswan.dll b/output/dll/bizswan.dll index 2203c861efbd135d722d4af5a7559efc19eefb05..97f73d2a6e9a17c0449478a12bd16af019763c1b 100644 GIT binary patch delta 13849 zcmc(mcU%-#_weUlK$hl?!YaLE!M2TMS(Yjg8%0Dk7Q}|w8%E8e0s(|&rRc#dMpUfP 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 Y?2CSoCPpD196c~Ve<|P5pNysd2fbej-2eap diff --git a/wonderswan/bizswan/bizswan.vcxproj b/wonderswan/bizswan/bizswan.vcxproj index fd15924816..8b97376655 100644 --- a/wonderswan/bizswan/bizswan.vcxproj +++ b/wonderswan/bizswan/bizswan.vcxproj @@ -101,7 +101,6 @@ - diff --git a/wonderswan/bizswan/bizswan.vcxproj.filters b/wonderswan/bizswan/bizswan.vcxproj.filters index 97d6f1b7b6..7ae23fe23a 100644 --- a/wonderswan/bizswan/bizswan.vcxproj.filters +++ b/wonderswan/bizswan/bizswan.vcxproj.filters @@ -112,9 +112,6 @@ Source Files - - Source Files - Source Files diff --git a/wonderswan/gfx.cpp b/wonderswan/gfx.cpp index a56cb27c45..43603ebf40 100644 --- a/wonderswan/gfx.cpp +++ b/wonderswan/gfx.cpp @@ -137,7 +137,7 @@ namespace MDFN_IEN_WSWAN case 0x14: return(LCDControl); case 0x15: return(LCDIcons); case 0x60: return(VideoMode); - case 0xa0: return(sys->wsc ? 0x87 : 0x86); + case 0xa0: return(wsc ? 0x87 : 0x86); case 0xa2: return(BTimerControl); case 0xa4: return((HBTimerPeriod >> 0) & 0xFF); case 0xa5: return((HBTimerPeriod >> 8) & 0xFF); @@ -549,6 +549,10 @@ namespace MDFN_IEN_WSWAN } } + void GFX::Init(bool color) + { + wsc = color; + } void GFX::Reset() { diff --git a/wonderswan/gfx.h b/wonderswan/gfx.h index e6a1a9a09a..9e020fd88a 100644 --- a/wonderswan/gfx.h +++ b/wonderswan/gfx.h @@ -20,6 +20,7 @@ public: void Scanline(uint32 *target); void SetPixelFormat(); + void Init(bool color); void Reset(); void Write(uint32 A, uint8 V); uint8 Read(uint32 A); @@ -73,6 +74,8 @@ private: uint16 HBCounter, VBCounter; uint8 VideoMode; + bool wsc; // mono / color + public: System *sys; }; diff --git a/wonderswan/memory.cpp b/wonderswan/memory.cpp index 434fa49d5f..1f76c4c576 100644 --- a/wonderswan/memory.cpp +++ b/wonderswan/memory.cpp @@ -296,7 +296,6 @@ namespace MDFN_IEN_WSWAN tmpname[16] = 0; language = settings.language; - wsc = settings.color; // WSwan_EEPROMInit() will also clear wsEEPROM sys->eeprom.Init(tmpname, settings.byear, settings.bmonth, settings.bday, settings.sex, settings.blood); diff --git a/wonderswan/memory.h b/wonderswan/memory.h index 3dce1ced7b..d2e94761b5 100644 --- a/wonderswan/memory.h +++ b/wonderswan/memory.h @@ -50,8 +50,6 @@ private: bool language; - bool wsc; // mono / color - public: System *sys; private: diff --git a/wonderswan/system.cpp b/wonderswan/system.cpp index a4baa2cafc..b94ded841c 100644 --- a/wonderswan/system.cpp +++ b/wonderswan/system.cpp @@ -68,7 +68,6 @@ namespace MDFN_IEN_WSWAN void System::Advance(uint16 buttons, bool novideo, uint32 *surface, int16 *soundbuff, int &soundbuffsize) { - memory.WSButtonStatus = buttons; while (!gfx.ExecuteLine(surface, novideo)) { @@ -80,7 +79,6 @@ namespace MDFN_IEN_WSWAN // how is this OK to reset? it's only used by the sound code, so once the sound for the frame has // been collected, it's OK to zero. indeed, it should be done as there's no rollover protection cpu.timestamp = 0; - } // Source: http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 @@ -198,13 +196,10 @@ namespace MDFN_IEN_WSWAN //MDFNMP_Init(16384, (1 << 20) / 1024); - // TODO: control WSC setting - memory.Init(settings); + gfx.Init(settings.color); rtc.Init(settings.initialtime, settings.userealtime); - //MDFNGameInfo->fps = (uint32)((uint64)3072000 * 65536 * 256 / (159*256)); - gfx.MakeTiles(); Reset(); @@ -270,10 +265,6 @@ namespace MDFN_IEN_WSWAN return true; } - - - - EXPORT System *bizswan_new() { return new System(); diff --git a/wonderswan/v30mz-ea.inc b/wonderswan/v30mz-ea.inc deleted file mode 100644 index e69de29bb2..0000000000