Previous 199869 Revisions Next

r34851 Wednesday 4th February, 2015 at 17:17:50 UTC by Couriersud
Merge branch 'master' of https://github.com/mamedev/mame.git
[src/mame/drivers]bloodbro.c dcon.c
[src/mame/includes]bloodbro.h dcon.h
[src/mame/video]bloodbro.c dcon.c

trunk/src/mame/drivers/bloodbro.c
r243362r243363
131131   AM_RANGE(0x000000, 0x07ffff) AM_ROM
132132   AM_RANGE(0x080000, 0x08afff) AM_RAM
133133   AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_SHARE("spriteram")
134   AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE(bloodbro_bgvideoram_w) AM_SHARE("bgvideoram")
134   AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE(bgvideoram_w) AM_SHARE("bgvideoram")
135135   AM_RANGE(0x08c400, 0x08cfff) AM_RAM
136   AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE(bloodbro_fgvideoram_w) AM_SHARE("fgvideoram")
136   AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE(fgvideoram_w) AM_SHARE("fgvideoram")
137137   AM_RANGE(0x08d400, 0x08d7ff) AM_RAM
138   AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE(bloodbro_txvideoram_w) AM_SHARE("txvideoram")
138   AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
139139   AM_RANGE(0x08e000, 0x08e7ff) AM_RAM
140140   AM_RANGE(0x08e800, 0x08f7ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
141141   AM_RANGE(0x08f800, 0x08ffff) AM_RAM
r243362r243363
163163   AM_RANGE(0x000000, 0x07ffff) AM_ROM
164164   AM_RANGE(0x080000, 0x08afff) AM_RAM
165165   AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_SHARE("spriteram")
166   AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE(bloodbro_bgvideoram_w) AM_SHARE("bgvideoram")
166   AM_RANGE(0x08c000, 0x08c3ff) AM_RAM_WRITE(bgvideoram_w) AM_SHARE("bgvideoram")
167167   AM_RANGE(0x08c400, 0x08cfff) AM_RAM
168   AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE(bloodbro_fgvideoram_w) AM_SHARE("fgvideoram")
168   AM_RANGE(0x08d000, 0x08d3ff) AM_RAM_WRITE(fgvideoram_w) AM_SHARE("fgvideoram")
169169   AM_RANGE(0x08d400, 0x08d7ff) AM_RAM
170   AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE(bloodbro_txvideoram_w) AM_SHARE("txvideoram")
170   AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
171171   AM_RANGE(0x08e000, 0x08ffff) AM_RAM
172172   AM_RANGE(0x0c1000, 0x0c1001) AM_READ_PORT("DSW")
173173   AM_RANGE(0x0c1002, 0x0c1003) AM_READ_PORT("IN0")
r243362r243363
663663
664664/* Game Drivers */
665665
666GAME( 1990, bloodbro, 0,        bloodbro, bloodbro, driver_device, 0, ROT0,   "TAD Corporation", "Blood Bros. (set 1)", GAME_NO_COCKTAIL )
667GAME( 1990, bloodbroa,bloodbro, bloodbro, bloodbro, driver_device, 0, ROT0,   "TAD Corporation", "Blood Bros. (set 2)", GAME_NO_COCKTAIL )
668GAME( 1990, bloodbrob,bloodbro, bloodbro, bloodbro, driver_device, 0, ROT0,   "TAD Corporation", "Blood Bros. (set 3)", GAME_NO_COCKTAIL )
669GAME( 1990, weststry, bloodbro, weststry, weststry, driver_device, 0, ROT0,   "bootleg (Datsu)", "West Story (bootleg of Blood Bros.)", GAME_NO_COCKTAIL | GAME_NO_SOUND )
670GAME( 1990, skysmash, 0,        skysmash, skysmash, driver_device, 0, ROT270, "Nihon System",    "Sky Smasher", 0 )
666GAME( 1990, bloodbro, 0,        bloodbro, bloodbro, driver_device, 0, ROT0,   "TAD Corporation", "Blood Bros. (set 1)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE )
667GAME( 1990, bloodbroa,bloodbro, bloodbro, bloodbro, driver_device, 0, ROT0,   "TAD Corporation", "Blood Bros. (set 2)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE )
668GAME( 1990, bloodbrob,bloodbro, bloodbro, bloodbro, driver_device, 0, ROT0,   "TAD Corporation", "Blood Bros. (set 3)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE )
669GAME( 1990, weststry, bloodbro, weststry, weststry, driver_device, 0, ROT0,   "bootleg (Datsu)", "West Story (bootleg of Blood Bros.)", GAME_NO_COCKTAIL | GAME_NO_SOUND | GAME_SUPPORTS_SAVE )
670GAME( 1990, skysmash, 0,        skysmash, skysmash, driver_device, 0, ROT270, "Nihon System",    "Sky Smasher", 0 | GAME_SUPPORTS_SAVE )
trunk/src/mame/drivers/dcon.c
r243362r243363
2626   AM_RANGE(0x00000, 0x7ffff) AM_ROM
2727   AM_RANGE(0x80000, 0x8bfff) AM_RAM
2828
29   AM_RANGE(0x8c000, 0x8c7ff) AM_RAM_WRITE(dcon_background_w) AM_SHARE("back_data")
30   AM_RANGE(0x8c800, 0x8cfff) AM_RAM_WRITE(dcon_foreground_w) AM_SHARE("fore_data")
31   AM_RANGE(0x8d000, 0x8d7ff) AM_RAM_WRITE(dcon_midground_w) AM_SHARE("mid_data")
32   AM_RANGE(0x8d800, 0x8e7ff) AM_RAM_WRITE(dcon_text_w) AM_SHARE("textram")
29   AM_RANGE(0x8c000, 0x8c7ff) AM_RAM_WRITE(background_w) AM_SHARE("back_data")
30   AM_RANGE(0x8c800, 0x8cfff) AM_RAM_WRITE(foreground_w) AM_SHARE("fore_data")
31   AM_RANGE(0x8d000, 0x8d7ff) AM_RAM_WRITE(midground_w) AM_SHARE("mid_data")
32   AM_RANGE(0x8d800, 0x8e7ff) AM_RAM_WRITE(text_w) AM_SHARE("textram")
3333   AM_RANGE(0x8e800, 0x8f7ff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
3434   AM_RANGE(0x8f800, 0x8ffff) AM_RAM AM_SHARE("spriteram")
35   AM_RANGE(0x9d000, 0x9d7ff) AM_WRITE(dcon_gfxbank_w)
35   AM_RANGE(0x9d000, 0x9d7ff) AM_WRITE(gfxbank_w)
3636
3737   AM_RANGE(0xa0000, 0xa000d) AM_DEVREADWRITE("seibu_sound", seibu_sound_device, main_word_r, main_word_w)
3838   AM_RANGE(0xc0000, 0xc004f) AM_DEVREADWRITE("crtc", seibu_crtc_device, read, write)
r243362r243363
403403}
404404
405405
406GAME( 1991, sdgndmps, 0, sdgndmps, sdgndmps, dcon_state, sdgndmps, ROT0, "Banpresto / Bandai", "SD Gundam Psycho Salamander no Kyoui", GAME_NO_COCKTAIL )
407GAME( 1992, dcon,     0, dcon,     dcon, driver_device,     0,        ROT0, "Success",            "D-Con", GAME_NO_COCKTAIL )
406GAME( 1991, sdgndmps, 0, sdgndmps, sdgndmps, dcon_state, sdgndmps, ROT0, "Banpresto / Bandai", "SD Gundam Psycho Salamander no Kyoui", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE )
407GAME( 1992, dcon,     0, dcon,     dcon, driver_device,     0,        ROT0, "Success",            "D-Con", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE )
trunk/src/mame/includes/bloodbro.h
r243362r243363
33public:
44   bloodbro_state(const machine_config &mconfig, device_type type, const char *tag)
55      : driver_device(mconfig, type, tag),
6      m_maincpu(*this, "maincpu"),
7      m_gfxdecode(*this, "gfxdecode"),
8      m_palette(*this, "palette"),
69      m_spriteram(*this, "spriteram"),
710      m_bgvideoram(*this, "bgvideoram"),
811      m_fgvideoram(*this, "fgvideoram"),
9      m_txvideoram(*this, "txvideoram"),
10      m_maincpu(*this, "maincpu"),
11      m_gfxdecode(*this, "gfxdecode"),
12      m_palette(*this, "palette") { }
12      m_txvideoram(*this, "txvideoram") { }
1313
14   required_device<cpu_device> m_maincpu;
15   required_device<gfxdecode_device> m_gfxdecode;
16   required_device<palette_device> m_palette;
17   
1418   required_shared_ptr<UINT16> m_spriteram;
1519   required_shared_ptr<UINT16> m_bgvideoram;
1620   required_shared_ptr<UINT16> m_fgvideoram;
r243362r243363
1822
1923   UINT16 m_scrollram[6];
2024   UINT16 m_layer_en;
25   
2126   tilemap_t *m_bg_tilemap;
2227   tilemap_t *m_fg_tilemap;
2328   tilemap_t *m_tx_tilemap;
2429
25   DECLARE_WRITE16_MEMBER(bloodbro_bgvideoram_w);
26   DECLARE_WRITE16_MEMBER(bloodbro_fgvideoram_w);
27   DECLARE_WRITE16_MEMBER(bloodbro_txvideoram_w);
30   DECLARE_WRITE16_MEMBER(bgvideoram_w);
31   DECLARE_WRITE16_MEMBER(fgvideoram_w);
32   DECLARE_WRITE16_MEMBER(txvideoram_w);
2833   DECLARE_WRITE16_MEMBER(layer_en_w);
2934   DECLARE_WRITE16_MEMBER(layer_scroll_w);
35   
3036   TILE_GET_INFO_MEMBER(get_bg_tile_info);
3137   TILE_GET_INFO_MEMBER(get_fg_tile_info);
3238   TILE_GET_INFO_MEMBER(get_tx_tile_info);
39   
3340   virtual void video_start();
41   
3442   UINT32 screen_update_bloodbro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
3543   UINT32 screen_update_weststry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
3644   UINT32 screen_update_skysmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
3745   void bloodbro_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
3846   void weststry_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
39   required_device<cpu_device> m_maincpu;
40   required_device<gfxdecode_device> m_gfxdecode;
41   required_device<palette_device> m_palette;
4247};
trunk/src/mame/includes/dcon.h
r243362r243363
33public:
44   dcon_state(const machine_config &mconfig, device_type type, const char *tag)
55      : driver_device(mconfig, type, tag),
6      m_maincpu(*this, "maincpu"),
7      m_gfxdecode(*this, "gfxdecode"),
8      m_palette(*this, "palette"),
69      m_back_data(*this, "back_data"),
710      m_fore_data(*this, "fore_data"),
811      m_mid_data(*this, "mid_data"),
912      m_textram(*this, "textram"),
10      m_spriteram(*this, "spriteram"),
11      m_maincpu(*this, "maincpu"),
12      m_gfxdecode(*this, "gfxdecode"),
13      m_palette(*this, "palette") { }
13      m_spriteram(*this, "spriteram") { }
1414
15   required_device<cpu_device> m_maincpu;
16   required_device<gfxdecode_device> m_gfxdecode;
17   required_device<palette_device> m_palette;
18
1519   required_shared_ptr<UINT16> m_back_data;
1620   required_shared_ptr<UINT16> m_fore_data;
1721   required_shared_ptr<UINT16> m_mid_data;
1822   required_shared_ptr<UINT16> m_textram;
1923   required_shared_ptr<UINT16> m_spriteram;
24
2025   tilemap_t *m_background_layer;
2126   tilemap_t *m_foreground_layer;
2227   tilemap_t *m_midground_layer;
2328   tilemap_t *m_text_layer;
24   UINT16 m_enable;
29
2530   int m_gfx_bank_select;
2631   int m_last_gfx_bank;
2732   UINT16 m_scroll_ram[6];
33   UINT16 m_layer_en;
34
2835   DECLARE_WRITE16_MEMBER(layer_en_w);
2936   DECLARE_WRITE16_MEMBER(layer_scroll_w);
30   UINT16 m_layer_en;
37   DECLARE_WRITE16_MEMBER(gfxbank_w);
38   DECLARE_WRITE16_MEMBER(background_w);
39   DECLARE_WRITE16_MEMBER(foreground_w);
40   DECLARE_WRITE16_MEMBER(midground_w);
41   DECLARE_WRITE16_MEMBER(text_w);
3142
32   DECLARE_WRITE16_MEMBER(dcon_gfxbank_w);
33   DECLARE_WRITE16_MEMBER(dcon_background_w);
34   DECLARE_WRITE16_MEMBER(dcon_foreground_w);
35   DECLARE_WRITE16_MEMBER(dcon_midground_w);
36   DECLARE_WRITE16_MEMBER(dcon_text_w);
37   DECLARE_DRIVER_INIT(sdgndmps);
3843   TILE_GET_INFO_MEMBER(get_back_tile_info);
3944   TILE_GET_INFO_MEMBER(get_fore_tile_info);
4045   TILE_GET_INFO_MEMBER(get_mid_tile_info);
4146   TILE_GET_INFO_MEMBER(get_text_tile_info);
47   
48   DECLARE_DRIVER_INIT(sdgndmps);
4249   virtual void video_start();
50   
4351   UINT32 screen_update_dcon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
4452   UINT32 screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
4553   void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect);
46   required_device<cpu_device> m_maincpu;
47   required_device<gfxdecode_device> m_gfxdecode;
48   required_device<palette_device> m_palette;
4954};
trunk/src/mame/video/bloodbro.c
r243362r243363
6161
6262   m_fg_tilemap->set_transparent_pen(15);
6363   m_tx_tilemap->set_transparent_pen(15);
64   
65   save_item(NAME(m_scrollram));
66   save_item(NAME(m_layer_en));
6467}
6568
6669
r243362r243363
7174
7275***************************************************************************/
7376
74WRITE16_MEMBER(bloodbro_state::bloodbro_bgvideoram_w)
77WRITE16_MEMBER(bloodbro_state::bgvideoram_w)
7578{
7679   COMBINE_DATA(&m_bgvideoram[offset]);
7780   m_bg_tilemap->mark_tile_dirty(offset);
7881}
7982
80WRITE16_MEMBER(bloodbro_state::bloodbro_fgvideoram_w)
83WRITE16_MEMBER(bloodbro_state::fgvideoram_w)
8184{
8285   COMBINE_DATA(&m_fgvideoram[offset]);
8386   m_fg_tilemap->mark_tile_dirty(offset);
8487}
8588
86WRITE16_MEMBER(bloodbro_state::bloodbro_txvideoram_w)
89WRITE16_MEMBER(bloodbro_state::txvideoram_w)
8790{
8891   COMBINE_DATA(&m_txvideoram[offset]);
8992   m_tx_tilemap->mark_tile_dirty(offset);
trunk/src/mame/video/dcon.c
r243362r243363
1010
1111/******************************************************************************/
1212
13WRITE16_MEMBER(dcon_state::dcon_gfxbank_w)
13WRITE16_MEMBER(dcon_state::gfxbank_w)
1414{
1515   if (data&1)
1616      m_gfx_bank_select=0x1000;
r243362r243363
1818      m_gfx_bank_select=0;
1919}
2020
21WRITE16_MEMBER(dcon_state::dcon_background_w)
21WRITE16_MEMBER(dcon_state::background_w)
2222{
2323   COMBINE_DATA(&m_back_data[offset]);
2424   m_background_layer->mark_tile_dirty(offset);
2525}
2626
27WRITE16_MEMBER(dcon_state::dcon_foreground_w)
27WRITE16_MEMBER(dcon_state::foreground_w)
2828{
2929   COMBINE_DATA(&m_fore_data[offset]);
3030   m_foreground_layer->mark_tile_dirty(offset);
3131}
3232
33WRITE16_MEMBER(dcon_state::dcon_midground_w)
33WRITE16_MEMBER(dcon_state::midground_w)
3434{
3535   COMBINE_DATA(&m_mid_data[offset]);
3636   m_midground_layer->mark_tile_dirty(offset);
3737}
3838
39WRITE16_MEMBER(dcon_state::dcon_text_w)
39WRITE16_MEMBER(dcon_state::text_w)
4040{
4141   COMBINE_DATA(&m_textram[offset]);
4242   m_text_layer->mark_tile_dirty(offset);
r243362r243363
106106   m_text_layer->set_transparent_pen(15);
107107
108108   m_gfx_bank_select = 0;
109   
110   save_item(NAME(m_gfx_bank_select));
111   save_item(NAME(m_last_gfx_bank));
112   save_item(NAME(m_scroll_ram));
113   save_item(NAME(m_layer_en));
109114}
110115
111116void dcon_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect)

https://github.com/mamedev/mame/commit/b6fe4b5e106329a92737ae91238e4d7b54c9b27e

Previous 199869 Revisions Next

© 1997-2024 The MAME Team