Skip to content

Commit c6f90b4

Browse files
smf-smf-
committed
New working machines added
-------------------------- Mawasunda!! (V2.08J 2000/02/01 11:02:54) [twistedsymphony, buffi, rtw, ekorz, Hammy, smf] Cool Boarders Arcade Jam Bootleg (Export) [buffi, smf] Aero Fighters Special (VER 1.00G) [smf] Brave Blade (VER 1.40G) [smf] Flame Gunner (VER 1.40G) [smf] Fighters' Impact (VER 2.10G) [smf] G-Darius (VER 2.70G) [smf] Ray Storm (VER 2.60G) [smf] Shanghai Matekibuyuu (VER 1.20G) [smf] The Block Kuzushi (VER 1.10G) [smf] Machines promoted to working ---------------------------- Space Invaders Anniversary (V2.02J 2003/09/12 20:00) [smf] Kollon (V2.04JA 2003/11/01 12:00) [smf] Primal Rage 2 (Ver 0.36a) [smf] Strider 2 [smf] New not working machines added ------------------------------ Bust a Move 2 (CDROM JAPANESE ROM ver. 1999/07/17 10:00:00) [windyfairy, smf] Refactored ZN1/ZN2/G-NET driver, added coin lockout based on manufacturer, removed unused inputs from each game. [smf]
1 parent 9c9425e commit c6f90b4

File tree

9 files changed

+3600
-3042
lines changed

9 files changed

+3600
-3042
lines changed

‎src/devices/video/psx.cpp

+12-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(CXD8654Q, cxd8654q_device, "cxd8654q", "CXD8654Q GPU") //
3434
psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t vram_size, psxcpu_device *cpu)
3535
: psxgpu_device(mconfig, type, tag, owner, clock)
3636
{
37-
set_vram_size(vram_size);
37+
vramSize = vram_size;
3838
cpu->gpu_read().set(tag, FUNC(psxgpu_device::read));
3939
cpu->gpu_write().set(tag, FUNC(psxgpu_device::write));
4040
cpu->subdevice<psxdma_device>("dma")->install_read_handler(2, psxdma_device::read_delegate(&psxgpu_device::dma_read, this));
@@ -2716,7 +2716,7 @@ void psxgpu_device::MoveImage()
27162716
}
27172717
DebugMesh( S11_COORD_X( m_packet.MoveImage.vertex[ 1 ].n_coord ), S11_COORD_Y( m_packet.MoveImage.vertex[ 1 ].n_coord ) );
27182718
DebugMesh( S11_COORD_X( m_packet.MoveImage.vertex[ 1 ].n_coord ) + SIZE_W( m_packet.MoveImage.n_size ), S11_COORD_Y( m_packet.MoveImage.vertex[ 1 ].n_coord ) );
2719-
DebugMesh( S11_COORD_X( m_packet.MoveImage.vertex[ 1 ].n_coord ), S11_COORD_Y( m_packet.MoveImage.vertex[ 1 ].n_coord ) ) + SIZE_H( m_packet.MoveImage.n_size ) );
2719+
DebugMesh( S11_COORD_X( m_packet.MoveImage.vertex[ 1 ].n_coord ), S11_COORD_Y( m_packet.MoveImage.vertex[ 1 ].n_coord ) + SIZE_H( m_packet.MoveImage.n_size ) );
27202720
DebugMesh( S11_COORD_X( m_packet.MoveImage.vertex[ 1 ].n_coord ) + SIZE_W( m_packet.MoveImage.n_size ), S11_COORD_Y( m_packet.MoveImage.vertex[ 1 ].n_coord ) + SIZE_H( m_packet.MoveImage.n_size ) );
27212721
DebugMeshEnd();
27222722
#endif
@@ -3463,6 +3463,11 @@ uint32_t psxgpu_device::read(offs_t offset, uint32_t mem_mask)
34633463
break;
34643464
case 0x01:
34653465
data = n_gpustatus;
3466+
3467+
if ((((n_gpustatus & (1U << 22)) && (n_gpustatus & (1U << 13))) ||
3468+
(!(n_gpustatus & (1U << 22)) && (BIT(screen().vpos(), 0)))))
3469+
data |= 1U << 31;
3470+
34663471
LOGMASKED(LOG_READ, "%s: read GPU status (%08x)\n", machine().describe_context(), data);
34673472
break;
34683473
default:
@@ -3481,7 +3486,11 @@ void psxgpu_device::vblank(screen_device &screen, bool vblank_state)
34813486
DebugCheckKeys();
34823487
#endif
34833488

3484-
n_gpustatus ^= ( 1L << 31 );
3489+
if (n_gpustatus & (1U << 22))
3490+
n_gpustatus ^= 1U << 13;
3491+
else
3492+
n_gpustatus |= 1U << 13;
3493+
34853494
m_vblank_handler(1);
34863495
}
34873496
}

‎src/devices/video/psx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class psxgpu_device : public device_t, public device_video_interface, public dev
2828
public:
2929
// configuration helpers
3030
auto vblank_callback() { return m_vblank_handler.bind(); }
31-
void set_vram_size(int size) { vramSize = size; }
31+
int vram_size() { return vramSize; }
3232

3333
void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
3434
uint32_t read(offs_t offset, uint32_t mem_mask = ~0);

‎src/mame/mame.lst

+15-3
Original file line numberDiff line numberDiff line change
@@ -43406,12 +43406,14 @@ smc777 //
4340643406
@source:sony/taitogn.cpp
4340743407
chaoshea // 1998.10 Chaos Heat (V2.09O)
4340843408
chaosheaj // 1998.10 Chaos Heat (V2.08J)
43409+
coh1002t //
4340943410
coh3002t //
4341043411
flipmaze // 1999.09 Flip Maze (V2.04J)
4341143412
gobyrc // 1999.?? Go By RC (V2.03O)
4341243413
kollon // 2003.11 Kollon (V2.04J)
4341343414
kollonc // 2003.11 Kollon (V2.04JC, Compact Flash version)
4341443415
mahjngoh // 1999.12 Mahjong Oh (V2.06J)
43416+
mawasunda // 2000.02 Mawasunda!! (V2.08J)
4341543417
nightrai // 2001.05 Night Raid (V2.03J)
4341643418
otenamhf // 2005.04 Otenami Haiken Final (V2.07JC)
4341743419
otenamih // 1999.02 Otenami Haiken (Success)
@@ -43429,12 +43431,20 @@ shikigama // 2001.09 Shikigami no Shiro (V1.02J)
4342943431
sianniv // 2003.10 Space Invaders Anniversary (V2.02J)
4343043432
soutenry // 2001.02 Soutenryu (V2.07J)
4343143433
spuzbobl // 1999.?? Super Puzzle Bobble (V2.05O)
43432-
spuzboblj // 1999.03 Super Puzzle Bobble (Japan)
43434+
spuzboblj // 1999.03 Super Puzzle Bobble (V2.04J)
4343343435
usagi // 2001.12 Usagi (V2.02J)
4343443436
xiistag // 2002.07 XII Stag (V2.01J)
4343543437
zokuoten // 2000.12 Zoku Otenamihaiken (V2.05J)
4343643438
zokuotena // 2000.12 Zoku Otenamihaiken (V2.03J)
43437-
zooo // 2004.05 Zooo
43439+
zooo // 2004.05 Zooo (V2.01JA)
43440+
aerofgtsg // 2011.01 Aero Fighters Special (VER 1.00G)
43441+
brvbladeg // 2011.01 Brave Blade (VER 1.40G)
43442+
flamegung // 2011.01 Flame Gunner (VER 1.40G)
43443+
ftimpactg // 2011.01 Fighters' Impact (VER 2.10G)
43444+
gdariusg // 2011.01 G-Darius (Ver 2.70G)
43445+
raystormg // 2011.01 Ray Storm (Ver 2.60G)
43446+
shngmtkbg // 2011.01 Shanghai Matekibuyuu (VER 1.20G)
43447+
tblkkuzug // 2011.01 The Block Kuzushi (VER 1.10G)
4343843448

4343943449
@source:sony/umatic.cpp
4344043450
vo5850pm // Sony U-Matic VO-5850PM
@@ -43443,7 +43453,8 @@ vo5850pm // Sony U-Matic VO-5850PM
4344343453
1on1gov // 1 on 1 Government (JAPAN)
4344443454
aerofgts // Aero Fighters Special (USA)
4344543455
aerofgtst // Aero Fighters Special (TAIWAN)
43446-
bam2 // Bust a Move 2 (JAPANESE ROM ver. 1999/07/17 10:00:00)
43456+
bam2 // Bust a Move 2 (HDD JAPANESE ROM ver. 1999/07/17 10:00:00)
43457+
bam2a // Bust a Move 2 (CDROM JAPANESE ROM ver. 1999/07/17 10:00:00)
4344743458
beastrzr // Beastorizer (USA, Sep 22 1997)
4344843459
beastrzra // Beastorizer (USA, Jun 21 1997)
4344943460
beastrzrb // Beastorizer (USA Bootleg)
@@ -43457,6 +43468,7 @@ brvbladea // Brave Blade (ASIA)
4345743468
brvbladej // Brave Blade (JAPAN)
4345843469
brvbladeu // Brave Blade (USA)
4345943470
cbaj // Cool Boaders Arcade Jam
43471+
cbajbl // Cool Boaders Arcade Jam (Bootleg)
4346043472
coh1000a //
4346143473
coh1000c //
4346243474
coh1000t //

‎src/mame/sony/taito_zm.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void taito_zoom_device::tms_ctrl_w(uint8_t data)
114114
void taito_zoom_device::taitozoom_mn_map(address_map &map)
115115
{
116116
if(m_use_flash) {
117-
map(0x080000, 0x0fffff).r(":pgmflash", FUNC(intelfsh16_device::read));
117+
map(0x080000, 0x0fffff).r(":zoomprog", FUNC(intelfsh16_device::read));
118118
} else {
119119
map(0x080000, 0x0fffff).rom().region("mn10200", 0);
120120
}

0 commit comments

Comments
 (0)