Skip to content

Commit

Permalink
Upgrade to FBA 0.2.97.30 - thanks to CaptainCPSX for doing the initia…
Browse files Browse the repository at this point in the history 
…l upgrade
  • Loading branch information
@inactive123
inactive123 committed Sep 21, 2013
1 parent acfdfa7 commit 134c55b
Show file tree
Hide file tree
Showing 6,878 changed files with 1,134,248 additions and 20,506 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4,698 changes: 2,349 additions & 2,349 deletions svn-current/trunk/gamelist-gx.txt
View file

Large diffs are not rendered by default.

11,863 changes: 5,989 additions & 5,874 deletions svn-current/trunk/gamelist.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion svn-current/trunk/makefile
View file
Expand Up @@ -40,7 +40,7 @@ TOAPLAN_SOUND_SAMPLES_HACK = 1
#SYMBOL = 1

# Include features for debugging drivers
DEBUG = 1
#DEBUG = 1

# Include rom set verifying features (comment this for release builds)
#ROM_VERIFY = 1
Expand Down
27 changes: 16 additions & 11 deletions svn-current/trunk/makefile.burn_rules
View file
@@ -1,8 +1,8 @@
alldir = burn burn/devices burn/snd burn/drv burn/drv/capcom burn/drv/cave burn/drv/cps3 burn/drv/dataeast \
burn/drv/galaxian burn/drv/irem burn/drv/konami burn/drv/megadrive burn/drv/pce burn/drv/pst90s burn/drv/pre90s \
burn/drv/neogeo burn/drv/pgm burn/drv/psikyo burn/drv/sega burn/drv/snes burn/drv/taito burn/drv/toaplan \
cpu cpu/a68k cpu/arm cpu/arm7 cpu/h6280 cpu/hd6309 cpu/i8039 cpu/konami cpu/m68k cpu/m6502 cpu/m6800 cpu/m6805 \
cpu/m6809 cpu/nec cpu/s2650 cpu/sh2 cpu/z80
burn/drv/neogeo burn/drv/pgm burn/drv/psikyo burn/drv/sega burn/drv/sms burn/drv/snes burn/drv/taito \
burn/drv/toaplan cpu cpu/a68k cpu/arm cpu/arm7 cpu/h6280 cpu/hd6309 cpu/i8039 cpu/konami cpu/m68k cpu/m6502 cpu/m6800 \
cpu/m6805 cpu/m6809 cpu/nec cpu/pic16c5x cpu/s2650 cpu/sh2 cpu/z80

drvobj = d_dodonpachi.o d_donpachi.o d_esprade.o d_feversos.o d_gaia.o d_guwange.o d_hotdogst.o d_korokoro.o d_mazinger.o \
d_metmqstr.o d_pwrinst2.o d_sailormn.o d_tjumpman.o d_uopoko.o \
Expand Down Expand Up @@ -52,18 +52,21 @@ drvobj = d_dodonpachi.o d_donpachi.o d_esprade.o d_feversos.o d_gaia.o d_guwang
d_wwfsstar.o \
\
d_1945kiii.o d_aerofgt.o d_airbustr.o d_aquarium.o d_blmbycar.o d_bloodbro.o d_crospang.o d_crshrace.o d_dcon.o \
d_deniam.o d_ddragon3.o d_diverboy.o d_drtomy.o d_egghunt.o d_esd16.o d_f1gp.o d_fstarfrc.o d_funybubl.o d_fuukifg3.o \
d_gaelco.o d_gaiden.o d_galpanic.o d_galspnbl.o d_gotcha.o d_gumbo.o d_hyperpac.o d_jchan.o d_kaneko16.o d_lordgun.o \
d_mcatadv.o d_midas.o d_mugsmash.o d_news.o d_nmg5.o d_nmk16.o d_ohmygod.o d_pass.o d_pirates.o d_powerins.o \
d_pushman.o d_raiden.o d_seta.o d_seta2.o d_shadfrce.o d_silkroad.o d_silvmil.o d_speedspn.o d_suna16.o d_taotaido.o \
d_tecmosys.o d_tumbleb.o d_unico.o d_vmetal.o d_welltris.o d_wwfwfest.o d_xorworld.o d_yunsun16.o d_zerozone.o \
d_deniam.o d_ddragon3.o d_diverboy.o d_drgnmst.o d_drtomy.o d_egghunt.o d_esd16.o d_f1gp.o d_fstarfrc.o d_funybubl.o \
d_fuukifg3.o d_gaelco.o d_gaiden.o d_galpanic.o d_galspnbl.o d_gotcha.o d_gumbo.o d_hyperpac.o d_jchan.o d_kaneko16.o \
d_lordgun.o d_mcatadv.o d_midas.o d_mugsmash.o d_news.o d_nmg5.o d_nmk16.o d_ohmygod.o d_pass.o d_pirates.o d_playmark.o \
d_powerins.o d_pushman.o d_raiden.o d_seta.o d_seta2.o d_shadfrce.o d_silkroad.o d_silvmil.o d_speedspn.o d_suna16.o \
d_taotaido.o d_tecmosys.o d_tumbleb.o d_unico.o d_vmetal.o d_welltris.o d_wwfwfest.o d_xorworld.o d_yunsun16.o \
d_zerozone.o \
\
d_parent.o \
\
d_megadrive.o \
\
d_pce.o \
\
d_sms.o \
\
d_snes.o

depobj := $(drvobj) \
Expand All @@ -79,10 +82,10 @@ depobj := $(drvobj) \
sn76496.o upd7759.o x1010.o ym2151.o ym2413.o ymdeltat.o ymf278b.o ymz280b.o \
\
arm7_intf.o arm_intf.o h6280_intf.o hd6309_intf.o konami_intf.o m6502_intf.o m6800_intf.o m6805_intf.o m6809_intf.o \
m68000_intf.o nec_intf.o s2650_intf.o z80_intf.o \
m68000_intf.o nec_intf.o pic16c5x_intf.o s2650_intf.o z80_intf.o \
\
arm.o arm7.o h6280.o hd6309.o i8039.o konami.o m6502.o m6800.o m6805.o m6809.o nec.o s2650.o sh2.o v25.o z80.o \
z80daisy.o \
arm.o arm7.o h6280.o hd6309.o i8039.o konami.o m6502.o m6800.o m6805.o m6809.o nec.o pic16c5x.o s2650.o sh2.o v25.o \
z80.o z80daisy.o \
\
cave.o cave_palette.o cave_sprite.o cave_tile.o \
\
Expand Down Expand Up @@ -118,6 +121,8 @@ depobj := $(drvobj) \
\
pce.o \
\
sms.o \
\
snes_65816.o snes_io.o snes_main.o snes_ppu.o snes_spc700.o

ifdef DEBUG
Expand Down
4 changes: 3 additions & 1 deletion svn-current/trunk/makefile.libretro
View file
Expand Up @@ -292,7 +292,8 @@ FBA_BURN_DIRS := $(FBA_BURN_DIR) \
$(FBA_BURN_DRIVERS_DIR)/sega \
$(SNES_DIR) \
$(FBA_BURN_DRIVERS_DIR)/taito \
$(FBA_BURN_DRIVERS_DIR)/toaplan
$(FBA_BURN_DRIVERS_DIR)/toaplan \
$(FBA_BURN_DRIVERS_DIR)

FBA_CPU_DIRS := $(FBA_CPU_DIR) \
$(FBA_CPU_DIR)/arm \
Expand All @@ -307,6 +308,7 @@ FBA_CPU_DIRS := $(FBA_CPU_DIR) \
$(FBA_CPU_DIR)/m6805 \
$(FBA_CPU_DIR)/m6809 \
$(FBA_CPU_DIR)/nec \
$(FBA_CPU_DIR)/pic16c5x \
$(FBA_CPU_DIR)/s2650 \
$(FBA_CPU_DIR)/sh2 \
$(FBA_CPU_DIR)/z80
Expand Down
40 changes: 31 additions & 9 deletions svn-current/trunk/src/burn/burn.cpp
View file
Expand Up @@ -3,11 +3,7 @@
#include "version.h"
#include "burnint.h"
#include "burn_sound.h"
#if defined(GEKKO) || defined(_XBOX1)
#include "driverlist-gx.h"
#else
#include "driverlist.h"
#endif

// filler function, used if the application is not printing debug messages
static INT32 __cdecl BurnbprintfFiller(INT32, TCHAR* , ...) { return 0; }
Expand Down Expand Up @@ -709,6 +705,7 @@ INT32 BurnDrvCartridgeSetup(BurnCartrigeCommand nCommand)
// Do one frame of game emulation
extern "C" INT32 BurnDrvFrame()
{
CheatApply(); // Apply cheats (if any)
HiscoreApply();
return pDriver[nBurnDrvActive]->Frame(); // Forward to drivers function
}
Expand Down Expand Up @@ -849,11 +846,36 @@ INT32 BurnTransferCopy(UINT32* pPalette)

pBurnDrvPalette = pPalette;

for (INT32 y = 0; y < nTransHeight; y++, pSrc += nTransWidth, pDest += nBurnPitch)
{
for (INT32 x = 0; x < nTransWidth; x ++)
((UINT16*)pDest)[x] = pPalette[pSrc[x]];
}
switch (nBurnBpp) {
case 2: {
for (INT32 y = 0; y < nTransHeight; y++, pSrc += nTransWidth, pDest += nBurnPitch) {
for (INT32 x = 0; x < nTransWidth; x ++) {
((UINT16*)pDest)[x] = pPalette[pSrc[x]];
}
}
break;
}
case 3: {
for (INT32 y = 0; y < nTransHeight; y++, pSrc += nTransWidth, pDest += nBurnPitch) {
for (INT32 x = 0; x < nTransWidth; x++) {
UINT32 c = pPalette[pSrc[x]];
*(pDest + (x * 3) + 0) = c & 0xFF;
*(pDest + (x * 3) + 1) = (c >> 8) & 0xFF;
*(pDest + (x * 3) + 2) = c >> 16;

}
}
break;
}
case 4: {
for (INT32 y = 0; y < nTransHeight; y++, pSrc += nTransWidth, pDest += nBurnPitch) {
for (INT32 x = 0; x < nTransWidth; x++) {
((UINT32*)pDest)[x] = pPalette[pSrc[x]];
}
}
break;
}
}

return 0;
}
Expand Down
5 changes: 4 additions & 1 deletion svn-current/trunk/src/burn/burn.h
View file
Expand Up @@ -325,6 +325,7 @@ void IpsApplyPatches(UINT8* base, char* rom_name);
#define HARDWARE_PREFIX_SETA (0x15000000)
#define HARDWARE_PREFIX_TECHNOS (0x16000000)
#define HARDWARE_PREFIX_PCENGINE (0x17000000)
#define HARDWARE_PREFIX_SEGA_MASTER_SYSTEM (0x18000000)

#define HARDWARE_MISC_PRE90S (HARDWARE_PREFIX_MISC_PRE90S)
#define HARDWARE_MISC_POST90S (HARDWARE_PREFIX_MISC_POST90S)
Expand Down Expand Up @@ -421,6 +422,8 @@ void IpsApplyPatches(UINT8* base, char* rom_name);
#define HARDWARE_IREM_M92 (HARDWARE_PREFIX_IREM | 0x00050000)
#define HARDWARE_IREM_MISC (HARDWARE_PREFIX_IREM | 0x00060000)

#define HARDWARE_SEGA_MASTER_SYSTEM (HARDWARE_PREFIX_SEGA_MASTER_SYSTEM)

#define HARDWARE_SEGA_MEGADRIVE (HARDWARE_PREFIX_SEGA_MEGADRIVE)

#define HARDWARE_SEGA_MEGADRIVE_PCB_SEGA_EEPROM (1)
Expand Down Expand Up @@ -460,7 +463,7 @@ void IpsApplyPatches(UINT8* base, char* rom_name);
#define HARDWARE_SEGA_MEGADRIVE_PCB_REALTEC (35)
#define HARDWARE_SEGA_MEGADRIVE_PCB_MC_SUP19IN1 (36)
#define HARDWARE_SEGA_MEGADRIVE_PCB_MC_SUP15IN1 (37)
#define HARDWARE_SEGA_MEGADRIVE_PCB_12IN1 (38)
#define HARDWARE_SEGA_MEGADRIVE_PCB_MC_12IN1 (38)
#define HARDWARE_SEGA_MEGADRIVE_PCB_TOPFIGHTER (39)
#define HARDWARE_SEGA_MEGADRIVE_PCB_POKEMON (40)
#define HARDWARE_SEGA_MEGADRIVE_PCB_POKEMON2 (41)
Expand Down
17 changes: 15 additions & 2 deletions svn-current/trunk/src/burn/burnint.h
View file
Expand Up @@ -99,7 +99,20 @@ INT32 BurnTransferInit();
// ---------------------------------------------------------------------------
// Plotting pixels

#define PutPix(pPix, c) (*((UINT16*)pPix) = (UINT16)c)
inline static void PutPix(UINT8* pPix, UINT32 c)
{
if (nBurnBpp >= 4) {
*((UINT32*)pPix) = c;
} else {
if (nBurnBpp == 2) {
*((UINT16*)pPix) = (UINT16)c;
} else {
pPix[0] = (UINT8)(c >> 0);
pPix[1] = (UINT8)(c >> 8);
pPix[2] = (UINT8)(c >> 16);
}
}
}

// ---------------------------------------------------------------------------
// Setting up cpus for cheats
Expand Down Expand Up @@ -201,7 +214,7 @@ extern UINT8 DebugCPU_S2650Initted;
extern UINT8 DebugCPU_SekInitted;
extern UINT8 DebugCPU_VezInitted;
extern UINT8 DebugCPU_ZetInitted;

extern UINT8 DebugCPU_PIC16C5XInitted;
extern UINT8 DebugCPU_I8039Initted;
extern UINT8 DebugCPU_SH2Initted;

Expand Down
4 changes: 2 additions & 2 deletions svn-current/trunk/src/burn/debug_track.cpp
View file
Expand Up @@ -60,7 +60,7 @@ UINT8 DebugCPU_S2650Initted;
UINT8 DebugCPU_SekInitted;
UINT8 DebugCPU_VezInitted;
UINT8 DebugCPU_ZetInitted;

UINT8 DebugCPU_PIC16C5XInitted;
UINT8 DebugCPU_I8039Initted;
UINT8 DebugCPU_SH2Initted;

Expand Down Expand Up @@ -123,7 +123,7 @@ void DebugTrackerExit()
if (DebugCPU_SekInitted) bprintf(PRINT_ERROR, _T("CPU Sek Not Exited\n"));
if (DebugCPU_VezInitted) bprintf(PRINT_ERROR, _T("CPU Vez Not Exited\n"));
if (DebugCPU_ZetInitted) bprintf(PRINT_ERROR, _T("CPU Zet Not Exited\n"));

if (DebugCPU_PIC16C5XInitted) bprintf(PRINT_ERROR, _T("CPU PIC16C5X Not Exited\n"));
if (DebugCPU_I8039Initted) bprintf(PRINT_ERROR, _T("CPU I8039 Not Exited\n"));
if (DebugCPU_SH2Initted) bprintf(PRINT_ERROR, _T("CPU SH2 Not Exited\n"));
}
128 changes: 128 additions & 0 deletions svn-current/trunk/src/burn/drv/capcom/cps.cpp
View file
Expand Up @@ -506,6 +506,46 @@ static INT32 CpsLoadOneSf2ebbl(UINT8* Tile, INT32 nNum, INT32 nWord, INT32 nShif
return 0;
}

static INT32 CpsLoadOneSf2b(UINT8* Tile, INT32 nNum, INT32 nWord, INT32 nShift)
{
UINT8 *Rom = NULL; INT32 nRomLen=0;
UINT8 *pt = NULL, *pr = NULL;
INT32 i;

LoadUp(&Rom, &nRomLen, nNum);
if (Rom == NULL) {
return 1;
}
nRomLen &= ~1; // make sure even

for (i = 0, pt = Tile + 4, pr = Rom; i < 0x10000; pt += 8) {
UINT32 Pix; // Eight pixels
UINT8 b;
b = *pr++; i++; Pix = SepTable[b];
if (nWord) {
b = *pr++; i++; Pix |= SepTable[b] << 1;
}

Pix <<= nShift;
*((UINT32 *)pt) |= Pix;
}

for (i = 0, pt = Tile, pr = Rom + 0x10000; i < 0x10000; pt += 8) {
UINT32 Pix; // Eight pixels
UINT8 b;
b = *pr++; i++; Pix = SepTable[b];
if (nWord) {
b = *pr++; i++; Pix |= SepTable[b] << 1;
}

Pix <<= nShift;
*((UINT32 *)pt) |= Pix;
}

BurnFree(Rom);
return 0;
}

static INT32 CpsLoadOneSf2koryu(UINT8* Tile, INT32 nNum, INT32 nWord, INT32 nShift)
{
UINT8 *Rom = NULL; INT32 nRomLen=0;
Expand Down Expand Up @@ -592,6 +632,47 @@ static INT32 CpsLoadOneSf2stt(UINT8* Tile, INT32 nNum, INT32 nWord, INT32 nShift
return 0;
}

static INT32 CpsLoadOneWonder3b(UINT8* Tile, INT32 nNum, INT32 nWord, INT32 nShift)
{
UINT8 *Rom = NULL; INT32 nRomLen=0;
UINT8 *pt = NULL, *pr = NULL;
INT32 i;

LoadUp(&Rom, &nRomLen, nNum);
if (Rom == NULL) {
return 1;
}

nRomLen &= ~1; // make sure even

for (i = 0, pt = Tile, pr = Rom; i < (nRomLen >> 1); pt += 8) {
UINT32 Pix; // Eight pixels
UINT8 b;
b = *pr++; i++; Pix = SepTable[b];
if (nWord) {
b = *pr++; i++; Pix |= SepTable[b] << 1;
}

Pix <<= nShift;
*((UINT32 *)pt) |= Pix;
}

for (i = 0, pt = Tile + 0x200000, pr = Rom + 0x40000; i < (nRomLen >> 1); pt += 8) {
UINT32 Pix; // Eight pixels
UINT8 b;
b = *pr++; i++; Pix = SepTable[b];
if (nWord) {
b = *pr++; i++; Pix |= SepTable[b] << 1;
}

Pix <<= nShift;
*((UINT32 *)pt) |= Pix;
}

BurnFree(Rom);
return 0;
}

static INT32 CpsLoadSf2ceuab3Tiles(UINT8* Tile, INT32 nNum)
{
UINT8 *Rom = (UINT8*)BurnMalloc(0x200000 * sizeof(UINT8));
Expand Down Expand Up @@ -957,6 +1038,16 @@ INT32 CpsLoadTilesSf2ebbl(UINT8 *Tile, INT32 nStart)
return 0;
}

INT32 CpsLoadTilesSf2b(UINT8 *Tile, INT32 nStart)
{
CpsLoadOneSf2b(Tile, nStart + 0, 0, 0);
CpsLoadOneSf2b(Tile, nStart + 1, 0, 2);
CpsLoadOneSf2b(Tile, nStart + 2, 0, 1);
CpsLoadOneSf2b(Tile, nStart + 3, 0, 3);

return 0;
}

INT32 CpsLoadTilesSf2koryuExtra(UINT8* Tile, INT32 nStart)
{
CpsLoadOneSf2koryu(Tile, nStart + 0, 1, 0);
Expand Down Expand Up @@ -1122,13 +1213,50 @@ INT32 CpsLoadTilesDinopic(INT32 nStart)
return 0;
}

INT32 CpsLoadTilesSlampic(INT32 nStart)
{
CpsLoadTilesBootleg(CpsGfx + 0x000000, nStart + 0);
CpsLoadTilesBootleg(CpsGfx + 0x200000, nStart + 4);
CpsLoadTilesBootleg(CpsGfx + 0x400000, nStart + 8);

return 0;
}

INT32 CpsLoadTilesKodb(INT32 nStart)
{
CpsLoadTilesByte(CpsGfx, nStart);

return 0;
}

INT32 CpsLoadTilesWonder3b(INT32 nStart)
{
CpsLoadOneWonder3b(CpsGfx + 0x000000, nStart + 0, 0, 0);
CpsLoadOneWonder3b(CpsGfx + 0x000000, nStart + 1, 0, 2);
CpsLoadOneWonder3b(CpsGfx + 0x000004, nStart + 2, 0, 0);
CpsLoadOneWonder3b(CpsGfx + 0x000004, nStart + 3, 0, 2);
CpsLoadOneWonder3b(CpsGfx + 0x000000, nStart + 4, 0, 1);
CpsLoadOneWonder3b(CpsGfx + 0x000000, nStart + 5, 0, 3);
CpsLoadOneWonder3b(CpsGfx + 0x000004, nStart + 6, 0, 1);
CpsLoadOneWonder3b(CpsGfx + 0x000004, nStart + 7, 0, 3);

return 0;
}

INT32 CpsLoadTilesPang3r1a(INT32 nStart)
{
CpsLoadOne(CpsGfx + 0x000000, nStart + 0, 1, 0);
CpsLoadOne(CpsGfx + 0x200000, nStart + 1, 1, 0);
CpsLoadOne(CpsGfx + 0x000004, nStart + 2, 1, 0);
CpsLoadOne(CpsGfx + 0x200004, nStart + 3, 1, 0);
CpsLoadOne(CpsGfx + 0x000000, nStart + 4, 1, 2);
CpsLoadOne(CpsGfx + 0x200000, nStart + 5, 1, 2);
CpsLoadOne(CpsGfx + 0x000004, nStart + 6, 1, 2);
CpsLoadOne(CpsGfx + 0x200004, nStart + 7, 1, 2);

return 0;
}

INT32 CpsLoadStars(UINT8* pStar, INT32 nStart)
{
UINT8* pTemp[2] = { NULL, NULL};
Expand Down

0 comments on commit 134c55b

Please sign in to comment.