summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Angelo Salese <salese_corp_ltd@email.it>2015-02-04 22:49:49 +0100
committer Angelo Salese <salese_corp_ltd@email.it>2015-02-04 22:49:49 +0100
commitf29c5872c1b821b8463a7c624365b3203eb12122 (patch)
tree6d2d4ed3fcd9488a7646b3f0ad313e7abcb757e1
parent11064eca6d4fb4e19478f5128d052d3a92c60057 (diff)
parentf0a29fad3bb638555ef424df7ebdecf12f28de9e (diff)
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r--src/mame/includes/toki.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h
index 866b7e719a6..13b0e361a18 100644
--- a/src/mame/includes/toki.h
+++ b/src/mame/includes/toki.h
@@ -41,15 +41,15 @@ public:
tilemap_t *m_foreground_layer;
tilemap_t *m_text_layer;
- DECLARE_WRITE16_MEMBER(tokib_soundcommand_w);
- DECLARE_READ16_MEMBER(pip_r);
+ DECLARE_WRITE16_MEMBER(tokib_soundcommand16_w);
+ DECLARE_READ16_MEMBER(pip16_r);
DECLARE_WRITE16_MEMBER(toki_control_w);
DECLARE_WRITE16_MEMBER(foreground_videoram_w);
DECLARE_WRITE16_MEMBER(background1_videoram_w);
DECLARE_WRITE16_MEMBER(background2_videoram_w);
- DECLARE_WRITE8_MEMBER(tokib_adpcm_control_w);
- DECLARE_WRITE8_MEMBER(tokib_adpcm_data_w);
- DECLARE_WRITE_LINE_MEMBER(tokib_adpcm_int);
+ DECLARE_WRITE8_MEMBER(toki_adpcm_control_w);
+ DECLARE_WRITE8_MEMBER(toki_adpcm_data_w);
+ DECLARE_WRITE_LINE_MEMBER(toki_adpcm_int);
DECLARE_DRIVER_INIT(tokib);
DECLARE_DRIVER_INIT(jujuba);