summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/toki.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/toki.c')
-rw-r--r--src/mame/video/toki.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index 83d5081ba55..b3a16aeeab3 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -29,7 +29,7 @@ remove all the code writing the $a0000 area.)
WRITE16_MEMBER(toki_state::toki_control_w)
{
m_screen->update_partial(m_screen->vpos() - 1);
- COMBINE_DATA(&m_scrollram16[offset]);
+ COMBINE_DATA(&m_scrollram[offset]);
}
TILE_GET_INFO_MEMBER(toki_state::get_text_tile_info)
@@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(toki_state::get_text_tile_info)
TILE_GET_INFO_MEMBER(toki_state::get_back_tile_info)
{
- int tile = m_background1_videoram16[tile_index];
+ int tile = m_background1_videoram[tile_index];
int color = (tile >> 12) & 0xf;
tile &= 0xfff;
@@ -61,7 +61,7 @@ TILE_GET_INFO_MEMBER(toki_state::get_back_tile_info)
TILE_GET_INFO_MEMBER(toki_state::get_fore_tile_info)
{
- int tile = m_background2_videoram16[tile_index];
+ int tile = m_background2_videoram[tile_index];
int color = (tile >> 12) & 0xf;
tile &= 0xfff;
@@ -92,22 +92,22 @@ void toki_state::video_start()
/*************************************/
-WRITE16_MEMBER(toki_state::toki_foreground_videoram16_w)
+WRITE16_MEMBER(toki_state::foreground_videoram_w)
{
UINT16 *videoram = m_videoram;
COMBINE_DATA(&videoram[offset]);
m_text_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(toki_state::toki_background1_videoram16_w)
+WRITE16_MEMBER(toki_state::background1_videoram_w)
{
- COMBINE_DATA(&m_background1_videoram16[offset]);
+ COMBINE_DATA(&m_background1_videoram[offset]);
m_background_layer->mark_tile_dirty(offset);
}
-WRITE16_MEMBER(toki_state::toki_background2_videoram16_w)
+WRITE16_MEMBER(toki_state::background2_videoram_w)
{
- COMBINE_DATA(&m_background2_videoram16[offset]);
+ COMBINE_DATA(&m_background2_videoram[offset]);
m_foreground_layer->mark_tile_dirty(offset);
}
@@ -249,25 +249,25 @@ UINT32 toki_state::screen_update_toki(screen_device &screen, bitmap_ind16 &bitma
{
int background_y_scroll,foreground_y_scroll,background_x_scroll,foreground_x_scroll;
- background_x_scroll=((m_scrollram16[0x06] &0x7f) << 1)
- |((m_scrollram16[0x06] &0x80) >> 7)
- |((m_scrollram16[0x05] &0x10) << 4);
- background_y_scroll=((m_scrollram16[0x0d]&0x10)<<4)+((m_scrollram16[0x0e]&0x7f)<<1)+((m_scrollram16[0x0e]&0x80)>>7);
+ background_x_scroll=((m_scrollram[0x06] &0x7f) << 1)
+ |((m_scrollram[0x06] &0x80) >> 7)
+ |((m_scrollram[0x05] &0x10) << 4);
+ background_y_scroll=((m_scrollram[0x0d]&0x10)<<4)+((m_scrollram[0x0e]&0x7f)<<1)+((m_scrollram[0x0e]&0x80)>>7);
m_background_layer->set_scrollx(0, background_x_scroll );
m_background_layer->set_scrolly(0, background_y_scroll );
- foreground_x_scroll= ((m_scrollram16[0x16] &0x7f) << 1)
- |((m_scrollram16[0x16] &0x80) >> 7)
- |((m_scrollram16[0x15] &0x10) << 4);
- foreground_y_scroll=((m_scrollram16[0x1d]&0x10)<<4)+((m_scrollram16[0x1e]&0x7f)<<1)+((m_scrollram16[0x1e]&0x80)>>7);
+ foreground_x_scroll= ((m_scrollram[0x16] &0x7f) << 1)
+ |((m_scrollram[0x16] &0x80) >> 7)
+ |((m_scrollram[0x15] &0x10) << 4);
+ foreground_y_scroll=((m_scrollram[0x1d]&0x10)<<4)+((m_scrollram[0x1e]&0x7f)<<1)+((m_scrollram[0x1e]&0x80)>>7);
m_foreground_layer->set_scrollx(0, foreground_x_scroll );
m_foreground_layer->set_scrolly(0, foreground_y_scroll );
- flip_screen_set((m_scrollram16[0x28]&0x8000)==0);
+ flip_screen_set((m_scrollram[0x28]&0x8000)==0);
- if (m_scrollram16[0x28]&0x100) {
+ if (m_scrollram[0x28]&0x100) {
m_background_layer->draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_foreground_layer->draw(screen, bitmap, cliprect, 0,0);
} else {
@@ -283,12 +283,12 @@ UINT32 toki_state::screen_update_tokib(screen_device &screen, bitmap_ind16 &bitm
{
m_foreground_layer->set_scroll_rows(1);
m_background_layer->set_scroll_rows(1);
- m_background_layer->set_scrolly(0, m_scrollram16[0]+1 );
- m_background_layer->set_scrollx(0, m_scrollram16[1]-0x103 );
- m_foreground_layer->set_scrolly(0, m_scrollram16[2]+1 );
- m_foreground_layer->set_scrollx(0, m_scrollram16[3]-0x101 );
+ m_background_layer->set_scrolly(0, m_scrollram[0]+1 );
+ m_background_layer->set_scrollx(0, m_scrollram[1]-0x103 );
+ m_foreground_layer->set_scrolly(0, m_scrollram[2]+1 );
+ m_foreground_layer->set_scrollx(0, m_scrollram[3]-0x101 );
- if (m_scrollram16[3]&0x2000) {
+ if (m_scrollram[3]&0x2000) {
m_background_layer->draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_foreground_layer->draw(screen, bitmap, cliprect, 0,0);
} else {