pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libretro-fbalpha: Update to 0.2.97.42.20171123
Module Name: pkgsrc-wip
Committed By: Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By: nee
Date: Tue Nov 28 11:33:58 2017 +0000
Changeset: 825d1916233c3d35a82cfcb224d3b45f50227d27
Modified Files:
libretro-fbalpha/Makefile
libretro-fbalpha/distinfo
Removed Files:
libretro-fbalpha/patches/patch-src_burn_drv_konami_d__mystwarr.cpp
libretro-fbalpha/patches/patch-src_cpu_arm7__intf.cpp
Log Message:
libretro-fbalpha: Update to 0.2.97.42.20171123
Fixes and new features
Speed-up the Game List (F6) window considerably [dink]
Fixed 16-bit rendering for most games on Konami and Metro hardware [iq_132]
Fixed 16-bit RGB555 rendering in Taito F3 [dink]
Separate Force 16-Bit Video option between D3D Enhanced blitter and DX9 Alt blitter [Barry]
Fixed scfinals coin-up issue with a kludge [dink]
Fixed missing background layer in Bio-ship Paladin level 2 [dink]
Fixed an issue with Pururun's sound [dink]
Massive Taito-F3 video fix-a-thon
Arabian Magic: ugly line down the screen at stage start, caused by off-by-one clipping
Arabian Magic: missing text in the cutscenes
Puzzle Bobble 4: missing end-of-round you won/lost animations
Land Maker: missing you won/lost text
Land Maker: tilemap alignment issues
Grid Seeker: missing continue screen
Remove unneeded DWM and MDI code, causes issues in Win10 [Barry]
Updated modern Windows builds to use the Segoe font recommended by Microsoft [Barry]
Fixed broken background issue in Ashura Blaster [dink]
Fixed animated background in Universal's Space Raider [dink]
Added experimental SekBurnUntilInt() code to the 68k core [dink]
Fixed layer alignments and screensize in Ajax / Typhoon [dink]
Fix shadow/highlights for 2-cell column vscroll in Megadrive, in particular fixes the intro to Trouble Shooter / Battle Mania [dink]
Fix Super Real Darwin sprite:tile priorities [dink]
Fix timing inconsistencies / framerate issues on some Win 10 machines (high precision timer) [dink]
Fix Galaxian-custom sound that dink broke [Barry]
Add ability to rotate player digitally in Forgotten Worlds [dink]
Fix layer priorities in G-Loc (gloc) [Barry]
Fix cutscene crystal ball in some sets of Altered Beast [Barry]
Fixed broken sound in Puzzle King (4in1boot) [dink]
Disabled Force 16-bit emulation by default, can still be enabled by user, but causes issues with some systems, eg, Taito F3 [Barry]
Made the Enhanced blitter the default for normal builds [Barry]
Made force flip a default option for the Direct Draw blitter [Barry]
Set the full-screen resolution to the desktop resolution on first program start [Barry]
Fixed blue squares in Street Fighter Alpha 2 high score entry screen [Barry]
Added a message to install the Direct X runtimes if the DLLs are missing when starting the DirectX9 blitters, removed the message that showed at every FB Alpha start [Barry]
Added ability to choose which monitor (separated for Horizontal and Vertical games) to use for fullscreen in the DirectX 9 blitters [Barry]
Added alpha transparencies to Raiga Strato Fighter [iq_132]
Fixed video offset issue in Gundhara [dink]
Fixed alpha blending and many sprite:tile priority issues in Nitro Ball [dink]
Fixed MSM6295 Banking in Boogie Wings [dink]
For debug builds: show negative numbers with the debug counter ('m' and 'n') [dink]
Fixed the road and sky levels (broken raster effects) in Ed Randy / The Cliffhanger [dink]
Fixed "stuck" sprites in Pitfall II on Sega System 1 hardware [dink]
Fixed slow music tempo when sound rate set to 44100 in Contra, Jaleco Megasystem 1 games, Konami's Surprise Attack and several Data East 16-Bit games [dink]
Fixed strange music tempo in Route 16 [dink]
Fixed un-smooth scrolling and cut-off end-of-level message in Konami's Surprise Attack [dink]
Fixed video offset issue in X-Multiply m81 version [dink]
Ported the Namco C140 sound core to FBAlpha [dink]
Added resampling to the Konami K054539 Soundcore, now most later Konami games (Xexex, Moo Mesa, Bucky O'Hare, etc) will sound great at any user-selected soundrate [dink]
Fixed occasional sprite flickering in Mystic Warriors [dink]
Fixed occasional freeze in Atomic Robo-Kid when playing via keyboard and up+down or left+right is pressed at the same time [dink]
Fixed music, graphics, timing and color issues in Psychic 5 [dink]
Added CPU_IRQSTATUS_HOLD support to m6809 cpu core [dink]
Add watchdog device. Hook it up to Momoko 120% driver as an example. [iq_132]
Use real MCU for Nekketsu Kouha Kunio-kun, Guardian/Get Star, Fairy Land Story, Rumba Lumber, Onna Sansirou - Typhoon Gal, Chack'n Pop, Golden Axe (set 2, US) [Barry]
Added BurnRandom() / BurnRandomScan(), a predictable random number generator based on old BSD LCG [dink]
Hooked up BurnRandom() to games using rand() to allow for reliable input recordings and states [dink]
Enabled Alpha Transparency effects in Mystic Warriors [dink]
Fixed music issues in DJ Boy [dink]
Fixed a palette issue and possibly(?) fixed a timing issue in Heavy Unit [dink]
EEPROM saves path now configurable [Barry]
General source tidy-up/maintenance, and conversion to BurnMalloc/BurnFree [Barry]
Add support for the new format hiscore.dat file [Barry]
Fix issue with IPS Manager sometimes saving ini file incorrectly [Barry]
Added Generate All .dat file function [Barry]
Added checkbox filters to the HTML debug log, and added ten new output levels [Barry]
Added extra compile step to link drivers separately to avoid Windows 32KB process limit [Barry]
Updated the documentation [Barry]
New drivers
Add driver for Mappy, Dig Dug II, Super Pacman, Pac & Pal, Grobda and The Tower of Druaga [iq_132, dink]
Add driver for Gaplus / Galaga 3 [iq_132]
Added driver for Toypop and Libble Rabble on misc. Namco Hardware [iq_132]
Added driver for Cannon Ball, Magix / Rock and Rock Tris on Yun Sung 8 hardware [iq_132]
Added driver for US Games trivia [iq_132]
Added driver for Double Wings on Data East 16-bit Hardware [iq_132]
Added driver for Assault, Burning Force, Cosmo Gang: The Video, Dragon Saber, Mirai Ninja, Valkyrie no Densetsu, Ordyne, Phelios, Rolling Thunder 2, Marvel Land, Metal Hawk, Kyuukai Douchuuki, Super World Stadium 92 and 93, Steel Gunner, Steel Gunner 2, Dirt Fox, Finest Hour and Lucky and Wild on Namco System 2 Hardware [iq_132, dink]
Add driver for Time Soldiers/Battle Field, Sky Soldiers, Sky Adventure, Gang Wars, Super Champion Baseball on Alpha68k II and VI hardware [iq_132, dink]
Added driver for Sauro and Tricky Doc [iq_132]
Added driver and sound core for Wiping / Rug Rats [iq_132, dink]
New additions to existing drivers
Added Dottori-Man Jr. to the Dottori Kun driver [hap, JacKc]
Added Revenger '84 to the EPOS driver [dink]
Added Ultimate Mortal Kombat Trilogy Hack r.5149 to Megadrive [dink]
Added Shinobi III M.I.J.E.T. Enhancement Hack to Megadrive [dink]
Clones and updated romsets in existing drivers
Added clone of Gals Panic DX (Asia) [arcade mod bios]
Added American Horseshoes (Taito-L) - was missing from the .40 release by accident [dink]
Added clone of Macross II (Korea) [CoolMod, CS, The Dumping Union, JacKc]
Added clone of The Last Blade (Special 2017, hack) [GSC20017, JacKc, iq_132]
Added clone of Street Fighter II: The World Warrior (Japan 911210, CPS-B-17) [ShouTime, Bonky, MetalliC, JacKc]
Added clone of Operation Wolf (Japan, SC) [ShouTime, JacKc]
Added clone of Operation Thunderbolt (Japan, SC) [ShouTime, JacKc]
Added clone of Silk Worm (prototype?) [frsj8112, JacKc]
Added clone of Double Dragon (Special 2017, hack) [JacKc, iq_132]
Added clone of Palamedes (US) [caius, The Dumping Union, JacKc]
Added Nebulous Bee, clone of Galaga [JacKc]
Added clone of Jackal (bootleg, Rotary Joystick) [f205v, The Iron Goat, JacKc]
Added clone of Rastan Saga (Japan Rev 1) [Michel BLANCO, JacKc]
Added clone of Captain Silver (Japan, revision 1) [Apocalypse, The Dumping Union, JacKc]
Added clone of Super Street Fighter II to the CPS-2 driver [Barry, idc/Team Avalaunch]
Added clone of Bucky O'Hare (ver JA) [ShouTime, The Dumping Union, JacKc]
Added Samurai Shodown IV - Amakusa's Revenge / Samurai Spirits - Amakusa Kourin (Special 2017, hack) [GSC2007, JacKc]
Updated The King of Fighters '98 (Combo) to Ver. 2017/04/08 [JacKc]
Sync. romsets with MAME 0.187 [Barry]
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=825d1916233c3d35a82cfcb224d3b45f50227d27
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libretro-fbalpha/Makefile | 4 +-
libretro-fbalpha/distinfo | 10 +-
.../patch-src_burn_drv_konami_d__mystwarr.cpp | 316 ---------------------
.../patches/patch-src_cpu_arm7__intf.cpp | 14 -
4 files changed, 6 insertions(+), 338 deletions(-)
diffs:
diff --git a/libretro-fbalpha/Makefile b/libretro-fbalpha/Makefile
index 5756a18753..d3262c5d48 100644
--- a/libretro-fbalpha/Makefile
+++ b/libretro-fbalpha/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= libretro-fbalpha-0.2.97.40
+DISTNAME= libretro-fbalpha-0.2.97.42.20171123
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/}
@@ -10,7 +10,7 @@ COMMENT= Libretro core based on the FB Alpha arcade emulator
LICENSE= no-commercial-use
GITHUB_PROJECT= fbalpha
-GITHUB_TAG= v${PKGVERSION_NOREV}
+GITHUB_TAG= 7332926d40c376a716c973bb1ea39171e4437b53
USE_TOOLS= gmake
diff --git a/libretro-fbalpha/distinfo b/libretro-fbalpha/distinfo
index 5806ba40dd..f6bbf39ef5 100644
--- a/libretro-fbalpha/distinfo
+++ b/libretro-fbalpha/distinfo
@@ -1,8 +1,6 @@
$NetBSD$
-SHA1 (libretro-fbalpha-0.2.97.40.tar.gz) = ea8c0605172470b7c592cab46d63200f46572975
-RMD160 (libretro-fbalpha-0.2.97.40.tar.gz) = d683b846bbc98a6dc4ffd3dd4a46fbd07a3366ea
-SHA512 (libretro-fbalpha-0.2.97.40.tar.gz) = 197a6dd939cda0fc5be4f1e9bfc9d933b9d63627e77f7b6c5da355cc8e97e43ee14b2556c3c1f201cf9a42900992bae711942e0d20317e7bd0132a6ad34e1050
-Size (libretro-fbalpha-0.2.97.40.tar.gz) = 8916054 bytes
-SHA1 (patch-src_burn_drv_konami_d__mystwarr.cpp) = ceebdff6bbe15162f79728622b681190fbcd53d0
-SHA1 (patch-src_cpu_arm7__intf.cpp) = 93f419448097a67725598835535d2f52452b65a4
+SHA1 (libretro-fbalpha-0.2.97.42.20171123-7332926d40c376a716c973bb1ea39171e4437b53.tar.gz) = 71ea01613865d1dae47c5908abf2c04bd189dee9
+RMD160 (libretro-fbalpha-0.2.97.42.20171123-7332926d40c376a716c973bb1ea39171e4437b53.tar.gz) = 5b75e408f8b2065bf15981772fd5b53f9d7a4a9a
+SHA512 (libretro-fbalpha-0.2.97.42.20171123-7332926d40c376a716c973bb1ea39171e4437b53.tar.gz) = 445f6fdce6b9e327459b8404933f5dd6bcb4f6fc5f2bb3a0dd7819db43f93c7ba654808148eac4a3e805ca44e13b2db5eedfc97c5c2f06902a0833477066d442
+Size (libretro-fbalpha-0.2.97.42.20171123-7332926d40c376a716c973bb1ea39171e4437b53.tar.gz) = 9188117 bytes
diff --git a/libretro-fbalpha/patches/patch-src_burn_drv_konami_d__mystwarr.cpp b/libretro-fbalpha/patches/patch-src_burn_drv_konami_d__mystwarr.cpp
deleted file mode 100644
index c99c2c2f99..0000000000
--- a/libretro-fbalpha/patches/patch-src_burn_drv_konami_d__mystwarr.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-$NetBSD$
-
-Backport changes from master, includes fix for sprite flickering.
-
---- src/burn/drv/konami/d_mystwarr.cpp.orig 2017-07-13 03:39:54.000000000 +0000
-+++ src/burn/drv/konami/d_mystwarr.cpp
-@@ -7,7 +7,8 @@
- background layer #2 on intro (bad guy on motorcycle), bottom clipped??
-
- metamorphic force
-- background in lava level is too fast. (irq?)
-+ level 1 boss "fire" circle around boss priority issue
-+ background in lava level is too fast. (irq?)
-
- martial champ
- 1: missing graphics in intro & title screens. On blank screens
-@@ -80,7 +81,7 @@ static UINT8 DrvJoy4[16];
- static UINT8 DrvJoy5[16];
- static UINT8 DrvReset;
- static UINT16 DrvInputs[6];
--static UINT8 DrvDips[1];
-+static UINT8 DrvDips[2];
-
- static INT32 sound_nmi_enable = 0;
- static UINT8 sound_control = 0;
-@@ -101,25 +102,25 @@ static struct BurnInputInfo MystwarrInpu
- {"P1 Button 2", BIT_DIGITAL, DrvJoy3 + 5, "p1 fire 2"},
- {"P1 Button 3", BIT_DIGITAL, DrvJoy3 + 6, "p1 fire 3"},
-
-- {"P2 Coin", BIT_DIGITAL, DrvJoy1 + 1, "p2 coin"},
-- {"P2 Start", BIT_DIGITAL, DrvJoy4 + 7, "p2 start"},
-- {"P2 Up", BIT_DIGITAL, DrvJoy4 + 2, "p2 up"},
-- {"P2 Down", BIT_DIGITAL, DrvJoy4 + 3, "p2 down"},
-- {"P2 Left", BIT_DIGITAL, DrvJoy4 + 0, "p2 left"},
-- {"P2 Right", BIT_DIGITAL, DrvJoy4 + 1, "p2 right"},
-- {"P2 Button 1", BIT_DIGITAL, DrvJoy4 + 4, "p2 fire 1"},
-- {"P2 Button 2", BIT_DIGITAL, DrvJoy4 + 5, "p2 fire 2"},
-- {"P2 Button 3", BIT_DIGITAL, DrvJoy4 + 6, "p2 fire 3"},
-+ {"P2 Coin", BIT_DIGITAL, DrvJoy1 + 2, "p2 coin"},
-+ {"P2 Start", BIT_DIGITAL, DrvJoy3 + 15, "p2 start"},
-+ {"P2 Up", BIT_DIGITAL, DrvJoy3 + 10, "p2 up"},
-+ {"P2 Down", BIT_DIGITAL, DrvJoy3 + 11, "p2 down"},
-+ {"P2 Left", BIT_DIGITAL, DrvJoy3 + 8, "p2 left"},
-+ {"P2 Right", BIT_DIGITAL, DrvJoy3 + 9, "p2 right"},
-+ {"P2 Button 1", BIT_DIGITAL, DrvJoy3 + 12, "p2 fire 1"},
-+ {"P2 Button 2", BIT_DIGITAL, DrvJoy3 + 13, "p2 fire 2"},
-+ {"P2 Button 3", BIT_DIGITAL, DrvJoy3 + 14, "p2 fire 3"},
-
-- {"P3 Coin", BIT_DIGITAL, DrvJoy1 + 2, "p3 coin"},
-- {"P3 Start", BIT_DIGITAL, DrvJoy3 + 15, "p3 start"},
-- {"P3 Up", BIT_DIGITAL, DrvJoy3 + 10, "p3 up"},
-- {"P3 Down", BIT_DIGITAL, DrvJoy3 + 11, "p3 down"},
-- {"P3 Left", BIT_DIGITAL, DrvJoy3 + 8, "p3 left"},
-- {"P3 Right", BIT_DIGITAL, DrvJoy3 + 9, "p3 right"},
-- {"P3 Button 1", BIT_DIGITAL, DrvJoy3 + 12, "p3 fire 1"},
-- {"P3 Button 2", BIT_DIGITAL, DrvJoy3 + 13, "p3 fire 2"},
-- {"P3 Button 3", BIT_DIGITAL, DrvJoy3 + 14, "p3 fire 3"},
-+ {"P3 Coin", BIT_DIGITAL, DrvJoy1 + 1, "p3 coin"},
-+ {"P3 Start", BIT_DIGITAL, DrvJoy4 + 7, "p3 start"},
-+ {"P3 Up", BIT_DIGITAL, DrvJoy4 + 2, "p3 up"},
-+ {"P3 Down", BIT_DIGITAL, DrvJoy4 + 3, "p3 down"},
-+ {"P3 Left", BIT_DIGITAL, DrvJoy4 + 0, "p3 left"},
-+ {"P3 Right", BIT_DIGITAL, DrvJoy4 + 1, "p3 right"},
-+ {"P3 Button 1", BIT_DIGITAL, DrvJoy4 + 4, "p3 fire 1"},
-+ {"P3 Button 2", BIT_DIGITAL, DrvJoy4 + 5, "p3 fire 2"},
-+ {"P3 Button 3", BIT_DIGITAL, DrvJoy4 + 6, "p3 fire 3"},
-
- {"P4 Coin", BIT_DIGITAL, DrvJoy1 + 3, "p4 coin"},
- {"P4 Start", BIT_DIGITAL, DrvJoy4 + 15, "p4 start"},
-@@ -133,6 +134,7 @@ static struct BurnInputInfo MystwarrInpu
-
- {"Reset", BIT_DIGITAL, &DrvReset, "reset"},
- {"Dip A", BIT_DIPSWITCH, DrvDips + 0, "dip"},
-+ {"Dip B", BIT_DIPSWITCH, DrvDips + 1, "dip"},
- };
-
- STDINPUTINFO(Mystwarr)
-@@ -328,6 +330,7 @@ STDINPUTINFO(Martchmp)
- static struct BurnDIPInfo MystwarrDIPList[]=
- {
- {0x25, 0xff, 0xff, 0xe4, NULL },
-+ {0x26, 0xff, 0xff, 0x00, NULL },
-
- {0 , 0xfe, 0 , 2, "Service Mode" },
- {0x25, 0x01, 0x04, 0x04, "Off" },
-@@ -344,6 +347,10 @@ static struct BurnDIPInfo MystwarrDIPLis
- {0 , 0xfe, 0 , 2, "Number of Players" },
- {0x25, 0x01, 0x40, 0x00, "4" },
- {0x25, 0x01, 0x40, 0x40, "2" },
-+
-+ {0 , 0xfe, 0 , 2, "Debug Alpha Mode (debug console/logfile)" },
-+ {0x26, 0x01, 0x01, 0x00, "Off" },
-+ {0x26, 0x01, 0x01, 0x01, "On" },
- };
-
- STDDIPINFO(Mystwarr)
-@@ -1681,11 +1688,27 @@ static UINT8 __fastcall mystwarr_sound_r
- }
-
- //--------------------------------------------------------------------------------------------------------------
-+static INT32 superblend = 0;
-+static INT32 oldsuperblend = 0;
-+static INT32 superblendoff = 0;
-
- static void mystwarr_tile_callback(INT32 layer, INT32 *code, INT32 *color, INT32 *flags)
- {
-- if (layer == 1 && (*code & 0xff00) + (*color) == 0x4101) *flags = (*flags)|(0x808000); //* water hack
-+ if (layer == 1) {
-+ /**/ if ((*code & 0xff00) + (*color) == 0x4101) superblend++; // water
-+ else if ((*code & 0xff00) + (*color) == 0xA30D) superblend++; // giant cargo plane
-+ else if ((*code & 0xff00) + (*color) == 0xA40D) superblend++; // giant cargo plane
-+ else if ((*code & 0xff00) + (*color) == 0xA50D) superblend++; // giant cargo plane
-+ else if ((*code & 0xff00) + (*color) == 0xFA01) superblend++; // intro "but behind the scenes..." part 1/x
-+ else if ((*code & 0xff00) + (*color) == 0xFA05) superblend++; // intro "but behind the scenes..." part 2
-+ else if ((*code & 0xff00) + (*color) == 0xFB01) superblend++; // part 3.
-+ else if ((*code & 0xff00) + (*color) == 0xFB05) superblend++; // part 4.
-+ else if ((*code & 0xff00) + (*color) == 0xFC05) superblend++; // part 5.
-+ else if ((*code & 0xff00) + (*color) == 0xD001) superblend++; // Title Screen
-+ else if ((*code & 0xff00) + (*color) == 0xC700) superblendoff++; // End Boss death scene (anti superblend)
-
-+ //if (counter) bprintf(0, _T("%X %X (%X), "), *code, *color, (*code & 0xff00) + (*color)); /* save this! -dink */
-+ }
- *color = layer_colorbase[layer] | ((*color >> 1) & 0x1e);
- }
-
-@@ -1809,6 +1832,10 @@ static INT32 DrvDoReset()
- oinprion = 0;
- sound_nmi_enable = 0;
-
-+ superblend = 0; // for mystwarr alpha tile count
-+ oldsuperblend = 0;
-+ superblendoff = 0;
-+
- return 0;
- }
-
-@@ -1977,13 +2004,13 @@ static INT32 MystwarrInit()
-
- K056832Init(DrvGfxROM0, DrvGfxROMExp0, 0x400000, mystwarr_tile_callback);
- K056832SetGlobalOffsets(24, 16);
-- K056832SetLayerOffsets(0, -2-4, 0);
-- K056832SetLayerOffsets(1, 0-4, 0);
-- K056832SetLayerOffsets(2, 2-4, 0);
-- K056832SetLayerOffsets(3, 3-4, 0);
-+ K056832SetLayerOffsets(0, -2-3, 0);
-+ K056832SetLayerOffsets(1, 0-3, 0);
-+ K056832SetLayerOffsets(2, 2-3, 0);
-+ K056832SetLayerOffsets(3, 3-3, 0);
-
- K053247Init(DrvGfxROM1, DrvGfxROMExp1, 0x7fffff, mystwarr_sprite_callback, 3);
-- K053247SetSpriteOffset(-24-48, -16-24);
-+ K053247SetSpriteOffset(-25-48, -15-24);
- K053247SetBpp(5);
-
- konamigx_mixer_init(0);
-@@ -2306,6 +2333,7 @@ static INT32 MartchmpInit()
- K053247SetBpp(5);
-
- konamigx_mixer_init(0);
-+ K054338_invert_alpha(0);
-
- SekInit(0, 0x68000);
- SekOpen(0);
-@@ -2458,7 +2486,6 @@ static INT32 GaiapolisInit()
- K053247SetSpriteOffset(7+(-24-79), -16-24);
-
- konamigx_mixer_init(0);
--// K054338_invert_alpha(0); // otherwise alpha blended roz is too light - sept.2.2016 - this breaks the "elevator/going down" level
-
- SekInit(0, 0x68000);
- SekOpen(0);
-@@ -2698,6 +2725,7 @@ static INT32 DrvExit()
- BurnFree (AllMem);
- if (pMystwarrRozBitmap) {
- BurnFree (pMystwarrRozBitmap);
-+ pMystwarrRozBitmap = NULL;
- }
- return 0;
- }
-@@ -2731,7 +2759,45 @@ static INT32 DrvDraw()
- if (nGame == 1) { // mystwarr
- blendmode = 0;
- cbparam = 0; // ?
-+
-+ { // "Superblend and the Survival of Alpha (in Mystwarr)"
-+ switch (Drv68KRAM[0x2335]) {
-+ case 0x0A:
-+ case 0x11:
-+ case 0x18: { // alpha on for sure, except endboss death scene (see: superblendoff)
-+ superblend = 0xfff;
-+ break;
-+ }
-+
-+ case 0x09:
-+ case 0x10:
-+ case 0x12:
-+ default: { // alpha off, but only if tilecount isn't rising
-+ if (superblend < oldsuperblend) {
-+ superblend = 0;
-+ }
-+ break;
-+ }
-+ }
-+
-+ if ((superblend || oldsuperblend) && !superblendoff) {
-+ blendmode = (1 << 16 | GXMIX_BLEND_FORCE) << 2; // using "|| oldsuperblend" for 1 frame latency, to avoid flickers on the water level when he gets "flushed" into the boss part
-+ }
-+
-+ if (DrvDips[1] & 1) // debug alpha
-+ bprintf(0, _T("%X %X (%X), "), superblend, oldsuperblend, Drv68KRAM[0x2335]);
-+
-+ oldsuperblend = superblend;
-+ if (superblend) superblend = 1;
-+
-+ superblendoff = 0; // frame-based.
-+ }
-+
- sprite_colorbase = K055555GetPaletteIndex(4)<<5;
-+ konamigx_mixer(enable_sub, 0, 0, 0, blendmode, 0, 0);
-+ KonamiBlendCopy(DrvPalette);
-+
-+ return 0;
- }
-
- if (nGame == 2 || nGame == 3) { // viostorm / metamrph
-@@ -2795,7 +2861,6 @@ static INT32 DrvFrame()
- ZetNewFrame();
-
- INT32 nInterleave = 60;
-- INT32 nSoundBufferPos = 0;
- INT32 nCyclesTotal[2] = { 16000000 / 60, 8000000 / 60 };
- INT32 nCyclesDone[2] = { 0, 0 };
-
-@@ -2805,19 +2870,14 @@ static INT32 DrvFrame()
- for (INT32 i = 0; i < nInterleave; i++) {
- INT32 nNext, nCyclesSegment;
-
-- nNext = (i + 1) * nCyclesTotal[0] / nInterleave;
-- nCyclesSegment = nNext - nCyclesDone[0];
-- nCyclesSegment = SekRun(nCyclesSegment);
-- nCyclesDone[0] += nCyclesSegment;
--
- if (nGame == 1)
- {
- if (mw_irq_control & 1)
- {
- if (i == 0)
- SekSetIRQLine(4, CPU_IRQSTATUS_AUTO);
--
-- if (i == ((nInterleave * 240)/256))
-+
-+ if (i == ((nInterleave * (240+10))/256)) // +10 otherwise flickers on char.selection screen (mystwarr)
- SekSetIRQLine(2, CPU_IRQSTATUS_AUTO);
- }
- }
-@@ -2852,6 +2912,12 @@ static INT32 DrvFrame()
- SekSetIRQLine(5, CPU_IRQSTATUS_AUTO);
- }
-
-+ nNext = (i + 1) * nCyclesTotal[0] / nInterleave;
-+ nCyclesSegment = nNext - nCyclesDone[0];
-+ nCyclesSegment = SekRun(nCyclesSegment);
-+ nCyclesDone[0] += nCyclesSegment;
-+
-+
- nNext = (i + 1) * nCyclesTotal[1] / nInterleave;
- nCyclesSegment = nNext - nCyclesDone[1];
- nCyclesSegment = ZetRun(nCyclesSegment);
-@@ -2860,25 +2926,12 @@ static INT32 DrvFrame()
- if ((i % (nInterleave / 8)) == ((nInterleave / 8) - 1)) {// && sound_nmi_enable && sound_control) { // iq_132
- ZetNmi();
- }
--
-- if (pBurnSoundOut) {
-- INT32 nSegmentLength = nBurnSoundLen / nInterleave;
-- INT16* pSoundBuf = pBurnSoundOut + (nSoundBufferPos << 1);
-- memset(pSoundBuf, 0, nSegmentLength * 2 * 2);
-- K054539Update(0, pSoundBuf, nSegmentLength);
-- K054539Update(1, pSoundBuf, nSegmentLength);
-- nSoundBufferPos += nSegmentLength;
-- }
- }
-
- if (pBurnSoundOut) {
-- INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos;
-- INT16* pSoundBuf = pBurnSoundOut + (nSoundBufferPos << 1);
-- if (nSegmentLength) {
-- memset(pSoundBuf, 0, nSegmentLength * 2 * 2);
-- K054539Update(0, pSoundBuf, nSegmentLength);
-- K054539Update(1, pSoundBuf, nSegmentLength);
-- }
-+ memset (pBurnSoundOut, 0, nBurnSoundLen * 2 * 2);
-+ K054539Update(0, pBurnSoundOut, nBurnSoundLen);
-+ K054539Update(1, pBurnSoundOut, nBurnSoundLen);
- }
-
- ZetClose();
-@@ -2891,7 +2944,7 @@ static INT32 DrvFrame()
- return 0;
- }
-
--static INT32 DrvScan(INT32 nAction,INT32 *pnMin)
-+static INT32 DrvScan(INT32 nAction, INT32 *pnMin)
- {
- struct BurnArea ba;
-
-@@ -2924,6 +2977,9 @@ static INT32 DrvScan(INT32 nAction,INT32
- SCAN_VAR(cbparam);
- SCAN_VAR(oinprion);
- SCAN_VAR(z80_bank);
-+ SCAN_VAR(superblend);
-+ SCAN_VAR(oldsuperblend);
-+ SCAN_VAR(superblendoff);
- }
-
- if (nAction & ACB_WRITE) {
diff --git a/libretro-fbalpha/patches/patch-src_cpu_arm7__intf.cpp b/libretro-fbalpha/patches/patch-src_cpu_arm7__intf.cpp
deleted file mode 100644
index 1d4e3c5ce7..0000000000
--- a/libretro-fbalpha/patches/patch-src_cpu_arm7__intf.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-http://neosource.1emulation.com/forums/index.php?topic=1731.msg24254#msg24254
-
---- src/cpu/arm7_intf.cpp.orig 2017-07-13 03:39:54.000000000 +0000
-+++ src/cpu/arm7_intf.cpp
-@@ -391,6 +391,7 @@ void Arm7Init( INT32 nCPU ) // only one
-
- for (INT32 i = 0; i < 3; i++) {
- membase[i] = (UINT8**)malloc(PAGE_COUNT * sizeof(UINT8*));
-+ memset(membase[i], 0, PAGE_COUNT * sizeof(UINT8*));
- }
-
- CpuCheatRegister(nCPU, &Arm7CheatCpuConfig);
Home |
Main Index |
Thread Index |
Old Index