Skip to content

Commit

Permalink
Merge branch 'finalburnneo-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
barbudreadmon committed Nov 1, 2020
2 parents 4cfe065 + 08658b2 commit aa1d4b6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/burn/drv/neogeo/d_neogeo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18092,9 +18092,9 @@ struct BurnDriver BurnDrvK2k2ps2re1 = {
// GOTVG 20201022

static struct BurnRomInfo kof2k2plusRomDesc[] = {
{ "265-p1pls.p1", 0x100000, 0xdc6da89f, 1 | BRF_ESS | BRF_PRG }, // 0 68K code
{ "265-p1pls.p1", 0x100000, 0x059da6f9, 1 | BRF_ESS | BRF_PRG }, // 0 68K code
{ "265-p2pls.p2", 0x500000, 0x7ad26451, 1 | BRF_ESS | BRF_PRG }, // 1
{ "265-p3pls.p3", 0x020000, 0xf9dacaae, 1 | BRF_ESS | BRF_PRG }, // 2 Extra ROM
{ "265-p3pls.p3", 0x020000, 0x80aacc1f, 1 | BRF_ESS | BRF_PRG }, // 2 Extra ROM

{ "265-s1pls.s1", 0x020000, 0x96bdd036, 2 | BRF_GRA }, // 3 Text layer tiles

Expand Down
4 changes: 2 additions & 2 deletions src/burn/drv/pce/d_pce.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7859,10 +7859,10 @@ STD_ROM_PICK(sgx_rtypeuh)
STD_ROM_FN(sgx_rtypeuh)

struct BurnDriver BurnDrvsgx_rtypeuh = {
"sgx_rtypeuh", "tg_rtype", NULL, NULL, "2019",
"sgx_rtypeuh", NULL, NULL, NULL, "2019",
"R-Type - Chris Covell's Unfinished SGX Hack\0", NULL, "NEC", "SuperGrafx",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 5, HARDWARE_PCENGINE_SGX, GBF_MISC, 0,
BDF_GAME_WORKING, 5, HARDWARE_PCENGINE_SGX, GBF_MISC, 0,
SgxGetZipName, sgx_rtypeuhRomInfo, sgx_rtypeuhRomName, NULL, NULL, NULL, NULL, pceInputInfo, pceDIPInfo,
SGXInit, PCEExit, PCEFrame, PCEDraw, PCEScan,
&PCEPaletteRecalc, 0x400, 512, 240, 4, 3
Expand Down
8 changes: 4 additions & 4 deletions src/burn/version.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Version number, written as vV.V.BB or vV.V.BBaa
// (0xVVBBaa, in BCD notation)

#define VER_MAJOR 0
#define VER_MINOR 2
#define VER_BETA 97
#define VER_ALPHA 44
#define VER_MAJOR 1
#define VER_MINOR 0
#define VER_BETA 0
#define VER_ALPHA 0

#define BURN_VERSION (VER_MAJOR * 0x100000) + (VER_MINOR * 0x010000) + (((VER_BETA / 10) * 0x001000) + ((VER_BETA % 10) * 0x000100)) + (((VER_ALPHA / 10) * 0x000010) + (VER_ALPHA % 10))

Expand Down

0 comments on commit aa1d4b6

Please sign in to comment.