Previous 199869 Revisions Next

r29559 Saturday 12th April, 2014 at 12:34:56 UTC by Nathan Woods
Merge branch 'master' of ssh://mess.org/mame into new_menus
[/branches/new_menus/src/emu/sound]tms36xx.h
[/branches/new_menus/src/mame]mame.lst
[/branches/new_menus/src/mame/audio]phoenix.c pleiads.c
[/branches/new_menus/src/mame/drivers]nmk16.c
[/branches/new_menus/src/mame/video]nmk16.c

branches/new_menus/src/mame/drivers/nmk16.c
r29558r29559
73817381   decryptcode( machine(), 23, 22, 21, 20, 19, 18, 17, 13, 14, 15, 16, 12, 11, 10, 9,  8, 7,  6,  5,  4, 3,  2,  1,  0 );
73827382}
73837383
7384ROM_START( spec2k )
7384ROM_START( spec2kh )
73857385   ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 Code */
73867386   ROM_LOAD16_BYTE( "yonatech5.u124", 0x00000, 0x40000, CRC(72ab5c05) SHA1(182a811982b89b8cda0677547ef0625c274f5c6b) )
73877387   ROM_LOAD16_BYTE( "yonatech6.u120", 0x00001, 0x40000, CRC(7e44bd9c) SHA1(da59685be14a09ec037743fcec34fb293f7d588d) )
r29558r29559
74067406   ROM_LOAD( "yonatech3.u106", 0x00000, 0x80000, CRC(6644c404) SHA1(b7ad3f9f08971432d024ef8be3fa3140f0bbae67) )
74077407ROM_END
74087408
7409ROM_START( spec2kv )
7409
7410ROM_START( spec2k )
74107411   ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 Code */
7411   ROM_LOAD16_BYTE( "prg1", 0x00000, 0x40000, NO_DUMP )
7412   ROM_LOAD16_BYTE( "prg2", 0x00001, 0x40000, NO_DUMP )
7412   ROM_LOAD16_BYTE( "u124", 0x00000, 0x40000, CRC(dbd6f65d) SHA1(0fad9836689fcbee60904ccad59a2a5be09f3139) )
7413   ROM_LOAD16_BYTE( "u120", 0x00001, 0x40000, CRC(be53e243) SHA1(38144b90a35ba144921824a0c4f133339e07f9a1) )
74137414
74147415   ROM_REGION( 0x20000, "audiocpu", 0 )    /* Z80 Code */
7415   ROM_LOAD( "z80", 0x00000, 0x10000, NO_DUMP )
7416   ROM_LOAD( "u103", 0x00000, 0x10000, CRC(f4e4fb10) SHA1(d19953d37e31fc753b50f0047d5be16f1f2daf09) )
74167417
74177418   ROM_REGION( 0x200000, "sprites",0 ) /* Sprites, 16x16x4 */
74187419   ROM_LOAD( "uc1", 0x00000, 0x200000, CRC(3139a213) SHA1(5ec4be0e27cbf1c4556ab10d7e1408ea64aa9e17) )
r29558r29559
74227423   ROM_LOAD( "uc2", 0x200000, 0x200000, CRC(998dc05c) SHA1(cadf8bb0b8944372fbce9934b93684749ebc3ba0) )
74237424
74247425   ROM_REGION( 0x20000, "fgtile", ROMREGION_ERASEFF )    /* Layer 1, 8x8x4 */
7425   ROM_LOAD( "fgtiles", 0x00000, 0x20000, NO_DUMP )
7426   ROM_LOAD( "u3", 0x00000, 0x20000, CRC(921503b8) SHA1(dea6e9d47c9db83e79907bc0609a64176aff26bc) )
74267427
74277428   ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
7428   ROM_LOAD( "samples1", 0x00000, 0x20000, NO_DUMP )
7429   ROM_LOAD( "u101", 0x00000, 0x40000, CRC(d16aaaad) SHA1(96ca173ca433164ed0ae51b41b42343bd3cfb5fe) )
74297430
74307431   ROM_REGION( 0x080000, "oki2", 0 ) /* Samples */
7431   ROM_LOAD( "samples2", 0x00000, 0x80000, NO_DUMP )
7432   ROM_LOAD( "u106", 0x00000, 0x80000, CRC(65d61f3a) SHA1(a8f7ad61ae29a5c852820e5cbe886a8cd437634a) )
74327433ROM_END
74337434
74347435/***************************************************************************
r29558r29559
75857586GAME( 2000, mangchi,  0,        popspops, mangchi, nmk16_state,    bubl2000, ROT0,               "Afega",                             "Mang-Chi", 0 )
75867587
75877588// these two are very similar games, but the exact parent/clone relationship is unknown
7588GAME( 2000, spec2k,   0,        firehawk, spec2k, nmk16_state,     spec2k,   ORIENTATION_FLIP_Y, "Yona Tech",             "Spectrum 2000 (Euro)", 0 )
7589GAME( 2000, spec2kv,  spec2k,   firehawk, spec2k, nmk16_state,     spec2k,   ROT270,             "Yona Tech",             "Spectrum 2000 (vertical)", GAME_NOT_WORKING ) // incomplete dump, only gfx roms are dumped
7590GAME( 2001, firehawk, 0,        firehawk, firehawk, driver_device, 0,        ORIENTATION_FLIP_Y, "ESD",                   "Fire Hawk", 0 )
7589GAME( 2000, spec2k,   0,       firehawk, spec2k, nmk16_state,     spec2k,   ROT270,             "Yona Tech",             "Spectrum 2000 (vertical)", GAME_IMPERFECT_GRAPHICS ) // the ships scroll off the screen if you insert a coin during the attract demo?  verify it doesn't happen on real hw(!)
7590GAME( 2000, spec2kh,  spec2k,  firehawk, spec2k, nmk16_state,     spec2k,   ORIENTATION_FLIP_Y, "Yona Tech",             "Spectrum 2000 (horizontal, buggy) (Europe)", 0 ) // this has odd bugs even on real hardware, eg glitchy 3 step destruction sequence of some larger enemies
7591GAME( 2001, firehawk, spec2k,  firehawk, firehawk, driver_device, 0,        ORIENTATION_FLIP_Y, "ESD",                   "Fire Hawk (horizontal)", 0 )
75917592
75927593// bee-oh board - different display / interrupt timing to others?
75937594GAME( 1991, manybloc, 0,        manybloc, manybloc, driver_device, 0,        ROT270,             "Bee-Oh",                "Many Block", GAME_NO_COCKTAIL | GAME_IMPERFECT_SOUND )
branches/new_menus/src/mame/mame.lst
r29558r29559
93029302firehawk        // (c) 2001 ESD
93039303mangchi         // (c) 2000
93049304spec2k          // (c) 2000 Yonatech
9305spec2kv
9305spec2kh         // (c) 2000 Yonatech
93069306
93079307// ESD games
93089308// http://www.esdgame.co.kr/english/
branches/new_menus/src/mame/audio/pleiads.c
r29558r29559
99#include "emu.h"
1010#include "audio/pleiads.h"
1111
12#undef VMIN
13#undef VMAX
14
1215#define VMIN    0
1316#define VMAX    32767
1417
branches/new_menus/src/mame/audio/phoenix.c
r29558r29559
4141 *
4242 ****************************************************************************/
4343
44#undef VMIN
45#undef VMAX
46
4447#define VMIN    0
4548#define VMAX    32767
4649
branches/new_menus/src/mame/video/nmk16.c
r29558r29559
929929UINT32 nmk16_state::screen_update_firehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
930930{
931931   m_bg_tilemap0->set_scrolly(0, m_afega_scroll_1[1] + 0x100);
932   m_bg_tilemap0->set_scrollx(0, m_afega_scroll_1[0]);
932   m_bg_tilemap0->set_scrollx(0, m_afega_scroll_0[1] - 0x100);
933933
934934   m_bg_tilemap0->draw(screen, bitmap, cliprect, 0,0);
935935
936936   nmk16_draw_sprites_flipsupported(bitmap,cliprect);
937937
938938   m_tx_tilemap->draw(screen, bitmap, cliprect, 0,0);
939   return 0;}
939   return 0;
940}
941
942
branches/new_menus/src/emu/sound/tms36xx.h
r29558r29559
3131#define TMS3615     15      // Naughty Boy, Pleiads (13 notes, one output)
3232#define TMS3617     17      // Monster Bash (13 notes, six outputs)
3333
34#undef VMIN
35#undef VMAX
36
3437#define VMIN    0x0000
3538#define VMAX    0x7fff
3639
Property changes on: branches/new_menus
Modified: svn:mergeinfo
   Merged /trunk:r29557

Previous 199869 Revisions Next

© 1997-2024 The MAME Team