Skip to content

Commit 85f8fed

Browse files
author
DavidHaywood
committed
add ultraman, small tidy
1 parent a20a5b9 commit 85f8fed

File tree

5 files changed

+117
-88
lines changed

5 files changed

+117
-88
lines changed

‎src/mame/mame.lst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46459,6 +46459,7 @@ apmj2009
4645946459
ban_bkgj
4646046460
ban_dn1j
4646146461
ban_kksj
46462+
ban_ult
4646246463
ban_utmj
4646346464
epo_ntpj
4646446465
epo_rgfj

‎src/mame/tvgames/xavix.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ class xavix_state : public driver_device
140140
void xavix_43mhz(machine_config &config);
141141

142142
void init_xavix();
143+
void init_no_timer() { init_xavix(); m_disable_timer_irq_hack = true; }
143144

144145
void ioevent_trg01(int state);
145146
void ioevent_trg02(int state);
@@ -197,6 +198,8 @@ class xavix_state : public driver_device
197198
return 0x00;
198199
}
199200

201+
uint16_t unknown_random_r() { return machine().rand(); }
202+
200203
protected:
201204
// driver_device overrides
202205
virtual void machine_start() override ATTR_COLD;
@@ -645,6 +648,7 @@ class superxavix_state : public xavix_state
645648
, m_bmp_palram_l(*this, "bmp_palram_l")
646649
, m_bmp_base(*this, "bmp_base")
647650
, m_extra(*this, "extra")
651+
, m_exio(*this, "EX%u", 0U)
648652
{
649653
m_video_hres_multiplier = 2;
650654
}
@@ -712,9 +716,9 @@ class superxavix_state : public xavix_state
712716
void extended_extbus_reg1_w(uint8_t data);
713717
void extended_extbus_reg2_w(uint8_t data);
714718

715-
uint8_t superxavix_read_extended_io0(offs_t offset, uint8_t mem_mask) { logerror("%s: superxavix_read_extended_io0 (mask %02x)\n", machine().describe_context(), mem_mask); return 0x00; }
716-
uint8_t superxavix_read_extended_io1(offs_t offset, uint8_t mem_mask) { logerror("%s: superxavix_read_extended_io1 (mask %02x)\n", machine().describe_context(), mem_mask); return 0x00; }
717-
uint8_t superxavix_read_extended_io2(offs_t offset, uint8_t mem_mask) { logerror("%s: superxavix_read_extended_io2 (mask %02x)\n", machine().describe_context(), mem_mask); return 0x00; }
719+
uint8_t superxavix_read_extended_io0(offs_t offset, uint8_t mem_mask) { logerror("%s: superxavix_read_extended_io0 (mask %02x)\n", machine().describe_context(), mem_mask); return m_exio[0]->read(); }
720+
uint8_t superxavix_read_extended_io1(offs_t offset, uint8_t mem_mask) { logerror("%s: superxavix_read_extended_io1 (mask %02x)\n", machine().describe_context(), mem_mask); return m_exio[1]->read(); }
721+
uint8_t superxavix_read_extended_io2(offs_t offset, uint8_t mem_mask) { logerror("%s: superxavix_read_extended_io2 (mask %02x)\n", machine().describe_context(), mem_mask); return m_exio[2]->read(); }
718722

719723
void superxavix_write_extended_io0(offs_t offset, uint8_t data, uint8_t mem_mask) { logerror("%s: superxavix_write_extended_io0 %02x (mask %02x)\n", machine().describe_context(), data, mem_mask); }
720724
void superxavix_write_extended_io1(offs_t offset, uint8_t data, uint8_t mem_mask) { logerror("%s: superxavix_write_extended_io1 %02x (mask %02x)\n", machine().describe_context(), data, mem_mask); }
@@ -744,6 +748,7 @@ class superxavix_state : public xavix_state
744748
required_shared_ptr<uint8_t> m_bmp_base;
745749

746750
optional_region_ptr<uint8_t> m_extra;
751+
required_ioport_array<3> m_exio;
747752

748753
bool m_use_superxavix_extra; // does not need saving
749754
};
@@ -831,8 +836,6 @@ class xavix_epo_hamc_state : public xavix_state
831836
: xavix_state(mconfig, type, tag)
832837
{ }
833838

834-
int camera_r() { return machine().rand(); }
835-
836839
protected:
837840
};
838841

@@ -844,10 +847,6 @@ class xavix_i2c_lotr_state : public xavix_i2c_state
844847
: xavix_i2c_state(mconfig, type, tag)
845848
{ }
846849

847-
int camera_r();
848-
849-
void init_epo_mini();
850-
851850
protected:
852851
//virtual void write_io1(uint8_t data, uint8_t direction) override;
853852
};

‎src/mame/tvgames/xavix_2000.cpp‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,17 @@ static INPUT_PORTS_START( ttv_lotr )
182182
PORT_INCLUDE(xavix)
183183

184184
PORT_MODIFY("IN1")
185-
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_i2c_lotr_state::camera_r))
186-
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_i2c_lotr_state::camera_r))
185+
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_i2c_lotr_state::unknown_random_r))
186+
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_i2c_lotr_state::unknown_random_r))
187187
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
188188
INPUT_PORTS_END
189189

190190
static INPUT_PORTS_START( epo_hamc )
191191
PORT_INCLUDE(xavix)
192192

193193
PORT_MODIFY("IN1")
194-
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_epo_hamc_state::camera_r))
195-
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_epo_hamc_state::camera_r))
194+
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_epo_hamc_state::unknown_random_r))
195+
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(xavix_epo_hamc_state::unknown_random_r))
196196
INPUT_PORTS_END
197197

198198
static INPUT_PORTS_START( ttv_mx )
@@ -384,11 +384,6 @@ ROM_START( epo_es2j ) // ES2J MAIN-01 2005 date on PCB, 2006 ingame
384384
ROM_LOAD("es2j.u3", 0x000000, 0x400000, CRC(840aecb1) SHA1(ad52449ffc13af5f4c67b2c3cf438e7ecd80b9fb) )
385385
ROM_END
386386

387-
void xavix_i2c_lotr_state::init_epo_mini()
388-
{
389-
init_xavix();
390-
m_disable_timer_irq_hack = true;
391-
}
392387

393388

394389
// doesn't use extra opcodes?
@@ -401,14 +396,14 @@ CONS( 2002, epo_bowl, 0, 0, xavix2000_i2c_24c04_2mb, epo_bowl, xavix_i2c_stat
401396

402397
// スーパーショット！ エキサイトゴルフ
403398
// needs timer irq hack to boot, fails to draw main menu properly (buggy xavix2000 opcodes?) (2002 date on PCB, 2003 ingame)
404-
CONS( 2003, epo_golf, 0, 0, xavix2000_i2c_24c04_4mb, ttv_lotr, xavix_i2c_lotr_state, init_epo_mini, "Epoch / SSD Company LTD", "Super Shot! Excite Golf (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
399+
CONS( 2003, epo_golf, 0, 0, xavix2000_i2c_24c04_4mb, ttv_lotr, xavix_i2c_lotr_state, init_no_timer, "Epoch / SSD Company LTD", "Super Shot! Excite Golf (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
405400

406401
// とっとこハム太郎 ハムハム大サーカス！
407402
CONS( 2002, epo_hamc, 0, 0, xavix2000_4mb, epo_hamc, xavix_epo_hamc_state, init_xavix, "Epoch / SSD Company LTD", "Tottoko Hamtaro - Ham Ham Dai Circus! (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
408403

409404
// ミニモニ。パーティ！リズムでぴょん！
410405
// needs timer irq hack to boot
411-
CONS( 2003, epo_mini, 0, 0, xavix2000_i2c_24c08_4mb, ttv_lotr, xavix_i2c_lotr_state, init_epo_mini, "Epoch / SSD Company LTD", "mini-moni Party! Rhythm de Pyon! (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
406+
CONS( 2003, epo_mini, 0, 0, xavix2000_i2c_24c08_4mb, ttv_lotr, xavix_i2c_lotr_state, init_no_timer, "Epoch / SSD Company LTD", "mini-moni Party! Rhythm de Pyon! (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
412407

413408
// カードスキャン!　エキサイトステージ サッカー日本代表チーム
414409
CONS( 2006, epo_es2j, 0, 0, xavix2000_4mb, xavix, xavix_state, init_xavix, "Epoch / SSD Company LTD", "Card Scan! Excite Stage Soccer Nippon Daihyou Team (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
@@ -444,7 +439,7 @@ CONS( 2004, ban_onep, 0, 0, xavix2000_i2c_24c04, ttv_lotr, xavix_i2c_lotr_sta
444439

445440
// Let’s！TV プレイ　闘印奥義　 陰陽大戦記～目指せ最強闘神士～
446441
// stalls unless timers are disabled like epo_mini / epo_golf, 2004 date on PCB, 2005 ingame
447-
CONS( 2005, ban_omt, 0, 0, xavix2000_i2c_24c04_4mb, ttv_lotr, xavix_i2c_lotr_state, init_epo_mini, "Bandai / SSD Company LTD", "Let's! TV Play Touin Ougi Onmyou Taisenki: Mezase Saikyou Toushinshi (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
442+
CONS( 2005, ban_omt, 0, 0, xavix2000_i2c_24c04_4mb, ttv_lotr, xavix_i2c_lotr_state, init_no_timer, "Bandai / SSD Company LTD", "Let's! TV Play Touin Ougi Onmyou Taisenki: Mezase Saikyou Toushinshi (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
448443

449444
// ディズニープリンセス　キラキラ魔法のレッスン
450445
CONS( 2004, tom_dpgm, 0, 0, xavix2000_i2c_24c08_4mb, ttv_lotr, xavix_i2c_lotr_state, init_xavix, "Tomy / SSD Company LTD", "Disney Princess Kirakira Mahou no Lesson (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )

‎src/mame/tvgames/xavix_2002.cpp‎

Lines changed: 101 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -103,41 +103,8 @@ static INPUT_PORTS_START( xavix )
103103
PORT_START("MOUSE1Y")
104104
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
105105

106-
PORT_START("REGION") // PAL/NTSC flag
107-
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_CUSTOM )
108-
INPUT_PORTS_END
109-
110-
static INPUT_PORTS_START( xavix_i2c )
111-
PORT_INCLUDE(xavix)
112-
113-
PORT_MODIFY("IN1")
114-
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
115-
INPUT_PORTS_END
116-
117-
118-
static INPUT_PORTS_START( epo_tfit )
119-
PORT_INCLUDE(xavix)
120-
121-
PORT_MODIFY("IN0")
122-
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // select
123-
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // back
124-
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
125-
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 )
126-
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
127-
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
128-
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
129-
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
130-
131-
PORT_MODIFY("IN1")
132-
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
133-
INPUT_PORTS_END
134-
135-
136-
static INPUT_PORTS_START( mrangbat )
137-
PORT_INCLUDE(xavix_i2c)
138-
139-
PORT_MODIFY("IN0")
140-
PORT_DIPNAME( 0x01, 0x00, "IN0" )
106+
PORT_START("EX0")
107+
PORT_DIPNAME( 0x01, 0x00, "EX0" )
141108
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
142109
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
143110
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
@@ -162,8 +129,8 @@ static INPUT_PORTS_START( mrangbat )
162129
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
163130
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
164131

165-
PORT_MODIFY("IN1")
166-
PORT_DIPNAME( 0x01, 0x00, "IN1" )
132+
PORT_START("EX1")
133+
PORT_DIPNAME( 0x01, 0x00, "EX1" )
167134
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
168135
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
169136
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
@@ -172,7 +139,9 @@ static INPUT_PORTS_START( mrangbat )
172139
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
173140
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
174141
PORT_DIPSETTING( 0x04, DEF_STR( On ) )
175-
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
142+
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
143+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
144+
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
176145
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
177146
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
178147
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
@@ -186,19 +155,8 @@ static INPUT_PORTS_START( mrangbat )
186155
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
187156
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
188157

189-
PORT_START("EX0") // NOT A JOYSTICK!!
190-
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_16WAY // Red/Up 1
191-
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_16WAY // Red/Up 2
192-
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_16WAY // Green / Circle / Right 2
193-
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_16WAY // Pink / Star / Left 2
194-
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_16WAY // Blue / Square / Right 1
195-
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_16WAY // Yellow / Triangle / Left 1
196-
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 )
197-
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 )
198-
199-
200-
PORT_START("EX1")
201-
PORT_DIPNAME( 0x01, 0x00, "EX1" )
158+
PORT_START("EX2")
159+
PORT_DIPNAME( 0x01, 0x00, "EX2" )
202160
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
203161
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
204162
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
@@ -223,8 +181,41 @@ static INPUT_PORTS_START( mrangbat )
223181
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
224182
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
225183

226-
PORT_START("EX2")
227-
PORT_DIPNAME( 0x01, 0x00, "EX2" )
184+
PORT_START("REGION") // PAL/NTSC flag
185+
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_CUSTOM )
186+
INPUT_PORTS_END
187+
188+
static INPUT_PORTS_START( xavix_i2c )
189+
PORT_INCLUDE(xavix)
190+
191+
PORT_MODIFY("IN1")
192+
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
193+
INPUT_PORTS_END
194+
195+
196+
static INPUT_PORTS_START( epo_tfit )
197+
PORT_INCLUDE(xavix)
198+
199+
PORT_MODIFY("IN0")
200+
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // select
201+
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // back
202+
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
203+
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 )
204+
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
205+
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
206+
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
207+
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
208+
209+
PORT_MODIFY("IN1")
210+
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
211+
INPUT_PORTS_END
212+
213+
214+
static INPUT_PORTS_START( mrangbat )
215+
PORT_INCLUDE(xavix_i2c)
216+
217+
PORT_MODIFY("IN0")
218+
PORT_DIPNAME( 0x01, 0x00, "IN0" )
228219
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
229220
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
230221
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
@@ -248,15 +239,63 @@ static INPUT_PORTS_START( mrangbat )
248239
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
249240
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
250241
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
242+
243+
PORT_MODIFY("IN1")
244+
PORT_DIPNAME( 0x01, 0x00, "IN1" )
245+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
246+
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
247+
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
248+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
249+
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
250+
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
251+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
252+
PORT_DIPSETTING( 0x04, DEF_STR( On ) )
253+
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
254+
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
255+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
256+
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
257+
PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
258+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
259+
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
260+
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
261+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
262+
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
263+
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
264+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
265+
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
266+
267+
PORT_MODIFY("EX0") // NOT A JOYSTICK!!
268+
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_16WAY // Red/Up 1
269+
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_16WAY // Red/Up 2
270+
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_16WAY // Green / Circle / Right 2
271+
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_16WAY // Pink / Star / Left 2
272+
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_16WAY // Blue / Square / Right 1
273+
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_16WAY // Yellow / Triangle / Left 1
274+
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 )
275+
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 )
251276
INPUT_PORTS_END
252277

253278
static INPUT_PORTS_START( xavix_bowl )
254279
PORT_INCLUDE(xavix)
255280

256281
PORT_MODIFY("IN1")
257-
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(superxavix_i2c_bowl_state::camera_r))
258-
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(superxavix_i2c_bowl_state::camera_r))
282+
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(superxavix_i2c_bowl_state::unknown_random_r))
283+
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(superxavix_i2c_bowl_state::unknown_random_r))
284+
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
285+
INPUT_PORTS_END
286+
287+
static INPUT_PORTS_START( ban_ult )
288+
PORT_INCLUDE(xavix)
289+
290+
PORT_MODIFY("IN1")
291+
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(superxavix_i2c_bowl_state::unknown_random_r))
292+
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(superxavix_i2c_bowl_state::unknown_random_r))
259293
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", FUNC(i2cmem_device::read_sda))
294+
295+
PORT_MODIFY("EX2")
296+
PORT_DIPNAME( 0x80, 0x80, "Demo Mode" ) // bypasses calibration screen
297+
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
298+
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
260299
INPUT_PORTS_END
261300

262301
static INPUT_PORTS_START( xavixp )
@@ -345,16 +384,6 @@ void superxavix_i2c_jmat_state::write_extended_io2(offs_t offset, uint8_t data,
345384
LOG("%s: io2_data_w %02x\n", machine().describe_context(), data);
346385
}
347386

348-
int xavix_i2c_lotr_state::camera_r() // seems to be some kind of camera status bits
349-
{
350-
return machine().rand();
351-
}
352-
353-
int superxavix_i2c_bowl_state::camera_r() // seems to be some kind of camera status bits
354-
{
355-
return machine().rand();
356-
}
357-
358387
void superxavix_i2c_state::write_io1(uint8_t data, uint8_t direction)
359388
{
360389
m_i2cmem->write_sda(BIT(data | ~direction, 3));
@@ -722,6 +751,11 @@ ROM_START( ban_utmj )
722751
// SEEPROM is HT24LC02 at u3
723752
ROM_END
724753

754+
ROM_START( ban_ult )
755+
ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00)
756+
ROM_LOAD("ultraman.u1", 0x000000, 0x800000,CRC(bc2a94fb) SHA1(4dc81089ac2afc1c9496a49ffd778213bb4a12bd) )
757+
ROM_END
758+
725759
ROM_START( ban_bkgj )
726760
ROM_REGION( 0x400000, "bios", ROMREGION_ERASE00)
727761
ROM_LOAD("bkgj.u2", 0x000000, 0x400000, CRC(a59ce23c) SHA1(d2a6be9e46f3cfc3cf798bf1f76732eee909c93b) )
@@ -878,6 +912,8 @@ CONS( 2006, ban_bkgj, 0, 0, superxavix_i2c_24c04_4mb,xavix_i2c, superxavix_i2c_
878912
// Let's!TV プレイ 体感キャストオフ 仮面ライダーカブト クロックアップ＆ライダーキック
879913
CONS( 2006, ban_utmj, 0, 0, superxavix_i2c_24c02, xavix_i2c, superxavix_i2c_state, init_xavix, "Bandai / SSD Company LTD", "Let's! TV Play Taikan Cast Off - Kamen Rider Kabuto Clock Up & Rider Kick!! (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
880914

915+
CONS( 2006, ban_ult, 0, 0, superxavix_i2c_24c02, ban_ult, superxavix_i2c_bowl_state, init_no_timer, "Bandai / SSD Company LTD", "Let's! TV Play Ultraman (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
916+
881917
// それいけトーマス ソドー島のなかまたち
882918
CONS( 2005, tmy_thom, 0, 0, superxavix_i2c_24c04, xavix_i2c, superxavix_i2c_state, init_xavix, "Tomy / SSD Company LTD", "Soreike Thomas - Sodor Tou no Nakamatachi / Thomas & Friends on the Island of Sodor (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
883919

‎src/mame/tvgames/xavix_2002.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ class superxavix_i2c_bowl_state : public superxavix_i2c_state
120120
superxavix_i2c_bowl_state(const machine_config &mconfig, device_type type, const char *tag)
121121
: superxavix_i2c_state(mconfig, type, tag)
122122
{ }
123-
124-
int camera_r();
125123
};
126124

127125

0 commit comments

Comments
 (0)