The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-12-24 02:01:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Chou Aniki. Remove hack. (#825)

Browse Source 
- Fix Chou Aniki. Remove hack.
- Fix lines in License Stub
This commit is contained in:
bladeoner 2019-03-11 02:29:24 +01:00 committed by dborth
parent 25fd692dc5
commit f513ac5e2f
65 changed files with 34 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/snes9x/65c816.h
View File

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

1
source/snes9x/bsx.h
View File

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

1
source/snes9x/c4.cpp
View File

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

1
source/snes9x/c4.h
View File

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

1
source/snes9x/c4emu.cpp
View File

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

1
source/snes9x/cheats.cpp
View File

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

1
source/snes9x/cheats.h
View File

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

1
source/snes9x/clip.cpp
View File

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

12
source/snes9x/controls.cpp
View File

@ -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];

1
source/snes9x/controls.h
View File

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

1
source/snes9x/cpu.cpp
View File

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

1
source/snes9x/cpuaddr.h
View File

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

19
source/snes9x/cpuexec.cpp
View File

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

1
source/snes9x/cpuexec.h
View File

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

1
source/snes9x/cpumacro.h
View File

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

13
source/snes9x/cpuops.cpp
View File

@ -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
}

1
source/snes9x/crosshairs.cpp
View File

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

1
source/snes9x/crosshairs.h
View File

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

1
source/snes9x/display.h
View File

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

1
source/snes9x/dma.cpp
View File

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

1
source/snes9x/dma.h
View File

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

1
source/snes9x/dsp.cpp
View File

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

1
source/snes9x/dsp.h
View File

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

1
source/snes9x/dsp2.cpp
View File

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

1
source/snes9x/dsp3.cpp
View File

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

1
source/snes9x/font.h
View File

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

1
source/snes9x/fxemu.cpp
View File

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

1
source/snes9x/fxemu.h
View File

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

1
source/snes9x/fxinst.cpp
View File

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

1
source/snes9x/fxinst.h
View File

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

1
source/snes9x/getset.h
View File

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

1
source/snes9x/language.h
View File

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

1
source/snes9x/logger.h
View File

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

2
source/snes9x/memmap.cpp
View File

@ -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;

1
source/snes9x/memmap.h
View File

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

1
source/snes9x/messages.h
View File

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

1
source/snes9x/missing.h
View File

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

1
source/snes9x/movie.h
View File

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

1
source/snes9x/obc1.cpp
View File

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

1
source/snes9x/obc1.h
View File

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

1
source/snes9x/port.h
View File

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

3
source/snes9x/ppu.cpp
View File

@ -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)

1
source/snes9x/sa1.cpp
View File

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

1
source/snes9x/sa1.h
View File

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

1
source/snes9x/sa1cpu.cpp
View File

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

1
source/snes9x/sar.h
View File

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

1
source/snes9x/screenshot.cpp
View File

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

1
source/snes9x/screenshot.h
View File

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

1
source/snes9x/sdd1.cpp
View File

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

1
source/snes9x/sdd1.h
View File

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

1
source/snes9x/sdd1emu.h
View File

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

1
source/snes9x/seta.cpp
View File

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

1
source/snes9x/seta.h
View File

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

1
source/snes9x/seta010.cpp
View File

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

1
source/snes9x/seta011.cpp
View File

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

1
source/snes9x/seta018.cpp
View File

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

1
source/snes9x/snapshot.cpp
View File

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

1
source/snes9x/snapshot.h
View File

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

8
source/snes9x/snes9x.h
View File

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

1
source/snes9x/spc7110.h
View File

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

1
source/snes9x/srtc.h
View File

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

1
source/snes9x/stream.cpp
View File

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

1
source/snes9x/stream.h
View File

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

1
source/snes9x/tile.cpp
View File

@ -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.

1
source/snes9x/tile.h
View File

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