notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bugfixes, r171 release
[fceu.git]
/
fce.c
diff --git
a/fce.c
b/fce.c
index
73e8845
..
a21e5f5
100644
(file)
--- a/
fce.c
+++ b/
fce.c
@@
-28,8
+28,7
@@
#include "fce.h"
#include "fceu098.h"
#include "sound.h"
#include "fce.h"
#include "fceu098.h"
#include "sound.h"
-#include "sound098.h"
-#include "svga.h"
+#include "svga.h"
#include "netplay.h"
#include "general.h"
#include "endian.h"
#include "netplay.h"
#include "general.h"
#include "endian.h"
@@
-50,6
+49,7
@@
#include "file.h"
#include "crc32.h"
#include "ppu.h"
#include "file.h"
#include "crc32.h"
#include "ppu.h"
+#include "ppu098.h"
#include "palette.h"
#include "movie.h"
#include "palette.h"
#include "movie.h"
@@
-112,6
+112,7
@@
static writefunc *BWriteG;
static int RWWrap=0;
#ifdef ASM_6502
static int RWWrap=0;
#ifdef ASM_6502
+#ifndef DEBUG_ASM_6502
static void asmcpu_update(int32 cycles)
{
// some code from x6502.c
static void asmcpu_update(int32 cycles)
{
// some code from x6502.c
@@
-137,6
+138,7
@@
static void asmcpu_update(int32 cycles)
}
}
}
}
}
}
+#endif
void asmcpu_unpack(void)
{
void asmcpu_unpack(void)
{
@@
-1268,7
+1270,6
@@
static void EmLoop(void);
int use098code = 0;
void (*ResetNES)(void) = 0;
int use098code = 0;
void (*ResetNES)(void) = 0;
-void (*PowerNES)(void) = 0;
void (*FCEUI_Emulate)(void) = 0;
void FCEUI_SetEmuMode(int is_new)
void (*FCEUI_Emulate)(void) = 0;
void FCEUI_SetEmuMode(int is_new)
@@
-1277,15
+1278,11
@@
void FCEUI_SetEmuMode(int is_new)
if (is_new)
{
ResetNES=ResetNES098;
if (is_new)
{
ResetNES=ResetNES098;
- PowerNES=PowerNES098;
- SetSoundVariables=SetSoundVariables098;
FCEUI_Emulate=FCEUI_Emulate098;
}
else
{
ResetNES=ResetNES081;
FCEUI_Emulate=FCEUI_Emulate098;
}
else
{
ResetNES=ResetNES081;
- PowerNES=PowerNES081;
- SetSoundVariables=SetSoundVariables081;
FCEUI_Emulate=EmLoop;
}
}
FCEUI_Emulate=EmLoop;
}
}
@@
-1517,6
+1514,7
@@
void ResetNES081(void)
X6502_Reset();
}
X6502_Reset();
}
+#ifndef DEBUG_ASM_6502
static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
{
int x=0;
static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
{
int x=0;
@@
-1528,8
+1526,9
@@
static void FCEU_MemoryRand(uint8 *ptr, uint32 size)
ptr++;
}
}
ptr++;
}
}
+#endif
-void PowerNES
081
(void)
+void PowerNES(void)
{
if(!GameLoaded) return;
{
if(!GameLoaded) return;
@@
-1546,6
+1545,13
@@
void PowerNES081(void)
ResetMapping();
PowerSound();
PowerPPU();
ResetMapping();
PowerSound();
PowerPPU();
+
+ if (use098code)
+ FCEUPPU_Power();
+
+ /* Have the external game hardware "powered" after the internal NES stuff.
+ Needed for the NSF code and VS System code.
+ */
GameInterface(GI_POWER, 0);
if(FCEUGameInfo.type==GIT_VSUNI)
FCEU_VSUniPower();
GameInterface(GI_POWER, 0);
if(FCEUGameInfo.type==GIT_VSUNI)
FCEU_VSUniPower();