Fix Chou Aniki. Remove hack. (#825)

- Fix Chou Aniki. Remove hack.
- Fix lines in License Stub

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_
 

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_
 

source/snes9x/c4.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #include <math.h>
 #include "snes9x.h"
 #include "memmap.h"

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_
 

source/snes9x/c4emu.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #include <math.h>
 #include "snes9x.h"
 #include "memmap.h"

source/snes9x/cheats.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #include <ctype.h>
 #include "snes9x.h"
 #include "memmap.h"

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_
 

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"
 

source/snes9x/controls.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #include <map>
 #include <set>
 #include <vector>
@@ -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];
 

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_
 

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"

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_
 

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

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_
 

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_
 

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
 }
 

source/snes9x/crosshairs.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #ifdef HAVE_LIBPNG
 #include <png.h>
 #endif

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_
 

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_
 

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"

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_
 

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

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_
 

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"
 

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"
 

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_
 

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"

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_
 

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"

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_
 

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_
 

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_
 

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_
 

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;
 

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_
 

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_
 

source/snes9x/missing.h

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #ifdef DEBUGGER
 
 #ifndef _MISSING_H_

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_
 

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"
 

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_
 

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_
 

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.IRQFlagChanging |= IRQ_TRIGGER_NMI;
-					Timings.NMITriggerPos = CPU.Cycles + 6 + 6;
 
 					#ifdef DEBUGGER
 					if (Settings.TraceHCEvent)

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"
 

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_
 

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"
 

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_
 

source/snes9x/screenshot.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #ifdef HAVE_LIBPNG
 #include <png.h>
 #endif

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_
 

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"

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_
 

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_
 

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"
 

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_
 

source/snes9x/seta010.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #include <math.h>
 #include "snes9x.h"
 #include "memmap.h"

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"

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"

source/snes9x/snapshot.cpp

@@ -4,7 +4,6 @@
    For further information, consult the LICENSE file in the root directory.
 \*****************************************************************************/
 
-
 #include <assert.h>
 #include "snes9x.h"
 #include "memmap.h"

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_
 

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_NONE        = 0x0,
-	IRQ_SET_FLAG = 1,
+	IRQ_SET_FLAG    = 0x1,
-	IRQ_CLEAR_FLAG = 2
+	IRQ_CLEAR_FLAG  = 0x2,
+	IRQ_TRIGGER_NMI = 0x4
 };
 
 struct STimings

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_
 

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_
 

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 <string>

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_
 

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.

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_