From f513ac5e2f99e5e6564b5ab24fe008d848c7c2e1 Mon Sep 17 00:00:00 2001 From: bladeoner Date: Mon, 11 Mar 2019 02:29:24 +0100 Subject: [PATCH] Fix Chou Aniki. Remove hack. (#825) - Fix Chou Aniki. Remove hack. - Fix lines in License Stub --- source/snes9x/65c816.h | 1 - source/snes9x/bsx.h | 1 - source/snes9x/c4.cpp | 1 - source/snes9x/c4.h | 1 - source/snes9x/c4emu.cpp | 1 - source/snes9x/cheats.cpp | 1 - source/snes9x/cheats.h | 1 - source/snes9x/clip.cpp | 1 - source/snes9x/controls.cpp | 12 +++++++++++- source/snes9x/controls.h | 1 - source/snes9x/cpu.cpp | 1 - source/snes9x/cpuaddr.h | 1 - source/snes9x/cpuexec.cpp | 19 ++++++++++++------- source/snes9x/cpuexec.h | 1 - source/snes9x/cpumacro.h | 1 - source/snes9x/cpuops.cpp | 13 ++++++------- source/snes9x/crosshairs.cpp | 1 - source/snes9x/crosshairs.h | 1 - source/snes9x/display.h | 1 - source/snes9x/dma.cpp | 1 - source/snes9x/dma.h | 1 - source/snes9x/dsp.cpp | 1 - source/snes9x/dsp.h | 1 - source/snes9x/dsp2.cpp | 1 - source/snes9x/dsp3.cpp | 1 - source/snes9x/font.h | 1 - source/snes9x/fxemu.cpp | 1 - source/snes9x/fxemu.h | 1 - source/snes9x/fxinst.cpp | 1 - source/snes9x/fxinst.h | 1 - source/snes9x/getset.h | 1 - source/snes9x/language.h | 1 - source/snes9x/logger.h | 1 - source/snes9x/memmap.cpp | 2 -- source/snes9x/memmap.h | 1 - source/snes9x/messages.h | 1 - source/snes9x/missing.h | 1 - source/snes9x/movie.h | 1 - source/snes9x/obc1.cpp | 1 - source/snes9x/obc1.h | 1 - source/snes9x/port.h | 1 - source/snes9x/ppu.cpp | 3 +-- source/snes9x/sa1.cpp | 1 - source/snes9x/sa1.h | 1 - source/snes9x/sa1cpu.cpp | 1 - source/snes9x/sar.h | 1 - source/snes9x/screenshot.cpp | 1 - source/snes9x/screenshot.h | 1 - source/snes9x/sdd1.cpp | 1 - source/snes9x/sdd1.h | 1 - source/snes9x/sdd1emu.h | 1 - source/snes9x/seta.cpp | 1 - source/snes9x/seta.h | 1 - source/snes9x/seta010.cpp | 1 - source/snes9x/seta011.cpp | 1 - source/snes9x/seta018.cpp | 1 - source/snes9x/snapshot.cpp | 1 - source/snes9x/snapshot.h | 1 - source/snes9x/snes9x.h | 8 ++++---- source/snes9x/spc7110.h | 1 - source/snes9x/srtc.h | 1 - source/snes9x/stream.cpp | 1 - source/snes9x/stream.h | 1 - source/snes9x/tile.cpp | 1 - source/snes9x/tile.h | 1 - 65 files changed, 34 insertions(+), 82 deletions(-) diff --git a/source/snes9x/65c816.h b/source/snes9x/65c816.h index 94e0344..fba1eec 100644 --- a/source/snes9x/65c816.h +++ b/source/snes9x/65c816.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _65C816_H_ #define _65C816_H_ diff --git a/source/snes9x/bsx.h b/source/snes9x/bsx.h index 77258ea..b7d3919 100644 --- a/source/snes9x/bsx.h +++ b/source/snes9x/bsx.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _BSX_H_ #define _BSX_H_ diff --git a/source/snes9x/c4.cpp b/source/snes9x/c4.cpp index 24682fa..98a1d4c 100644 --- a/source/snes9x/c4.cpp +++ b/source/snes9x/c4.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/c4.h b/source/snes9x/c4.h index 8708700..f840651 100644 --- a/source/snes9x/c4.h +++ b/source/snes9x/c4.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _C4_H_ #define _C4_H_ diff --git a/source/snes9x/c4emu.cpp b/source/snes9x/c4emu.cpp index efec93b..708acab 100644 --- a/source/snes9x/c4emu.cpp +++ b/source/snes9x/c4emu.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/cheats.cpp b/source/snes9x/cheats.cpp index 40abe28..fa99e33 100644 --- a/source/snes9x/cheats.cpp +++ b/source/snes9x/cheats.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/cheats.h b/source/snes9x/cheats.h index 161f66a..9171c3c 100644 --- a/source/snes9x/cheats.h +++ b/source/snes9x/cheats.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _CHEATS_H_ #define _CHEATS_H_ diff --git a/source/snes9x/clip.cpp b/source/snes9x/clip.cpp index 2c35061..2578fd5 100644 --- a/source/snes9x/clip.cpp +++ b/source/snes9x/clip.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/controls.cpp b/source/snes9x/controls.cpp index ed5a316..58364ea 100644 --- a/source/snes9x/controls.cpp +++ b/source/snes9x/controls.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include #include #include @@ -2444,6 +2443,17 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2) break; } +#ifdef NETPLAY_SUPPORT + if (Settings.NetPlay && data2 != 1) { //data2 == 1 means it's sent by the netplay code + if (Settings.NetPlayServer) { + S9xNPSendJoypadSwap(); + } else { + S9xSetInfoString("Netplay Client cannot swap pads."); + break; + } + } +#endif + newcontrollers[1] = curcontrollers[0]; newcontrollers[0] = curcontrollers[1]; diff --git a/source/snes9x/controls.h b/source/snes9x/controls.h index ee2cf31..a96d586 100644 --- a/source/snes9x/controls.h +++ b/source/snes9x/controls.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _CONTROLS_H_ #define _CONTROLS_H_ diff --git a/source/snes9x/cpu.cpp b/source/snes9x/cpu.cpp index 07f779e..f77f149 100644 --- a/source/snes9x/cpu.cpp +++ b/source/snes9x/cpu.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "dma.h" diff --git a/source/snes9x/cpuaddr.h b/source/snes9x/cpuaddr.h index 6228027..47e1aa6 100644 --- a/source/snes9x/cpuaddr.h +++ b/source/snes9x/cpuaddr.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _CPUADDR_H_ #define _CPUADDR_H_ diff --git a/source/snes9x/cpuexec.cpp b/source/snes9x/cpuexec.cpp index bc8d4d5..cd2b1ba 100644 --- a/source/snes9x/cpuexec.cpp +++ b/source/snes9x/cpuexec.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "cpuops.h" @@ -25,9 +24,14 @@ void S9xMainLoop (void) #define CHECK_FOR_IRQ_CHANGE() \ if (Timings.IRQFlagChanging) \ { \ - if (Timings.IRQFlagChanging == IRQ_CLEAR_FLAG) \ + if (Timings.IRQFlagChanging & IRQ_TRIGGER_NMI) \ + { \ + CPU.NMIPending = TRUE; \ + Timings.NMITriggerPos = CPU.Cycles + 6; \ + } \ + if (Timings.IRQFlagChanging & IRQ_CLEAR_FLAG) \ ClearIRQ(); \ - else if (Timings.IRQFlagChanging == IRQ_SET_FLAG) \ + else if (Timings.IRQFlagChanging & IRQ_SET_FLAG) \ SetIRQ(); \ Timings.IRQFlagChanging = IRQ_NONE; \ } @@ -132,11 +136,12 @@ void S9xMainLoop (void) if (!(CPU.Flags & FRAME_ADVANCE_FLAG)) #endif { - S9xSyncSpeed(); + S9xSyncSpeed(); } + break; } - + uint8 Op; struct SOpcodes *Opcodes; @@ -263,9 +268,9 @@ void S9xDoHEventProcessing (void) if (Timings.NextIRQTimer != 0x0fffffff) Timings.NextIRQTimer -= Timings.H_Max; S9xAPUSetReferenceTime(CPU.Cycles); - + if (Settings.SA1) - SA1.Cycles -= Timings.H_Max * 3; + SA1.Cycles -= Timings.H_Max * 3; CPU.V_Counter++; if (CPU.V_Counter >= Timings.V_Max) // V ranges from 0 to Timings.V_Max - 1 diff --git a/source/snes9x/cpuexec.h b/source/snes9x/cpuexec.h index ce2f1e4..ed02555 100644 --- a/source/snes9x/cpuexec.h +++ b/source/snes9x/cpuexec.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _CPUEXEC_H_ #define _CPUEXEC_H_ diff --git a/source/snes9x/cpumacro.h b/source/snes9x/cpumacro.h index 20bb480..e2bf7a3 100644 --- a/source/snes9x/cpumacro.h +++ b/source/snes9x/cpumacro.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _CPUMACRO_H_ #define _CPUMACRO_H_ diff --git a/source/snes9x/cpuops.cpp b/source/snes9x/cpuops.cpp index 4afce01..b2342ba 100644 --- a/source/snes9x/cpuops.cpp +++ b/source/snes9x/cpuops.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "apu/apu.h" @@ -1453,7 +1452,7 @@ static void Op58 (void) AddCycles(ONE_CYCLE); #ifndef SA1_OPCODES - Timings.IRQFlagChanging = IRQ_CLEAR_FLAG; + Timings.IRQFlagChanging |= IRQ_CLEAR_FLAG; #else ClearIRQ(); #endif @@ -1465,7 +1464,7 @@ static void Op78 (void) AddCycles(ONE_CYCLE); #ifndef SA1_OPCODES - Timings.IRQFlagChanging = IRQ_SET_FLAG; + Timings.IRQFlagChanging |= IRQ_SET_FLAG; #else SetIRQ(); #endif @@ -2781,7 +2780,7 @@ static void OpDC (void) { S9xSetPCBase(AbsoluteIndirectLong(JUMP)); #ifdef SA1_OPCODES - AddCycles(ONE_CYCLE); + AddCycles(ONE_CYCLE); #endif } @@ -2789,7 +2788,7 @@ static void OpDCSlow (void) { S9xSetPCBase(AbsoluteIndirectLongSlow(JUMP)); #ifdef SA1_OPCODES - AddCycles(ONE_CYCLE); + AddCycles(ONE_CYCLE); #endif } @@ -2797,7 +2796,7 @@ static void Op5C (void) { S9xSetPCBase(AbsoluteLong(JUMP)); #ifdef SA1_OPCODES - AddCycles(ONE_CYCLE); + AddCycles(ONE_CYCLE); #endif } @@ -2805,7 +2804,7 @@ static void Op5CSlow (void) { S9xSetPCBase(AbsoluteLongSlow(JUMP)); #ifdef SA1_OPCODES - AddCycles(ONE_CYCLE); + AddCycles(ONE_CYCLE); #endif } diff --git a/source/snes9x/crosshairs.cpp b/source/snes9x/crosshairs.cpp index b495c36..4c99065 100644 --- a/source/snes9x/crosshairs.cpp +++ b/source/snes9x/crosshairs.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifdef HAVE_LIBPNG #include #endif diff --git a/source/snes9x/crosshairs.h b/source/snes9x/crosshairs.h index 65866ab..59ea59a 100644 --- a/source/snes9x/crosshairs.h +++ b/source/snes9x/crosshairs.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _CROSSHAIRS_H_ #define _CROSSHAIRS_H_ diff --git a/source/snes9x/display.h b/source/snes9x/display.h index 4aac723..bafb5c8 100644 --- a/source/snes9x/display.h +++ b/source/snes9x/display.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _DISPLAY_H_ #define _DISPLAY_H_ diff --git a/source/snes9x/dma.cpp b/source/snes9x/dma.cpp index 12d7356..e1ad324 100644 --- a/source/snes9x/dma.cpp +++ b/source/snes9x/dma.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "dma.h" diff --git a/source/snes9x/dma.h b/source/snes9x/dma.h index e83af4c..93c993a 100644 --- a/source/snes9x/dma.h +++ b/source/snes9x/dma.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _DMA_H_ #define _DMA_H_ diff --git a/source/snes9x/dsp.cpp b/source/snes9x/dsp.cpp index d4bffdb..27db64a 100644 --- a/source/snes9x/dsp.cpp +++ b/source/snes9x/dsp.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #ifdef DEBUGGER diff --git a/source/snes9x/dsp.h b/source/snes9x/dsp.h index f2d12bf..0044fa7 100644 --- a/source/snes9x/dsp.h +++ b/source/snes9x/dsp.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _DSP1_H_ #define _DSP1_H_ diff --git a/source/snes9x/dsp2.cpp b/source/snes9x/dsp2.cpp index 58f56b2..77c7734 100644 --- a/source/snes9x/dsp2.cpp +++ b/source/snes9x/dsp2.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/dsp3.cpp b/source/snes9x/dsp3.cpp index e71c032..47d16f8 100644 --- a/source/snes9x/dsp3.cpp +++ b/source/snes9x/dsp3.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/font.h b/source/snes9x/font.h index 2762b60..8bf25a8 100644 --- a/source/snes9x/font.h +++ b/source/snes9x/font.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _FONT_H_ #define _FONT_H_ diff --git a/source/snes9x/fxemu.cpp b/source/snes9x/fxemu.cpp index a32f811..7c02106 100644 --- a/source/snes9x/fxemu.cpp +++ b/source/snes9x/fxemu.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "fxinst.h" diff --git a/source/snes9x/fxemu.h b/source/snes9x/fxemu.h index f5cea75..9f4bad9 100644 --- a/source/snes9x/fxemu.h +++ b/source/snes9x/fxemu.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _FXEMU_H_ #define _FXEMU_H_ diff --git a/source/snes9x/fxinst.cpp b/source/snes9x/fxinst.cpp index 6674b4c..a32a4c1 100644 --- a/source/snes9x/fxinst.cpp +++ b/source/snes9x/fxinst.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "fxinst.h" #include "fxemu.h" diff --git a/source/snes9x/fxinst.h b/source/snes9x/fxinst.h index 5a18915..5abac4e 100644 --- a/source/snes9x/fxinst.h +++ b/source/snes9x/fxinst.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _FXINST_H_ #define _FXINST_H_ diff --git a/source/snes9x/getset.h b/source/snes9x/getset.h index bf6dfc5..dfec3f2 100644 --- a/source/snes9x/getset.h +++ b/source/snes9x/getset.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _GETSET_H_ #define _GETSET_H_ diff --git a/source/snes9x/language.h b/source/snes9x/language.h index 44151d0..c218b3a 100644 --- a/source/snes9x/language.h +++ b/source/snes9x/language.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _LANGUAGE_H_ #define _LANGUAGE_H_ diff --git a/source/snes9x/logger.h b/source/snes9x/logger.h index 93bd974..2a37dc2 100644 --- a/source/snes9x/logger.h +++ b/source/snes9x/logger.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _LOGGER_H_ #define _LOGGER_H_ diff --git a/source/snes9x/memmap.cpp b/source/snes9x/memmap.cpp index a82ae5d..f765a3e 100644 --- a/source/snes9x/memmap.cpp +++ b/source/snes9x/memmap.cpp @@ -3648,8 +3648,6 @@ void CMemory::ApplyROMFixes (void) { if (match_id("AVCJ")) // Rendering Ranger R2 Timings.APUSpeedup = 4; - if (match_id("AANJ")) // Chou Aniki - Timings.APUSpeedup = -3; if (match_na("CIRCUIT USA")) Timings.APUSpeedup = 3; diff --git a/source/snes9x/memmap.h b/source/snes9x/memmap.h index a8bee8f..c21c09a 100644 --- a/source/snes9x/memmap.h +++ b/source/snes9x/memmap.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _MEMMAP_H_ #define _MEMMAP_H_ diff --git a/source/snes9x/messages.h b/source/snes9x/messages.h index 6a9cb29..1019e3b 100644 --- a/source/snes9x/messages.h +++ b/source/snes9x/messages.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _MESSAGES_H_ #define _MESSAGES_H_ diff --git a/source/snes9x/missing.h b/source/snes9x/missing.h index 527de5d..681042d 100644 --- a/source/snes9x/missing.h +++ b/source/snes9x/missing.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifdef DEBUGGER #ifndef _MISSING_H_ diff --git a/source/snes9x/movie.h b/source/snes9x/movie.h index a387d8f..31fcb26 100644 --- a/source/snes9x/movie.h +++ b/source/snes9x/movie.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _MOVIE_H_ #define _MOVIE_H_ diff --git a/source/snes9x/obc1.cpp b/source/snes9x/obc1.cpp index ca30a18..fe1d7e7 100644 --- a/source/snes9x/obc1.cpp +++ b/source/snes9x/obc1.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/obc1.h b/source/snes9x/obc1.h index b4cadb9..686eb9b 100644 --- a/source/snes9x/obc1.h +++ b/source/snes9x/obc1.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _OBC1_H_ #define _OBC1_H_ diff --git a/source/snes9x/port.h b/source/snes9x/port.h index 8a2f0d6..8102f34 100644 --- a/source/snes9x/port.h +++ b/source/snes9x/port.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _PORT_H_ #define _PORT_H_ diff --git a/source/snes9x/ppu.cpp b/source/snes9x/ppu.cpp index 6bca9dc..50446f3 100644 --- a/source/snes9x/ppu.cpp +++ b/source/snes9x/ppu.cpp @@ -1403,8 +1403,7 @@ void S9xSetCPU (uint8 Byte, uint16 Address) { // FIXME: triggered at HC+=6, checked just before the final CPU cycle, // then, when to call S9xOpcode_NMI()? - CPU.NMIPending = TRUE; - Timings.NMITriggerPos = CPU.Cycles + 6 + 6; + Timings.IRQFlagChanging |= IRQ_TRIGGER_NMI; #ifdef DEBUGGER if (Settings.TraceHCEvent) diff --git a/source/snes9x/sa1.cpp b/source/snes9x/sa1.cpp index c5519ce..4f5fc8b 100644 --- a/source/snes9x/sa1.cpp +++ b/source/snes9x/sa1.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/sa1.h b/source/snes9x/sa1.h index 91075d1..4a8ce72 100644 --- a/source/snes9x/sa1.h +++ b/source/snes9x/sa1.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SA1_H_ #define _SA1_H_ diff --git a/source/snes9x/sa1cpu.cpp b/source/snes9x/sa1cpu.cpp index b08a5ac..9cf805b 100644 --- a/source/snes9x/sa1cpu.cpp +++ b/source/snes9x/sa1cpu.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/sar.h b/source/snes9x/sar.h index 8f61ee5..7e07b99 100644 --- a/source/snes9x/sar.h +++ b/source/snes9x/sar.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SAR_H_ #define _SAR_H_ diff --git a/source/snes9x/screenshot.cpp b/source/snes9x/screenshot.cpp index 4125173..90df100 100644 --- a/source/snes9x/screenshot.cpp +++ b/source/snes9x/screenshot.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifdef HAVE_LIBPNG #include #endif diff --git a/source/snes9x/screenshot.h b/source/snes9x/screenshot.h index 7daad7a..91b5f33 100644 --- a/source/snes9x/screenshot.h +++ b/source/snes9x/screenshot.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SCREENSHOT_H_ #define _SCREENSHOT_H_ diff --git a/source/snes9x/sdd1.cpp b/source/snes9x/sdd1.cpp index c6a2b3b..e11f50a 100644 --- a/source/snes9x/sdd1.cpp +++ b/source/snes9x/sdd1.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "sdd1.h" diff --git a/source/snes9x/sdd1.h b/source/snes9x/sdd1.h index c8e79a0..10dfeb7 100644 --- a/source/snes9x/sdd1.h +++ b/source/snes9x/sdd1.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SDD1_H_ #define _SDD1_H_ diff --git a/source/snes9x/sdd1emu.h b/source/snes9x/sdd1emu.h index 1b78874..b4d5163 100644 --- a/source/snes9x/sdd1emu.h +++ b/source/snes9x/sdd1emu.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SDD1EMU_H_ #define _SDD1EMU_H_ diff --git a/source/snes9x/seta.cpp b/source/snes9x/seta.cpp index 0773696..7df06f2 100644 --- a/source/snes9x/seta.cpp +++ b/source/snes9x/seta.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "seta.h" diff --git a/source/snes9x/seta.h b/source/snes9x/seta.h index 91ee3da..2fa4e56 100644 --- a/source/snes9x/seta.h +++ b/source/snes9x/seta.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SETA_H_ #define _SETA_H_ diff --git a/source/snes9x/seta010.cpp b/source/snes9x/seta010.cpp index 5d8a1c3..b57e43b 100644 --- a/source/snes9x/seta010.cpp +++ b/source/snes9x/seta010.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/seta011.cpp b/source/snes9x/seta011.cpp index 18a4f9e..32670b3 100644 --- a/source/snes9x/seta011.cpp +++ b/source/snes9x/seta011.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "seta.h" diff --git a/source/snes9x/seta018.cpp b/source/snes9x/seta018.cpp index 1302284..371a407 100644 --- a/source/snes9x/seta018.cpp +++ b/source/snes9x/seta018.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include "snes9x.h" #include "memmap.h" #include "seta.h" diff --git a/source/snes9x/snapshot.cpp b/source/snes9x/snapshot.cpp index ff9bf8a..4b3e9d3 100644 --- a/source/snes9x/snapshot.cpp +++ b/source/snes9x/snapshot.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #include #include "snes9x.h" #include "memmap.h" diff --git a/source/snes9x/snapshot.h b/source/snes9x/snapshot.h index c3d82ec..f1a5ecc 100644 --- a/source/snes9x/snapshot.h +++ b/source/snes9x/snapshot.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SNAPSHOT_H_ #define _SNAPSHOT_H_ diff --git a/source/snes9x/snes9x.h b/source/snes9x/snes9x.h index 18a961f..a3165c8 100644 --- a/source/snes9x/snes9x.h +++ b/source/snes9x/snes9x.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SNES9X_H_ #define _SNES9X_H_ @@ -155,9 +154,10 @@ enum enum { - IRQ_NONE = 0, - IRQ_SET_FLAG = 1, - IRQ_CLEAR_FLAG = 2 + IRQ_NONE = 0x0, + IRQ_SET_FLAG = 0x1, + IRQ_CLEAR_FLAG = 0x2, + IRQ_TRIGGER_NMI = 0x4 }; struct STimings diff --git a/source/snes9x/spc7110.h b/source/snes9x/spc7110.h index 0eda41a..5d082ac 100644 --- a/source/snes9x/spc7110.h +++ b/source/snes9x/spc7110.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SPC7110_H_ #define _SPC7110_H_ diff --git a/source/snes9x/srtc.h b/source/snes9x/srtc.h index 916df99..7152d0a 100644 --- a/source/snes9x/srtc.h +++ b/source/snes9x/srtc.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _SRTC_H_ #define _SRTC_H_ diff --git a/source/snes9x/stream.cpp b/source/snes9x/stream.cpp index bccd6b9..d6e1c1c 100644 --- a/source/snes9x/stream.cpp +++ b/source/snes9x/stream.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - // Abstract the details of reading from zip files versus FILE *'s. #include diff --git a/source/snes9x/stream.h b/source/snes9x/stream.h index 1241256..07e8410 100644 --- a/source/snes9x/stream.h +++ b/source/snes9x/stream.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _STREAM_H_ #define _STREAM_H_ diff --git a/source/snes9x/tile.cpp b/source/snes9x/tile.cpp index 94e2635..470bc57 100644 --- a/source/snes9x/tile.cpp +++ b/source/snes9x/tile.cpp @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - // This file includes itself multiple times. // The other option would be to have 4 files, where A includes B, and B includes C 3 times, and C includes D 5 times. // Look for the following marker to find where the divisions are. diff --git a/source/snes9x/tile.h b/source/snes9x/tile.h index d5bdb4f..1a07a40 100644 --- a/source/snes9x/tile.h +++ b/source/snes9x/tile.h @@ -4,7 +4,6 @@ For further information, consult the LICENSE file in the root directory. \*****************************************************************************/ - #ifndef _TILE_H_ #define _TILE_H_