diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs index 7808b9295c..6e8702211f 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs @@ -2,9 +2,9 @@ using System.Linq; using LuaInterface; -using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Emulation.Cores.PCEngine; using BizHawk.Emulation.Cores.Sega.MasterSystem; +using BizHawk.Emulation.Cores.Nintendo.NES; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs index df6dd3dd47..2c41a7bc72 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.NES.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; namespace BizHawk.Client.Common { diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 5853fb4d40..115d895efb 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -22,7 +22,7 @@ using BizHawk.Emulation.Cores.ColecoVision; using BizHawk.Emulation.Cores.Intellivision; using BizHawk.Emulation.Cores.PCEngine; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.N64; using BizHawk.Emulation.Cores.Nintendo.Gameboy; diff --git a/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs b/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs index b932c7e12a..96acd9a7ab 100644 --- a/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs +++ b/BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs @@ -1,10 +1,10 @@ using System; using System.Drawing; using System.Windows.Forms; -using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Common; using BizHawk.Client.Common; +using BizHawk.Emulation.Cores.Nintendo.NES; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index c62a4c1b25..ab1caa7eee 100644 --- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -5,7 +5,7 @@ using System.IO; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.ColecoVision; using BizHawk.Emulation.Cores.Sega.MasterSystem; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.N64; using BizHawk.Emulation.Cores.Nintendo.Gameboy; diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index aaacb3f6c8..e2c4e6d7be 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using BizHawk.Client.Common; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Sega.Genesis; diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs b/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs index 7021c6b816..f718b75d90 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Client.Common; diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs index bc1693ad1c..98cb0a1201 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs @@ -5,7 +5,7 @@ using System.Windows.Forms; using System.Globalization; using BizHawk.Client.Common; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs index 3a27aa09e1..ad82d38f16 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Client.Common; diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs index db5be1e316..34916f01b7 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using System.Globalization; using BizHawk.Client.Common; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; namespace BizHawk.Client.EmuHawk { diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 77ccd3127d..09df110f02 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; using BizHawk.Client.Common; using BizHawk.Emulation.Cores.Calculators; -using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Cores.Nintendo.NES; using BizHawk.Emulation.Cores.Nintendo.SNES; namespace BizHawk.Client.EmuHawk diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs index 3d9f77a4c4..4dd9835f97 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs @@ -4,9 +4,6 @@ //(mix higher integer precision with the non-linear mixer and then highpass filter befoure outputting s16s) //TODO - DMC cpu suspending - http://forums.nesdev.com/viewtopic.php?p=62690#p62690 -using System; -using System.Collections.Generic; - //http://wiki.nesdev.com/w/index.php/APU_Mixer_Emulation //http://wiki.nesdev.com/w/index.php/APU //http://wiki.nesdev.com/w/index.php/APU_Pulse @@ -14,9 +11,12 @@ using System.Collections.Generic; //TODO - refactor length counter to be separate component +using System; +using System.Collections.Generic; + using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { sealed partial class NES diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BisqAPU.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BisqAPU.cs index e599df6f45..86c261baa5 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/BisqAPU.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BisqAPU.cs @@ -12,7 +12,7 @@ using BizHawk.Emulation.Sound; //TODO - refactor length counter to be separate component -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { partial class NES { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs index f0fd509fda..a9860da941 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs @@ -9,7 +9,7 @@ using BizHawk.Emulation.Common; //TODO - consider bytebuffer for mirroring //TODO - could stringpool the bootgod DB for a pedantic optimization -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { partial class NES { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AVE-NINA.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AVE-NINA.cs index d41e132146..40042860a2 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AVE-NINA.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AVE-NINA.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA half of mapper 034 (the other half is BxROM which is entirely different..) public sealed class AVE_NINA_001 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs index f9bda4bba3..1fd065e37f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //generally mapper7 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs index e4dd2cbd96..857fac1c1d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 16 & 159 /* diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs index c0fd174d10..71b575a77d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class BANDAI_74_161_02_74 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs index b40be8d22c..3a5a722abb 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class BANDAI_74_161_161_32 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BxROM.cs index ee5067cdd6..893269efa1 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BxROM.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA half of mapper 034 (the other half is AVE_NINA_001 which is entirely different..) public sealed class BxROM : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CNROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CNROM.cs index 4db70441b6..93f6b9cf0a 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CNROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CNROM.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //generally mapper 3 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CPROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CPROM.cs index 33a4950ddc..0170b23564 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CPROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CPROM.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class CPROM : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs index a285b219ab..60418cd8e7 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 071 //TODO - apparently this mapper contains good nes timing test cases diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/ExROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/ExROM.cs index 33e039e7f1..c652fb7565 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/ExROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/ExROM.cs @@ -15,7 +15,7 @@ using BizHawk.Emulation.Common; //TODO - tweak nametable / chr viewer to be more useful //FUTURE - we may need to split this into a separate MMC5 class. but for now it is just a pain. -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { [NES.INESBoardImplPriority] public sealed class ExROM : NES.NESBoardBase @@ -179,7 +179,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo int bank_1k = addr >> 10; int ofs = addr & ((1 << 10) - 1); - if (exram_mode == 1 && NES.ppu.ppuphase == Nintendo.NES.PPU.PPUPHASE.BG) + if (exram_mode == 1 && NES.ppu.ppuphase == NES.PPU.PPUPHASE.BG) { int exram_addr = last_nt_read; int bank_4k = EXRAM[exram_addr] & 0x3F; diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs index 8399129f97..1cc9ac61cd 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //generally mapper66 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IC_74x377.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IC_74x377.cs index 1425a08557..952ea4969d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IC_74x377.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IC_74x377.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //mapper 011 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs index 588ead2b03..d868419c3f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //Mapper 77 //Napoleon Senki diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs index 0015195b12..7b51a69e07 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //iNES Mapper 97 //Kaiketsu Yanchamaru (Kid Niki 1) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_G101.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_G101.cs index 2606545646..cf7a6ed241 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_G101.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_G101.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 032 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs index edb43283f3..3775f47222 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 65 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs index 4d28db4dec..2bd1085b2b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /* PRG-ROM - 32kb/16kb diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs index c0aed21a9c..0fdc6039db 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //Mapper 86 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs index e9b201b6ef..725980d3d1 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //iNES Mapper 72 //Example Games: diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs index 3363d30f4e..828c427d96 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //iNES Mapper 92 //Example Games: diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs index cc37db8850..474f5e8930 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class JALECO_SS8806 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs index 91995c1cb5..4ebee4b4db 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /* * Life Span: October 1986 - April 1987 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs index 23b6634ac2..b80b6b3133 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class MLT_ACTION52 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs index c252c88ae6..0801f9840c 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class MLT_MAX15 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs index 3ab7b19da7..0f64001065 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //aka MMC6 aka StarTropics and StarTropics 2 //for simplicity's sake, the behaviour of mmc6 is wrapped up into this board since it isnt used anywhere else diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs index ab8d4a6335..12a15c7311 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs @@ -6,7 +6,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public class MMC3 : IDisposable { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs index bbb7fa3c98..7ad1eacfed 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper012 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs index d76143f208..19b96dbac9 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // mmc3 multi, PAL, "Super Mario Bros. / Tetris / Nintendo World Cup" public sealed class Mapper037 : MMC3Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs index 087e5abcdb..46747c18ee 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //http://wiki.nesdev.com/w/index.php/INES_Mapper_044 public class Mapper044 : MMC3Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs index 5903f92ffc..9b26800420 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //http://wiki.nesdev.com/w/index.php/INES_Mapper_044 public sealed class Mapper049 : MMC3Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs index c216cceba7..42fcf1db5f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper52 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs index 625da03828..6c553a0f2b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs @@ -2,7 +2,7 @@ //TODO - could merge functionality with 192 somehow -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper074 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs index 3dd4b66eee..f07863ba58 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //this class also handles mapper 248 //FCEUX uses 115 to implement 248 as well (as of 09-apr-2012 it does it buggily in the case of Bao Qing Tian (As)) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs index bf1d9b8f2f..0c284c6f2d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // Fire Emblem (Ch) // mmc3 with mmc2-style chr swapping diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs index 610f9b4f3f..1ad33fbf4f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper182 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs index bf9c496409..9adc8eeea9 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper189 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs index 13ca2cdfaf..f4251e45e5 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs @@ -2,7 +2,7 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper191 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs index d5a8534b82..d514d4e846 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper192 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs index 7bbb6f7e32..5b742e1ab2 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper194 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs index b76e789223..24cb792223 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper197 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs index ed20f8f323..77d38091eb 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper205 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs index 66618b967c..a4be19d999 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper245 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs index 2833dbd038..8c0c2b21ee 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper249 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs index 75b0615fa8..b9d6e4024b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // Time Diver Avenger (Unl) // MMC3 with slightly different write scheme diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs index 7deb4e329b..612d5e576b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class NES_QJ : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs index 249c41f2d6..e3edaba682 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //aka mapper 118 //wires the mapper outputs to control the nametables diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs index 6c57fb674f..d1fc69ecec 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //aka mapper 119 //just high speed and pinbot with an MMC3 and some custom logic to select between chr rom and chr ram diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs index 554a5e064d..d95a108c5d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { [NES.INESBoardImplPriority] public sealed class TVROM : MMC3Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs index aa7487386a..c8039cfc78 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs @@ -3,7 +3,7 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { [NES.INESBoardImplPriority] public sealed class TxROM : MMC3Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs index c597a0d479..3c874034c0 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper015 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper028.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper028.cs index 8600995e4e..a7f2e43cc3 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper028.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper028.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // http://wiki.nesdev.com/w/index.php/User:Tepples/Multi-discrete_mapper public sealed class Mapper028 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper036.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper036.cs index 2e74553cd5..8db043a06d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper036.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper036.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // mapper036 // Strike Wolf (MGC-014) [!].nes diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper038.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper038.cs index 61be5b0605..acb94fa21f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper038.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper038.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // Crime Busters (Brazil) (Unl) public sealed class Mapper038 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper040.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper040.cs index 000c29907e..38f252b00c 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper040.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper040.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // smb2j (us pirate) public sealed class Mapper040 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper041.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper041.cs index 62e069159b..3fa15a8c9b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper041.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper041.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // caltron 6 in 1 public sealed class Mapper041 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper042.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper042.cs index 6088e12ff9..7405ea9ceb 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper042.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper042.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // pirate FDS conversion // this is probably two different boards, but they seem to work well enough the same diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs index fc2dfdf05f..276fac12e9 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper045 : MMC3Board_Base { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs index 495e0fb49e..4401ef27b7 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper046 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs index 28109ff09d..c52170005b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper057 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs index f353d4d0f2..8ca97c3670 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper058 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs index 8a38ddac64..9f2f26d508 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //Mapper 069 is FME7 //or, Sunsoft-5, which is FME7 with additional sound hardware diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs index 4b02daf15c..7daea6386c 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper078 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs index e35363fdd6..156ac01a3b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper090 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper091.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper091.cs index e643f71f1c..8e562eb2ce 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper091.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper091.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper91 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs index e7fb5a2e5f..0fb4f2f8ca 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // one of the VS unisystem mappers // a lot of dumps are labelled incorrectly diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper101.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper101.cs index 4a399c3d9d..02f1be7ccd 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper101.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper101.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //Urusei Yatsura - Lum no Wedding Bell (J) public sealed class Mapper101 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper103.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper103.cs index 700a6eb4a5..efad39f3e4 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper103.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper103.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // Doki Doki Panic (FDS port) // "BTL 2708" diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper107.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper107.cs index 006e1a3570..9dbfc85673 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper107.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper107.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper107 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper108.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper108.cs index 18c612c373..9a5bbe1d40 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper108.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper108.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // Meikyuu Jiin Dababa (FDS Conversion) public sealed class Mapper108 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs index 4f417ccbc2..a9ec55d518 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs @@ -1,10 +1,9 @@ //TODO - emulation of mirroring is all bolloxed. using System; - using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper116 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper120.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper120.cs index 29175b75fa..1c907bdd87 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper120.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper120.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper120 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper132.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper132.cs index abbfe2364a..6898abf625 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper132.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper132.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // Creatom // specs pulled from Nintendulator sources diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper143.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper143.cs index 833f35a99c..16b6ca2122 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper143.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper143.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // sachen // NROM plus random copy protection circuit diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper156.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper156.cs index ee0a701d86..696cba92e6 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper156.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper156.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // behavior pulled from fceux: /* diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper164.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper164.cs index 12d900aa98..7d79d1c943 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper164.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper164.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper164 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper168.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper168.cs index 96121c8f12..4e0aaa109c 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper168.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper168.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // RacerMate II // 64KB PRGROM, 64KB CHRRAM(!), CHRRAM is battry backed (!!) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs index bae41ec199..db0fef591a 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper176 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper177.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper177.cs index 9cde48ad75..5c31161cd3 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper177.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper177.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // china // behavior from fceux diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs index 25c82f1750..316bdccee1 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs @@ -1,7 +1,6 @@ using BizHawk.Common; - -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper178 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper180.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper180.cs index bb6ffab6fe..099fa34624 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper180.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper180.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper180 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper193.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper193.cs index f55e3db9cd..1dd4d2d76e 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper193.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper193.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper193 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs index dfd5777c9b..36857a8486 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper200 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper201.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper201.cs index 153c14407d..2ad9dd0ebc 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper201.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper201.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper201 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper203.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper203.cs index fc52acb690..857e3d91ea 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper203.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper203.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper203 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs index f877bca305..d695c77866 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /* * Here are Disch's original notes: diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper218.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper218.cs index 54c53850c0..881e1759c2 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper218.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper218.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // rewires pins to use internal CIRAM as both nametable and pattern data, so // the entire cart is just a single PRGROM chip (plus CIC) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs index 064db9984c..02c2b07e9a 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper225 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs index 3a4e27b9af..d43fe770b7 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper226 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs index ebd73a82c2..c0499540f0 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper227 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs index a8af48b078..fac7158cba 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper230 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs index 4a138a02a6..9d3416f041 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper231 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs index 8414388600..e822291558 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs @@ -1,7 +1,7 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper233 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper240.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper240.cs index dabb8e318c..d0218f87f9 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper240.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper240.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper240 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper241.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper241.cs index 07c2983f0f..fec3b57995 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper241.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper241.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper241 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs index 341d19f78a..879d568a96 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /* PCB Class: Unknown diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper243.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper243.cs index 5206c324aa..169cfc06c3 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper243.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper243.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper243 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper246.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper246.cs index 90c84315b2..11f73e3025 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper246.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper246.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper246 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs index a90e8f61cc..a140945530 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper50 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper60.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper60.cs index 446e4e0617..0c74bff6cc 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper60.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper60.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper60 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs index 9bb962fc4a..1d9e5fa94c 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper61 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs index 8f5e4409f9..a36ede4c37 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper62 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs index 408ae577d9..131940318d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 19 + 210 //210 lacks the sound and nametable control diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs index 2a02af1d72..3eae4b276d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 105 public sealed class NES_EVENT : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM.cs index 2abed5f18d..379bb7f65f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { [NES.INESBoardImplPriority] public sealed class NROM : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM368.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM368.cs index a7acaaba33..831ee7f7e3 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM368.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM368.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class NROM368 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs index 57e62784f2..9edd0dbff4 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //this board contains a Namcot 109 and some extra ram for nametables public sealed class DRROM : Namcot108Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs index 89bbeebd57..65ac525db1 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //aka NAMCOT-3446 public sealed class Mapper076 : Namcot108Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs index f0a6271d82..fed1acc9d7 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /* Example Games: diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs index d915316222..3ae33c9c63 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //pretty much just one game. //wires the mapper outputs to control the nametables. check out the companion board TLSROM diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs index 13d65e2f31..c7d072d5f6 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper112 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs index f9979dcea8..c2d4f85ef6 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /* Example Games: diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs index c197405098..3a9267c17c 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs @@ -1,6 +1,6 @@ using System; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //various japanese Namcot108 boards plus DEROM public sealed class Mapper206 : Namcot108Board_Base diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs index 976512f669..a9e6fe20bf 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // http://wiki.nesdev.com/w/index.php/Namco_163_audio public sealed class Namco163Audio : IDisposable diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs index 0953901996..b4e2255f73 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs @@ -3,12 +3,12 @@ //for some info on NAMCOT 108 //but mostly http://wiki.nesdev.com/w/index.php/INES_Mapper_206 +//TODO - prg is 4 bits, chr is 6 bits + using System; using BizHawk.Common; -//TODO - prg is 4 bits, chr is 6 bits - -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //also, Namcot109, Namcot118, Namcot119 chips are this exact same thing public class Namcot108Chip : IDisposable diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NanJing.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NanJing.cs index 288b06bea2..0c9473a54e 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NanJing.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NanJing.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class NanJing : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NovelDiamond.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NovelDiamond.cs index 786d8a4144..58b62e693e 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NovelDiamond.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NovelDiamond.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class NovelDiamond : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs index 5a48609920..ace49f9bc0 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA MMC2 Mike Tyson's Punch-Out!! //AKA MMC4 (similar enough to combine in one fle) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs index 0110018954..0f576baf89 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs @@ -1,8 +1,7 @@ using System; - using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /// /// describes a 24C01 or 24C02 as connected to a BANDAI-FCG diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SachenSimple.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SachenSimple.cs index 97f861a6b0..ddec931303 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SachenSimple.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SachenSimple.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // a number of boards used by Sachen (and others?) // 32K prgrom blocks and 8k chrrom blocks diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft1.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft1.cs index 378ecd23c8..f3646249b4 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft1.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft1.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 184 //Sunsoft-1 chips, EXCEPT for fantasy zone. diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs index 72027f1286..8b9a3102d9 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA Sunsoft-2 chip (SUNSOFT-3 pcb) //game=Tenka no Goikenban: Mito Koumon ; chip=sunsoft-2 ; pcb = SUNSOFT-3 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs index e47175eee9..493be8ca21 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //game=shanghai ; chip=sunsoft-2 ; pcb=SUNSOFT-3R //game=fantasy zone ; chip=sunsoft-1 ; pcb = SUNSOFT-4 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs index 9add74523d..ec1744769d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 67 //this may be confusing due to general chaos with the early sunsoft mappers. see docs/sunsoft.txt diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft4.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft4.cs index 82dfdeb31a..12c5699dae 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft4.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft4.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 068 (and TENGEN-800042) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index 64a151ae1e..dc7eaf595e 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA MMC1 //http://wiki.nesdev.com/w/index.php/SxROM diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs index 38708a3cb1..4d570c226e 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //Mapper 152 //Arkanoid 2 (J) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs index 82e8553977..7c94b80069 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 64 public sealed class TENGEN_800032 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs index d1a01ebebb..520a53b182 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // tetris (unl) // behaves identically to CNROM for the one board it is on, but supports more (64K prg, 64K chr) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs index 12edc8ad87..a53cb68965 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 033 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs index 7d5be0398b..66c4811c06 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 80 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs index f0e701e34b..eb621c1e2a 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Taito_X1_017 : NES.NESBoardBase { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs index 134a15da9a..1008335ae6 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //generally mapper2 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs index a65f1d2a7e..349eb7182d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //AKA mapper 75 public sealed class VRC1 : NES.NESBoardBase diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs index 11e8a40768..b47515ce2d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs @@ -1,10 +1,9 @@ //TODO - for chr, refactor to use 8 registers of 8 bits instead of 16 registers of 4 bits. more realistic, less weird code. using System; - using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //mapper 21 + 22 + 23 + 25 (docs largely in 021.txt for VRC4 and 22.txt for VRC2) //If you change any of the IRQ logic here, be sure to change it in VRC 3/6/7 as well. diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs index de5511f401..6f60509959 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs @@ -1,6 +1,6 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //mapper 73 AKA salamander //different IRQ logic than other VRC diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs index 111afe923b..0d688c0e9b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs @@ -1,8 +1,7 @@ using System; - using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //mapper 24 + 26 //If you change any of the IRQ logic here, be sure to change it in VRC 2/3/4/7 as well. diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs index c9f923366a..216d86c141 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { //mapper 85 //If you change any of the IRQ logic here, be sure to change it in VRC 2/3/4/6 as well. diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs index 8330d82bed..6347562a37 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs @@ -8,7 +8,7 @@ using BizHawk.Emulation.CPUs.M6502; #pragma warning disable 162 -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public partial class NES : IEmulator { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDS.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDS.cs index f3c658c853..d9b84a5947 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDS.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDS.cs @@ -6,7 +6,7 @@ using System.IO; using BizHawk.Common; using BizHawk.Emulation.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /* * http://sourceforge.net/p/fceultra/code/2696/tree/fceu/src/fds.cpp - only used for timer info diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDSAudio.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDSAudio.cs index de3bd8e65b..8248da7add 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDSAudio.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDSAudio.cs @@ -1,7 +1,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { // http://wiki.nesdev.com/w/index.php/FDS_audio public class FDSAudio //: IDisposable diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/RamAdapter.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/RamAdapter.cs index 8556100d20..73bfc70cee 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/RamAdapter.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/RamAdapter.cs @@ -3,7 +3,7 @@ using System.IO; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /// /// implements the FDS disk drive hardware, more or less diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index 698678c626..478b963af8 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -7,7 +7,7 @@ using BizHawk.Common; using BizHawk.Emulation.Common; //TODO - redo all timekeeping in terms of master clock -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { public partial class NES : IEmulator diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs index 920b321199..aa9bd01d9d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { partial class NES { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs index 7e23ea6aae..124af6869d 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs @@ -15,7 +15,7 @@ using System; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { partial class NES { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs index 68e08fc580..a9b5e87906 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs @@ -6,7 +6,7 @@ using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { partial class NES { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Palettes.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Palettes.cs index 0cf3cc5b54..eda61a3a76 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Palettes.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Palettes.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { partial class NES { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Unif.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Unif.cs index 462e8a4a88..2b01cd03d3 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Unif.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Unif.cs @@ -6,7 +6,7 @@ using System.IO; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { /// /// at least it's not iNES 2.0... diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs index b62aba8dea..cdcea4e7cb 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs @@ -1,7 +1,7 @@ using System.IO; using BizHawk.Common; -namespace BizHawk.Emulation.Consoles.Nintendo +namespace BizHawk.Emulation.Cores.Nintendo.NES { partial class NES {