summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emu/driver.c236
-rw-r--r--src/emu/driver.h273
-rw-r--r--src/emu/gamedrv.h10
-rw-r--r--src/emu/machine.c3
-rw-r--r--src/emu/machine.h2
-rw-r--r--src/emu/video/generic.c674
-rw-r--r--src/emu/video/generic.h22
-rw-r--r--src/lib/util/palette.h18
-rw-r--r--src/mame/audio/n8080.c2
-rw-r--r--src/mame/drivers/1945kiii.c2
-rw-r--r--src/mame/drivers/2mindril.c2
-rw-r--r--src/mame/drivers/88games.c2
-rw-r--r--src/mame/drivers/acommand.c8
-rw-r--r--src/mame/drivers/actfancr.c4
-rw-r--r--src/mame/drivers/aerofgt.c24
-rw-r--r--src/mame/drivers/airbustr.c2
-rw-r--r--src/mame/drivers/ajax.c2
-rw-r--r--src/mame/drivers/albazc.c2
-rw-r--r--src/mame/drivers/albazg.c7
-rw-r--r--src/mame/drivers/aliens.c2
-rw-r--r--src/mame/drivers/ambush.c2
-rw-r--r--src/mame/drivers/aquarium.c2
-rw-r--r--src/mame/drivers/armedf.c18
-rw-r--r--src/mame/drivers/ashnojoe.c2
-rw-r--r--src/mame/drivers/asterix.c2
-rw-r--r--src/mame/drivers/atarisy1.c2
-rw-r--r--src/mame/drivers/atetris.c4
-rw-r--r--src/mame/drivers/backfire.c4
-rw-r--r--src/mame/drivers/battlane.c2
-rw-r--r--src/mame/drivers/battlnts.c2
-rw-r--r--src/mame/drivers/bbusters.c4
-rw-r--r--src/mame/drivers/bestleag.c2
-rw-r--r--src/mame/drivers/bigstrkb.c2
-rw-r--r--src/mame/drivers/bingor.c2
-rw-r--r--src/mame/drivers/bishi.c2
-rw-r--r--src/mame/drivers/blackt96.c2
-rw-r--r--src/mame/drivers/blktiger.c4
-rw-r--r--src/mame/drivers/blockhl.c2
-rw-r--r--src/mame/drivers/bloodbro.c4
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/bogeyman.c2
-rw-r--r--src/mame/drivers/bombjack.c2
-rw-r--r--src/mame/drivers/bottom9.c2
-rw-r--r--src/mame/drivers/bublbobl.c6
-rw-r--r--src/mame/drivers/buggychl.c2
-rw-r--r--src/mame/drivers/cabal.c4
-rw-r--r--src/mame/drivers/cabaret.c4
-rw-r--r--src/mame/drivers/calorie.c6
-rw-r--r--src/mame/drivers/caswin.c2
-rw-r--r--src/mame/drivers/cbasebal.c2
-rw-r--r--src/mame/drivers/chanbara.c2
-rw-r--r--src/mame/drivers/chinagat.c6
-rw-r--r--src/mame/drivers/chqflag.c2
-rw-r--r--src/mame/drivers/citycon.c4
-rw-r--r--src/mame/drivers/clshroad.c3
-rw-r--r--src/mame/drivers/cmmb.c2
-rw-r--r--src/mame/drivers/cntsteer.c2
-rw-r--r--src/mame/drivers/cosmic.c2
-rw-r--r--src/mame/drivers/crbaloon.c2
-rw-r--r--src/mame/drivers/crimfght.c2
-rw-r--r--src/mame/drivers/crospang.c4
-rw-r--r--src/mame/drivers/crshrace.c2
-rw-r--r--src/mame/drivers/cybertnk.c2
-rw-r--r--src/mame/drivers/cyclemb.c4
-rw-r--r--src/mame/drivers/d9final.c4
-rw-r--r--src/mame/drivers/dacholer.c6
-rw-r--r--src/mame/drivers/darius.c4
-rw-r--r--src/mame/drivers/darkhors.c4
-rw-r--r--src/mame/drivers/dblewing.c4
-rw-r--r--src/mame/drivers/dbz.c2
-rw-r--r--src/mame/drivers/dcon.c2
-rw-r--r--src/mame/drivers/ddealer.c2
-rw-r--r--src/mame/drivers/ddragon.c10
-rw-r--r--src/mame/drivers/ddragon3.c6
-rw-r--r--src/mame/drivers/deadang.c2
-rw-r--r--src/mame/drivers/dec0.c8
-rw-r--r--src/mame/drivers/dec8.c44
-rw-r--r--src/mame/drivers/deco156.c3
-rw-r--r--src/mame/drivers/deco_ld.c6
-rw-r--r--src/mame/drivers/diverboy.c2
-rw-r--r--src/mame/drivers/dogfgt.c2
-rw-r--r--src/mame/drivers/dominob.c12
-rw-r--r--src/mame/drivers/dooyong.c18
-rw-r--r--src/mame/drivers/dreamwld.c2
-rw-r--r--src/mame/drivers/drgnmst.c2
-rw-r--r--src/mame/drivers/drmicro.c2
-rw-r--r--src/mame/drivers/drtomy.c2
-rw-r--r--src/mame/drivers/egghunt.c2
-rw-r--r--src/mame/drivers/enigma2.c2
-rw-r--r--src/mame/drivers/equites.c2
-rw-r--r--src/mame/drivers/esd16.c8
-rw-r--r--src/mame/drivers/ettrivia.c2
-rw-r--r--src/mame/drivers/exterm.c2
-rw-r--r--src/mame/drivers/exzisus.c4
-rw-r--r--src/mame/drivers/f1gp.c6
-rw-r--r--src/mame/drivers/fantland.c8
-rw-r--r--src/mame/drivers/fcrash.c4
-rw-r--r--src/mame/drivers/finalizr.c2
-rw-r--r--src/mame/drivers/firetrap.c2
-rw-r--r--src/mame/drivers/fitfight.c4
-rw-r--r--src/mame/drivers/flkatck.c2
-rw-r--r--src/mame/drivers/freekick.c4
-rw-r--r--src/mame/drivers/funkyjet.c2
-rw-r--r--src/mame/drivers/fuukifg2.c2
-rw-r--r--src/mame/drivers/gaelco.c8
-rw-r--r--src/mame/drivers/gaiden.c6
-rw-r--r--src/mame/drivers/galaga.c4
-rw-r--r--src/mame/drivers/galaxi.c2
-rw-r--r--src/mame/drivers/galpani2.c2
-rw-r--r--src/mame/drivers/galpani3.c2
-rw-r--r--src/mame/drivers/galspnbl.c2
-rw-r--r--src/mame/drivers/gauntlet.c2
-rw-r--r--src/mame/drivers/gberet.c4
-rw-r--r--src/mame/drivers/gbusters.c2
-rw-r--r--src/mame/drivers/gcpinbal.c2
-rw-r--r--src/mame/drivers/gijoe.c2
-rw-r--r--src/mame/drivers/ginganin.c2
-rw-r--r--src/mame/drivers/gladiatr.c3
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/gng.c4
-rw-r--r--src/mame/drivers/go2000.c4
-rw-r--r--src/mame/drivers/goal92.c2
-rw-r--r--src/mame/drivers/goindol.c2
-rw-r--r--src/mame/drivers/goldstar.c6
-rw-r--r--src/mame/drivers/good.c2
-rw-r--r--src/mame/drivers/goodejan.c2
-rw-r--r--src/mame/drivers/gotcha.c2
-rw-r--r--src/mame/drivers/gpworld.c2
-rw-r--r--src/mame/drivers/gradius3.c2
-rw-r--r--src/mame/drivers/gstriker.c4
-rw-r--r--src/mame/drivers/gumbo.c6
-rw-r--r--src/mame/drivers/hexion.c2
-rw-r--r--src/mame/drivers/himesiki.c2
-rw-r--r--src/mame/drivers/hvyunit.c4
-rw-r--r--src/mame/drivers/igs009.c4
-rw-r--r--src/mame/drivers/igs017.c2
-rw-r--r--src/mame/drivers/igs_m027.c4
-rw-r--r--src/mame/drivers/igspoker.c12
-rw-r--r--src/mame/drivers/inufuku.c2
-rw-r--r--src/mame/drivers/iqblock.c4
-rw-r--r--src/mame/drivers/jack.c2
-rw-r--r--src/mame/drivers/jackal.c2
-rw-r--r--src/mame/drivers/jackie.c4
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/jailbrek.c2
-rw-r--r--src/mame/drivers/jalmah.c6
-rw-r--r--src/mame/drivers/jchan.c2
-rw-r--r--src/mame/drivers/kaneko16.c18
-rw-r--r--src/mame/drivers/kickgoal.c2
-rw-r--r--src/mame/drivers/laserbas.c2
-rw-r--r--src/mame/drivers/laserbat.c2
-rw-r--r--src/mame/drivers/legionna.c18
-rw-r--r--src/mame/drivers/lethal.c4
-rw-r--r--src/mame/drivers/lkage.c2
-rw-r--r--src/mame/drivers/looping.c12
-rw-r--r--src/mame/drivers/lsasquad.c2
-rw-r--r--src/mame/drivers/lucky74.c2
-rw-r--r--src/mame/drivers/lwings.c14
-rw-r--r--src/mame/drivers/m107.c2
-rw-r--r--src/mame/drivers/m63.c10
-rw-r--r--src/mame/drivers/m90.c6
-rw-r--r--src/mame/drivers/madmotor.c2
-rw-r--r--src/mame/drivers/mainevt.c4
-rw-r--r--src/mame/drivers/mappy.c2
-rw-r--r--src/mame/drivers/mayumi.c2
-rw-r--r--src/mame/drivers/mcatadv.c2
-rw-r--r--src/mame/drivers/mcr.c4
-rw-r--r--src/mame/drivers/megasys1.c8
-rw-r--r--src/mame/drivers/merit.c4
-rw-r--r--src/mame/drivers/metlclsh.c8
-rw-r--r--src/mame/drivers/metro.c46
-rw-r--r--src/mame/drivers/midas.c4
-rw-r--r--src/mame/drivers/mil4000.c2
-rw-r--r--src/mame/drivers/mirage.c4
-rw-r--r--src/mame/drivers/missb2.c4
-rw-r--r--src/mame/drivers/mlanding.c2
-rw-r--r--src/mame/drivers/model1.c2
-rw-r--r--src/mame/drivers/mole.c2
-rw-r--r--src/mame/drivers/momoko.c2
-rw-r--r--src/mame/drivers/moo.c6
-rw-r--r--src/mame/drivers/mosaic.c4
-rw-r--r--src/mame/drivers/mrflea.c2
-rw-r--r--src/mame/drivers/msisaac.c4
-rw-r--r--src/mame/drivers/mugsmash.c2
-rw-r--r--src/mame/drivers/mwarr.c2
-rw-r--r--src/mame/drivers/mystwarr.c12
-rw-r--r--src/mame/drivers/neoprint.c2
-rw-r--r--src/mame/drivers/news.c2
-rw-r--r--src/mame/drivers/ninjakd2.c10
-rw-r--r--src/mame/drivers/nmg5.c4
-rw-r--r--src/mame/drivers/nmk16.c42
-rw-r--r--src/mame/drivers/ohmygod.c2
-rw-r--r--src/mame/drivers/olibochu.c8
-rw-r--r--src/mame/drivers/oneshot.c2
-rw-r--r--src/mame/drivers/opwolf.c4
-rw-r--r--src/mame/drivers/othldrby.c2
-rw-r--r--src/mame/drivers/overdriv.c2
-rw-r--r--src/mame/drivers/pacland.c6
-rw-r--r--src/mame/drivers/parodius.c4
-rw-r--r--src/mame/drivers/pass.c2
-rw-r--r--src/mame/drivers/pbaction.c2
-rw-r--r--src/mame/drivers/pgm.c2
-rw-r--r--src/mame/drivers/pinkiri8.c4
-rw-r--r--src/mame/drivers/pipedrm.c2
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/pitnrun.c4
-rw-r--r--src/mame/drivers/pkscram.c2
-rw-r--r--src/mame/drivers/pktgaldx.c2
-rw-r--r--src/mame/drivers/playmark.c2
-rw-r--r--src/mame/drivers/popeye.c2
-rw-r--r--src/mame/drivers/popobear.c2
-rw-r--r--src/mame/drivers/prehisle.c2
-rw-r--r--src/mame/drivers/progolf.c2
-rw-r--r--src/mame/drivers/psikyo.c4
-rw-r--r--src/mame/drivers/psychic5.c6
-rw-r--r--src/mame/drivers/pturn.c6
-rw-r--r--src/mame/drivers/pushman.c6
-rw-r--r--src/mame/drivers/pzletime.c2
-rw-r--r--src/mame/drivers/qdrmfgp.c4
-rw-r--r--src/mame/drivers/quizpani.c2
-rw-r--r--src/mame/drivers/quizpun2.c2
-rw-r--r--src/mame/drivers/r2dx_v33.c4
-rw-r--r--src/mame/drivers/raiden.c4
-rw-r--r--src/mame/drivers/raiden2.c6
-rw-r--r--src/mame/drivers/rainbow.c4
-rw-r--r--src/mame/drivers/rallyx.c4
-rw-r--r--src/mame/drivers/rastan.c2
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/realbrk.c2
-rw-r--r--src/mame/drivers/renegade.c4
-rw-r--r--src/mame/drivers/rmhaihai.c2
-rw-r--r--src/mame/drivers/rollerg.c2
-rw-r--r--src/mame/drivers/royalmah.c8
-rw-r--r--src/mame/drivers/rpunch.c2
-rw-r--r--src/mame/drivers/rungun.c2
-rw-r--r--src/mame/drivers/sandscrp.c2
-rw-r--r--src/mame/drivers/sauro.c2
-rw-r--r--src/mame/drivers/sbowling.c4
-rw-r--r--src/mame/drivers/scotrsht.c2
-rw-r--r--src/mame/drivers/sderby.c8
-rw-r--r--src/mame/drivers/sengokmj.c2
-rw-r--r--src/mame/drivers/senjyo.c2
-rw-r--r--src/mame/drivers/seta2.c30
-rw-r--r--src/mame/drivers/sf.c6
-rw-r--r--src/mame/drivers/shadfrce.c4
-rw-r--r--src/mame/drivers/shangha3.c6
-rw-r--r--src/mame/drivers/shanghai.c4
-rw-r--r--src/mame/drivers/shootout.c2
-rw-r--r--src/mame/drivers/sidearms.c12
-rw-r--r--src/mame/drivers/sigmab98.c12
-rw-r--r--src/mame/drivers/skyarmy.c4
-rw-r--r--src/mame/drivers/snowbros.c16
-rw-r--r--src/mame/drivers/solomon.c2
-rw-r--r--src/mame/drivers/spbactn.c2
-rw-r--r--src/mame/drivers/speedbal.c4
-rw-r--r--src/mame/drivers/speedspn.c2
-rw-r--r--src/mame/drivers/splash.c6
-rw-r--r--src/mame/drivers/spoker.c8
-rw-r--r--src/mame/drivers/spool99.c4
-rw-r--r--src/mame/drivers/spy.c2
-rw-r--r--src/mame/drivers/srmp2.c2
-rw-r--r--src/mame/drivers/srmp6.c2
-rw-r--r--src/mame/drivers/srumbler.c2
-rw-r--r--src/mame/drivers/stadhero.c2
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/suna8.c20
-rw-r--r--src/mame/drivers/supbtime.c4
-rw-r--r--src/mame/drivers/superqix.c14
-rw-r--r--src/mame/drivers/superwng.c8
-rw-r--r--src/mame/drivers/suprgolf.c2
-rw-r--r--src/mame/drivers/suprslam.c2
-rw-r--r--src/mame/drivers/surpratk.c4
-rw-r--r--src/mame/drivers/tail2nos.c2
-rw-r--r--src/mame/drivers/taito_b.c32
-rw-r--r--src/mame/drivers/taito_f2.c50
-rw-r--r--src/mame/drivers/taito_h.c6
-rw-r--r--src/mame/drivers/taito_o.c2
-rw-r--r--src/mame/drivers/taito_x.c8
-rw-r--r--src/mame/drivers/taito_z.c10
-rw-r--r--src/mame/drivers/taotaido.c2
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tatsumi.c8
-rw-r--r--src/mame/drivers/taxidriv.c2
-rw-r--r--src/mame/drivers/tbowl.c2
-rw-r--r--src/mame/drivers/tecmo.c6
-rw-r--r--src/mame/drivers/tecmo16.c4
-rw-r--r--src/mame/drivers/tecmosys.c4
-rw-r--r--src/mame/drivers/tehkanwc.c4
-rw-r--r--src/mame/drivers/thedeep.c6
-rw-r--r--src/mame/drivers/thoop2.c2
-rw-r--r--src/mame/drivers/thunderx.c4
-rw-r--r--src/mame/drivers/tigeroad.c2
-rw-r--r--src/mame/drivers/tmaster.c2
-rw-r--r--src/mame/drivers/tmnt.c18
-rw-r--r--src/mame/drivers/tnzs.c6
-rw-r--r--src/mame/drivers/toaplan2.c36
-rw-r--r--src/mame/drivers/toki.c4
-rw-r--r--src/mame/drivers/topspeed.c2
-rw-r--r--src/mame/drivers/toypop.c3
-rw-r--r--src/mame/drivers/tsamurai.c2
-rw-r--r--src/mame/drivers/tumbleb.c16
-rw-r--r--src/mame/drivers/tumblep.c2
-rw-r--r--src/mame/drivers/twincobr.c2
-rw-r--r--src/mame/drivers/ultraman.c2
-rw-r--r--src/mame/drivers/umipoker.c2
-rw-r--r--src/mame/drivers/vamphalf.c2
-rw-r--r--src/mame/drivers/vastar.c2
-rw-r--r--src/mame/drivers/vball.c2
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/vmetal.c2
-rw-r--r--src/mame/drivers/volfied.c2
-rw-r--r--src/mame/drivers/vroulet.c2
-rw-r--r--src/mame/drivers/wardner.c2
-rw-r--r--src/mame/drivers/warpwarp.c8
-rw-r--r--src/mame/drivers/wc90.c2
-rw-r--r--src/mame/drivers/wc90b.c2
-rw-r--r--src/mame/drivers/welltris.c2
-rw-r--r--src/mame/drivers/wgp.c2
-rw-r--r--src/mame/drivers/wink.c2
-rw-r--r--src/mame/drivers/witch.c4
-rw-r--r--src/mame/drivers/wrally.c2
-rw-r--r--src/mame/drivers/wwfsstar.c4
-rw-r--r--src/mame/drivers/wwfwfest.c4
-rw-r--r--src/mame/drivers/xain.c4
-rw-r--r--src/mame/drivers/xexex.c2
-rw-r--r--src/mame/drivers/xmen.c4
-rw-r--r--src/mame/drivers/xybots.c2
-rw-r--r--src/mame/drivers/yunsun16.c2
-rw-r--r--src/mame/drivers/zerozone.c2
-rw-r--r--src/mame/machine/bublbobl.c4
-rw-r--r--src/mame/machine/leland.c4
-rw-r--r--src/mame/machine/seicop.c2
-rw-r--r--src/mame/machine/wrally.c2
-rw-r--r--src/mame/video/1942.c6
-rw-r--r--src/mame/video/1943.c8
-rw-r--r--src/mame/video/40love.c2
-rw-r--r--src/mame/video/aeroboto.c8
-rw-r--r--src/mame/video/ambush.c10
-rw-r--r--src/mame/video/amspdwy.c8
-rw-r--r--src/mame/video/appoooh.c8
-rw-r--r--src/mame/video/arkanoid.c34
-rw-r--r--src/mame/video/armedf.c2
-rw-r--r--src/mame/video/ashnojoe.c2
-rw-r--r--src/mame/video/bagman.c8
-rw-r--r--src/mame/video/bankp.c4
-rw-r--r--src/mame/video/baraduke.c10
-rw-r--r--src/mame/video/battlane.c4
-rw-r--r--src/mame/video/battlex.c6
-rw-r--r--src/mame/video/bionicc.c4
-rw-r--r--src/mame/video/bking.c12
-rw-r--r--src/mame/video/blktiger.c6
-rw-r--r--src/mame/video/blueprnt.c6
-rw-r--r--src/mame/video/bogeyman.c6
-rw-r--r--src/mame/video/bombjack.c6
-rw-r--r--src/mame/video/boogwing.c2
-rw-r--r--src/mame/video/bosco.c8
-rw-r--r--src/mame/video/btime.c33
-rw-r--r--src/mame/video/bublbobl.c2
-rw-r--r--src/mame/video/buggychl.c20
-rw-r--r--src/mame/video/cabal.c4
-rw-r--r--src/mame/video/cbuster.c2
-rw-r--r--src/mame/video/champbas.c2
-rw-r--r--src/mame/video/circusc.c4
-rw-r--r--src/mame/video/citycon.c6
-rw-r--r--src/mame/video/cloak.c4
-rw-r--r--src/mame/video/clshroad.c4
-rw-r--r--src/mame/video/cninja.c12
-rw-r--r--src/mame/video/commando.c4
-rw-r--r--src/mame/video/cop01.c4
-rw-r--r--src/mame/video/cosmic.c13
-rw-r--r--src/mame/video/cps1.c10
-rw-r--r--src/mame/video/crbaloon.c2
-rw-r--r--src/mame/video/cvs.c4
-rw-r--r--src/mame/video/dassault.c2
-rw-r--r--src/mame/video/ddragon.c2
-rw-r--r--src/mame/video/ddragon3.c8
-rw-r--r--src/mame/video/deadang.c4
-rw-r--r--src/mame/video/dec0.c14
-rw-r--r--src/mame/video/dec8.c10
-rw-r--r--src/mame/video/decbac06.c4
-rw-r--r--src/mame/video/deckarn.c2
-rw-r--r--src/mame/video/decmxc06.c2
-rw-r--r--src/mame/video/deco32.c2
-rw-r--r--src/mame/video/decocass.c9
-rw-r--r--src/mame/video/decospr.c2
-rw-r--r--src/mame/video/dietgo.c2
-rw-r--r--src/mame/video/digdug.c10
-rw-r--r--src/mame/video/docastle.c10
-rw-r--r--src/mame/video/dogfgt.c10
-rw-r--r--src/mame/video/dooyong.c14
-rw-r--r--src/mame/video/dynduke.c4
-rw-r--r--src/mame/video/equites.c16
-rw-r--r--src/mame/video/esd16.c2
-rw-r--r--src/mame/video/exprraid.c8
-rw-r--r--src/mame/video/exzisus.c8
-rw-r--r--src/mame/video/fastfred.c18
-rw-r--r--src/mame/video/finalizr.c4
-rw-r--r--src/mame/video/firetrap.c4
-rw-r--r--src/mame/video/flower.c6
-rw-r--r--src/mame/video/flstory.c8
-rw-r--r--src/mame/video/freekick.c12
-rw-r--r--src/mame/video/funkybee.c8
-rw-r--r--src/mame/video/funkyjet.c2
-rw-r--r--src/mame/video/fuukifg2.c8
-rw-r--r--src/mame/video/fuukifg3.c8
-rw-r--r--src/mame/video/gaelco2.c2
-rw-r--r--src/mame/video/gaiden.c6
-rw-r--r--src/mame/video/galaga.c8
-rw-r--r--src/mame/video/galaxold.c7
-rw-r--r--src/mame/video/gaplus.c4
-rw-r--r--src/mame/video/gberet.c4
-rw-r--r--src/mame/video/gladiatr.c6
-rw-r--r--src/mame/video/gng.c4
-rw-r--r--src/mame/video/goindol.c8
-rw-r--r--src/mame/video/gottlieb.c14
-rw-r--r--src/mame/video/gotya.c14
-rw-r--r--src/mame/video/gunsmoke.c4
-rw-r--r--src/mame/video/hanaawas.c9
-rw-r--r--src/mame/video/higemaru.c6
-rw-r--r--src/mame/video/himesiki.c2
-rw-r--r--src/mame/video/holeland.c12
-rw-r--r--src/mame/video/hyperspt.c10
-rw-r--r--src/mame/video/hyprduel.c4
-rw-r--r--src/mame/video/ironhors.c16
-rw-r--r--src/mame/video/jack.c10
-rw-r--r--src/mame/video/jackal.c9
-rw-r--r--src/mame/video/jailbrek.c2
-rw-r--r--src/mame/video/kan_panb.c10
-rw-r--r--src/mame/video/kan_pand.c2
-rw-r--r--src/mame/video/kchamp.c6
-rw-r--r--src/mame/video/kingobox.c8
-rw-r--r--src/mame/video/ksayakyu.c2
-rw-r--r--src/mame/video/ladybug.c20
-rw-r--r--src/mame/video/ladyfrog.c4
-rw-r--r--src/mame/video/lasso.c16
-rw-r--r--src/mame/video/lastduel.c4
-rw-r--r--src/mame/video/liberate.c10
-rw-r--r--src/mame/video/lkage.c8
-rw-r--r--src/mame/video/lsasquad.c18
-rw-r--r--src/mame/video/lwings.c4
-rw-r--r--src/mame/video/m52.c21
-rw-r--r--src/mame/video/m58.c12
-rw-r--r--src/mame/video/m72.c8
-rw-r--r--src/mame/video/m92.c16
-rw-r--r--src/mame/video/madmotor.c2
-rw-r--r--src/mame/video/mainsnk.c4
-rw-r--r--src/mame/video/mappy.c12
-rw-r--r--src/mame/video/markham.c10
-rw-r--r--src/mame/video/mermaid.c34
-rw-r--r--src/mame/video/metlclsh.c4
-rw-r--r--src/mame/video/metro.c2
-rw-r--r--src/mame/video/mikie.c6
-rw-r--r--src/mame/video/mitchell.c6
-rw-r--r--src/mame/video/mjkjidai.c4
-rw-r--r--src/mame/video/mouser.c18
-rw-r--r--src/mame/video/mrjong.c6
-rw-r--r--src/mame/video/mustache.c10
-rw-r--r--src/mame/video/n8080.c16
-rw-r--r--src/mame/video/namcos1.c10
-rw-r--r--src/mame/video/namcos86.c10
-rw-r--r--src/mame/video/ninjakd2.c2
-rw-r--r--src/mame/video/nmk16.c16
-rw-r--r--src/mame/video/nova2001.c14
-rw-r--r--src/mame/video/nycaptor.c4
-rw-r--r--src/mame/video/othldrby.c6
-rw-r--r--src/mame/video/pacland.c6
-rw-r--r--src/mame/video/paradise.c8
-rw-r--r--src/mame/video/pbaction.c8
-rw-r--r--src/mame/video/pcktgal.c4
-rw-r--r--src/mame/video/pitnrun.c10
-rw-r--r--src/mame/video/pktgaldx.c2
-rw-r--r--src/mame/video/pokechmp.c6
-rw-r--r--src/mame/video/pooyan.c2
-rw-r--r--src/mame/video/popeye.c12
-rw-r--r--src/mame/video/powerins.c4
-rw-r--r--src/mame/video/prehisle.c4
-rw-r--r--src/mame/video/psikyo.c8
-rw-r--r--src/mame/video/psychic5.c6
-rw-r--r--src/mame/video/pushman.c2
-rw-r--r--src/mame/video/quizdna.c2
-rw-r--r--src/mame/video/rallyx.c15
-rw-r--r--src/mame/video/realbrk.c10
-rw-r--r--src/mame/video/redclash.c5
-rw-r--r--src/mame/video/renegade.c12
-rw-r--r--src/mame/video/retofinv.c4
-rw-r--r--src/mame/video/rocnrope.c4
-rw-r--r--src/mame/video/rohga.c6
-rw-r--r--src/mame/video/sauro.c6
-rw-r--r--src/mame/video/sbasketb.c6
-rw-r--r--src/mame/video/scotrsht.c2
-rw-r--r--src/mame/video/senjyo.c8
-rw-r--r--src/mame/video/seta2.c6
-rw-r--r--src/mame/video/sf.c6
-rw-r--r--src/mame/video/shangha3.c4
-rw-r--r--src/mame/video/shaolins.c6
-rw-r--r--src/mame/video/shisen.c2
-rw-r--r--src/mame/video/shootout.c6
-rw-r--r--src/mame/video/sidearms.c2
-rw-r--r--src/mame/video/simpl156.c2
-rw-r--r--src/mame/video/simpsons.c2
-rw-r--r--src/mame/video/skykid.c10
-rw-r--r--src/mame/video/snk.c20
-rw-r--r--src/mame/video/snk6502.c8
-rw-r--r--src/mame/video/solomon.c6
-rw-r--r--src/mame/video/sonson.c4
-rw-r--r--src/mame/video/spcforce.c4
-rw-r--r--src/mame/video/spdodgeb.c6
-rw-r--r--src/mame/video/speedbal.c2
-rw-r--r--src/mame/video/srumbler.c6
-rw-r--r--src/mame/video/sshangha.c2
-rw-r--r--src/mame/video/ssozumo.c4
-rw-r--r--src/mame/video/stfight.c6
-rw-r--r--src/mame/video/strnskil.c10
-rw-r--r--src/mame/video/suna16.c6
-rw-r--r--src/mame/video/suna8.c4
-rw-r--r--src/mame/video/supbtime.c2
-rw-r--r--src/mame/video/superqix.c10
-rw-r--r--src/mame/video/suprloco.c8
-rw-r--r--src/mame/video/system1.c10
-rw-r--r--src/mame/video/tagteam.c8
-rw-r--r--src/mame/video/tecmo.c4
-rw-r--r--src/mame/video/tecmo16.c2
-rw-r--r--src/mame/video/tehkanwc.c8
-rw-r--r--src/mame/video/terracre.c4
-rw-r--r--src/mame/video/thedeep.c2
-rw-r--r--src/mame/video/tigeroad.c6
-rw-r--r--src/mame/video/timeplt.c2
-rw-r--r--src/mame/video/toaplan1.c4
-rw-r--r--src/mame/video/toki.c4
-rw-r--r--src/mame/video/toypop.c3
-rw-r--r--src/mame/video/trackfld.c8
-rw-r--r--src/mame/video/travrusa.c6
-rw-r--r--src/mame/video/tryout.c6
-rw-r--r--src/mame/video/tsamurai.c2
-rw-r--r--src/mame/video/tumblep.c2
-rw-r--r--src/mame/video/twin16.c4
-rw-r--r--src/mame/video/vaportra.c2
-rw-r--r--src/mame/video/vastar.c6
-rw-r--r--src/mame/video/vball.c2
-rw-r--r--src/mame/video/vulgus.c8
-rw-r--r--src/mame/video/warpwarp.c2
-rw-r--r--src/mame/video/welltris.c2
-rw-r--r--src/mame/video/wrally.c4
-rw-r--r--src/mame/video/wwfsstar.c4
-rw-r--r--src/mame/video/wwfwfest.c4
-rw-r--r--src/mame/video/xain.c4
-rw-r--r--src/mame/video/xevious.c8
-rw-r--r--src/mame/video/xxmissio.c2
-rw-r--r--src/mame/video/yiear.c6
-rw-r--r--src/mame/video/yunsun16.c2
-rw-r--r--src/mame/video/zaccaria.c9
-rw-r--r--src/mame/video/zaxxon.c12
-rw-r--r--src/mame/video/zodiack.c10
553 files changed, 1999 insertions, 2295 deletions
diff --git a/src/emu/driver.c b/src/emu/driver.c
index 9b108b57ed7..c36216dc175 100644
--- a/src/emu/driver.c
+++ b/src/emu/driver.c
@@ -58,7 +58,9 @@ driver_device::driver_device(const machine_config &mconfig, device_type type, co
m_generic_paletteram_16(*this, "paletteram"),
m_generic_paletteram2_16(*this, "paletteram2"),
m_generic_paletteram_32(*this, "paletteram"),
- m_generic_paletteram2_32(*this, "paletteram2")
+ m_generic_paletteram2_32(*this, "paletteram2"),
+ m_flip_screen_x(0),
+ m_flip_screen_y(0)
{
memset(m_callbacks, 0, sizeof(m_callbacks));
}
@@ -265,6 +267,10 @@ void driver_device::device_start()
machine_start();
sound_start();
video_start();
+
+ // save generic states
+ save_item(NAME(m_flip_screen_x));
+ save_item(NAME(m_flip_screen_y));
}
@@ -282,3 +288,231 @@ void driver_device::device_reset_after_children()
sound_reset();
video_reset();
}
+
+
+
+//**************************************************************************
+// GENERIC FLIP SCREEN HANDLING
+//**************************************************************************
+
+//-------------------------------------------------
+// updateflip - handle global flipping
+//-------------------------------------------------
+
+void driver_device::updateflip()
+{
+ // push the flip state to all tilemaps
+ machine().tilemap().set_flip_all((TILEMAP_FLIPX & m_flip_screen_x) | (TILEMAP_FLIPY & m_flip_screen_y));
+
+ // flip the visible area within the screen width/height
+ int width = machine().primary_screen->width();
+ int height = machine().primary_screen->height();
+ rectangle visarea = machine().primary_screen->visible_area();
+ if (m_flip_screen_x)
+ {
+ int temp = width - visarea.min_x - 1;
+ visarea.min_x = width - visarea.max_x - 1;
+ visarea.max_x = temp;
+ }
+ if (m_flip_screen_y)
+ {
+ int temp = height - visarea.min_y - 1;
+ visarea.min_y = height - visarea.max_y - 1;
+ visarea.max_y = temp;
+ }
+
+ // reconfigure the screen with the new visible area
+ attoseconds_t period = machine().primary_screen->frame_period().attoseconds;
+ machine().primary_screen->configure(width, height, visarea, period);
+}
+
+
+//-------------------------------------------------
+// flip_screen_set - set global flip
+//-------------------------------------------------
+
+void driver_device::flip_screen_set(UINT32 on)
+{
+ // normalize to all 1
+ if (on)
+ on = ~0;
+
+ // if something's changed, handle it
+ if (m_flip_screen_x != on || m_flip_screen_y != on)
+ {
+ if (!on)
+ updateflip(); // flip visarea back
+ m_flip_screen_x = m_flip_screen_y = on;
+ updateflip();
+ }
+}
+
+
+//-------------------------------------------------
+// flip_screen_set_no_update - set global flip
+// do not call update_flip.
+//-------------------------------------------------
+
+void driver_device::flip_screen_set_no_update(UINT32 on)
+{
+ // flip_screen_y is not updated on purpose
+ // this function is for drivers which
+ // where writing to flip_screen_x to
+ // bypass update_flip
+ if (on)
+ on = ~0;
+ m_flip_screen_x = on;
+}
+
+
+//-------------------------------------------------
+// flip_screen_x_set - set global horizontal flip
+//-------------------------------------------------
+
+void driver_device::flip_screen_x_set(UINT32 on)
+{
+ // normalize to all 1
+ if (on)
+ on = ~0;
+
+ // if something's changed, handle it
+ if (m_flip_screen_x != on)
+ {
+ m_flip_screen_x = on;
+ updateflip();
+ }
+}
+
+
+//-------------------------------------------------
+// flip_screen_y_set - set global vertical flip
+//-------------------------------------------------
+
+void driver_device::flip_screen_y_set(UINT32 on)
+{
+ // normalize to all 1
+ if (on)
+ on = ~0;
+
+ // if something's changed, handle it
+ if (m_flip_screen_y != on)
+ {
+ m_flip_screen_y = on;
+ updateflip();
+ }
+}
+
+
+
+//**************************************************************************
+// 8-BIT PALETTE WRITE HANDLERS
+//**************************************************************************
+
+// 3-3-2 RGB palette write handlers
+WRITE8_MEMBER( driver_device::paletteram_BBGGGRRR_byte_w ) { palette_8bit_byte_w<3,3,2, 0,3,6>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_RRRGGGBB_byte_w ) { palette_8bit_byte_w<3,3,2, 5,2,0>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_BBGGRRII_byte_w )
+{
+ m_generic_paletteram_8[offset] = data;
+ int i = (data >> 0) & 3;
+ palette_set_color_rgb(machine(), offset, pal4bit(((data >> 0) & 0x0c) | i),
+ pal4bit(((data >> 2) & 0x0c) | i),
+ pal4bit(((data >> 4) & 0x0c) | i));
+}
+
+
+
+//**************************************************************************
+// 16-BIT PALETTE WRITE HANDLERS
+//**************************************************************************
+
+// 4-4-4 RGB palette write handlers
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_byte_le_w ) { palette_16bit_byte_le_w<4,4,4, 0,4,8>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_byte_be_w ) { palette_16bit_byte_be_w<4,4,4, 0,4,8>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<4,4,4, 0,4,8>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<4,4,4, 0,4,8>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_word_w ) { palette_16bit_word_w<4,4,4, 0,4,8>(space, offset, data, mem_mask); }
+
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_byte_le_w ) { palette_16bit_byte_le_w<4,4,4, 4,0,8>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_byte_be_w ) { palette_16bit_byte_be_w<4,4,4, 4,0,8>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<4,4,4, 4,0,8>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<4,4,4, 4,0,8>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_word_w ) { palette_16bit_word_w<4,4,4, 4,0,8>(space, offset, data, mem_mask); }
+
+WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRBBBBGGGG_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<4,4,4, 8,0,4>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRBBBBGGGG_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<4,4,4, 8,0,4>(space, offset, data, mem_mask); }
+
+WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_byte_le_w ) { palette_16bit_byte_le_w<4,4,4, 8,4,0>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_byte_be_w ) { palette_16bit_byte_be_w<4,4,4, 8,4,0>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<4,4,4, 8,4,0>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<4,4,4, 8,4,0>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_word_w ) { palette_16bit_word_w<4,4,4, 8,4,0>(space, offset, data, mem_mask); }
+
+WRITE8_MEMBER( driver_device::paletteram_RRRRGGGGBBBBxxxx_byte_be_w ) { palette_16bit_byte_be_w<4,4,4, 12,8,4>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_RRRRGGGGBBBBxxxx_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<4,4,4, 12,8,4>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_RRRRGGGGBBBBxxxx_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<4,4,4, 12,8,4>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_RRRRGGGGBBBBxxxx_word_w ) { palette_16bit_word_w<4,4,4, 12,8,4>(space, offset, data, mem_mask); }
+
+// 4-4-4-4 IRGB palette write handlers
+template<int _IShift, int _RShift, int _GShift, int _BShift>
+inline void set_color_irgb(running_machine &machine, pen_t color, UINT16 data)
+{
+ static const UINT8 ztable[16] = { 0x0, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11 };
+ UINT8 i = ztable[(data >> _IShift) & 15];
+ UINT8 r = ((data >> _RShift) & 15) * i;
+ UINT8 g = ((data >> _GShift) & 15) * i;
+ UINT8 b = ((data >> _BShift) & 15) * i;
+ palette_set_color_rgb(machine, color, r, g, b);
+}
+
+WRITE16_MEMBER( driver_device::paletteram_IIIIRRRRGGGGBBBB_word_w )
+{
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ set_color_irgb<12,8,4,0>(machine(), offset, m_generic_paletteram_16[offset]);
+}
+
+WRITE16_MEMBER( driver_device::paletteram_RRRRGGGGBBBBIIII_word_w )
+{
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ set_color_irgb<0,12,8,4>(machine(), offset, m_generic_paletteram_16[offset]);
+}
+
+// 5-5-5 RGB palette write handlers
+WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_byte_le_w ) { palette_16bit_byte_le_w<5,5,5, 0,5,10>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_byte_be_w ) { palette_16bit_byte_be_w<5,5,5, 0,5,10>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<5,5,5, 0,5,10>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<5,5,5, 0,5,10>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_word_w ) { palette_16bit_word_w<5,5,5, 0,5,10>(space, offset, data, mem_mask); }
+
+WRITE8_MEMBER( driver_device::paletteram_xBBBBBRRRRRGGGGG_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<5,5,5, 5,0,10>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xBBBBBRRRRRGGGGG_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<5,5,5, 5,0,10>(space, offset, data, mem_mask); }
+
+WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_byte_le_w ) { palette_16bit_byte_le_w<5,5,5, 10,5,0>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_byte_be_w ) { palette_16bit_byte_be_w<5,5,5, 10,5,0>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_byte_split_lo_w ) { palette_16bit_byte_split_lo_w<5,5,5, 10,5,0>(space, offset, data, mem_mask); }
+WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_byte_split_hi_w ) { palette_16bit_byte_split_hi_w<5,5,5, 10,5,0>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_word_w ) { palette_16bit_word_w<5,5,5, 10,5,0>(space, offset, data, mem_mask); }
+WRITE32_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_dword_be_w ) { palette_16bit_dword_be_w<5,5,5, 10,5,0>(space, offset, data, mem_mask); }
+WRITE32_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_dword_le_w ) { palette_16bit_dword_le_w<5,5,5, 10,5,0>(space, offset, data, mem_mask); }
+
+WRITE16_MEMBER( driver_device::paletteram_xGGGGGRRRRRBBBBB_word_w ) { palette_16bit_word_w<5,5,5, 5,10,0>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_xGGGGGBBBBBRRRRR_word_w ) { palette_16bit_word_w<5,5,5, 0,10,5>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_RRRRRGGGGGBBBBBx_word_w ) { palette_16bit_word_w<5,5,5, 11,6,1>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_GGGGGRRRRRBBBBBx_word_w ) { palette_16bit_word_w<5,5,5, 6,11,1>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_RRRRGGGGBBBBRGBx_word_w )
+{
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ data = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(), offset, pal5bit(((data >> 11) & 0x1e) | ((data >> 3) & 0x01)),
+ pal5bit(((data >> 7) & 0x1e) | ((data >> 2) & 0x01)),
+ pal5bit(((data >> 3) & 0x1e) | ((data >> 1) & 0x01)));
+}
+
+
+//**************************************************************************
+// 32-BIT PALETTE WRITE HANDLERS
+//**************************************************************************
+
+// 8-8-8 RGB palette write handlers
+WRITE16_MEMBER( driver_device::paletteram_xrgb_word_be_w ) { palette_32bit_word_be_w<8,8,8, 16,8,0>(space, offset, data, mem_mask); }
+WRITE16_MEMBER( driver_device::paletteram_xbgr_word_be_w ) { palette_32bit_word_be_w<8,8,8, 0,8,16>(space, offset, data, mem_mask); }
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 51c227066dc..d1d33256310 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -80,6 +80,20 @@ public:
static void static_set_palette_init(device_t &device, palette_init_func callback);
// generic helpers
+ template<class _DriverClass, void (_DriverClass::*_Function)()>
+ static void static_wrapper(driver_device &device)
+ {
+ (downcast<_DriverClass &>(device).*_Function)();
+ }
+
+ // generic video
+ void flip_screen_set(UINT32 on);
+ void flip_screen_set_no_update(UINT32 on);
+ void flip_screen_x_set(UINT32 on);
+ void flip_screen_y_set(UINT32 on);
+ UINT32 flip_screen() const { return m_flip_screen_x; }
+ UINT32 flip_screen_x() const { return m_flip_screen_x; }
+ UINT32 flip_screen_y() const { return m_flip_screen_y; }
// watchdog read/write handlers
DECLARE_WRITE8_MEMBER( watchdog_reset_w );
@@ -115,77 +129,86 @@ public:
DECLARE_WRITE8_MEMBER( soundlatch3_clear_w );
DECLARE_WRITE8_MEMBER( soundlatch4_clear_w );
- // general palette helpers
- void set_color_332(pen_t color, int rshift, int gshift, int bshift, UINT32 data);
- void set_color_444(pen_t color, int rshift, int gshift, int bshift, UINT32 data);
- void set_color_555(pen_t color, int rshift, int gshift, int bshift, UINT32 data);
- void set_color_565(pen_t color, int rshift, int gshift, int bshift, UINT32 data);
- void set_color_888(pen_t color, int rshift, int gshift, int bshift, UINT32 data);
- void set_color_4444(pen_t color, int ishift, int rshift, int gshift, int bshift, UINT16 data);
+ // templatized palette writers for 8-bit palette data
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE8_MEMBER( palette_8bit_byte_w );
+
+ // templatized palette writers for 16-bit palette data
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE8_MEMBER( palette_16bit_byte_le_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE8_MEMBER( palette_16bit_byte_be_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE8_MEMBER( palette_16bit_byte_split_lo_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE8_MEMBER( palette_16bit_byte_split_hi_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE16_MEMBER( palette_16bit_word_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE32_MEMBER( palette_16bit_dword_le_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE32_MEMBER( palette_16bit_dword_be_w );
+
+ // templatized palette writers for 32-bit palette data
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE16_MEMBER( palette_32bit_word_le_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE16_MEMBER( palette_32bit_word_be_w );
+ template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift> DECLARE_WRITE32_MEMBER( palette_32bit_dword_w );
// 3-3-2 RGB palette write handlers
- DECLARE_WRITE8_MEMBER( paletteram_BBGGGRRR_w );
- DECLARE_WRITE8_MEMBER( paletteram_RRRGGGBB_w );
- DECLARE_WRITE8_MEMBER( paletteram_BBGGRRII_w );
- DECLARE_WRITE8_MEMBER( paletteram_IIBBGGRR_w );
+ DECLARE_WRITE8_MEMBER( paletteram_BBGGGRRR_byte_w );
+ DECLARE_WRITE8_MEMBER( paletteram_RRRGGGBB_byte_w );
+ DECLARE_WRITE8_MEMBER( paletteram_BBGGRRII_byte_w );
// 4-4-4 RGB palette write handlers
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_le_w );
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_be_w );
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_split1_w ); // uses paletteram
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_split2_w ); // uses paletteram2
- DECLARE_WRITE16_MEMBER( paletteram16_xxxxBBBBGGGGRRRR_word_w );
-
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_le_w );
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_be_w );
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_split1_w ); // uses paletteram
- DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_split2_w ); // uses paletteram2
- DECLARE_WRITE16_MEMBER( paletteram16_xxxxBBBBRRRRGGGG_word_w );
-
- DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRBBBBGGGG_split1_w ); // uses paletteram
- DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRBBBBGGGG_split2_w ); // uses paletteram2
-
- DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_le_w );
- DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_be_w );
- DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_split1_w ); // uses paletteram
- DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_split2_w ); // uses paletteram2
- DECLARE_WRITE16_MEMBER( paletteram16_xxxxRRRRGGGGBBBB_word_w );
-
- DECLARE_WRITE8_MEMBER( paletteram_RRRRGGGGBBBBxxxx_be_w );
- DECLARE_WRITE8_MEMBER( paletteram_RRRRGGGGBBBBxxxx_split1_w ); // uses paletteram
- DECLARE_WRITE8_MEMBER( paletteram_RRRRGGGGBBBBxxxx_split2_w ); // uses paletteram2
- DECLARE_WRITE16_MEMBER( paletteram16_RRRRGGGGBBBBxxxx_word_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_byte_le_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_byte_be_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xxxxBBBBGGGGRRRR_word_w );
+
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_byte_le_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_byte_be_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxBBBBRRRRGGGG_byte_split_hi_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xxxxBBBBRRRRGGGG_word_w );
+
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRBBBBGGGG_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRBBBBGGGG_byte_split_hi_w );
+
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_byte_le_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_byte_be_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xxxxRRRRGGGGBBBB_byte_split_hi_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xxxxRRRRGGGGBBBB_word_w );
+
+ DECLARE_WRITE8_MEMBER( paletteram_RRRRGGGGBBBBxxxx_byte_be_w );
+ DECLARE_WRITE8_MEMBER( paletteram_RRRRGGGGBBBBxxxx_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_RRRRGGGGBBBBxxxx_byte_split_hi_w );
+ DECLARE_WRITE16_MEMBER( paletteram_RRRRGGGGBBBBxxxx_word_w );
// 4-4-4-4 IRGB palette write handlers
- DECLARE_WRITE16_MEMBER( paletteram16_IIIIRRRRGGGGBBBB_word_w );
- DECLARE_WRITE16_MEMBER( paletteram16_RRRRGGGGBBBBIIII_word_w );
+ DECLARE_WRITE16_MEMBER( paletteram_IIIIRRRRGGGGBBBB_word_w );
+ DECLARE_WRITE16_MEMBER( paletteram_RRRRGGGGBBBBIIII_word_w );
// 5-5-5 RGB palette write handlers
- DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_le_w );
- DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_be_w );
- DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_split1_w ); // uses paletteram
- DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_split2_w ); // uses paletteram2
- DECLARE_WRITE16_MEMBER( paletteram16_xBBBBBGGGGGRRRRR_word_w );
-
- DECLARE_WRITE8_MEMBER( paletteram_xBBBBBRRRRRGGGGG_split1_w ); // uses paletteram
- DECLARE_WRITE8_MEMBER( paletteram_xBBBBBRRRRRGGGGG_split2_w ); // uses paletteram2
-
- DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_le_w );
- DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_be_w );
- DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_split1_w );
- DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_split2_w );
- DECLARE_WRITE16_MEMBER( paletteram16_xRRRRRGGGGGBBBBB_word_w );
-
- DECLARE_WRITE16_MEMBER( paletteram16_xGGGGGRRRRRBBBBB_word_w );
- DECLARE_WRITE16_MEMBER( paletteram16_xGGGGGBBBBBRRRRR_word_w );
-
- DECLARE_WRITE16_MEMBER( paletteram16_RRRRRGGGGGBBBBBx_word_w );
- DECLARE_WRITE16_MEMBER( paletteram16_GGGGGRRRRRBBBBBx_word_w );
- DECLARE_WRITE16_MEMBER( paletteram16_RRRRGGGGBBBBRGBx_word_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_byte_le_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_byte_be_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xBBBBBGGGGGRRRRR_word_w );
+
+ DECLARE_WRITE8_MEMBER( paletteram_xBBBBBRRRRRGGGGG_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xBBBBBRRRRRGGGGG_byte_split_hi_w );
+
+ DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_byte_le_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_byte_be_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_byte_split_lo_w );
+ DECLARE_WRITE8_MEMBER( paletteram_xRRRRRGGGGGBBBBB_byte_split_hi_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xRRRRRGGGGGBBBBB_word_w );
+ DECLARE_WRITE32_MEMBER( paletteram_xRRRRRGGGGGBBBBB_dword_be_w );
+ DECLARE_WRITE32_MEMBER( paletteram_xRRRRRGGGGGBBBBB_dword_le_w );
+
+ DECLARE_WRITE16_MEMBER( paletteram_xGGGGGRRRRRBBBBB_word_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xGGGGGBBBBBRRRRR_word_w );
+ DECLARE_WRITE16_MEMBER( paletteram_RRRRRGGGGGBBBBBx_word_w );
+ DECLARE_WRITE16_MEMBER( paletteram_GGGGGRRRRRBBBBBx_word_w );
+ DECLARE_WRITE16_MEMBER( paletteram_RRRRGGGGBBBBRGBx_word_w );
// 8-8-8 RGB palette write handlers
- DECLARE_WRITE16_MEMBER( paletteram16_xrgb_word_be_w );
- DECLARE_WRITE16_MEMBER( paletteram16_xbgr_word_be_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xrgb_word_be_w );
+ DECLARE_WRITE16_MEMBER( paletteram_xbgr_word_be_w );
// generic input port helpers
// custom handler
@@ -230,6 +253,14 @@ public:
optional_shared_ptr<UINT16> m_generic_paletteram2_16;
optional_shared_ptr<UINT32> m_generic_paletteram_32;
optional_shared_ptr<UINT32> m_generic_paletteram2_32;
+
+private:
+ // helpers
+ void updateflip();
+
+ // generic video
+ UINT32 m_flip_screen_x;
+ UINT32 m_flip_screen_y;
};
@@ -243,4 +274,124 @@ device_t *driver_device_creator(const machine_config &mconfig, const char *tag,
}
+
+//**************************************************************************
+// PALETTE WRITER TEMPLATES
+//**************************************************************************
+
+// write 8-bit palette data
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE8_MEMBER(driver_device::palette_8bit_byte_w)
+{
+ m_generic_paletteram_8[offset] = data;
+ UINT8 paldata = m_generic_paletteram_8[offset];
+ palette_set_color_rgb(machine(), offset, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 16-bit palette data to consecutive 8-bit addresses with LSB first
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE8_MEMBER(driver_device::palette_16bit_byte_le_w)
+{
+ m_generic_paletteram_8[offset] = data;
+ UINT16 paldata = m_generic_paletteram_8[offset & ~1] | (m_generic_paletteram_8[offset | 1] << 8);
+ palette_set_color_rgb(machine(), offset / 2, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 16-bit palette data to consecutive 8-bit addresses with MSB first
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE8_MEMBER(driver_device::palette_16bit_byte_be_w)
+{
+ m_generic_paletteram_8[offset] = data;
+ UINT16 paldata = m_generic_paletteram_8[offset | 1] | (m_generic_paletteram_8[offset & ~1] << 8);
+ palette_set_color_rgb(machine(), offset / 2, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 16-bit palette data to split 8-bit addresses (LSB)
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE8_MEMBER(driver_device::palette_16bit_byte_split_lo_w)
+{
+ m_generic_paletteram_8[offset] = data;
+ UINT16 paldata = m_generic_paletteram_8[offset] | (m_generic_paletteram2_8[offset] << 8);
+ palette_set_color_rgb(machine(), offset, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 16-bit palette data to split 8-bit addresses (MSB)
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE8_MEMBER(driver_device::palette_16bit_byte_split_hi_w)
+{
+ m_generic_paletteram2_8[offset] = data;
+ UINT16 paldata = m_generic_paletteram_8[offset] | (m_generic_paletteram2_8[offset] << 8);
+ palette_set_color_rgb(machine(), offset, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 16-bit palette data to 16-bit addresses
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE16_MEMBER(driver_device::palette_16bit_word_w)
+{
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ UINT16 paldata = m_generic_paletteram_16[offset];
+ palette_set_color_rgb(machine(), offset, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 16-bit palette data to packed 32-bit addresses (lower entry in lower 16 bits)
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE32_MEMBER(driver_device::palette_16bit_dword_le_w)
+{
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
+ if (ACCESSING_BITS_0_15)
+ {
+ UINT16 paldata = m_generic_paletteram_32[offset];
+ palette_set_color_rgb(machine(), offset * 2 + 0, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_GreenBits>(paldata >> _BlueShift));
+ }
+ if (ACCESSING_BITS_16_31)
+ {
+ UINT16 paldata = m_generic_paletteram_32[offset] >> 16;
+ palette_set_color_rgb(machine(), offset * 2 + 1, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_GreenBits>(paldata >> _BlueShift));
+ }
+}
+
+// write 16-bit palette data to packed 32-bit addresses (lower entry in upper 16 bits)
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE32_MEMBER(driver_device::palette_16bit_dword_be_w)
+{
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
+ if (ACCESSING_BITS_16_31)
+ {
+ UINT16 paldata = m_generic_paletteram_32[offset] >> 16;
+ palette_set_color_rgb(machine(), offset * 2 + 0, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+ }
+ if (ACCESSING_BITS_0_15)
+ {
+ UINT16 paldata = m_generic_paletteram_32[offset];
+ palette_set_color_rgb(machine(), offset * 2 + 1, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+ }
+}
+
+// write 32-bit palette data to consecutive 16-bit addresses with LSW first
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE16_MEMBER(driver_device::palette_32bit_word_le_w)
+{
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ UINT32 paldata = m_generic_paletteram_16[offset & ~1] | (m_generic_paletteram_16[offset | 1] << 16);
+ palette_set_color_rgb(machine(), offset / 2, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 32-bit palette data to consecutive 16-bit addresses with MSW first
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE16_MEMBER(driver_device::palette_32bit_word_be_w)
+{
+ COMBINE_DATA(&m_generic_paletteram_16[offset]);
+ UINT32 paldata = m_generic_paletteram_16[offset | 1] | (m_generic_paletteram_16[offset & ~1] << 16);
+ palette_set_color_rgb(machine(), offset / 2, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
+// write 32-bit palette data to 32-bit addresses
+template<int _RedBits, int _GreenBits, int _BlueBits, int _RedShift, int _GreenShift, int _BlueShift>
+WRITE32_MEMBER(driver_device::palette_32bit_dword_w)
+{
+ COMBINE_DATA(&m_generic_paletteram_32[offset]);
+ UINT32 paldata = m_generic_paletteram_32[offset];
+ palette_set_color_rgb(machine(), offset, palexpand<_RedBits>(paldata >> _RedShift), palexpand<_GreenBits>(paldata >> _GreenShift), palexpand<_BlueBits>(paldata >> _BlueShift));
+}
+
#endif /* __DRIVER_H__ */
diff --git a/src/emu/gamedrv.h b/src/emu/gamedrv.h
index 5bc587a59ff..8518ef05451 100644
--- a/src/emu/gamedrv.h
+++ b/src/emu/gamedrv.h
@@ -85,16 +85,6 @@ const UINT32 GAME_IS_SKELETON_MECHANICAL = GAME_IS_SKELETON | GAME_MECHANICAL |
// static driver initialization callback
typedef void (*driver_init_func)(running_machine &machine);
-/*
-// wrapper template to allow members
-template<class _DriverClass, void (_DriverClass::*_Function)()>
-void driver_init_wrapper(running_machine &machine)
-{
- _DriverClass *object = machine.driver_data<_DriverClass>();
- (object->*_Function)();
-}
-*/
-
// static POD structure describing each game driver entry
struct game_driver
{
diff --git a/src/emu/machine.c b/src/emu/machine.c
index 55cd4406a63..8d3a66fd077 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -62,7 +62,6 @@
- calls render_init() [render.c] to initialize the rendering system
- calls ui_init() [ui.c] to initialize the user interface
- calls generic_machine_init() [machine/generic.c] to initialize generic machine structures
- - calls generic_video_init() [video/generic.c] to initialize generic video structures
- calls generic_sound_init() [audio/generic.c] to initialize generic sound structures
- calls timer_init() [timer.c] to reset the timer system
- calls osd_init() [osdepend.h] to do platform-specific initialization
@@ -149,7 +148,6 @@ running_machine::running_machine(const machine_config &_config, osd_interface &o
ui_input_data(NULL),
debugcpu_data(NULL),
generic_machine_data(NULL),
- generic_video_data(NULL),
generic_audio_data(NULL),
m_config(_config),
@@ -252,7 +250,6 @@ void running_machine::start()
m_render = auto_alloc(*this, render_manager(*this));
generic_machine_init(*this);
generic_sound_init(*this);
- generic_video_init(*this);
// allocate a soft_reset timer
m_soft_reset_timer = m_scheduler.timer_alloc(timer_expired_delegate(FUNC(running_machine::soft_reset), this));
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 5dfeb80558b..d5fb9a44db4 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -189,7 +189,6 @@ typedef struct _input_port_private input_port_private;
typedef struct _ui_input_private ui_input_private;
typedef struct _debugcpu_private debugcpu_private;
typedef struct _generic_machine_private generic_machine_private;
-typedef struct _generic_video_private generic_video_private;
typedef struct _generic_audio_private generic_audio_private;
@@ -413,7 +412,6 @@ public:
ui_input_private * ui_input_data; // internal data from uiinput.c
debugcpu_private * debugcpu_data; // internal data from debugcpu.c
generic_machine_private *generic_machine_data; // internal data from machine/generic.c
- generic_video_private * generic_video_data; // internal data from video/generic.c
generic_audio_private * generic_audio_data; // internal data from audio/generic.c
private:
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index 593fe31c7b8..decbaf495eb 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -14,18 +14,6 @@
/***************************************************************************
- TYPE DEFINITIONS
-***************************************************************************/
-
-struct _generic_video_private
-{
- int flip_screen_x;
- int flip_screen_y;
-};
-
-
-
-/***************************************************************************
COMMON GRAPHICS LAYOUTS
***************************************************************************/
@@ -109,253 +97,6 @@ const gfx_layout gfx_16x16x4_planar =
/***************************************************************************
- INLINE FUNCTIONS
-***************************************************************************/
-
-/*-------------------------------------------------
- set_color_332 - set a 3-3-2 RGB color using
- the 16-bit data provided and the specified
- shift values
--------------------------------------------------*/
-
-void driver_device::set_color_332(pen_t color, int rshift, int gshift, int bshift, UINT32 data)
-{
- palette_set_color(machine(), color, pal332(data, rshift, gshift, bshift));
-}
-
-
-/*-------------------------------------------------
- set_color_444 - set a 4-4-4 RGB color using
- the 16-bit data provided and the specified
- shift values
--------------------------------------------------*/
-
-void driver_device::set_color_444(pen_t color, int rshift, int gshift, int bshift, UINT32 data)
-{
- palette_set_color(machine(), color, pal444(data, rshift, gshift, bshift));
-}
-
-
-/*-------------------------------------------------
- set_color_4444 - set a 4-4-4-4 IRGB color using
- the 16-bit data provided and the specified
- shift values
--------------------------------------------------*/
-
-void driver_device::set_color_4444(pen_t color, int ishift, int rshift, int gshift, int bshift, UINT16 data)
-{
- static const UINT8 ztable[16] =
- { 0x0, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11 };
- int i, r, g, b;
-
- i = ztable[(data >> ishift) & 15];
- r = ((data >> rshift) & 15) * i;
- g = ((data >> gshift) & 15) * i;
- b = ((data >> bshift) & 15) * i;
-
- palette_set_color_rgb(machine(), color, r, g, b);
-}
-
-
-/*-------------------------------------------------
- set_color_555 - set a 5-5-5 RGB color using
- the 16-bit data provided and the specified
- shift values
--------------------------------------------------*/
-
-void driver_device::set_color_555(pen_t color, int rshift, int gshift, int bshift, UINT32 data)
-{
- palette_set_color(machine(), color, pal555(data, rshift, gshift, bshift));
-}
-
-
-/*-------------------------------------------------
- set_color_565 - set a 5-6-5 RGB color using
- the 16-bit data provided and the specified
- shift values
--------------------------------------------------*/
-
-void driver_device::set_color_565(pen_t color, int rshift, int gshift, int bshift, UINT32 data)
-{
- palette_set_color(machine(), color, pal565(data, rshift, gshift, bshift));
-}
-
-
-/*-------------------------------------------------
- set_color_8888 - set a 8-8-8 RGB color using
- the 32-bit data provided and the specified
- shift values
--------------------------------------------------*/
-
-void driver_device::set_color_888(pen_t color, int rshift, int gshift, int bshift, UINT32 data)
-{
- palette_set_color(machine(), color, pal888(data, rshift, gshift, bshift));
-}
-
-
-
-/***************************************************************************
- INITIALIZATION
-***************************************************************************/
-
-/*-------------------------------------------------
- generic_video_init - initialize globals and
- register for save states
--------------------------------------------------*/
-
-void generic_video_init(running_machine &machine)
-{
- generic_video_private *state;
-
- state = machine.generic_video_data = auto_alloc_clear(machine, generic_video_private);
-
- machine.save().save_item(NAME(state->flip_screen_x));
- machine.save().save_item(NAME(state->flip_screen_y));
-}
-
-
-
-/***************************************************************************
- GLOBAL VIDEO ATTRIBUTES
-***************************************************************************/
-
-/*-------------------------------------------------
- updateflip - handle global flipping
--------------------------------------------------*/
-
-static void updateflip(running_machine &machine)
-{
- generic_video_private *state = machine.generic_video_data;
- int width = machine.primary_screen->width();
- int height = machine.primary_screen->height();
- attoseconds_t period = machine.primary_screen->frame_period().attoseconds;
- rectangle visarea = machine.primary_screen->visible_area();
-
- machine.tilemap().set_flip_all((TILEMAP_FLIPX & state->flip_screen_x) | (TILEMAP_FLIPY & state->flip_screen_y));
-
- if (state->flip_screen_x)
- {
- int temp;
-
- temp = width - visarea.min_x - 1;
- visarea.min_x = width - visarea.max_x - 1;
- visarea.max_x = temp;
- }
- if (state->flip_screen_y)
- {
- int temp;
-
- temp = height - visarea.min_y - 1;
- visarea.min_y = height - visarea.max_y - 1;
- visarea.max_y = temp;
- }
-
- machine.primary_screen->configure(width, height, visarea, period);
-}
-
-
-/*-------------------------------------------------
- flip_screen_set - set global flip
--------------------------------------------------*/
-
-void flip_screen_set(running_machine &machine, int on)
-{
- generic_video_private *state = machine.generic_video_data;
- if (on) on = ~0;
- if (state->flip_screen_x != on || state->flip_screen_y != on)
- {
- if (!on) updateflip(machine); // flip visarea back
- state->flip_screen_x = state->flip_screen_y = on;
- updateflip(machine);
- }
-}
-
-
-/*-------------------------------------------------
- flip_screen_set_no_update - set global flip
- do not call update_flip.
--------------------------------------------------*/
-
-void flip_screen_set_no_update(running_machine &machine, int on)
-{
- /* flip_screen_y is not updated on purpose
- * this function is for drivers which
- * where writing to flip_screen_x to
- * bypass update_flip
- */
- generic_video_private *state = machine.generic_video_data;
- if (on) on = ~0;
- state->flip_screen_x = on;
-}
-
-
-/*-------------------------------------------------
- flip_screen_x_set - set global horizontal flip
--------------------------------------------------*/
-
-void flip_screen_x_set(running_machine &machine, int on)
-{
- generic_video_private *state = machine.generic_video_data;
- if (on) on = ~0;
- if (state->flip_screen_x != on)
- {
- state->flip_screen_x = on;
- updateflip(machine);
- }
-}
-
-
-/*-------------------------------------------------
- flip_screen_y_set - set global vertical flip
--------------------------------------------------*/
-
-void flip_screen_y_set(running_machine &machine, int on)
-{
- generic_video_private *state = machine.generic_video_data;
- if (on) on = ~0;
- if (state->flip_screen_y != on)
- {
- state->flip_screen_y = on;
- updateflip(machine);
- }
-}
-
-
-/*-------------------------------------------------
- flip_screen_get - get global flip
--------------------------------------------------*/
-
-int flip_screen_get(running_machine &machine)
-{
- generic_video_private *state = machine.generic_video_data;
- return state->flip_screen_x;
-}
-
-
-/*-------------------------------------------------
- flip_screen_x_get - get global x flip
--------------------------------------------------*/
-
-int flip_screen_x_get(running_machine &machine)
-{
- generic_video_private *state = machine.generic_video_data;
- return state->flip_screen_x;
-}
-
-
-/*-------------------------------------------------
- flip_screen_get - get global y flip
--------------------------------------------------*/
-
-int flip_screen_y_get(running_machine &machine)
-{
- generic_video_private *state = machine.generic_video_data;
- return state->flip_screen_y;
-}
-
-
-
-/***************************************************************************
COMMON PALETTE INITIALIZATION
***************************************************************************/
@@ -490,418 +231,3 @@ PALETTE_INIT( RRRRR_GGGGGG_BBBBB )
for (i = 0; i < 0x10000; i++)
palette_set_color(machine, i, MAKE_RGB(pal5bit(i >> 11), pal6bit(i >> 5), pal5bit(i >> 0)));
}
-
-
-
-/***************************************************************************
- 3-3-2 RGB PALETTE WRITE HANDLERS
-***************************************************************************/
-
-/*-------------------------------------------------
- RRR-GGG-BB writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_RRRGGGBB_w )
-{
- m_generic_paletteram_8[offset] = data;
- palette_set_color_rgb(machine(), offset, pal3bit(data >> 5), pal3bit(data >> 2), pal2bit(data >> 0));
-}
-
-
-/*-------------------------------------------------
- BB-GGG-RR writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_BBGGGRRR_w )
-{
- m_generic_paletteram_8[offset] = data;
- palette_set_color_rgb(machine(), offset, pal3bit(data >> 0), pal3bit(data >> 3), pal2bit(data >> 6));
-}
-
-
-/*-------------------------------------------------
- BB-GG-RR-II writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_BBGGRRII_w )
-{
- int i = (data >> 0) & 3;
-
- m_generic_paletteram_8[offset] = data;
- palette_set_color_rgb(machine(), offset, pal4bit(((data >> 0) & 0x0c) | i),
- pal4bit(((data >> 2) & 0x0c) | i),
- pal4bit(((data >> 4) & 0x0c) | i));
-}
-
-/*-------------------------------------------------
- II-BB-GG-RR writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_IIBBGGRR_w )
-{
- int i = (data >> 6) & 3;
-
- m_generic_paletteram_8[offset] = data;
- palette_set_color_rgb(machine(), offset, pal4bit(((data << 2) & 0x0c) | i),
- pal4bit(((data >> 0) & 0x0c) | i),
- pal4bit(((data >> 2) & 0x0c) | i));
-}
-
-
-
-/***************************************************************************
- 4-4-4 RGB PALETTE WRITE HANDLERS
-***************************************************************************/
-
-/*-------------------------------------------------
- xxxx-BBBB-GGGG-RRRR writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_le_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset / 2, 0, 4, 8, paletteram16_le(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_be_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset / 2, 0, 4, 8, paletteram16_be(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset, 0, 4, 8, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBGGGGRRRR_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_444(offset, 0, 4, 8, paletteram16_split(offset));
-}
-
-WRITE16_MEMBER( driver_device::paletteram16_xxxxBBBBGGGGRRRR_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_444(offset, 0, 4, 8, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- xxxx-BBBB-RRRR-GGGG writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_le_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset / 2, 4, 0, 8, paletteram16_le(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_be_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset / 2, 4, 0, 8, paletteram16_be(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset, 4, 0, 8, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxBBBBRRRRGGGG_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_444(offset, 4, 0, 8, paletteram16_split(offset));
-}
-
-WRITE16_MEMBER( driver_device::paletteram16_xxxxBBBBRRRRGGGG_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_444(offset, 4, 0, 8, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- xxxx-RRRR-BBBB-GGGG writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRBBBBGGGG_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset, 8, 0, 4, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRBBBBGGGG_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_444(offset, 8, 0, 4, paletteram16_split(offset));
-}
-
-
-/*-------------------------------------------------
- xxxx-RRRR-GGGG-BBBB writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_le_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset / 2, 8, 4, 0, paletteram16_le(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_be_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset / 2, 8, 4, 0, paletteram16_be(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset, 8, 4, 0, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xxxxRRRRGGGGBBBB_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_444(offset, 8, 4, 0, paletteram16_split(offset));
-}
-
-WRITE16_MEMBER( driver_device::paletteram16_xxxxRRRRGGGGBBBB_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_444(offset, 8, 4, 0, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- RRRR-GGGG-BBBB-xxxx writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_RRRRGGGGBBBBxxxx_be_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset / 2, 12, 8, 4, paletteram16_be(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_RRRRGGGGBBBBxxxx_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_444(offset, 12, 8, 4, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_RRRRGGGGBBBBxxxx_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_444(offset, 12, 8, 4, paletteram16_split(offset));
-}
-
-WRITE16_MEMBER( driver_device::paletteram16_RRRRGGGGBBBBxxxx_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_444(offset, 12, 8, 4, m_generic_paletteram_16[offset]);
-}
-
-
-
-/***************************************************************************
- 5-5-5 RGB PALETTE WRITE HANDLERS
-***************************************************************************/
-
-/*-------------------------------------------------
- x-BBBBB-GGGGG-RRRRR writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_le_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_555(offset / 2, 0, 5, 10, paletteram16_le(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_be_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_555(offset / 2, 0, 5, 10, paletteram16_be(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_555(offset, 0, 5, 10, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xBBBBBGGGGGRRRRR_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_555(offset, 0, 5, 10, paletteram16_split(offset));
-}
-
-WRITE16_MEMBER( driver_device::paletteram16_xBBBBBGGGGGRRRRR_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_555(offset, 0, 5, 10, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- x-BBBBB-RRRRR-GGGGG writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_xBBBBBRRRRRGGGGG_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_555(offset, 5, 0, 10, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xBBBBBRRRRRGGGGG_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_555(offset, 5, 0, 10, paletteram16_split(offset));
-}
-
-
-/*-------------------------------------------------
- x-RRRRR-GGGGG-BBBBB writes
--------------------------------------------------*/
-
-WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_le_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_555(offset / 2, 10, 5, 0, paletteram16_le(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_be_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_555(offset / 2, 10, 5, 0, paletteram16_be(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_split1_w )
-{
- m_generic_paletteram_8[offset] = data;
- set_color_555(offset, 10, 5, 0, paletteram16_split(offset));
-}
-
-WRITE8_MEMBER( driver_device::paletteram_xRRRRRGGGGGBBBBB_split2_w )
-{
- m_generic_paletteram2_8[offset] = data;
- set_color_555(offset, 10, 5, 0, paletteram16_split(offset));
-}
-
-WRITE16_MEMBER( driver_device::paletteram16_xRRRRRGGGGGBBBBB_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_555(offset, 10, 5, 0, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- x-GGGGG-RRRRR-BBBBB writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_xGGGGGRRRRRBBBBB_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_555(offset, 5, 10, 0, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- x-GGGGG-BBBBB-RRRRR writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_xGGGGGBBBBBRRRRR_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_555(offset, 0, 10, 5, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- GGGGG-RRRRR-BBBBB-x writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_GGGGGRRRRRBBBBBx_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_555(offset, 6, 11, 1, m_generic_paletteram_16[offset]);
-}
-
-/*-------------------------------------------------
- RRRRR-GGGGG-BBBBB-x writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_RRRRRGGGGGBBBBBx_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_555(offset, 11, 6, 1, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- RRRR-GGGG-BBBB-RGBx writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_RRRRGGGGBBBBRGBx_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- data = m_generic_paletteram_16[offset];
- palette_set_color_rgb(machine(), offset, pal5bit(((data >> 11) & 0x1e) | ((data >> 3) & 0x01)),
- pal5bit(((data >> 7) & 0x1e) | ((data >> 2) & 0x01)),
- pal5bit(((data >> 3) & 0x1e) | ((data >> 1) & 0x01)));
-}
-
-
-
-/***************************************************************************
- 4-4-4-4 RGBI PALETTE WRITE HANDLERS
-***************************************************************************/
-
-/*-------------------------------------------------
- IIII-RRRR-GGGG-BBBB writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_IIIIRRRRGGGGBBBB_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_4444(offset, 12, 8, 4, 0, m_generic_paletteram_16[offset]);
-}
-
-
-/*-------------------------------------------------
- RRRR-GGGG-BBBB-IIII writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_RRRRGGGGBBBBIIII_word_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_4444(offset, 0, 12, 8, 4, m_generic_paletteram_16[offset]);
-}
-
-
-
-/***************************************************************************
- 8-8-8 RGB PALETTE WRITE HANDLERS
-***************************************************************************/
-
-/*-------------------------------------------------
- xxxxxxxx-RRRRRRRR-GGGGGGGG-BBBBBBBB writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_xrgb_word_be_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_888(offset / 2, 16, 8, 0, paletteram32_be(offset));
-}
-
-
-/*-------------------------------------------------
- xxxxxxxx-BBBBBBBB-GGGGGGGG-RRRRRRRR writes
--------------------------------------------------*/
-
-WRITE16_MEMBER( driver_device::paletteram16_xbgr_word_be_w )
-{
- COMBINE_DATA(&m_generic_paletteram_16[offset]);
- set_color_888(offset / 2, 0, 8, 16, paletteram32_be(offset));
-}
diff --git a/src/emu/video/generic.h b/src/emu/video/generic.h
index e57dc4be32b..196d5665708 100644
--- a/src/emu/video/generic.h
+++ b/src/emu/video/generic.h
@@ -35,28 +35,6 @@ extern const gfx_layout gfx_16x16x4_planar;
FUNCTION PROTOTYPES
***************************************************************************/
-/* ----- initialization ----- */
-
-/* set up all the common systems */
-void generic_video_init(running_machine &machine);
-
-
-
-/* ----- global attributes ----- */
-
-/* set global attributes */
-void flip_screen_set(running_machine &machine, int on);
-void flip_screen_set_no_update(running_machine &machine, int on); /* will not call update_flip */
-void flip_screen_x_set(running_machine &machine, int on);
-void flip_screen_y_set(running_machine &machine, int on);
-int flip_screen_get(running_machine &machine);
-int flip_screen_x_get(running_machine &machine);
-int flip_screen_y_get(running_machine &machine);
-
-//#define flip_screen flip_screen_get(machine)
-
-
-
/* ----- generic palette init routines ----- */
PALETTE_INIT( all_black );
diff --git a/src/lib/util/palette.h b/src/lib/util/palette.h
index 39b643d361c..c8c15f4734b 100644
--- a/src/lib/util/palette.h
+++ b/src/lib/util/palette.h
@@ -296,6 +296,24 @@ inline UINT8 pal7bit(UINT8 bits)
}
+//-------------------------------------------------
+// palexpand - expand a palette value to 8 bits
+//-------------------------------------------------
+
+template<int _NumBits>
+inline UINT8 palexpand(UINT8 data)
+{
+ if (_NumBits == 1) return pal1bit(data);
+ if (_NumBits == 2) return pal2bit(data);
+ if (_NumBits == 3) return pal3bit(data);
+ if (_NumBits == 4) return pal4bit(data);
+ if (_NumBits == 5) return pal5bit(data);
+ if (_NumBits == 6) return pal6bit(data);
+ if (_NumBits == 7) return pal7bit(data);
+ return data;
+}
+
+
/*-------------------------------------------------
pal332 - create a 3-3-2 color by extracting
bits from a UINT32
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index 977e1eaf1e4..00a328b481c 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -313,7 +313,7 @@ static void delayed_sound_2( running_machine &machine, int data )
if (~data & 0x20) state->m_curr_sound_pins |= 1 << 0xc;
if (state->m_n8080_hardware == 1)
- flip_screen_set_no_update(machine, data & 0x20);
+ state->flip_screen_set_no_update(data & 0x20);
if (state->m_n8080_hardware == 3)
state->m_helifire_flash = data & 0x20;
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 0dd8fb94300..b739840efa9 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -150,7 +150,7 @@ static ADDRESS_MAP_START( k3_map, AS_PROGRAM, 16, k3_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Main Ram
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") // palette
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") // palette
AM_RANGE(0x240000, 0x240fff) AM_RAM AM_BASE(m_spriteram_1)
AM_RANGE(0x280000, 0x280fff) AM_RAM AM_BASE(m_spriteram_2)
AM_RANGE(0x2c0000, 0x2c0fff) AM_RAM_WRITE(k3_bgram_w) AM_BASE(m_bgram)
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 6bacd5167dc..bed4ada54da 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -207,7 +207,7 @@ static ADDRESS_MAP_START( drill_map, AS_PROGRAM, 16, _2mindril_state )
AM_RANGE(0x430000, 0x43ffff) AM_READWRITE(f3_pivot_r,f3_pivot_w)
AM_RANGE(0x460000, 0x46000f) AM_WRITE(f3_control_0_w)
AM_RANGE(0x460010, 0x46001f) AM_WRITE(f3_control_1_w)
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x502022, 0x502023) AM_WRITENOP //countinously switches between 0 and 2
AM_RANGE(0x600000, 0x600007) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2610_r, ym2610_w, 0x00ff)
AM_RANGE(0x60000c, 0x60000d) AM_READWRITE(drill_irq_r,drill_irq_w)
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index e509cf84889..7fa74f5e87d 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -128,7 +128,7 @@ WRITE8_MEMBER(_88games_state::k052109_051960_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _88games_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(m_banked_rom) /* banked ROM + palette RAM */
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(m_paletteram_1000) /* banked ROM + palette RAM */
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_be_w) AM_BASE(m_paletteram_1000) /* banked ROM + palette RAM */
AM_RANGE(0x2000, 0x2fff) AM_RAM
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x3800, 0x3fff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(m_ram)
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 18e8033cf43..4f8b8173272 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -140,12 +140,12 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int xx,yy,x;
int delta = 16;
- flipx ^= flip_screen_get(machine);
- flipy ^= flip_screen_get(machine);
+ flipx ^= state->flip_screen();
+ flipy ^= state->flip_screen();
if ((pri&pri_mask)!=priority) continue;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 368 - sx;
sy = 240 - sy;
@@ -458,7 +458,7 @@ static ADDRESS_MAP_START( acommand_map, AS_PROGRAM, 16, acommand_state )
AM_RANGE(0x082208, 0x082209) AM_WRITE(ac_unk2_w)
AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM_WRITE(ac_bgvram_w) AM_BASE(m_ac_bgvram)
AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(ac_txvram_w) AM_BASE(m_ac_txvram)
- AM_RANGE(0x0b8000, 0x0bffff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0b8000, 0x0bffff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0f0000, 0x0f7fff) AM_RAM
AM_RANGE(0x0f8000, 0x0f8fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x0f9000, 0x0fffff) AM_RAM
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 47837c0032d..f21cc05fa75 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( actfan_map, AS_PROGRAM, 8, actfancr_state )
AM_RANGE(0x072000, 0x0727ff) AM_DEVREADWRITE_LEGACY("tilegen2", deco_bac06_pf_data_8bit_swap_r, deco_bac06_pf_data_8bit_swap_w)
AM_RANGE(0x100000, 0x1007ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x110000, 0x110001) AM_WRITE(actfancr_buffer_spriteram_w)
- AM_RANGE(0x120000, 0x1205ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0x120000, 0x1205ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0x130000, 0x130000) AM_READ_PORT("P1")
AM_RANGE(0x130001, 0x130001) AM_READ_PORT("P2")
AM_RANGE(0x130002, 0x130002) AM_READ_PORT("DSW1")
@@ -105,7 +105,7 @@ static ADDRESS_MAP_START( triothep_map, AS_PROGRAM, 8, actfancr_state )
AM_RANGE(0x100000, 0x100001) AM_WRITE(actfancr_sound_w)
AM_RANGE(0x110000, 0x110001) AM_WRITE(actfancr_buffer_spriteram_w)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x130000, 0x1305ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0x130000, 0x1305ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x140001) AM_READNOP /* Value doesn't matter */
AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM AM_BASE(m_main_ram) /* Main ram */
AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(triothep_control_r, triothep_control_select_w)
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 3d6feeddce3..9883176bde7 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -142,7 +142,7 @@ static ADDRESS_MAP_START( pspikes_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffc000, 0xffc3ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(pspikes_palette_bank_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
@@ -158,7 +158,7 @@ static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0xffc000, 0xffcbff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd200, 0xffd201) AM_WRITE(pspikesb_gfxbank_w)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0")
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1")
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
@@ -178,7 +178,7 @@ static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0xffc000, 0xffcfff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
//AM_RANGE(0xffd200, 0xffd201) AM_WRITE(pspikesb_gfxbank_w)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0")
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
@@ -193,7 +193,7 @@ static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffc000, 0xffcbff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(pspikes_palette_bank_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW")
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
- AM_RANGE(0x0fe000, 0x0fe7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0fe000, 0x0fe7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0ff000, 0x0ff001) AM_READ_PORT("IN0")
AM_RANGE(0x0ff002, 0x0ff003) AM_READ_PORT("IN1") AM_WRITE(karatblz_gfxbank_w)
AM_RANGE(0x0ff004, 0x0ff005) AM_READ_PORT("IN2")
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* work RAM */
AM_RANGE(0xffc000, 0xffc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffd1ff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
- AM_RANGE(0xffe000, 0xffe7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffe7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(spinlbrk_gfxbank_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(aerofgt_bg2scrollx_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW")
@@ -247,7 +247,7 @@ static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0x0fd000, 0x0fdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
- AM_RANGE(0x0fe000, 0x0fe7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0fe000, 0x0fe7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0ff000, 0x0ff001) AM_READ_PORT("IN0")
AM_RANGE(0x0ff002, 0x0ff003) AM_READ_PORT("IN1") AM_WRITE(aerofgt_bg1scrolly_w)
AM_RANGE(0x0ff004, 0x0ff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg2scrollx_w)
@@ -267,7 +267,7 @@ static ADDRESS_MAP_START( aerofgtb_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
- AM_RANGE(0x0fd000, 0x0fd7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0fd000, 0x0fd7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0fe000, 0x0fe001) AM_READ_PORT("IN0")
AM_RANGE(0x0fe002, 0x0fe003) AM_READ_PORT("IN1") AM_WRITE(aerofgt_bg1scrolly_w)
AM_RANGE(0x0fe004, 0x0fe005) AM_READ_PORT("DSW1") AM_WRITE(aerofgt_bg2scrollx_w)
@@ -280,7 +280,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( aerofgt_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x1b0000, 0x1b07ff) AM_RAM AM_BASE(m_rasterram) /* used only for the scroll registers */
AM_RANGE(0x1b0800, 0x1b0801) AM_NOP /* ??? */
AM_RANGE(0x1b0ff0, 0x1b0fff) AM_RAM /* stack area during boot */
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM //AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
- AM_RANGE(0x0fd000, 0x0fd7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0fd000, 0x0fd7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0fe000, 0x0fe001) AM_READ_PORT("IN0")
AM_RANGE(0x0fe002, 0x0fe003) AM_READ_PORT("IN1")
AM_RANGE(0x0fe004, 0x0fe005) AM_READ_PORT("DSW1")
@@ -341,7 +341,7 @@ static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE_SIZE(m_spriteram2, m_spriteram2_size)
AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */
AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
- AM_RANGE(0x0fd000, 0x0fd7ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0fd000, 0x0fd7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0fe000, 0x0fe001) AM_READ_PORT("IN0")
AM_RANGE(0x0fe002, 0x0fe003) AM_READ_PORT("IN1")
AM_RANGE(0x0fe004, 0x0fe005) AM_READ_PORT("DSW1")
@@ -368,7 +368,7 @@ static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16, aerofgt_state )
AM_RANGE(0xff8000, 0xff8fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE(m_bg1videoram)
AM_RANGE(0xffc000, 0xffc3ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram3, m_spriteram3_size)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(m_rasterram) /* bg1 scroll registers */
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(pspikes_palette_bank_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w)
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 5572285c643..a3a0cfd317b 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -274,7 +274,7 @@ WRITE8_MEMBER(airbustr_state::slave_bankswitch_w)
memory_set_bank(machine(), "bank2", data & 0x07);
- flip_screen_set(machine(), data & 0x10);
+ flip_screen_set(data & 0x10);
// used at the end of levels, after defeating the boss, to leave trails
pandora_set_clear_bitmap(m_pandora, data & 0x20);
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 9d0cd9237e2..55b5c6d34e0 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -29,7 +29,7 @@ static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8, ajax_state )
AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ajax_ls138_f10_r, ajax_ls138_f10_w) /* bankswitch + sound command + FIRQ command */
AM_RANGE(0x0800, 0x0807) AM_DEVREADWRITE_LEGACY("k051960", k051937_r, k051937_w) /* sprite control registers */
AM_RANGE(0x0c00, 0x0fff) AM_DEVREADWRITE_LEGACY("k051960", k051960_r, k051960_w) /* sprite RAM 2128SL at J7 */
- AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_SHARE("paletteram")/* palette */
+ AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_be_w) AM_SHARE("paletteram")/* palette */
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("share1") /* shared RAM with the 6809 */
AM_RANGE(0x4000, 0x5fff) AM_RAM /* RAM 6264L at K10 */
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank2") /* banked ROM */
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index 0310ced5c3b..947f5afaf83 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -145,7 +145,7 @@ WRITE8_MEMBER(albazc_state::albazc_vregs_w)
if(offset == 0)
{
/* core bug with this? */
- //flip_screen_set(machine(), (data & 0x40) >> 6);
+ //flip_screen_set((data & 0x40) >> 6);
m_flip_bit = (data & 0x40) >> 6;
}
}
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index eb6a7fa67b1..8604130082d 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -183,12 +183,13 @@ static WRITE8_DEVICE_HANDLER( mux_w )
static WRITE8_DEVICE_HANDLER( yumefuda_output_w )
{
+ albazg_state *state = device->machine().driver_data<albazg_state>();
coin_counter_w(device->machine(), 0, ~data & 4);
coin_counter_w(device->machine(), 1, ~data & 2);
coin_lockout_global_w(device->machine(), data & 1);
//data & 0x10 hopper-c (active LOW)
//data & 0x08 divider (active HIGH)
- flip_screen_set(device->machine(), ~data & 0x20);
+ state->flip_screen_set(~data & 0x20);
}
static const ay8910_interface ay8910_config =
@@ -233,8 +234,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, albazg_state )
AM_RANGE(0xa7fc, 0xa7fc) AM_WRITE(prot_lock_w)
AM_RANGE(0xa7ff, 0xa7ff) AM_WRITE_PORT("EEPROMOUT")
AM_RANGE(0xaf80, 0xafff) AM_READWRITE(custom_ram_r, custom_ram_w) AM_BASE(m_cus_ram)
- AM_RANGE(0xb000, 0xb07f) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xb080, 0xb0ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xb000, 0xb07f) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb080, 0xb0ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(yumefuda_vram_w) AM_BASE(m_videoram)
AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(yumefuda_cram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xffff) AM_RAM
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 45b6fc01ae7..e012c38fbc6 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -38,7 +38,7 @@ READ8_MEMBER(aliens_state::bankedram_r)
WRITE8_MEMBER(aliens_state::bankedram_w)
{
if (m_palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
else
m_ram[offset] = data;
}
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 1a503ee4738..653b53a31d1 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -53,7 +53,7 @@ WRITE8_MEMBER(ambush_state::ambush_coin_counter_w)
WRITE8_MEMBER(ambush_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 8de6833e196..41887625e94 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, aquarium_state )
AM_RANGE(0xc01000, 0xc01fff) AM_RAM_WRITE(aquarium_bak_videoram_w) AM_BASE(m_bak_videoram)
AM_RANGE(0xc02000, 0xc03fff) AM_RAM_WRITE(aquarium_txt_videoram_w) AM_BASE(m_txt_videoram)
AM_RANGE(0xc80000, 0xc81fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xd00000, 0xd00fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd00000, 0xd00fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd80014, 0xd8001f) AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0xd80068, 0xd80069) AM_WRITENOP /* probably not used */
AM_RANGE(0xd80080, 0xd80081) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 51aa3bd526c..e11d90f492f 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -325,7 +325,7 @@ WRITE16_MEMBER(armedf_state::terraf_io_w)
coin_counter_w(machine(), 0, (data & 1) >> 0);
coin_counter_w(machine(), 1, (data & 2) >> 1);
- flip_screen_set(machine(), m_vreg & 0x1000);
+ flip_screen_set(m_vreg & 0x1000);
}
WRITE16_MEMBER(armedf_state::terrafb_io_w)
@@ -339,7 +339,7 @@ WRITE16_MEMBER(armedf_state::terrafb_io_w)
coin_counter_w(machine(), 0, (data & 1) >> 0);
coin_counter_w(machine(), 1, (data & 2) >> 1);
- flip_screen_set(machine(), m_vreg & 0x1000);
+ flip_screen_set(m_vreg & 0x1000);
}
WRITE16_MEMBER(armedf_state::bootleg_io_w)
@@ -355,7 +355,7 @@ WRITE16_MEMBER(armedf_state::bootleg_io_w)
coin_counter_w(machine(), 0, (data & 1) >> 0);
coin_counter_w(machine(), 1, (data & 2) >> 1);
- flip_screen_set(machine(), m_vreg & 0x1000);
+ flip_screen_set(m_vreg & 0x1000);
}
WRITE16_MEMBER(armedf_state::sound_command_w)
@@ -392,7 +392,7 @@ static ADDRESS_MAP_START( terraf_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x0603ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x060400, 0x063fff) AM_RAM
- AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
@@ -423,7 +423,7 @@ static ADDRESS_MAP_START( cclimbr2_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x061000, 0x063fff) AM_RAM
- AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
@@ -445,7 +445,7 @@ static ADDRESS_MAP_START( legion_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x061000, 0x063fff) AM_RAM
- AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
@@ -478,7 +478,7 @@ static ADDRESS_MAP_START( legiono_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x061000, 0x063fff) AM_RAM
- AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x064000, 0x064fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(nb1414m4_text_videoram_r,nb1414m4_text_videoram_w,0x00ff)
AM_RANGE(0x06a000, 0x06a9ff) AM_RAM
AM_RANGE(0x06c000, 0x06cfff) AM_RAM AM_BASE(m_spr_pal_clut)
@@ -503,7 +503,7 @@ static ADDRESS_MAP_START( armedf_map, AS_PROGRAM, 16, armedf_state )
AM_RANGE(0x066000, 0x066fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x067000, 0x067fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0x068000, 0x069fff) AM_READWRITE8(armedf_text_videoram_r,armedf_text_videoram_w,0x00ff)
- AM_RANGE(0x06a000, 0x06afff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x06a000, 0x06afff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x06b000, 0x06bfff) AM_RAM AM_BASE(m_spr_pal_clut)
AM_RANGE(0x06c000, 0x06c001) AM_READ_PORT("P1")
AM_RANGE(0x06c002, 0x06c003) AM_READ_PORT("P2")
@@ -678,7 +678,7 @@ static ADDRESS_MAP_START( bigfghtr_map, AS_PROGRAM, 16, bigfghtr_state )
AM_RANGE(0x086000, 0x086fff) AM_RAM_WRITE(armedf_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x087000, 0x087fff) AM_RAM_WRITE(armedf_fg_videoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0x088000, 0x089fff) AM_READWRITE8(armedf_text_videoram_r,armedf_text_videoram_w,0x00ff)
- AM_RANGE(0x08a000, 0x08afff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x08a000, 0x08afff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_BASE(m_spr_pal_clut)
AM_RANGE(0x08c000, 0x08c001) AM_READ_PORT("P1")
AM_RANGE(0x08c002, 0x08c003) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 2584bf3fcde..3ed83639b2b 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -104,7 +104,7 @@ static ADDRESS_MAP_START( ashnojoe_map, AS_PROGRAM, 16, ashnojoe_state )
AM_RANGE(0x046000, 0x046fff) AM_RAM_WRITE(ashnojoe_tileram6_w) AM_BASE(m_tileram_6)
AM_RANGE(0x047000, 0x047fff) AM_RAM_WRITE(ashnojoe_tileram7_w) AM_BASE(m_tileram_7)
AM_RANGE(0x048000, 0x048fff) AM_RAM_WRITE(ashnojoe_tileram_w) AM_BASE(m_tileram)
- AM_RANGE(0x049000, 0x049fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x049000, 0x049fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x04a000, 0x04a001) AM_READ_PORT("P1")
AM_RANGE(0x04a002, 0x04a003) AM_READ_PORT("P2")
AM_RANGE(0x04a004, 0x04a005) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 0fb0aab6ced..7574e83558e 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -174,7 +174,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, asterix_state )
AM_RANGE(0x180000, 0x1807ff) AM_DEVREADWRITE_LEGACY("k053244", k053245_word_r, k053245_word_w)
AM_RANGE(0x180800, 0x180fff) AM_RAM // extra RAM, or mirror for the above?
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE_LEGACY("k053244", k053244_word_r, k053244_word_w)
- AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30001f) AM_DEVREADWRITE_LEGACY("k053244", k053244_lsb_r, k053244_lsb_w)
AM_RANGE(0x380000, 0x380001) AM_READ_PORT("IN0")
AM_RANGE(0x380002, 0x380003) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 7679dd64be3..2792f9b3c8c 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -484,7 +484,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, atarisy1_state )
AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE_LEGACY(atarigen_playfield_w) AM_BASE(m_playfield)
AM_RANGE(0xa02000, 0xa02fff) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarisy1_spriteram_w)
AM_RANGE(0xa03000, 0xa03fff) AM_RAM_WRITE_LEGACY(atarigen_alpha_w) AM_BASE(m_alpha)
- AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram_IIIIRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xf00000, 0xf00fff) AM_READWRITE_LEGACY(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0xf20000, 0xf20007) AM_READ_LEGACY(trakball_r)
AM_RANGE(0xf40000, 0xf4001f) AM_READWRITE_LEGACY(joystick_r, joystick_w)
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index fe40c2c68e2..41485e50102 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -201,7 +201,7 @@ WRITE8_MEMBER(atetris_state::nvram_enable_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, atetris_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE(paletteram_RRRGGGBB_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x2400, 0x25ff) AM_MIRROR(0x0200) AM_RAM_WRITE(nvram_w) AM_SHARE("nvram")
AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x03e0) AM_DEVREADWRITE_LEGACY("pokey1", pokey_r, pokey_w)
AM_RANGE(0x2810, 0x281f) AM_MIRROR(0x03e0) AM_DEVREADWRITE_LEGACY("pokey2", pokey_r, pokey_w)
@@ -218,7 +218,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( atetrisb2_map, AS_PROGRAM, 8, atetris_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x2400, 0x25ff) AM_RAM_WRITE(nvram_w) AM_SHARE("nvram")
AM_RANGE(0x2802, 0x2802) AM_DEVWRITE_LEGACY("sn1", sn76496_w)
AM_RANGE(0x2804, 0x2804) AM_DEVWRITE_LEGACY("sn2", sn76496_w)
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 48c65b23d51..f6e5dfe8579 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -106,7 +106,7 @@ static SCREEN_UPDATE_IND16( backfire_left )
backfire_state *state = screen.machine().driver_data<backfire_state>();
//FIXME: flip_screen_x should not be written!
- flip_screen_set_no_update(screen.machine(), 1);
+ state->flip_screen_set_no_update(1);
/* screen 1 uses pf1 as the forground and pf3 as the background */
/* screen 2 uses pf2 as the foreground and pf4 as the background */
@@ -139,7 +139,7 @@ static SCREEN_UPDATE_IND16( backfire_right )
backfire_state *state = screen.machine().driver_data<backfire_state>();
//FIXME: flip_screen_x should not be written!
- flip_screen_set_no_update(screen.machine(), 1);
+ state->flip_screen_set_no_update(1);
/* screen 1 uses pf1 as the forground and pf3 as the background */
/* screen 2 uses pf2 as the foreground and pf4 as the background */
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index b1d5e6dd6be..95b661b6783 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -35,7 +35,7 @@ WRITE8_MEMBER(battlane_state::battlane_cpu_command_w)
0x01 = Y Scroll MSB
*/
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
/*
I think that the NMI is an inhibitor. It is constantly set
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 625fea61415..cc2d32ffbd7 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -60,7 +60,7 @@ static ADDRESS_MAP_START( battlnts_map, AS_PROGRAM, 8, battlnts_state )
AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE_LEGACY("k007342", k007342_r, k007342_w) /* Color RAM + Video RAM */
AM_RANGE(0x2000, 0x21ff) AM_DEVREADWRITE_LEGACY("k007420", k007420_r, k007420_w) /* Sprite RAM */
AM_RANGE(0x2200, 0x23ff) AM_DEVREADWRITE_LEGACY("k007342", k007342_scroll_r, k007342_scroll_w) /* Scroll RAM */
- AM_RANGE(0x2400, 0x24ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_SHARE("paletteram")/* palette */
+ AM_RANGE(0x2400, 0x24ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_be_w) AM_SHARE("paletteram")/* palette */
AM_RANGE(0x2600, 0x2607) AM_DEVWRITE_LEGACY("k007342", k007342_vreg_w) /* Video Registers */
AM_RANGE(0x2e00, 0x2e00) AM_READ_PORT("DSW1")
AM_RANGE(0x2e01, 0x2e01) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 6a1d144f528..caae010b49a 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -335,7 +335,7 @@ static ADDRESS_MAP_START( bbusters_map, AS_PROGRAM, 16, bbusters_state )
AM_RANGE(0x0b4000, 0x0b5fff) AM_RAM /* service mode */
AM_RANGE(0x0b8000, 0x0b8003) AM_WRITEONLY AM_BASE(m_pf1_scroll_data)
AM_RANGE(0x0b8008, 0x0b800b) AM_WRITEONLY AM_BASE(m_pf2_scroll_data)
- AM_RANGE(0x0d0000, 0x0d0fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0d0000, 0x0d0fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("COINS") /* Coins */
AM_RANGE(0x0e0002, 0x0e0003) AM_READ_PORT("IN0") /* Player 1 & 2 */
AM_RANGE(0x0e0004, 0x0e0005) AM_READ_PORT("IN1") /* Player 3 */
@@ -362,7 +362,7 @@ static ADDRESS_MAP_START( mechatt_map, AS_PROGRAM, 16, bbusters_state )
AM_RANGE(0x0b8000, 0x0b8003) AM_WRITEONLY AM_BASE(m_pf1_scroll_data)
AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM_WRITE(bbusters_pf2_w) AM_BASE(m_pf2_data)
AM_RANGE(0x0c8000, 0x0c8003) AM_WRITEONLY AM_BASE(m_pf2_scroll_data)
- AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("IN0")
AM_RANGE(0x0e0002, 0x0e0003) AM_READ_PORT("DSW1")
AM_RANGE(0x0e0004, 0x0e0007) AM_READ(mechatt_gun_r)
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index d7864c9271a..70c613aaa16 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -234,7 +234,7 @@ static ADDRESS_MAP_START( bestleag_map, AS_PROGRAM, 16, bestleag_state )
AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE(bestleag_fgram_w) AM_BASE(m_fgram)
AM_RANGE(0x0f0000, 0x0f3fff) AM_RAM_WRITE(bestleag_txram_w) AM_BASE(m_txram)
AM_RANGE(0x0f8000, 0x0f800b) AM_RAM AM_BASE(m_vregs)
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x300010, 0x300011) AM_READ_PORT("SYSTEM")
AM_RANGE(0x300012, 0x300013) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 6a94a49f8a6..52d0c464939 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START( bigstrkb_map, AS_PROGRAM, 16, bigstrkb_state )
AM_RANGE(0x0ec000, 0x0effff) AM_RAM_WRITE(bsb_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0x0f0000, 0x0f7fff) AM_RAM
- AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0f8800, 0x0fffff) AM_RAM
AM_RANGE(0x1f0000, 0x1f7fff) AM_RAM
diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c
index 50a77aaf9ec..7c9ad87cd3b 100644
--- a/src/mame/drivers/bingor.c
+++ b/src/mame/drivers/bingor.c
@@ -511,7 +511,7 @@ READ16_MEMBER(bingor_state::test_r)
static ADDRESS_MAP_START( bingor_map, AS_PROGRAM, 16, bingor_state )
AM_RANGE(0x00000, 0x0ffff) AM_RAM
AM_RANGE(0x90000, 0x9ffff) AM_ROM AM_REGION("gfx", 0)
- AM_RANGE(0xa0300, 0xa031f) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBIIII_word_w) AM_SHARE("paletteram") //wrong
+ AM_RANGE(0xa0300, 0xa031f) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBIIII_word_w) AM_SHARE("paletteram") //wrong
AM_RANGE(0xa0000, 0xaffff) AM_RAM AM_BASE(m_blit_ram)
AM_RANGE(0xe0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 50fe923fa5b..b05e5f851de 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -156,7 +156,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, bishi_state )
AM_RANGE(0x870000, 0x8700ff) AM_DEVWRITE_LEGACY("k055555", k055555_word_w) // PCU2
AM_RANGE(0x880000, 0x880003) AM_DEVREADWRITE8_LEGACY("ymz", ymz280b_r, ymz280b_w, 0xff00)
AM_RANGE(0xa00000, 0xa01fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) // Graphic planes
- AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(paletteram16_xbgr_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb03fff) AM_RAM_WRITE(paletteram_xbgr_word_be_w) AM_SHARE("paletteram")
AM_RANGE(0xb04000, 0xb047ff) AM_READ(bishi_mirror_r) // bug in the ram/rom test?
AM_RANGE(0xc00000, 0xc01fff) AM_READ(bishi_K056832_rom_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index acc778b1889..d69b5a39681 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -187,7 +187,7 @@ static ADDRESS_MAP_START( blackt96_map, AS_PROGRAM, 16, blackt96_state )
AM_RANGE(0x100000, 0x100fff) AM_RAM AM_BASE(m_tilemapram) // text tilemap
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE(m_tilemapram2)// sprite list + sprite tilemaps
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc03fff) AM_RAM // main ram
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 22c795a2c4a..35cd47390a7 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -72,8 +72,8 @@ static ADDRESS_MAP_START( blktiger_map, AS_PROGRAM, 8, blktiger_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READWRITE(blktiger_bgvideoram_r, blktiger_bgvideoram_w)
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(blktiger_txvideoram_w) AM_BASE(m_txvideoram)
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xe000, 0xfdff) AM_RAM
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index 49a6b92904e..470e96b4f9d 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -51,7 +51,7 @@ WRITE8_MEMBER(blockhl_state::bankedram_w)
{
if (m_palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
else
m_ram[offset] = data;
}
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index c2c0d368ac9..bd09eb47c22 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -125,7 +125,7 @@ static ADDRESS_MAP_START( bloodbro_map, AS_PROGRAM, 16, bloodbro_state )
AM_RANGE(0x08d400, 0x08d7ff) AM_RAM
AM_RANGE(0x08d800, 0x08dfff) AM_RAM_WRITE(bloodbro_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0x08e000, 0x08e7ff) AM_RAM
- AM_RANGE(0x08e800, 0x08f7ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x08e800, 0x08f7ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08f800, 0x08ffff) AM_RAM
AM_RANGE(0x0a0000, 0x0a000d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0x0c0000, 0x0c007f) AM_RAM AM_BASE(m_scroll)
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( weststry_map, AS_PROGRAM, 16, bloodbro_state )
AM_RANGE(0x0c1002, 0x0c1003) AM_READ_PORT("IN0")
AM_RANGE(0x0c1004, 0x0c1005) AM_READ_PORT("IN1")
AM_RANGE(0x0c1000, 0x0c17ff) AM_RAM
- AM_RANGE(0x128000, 0x1287ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x128000, 0x1287ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x120000, 0x128fff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index 88a1639b508..90a412a626b 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, blstroid_state )
AM_RANGE(0xff9800, 0xff9801) AM_MIRROR(0x7f83f8) AM_READ_PORT("DIAL0")
AM_RANGE(0xff9804, 0xff9805) AM_MIRROR(0x7f83f8) AM_READ_PORT("DIAL1")
AM_RANGE(0xff9c00, 0xff9c03) AM_MIRROR(0x7f83fc) AM_READ_LEGACY(inputs_r)
- AM_RANGE(0xffa000, 0xffa3ff) AM_MIRROR(0x7f8c00) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffa000, 0xffa3ff) AM_MIRROR(0x7f8c00) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffb000, 0xffb3ff) AM_MIRROR(0x7f8c00) AM_READWRITE_LEGACY(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0xffc000, 0xffcfff) AM_MIRROR(0x7f8000) AM_RAM_WRITE_LEGACY(atarigen_playfield_w) AM_BASE(m_playfield)
AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w)
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 788056c8b63..a6b34f6301a 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -30,7 +30,7 @@ WRITE8_MEMBER(bogeyman_state::bogeyman_8910_control_w)
{
// bit 0 is flipscreen
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
// bit 5 goes to 8910 #0 BDIR pin
if ((m_last_write & 0x20) == 0x20 && (data & 0x20) == 0x00)
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index f66bd5815d5..4c3eb472159 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -142,7 +142,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, bombjack_state )
AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(bombjack_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0x9820, 0x987f) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9a00, 0x9a00) AM_WRITENOP
- AM_RANGE(0x9c00, 0x9cff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0x9c00, 0x9cff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0x9e00, 0x9e00) AM_WRITE(bombjack_background_w)
AM_RANGE(0xb000, 0xb000) AM_READ_PORT("P1")
AM_RANGE(0xb000, 0xb000) AM_WRITE(irq_mask_w)
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index b883a791fbf..c923fbb7506 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -93,7 +93,7 @@ WRITE8_MEMBER(bottom9_state::bottom9_bankedram2_w)
if (m_k052109_selected)
k052109_051960_w(space, offset + 0x2000, data);
else
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
}
WRITE8_MEMBER(bottom9_state::bankswitch_w)
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 84b7e9a0cbf..d1f305c7975 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -290,7 +290,7 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE(m_objectram, m_objectram_size)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xfa00, 0xfa00) AM_READWRITE(bublbobl_sound_status_r, bublbobl_sound_command_w)
AM_RANGE(0xfa03, 0xfa03) AM_WRITE(bublbobl_soundcpu_reset_w)
AM_RANGE(0xfa80, 0xfa80) AM_WRITE(watchdog_reset_w)
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( bootleg_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE(m_objectram, m_objectram_size)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xfa00, 0xfa00) AM_READWRITE(bublbobl_sound_status_r, bublbobl_sound_command_w)
AM_RANGE(0xfa03, 0xfa03) AM_WRITE(bublbobl_soundcpu_reset_w)
AM_RANGE(0xfa80, 0xfa80) AM_WRITENOP // ???
@@ -370,7 +370,7 @@ static ADDRESS_MAP_START( tokio_map, AS_PROGRAM, 8, bublbobl_state )
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE(m_objectram, m_objectram_size)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xfa00, 0xfa00) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xfa03, 0xfa03) AM_READ_PORT("DSW0")
AM_RANGE(0xfa04, 0xfa04) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 6beebc40f18..854f88a1612 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( buggychl_map, AS_PROGRAM, 8, buggychl_state )
// AM_RANGE(0xd60b, 0xd60b) // other inputs, not used?
AM_RANGE(0xd610, 0xd610) AM_WRITE(sound_command_w)
AM_RANGE(0xd618, 0xd618) AM_WRITENOP /* accelerator clear */
- AM_RANGE(0xd700, 0xd7ff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd700, 0xd7ff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xd840, 0xd85f) AM_WRITEONLY AM_BASE(m_scrollv)
AM_RANGE(0xdb00, 0xdbff) AM_WRITEONLY AM_BASE(m_scrollh)
AM_RANGE(0xdc04, 0xdc04) AM_WRITEONLY /* should be fg scroll */
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 292fee1a3f3..f1be64d0380 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, cabal_state )
AM_RANGE(0xc0000, 0xc0001) AM_WRITE(track_reset_w)
AM_RANGE(0xc0040, 0xc0041) AM_WRITENOP /* ??? */
AM_RANGE(0xc0080, 0xc0081) AM_WRITE(cabal_flipscreen_w)
- AM_RANGE(0xe0000, 0xe07ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe0000, 0xe07ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xe8008, 0xe8009) AM_WRITE(cabal_sound_irq_trigger_word_w) // fix coin insertion
AM_RANGE(0xe8000, 0xe800d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
ADDRESS_MAP_END
@@ -148,7 +148,7 @@ static ADDRESS_MAP_START( cabalbl_main_map, AS_PROGRAM, 16, cabal_state )
AM_RANGE(0xa0010, 0xa0011) AM_READ_PORT("INPUTS")
AM_RANGE(0xc0040, 0xc0041) AM_WRITENOP /* ??? */
AM_RANGE(0xc0080, 0xc0081) AM_WRITE(cabal_flipscreen_w)
- AM_RANGE(0xe0000, 0xe07ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe0000, 0xe07ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xe8000, 0xe8003) AM_WRITE(cabalbl_sndcmd_w)
AM_RANGE(0xe8004, 0xe8005) AM_READ(soundlatch2_word_r)
AM_RANGE(0xe8008, 0xe8009) AM_WRITE(cabalbl_sound_irq_trigger_word_w)
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index 3b95a0e1a70..bdd10bf3e55 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -177,8 +177,8 @@ static ADDRESS_MAP_START( cabaret_portmap, AS_IO, 8, cabaret_state )
AM_RANGE( 0x2000, 0x27ff ) AM_RAM_WRITE(fg_tile_w ) AM_BASE(m_fg_tile_ram )
AM_RANGE( 0x2800, 0x2fff ) AM_RAM_WRITE(fg_color_w ) AM_BASE(m_fg_color_ram )
- AM_RANGE( 0x3000, 0x37ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE( 0x3800, 0x3fff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE( 0x3000, 0x37ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x3800, 0x3fff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE( 0x1000, 0x103f ) AM_RAM_WRITE(bg_scroll_w ) AM_BASE(m_bg_scroll )
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 1f9c46835c8..108533cf054 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -171,7 +171,7 @@ static SCREEN_UPDATE_IND16( calorie )
ypos = 0xff - state->m_sprites[x + 2];
xpos = state->m_sprites[x + 3];
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
if (state->m_sprites[x + 1] & 0x10)
ypos = 0xff - ypos + 32;
@@ -219,7 +219,7 @@ WRITE8_MEMBER(calorie_state::bg_bank_w)
WRITE8_MEMBER(calorie_state::calorie_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
READ8_MEMBER(calorie_state::calorie_soundlatch_r)
@@ -246,7 +246,7 @@ static ADDRESS_MAP_START( calorie_map, AS_PROGRAM, 8, calorie_state )
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(fg_ram_w) AM_BASE(m_fg_ram)
AM_RANGE(0xd800, 0xdbff) AM_RAM AM_BASE(m_sprites)
- AM_RANGE(0xdc00, 0xdcff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xdc00, 0xdcff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xde00, 0xde00) AM_WRITE(bg_bank_w)
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("P1")
AM_RANGE(0xf001, 0xf001) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c
index 4a452894d65..94d880e6db2 100644
--- a/src/mame/drivers/caswin.c
+++ b/src/mame/drivers/caswin.c
@@ -115,7 +115,7 @@ WRITE8_MEMBER(caswin_state::vvillage_scroll_w)
/*---- ---x flip screen */
WRITE8_MEMBER(caswin_state::vvillage_vregs_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
/**********************
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index a83cb2f112f..aa7b6e74d5b 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -69,7 +69,7 @@ WRITE8_MEMBER(cbasebal_state::bankedram_w)
break;
case 1:
if (offset < 0x800)
- paletteram_xxxxBBBBRRRRGGGG_le_w(space, offset, data);
+ paletteram_xxxxBBBBRRRRGGGG_byte_le_w(space, offset, data);
break;
default:
cbasebal_scrollram_w(space, offset, data);
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index acef87fc3bd..001f651caea 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -349,7 +349,7 @@ static WRITE8_DEVICE_HANDLER( chanbara_ay_out_1_w )
state->m_scrollhi = data & 0x01;
- flip_screen_set(device->machine(), data & 0x02);
+ state->flip_screen_set(data & 0x02);
memory_set_bank(device->machine(), "bank1", (data & 0x04) >> 2);
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 2a7a1900609..0f3add8fa9f 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -175,7 +175,7 @@ static WRITE8_HANDLER( chinagat_video_ctrl_w )
state->m_scrolly_hi = ((data & 0x02) >> 1);
state->m_scrollx_hi = data & 0x01;
- flip_screen_set(space->machine(), ~data & 0x04);
+ state->flip_screen_set(~data & 0x04);
}
static WRITE8_HANDLER( chinagat_bankswitch_w )
@@ -309,8 +309,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, ddragon_state )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0x3000, 0x317f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x3400, 0x357f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x3000, 0x317f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3400, 0x357f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x3800, 0x397f) AM_WRITE_BANK("bank3") AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x3e00, 0x3e04) AM_WRITE_LEGACY(chinagat_interrupt_w)
AM_RANGE(0x3e06, 0x3e06) AM_WRITEONLY AM_BASE(m_scrolly_lo)
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 920714d2e8a..88109373d65 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -50,7 +50,7 @@ WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w)
if (data & 0x20)
{
space.install_read_bank(0x1800, 0x1fff, "bank5");
- space.install_write_handler(0x1800, 0x1fff, write8_delegate(FUNC(driver_device::paletteram_xBBBBBGGGGGRRRRR_be_w),this));
+ space.install_write_handler(0x1800, 0x1fff, write8_delegate(FUNC(driver_device::paletteram_xBBBBBGGGGGRRRRR_byte_be_w),this));
memory_set_bankptr(machine(), "bank5", m_generic_paletteram_8);
if (m_k051316_readroms)
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 0d8a8773a29..158fbe991e0 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -16,7 +16,7 @@ Dip locations added from dip listing at crazykong.com
READ8_MEMBER(citycon_state::citycon_in_r)
{
- return input_port_read(machine(), flip_screen_get(machine()) ? "P2" : "P1");
+ return input_port_read(machine(), flip_screen() ? "P2" : "P1");
}
READ8_MEMBER(citycon_state::citycon_irq_ack_r)
@@ -37,7 +37,7 @@ static ADDRESS_MAP_START( citycon_map, AS_PROGRAM, 8, citycon_state )
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW2") AM_WRITE(soundlatch2_w)
AM_RANGE(0x3004, 0x3005) AM_READNOP AM_WRITEONLY AM_BASE(m_scroll)
AM_RANGE(0x3007, 0x3007) AM_READ(citycon_irq_ack_r)
- AM_RANGE(0x3800, 0x3cff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3800, 0x3cff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 75a3ea47bf5..ee248f1a8c5 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -24,7 +24,8 @@ XTAL : 18.432 MHz
static MACHINE_RESET( clshroad )
{
- flip_screen_set(machine, 0);
+ clshroad_state *state = machine.driver_data<clshroad_state>();
+ state->flip_screen_set(0);
}
diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c
index 7529a59938a..56852044807 100644
--- a/src/mame/drivers/cmmb.c
+++ b/src/mame/drivers/cmmb.c
@@ -116,7 +116,7 @@ WRITE8_MEMBER(cmmb_state::cmmb_charram_w)
WRITE8_MEMBER(cmmb_state::cmmb_paletteram_w)
{
/* RGB output is inverted */
- paletteram_RRRGGGBB_w(space,offset,~data);
+ paletteram_RRRGGGBB_byte_w(space,offset,~data);
}
READ8_MEMBER(cmmb_state::cmmb_input_r)
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index 618b39b99a8..e7e9e7e2fbd 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -395,7 +395,7 @@ WRITE8_MEMBER(cntsteer_state::zerotrgt_vregs_w)
m_bg_tilemap->mark_all_dirty();
break;
case 3: m_rotation_sign = (data & 1);
- flip_screen_set(machine(), !(data & 4));
+ flip_screen_set(!(data & 4));
m_scrolly_hi = (data & 0x30) << 4;
m_scrollx_hi = (data & 0xc0) << 2;
break;
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 75d601594d6..ed7d88caa93 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -347,7 +347,7 @@ READ8_MEMBER(cosmic_state::nomnlnd_port_0_1_r)
WRITE8_MEMBER(cosmic_state::flip_screen_w)
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 434763a97c8..cf443d38280 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -53,7 +53,7 @@ static void pc3092_reset(void)
static void pc3092_update(running_machine &machine)
{
crbaloon_state *state = machine.driver_data<crbaloon_state>();
- flip_screen_set(machine, (state->m_pc3092_data[1] & 0x01) ? TRUE : FALSE);
+ state->flip_screen_set((state->m_pc3092_data[1] & 0x01) ? TRUE : FALSE);
}
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index f7aaadb6ab8..bed01bd7d1c 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -407,7 +407,7 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking )
if (lines & 0x20)
{
device->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x03ff, "bank3");
- device->memory().space(AS_PROGRAM)->install_write_handler(0x0000, 0x03ff, write8_delegate(FUNC(crimfght_state::paletteram_xBBBBBGGGGGRRRRR_be_w), state));
+ device->memory().space(AS_PROGRAM)->install_write_handler(0x0000, 0x03ff, write8_delegate(FUNC(crimfght_state::paletteram_xBBBBBGGGGGRRRRR_byte_be_w), state));
memory_set_bankptr(device->machine(), "bank3", state->m_generic_paletteram_8);
}
else
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 1ccc0f989b3..252115643d8 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -58,7 +58,7 @@ static ADDRESS_MAP_START( crospang_map, AS_PROGRAM, 16, crospang_state )
AM_RANGE(0x10000e, 0x10000f) AM_WRITENOP
AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(crospang_fg_videoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE(crospang_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x210000, 0x2107ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w)
AM_RANGE(0x280000, 0x280001) AM_READ_PORT("P1_P2")
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( bestri_map, AS_PROGRAM, 16, crospang_state )
AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(crospang_fg_videoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0x122000, 0x1227ff) AM_RAM_WRITE(crospang_bg_videoram_w) AM_BASE(m_bg_videoram)
- AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x210000, 0x2107ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w)
AM_RANGE(0x270004, 0x270005) AM_WRITENOP
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 080f4cd2de6..0bbf3605f6f 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -193,7 +193,7 @@ static ADDRESS_MAP_START( crshrace_map, AS_PROGRAM, 16, crshrace_state )
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM
AM_RANGE(0xffc000, 0xffc001) AM_WRITE(crshrace_roz_bank_w)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(crshrace_videoram2_w) AM_BASE(m_videoram2)
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1") AM_WRITE(crshrace_gfxctrl_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("P2")
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW0")
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index c4266cfdeeb..305d53e0a04 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -667,7 +667,7 @@ static ADDRESS_MAP_START( master_mem, AS_PROGRAM, 16, cybertnk_state )
AM_RANGE(0x0c4000, 0x0c5fff) AM_RAM AM_BASE(m_bg_vram)
AM_RANGE(0x0c8000, 0x0c9fff) AM_RAM AM_BASE(m_fg_vram)
AM_RANGE(0x0e0000, 0x0e0fff) AM_RAM AM_SHARE("sharedram")
- AM_RANGE(0x100000, 0x107fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x107fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x110000, 0x1101ff) AM_READWRITE(io_r,io_w) AM_BASE(m_io_ram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c
index 825a238ed10..59eb96dd3c8 100644
--- a/src/mame/drivers/cyclemb.c
+++ b/src/mame/drivers/cyclemb.c
@@ -130,7 +130,7 @@ static SCREEN_UPDATE_IND16( cyclemb )
cyclemb_state *state = screen.machine().driver_data<cyclemb_state>();
int x,y,count;
const gfx_element *gfx = screen.machine().gfx[0];
- UINT8 flip_screen = flip_screen_get(screen.machine());
+ UINT8 flip_screen = state->flip_screen();
count = 0;
@@ -248,7 +248,7 @@ WRITE8_MEMBER(cyclemb_state::sound_cmd_w)//actually ciom
WRITE8_MEMBER(cyclemb_state::cyclemb_flip_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
// a bunch of other things are setted here
}
diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c
index 4c5adfb67ff..56c13f6fe80 100644
--- a/src/mame/drivers/d9final.c
+++ b/src/mame/drivers/d9final.c
@@ -109,8 +109,8 @@ static ADDRESS_MAP_START( d9final_map, AS_PROGRAM, 8, d9final_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
- AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(sc0_lovram) AM_BASE(m_lo_vram)
AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(sc0_hivram) AM_BASE(m_hi_vram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(sc0_cram) AM_BASE(m_cram)
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 119c5c8ae06..f5074ac55ed 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -131,7 +131,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sx = (state->m_spriteram[offs + 3] - 128) + 256 * (attr & 0x01);
sy = 255 - state->m_spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -151,7 +151,7 @@ static SCREEN_UPDATE_IND16(dacholer)
{
dacholer_state *state = screen.machine().driver_data<dacholer_state>();
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
state->m_bg_tilemap->set_scrollx(0, 256 - state->m_scroll_x);
state->m_bg_tilemap->set_scrolly(0, 256 - state->m_scroll_y);
@@ -188,7 +188,7 @@ WRITE8_MEMBER(dacholer_state::bg_bank_w)
m_bg_tilemap->mark_all_dirty();
}
- flip_screen_set(machine(), data & 0xc); // probably one bit for flipx and one for flipy
+ flip_screen_set(data & 0xc); // probably one bit for flipx and one for flipy
}
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index b3ef655686e..01b4d3677ae 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -249,7 +249,7 @@ static ADDRESS_MAP_START( darius_map, AS_PROGRAM, 16, darius_state )
AM_RANGE(0xd20000, 0xd20003) AM_DEVWRITE_LEGACY("pc080sn", pc080sn_yscroll_word_w)
AM_RANGE(0xd40000, 0xd40003) AM_DEVWRITE_LEGACY("pc080sn", pc080sn_xscroll_word_w)
AM_RANGE(0xd50000, 0xd50003) AM_DEVWRITE_LEGACY("pc080sn", pc080sn_ctrl_word_w)
- AM_RANGE(0xd80000, 0xd80fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")/* palette */
+ AM_RANGE(0xd80000, 0xd80fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")/* palette */
AM_RANGE(0xe00100, 0xe00fff) AM_RAM AM_SHARE("share1") AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xe01000, 0xe02fff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xe08000, 0xe0ffff) AM_RAM_WRITE(darius_fg_layer_w) AM_SHARE("share3") AM_BASE(m_fg_ram)
@@ -260,7 +260,7 @@ static ADDRESS_MAP_START( darius_cpub_map, AS_PROGRAM, 16, darius_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_RAM /* local RAM */
AM_RANGE(0xc00000, 0xc0007f) AM_WRITE(darius_ioc_w) /* only writes $c00050 (?) */
- AM_RANGE(0xd80000, 0xd80fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w)
+ AM_RANGE(0xd80000, 0xd80fff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w)
AM_RANGE(0xe00100, 0xe00fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe01000, 0xe02fff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xe08000, 0xe0ffff) AM_RAM_WRITE(darius_fg_layer_w) AM_SHARE("share3")
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 3b81dacbc22..1e781647f04 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -275,8 +275,8 @@ static WRITE32_DEVICE_HANDLER( darkhors_eeprom_w )
WRITE32_MEMBER(darkhors_state::paletteram32_xBBBBBGGGGGRRRRR_dword_w)
{
- if (ACCESSING_BITS_16_31) paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset*2, data >> 16, mem_mask >> 16);
- if (ACCESSING_BITS_0_15) paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset*2+1, data, mem_mask);
+ if (ACCESSING_BITS_16_31) paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset*2, data >> 16, mem_mask >> 16);
+ if (ACCESSING_BITS_0_15) paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset*2+1, data, mem_mask);
}
WRITE32_MEMBER(darkhors_state::darkhors_input_sel_w)
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 84a16eb5f31..c201d1b572e 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -101,7 +101,7 @@ static SCREEN_UPDATE_IND16(dblewing)
dblewing_state *state = screen.machine().driver_data<dblewing_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
bitmap.fill(0, cliprect); /* not Confirmed */
@@ -329,7 +329,7 @@ static ADDRESS_MAP_START( dblewing_map, AS_PROGRAM, 16, dblewing_state )
AM_RANGE(0x288000, 0x288001) AM_RAM
AM_RANGE(0x28c000, 0x28c00f) AM_RAM_DEVWRITE_LEGACY("tilegen1", deco16ic_pf_control_w)
AM_RANGE(0x300000, 0x3007ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x320000, 0x3207ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x320000, 0x3207ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xff0000, 0xff3fff) AM_MIRROR(0xc000) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 320ea8df8cc..c63bfd3f764 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -120,7 +120,7 @@ static ADDRESS_MAP_START( dbz_map, AS_PROGRAM, 16, dbz_state )
AM_RANGE(0x498000, 0x49ffff) AM_DEVREAD_LEGACY("k056832", k056832_rom_word_8000_r) // code near a60 in dbz2, subroutine at 730 in dbz
AM_RANGE(0x4a0000, 0x4a0fff) AM_DEVREADWRITE_LEGACY("k053246", k053247_word_r, k053247_word_w)
AM_RANGE(0x4a1000, 0x4a3fff) AM_RAM
- AM_RANGE(0x4a8000, 0x4abfff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // palette
+ AM_RANGE(0x4a8000, 0x4abfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // palette
AM_RANGE(0x4c0000, 0x4c0001) AM_DEVREAD_LEGACY("k053246", k053246_word_r)
AM_RANGE(0x4c0000, 0x4c0007) AM_DEVWRITE_LEGACY("k053246", k053246_word_w)
AM_RANGE(0x4c4000, 0x4c4007) AM_DEVWRITE_LEGACY("k053246", k053246_word_w)
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index 5107004b275..61f6acc969e 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -28,7 +28,7 @@ static ADDRESS_MAP_START( dcon_map, AS_PROGRAM, 16, dcon_state )
AM_RANGE(0x8c800, 0x8cfff) AM_RAM_WRITE(dcon_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x8d000, 0x8d7ff) AM_RAM_WRITE(dcon_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x8d800, 0x8e7ff) AM_RAM_WRITE(dcon_text_w) AM_BASE(m_textram)
- AM_RANGE(0x8e800, 0x8f7ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x8e800, 0x8f7ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x8f800, 0x8ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x9d000, 0x9d7ff) AM_WRITE(dcon_gfxbank_w)
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index 578813fb608..5c1376bc656 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -460,7 +460,7 @@ static ADDRESS_MAP_START( ddealer, AS_PROGRAM, 16, ddealer_state )
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("UNK")
AM_RANGE(0x084000, 0x084003) AM_DEVWRITE8_LEGACY("ymsnd", ym2203_w, 0x00ff) // ym ?
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") // palette ram
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") // palette ram
AM_RANGE(0x08c000, 0x08cfff) AM_RAM_WRITE(ddealer_vregs_w) AM_BASE(m_vregs) // palette ram
/* this might actually be 1 tilemap with some funky rowscroll / columnscroll enabled, I'm not sure */
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index a5c71699c19..e46d7e547c5 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -195,7 +195,7 @@ static WRITE8_HANDLER( ddragon_bankswitch_w )
ddragon_state *state = space->machine().driver_data<ddragon_state>();
state->m_scrollx_hi = (data & 0x01);
state->m_scrolly_hi = ((data & 0x02) >> 1);
- flip_screen_set(space->machine(), ~data & 0x04);
+ state->flip_screen_set(~data & 0x04);
/* bit 3 unknown */
@@ -502,8 +502,8 @@ static READ8_HANDLER( dd_adpcm_status_r )
static ADDRESS_MAP_START( ddragon_map, AS_PROGRAM, 8, ddragon_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(m_rambase)
- AM_RANGE(0x1000, 0x11ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x1200, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x1000, 0x11ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1200, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x1400, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x2000, 0x2fff) AM_READWRITE_LEGACY(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(m_spriteram)
@@ -536,8 +536,8 @@ static ADDRESS_MAP_START( dd2_map, AS_PROGRAM, 8, ddragon_state )
AM_RANGE(0x3809, 0x3809) AM_WRITEONLY AM_BASE(m_scrollx_lo)
AM_RANGE(0x380a, 0x380a) AM_WRITEONLY AM_BASE(m_scrolly_lo)
AM_RANGE(0x380b, 0x380f) AM_WRITE_LEGACY(ddragon_interrupt_w)
- AM_RANGE(0x3c00, 0x3dff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x3e00, 0x3fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x3c00, 0x3dff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3e00, 0x3fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 25b325c019b..c5108f744a5 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -216,7 +216,7 @@ static ADDRESS_MAP_START( ddragon3_map, AS_PROGRAM, 16, ddragon3_state )
AM_RANGE(0x100004, 0x100005) AM_READ_PORT("DSW")
AM_RANGE(0x100006, 0x100007) AM_READ_PORT("P3")
AM_RANGE(0x100000, 0x10000f) AM_WRITE(ddragon3_io_w)
- AM_RANGE(0x140000, 0x1405ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
+ AM_RANGE(0x140000, 0x1405ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x180000, 0x180fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* working RAM */
ADDRESS_MAP_END
@@ -227,7 +227,7 @@ static ADDRESS_MAP_START( dd3b_map, AS_PROGRAM, 16, ddragon3_state )
AM_RANGE(0x081000, 0x081fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(ddragon3_scroll_w)
- AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
+ AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x140000, 0x14000f) AM_WRITE(ddragon3_io_w)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN0")
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("IN1")
@@ -243,7 +243,7 @@ static ADDRESS_MAP_START( ctribe_map, AS_PROGRAM, 16, ddragon3_state )
AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE(ddragon3_bg_videoram_w) AM_BASE(m_bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
AM_RANGE(0x082800, 0x082fff) AM_RAM
AM_RANGE(0x0c0000, 0x0c000f) AM_READWRITE(ddragon3_scroll_r, ddragon3_scroll_w)
- AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
+ AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x140000, 0x14000f) AM_WRITE(ddragon3_io_w)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN0")
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 93e72204aca..a7fbe59a8e7 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -67,7 +67,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, deadang_state )
AM_RANGE(0x08800, 0x0bfff) AM_WRITEONLY
AM_RANGE(0x0a000, 0x0a001) AM_READ_PORT("P1_P2")
AM_RANGE(0x0a002, 0x0a003) AM_READ_PORT("DSW")
- AM_RANGE(0x0c000, 0x0cfff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c000, 0x0cfff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0d000, 0x0dfff) AM_WRITEONLY
AM_RANGE(0x0e000, 0x0e0ff) AM_WRITEONLY AM_BASE(m_scroll_ram)
AM_RANGE(0x0e100, 0x0ffff) AM_WRITEONLY
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 5b260aa97f2..50e26b65999 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -507,7 +507,7 @@ static ADDRESS_MAP_START( slyspy_map, AS_PROGRAM, 16, dec0_state )
AM_RANGE(0x304000, 0x307fff) AM_RAM AM_BASE(m_ram) /* Sly spy main ram */
AM_RANGE(0x308000, 0x3087ff) AM_RAM AM_BASE(m_spriteram) /* Sprites */
- AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x314000, 0x314003) AM_WRITE(slyspy_control_w)
AM_RANGE(0x314008, 0x31400f) AM_READ(slyspy_controls_r)
AM_RANGE(0x31c000, 0x31c00f) AM_READ(slyspy_protection_r) AM_WRITENOP
@@ -518,7 +518,7 @@ static ADDRESS_MAP_START( midres_map, AS_PROGRAM, 16, dec0_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE(m_ram)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x160001) AM_WRITE(dec0_priority_w)
AM_RANGE(0x180000, 0x18000f) AM_READ(midres_controls_r)
AM_RANGE(0x180008, 0x18000f) AM_WRITENOP /* ?? watchdog ?? */
@@ -606,7 +606,7 @@ static ADDRESS_MAP_START( secretab_map, AS_PROGRAM, 16, dec0_state )
AM_RANGE(0x300c00, 0x300fff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_rowscroll_r, deco_bac06_pf_rowscroll_w)
AM_RANGE(0x301000, 0x3017ff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_data_r, deco_bac06_pf_data_w)
AM_RANGE(0x301800, 0x307fff) AM_RAM AM_BASE(m_ram) /* Sly spy main ram */
- AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xb08000, 0xb087ff) AM_RAM AM_BASE(m_spriteram) /* Sprites */
ADDRESS_MAP_END
@@ -636,7 +636,7 @@ static ADDRESS_MAP_START( automat_map, AS_PROGRAM, 16, dec0_state )
AM_RANGE(0x300000, 0x30001f) AM_READ(dec0_rotary_r)
AM_RANGE(0x30c000, 0x30c00b) AM_READ(dec0_controls_r)
AM_RANGE(0x30c000, 0x30c01f) AM_WRITE(automat_control_w) /* Priority, sound, etc. */
- AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x314000, 0x3147ff) AM_RAM
AM_RANGE(0x400008, 0x400009) AM_WRITE(dec0_priority_w) // NEW
AM_RANGE(0xff8000, 0xffbfff) AM_RAM AM_BASE(m_ram) /* Main ram */
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 61eafc0fda0..82f1abe5a1c 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -461,7 +461,7 @@ WRITE8_MEMBER(dec8_state::ghostb_bank_w)
if ((data&1)==0) device_set_input_line(m_maincpu, M6809_IRQ_LINE, CLEAR_LINE);
if (data & 2) m_nmi_enable =1; else m_nmi_enable = 0;
- flip_screen_set(machine(), data & 0x08);
+ flip_screen_set(data & 0x08);
}
WRITE8_MEMBER(dec8_state::csilver_control_w)
@@ -576,15 +576,15 @@ WRITE8_MEMBER(dec8_state::shackled_int_w)
/******************************************************************************/
-WRITE8_MEMBER(dec8_state::flip_screen_w){ flip_screen_set(machine(), data); }
+WRITE8_MEMBER(dec8_state::flip_screen_w){ flip_screen_set(data); }
/******************************************************************************/
static ADDRESS_MAP_START( lastmisn_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_SHARE("paletteram")
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") AM_SHARE("paletteram2")
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("share3") AM_SHARE("paletteram")
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("share4") AM_SHARE("paletteram2")
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("IN0")
AM_RANGE(0x1801, 0x1801) AM_READ_PORT("IN1")
AM_RANGE(0x1802, 0x1802) AM_READ_PORT("IN2")
@@ -609,8 +609,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lastmisn_sub_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3")
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4")
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("share3")
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("share4")
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("IN0")
AM_RANGE(0x1801, 0x1801) AM_READ_PORT("IN1")
AM_RANGE(0x1802, 0x1802) AM_READ_PORT("IN2")
@@ -629,8 +629,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( shackled_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_SHARE("paletteram")
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") AM_SHARE("paletteram2")
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("share3") AM_SHARE("paletteram")
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("share4") AM_SHARE("paletteram2")
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("IN0")
AM_RANGE(0x1801, 0x1801) AM_READ_PORT("IN1")
AM_RANGE(0x1802, 0x1802) AM_READ_PORT("IN2")
@@ -653,8 +653,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( shackled_sub_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3")
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4")
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("share3")
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("share4")
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("IN0")
AM_RANGE(0x1801, 0x1801) AM_READ_PORT("IN1")
AM_RANGE(0x1802, 0x1802) AM_READ_PORT("IN2")
@@ -680,8 +680,8 @@ static ADDRESS_MAP_START( gondo_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2000, 0x27ff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
- AM_RANGE(0x2800, 0x2bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x2c00, 0x2fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x2800, 0x2bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x2c00, 0x2fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram") /* Sprites */
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("DSW0") /* Dip 1 */
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("DSW1") /* Dip 2 */
@@ -703,8 +703,8 @@ static ADDRESS_MAP_START( garyoret_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2000, 0x27ff) AM_READWRITE(dec8_bg_data_r, dec8_bg_data_w) AM_BASE(m_bg_data)
- AM_RANGE(0x2800, 0x2bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x2c00, 0x2fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x2800, 0x2bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x2c00, 0x2fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram") /* Sprites */
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("DSW0") /* Dip 1 */
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("DSW1") /* Dip 2 */
@@ -747,8 +747,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( csilver_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_SHARE("paletteram")
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") AM_SHARE("paletteram2")
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("share3") AM_SHARE("paletteram")
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("share4") AM_SHARE("paletteram2")
AM_RANGE(0x1800, 0x1800) AM_READ_PORT("IN1")
AM_RANGE(0x1801, 0x1801) AM_READ_PORT("IN0")
AM_RANGE(0x1803, 0x1803) AM_READ_PORT("IN2")
@@ -772,8 +772,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( csilver_sub_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3")
- AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4")
+ AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("share3")
+ AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("share4")
AM_RANGE(0x1803, 0x1803) AM_READ_PORT("IN2")
AM_RANGE(0x1804, 0x1804) AM_READ_PORT("DSW1")
AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w)
@@ -793,7 +793,7 @@ static ADDRESS_MAP_START( oscar_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2800, 0x2fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco_bac06_pf_data_8bit_r, deco_bac06_pf_data_8bit_w)
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE("spriteram") /* Sprites */
- AM_RANGE(0x3800, 0x3bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3800, 0x3bff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0x3c00, 0x3c00) AM_READ_PORT("IN0")
AM_RANGE(0x3c01, 0x3c01) AM_READ_PORT("IN1")
AM_RANGE(0x3c02, 0x3c02) AM_READ_PORT("IN2") /* VBL & coins */
@@ -831,8 +831,8 @@ static ADDRESS_MAP_START( srdarwin_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1805, 0x1806) AM_WRITE(srdarwin_control_w) /* Scroll & Bank */
AM_RANGE(0x2000, 0x2000) AM_READWRITE(i8751_h_r, dec8_sound_w) /* Sound */
AM_RANGE(0x2001, 0x2001) AM_READWRITE(i8751_l_r, flip_screen_w) /* Flipscreen */
- AM_RANGE(0x2800, 0x288f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x3000, 0x308f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x2800, 0x288f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3000, 0x308f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("DSW0") /* Dip 1 */
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("IN0") /* Player 1 */
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("IN1") /* Player 2 (cocktail) + VBL */
@@ -848,7 +848,7 @@ static ADDRESS_MAP_START( cobra_map, AS_PROGRAM, 8, dec8_state )
AM_RANGE(0x1800, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x3000, 0x31ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3000, 0x31ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0x3200, 0x37ff) AM_WRITEONLY /* Unused */
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("IN0") /* Player 1 */
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("IN1") /* Player 2 */
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index bac2024ab08..a01caf4cfb8 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -68,9 +68,8 @@ static VIDEO_START( wcvol95 )
static SCREEN_UPDATE_RGB32( wcvol95 )
{
//FIXME: flip_screen_x should not be written!
- flip_screen_set_no_update(screen.machine(), 1);
-
deco156_state *state = screen.machine().driver_data<deco156_state>();
+ state->flip_screen_set_no_update(1);
screen.machine().priority_bitmap.fill(0);
bitmap.fill(0);
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index 63feb29e28d..2c15e743efd 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -196,7 +196,7 @@ static ADDRESS_MAP_START( begas_map, AS_PROGRAM, 8, deco_ld_state )
AM_RANGE(0x1003, 0x1003) AM_WRITE(rblaster_vram_bank_w) //might be 1001
AM_RANGE(0x1006, 0x1006) AM_NOP //ld status / command
AM_RANGE(0x1007, 0x1007) AM_READWRITE(laserdisc_r,laserdisc_w) // ld data
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_RRRGGGBB_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x3000, 0x3fff) AM_RAM
@@ -214,7 +214,7 @@ static ADDRESS_MAP_START( cobra_map, AS_PROGRAM, 8, deco_ld_state )
AM_RANGE(0x1004, 0x1004) AM_WRITE(rblaster_vram_bank_w) //might be 1001
AM_RANGE(0x1006, 0x1006) AM_NOP //ld status / command
AM_RANGE(0x1007, 0x1007) AM_READWRITE(laserdisc_r,laserdisc_w) // ld data
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_RRRGGGBB_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x2000, 0x2fff) AM_RAM
AM_RANGE(0x3000, 0x37ff) AM_RAM //vram attr?
AM_RANGE(0x3800, 0x3fff) AM_RAM AM_BASE(m_videoram)
@@ -230,7 +230,7 @@ static ADDRESS_MAP_START( rblaster_map, AS_PROGRAM, 8, deco_ld_state )
AM_RANGE(0x1003, 0x1003) AM_WRITE(rblaster_vram_bank_w) //might be 1001
AM_RANGE(0x1006, 0x1006) AM_NOP //ld status / command
AM_RANGE(0x1007, 0x1007) AM_READWRITE(laserdisc_r,laserdisc_w) // ld data
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_RRRGGGBB_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x3000, 0x3fff) AM_RAM
AM_RANGE(0xc000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index f166dbbefae..4d17158ddf1 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -144,7 +144,7 @@ static ADDRESS_MAP_START( diverboy_map, AS_PROGRAM, 16, diverboy_state )
AM_RANGE(0x040000, 0x04ffff) AM_RAM
AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x100000, 0x100001) AM_WRITE(soundcmd_w)
- AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("P1_P2")
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("DSW")
AM_RANGE(0x180008, 0x180009) AM_READ_PORT("COINS")
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index e56654cd710..0ca0cfd5395 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -71,7 +71,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, dogfgt_state )
AM_RANGE(0x1830, 0x1830) AM_READ_PORT("DSW2")
AM_RANGE(0x1830, 0x1830) AM_WRITE(dogfgt_soundlatch_w)
AM_RANGE(0x1840, 0x1840) AM_WRITE(dogfgt_soundcontrol_w)
- AM_RANGE(0x1870, 0x187f) AM_WRITE(paletteram_BBGGGRRR_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1870, 0x187f) AM_WRITE(paletteram_BBGGGRRR_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x2000, 0x3fff) AM_READWRITE(dogfgt_bitmapram_r, dogfgt_bitmapram_w)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 0b44c236849..1b94706c992 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -100,20 +100,20 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sx = state->m_spriteram[offs];
sy = 248 - state->m_spriteram[offs + 1];
- if (flip_screen_x_get(machine)) sx = 248 - sx;
- if (flip_screen_y_get(machine)) sy = 248 - sy;
+ if (state->flip_screen_x()) sx = 248 - sx;
+ if (state->flip_screen_y()) sy = 248 - sy;
code = state->m_spriteram[offs + 3] + ((state->m_spriteram[offs + 2] & 0x03) << 8) ;
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
2 * code,
((state->m_spriteram[offs + 2] & 0xf8) >> 3) ,
- flip_screen_x_get(machine),flip_screen_y_get(machine),
- sx,sy + (flip_screen_y_get(machine) ? 8 : -8),0);
+ state->flip_screen_x(),state->flip_screen_y(),
+ sx,sy + (state->flip_screen_y() ? 8 : -8),0);
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
2 * code + 1,
((state->m_spriteram[offs + 2] & 0xf8) >> 3) ,
- flip_screen_x_get(machine),flip_screen_y_get(machine),
+ state->flip_screen_x(),state->flip_screen_y(),
sx,sy,0);
}
}
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8, dominob_state )
AM_RANGE(0xe840, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xf07f) AM_RAM AM_BASE(m_bgram)
AM_RANGE(0xf080, 0xf7ff) AM_RAM
- AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xfc00, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index f3bc364a11a..fe4f4259d1f 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -98,7 +98,7 @@ static MACHINE_START( lastday )
WRITE8_MEMBER(dooyong_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
static MACHINE_RESET( sound_ym2203 )
@@ -128,7 +128,7 @@ static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xc012, 0xc012) AM_WRITE(soundlatch_w)
AM_RANGE(0xc013, 0xc013) AM_READ_PORT("DSWA")
AM_RANGE(0xc014, 0xc014) AM_READ_PORT("DSWB")
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram")
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xf010, 0xf010) AM_WRITE(soundlatch_w)
AM_RANGE(0xf018, 0xf01f) AM_WRITE(dooyong_bgscroll8_w)
AM_RANGE(0xf020, 0xf027) AM_WRITE(dooyong_fgscroll8_w)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_state )
@@ -168,7 +168,7 @@ static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xf010, 0xf010) AM_WRITE(soundlatch_w)
AM_RANGE(0xf018, 0xf01f) AM_WRITE(dooyong_bgscroll8_w)
AM_RANGE(0xf020, 0xf027) AM_WRITE(dooyong_fgscroll8_w)
- AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_state )
@@ -185,7 +185,7 @@ static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xc018, 0xc01f) AM_WRITE(dooyong_fg2scroll8_w)
AM_RANGE(0xc040, 0xc047) AM_WRITE(dooyong_bgscroll8_w)
AM_RANGE(0xc048, 0xc04f) AM_WRITE(dooyong_fgscroll8_w)
- AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xf000, 0xffff) AM_RAM
@@ -216,7 +216,7 @@ static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd3ff) AM_RAM /* what is this? looks like a palette? scratchpad RAM maybe? */
AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(m_txvideoram)
- AM_RANGE(0xf000, 0xf7ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf7ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSWA")
AM_RANGE(0xf800, 0xf800) AM_WRITE(primella_ctrl_w) /* bank switch, flip screen etc */
AM_RANGE(0xf810, 0xf810) AM_READ_PORT("DSWB")
@@ -239,7 +239,7 @@ static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_state )
AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w)
AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w)
- AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0c0012, 0x0c0013) AM_WRITE(soundlatch_word_w)
AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(rshark_ctrl_w) /* flip screen + unknown stuff */
AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE(dooyong_fgscroll16_w)
@@ -257,7 +257,7 @@ static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_state )
AM_RANGE(0x080006, 0x080007) AM_READ_PORT("SYSTEM")
AM_RANGE(0x084000, 0x08400f) AM_WRITE(dooyong_bgscroll16_w)
AM_RANGE(0x084010, 0x08401f) AM_WRITE(dooyong_bg2scroll16_w)
- AM_RANGE(0x088000, 0x088fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x088fff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x080012, 0x080013) AM_WRITE(soundlatch_word_w)
AM_RANGE(0x080014, 0x080015) AM_WRITE(rshark_ctrl_w) /* flip screen + unknown stuff */
AM_RANGE(0x08c000, 0x08c00f) AM_WRITE(dooyong_fgscroll16_w)
@@ -278,7 +278,7 @@ static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_state )
AM_RANGE(0x0c0018, 0x0c001b) AM_WRITENOP // ?
AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w)
AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w) // not used atm
- AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE(dooyong_fgscroll16_w) // not used atm
AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE(dooyong_fg2scroll16_w) // not used atm
AM_RANGE(0x0dc000, 0x0dc01f) AM_RAM // registers of some kind?
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 2a80ebd88fd..46133026333 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -432,7 +432,7 @@ WRITE32_MEMBER(dreamwld_state::dreamwld_6295_1_bank_w)
logerror("OKI1: unk bank write %x mem_mask %8x\n", data, mem_mask);
}
-// why doesn't using paletteram16_xRRRRRGGGGGBBBBB_word_w with a 16-bit handler work? colours are
+// why doesn't using paletteram_xRRRRRGGGGGBBBBB_word_w with a 16-bit handler work? colours are
// severely corrupt on dream world's semicom screen + many sprites, seems palette values get duplicated.
WRITE32_MEMBER(dreamwld_state::dreamwld_palette_w)
{
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 10a11d3c88e..5224f551594 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -199,7 +199,7 @@ static ADDRESS_MAP_START( drgnmst_main_map, AS_PROGRAM, 16, drgnmst_state )
AM_RANGE(0x800180, 0x800181) AM_WRITE(drgnmst_snd_command_w)
AM_RANGE(0x800188, 0x800189) AM_WRITE(drgnmst_snd_flag_w)
AM_RANGE(0x8001e0, 0x8001e1) AM_WRITENOP
- AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x904000, 0x907fff) AM_RAM_WRITE(drgnmst_md_videoram_w) AM_BASE(m_md_videoram)
AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE(drgnmst_bg_videoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0x90c000, 0x90ffff) AM_RAM_WRITE(drgnmst_fg_videoram_w) AM_BASE(m_fg_videoram)
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 6b8ad2c15fe..a0709ff4ffa 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -36,7 +36,7 @@ WRITE8_MEMBER(drmicro_state::nmi_enable_w)
m_nmi_enable = data & 1;
m_flipscreen = (data & 2) ? 1 : 0;
- flip_screen_set(machine(), data & 2);
+ flip_screen_set(data & 2);
// bit2,3 unknown
}
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index b3e943ec40f..6122b7951fe 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( drtomy_map, AS_PROGRAM, 16, drtomy_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(drtomy_vram_fg_w) AM_BASE(m_videoram_fg) /* Video RAM FG */
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(drtomy_vram_bg_w) AM_BASE(m_videoram_bg) /* Video RAM BG */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW1")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW2")
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index b318a4a646f..135be3157d4 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -219,7 +219,7 @@ static WRITE8_DEVICE_HANDLER( egghunt_okibanking_w )
static ADDRESS_MAP_START( egghunt_map, AS_PROGRAM, 8, egghunt_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(egghunt_atram_w) AM_BASE(m_atram)
AM_RANGE(0xd000, 0xdfff) AM_READWRITE(egghunt_bgram_r, egghunt_bgram_w)
AM_RANGE(0xe000, 0xffff) AM_RAM
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 28a10165d2e..352727434ee 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -231,7 +231,7 @@ static SCREEN_UPDATE_RGB32( enigma2 )
offs_t color_map_address = (y >> 3 << 5) | (x >> 3);
/* the schematics shows it like this, but it doesn't work as this would
produce no stars, due to the contents of the PROM -- maybe there is
- a star disabled bit somewhere that's connected here instead of flip_screen_get(screen.machine()) */
+ a star disabled bit somewhere that's connected here instead of flip_screen() */
/* star_map_address = (y >> 4 << 6) | (engima2_flip_screen_get() << 5) | (x >> 3); */
offs_t star_map_address = (y >> 4 << 6) | 0x20 | (x >> 3);
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 52bc947f0ad..207decbfb25 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1224,7 +1224,7 @@ static MACHINE_RESET( equites )
{
equites_state *state = machine.driver_data<equites_state>();
- flip_screen_set(machine, 0);
+ state->flip_screen_set(0);
state->m_fg_char_bank = 0;
state->m_bgcolor = 0;
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 6dab380a2c2..6cea60b43db 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -82,7 +82,7 @@ WRITE16_MEMBER(esd16_state::esd16_sound_command_w)
static ADDRESS_MAP_START( multchmp_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
- AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
/**/AM_RANGE(0x300000, 0x3007ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x300800, 0x300807) AM_WRITE(esd16_spriteram_w) // Sprites (Mirrored)
/**/AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
@@ -133,7 +133,7 @@ WRITE16_MEMBER(esd16_state::esd_eeprom_w)
static ADDRESS_MAP_START( hedpanic_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
- AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x900000, 0x9007ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x900800, 0x900807) AM_WRITE(esd16_spriteram_w) // Sprites (Mirrored)
AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( mchampdx_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
AM_RANGE(0x320000, 0x323fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) //
AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_BASE(m_vram_1) // mirror?
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x500000, 0x500001) AM_WRITENOP // IRQ Ack
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P1_P2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
@@ -188,7 +188,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tangtang_map, AS_PROGRAM, 16, esd16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // RAM
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // RAM
AM_RANGE(0x200000, 0x2007ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x200800, 0x200807) AM_WRITE(esd16_spriteram_w) // Sprites (Mirrored)
AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_BASE(m_vram_0) // Layers
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 20c4784cf66..e7fd2985631 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -80,7 +80,7 @@ WRITE8_MEMBER(ettrivia_state::ettrivia_control_w)
coin_counter_w(machine(), 0, data & 0x80);
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
READ8_MEMBER(ettrivia_state::ettrivia_question_r)
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index d213c389fe2..728ba67b189 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -286,7 +286,7 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 16, exterm_state )
AM_RANGE(0x01500000, 0x0153ffff) AM_MIRROR(0xfc000000) AM_WRITE(exterm_output_port_0_w)
AM_RANGE(0x01580000, 0x015bffff) AM_MIRROR(0xfc000000) AM_WRITE(sound_latch_w)
AM_RANGE(0x015c0000, 0x015fffff) AM_MIRROR(0xfc000000) AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x01800000, 0x01807fff) AM_MIRROR(0xfc7f8000) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x01800000, 0x01807fff) AM_MIRROR(0xfc7f8000) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x02800000, 0x02807fff) AM_MIRROR(0xfc7f8000) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x03000000, 0x03ffffff) AM_MIRROR(0xfc000000) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 7e70825df64..0ae3486e33f 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -59,7 +59,7 @@ WRITE8_MEMBER(exzisus_state::exzisus_cpua_bankswitch_w)
}
}
- flip_screen_set(machine(), data & 0x40);
+ flip_screen_set(data & 0x40);
}
WRITE8_MEMBER(exzisus_state::exzisus_cpub_bankswitch_w)
@@ -75,7 +75,7 @@ WRITE8_MEMBER(exzisus_state::exzisus_cpub_bankswitch_w)
}
}
- flip_screen_set(machine(), data & 0x40);
+ flip_screen_set(data & 0x40);
}
WRITE8_MEMBER(exzisus_state::exzisus_coincounter_w)
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 37af171917f..cecd19a12b8 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( f1gp_cpu1_map, AS_PROGRAM, 16, f1gp_state )
AM_RANGE(0xff8000, 0xffbfff) AM_RAM // WORK RAM-1
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram) // DUAL RAM
AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram) // CHARACTER
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // PALETTE
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // PALETTE
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS")
AM_RANGE(0xfff000, 0xfff001) AM_WRITE(f1gp_gfxctrl_w)
// AM_RANGE(0xfff002, 0xfff003) analog wheel?
@@ -125,7 +125,7 @@ static ADDRESS_MAP_START( f1gp2_cpu1_map, AS_PROGRAM, 16, f1gp_state )
AM_RANGE(0xff8000, 0xffbfff) AM_RAM // WORK RAM-1
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram) // DUAL RAM
AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram) // CHARACTER
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // PALETTE
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // PALETTE
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS") AM_WRITE(f1gp2_gfxctrl_w)
// AM_RANGE(0xfff002, 0xfff003) analog wheel?
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW1")
@@ -198,7 +198,7 @@ static ADDRESS_MAP_START( f1gpb_cpu1_map, AS_PROGRAM, 16, f1gp_state )
AM_RANGE(0xff8000, 0xffbfff) AM_RAM
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(m_sharedram)
AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(f1gp_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS")
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW1")
AM_RANGE(0xfff006, 0xfff007) AM_READ_PORT("DSW2")
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 5b683c37a34..c276fdc8db6 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -123,7 +123,7 @@ static ADDRESS_MAP_START( fantland_map, AS_PROGRAM, 16, fantland_state )
AM_RANGE( 0x00000, 0x07fff ) AM_RAM
AM_RANGE( 0x08000, 0x7ffff ) AM_ROM
- AM_RANGE( 0xa2000, 0xa21ff ) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0xa2000, 0xa21ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w ) AM_SHARE("paletteram")
AM_RANGE( 0xa3000, 0xa3001 ) AM_READ_PORT("a3000") AM_WRITE(fantland_nmi_enable_16_w )
AM_RANGE( 0xa3002, 0xa3003 ) AM_READ_PORT("a3002") AM_WRITE(fantland_soundlatch_16_w )
@@ -143,7 +143,7 @@ static ADDRESS_MAP_START( galaxygn_map, AS_PROGRAM, 8, fantland_state )
AM_RANGE( 0x00000, 0x07fff ) AM_RAM
AM_RANGE( 0x10000, 0x2ffff ) AM_ROM
- AM_RANGE( 0x52000, 0x521ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x52000, 0x521ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w ) AM_SHARE("paletteram")
AM_RANGE( 0x53000, 0x53000 ) AM_READ_PORT("P1") AM_WRITE(fantland_nmi_enable_w )
AM_RANGE( 0x53001, 0x53001 ) AM_READ_PORT("P2")
@@ -235,7 +235,7 @@ static ADDRESS_MAP_START( borntofi_map, AS_PROGRAM, 8, fantland_state )
AM_RANGE( 0x00000, 0x07fff ) AM_RAM
AM_RANGE( 0x10000, 0x2ffff ) AM_ROM
- AM_RANGE( 0x52000, 0x521ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x52000, 0x521ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w ) AM_SHARE("paletteram")
AM_RANGE( 0x53000, 0x53001 ) AM_READWRITE(borntofi_inputs_r, borntofi_nmi_enable_w )
AM_RANGE( 0x53002, 0x53002 ) AM_READ_PORT( "DSW" ) AM_WRITE(fantland_soundlatch_w )
AM_RANGE( 0x53003, 0x53003 ) AM_READ_PORT( "Controls" )
@@ -264,7 +264,7 @@ static ADDRESS_MAP_START( wheelrun_map, AS_PROGRAM, 8, fantland_state )
AM_RANGE(0x30000, 0x3ffff) AM_ROM
AM_RANGE(0x70000, 0x7ffff) AM_ROM
- AM_RANGE(0x52000, 0x521ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_SHARE( "paletteram" )
+ AM_RANGE(0x52000, 0x521ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w ) AM_SHARE( "paletteram" )
AM_RANGE(0x53000, 0x53000) AM_READ_PORT( "53000" ) AM_WRITE(borntofi_nmi_enable_w )
AM_RANGE(0x53001, 0x53001) AM_READ_PORT( "53001" )
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 114081ee5e1..cdde4a35eca 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -224,7 +224,7 @@ static SCREEN_UPDATE_IND16( fcrash )
int videocontrol = state->m_cps_a_regs[0x22 / 2];
- flip_screen_set(screen.machine(), videocontrol & 0x8000);
+ state->flip_screen_set(videocontrol & 0x8000);
layercontrol = state->m_cps_b_regs[0x20 / 2];
@@ -304,7 +304,7 @@ static SCREEN_UPDATE_IND16( kodb )
int layercontrol, l0, l1, l2, l3;
int videocontrol = state->m_cps_a_regs[0x22 / 2];
- flip_screen_set(screen.machine(), videocontrol & 0x8000);
+ state->flip_screen_set(videocontrol & 0x8000);
layercontrol = state->m_cps_b_regs[0x20 / 2];
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index f5c704f8a4a..c1b7576427f 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -45,7 +45,7 @@ WRITE8_MEMBER(finalizr_state::finalizr_flipscreen_w)
m_nmi_enable = data & 0x01;
m_irq_enable = data & 0x02;
- flip_screen_set(machine(), ~data & 0x08);
+ flip_screen_set(~data & 0x08);
}
WRITE8_MEMBER(finalizr_state::finalizr_i8039_irq_w)
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 425ff605263..518a5d31736 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -337,7 +337,7 @@ WRITE8_MEMBER(firetrap_state::firetrap_adpcm_data_w)
WRITE8_MEMBER(firetrap_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 18b58f38fb8..a5c316bd65b 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( fitfight_main_map, AS_PROGRAM, 16, fitfight_state )
AM_RANGE(0xb14000, 0xb17fff) AM_WRITENOP //used by histryma @0x0000b25a,b270
AM_RANGE(0xb18000, 0xb1bfff) AM_WRITENOP //used by histryma @0x0000b25a,b270,b286
- AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_BASE(m_spriteram)
@@ -195,7 +195,7 @@ static ADDRESS_MAP_START( bbprot_main_map, AS_PROGRAM, 16, fitfight_state )
AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM_WRITE(fof_txt_tileram_w) AM_BASE(m_fof_txt_tileram)
AM_RANGE(0xc00000, 0xc00fff) AM_READONLY
- AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_BASE(m_spriteram)
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index e9867c63120..38aa65fb4a0 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -96,7 +96,7 @@ static ADDRESS_MAP_START( flkatck_map, AS_PROGRAM, 8, flkatck_state )
AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE(flkatck_k007121_regs_w) /* 007121 registers */
AM_RANGE(0x0008, 0x03ff) AM_RAM /* RAM */
AM_RANGE(0x0400, 0x041f) AM_READWRITE(flkatck_ls138_r, flkatck_ls138_w) /* inputs, DIPS, bankswitch, counters, sound command */
- AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_le_w) AM_SHARE("paletteram") /* palette */
+ AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_le_w) AM_SHARE("paletteram") /* palette */
AM_RANGE(0x1000, 0x1fff) AM_RAM /* RAM */
AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(flkatck_k007121_w) AM_BASE(m_k007121_ram) /* Video RAM (007121) */
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") /* banked ROM */
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 7c464982e47..ff59c3652fb 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -46,9 +46,9 @@ WRITE8_MEMBER(freekick_state::flipscreen_w)
{
/* flip Y/X could be the other way round... */
if (offset)
- flip_screen_y_set(machine(), ~data & 1);
+ flip_screen_y_set(~data & 1);
else
- flip_screen_x_set(machine(), ~data & 1);
+ flip_screen_x_set(~data & 1);
}
WRITE8_MEMBER(freekick_state::coin_w)
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 12e96d593e9..4a6517efa6c 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -102,7 +102,7 @@ Notes:
static ADDRESS_MAP_START( funkyjet_map, AS_PROGRAM, 16, funkyjet_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x143fff) AM_RAM
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x180000, 0x1807ff) AM_READWRITE_LEGACY(deco16_146_funkyjet_prot_r, deco16_146_funkyjet_prot_w) AM_BASE_LEGACY(&deco16_prot_ram)
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 8a2024d45c1..ff927399162 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( fuuki16_map, AS_PROGRAM, 16, fuuki16_state )
AM_RANGE(0x504000, 0x505fff) AM_RAM_WRITE(fuuki16_vram_2_w) AM_BASE(m_vram[2]) //
AM_RANGE(0x506000, 0x507fff) AM_RAM_WRITE(fuuki16_vram_3_w) AM_BASE(m_vram[3]) //
AM_RANGE(0x600000, 0x601fff) AM_MIRROR(0x008000) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites, mirrored?
- AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x810000, 0x810001) AM_READ_PORT("P1_P2")
AM_RANGE(0x880000, 0x880001) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 629c0d2e2b0..a8224200b5c 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -122,7 +122,7 @@ static ADDRESS_MAP_START( bigkarnk_map, AS_PROGRAM, 16, gaelco_state )
AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW1")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW2")
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( maniacsq_map, AS_PROGRAM, 16, gaelco_state )
AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1")
@@ -166,7 +166,7 @@ static ADDRESS_MAP_START( squash_map, AS_PROGRAM, 16, gaelco_state )
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(gaelco_encrypted_w) AM_BASE(m_screen) /* Screen RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1")
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( thoop_map, AS_PROGRAM, 16, gaelco_state )
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(thoop_encrypted_w) AM_BASE(m_screen) /* Screen RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index f51528b7034..6e21f09d6d0 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -394,7 +394,7 @@ static ADDRESS_MAP_START( gaiden_map, AS_PROGRAM, 16, gaiden_state )
AM_RANGE(0x072000, 0x073fff) AM_READWRITE(gaiden_videoram2_r, gaiden_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x074000, 0x075fff) AM_READWRITE(gaiden_videoram3_r, gaiden_videoram3_w) AM_BASE(m_videoram3)
AM_RANGE(0x076000, 0x077fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x07a000, 0x07a001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x07a002, 0x07a003) AM_READ_PORT("P1_P2") AM_WRITE(gaiden_sproffsety_w)
AM_RANGE(0x07a004, 0x07a005) AM_READ_PORT("DSW")
@@ -420,7 +420,7 @@ static ADDRESS_MAP_START( drgnbowl_map, AS_PROGRAM, 16, gaiden_state )
AM_RANGE(0x072000, 0x073fff) AM_RAM_WRITE(gaiden_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x074000, 0x075fff) AM_RAM_WRITE(gaiden_videoram3_w) AM_BASE(m_videoram3)
AM_RANGE(0x076000, 0x077fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x07a000, 0x07a001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x07a002, 0x07a003) AM_READ_PORT("P1_P2")
AM_RANGE(0x07a004, 0x07a005) AM_READ_PORT("DSW")
@@ -916,7 +916,7 @@ static ADDRESS_MAP_START( mastninj_map, AS_PROGRAM, 16, gaiden_state )
AM_RANGE(0x072000, 0x073fff) AM_READWRITE(gaiden_videoram2_r, gaiden_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x074000, 0x075fff) AM_READWRITE(gaiden_videoram3_r, gaiden_videoram3_w) AM_BASE(m_videoram3)
AM_RANGE(0x076000, 0x077fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x078000, 0x079fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
// AM_RANGE(0x078800, 0x079fff) AM_RAM
AM_RANGE(0x07a000, 0x07a001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x07a002, 0x07a003) AM_READ_PORT("P1_P2")
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index c8cb13e2916..c24c7d5e093 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -725,12 +725,12 @@ READ8_MEMBER(galaga_state::bosco_dsw_r)
WRITE8_MEMBER(galaga_state::galaga_flip_screen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
WRITE8_MEMBER(bosco_state::bosco_flip_screen_w)
{
- flip_screen_set(machine(), ~data & 1);
+ flip_screen_set(~data & 1);
}
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 5ca31f0b97b..ee1c046f22a 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( galaxi_map, AS_PROGRAM, 16, galaxi_state )
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(galaxi_fg_w ) AM_BASE(m_fg_ram)
AM_RANGE(0x102000, 0x1047ff) AM_READNOP // unknown
- AM_RANGE(0x300000, 0x3007ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x3007ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("INPUTS")
AM_RANGE(0x500000, 0x500001) AM_WRITE(galaxi_500000_w)
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 17781730f7c..0f6fc0fd324 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -304,7 +304,7 @@ static ADDRESS_MAP_START( galpani2_mem1, AS_PROGRAM, 16, galpani2_state )
AM_RANGE(0x314000, 0x314001) AM_WRITENOP // ? flip backgrounds ?
AM_RANGE(0x318000, 0x318001) AM_DEVREADWRITE_LEGACY("eeprom", galpani2_eeprom_r, galpani2_eeprom_w) // EEPROM
AM_RANGE(0x380000, 0x387fff) AM_RAM // Palette?
- AM_RANGE(0x388000, 0x38ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram" ) // Palette
+ AM_RANGE(0x388000, 0x38ffff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram" ) // Palette
AM_RANGE(0x390000, 0x3901ff) AM_WRITENOP // ? at startup of service mode
AM_RANGE(0x400000, 0x43ffff) AM_RAM_WRITE_LEGACY(galpani2_bg8_0_w) AM_BASE(m_bg8[0]) // Background 0
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 9818522bb5d..63ad0e327fd 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -900,7 +900,7 @@ static ADDRESS_MAP_START( galpani3_map, AS_PROGRAM, 16, galpani3_state )
AM_RANGE(0x000000, 0x17ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // area [B] - Work RAM
- AM_RANGE(0x280000, 0x287fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // area [A] - palette for sprites
+ AM_RANGE(0x280000, 0x287fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // area [A] - palette for sprites
AM_RANGE(0x300000, 0x303fff) AM_RAM_WRITE(galpani3_suprnova_sprite32_w) AM_SHARE("spriteram")
AM_RANGE(0x380000, 0x38003f) AM_RAM_WRITE(galpani3_suprnova_sprite32regs_w) AM_BASE(m_sprregs)
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 0bfa1680210..c4410972d55 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -51,7 +51,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, galspnbl_state )
AM_RANGE(0x905000, 0x907fff) AM_WRITENOP /* ??? */
AM_RANGE(0x980000, 0x9bffff) AM_RAM AM_BASE(m_bgvideoram)
AM_RANGE(0xa00000, 0xa00fff) AM_WRITENOP /* more palette ? */
- AM_RANGE(0xa01000, 0xa017ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa01000, 0xa017ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xa01800, 0xa027ff) AM_WRITENOP /* more palette ? */
AM_RANGE(0xa80000, 0xa80001) AM_READ_PORT("IN0")
AM_RANGE(0xa80010, 0xa80011) AM_READ_PORT("IN1") AM_WRITE(soundcommand_w)
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 6625300471c..3672ddd4ded 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -331,7 +331,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, gauntlet_state )
AM_RANGE(0x905f6e, 0x905f6f) AM_MIRROR(0x2c8000) AM_RAM_WRITE_LEGACY(gauntlet_yscroll_w) AM_BASE(m_yscroll)
AM_RANGE(0x905000, 0x905f7f) AM_MIRROR(0x2c8000) AM_RAM_WRITE_LEGACY(atarigen_alpha_w) AM_BASE(m_alpha)
AM_RANGE(0x905f80, 0x905fff) AM_MIRROR(0x2c8000) AM_READWRITE_LEGACY(atarimo_0_slipram_r, atarimo_0_slipram_w)
- AM_RANGE(0x910000, 0x9107ff) AM_MIRROR(0x2cf800) AM_RAM_WRITE(paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x910000, 0x9107ff) AM_MIRROR(0x2cf800) AM_RAM_WRITE(paletteram_IIIIRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x930000, 0x930001) AM_MIRROR(0x2cfffe) AM_WRITE_LEGACY(gauntlet_xscroll_w) AM_BASE(m_xscroll)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index f9dcdae825d..392f1773c21 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -140,7 +140,7 @@ WRITE8_MEMBER(gberet_state::gberet_flipscreen_w)
m_interrupt_mask = data & 7;
/* bit 3 = flip screen */
- flip_screen_set(machine(), data & 8);
+ flip_screen_set(data & 8);
}
WRITE8_MEMBER(gberet_state::gberet_sound_w)
@@ -192,7 +192,7 @@ ADDRESS_MAP_END
WRITE8_MEMBER(gberet_state::gberetb_flipscreen_w)
{
- flip_screen_set(machine(), data & 8);
+ flip_screen_set(data & 8);
}
READ8_MEMBER(gberet_state::gberetb_irq_ack_r)
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index 366e600778b..49751ee730a 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -40,7 +40,7 @@ WRITE8_MEMBER(gbusters_state::bankedram_w)
{
if (m_palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
else
m_ram[offset] = data;
}
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index cb16a3de6bd..28b5dbc372f 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -233,7 +233,7 @@ static ADDRESS_MAP_START( gcpinbal_map, AS_PROGRAM, 16, gcpinbal_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(gcpinbal_tilemaps_word_r, gcpinbal_tilemaps_word_w) AM_BASE(m_tilemapram)
AM_RANGE(0xc80000, 0xc80fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprite ram */
- AM_RANGE(0xd00000, 0xd00fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd00000, 0xd00fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd80000, 0xd800ff) AM_READWRITE(ioc_r, ioc_w) AM_BASE(m_ioc_ram)
AM_RANGE(0xff0000, 0xffffff) AM_RAM /* RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index e04a57c8d70..b3ec98d3ff8 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -172,7 +172,7 @@ static ADDRESS_MAP_START( gijoe_map, AS_PROGRAM, 16, gijoe_state )
AM_RANGE(0x160000, 0x160007) AM_DEVWRITE_LEGACY("k056832", k056832_b_word_w) // VSCCS (board dependent)
AM_RANGE(0x170000, 0x170001) AM_WRITENOP // Watchdog
AM_RANGE(0x180000, 0x18ffff) AM_RAM AM_BASE(m_workram) // Main RAM. Spec. 180000-1803ff, 180400-187fff
- AM_RANGE(0x190000, 0x190fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x190000, 0x190fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x1a0000, 0x1a001f) AM_DEVWRITE_LEGACY("k053251", k053251_lsb_w)
AM_RANGE(0x1b0000, 0x1b003f) AM_DEVWRITE_LEGACY("k056832", k056832_word_w)
AM_RANGE(0x1c000c, 0x1c000d) AM_WRITE(sound_cmd_w)
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index b2c3097c598..b4363f4608f 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -76,7 +76,7 @@ static ADDRESS_MAP_START( ginganin_map, AS_PROGRAM, 16, ginganin_state )
AM_RANGE(0x020000, 0x023fff) AM_RAM
AM_RANGE(0x030000, 0x0307ff) AM_RAM_WRITE(ginganin_txtram16_w) AM_BASE(m_txtram)
AM_RANGE(0x040000, 0x0407ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x050000, 0x0507ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x050000, 0x0507ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x060000, 0x06000f) AM_RAM_WRITE(ginganin_vregs16_w) AM_BASE(m_vregs)
AM_RANGE(0x068000, 0x06bfff) AM_RAM_WRITE(ginganin_fgram16_w) AM_BASE(m_fgram)
AM_RANGE(0x070000, 0x070001) AM_READ_PORT("P1_P2")
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index eb5a05d896a..6aa17bf3157 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -305,7 +305,8 @@ static READ8_HANDLER( glad_cpu_sound_command_r )
static WRITE8_HANDLER( gladiatr_flipscreen_w )
{
- flip_screen_set(space->machine(), data & 1);
+ gladiatr_state *state = space->machine().driver_data<gladiatr_state>();
+ state->flip_screen_set(data & 1);
}
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 1bb0099ed79..659c7c29dab 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -83,7 +83,7 @@ static ADDRESS_MAP_START( glass_map, AS_PROGRAM, 16, glass_state )
AM_RANGE(0x102000, 0x102fff) AM_RAM /* Extra Video RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x108008, 0x108009) AM_WRITE(clr_int_w) /* CLR INT Video */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index e81fba0f2dc..6b1aa4543de 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -50,8 +50,8 @@ static ADDRESS_MAP_START( gng_map, AS_PROGRAM, 8, gng_state )
AM_RANGE(0x3002, 0x3002) AM_READ_PORT("P2")
AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW1")
AM_RANGE(0x3004, 0x3004) AM_READ_PORT("DSW2")
- AM_RANGE(0x3800, 0x38ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
- AM_RANGE(0x3900, 0x39ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3800, 0x38ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_hi_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x3900, 0x39ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_lo_w) AM_SHARE("paletteram")
AM_RANGE(0x3a00, 0x3a00) AM_WRITE(soundlatch_w)
AM_RANGE(0x3b08, 0x3b09) AM_WRITE(gng_bgscrollx_w)
AM_RANGE(0x3b0a, 0x3b0b) AM_WRITE(gng_bgscrolly_w)
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 029aa213c75..8cd60b392f6 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( go2000_map, AS_PROGRAM, 16, go2000_state )
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE(m_videoram)
AM_RANGE(0x610000, 0x61ffff) AM_RAM AM_BASE(m_videoram2)
- AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xa00000, 0xa00001) AM_READ_PORT("INPUTS")
AM_RANGE(0xa00002, 0xa00003) AM_READ_PORT("DSW")
AM_RANGE(0x620002, 0x620003) AM_WRITE(sound_cmd_w)
@@ -278,7 +278,7 @@ static SCREEN_UPDATE_IND16(go2000)
if (flipx)
tile_flipx = !tile_flipx;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = max_x - sx;
sy = max_y - sy;
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index f795de0698f..18dafb2ad2b 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START( goal92_map, AS_PROGRAM, 16, goal92_state )
AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(goal92_foreground_w) AM_BASE(m_fg_data)
AM_RANGE(0x101800, 0x101fff) AM_RAM // it has tiles for clouds, but they aren't used
AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(goal92_text_w) AM_BASE(m_tx_data)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x13ffff) AM_RAM
AM_RANGE(0x140000, 0x1407ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x140800, 0x140801) AM_WRITENOP
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index eba1433b7d0..a28fc839b55 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -34,7 +34,7 @@ WRITE8_MEMBER(goindol_state::goindol_bankswitch_w)
machine().tilemap().mark_all_dirty();
}
- flip_screen_set(machine(), data & 0x20);
+ flip_screen_set(data & 0x20);
}
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index a6463e3ae73..439ccb1e03a 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -163,7 +163,7 @@ static ADDRESS_MAP_START( goldstar_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0xf840, 0xf840) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w)
AM_RANGE(0xfb00, 0xfb00) AM_DEVREADWRITE("oki", okim6295_device, read, write)
- AM_RANGE(0xfd00, 0xfdff) AM_RAM_WRITE(paletteram_BBGGGRRR_w) AM_SHARE("paletteram")
+ AM_RANGE(0xfd00, 0xfdff) AM_RAM_WRITE(paletteram_BBGGGRRR_byte_w) AM_SHARE("paletteram")
AM_RANGE(0xfe00, 0xfe00) AM_READWRITE(protection_r,protection_w)
ADDRESS_MAP_END
@@ -522,8 +522,8 @@ READ8_MEMBER(goldstar_state::unkch_unk_r)
/* newer / more capable hw */
static ADDRESS_MAP_START( unkch_map, AS_PROGRAM, 8, goldstar_state )
AM_RANGE(0x0000, 0x9fff) AM_ROM
- AM_RANGE(0xc000, 0xc1ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xc800, 0xc9ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xc000, 0xc1ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc800, 0xc9ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("nvram")
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index d73c3bf133d..2acd55c0b8b 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -111,7 +111,7 @@ static ADDRESS_MAP_START( good_map, AS_PROGRAM, 16, good_state )
AM_RANGE(0x280002, 0x280003) AM_READ_PORT("IN1")
AM_RANGE(0x280004, 0x280005) AM_READ_PORT("IN2")
- AM_RANGE(0x800000, 0x8007ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x8007ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x820000, 0x820fff) AM_RAM_WRITE(fg_tilemapram_w) AM_BASE(m_fg_tilemapram)
AM_RANGE(0x822000, 0x822fff) AM_RAM_WRITE(bg_tilemapram_w) AM_BASE(m_bg_tilemapram)
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 20bfa3910c3..91b201b37ce 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START( goodejan_map, AS_PROGRAM, 16, goodejan_state )
AM_RANGE(0x00000, 0x0afff) AM_RAM
AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE_LEGACY(seibucrtc_sc0vram_w) AM_BASE_LEGACY(&seibucrtc_sc0vram)
AM_RANGE(0x0c800, 0x0cfff) AM_RAM_WRITE_LEGACY(seibucrtc_sc3vram_w) AM_BASE_LEGACY(&seibucrtc_sc3vram)
- AM_RANGE(0x0d000, 0x0dfff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0d000, 0x0dfff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
/*Guess: these two aren't used/initialized at all.*/
AM_RANGE(0x0e000, 0x0e7ff) AM_RAM_WRITE_LEGACY(seibucrtc_sc1vram_w) AM_BASE_LEGACY(&seibucrtc_sc1vram)
AM_RANGE(0x0e800, 0x0efff) AM_RAM_WRITE_LEGACY(seibucrtc_sc2vram_w) AM_BASE_LEGACY(&seibucrtc_sc2vram)
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 504f7f25bb4..3fc7a296738 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -101,7 +101,7 @@ static ADDRESS_MAP_START( gotcha_map, AS_PROGRAM, 16, gotcha_state )
AM_RANGE(0x100002, 0x100003) AM_WRITE(gotcha_lamps_w)
AM_RANGE(0x100004, 0x100005) AM_DEVWRITE_LEGACY("oki", gotcha_oki_bank_w)
AM_RANGE(0x120000, 0x12ffff) AM_RAM
- AM_RANGE(0x140000, 0x1405ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1405ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("INPUTS")
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 173a7ebf9aa..4b4334e6be3 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -118,7 +118,7 @@ static void gpworld_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
const int SPR_SKIP_HI = 5;
const int SPR_GFXOFS_LO = 6;
const int SPR_GFXOFS_HI = 7;
- int flip = flip_screen_get(machine);
+ int flip = state->flip_screen();
int i;
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 1b9d1cf2d96..bd2a2ea7d5a 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -157,7 +157,7 @@ static WRITE8_DEVICE_HANDLER( sound_bank_w )
static ADDRESS_MAP_START( gradius3_map, AS_PROGRAM, 16, gradius3_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(cpuA_ctrl_w) /* halt cpu B, irq enable, priority, coin counters, other? */
AM_RANGE(0x0c8000, 0x0c8001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0c8002, 0x0c8003) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index ac694c39909..1541f21febc 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -282,7 +282,7 @@ static ADDRESS_MAP_START( gstriker_map, AS_PROGRAM, 16, gstriker_state )
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_BASE(m_CG10103[0].vram)
AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE(VS920A_0_vram_w) AM_BASE(m_VS920A[0].vram)
AM_RANGE(0x181000, 0x181fff) AM_RAM AM_BASE(m_lineram)
- AM_RANGE(0x1c0000, 0x1c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1c0000, 0x1c0fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x20000f) AM_RAM_WRITE(MB60553_0_regs_w)
AM_RANGE(0x200040, 0x20005f) AM_RAM //AM_BASE_LEGACY(&gs_mixer_regs)
@@ -319,7 +319,7 @@ static ADDRESS_MAP_START( vgoal_map, AS_PROGRAM, 16, gstriker_state )
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_BASE(m_CG10103[0].vram)
AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE(VS920A_0_vram_w) AM_BASE(m_VS920A[0].vram)
AM_RANGE(0x181000, 0x181fff) AM_RAM AM_BASE(m_lineram)
- AM_RANGE(0x1c0000, 0x1c4fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1c0000, 0x1c4fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x20000f) AM_RAM_WRITE(MB60553_0_regs_w)
AM_RANGE(0x200040, 0x20005f) AM_RAM //AM_BASE_LEGACY(&gs_mixer_regs)
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index c47b753231b..8f1d3ceac56 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -49,7 +49,7 @@ PCB Layout
static ADDRESS_MAP_START( gumbo_map, AS_PROGRAM, 16, gumbo_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM // main ram
- AM_RANGE(0x1b0000, 0x1b03ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1b0000, 0x1b03ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("P1_P2")
AM_RANGE(0x1c0200, 0x1c0201) AM_READ_PORT("DSW")
AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( mspuzzle_map, AS_PROGRAM, 16, gumbo_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM // main ram
AM_RANGE(0x190000, 0x197fff) AM_RAM_WRITE(gumbo_fg_videoram_w) AM_BASE(m_fg_videoram) // fg tilemap
- AM_RANGE(0x1a0000, 0x1a03ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1a0000, 0x1a03ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x1b0100, 0x1b0101) AM_READ_PORT("P1_P2")
AM_RANGE(0x1b0200, 0x1b0201) AM_READ_PORT("DSW")
AM_RANGE(0x1b0300, 0x1b0301) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
@@ -73,7 +73,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dblpoint_map, AS_PROGRAM, 16, gumbo_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM // main ram
- AM_RANGE(0x1b0000, 0x1b03ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1b0000, 0x1b03ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("P1_P2")
AM_RANGE(0x1c0200, 0x1c0201) AM_READ_PORT("DSW")
AM_RANGE(0x1c0300, 0x1c0301) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 5e98037f86f..df32ea5ceb7 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -96,7 +96,7 @@ WRITE8_MEMBER(hexion_state::coincntr_w)
coin_counter_w(machine(), 1,data & 0x02);
/* bit 5 = flip screen */
- flip_screen_set(machine(), data & 0x20);
+ flip_screen_set(data & 0x20);
/* other bit unknown */
if ((data & 0xdc) != 0x10) popmessage("coincntr %02x",data);
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index 7f761fa75fc..58bcff10101 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( himesiki_prm0, AS_PROGRAM, 8, himesiki_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xb000, 0xbfff) AM_RAM_WRITE(himesiki_bg_ram_w) AM_BASE(m_bg_ram)
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index 7350252eeb5..6fc113c1386 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -433,8 +433,8 @@ static ADDRESS_MAP_START( slave_memory, AS_PROGRAM, 8, hvyunit_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(hu_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(hu_colorram_w) AM_BASE(m_colorram)
- AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_split2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_split1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_split_hi_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_split_lo_w) AM_SHARE("paletteram")
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 827ecb39b10..e9f9e4bb5b2 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -454,8 +454,8 @@ static ADDRESS_MAP_START( jingbell_portmap, AS_IO, 8, igs009_state )
AM_RANGE( 0x1000, 0x11ff ) AM_RAM_WRITE(bg_scroll_w ) AM_BASE(m_bg_scroll )
- AM_RANGE( 0x2000, 0x23ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE( 0x2400, 0x27ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE( 0x2000, 0x23ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x2400, 0x27ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE( 0x3000, 0x33ff ) AM_RAM_WRITE(gp98_reel1_ram_w ) AM_BASE(m_gp98_reel1_ram )
AM_RANGE( 0x3400, 0x37ff ) AM_RAM_WRITE(gp98_reel2_ram_w ) AM_BASE(m_gp98_reel2_ram )
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index efacd12e3a4..beb67e04bed 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -1295,7 +1295,7 @@ static ADDRESS_MAP_START( iqblocka_io, AS_IO, 8, igs017_state )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // internal regs
AM_RANGE( 0x1000, 0x17ff ) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE( 0x1800, 0x1bff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x1800, 0x1bff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w ) AM_SHARE("paletteram")
AM_RANGE( 0x1c00, 0x1fff ) AM_RAM
// AM_RANGE(0x200a, 0x200a) AM_WRITENOP
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index 5b78206b5b3..73744e454ac 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -144,8 +144,8 @@ WRITE32_MEMBER(igs_m027_state::igs_palette32_w)
{
m_generic_paletteram_16.set_target((UINT16 *)m_igs_palette32, 0x800);
COMBINE_DATA(&m_igs_palette32[offset]);
- //paletteram16_xGGGGGRRRRRBBBBB_word_w(offset*2,m_generic_paletteram_16[offset*2],0);
- //paletteram16_xGGGGGRRRRRBBBBB_word_w(offset*2+1,m_generic_paletteram_16[offset*2+1],0);
+ //paletteram_xGGGGGRRRRRBBBBB_word_w(offset*2,m_generic_paletteram_16[offset*2],0);
+ //paletteram_xGGGGGRRRRRBBBBB_word_w(offset*2+1,m_generic_paletteram_16[offset*2+1],0);
//if(data!=0)
//fprintf(stdout,"PALETTE RAM OFFSET %x ,data %x!\n",offset ,m_igs_palette32[offset]);
}
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index dacda10d9da..b1ed83d7210 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -351,8 +351,8 @@ static ADDRESS_MAP_START( igspoker_prg_map, AS_PROGRAM, 8, igspoker_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( igspoker_io_map, AS_IO, 8, igspoker_state )
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x4002, 0x4002) AM_READ_PORT("DSW3") /* DSW3 */
@@ -1105,8 +1105,8 @@ INPUT_PORTS_END
static ADDRESS_MAP_START( number10_io_map, AS_IO, 8, igspoker_state )
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x4002, 0x4002) AM_READ_PORT("DSW3") /* DSW3 */
@@ -1128,8 +1128,8 @@ static ADDRESS_MAP_START( number10_io_map, AS_IO, 8, igspoker_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( cpokerpk_io_map, AS_IO, 8, igspoker_state )
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x4002, 0x4002) AM_READ_PORT("DSW3") /* DSW3 */
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 65098831159..3c1e74c3285 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -139,7 +139,7 @@ static ADDRESS_MAP_START( inufuku_map, AS_PROGRAM, 16, inufuku_state )
AM_RANGE(0x200000, 0x200001) AM_WRITE_PORT("EEPROMOUT")
AM_RANGE(0x280000, 0x280001) AM_WRITE(inufuku_soundcommand_w) // sound command
- AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram") // palette ram
+ AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram") // palette ram
AM_RANGE(0x380000, 0x3801ff) AM_WRITEONLY AM_BASE(m_bg_rasterram) // bg raster ram
AM_RANGE(0x400000, 0x401fff) AM_READWRITE(inufuku_bg_videoram_r, inufuku_bg_videoram_w) AM_BASE(m_bg_videoram) // bg ram
AM_RANGE(0x402000, 0x403fff) AM_READWRITE(inufuku_tx_videoram_r, inufuku_tx_videoram_w) AM_BASE(m_tx_videoram) // text ram
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 1492beebe73..08c8d59fa33 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -131,8 +131,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main_portmap, AS_IO, 8, iqblock_state )
- AM_RANGE(0x2000, 0x23ff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w)
- AM_RANGE(0x2800, 0x2bff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w)
+ AM_RANGE(0x2000, 0x23ff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w)
+ AM_RANGE(0x2800, 0x2bff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w)
AM_RANGE(0x6000, 0x603f) AM_WRITE(iqblock_fgscroll_w)
AM_RANGE(0x6800, 0x69ff) AM_WRITE(iqblock_fgvideoram_w) /* initialized up to 6fff... bug or larger tilemap? */
AM_RANGE(0x7000, 0x7fff) AM_WRITE(iqblock_bgvideoram_w)
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index d40e85694d4..a8c5d8e517b 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -74,7 +74,7 @@ WRITE8_MEMBER(jack_state::jack_sh_command_w)
WRITE8_MEMBER(jack_state::joinem_misc_w)
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
m_joinem_snd_bit = data & 1;
}
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index ab179e63fab..4363659f358 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -91,7 +91,7 @@ READ8_MEMBER(jackal_state::topgunbl_rotary_r)
WRITE8_MEMBER(jackal_state::jackal_flipscreen_w)
{
m_irq_enable = data & 0x02;
- flip_screen_set(machine(), data & 0x08);
+ flip_screen_set(data & 0x08);
}
READ8_MEMBER(jackal_state::jackal_zram_r)
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index a199ff24825..fac34482c43 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -361,8 +361,8 @@ static ADDRESS_MAP_START( jackie_io_map, AS_IO, 8, jackie_state )
AM_RANGE(0x05a0, 0x05a4) AM_WRITE(jackie_unk_reg3_lo_w)
AM_RANGE(0x0da0, 0x0da4) AM_WRITE(jackie_unk_reg3_hi_w)
AM_RANGE(0x1000, 0x1107) AM_RAM AM_BASE(m_bg_scroll2 )
- AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x4001, 0x4001) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x4002, 0x4002) AM_READ_PORT("DSW3") /* DSW3 */
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index 69f5a8fe25d..48dd9049ed8 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -174,7 +174,7 @@ static ADDRESS_MAP_START( jackpool_mem, AS_PROGRAM, 16, jackpool_state )
AM_RANGE(0x340000, 0x347fff) AM_RAM AM_BASE(m_vram)
AM_RANGE(0x348000, 0x34ffff) AM_RAM //<- vram banks 2 & 3?
- AM_RANGE(0x360000, 0x3603ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x360000, 0x3603ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x380000, 0x380061) AM_READWRITE(jackpool_io_r,jackpool_io_w) AM_BASE(m_io)//AM_READ(jackpool_io_r)
AM_RANGE(0x800000, 0x80000f) AM_READ(jackpool_ff_r) AM_WRITENOP //UART
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 4196205ec44..e2a7069c02c 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -97,7 +97,7 @@ WRITE8_MEMBER(jailbrek_state::ctrl_w)
m_nmi_enable = data & 0x01;
m_irq_enable = data & 0x02;
- flip_screen_set(machine(), data & 0x08);
+ flip_screen_set(data & 0x08);
}
static INTERRUPT_GEN( jb_interrupt )
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 7df60836fe0..b164bf49b87 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -974,7 +974,7 @@ WRITE16_MEMBER(jalmah_state::jalmah_okibank_w)
WRITE16_MEMBER(jalmah_state::jalmah_flip_screen_w)
{
/*---- ----x flip screen*/
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
// popmessage("%04x",data);
}
@@ -993,7 +993,7 @@ static ADDRESS_MAP_START( jalmah, AS_PROGRAM, 16, jalmah_state )
/**/AM_RANGE(0x080020, 0x08003f) AM_RAM_WRITE(jalmah_scroll_w)
AM_RANGE(0x080040, 0x080041) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
// 0x084000, 0x084001 ?
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") /* Palette RAM */
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(sc0_vram_w) AM_BASE(m_sc0_vram)
AM_RANGE(0x094000, 0x097fff) AM_RAM_WRITE(sc1_vram_w) AM_BASE(m_sc1_vram)
AM_RANGE(0x098000, 0x09bfff) AM_RAM_WRITE(sc2_vram_w) AM_BASE(m_sc2_vram)
@@ -1017,7 +1017,7 @@ static ADDRESS_MAP_START( urashima, AS_PROGRAM, 16, jalmah_state )
/**/AM_RANGE(0x08001c, 0x08001d) AM_RAM_WRITE(urashima_bank_w)
AM_RANGE(0x080040, 0x080041) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
// 0x084000, 0x084001 ?
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") /* Palette RAM */
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") /* Palette RAM */
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(urashima_sc0_vram_w) AM_BASE(m_sc0_vram)
AM_RANGE(0x094000, 0x097fff) AM_RAM_WRITE(urashima_sc0_vram_w)
AM_RANGE(0x098000, 0x09bfff) AM_RAM_WRITE(urashima_sc0_vram_w)
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 1d326350197..14498b2348e 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -522,7 +522,7 @@ static ADDRESS_MAP_START( jchan_main, AS_PROGRAM, 16, jchan_state )
AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(jchan_suprnova_sprite32_1_w) AM_BASE(m_spriteram_1)
AM_RANGE(0x600000, 0x60003f) AM_RAM_WRITE(jchan_suprnova_sprite32regs_1_w) AM_BASE(m_sprregs_1)
- AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // palette for sprites?
+ AM_RANGE(0x700000, 0x70ffff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // palette for sprites?
AM_RANGE(0xf00000, 0xf00007) AM_READWRITE(jchan_ctrl_r, jchan_ctrl_w) AM_BASE(m_ctrl)
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 677da46b57a..8b3232d2d9d 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -372,7 +372,7 @@ static ADDRESS_MAP_START( berlwall, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // Work RAM
AM_RANGE(0x30e000, 0x30ffff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
// AM_RANGE(0x480000, 0x480001) AM_RAM // ?
AM_RANGE(0x500000, 0x500001) AM_READWRITE(kaneko16_bg15_reg_r, kaneko16_bg15_reg_w) AM_BASE(m_bg15_reg) // High Color Background
AM_RANGE(0x580000, 0x580001) AM_READWRITE(kaneko16_bg15_select_r, kaneko16_bg15_select_w) AM_BASE(m_bg15_select)
@@ -429,7 +429,7 @@ static ADDRESS_MAP_START( bakubrkr, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(m_vscroll[3]) //
AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(m_vscroll[2]) //
AM_RANGE(0x600000, 0x601fff) AM_RAM AM_SHARE("spriteram") // Sprites
- AM_RANGE(0x700000, 0x700fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x700000, 0x700fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x800000, 0x80001f) AM_RAM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(m_layers_0_regs) // Layers 0 Regs
AM_RANGE(0x900000, 0x90001f) AM_RAM_WRITE(kaneko16_sprites_regs_w) AM_BASE(m_sprites_regs ) // Sprites Regs
AM_RANGE(0xa80000, 0xa80001) AM_READ(watchdog_reset16_r) // Watchdog
@@ -449,7 +449,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( blazeon, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(m_vscroll[1]) //
@@ -513,7 +513,7 @@ static ADDRESS_MAP_START( bloodwar, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w)
AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
- AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
@@ -575,7 +575,7 @@ static ADDRESS_MAP_START( bonkadv, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w)
AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
- AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
AM_RANGE(0x501000, 0x501fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
@@ -655,7 +655,7 @@ static ADDRESS_MAP_START( gtmr_map, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
- AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x310000, 0x327fff) AM_RAM //
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
@@ -731,7 +731,7 @@ static ADDRESS_MAP_START( gtmr2_map, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w)
AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w)
- AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x300000, 0x30ffff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x310000, 0x327fff) AM_RAM //
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_SHARE("spriteram") // Sprites
@@ -778,7 +778,7 @@ static ADDRESS_MAP_START( mgcrystl, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE_LEGACY("ay1", kaneko16_YM2149_r, kaneko16_YM2149_w) // Sound
AM_RANGE(0x400200, 0x40021f) AM_DEVREADWRITE_LEGACY("ay2", kaneko16_YM2149_r, kaneko16_YM2149_w)
AM_RANGE(0x400400, 0x400401) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(kaneko16_vram_1_w) AM_BASE(m_vram[1]) // Layers 0
AM_RANGE(0x601000, 0x601fff) AM_RAM_WRITE(kaneko16_vram_0_w) AM_BASE(m_vram[0]) //
AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(m_vscroll[1]) //
@@ -846,7 +846,7 @@ static ADDRESS_MAP_START( shogwarr, AS_PROGRAM, 16, kaneko16_state )
AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(calc3_mcu_com2_w)
//AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE_LEGACY(calc3_run) // guess, might be irqack
AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(calc3_mcu_com3_w)
- AM_RANGE(0x380000, 0x380fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x380000, 0x380fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff) // Samples
AM_RANGE(0x480000, 0x480001) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x580000, 0x581fff) AM_RAM AM_SHARE("spriteram") // Sprites
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index e9098b91dfd..82a5e595d6a 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -493,7 +493,7 @@ static ADDRESS_MAP_START( kickgoal_program_map, AS_PROGRAM, 16, kickgoal_state )
AM_RANGE(0xa0c000, 0xa0ffff) AM_RAM // more tilemap?
AM_RANGE(0xa10000, 0xa1000f) AM_WRITEONLY AM_BASE(m_scrram) /* Scroll Registers */
AM_RANGE(0xb00000, 0xb007ff) AM_WRITEONLY AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Sprites */
- AM_RANGE(0xc00000, 0xc007ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram") /* Palette */ // actionhw reads this
+ AM_RANGE(0xc00000, 0xc007ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram") /* Palette */ // actionhw reads this
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index 05cb328a86c..530db2b9dd2 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( laserbas_io, AS_IO, 8, laserbas_state )
// AM_RANGE(0x23, 0x23) AM_WRITE_LEGACY(test_w) bit 2 presumably is a mux for 0x20?
AM_RANGE(0x40, 0x43) AM_DEVREADWRITE_LEGACY("pit0", pit8253_r, pit8253_w)
AM_RANGE(0x44, 0x47) AM_DEVREADWRITE_LEGACY("pit1", pit8253_r, pit8253_w)
- AM_RANGE(0x80, 0x9f) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_SHARE("paletteram")
+ AM_RANGE(0x80, 0x9f) AM_RAM_WRITE(paletteram_RRRGGGBB_byte_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static INPUT_PORTS_START( laserbas )
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index fcfe69bf0da..adac0403ec1 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -65,7 +65,7 @@ WRITE8_MEMBER(laserbat_state::laserbat_input_mux_w)
m_input_mux = (data & 0x30) >> 4;
- flip_screen_set_no_update(machine(), data & 0x08);
+ flip_screen_set_no_update(data & 0x08);
coin_counter_w(machine(), 0,data & 1);
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 996b3c5a8da..69cff44eb81 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -87,7 +87,7 @@ static ADDRESS_MAP_START( legionna_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x102800, 0x1037ff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
- AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* palette xRRRRxGGGGxBBBBx ? */
+ AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* palette xRRRRxGGGGxBBBBx ? */
AM_RANGE(0x105000, 0x105fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x106000, 0x107fff) AM_RAM
AM_RANGE(0x108000, 0x11ffff) AM_RAM /* main ram */
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( heatbrl_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x103000, 0x103fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x108000, 0x11ffff) AM_RAM
ADDRESS_MAP_END
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( godzilla_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x102000, 0x1027ff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x102800, 0x1037ff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
AM_RANGE(0x103800, 0x103fff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x105000, 0x105fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x106000, 0x1067ff) AM_RAM
AM_RANGE(0x106800, 0x106fff) AM_RAM
@@ -129,7 +129,7 @@ WRITE16_MEMBER(legionna_state::denjin_paletteram16_xBBBBBGGGGGRRRRR_word_w)
{
offset^=1;
COMBINE_DATA(&m_generic_paletteram_16[offset]);
- paletteram16_xBBBBBGGGGGRRRRR_word_w(space,offset,data,mem_mask);
+ paletteram_xBBBBBGGGGGRRRRR_word_w(space,offset,data,mem_mask);
}
static ADDRESS_MAP_START( denjinmk_map, AS_PROGRAM, 16, legionna_state )
@@ -157,8 +157,8 @@ static ADDRESS_MAP_START( grainbow_map, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x104000, 0x104fff) AM_RAM//_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x104000, 0x104fff) AM_RAM//_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x105000, 0x105fff) AM_RAM
AM_RANGE(0x106000, 0x106fff) AM_RAM
AM_RANGE(0x107000, 0x107fff) AM_RAM AM_SHARE("spriteram")
@@ -173,7 +173,7 @@ static ADDRESS_MAP_START( cupsoc_mem, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM
AM_RANGE(0x105000, 0x106fff) AM_RAM
AM_RANGE(0x107000, 0x1077ff) AM_RAM AM_SHARE("spriteram")
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( cupsocs_mem, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM
AM_RANGE(0x105000, 0x106fff) AM_RAM
AM_RANGE(0x107000, 0x1077ff) AM_RAM AM_SHARE("spriteram")
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( cupsocbl_mem, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x101000, 0x1017ff) AM_RAM_WRITE(legionna_foreground_w) AM_BASE(m_fore_data)
AM_RANGE(0x101800, 0x101fff) AM_RAM_WRITE(legionna_midground_w) AM_BASE(m_mid_data)
AM_RANGE(0x102000, 0x102fff) AM_RAM_WRITE(legionna_text_w) AM_BASE(m_textram)
- AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x103000, 0x103fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x104000, 0x104fff) AM_RAM
AM_RANGE(0x105000, 0x106fff) AM_RAM
AM_RANGE(0x107000, 0x1077ff) AM_RAM AM_SHARE("spriteram")
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index c550025a3aa..336a317ec35 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -326,7 +326,7 @@ WRITE8_MEMBER(lethal_state::le_4800_w)
if (m_cur_control2 & 0x10) // RAM enable
{
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
}
else
{
@@ -417,7 +417,7 @@ WRITE8_MEMBER(lethal_state::le_4800_w)
// use one more palette entry for the BG color
WRITE8_MEMBER(lethal_state::le_bgcolor_w)
{
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, 0x3800 + offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, 0x3800 + offset, data);
}
READ8_MEMBER(lethal_state::guns_r)
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 28ea82d31cb..87431953e72 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -135,7 +135,7 @@ READ8_MEMBER(lkage_state::sound_status_r)
static ADDRESS_MAP_START( lkage_map, AS_PROGRAM, 8, lkage_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work ram */
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xf000, 0xf003) AM_RAM AM_BASE(m_vreg) /* video registers */
AM_RANGE(0xf060, 0xf060) AM_WRITE(lkage_sound_command_w)
AM_RANGE(0xf061, 0xf061) AM_WRITENOP AM_READ(sound_status_r)
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 516c2a036c4..fa4f17c674c 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -214,15 +214,15 @@ static VIDEO_START( looping )
WRITE8_MEMBER(looping_state::flip_screen_x_w)
{
- flip_screen_x_set(machine(), ~data & 0x01);
- m_bg_tilemap->set_scrollx(0, flip_screen_get(machine()) ? 128 : 0);
+ flip_screen_x_set(~data & 0x01);
+ m_bg_tilemap->set_scrollx(0, flip_screen() ? 128 : 0);
}
WRITE8_MEMBER(looping_state::flip_screen_y_w)
{
- flip_screen_y_set(machine(), ~data & 0x01);
- m_bg_tilemap->set_scrollx(0, flip_screen_get(machine()) ? 128 : 0);
+ flip_screen_y_set(~data & 0x01);
+ m_bg_tilemap->set_scrollx(0, flip_screen() ? 128 : 0);
}
@@ -275,13 +275,13 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int code = source[1] & 0x3f;
int color = source[2];
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index 18123a842ff..a46a3eafeb5 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -160,7 +160,7 @@ WRITE8_MEMBER(lsasquad_state::lsasquad_bankswitch_w)
/* bit 3 is zeroed on startup, maybe reset sound CPU */
/* bit 4 flips screen */
- flip_screen_set(machine(), data & 0x10);
+ flip_screen_set(data & 0x10);
/* other bits unknown */
}
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 35767bb41ff..4434c0199ed 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -708,7 +708,7 @@ static WRITE8_DEVICE_HANDLER( ym2149_portb_w )
bit 0 contains the screen orientation.
*/
state->m_ym2149_portb = data;
- flip_screen_set(device->machine(), data & 0x01);
+ state->flip_screen_set(data & 0x01);
}
READ8_MEMBER(lucky74_state::usart_8251_r)
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index c7df2c2ac14..06aaef6147b 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -74,7 +74,7 @@ WRITE8_MEMBER(lwings_state::lwings_bankswitch_w)
{
/* bit 0 is flip screen */
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
/* bits 1 and 2 select ROM bank */
memory_set_bank(machine(), "bank1", (data & 0x06) >> 1);
@@ -288,8 +288,8 @@ static ADDRESS_MAP_START( avengers_map, AS_PROGRAM, 8, lwings_state )
AM_RANGE(0xdf80, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_hi_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_lo_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xf801) AM_WRITE(lwings_bg1_scrollx_w)
AM_RANGE(0xf802, 0xf803) AM_WRITE(lwings_bg1_scrolly_w)
AM_RANGE(0xf804, 0xf804) AM_WRITE(trojan_bg2_scrollx_w)
@@ -311,8 +311,8 @@ static ADDRESS_MAP_START( lwings_map, AS_PROGRAM, 8, lwings_state )
AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_hi_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_lo_w) AM_SHARE("paletteram")
AM_RANGE(0xf808, 0xf808) AM_READ_PORT("SERVICE")
AM_RANGE(0xf809, 0xf809) AM_READ_PORT("P1")
@@ -333,8 +333,8 @@ static ADDRESS_MAP_START( trojan_map, AS_PROGRAM, 8, lwings_state )
AM_RANGE(0xdf80, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lwings_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(lwings_bg1videoram_w) AM_BASE(m_bg1videoram)
- AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_SHARE("paletteram2")
- AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split1_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_hi_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_split_lo_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xf801) AM_WRITE(lwings_bg1_scrollx_w)
AM_RANGE(0xf802, 0xf803) AM_WRITE(lwings_bg1_scrolly_w)
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index b86df9a5fe0..0b151ccd4ff 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, m107_state )
AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m107_vram_w) AM_BASE(m_vram_data)
AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */
AM_RANGE(0xf8000, 0xf8fff) AM_RAM AM_BASE(m_spriteram)
- AM_RANGE(0xf9000, 0xf9fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf9000, 0xf9fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffff0, 0xfffff) AM_ROM AM_REGION("maincpu", 0x7fff0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 778ecf05a94..86134ca5f7f 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -262,9 +262,9 @@ WRITE8_MEMBER(m63_state::m63_palbank_w)
WRITE8_MEMBER(m63_state::m63_flipscreen_w)
{
- if (flip_screen_get(machine()) != (~data & 0x01))
+ if (flip_screen() != (~data & 0x01))
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -272,8 +272,8 @@ WRITE8_MEMBER(m63_state::m63_flipscreen_w)
WRITE8_MEMBER(m63_state::fghtbskt_flipscreen_w)
{
- flip_screen_set(machine(), data);
- m_fg_flag = flip_screen_get(machine()) ? TILE_FLIPX : 0;
+ flip_screen_set(data);
+ m_fg_flag = flip_screen() ? TILE_FLIPX : 0;
}
@@ -322,7 +322,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = state->m_spriteram[offs + 3];
int sy = state->m_sy_offset - state->m_spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = state->m_sy_offset - sy;
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index b39e1120276..e7ac2318010 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( m90_main_cpu_map, AS_PROGRAM, 16, m90_state )
AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK("bank1") /* Quiz F1 only */
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m90_video_w) AM_BASE(m_video_data)
- AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -86,7 +86,7 @@ static ADDRESS_MAP_START( dynablsb_main_cpu_map, AS_PROGRAM, 16, m90_state )
AM_RANGE(0x6000e, 0x60fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m90_video_w) AM_BASE(m_video_data)
- AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -95,7 +95,7 @@ static ADDRESS_MAP_START( bomblord_main_cpu_map, AS_PROGRAM, 16, m90_state )
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
AM_RANGE(0xc000e, 0xc0fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m90_video_w) AM_BASE(m_video_data)
- AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 70e295702ce..c99798483b6 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -56,7 +56,7 @@ static ADDRESS_MAP_START( madmotor_map, AS_PROGRAM, 16, madmotor_state )
AM_RANGE(0x1a4000, 0x1a4fff) AM_DEVREADWRITE_LEGACY("tilegen3", deco_bac06_pf_data_r, deco_bac06_pf_data_w)
AM_RANGE(0x3e0000, 0x3e3fff) AM_RAM
AM_RANGE(0x3e8000, 0x3e87ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x3f0000, 0x3f07ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3f0000, 0x3f07ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x3f8002, 0x3f8003) AM_READ_PORT("P1_P2")
AM_RANGE(0x3f8004, 0x3f8005) AM_READ_PORT("DSW")
AM_RANGE(0x3f8006, 0x3f8007) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 09ec139ad9b..36e9ce6b395 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -179,7 +179,7 @@ static ADDRESS_MAP_START( mainevt_map, AS_PROGRAM, 8, mainevt_state )
AM_RANGE(0x0000, 0x3fff) AM_READWRITE(k052109_051960_r, k052109_051960_w)
AM_RANGE(0x4000, 0x5dff) AM_RAM
- AM_RANGE(0x5e00, 0x5fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x5e00, 0x5fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -203,7 +203,7 @@ static ADDRESS_MAP_START( devstors_map, AS_PROGRAM, 8, mainevt_state )
AM_RANGE(0x0000, 0x3fff) AM_READWRITE(k052109_051960_r, k052109_051960_w)
AM_RANGE(0x4000, 0x5dff) AM_RAM
- AM_RANGE(0x5e00, 0x5fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x5e00, 0x5fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 411d9cbd56c..8d1156feb5d 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -690,7 +690,7 @@ WRITE8_MEMBER(mappy_state::mappy_latch_w)
break;
case 0x04: /* FLIP */
- flip_screen_set(machine(), bit);
+ flip_screen_set(bit);
break;
case 0x06: /* SOUND ON */
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index eb6412ed7da..614173136d3 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -99,7 +99,7 @@ WRITE8_MEMBER(mayumi_state::bank_sel_w)
m_int_enable = data & 1;
- flip_screen_set(machine(), data & 2);
+ flip_screen_set(data & 2);
}
WRITE8_MEMBER(mayumi_state::input_sel_w)
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 8674e037759..1a866d46883 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( mcatadv_map, AS_PROGRAM, 16, mcatadv_state )
AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(mcatadv_videoram1_w) AM_BASE(m_videoram1) // Tilemap 0
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(mcatadv_videoram2_w) AM_BASE(m_videoram2) // Tilemap 1
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x602000, 0x602fff) AM_RAM // Bigger than needs to be?
AM_RANGE(0x700000, 0x707fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites, two halves for double buffering
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index a5cb26961b8..bf52117ffe0 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -641,8 +641,8 @@ static ADDRESS_MAP_START( cpu_90009_map, AS_PROGRAM, 8, mcr_state )
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf000, 0xf1ff) AM_MIRROR(0x0200) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xf400, 0xf41f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xf800, 0xf81f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xf400, 0xf41f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xf81f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE(mcr_90009_videoram_w) AM_BASE(m_videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 1f378d9bb6d..02faac7f2da 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -180,7 +180,7 @@ static ADDRESS_MAP_START( megasys1A_map, AS_PROGRAM, 16, megasys1_state )
AM_RANGE(0x080006, 0x080007) AM_READ_PORT("DSW")
AM_RANGE(0x080008, 0x080009) AM_READ(soundlatch2_word_r) /* from sound cpu */
AM_RANGE(0x084000, 0x0843ff) AM_RAM_WRITE(megasys1_vregs_A_w) AM_BASE(m_vregs)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08e000, 0x08ffff) AM_RAM AM_BASE(m_objectram)
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
AM_RANGE(0x094000, 0x097fff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
@@ -257,7 +257,7 @@ static ADDRESS_MAP_START( megasys1B_map, AS_PROGRAM, 16, megasys1_state )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x044000, 0x0443ff) AM_RAM_WRITE(megasys1_vregs_A_w) AM_BASE(m_vregs)
- AM_RANGE(0x048000, 0x0487ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x048000, 0x0487ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x04e000, 0x04ffff) AM_RAM AM_BASE(m_objectram)
AM_RANGE(0x050000, 0x053fff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
AM_RANGE(0x054000, 0x057fff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
@@ -284,7 +284,7 @@ static ADDRESS_MAP_START( megasys1C_map, AS_PROGRAM, 16, megasys1_state )
AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
AM_RANGE(0x0f0000, 0x0f3fff) AM_RAM_WRITE(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
- AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0d8000, 0x0d8001) AM_READWRITE(ip_select_r,ip_select_w)
AM_RANGE(0x1c0000, 0x1cffff) AM_MIRROR(0x30000) AM_RAM AM_BASE(m_ram) //0x1f****, Cybattler reads attract mode inputs at 0x1d****
ADDRESS_MAP_END
@@ -305,7 +305,7 @@ static ADDRESS_MAP_START( megasys1D_map, AS_PROGRAM, 16, megasys1_state )
AM_RANGE(0x0ca000, 0x0cbfff) AM_RAM AM_BASE(m_objectram)
AM_RANGE(0x0d0000, 0x0d3fff) AM_RAM_WRITE(megasys1_scrollram_1_w) AM_BASE(m_scrollram[1])
AM_RANGE(0x0d4000, 0x0d7fff) AM_RAM_WRITE(megasys1_scrollram_2_w) AM_BASE(m_scrollram[2])
- AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_RAM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("DSW")
AM_RANGE(0x0e8000, 0x0ebfff) AM_RAM_WRITE(megasys1_scrollram_0_w) AM_BASE(m_scrollram[0])
AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 67b4f9585a6..ad1d650668c 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -308,7 +308,7 @@ static WRITE8_DEVICE_HANDLER( led2_w )
static WRITE8_DEVICE_HANDLER( misc_w )
{
merit_state *state = device->machine().driver_data<merit_state>();
- flip_screen_set(device->machine(), ~data & 0x10);
+ state->flip_screen_set(~data & 0x10);
state->m_extra_video_bank_bit = (data & 2) << 8;
state->m_lscnblk = (data >> 3) & 1;
@@ -318,7 +318,7 @@ static WRITE8_DEVICE_HANDLER( misc_w )
static WRITE8_DEVICE_HANDLER( misc_couple_w )
{
merit_state *state = device->machine().driver_data<merit_state>();
- flip_screen_set(device->machine(), ~data & 0x10);
+ state->flip_screen_set(~data & 0x10);
state->m_extra_video_bank_bit = (data & 2) << 8;
state->m_lscnblk = (data >> 3) & 1;
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 72386c4daef..78ee27095d2 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -65,8 +65,8 @@ static ADDRESS_MAP_START( metlclsh_master_map, AS_PROGRAM, 8, metlclsh_state )
AM_RANGE(0xc080, 0xc080) AM_WRITENOP // ? 0
AM_RANGE(0xc0c2, 0xc0c2) AM_WRITE(metlclsh_cause_irq) // cause irq on cpu #2
AM_RANGE(0xc0c3, 0xc0c3) AM_WRITE(metlclsh_ack_nmi) // nmi ack
-/**/AM_RANGE(0xc800, 0xc82f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
-/**/AM_RANGE(0xcc00, 0xcc2f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+/**/AM_RANGE(0xc800, 0xc82f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+/**/AM_RANGE(0xcc00, 0xcc2f) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xd000, 0xd001) AM_DEVREADWRITE_LEGACY("ym1", ym2203_r,ym2203_w)
/**/AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(metlclsh_fgram_w) AM_BASE(m_fgram)
AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("ym2", ym3526_w )
@@ -98,7 +98,7 @@ WRITE8_MEMBER(metlclsh_state::metlclsh_ack_nmi2)
WRITE8_MEMBER(metlclsh_state::metlclsh_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
static ADDRESS_MAP_START( metlclsh_slave_map, AS_PROGRAM, 8, metlclsh_state )
@@ -275,7 +275,7 @@ static MACHINE_RESET( metlclsh )
{
metlclsh_state *state = machine.driver_data<metlclsh_state>();
- flip_screen_set(machine, 0);
+ state->flip_screen_set(0);
state->m_write_mask = 0;
state->m_gfxbank = 0;
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 458167e7174..858a3cd382d 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -882,7 +882,7 @@ static ADDRESS_MAP_START( balcube_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x620000, 0x63ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x640000, 0x65ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x660000, 0x66ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x670000, 0x673fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x670000, 0x673fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x674000, 0x674fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x678000, 0x6787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x678840, 0x67884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -913,7 +913,7 @@ static ADDRESS_MAP_START( daitoa_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x160000, 0x16ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x178840, 0x17884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -952,7 +952,7 @@ static ADDRESS_MAP_START( bangball_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0xe20000, 0xe3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0xe40000, 0xe5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xe60000, 0xe6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0xe70000, 0xe73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xe70000, 0xe73fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xe74000, 0xe74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xe78000, 0xe787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xe78840, 0xe7884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -978,7 +978,7 @@ static ADDRESS_MAP_START( batlbubl_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x160000, 0x16ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x178840, 0x17884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -1014,7 +1014,7 @@ static ADDRESS_MAP_START( msgogo_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x140000, 0x15ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x160000, 0x16ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x178840, 0x17884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -1048,7 +1048,7 @@ static ADDRESS_MAP_START( daitorid_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -1081,7 +1081,7 @@ static ADDRESS_MAP_START( dharma_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -1132,7 +1132,7 @@ static ADDRESS_MAP_START( karatour_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x40000a, 0x40000b) AM_READ_PORT("DSW1") //
AM_RANGE(0x40000c, 0x40000d) AM_READ_PORT("IN2") //
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x875000, 0x875fff) AM_READWRITE(karatour_vram_0_r, karatour_vram_0_w) // Layer 0 (Part of)
AM_RANGE(0x876000, 0x876fff) AM_READWRITE(karatour_vram_1_r, karatour_vram_1_w) // Layer 1 (Part of)
@@ -1162,7 +1162,7 @@ static ADDRESS_MAP_START( kokushi_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x7fc000, 0x7fffff) AM_RAM // RAM
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x875000, 0x875fff) AM_READWRITE(karatour_vram_0_r, karatour_vram_0_w) // Layer 0 (Part of)
AM_RANGE(0x876000, 0x876fff) AM_READWRITE(karatour_vram_1_r, karatour_vram_1_w) // Layer 1 (Part of)
@@ -1197,7 +1197,7 @@ static ADDRESS_MAP_START( lastfort_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878800, 0x878813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
@@ -1237,7 +1237,7 @@ static ADDRESS_MAP_START( lastforg_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x8a0000, 0x8bffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x8c0000, 0x8dffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x8e0000, 0x8effff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x8f0000, 0x8f3fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x8f0000, 0x8f3fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x8f4000, 0x8f4fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x8f8000, 0x8f87ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x8f8800, 0x8f8813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
@@ -1331,7 +1331,7 @@ static ADDRESS_MAP_START( gakusai_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x274000, 0x274fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x278000, 0x2787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x27880e, 0x27880f) AM_RAM AM_BASE(m_screenctrl) // Screen Control
@@ -1368,7 +1368,7 @@ static ADDRESS_MAP_START( gakusai2_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x620000, 0x63ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x640000, 0x65ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x660000, 0x66ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x670000, 0x673fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x670000, 0x673fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x674000, 0x674fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x675000, 0x675fff) AM_RAM // Sprites?
AM_RANGE(0x678000, 0x6787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
@@ -1440,7 +1440,7 @@ static ADDRESS_MAP_START( dokyusp_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x274000, 0x274fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x278000, 0x2787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x278810, 0x27881f) AM_WRITEONLY AM_BASE(m_irq_levels) // IRQ Levels
@@ -1478,7 +1478,7 @@ static ADDRESS_MAP_START( dokyusei_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x460000, 0x46ffff) AM_WRITENOP // DSW Selection
- AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x47880e, 0x47880f) AM_WRITEONLY AM_BASE(m_screenctrl) // Screen Control
@@ -1517,7 +1517,7 @@ static ADDRESS_MAP_START( pangpoms_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x478800, 0x478813) AM_RAM AM_BASE(m_videoregs) // Video Registers
@@ -1553,7 +1553,7 @@ static ADDRESS_MAP_START( poitto_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc74000, 0xc74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc78000, 0xc787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xc78800, 0xc78813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
@@ -1586,7 +1586,7 @@ static ADDRESS_MAP_START( skyalert_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x820000, 0x83ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x840000, 0x85ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x870000, 0x873fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x874000, 0x874fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x878000, 0x8787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x878800, 0x878813) AM_WRITEONLY AM_BASE(m_videoregs) // Video Registers
@@ -1622,7 +1622,7 @@ static ADDRESS_MAP_START( pururun_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc74000, 0xc74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc78000, 0xc787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -1655,7 +1655,7 @@ static ADDRESS_MAP_START( toride2g_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0xc20000, 0xc3ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0xc40000, 0xc5ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r) // Banked ROM
- AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc70000, 0xc73fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc74000, 0xc74fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0xc78000, 0xc787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(m_blitter_regs) // Tiles Blitter
@@ -1732,7 +1732,7 @@ static ADDRESS_MAP_START( blzntrnd_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r) // Banked ROM
AM_RANGE(0x260000, 0x26ffff) AM_WRITENOP // ??????
- AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x270000, 0x273fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x274000, 0x274fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x278000, 0x2787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x278860, 0x27886b) AM_WRITE(metro_window_w) AM_BASE(m_window) // Tilemap Window
@@ -1774,7 +1774,7 @@ static ADDRESS_MAP_START( mouja_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(m_vram_0) // Layer 0
AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x440000, 0x45ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(m_vram_2) // Layer 2
- AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x470000, 0x473fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x474000, 0x474fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_RAM AM_BASE_SIZE(m_tiletable, m_tiletable_size) // Tiles Set
AM_RANGE(0x47880e, 0x47880f) AM_WRITEONLY AM_BASE(m_screenctrl) // Screen Control
@@ -1861,7 +1861,7 @@ static ADDRESS_MAP_START( puzzlet_map, AS_PROGRAM, 16, metro_state )
AM_RANGE(0x760000, 0x76ffff) AM_READ(metro_bankedrom_r) // Banked ROM
// AM_RANGE(0x772000, 0x773fff) AM_RAM
- AM_RANGE(0x770000, 0x773fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x770000, 0x773fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x775000, 0x775fff) AM_RAM_WRITE(vram_0_clr_w)
AM_RANGE(0x776000, 0x776fff) AM_RAM_WRITE(vram_1_clr_w)
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 6680d3ca703..180a268ec00 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -274,7 +274,7 @@ static ADDRESS_MAP_START( livequiz_map, AS_PROGRAM, 16, midas_state )
AM_RANGE(0x9c0000, 0x9c0005) AM_WRITE(midas_gfxregs_w ) AM_BASE(m_gfxregs )
- AM_RANGE(0xa00000, 0xa3ffff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w ) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa3ffff) AM_RAM_WRITE(paletteram_xrgb_word_be_w ) AM_SHARE("paletteram")
AM_RANGE(0xa40000, 0xa7ffff) AM_RAM
AM_RANGE(0xb00000, 0xb00001) AM_READ(ret_ffff )
@@ -353,7 +353,7 @@ static ADDRESS_MAP_START( hammer_map, AS_PROGRAM, 16, midas_state )
AM_RANGE(0x9c0000, 0x9c0005) AM_WRITE(midas_gfxregs_w ) AM_BASE(m_gfxregs )
- AM_RANGE(0xa00000, 0xa3ffff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w ) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa3ffff) AM_RAM_WRITE(paletteram_xrgb_word_be_w ) AM_SHARE("paletteram")
AM_RANGE(0xa40000, 0xa7ffff) AM_RAM
AM_RANGE(0xb00000, 0xb00001) AM_READ(ret_ffff )
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index 79eb474e86d..3a61aa30be8 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -286,7 +286,7 @@ static ADDRESS_MAP_START( mil4000_map, AS_PROGRAM, 16, mil4000_state )
AM_RANGE(0x708010, 0x708011) AM_NOP //touch screen
AM_RANGE(0x70801e, 0x70801f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x780000, 0x780fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x780000, 0x780fff) AM_RAM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("nvram") // 2x CY62256L-70 (U7 & U8).
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index f08dcf4ecf4..3165cb53e49 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -83,7 +83,7 @@ static SCREEN_UPDATE_RGB32( mirage )
miragemi_state *state = screen.machine().driver_data<miragemi_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, state->m_spriteram->buffer(), 0x400);
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( mirage_map, AS_PROGRAM, 16, miragemi_state )
AM_RANGE(0x110000, 0x110bff) AM_RAM AM_BASE(m_pf1_rowscroll)
AM_RANGE(0x112000, 0x112bff) AM_RAM AM_BASE(m_pf2_rowscroll)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x130000, 0x1307ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x130000, 0x1307ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x14000f) AM_DEVREADWRITE8("oki_sfx", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x150000, 0x15000f) AM_DEVREADWRITE8("oki_bgm", okim6295_device, read, write, 0x00ff)
// AM_RANGE(0x140006, 0x140007) AM_READ_LEGACY(random_readers)
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 110c219d858..4bf831d7b18 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -112,7 +112,7 @@ static SCREEN_UPDATE_IND16( missb2 )
x = sx + xc * 8;
y = (sy + yc * 8) & 0xff;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
x = 248 - x;
y = 248 - y;
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, missb2_state )
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE(m_videoram, m_videoram_size)
AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE(m_objectram, m_objectram_size)
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xf9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xfa00, 0xfa00) AM_WRITE(bublbobl_sound_command_w)
AM_RANGE(0xfa03, 0xfa03) AM_WRITENOP // sound cpu reset
AM_RANGE(0xfa80, 0xfa80) AM_WRITENOP
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 7470ab6811b..2e36409b979 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -481,7 +481,7 @@ static ADDRESS_MAP_START( mlanding_mem, AS_PROGRAM, 16, mlanding_state )
AM_RANGE(0x2d0000, 0x2d0001) AM_READNOP
AM_RANGE(0x2d0002, 0x2d0003) AM_DEVREAD8_LEGACY("tc0140syt", tc0140syt_comm_r, 0x00ff)
- AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x280000, 0x2807ff) AM_READWRITE(ml_mecha_ram_r,ml_mecha_ram_w)
AM_RANGE(0x290000, 0x290001) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index e89ff9f0168..b4145676153 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -798,7 +798,7 @@ WRITE16_MEMBER(model1_state::md0_w)
WRITE16_MEMBER(model1_state::p_w)
{
UINT16 old = m_generic_paletteram_16[offset];
- paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask);
+ paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask);
if(0 && m_generic_paletteram_16[offset] != old)
logerror("XVIDEO: p_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, cpu_get_pc(&space.device()));
}
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index a06d639a558..c64357ce24f 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -119,7 +119,7 @@ WRITE8_MEMBER(mole_state::mole_tilebank_w)
WRITE8_MEMBER(mole_state::mole_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
static SCREEN_UPDATE_IND16( mole )
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index c25c5c96be3..f8bc65742ce 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( momoko_map, AS_PROGRAM, 8, momoko_state )
AM_RANGE(0xd404, 0xd404) AM_WRITE(watchdog_reset_w)
AM_RANGE(0xd406, 0xd406) AM_READ_PORT("DSW0") AM_WRITE(soundlatch_w)
AM_RANGE(0xd407, 0xd407) AM_READ_PORT("DSW1")
- AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xdc00, 0xdc00) AM_WRITE(momoko_fg_scrolly_w)
AM_RANGE(0xdc01, 0xdc01) AM_WRITE(momoko_fg_scrollx_w)
AM_RANGE(0xdc02, 0xdc02) AM_WRITE(momoko_fg_select_w)
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 24cc468d894..53a5d16a57c 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -280,7 +280,7 @@ static ADDRESS_MAP_START( moo_map, AS_PROGRAM, 16, moo_state )
AM_RANGE(0x1a0000, 0x1a1fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) /* Graphic planes */
AM_RANGE(0x1a2000, 0x1a3fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) /* Graphic planes mirror */
AM_RANGE(0x1b0000, 0x1b1fff) AM_DEVREAD_LEGACY("k056832", k056832_rom_word_r) /* Passthrough to tile roms */
- AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
#if MOO_DEBUG
AM_RANGE(0x0c0000, 0x0c003f) AM_DEVREAD_LEGACY("k056832", k056832_word_r)
AM_RANGE(0x0c2000, 0x0c2007) AM_DEVREAD_LEGACY("k053246", k053246_reg_word_r)
@@ -313,7 +313,7 @@ static ADDRESS_MAP_START( moobl_map, AS_PROGRAM, 16, moo_state )
AM_RANGE(0x1a0000, 0x1a1fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) /* Graphic planes */
AM_RANGE(0x1a2000, 0x1a3fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) /* Graphic planes mirror */
AM_RANGE(0x1b0000, 0x1b1fff) AM_DEVREAD_LEGACY("k056832", k056832_rom_word_r) /* Passthrough to tile roms */
- AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( bucky_map, AS_PROGRAM, 16, moo_state )
@@ -344,7 +344,7 @@ static ADDRESS_MAP_START( bucky_map, AS_PROGRAM, 16, moo_state )
AM_RANGE(0x182000, 0x183fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w) /* Graphic planes mirror */
AM_RANGE(0x184000, 0x187fff) AM_RAM /* extra tile RAM? */
AM_RANGE(0x190000, 0x191fff) AM_DEVREAD_LEGACY("k056832", k056832_rom_word_r) /* Passthrough to tile roms */
- AM_RANGE(0x1b0000, 0x1b3fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1b0000, 0x1b3fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x23ffff) AM_ROM /* data */
#if MOO_DEBUG
AM_RANGE(0x0c0000, 0x0c003f) AM_DEVREAD_LEGACY("k056832", k056832_word_r)
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 54feb2e870d..22a4daee05c 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START( mosaic_map, AS_PROGRAM, 8, mosaic_state )
AM_RANGE(0x20000, 0x21fff) AM_RAM
AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE(mosaic_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x23000, 0x23fff) AM_RAM_WRITE(mosaic_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( gfire2_map, AS_PROGRAM, 8, mosaic_state )
@@ -100,7 +100,7 @@ static ADDRESS_MAP_START( gfire2_map, AS_PROGRAM, 8, mosaic_state )
AM_RANGE(0x10000, 0x17fff) AM_RAM
AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE(mosaic_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0x23000, 0x23fff) AM_RAM_WRITE(mosaic_fgvideoram_w) AM_BASE(m_fgvideoram)
- AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( mosaic_io_map, AS_IO, 8, mosaic_state )
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 60467c36085..0cf551a6a79 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -162,7 +162,7 @@ static ADDRESS_MAP_START( mrflea_master_map, AS_PROGRAM, 8, mrflea_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(mrflea_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xe800, 0xe83f) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe800, 0xe83f) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xec00, 0xecff) AM_RAM_WRITE(mrflea_spriteram_w) AM_BASE(m_spriteram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 9a75c7c269c..89cf1475fdb 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -55,7 +55,7 @@ WRITE8_MEMBER(msisaac_state::nmi_enable_w)
#if 0
WRITE8_MEMBER(msisaac_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
WRITE8_MEMBER(msisaac_state::msisaac_coin_counter_w)
@@ -174,7 +174,7 @@ WRITE8_MEMBER(msisaac_state::msisaac_mcu_w)
static ADDRESS_MAP_START( msisaac_map, AS_PROGRAM, 8, msisaac_state )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xf000, 0xf000) AM_WRITE(msisaac_bg2_textbank_w)
AM_RANGE(0xf001, 0xf001) AM_WRITENOP //???
AM_RANGE(0xf002, 0xf002) AM_WRITENOP //???
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 884dd02442f..6ab1db7eb40 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -176,7 +176,7 @@ static ADDRESS_MAP_START( mugsmash_map, AS_PROGRAM, 16, mugsmash_state )
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(mugsmash_videoram1_w) AM_BASE(m_videoram1)
AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(mugsmash_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE(mugsmash_reg_w) AM_BASE(m_regs1) /* video registers*/
- AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x1005ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x140007) AM_WRITE(mugsmash_reg2_w) AM_BASE(m_regs2) /* sound + ? */
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* main ram? */
AM_RANGE(0x1c4000, 0x1cffff) AM_RAM
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index c3e80be1142..eb5a063c065 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -191,7 +191,7 @@ static ADDRESS_MAP_START( mwarr_map, AS_PROGRAM, 16, mwarr_state )
AM_RANGE(0x103400, 0x1037ff) AM_RAM AM_BASE(m_mlow_scrollram)
AM_RANGE(0x103800, 0x103bff) AM_RAM AM_BASE(m_mhigh_scrollram)
AM_RANGE(0x103c00, 0x103fff) AM_RAM AM_BASE(m_vidattrram)
- AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x108000, 0x108fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x110000, 0x110001) AM_READ_PORT("P1_P2")
AM_RANGE(0x110002, 0x110003) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 523feb489d1..0c93489e65e 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -274,7 +274,7 @@ static ADDRESS_MAP_START( mystwarr_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x600000, 0x601fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w)
AM_RANGE(0x602000, 0x603fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM mirror read(essential)
AM_RANGE(0x680000, 0x683fff) AM_READ_LEGACY(K056832_mw_rom_word_r)
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
#if MW_DEBUG
AM_RANGE(0x480000, 0x4800ff) AM_READ_LEGACY(K055555_word_r)
AM_RANGE(0x482010, 0x48201f) AM_READ_LEGACY(K053247_reg_word_r)
@@ -315,7 +315,7 @@ static ADDRESS_MAP_START( metamrph_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x302000, 0x303fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM mirror read/write (essential)
AM_RANGE(0x310000, 0x311fff) AM_READ_LEGACY(K056832_mw_rom_word_r)
AM_RANGE(0x320000, 0x321fff) AM_DEVREAD("k053250_1", k053250_t, rom_r)
- AM_RANGE(0x330000, 0x331fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x330000, 0x331fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
#if MW_DEBUG
AM_RANGE(0x240000, 0x240007) AM_READ_LEGACY(K053246_reg_word_r)
AM_RANGE(0x244010, 0x24401f) AM_READ_LEGACY(K053247_reg_word_r)
@@ -358,7 +358,7 @@ static ADDRESS_MAP_START( viostorm_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x302000, 0x303fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM mirror read(essential)
AM_RANGE(0x304000, 0x3041ff) AM_RAM
AM_RANGE(0x310000, 0x311fff) AM_READ_LEGACY(K056832_mw_rom_word_r)
- AM_RANGE(0x330000, 0x331fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x330000, 0x331fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
#if MW_DEBUG
AM_RANGE(0x240000, 0x240007) AM_READ_LEGACY(K053246_reg_word_r)
AM_RANGE(0x244010, 0x24401f) AM_READ_LEGACY(K053247_reg_word_r)
@@ -445,7 +445,7 @@ static ADDRESS_MAP_START( martchmp_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x41c000, 0x41c01f) AM_DEVREADWRITE8_LEGACY("k053252",k053252_r,k053252_w,0x00ff) // CCU
AM_RANGE(0x41e000, 0x41e007) AM_WRITE_LEGACY(K056832_b_word_w) // VSCCS
AM_RANGE(0x480000, 0x483fff) AM_READWRITE(K053247_martchmp_word_r,K053247_martchmp_word_w) AM_BASE(m_spriteram) // sprite RAM
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram") // palette RAM
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram") // palette RAM
AM_RANGE(0x680000, 0x681fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM
AM_RANGE(0x682000, 0x683fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM mirror read/write (essential)
AM_RANGE(0x700000, 0x703fff) AM_READ_LEGACY(K056832_mw_rom_word_r) // tile ROM readback
@@ -466,7 +466,7 @@ static ADDRESS_MAP_START( dadandrn_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(K053247_scattered_word_r,K053247_scattered_word_w) AM_BASE(m_spriteram)
AM_RANGE(0x410000, 0x411fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM
AM_RANGE(0x412000, 0x413fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM mirror read/write (essential)
- AM_RANGE(0x420000, 0x421fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x420000, 0x421fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
AM_RANGE(0x430000, 0x430007) AM_WRITE_LEGACY(K053246_word_w)
AM_RANGE(0x440000, 0x443fff) AM_READ_LEGACY(K056832_mw_rom_word_r)
AM_RANGE(0x450000, 0x45000f) AM_READ_LEGACY(K055673_rom_word_r)
@@ -513,7 +513,7 @@ static ADDRESS_MAP_START( gaiapols_map, AS_PROGRAM, 16, mystwarr_state )
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(K053247_scattered_word_r,K053247_scattered_word_w) AM_BASE(m_spriteram)
AM_RANGE(0x410000, 0x411fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM
AM_RANGE(0x412000, 0x413fff) AM_READWRITE_LEGACY(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM mirror read / write (essential)
- AM_RANGE(0x420000, 0x421fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x420000, 0x421fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
AM_RANGE(0x430000, 0x430007) AM_WRITE_LEGACY(K053246_word_w)
AM_RANGE(0x440000, 0x441fff) AM_READ_LEGACY(K056832_mw_rom_word_r)
AM_RANGE(0x450000, 0x45000f) AM_READ_LEGACY(K055673_rom_word_r)
diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c
index 9c4aaf0a83b..ba0cb155980 100644
--- a/src/mame/drivers/neoprint.c
+++ b/src/mame/drivers/neoprint.c
@@ -214,7 +214,7 @@ static ADDRESS_MAP_START( neoprint_map, AS_PROGRAM, 16, neoprint_state )
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x30ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x400000, 0x43ffff) AM_RAM AM_BASE(m_npvidram)
- AM_RANGE(0x500000, 0x51ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500000, 0x51ffff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x600001) AM_READWRITE(neoprint_audio_result_r,audio_command_w)
AM_RANGE(0x600002, 0x600003) AM_READWRITE(neoprint_calendar_r,neoprint_calendar_w)
AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM") AM_WRITENOP
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 178861ea962..ac5a8c75355 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -23,7 +23,7 @@ static ADDRESS_MAP_START( news_map, AS_PROGRAM, 8, news_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* 4000-7fff is written to during startup, probably leftover code */
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(news_fgram_w) AM_BASE(m_fgram)
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(news_bgram_w) AM_BASE(m_bgram)
- AM_RANGE(0x9000, 0x91ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x9000, 0x91ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("INPUTS")
AM_RANGE(0xc002, 0xc002) AM_DEVREADWRITE("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 2ceef72966d..06153b92915 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -217,7 +217,7 @@ WRITE8_MEMBER(ninjakd2_state::ninjakd2_soundreset_w)
cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
// bit 7 flips screen
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
// other bits unused
}
@@ -402,7 +402,7 @@ static ADDRESS_MAP_START( ninjakd2_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0xc202, 0xc202) AM_WRITE(ninjakd2_bankselect_w)
AM_RANGE(0xc203, 0xc203) AM_WRITE(ninjakd2_sprite_overdraw_w)
AM_RANGE(0xc208, 0xc20c) AM_WRITE(ninjakd2_bg_ctrl_w) // scroll + enable
- AM_RANGE(0xc800, 0xcdff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc800, 0xcdff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(ninjakd2_bgvideoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xe000, 0xf9ff) AM_RAM
@@ -417,7 +417,7 @@ static ADDRESS_MAP_START( mnight_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0xda00, 0xdfff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(ninjakd2_bgvideoram_w) AM_BASE(m_bg_videoram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0xf000, 0xf5ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf5ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("KEYCOIN")
AM_RANGE(0xf801, 0xf801) AM_READ_PORT("PAD1")
AM_RANGE(0xf802, 0xf802) AM_READ_PORT("PAD2")
@@ -434,7 +434,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( robokid_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(robokid_bg2_videoram_r, robokid_bg2_videoram_w) // banked
AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(robokid_bg1_videoram_r, robokid_bg1_videoram_w) // banked
@@ -480,7 +480,7 @@ static ADDRESS_MAP_START( omegaf_main_cpu, AS_PROGRAM, 8, ninjakd2_state )
AM_RANGE(0xc800, 0xcbff) AM_READWRITE(robokid_bg1_videoram_r, robokid_bg1_videoram_w) // banked
AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(robokid_bg2_videoram_r, robokid_bg2_videoram_w) // banked
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(m_fg_videoram)
- AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xe000, 0xf9ff) AM_RAM
AM_RANGE(0xfa00, 0xffff) AM_RAM AM_BASE(m_spriteram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index c30a609cc07..ce8e9cd5c45 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -330,7 +330,7 @@ static WRITE8_DEVICE_HANDLER( oki_banking_w )
static ADDRESS_MAP_START( nmg5_map, AS_PROGRAM, 16, nmg5_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x120000, 0x12ffff) AM_RAM
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x180000, 0x180001) AM_WRITE(nmg5_soundlatch_w)
AM_RANGE(0x180002, 0x180003) AM_WRITENOP
@@ -350,7 +350,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pclubys_map, AS_PROGRAM, 16, nmg5_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
- AM_RANGE(0x440000, 0x4407ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x440000, 0x4407ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x460000, 0x4607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x480000, 0x480001) AM_WRITE(nmg5_soundlatch_w)
AM_RANGE(0x480002, 0x480003) AM_WRITENOP
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index f42652b19b0..cc3cd35af56 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -319,7 +319,7 @@ static ADDRESS_MAP_START( vandyke_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080016, 0x080017) AM_WRITENOP /* IRQ enable? */
AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c007) AM_WRITE(vandyke_scroll_w)
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x094000, 0x097fff) AM_RAM /* what is this? */
@@ -338,7 +338,7 @@ static ADDRESS_MAP_START( vandykeb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x080010, 0x08001d) AM_WRITE(vandykeb_scroll_w) /* 10, 12, 1a, 1c */
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c007) AM_WRITENOP /* just in case... */
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x094000, 0x097fff) AM_RAM /* what is this? */
@@ -356,7 +356,7 @@ static ADDRESS_MAP_START( manybloc_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x08001c, 0x08001d) AM_WRITENOP /* See notes at the top of the driver */
AM_RANGE(0x08001e, 0x08001f) AM_READWRITE(soundlatch2_word_r,soundlatch_word_w)
- AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x09c000, 0x09cfff) AM_RAM_WRITE(manybloc_scroll_w) AM_BASE(m_gunnail_scrollram)
AM_RANGE(0x09d000, 0x09d7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
@@ -375,7 +375,7 @@ static ADDRESS_MAP_START( tharrier_map, AS_PROGRAM, 16, nmk16_state )
// AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE(soundlatch_word_w)
AM_RANGE(0x080202, 0x080203) AM_READ_PORT("IN2")
- AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
// AM_RANGE(0x08c000, 0x08c007) AM_WRITE(nmk_scroll_w)
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x09c000, 0x09c7ff) AM_RAM /* Unused txvideoram area? */
@@ -410,7 +410,7 @@ static ADDRESS_MAP_START( mustang_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP // frame number?
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w)
AM_RANGE(0x08c002, 0x08c087) AM_WRITENOP // ??
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
@@ -427,7 +427,7 @@ static ADDRESS_MAP_START( mustangb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP // frame number?
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(seibu_main_mustb_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w)
AM_RANGE(0x08c002, 0x08c087) AM_WRITENOP // ??
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
@@ -445,7 +445,7 @@ static ADDRESS_MAP_START( twinactn_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITENOP // frame number?
AM_RANGE(0x08001e, 0x08001f) AM_WRITE(afega_soundlatch_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w)
AM_RANGE(0x08c002, 0x08c087) AM_WRITENOP // ??
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
@@ -466,7 +466,7 @@ static ADDRESS_MAP_START( acrobatm_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0xc0016, 0xc0017) AM_WRITENOP
AM_RANGE(0xc0018, 0xc0019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0xc001e, 0xc001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0xc4000, 0xc45ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc4000, 0xc45ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc8000, 0xc8007) AM_RAM_WRITE(nmk_scroll_w)
AM_RANGE(0xcc000, 0xcffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0xd4000, 0xd47ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
@@ -482,7 +482,7 @@ static ADDRESS_MAP_START( bioship_map, AS_PROGRAM, 16, nmk16_state )
// AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x084000, 0x084001) AM_WRITE(bioship_bank_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c007) AM_RAM_WRITE(bioshipbg_scroll_w)
AM_RANGE(0x08c010, 0x08c017) AM_RAM_WRITE(bioship_scroll_w)
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
@@ -662,7 +662,7 @@ static ADDRESS_MAP_START( hachamf_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
/* Video Region */
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c007) AM_WRITE(nmk_scroll_w)
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
@@ -895,7 +895,7 @@ static ADDRESS_MAP_START( tdragon_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */
AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE(nmk_scroll_w)
- AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
ADDRESS_MAP_END
@@ -912,7 +912,7 @@ static ADDRESS_MAP_START( tdragonb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */
AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE_LEGACY(seibu_main_mustb_w)
AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE(nmk_scroll_w)
- AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
ADDRESS_MAP_END
@@ -928,7 +928,7 @@ static ADDRESS_MAP_START( ssmissin_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */
AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE(ssmissin_sound_w)
AM_RANGE(0x0c4000, 0x0c4007) AM_RAM_WRITE(nmk_scroll_w)
- AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c8000, 0x0c87ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0cc000, 0x0cffff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x0d0000, 0x0d07ff) AM_MIRROR(0x1800) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram) //mirror for airattck
ADDRESS_MAP_END
@@ -953,7 +953,7 @@ static ADDRESS_MAP_START( strahl_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x8001e, 0x8001f) AM_WRITE_LEGACY(NMK004_w)
AM_RANGE(0x84000, 0x84007) AM_RAM_WRITE(nmk_scroll_w)
AM_RANGE(0x88000, 0x88007) AM_RAM_WRITE(nmk_scroll_2_w)
- AM_RANGE(0x8c000, 0x8c7ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x8c000, 0x8c7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x90000, 0x93fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x94000, 0x97fff) AM_RAM_WRITE(nmk_fgvideoram_w) AM_BASE(m_nmk_fgvideoram)
AM_RANGE(0x9c000, 0x9c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
@@ -971,7 +971,7 @@ static ADDRESS_MAP_START( macross_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080016, 0x080017) AM_WRITENOP /* IRQ enable? */
AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c007) AM_RAM_WRITE(nmk_scroll_w)
AM_RANGE(0x090000, 0x093fff) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
AM_RANGE(0x09c000, 0x09c7ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE(m_nmk_txvideoram)
@@ -989,7 +989,7 @@ static ADDRESS_MAP_START( gunnail_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x080016, 0x080017) AM_WRITENOP /* IRQ enable? */
AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x08001e, 0x08001f) AM_WRITE_LEGACY(NMK004_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08c000, 0x08c1ff) AM_WRITEONLY AM_BASE(m_gunnail_scrollram)
AM_RANGE(0x08c200, 0x08c3ff) AM_WRITEONLY AM_BASE(m_gunnail_scrollramy)
AM_RANGE(0x08c400, 0x08c7ff) AM_WRITEONLY // unknown
@@ -1009,7 +1009,7 @@ static ADDRESS_MAP_START( macross2_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x100016, 0x100017) AM_WRITE(macross2_sound_reset_w) /* Z80 reset */
AM_RANGE(0x100018, 0x100019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x10001e, 0x10001f) AM_WRITE(macross2_sound_command_w) /* to Z80 */
- AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x130000, 0x1301ff) AM_RAM AM_BASE(m_gunnail_scrollram)
AM_RANGE(0x130200, 0x1303ff) AM_RAM AM_BASE(m_gunnail_scrollramy)
@@ -1035,7 +1035,7 @@ static ADDRESS_MAP_START( raphero_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x100016, 0x100017) AM_WRITENOP /* IRQ enable or z80 sound reset like in Macross 2? */
AM_RANGE(0x100018, 0x100019) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x10001e, 0x10001f) AM_WRITE(macross2_sound_command_w) /* to Z80 */
- AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x130000, 0x1301ff) AM_RAM AM_BASE(m_gunnail_scrollram)
AM_RANGE(0x130200, 0x1303ff) AM_RAM AM_BASE(m_gunnail_scrollramy)
@@ -1110,7 +1110,7 @@ static ADDRESS_MAP_START( bjtwin_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x084000, 0x084001) AM_DEVREADWRITE8("oki1", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x084010, 0x084011) AM_DEVREADWRITE8("oki2", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x084020, 0x08402f) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_lsb_w)
- AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0887ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x094000, 0x094001) AM_WRITE(nmk_tilebank_w)
AM_RANGE(0x094002, 0x094003) AM_WRITENOP /* IRQ enable? */
AM_RANGE(0x09c000, 0x09cfff) AM_MIRROR(0x1000) AM_RAM_WRITE(nmk_bgvideoram0_w) AM_BASE(m_nmk_bgvideoram0)
@@ -4624,7 +4624,7 @@ static ADDRESS_MAP_START( afega, AS_PROGRAM, 16, nmk16_state )
/**/AM_RANGE(0x084000, 0x084003) AM_RAM_WRITE(afega_scroll0_w) // Scroll on redhawkb (mirror or changed?..)
/**/AM_RANGE(0x084004, 0x084007) AM_RAM_WRITE(afega_scroll1_w) // Scroll on redhawkb (mirror or changed?..)
AM_RANGE(0x080020, 0x087fff) AM_WRITEONLY //
-/**/AM_RANGE(0x088000, 0x0885ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") // Palette
+/**/AM_RANGE(0x088000, 0x0885ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x088600, 0x08bfff) AM_WRITEONLY //
/**/AM_RANGE(0x08c000, 0x08c003) AM_RAM_WRITE(afega_scroll0_w) AM_BASE(m_afega_scroll_0) // Scroll
/**/AM_RANGE(0x08c004, 0x08c007) AM_RAM_WRITE(afega_scroll1_w) AM_BASE(m_afega_scroll_1) //
@@ -4657,7 +4657,7 @@ WRITE16_MEMBER(nmk16_state::twinactn_scroll1_w)
WRITE16_MEMBER(nmk16_state::twinactn_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
if (data & (~1))
logerror("%06x: unknown flip screen bit written %04x\n", cpu_get_pc(&space.device()), data);
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 5f0b81d02e0..a4623357665 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -45,7 +45,7 @@ static ADDRESS_MAP_START( ohmygod_map, AS_PROGRAM, 16, ohmygod_state )
AM_RANGE(0x308000, 0x30ffff) AM_RAM
AM_RANGE(0x400000, 0x400001) AM_WRITE(ohmygod_scrollx_w)
AM_RANGE(0x400002, 0x400003) AM_WRITE(ohmygod_scrolly_w)
- AM_RANGE(0x600000, 0x6007ff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x6007ff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x703fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x704000, 0x707fff) AM_RAM
AM_RANGE(0x708000, 0x70ffff) AM_RAM /* Work RAM */
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 5845c985a7e..949a09de2a2 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -134,9 +134,9 @@ WRITE8_MEMBER(olibochu_state::olibochu_colorram_w)
WRITE8_MEMBER(olibochu_state::olibochu_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x80))
+ if (flip_screen() != (data & 0x80))
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
machine().tilemap().mark_all_dirty();
}
@@ -178,7 +178,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = spriteram[offs + 3];
int sy = ((spriteram[offs + 2] + 8) & 0xff) - 8;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -204,7 +204,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = spriteram_2[offs + 3];
int sy = spriteram_2[offs + 2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 248 - sx;
sy = 248 - sy;
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index b56ee2c7e50..cd6b2885818 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -103,7 +103,7 @@ static WRITE16_DEVICE_HANDLER( soundbank_w )
static ADDRESS_MAP_START( oneshot_map, AS_PROGRAM, 16, oneshot_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
- AM_RANGE(0x0c0000, 0x0c07ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c0000, 0x0c07ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x120000, 0x120fff) AM_RAM AM_BASE(m_sprites)
AM_RANGE(0x180000, 0x180fff) AM_RAM_WRITE(oneshot_mid_videoram_w) AM_BASE(m_mid_videoram) // some people , girl etc.
AM_RANGE(0x181000, 0x181fff) AM_RAM_WRITE(oneshot_fg_videoram_w) AM_BASE(m_fg_videoram) // credits etc.
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 85c68adbe74..6ca5dbb4ab3 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -362,7 +362,7 @@ static ADDRESS_MAP_START( opwolf_map, AS_PROGRAM, 16, opwolf_state )
AM_RANGE(0x0ff802, 0x0ff803) AM_WRITE(opwolf_cchip_status_w)
AM_RANGE(0x0ffc00, 0x0ffc01) AM_WRITE(opwolf_cchip_bank_w)
AM_RANGE(0x100000, 0x107fff) AM_RAM
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */
AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire
AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */
@@ -383,7 +383,7 @@ static ADDRESS_MAP_START( opwolfb_map, AS_PROGRAM, 16, opwolf_state )
AM_RANGE(0x0f0008, 0x0f000b) AM_READ(opwolf_in_r) /* coins and buttons */
AM_RANGE(0x0ff000, 0x0fffff) AM_READWRITE(cchip_r,cchip_w)
AM_RANGE(0x100000, 0x107fff) AM_RAM
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */
AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire
AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index c8a0446599a..6ecc2532700 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( othldrby_map, AS_PROGRAM, 16, othldrby_state )
AM_RANGE(0x300008, 0x300009) AM_WRITE(othldrby_vreg_addr_w)
AM_RANGE(0x30000c, 0x30000d) AM_READ_PORT("VBLANK")
AM_RANGE(0x30000c, 0x30000f) AM_WRITE(othldrby_vreg_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x600001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x700000, 0x700001) AM_READ(othldrby_scanline_r)
AM_RANGE(0x700004, 0x700005) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 769612cc174..8103b485012 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -157,7 +157,7 @@ WRITE16_MEMBER(overdriv_state::overdriv_cpuB_irq6_w)
static ADDRESS_MAP_START( overdriv_master_map, AS_PROGRAM, 16, overdriv_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM /* work RAM */
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("INPUTS")
AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0e0000, 0x0e0001) AM_WRITENOP /* unknown (always 0x30) */
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 57dd00dd730..3d77ebdbecd 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -187,9 +187,9 @@ WRITE8_MEMBER(pacland_state::pacland_subreset_w)
WRITE8_MEMBER(pacland_state::pacland_flipscreen_w)
{
int bit = !BIT(offset,11);
- /* can't use flip_screen_set(machine(), ) because the visible area is asymmetrical */
- flip_screen_set_no_update(machine(), bit);
- machine().tilemap().set_flip_all(flip_screen_get(machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ /* can't use flip_screen_set() because the visible area is asymmetrical */
+ flip_screen_set_no_update(bit);
+ machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 6a7a9d19686..90b2d8d7a60 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -46,9 +46,9 @@ WRITE8_MEMBER(parodius_state::bankedram_w)
if (m_videobank & 0x01)
{
if (m_videobank & 0x04)
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset + 0x0800, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset + 0x0800, data);
else
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
}
else
m_ram[offset] = data;
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index b23ad2930c7..5a57a51e945 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -113,7 +113,7 @@ static ADDRESS_MAP_START( pass_map, AS_PROGRAM, 16, pass_state )
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(pass_bg_videoram_w) AM_BASE(m_bg_videoram) // Background
AM_RANGE(0x210000, 0x213fff) AM_RAM_WRITE(pass_fg_videoram_w) AM_BASE(m_fg_videoram) // Foreground
- AM_RANGE(0x220000, 0x2203ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x220000, 0x2203ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x230000, 0x230001) AM_WRITE(soundlatch_word_w)
AM_RANGE(0x230100, 0x230101) AM_READ_PORT("DSW")
AM_RANGE(0x230200, 0x230201) AM_READ_PORT("INPUTS")
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 8ee98763621..c6723417195 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( pbaction_map, AS_PROGRAM, 8, pbaction_state )
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(pbaction_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(pbaction_colorram_w) AM_BASE(m_colorram)
AM_RANGE(0xe000, 0xe07f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xe400, 0xe5ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe400, 0xe5ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xe600, 0xe600) AM_READ_PORT("P1") AM_WRITE(nmi_mask_w)
AM_RANGE(0xe601, 0xe601) AM_READ_PORT("P2")
AM_RANGE(0xe602, 0xe602) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 783a5a42553..7416ee59bb7 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -323,7 +323,7 @@ ADDRESS_MAP_START( pgm_base_mem, AS_PROGRAM, 16, pgm_state )
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE_LEGACY(&pgm_mainram) AM_SHARE("sram") /* Main Ram */
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_READWRITE(pgm_videoram_r, pgm_videoram_w) AM_BASE(m_videoram) /* IGS023 VIDEO CHIP */
- AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(m_videoregs) /* Video Regs inc. Zoom Table */
AM_RANGE(0xc00002, 0xc00003) AM_READ(soundlatch_word_r) AM_WRITE(m68k_l1_w)
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index 5e07a693cf6..d7330f40a0a 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -77,8 +77,8 @@ static ADDRESS_MAP_START( janshi_vdp_map8, AS_0, 8, pinkiri8_state )
AM_RANGE(0xfc3800, 0xfc3fff) AM_RAM AM_BASE(m_janshi_vram2) // y pos + unknown
- AM_RANGE(0xff0000, 0xff07ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xff2000, 0xff27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xff0000, 0xff07ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xff2000, 0xff27ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xff6000, 0xff601f) AM_RAM AM_BASE(m_janshi_crtc_regs)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index c7c62cae9a5..3e930c5175a 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -268,7 +268,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, fromance_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 0e6432d8e71..1b3131e13ea 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -172,7 +172,7 @@ static ADDRESS_MAP_START( pirates_map, AS_PROGRAM, 16, pirates_state )
// AM_RANGE(0x500800, 0x50080f) AM_WRITENOP
AM_RANGE(0x600000, 0x600001) AM_WRITE(pirates_out_w)
AM_RANGE(0x700000, 0x700001) AM_WRITEONLY AM_BASE(m_scroll) // scroll reg
- AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x900000, 0x90017f) AM_RAM // more of tilemaps ?
AM_RANGE(0x900180, 0x90137f) AM_RAM_WRITE(pirates_tx_tileram_w) AM_BASE(m_tx_tileram)
AM_RANGE(0x901380, 0x902a7f) AM_RAM_WRITE(pirates_fg_tileram_w) AM_BASE(m_fg_tileram)
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 426aa003821..003a2ad9eed 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -83,12 +83,12 @@ WRITE8_MEMBER(pitnrun_state::nmi_enable_w)
WRITE8_MEMBER(pitnrun_state::pitnrun_hflip_w)
{
- flip_screen_x_set(machine(), data);
+ flip_screen_x_set(data);
}
WRITE8_MEMBER(pitnrun_state::pitnrun_vflip_w)
{
- flip_screen_y_set(machine(), data);
+ flip_screen_y_set(data);
}
static ADDRESS_MAP_START( pitnrun_map, AS_PROGRAM, 8, pitnrun_state )
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index dd63e5420e3..ae0d5be8f03 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( pkscramble_map, AS_PROGRAM, 16, pkscram_state )
AM_RANGE(0x045000, 0x045fff) AM_RAM_WRITE(pkscramble_mdtilemap_w) AM_BASE(m_pkscramble_mdtilemap_ram) // md tilemap (just a copy of fg?)
AM_RANGE(0x046000, 0x046fff) AM_RAM_WRITE(pkscramble_bgtilemap_w) AM_BASE(m_pkscramble_bgtilemap_ram) // bg tilemap
AM_RANGE(0x047000, 0x047fff) AM_RAM // unused
- AM_RANGE(0x048000, 0x048fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x048000, 0x048fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x049000, 0x049001) AM_READ_PORT("DSW")
AM_RANGE(0x049004, 0x049005) AM_READ_PORT("INPUTS")
AM_RANGE(0x049008, 0x049009) AM_WRITE(pkscramble_output_w)
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index 207d2090653..cc573ffdb66 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( pktgaldb_map, AS_PROGRAM, 16, pktgaldx_state )
AM_RANGE(0x300000, 0x30000f) AM_RAM // ??
- AM_RANGE(0x330000, 0x330bff) AM_RAM_WRITE(paletteram16_xbgr_word_be_w) AM_SHARE("paletteram") // extra colours?
+ AM_RANGE(0x330000, 0x330bff) AM_RAM_WRITE(paletteram_xbgr_word_be_w) AM_SHARE("paletteram") // extra colours?
ADDRESS_MAP_END
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index db701b43c5d..d88560c7b81 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -276,7 +276,7 @@ static ADDRESS_MAP_START( wbeachvl_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0x71001a, 0x71001b) AM_READ_PORT("P4")
// AM_RANGE(0x71001c, 0x71001d) AM_READ_LEGACY(playmark_snd_status???)
// AM_RANGE(0x71001e, 0x71001f) AM_WRITENOP//playmark_snd_command_w },
- AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 0695b829f47..3718c86ef51 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -395,7 +395,7 @@ static WRITE8_DEVICE_HANDLER( popeye_portB_w )
{
popeye_state *state = device->machine().driver_data<popeye_state>();
/* bit 0 flips screen */
- flip_screen_set(device->machine(), data & 1);
+ state->flip_screen_set(data & 1);
/* bits 1-3 select DSW1 bit to read */
state->m_dswbit = (data & 0x0e) >> 1;
diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c
index e4e1ec274e4..d33787df376 100644
--- a/src/mame/drivers/popobear.c
+++ b/src/mame/drivers/popobear.c
@@ -303,7 +303,7 @@ static ADDRESS_MAP_START( popobear_mem, AS_PROGRAM, 16, popobear_state )
AM_RANGE(0x480034, 0x480035) AM_RAM // coin counter or coin lockout
AM_RANGE(0x48003a, 0x48003b) AM_RAM //AM_READ_LEGACY(popo_48003a_r) AM_WRITE_LEGACY(popo_48003a_w)
- AM_RANGE(0x480400, 0x4807ff) AM_RAM AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x480400, 0x4807ff) AM_RAM AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("IN0")
AM_RANGE(0x520000, 0x520001) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 01afa33d1cb..f2c8a12ae22 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -31,7 +31,7 @@ static ADDRESS_MAP_START( prehisle_map, AS_PROGRAM, 16, prehisle_state )
AM_RANGE(0x090000, 0x0907ff) AM_RAM_WRITE(prehisle_fg_videoram16_w) AM_BASE(m_videoram)
AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(prehisle_bg_videoram16_w) AM_BASE(m_bg_videoram16)
- AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0e0000, 0x0e00ff) AM_READ(prehisle_control16_r)
AM_RANGE(0x0f0070, 0x0ff071) AM_WRITE(prehisle_sound16_w)
AM_RANGE(0x0f0000, 0x0ff0ff) AM_WRITE(prehisle_control16_w)
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index c01055292a0..051efd2451b 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -190,7 +190,7 @@ WRITE8_MEMBER(progolf_state::progolf_scrollx_hi_w)
WRITE8_MEMBER(progolf_state::progolf_flip_screen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
if(data & 0xfe)
printf("$9600 with data = %02x used\n",data);
}
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 443d1b831aa..64fb0df6175 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -313,9 +313,9 @@ READ32_MEMBER(psikyo_state::paletteram32_dword_r)
WRITE32_MEMBER(psikyo_state::paletteram32_xRRRRRGGGGGBBBBB_dword_w)
{
if (ACCESSING_BITS_16_31)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(space, offset * 2, data >> 16, mem_mask >> 16);
+ paletteram_xRRRRRGGGGGBBBBB_word_w(space, offset * 2, data >> 16, mem_mask >> 16);
if (ACCESSING_BITS_0_15)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(space, offset * 2 + 1, data, mem_mask);
+ paletteram_xRRRRRGGGGGBBBBB_word_w(space, offset * 2 + 1, data, mem_mask);
}
static ADDRESS_MAP_START( psikyo_map, AS_PROGRAM, 32, psikyo_state )
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 7fb83845692..6cb470da73b 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -319,7 +319,7 @@ static MACHINE_RESET( psychic5 )
{
psychic5_state *state = machine.driver_data<psychic5_state>();
state->m_bank_latch = 0xff;
- flip_screen_set(machine, 0);
+ state->flip_screen_set(0);
}
/***************************************************************************
@@ -386,7 +386,7 @@ WRITE8_MEMBER(psychic5_state::psychic5_coin_counter_w)
// bit 7 toggles flip screen
if (data & 0x80)
{
- flip_screen_set(machine(), !flip_screen_get(machine()));
+ flip_screen_set(!flip_screen());
}
}
@@ -395,7 +395,7 @@ WRITE8_MEMBER(psychic5_state::bombsa_flipscreen_w)
// bit 7 toggles flip screen
if (data & 0x80)
{
- flip_screen_set(machine(), !flip_screen_get(machine()));
+ flip_screen_set(!flip_screen());
}
}
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index caf2bb0fd14..1dd7adf990c 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -179,13 +179,13 @@ static SCREEN_UPDATE_IND16(pturn)
flipy=spriteram[offs+1]&0x80;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
sx = 224 - sx;
flipx ^= 0x40;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy ^= 0x80;
sy = 224 - sy;
@@ -277,7 +277,7 @@ WRITE8_MEMBER(pturn_state::bgbank_w)
WRITE8_MEMBER(pturn_state::flip_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index f1493a44837..be33fc96549 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -35,7 +35,7 @@ WRITE16_MEMBER(pushman_state::pushman_flipscreen_w)
{
if (ACCESSING_BITS_8_15)
{
- flip_screen_set(machine(), data & 0x0200);
+ flip_screen_set(data & 0x0200);
coin_counter_w(machine(), 0, data & 0x4000);
coin_counter_w(machine(), 1, data & 0x8000);
}
@@ -153,7 +153,7 @@ static ADDRESS_MAP_START( pushman_map, AS_PROGRAM, 16, pushman_state )
AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE(pushman_scroll_w)
AM_RANGE(0xfe800e, 0xfe800f) AM_WRITENOP /* ? */
AM_RANGE(0xfec000, 0xfec7ff) AM_RAM_WRITE(pushman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xff8000, 0xff87ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xff8000, 0xff87ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( bballs_map, AS_PROGRAM, 16, pushman_state )
AM_RANGE(0xe8000, 0xe8003) AM_WRITE(pushman_scroll_w)
AM_RANGE(0xe800e, 0xe800f) AM_WRITENOP /* ? */
AM_RANGE(0xec000, 0xec7ff) AM_RAM_WRITE(pushman_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0xf8000, 0xf87ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf8000, 0xf87ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfc000, 0xfffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index 13f2bc1862c..5a89a9c2018 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( pzletime_map, AS_PROGRAM, 16, pzletime_state )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x700000, 0x700005) AM_RAM_WRITE(video_regs_w) AM_BASE(m_video_regs)
AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x900000, 0x9005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x900000, 0x9005ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xa00000, 0xa00007) AM_RAM AM_BASE(m_tilemap_regs)
AM_RANGE(0xb00000, 0xb3ffff) AM_RAM AM_BASE(m_bg_videoram)
AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(mid_videoram_w) AM_BASE(m_mid_videoram)
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 6f27ec2bbab..fe679b783d8 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -334,7 +334,7 @@ static ADDRESS_MAP_START( qdrmfgp_map, AS_PROGRAM, 16, qdrmfgp_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(m_workram) /* work ram */
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_SHARE("nvram") /* backup ram */
- AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30003f) AM_DEVWRITE_LEGACY("k056832", k056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE8_LEGACY("k053252", k053252_r, k053252_w,0x00ff) /* ccu */
AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service sw */
@@ -357,7 +357,7 @@ static ADDRESS_MAP_START( qdrmfgp2_map, AS_PROGRAM, 16, qdrmfgp_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x110fff) AM_RAM AM_BASE(m_workram) /* work ram */
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_SHARE("nvram") /* backup ram */
- AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x280fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30003f) AM_DEVWRITE_LEGACY("k056832", k056832_word_w) /* video reg */
AM_RANGE(0x320000, 0x32001f) AM_DEVREADWRITE8_LEGACY("k053252", k053252_r, k053252_w,0xff00) /* ccu */
AM_RANGE(0x330000, 0x330001) AM_READ_PORT("SENSOR") /* battery power & service */
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index b46e51946f9..c0a21b15c89 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -62,7 +62,7 @@ static ADDRESS_MAP_START( quizpani_map, AS_PROGRAM, 16, quizpani_state )
AM_RANGE(0x100018, 0x100019) AM_WRITE(quizpani_tilesbank_w)
AM_RANGE(0x104000, 0x104001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x104020, 0x104027) AM_DEVWRITE_LEGACY("nmk112", nmk112_okibank_lsb_w)
- AM_RANGE(0x108000, 0x1083ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x108000, 0x1083ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x108400, 0x1085ff) AM_WRITENOP
AM_RANGE(0x10c000, 0x10c007) AM_RAM AM_BASE(m_scrollreg)
AM_RANGE(0x10c008, 0x10c403) AM_WRITENOP
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index f011b34c79a..ef2fbe4e99b 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -364,7 +364,7 @@ static ADDRESS_MAP_START( quizpun2_map, AS_PROGRAM, 8, quizpun2_state )
AM_RANGE( 0xc000, 0xc7ff ) AM_RAM_WRITE(bg_ram_w ) AM_BASE(m_bg_ram ) // 4 * 400
AM_RANGE( 0xc800, 0xcfff ) AM_RAM //
- AM_RANGE( 0xd000, 0xd3ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0xd000, 0xd3ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w ) AM_SHARE("paletteram")
AM_RANGE( 0xe000, 0xffff ) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c
index 107632b54b9..33386699d9a 100644
--- a/src/mame/drivers/r2dx_v33.c
+++ b/src/mame/drivers/r2dx_v33.c
@@ -408,7 +408,7 @@ static ADDRESS_MAP_START( rdx_v33_map, AS_PROGRAM, 16, r2dx_v33_state )
AM_RANGE(0x0e800, 0x0f7ff) AM_RAM_WRITE(rdx_tx_vram_w) AM_BASE_LEGACY(&tx_vram)
AM_RANGE(0x0f800, 0x0ffff) AM_RAM /* Stack area */
AM_RANGE(0x10000, 0x1efff) AM_RAM
- AM_RANGE(0x1f000, 0x1ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1f000, 0x1ffff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank1")
AM_RANGE(0x40000, 0xfffff) AM_ROM AM_REGION("mainprg", 0x40000 )
@@ -481,7 +481,7 @@ static ADDRESS_MAP_START( nzerotea_map, AS_PROGRAM, 16, r2dx_v33_state )
AM_RANGE(0x0e800, 0x0f7ff) AM_RAM_WRITE(rdx_tx_vram_w) AM_BASE_LEGACY(&tx_vram)
AM_RANGE(0x0f800, 0x0ffff) AM_RAM /* Stack area */
AM_RANGE(0x10000, 0x1efff) AM_RAM
- AM_RANGE(0x1f000, 0x1ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1f000, 0x1ffff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank1")
AM_RANGE(0x40000, 0xfffff) AM_ROM AM_REGION("mainprg", 0x40000 )
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 00ef774e5f1..e3b8d575593 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16, raiden_state )
AM_RANGE(0x00000, 0x01fff) AM_RAM
AM_RANGE(0x02000, 0x027ff) AM_RAM_WRITE(raiden_background_w) AM_BASE(m_back_data)
AM_RANGE(0x02800, 0x02fff) AM_RAM_WRITE(raiden_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x03000, 0x03fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x03000, 0x03fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x07ffe, 0x0afff) AM_WRITENOP
AM_RANGE(0xc0000, 0xfffff) AM_ROM
@@ -104,7 +104,7 @@ static ADDRESS_MAP_START( raidenu_sub_map, AS_PROGRAM, 16, raiden_state )
AM_RANGE(0x00000, 0x05fff) AM_RAM
AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE(raiden_background_w) AM_BASE(m_back_data)
AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE(raiden_foreground_w) AM_BASE(m_fore_data)
- AM_RANGE(0x07000, 0x07fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x07000, 0x07fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_SHARE("share1")
//AM_RANGE(0x07ffe, 0x0afff) AM_WRITENOP
AM_RANGE(0xc0000, 0xfffff) AM_ROM
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 1336f29fd5b..7db9edbf2a3 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -1271,7 +1271,7 @@ static ADDRESS_MAP_START( raiden2_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x0f800, 0x0ffff) AM_RAM /* Stack area */
AM_RANGE(0x10000, 0x1efff) AM_RAM
- AM_RANGE(0x1f000, 0x1ffff) AM_RAM AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1f000, 0x1ffff) AM_RAM AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("mainbank")
AM_RANGE(0x40000, 0xfffff) AM_ROM AM_REGION("mainprg", 0x40000)
@@ -1308,7 +1308,7 @@ static ADDRESS_MAP_START( zeroteam_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE(raiden2_foreground_w) AM_BASE(fore_data)
AM_RANGE(0x0c800, 0x0cfff) AM_RAM_WRITE(raiden2_midground_w) AM_BASE(mid_data)
AM_RANGE(0x0d000, 0x0dfff) AM_RAM_WRITE(raiden2_text_w) AM_BASE(text_data)
- AM_RANGE(0x0e000, 0x0efff) AM_RAM AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0e000, 0x0efff) AM_RAM AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0f000, 0x0ffff) AM_RAM AM_BASE(sprites)
AM_RANGE(0x10000, 0x1ffff) AM_RAM
@@ -1338,7 +1338,7 @@ static ADDRESS_MAP_START( xsedae_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE(raiden2_foreground_w) AM_BASE(fore_data)
AM_RANGE(0x0c800, 0x0cfff) AM_RAM_WRITE(raiden2_midground_w) AM_BASE(mid_data)
AM_RANGE(0x0d000, 0x0dfff) AM_RAM_WRITE(raiden2_text_w) AM_BASE(text_data)
- AM_RANGE(0x0e000, 0x0efff) AM_RAM AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0e000, 0x0efff) AM_RAM AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0f000, 0x0ffff) AM_RAM AM_BASE(sprites)
AM_RANGE(0x10000, 0x1ffff) AM_RAM
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 6f739c5fa94..db9346c8eac 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -347,7 +347,7 @@ WRITE16_MEMBER(rbisland_state::jumping_sound_w)
static ADDRESS_MAP_START( rbisland_map, AS_PROGRAM, 16, rbisland_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x10c000, 0x10ffff) AM_RAM /* main RAM */
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x201000, 0x203fff) AM_RAM /* r/w in initial checks */
AM_RANGE(0x390000, 0x390003) AM_READ_PORT("DSWA")
AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE(rbisland_spritectrl_w)
@@ -368,7 +368,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( jumping_map, AS_PROGRAM, 16, rbisland_state )
AM_RANGE(0x000000, 0x09ffff) AM_ROM
AM_RANGE(0x10c000, 0x10ffff) AM_RAM /* main RAM */
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x201000, 0x203fff) AM_RAM /* r/w in initial checks */
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("DSWA")
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("DSWB")
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 478b5695ce0..91e7b94cd59 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -243,7 +243,7 @@ WRITE8_MEMBER(rallyx_state::rallyx_latch_w)
break;
case 0x03: /* FLIP */
- flip_screen_set_no_update(machine(), bit);
+ flip_screen_set_no_update(bit);
machine().tilemap().set_flip_all(bit * (TILEMAP_FLIPX | TILEMAP_FLIPY));
break;
@@ -285,7 +285,7 @@ WRITE8_MEMBER(rallyx_state::locomotn_latch_w)
break;
case 0x03: /* FLIP */
- flip_screen_set_no_update(machine(), bit);
+ flip_screen_set_no_update(bit);
machine().tilemap().set_flip_all(bit * (TILEMAP_FLIPX | TILEMAP_FLIPY));
break;
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 55372a72ac7..7265cb9f8f3 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -205,7 +205,7 @@ static WRITE8_DEVICE_HANDLER( rastan_msm5205_stop_w )
static ADDRESS_MAP_START( rastan_map, AS_PROGRAM, 16, rastan_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x10c000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x350008, 0x350009) AM_WRITENOP /* 0 only (often) ? */
AM_RANGE(0x380000, 0x380001) AM_WRITE(rastan_spritectrl_w) /* sprite palette bank, coin counters & lockout */
AM_RANGE(0x390000, 0x390001) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 4e5647b57f2..de56a2376f7 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( rbmk_mem, AS_PROGRAM, 16, rbmk_state )
AM_RANGE(0x500000, 0x50ffff) AM_RAM
AM_RANGE(0x940000, 0x940fff) AM_RAM AM_BASE(m_gms_vidram2)
AM_RANGE(0x980300, 0x983fff) AM_RAM // 0x2048 words ???, byte access
- AM_RANGE(0x900000, 0x900fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x900000, 0x900fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x9c0000, 0x9c0fff) AM_RAM AM_BASE(m_gms_vidram)
AM_RANGE(0xb00000, 0xb00001) AM_DEVWRITE_LEGACY("eeprom", eeprom_w)
AM_RANGE(0xC00000, 0xC00001) AM_READ_PORT("IN0") AM_WRITE(gms_write1)
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 5a7eb45f43e..ee866ccfa81 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -155,7 +155,7 @@ WRITE16_MEMBER(realbrk_state::backup_ram_w)
static ADDRESS_MAP_START( base_mem, AS_PROGRAM, 16, realbrk_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(m_spriteram) // Sprites
- AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram" ) // Palette
+ AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram" ) // Palette
AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(realbrk_vram_0_w) AM_BASE(m_vram_0 ) // Background (0)
AM_RANGE(0x602000, 0x603fff) AM_RAM_WRITE(realbrk_vram_1_w) AM_BASE(m_vram_1 ) // Background (1)
AM_RANGE(0x604000, 0x604fff) AM_RAM_WRITE(realbrk_vram_2_w) AM_BASE(m_vram_2 ) // Text (2)
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 3eecf6f6125..9ce6e112fbf 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -647,8 +647,8 @@ static ADDRESS_MAP_START( renegade_map, AS_PROGRAM, 8, renegade_state )
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(renegade_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(renegade_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x3000, 0x30ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x3100, 0x31ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x3000, 0x30ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3100, 0x31ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("IN0") AM_WRITE(renegade_scroll0_w) /* Player#1 controls, P1,P2 start */
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("IN1") AM_WRITE(renegade_scroll1_w) /* Player#2 controls, coin triggers */
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("DSW2") AM_WRITE(sound_w) /* DIP2 various IO ports */
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index f44b0cec4e7..9d763792bfb 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -165,7 +165,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_w )
WRITE8_MEMBER(rmhaihai_state::ctrl_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
// (data & 0x02) is switched on and off in service mode
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 3d58e13976b..c541f8a0f1f 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( rollerg_map, AS_PROGRAM, 8, rollerg_state )
AM_RANGE(0x0300, 0x030f) AM_DEVREADWRITE_LEGACY("k053244", k053244_r, k053244_w)
AM_RANGE(0x0800, 0x0fff) AM_READ(rollerg_k051316_r) AM_DEVWRITE_LEGACY("k051316", k051316_w)
AM_RANGE(0x1000, 0x17ff) AM_DEVREADWRITE_LEGACY("k053244", k053245_r, k053245_w)
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0x2000, 0x3aff) AM_RAM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 2c74944cec3..3be95954eb5 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -409,7 +409,7 @@ WRITE8_MEMBER(royalmah_state::mjapinky_bank_w)
WRITE8_MEMBER(royalmah_state::mjapinky_palbank_w)
{
- flip_screen_set(machine(), ~data & 4);
+ flip_screen_set(~data & 4);
m_palette_base = (data >> 3) & 0x01;
coin_counter_w(machine(), 0,data & 2); // in
coin_counter_w(machine(), 1,data & 1); // out
@@ -845,7 +845,7 @@ READ8_MEMBER(royalmah_state::janptr96_unknown_r)
WRITE8_MEMBER(royalmah_state::janptr96_coin_counter_w)
{
- flip_screen_set(machine(), ~data & 4);
+ flip_screen_set(~data & 4);
coin_counter_w(machine(), 0,data & 2); // in
coin_counter_w(machine(), 1,data & 1); // out
}
@@ -872,7 +872,7 @@ ADDRESS_MAP_END
WRITE8_MEMBER(royalmah_state::mjifb_coin_counter_w)
{
- flip_screen_set(machine(), data & 4);
+ flip_screen_set(data & 4);
coin_counter_w(machine(), 0,data & 2); // in
coin_counter_w(machine(), 1,data & 1); // out
}
@@ -1216,7 +1216,7 @@ WRITE8_MEMBER(royalmah_state::mjvegasa_rom_io_w)
WRITE8_MEMBER(royalmah_state::mjvegasa_coin_counter_w)
{
- flip_screen_set(machine(), data & 4);
+ flip_screen_set(data & 4);
coin_counter_w(machine(), 0,data & 2); // in
coin_counter_w(machine(), 1,data & 1); // out
}
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 88510a534b5..6cd7d0fc4c1 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -227,7 +227,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, rpunch_state )
AM_RANGE(0x040000, 0x04ffff) AM_RAM AM_BASE(m_bitmapram) AM_SIZE(m_bitmapram_size)
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x080000, 0x083fff) AM_RAM_WRITE(rpunch_videoram_w) AM_BASE(m_videoram)
- AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE(rpunch_scrollreg_w)
AM_RANGE(0x0c0008, 0x0c0009) AM_WRITE(rpunch_crtc_data_w)
AM_RANGE(0x0c000c, 0x0c000d) AM_WRITE(rpunch_videoreg_w)
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index d2d10af9dc9..ace3e0e3f0f 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -181,7 +181,7 @@ static INTERRUPT_GEN(rng_interrupt)
static ADDRESS_MAP_START( rungun_map, AS_PROGRAM, 16, rungun_state )
AM_RANGE(0x000000, 0x2fffff) AM_ROM // main program + data
- AM_RANGE(0x300000, 0x3007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x3007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x380000, 0x39ffff) AM_RAM // work RAM
AM_RANGE(0x400000, 0x43ffff) AM_READNOP // AM_READ_LEGACY(K053936_0_rom_r ) // '936 ROM readback window
AM_RANGE(0x480000, 0x48001f) AM_READWRITE(rng_sysregs_r, rng_sysregs_w) AM_BASE(m_sysreg)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 1abe2799606..05497711297 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -249,7 +249,7 @@ static ADDRESS_MAP_START( sandscrp, AS_PROGRAM, 16, sandscrp_state )
AM_RANGE(0x402000, 0x402fff) AM_RAM AM_BASE(m_vscroll[1]) //
AM_RANGE(0x403000, 0x403fff) AM_RAM AM_BASE(m_vscroll[0]) //
AM_RANGE(0x500000, 0x501fff) AM_DEVREADWRITE_LEGACY("pandora", pandora_spriteram_LSB_r, pandora_spriteram_LSB_w ) // sprites
- AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x600000, 0x600fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xa00000, 0xa00001) AM_WRITE(sandscrp_coin_counter_w) // Coin Counters (Lockout unused)
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1")
AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 43bc43418c3..3f2e45c5550 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -155,7 +155,7 @@ WRITE8_MEMBER(sauro_state::sauro_coin2_w)
WRITE8_MEMBER(sauro_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
static WRITE8_DEVICE_HANDLER( adpcm_w )
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 720f2721348..643fb86d6ce 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -93,7 +93,7 @@ static void plot_pixel_sbw(bitmap_ind16 *tmpbitmap, int x, int y, int col, int f
WRITE8_MEMBER(sbowling_state::sbw_videoram_w)
{
- int flip = flip_screen_get(machine());
+ int flip = flip_screen();
int x,y,i,v1,v2;
m_videoram[offset] = data;
@@ -183,7 +183,7 @@ WRITE8_MEMBER(sbowling_state::system_w)
*/
- flip_screen_set(machine(), data&1);
+ flip_screen_set(data&1);
if ((m_sbw_system^data)&1)
{
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index f0c8daf2d34..69def1e04fb 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -43,7 +43,7 @@ WRITE8_MEMBER(scotrsht_state::ctrl_w)
{
m_irq_enable = data & 0x02;
- flip_screen_set(machine(), data & 0x08);
+ flip_screen_set(data & 0x08);
}
static INTERRUPT_GEN( scotrsht_interrupt )
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 17c04087710..9a6222ad068 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -286,7 +286,7 @@ static ADDRESS_MAP_START( sderby_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x308000, 0x30800d) AM_READ(sderby_input_r)
AM_RANGE(0x308008, 0x308009) AM_WRITE(sderby_out_w) /* output port */
AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* unknown... write 0x01 in game, and 0x00 on reset */
AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xffc000, 0xffffff) AM_RAM
@@ -305,7 +305,7 @@ static ADDRESS_MAP_START( luckboom_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x308000, 0x30800d) AM_READ(sderby_input_r)
AM_RANGE(0x308008, 0x308009) AM_WRITE(sderby_out_w) /* output port */
AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* unknown... write 0x01 in game, and 0x00 on reset */
AM_RANGE(0xe00000, 0xe007ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xff0000, 0xffffff) AM_RAM
@@ -324,7 +324,7 @@ static ADDRESS_MAP_START( spacewin_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x308000, 0x30800d) AM_READ(sderby_input_r)
AM_RANGE(0x308008, 0x308009) AM_WRITE(scmatto_out_w) /* output port */
AM_RANGE(0x30800e, 0x30800f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd00000, 0xd001ff) AM_RAM
AM_RANGE(0x800000, 0x800fff) AM_RAM AM_BASE(m_spriteram) AM_SIZE(m_spriteram_size)
AM_RANGE(0x801000, 0x80100d) AM_WRITENOP /* unknown */
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( roulette_map, AS_PROGRAM, 16, sderby_state )
AM_RANGE(0x70800a, 0x70800b) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x70800c, 0x70800d) AM_WRITENOP /* watchdog?? (0x0003) */
AM_RANGE(0x70800e, 0x70800f) AM_READWRITE(rprot_r, rprot_w) /* MCU communication */
- AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xff0000, 0xff07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xffc000, 0xffffff) AM_RAM
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 15c843ed4fb..4a5231d055d 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -121,7 +121,7 @@ static ADDRESS_MAP_START( sengokmj_map, AS_PROGRAM, 16, sengokmj_state )
AM_RANGE(0x0c800, 0x0cfff) AM_RAM_WRITE_LEGACY(seibucrtc_sc1vram_w) AM_BASE_LEGACY(&seibucrtc_sc1vram)
AM_RANGE(0x0d000, 0x0d7ff) AM_RAM_WRITE_LEGACY(seibucrtc_sc2vram_w) AM_BASE_LEGACY(&seibucrtc_sc2vram)
AM_RANGE(0x0d800, 0x0e7ff) AM_RAM_WRITE_LEGACY(seibucrtc_sc3vram_w) AM_BASE_LEGACY(&seibucrtc_sc3vram)
- AM_RANGE(0x0e800, 0x0f7ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0e800, 0x0f7ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0f800, 0x0ffff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xc0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 8ab6bc469b4..6d61503ed43 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -99,7 +99,7 @@ static INTERRUPT_GEN( senjyo_interrupt )
WRITE8_MEMBER(senjyo_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
static WRITE8_DEVICE_HANDLER( sound_cmd_w )
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index c318d14db6d..100f84f34b7 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -162,7 +162,7 @@ static ADDRESS_MAP_START( grdians_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x800000, 0x800001) AM_WRITE_LEGACY(grdians_lockout_w)
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared
AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xe00010, 0xe0001f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
@@ -202,7 +202,7 @@ static ADDRESS_MAP_START( gundamex_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x800000, 0x800001) AM_WRITE_LEGACY(grdians_lockout_w)
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc50000, 0xc5ffff) AM_RAM // cleared
AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xe00010, 0xe0001f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
@@ -267,7 +267,7 @@ static ADDRESS_MAP_START( mj4simai_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x600300, 0x60030f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -290,7 +290,7 @@ static ADDRESS_MAP_START( myangel_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x700310, 0x70031f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -313,7 +313,7 @@ static ADDRESS_MAP_START( myangel2_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x600300, 0x60030f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xd00000, 0xd3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xd40000, 0xd4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xd40000, 0xd4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xd60000, 0xd6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@@ -357,7 +357,7 @@ static ADDRESS_MAP_START( pzlbowl_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x500006, 0x500007) AM_READ(watchdog_reset16_r) // Watchdog
AM_RANGE(0x700000, 0x700001) AM_READ_LEGACY(pzlbowl_protection_r) // Protection
AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0x840000, 0x84ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x840000, 0x84ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x860000, 0x86003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0x900000, 0x903fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
@@ -383,7 +383,7 @@ static ADDRESS_MAP_START( penbros_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r) // Watchdog
//AM_RANGE(0x700000, 0x700001) AM_READ_LEGACY(pzlbowl_protection_r) // Protection
AM_RANGE(0xb00000, 0xb3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xb40000, 0xb4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xb40000, 0xb4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xb60000, 0xb6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs)
AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
@@ -442,7 +442,7 @@ static ADDRESS_MAP_START( reelquak_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE(0x400300, 0x40030f) AM_WRITE_LEGACY(seta2_sound_bank_w) // Samples Banks
AM_RANGE(0xb00000, 0xb03fff) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc40000, 0xc4ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE_LEGACY(reelquak_leds_w ) // parallel data register (leds)
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE_LEGACY(tmp68301_regs_r, tmp68301_regs_w) // TMP68301 Registers
@@ -499,7 +499,7 @@ static ADDRESS_MAP_START( samshoot_map, AS_PROGRAM, 16, seta2_state )
AM_RANGE( 0x700006, 0x700007 ) AM_READ(watchdog_reset16_r ) // Watchdog?
AM_RANGE( 0x800000, 0x83ffff ) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
- AM_RANGE( 0x840000, 0x84ffff ) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE( 0x840000, 0x84ffff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE( 0x860000, 0x86003f ) AM_WRITE(seta2_vregs_w) AM_BASE(m_vregs) // Video Registers
AM_RANGE( 0x900000, 0x903fff ) AM_DEVREADWRITE_LEGACY("x1snd", seta_sound_word_r, seta_sound_word_w ) // Sound
@@ -550,16 +550,6 @@ static READ16_HANDLER( spriteram16_word_r )
return state->m_spriteram[offset];
}
-static WRITE32_HANDLER( paletteram32_dword_w )
-{
- seta2_state *state = space->machine().driver_data<seta2_state>();
- COMBINE_DATA( &state->m_generic_paletteram_32[offset] );
- if (ACCESSING_BITS_16_31)
- state->set_color_555(offset * 2 + 0, 10+16, 5+16, 0+16, state->m_generic_paletteram_32[offset]);
- if (ACCESSING_BITS_0_15)
- state->set_color_555(offset * 2 + 1, 10, 5, 0, state->m_generic_paletteram_32[offset]);
-}
-
// Main CPU
// ColdFire peripherals
@@ -632,7 +622,7 @@ static ADDRESS_MAP_START( funcube_map, AS_PROGRAM, 32, seta2_state )
AM_RANGE( 0x00600000, 0x00600003 ) AM_DEVREADWRITE_LEGACY("oki", oki_read, oki_write)
AM_RANGE( 0x00800000, 0x0083ffff ) AM_READWRITE16_LEGACY(spriteram16_word_r, spriteram16_word_w, 0xffffffff ) AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE( 0x00840000, 0x0084ffff ) AM_RAM_WRITE_LEGACY(paletteram32_dword_w) AM_SHARE("paletteram")
+ AM_RANGE( 0x00840000, 0x0084ffff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_dword_be_w) AM_SHARE("paletteram")
AM_RANGE( 0x00860000, 0x0086003f ) AM_WRITE16(seta2_vregs_w, 0xffffffff ) AM_BASE(m_vregs)
AM_RANGE( 0x00c00000, 0x00c002ff ) AM_READWRITE_LEGACY(funcube_nvram_dword_r, funcube_nvram_dword_w )
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 753616a6aa3..4a4f56d317c 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -191,7 +191,7 @@ static WRITE8_DEVICE_HANDLER( msm5205_w )
static ADDRESS_MAP_START( sf_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("COINS")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN0")
AM_RANGE(0xc00004, 0xc00005) AM_READ(button1_r)
@@ -213,7 +213,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sfus_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1")
AM_RANGE(0xc00004, 0xc00005) AM_READ(dummy_r)
@@ -235,7 +235,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sfjp_map, AS_PROGRAM, 16, sf_state )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE(m_videoram, m_videoram_size)
- AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("COINS")
AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1")
AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 90b801fba30..a0d18443ba9 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -151,7 +151,7 @@ lev 7 : 0x7c : 0000 11d0 - just rte
WRITE16_MEMBER(shadfrce_state::shadfrce_flip_screen)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
@@ -369,7 +369,7 @@ static ADDRESS_MAP_START( shadfrce_map, AS_PROGRAM, 16, shadfrce_state )
AM_RANGE(0x102800, 0x103fff) AM_RAM
AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(shadfrce_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0x142000, 0x143fff) AM_RAM AM_BASE(m_spvideoram) AM_SIZE(m_spvideoram_size) /* sprites */
- AM_RANGE(0x180000, 0x187fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x180000, 0x187fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(shadfrce_bg0scrollx_w) /* SCROLL X */
AM_RANGE(0x1c0002, 0x1c0003) AM_WRITE(shadfrce_bg0scrolly_w) /* SCROLL Y */
AM_RANGE(0x1c0004, 0x1c0005) AM_WRITE(shadfrce_bg1scrollx_w) /* SCROLL X */
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 02a74d383ff..be6dcc7b0b1 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -118,7 +118,7 @@ WRITE16_MEMBER(shangha3_state::heberpop_sound_command_w)
static ADDRESS_MAP_START( shangha3_map, AS_PROGRAM, 16, shangha3_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("INPUTS")
AM_RANGE(0x200002, 0x200003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w)
@@ -136,7 +136,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( heberpop_map, AS_PROGRAM, 16, shangha3_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("INPUTS")
AM_RANGE(0x200002, 0x200003) AM_READ_PORT("SYSTEM")
AM_RANGE(0x200004, 0x200005) AM_READ_PORT("DSW")
@@ -159,7 +159,7 @@ static ADDRESS_MAP_START( blocken_map, AS_PROGRAM, 16, shangha3_state )
AM_RANGE(0x10000a, 0x10000b) AM_WRITENOP /* irq ack? */
AM_RANGE(0x10000c, 0x10000d) AM_WRITE(blocken_coinctrl_w)
AM_RANGE(0x10000e, 0x10000f) AM_WRITE(heberpop_sound_command_w)
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_RRRRRGGGGGBBBBBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30ffff) AM_RAM AM_BASE_SIZE(m_ram, m_ram_size) /* gfx & work ram */
AM_RANGE(0x340000, 0x340001) AM_WRITE(shangha3_flipscreen_w)
AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w)
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 1cc5787e5ca..893bae5d3c3 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -142,7 +142,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( shangha2_map, AS_PROGRAM, 16, shanghai_state )
AM_RANGE(0x00000, 0x03fff) AM_RAM
- AM_RANGE(0x04000, 0x041ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x04000, 0x041ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x80000, 0xfffff) AM_ROM
ADDRESS_MAP_END
@@ -181,7 +181,7 @@ static ADDRESS_MAP_START( kothello_map, AS_PROGRAM, 16, shanghai_state )
AM_RANGE(0x09012, 0x09013) AM_READ_PORT("P2")
AM_RANGE(0x09014, 0x09015) AM_READ_PORT("SYSTEM")
AM_RANGE(0x09016, 0x0901f) AM_WRITENOP // 0x9016 is set to 0 at the boot
- AM_RANGE(0x0a000, 0x0a1ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0a000, 0x0a1ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0b010, 0x0b01f) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0x80000, 0xfffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 1c409b3c40d..04e49015cbe 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -54,7 +54,7 @@ WRITE8_MEMBER(shootout_state::sound_cpu_command_w)
WRITE8_MEMBER(shootout_state::shootout_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
WRITE8_MEMBER(shootout_state::shootout_coin_counter_w)
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index ecf7e936684..526fe2eccb5 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -72,8 +72,8 @@ READ8_MEMBER(sidearms_state::turtship_ports_r)
static ADDRESS_MAP_START( sidearms_map, AS_PROGRAM, 8, sidearms_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xc800, 0xc800) AM_READ_PORT("SYSTEM") AM_WRITE(soundlatch_w)
AM_RANGE(0xc801, 0xc801) AM_READ_PORT("P1") AM_WRITE(sidearms_bankswitch_w)
AM_RANGE(0xc802, 0xc802) AM_READ_PORT("P2") AM_WRITE(watchdog_reset_w)
@@ -95,8 +95,8 @@ static ADDRESS_MAP_START( turtship_map, AS_PROGRAM, 8, sidearms_state )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xdfff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xe800, 0xe807) AM_READ(turtship_ports_r)
AM_RANGE(0xe800, 0xe800) AM_WRITE(soundlatch_w)
AM_RANGE(0xe801, 0xe801) AM_WRITE(sidearms_bankswitch_w)
@@ -142,8 +142,8 @@ WRITE8_MEMBER(sidearms_state::whizz_bankswitch_w)
static ADDRESS_MAP_START( whizz_map, AS_PROGRAM, 8, sidearms_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
- AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xc800, 0xc800) AM_READ_PORT("DSW0") AM_WRITE(soundlatch_w)
AM_RANGE(0xc801, 0xc801) AM_READ_PORT("DSW1") AM_WRITE(whizz_bankswitch_w)
AM_RANGE(0xc802, 0xc802) AM_READ_PORT("DSW2") AM_WRITE(watchdog_reset_w)
diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c
index 298f179fa63..a900051148e 100644
--- a/src/mame/drivers/sigmab98.c
+++ b/src/mame/drivers/sigmab98.c
@@ -491,7 +491,7 @@ static ADDRESS_MAP_START( gegege_mem_map, AS_PROGRAM, 8, sigmab98_state )
AM_RANGE( 0xa000, 0xafff ) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE( 0xc000, 0xc1ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_be_w) AM_SHARE("paletteram")
+ AM_RANGE( 0xc000, 0xc1ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_be_w) AM_SHARE("paletteram")
AM_RANGE( 0xc800, 0xc87f ) AM_RAM
@@ -737,7 +737,7 @@ static ADDRESS_MAP_START( animalc_map, AS_PROGRAM, 8, sigmab98_state )
AM_RANGE( 0xa000, 0xafff ) AM_RAM
AM_RANGE( 0xb000, 0xbfff ) AM_RAMBANK("sprbank")
- AM_RANGE( 0xd000, 0xd1ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_be_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0xd000, 0xd1ff ) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_be_w ) AM_SHARE("paletteram")
AM_RANGE( 0xd800, 0xd87f ) AM_RAM // table?
AM_RANGE( 0xe011, 0xe011 ) AM_WRITENOP // IRQ Enable? Screen disable?
@@ -930,7 +930,7 @@ WRITE8_MEMBER(sigmab98_state::haekaka_b000_w)
case 0x67: // PALETTERAM + TABLE? + REGS
if (offset < 0x200)
{
- paletteram_xRRRRRGGGGGBBBBB_be_w(space, offset, data);
+ paletteram_xRRRRRGGGGGBBBBB_byte_be_w(space, offset, data);
// m_generic_paletteram_8[offset] = data;
return;
}
@@ -1171,7 +1171,7 @@ WRITE8_MEMBER(sigmab98_state::itazuram_nvram_palette_w)
{
if (m_rambank == 0x64)
{
- paletteram_xRRRRRGGGGGBBBBB_be_w(space, offset, data);
+ paletteram_xRRRRRGGGGGBBBBB_byte_be_w(space, offset, data);
// m_generic_paletteram_8[offset] = data;
}
else if (m_rambank == 0x52)
@@ -1189,7 +1189,7 @@ WRITE8_MEMBER(sigmab98_state::itazuram_palette_w)
if (m_rombank == 0x6c)
{
if (offset < 0x200)
- paletteram_xRRRRRGGGGGBBBBB_be_w(space, offset, data);
+ paletteram_xRRRRRGGGGGBBBBB_byte_be_w(space, offset, data);
// m_generic_paletteram_8[offset] = data;
}
else
@@ -1410,7 +1410,7 @@ WRITE8_MEMBER(sigmab98_state::tdoboon_c000_w)
case 0x66: // PALETTERAM + TABLE?
if (offset < 0x200)
{
- paletteram_xRRRRRGGGGGBBBBB_be_w(space, offset, data);
+ paletteram_xRRRRRGGGGGBBBBB_byte_be_w(space, offset, data);
// m_generic_paletteram_8[offset] = data;
return;
}
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 7d5a218bc74..b2c9b588408 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -50,12 +50,12 @@ public:
WRITE8_MEMBER(skyarmy_state::skyarmy_flip_screen_x_w)
{
- flip_screen_x_set(machine(), data & 0x01);
+ flip_screen_x_set(data & 0x01);
}
WRITE8_MEMBER(skyarmy_state::skyarmy_flip_screen_y_w)
{
- flip_screen_y_set(machine(), data & 0x01);
+ flip_screen_y_set(data & 0x01);
}
static TILE_GET_INFO( get_skyarmy_tile_info )
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index fc44b6e4ff7..f6d04523595 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -78,7 +78,7 @@ out of the sprite list at that point.. (verify on real hw)
WRITE16_MEMBER(snowbros_state::snowbros_flipscreen_w)
{
if (ACCESSING_BITS_8_15)
- flip_screen_set(machine(), ~data & 0x8000);
+ flip_screen_set(~data & 0x8000);
}
@@ -204,7 +204,7 @@ static ADDRESS_MAP_START( snowbros_map, AS_PROGRAM, 16, snowbros_state )
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("DSW1")
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x701fff) AM_DEVREADWRITE_LEGACY("pandora", pandora_spriteram_LSB_r, pandora_spriteram_LSB_w)
AM_RANGE(0x800000, 0x800001) AM_WRITE(snowbros_irq4_ack_w) /* IRQ 4 acknowledge */
AM_RANGE(0x900000, 0x900001) AM_WRITE(snowbros_irq3_ack_w) /* IRQ 3 acknowledge */
@@ -286,7 +286,7 @@ static ADDRESS_MAP_START( wintbob_map, AS_PROGRAM, 16, snowbros_state )
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("DSW1")
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x701fff) AM_RAM AM_BASE_SIZE(m_bootleg_spriteram16, m_spriteram_size)
AM_RANGE(0x800000, 0x800001) AM_WRITE(snowbros_irq4_ack_w) /* IRQ 4 acknowledge */
AM_RANGE(0x900000, 0x900001) AM_WRITE(snowbros_irq3_ack_w) /* IRQ 3 acknowledge */
@@ -307,7 +307,7 @@ static ADDRESS_MAP_START( honeydol_map, AS_PROGRAM, 16, snowbros_state )
AM_RANGE(0x900000, 0x900001) AM_READ_PORT("DSW1")
AM_RANGE(0x900002, 0x900003) AM_READ_PORT("DSW2")
AM_RANGE(0x900004, 0x900005) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xa00000, 0xa007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xb00000, 0xb01fff) AM_RAM AM_BASE_SIZE(m_bootleg_spriteram16, m_spriteram_size)
ADDRESS_MAP_END
@@ -344,7 +344,7 @@ static ADDRESS_MAP_START( twinadv_map, AS_PROGRAM, 16, snowbros_state )
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("DSW1")
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x701fff) AM_RAM AM_BASE_SIZE(m_bootleg_spriteram16, m_spriteram_size)
AM_RANGE(0x800000, 0x800001) AM_WRITE(snowbros_irq4_ack_w) /* IRQ 4 acknowledge */
AM_RANGE(0x900000, 0x900001) AM_WRITE(snowbros_irq3_ack_w) /* IRQ 3 acknowledge */
@@ -384,7 +384,7 @@ static ADDRESS_MAP_START( hyperpac_map, AS_PROGRAM, 16, snowbros_state )
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x701fff) AM_DEVREADWRITE_LEGACY("pandora", pandora_spriteram_LSB_r,pandora_spriteram_LSB_w)
AM_RANGE(0x800000, 0x800001) AM_WRITE(snowbros_irq4_ack_w) /* IRQ 4 acknowledge */
AM_RANGE(0x900000, 0x900001) AM_WRITE(snowbros_irq3_ack_w) /* IRQ 3 acknowledge */
@@ -519,7 +519,7 @@ static ADDRESS_MAP_START( snowbros3_map, AS_PROGRAM, 16, snowbros_state )
AM_RANGE( 0x500000, 0x500001) AM_READ_PORT("DSW1")
AM_RANGE( 0x500002, 0x500003) AM_READ_PORT("DSW2")
AM_RANGE( 0x500004, 0x500005) AM_READ_PORT("SYSTEM")
- AM_RANGE( 0x600000, 0x6003ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE( 0x600000, 0x6003ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE( 0x700000, 0x7021ff) AM_RAM AM_BASE_SIZE(m_bootleg_spriteram16, m_spriteram_size)
AM_RANGE(0x800000, 0x800001) AM_WRITE(snowbros_irq4_ack_w) /* IRQ 4 acknowledge */
AM_RANGE(0x900000, 0x900001) AM_WRITE(snowbros_irq3_ack_w) /* IRQ 3 acknowledge */
@@ -538,7 +538,7 @@ static ADDRESS_MAP_START( finalttr_map, AS_PROGRAM, 16, snowbros_state )
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("DSW2")
AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x6001ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x701fff) AM_DEVREADWRITE_LEGACY("pandora", pandora_spriteram_LSB_r, pandora_spriteram_LSB_w)
AM_RANGE(0x800000, 0x800001) AM_WRITE(snowbros_irq4_ack_w) /* IRQ 4 acknowledge */
AM_RANGE(0x900000, 0x900001) AM_WRITE(snowbros_irq3_ack_w) /* IRQ 3 acknowledge */
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index a7b2995bcfb..89bae6e3c17 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -52,7 +52,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, solomon_state )
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(solomon_colorram2_w) AM_BASE(m_colorram2)
AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(solomon_videoram2_w) AM_BASE(m_videoram2)
AM_RANGE(0xe000, 0xe07f) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xe400, 0xe5ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe400, 0xe5ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xe600, 0xe600) AM_READ_PORT("P1")
AM_RANGE(0xe601, 0xe601) AM_READ_PORT("P2")
AM_RANGE(0xe602, 0xe602) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index f417011b256..1d9e95514f8 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -146,7 +146,7 @@ static ADDRESS_MAP_START( spbactn_map, AS_PROGRAM, 16, spbactn_state )
AM_RANGE(0x50000, 0x50fff) AM_RAM AM_BASE(m_spvideoram)
AM_RANGE(0x60000, 0x67fff) AM_RAM AM_BASE(m_fgvideoram)
AM_RANGE(0x70000, 0x77fff) AM_RAM AM_BASE(m_bgvideoram)
- AM_RANGE(0x80000, 0x827ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x80000, 0x827ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x90000, 0x90001) AM_READ_PORT("IN0")
AM_RANGE(0x90010, 0x90011) AM_READ_PORT("IN1")
AM_RANGE(0x90020, 0x90021) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index b8b70c1ab10..8bedad99ea9 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -60,7 +60,7 @@ WRITE8_MEMBER(speedbal_state::speedbal_coincounter_w)
{
coin_counter_w(machine(), 0, data & 0x80);
coin_counter_w(machine(), 1, data & 0x40);
- flip_screen_set(machine(), data & 8); // also changes data & 0x10 at the same time too (flipx and flipy?)
+ flip_screen_set(data & 8); // also changes data & 0x10 at the same time too (flipx and flipy?)
/* unknown: (data & 0x10) and (data & 4) */
}
@@ -69,7 +69,7 @@ static ADDRESS_MAP_START( main_cpu_map, AS_PROGRAM, 8, speedbal_state )
AM_RANGE(0xdc00, 0xdfff) AM_RAM AM_SHARE("share1") // shared with SOUND
AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE(speedbal_background_videoram_w) AM_BASE(m_background_videoram)
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(speedbal_foreground_videoram_w) AM_BASE(m_foreground_videoram)
- AM_RANGE(0xf000, 0xf5ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf5ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf600, 0xfeff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xff00, 0xffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 27ff6f777d5..07f4530ec60 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -107,7 +107,7 @@ static WRITE8_DEVICE_HANDLER( oki_banking_w )
static ADDRESS_MAP_START( speedspn_map, AS_PROGRAM, 8, speedspn_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_SHARE("paletteram") /* RAM COLOUR */
+ AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_byte_le_w) AM_SHARE("paletteram") /* RAM COLOUR */
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(speedspn_attram_w) AM_BASE(m_attram)
AM_RANGE(0x9000, 0x9fff) AM_READWRITE(speedspn_vidram_r,speedspn_vidram_w) /* RAM FIX / RAM OBJECTS (selected by bit 0 of port 17) */
AM_RANGE(0xa000, 0xa7ff) AM_RAM
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 39491f87a38..76c574fa5c6 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -100,7 +100,7 @@ static ADDRESS_MAP_START( splash_map, AS_PROGRAM, 16, splash_state )
AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x881800, 0x881803) AM_RAM AM_BASE(m_vregs) /* Scroll registers */
AM_RANGE(0x881804, 0x881fff) AM_RAM /* Work RAM */
- AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
+ AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
AM_RANGE(0x900000, 0x900fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0xffc000, 0xffffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
@@ -179,7 +179,7 @@ static ADDRESS_MAP_START( roldfrog_map, AS_PROGRAM, 16, splash_state )
AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x881800, 0x881803) AM_RAM AM_BASE(m_vregs) /* Scroll registers */
AM_RANGE(0x881804, 0x881fff) AM_RAM /* Work RAM */
- AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
+ AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
AM_RANGE(0xa00000, 0xa00001) AM_READ(roldfrog_bombs_r)
AM_RANGE(0xd00000, 0xd00fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0xe00000, 0xe00001) AM_WRITEONLY AM_BASE(m_bitmap_mode) /* Bitmap Mode? */
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( funystrp_map, AS_PROGRAM, 16, splash_state )
AM_RANGE(0x880000, 0x8817ff) AM_RAM_WRITE(splash_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x881800, 0x881803) AM_RAM AM_BASE(m_vregs) /* Scroll registers */
AM_RANGE(0x881804, 0x881fff) AM_WRITENOP
- AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
+ AM_RANGE(0x8c0000, 0x8c0fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette is xRRRRxGGGGxBBBBx */
AM_RANGE(0xd00000, 0xd01fff) AM_READWRITE(spr_read, spr_write) AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0xfe0000, 0xffffff) AM_RAM AM_MASK(0xffff) /* there's fe0000 <-> ff0000 compare */ /* Work RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index 86387144165..5872dda8ec2 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -224,8 +224,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( spoker_portmap, AS_IO, 8, spoker_state )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
- AM_RANGE( 0x2000, 0x23ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE( 0x2400, 0x27ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE( 0x2000, 0x23ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x2400, 0x27ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE( 0x3000, 0x33ff ) AM_RAM_WRITE(bg_tile_w ) AM_BASE(m_bg_tile_ram )
@@ -255,8 +255,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( 3super8_portmap, AS_IO, 8, spoker_state )
// AM_RANGE( 0x1000, 0x1fff ) AM_WRITENOP
- AM_RANGE( 0x2000, 0x27ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_SHARE("paletteram")
- AM_RANGE( 0x2800, 0x2fff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_SHARE("paletteram2")
+ AM_RANGE( 0x2000, 0x27ff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x2800, 0x2fff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w ) AM_SHARE("paletteram2")
AM_RANGE( 0x3000, 0x33ff ) AM_RAM_WRITE(bg_tile_w ) AM_BASE(m_bg_tile_ram )
diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c
index 63ee71fb1e1..16887f92ce3 100644
--- a/src/mame/drivers/spool99.c
+++ b/src/mame/drivers/spool99.c
@@ -217,7 +217,7 @@ static ADDRESS_MAP_START( spool99_map, AS_PROGRAM, 8, spool99_state )
AM_RANGE(0xafef, 0xafef) AM_DEVWRITE_LEGACY("eeprom", eeprom_dataline_w )
AM_RANGE(0xaff8, 0xaff8) AM_DEVWRITE("oki", okim6295_device, write)
- AM_RANGE(0xb000, 0xb3ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb000, 0xb3ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xb800, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(spool99_vram_w) AM_BASE(m_vram)
@@ -263,7 +263,7 @@ static ADDRESS_MAP_START( vcarn_map, AS_PROGRAM, 8, spool99_state )
AM_RANGE(0xa747, 0xa747) AM_DEVWRITE_LEGACY("eeprom", eeprom_dataline_w )
AM_RANGE(0xa780, 0xa780) AM_DEVWRITE("oki", okim6295_device, write)
- AM_RANGE(0xa800, 0xabff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa800, 0xabff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xb000, 0xdfff) AM_RAM
// AM_RANGE(0xdf00, 0xdfff) AM_READWRITE(vcarn_io_r,vcarn_io_w) AM_BASE_LEGACY(&vcarn_io)
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 29a593afd83..88793816614 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -63,7 +63,7 @@ WRITE8_MEMBER(spy_state::spy_bankedram1_w)
if (m_rambank & 1)
{
- paletteram_xBBBBBGGGGGRRRRR_be_w(space,offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space,offset,data);
}
else if (m_rambank & 2)
{
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 52bd77479f1..18130d4e069 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -428,7 +428,7 @@ static ADDRESS_MAP_START( mjyuugi_map, AS_PROGRAM, 16, srmp2_state )
AM_RANGE(0x300000, 0x300001) AM_READ8(mjyuugi_irq4_ack_r,0x00ff) /* irq ack lv 4? */
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("DSW3-1") /* DSW 3-1 */
AM_RANGE(0x500010, 0x500011) AM_READ_PORT("DSW3-2") /* DSW 3-2 */
- AM_RANGE(0x700000, 0x7003ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x7003ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x800001) AM_READNOP /* ??? */
AM_RANGE(0x900000, 0x900001) AM_READWRITE8(iox_mux_r, iox_command_w,0x00ff) /* key matrix | I/O */
AM_RANGE(0x900002, 0x900003) AM_READWRITE8(iox_status_r,iox_data_w,0x00ff)
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index e22fd73c10a..08974b3a0ac 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -505,7 +505,7 @@ WRITE16_MEMBER(srmp6_state::paletteram_w)
INT8 r, g, b;
int brg = m_brightness - 0x60;
- paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask);
+ paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask);
if(brg)
{
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index db77d874343..23283321910 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -88,7 +88,7 @@ static ADDRESS_MAP_START( srumbler_map, AS_PROGRAM, 8, srumbler_state )
AM_RANGE(0x6000, 0x6fff) AM_ROMBANK("6000") /* Banked ROM */
AM_RANGE(0x6000, 0x6fff) AM_WRITENOP /* Video RAM 2 ??? (not used) */
AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("7000") /* Banked ROM */
- AM_RANGE(0x7000, 0x73ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x7000, 0x73ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("8000") /* Banked ROM */
AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("9000") /* Banked ROM */
AM_RANGE(0xa000, 0xafff) AM_ROMBANK("a000") /* Banked ROM */
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 503b0ffc1aa..947c82d84e3 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -64,7 +64,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, stadhero_state )
AM_RANGE(0x240010, 0x240017) AM_DEVWRITE_LEGACY("tilegen1", deco_bac06_pf_control_1_w)
AM_RANGE(0x260000, 0x261fff) AM_DEVREADWRITE_LEGACY("tilegen1", deco_bac06_pf_data_r, deco_bac06_pf_data_w)
AM_RANGE(0x30c000, 0x30c00b) AM_READWRITE(stadhero_control_r, stadhero_control_w)
- AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x310000, 0x3107ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* Main ram */
AM_RANGE(0xffc000, 0xffc7ff) AM_MIRROR(0x000800) AM_RAM AM_BASE(m_spriteram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index bb8c3b56331..37359deb8b9 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -101,7 +101,7 @@ static ADDRESS_MAP_START( stlforce_map, AS_PROGRAM, 16, stlforce_state )
AM_RANGE(0x103400, 0x1037ff) AM_RAM AM_BASE(m_mlow_scrollram)
AM_RANGE(0x103800, 0x103bff) AM_RAM AM_BASE(m_mhigh_scrollram)
AM_RANGE(0x103c00, 0x103fff) AM_RAM AM_BASE(m_vidattrram)
- AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x105000, 0x107fff) AM_RAM /* unknown / ram */
AM_RANGE(0x108000, 0x108fff) AM_RAM AM_BASE(m_spriteram)
AM_RANGE(0x109000, 0x11ffff) AM_RAM
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index fa865c1f2ed..30c1b34b46c 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -502,7 +502,7 @@ WRITE8_MEMBER(suna8_state::hardhead_bankswitch_w)
*/
WRITE8_MEMBER(suna8_state::hardhead_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x04);
+ flip_screen_set(data & 0x04);
coin_lockout_w ( machine(), 0, data & 0x08);
coin_lockout_w ( machine(), 1, data & 0x10);
}
@@ -511,7 +511,7 @@ static ADDRESS_MAP_START( hardhead_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc000, 0xd7ff) AM_RAM // RAM
- AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xda00, 0xda00) AM_RAM_READ(hardhead_ip_r) AM_BASE(m_hardhead_ip) // Input Port Select
AM_RANGE(0xda80, 0xda80) AM_READ(soundlatch2_r) AM_WRITE(hardhead_bankswitch_w ) // ROM Banking
AM_RANGE(0xdb00, 0xdb00) AM_WRITE(soundlatch_w ) // To Sound CPU
@@ -549,7 +549,7 @@ WRITE8_MEMBER(suna8_state::rranger_bankswitch_w)
memory_set_bank(machine(), "bank1", bank);
- flip_screen_set(machine(), data & 0x20);
+ flip_screen_set(data & 0x20);
coin_lockout_w ( machine(), 0, data & 0x40);
coin_lockout_w ( machine(), 1, data & 0x80);
}
@@ -587,7 +587,7 @@ static ADDRESS_MAP_START( rranger_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc280, 0xc280) AM_WRITENOP // ? NMI Ack
AM_RANGE(0xc280, 0xc280) AM_READ_PORT("DSW1") // DSW 1
AM_RANGE(0xc2c0, 0xc2c0) AM_READ_PORT("DSW2") // DSW 2
- AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0xc800, 0xdfff) AM_RAM // RAM
AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE(suna8_spriteram_w) AM_BASE(m_spriteram) // Sprites
ADDRESS_MAP_END
@@ -632,7 +632,7 @@ WRITE8_MEMBER(suna8_state::brickzn_spritebank_w)
m_spritebank = (data >> 1) & 1;
if (data & ~0x03) logerror("CPU #0 - PC %04X: unknown spritebank bits: %02X\n",cpu_get_pc(&space.device()),data);
- flip_screen_set(machine(), data & 0x01 );
+ flip_screen_set(data & 0x01 );
}
WRITE8_MEMBER(suna8_state::brickzn_unknown_w)
@@ -693,7 +693,7 @@ WRITE8_MEMBER(suna8_state::hardhea2_nmi_w)
*/
WRITE8_MEMBER(suna8_state::hardhea2_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown flipscreen bits: %02X\n",cpu_get_pc(&space.device()),data);
}
@@ -789,7 +789,7 @@ static ADDRESS_MAP_START( hardhea2_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc533, 0xc533) AM_WRITE(hardhea2_rambank_0_w )
// Protection ***
- AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
+ AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
AM_RANGE(0xc800, 0xdfff) AM_RAMBANK("bank2") // RAM (Banked?)
AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
ADDRESS_MAP_END
@@ -825,7 +825,7 @@ static ADDRESS_MAP_START( starfigh_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc300, 0xc300) AM_WRITE(hardhea2_flipscreen_w ) // Flip Screen
AM_RANGE(0xc400, 0xc400) AM_WRITE(hardhea2_leds_w ) // Leds + Coin Counter
AM_RANGE(0xc500, 0xc500) AM_WRITE(soundlatch_w ) // To Sound CPU
- AM_RANGE(0xc600, 0xc7ff) AM_READWRITE(banked_paletteram_r, paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
+ AM_RANGE(0xc600, 0xc7ff) AM_READWRITE(banked_paletteram_r, paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
AM_RANGE(0xc800, 0xdfff) AM_RAM // RAM
AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
ADDRESS_MAP_END
@@ -884,7 +884,7 @@ WRITE8_MEMBER(suna8_state::suna8_wram_w)
*/
WRITE8_MEMBER(suna8_state::sparkman_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
//if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown flipscreen bits: %02X\n",cpu_get_pc(&space.device()),data);
}
@@ -958,7 +958,7 @@ static ADDRESS_MAP_START( sparkman_map, AS_PROGRAM, 8, suna8_state )
AM_RANGE(0xc400, 0xc400) AM_WRITE(sparkman_leds_w ) // Leds
AM_RANGE(0xc480, 0xc480) AM_WRITE(sparkman_coin_counter_w ) // Coin Counter
AM_RANGE(0xc500, 0xc500) AM_WRITE(soundlatch_w ) // To Sound CPU
- AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
+ AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_byte_be_w) AM_SHARE("paletteram" ) // Palette (Banked??)
AM_RANGE(0xc800, 0xdfff) AM_RAM_WRITE(suna8_wram_w) AM_BASE(m_wram) // RAM
AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 1425bea5710..3f972c76421 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -64,7 +64,7 @@ static ADDRESS_MAP_START( supbtime_map, AS_PROGRAM, 16, supbtime_state )
AM_RANGE(0x104000, 0x11ffff) AM_WRITENOP /* Nothing there */
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x120800, 0x13ffff) AM_WRITENOP /* Nothing there */
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x18000f) AM_READ(supbtime_controls_r)
AM_RANGE(0x18000a, 0x18000d) AM_WRITENOP
AM_RANGE(0x1a0000, 0x1a0001) AM_WRITE(sound_w)
@@ -79,7 +79,7 @@ static ADDRESS_MAP_START( chinatwn_map, AS_PROGRAM, 16, supbtime_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(sound_w)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x18000f) AM_READ(supbtime_controls_r)
AM_RANGE(0x18000a, 0x18000d) AM_WRITENOP
AM_RANGE(0x1a0000, 0x1a3fff) AM_RAM
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index d8834d68c26..82b95bf6527 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -222,7 +222,7 @@ WRITE8_MEMBER(superqix_state::bootleg_mcu_p1_w)
coin_lockout_global_w(machine(), (data & 1) ^ m_invert_coin_lockout);
break;
case 4:
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
break;
case 5:
m_port1 = data;
@@ -289,7 +289,7 @@ WRITE8_MEMBER(superqix_state::sqixu_mcu_p2_w)
coin_lockout_global_w(machine(), ~data & 8);
// bit 4 = flip screen
- flip_screen_set(machine(), data & 0x10);
+ flip_screen_set(data & 0x10);
// bit 5 = unknown (set on startup)
@@ -330,7 +330,7 @@ static READ8_DEVICE_HANDLER( bootleg_in0_r )
WRITE8_MEMBER(superqix_state::bootleg_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 1);
+ flip_screen_set(~data & 1);
}
@@ -572,7 +572,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, superqix_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( pbillian_port_map, AS_IO, 8, superqix_state )
- AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x0401, 0x0401) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x0408, 0x0408) AM_READ(pbillian_from_mcu_r)
@@ -585,7 +585,7 @@ static ADDRESS_MAP_START( pbillian_port_map, AS_IO, 8, superqix_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( hotsmash_port_map, AS_IO, 8, superqix_state )
- AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x0401, 0x0401) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_address_w)
AM_RANGE(0x0408, 0x0408) AM_READ(hotsmash_from_mcu_r)
@@ -598,7 +598,7 @@ static ADDRESS_MAP_START( hotsmash_port_map, AS_IO, 8, superqix_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( sqix_port_map, AS_IO, 8, superqix_state )
- AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x0401, 0x0401) AM_DEVREAD_LEGACY("ay1", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE_LEGACY("ay1", ay8910_data_address_w)
AM_RANGE(0x0405, 0x0405) AM_DEVREAD_LEGACY("ay2", ay8910_r)
@@ -611,7 +611,7 @@ static ADDRESS_MAP_START( sqix_port_map, AS_IO, 8, superqix_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( bootleg_port_map, AS_IO, 8, superqix_state )
- AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_byte_w) AM_SHARE("paletteram")
AM_RANGE(0x0401, 0x0401) AM_DEVREAD_LEGACY("ay1", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE_LEGACY("ay1", ay8910_data_address_w)
AM_RANGE(0x0405, 0x0405) AM_DEVREAD_LEGACY("ay2", ay8910_r)
diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c
index f2b53a5a4e4..2bc57b2e9eb 100644
--- a/src/mame/drivers/superwng.c
+++ b/src/mame/drivers/superwng.c
@@ -98,12 +98,12 @@ static TILE_GET_INFO( get_fg_tile_info )
WRITE8_MEMBER(superwng_state::superwng_flip_screen_x_w)
{
- flip_screen_x_set(machine(), ~data & 1);
+ flip_screen_x_set(~data & 1);
}
WRITE8_MEMBER(superwng_state::superwng_flip_screen_y_w)
{
- flip_screen_y_set(machine(), ~data & 1);
+ flip_screen_y_set(~data & 1);
}
static VIDEO_START( superwng )
@@ -118,7 +118,7 @@ static VIDEO_START( superwng )
static SCREEN_UPDATE_IND16( superwng )
{
superwng_state *state = screen.machine().driver_data<superwng_state>();
- int flip=flip_screen_get(screen.machine());
+ int flip=state->flip_screen();
state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
rectangle tmp=cliprect;
@@ -273,7 +273,7 @@ WRITE8_MEMBER(superwng_state::superwng_tilebank_w)
WRITE8_MEMBER(superwng_state::superwng_flip_screen_w)
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
m_bg_tilemap->mark_all_dirty();
m_fg_tilemap->mark_all_dirty();
}
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index c80ff24476b..39034df951a 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -266,7 +266,7 @@ static WRITE8_DEVICE_HANDLER( rom_bank_select_w )
memory_set_bankptr(device->machine(), "bank2", region_base + (data&0x3f ) * 0x4000);
state->m_msm_nmi_mask = data & 0x40;
- flip_screen_set(device->machine(), data & 0x80);
+ state->flip_screen_set(data & 0x80);
}
WRITE8_MEMBER(suprgolf_state::rom2_bank_select_w)
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 82354ff2978..d4487e00320 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -134,7 +134,7 @@ static ADDRESS_MAP_START( suprslam_map, AS_PROGRAM, 16, suprslam_state )
// AM_RANGE(0xff3000, 0xff3001) AM_WRITENOP // sprite buffer trigger?
AM_RANGE(0xff8000, 0xff8fff) AM_DEVREADWRITE_LEGACY("k053936", k053936_linectrl_r, k053936_linectrl_w)
AM_RANGE(0xff9000, 0xff9001) AM_WRITE(sound_command_w)
- AM_RANGE(0xffa000, 0xffafff) AM_RAM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffa000, 0xffafff) AM_RAM_WRITE(paletteram_xGGGGGBBBBBRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffd000, 0xffd01f) AM_DEVWRITE_LEGACY("k053936", k053936_ctrl_w)
AM_RANGE(0xffe000, 0xffe001) AM_WRITE(suprslam_bank_w)
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index c22b772ef79..28e0c6252ae 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -47,9 +47,9 @@ WRITE8_MEMBER(surpratk_state::bankedram_w)
if (m_videobank & 0x02)
{
if (m_videobank & 0x04)
- paletteram_xBBBBBGGGGGRRRRR_be_w(space,offset + 0x0800,data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space,offset + 0x0800,data);
else
- paletteram_xBBBBBGGGGGRRRRR_be_w(space,offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space,offset,data);
}
else if (m_videobank & 0x01)
k053245_w(m_k053244, offset, data);
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 9ee5e5705eb..8efe15abcea 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -43,7 +43,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tail2nos_state )
AM_RANGE(0xffc000, 0xffc2ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xffc300, 0xffcfff) AM_RAM
AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(tail2nos_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("INPUTS") AM_WRITE(tail2nos_gfxbank_w)
AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW")
AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w)
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 2fe1b8f17b4..45b0ec3eb60 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -515,7 +515,7 @@ WRITE16_MEMBER(taitob_state::realpunc_output_w)
static ADDRESS_MAP_START( rastsag2_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x607fff) AM_RAM /* Main RAM */ /*ashura up to 603fff only*/
TC0180VCU_MEMRW( 0x400000 )
AM_RANGE(0x800000, 0x800001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
@@ -530,7 +530,7 @@ static ADDRESS_MAP_START( crimec_map, AS_PROGRAM, 16, taitob_state )
TC0180VCU_MEMRW( 0x400000 )
AM_RANGE(0x600000, 0x600001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x600002, 0x600003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xa00000, 0xa0ffff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -542,12 +542,12 @@ static ADDRESS_MAP_START( tetrist_map, AS_PROGRAM, 16, taitob_state )
TC0180VCU_MEMRW( 0x400000 )
AM_RANGE(0x600000, 0x60000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0xff00)
AM_RANGE(0x800000, 0x807fff) AM_RAM /* Main RAM */
- AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( tetrista_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
TC0180VCU_MEMRW( 0x400000 )
AM_RANGE(0x600000, 0x600001) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_portreg_r, tc0220ioc_portreg_w, 0xff00)
AM_RANGE(0x600002, 0x600003) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_port_r, tc0220ioc_port_w, 0xff00)
@@ -565,7 +565,7 @@ static ADDRESS_MAP_START( hitice_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x700000, 0x700001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x700002, 0x700003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
AM_RANGE(0x800000, 0x803fff) AM_RAM /* Main RAM */
- AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xb00000, 0xb7ffff) AM_RAM_WRITE(hitice_pixelram_w) AM_BASE(m_pixelram)
// { 0xbffff0, 0xbffff1, ???
AM_RANGE(0xbffff2, 0xbffff5) AM_WRITE(hitice_pixel_scroll_w)
@@ -588,7 +588,7 @@ static ADDRESS_MAP_START( rambo3_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x60001c, 0x60001d) AM_READ(trackx2_lo_r)
AM_RANGE(0x60001e, 0x60001f) AM_READ(trackx2_hi_r)
AM_RANGE(0x800000, 0x803fff) AM_RAM /* Main RAM */
- AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
@@ -603,7 +603,7 @@ static ADDRESS_MAP_START( pbobble_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x600000, 0x600003) AM_WRITE(gain_control_w)
AM_RANGE(0x700000, 0x700001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x700002, 0x700003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x900000, 0x90ffff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -619,7 +619,7 @@ static ADDRESS_MAP_START( spacedx_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x600000, 0x600003) AM_WRITE(gain_control_w)
AM_RANGE(0x700000, 0x700001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x700002, 0x700003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x900000, 0x90ffff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -631,7 +631,7 @@ static ADDRESS_MAP_START( spacedxo_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x210000, 0x210001) AM_READ_PORT("IN3")
AM_RANGE(0x220000, 0x220001) AM_READ_PORT("IN4")
AM_RANGE(0x230000, 0x230001) AM_READ_PORT("IN5")
- AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x302000, 0x303fff) AM_READONLY
AM_RANGE(0x400000, 0x40ffff) AM_RAM /* Main RAM */
TC0180VCU_MEMRW( 0x500000 )
@@ -649,7 +649,7 @@ static ADDRESS_MAP_START( qzshowby_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x600000, 0x600001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x600002, 0x600003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
AM_RANGE(0x700000, 0x700003) AM_WRITE(gain_control_w)
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x900000, 0x90ffff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -659,7 +659,7 @@ static ADDRESS_MAP_START( viofight_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x200000, 0x200001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
TC0180VCU_MEMRW( 0x400000 )
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0xff00)
AM_RANGE(0xa00000, 0xa03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -669,7 +669,7 @@ static ADDRESS_MAP_START( masterw_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM /* Main RAM */
TC0180VCU_MEMRW( 0x400000 )
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_portreg_r, tc0220ioc_portreg_w, 0xff00)
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_port_r, tc0220ioc_port_w, 0xff00)
AM_RANGE(0xa00000, 0xa00001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
@@ -689,7 +689,7 @@ static ADDRESS_MAP_START( silentd_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x230000, 0x230001) AM_READ_PORT("IN5")
AM_RANGE(0x240000, 0x240001) AM_WRITENOP // ???
// AM_RANGE(0x240000, 0x240001) AM_READNOP /* read 4 times at init */
- AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x400000, 0x403fff) AM_RAM /* Main RAM */
TC0180VCU_MEMRW( 0x500000 )
ADDRESS_MAP_END
@@ -699,7 +699,7 @@ static ADDRESS_MAP_START( selfeena_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* Main RAM */
TC0180VCU_MEMRW( 0x200000 )
- AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x400000, 0x40000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0xff00)
AM_RANGE(0x410000, 0x41000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0xff00) /* mirror address - seems to be only used for coin control */
AM_RANGE(0x500000, 0x500001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
@@ -710,7 +710,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sbm_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Main RAM */
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_wordswap_r, tc0510nio_halfword_wordswap_w)
AM_RANGE(0x320000, 0x320001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x320002, 0x320003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -728,7 +728,7 @@ static ADDRESS_MAP_START( realpunc_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x188002, 0x188003) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_comm_w, 0xff00)
AM_RANGE(0x18c000, 0x18c001) AM_WRITE(realpunc_output_w)
TC0180VCU_MEMRW( 0x200000 )
- AM_RANGE(0x280000, 0x281fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x280000, 0x281fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x300001) AM_DEVREADWRITE_LEGACY("hd63484", hd63484_status_r, hd63484_address_w)
AM_RANGE(0x300002, 0x300003) AM_DEVREADWRITE_LEGACY("hd63484", hd63484_data_r, hd63484_data_w)
// AM_RANGE(0x320000, 0x320001) AM_READ_LEGACY(SMH_NOP) // ?
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 5fc23b6cb77..4af52fb53c9 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -702,7 +702,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dondokod_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x320000, 0x320001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x320002, 0x320003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -721,7 +721,7 @@ static ADDRESS_MAP_START( megab_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x120000, 0x12000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x180000, 0x180fff) AM_READWRITE(cchip2_word_r, cchip2_word_w) AM_BASE(m_cchip2_ram)
AM_RANGE(0x200000, 0x20ffff) AM_RAM
- AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x400000, 0x40001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
AM_RANGE(0x600000, 0x60ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x610000, 0x61ffff) AM_RAM /* unused? */
@@ -731,7 +731,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( thundfox_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x220000, 0x220001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x220002, 0x220003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -747,7 +747,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cameltry_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x300018, 0x30001f) AM_READ(cameltry_paddle_r)
AM_RANGE(0x320000, 0x320001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
@@ -776,7 +776,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( liquidk_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x320000, 0x320001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x320002, 0x320003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
@@ -811,7 +811,7 @@ static ADDRESS_MAP_START( ssi_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x200000, 0x20ffff) AM_RAM
- AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x400002, 0x400003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
// AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* ?? */
@@ -823,7 +823,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gunfront_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_wordswap_r, tc0510nio_halfword_wordswap_w)
AM_RANGE(0x320000, 0x320001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x320002, 0x320003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -837,7 +837,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( growl_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300004, 0x300005) AM_WRITE(growl_coin_word_w)
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("DSWA")
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("DSWB")
@@ -883,7 +883,7 @@ static ADDRESS_MAP_START( footchmp_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x400000, 0x40ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
AM_RANGE(0x430000, 0x43002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
AM_RANGE(0x500000, 0x50001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff) /* 500002 written like a watchdog?! */
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700006, 0x700007) AM_WRITE(taitof2_4p_coin_word_w)
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSWA")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSWB")
@@ -900,7 +900,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( koshien_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x320000, 0x320001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x320002, 0x320003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -919,7 +919,7 @@ static ADDRESS_MAP_START( yuyugogo_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0xb00000, 0xb10fff) AM_RAM /* deliberate writes to $b10xxx, I think */
AM_RANGE(0xc00000, 0xc01fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
AM_RANGE(0xd00000, 0xdfffff) AM_ROM AM_REGION("extra", 0)
@@ -928,7 +928,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ninjak_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30000f) AM_READ(ninjak_input_r)
AM_RANGE(0x30000e, 0x30000f) AM_WRITE(ninjak_coin_word_w)
AM_RANGE(0x380000, 0x380001) AM_WRITE(watchdog_reset16_w) /* ??? */
@@ -944,7 +944,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( solfigtr_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300004, 0x300005) AM_WRITE(growl_coin_word_w) /* NOT VERIFIED */
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("DSWA")
AM_RANGE(0x300002, 0x300003) AM_READ_PORT("DSWB")
@@ -967,7 +967,7 @@ static ADDRESS_MAP_START( qzquest_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x300000, 0x300001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x300002, 0x300003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
- AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x50ffff) AM_RAM
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
@@ -983,7 +983,7 @@ static ADDRESS_MAP_START( pulirula_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x402000, 0x40200f) AM_DEVWRITE_LEGACY("tc0430grw", tc0430grw_ctrl_word_w)
// AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* ??? */
AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -999,7 +999,7 @@ static ADDRESS_MAP_START( metalb_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x500000, 0x50ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
AM_RANGE(0x530000, 0x53002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
AM_RANGE(0x600000, 0x60001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff)
- AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_wordswap_r, tc0510nio_halfword_wordswap_w)
AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x900002, 0x900003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -1011,7 +1011,7 @@ static ADDRESS_MAP_START( qzchikyu_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x300000, 0x300001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x300002, 0x300003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
- AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x50ffff) AM_RAM
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
@@ -1024,7 +1024,7 @@ static ADDRESS_MAP_START( yesnoj_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x400000, 0x40ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x500000, 0x50ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x520000, 0x52000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
// AM_RANGE(0x700000, 0x70000b) AM_READ_LEGACY(yesnoj_unknown_r) /* what's this? */
AM_RANGE(0x800000, 0x800001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -1046,7 +1046,7 @@ static ADDRESS_MAP_START( deadconx_map, AS_PROGRAM, 16, taitof2_state )
// AM_RANGE(0x42000c, 0x42000f) AM_WRITENOP /* zeroed */
AM_RANGE(0x430000, 0x43002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
AM_RANGE(0x500000, 0x50001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff) /* uses 500002 like a watchdog !? */
- AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSWA")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSWB")
AM_RANGE(0x700004, 0x700005) AM_READ_PORT("IN2")
@@ -1062,7 +1062,7 @@ static ADDRESS_MAP_START( dinorex_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x2fffff) AM_ROM
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE_LEGACY("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x400000, 0x400fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
- AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x60ffff) AM_RAM
AM_RANGE(0x700000, 0x70001f) AM_DEVWRITE8_LEGACY("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -1080,7 +1080,7 @@ static ADDRESS_MAP_START( qjinsei_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x300000, 0x30ffff) AM_RAM
AM_RANGE(0x500000, 0x500001) AM_WRITENOP /* watchdog ? */
AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -1096,7 +1096,7 @@ static ADDRESS_MAP_START( qcrayon_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x500000, 0x500001) AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x500002, 0x500003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE(m_sprite_extension, m_spriteext_size)
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x900000, 0x90ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x920000, 0x92000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -1107,7 +1107,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( qcrayon2_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
- AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x400000, 0x40ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x500000, 0x50ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x520000, 0x52000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -1126,7 +1126,7 @@ static ADDRESS_MAP_START( driftout_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x300000, 0x30ffff) AM_RAM
AM_RANGE(0x400000, 0x401fff) AM_DEVREADWRITE_LEGACY("tc0430grw", tc0430grw_word_r, tc0430grw_word_w) /* ROZ tilemap */
AM_RANGE(0x402000, 0x40200f) AM_DEVWRITE_LEGACY("tc0430grw", tc0430grw_ctrl_word_w)
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -1143,7 +1143,7 @@ static ADDRESS_MAP_START( driveout_map, AS_PROGRAM, 16, taitof2_state )
AM_RANGE(0x300000, 0x30ffff) AM_RAM
AM_RANGE(0x400000, 0x401fff) AM_DEVREADWRITE_LEGACY("tc0430grw", tc0430grw_word_r, tc0430grw_word_w) /* ROZ tilemap */
AM_RANGE(0x402000, 0x40200f) AM_DEVWRITE_LEGACY("tc0430grw", tc0430grw_ctrl_word_w)
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x800000, 0x80ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 44da739a865..e4d5286ab89 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -255,7 +255,7 @@ static ADDRESS_MAP_START( syvalion_map, AS_PROGRAM, 16, taitoh_state )
AM_RANGE(0x300000, 0x300001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x300002, 0x300003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x400000, 0x420fff) AM_DEVREADWRITE_LEGACY("tc0080vco", tc0080vco_word_r, tc0080vco_word_w)
- AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( recordbr_map, AS_PROGRAM, 16, taitoh_state )
@@ -266,7 +266,7 @@ static ADDRESS_MAP_START( recordbr_map, AS_PROGRAM, 16, taitoh_state )
AM_RANGE(0x300000, 0x300001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x300002, 0x300003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x400000, 0x420fff) AM_DEVREADWRITE_LEGACY("tc0080vco", tc0080vco_word_r, tc0080vco_word_w)
- AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( dleague_map, AS_PROGRAM, 16, taitoh_state )
@@ -276,7 +276,7 @@ static ADDRESS_MAP_START( dleague_map, AS_PROGRAM, 16, taitoh_state )
AM_RANGE(0x300000, 0x300001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x300002, 0x300003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x400000, 0x420fff) AM_DEVREADWRITE_LEGACY("tc0080vco", tc0080vco_word_r, tc0080vco_word_w)
- AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x600001) AM_WRITENOP /* ?? writes zero once per frame */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c
index 7b51d107100..5490a16bd97 100644
--- a/src/mame/drivers/taito_o.c
+++ b/src/mame/drivers/taito_o.c
@@ -66,7 +66,7 @@ static ADDRESS_MAP_START( parentj_map, AS_PROGRAM, 16, taitoo_state )
AM_RANGE(0x200000, 0x20000f) AM_READWRITE(io_r, io_w) /* TC0220IOC ? */
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2203_r, ym2203_w, 0x00ff)
AM_RANGE(0x400000, 0x420fff) AM_DEVREADWRITE_LEGACY("tc0080vco", tc0080vco_word_r, tc0080vco_word_w)
- AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static INPUT_PORTS_START( parentj )
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 7f11c4b580b..d33670184ff 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -432,7 +432,7 @@ static ADDRESS_MAP_START( superman_map, AS_PROGRAM, 16, taitox_state )
AM_RANGE(0x900000, 0x9007ff) AM_READWRITE_LEGACY(cchip1_ram_r, cchip1_ram_w)
AM_RANGE(0x900802, 0x900803) AM_READWRITE_LEGACY(cchip1_ctrl_r, cchip1_ctrl_w)
AM_RANGE(0x900c00, 0x900c01) AM_WRITE_LEGACY(cchip1_bank_w)
- AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
@@ -447,7 +447,7 @@ static ADDRESS_MAP_START( daisenpu_map, AS_PROGRAM, 16, taitox_state )
AM_RANGE(0x800000, 0x800001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x900000, 0x90000f) AM_READWRITE_LEGACY(daisenpu_input_r, daisenpu_input_w)
- AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
@@ -462,7 +462,7 @@ static ADDRESS_MAP_START( gigandes_map, AS_PROGRAM, 16, taitox_state )
AM_RANGE(0x800000, 0x800001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x900000, 0x90000f) AM_READWRITE_LEGACY(daisenpu_input_r, daisenpu_input_w)
- AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
@@ -477,7 +477,7 @@ static ADDRESS_MAP_START( ballbros_map, AS_PROGRAM, 16, taitox_state )
AM_RANGE(0x800000, 0x800001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x900000, 0x90000f) AM_READWRITE_LEGACY(daisenpu_input_r, daisenpu_input_w)
- AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE_LEGACY("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 186d558a4bb..edd14d2468d 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -1586,7 +1586,7 @@ static ADDRESS_MAP_START( bshark_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x400000, 0x40000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x600000, 0x600001) AM_WRITE(cpua_ctrl_w)
AM_RANGE(0x800000, 0x800007) AM_READWRITE(bshark_stick_r, bshark_stick_w)
- AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd00000, 0xd0ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0xd20000, 0xd2000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -1599,7 +1599,7 @@ static ADDRESS_MAP_START( bsharkjjs_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x400000, 0x40000f) AM_DEVREADWRITE8_LEGACY("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
AM_RANGE(0x600000, 0x600001) AM_WRITE(cpua_ctrl_w)
// AM_RANGE(0x800000, 0x800007) AM_READWRITE(bshark_stick_r, bshark_stick_w) /* No analog stick, this is the Joystick version */
- AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xc00000, 0xc00fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd00000, 0xd0ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0xd20000, 0xd2000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
@@ -1627,7 +1627,7 @@ static ADDRESS_MAP_START( sci_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x200010, 0x20001f) AM_READ(sci_steer_input_r)
// AM_RANGE(0x400000, 0x400001) AM_WRITE(cpua_ctrl_w) // ?? doesn't seem to fit what's written
AM_RANGE(0x420000, 0x420003) AM_READWRITE(taitoz_sound_r, taitoz_sound_w)
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xa00000, 0xa0ffff) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */
AM_RANGE(0xa20000, 0xa2000f) AM_DEVREADWRITE_LEGACY("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
@@ -1721,7 +1721,7 @@ static ADDRESS_MAP_START( dblaxle_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x400010, 0x40001f) AM_READ(dblaxle_steer_input_r)
AM_RANGE(0x600000, 0x600001) AM_WRITE(cpua_ctrl_w) /* could this be causing int6 ? */
AM_RANGE(0x620000, 0x620003) AM_READWRITE(taitoz_sound_r, taitoz_sound_w)
- AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x900000, 0x90ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemap mirror */
AM_RANGE(0xa00000, 0xa0ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
AM_RANGE(0xa30000, 0xa3002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
@@ -1746,7 +1746,7 @@ static ADDRESS_MAP_START( racingb_map, AS_PROGRAM, 16, taitoz_state )
AM_RANGE(0x300010, 0x30001f) AM_READ(dblaxle_steer_input_r)
AM_RANGE(0x500002, 0x500003) AM_WRITE(cpua_ctrl_w)
AM_RANGE(0x520000, 0x520003) AM_READWRITE(taitoz_sound_r, taitoz_sound_w)
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x900000, 0x90ffff) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_word_r, tc0480scp_word_w) /* tilemaps */
AM_RANGE(0x930000, 0x93002f) AM_DEVREADWRITE_LEGACY("tc0480scp", tc0480scp_ctrl_word_r, tc0480scp_ctrl_word_w)
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* mostly unused ? */
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 8b6712098be..592009f6c9e 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, taotaido_state )
AM_RANGE(0xa00000, 0xa01fff) AM_RAM AM_BASE(m_spriteram) // sprite ram
AM_RANGE(0xc00000, 0xc0ffff) AM_RAM AM_BASE(m_spriteram2) // sprite tile lookup ram
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM // main ram
- AM_RANGE(0xffc000, 0xffcfff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // palette ram
+ AM_RANGE(0xffc000, 0xffcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // palette ram
AM_RANGE(0xffe000, 0xffe3ff) AM_RAM AM_BASE(m_scrollram) // rowscroll / rowselect / scroll ram
AM_RANGE(0xffff80, 0xffff81) AM_READ_PORT("P1")
AM_RANGE(0xffff82, 0xffff83) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index c59464e76fb..705bc67f43b 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -73,7 +73,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, targeth_state )
AM_RANGE(0x108006, 0x108007) AM_READ_PORT("GUNY2")
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x10800c, 0x10800d) AM_WRITENOP /* CLR Video INT */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index b79cbdb68bb..5f5923e357c 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -307,7 +307,7 @@ static ADDRESS_MAP_START( cyclwarr_68000a_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x0ba008, 0x0ba009) AM_READWRITE(cyclwarr_control_r, cyclwarr_control_w)
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_BASE(m_spriteram)
AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
- AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK("bank2") /* CPU B ROM */
AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */
ADDRESS_MAP_END
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( cyclwarr_68000b_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w)
AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w)
- AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w)
+ AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram_xRRRRRGGGGGBBBBB_word_w)
AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK("bank2") /* CPU B ROM */
AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */
ADDRESS_MAP_END
@@ -363,7 +363,7 @@ static ADDRESS_MAP_START( bigfight_68000a_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x0ba008, 0x0ba009) AM_READWRITE(cyclwarr_control_r, cyclwarr_control_w)
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_BASE(m_spriteram)
AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(m_sprite_control_ram)
- AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK("bank2") /* CPU A ROM */
AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* CPU B ROM */
ADDRESS_MAP_END
@@ -382,7 +382,7 @@ static ADDRESS_MAP_START( bigfight_68000b_map, AS_PROGRAM, 16, tatsumi_state )
AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w)
AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w)
- AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w)
+ AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram_xRRRRRGGGGGBBBBB_word_w)
AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK("bank2") /* CPU A ROM */
AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* CPU B ROM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/taxidriv.c b/src/mame/drivers/taxidriv.c
index 98b750fee2e..1f3a551aa67 100644
--- a/src/mame/drivers/taxidriv.c
+++ b/src/mame/drivers/taxidriv.c
@@ -55,7 +55,7 @@ static WRITE8_DEVICE_HANDLER( p0c_w )
/* bit 2 toggles during gameplay */
- flip_screen_set(device->machine(), data & 8);
+ state->flip_screen_set(data & 8);
// popmessage("%02x",data&0x0f);
}
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 5805376392c..9290b766539 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( 6206C_map, AS_PROGRAM, 8, tbowl_state )
AM_RANGE(0xc000, 0xdfff) AM_READONLY
AM_RANGE(0xc000, 0xd7ff) AM_WRITEONLY
AM_RANGE(0xd800, 0xdfff) AM_WRITEONLY AM_BASE(m_spriteram)
- AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram") // 2x palettes, one for each monitor?
+ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_be_w) AM_SHARE("paletteram") // 2x palettes, one for each monitor?
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank2")
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(shared_r, shared_w)
AM_RANGE(0xfc00, 0xfc00) AM_WRITE(tbowlc_bankswitch_w)
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index a9abc50e76f..0b27260588d 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -139,7 +139,7 @@ static ADDRESS_MAP_START( rygar_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("JOY1")
AM_RANGE(0xf801, 0xf801) AM_READ_PORT("BUTTONS1")
@@ -166,7 +166,7 @@ static ADDRESS_MAP_START( gemini_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(tecmo_fgvideoram_w) AM_BASE(m_fgvideoram)
AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE(m_bgvideoram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("JOY1")
@@ -195,7 +195,7 @@ static ADDRESS_MAP_START( silkworm_map, AS_PROGRAM, 8, tecmo_state )
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(tecmo_txvideoram_w) AM_BASE(m_txvideoram)
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1")
AM_RANGE(0xf800, 0xf800) AM_READ_PORT("JOY1")
AM_RANGE(0xf801, 0xf801) AM_READ_PORT("BUTTONS1")
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 3622d68118d..ffb39fca365 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START( fstarfrc_map, AS_PROGRAM, 16, tecmo16_state )
AM_RANGE(0x121800, 0x121fff) AM_RAM_WRITE(tecmo16_colorram2_w) AM_BASE(m_colorram2)
AM_RANGE(0x122000, 0x127fff) AM_RAM /* work area */
AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x150000, 0x150001) AM_WRITE(tecmo16_flipscreen_w)
AM_RANGE(0x150010, 0x150011) AM_WRITE(tecmo16_sound_command_w)
AM_RANGE(0x150030, 0x150031) AM_READ_PORT("DSW2") AM_WRITENOP /* ??? */
@@ -76,7 +76,7 @@ static ADDRESS_MAP_START( ginkun_map, AS_PROGRAM, 16, tecmo16_state )
AM_RANGE(0x123000, 0x123fff) AM_RAM_WRITE(tecmo16_colorram2_w) AM_BASE(m_colorram2)
AM_RANGE(0x124000, 0x124fff) AM_RAM /* extra RAM for Riot */
AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
- AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x141fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x150000, 0x150001) AM_WRITE(tecmo16_flipscreen_w)
AM_RANGE(0x150010, 0x150011) AM_WRITE(tecmo16_sound_command_w)
AM_RANGE(0x150020, 0x150021) AM_READ_PORT("EXTRA") AM_WRITENOP /* ??? */
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 86bfc92e6ca..faa6b0884be 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -300,10 +300,10 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tecmosys_state )
AM_RANGE(0x700000, 0x703fff) AM_RAM_WRITE(fg_tilemap_w) AM_BASE(m_fgtilemap_ram) // fix ram
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE(m_spriteram) // obj ram
AM_RANGE(0x880000, 0x88000b) AM_READ(unk880000_r)
- AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // AM_WRITEONLY // obj pal
+ AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // AM_WRITEONLY // obj pal
//AM_RANGE(0x980000, 0x9807ff) AM_WRITEONLY // bg pal
- //AM_RANGE(0x980800, 0x980fff) AM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // fix pal
+ //AM_RANGE(0x980800, 0x980fff) AM_WRITE(paletteram_xGGGGGRRRRRBBBBB_word_w) AM_SHARE("paletteram") // fix pal
// the two above are as tested by the game code, I've only rolled them into one below to get colours to show right.
AM_RANGE(0x980000, 0x980fff) AM_RAM_WRITE(tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(m_tilemap_paletteram16)
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 8f3a348dd12..865d75da5ed 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -219,7 +219,7 @@ static ADDRESS_MAP_START( main_mem, AS_PROGRAM, 8, tehkanwc_state )
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(tehkanwc_videoram_w) AM_SHARE("share2") AM_BASE(m_videoram)
AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(tehkanwc_colorram_w) AM_SHARE("share3") AM_BASE(m_colorram)
- AM_RANGE(0xd800, 0xddff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("share4") AM_SHARE("paletteram")
+ AM_RANGE(0xd800, 0xddff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_be_w) AM_SHARE("share4") AM_SHARE("paletteram")
AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE("share5") /* unused part of the palette RAM, I think? Gridiron uses it */
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(tehkanwc_videoram2_w) AM_SHARE("share6") AM_BASE(m_videoram2)
AM_RANGE(0xe800, 0xebff) AM_RAM AM_SHARE("share7") AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprites */
@@ -245,7 +245,7 @@ static ADDRESS_MAP_START( sub_mem, AS_PROGRAM, 8, tehkanwc_state )
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(tehkanwc_videoram_w) AM_SHARE("share2")
AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(tehkanwc_colorram_w) AM_SHARE("share3")
- AM_RANGE(0xd800, 0xddff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("share4") AM_SHARE("paletteram")
+ AM_RANGE(0xd800, 0xddff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_be_w) AM_SHARE("share4") AM_SHARE("paletteram")
AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE("share5") /* unused part of the palette RAM, I think? Gridiron uses it */
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(tehkanwc_videoram2_w) AM_SHARE("share6")
AM_RANGE(0xe800, 0xebff) AM_RAM AM_SHARE("share7") /* sprites */
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 41657977f4c..2dc2f84da8b 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -70,11 +70,11 @@ WRITE8_MEMBER(thedeep_state::thedeep_protection_w)
switch (m_protection_command)
{
case 0x11:
- flip_screen_set(machine(), 1);
+ flip_screen_set(1);
break;
case 0x20:
- flip_screen_set(machine(), 0);
+ flip_screen_set(0);
break;
case 0x30:
@@ -207,7 +207,7 @@ static void thedeep_maincpu_bankswitch(running_machine &machine,UINT8 bank_trig)
WRITE8_MEMBER(thedeep_state::thedeep_p1_w)
{
- flip_screen_set(machine(), (data & 1) ^ 1);
+ flip_screen_set((data & 1) ^ 1);
thedeep_maincpu_bankswitch(machine(),(data & 6) >> 1);
logerror("P1 %02x\n",data);
}
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index fdc771181c3..0223908d2ea 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( thoop2_map, AS_PROGRAM, 16, thoop2_state )
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(thoop2_vram_w) AM_BASE(m_videoram) /* Video RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset16_w) /* INT 6 ACK/Watchdog timer */
- AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")/* Palette */
+ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")/* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 29530f27af5..0c9082f1f31 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -48,7 +48,7 @@ WRITE8_MEMBER(thunderx_state::scontra_bankedram_w)
{
if (m_palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
else
m_ram[offset] = data;
}
@@ -91,7 +91,7 @@ WRITE8_MEMBER(thunderx_state::thunderx_bankedram_w)
logerror("%04x pmc internal ram %04x = %02x\n",cpu_get_pc(&space.device()),offset,data);
}
else
- paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data);
}
/*
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 04728afc046..f668bac9551 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -177,7 +177,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tigeroad_state )
AM_RANGE(0xfec000, 0xfec7ff) AM_RAM_WRITE(tigeroad_videoram_w) AM_BASE(m_videoram)
AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE(tigeroad_scroll_w)
AM_RANGE(0xfe800e, 0xfe800f) AM_WRITEONLY /* fe800e = watchdog or IRQ acknowledge */
- AM_RANGE(0xff8200, 0xff867f) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xff8200, 0xff867f) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_BASE(m_ram16)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 5657fc68066..209bc2228b4 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -538,7 +538,7 @@ static ADDRESS_MAP_START( tmaster_map, AS_PROGRAM, 16, tmaster_state )
AM_RANGE( 0x580000, 0x580001 ) AM_WRITENOP // often
- AM_RANGE( 0x600000, 0x601fff ) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w ) AM_SHARE("paletteram")
+ AM_RANGE( 0x600000, 0x601fff ) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w ) AM_SHARE("paletteram")
AM_RANGE( 0x800000, 0x800001 ) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff )
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 7627cdca8fb..ddff0d4baa7 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -621,7 +621,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( punkshot_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM /* main RAM */
- AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("DSW1/DSW2")
AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("COINS/DSW3")
AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P3/P4")
@@ -640,7 +640,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lgtnfght_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x090000, 0x093fff) AM_RAM /*main RAM */
AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS")
AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1")
@@ -671,7 +671,7 @@ static ADDRESS_MAP_START( blswhstl_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x180000, 0x183fff) AM_DEVREADWRITE_LEGACY("k052109", k052109_word_r, k052109_word_w)
AM_RANGE(0x204000, 0x207fff) AM_RAM /* main RAM */
AM_RANGE(0x300000, 0x303fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE(m_spriteram)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x50003f) AM_DEVREADWRITE_LEGACY("k054000", k054000_lsb_r, k054000_lsb_w)
AM_RANGE(0x680000, 0x68001f) AM_READWRITE(k053244_word_noA1_r, k053244_word_noA1_w)
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("P1")
@@ -713,7 +713,7 @@ static ADDRESS_MAP_START( glfgreat_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */
AM_RANGE(0x104000, 0x107fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE(m_spriteram)
- AM_RANGE(0x108000, 0x108fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x108000, 0x108fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x10c000, 0x10cfff) AM_DEVREADWRITE_LEGACY("k053936", k053936_linectrl_r, k053936_linectrl_w) /* 053936? */
AM_RANGE(0x110000, 0x11001f) AM_WRITE(k053244_word_noA1_w) /* duplicate! */
AM_RANGE(0x114000, 0x11401f) AM_DEVREADWRITE_LEGACY("k053245", k053244_lsb_r, k053244_lsb_w) /* duplicate! */
@@ -737,7 +737,7 @@ static ADDRESS_MAP_START( prmrsocr_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */
AM_RANGE(0x104000, 0x107fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE(m_spriteram)
- AM_RANGE(0x108000, 0x108fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x108000, 0x108fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x10c000, 0x10cfff) AM_DEVREADWRITE_LEGACY("k053936", k053936_linectrl_r, k053936_linectrl_w)
AM_RANGE(0x110000, 0x11001f) AM_WRITE(k053244_word_noA1_w) /* duplicate! */
AM_RANGE(0x114000, 0x11401f) AM_DEVREADWRITE_LEGACY("k053245", k053244_lsb_r, k053244_lsb_w) /* duplicate! */
@@ -999,7 +999,7 @@ logerror("copy command %04x sprite %08x data %08x: %04x%04x %04x%04x modifiers
static ADDRESS_MAP_START( tmnt2_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_BASE(m_tmnt2_rom)
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_BASE(m_sunset_104000) /* main RAM */
- AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x183fff) AM_RAM_WRITE(k053245_scattered_word_w) AM_BASE(m_spriteram) // k053245_scattered_word_r
AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("P1")
AM_RANGE(0x1c0002, 0x1c0003) AM_READ_PORT("P2")
@@ -1025,7 +1025,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ssriders_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */
- AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE(m_spriteram)
AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("P1")
AM_RANGE(0x1c0002, 0x1c0003) AM_READ_PORT("P2")
@@ -1051,7 +1051,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sunsetbl_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */
- AM_RANGE(0x14c000, 0x14cfff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x14c000, 0x14cfff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x14e700, 0x14e71f) AM_DEVWRITE_LEGACY("k053251", k053251_lsb_w)
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE(m_spriteram)
AM_RANGE(0x184000, 0x18ffff) AM_RAM
@@ -1077,7 +1077,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( thndrx2_main_map, AS_PROGRAM, 16, tmnt_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */
- AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x300000, 0x30001f) AM_DEVWRITE_LEGACY("k053251", k053251_lsb_w)
AM_RANGE(0x400000, 0x400003) AM_DEVREAD8_LEGACY("k053260", punkshot_sound_r, 0x00ff) /* K053260 */
AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8_LEGACY("k053260", k053260_w, 0x00ff)
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index c77a0d240d9..f255179c3e9 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -761,7 +761,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tnzs_state )
/* arknoid2, extrmatn, plumppop and drtoppel have PROMs instead of RAM */
/* drtoppel writes here anyway! (maybe leftover from tests during development) */
/* so the handler is patched out in init_drtopple() */
- AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu0_type2, AS_PROGRAM, 8, tnzs_state )
@@ -824,7 +824,7 @@ static ADDRESS_MAP_START( tnzsb_cpu1_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xf000, 0xf003) AM_READONLY
- AM_RANGE(0xf000, 0xf3ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf000, 0xf3ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( kabukiz_cpu1_map, AS_PROGRAM, 8, tnzs_state )
@@ -839,7 +839,7 @@ static ADDRESS_MAP_START( kabukiz_cpu1_map, AS_PROGRAM, 8, tnzs_state )
AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2")
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("share1")
- AM_RANGE(0xf800, 0xfbff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xf800, 0xfbff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_byte_le_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( tnzsb_cpu2_map, AS_PROGRAM, 8, tnzs_state )
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 450a630b955..77ca6ea4ade 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -1027,7 +1027,7 @@ static ADDRESS_MAP_START( tekipaki_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x020000, 0x03ffff) AM_ROM // extra for Whoopee
AM_RANGE(0x080000, 0x082fff) AM_RAM
- AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x14000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("DSWA")
AM_RANGE(0x180010, 0x180011) AM_READ_PORT("DSWB")
@@ -1044,7 +1044,7 @@ static ADDRESS_MAP_START( ghox_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040001) AM_READ(ghox_p2_h_analog_r)
AM_RANGE(0x080000, 0x083fff) AM_RAM
- AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x100000, 0x100001) AM_READ(ghox_p1_h_analog_r)
AM_RANGE(0x140000, 0x14000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x180000, 0x180001) AM_READWRITE(ghox_mcu_r, ghox_mcu_w) // really part of shared RAM
@@ -1068,7 +1068,7 @@ static ADDRESS_MAP_START( dogyuun_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x20001c, 0x20001d) AM_WRITE(toaplan2_v25_coin_word_w) // Coin count/lock + v25 reset line
AM_RANGE(0x210000, 0x21ffff) AM_READWRITE(shared_ram_r, shared_ram_w )
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x50000d) AM_DEVREADWRITE_LEGACY("gp9001vdp1", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r) // test bit 8
ADDRESS_MAP_END
@@ -1083,7 +1083,7 @@ static ADDRESS_MAP_START( kbash_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x208018, 0x208019) AM_READ_PORT("SYS")
AM_RANGE(0x20801c, 0x20801d) AM_WRITE(toaplan2_coin_word_w)
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r) // test bit 8
ADDRESS_MAP_END
@@ -1105,7 +1105,7 @@ static ADDRESS_MAP_START( kbash2_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x200028, 0x200029) AM_DEVWRITE_LEGACY("oki1", oki_bankswitch_w)
AM_RANGE(0x20002c, 0x20002d) AM_READ(video_count_r)
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
@@ -1113,7 +1113,7 @@ static ADDRESS_MAP_START( truxton2_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x300000, 0x300fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x300000, 0x300fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x402000, 0x4021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x402200, 0x402fff) AM_RAM
@@ -1136,7 +1136,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pipibibs_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x082fff) AM_RAM
- AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x14000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x190000, 0x190fff) AM_READWRITE(shared_ram_r, shared_ram_w)
AM_RANGE(0x19c01c, 0x19c01d) AM_WRITE(toaplan2_coin_word_w)
@@ -1154,7 +1154,7 @@ static ADDRESS_MAP_START( pipibibi_bootleg_68k_mem, AS_PROGRAM, 16, toaplan2_sta
AM_RANGE(0x080000, 0x082fff) AM_RAM
AM_RANGE(0x083000, 0x0837ff) AM_DEVREADWRITE_LEGACY("gp9001vdp0", pipibibi_bootleg_spriteram16_r, pipibibi_bootleg_spriteram16_w) // SpriteRAM
AM_RANGE(0x083800, 0x087fff) AM_RAM // SpriteRAM (unused)
- AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x120000, 0x120fff) AM_RAM // Copy of SpriteRAM ?
// AM_RANGE(0x13f000, 0x13f001) AM_WRITENOP // ???
AM_RANGE(0x180000, 0x182fff) AM_DEVREADWRITE_LEGACY("gp9001vdp0", pipibibi_bootleg_videoram16_r, pipibibi_bootleg_videoram16_w) // TileRAM
@@ -1181,7 +1181,7 @@ static ADDRESS_MAP_START( fixeight_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x20001c, 0x20001d) AM_WRITE(toaplan2_coin_word_w)
AM_RANGE(0x280000, 0x28ffff) AM_READWRITE(shared_ram_r, shared_ram_w )
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
@@ -1203,7 +1203,7 @@ static ADDRESS_MAP_START( fixeightbl_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x200018, 0x200019) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x20001c, 0x20001d) AM_READ_PORT("DSWA")
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x503000, 0x5031ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
@@ -1222,7 +1222,7 @@ static ADDRESS_MAP_START( vfive_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x20001c, 0x20001d) AM_WRITE(toaplan2_v25_coin_word_w) // Coin count/lock + v25 reset line
AM_RANGE(0x210000, 0x21ffff) AM_READWRITE(shared_ram_r, shared_ram_w )
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r)
ADDRESS_MAP_END
@@ -1236,7 +1236,7 @@ static ADDRESS_MAP_START( batsugun_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x20001c, 0x20001d) AM_WRITE(toaplan2_v25_coin_word_w) // Coin count/lock + v25 reset line
AM_RANGE(0x210000, 0x21ffff) AM_READWRITE(shared_ram_r, shared_ram_w )
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x50000d) AM_DEVREADWRITE_LEGACY("gp9001vdp1", gp9001_vdp_r, gp9001_vdp_w)
AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r)
ADDRESS_MAP_END
@@ -1246,7 +1246,7 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x500003) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2151_r, ym2151_w, 0x00ff)
AM_RANGE(0x600000, 0x600001) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("JMPR")
@@ -1275,7 +1275,7 @@ static ADDRESS_MAP_START( mahoudai_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x21c034, 0x21c035) AM_READ_PORT("JMPR")
AM_RANGE(0x21c03c, 0x21c03d) AM_READ(video_count_r)
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x401000, 0x4017ff) AM_RAM // Unused palette RAM
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
@@ -1299,7 +1299,7 @@ static ADDRESS_MAP_START( shippumd_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x21c034, 0x21c035) AM_READ_PORT("JMPR")
AM_RANGE(0x21c03c, 0x21c03d) AM_READ(video_count_r)
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x401000, 0x4017ff) AM_RAM // Unused palette RAM
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
@@ -1322,7 +1322,7 @@ static ADDRESS_MAP_START( bgaregga_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x21c034, 0x21c035) AM_READ_PORT("JMPR")
AM_RANGE(0x21c03c, 0x21c03d) AM_READ(video_count_r)
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE_LEGACY("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
- AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
AM_RANGE(0x502000, 0x5021ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x502200, 0x502fff) AM_RAM
@@ -1336,7 +1336,7 @@ static ADDRESS_MAP_START( batrider_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
// actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") AM_SIZE(m_paletteram_size)
+ AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") AM_SIZE(m_paletteram_size)
AM_RANGE(0x203000, 0x2031ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x203200, 0x2033ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x203400, 0x207fff) AM_RAM AM_BASE_SIZE(m_mainram16, m_mainram_overlap_size)
@@ -1366,7 +1366,7 @@ static ADDRESS_MAP_START( bbakraid_68k_mem, AS_PROGRAM, 16, toaplan2_state )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
// actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE(m_txvideoram16, m_tx_vram_size)
- AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") AM_SIZE(m_paletteram_size)
+ AM_RANGE(0x202000, 0x202fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram") AM_SIZE(m_paletteram_size)
AM_RANGE(0x203000, 0x2031ff) AM_RAM_WRITE(toaplan2_txvideoram16_offs_w) AM_BASE_SIZE(m_txvideoram16_offs, m_tx_offs_vram_size)
AM_RANGE(0x203200, 0x2033ff) AM_RAM_WRITE(toaplan2_txscrollram16_w) AM_BASE_SIZE(m_txscrollram16, m_tx_scroll_vram_size)
AM_RANGE(0x203400, 0x207fff) AM_RAM AM_BASE_SIZE(m_mainram16, m_mainram_overlap_size)
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index b1a3ddf2a3a..96427b9f72a 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( toki_map, AS_PROGRAM, 16, toki_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x06d7ff) AM_RAM
AM_RANGE(0x06d800, 0x06dfff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x06e000, 0x06e7ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x06e000, 0x06e7ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x06e800, 0x06efff) AM_RAM_WRITE(toki_background1_videoram16_w) AM_BASE(m_background1_videoram16)
AM_RANGE(0x06f000, 0x06f7ff) AM_RAM_WRITE(toki_background2_videoram16_w) AM_BASE(m_background2_videoram16)
AM_RANGE(0x06f800, 0x06ffff) AM_RAM_WRITE(toki_foreground_videoram16_w) AM_BASE(m_videoram)
@@ -108,7 +108,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tokib_map, AS_PROGRAM, 16, toki_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x06dfff) AM_RAM
- AM_RANGE(0x06e000, 0x06e7ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x06e000, 0x06e7ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x06e800, 0x06efff) AM_RAM_WRITE(toki_background1_videoram16_w) AM_BASE(m_background1_videoram16)
AM_RANGE(0x06f000, 0x06f7ff) AM_RAM_WRITE(toki_background2_videoram16_w) AM_BASE(m_background2_videoram16)
AM_RANGE(0x06f800, 0x06ffff) AM_RAM_WRITE(toki_foreground_videoram16_w) AM_BASE(m_videoram)
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index 083f8d9e086..a6a512e794a 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -441,7 +441,7 @@ static WRITE8_DEVICE_HANDLER( topspeed_msm5205_stop_w )
static ADDRESS_MAP_START( topspeed_map, AS_PROGRAM, 16, topspeed_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_SIZE(m_sharedram, m_sharedram_size)
- AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600002, 0x600003) AM_WRITE(cpua_ctrl_w)
AM_RANGE(0x7e0000, 0x7e0001) AM_READNOP AM_DEVWRITE8_LEGACY("tc0140syt", tc0140syt_port_w, 0x00ff)
AM_RANGE(0x7e0002, 0x7e0003) AM_DEVREADWRITE8_LEGACY("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 5c2d367df64..6053f404400 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -511,7 +511,8 @@ static WRITE8_DEVICE_HANDLER( out_coin1 )
static WRITE8_DEVICE_HANDLER( flip )
{
- flip_screen_set(device->machine(), data & 1);
+ toypop_state *state = device->machine().driver_data<toypop_state>();
+ state->flip_screen_set(data & 1);
}
/* chip #0: player inputs, buttons, coins */
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 74d1330fa6a..3520529da4f 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -97,7 +97,7 @@ WRITE8_MEMBER(tsamurai_state::sound_command3_w)
WRITE8_MEMBER(tsamurai_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
WRITE8_MEMBER(tsamurai_state::tsamurai_coin_counter_w)
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 83f4550c192..73d5fe3c446 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -654,7 +654,7 @@ static ADDRESS_MAP_START( tumblepopb_main_map, AS_PROGRAM, 16, tumbleb_state )
#endif
AM_RANGE(0x100000, 0x100001) AM_READWRITE(tumblepb_prot_r, tumblepb_oki_w)
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_mainram)
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Bootleg sprite buffer */
AM_RANGE(0x160800, 0x160807) AM_WRITEONLY /* writes past the end of spriteram */
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
@@ -676,7 +676,7 @@ static ADDRESS_MAP_START( fncywld_main_map, AS_PROGRAM, 16, tumbleb_state )
#endif
AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8_LEGACY("ymsnd", ym2151_r, ym2151_w, 0x00ff)
AM_RANGE(0x100004, 0x100005) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff)
- AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* sprites */
AM_RANGE(0x160800, 0x16080f) AM_WRITEONLY /* goes slightly past the end of spriteram? */
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
@@ -704,7 +704,7 @@ static ADDRESS_MAP_START( htchctch_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x100000, 0x100001) AM_WRITE(semicom_soundcmd_w)
AM_RANGE(0x100002, 0x100003) AM_WRITE(bcstory_tilebank_w)
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_mainram)
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x160fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Bootleg sprite buffer */
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
AM_RANGE(0x18000c, 0x18000d) AM_WRITENOP
@@ -720,7 +720,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( jumppop_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_mainram)
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x160fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Bootleg sprite buffer */
AM_RANGE(0x180000, 0x180001) AM_NOP /* IRQ ack? */
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("PLAYERS")
@@ -745,7 +745,7 @@ static ADDRESS_MAP_START( suprtrio_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0xa00000, 0xa0000f) AM_RAM AM_BASE(m_control)
AM_RANGE(0xa20000, 0xa20fff) AM_RAM_WRITE(tumblepb_pf1_data_w) AM_BASE(m_pf1_data)
AM_RANGE(0xa22000, 0xa22fff) AM_RAM_WRITE(tumblepb_pf2_data_w) AM_BASE(m_pf2_data)
- AM_RANGE(0xcf0000, 0xcf05ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xcf0000, 0xcf05ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("PLAYERS") AM_WRITE(suprtrio_tilebank_w)
AM_RANGE(0xe40000, 0xe40001) AM_READ_PORT("SYSTEM")
AM_RANGE(0xe80002, 0xe80003) AM_READ_PORT("DSW")
@@ -756,7 +756,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pangpang_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_mainram)
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Bootleg sprite buffer */
AM_RANGE(0x160800, 0x160807) AM_WRITEONLY // writes past the end of spriteram
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
@@ -839,7 +839,7 @@ static ADDRESS_MAP_START( jumpkids_main_map, AS_PROGRAM, 16, tumbleb_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(jumpkids_sound_w)
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE(m_mainram)
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) /* Bootleg sprite buffer */
AM_RANGE(0x160800, 0x160807) AM_WRITEONLY /* writes past the end of spriteram */
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r)
@@ -3755,7 +3755,7 @@ static DRIVER_INIT( chokchok )
/* different palette format, closer to tumblep -- is this controlled by a register? the palette was right with the hatch catch trojan */
tumbleb_state *state = machine.driver_data<tumbleb_state>();
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x140000, 0x140fff, write16_delegate(FUNC(tumbleb_state::paletteram16_xxxxBBBBGGGGRRRR_word_w), state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x140000, 0x140fff, write16_delegate(FUNC(tumbleb_state::paletteram_xxxxBBBBGGGGRRRR_word_w), state));
/* slightly different banking */
machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x100002, 0x100003, write16_delegate(FUNC(tumbleb_state::chokchok_tilebank_w),state));
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index ea955c04b67..3ec90c2ff6f 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -113,7 +113,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, tumblep_state )
#endif
AM_RANGE(0x100000, 0x100001) AM_WRITE(tumblep_sound_w)
AM_RANGE(0x120000, 0x123fff) AM_RAM
- AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepop_controls_r)
AM_RANGE(0x18000c, 0x18000d) AM_WRITENOP
AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 10d10822c6f..ae4c0a88f26 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -278,7 +278,7 @@ static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 16, twincobr_state )
AM_RANGE(0x000000, 0x02ffff) AM_ROM
AM_RANGE(0x030000, 0x033fff) AM_RAM /* 68K and DSP shared RAM */
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0x050000, 0x050dff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x050000, 0x050dff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x060000, 0x060001) AM_DEVWRITE8("crtc", mc6845_device, address_w, 0x00ff)
AM_RANGE(0x060002, 0x060003) AM_DEVWRITE8("crtc", mc6845_device, register_w, 0x00ff)
AM_RANGE(0x070000, 0x070003) AM_WRITE(twincobr_txscroll_w) /* text layer scroll */
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index 6e8b6a04418..1ce9eaa2234 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -34,7 +34,7 @@ WRITE16_MEMBER(ultraman_state::sound_irq_trigger_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, ultraman_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM
- AM_RANGE(0x180000, 0x183fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette */
+ AM_RANGE(0x180000, 0x183fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")/* Palette */
AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x1c0002, 0x1c0003) AM_READ_PORT("P1")
AM_RANGE(0x1c0004, 0x1c0005) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c
index 52401a1ab18..fab2bd4de10 100644
--- a/src/mame/drivers/umipoker.c
+++ b/src/mame/drivers/umipoker.c
@@ -305,7 +305,7 @@ static ADDRESS_MAP_START( umipoker_map, AS_PROGRAM, 16, umipoker_state )
ADDRESS_MAP_UNMAP_LOW
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x403fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x600000, 0x6007ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x600000, 0x6007ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(umipoker_vram_0_w) AM_BASE(m_vram_0)
AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE(umipoker_vram_1_w) AM_BASE(m_vram_1)
AM_RANGE(0x804000, 0x805fff) AM_RAM_WRITE(umipoker_vram_2_w) AM_BASE(m_vram_2)
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index f70a0b68450..9bef5291c64 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -321,7 +321,7 @@ WRITE16_MEMBER(vamphalf_state::boonggab_lamps_w)
static ADDRESS_MAP_START( common_map, AS_PROGRAM, 16, vamphalf_state )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE(m_wram)
AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_BASE(m_tiles)
- AM_RANGE(0x80000000, 0x8000ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x80000000, 0x8000ffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 6500d43fb66..7bfa7bbb022 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -92,7 +92,7 @@ WRITE8_MEMBER(vastar_state::vastar_sharedram_w)
WRITE8_MEMBER(vastar_state::flip_screen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
WRITE8_MEMBER(vastar_state::nmi_mask_w)
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index f220e688a41..498a84cf850 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -187,7 +187,7 @@ WRITE8_MEMBER(vball_state::cpu_sound_command_w)
*/
WRITE8_MEMBER(vball_state::vb_scrollx_hi_w)
{
- flip_screen_set(machine(), ~data&1);
+ flip_screen_set(~data&1);
m_vb_scrollx_hi = (data & 0x02) << 7;
vb_bgprombank_w(machine(), (data >> 2) & 0x07);
vb_spprombank_w(machine(), (data >> 5) & 0x07);
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 9b42e7cff91..465aa0ffdd1 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -169,7 +169,7 @@ static void vendetta_video_banking( running_machine &machine, int select )
if (select & 1)
{
space->install_read_bank(state->m_video_banking_base + 0x2000, state->m_video_banking_base + 0x2fff, "bank4" );
- space->install_write_handler(state->m_video_banking_base + 0x2000, state->m_video_banking_base + 0x2fff, write8_delegate(FUNC(vendetta_state::paletteram_xBBBBBGGGGGRRRRR_be_w), state) );
+ space->install_write_handler(state->m_video_banking_base + 0x2000, state->m_video_banking_base + 0x2fff, write8_delegate(FUNC(vendetta_state::paletteram_xBBBBBGGGGGRRRRR_byte_be_w), state) );
space->install_legacy_readwrite_handler(*state->m_k053246, state->m_video_banking_base + 0x0000, state->m_video_banking_base + 0x0fff, FUNC(k053247_r), FUNC(k053247_w) );
memory_set_bankptr(machine, "bank4", state->m_generic_paletteram_8);
}
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 3137ff0e741..d2e91d96eaa 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -236,7 +236,7 @@ static ADDRESS_MAP_START( varia_program_map, AS_PROGRAM, 16, vmetal_state )
AM_RANGE(0x160000, 0x16ffff) AM_READ(varia_crom_read) // cgrom read window ..
- AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram16_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x170000, 0x173fff) AM_RAM_WRITE(paletteram_GGGGGRRRRRBBBBBx_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0x175000, 0x177fff) AM_RAM
AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE(m_tlookup)
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index 7226812c6fb..b97ed01faa9 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -67,7 +67,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, volfied_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main */
AM_RANGE(0x200000, 0x203fff) AM_DEVREADWRITE_LEGACY("pc090oj", pc090oj_word_r, pc090oj_word_w)
AM_RANGE(0x400000, 0x47ffff) AM_READWRITE(volfied_video_ram_r, volfied_video_ram_w)
- AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x600000, 0x600001) AM_WRITE(volfied_video_mask_w)
AM_RANGE(0x700000, 0x700001) AM_WRITE(volfied_sprite_ctrl_w)
AM_RANGE(0xd00000, 0xd00001) AM_READWRITE(volfied_video_ctrl_r, volfied_video_ctrl_w)
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 614a592a9b2..4a311dc45e9 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -63,7 +63,7 @@ public:
WRITE8_MEMBER(vroulet_state::vroulet_paletteram_w)
{
/*
- paletteram_xxxxBBBBGGGGRRRR_be_w
+ paletteram_xxxxBBBBGGGGRRRR_byte_be_w
but... each palette has 8 colors only, not 16 as expected...
*/
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 21bb97bc3b6..95f9c78def4 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -205,7 +205,7 @@ static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 8, wardner_state )
AM_RANGE(0x8000, 0x8fff) AM_WRITE(wardner_sprite_w) AM_SHARE("spriteram")
AM_RANGE(0x9000, 0x9fff) AM_ROM
- AM_RANGE(0xa000, 0xadff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_le_w) AM_SHARE("paletteram")
+ AM_RANGE(0xa000, 0xadff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_le_w) AM_SHARE("paletteram")
AM_RANGE(0xae00, 0xafff) AM_RAM AM_BASE(m_rambase_ae00)
AM_RANGE(0xb000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE(m_rambase_c000) AM_SHARE("share1") /* Shared RAM with Sound Z80 */
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index c29b17c1a0b..d119e721721 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -158,7 +158,7 @@ READ8_MEMBER(warpwarp_state::geebee_in_r)
res = input_port_read_safe(machine(), portnames[offset], 0);
if (offset == 3)
{
- res = input_port_read(machine(), (flip_screen_get(machine()) & 1) ? "IN2" : "IN1"); // read player 2 input in cocktail mode
+ res = input_port_read(machine(), (flip_screen() & 1) ? "IN2" : "IN1"); // read player 2 input in cocktail mode
if (m_handle_joystick)
{
/* map digital two-way joystick to two fixed VOLIN values */
@@ -220,7 +220,7 @@ WRITE8_MEMBER(warpwarp_state::geebee_out7_w)
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
break;
case 7:
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
break;
}
}
@@ -246,7 +246,7 @@ static READ8_DEVICE_HANDLER( warpwarp_vol_r )
warpwarp_state *state = device->machine().driver_data<warpwarp_state>();
int res;
- res = input_port_read(device->machine(), (flip_screen_get(device->machine()) & 1) ? "VOLIN2" : "VOLIN1");
+ res = input_port_read(device->machine(), (state->flip_screen() & 1) ? "VOLIN2" : "VOLIN1");
if (state->m_handle_joystick)
{
if (res & 1) return 0x0f;
@@ -305,7 +305,7 @@ WRITE8_MEMBER(warpwarp_state::warpwarp_out3_w)
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
break;
case 7:
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
break;
}
}
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index f903efeb31d..62edc547b9d 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -145,7 +145,7 @@ static ADDRESS_MAP_START( wc90_map_2, AS_PROGRAM, 8, wc90_state )
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd800, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank2")
AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90_bankswitch1_w)
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index deb84694d59..2b7ad223b00 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( wc90b_map2, AS_PROGRAM, 8, wc90b_state )
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size)
AM_RANGE(0xd800, 0xdfff) AM_RAM
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_be_w) AM_SHARE("paletteram")
AM_RANGE(0xe800, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank2")
AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE("share1")
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 4281ec442b3..a27cbaef8c9 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -358,7 +358,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, welltris_state )
AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* work */
AM_RANGE(0xffc000, 0xffc3ff) AM_RAM_WRITE(welltris_spriteram_w) AM_BASE(m_spriteram) /* Sprite */
AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(welltris_charvideoram_w) AM_BASE(m_charvideoram) /* Char */
- AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1") /* Bottom Controls */
AM_RANGE(0xfff000, 0xfff001) AM_WRITE(welltris_palette_bank_w)
AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("P2") /* Top Controls */
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index 55b305fa586..2abcc23f7c5 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -656,7 +656,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, wgp_state )
AM_RANGE(0x502000, 0x517fff) AM_READWRITE(wgp_pivram_word_r, wgp_pivram_word_w) AM_BASE(m_pivram) /* piv tilemaps */
AM_RANGE(0x520000, 0x52001f) AM_READWRITE(wgp_piv_ctrl_word_r, wgp_piv_ctrl_word_w) AM_BASE(m_piv_ctrlram)
AM_RANGE(0x600000, 0x600003) AM_WRITE(rotate_port_w) /* rotation control ? */
- AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_word_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 16 /* LAN areas not mapped... */, wgp_state )
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 67250534bcf..b8a386c6852 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -144,7 +144,7 @@ WRITE8_MEMBER(wink_state::prot_w)
static ADDRESS_MAP_START( wink_io, AS_IO, 8, wink_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x1f) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_le_w) AM_SHARE("paletteram") //0x10-0x1f is likely to be something else
+ AM_RANGE(0x00, 0x1f) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_byte_le_w) AM_SHARE("paletteram") //0x10-0x1f is likely to be something else
// AM_RANGE(0x20, 0x20) AM_WRITENOP //??? seems unused..
AM_RANGE(0x21, 0x21) AM_WRITE(player_mux_w) //??? no mux on the pcb.
AM_RANGE(0x22, 0x22) AM_WRITE(tile_banking_w)
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 1163e3b3370..f1e2c9d216d 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -471,8 +471,8 @@ static ADDRESS_MAP_START( map_main, AS_PROGRAM, 8, witch_state )
AM_RANGE(0xc800, 0xcbff) AM_READWRITE(gfx1_vram_r, gfx1_vram_w) AM_BASE(m_gfx1_vram)
AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(gfx1_cram_r, gfx1_cram_w) AM_BASE(m_gfx1_cram)
AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE(m_sprite_ram)
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xf100, 0xf17f) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf180, 0xffff) AM_RAM AM_SHARE("share2")
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index 43551af4b95..767aa3456c8 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( wrally_map, AS_PROGRAM, 16, wrally_state )
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(wrally_vram_w) AM_BASE(m_videoram) /* encrypted Video RAM */
AM_RANGE(0x108000, 0x108007) AM_RAM AM_BASE(m_vregs) /* Video Registers */
AM_RANGE(0x10800c, 0x10800d) AM_WRITENOP /* CLR INT Video */
- AM_RANGE(0x200000, 0x203fff) AM_RAM_WRITE(paletteram16_xxxxBBBBRRRRGGGG_word_w) AM_SHARE("paletteram") /* Palette */
+ AM_RANGE(0x200000, 0x203fff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_word_w) AM_SHARE("paletteram") /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(m_spriteram) /* Sprite RAM */
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW")
AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2")
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 9bb2e8d7651..0b57cf5e591 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, wwfsstar_state )
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(wwfsstar_fg0_videoram_w) AM_BASE(m_fg0_videoram) /* FG0 Ram */
AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(wwfsstar_bg0_videoram_w) AM_BASE(m_bg0_videoram) /* BG0 Ram */
AM_RANGE(0x100000, 0x1003ff) AM_RAM AM_BASE(m_spriteram) /* SPR Ram */
- AM_RANGE(0x140000, 0x140fff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x140000, 0x140fff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x180003) AM_WRITE(wwfsstar_irqack_w)
AM_RANGE(0x180000, 0x180001) AM_READ_PORT("DSW1")
AM_RANGE(0x180002, 0x180003) AM_READ_PORT("DSW2")
@@ -214,7 +214,7 @@ WRITE16_MEMBER(wwfsstar_state::wwfsstar_soundwrite)
WRITE16_MEMBER(wwfsstar_state::wwfsstar_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
WRITE16_MEMBER(wwfsstar_state::wwfsstar_irqack_w)
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 580dd9a310c..863175baf73 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -109,7 +109,7 @@ WRITE16_MEMBER(wwfwfest_state::wwfwfest_irq_ack_w)
WRITE16_MEMBER(wwfwfest_state::wwfwfest_flipscreen_w)
{
- flip_screen_set(machine(), data&1);
+ flip_screen_set(data&1);
}
/*- Palette Reads/Writes -*/
@@ -123,7 +123,7 @@ READ16_MEMBER(wwfwfest_state::wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r)
WRITE16_MEMBER(wwfwfest_state::wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w)
{
offset = (offset & 0x000f) | (offset & 0x7fc0) >> 2;
- paletteram16_xxxxBBBBGGGGRRRR_word_w (space, offset, data, mem_mask);
+ paletteram_xxxxBBBBGGGGRRRR_word_w (space, offset, data, mem_mask);
}
/*- Priority Control -*/
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 20100d686a4..c8c57c70e4f 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -406,8 +406,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, xain_state )
AM_RANGE(0x3a0d, 0x3a0d) AM_WRITE(xain_flipscreen_w)
AM_RANGE(0x3a0e, 0x3a0e) AM_WRITE(xain_68705_w)
AM_RANGE(0x3a0f, 0x3a0f) AM_WRITE(xainCPUA_bankswitch_w)
- AM_RANGE(0x3c00, 0x3dff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("paletteram")
- AM_RANGE(0x3e00, 0x3fff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("paletteram2")
+ AM_RANGE(0x3c00, 0x3dff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w) AM_SHARE("paletteram")
+ AM_RANGE(0x3e00, 0x3fff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w) AM_SHARE("paletteram2")
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 10bd54988cb..a6bab22abe4 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, xexex_state )
AM_RANGE(0x182000, 0x183fff) AM_DEVREADWRITE_LEGACY("k056832", k056832_ram_word_r, k056832_ram_word_w)
AM_RANGE(0x190000, 0x191fff) AM_DEVREAD_LEGACY("k056832", k056832_rom_word_r) // Passthrough to tile roms
AM_RANGE(0x1a0000, 0x1a1fff) AM_DEVREAD("k053250", k053250_t, rom_r)
- AM_RANGE(0x1b0000, 0x1b1fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_SHARE("paletteram")
+ AM_RANGE(0x1b0000, 0x1b1fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram")
#if XE_DEBUG
AM_RANGE(0x0c0000, 0x0c003f) AM_DEVREAD_LEGACY("k056832", k056832_word_r)
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 42e156cae88..281f1c8880e 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, xmen_state )
AM_RANGE(0x080000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE_LEGACY("k053246", k053247_word_r, k053247_word_w)
AM_RANGE(0x101000, 0x101fff) AM_RAM
- AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x108000, 0x108001) AM_WRITE(eeprom_w)
AM_RANGE(0x108020, 0x108027) AM_DEVWRITE_LEGACY("k053246", k053246_word_w)
AM_RANGE(0x10804c, 0x10804d) AM_WRITE(sound_cmd_w)
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( 6p_main_map, AS_PROGRAM, 16, xmen_state )
AM_RANGE(0x101000, 0x101fff) AM_RAM
AM_RANGE(0x102000, 0x102fff) AM_RAM AM_BASE(m_xmen6p_spriteramright) /* sprites (screen 2) */
AM_RANGE(0x103000, 0x103fff) AM_RAM /* 6p - a buffer? */
- AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x104000, 0x104fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x108000, 0x108001) AM_WRITE(eeprom_w)
AM_RANGE(0x108020, 0x108027) AM_DEVWRITE_LEGACY("k053246", k053246_word_w) /* sprites */
AM_RANGE(0x10804c, 0x10804d) AM_WRITE(sound_cmd_w)
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 38a02ee0c93..18fe7843d73 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, xybots_state )
AM_RANGE(0xff9000, 0xffadff) AM_MIRROR(0x7f8000) AM_RAM
AM_RANGE(0xffae00, 0xffafff) AM_MIRROR(0x7f8000) AM_READWRITE_LEGACY(atarimo_0_spriteram_r, atarimo_0_spriteram_w)
AM_RANGE(0xffb000, 0xffbfff) AM_MIRROR(0x7f8000) AM_RAM_WRITE_LEGACY(atarigen_playfield_w) AM_BASE(m_playfield)
- AM_RANGE(0xffc000, 0xffc7ff) AM_MIRROR(0x7f8800) AM_RAM_WRITE(paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0xffc000, 0xffc7ff) AM_MIRROR(0x7f8800) AM_RAM_WRITE(paletteram_IIIIRRRRGGGGBBBB_word_w) AM_SHARE("paletteram")
AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_READWRITE_LEGACY(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0xffe000, 0xffe0ff) AM_MIRROR(0x7f8000) AM_READ_LEGACY(atarigen_sound_r)
AM_RANGE(0xffe100, 0xffe1ff) AM_MIRROR(0x7f8000) AM_READ_PORT("FFE100")
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index d345201772d..e3315c80218 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, yunsun16_state )
AM_RANGE(0x800180, 0x800181) AM_WRITE(yunsun16_sound_bank_w) // Sound
AM_RANGE(0x800188, 0x800189) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) // Sound
AM_RANGE(0x8001fe, 0x8001ff) AM_WRITENOP // ? 0 (during int)
- AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
+ AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") // Palette
AM_RANGE(0x908000, 0x90bfff) AM_RAM_WRITE(yunsun16_vram_1_w) AM_BASE(m_vram_1) // Layer 1
AM_RANGE(0x90c000, 0x90ffff) AM_RAM_WRITE(yunsun16_vram_0_w) AM_BASE(m_vram_0) // Layer 0
AM_RANGE(0x910000, 0x910fff) AM_RAM AM_BASE_SIZE(m_spriteram, m_spriteram_size) // Sprites
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 057f3fc5bac..8dcbc961b0c 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -52,7 +52,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, zerozone_state )
AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSWB")
AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSWA")
AM_RANGE(0x084000, 0x084001) AM_WRITE(sound_w)
- AM_RANGE(0x088000, 0x0881ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
+ AM_RANGE(0x088000, 0x0881ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBRGBx_word_w) AM_SHARE("paletteram")
AM_RANGE(0x098000, 0x098001) AM_RAM /* Watchdog? */
AM_RANGE(0x09ce00, 0x09ffff) AM_RAM_WRITE(tilemap_w) AM_SHARE("videoram")
AM_RANGE(0x0b4000, 0x0b4001) AM_WRITE(tilebank_w)
diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c
index d2d47b94dc1..ba39c2b2e4e 100644
--- a/src/mame/machine/bublbobl.c
+++ b/src/mame/machine/bublbobl.c
@@ -31,7 +31,7 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_bankswitch_w)
m_video_enable = data & 0x40;
/* bit 7 flips screen */
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
WRITE8_MEMBER(bublbobl_state::tokio_bankswitch_w)
@@ -45,7 +45,7 @@ WRITE8_MEMBER(bublbobl_state::tokio_bankswitch_w)
WRITE8_MEMBER(bublbobl_state::tokio_videoctrl_w)
{
/* bit 7 flips screen */
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
/* other bits unknown */
}
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index 7797031e308..21fe4a71afe 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -1236,7 +1236,7 @@ WRITE8_MEMBER(leland_state::ataxx_master_output_w)
WRITE8_MEMBER(leland_state::leland_gated_paletteram_w)
{
if (m_wcol_enable)
- paletteram_BBGGGRRR_w(space, offset, data);
+ paletteram_BBGGGRRR_byte_w(space, offset, data);
}
@@ -1251,7 +1251,7 @@ READ8_MEMBER(leland_state::leland_gated_paletteram_r)
WRITE8_MEMBER(leland_state::ataxx_paletteram_and_misc_w)
{
if (m_wcol_enable)
- paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset, data);
+ paletteram_xxxxRRRRGGGGBBBB_byte_le_w(space, offset, data);
else if (offset == 0x7f8 || offset == 0x7f9)
leland_master_video_addr_w(space, offset - 0x7f8, data);
else if (offset == 0x7fc)
diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c
index 9d044811d04..74da542ab0d 100644
--- a/src/mame/machine/seicop.c
+++ b/src/mame/machine/seicop.c
@@ -1534,7 +1534,7 @@ static WRITE16_HANDLER( seibu_common_video_regs_w )
switch(offset)
{
- case (0x01a/2): { flip_screen_set(space->machine(), seibu_vregs[offset] & 0x01); break; }
+ case (0x01a/2): { state->flip_screen_set(seibu_vregs[offset] & 0x01); break; }
case (0x01c/2): { state->m_layer_disable = seibu_vregs[offset]; break; }
case (0x020/2): { state->m_scrollram16[0] = seibu_vregs[offset]; break; }
case (0x022/2): { state->m_scrollram16[1] = seibu_vregs[offset]; break; }
diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c
index eb7c99cda73..2033075d517 100644
--- a/src/mame/machine/wrally.c
+++ b/src/mame/machine/wrally.c
@@ -28,7 +28,7 @@ WRITE16_MEMBER(wrally_state::wrally_vram_w)
WRITE16_MEMBER(wrally_state::wrally_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
WRITE16_MEMBER(wrally_state::OKIM6295_bankswitch_w)
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index b7326e4f1ec..7ec32c4aee2 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -183,7 +183,7 @@ WRITE8_MEMBER(_1942_state::c1942_c804_w)
device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
@@ -209,7 +209,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sy = state->m_spriteram[offs + 2];
dir = 1;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -225,7 +225,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
{
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code + i,col,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx,sy + 16 * i * dir,15);
i--;
diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c
index 660f084e587..59fa60ae138 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -145,7 +145,7 @@ WRITE8_MEMBER(_1943_state::c1943_c804_w)
/* bit 5 resets the sound CPU - we ignore it */
/* bit 6 flips screen */
- flip_screen_set(machine(), data & 0x40);
+ flip_screen_set(data & 0x40);
/* bit 7 enables characters */
m_char_on = data & 0x80;
@@ -230,7 +230,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = state->m_spriteram[offs + 3] - ((attr & 0x10) << 4);
int sy = state->m_spriteram[offs + 2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -240,12 +240,12 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
if (priority)
{
if (color != 0x0a && color != 0x0b)
- drawgfx_transpen(bitmap, cliprect, machine.gfx[3], code, color, flip_screen_get(machine), flip_screen_get(machine), sx, sy, 0);
+ drawgfx_transpen(bitmap, cliprect, machine.gfx[3], code, color, state->flip_screen(), state->flip_screen(), sx, sy, 0);
}
else
{
if (color == 0x0a || color == 0x0b)
- drawgfx_transpen(bitmap, cliprect, machine.gfx[3], code, color, flip_screen_get(machine), flip_screen_get(machine), sx, sy, 0);
+ drawgfx_transpen(bitmap, cliprect, machine.gfx[3], code, color, state->flip_screen(), state->flip_screen(), sx, sy, 0);
}
}
}
diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c
index 6711321cb24..6e87a6b91cf 100644
--- a/src/mame/video/40love.c
+++ b/src/mame/video/40love.c
@@ -160,7 +160,7 @@ WRITE8_MEMBER(fortyl_state::fortyl_pixram_sel_w)
if (m_flipscreen != f)
{
m_flipscreen = f;
- flip_screen_set(machine(), m_flipscreen);
+ flip_screen_set(m_flipscreen);
m_pix_redraw = 1;
for (offs = 0; offs < 32; offs++)
diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c
index 717f5bc6d04..acf7425a610 100644
--- a/src/mame/video/aeroboto.c
+++ b/src/mame/video/aeroboto.c
@@ -81,14 +81,14 @@ VIDEO_START( aeroboto )
READ8_MEMBER(aeroboto_state::aeroboto_in0_r)
{
- return input_port_read(machine(), flip_screen_get(machine()) ? "P2" : "P1");
+ return input_port_read(machine(), flip_screen() ? "P2" : "P1");
}
WRITE8_MEMBER(aeroboto_state::aeroboto_3000_w)
{
/* bit 0 selects both flip screen and player1/player2 controls */
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
/* bit 1 = char bank select */
if (m_charbank != ((data & 0x02) >> 1))
@@ -136,7 +136,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int x = state->m_spriteram[offs + 3];
int y = 240 - state->m_spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = 248 - x;
y = 240 - y;
@@ -145,7 +145,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
drawgfx_transpen(bitmap, cliprect, machine.gfx[1],
state->m_spriteram[offs + 1],
state->m_spriteram[offs + 2] & 0x07,
- flip_screen_get(machine), flip_screen_get(machine),
+ state->flip_screen(), state->flip_screen(),
((x + 8) & 0xff) - 8, y, 0);
}
}
diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c
index c3c9e6577e3..2f700831b1d 100644
--- a/src/mame/video/ambush.c
+++ b/src/mame/video/ambush.c
@@ -71,7 +71,7 @@ static void draw_chars( running_machine &machine, bitmap_ind16 &bitmap, const re
code = state->m_videoram[offs] | ((col & 0x60) << 3);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -81,7 +81,7 @@ static void draw_chars( running_machine &machine, bitmap_ind16 &bitmap, const re
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
code,
(col & 0x0f) | ((*state->m_colorbank & 0x03) << 4),
- flip_screen_get(machine), flip_screen_get(machine),
+ state->flip_screen(), state->flip_screen(),
8 * sx, (8 * sy + scroll) & 0xff, transpen);
}
}
@@ -119,7 +119,7 @@ SCREEN_UPDATE_IND16( ambush )
/* 16x16 sprites */
gfx = 1;
- if (!flip_screen_get(screen.machine()))
+ if (!state->flip_screen())
sy = 240 - sy;
else
sx = 240 - sx;
@@ -130,7 +130,7 @@ SCREEN_UPDATE_IND16( ambush )
gfx = 0;
code <<= 2;
- if (!flip_screen_get(screen.machine()))
+ if (!state->flip_screen())
sy = 248 - sy;
else
sx = 248 - sx;
@@ -140,7 +140,7 @@ SCREEN_UPDATE_IND16( ambush )
flipx = state->m_spriteram[offs + 1] & 0x40;
flipy = state->m_spriteram[offs + 1] & 0x80;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c
index 59ffb09016e..e80b2cd7e35 100644
--- a/src/mame/video/amspdwy.c
+++ b/src/mame/video/amspdwy.c
@@ -19,14 +19,14 @@
WRITE8_MEMBER(amspdwy_state::amspdwy_paletteram_w)
{
data ^= 0xff;
- paletteram_BBGGGRRR_w(space, offset, data);
-// paletteram_RRRGGGBB_w(offset, data);
+ paletteram_BBGGGRRR_byte_w(space, offset, data);
+// paletteram_RRRGGGBB_byte_w(offset, data);
}
WRITE8_MEMBER(amspdwy_state::amspdwy_flipscreen_w)
{
m_flipscreen ^= 1;
- flip_screen_set(machine(), m_flipscreen);
+ flip_screen_set(m_flipscreen);
}
/***************************************************************************
@@ -117,7 +117,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipx = attr & 0x80;
int flipy = attr & 0x40;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = max_x - x - 8;
y = max_y - y - 8;
diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c
index 2e2638888b3..868e1faab30 100644
--- a/src/mame/video/appoooh.c
+++ b/src/mame/video/appoooh.c
@@ -181,7 +181,7 @@ WRITE8_MEMBER(appoooh_state::appoooh_out_w)
m_nmi_mask = data & 1;
/* bit 1 flip screen */
- flip_screen_set(machine(), data & 0x02);
+ flip_screen_set(data & 0x02);
/* bits 2-3 unknown */
@@ -203,8 +203,9 @@ WRITE8_MEMBER(appoooh_state::appoooh_out_w)
static void appoooh_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &cliprect, const gfx_element *gfx, UINT8 *sprite )
{
+ appoooh_state *state = gfx->machine().driver_data<appoooh_state>();
int offs;
- int flipy = flip_screen_get(gfx->machine());
+ int flipy = state->flip_screen();
for (offs = 0x20 - 4; offs >= 0; offs -= 4)
{
@@ -234,8 +235,9 @@ static void appoooh_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &clipr
static void robowres_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &cliprect, const gfx_element *gfx, UINT8 *sprite )
{
+ appoooh_state *state = gfx->machine().driver_data<appoooh_state>();
int offs;
- int flipy = flip_screen_get(gfx->machine());
+ int flipy = state->flip_screen();
for (offs = 0x20 - 4; offs >= 0; offs -= 4)
{
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index 09ab2e9d05a..170f7789c72 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -21,15 +21,15 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_d008_w)
int bank;
/* bits 0 and 1 flip X and Y, I don't know which is which */
- if (flip_screen_x_get(machine()) != (data & 0x01))
+ if (flip_screen_x() != (data & 0x01))
{
- flip_screen_x_set(machine(), data & 0x01);
+ flip_screen_x_set(data & 0x01);
m_bg_tilemap->mark_all_dirty();
}
- if (flip_screen_y_get(machine()) != (data & 0x02))
+ if (flip_screen_y() != (data & 0x02))
{
- flip_screen_y_set(machine(), data & 0x02);
+ flip_screen_y_set(data & 0x02);
m_bg_tilemap->mark_all_dirty();
}
@@ -76,15 +76,15 @@ WRITE8_MEMBER(arkanoid_state::tetrsark_d008_w)
int bank;
/* bits 0 and 1 flip X and Y, I don't know which is which */
- if (flip_screen_x_get(machine()) != (data & 0x01))
+ if (flip_screen_x() != (data & 0x01))
{
- flip_screen_x_set(machine(), data & 0x01);
+ flip_screen_x_set(data & 0x01);
m_bg_tilemap->mark_all_dirty();
}
- if (flip_screen_y_get(machine()) != (data & 0x02))
+ if (flip_screen_y() != (data & 0x02))
{
- flip_screen_y_set(machine(), data & 0x02);
+ flip_screen_y_set(data & 0x02);
m_bg_tilemap->mark_all_dirty();
}
@@ -121,16 +121,16 @@ WRITE8_MEMBER(arkanoid_state::hexa_d008_w)
{
/* bit 0 = flipx (or y?) */
- if (flip_screen_x_get(machine()) != (data & 0x01))
+ if (flip_screen_x() != (data & 0x01))
{
- flip_screen_x_set(machine(), data & 0x01);
+ flip_screen_x_set(data & 0x01);
m_bg_tilemap->mark_all_dirty();
}
/* bit 1 = flipy (or x?) */
- if (flip_screen_y_get(machine()) != (data & 0x02))
+ if (flip_screen_y() != (data & 0x02))
{
- flip_screen_y_set(machine(), data & 0x02);
+ flip_screen_y_set(data & 0x02);
m_bg_tilemap->mark_all_dirty();
}
@@ -177,9 +177,9 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sx = state->m_spriteram[offs];
sy = 248 - state->m_spriteram[offs + 1];
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
sx = 248 - sx;
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
sy = 248 - sy;
code = state->m_spriteram[offs + 3] + ((state->m_spriteram[offs + 2] & 0x03) << 8) + 1024 * state->m_gfxbank;
@@ -187,12 +187,12 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
2 * code,
((state->m_spriteram[offs + 2] & 0xf8) >> 3) + 32 * state->m_palettebank,
- flip_screen_x_get(machine),flip_screen_y_get(machine),
- sx,sy + (flip_screen_y_get(machine) ? 8 : -8),0);
+ state->flip_screen_x(),state->flip_screen_y(),
+ sx,sy + (state->flip_screen_y() ? 8 : -8),0);
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
2 * code + 1,
((state->m_spriteram[offs + 2] & 0xf8) >> 3) + 32 * state->m_palettebank,
- flip_screen_x_get(machine),flip_screen_y_get(machine),
+ state->flip_screen_x(),state->flip_screen_y(),
sx,sy,0);
}
}
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index c6d4db5ba42..fa9a6026156 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -353,7 +353,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = buffered_spriteram[offs + 3];
int sy = state->m_sprite_offy + 240 - (buffered_spriteram[offs + 0] & 0x1ff);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 320 - sx + 176; /* don't ask where 176 comes from, just tried it out */
sy = 240 - sy + 1; /* don't ask where 1 comes from, just tried it out */
diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c
index d58d1f8e38f..b7ddef5b8d0 100644
--- a/src/mame/video/ashnojoe.c
+++ b/src/mame/video/ashnojoe.c
@@ -221,7 +221,7 @@ SCREEN_UPDATE_IND16( ashnojoe )
//state->m_tilemap_reg[0] & 0x10 // ?? on coin insertion
- flip_screen_set(screen.machine(), state->m_tilemap_reg[0] & 1);
+ state->flip_screen_set(state->m_tilemap_reg[0] & 1);
if(state->m_tilemap_reg[0] & 0x02)
state->m_joetilemap7->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c
index 2f8b550474d..9cd03c1017b 100644
--- a/src/mame/video/bagman.c
+++ b/src/mame/video/bagman.c
@@ -81,9 +81,9 @@ PALETTE_INIT( bagman )
WRITE8_MEMBER(bagman_state::bagman_flipscreen_w)
{
- if ((flip_screen_get(machine()) ^ data) & 1)
+ if ((flip_screen() ^ data) & 1)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
m_bg_tilemap->mark_all_dirty();
}
}
@@ -122,12 +122,12 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sy = 255 - spriteram[offs + 2] - 16;
flipx = spriteram[offs] & 0x40;
flipy = spriteram[offs] & 0x80;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = bitmap.width() - sx - 15;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
sy = bitmap.height() - sy - 15;
flipy = !flipy;
diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c
index 4dd0a42ad42..f00a76f548c 100644
--- a/src/mame/video/bankp.c
+++ b/src/mame/video/bankp.c
@@ -126,7 +126,7 @@ WRITE8_MEMBER(bankp_state::bankp_out_w)
m_nmi_mask = (data & 0x10) >> 4;
/* bit 5 controls screen flip */
- flip_screen_set(machine(), data & 0x20);
+ flip_screen_set(data & 0x20);
/* bits 6-7 unknown */
}
@@ -171,7 +171,7 @@ SCREEN_UPDATE_IND16( bankp )
{
bankp_state *state = screen.machine().driver_data<bankp_state>();
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
state->m_fg_tilemap->set_scrollx(0, -state->m_scroll_x);
state->m_bg_tilemap->set_scrollx(0, 0);
diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c
index 03976e26ec7..258b48e9106 100644
--- a/src/mame/video/baraduke.c
+++ b/src/mame/video/baraduke.c
@@ -260,7 +260,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sy -= 16 * sizey;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 496+3 - 16 * sizex - sx;
sy = 240 - 16 * sizey - sy;
@@ -295,7 +295,7 @@ static void set_scroll(running_machine &machine, int layer)
scrollx = state->m_xscroll[layer] + xdisp[layer];
scrolly = state->m_yscroll[layer] + 9;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
scrollx = -scrollx + 3;
scrolly = -scrolly;
@@ -313,9 +313,9 @@ SCREEN_UPDATE_IND16( baraduke )
int back;
/* flip screen is embedded in the sprite control registers */
- /* can't use flip_screen_set(screen.machine(), ) because the visible area is asymmetrical */
- flip_screen_set_no_update(screen.machine(), spriteram[0x07f6] & 0x01);
- screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ /* can't use state->flip_screen_set() because the visible area is asymmetrical */
+ state->flip_screen_set_no_update(spriteram[0x07f6] & 0x01);
+ screen.machine().tilemap().set_flip_all(state->flip_screen() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
set_scroll(screen.machine(), 0);
set_scroll(screen.machine(), 1);
diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c
index 751641f6e16..54299ff6a3b 100644
--- a/src/mame/video/battlane.c
+++ b/src/mame/video/battlane.c
@@ -175,7 +175,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx = attr & 0x04;
flipy = attr & 0x02;
- if (!flip_screen_get(machine))
+ if (!state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -218,7 +218,7 @@ static void draw_fg_bitmap( running_machine &machine, bitmap_ind16 &bitmap )
if (data)
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
bitmap.pix16(255 - y, 255 - x) = data;
else
bitmap.pix16(y, x) = data;
diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c
index 319e4c8be77..463f37e04be 100644
--- a/src/mame/video/battlex.c
+++ b/src/mame/video/battlex.c
@@ -37,9 +37,9 @@ WRITE8_MEMBER(battlex_state::battlex_flipscreen_w)
{
m_starfield_enabled = data & 0x10;
- if (flip_screen_get(machine()) != (data >> 7))
+ if (flip_screen() != (data >> 7))
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
machine().tilemap().mark_all_dirty();
}
}
@@ -76,7 +76,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipy = source[1] & 0x80;
int flipx = source[1] & 0x40;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index ed107e3c3af..5211e1a7d96 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -183,7 +183,7 @@ WRITE16_MEMBER(bionicc_state::bionicc_gfxctrl_w)
if (ACCESSING_BITS_8_15)
{
- flip_screen_set(machine(), data & 0x0100);
+ flip_screen_set(data & 0x0100);
m_bg_tilemap->enable(data & 0x2000); /* guess */
m_fg_tilemap->enable(data & 0x1000); /* guess */
@@ -223,7 +223,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
if (sy > 512 - 16)
sy -= 512;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c
index 482d06ba803..948a92f6eb2 100644
--- a/src/mame/video/bking.c
+++ b/src/mame/video/bking.c
@@ -124,9 +124,9 @@ WRITE8_MEMBER(bking_state::bking_cont1_w)
coin_lockout_global_w(machine(), ~data & 0x01);
- flip_screen_set_no_update(machine(), data & 0x04);
+ flip_screen_set_no_update(data & 0x04);
- machine().tilemap().set_flip_all(flip_screen_get(machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ machine().tilemap().set_flip_all(flip_screen() ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
m_controller = data & 0x02;
@@ -304,8 +304,8 @@ SCREEN_VBLANK( bking )
latch = 0x0400;
}
- state->m_bg_tilemap->set_scrollx(0, flip_screen_get(screen.machine()) ? -xld : xld);
- state->m_bg_tilemap->set_scrolly(0, flip_screen_get(screen.machine()) ? -yld : yld);
+ state->m_bg_tilemap->set_scrollx(0, state->flip_screen() ? -xld : xld);
+ state->m_bg_tilemap->set_scrolly(0, state->flip_screen() ? -yld : yld);
state->m_bg_tilemap->draw(state->m_tmp_bitmap1, rect, 0, 0);
@@ -331,8 +331,8 @@ SCREEN_VBLANK( bking )
int col = (xld + x) / 8 + 1;
int row = (yld + y) / 8 + 0;
- latch |= (flip_screen_get(screen.machine()) ? 31 - col : col) << 0;
- latch |= (flip_screen_get(screen.machine()) ? 31 - row : row) << 5;
+ latch |= (state->flip_screen() ? 31 - col : col) << 0;
+ latch |= (state->flip_screen() ? 31 - row : row) << 5;
state->m_pc3259_output[0] = (latch >> 0x0) & 0xf;
state->m_pc3259_output[1] = (latch >> 0x4) & 0xf;
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index f307a833edb..ef9af7e2cec 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -158,7 +158,7 @@ WRITE8_MEMBER(blktiger_state::blktiger_video_control_w)
device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
/* bit 6 flips screen */
- flip_screen_set(machine(), data & 0x40);
+ flip_screen_set(data & 0x40);
/* bit 7 enables characters? Just a guess */
m_chon = ~data & 0x80;
@@ -206,7 +206,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int color = attr & 0x07;
int flipx = attr & 0x08;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -216,7 +216,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code,
color,
- flipx,flip_screen_get(machine),
+ flipx,state->flip_screen(),
sx,sy,15);
}
}
diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c
index 97f1bdbc9d1..40c5dbb3501 100644
--- a/src/mame/video/blueprnt.c
+++ b/src/mame/video/blueprnt.c
@@ -63,7 +63,7 @@ WRITE8_MEMBER(blueprnt_state::blueprnt_colorram_w)
WRITE8_MEMBER(blueprnt_state::blueprnt_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 0x02);
+ flip_screen_set(~data & 0x02);
if (m_gfx_bank != ((data & 0x04) >> 2))
{
@@ -108,7 +108,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipx = state->m_spriteram[offs + 2] & 0x40;
int flipy = state->m_spriteram[offs + 2 - 4] & 0x80; // -4? Awkward, isn't it?
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 248 - sx;
sy = 240 - sy;
@@ -126,7 +126,7 @@ SCREEN_UPDATE_IND16( blueprnt )
blueprnt_state *state = screen.machine().driver_data<blueprnt_state>();
int i;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
for (i = 0; i < 32; i++)
state->m_bg_tilemap->set_scrolly(i, state->m_scrollram[32 - i]);
else
diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c
index 366779025e0..73316d44339 100644
--- a/src/mame/video/bogeyman.c
+++ b/src/mame/video/bogeyman.c
@@ -66,7 +66,7 @@ WRITE8_MEMBER(bogeyman_state::bogeyman_colorram2_w)
WRITE8_MEMBER(bogeyman_state::bogeyman_paletteram_w)
{
/* RGB output is inverted */
- paletteram_BBGGGRRR_w(space, offset, ~data);
+ paletteram_BBGGGRRR_byte_w(space, offset, ~data);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -121,7 +121,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
if (multi) sy -= 16;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -141,7 +141,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
machine.gfx[2],
code + 1, color,
flipx, flipy,
- sx, sy + (flip_screen_get(machine) ? -16 : 16), 0);
+ sx, sy + (state->flip_screen() ? -16 : 16), 0);
}
}
}
diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c
index f29bab27273..0cbeaf56dfd 100644
--- a/src/mame/video/bombjack.c
+++ b/src/mame/video/bombjack.c
@@ -33,9 +33,9 @@ WRITE8_MEMBER(bombjack_state::bombjack_background_w)
WRITE8_MEMBER(bombjack_state::bombjack_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -106,7 +106,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx = state->m_spriteram[offs + 1] & 0x40;
flipy = state->m_spriteram[offs + 1] & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
if (state->m_spriteram[offs + 1] & 0x20)
{
diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c
index f2426697b96..78dee27ec80 100644
--- a/src/mame/video/boogwing.c
+++ b/src/mame/video/boogwing.c
@@ -187,7 +187,7 @@ SCREEN_UPDATE_RGB32( boogwing )
screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, state->m_spriteram2->buffer(), 0x400, true);
screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, state->m_spriteram->buffer(), 0x400, true);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c
index 9737e41aab5..b98a787055f 100644
--- a/src/mame/video/bosco.c
+++ b/src/mame/video/bosco.c
@@ -204,7 +204,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int flipy = spriteram[offs] & 2;
int color = spriteram_2[offs + 1] & 0x3f;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx += 128-2;
sy += 8;
@@ -230,7 +230,7 @@ static void draw_bullets(running_machine &machine, bitmap_ind16 &bitmap, const r
int x = state->m_bosco_radarx[offs] + ((~state->m_bosco_radarattr[offs] & 0x01) << 8);
int y = 253 - state->m_bosco_radary[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x += 96-2;
y += 8;
@@ -289,7 +289,7 @@ SCREEN_UPDATE_IND16( bosco )
the screen, and clip it to only the position where it is supposed to be shown */
rectangle fg_clip = cliprect;
rectangle bg_clip = cliprect;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
bg_clip.min_x = 20*8;
fg_clip.max_x = 20*8-1;
@@ -301,7 +301,7 @@ SCREEN_UPDATE_IND16( bosco )
}
bitmap.fill(get_black_pen(screen.machine()), cliprect);
- draw_stars(screen.machine(),bitmap,cliprect,flip_screen_get(screen.machine()));
+ draw_stars(screen.machine(),bitmap,cliprect,state->flip_screen());
state->m_bg_tilemap->draw(bitmap, bg_clip, 0,0);
state->m_fg_tilemap->draw(bitmap, fg_clip, 0,0);
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index 1517e9d814c..d15014b7f7c 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -140,7 +140,7 @@ VIDEO_START( bnj )
WRITE8_MEMBER(btime_state::btime_paletteram_w)
{
/* RGB output is inverted */
- paletteram_BBGGGRRR_w(space, offset, ~data);
+ paletteram_BBGGGRRR_byte_w(space, offset, ~data);
}
WRITE8_MEMBER(btime_state::lnc_videoram_w)
@@ -247,7 +247,7 @@ WRITE8_MEMBER(btime_state::btime_video_control_w)
// Bit 0 = Flip screen
// Bit 1-7 = Unknown
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
WRITE8_MEMBER(btime_state::bnj_video_control_w)
@@ -277,7 +277,7 @@ WRITE8_MEMBER(btime_state::zoar_video_control_w)
m_btime_palette = (data & 0x30) >> 3;
if (input_port_read(machine(), "DSW1") & 0x40) /* cocktail mode */
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
WRITE8_MEMBER(btime_state::disco_video_control_w)
@@ -285,7 +285,7 @@ WRITE8_MEMBER(btime_state::disco_video_control_w)
m_btime_palette = (data >> 2) & 0x03;
if (!(input_port_read(machine(), "DSW1") & 0x40)) /* cocktail mode */
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
@@ -305,7 +305,7 @@ static void draw_chars( running_machine &machine, bitmap_ind16 &bitmap, const re
if ((priority != -1) && (priority != ((code >> 7) & 0x01)))
continue;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = 31 + 16 - x;
y = 33 - y;
@@ -314,7 +314,7 @@ static void draw_chars( running_machine &machine, bitmap_ind16 &bitmap, const re
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
code,
color,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
8*x,8*y,
transparency ? 0 : -1);
}
@@ -324,6 +324,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT8 sprite_y_adjust, UINT8 sprite_y_adjust_flip_screen,
UINT8 *sprite_ram, offs_t interleave )
{
+ btime_state *state = machine.driver_data<btime_state>();
int i;
offs_t offs;
@@ -341,7 +342,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx = sprite_ram[offs + 0] & 0x04;
flipy = sprite_ram[offs + 0] & 0x02;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = 240 + 128 - x;
y = 256 - y + sprite_y_adjust_flip_screen;
@@ -358,7 +359,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx,flipy,
x, y,0);
- y = y + (flip_screen_get(machine) ? -256 : 256);
+ y = y + (state->flip_screen() ? -256 : 256);
// Wrap around
drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
@@ -394,7 +395,7 @@ static void draw_background( running_machine &machine, bitmap_ind16 &bitmap, con
int x = 240 - (16 * (offs / 16) + scroll) - 1;
int y = 16 * (offs % 16);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = 240 + 128 - x;
y = 256 - y;
@@ -403,7 +404,7 @@ static void draw_background( running_machine &machine, bitmap_ind16 &bitmap, con
drawgfx_opaque(bitmap, cliprect,machine.gfx[2],
gfx[tileoffset + offs],
color,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
x,y);
}
}
@@ -418,7 +419,7 @@ SCREEN_UPDATE_IND16( btime )
int i, start;
// Generate tile map
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
start = 0;
else
start = 1;
@@ -495,7 +496,7 @@ SCREEN_UPDATE_IND16( bnj )
sy = 16 * (((offs % 0x100) < 0x80) ? offs % 8 : (offs % 8) + 8);
sx = 496 - sx;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 496 - sx;
sy = 256 - sy;
@@ -504,13 +505,13 @@ SCREEN_UPDATE_IND16( bnj )
drawgfx_opaque(*state->m_background_bitmap, state->m_background_bitmap->cliprect(), screen.machine().gfx[2],
(state->m_bnj_backgroundram[offs] >> 4) + ((offs & 0x80) >> 3) + 32,
0,
- flip_screen_get(screen.machine()), flip_screen_get(screen.machine()),
+ state->flip_screen(), state->flip_screen(),
sx, sy);
}
/* copy the background bitmap to the screen */
scroll = (state->m_bnj_scroll1 & 0x02) * 128 + 511 - state->m_bnj_scroll2;
- if (!flip_screen_get(screen.machine()))
+ if (!state->flip_screen())
scroll = 767 - scroll;
copyscrollbitmap(bitmap, *state->m_background_bitmap, 1, &scroll, 0, 0, cliprect);
@@ -542,7 +543,7 @@ SCREEN_UPDATE_IND16( cookrace )
sx = 31 - (offs / 32);
sy = offs % 32;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 31 - sx;
sy = 33 - sy;
@@ -551,7 +552,7 @@ SCREEN_UPDATE_IND16( cookrace )
drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[2],
state->m_bnj_backgroundram[offs],
0,
- flip_screen_get(screen.machine()), flip_screen_get(screen.machine()),
+ state->flip_screen(), state->flip_screen(),
8*sx,8*sy);
}
diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c
index c22f3541f14..ef5934dfe15 100644
--- a/src/mame/video/bublbobl.c
+++ b/src/mame/video/bublbobl.c
@@ -73,7 +73,7 @@ SCREEN_UPDATE_IND16( bublbobl )
x = sx + xc * 8;
y = (sy + yc * 8) & 0xff;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
x = 248 - x;
y = 248 - y;
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index 8c1cdec59bc..e0050402760 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -56,8 +56,8 @@ WRITE8_MEMBER(buggychl_state::buggychl_ctrl_w)
bit0 = VINV
*/
- flip_screen_y_set(machine(), data & 0x01);
- flip_screen_x_set(machine(), data & 0x02);
+ flip_screen_y_set(data & 0x01);
+ flip_screen_x_set(data & 0x02);
m_bg_on = data & 0x04;
m_sky_on = data & 0x08;
@@ -92,7 +92,7 @@ static void draw_bg( running_machine &machine, bitmap_ind16 &bitmap, const recta
/* prevent wraparound */
rectangle clip = cliprect;
- if (flip_screen_x_get(machine)) clip.min_x += 8*8;
+ if (state->flip_screen_x()) clip.min_x += 8*8;
else clip.max_x -= 8*8;
for (offs = 0; offs < 0x400; offs++)
@@ -102,15 +102,15 @@ static void draw_bg( running_machine &machine, bitmap_ind16 &bitmap, const recta
int sx = offs % 32;
int sy = offs / 32;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
sx = 31 - sx;
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
sy = 31 - sy;
drawgfx_opaque(state->m_tmp_bitmap1, state->m_tmp_bitmap1.cliprect(), machine.gfx[0],
code,
2,
- flip_screen_x_get(machine),flip_screen_y_get(machine),
+ state->flip_screen_x(),state->flip_screen_y(),
8*sx,8*sy);
}
@@ -137,8 +137,8 @@ static void draw_fg( running_machine &machine, bitmap_ind16 &bitmap, const recta
{
int sx = offs % 32;
int sy = offs / 32;
- int flipx = flip_screen_x_get(machine);
- int flipy = flip_screen_y_get(machine);
+ int flipx = state->flip_screen_x();
+ int flipy = state->flip_screen_y();
int code = state->m_videoram[offs];
@@ -184,7 +184,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
for (y = 0; y < 64; y++)
{
- int dy = flip_screen_y_get(machine) ? (255 - sy - y) : (sy + y);
+ int dy = state->flip_screen_y() ? (255 - sy - y) : (sy + y);
if ((dy & ~0xff) == 0)
{
@@ -212,7 +212,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int col = pendata[x];
if (col)
{
- int dx = flip_screen_x_get(machine) ? (255 - sx - px) : (sx + px);
+ int dx = state->flip_screen_x() ? (255 - sx - px) : (sx + px);
if ((dx & ~0xff) == 0)
bitmap.pix16(dy, dx) = state->m_sprite_color_base + col;
}
diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c
index e7e11a09e7b..d2e89bfa4a8 100644
--- a/src/mame/video/cabal.c
+++ b/src/mame/video/cabal.c
@@ -64,7 +64,7 @@ WRITE16_MEMBER(cabal_state::cabal_flipscreen_w)
m_background_layer->set_flip(flip);
m_text_layer->set_flip(flip);
- flip_screen_set(machine(), data & 0x20);
+ flip_screen_set(data & 0x20);
}
}
@@ -125,7 +125,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if ( sx>256 ) sx -= 512;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c
index f7641087370..632f1b0b078 100644
--- a/src/mame/video/cbuster.c
+++ b/src/mame/video/cbuster.c
@@ -53,7 +53,7 @@ SCREEN_UPDATE_RGB32( twocrude )
cbuster_state *state = screen.machine().driver_data<cbuster_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), !BIT(flip, 7));
+ state->flip_screen_set(!BIT(flip, 7));
screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, state->m_spriteram16_buffer, 0x400);
diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c
index b5187117212..6ec01453a62 100644
--- a/src/mame/video/champbas.c
+++ b/src/mame/video/champbas.c
@@ -185,7 +185,7 @@ WRITE8_MEMBER(champbas_state::champbas_palette_bank_w)
WRITE8_MEMBER(champbas_state::champbas_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 1);
+ flip_screen_set(~data & 1);
}
diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c
index 76fcf9fd84a..27b94fde089 100644
--- a/src/mame/video/circusc.c
+++ b/src/mame/video/circusc.c
@@ -148,7 +148,7 @@ WRITE8_MEMBER(circusc_state::circusc_colorram_w)
WRITE8_MEMBER(circusc_state::circusc_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
@@ -179,7 +179,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipx = sr[offs + 1] & 0x40;
int flipy = sr[offs + 1] & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c
index b8d5728fcd6..aa12ebe2365 100644
--- a/src/mame/video/citycon.c
+++ b/src/mame/video/citycon.c
@@ -95,7 +95,7 @@ WRITE8_MEMBER(citycon_state::citycon_background_w)
/* bit 0 flips screen */
/* it is also used to multiplex player 1 and player 2 controls */
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
/* bits 1-3 are unknown */
// if ((data & 0x0e) != 0) logerror("background register = %02x\n", data);
@@ -115,7 +115,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sx = state->m_spriteram[offs + 3];
sy = 239 - state->m_spriteram[offs];
flipx = ~state->m_spriteram[offs + 2] & 0x10;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 238 - sy;
@@ -125,7 +125,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
drawgfx_transpen(bitmap, cliprect, machine.gfx[state->m_spriteram[offs + 1] & 0x80 ? 2 : 1],
state->m_spriteram[offs + 1] & 0x7f,
state->m_spriteram[offs + 2] & 0x0f,
- flipx,flip_screen_get(machine),
+ flipx,state->flip_screen(),
sx, sy, 0);
}
}
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index 479fbe8a583..19b754043ab 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -150,7 +150,7 @@ WRITE8_MEMBER(cloak_state::cloak_videoram_w)
WRITE8_MEMBER(cloak_state::cloak_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -212,7 +212,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int sx = spriteram[offs + 192];
int sy = 240 - spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx -= 9;
sy = 240 - sy;
diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c
index 88a2e8bc4b5..60768388cd9 100644
--- a/src/mame/video/clshroad.c
+++ b/src/mame/video/clshroad.c
@@ -36,7 +36,7 @@
WRITE8_MEMBER(clshroad_state::clshroad_flipscreen_w)
{
- flip_screen_set(machine(), data & 1 );
+ flip_screen_set(data & 1 );
}
@@ -301,7 +301,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int flipy = 0;
x -= 0x4a/2;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
y = 240 - y;
flipx = !flipx;
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c
index 6eb76efab8b..1a879716043 100644
--- a/src/mame/video/cninja.c
+++ b/src/mame/video/cninja.c
@@ -98,7 +98,7 @@ static void cninjabl_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
inc = 1;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
y = 240 - y;
x = 240 - x;
@@ -130,7 +130,7 @@ SCREEN_UPDATE_IND16( cninja )
cninja_state *state = screen.machine().driver_data<cninja_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
@@ -155,7 +155,7 @@ SCREEN_UPDATE_IND16( cninjabl )
deco16ic_set_enable(state->m_deco_tilegen2, 0, 1 );
deco16ic_set_enable(state->m_deco_tilegen2, 1, 1 );
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
@@ -176,7 +176,7 @@ SCREEN_UPDATE_IND16( edrandy )
cninja_state *state = screen.machine().driver_data<cninja_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
@@ -211,7 +211,7 @@ SCREEN_UPDATE_IND16( robocop2 )
}
/* Update playfields */
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
@@ -254,7 +254,7 @@ SCREEN_UPDATE_RGB32( mutantf )
UINT16 priority = decocomn_priority_r(state->m_decocomn, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index cd7d5380e37..aabcf9dad1d 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -63,7 +63,7 @@ WRITE8_MEMBER(commando_state::commando_c804_w)
device_set_input_line(m_audiocpu, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
// bit 7 flips screen
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -116,7 +116,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = buffered_spriteram[offs + 3] - ((attr & 0x01) << 8);
int sy = buffered_spriteram[offs + 2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c
index 96db56a7e49..c9a97820834 100644
--- a/src/mame/video/cop01.c
+++ b/src/mame/video/cop01.c
@@ -151,7 +151,7 @@ WRITE8_MEMBER(cop01_state::cop01_vreg_w)
{
coin_counter_w(machine(), 0, data & 1);
coin_counter_w(machine(), 1, data & 2);
- flip_screen_set(machine(), data & 4);
+ flip_screen_set(data & 4);
}
}
@@ -183,7 +183,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sx = (state->m_spriteram[offs + 3] - 0x80) + 256 * (attr & 0x01);
sy = 240 - state->m_spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index c08664bcf77..5f8b327b413 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -268,7 +268,7 @@ static void draw_bitmap( running_machine &machine, bitmap_ind16 &bitmap, const r
{
if (data & 0x80)
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
bitmap.pix16(255-y, 255-x) = pen;
else
bitmap.pix16(y, x) = pen;
@@ -317,6 +317,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
static void cosmica_draw_starfield( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect )
{
+ cosmic_state *state = screen.machine().driver_data<cosmic_state>();
UINT8 y = 0;
UINT8 map = 0;
UINT8 *PROM = screen.machine().region("user2")->base();
@@ -333,7 +334,7 @@ static void cosmica_draw_starfield( screen_device &screen, bitmap_ind16 &bitmap,
UINT8 x1;
int hc, hb_;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
x1 = x - screen.frame_number();
else
x1 = x + screen.frame_number();
@@ -366,6 +367,7 @@ static void cosmica_draw_starfield( screen_device &screen, bitmap_ind16 &bitmap,
static void devzone_draw_grid( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect )
{
+ cosmic_state *state = machine.driver_data<cosmic_state>();
UINT8 y;
UINT8 *horz_PROM = machine.region("user2")->base();
UINT8 *vert_PROM = machine.region("user3")->base();
@@ -404,7 +406,7 @@ static void devzone_draw_grid( running_machine &machine, bitmap_ind16 &bitmap, c
if (!(vert_data & horz_data & 0x80)) /* NAND gate */
{
/* blue */
- if (flip_screen_get(machine))
+ if (state->flip_screen())
bitmap.pix16(255-y, 255-x) = 4;
else
bitmap.pix16(y, x) = 4;
@@ -424,6 +426,7 @@ static void devzone_draw_grid( running_machine &machine, bitmap_ind16 &bitmap, c
static void nomnlnd_draw_background( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect )
{
+ cosmic_state *state = screen.machine().driver_data<cosmic_state>();
UINT8 y = 0;
UINT8 water = screen.frame_number();
UINT8 *PROM = screen.machine().region("user2")->base();
@@ -489,7 +492,7 @@ static void nomnlnd_draw_background( screen_device &screen, bitmap_ind16 &bitmap
if ((!hd_) & hc_ & (!hb_))
{
offs_t offs = ((x >> 3) & 0x03) | ((y & 0x1f) << 2) |
- (flip_screen_get(screen.machine()) ? 0x80 : 0);
+ (state->flip_screen() ? 0x80 : 0);
UINT8 plane1 = PROM[offs ] << (x & 0x07);
UINT8 plane2 = PROM[offs | 0x0400] << (x & 0x07);
@@ -523,7 +526,7 @@ static void nomnlnd_draw_background( screen_device &screen, bitmap_ind16 &bitmap
if (color != 0)
{
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
bitmap.pix16(255-y, 255-x) = color;
else
bitmap.pix16(y, x) = color;
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 3849f70c5a4..9961d41f4e9 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -2312,7 +2312,7 @@ static void cps1_render_sprites( running_machine &machine, bitmap_ind16 &bitmap,
#define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \
{ \
- if (flip_screen_get(machine)) \
+ if (state->flip_screen()) \
pdrawgfx_transpen(bitmap,\
cliprect,machine.gfx[2], \
CODE, \
@@ -2550,7 +2550,7 @@ static void cps2_render_sprites( running_machine &machine, bitmap_ind16 &bitmap,
#define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \
{ \
- if (flip_screen_get(machine)) \
+ if (state->flip_screen()) \
pdrawgfx_transpen(bitmap,\
cliprect,machine.gfx[2], \
CODE, \
@@ -2718,7 +2718,7 @@ static void cps1_render_stars( screen_device &screen, bitmap_ind16 &bitmap, cons
int sy = (offs % 256);
sx = (sx - state->m_stars2x + (col & 0x1f)) & 0x1ff;
sy = (sy - state->m_stars2y) & 0xff;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 511 - sx;
sy = 255 - sy;
@@ -2743,7 +2743,7 @@ static void cps1_render_stars( screen_device &screen, bitmap_ind16 &bitmap, cons
int sy = (offs % 256);
sx = (sx - state->m_stars1x + (col & 0x1f)) & 0x1ff;
sy = (sy - state->m_stars1y) & 0xff;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 511 - sx;
sy = 255 - sy;
@@ -2805,7 +2805,7 @@ SCREEN_UPDATE_IND16( cps1 )
int layercontrol, l0, l1, l2, l3;
int videocontrol = state->m_cps_a_regs[CPS1_VIDEOCONTROL];
- flip_screen_set(screen.machine(), videocontrol & 0x8000);
+ state->flip_screen_set(videocontrol & 0x8000);
layercontrol = state->m_cps_b_regs[state->m_game_config->layer_control / 2];
diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c
index 4b7963eee4e..fae31511a9d 100644
--- a/src/mame/video/crbaloon.c
+++ b/src/mame/video/crbaloon.c
@@ -104,7 +104,7 @@ static void draw_sprite_and_check_collision(running_machine &machine, bitmap_ind
UINT8 *gfx = machine.region("gfx2")->base() + (code << 7);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sy += 32;
/* assume no collision */
diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c
index 8e22cff2a59..9778e675af0 100644
--- a/src/mame/video/cvs.c
+++ b/src/mame/video/cvs.c
@@ -331,10 +331,10 @@ void cvs_update_stars(running_machine &machine, bitmap_ind16 &bitmap, const rect
if ((y & 1) ^ ((x >> 4) & 1))
{
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
x = ~x;
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
y = ~y;
if ((y >= cliprect.min_y) && (y <= cliprect.max_y) &&
diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c
index 8e81c4220bd..a66957c8245 100644
--- a/src/mame/video/dassault.c
+++ b/src/mame/video/dassault.c
@@ -86,7 +86,7 @@ SCREEN_UPDATE_RGB32( dassault )
bitmap_ind16* sprite_bitmap2 = &screen.machine().device<decospr_device>("spritegen2")->get_sprite_temp_bitmap();
/* Update tilemaps */
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, 0, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, 0, state->m_pf4_rowscroll);
diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c
index 6c2054d1245..6626ec78710 100644
--- a/src/mame/video/ddragon.c
+++ b/src/mame/video/ddragon.c
@@ -196,7 +196,7 @@ static void draw_sprites( running_machine& machine, bitmap_ind16 &bitmap,const r
which = src[i + 3] + ((src[i + 2] & 0x0f) << 8);
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 256 - sy;
diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c
index f384969822c..5dd0f30b73e 100644
--- a/src/mame/video/ddragon3.c
+++ b/src/mame/video/ddragon3.c
@@ -17,7 +17,7 @@ WRITE16_MEMBER(ddragon3_state::ddragon3_scroll_w)
case 2: COMBINE_DATA(&m_bg_scrollx); break; // Scroll X, BG0
case 3: COMBINE_DATA(&m_bg_scrolly); break; // Scroll Y, BG0
case 4: break; // Unknown write
- case 5: flip_screen_set(machine(), data & 0x01); break; // Flip Screen
+ case 5: flip_screen_set(data & 0x01); break; // Flip Screen
case 6:
COMBINE_DATA(&m_bg_tilebase); // BG Tile Base
m_bg_tilebase &= 0x1ff;
@@ -35,7 +35,7 @@ READ16_MEMBER(ddragon3_state::ddragon3_scroll_r)
case 1: return m_fg_scrolly;
case 2: return m_bg_scrollx;
case 3: return m_bg_scrolly;
- case 5: return flip_screen_get(machine());
+ case 5: return flip_screen();
case 6: return m_bg_tilebase;
}
@@ -138,7 +138,7 @@ static void draw_sprites( running_machine& machine, bitmap_ind16 &bitmap, const
if (attr & 0x02) sy = 239 + (0x100 - sy); else sy = 240 - sy;
if (sx > 0x17f) sx = 0 - (0x200 - sx);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 304 - sx;
sy = 224 - sy;
@@ -150,7 +150,7 @@ static void draw_sprites( running_machine& machine, bitmap_ind16 &bitmap, const
{
drawgfx_transpen(bitmap, cliprect,
machine.gfx[1], code + i, color, flipx, flipy,
- sx, sy + (flip_screen_get(machine) ? (i * 16) : (-i * 16)), 0);
+ sx, sy + (state->flip_screen() ? (i * 16) : (-i * 16)), 0);
}
}
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index a4c842e244e..5ab7e6b197c 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -113,7 +113,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
color = (spriteram16[offs+1]>>12)&0xf;
sprite = spriteram16[offs+1]&0xfff;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
x=240-x;
y=240-y;
if (fx) fx=0; else fx=1;
@@ -151,7 +151,7 @@ SCREEN_UPDATE_IND16( deadang )
state->m_pf3_layer->enable(!(state->m_scroll_ram[0x34]&1));
state->m_pf1_layer->enable(!(state->m_scroll_ram[0x34]&2));
state->m_pf2_layer->enable(!(state->m_scroll_ram[0x34]&4));
- flip_screen_set(screen.machine(), state->m_scroll_ram[0x34]&0x40 );
+ state->flip_screen_set(state->m_scroll_ram[0x34]&0x40 );
bitmap.fill(get_black_pen(screen.machine()), cliprect);
screen.machine().priority_bitmap.fill(0, cliprect);
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 5d97f3c35c4..608875ae230 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -49,7 +49,7 @@ SCREEN_UPDATE_IND16( hbarrel )
{
dec0_state *state = screen.machine().driver_data<dec0_state>();
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
screen.machine().device<deco_bac06_device>("tilegen3")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram, 0x08, 0x08, 0x0f);
@@ -67,7 +67,7 @@ SCREEN_UPDATE_IND16( hbarrel )
SCREEN_UPDATE_IND16( baddudes )
{
dec0_state *state = screen.machine().driver_data<dec0_state>();
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
/* WARNING: inverted wrt Midnight Resistance */
if ((state->m_pri & 0x01) == 0)
@@ -108,7 +108,7 @@ SCREEN_UPDATE_IND16( robocop )
dec0_state *state = screen.machine().driver_data<dec0_state>();
int trans;
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
if (state->m_pri & 0x04)
trans = 0x08;
@@ -153,7 +153,7 @@ SCREEN_UPDATE_IND16( birdtry )
{
dec0_state *state = screen.machine().driver_data<dec0_state>();
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
/* This game doesn't have the extra playfield chip on the game board, but
the palette does show through. */
@@ -169,7 +169,7 @@ SCREEN_UPDATE_IND16( birdtry )
SCREEN_UPDATE_IND16( hippodrm )
{
dec0_state *state = screen.machine().driver_data<dec0_state>();
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
if (state->m_pri & 0x01)
{
@@ -192,7 +192,7 @@ SCREEN_UPDATE_IND16( hippodrm )
SCREEN_UPDATE_IND16( slyspy )
{
dec0_state *state = screen.machine().driver_data<dec0_state>();
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
screen.machine().device<deco_bac06_device>("tilegen3")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
screen.machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
@@ -214,7 +214,7 @@ SCREEN_UPDATE_IND16( midres )
dec0_state *state = screen.machine().driver_data<dec0_state>();
int trans;
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
if (state->m_pri & 0x04)
trans = 0x00;
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index 06c8364c961..e17b966dcbb 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -237,7 +237,7 @@ static void srdarwin_draw_sprites( running_machine& machine, bitmap_ind16 &bitma
fx = buffered_spriteram[offs + 1] & 0x04;
multi = buffered_spriteram[offs + 1] & 0x10;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 240 - sy;
sx = 240 - sx;
@@ -249,13 +249,13 @@ static void srdarwin_draw_sprites( running_machine& machine, bitmap_ind16 &bitma
drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
code,
color,
- fx,flip_screen_get(machine),
+ fx,state->flip_screen(),
sx,sy,0);
if (multi)
drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
code+1,
color,
- fx,flip_screen_get(machine),
+ fx,state->flip_screen(),
sx,sy2,0);
}
}
@@ -266,7 +266,7 @@ SCREEN_UPDATE_IND16( cobracom )
{
dec8_state *state = screen.machine().driver_data<dec8_state>();
- flip_screen_set(screen.machine(), state->m_bg_control[0] >> 7);
+ state->flip_screen_set(state->m_bg_control[0] >> 7);
screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, state->m_buffered_spriteram16, 0x04, 0x00, 0x03);
@@ -346,7 +346,7 @@ VIDEO_START( ghostb )
SCREEN_UPDATE_IND16( oscar )
{
dec8_state *state = screen.machine().driver_data<dec8_state>();
- flip_screen_set(screen.machine(), state->m_bg_control[1] >> 7);
+ state->flip_screen_set(state->m_bg_control[1] >> 7);
// we mimic the priority scheme in dec0.c, this was originally a bit different, so this could be wrong
screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
diff --git a/src/mame/video/decbac06.c b/src/mame/video/decbac06.c
index 9b3e50b67ef..eb30fa0b90a 100644
--- a/src/mame/video/decbac06.c
+++ b/src/mame/video/decbac06.c
@@ -250,7 +250,7 @@ void deco_bac06_device::custom_tilemap_draw(running_machine &machine,
doesn't affect any games.
*/
- if (flip_screen_get(machine))
+ if (machine.driver_data()->flip_screen())
src_y = (src_bitmap.height() - 256) - scrolly;
else
src_y = scrolly;
@@ -261,7 +261,7 @@ void deco_bac06_device::custom_tilemap_draw(running_machine &machine,
else
src_x=scrollx;
- if (flip_screen_get(machine))
+ if (machine.driver_data()->flip_screen())
src_x=(src_bitmap.width() - 256) - src_x;
for (x=0; x<=cliprect.max_x; x++) {
diff --git a/src/mame/video/deckarn.c b/src/mame/video/deckarn.c
index 8e3af759bb6..3bc158c0a47 100644
--- a/src/mame/video/deckarn.c
+++ b/src/mame/video/deckarn.c
@@ -71,7 +71,7 @@ void deco_karnovsprites_device::draw_sprites( running_machine &machine, bitmap_i
y = (y + 16) % 0x200;
x = 256 - x;
y = 256 - y;
- if (flip_screen_get(machine))
+ if (machine.driver_data()->flip_screen())
{
y = 240 - y;
x = 240 - x;
diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c
index 6facb6a72ca..e9fe2918e09 100644
--- a/src/mame/video/decmxc06.c
+++ b/src/mame/video/decmxc06.c
@@ -86,7 +86,7 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_ind16 &bi
sy = 240 - sy;
- if (flip_screen_get(machine))
+ if (machine.driver_data()->flip_screen())
{
sy = 240 - sy;
sx = 240 - sx;
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index d1df4ce0d3f..bcf664fd149 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -582,7 +582,7 @@ SCREEN_UPDATE_IND16( captaven )
state->m_deco_tilegen1 = screen.machine().device("tilegen1");
state->m_deco_tilegen2 = screen.machine().device("tilegen2");
- screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ screen.machine().tilemap().set_flip_all(state->flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
screen.machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(screen.machine().pens[0x000], cliprect); // Palette index not confirmed
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index 8c88e952524..3d8ff305c81 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -395,6 +395,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap, const r
int sprite_y_adjust, int sprite_y_adjust_flip_screen,
UINT8 *sprite_ram, int interleave)
{
+ decocass_state *state = machine.driver_data<decocass_state>();
int i,offs;
/* Draw the sprites */
@@ -411,7 +412,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap, const r
flipx = sprite_ram[offs + 0] & 0x04;
flipy = sprite_ram[offs + 0] & 0x02;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy + sprite_y_adjust_flip_screen;
@@ -428,7 +429,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap, const r
flipx,flipy,
sx,sy, 0);
- sy += (flip_screen_get(machine) ? -256 : 256);
+ sy += (state->flip_screen() ? -256 : 256);
// Wrap around
drawgfx_transpen(bitmap,cliprect, machine.gfx[1],
@@ -455,7 +456,7 @@ static void draw_missiles(running_machine &machine,bitmap_ind16 &bitmap, const r
sy = 255 - missile_ram[offs + 0 * interleave];
sx = 255 - missile_ram[offs + 2 * interleave];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy + missile_y_adjust_flip_screen;
@@ -471,7 +472,7 @@ static void draw_missiles(running_machine &machine,bitmap_ind16 &bitmap, const r
sy = 255 - missile_ram[offs + 1 * interleave];
sx = 255 - missile_ram[offs + 3 * interleave];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy + missile_y_adjust_flip_screen;
diff --git a/src/mame/video/decospr.c b/src/mame/video/decospr.c
index 6fe8c5d14d6..ac2b7829e6b 100644
--- a/src/mame/video/decospr.c
+++ b/src/mame/video/decospr.c
@@ -213,7 +213,7 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle &
int offs, end, incr;
- int flipscreen = flip_screen_get(machine());
+ int flipscreen = machine().driver_data()->flip_screen();
if (invert_flip)
flipscreen = !flipscreen;
diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c
index d03c0034e47..9b0a177b738 100644
--- a/src/mame/video/dietgo.c
+++ b/src/mame/video/dietgo.c
@@ -8,7 +8,7 @@ SCREEN_UPDATE_IND16( dietgo )
dietgo_state *state = screen.machine().driver_data<dietgo_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
bitmap.fill(256, cliprect); /* not verified */
diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c
index f3dc646582b..c7178212743 100644
--- a/src/mame/video/digdug.c
+++ b/src/mame/video/digdug.c
@@ -129,9 +129,9 @@ static TILE_GET_INFO( tx_get_tile_info )
characters when screen is flipped, we have to flip them back. */
SET_TILE_INFO(
0,
- (code & 0x7f) | (flip_screen_get(machine) ? 0x80 : 0),
+ (code & 0x7f) | (state->flip_screen() ? 0x80 : 0),
color,
- flip_screen_get(machine) ? TILE_FLIPX : 0);
+ state->flip_screen() ? TILE_FLIPX : 0);
}
@@ -227,7 +227,7 @@ WRITE8_HANDLER( digdug_PORT_w )
break;
case 7: /* FLIP */
- flip_screen_set(space->machine(), data & 1);
+ state->flip_screen_set(data & 1);
break;
}
}
@@ -252,7 +252,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap, const r
rectangle visarea = cliprect;
visarea.min_x = 2*8;
visarea.max_x = 34*8-1;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
visarea.min_x += 12*8;
visarea.max_x += 12*8;
@@ -280,7 +280,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap, const r
sy -= 16 * size;
sy = (sy & 0xff) - 32; // fix wraparound
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c
index cc3e292c481..2ac26e377b7 100644
--- a/src/mame/video/docastle.c
+++ b/src/mame/video/docastle.c
@@ -76,27 +76,27 @@ WRITE8_MEMBER(docastle_state::docastle_colorram_w)
READ8_MEMBER(docastle_state::docastle_flipscreen_off_r)
{
- flip_screen_set(machine(), 0);
+ flip_screen_set(0);
m_do_tilemap->mark_all_dirty();
return 0;
}
READ8_MEMBER(docastle_state::docastle_flipscreen_on_r)
{
- flip_screen_set(machine(), 1);
+ flip_screen_set(1);
m_do_tilemap->mark_all_dirty();
return 1;
}
WRITE8_MEMBER(docastle_state::docastle_flipscreen_off_w)
{
- flip_screen_set(machine(), 0);
+ flip_screen_set(0);
m_do_tilemap->mark_all_dirty();
}
WRITE8_MEMBER(docastle_state::docastle_flipscreen_on_w)
{
- flip_screen_set(machine(), 1);
+ flip_screen_set(1);
m_do_tilemap->mark_all_dirty();
}
@@ -190,7 +190,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipy = state->m_spriteram[offs + 2] & 0x80;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index 0d156c11273..64ba29cf8d3 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -119,7 +119,7 @@ WRITE8_MEMBER(dogfgt_state::internal_bitmapram_w)
for (i = 0; i < 3; i++)
color |= ((m_bitmapram[offset + BITMAPRAM_SIZE / 3 * i] >> subx) & 1) << i;
- if (flip_screen_get(machine()))
+ if (flip_screen())
m_pixbitmap.pix16(y ^ 0xff, (x + subx) ^ 0xff) = PIXMAP_COLOR_BASE + 8 * m_pixcolor + color;
else
m_pixbitmap.pix16(y, x + subx) = PIXMAP_COLOR_BASE + 8 * m_pixcolor + color;
@@ -164,7 +164,7 @@ WRITE8_MEMBER(dogfgt_state::dogfgt_1800_w)
coin_counter_w(machine(), 1, data & 0x20);
/* bit 7 is screen flip */
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
/* other bits unused? */
logerror("PC %04x: 1800 = %02x\n", cpu_get_pc(&space.device()), data);
@@ -192,7 +192,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,const r
sy = (240 - state->m_spriteram[offs + 2]) & 0xff;
flipx = state->m_spriteram[offs] & 0x04;
flipy = state->m_spriteram[offs] & 0x02;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -215,11 +215,11 @@ SCREEN_UPDATE_IND16( dogfgt )
dogfgt_state *state = screen.machine().driver_data<dogfgt_state>();
int offs;
- if (state->m_lastflip != flip_screen_get(screen.machine()) || state->m_lastpixcolor != state->m_pixcolor)
+ if (state->m_lastflip != state->flip_screen() || state->m_lastpixcolor != state->m_pixcolor)
{
address_space *space = screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
- state->m_lastflip = flip_screen_get(screen.machine());
+ state->m_lastflip = state->flip_screen();
state->m_lastpixcolor = state->m_pixcolor;
for (offs = 0; offs < BITMAPRAM_SIZE; offs++)
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 7bf116fecb5..55362e1d6c7 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -118,13 +118,13 @@ WRITE8_MEMBER(dooyong_state::lastday_ctrl_w)
m_sprites_disabled = data & 0x10;
/* bit 6 is flip screen */
- flip_screen_set(machine(), data & 0x40);
+ flip_screen_set(data & 0x40);
}
WRITE8_MEMBER(dooyong_state::pollux_ctrl_w)
{
/* bit 0 is flip screen */
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
/* bits 6 and 7 are coin counters */
coin_counter_w(machine(), 0, data & 0x80);
@@ -145,7 +145,7 @@ WRITE8_MEMBER(dooyong_state::primella_ctrl_w)
m_tx_pri = data & 0x08;
/* bit 4 flips screen */
- flip_screen_set(machine(), data & 0x10);
+ flip_screen_set(data & 0x10);
/* bit 5 used but unknown */
@@ -166,7 +166,7 @@ WRITE8_MEMBER(dooyong_state::paletteram_flytiger_w)
WRITE8_MEMBER(dooyong_state::flytiger_ctrl_w)
{
/* bit 0 is flip screen */
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
/* bits 1, 2 used but unknown */
@@ -183,7 +183,7 @@ WRITE16_MEMBER(dooyong_state::rshark_ctrl_w)
if (ACCESSING_BITS_0_7)
{
/* bit 0 flips screen */
- flip_screen_set(machine(), data & 0x0001);
+ flip_screen_set(data & 0x0001);
/* bit 4 changes tilemaps priority */
m_rshark_pri = data & 0x0010;
@@ -410,7 +410,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
}
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 498 - sx;
sy = 240 - (16 * height) - sy;
@@ -475,7 +475,7 @@ static void rshark_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
width = buffered_spriteram16[offs+1] & 0x000f;
height = (buffered_spriteram16[offs+1] & 0x00f0) >> 4;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 498 - (16 * width) - sx;
sy = 240 - (16 * height) - sy;
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index df2b1e90982..b2b6bddf62e 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -128,7 +128,7 @@ WRITE16_MEMBER(dynduke_state::dynduke_control_w)
if (data&0x4) m_txt_enable = 0; else m_txt_enable = 1;
if (data&0x8) m_sprite_enable=0; else m_sprite_enable=1;
- flip_screen_set(machine(), data & 0x40);
+ flip_screen_set(data & 0x40);
}
}
@@ -157,7 +157,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
sprite = buffered_spriteram16[offs+1];
sprite &= 0x3fff;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
x=240-x;
y=240-y;
if (fx) fx=0; else fx=1;
diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c
index 2a0ab8cb99f..35f66576fed 100644
--- a/src/mame/video/equites.c
+++ b/src/mame/video/equites.c
@@ -208,18 +208,18 @@ WRITE16_MEMBER(equites_state::splndrbt_selchar1_w)
WRITE16_MEMBER(equites_state::equites_flip0_w)
{
- flip_screen_set(machine(), 0);
+ flip_screen_set(0);
}
WRITE16_MEMBER(equites_state::equites_flip1_w)
{
- flip_screen_set(machine(), 1);
+ flip_screen_set(1);
}
WRITE16_MEMBER(equites_state::splndrbt_flip0_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(machine(), 0);
+ flip_screen_set(0);
if (ACCESSING_BITS_8_15)
m_bgcolor = data >> 8;
@@ -228,7 +228,7 @@ WRITE16_MEMBER(equites_state::splndrbt_flip0_w)
WRITE16_MEMBER(equites_state::splndrbt_flip1_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(machine(), 1);
+ flip_screen_set(1);
}
WRITE16_MEMBER(equites_state::splndrbt_bg_scrollx_w)
@@ -266,7 +266,7 @@ static void equites_draw_sprites_block( running_machine &machine, bitmap_ind16 &
int sy = (state->m_spriteram[offs] & 0x00ff);
int transmask = colortable_get_transpen_mask(machine.colortable, machine.gfx[2], color, 0);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -354,7 +354,7 @@ static void splndrbt_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
sy += 16;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
// sx NOT inverted
fx = fx ^ 1;
@@ -407,11 +407,11 @@ static void splndrbt_copy_bg( running_machine &machine, bitmap_ind16 &dst_bitmap
const UINT8 * const yrom = xrom + 0x2000;
int scroll_x = state->m_splndrbt_bg_scrollx;
int scroll_y = state->m_splndrbt_bg_scrolly;
- int const dinvert = flip_screen_get(machine) ? 0xff : 0x00;
+ int const dinvert = state->flip_screen() ? 0xff : 0x00;
int src_y = 0;
int dst_y;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
scroll_x = -scroll_x - 8;
scroll_y = -scroll_y;
diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c
index 17831f96d21..96d00468692 100644
--- a/src/mame/video/esd16.c
+++ b/src/mame/video/esd16.c
@@ -114,7 +114,7 @@ WRITE16_MEMBER(esd16_state::esd16_tilemap0_color_w)
m_tilemap0_color = data & 3;
m_tilemap_0->mark_all_dirty();
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c
index e29c4983f05..0e44455857b 100644
--- a/src/mame/video/exprraid.c
+++ b/src/mame/video/exprraid.c
@@ -16,9 +16,9 @@ WRITE8_MEMBER(exprraid_state::exprraid_colorram_w)
WRITE8_MEMBER(exprraid_state::exprraid_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -106,7 +106,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = ((248 - state->m_spriteram[offs + 2]) & 0xff) - 8;
int sy = state->m_spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -126,7 +126,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
drawgfx_transpen(bitmap,cliprect, machine.gfx[1],
code + 1, color,
flipx, flipy,
- sx, sy + (flip_screen_get(machine) ? -16 : 16), 0);
+ sx, sy + (state->flip_screen() ? -16 : 16), 0);
}
}
}
diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c
index eff80ef810d..6839bc892dc 100644
--- a/src/mame/video/exzisus.c
+++ b/src/mame/video/exzisus.c
@@ -131,7 +131,7 @@ SCREEN_UPDATE_IND16( exzisus )
x = (sx + (xc << 3)) & 0xff;
y = (sy + (yc << 3)) & 0xff;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
x = 248 - x;
y = 248 - y;
@@ -140,7 +140,7 @@ SCREEN_UPDATE_IND16( exzisus )
drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],
code & 0x3fff,
color,
- flip_screen_get(screen.machine()), flip_screen_get(screen.machine()),
+ state->flip_screen(), state->flip_screen(),
x, y, 15);
goffs += 2;
}
@@ -200,7 +200,7 @@ SCREEN_UPDATE_IND16( exzisus )
x = (sx + (xc << 3)) & 0xff;
y = (sy + (yc << 3)) & 0xff;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
x = 248 - x;
y = 248 - y;
@@ -209,7 +209,7 @@ SCREEN_UPDATE_IND16( exzisus )
drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
code & 0x3fff,
color,
- flip_screen_get(screen.machine()), flip_screen_get(screen.machine()),
+ state->flip_screen(), state->flip_screen(),
x, y, 15);
goffs += 2;
}
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index 7ae2b248429..6a54cdd636b 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -204,22 +204,22 @@ WRITE8_HANDLER( fastfred_colorbank2_w )
WRITE8_HANDLER( fastfred_flip_screen_x_w )
{
fastfred_state *state = space->machine().driver_data<fastfred_state>();
- if (flip_screen_x_get(space->machine()) != (data & 0x01))
+ if (state->flip_screen_x() != (data & 0x01))
{
- flip_screen_x_set(space->machine(), data & 0x01);
+ state->flip_screen_x_set(data & 0x01);
- state->m_bg_tilemap->set_flip((flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0));
+ state->m_bg_tilemap->set_flip((state->flip_screen_x() ? TILEMAP_FLIPX : 0) | (state->flip_screen_y() ? TILEMAP_FLIPY : 0));
}
}
WRITE8_HANDLER( fastfred_flip_screen_y_w )
{
fastfred_state *state = space->machine().driver_data<fastfred_state>();
- if (flip_screen_y_get(space->machine()) != (data & 0x01))
+ if (state->flip_screen_y() != (data & 0x01))
{
- flip_screen_y_set(space->machine(), data & 0x01);
+ state->flip_screen_y_set(data & 0x01);
- state->m_bg_tilemap->set_flip((flip_screen_x_get(space->machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(space->machine()) ? TILEMAP_FLIPY : 0));
+ state->m_bg_tilemap->set_flip((state->flip_screen_x() ? TILEMAP_FLIPX : 0) | (state->flip_screen_y() ? TILEMAP_FLIPY : 0));
}
}
@@ -276,18 +276,18 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
}
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
sy = 240 - sy;
flipy = !flipy;
}
- drawgfx_transpen(bitmap,flip_screen_x_get(machine) ? spritevisibleareaflipx : spritevisiblearea,machine.gfx[1],
+ drawgfx_transpen(bitmap,state->flip_screen_x() ? spritevisibleareaflipx : spritevisiblearea,machine.gfx[1],
code,
state->m_colorbank | (state->m_spriteram[offs + 2] & 0x07),
flipx,flipy,
diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c
index dc094fb27c2..a1bfebd4090 100644
--- a/src/mame/video/finalizr.c
+++ b/src/mame/video/finalizr.c
@@ -121,7 +121,7 @@ SCREEN_UPDATE_IND16( finalizr )
if (size >= 0x10) /* 32x32 */
{
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 256 - sx;
sy = 224 - sy;
@@ -152,7 +152,7 @@ SCREEN_UPDATE_IND16( finalizr )
}
else
{
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = ((size & 0x08) ? 280:272) - sx;
sy = ((size & 0x04) ? 248:240) - sy;
diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c
index 31b664d7231..ad24f5572e4 100644
--- a/src/mame/video/firetrap.c
+++ b/src/mame/video/firetrap.c
@@ -211,7 +211,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
color = ((state->m_spriteram[offs + 1] & 0x08) >> 2) | (state->m_spriteram[offs + 1] & 0x01);
flipx = state->m_spriteram[offs + 1] & 0x04;
flipy = state->m_spriteram[offs + 1] & 0x02;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -221,7 +221,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
if (state->m_spriteram[offs + 1] & 0x10) /* double width */
{
- if (flip_screen_get(machine)) sy -= 16;
+ if (state->flip_screen()) sy -= 16;
drawgfx_transpen(bitmap,cliprect,machine.gfx[3],
code & ~1,
diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c
index 8ec1c86ba7d..cc3288b6c1a 100644
--- a/src/mame/video/flower.c
+++ b/src/mame/video/flower.c
@@ -78,7 +78,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
code |= ((source[2] & 0x01) << 6);
code |= ((source[2] & 0x08) << 4);
- if(flip_screen_get(machine))
+ if(state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
@@ -176,7 +176,7 @@ SCREEN_UPDATE_IND16( flower )
draw_sprites(screen.machine(),bitmap,cliprect);
- if(flip_screen_get(screen.machine()))
+ if(state->flip_screen())
{
myclip.min_x = cliprect.min_x;
myclip.max_x = cliprect.min_x + 15;
@@ -213,5 +213,5 @@ WRITE8_MEMBER(flower_state::flower_bg1ram_w)
WRITE8_MEMBER(flower_state::flower_flipscreen_w)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
}
diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c
index 138b6f4bcb5..1a36594b960 100644
--- a/src/mame/video/flstory.c
+++ b/src/mame/video/flstory.c
@@ -102,9 +102,9 @@ WRITE8_MEMBER(flstory_state::flstory_videoram_w)
WRITE8_MEMBER(flstory_state::flstory_palette_w)
{
if (offset & 0x100)
- paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (m_palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w(space, (offset & 0xff) + (m_palette_bank << 8),data);
else
- paletteram_xxxxBBBBGGGGRRRR_split1_w(space, (offset & 0xff) + (m_palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w(space, (offset & 0xff) + (m_palette_bank << 8),data);
}
READ8_MEMBER(flstory_state::flstory_palette_r)
@@ -129,7 +129,7 @@ WRITE8_MEMBER(flstory_state::flstory_gfxctrl_w)
}
m_palette_bank = (data & 0x20) >> 5;
- flip_screen_set(machine(), m_flipscreen);
+ flip_screen_set(m_flipscreen);
//popmessage("%04x: gfxctrl = %02x\n", cpu_get_pc(&space.device()), data);
@@ -151,7 +151,7 @@ WRITE8_MEMBER(flstory_state::victnine_gfxctrl_w)
if (data & 0x04)
{
m_flipscreen = (data & 0x01);
- flip_screen_set(machine(), m_flipscreen);
+ flip_screen_set(m_flipscreen);
}
//popmessage("%04x: gfxctrl = %02x\n", cpu_get_pc(&space.device()), data);
diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c
index bee6303e2c5..e4e67082423 100644
--- a/src/mame/video/freekick.c
+++ b/src/mame/video/freekick.c
@@ -43,12 +43,12 @@ static void gigas_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
int flipy = 0;
int color = state->m_spriteram[offs + 1] & 0x1f;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
xpos = 240 - xpos;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
ypos = 256 - ypos;
flipy = !flipy;
@@ -78,12 +78,12 @@ static void pbillrd_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap
int flipy = 0;//state->m_spriteram[offs + 0] & 0x40;
int color = state->m_spriteram[offs + 1] & 0x0f;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
xpos = 240 - xpos;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
ypos = 256 - ypos;
flipy = !flipy;
@@ -114,12 +114,12 @@ static void freekick_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
int flipy = state->m_spriteram[offs + 2] & 0x40;
int color = state->m_spriteram[offs + 2] & 0x1f;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
xpos = 240 - xpos;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
ypos = 256 - ypos;
flipy = !flipy;
diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c
index 521c3a075c5..b32c12a2360 100644
--- a/src/mame/video/funkybee.c
+++ b/src/mame/video/funkybee.c
@@ -62,12 +62,12 @@ WRITE8_MEMBER(funkybee_state::funkybee_gfx_bank_w)
WRITE8_MEMBER(funkybee_state::funkybee_scroll_w)
{
- m_bg_tilemap->set_scrollx(0, flip_screen_get(machine()) ? -data : data);
+ m_bg_tilemap->set_scrollx(0, flip_screen() ? -data : data);
}
WRITE8_MEMBER(funkybee_state::funkybee_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -107,7 +107,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = state->m_videoram[offs2 + 0x10];
int sy = 224 - state->m_colorram[offs2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy += 32;
flipx = !flipx;
@@ -127,7 +127,7 @@ static void draw_columns( running_machine &machine, bitmap_ind16 &bitmap, const
for (offs = 0x1f; offs >= 0; offs--)
{
- int const flip = flip_screen_get(machine);
+ int const flip = state->flip_screen();
int code = state->m_videoram[0x1c00 + offs];
int color = state->m_colorram[0x1f10] & 0x03;
int sx = flip ? state->m_videoram[0x1f1f] : state->m_videoram[0x1f10];
diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c
index eff656f1d14..38ac860794f 100644
--- a/src/mame/video/funkyjet.c
+++ b/src/mame/video/funkyjet.c
@@ -16,7 +16,7 @@ SCREEN_UPDATE_IND16( funkyjet )
funkyjet_state *state = screen.machine().driver_data<funkyjet_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
bitmap.fill(768, cliprect);
diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c
index 36162d76911..cf2960d1209 100644
--- a/src/mame/video/fuukifg2.c
+++ b/src/mame/video/fuukifg2.c
@@ -182,7 +182,7 @@ static void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rec
sx = (sx & 0x1ff) - (sx & 0x200);
sy = (sy & 0x1ff) - (sy & 0x200);
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
flipx = !flipx; sx = max_x - sx - xnum * 16;
flipy = !flipy; sy = max_y - sy - ynum * 16;
@@ -306,12 +306,12 @@ SCREEN_UPDATE_IND16( fuuki16 )
int tm_middle = pri_table[state->m_priority[0] & 0x0f][1];
int tm_back = pri_table[state->m_priority[0] & 0x0f][2];
- flip_screen_set(screen.machine(), state->m_vregs[0x1e / 2] & 1);
+ state->flip_screen_set(state->m_vregs[0x1e / 2] & 1);
/* Layers scrolling */
- scrolly_offs = state->m_vregs[0xc / 2] - (flip_screen_get(screen.machine()) ? 0x103 : 0x1f3);
- scrollx_offs = state->m_vregs[0xe / 2] - (flip_screen_get(screen.machine()) ? 0x2a7 : 0x3f6);
+ scrolly_offs = state->m_vregs[0xc / 2] - (state->flip_screen() ? 0x103 : 0x1f3);
+ scrollx_offs = state->m_vregs[0xe / 2] - (state->flip_screen() ? 0x2a7 : 0x3f6);
layer0_scrolly = state->m_vregs[0x0 / 2] + scrolly_offs;
layer0_scrollx = state->m_vregs[0x2 / 2] + scrollx_offs;
diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c
index f1cbfb6b5b3..e897b228378 100644
--- a/src/mame/video/fuukifg3.c
+++ b/src/mame/video/fuukifg3.c
@@ -198,7 +198,7 @@ static void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rec
sx = (sx & 0x1ff) - (sx & 0x200);
sy = (sy & 0x1ff) - (sy & 0x200);
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
flipx = !flipx; sx = max_x - sx - xnum * 16;
flipy = !flipy; sy = max_y - sy - ynum * 16;
@@ -330,12 +330,12 @@ SCREEN_UPDATE_IND16( fuuki32 )
int tm_middle = pri_table[(state->m_priority[0] >> 16) & 0x0f][1];
int tm_back = pri_table[(state->m_priority[0] >> 16) & 0x0f][2];
- flip_screen_set(screen.machine(), (state->m_vregs[0x1e / 4] & 0x0000ffff) & 1);
+ state->flip_screen_set((state->m_vregs[0x1e / 4] & 0x0000ffff) & 1);
/* Layers scrolling */
- scrolly_offs = ((state->m_vregs[0xc / 4] & 0xffff0000) >> 16) - (flip_screen_get(screen.machine()) ? 0x103 : 0x1f3);
- scrollx_offs = (state->m_vregs[0xc / 4] & 0x0000ffff) - (flip_screen_get(screen.machine()) ? 0x2c7 : 0x3f6);
+ scrolly_offs = ((state->m_vregs[0xc / 4] & 0xffff0000) >> 16) - (state->flip_screen() ? 0x103 : 0x1f3);
+ scrollx_offs = (state->m_vregs[0xc / 4] & 0x0000ffff) - (state->flip_screen() ? 0x2c7 : 0x3f6);
layer0_scrolly = ((state->m_vregs[0x0 / 4] & 0xffff0000) >> 16) + scrolly_offs;
layer0_scrollx = ((state->m_vregs[0x0 / 4] & 0x0000ffff)) + scrollx_offs;
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index e797cdbbe4d..2d69d98953e 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -193,7 +193,7 @@ WRITE16_MEMBER(gaelco2_state::gaelco2_vram_w)
/***************************************************************************
- Palette (paletteram16_xRRRRRGGGGGBBBBB_word_w)
+ Palette (paletteram_xRRRRRGGGGGBBBBB_word_w)
The game's palette uses colors 0-4095, but we need 15 aditional palettes
to handle shadows and highlights properly. After a color write to the
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index a7a972c163f..5d125cdeefd 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -170,7 +170,7 @@ VIDEO_START( drgnbowl )
WRITE16_MEMBER(gaiden_state::gaiden_flip_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
WRITE16_MEMBER(gaiden_state::gaiden_txscrollx_w)
@@ -396,7 +396,7 @@ static void gaiden_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap_
if (ypos >= 256)
ypos -= 512;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
@@ -518,7 +518,7 @@ static void raiga_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap_b
if (ypos >= 256)
ypos -= 512;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c
index 5829ad87186..bda46f91811 100644
--- a/src/mame/video/galaga.c
+++ b/src/mame/video/galaga.c
@@ -416,9 +416,9 @@ static TILE_GET_INFO( get_tile_info )
int color = state->m_videoram[tile_index + 0x400] & 0x3f;
SET_TILE_INFO(
0,
- (state->m_videoram[tile_index] & 0x7f) | (flip_screen_get(machine) ? 0x80 : 0) | (state->m_galaga_gfxbank << 8),
+ (state->m_videoram[tile_index] & 0x7f) | (state->flip_screen() ? 0x80 : 0) | (state->m_galaga_gfxbank << 8),
color,
- flip_screen_get(machine) ? TILE_FLIPX : 0);
+ state->flip_screen() ? TILE_FLIPX : 0);
tileinfo.group = color;
}
@@ -504,7 +504,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sy -= 16 * sizey;
sy = (sy & 0xff) - 32; // fix wraparound
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
@@ -537,7 +537,7 @@ static void draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const rec
if ( (state->m_galaga_starcontrol[5] & 1) == 1 )
{
int y_align = 112; /* 112 is a tweak to get alignment about perfect */
- int x_align = flip_screen_get(machine) ? 112 : 16;
+ int x_align = state->flip_screen() ? 112 : 16;
int star_cntr;
int set_a, set_b;
diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c
index c27205a008e..85e68510da6 100644
--- a/src/mame/video/galaxold.c
+++ b/src/mame/video/galaxold.c
@@ -1159,9 +1159,10 @@ static void darkplnt_draw_bullets(running_machine &machine, bitmap_ind16 &bitmap
static void dambustr_draw_bullets(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int offs, int x, int y)
{
+ galaxold_state *state = machine.driver_data<galaxold_state>();
int i, color;
- if (flip_screen_x_get(machine)) x++;
+ if (state->flip_screen_x()) x++;
x = x - 6;
@@ -1339,7 +1340,7 @@ static void dambustr_draw_background(running_machine &machine, bitmap_ind16 &bit
int col1 = base + state->m_dambustr_bg_color_1;
int col2 = base + state->m_dambustr_bg_color_2;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
bitmap.plot_box( 0, 0, 256-state->m_dambustr_bg_split_line, 256, col2);
bitmap.plot_box(256-state->m_dambustr_bg_split_line, 0, state->m_dambustr_bg_split_line, 256, col1);
@@ -1356,7 +1357,7 @@ static void dambustr_draw_upper_background(running_machine &machine, bitmap_ind1
{
galaxold_state *state = machine.driver_data<galaxold_state>();
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
rectangle clip(254 - state->m_dambustr_bg_split_line, state->m_dambustr_bg_split_line, 0, 255);
copybitmap(bitmap, *state->m_dambustr_tmpbitmap, 0, 0, 0, 0, clip);
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index 234ee6640f0..59f9d8126c6 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -279,7 +279,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int duplicate = spriteram_3[offs] & 0x80;
int x,y;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
@@ -308,7 +308,7 @@ SCREEN_UPDATE_IND16( gaplus )
{
gaplus_state *state = screen.machine().driver_data<gaplus_state>();
/* flip screen control is embedded in RAM */
- flip_screen_set(screen.machine(), state->m_spriteram[0x1f7f-0x800] & 1);
+ state->flip_screen_set(state->m_spriteram[0x1f7f-0x800] & 1);
bitmap.fill(0, cliprect);
diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c
index 21779d3d9e5..7b3cf5244b8 100644
--- a/src/mame/video/gberet.c
+++ b/src/mame/video/gberet.c
@@ -150,7 +150,7 @@ static void gberet_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
int flipx = attr & 0x10;
int flipy = attr & 0x20;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -205,7 +205,7 @@ static void gberetb_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap
int flipx = attr & 0x10;
int flipy = attr & 0x20;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index 093ae9e3b7f..94cd71b7a5f 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -217,7 +217,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int color = src[1] & 0x1f;
int x,y;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
xflip = !xflip;
yflip = !yflip;
@@ -287,9 +287,9 @@ SCREEN_UPDATE_IND16( gladiatr )
int scroll;
scroll = state->m_bg_scrollx + ((state->m_video_attributes & 0x04) << 6);
- state->m_bg_tilemap->set_scrollx(0, scroll ^ (flip_screen_get(screen.machine()) ? 0x0f : 0));
+ state->m_bg_tilemap->set_scrollx(0, scroll ^ (state->flip_screen() ? 0x0f : 0));
scroll = state->m_fg_scrollx + ((state->m_video_attributes & 0x08) << 5);
- state->m_fg_tilemap->set_scrollx(0, scroll ^ (flip_screen_get(screen.machine()) ? 0x0f : 0));
+ state->m_fg_tilemap->set_scrollx(0, scroll ^ (state->flip_screen() ? 0x0f : 0));
// always 0 anyway
state->m_bg_tilemap->set_scrolly(0, state->m_bg_scrolly);
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index 5105689fb97..9958459901d 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -93,7 +93,7 @@ WRITE8_MEMBER(gng_state::gng_bgscrolly_w)
WRITE8_MEMBER(gng_state::gng_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 1);
+ flip_screen_set(~data & 1);
}
@@ -120,7 +120,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipx = attributes & 0x04;
int flipy = attributes & 0x08;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c
index 306fb97dd20..967ffc035d0 100644
--- a/src/mame/video/goindol.c
+++ b/src/mame/video/goindol.c
@@ -93,7 +93,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sx = sprite_ram[offs];
sy = 240 - sprite_ram[offs + 1];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 248 - sx;
sy = 248 - sy;
@@ -109,14 +109,14 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
machine.gfx[gfxbank],
tile,
palette,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx,sy, 0);
drawgfx_transpen(bitmap,cliprect,
machine.gfx[gfxbank],
tile+1,
palette,
- flip_screen_get(machine),flip_screen_get(machine),
- sx,sy + (flip_screen_get(machine) ? -8 : 8), 0);
+ state->flip_screen(),state->flip_screen(),
+ sx,sy + (state->flip_screen() ? -8 : 8), 0);
}
}
}
diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c
index 8765101d87e..224e329af92 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -51,16 +51,16 @@ WRITE8_MEMBER(gottlieb_state::gottlieb_video_control_w)
m_background_priority = data & 0x01;
/* bit 1 controls horizonal flip screen */
- if (flip_screen_x_get(machine()) != (data & 0x02))
+ if (flip_screen_x() != (data & 0x02))
{
- flip_screen_x_set(machine(), data & 0x02);
+ flip_screen_x_set(data & 0x02);
machine().tilemap().mark_all_dirty();
}
/* bit 2 controls horizonal flip screen */
- if (flip_screen_y_get(machine()) != (data & 0x04))
+ if (flip_screen_y() != (data & 0x04))
{
- flip_screen_y_set(machine(), data & 0x04);
+ flip_screen_y_set(data & 0x04);
machine().tilemap().mark_all_dirty();
}
@@ -225,13 +225,13 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
int sy = (spriteram[offs]) - 13;
int code = (255 ^ spriteram[offs + 2]) + 256 * state->m_spritebank;
- if (flip_screen_x_get(machine)) sx = 233 - sx;
- if (flip_screen_y_get(machine)) sy = 244 - sy;
+ if (state->flip_screen_x()) sx = 233 - sx;
+ if (state->flip_screen_y()) sy = 244 - sy;
drawgfx_transpen(bitmap, clip,
machine.gfx[2],
code, 0,
- flip_screen_x_get(machine), flip_screen_y_get(machine),
+ state->flip_screen_x(), state->flip_screen_y(),
sx,sy, 0);
}
}
diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c
index 3556e058a07..ef6bebda50e 100644
--- a/src/mame/video/gotya.c
+++ b/src/mame/video/gotya.c
@@ -82,9 +82,9 @@ WRITE8_MEMBER(gotya_state::gotya_video_control_w)
m_scroll_bit_8 = data & 0x01;
- if (flip_screen_get(machine()) != (data & 0x02))
+ if (flip_screen() != (data & 0x02))
{
- flip_screen_set(machine(), data & 0x02);
+ flip_screen_set(data & 0x02);
machine().tilemap().mark_all_dirty();
}
}
@@ -117,7 +117,7 @@ static void draw_status_row( running_machine &machine, bitmap_ind16 &bitmap, con
gotya_state *state = machine.driver_data<gotya_state>();
int row;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 35 - sx;
}
@@ -126,7 +126,7 @@ static void draw_status_row( running_machine &machine, bitmap_ind16 &bitmap, con
{
int sy;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sy = row;
else
sy = 31 - row;
@@ -135,7 +135,7 @@ static void draw_status_row( running_machine &machine, bitmap_ind16 &bitmap, con
machine.gfx[0],
state->m_videoram2[row * 32 + col],
state->m_videoram2[row * 32 + col + 0x10] & 0x0f,
- flip_screen_x_get(machine), flip_screen_y_get(machine),
+ state->flip_screen_x(), state->flip_screen_y(),
8 * sx, 8 * sy);
}
}
@@ -153,13 +153,13 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = 256 - spriteram[offs + 0x10] + (spriteram[offs + 0x01] & 0x01) * 256;
int sy = spriteram[offs + 0x00];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sy = 240 - sy;
drawgfx_transpen(bitmap,cliprect,
machine.gfx[1],
code, color,
- flip_screen_x_get(machine), flip_screen_y_get(machine),
+ state->flip_screen_x(), state->flip_screen_y(),
sx, sy, 0);
}
}
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index 4daf89c2e59..5dacb8970ef 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -83,7 +83,7 @@ WRITE8_MEMBER(gunsmoke_state::gunsmoke_c804_w)
/* bit 5 resets the sound CPU? - we ignore it */
/* bit 6 flips screen */
- flip_screen_set(machine(), data & 0x40);
+ flip_screen_set(data & 0x40);
/* bit 7 enables characters? */
m_chon = data & 0x80;
@@ -158,7 +158,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
code += 256 * bank;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c
index 513b564e0a5..210af843a17 100644
--- a/src/mame/video/hanaawas.c
+++ b/src/mame/video/hanaawas.c
@@ -74,15 +74,16 @@ WRITE8_MEMBER(hanaawas_state::hanaawas_colorram_w)
/* dirty both current and next offsets */
m_bg_tilemap->mark_tile_dirty(offset);
- m_bg_tilemap->mark_tile_dirty((offset + (flip_screen_get(machine()) ? -1 : 1)) & 0x03ff);
+ m_bg_tilemap->mark_tile_dirty((offset + (flip_screen() ? -1 : 1)) & 0x03ff);
}
WRITE8_DEVICE_HANDLER( hanaawas_portB_w )
{
/* bit 7 is flip screen */
- if (flip_screen_get(device->machine()) != (~data & 0x80))
+ hanaawas_state *state = device->machine().driver_data<hanaawas_state>();
+ if (state->flip_screen() != (~data & 0x80))
{
- flip_screen_set(device->machine(), ~data & 0x80);
+ state->flip_screen_set(~data & 0x80);
device->machine().tilemap().mark_all_dirty();
}
}
@@ -91,7 +92,7 @@ static TILE_GET_INFO( get_bg_tile_info )
{
hanaawas_state *state = machine.driver_data<hanaawas_state>();
/* the color is determined by the current color byte, but the bank is via the previous one!!! */
- int offset = (tile_index + (flip_screen_get(machine) ? 1 : -1)) & 0x3ff;
+ int offset = (tile_index + (state->flip_screen() ? 1 : -1)) & 0x3ff;
int attr = state->m_colorram[offset];
int gfxbank = (attr & 0x40) >> 6;
int code = state->m_videoram[tile_index] + ((attr & 0x20) << 3);
diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c
index f8182fdfdc0..5fa1254077e 100644
--- a/src/mame/video/higemaru.c
+++ b/src/mame/video/higemaru.c
@@ -81,9 +81,9 @@ WRITE8_MEMBER(higemaru_state::higemaru_c800_w)
coin_counter_w(machine(), 1,data & 1);
/* bit 7 flips screen */
- if (flip_screen_get(machine()) != (data & 0x80))
+ if (flip_screen() != (data & 0x80))
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
m_bg_tilemap->mark_all_dirty();
}
}
@@ -119,7 +119,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sy = spriteram[offs + 8];
flipx = spriteram[offs + 4] & 0x10;
flipy = spriteram[offs + 4] & 0x20;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c
index f374e685714..dd25315cdcc 100644
--- a/src/mame/video/himesiki.c
+++ b/src/mame/video/himesiki.c
@@ -41,7 +41,7 @@ WRITE8_MEMBER(himesiki_state::himesiki_scrollx_w)
WRITE8_MEMBER(himesiki_state::himesiki_flip_w)
{
m_flipscreen = data & 0xc0;
- flip_screen_set(machine(), m_flipscreen);
+ flip_screen_set(m_flipscreen);
if (data & 0x3f)
logerror("p08_w %02x\n",data);
diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c
index ff7efd85834..42e9d358e65 100644
--- a/src/mame/video/holeland.c
+++ b/src/mame/video/holeland.c
@@ -99,9 +99,9 @@ WRITE8_MEMBER(holeland_state::holeland_scroll_w)
WRITE8_MEMBER(holeland_state::holeland_flipscreen_w)
{
if (offset)
- flip_screen_y_set(machine(), data);
+ flip_screen_y_set(data);
else
- flip_screen_x_set(machine(), data);
+ flip_screen_x_set(data);
}
@@ -125,13 +125,13 @@ static void holeland_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
flipx = spriteram[offs + 3] & 0x04;
flipy = spriteram[offs + 3] & 0x08;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 240 - sy;
@@ -164,13 +164,13 @@ static void crzrally_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
flipx = spriteram[offs + 3] & 0x04;
flipy = spriteram[offs + 3] & 0x08;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 240 - sy;
diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c
index e7724c03aee..d3406c75740 100644
--- a/src/mame/video/hyperspt.c
+++ b/src/mame/video/hyperspt.c
@@ -103,9 +103,9 @@ WRITE8_MEMBER(hyperspt_state::hyperspt_colorram_w)
WRITE8_MEMBER(hyperspt_state::hyperspt_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -143,13 +143,13 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipx = ~spriteram[offs] & 0x40;
int flipy = spriteram[offs] & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 240 - sy;
flipy = !flipy;
}
- /* Note that this adjustment must be done AFTER handling flip_screen_get(machine), thus */
+ /* Note that this adjustment must be done AFTER handling state->flip_screen(), thus */
/* proving that this is a hardware related "feature" */
sy += 1;
@@ -180,7 +180,7 @@ SCREEN_UPDATE_IND16( hyperspt )
for (row = 0; row < 32; row++)
{
int scrollx = state->m_scroll[row * 2] + (state->m_scroll[(row * 2) + 1] & 0x01) * 256;
- if (flip_screen_get(screen.machine())) scrollx = -scrollx;
+ if (state->flip_screen()) scrollx = -scrollx;
state->m_bg_tilemap->set_scrollx(row, scrollx);
}
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index bc62cea599c..f0995651660 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -557,7 +557,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 gfxstart = (8 * 8 * 4 / 8) * (((attr & 0x000f) << 16) + code);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx; x = max_x - x - width;
flipy = !flipy; y = max_y - y - height;
@@ -729,7 +729,7 @@ SCREEN_UPDATE_IND16( hyprduel )
---- ---- ---- ---0 Flip Screen */
if (screenctrl & 2)
return 0;
- flip_screen_set(screen.machine(), screenctrl & 1);
+ state->flip_screen_set(screenctrl & 1);
#if 0
if (screen.machine().input().code_pressed(KEYCODE_Z))
diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c
index 81993020241..0f3addd8534 100644
--- a/src/mame/video/ironhors.c
+++ b/src/mame/video/ironhors.c
@@ -122,9 +122,9 @@ WRITE8_MEMBER(ironhors_state::ironhors_palettebank_w)
WRITE8_MEMBER(ironhors_state::ironhors_flipscreen_w)
{
- if (flip_screen_get(machine()) != (~data & 0x08))
+ if (flip_screen() != (~data & 0x08))
{
- flip_screen_set(machine(), ~data & 0x08);
+ flip_screen_set(~data & 0x08);
machine().tilemap().mark_all_dirty();
}
@@ -170,9 +170,9 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipy = sr[offs + 4] & 0x40;
int code = (sr[offs] << 2) + ((sr[offs + 1] & 0x03) << 10) + ((sr[offs + 1] & 0x0c) >> 2);
int color = ((sr[offs + 1] & 0xf0) >> 4) + 16 * state->m_palettebank;
- // int mod = flip_screen_get(machine) ? -8 : 8;
+ // int mod = state->flip_screen() ? -8 : 8;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -192,7 +192,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
case 0x04: /* 16x8 */
{
- if (flip_screen_get(machine)) sy += 8; // this fixes the train wheels' position
+ if (state->flip_screen()) sy += 8; // this fixes the train wheels' position
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code & ~1,
@@ -283,9 +283,9 @@ static void farwest_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap
int code = (sr[offs] << 2) + ((sr2[offs] & 0x03) << 10) + ((sr2[offs] & 0x0c) >> 2);
int color = ((sr2[offs] & 0xf0) >> 4) + 16 * state->m_palettebank;
- // int mod = flip_screen_get() ? -8 : 8;
+ // int mod = flip_screen() ? -8 : 8;
-// if (flip_screen_get())
+// if (flip_screen())
{
// sx = 240 - sx;
sy = 240 - sy;
@@ -305,7 +305,7 @@ static void farwest_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap
case 0x04: /* 16x8 */
{
- if (flip_screen_get(machine)) sy += 8; // this fixes the train wheels' position
+ if (state->flip_screen()) sy += 8; // this fixes the train wheels' position
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code & ~1,
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c
index 65d0d229def..2380d352dac 100644
--- a/src/mame/video/jack.c
+++ b/src/mame/video/jack.c
@@ -25,18 +25,18 @@ WRITE8_MEMBER(jack_state::jack_colorram_w)
WRITE8_MEMBER(jack_state::jack_paletteram_w)
{
/* RGB output is inverted */
- paletteram_BBGGGRRR_w(space, offset, ~data);
+ paletteram_BBGGGRRR_byte_w(space, offset, ~data);
}
READ8_MEMBER(jack_state::jack_flipscreen_r)
{
- flip_screen_set(machine(), offset);
+ flip_screen_set(offset);
return 0;
}
WRITE8_MEMBER(jack_state::jack_flipscreen_w)
{
- flip_screen_set(machine(), offset);
+ flip_screen_set(offset);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -79,7 +79,7 @@ static void jack_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, c
flipx = (spriteram[offs + 3] & 0x80);
flipy = (spriteram[offs + 3] & 0x40);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 248 - sx;
sy = 248 - sy;
@@ -164,7 +164,7 @@ static void joinem_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
flipx = (spriteram[offs + 3] & 0x80);
flipy = (spriteram[offs + 3] & 0x40);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 248 - sx;
sy = 248 - sy;
diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c
index 994a6248ca9..a6bee12bbb4 100644
--- a/src/mame/video/jackal.c
+++ b/src/mame/video/jackal.c
@@ -119,6 +119,7 @@ static void draw_background( running_machine &machine, bitmap_ind16 &bitmap, con
static void draw_sprites_region( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, const UINT8 *sram, int length, int bank )
{
+ jackal_state *state = machine.driver_data<jackal_state>();
int offs;
for (offs = 0; offs < length; offs += 5)
@@ -137,7 +138,7 @@ static void draw_sprites_region( running_machine &machine, bitmap_ind16 &bitmap,
if (sy > 0xf0)
sy = sy - 256;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -150,7 +151,7 @@ static void draw_sprites_region( running_machine &machine, bitmap_ind16 &bitmap,
int spritenum = sn1 * 4 + ((sn2 & (8 + 4)) >> 2) + ((sn2 & (2 + 1)) << 10);
int mod = -8;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx += 8;
sy -= 8;
@@ -159,7 +160,7 @@ static void draw_sprites_region( running_machine &machine, bitmap_ind16 &bitmap,
if ((attr & 0x0C) == 0x0C)
{
- if (flip_screen_get(machine)) sy += 16;
+ if (state->flip_screen()) sy += 16;
DRAW_SPRITE(bank + 1, spritenum, sx, sy)
}
@@ -182,7 +183,7 @@ static void draw_sprites_region( running_machine &machine, bitmap_ind16 &bitmap,
if (attr & 0x10)
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx -= 16;
sy -= 16;
diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c
index bc9f53090e6..27679daeb22 100644
--- a/src/mame/video/jailbrek.c
+++ b/src/mame/video/jailbrek.c
@@ -79,7 +79,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = spriteram[i + 2] - ((attr & 0x80) << 1);
int sy = spriteram[i + 3];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c
index 68cf4873044..355b6298c8c 100644
--- a/src/mame/video/kan_panb.c
+++ b/src/mame/video/kan_panb.c
@@ -33,7 +33,7 @@ SCREEN_UPDATE_IND16( honeydol )
x = dx;
y = dy;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 240 - x;
sy = 240 - y;
@@ -64,7 +64,7 @@ SCREEN_UPDATE_IND16( honeydol )
x = dx;
y = dy;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 240 - x;
sy = 240 - y;
@@ -120,7 +120,7 @@ SCREEN_UPDATE_IND16( twinadv )
x = dx;
y = dy;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 240 - x;
sy = 240 - y;
@@ -169,7 +169,7 @@ SCREEN_UPDATE_IND16( wintbob )
if (wrapr == 8) xpos -= 256;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
xpos = 240 - xpos;
ypos = 240 - ypos;
@@ -249,7 +249,7 @@ SCREEN_UPDATE_IND16( snowbro3 )
if (x > 511) x &= 0x1ff;
if (y > 511) y &= 0x1ff;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
sx = 240 - x;
sy = 240 - y;
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index ca44d44e070..9992433ee84 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -162,7 +162,7 @@ static void pandora_draw( device_t *device, bitmap_ind16 &bitmap, const rectangl
y = dy;
}
- if (flip_screen_get(device->machine()))
+ if (device->machine().driver_data()->flip_screen())
{
sx = 240 - x;
sy = 240 - y;
diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c
index b6dbf96efe3..b5586f88c2e 100644
--- a/src/mame/video/kchamp.c
+++ b/src/mame/video/kchamp.c
@@ -38,7 +38,7 @@ WRITE8_MEMBER(kchamp_state::kchamp_colorram_w)
WRITE8_MEMBER(kchamp_state::kchamp_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -83,7 +83,7 @@ static void kchamp_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
int sx = spriteram[offs + 3] - 8;
int sy = 247 - spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -112,7 +112,7 @@ static void kchampvs_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
int sx = spriteram[offs + 3];
int sy = 240 - spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c
index 58fd6cf913d..125faaec37d 100644
--- a/src/mame/video/kingobox.c
+++ b/src/mame/video/kingobox.c
@@ -165,9 +165,9 @@ WRITE8_MEMBER(kingofb_state::kingofb_f800_w)
m_bg_tilemap->mark_all_dirty();
}
- if (flip_screen_get(machine()) != (data & 0x80))
+ if (flip_screen() != (data & 0x80))
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
machine().tilemap().mark_all_dirty();
}
}
@@ -226,7 +226,7 @@ static void kingofb_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
sx = spriteram[roffs + 1];
sy = spriteram[roffs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -288,7 +288,7 @@ static void ringking_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
int sx = spriteram[offs + 2];
int sy = spriteram[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c
index 70770d36afe..14584b814f2 100644
--- a/src/mame/video/ksayakyu.c
+++ b/src/mame/video/ksayakyu.c
@@ -22,7 +22,7 @@ WRITE8_MEMBER(ksayakyu_state::ksayakyu_videoctrl_w)
m_video_ctrl = data;
m_flipscreen = data & 4;
- flip_screen_set(machine(), m_flipscreen);
+ flip_screen_set(m_flipscreen);
m_tilemap->set_scrolly(0, (data & 0xe0) << 3);
if(m_flipscreen)
m_tilemap->set_flip((data & 2) ? TILEMAP_FLIPY : TILEMAP_FLIPX | TILEMAP_FLIPY);
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index 976549c5b4b..fff5f115301 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -149,9 +149,9 @@ WRITE8_MEMBER(ladybug_state::ladybug_colorram_w)
WRITE8_MEMBER(ladybug_state::ladybug_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -166,9 +166,9 @@ WRITE8_MEMBER(ladybug_state::sraider_io_w)
// bit3 = enable stars
// bit210 = stars speed/dir
- if (flip_screen_get(machine()) != (data & 0x80))
+ if (flip_screen() != (data & 0x80))
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
machine().tilemap().mark_all_dirty();
}
@@ -292,7 +292,7 @@ SCREEN_UPDATE_IND16( ladybug )
int sx = offs % 4;
int sy = offs / 4;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
state->m_bg_tilemap->set_scrollx(offs, -state->m_videoram[32 * sx + sy]);
else
state->m_bg_tilemap->set_scrollx(offs, state->m_videoram[32 * sx + sy]);
@@ -325,7 +325,7 @@ SCREEN_UPDATE_IND16( sraider )
int sx = offs % 4;
int sy = offs / 4;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
state->m_bg_tilemap->set_scrollx(offs, -state->m_videoram[32 * sx + sy]);
else
state->m_bg_tilemap->set_scrollx(offs, state->m_videoram[32 * sx + sy]);
@@ -335,7 +335,7 @@ SCREEN_UPDATE_IND16( sraider )
bitmap.fill(0, cliprect);
// draw the stars
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
redclash_draw_stars(screen.machine(), bitmap, cliprect, 0x60, 1, 0x27, 0xff);
else
redclash_draw_stars(screen.machine(), bitmap, cliprect, 0x60, 1, 0x00, 0xd8);
@@ -344,7 +344,7 @@ SCREEN_UPDATE_IND16( sraider )
colortable_palette_set_color(screen.machine().colortable, 0x40, MAKE_RGB(state->m_grid_color & 0x40 ? 0xff : 0,
state->m_grid_color & 0x20 ? 0xff : 0,
state->m_grid_color & 0x10 ? 0xff : 0));
- state->m_grid_tilemap->draw(bitmap, cliprect, 0, flip_screen_get(screen.machine()));
+ state->m_grid_tilemap->draw(bitmap, cliprect, 0, state->flip_screen());
for (i = 0; i < 0x100; i++)
{
@@ -353,7 +353,7 @@ SCREEN_UPDATE_IND16( sraider )
UINT8 x = i;
int height = cliprect.max_y - cliprect.min_y + 1;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
x = ~x;
bitmap.plot_box(x, cliprect.min_y, 1, height, 0x81);
@@ -361,7 +361,7 @@ SCREEN_UPDATE_IND16( sraider )
}
// now the chars
- state->m_bg_tilemap->draw(bitmap, cliprect, 0, flip_screen_get(screen.machine()));
+ state->m_bg_tilemap->draw(bitmap, cliprect, 0, state->flip_screen());
// now the sprites
draw_sprites(screen.machine(), bitmap, cliprect);
diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c
index cbb153c5914..5ed09df5b4a 100644
--- a/src/mame/video/ladyfrog.c
+++ b/src/mame/video/ladyfrog.c
@@ -46,9 +46,9 @@ WRITE8_MEMBER(ladyfrog_state::ladyfrog_palette_w)
{
if (offset & 0x100)
- paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
else
- paletteram_xxxxBBBBGGGGRRRR_split1_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
}
READ8_MEMBER(ladyfrog_state::ladyfrog_palette_r)
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index 4adea46636c..819d801ac92 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -217,10 +217,10 @@ WRITE8_MEMBER(lasso_state::lasso_colorram_w)
WRITE8_MEMBER(lasso_state::lasso_flip_screen_w)
{
/* don't know which is which, but they are always set together */
- flip_screen_x_set(machine(), data & 0x01);
- flip_screen_y_set(machine(), data & 0x02);
+ flip_screen_x_set(data & 0x01);
+ flip_screen_y_set(data & 0x02);
- machine().tilemap().set_flip_all((flip_screen_x_get(machine()) ? TILEMAP_FLIPX : 0) | (flip_screen_y_get(machine()) ? TILEMAP_FLIPY : 0));
+ machine().tilemap().set_flip_all((flip_screen_x() ? TILEMAP_FLIPX : 0) | (flip_screen_y() ? TILEMAP_FLIPY : 0));
}
@@ -296,13 +296,13 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx = source[1] & 0x40;
flipy = source[1] & 0x80;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
flipy = !flipy;
else
sy = 240 - sy;
@@ -334,7 +334,7 @@ static void draw_lasso( running_machine &machine, bitmap_ind16 &bitmap, const re
UINT8 x;
UINT8 y = offs >> 5;
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
y = ~y;
if ((y < cliprect.min_y) || (y > cliprect.max_y))
@@ -343,7 +343,7 @@ static void draw_lasso( running_machine &machine, bitmap_ind16 &bitmap, const re
x = (offs & 0x1f) << 3;
data = state->m_bitmap_ram[offs];
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
x = ~x;
for (bit = 0; bit < 8; bit++)
@@ -351,7 +351,7 @@ static void draw_lasso( running_machine &machine, bitmap_ind16 &bitmap, const re
if ((data & 0x80) && (x >= cliprect.min_x) && (x <= cliprect.max_x))
bitmap.pix16(y, x) = pen;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
x = x - 1;
else
x = x + 1;
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index fa818cfbd6e..74381ee6ce7 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -128,7 +128,7 @@ WRITE16_MEMBER(lastduel_state::lastduel_flip_w)
{
if (ACCESSING_BITS_0_7)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
coin_lockout_w(machine(), 0, ~data & 0x10);
coin_lockout_w(machine(), 1, ~data & 0x20);
@@ -245,7 +245,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipy = attr & state->m_sprite_flipy_mask; /* 0x40 for lastduel, 0x80 for madgear */
color = attr & 0x0f;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 496 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index ab9ff8a8a53..ad92b054290 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -117,7 +117,7 @@ WRITE8_MEMBER(liberate_state::deco16_io_w)
m_back_tilemap->mark_all_dirty();
}
m_background_disable = data & 0x4;
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
break;
case 7: /* Background palette resistors? */
/* Todo */
@@ -169,7 +169,7 @@ WRITE8_MEMBER(liberate_state::prosport_io_w)
{
case 0:
//background_disable = ~data & 0x80;
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
m_back_tilemap->mark_all_dirty();
break;
case 2: /* Sound */
@@ -319,7 +319,7 @@ static void liberate_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
if (multi && fy == 0)
sy -= 16;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 240 - sy;
sx = 240 - sx;
@@ -390,7 +390,7 @@ static void prosport_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
// if (multi) sy -= 16;
if ((fy && multi) || (fx && multi)) { code2 = code; code++; }
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 240 - sy;
sx = 240 - sx;
@@ -451,7 +451,7 @@ static void boomrang_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
// if (multi) sy -= 16;
if (fy && multi) { code2 = code; code++; }
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 240 - sy;
sx = 240 - sx;
diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c
index 856cb6fc75c..3619ab1cf98 100644
--- a/src/mame/video/lkage.c
+++ b/src/mame/video/lkage.c
@@ -138,12 +138,12 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
priority_mask = 0xf0;
}
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = 239 - sx - 24;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
sy = 254 - 16 * height - sy;
flipy = !flipy;
@@ -176,8 +176,8 @@ SCREEN_UPDATE_IND16( lkage )
lkage_state *state = screen.machine().driver_data<lkage_state>();
int bank;
- flip_screen_x_set(screen.machine(), ~state->m_vreg[2] & 0x01);
- flip_screen_y_set(screen.machine(), ~state->m_vreg[2] & 0x02);
+ state->flip_screen_x_set(~state->m_vreg[2] & 0x01);
+ state->flip_screen_y_set(~state->m_vreg[2] & 0x02);
bank = state->m_vreg[1] & 0x08;
diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c
index 5b3cf847f72..86fee85888b 100644
--- a/src/mame/video/lsasquad.c
+++ b/src/mame/video/lsasquad.c
@@ -15,7 +15,7 @@ static void draw_layer( running_machine &machine, bitmap_ind16 &bitmap, const re
base = 64 * scrollram[offs + 1];
sx = 8 * (offs / 4) + scrollx;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sx = 248 - sx;
sx &= 0xff;
@@ -25,7 +25,7 @@ static void draw_layer( running_machine &machine, bitmap_ind16 &bitmap, const re
int attr;
sy = 8 * y + scrolly;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sy = 248 - sy;
sy &= 0xff;
@@ -36,13 +36,13 @@ static void draw_layer( running_machine &machine, bitmap_ind16 &bitmap, const re
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
code,
color,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx,sy,15);
if (sx > 248) /* wraparound */
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
code,
color,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx-256,sy,15);
}
}
@@ -102,7 +102,7 @@ static int draw_layer_daikaiju( running_machine &machine, bitmap_ind16 &bitmap,
base = 64 * state->m_scrollram[offs + 1];
sx = scrollx + stepx;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sx = 248 - sx;
sx &= 0xff;
@@ -111,7 +111,7 @@ static int draw_layer_daikaiju( running_machine &machine, bitmap_ind16 &bitmap,
int attr;
sy = 8 * y + scrolly;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sy = 248 - sy;
sy &= 0xff;
@@ -124,13 +124,13 @@ static int draw_layer_daikaiju( running_machine &machine, bitmap_ind16 &bitmap,
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
code,
color,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx,sy,15);
if (sx > 248) /* wraparound */
drawgfx_transpen(bitmap,cliprect,machine.gfx[0],
code,
color,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx-256,sy,15);
}
}
@@ -176,7 +176,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx = attr & 0x40;
flipy = attr & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index b23ff33f3b7..fef6bfb10ef 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -199,7 +199,7 @@ static void lwings_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
flipx = buffered_spriteram[offs + 1] & 0x02;
flipy = buffered_spriteram[offs + 1] & 0x04;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -248,7 +248,7 @@ static void trojan_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
flipy = 1;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index 35c738133ab..b2af6a44507 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -275,7 +275,7 @@ WRITE8_MEMBER(m52_state::m52_bgcontrol_w)
WRITE8_MEMBER(m52_state::m52_flipscreen_w)
{
/* screen flip is handled both by software and hardware */
- flip_screen_set(machine(), (data & 0x01) ^ (~input_port_read(machine(), "DSW2") & 0x01));
+ flip_screen_set((data & 0x01) ^ (~input_port_read(machine(), "DSW2") & 0x01));
coin_counter_w(machine(), 0, data & 0x02);
coin_counter_w(machine(), 1, data & 0x20);
@@ -283,7 +283,7 @@ WRITE8_MEMBER(m52_state::m52_flipscreen_w)
WRITE8_MEMBER(m52_state::alpha1v_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
@@ -299,7 +299,8 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
rectangle rect;
const rectangle &visarea = machine.primary_screen->visible_area();
- if (flip_screen_get(machine))
+ m52_state *state = machine.driver_data<m52_state>();
+ if (state->flip_screen())
{
xpos = 255 - xpos;
ypos = 255 - ypos - BGHEIGHT;
@@ -313,23 +314,23 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
drawgfx_transpen(bitmap, cliprect,
machine.gfx[image],
0, 0,
- flip_screen_get(machine),
- flip_screen_get(machine),
+ state->flip_screen(),
+ state->flip_screen(),
xpos,
ypos, 0);
drawgfx_transpen(bitmap, cliprect,
machine.gfx[image],
0, 0,
- flip_screen_get(machine),
- flip_screen_get(machine),
+ state->flip_screen(),
+ state->flip_screen(),
xpos - 256,
ypos, 0);
rect.min_x = visarea.min_x;
rect.max_x = visarea.max_x;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
rect.min_y = ypos - BGHEIGHT;
rect.max_y = ypos - 1;
@@ -370,7 +371,7 @@ SCREEN_UPDATE_IND16( m52 )
draw_background(screen.machine(), bitmap, cliprect, state->m_bg1xpos, state->m_bg1ypos, 4); /* cityscape */
}
- state->m_bg_tilemap->set_flip(flip_screen_get(screen.machine()) ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ state->m_bg_tilemap->set_flip(state->flip_screen() ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -394,7 +395,7 @@ SCREEN_UPDATE_IND16( m52 )
clip.min_y = 128, clip.max_y = 255;
/* adjust for flipping */
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
int temp = clip.min_y;
clip.min_y = 255 - clip.max_y;
diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c
index 6dd439d7f1f..3339b222ad4 100644
--- a/src/mame/video/m58.c
+++ b/src/mame/video/m58.c
@@ -200,7 +200,7 @@ VIDEO_START( yard )
WRITE8_MEMBER(m58_state::yard_flipscreen_w)
{
/* screen flip is handled both by software and hardware */
- flip_screen_set(machine(), (data & 0x01) ^ (~input_port_read(machine(), "DSW2") & 0x01));
+ flip_screen_set((data & 0x01) ^ (~input_port_read(machine(), "DSW2") & 0x01));
coin_counter_w(machine(), 0, data & 0x02);
coin_counter_w(machine(), 1, data & 0x20);
@@ -245,7 +245,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
code2 = code1 + 0x40;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy2 = 192 - sy1;
@@ -279,16 +279,16 @@ static void draw_panel( running_machine &machine, bitmap_ind16 &bitmap, const re
{
const rectangle clippanel(26*8, 32*8-1, 1*8, 31*8-1);
const rectangle clippanelflip(0*8, 6*8-1, 1*8, 31*8-1);
- rectangle clip = flip_screen_get(machine) ? clippanelflip : clippanel;
+ rectangle clip = state->flip_screen() ? clippanelflip : clippanel;
const rectangle &visarea = machine.primary_screen->visible_area();
- int sx = flip_screen_get(machine) ? cliprect.min_x - 8 : cliprect.max_x + 1 - SCROLL_PANEL_WIDTH;
- int yoffs = flip_screen_get(machine) ? -40 : -16;
+ int sx = state->flip_screen() ? cliprect.min_x - 8 : cliprect.max_x + 1 - SCROLL_PANEL_WIDTH;
+ int yoffs = state->flip_screen() ? -40 : -16;
clip.min_y += visarea.min_y + yoffs;
clip.max_y += visarea.max_y + yoffs;
clip &= cliprect;
- copybitmap(bitmap, *state->m_scroll_panel_bitmap, flip_screen_get(machine), flip_screen_get(machine),
+ copybitmap(bitmap, *state->m_scroll_panel_bitmap, state->flip_screen(), state->flip_screen(),
sx, visarea.min_y + yoffs, clip);
}
}
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 87d87536cfe..17fbd268a2e 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -365,7 +365,7 @@ WRITE16_MEMBER(m72_state::m72_port02_w)
coin_counter_w(machine(), 1,data & 0x02);
/* bit 2 is flip screen (handled both by software and hardware) */
- flip_screen_set(machine(), ((data & 0x04) >> 2) ^ ((~input_port_read(machine(), "DSW") >> 8) & 1));
+ flip_screen_set(((data & 0x04) >> 2) ^ ((~input_port_read(machine(), "DSW") >> 8) & 1));
/* bit 3 is display disable */
m_video_off = data & 0x08;
@@ -391,7 +391,7 @@ WRITE16_MEMBER(m72_state::rtype2_port02_w)
coin_counter_w(machine(), 1,data & 0x02);
/* bit 2 is flip screen (handled both by software and hardware) */
- flip_screen_set(machine(), ((data & 0x04) >> 2) ^ ((~input_port_read(machine(), "DSW") >> 8) & 1));
+ flip_screen_set(((data & 0x04) >> 2) ^ ((~input_port_read(machine(), "DSW") >> 8) & 1));
/* bit 3 is display disable */
m_video_off = data & 0x08;
@@ -442,7 +442,7 @@ static void m72_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,cons
h = 1 << ((spriteram[offs+2] & 0x3000) >> 12);
sy -= 16 * h;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 512 - 16*w - sx;
sy = 284 - 16*h - sy;
@@ -495,7 +495,7 @@ static void majtitle_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
h = 1 << ((spriteram16_2[offs+2] & 0x3000) >> 12);
sy -= 16 * h;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 512 - 16*w - sx;
sy = 256 - 16*h - sy;
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index f635d9ff4ca..9c541ec3480 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -131,7 +131,7 @@ READ16_MEMBER(m92_state::m92_paletteram_r)
WRITE16_MEMBER(m92_state::m92_paletteram_w)
{
- paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset + 0x400 * m_palette_bank, data, mem_mask);
+ paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset + 0x400 * m_palette_bank, data, mem_mask);
}
/*****************************************************************************/
@@ -349,7 +349,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
for (row = 0; row < numrows; row++)
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
pdrawgfx_transpen(bitmap,cliprect,machine.gfx[1],
code + s_ptr, color, !flipx, !flipy,
@@ -424,7 +424,7 @@ static void ppan_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, co
for (row = 0; row < numrows; row++)
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
pdrawgfx_transpen(bitmap,cliprect,machine.gfx[1],
code + s_ptr, color, !flipx, !flipy,
@@ -544,10 +544,11 @@ SCREEN_UPDATE_IND16( m92 )
draw_sprites(screen.machine(), bitmap, cliprect);
/* Flipscreen appears hardwired to the dipswitch - strange */
+ m92_state *state = screen.machine().driver_data<m92_state>();
if (input_port_read(screen.machine(), "DSW") & 0x100)
- flip_screen_set(screen.machine(), 0);
+ state->flip_screen_set(0);
else
- flip_screen_set(screen.machine(), 1);
+ state->flip_screen_set(1);
return 0;
}
@@ -561,9 +562,10 @@ SCREEN_UPDATE_IND16( ppan )
ppan_draw_sprites(screen.machine(), bitmap, cliprect);
/* Flipscreen appears hardwired to the dipswitch - strange */
+ m92_state *state = screen.machine().driver_data<m92_state>();
if (input_port_read(screen.machine(), "DSW") & 0x100)
- flip_screen_set(screen.machine(), 0);
+ state->flip_screen_set(0);
else
- flip_screen_set(screen.machine(), 1);
+ state->flip_screen_set(1);
return 0;
}
diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c
index 7bce4138419..c3bd372c782 100644
--- a/src/mame/video/madmotor.c
+++ b/src/mame/video/madmotor.c
@@ -25,7 +25,7 @@ VIDEO_START( madmotor )
SCREEN_UPDATE_IND16( madmotor )
{
madmotor_state *state = screen.machine().driver_data<madmotor_state>();
- flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
// screen.machine().tilemap().set_flip_all(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c
index 3ba8449228d..89edce4c206 100644
--- a/src/mame/video/mainsnk.c
+++ b/src/mame/video/mainsnk.c
@@ -88,7 +88,7 @@ WRITE8_MEMBER(mainsnk_state::mainsnk_c600_w)
int bank;
int total_elements = machine().gfx[0]->total_elements;
- flip_screen_set(machine(), ~data & 0x80);
+ flip_screen_set(~data & 0x80);
m_bg_tilemap->set_palette_offset((data & 0x07) << 4);
m_tx_tilemap->set_palette_offset((data & 0x07) << 4);
@@ -146,7 +146,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sx = 288-16 - sx;
sy += 8;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 288-16 - sx;
sy = 224-16 - sy;
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index e9dee72f2f1..32640ea724e 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -373,12 +373,12 @@ WRITE8_MEMBER(mappy_state::mappy_videoram_w)
WRITE8_MEMBER(mappy_state::superpac_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
READ8_MEMBER(mappy_state::superpac_flipscreen_r)
{
- flip_screen_set(machine(), 1);
+ flip_screen_set(1);
return 0xff;
}
@@ -398,6 +398,7 @@ WRITE8_MEMBER(mappy_state::mappy_scroll_w)
static void mappy_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram_base)
{
+ mappy_state *state = machine.driver_data<mappy_state>();
UINT8 *spriteram = spriteram_base + 0x780;
UINT8 *spriteram_2 = spriteram + 0x800;
UINT8 *spriteram_3 = spriteram_2 + 0x800;
@@ -430,7 +431,7 @@ static void mappy_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, c
sy -= 16 * sizey;
sy = (sy & 0xff) - 32; // fix wraparound
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
@@ -478,6 +479,7 @@ spriteram_3
static void phozon_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram_base)
{
+ mappy_state *state = machine.driver_data<mappy_state>();
UINT8 *spriteram = spriteram_base + 0x780;
UINT8 *spriteram_2 = spriteram + 0x800;
UINT8 *spriteram_3 = spriteram_2 + 0x800;
@@ -509,7 +511,7 @@ static void phozon_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
sy -= 8 * sizey;
sy = (sy & 0xff) - 32; // fix wraparound
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
@@ -568,7 +570,7 @@ SCREEN_UPDATE_IND16( phozon )
mappy_state *state = screen.machine().driver_data<mappy_state>();
/* flip screen control is embedded in RAM */
- flip_screen_set(screen.machine(), state->m_spriteram[0x1f7f-0x800] & 1);
+ state->flip_screen_set(state->m_spriteram[0x1f7f-0x800] & 1);
state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0);
diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c
index b8291fd5d74..ba41b23c78d 100644
--- a/src/mame/video/markham.c
+++ b/src/mame/video/markham.c
@@ -47,9 +47,9 @@ WRITE8_MEMBER(markham_state::markham_videoram_w)
WRITE8_MEMBER(markham_state::markham_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -83,15 +83,15 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int chr = spriteram[offs + 1];
int col = spriteram[offs + 2];
- int fx = flip_screen_get(machine);
- int fy = flip_screen_get(machine);
+ int fx = state->flip_screen();
+ int fy = state->flip_screen();
int x = spriteram[offs + 3];
int y = spriteram[offs + 0];
int px, py;
col &= 0x3f ;
- if (flip_screen_get(machine) == 0)
+ if (state->flip_screen() == 0)
{
px = x - 2;
py = 240 - y;
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index 8879aed9ce5..31cd1b904b2 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -83,12 +83,12 @@ WRITE8_MEMBER(mermaid_state::mermaid_colorram_w)
WRITE8_MEMBER(mermaid_state::mermaid_flip_screen_x_w)
{
- flip_screen_x_set(machine(), data & 0x01);
+ flip_screen_x_set(data & 0x01);
}
WRITE8_MEMBER(mermaid_state::mermaid_flip_screen_y_w)
{
- flip_screen_y_set(machine(), data & 0x01);
+ flip_screen_y_set(data & 0x01);
}
WRITE8_MEMBER(mermaid_state::mermaid_bg_scroll_w)
@@ -205,19 +205,19 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
code |= state->m_rougien_gfxbank1 * 0x2800;
code |= state->m_rougien_gfxbank2 * 0x2400;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 240 - sy;
}
- drawgfx_transpen(bitmap, (flip_screen_x_get(machine) ? flip_spritevisiblearea : spritevisiblearea),
+ drawgfx_transpen(bitmap, (state->flip_screen_x() ? flip_spritevisiblearea : spritevisiblearea),
machine.gfx[1], code, color, flipx, flipy, sx, sy, 0);
}
}
@@ -291,13 +291,13 @@ SCREEN_VBLANK( mermaid )
code |= state->m_rougien_gfxbank1 * 0x2800;
code |= state->m_rougien_gfxbank2 * 0x2400;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 240 - sy;
@@ -354,13 +354,13 @@ SCREEN_VBLANK( mermaid )
code2 |= state->m_rougien_gfxbank1 * 0x2800;
code2 |= state->m_rougien_gfxbank2 * 0x2400;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx2 = !flipx2;
sx2 = 240 - sx2;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy2 = !flipy2;
sy2 = 240 - sy2;
@@ -394,13 +394,13 @@ SCREEN_VBLANK( mermaid )
code |= state->m_rougien_gfxbank1 * 0x2800;
code |= state->m_rougien_gfxbank2 * 0x2400;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 240 - sy;
@@ -435,13 +435,13 @@ SCREEN_VBLANK( mermaid )
code2 |= state->m_rougien_gfxbank1 * 0x2800;
code2 |= state->m_rougien_gfxbank2 * 0x2400;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx2 = !flipx2;
sx2 = 240 - sx2;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy2 = !flipy2;
sy2 = 240 - sy2;
@@ -475,13 +475,13 @@ SCREEN_VBLANK( mermaid )
code |= state->m_rougien_gfxbank1 * 0x2800;
code |= state->m_rougien_gfxbank2 * 0x2400;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 240 - sy;
@@ -516,13 +516,13 @@ SCREEN_VBLANK( mermaid )
code2 |= state->m_rougien_gfxbank1 * 0x2800;
code2 |= state->m_rougien_gfxbank2 * 0x2400;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx2 = !flipx2;
sx2 = 240 - sx2;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy2 = !flipy2;
sy2 = 240 - sy2;
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c
index 66d3d50aa69..d280335429a 100644
--- a/src/mame/video/metlclsh.c
+++ b/src/mame/video/metlclsh.c
@@ -197,7 +197,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sy = 240 - spriteram[offs + 2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx; flipx = !flipx;
sy = 240 - sy; flipy = !flipy; if (sizey) sy += 16;
@@ -249,7 +249,7 @@ SCREEN_UPDATE_IND16( metlclsh )
if (state->m_scrollx[0] & 0x08) // background (if enabled)
{
/* The background seems to be always flipped along x */
- state->m_bg_tilemap->set_flip((flip_screen_get(screen.machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0) ^ TILEMAP_FLIPX);
+ state->m_bg_tilemap->set_flip((state->flip_screen() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0) ^ TILEMAP_FLIPX);
state->m_bg_tilemap->set_scrollx(0, state->m_scrollx[1] + ((state->m_scrollx[0] & 0x02) << 7) );
state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
}
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index 3157c2cb089..8fa608656ea 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -752,7 +752,7 @@ SCREEN_UPDATE_IND16( metro )
if (screenctrl & 2)
return 0;
- //flip_screen_set(screen.machine(), screenctrl & 1);
+ //state->flip_screen_set(screenctrl & 1);
state->m_flip_screen = screenctrl & 1;
/* If the game supports 16x16 tiles, make sure that the
diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c
index 87af164a16a..bb85a9dc30f 100644
--- a/src/mame/video/mikie.c
+++ b/src/mame/video/mikie.c
@@ -113,9 +113,9 @@ WRITE8_MEMBER(mikie_state::mikie_palettebank_w)
WRITE8_MEMBER(mikie_state::mikie_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -158,7 +158,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int flipx = ~spriteram[offs] & 0x10;
int flipy = spriteram[offs] & 0x20;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 242 - sy;
flipy = !flipy;
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index 3f95b24319a..43db2e5edf9 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -252,9 +252,9 @@ WRITE8_MEMBER(mitchell_state::pang_paletteram_w)
{
if (m_paletteram_bank)
- paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset + 0x800, data);
+ paletteram_xxxxRRRRGGGGBBBB_byte_le_w(space, offset + 0x800, data);
else
- paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset, data);
+ paletteram_xxxxRRRRGGGGBBBB_byte_le_w(space, offset, data);
}
READ8_MEMBER(mitchell_state::pang_paletteram_r)
@@ -268,7 +268,7 @@ READ8_MEMBER(mitchell_state::pang_paletteram_r)
WRITE8_MEMBER(mitchell_state::mgakuen_paletteram_w)
{
- paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset, data);
+ paletteram_xxxxRRRRGGGGBBBB_byte_le_w(space, offset, data);
}
READ8_MEMBER(mitchell_state::mgakuen_paletteram_r)
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index 5a432e16713..74128e8bf61 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -57,7 +57,7 @@ WRITE8_MEMBER(mjkjidai_state::mjkjidai_ctrl_w)
m_nmi_mask = data & 1;
/* bit 1 = flip screen */
- flip_screen_set(machine(), data & 0x02);
+ flip_screen_set(data & 0x02);
/* bit 2 =display enable */
m_display_enable = data & 0x04;
@@ -106,7 +106,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
sx += (spriteram_2[offs] & 0x20) >> 5; // not sure about this
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 496 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c
index 51b2fdf257b..e389388fafe 100644
--- a/src/mame/video/mouser.c
+++ b/src/mame/video/mouser.c
@@ -46,12 +46,12 @@ PALETTE_INIT( mouser )
WRITE8_MEMBER(mouser_state::mouser_flip_screen_x_w)
{
- flip_screen_x_set(machine(), ~data & 1);
+ flip_screen_x_set(~data & 1);
}
WRITE8_MEMBER(mouser_state::mouser_flip_screen_y_w)
{
- flip_screen_y_set(machine(), ~data & 1);
+ flip_screen_y_set(~data & 1);
}
SCREEN_UPDATE_IND16( mouser )
@@ -71,12 +71,12 @@ SCREEN_UPDATE_IND16( mouser )
sx = offs % 32;
sy = offs / 32;
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
sx = 31 - sx;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
sy = 31 - sy;
}
@@ -93,7 +93,7 @@ SCREEN_UPDATE_IND16( mouser )
drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
state->m_videoram[offs] | (state->m_colorram[color_offs] >> 5) * 256 | ((state->m_colorram[color_offs] >> 4) & 1) * 512,
state->m_colorram[color_offs]%16,
- flip_screen_x_get(screen.machine()),flip_screen_y_get(screen.machine()),
+ state->flip_screen_x(),state->flip_screen_y(),
8*sx,scrolled_y_position);
}
@@ -108,13 +108,13 @@ SCREEN_UPDATE_IND16( mouser )
flipx = BIT(spriteram[offs], 6);
flipy = BIT(spriteram[offs], 7);
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 238 - sy;
@@ -137,13 +137,13 @@ SCREEN_UPDATE_IND16( mouser )
flipx = BIT(spriteram[offs], 6);
flipy = BIT(spriteram[offs], 7);
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
{
flipy = !flipy;
sy = 238 - sy;
diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c
index 21db07ef9b8..ced313e02c8 100644
--- a/src/mame/video/mrjong.c
+++ b/src/mame/video/mrjong.c
@@ -82,9 +82,9 @@ WRITE8_MEMBER(mrjong_state::mrjong_colorram_w)
WRITE8_MEMBER(mrjong_state::mrjong_flipscreen_w)
{
- if (flip_screen_get(machine()) != BIT(data, 2))
+ if (flip_screen() != BIT(data, 2))
{
- flip_screen_set(machine(), BIT(data, 2));
+ flip_screen_set(BIT(data, 2));
machine().tilemap().mark_all_dirty();
}
}
@@ -127,7 +127,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sx = 224 - state->m_videoram[offs + 2];
sy = state->m_videoram[offs + 0];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 208 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c
index ba6af16369f..e54fc8a3f2d 100644
--- a/src/mame/video/mustache.c
+++ b/src/mame/video/mustache.c
@@ -52,9 +52,9 @@ WRITE8_MEMBER(mustache_state::mustache_videoram_w)
WRITE8_MEMBER(mustache_state::mustache_video_control_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
@@ -121,12 +121,12 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if ((state->m_control_byte & 0xa))
clip.max_y = visarea.max_y;
else
- if (flip_screen_get(machine))
+ if (state->flip_screen())
clip.min_y = visarea.min_y + 56;
else
clip.max_y = visarea.max_y - 56;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -135,7 +135,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
drawgfx_transpen(bitmap,clip,gfx,
code,
color,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx,sy,0);
}
}
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index 67491ad8556..f4446f483c1 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -13,7 +13,7 @@ WRITE8_MEMBER(n8080_state::n8080_video_control_w)
m_sheriff_color_mode = (data >> 3) & 3;
m_sheriff_color_data = (data >> 0) & 7;
- flip_screen_set_no_update(machine(), data & 0x20);
+ flip_screen_set_no_update(data & 0x20);
}
@@ -75,7 +75,7 @@ static void helifire_next_line( running_machine &machine )
}
else
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
state->m_helifire_mv %= 255;
else
state->m_helifire_mv %= 257;
@@ -94,7 +94,7 @@ VIDEO_START( spacefev )
state->m_cannon_timer = machine.scheduler().timer_alloc(FUNC(spacefev_stop_red_cannon));
- flip_screen_set_no_update(machine, 0);
+ state->flip_screen_set_no_update(0);
state->save_item(NAME(state->m_spacefev_red_screen));
state->save_item(NAME(state->m_spacefev_red_cannon));
@@ -105,7 +105,7 @@ VIDEO_START( sheriff )
{
n8080_state *state = machine.driver_data<n8080_state>();
- flip_screen_set_no_update(machine, 0);
+ state->flip_screen_set_no_update(0);
state->save_item(NAME(state->m_sheriff_color_mode));
state->save_item(NAME(state->m_sheriff_color_data));
@@ -134,14 +134,14 @@ VIDEO_START( helifire )
state->m_helifire_LSFR[i] = data;
}
- flip_screen_set_no_update(machine, 0);
+ state->flip_screen_set_no_update(0);
}
SCREEN_UPDATE_IND16( spacefev )
{
n8080_state *state = screen.machine().driver_data<n8080_state>();
- UINT8 mask = flip_screen_get(screen.machine()) ? 0xff : 0x00;
+ UINT8 mask = state->flip_screen() ? 0xff : 0x00;
int x;
int y;
@@ -211,7 +211,7 @@ SCREEN_UPDATE_IND16( spacefev )
SCREEN_UPDATE_IND16( sheriff )
{
n8080_state *state = screen.machine().driver_data<n8080_state>();
- UINT8 mask = flip_screen_get(screen.machine()) ? 0xff : 0x00;
+ UINT8 mask = state->flip_screen() ? 0xff : 0x00;
const UINT8* pPROM = screen.machine().region("proms")->base();
@@ -323,7 +323,7 @@ SCREEN_UPDATE_IND16( helifire )
for (n = 0; n < 8; n++)
{
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
if ((state->m_videoram[offset ^ 0x1fff] << n) & 0x80)
{
diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c
index c838fd93a66..0bcd53cd330 100644
--- a/src/mame/video/namcos1.c
+++ b/src/mame/video/namcos1.c
@@ -334,7 +334,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sx += sprite_xoffs;
sy -= sprite_yoffs;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = -sx - sizex;
sy = -sy - sizey;
@@ -377,9 +377,9 @@ SCREEN_UPDATE_IND16( namcos1 )
rectangle new_clip = cliprect;
/* flip screen is embedded in the sprite control registers */
- /* can't use flip_screen_set(screen.machine(), ) because the visible area is asymmetrical */
- flip_screen_set_no_update(screen.machine(), state->m_spriteram[0x0ff6] & 1);
- screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ /* can't use state->flip_screen_set() because the visible area is asymmetrical */
+ state->flip_screen_set_no_update(state->m_spriteram[0x0ff6] & 1);
+ screen.machine().tilemap().set_flip_all(state->flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* background color */
@@ -411,7 +411,7 @@ SCREEN_UPDATE_IND16( namcos1 )
scrollx = ( state->m_playfield_control[j+1] + (state->m_playfield_control[j+0]<<8) ) - disp_x[i];
scrolly = ( state->m_playfield_control[j+3] + (state->m_playfield_control[j+2]<<8) ) + 8;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
scrollx = -scrollx;
scrolly = -scrolly;
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index 1f64c6268a9..ea698f08da7 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -312,7 +312,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sx += sprite_xoffs;
sy -= sprite_yoffs;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = -sx - sizex;
sy = -sy - sizey;
@@ -344,7 +344,7 @@ static void set_scroll(running_machine &machine, int layer)
scrollx = state->m_xscroll[layer] - xdisp[layer];
scrolly = state->m_yscroll[layer] + 9;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
scrollx = -scrollx;
scrolly = -scrolly;
@@ -360,9 +360,9 @@ SCREEN_UPDATE_IND16( namcos86 )
int layer;
/* flip screen is embedded in the sprite control registers */
- /* can't use flip_screen_set(screen.machine(), ) because the visible area is asymmetrical */
- flip_screen_set_no_update(screen.machine(), state->m_spriteram[0x07f6] & 1);
- screen.machine().tilemap().set_flip_all(flip_screen_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ /* can't use state->flip_screen_set() because the visible area is asymmetrical */
+ state->flip_screen_set_no_update(state->m_spriteram[0x07f6] & 1);
+ screen.machine().tilemap().set_flip_all(state->flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
set_scroll(screen.machine(), 0);
set_scroll(screen.machine(), 1);
set_scroll(screen.machine(), 2);
diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c
index 6542a7ebbce..d82f0f68516 100644
--- a/src/mame/video/ninjakd2.c
+++ b/src/mame/video/ninjakd2.c
@@ -376,7 +376,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap)
// Ninja Kid II doesn't use the 'big' feature so it might not be available on the board
int const big = (sprptr[2] & 0x04) >> 2;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - 16*big - sx;
sy = 240 - 16*big - sy;
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index 3962f6aa238..011bbd2a5c2 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -366,7 +366,7 @@ WRITE16_MEMBER(nmk16_state::manybloc_scroll_w)
WRITE16_MEMBER(nmk16_state::nmk_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
WRITE16_MEMBER(nmk16_state::nmk_tilebank_w)
@@ -426,7 +426,7 @@ static inline void nmk16_draw_sprite(nmk16_state *state, running_machine &machin
if(pri != priority)
return;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 368 - sx;
sy = 240 - sy;
@@ -443,7 +443,7 @@ static inline void nmk16_draw_sprite(nmk16_state *state, running_machine &machin
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code,
color,
- flip_screen_get(machine), flip_screen_get(machine),
+ state->flip_screen(), state->flip_screen(),
((x + 16) & 0x1FF) - 16,sy & 0x1FF,15);
code++;
x += delta;
@@ -474,10 +474,10 @@ static inline void nmk16_draw_sprite_flipsupported(nmk16_state *state, running_m
if(pri != priority)
return;
- flipx ^= flip_screen_get(machine);
- flipy ^= flip_screen_get(machine);
+ flipx ^= state->flip_screen();
+ flipy ^= state->flip_screen();
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 368 - sx;
sy = 240 - sy;
@@ -979,8 +979,8 @@ static void video_update(running_machine &machine, bitmap_ind16 &bitmap, const r
if (dsw_flipscreen)
{
- flip_screen_x_set(machine, ~input_port_read(machine, "DSW1") & 0x0100);
- flip_screen_y_set(machine, ~input_port_read(machine, "DSW1") & 0x0200);
+ state->flip_screen_x_set(~input_port_read(machine, "DSW1") & 0x0100);
+ state->flip_screen_y_set(~input_port_read(machine, "DSW1") & 0x0200);
}
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c
index 5939aad155d..16977c41640 100644
--- a/src/mame/video/nova2001.c
+++ b/src/mame/video/nova2001.c
@@ -51,18 +51,18 @@ WRITE8_MEMBER(nova2001_state::ninjakun_paletteram_w)
{
int i;
- paletteram_BBGGRRII_w(space,offset,data);
+ paletteram_BBGGRRII_byte_w(space,offset,data);
// expand the sprite palette to full length
if (offset < 16)
{
- paletteram_BBGGRRII_w(space, 0x200 + offset * 16 + 1, data);
+ paletteram_BBGGRRII_byte_w(space, 0x200 + offset * 16 + 1, data);
if (offset != 1)
{
for (i = 0; i < 16; i++)
{
- paletteram_BBGGRRII_w(space, 0x200 + offset + i * 16, data);
+ paletteram_BBGGRRII_byte_w(space, 0x200 + offset + i * 16, data);
}
}
}
@@ -248,12 +248,12 @@ WRITE8_MEMBER(nova2001_state::nova2001_scroll_y_w)
WRITE8_MEMBER(nova2001_state::nova2001_flipscreen_w)
{
// inverted
- flip_screen_set(machine(), ~data & 1);
+ flip_screen_set(~data & 1);
}
WRITE8_MEMBER(nova2001_state::pkunwar_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
@@ -286,7 +286,7 @@ static void nova2001_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
continue;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -324,7 +324,7 @@ static void pkunwar_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
continue;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c
index 9efea4acd95..c56c29fe62b 100644
--- a/src/mame/video/nycaptor.c
+++ b/src/mame/video/nycaptor.c
@@ -107,9 +107,9 @@ WRITE8_MEMBER(nycaptor_state::nycaptor_palette_w)
return;
if (offset & 0x100)
- paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
else
- paletteram_xxxxBBBBGGGGRRRR_split1_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
+ paletteram_xxxxBBBBGGGGRRRR_byte_split_lo_w(space, (offset & 0xff) + (m_palette_bank << 8), data);
}
READ8_MEMBER(nycaptor_state::nycaptor_palette_r)
diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c
index 807cf5b82ca..f5e15e25031 100644
--- a/src/mame/video/othldrby.c
+++ b/src/mame/video/othldrby.c
@@ -153,7 +153,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
sizex = (state->m_buf_spriteram[offs + 2] & 0x000f) + 1;
sizey = (state->m_buf_spriteram[offs + 3] & 0x000f) + 1;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
@@ -180,11 +180,11 @@ SCREEN_UPDATE_IND16( othldrby )
othldrby_state *state = screen.machine().driver_data<othldrby_state>();
int layer;
- flip_screen_set(screen.machine(), state->m_vreg[0x0f] & 0x80);
+ state->flip_screen_set(state->m_vreg[0x0f] & 0x80);
for (layer = 0; layer < 3; layer++)
{
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
state->m_bg_tilemap[layer]->set_scrollx(0, state->m_vreg[2 * layer] + 59);
state->m_bg_tilemap[layer]->set_scrolly(0, state->m_vreg[2 * layer + 1] + 248);
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index a28a98e80b7..fa62658c87d 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -303,7 +303,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sprite &= ~sizex;
sprite &= ~(sizey << 1);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
@@ -374,8 +374,8 @@ SCREEN_UPDATE_IND16( pacland )
int row;
for (row = 5; row < 29; row++)
- state->m_fg_tilemap->set_scrollx(row, flip_screen_get(screen.machine()) ? state->m_scroll0-7 : state->m_scroll0);
- state->m_bg_tilemap->set_scrollx(0, flip_screen_get(screen.machine()) ? state->m_scroll1-4 : state->m_scroll1-3);
+ state->m_fg_tilemap->set_scrollx(row, state->flip_screen() ? state->m_scroll0-7 : state->m_scroll0);
+ state->m_bg_tilemap->set_scrollx(0, state->flip_screen() ? state->m_scroll1-4 : state->m_scroll1-3);
/* draw high priority sprite pixels, setting priority bitmap to non-zero
wherever there is a high-priority pixel; note that we draw to the bitmap
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index 936796302fc..d5420d29ea4 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -30,12 +30,12 @@ Note: if MAME_DEBUG is defined, pressing Z with:
WRITE8_MEMBER(paradise_state::paradise_flipscreen_w)
{
- flip_screen_set(machine(), data ? 0 : 1);
+ flip_screen_set(data ? 0 : 1);
}
WRITE8_MEMBER(paradise_state::tgtball_flipscreen_w)
{
- flip_screen_set(machine(), data ? 1 : 0);
+ flip_screen_set(data ? 1 : 0);
}
/* Note: Penky updates pixel palette bank register BEFORE actually writing to the paletteram. */
@@ -200,7 +200,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipx = 0; // ?
int flipy = 0;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = 0xf0 - x; flipx = !flipx;
y = 0xf0 - y; flipy = !flipy;
@@ -263,7 +263,7 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
if (layers_ctrl & 1) state->m_tilemap_0->draw(bitmap, cliprect, 0, 0);
if (layers_ctrl & 2) state->m_tilemap_1->draw(bitmap, cliprect, 0, 0);
- if (layers_ctrl & 4) copybitmap_trans(bitmap, state->m_tmpbitmap, flip_screen_get(screen.machine()), flip_screen_get(screen.machine()), 0, 0, cliprect, 0x80f);
+ if (layers_ctrl & 4) copybitmap_trans(bitmap, state->m_tmpbitmap, state->flip_screen(), state->flip_screen(), 0, 0, cliprect, 0x80f);
if (state->m_priority & 2)
{
diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c
index 35e7ace334c..994a71dfe4b 100644
--- a/src/mame/video/pbaction.c
+++ b/src/mame/video/pbaction.c
@@ -36,7 +36,7 @@ WRITE8_MEMBER(pbaction_state::pbaction_colorram2_w)
WRITE8_MEMBER(pbaction_state::pbaction_scroll_w)
{
m_scroll = data - 3;
- if (flip_screen_get(machine()))
+ if (flip_screen())
m_scroll = -m_scroll;
m_bg_tilemap->set_scrollx(0, m_scroll);
@@ -45,7 +45,7 @@ WRITE8_MEMBER(pbaction_state::pbaction_scroll_w)
WRITE8_MEMBER(pbaction_state::pbaction_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -103,7 +103,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx = spriteram[offs + 1] & 0x40;
flipy = spriteram[offs + 1] & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
if (spriteram[offs] & 0x80)
{
@@ -123,7 +123,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
spriteram[offs],
spriteram[offs + 1] & 0x0f,
flipx,flipy,
- sx + (flip_screen_get(machine) ? state->m_scroll : -state->m_scroll), sy,0);
+ sx + (state->flip_screen() ? state->m_scroll : -state->m_scroll), sy,0);
}
}
diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c
index 053ecb6960c..12e7e145686 100644
--- a/src/mame/video/pcktgal.c
+++ b/src/mame/video/pcktgal.c
@@ -48,7 +48,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
flipx = spriteram[offs+1] & 0x04;
flipy = spriteram[offs+1] & 0x02;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
sx=240-sx;
sy=240-sy;
if (flipx) flipx=0; else flipx=1;
@@ -66,7 +66,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
SCREEN_UPDATE_IND16( pcktgal )
{
-// flip_screen_set(screen.machine(), screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+// state->flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
draw_sprites(screen.machine(), bitmap, cliprect);
return 0;
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index 43c0fdee6cb..ebdc1a8bc98 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -190,12 +190,12 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
flipy = (spriteram[offs+1]&0x80)>>7;
flipx = (spriteram[offs+1]&0x40)>>6;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = 256 - sx;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
sy = 240 - sy;
flipy = !flipy;
@@ -245,10 +245,10 @@ SCREEN_UPDATE_IND16( pitnrun )
dx=128-state->m_h_heed+((state->m_ha&8)<<5)+3;
dy=128-state->m_v_heed+((state->m_ha&0x10)<<4);
- if (flip_screen_x_get(screen.machine()))
+ if (state->flip_screen_x())
dx=128-dx+16;
- if (flip_screen_y_get(screen.machine()))
+ if (state->flip_screen_y())
dy=128-dy;
myclip.set(dx, dx+127, dy, dy+127);
@@ -260,7 +260,7 @@ SCREEN_UPDATE_IND16( pitnrun )
draw_sprites(screen.machine(),bitmap,myclip);
if(state->m_ha&4)
- copybitmap_trans(bitmap,*state->m_tmp_bitmap[state->m_ha&3],flip_screen_x_get(screen.machine()),flip_screen_y_get(screen.machine()),dx,dy,myclip, 1);
+ copybitmap_trans(bitmap,*state->m_tmp_bitmap[state->m_ha&3],state->flip_screen_x(),state->flip_screen_y(),dx,dy,myclip, 1);
state->m_fg->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c
index 1ea3b25c411..ad2a80ff1c8 100644
--- a/src/mame/video/pktgaldx.c
+++ b/src/mame/video/pktgaldx.c
@@ -10,7 +10,7 @@ SCREEN_UPDATE_IND16( pktgaldx )
pktgaldx_state *state = screen.machine().driver_data<pktgaldx_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
bitmap.fill(0, cliprect); /* not Confirmed */
diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c
index 11df21fd958..2b0e56c0fdb 100644
--- a/src/mame/video/pokechmp.c
+++ b/src/mame/video/pokechmp.c
@@ -13,9 +13,9 @@ WRITE8_MEMBER(pokechmp_state::pokechmp_videoram_w)
WRITE8_MEMBER(pokechmp_state::pokechmp_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x80))
+ if (flip_screen() != (data & 0x80))
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
machine().tilemap().mark_all_dirty();
}
}
@@ -55,7 +55,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
flipx = spriteram[offs+1] & 0x04;
flipy = spriteram[offs+1] & 0x02;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
sx=240-sx;
sy=240-sy;
if (flipx) flipx=0; else flipx=1;
diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c
index b720ed1adc2..c7dc23f3195 100644
--- a/src/mame/video/pooyan.c
+++ b/src/mame/video/pooyan.c
@@ -144,7 +144,7 @@ WRITE8_MEMBER(pooyan_state::pooyan_colorram_w)
WRITE8_MEMBER(pooyan_state::pooyan_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
}
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 6ad244f462a..b6f6053b41e 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -191,7 +191,7 @@ WRITE8_MEMBER(popeye_state::popeye_bitmap_w)
sx = 8 * (offset % 128);
sy = 8 * (offset / 128);
- if (flip_screen_get(machine()))
+ if (flip_screen())
sy = 512-8 - sy;
colour = data & 0x0f;
@@ -208,7 +208,7 @@ WRITE8_MEMBER(popeye_state::popeye_bitmap_w)
sx = 8 * (offset % 64);
sy = 4 * (offset / 64);
- if (flip_screen_get(machine()))
+ if (flip_screen())
sy = 512-4 - sy;
colour = data & 0x0f;
@@ -282,12 +282,12 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
int offs;
address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
- if (state->m_lastflip != flip_screen_get(machine))
+ if (state->m_lastflip != state->flip_screen())
{
for (offs = 0;offs < popeye_bitmapram_size;offs++)
state->popeye_bitmap_w(*space,offs,state->m_bitmapram[offs]);
- state->m_lastflip = flip_screen_get(machine);
+ state->m_lastflip = state->flip_screen();
}
set_background_palette(machine, (*state->m_palettebank & 0x08) >> 3);
@@ -303,7 +303,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
if (state->m_bitmap_type == TYPE_SKYSKIPR)
scrollx = 2*scrollx - 512;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
if (state->m_bitmap_type == TYPE_POPEYE)
scrollx = -scrollx;
@@ -351,7 +351,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sx = 2*(spriteram[offs])-8;
sy = 2*(256-spriteram[offs + 1]);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index 2083f36feca..5f69cdba7aa 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -50,7 +50,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
WRITE16_MEMBER(powerins_state::powerins_flipscreen_w)
{
- if (ACCESSING_BITS_0_7) flip_screen_set(machine(), data & 1 );
+ if (ACCESSING_BITS_0_7) flip_screen_set(data & 1 );
}
WRITE16_MEMBER(powerins_state::powerins_tilebank_w)
@@ -293,7 +293,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
/* Handle flip_screen. Apply a global offset of 32 pixels along x too */
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = screen_w - sx - dimx*16 - 32; flipx = !flipx;
sy = screen_h - sy - dimy*16; flipy = !flipy;
diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c
index b4d8e142b63..357a294afbe 100644
--- a/src/mame/video/prehisle.c
+++ b/src/mame/video/prehisle.c
@@ -53,7 +53,7 @@ WRITE16_MEMBER(prehisle_state::prehisle_control16_w)
case 0x23: m_invert_controls = data ? 0x00ff : 0x0000; break;
case 0x28: coin_counter_w(machine(), 0, data & 1); break;
case 0x29: coin_counter_w(machine(), 1, data & 1); break;
- case 0x30: flip_screen_set(machine(), data & 0x01); break;
+ case 0x30: flip_screen_set(data & 0x01); break;
}
}
@@ -145,7 +145,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if (sx&0x100) sx=-0x100+(sx&0xff);
if (sy&0x100) sy=-0x100+(sy&0xff);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index 51363999fb4..a5fb2a7e597 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -332,7 +332,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
zoomx = 32 - zoomx;
zoomy = 32 - zoomy;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = width - x - (nx * zoomx) / 2;
y = height - y - (ny * zoomy) / 2;
@@ -453,7 +453,7 @@ static void draw_sprites_bootleg( running_machine &machine, bitmap_ind16 &bitmap
zoomy = 32 - zoomy;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = width - x - (nx * zoomx) / 2;
y = height - y - (ny * zoomy) / 2;
@@ -533,7 +533,7 @@ SCREEN_UPDATE_IND16( psikyo )
tilemap_t *tmptilemap0, *tmptilemap1;
- flip_screen_set(screen.machine(), ~input_port_read(screen.machine(), "DSW") & 0x00010000); // hardwired to a DSW bit
+ state->flip_screen_set(~input_port_read(screen.machine(), "DSW") & 0x00010000); // hardwired to a DSW bit
/* Layers enable (not quite right) */
@@ -707,7 +707,7 @@ SCREEN_UPDATE_IND16( psikyo_bootleg )
tilemap_t *tmptilemap0, *tmptilemap1;
- flip_screen_set(screen.machine(), ~input_port_read(screen.machine(), "DSW") & 0x00010000); // hardwired to a DSW bit
+ state->flip_screen_set(~input_port_read(screen.machine(), "DSW") & 0x00010000); // hardwired to a DSW bit
/* Layers enable (not quite right) */
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index 4f46e4f6859..eaad88586f9 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -325,7 +325,7 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
if (attr & 0x01) sx -= 256;
if (attr & 0x04) sy -= 256;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 224 - sx;
sy = 224 - sy;
@@ -350,7 +350,7 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
}
else
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
DRAW_SPRITE(code, sx + 16, sy + 16)
else
DRAW_SPRITE(code, sx, sy)
@@ -408,7 +408,7 @@ static void draw_background(running_machine &machine, bitmap_rgb32 &bitmap, cons
case 11: case 13: clip.max_x = state->m_sx1; break;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
clip.set(255 - clip.max_x, 255 - clip.min_x, 255 - clip.max_y, 255 - clip.min_y);
}
diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c
index cb1b996e14d..5ed997b2f23 100644
--- a/src/mame/video/pushman.c
+++ b/src/mame/video/pushman.c
@@ -105,7 +105,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
flipx = spriteram[offs + 1] & 2;
flipy = spriteram[offs + 1] & 1; /* flip y untested */
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = 240 - x;
y = 240 - y;
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index f9bf8103e6b..2cf54ee0eea 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -112,7 +112,7 @@ WRITE8_MEMBER(quizdna_state::quizdna_screen_ctrl_w)
m_flipscreen = tmp;
- flip_screen_set(machine(), tmp);
+ flip_screen_set(tmp);
m_fg_tilemap->set_scrolldx(64, -64 +16);
}
diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c
index 39c2e5eaa47..684f5ac0bc1 100644
--- a/src/mame/video/rallyx.c
+++ b/src/mame/video/rallyx.c
@@ -447,10 +447,11 @@ static void plot_star( running_machine &machine, bitmap_ind16 &bitmap, const rec
if (!cliprect.contains(x, y))
return;
- if (flip_screen_x_get(machine))
+ rallyx_state *state = machine.driver_data<rallyx_state>();
+ if (state->flip_screen_x())
x = 255 - x;
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
y = 255 - y;
if (colortable_entry_get_value(machine.colortable, bitmap.pix16(y, x) % 0x144) == 0)
@@ -487,7 +488,7 @@ static void rallyx_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
int color = spriteram_2[offs + 1] & 0x3f;
int flipx = spriteram[offs] & 1;
int flipy = spriteram[offs] & 2;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
sx -= 2 * displacement;
pdrawgfx_transmask(bitmap,cliprect,machine.gfx[1],
@@ -535,7 +536,7 @@ static void rallyx_draw_bullets( running_machine &machine, bitmap_ind16 &bitmap,
x = state->m_radarx[offs] + ((~state->m_radarattr[offs & 0x0f] & 0x01) << 8);
y = 253 - state->m_radary[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
x -= 3;
if (transpen)
@@ -630,7 +631,7 @@ SCREEN_UPDATE_IND16( rallyx )
rectangle fg_clip = cliprect;
rectangle bg_clip = cliprect;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
bg_clip.min_x = 8 * 8;
fg_clip.max_x = 8 * 8 - 1;
@@ -664,7 +665,7 @@ SCREEN_UPDATE_IND16( jungler )
rectangle fg_clip = cliprect;
rectangle bg_clip = cliprect;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
bg_clip.min_x = 8 * 8;
fg_clip.max_x = 8 * 8 - 1;
@@ -702,7 +703,7 @@ SCREEN_UPDATE_IND16( locomotn )
rectangle fg_clip = cliprect;
rectangle bg_clip = cliprect;
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
/* handle reduced visible area in some games */
if (screen.visible_area().max_x == 32 * 8 - 1)
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index a8a503ef4fc..531f0f09496 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -30,7 +30,7 @@ WRITE16_MEMBER(realbrk_state::realbrk_flipscreen_w)
coin_counter_w(machine(), 0, data & 0x0001);
coin_counter_w(machine(), 1, data & 0x0004);
- flip_screen_set(machine(), data & 0x0080);
+ flip_screen_set( data & 0x0080);
}
if (ACCESSING_BITS_8_15)
@@ -256,8 +256,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
xdim = ((zoom & 0x00ff) >> 0) << (16-6+4);
ydim = ((zoom & 0xff00) >> 8) << (16-6+4);
- if (flip_screen_x_get(machine)) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
- if (flip_screen_y_get(machine)) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
+ if (state->flip_screen_x()) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
+ if (state->flip_screen_y()) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
if (flipx) { xstart = xnum-1; xend = -1; xinc = -1; }
else { xstart = 0; xend = xnum; xinc = +1; }
@@ -418,8 +418,8 @@ static void dai2kaku_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
xdim = ((zoom & 0x00ff) >> 0) << (16-6+4);
ydim = ((zoom & 0xff00) >> 8) << (16-6+4);
- if (flip_screen_x_get(machine)) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
- if (flip_screen_y_get(machine)) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
+ if (state->flip_screen_x()) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
+ if (state->flip_screen_y()) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
if (flipx) { xstart = xnum-1; xend = -1; xinc = -1; }
else { xstart = 0; xend = xnum; xinc = +1; }
diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c
index 2adc987435b..e9e98e88f4b 100644
--- a/src/mame/video/redclash.c
+++ b/src/mame/video/redclash.c
@@ -120,7 +120,8 @@ WRITE8_HANDLER( redclash_gfxbank_w )
WRITE8_HANDLER( redclash_flipscreen_w )
{
- flip_screen_set(space->machine(), data & 0x01);
+ ladybug_state *state = space->machine().driver_data<ladybug_state>();
+ state->flip_screen_set(data & 0x01);
}
void redclash_set_stars_enable( running_machine &machine, UINT8 on ); //temp
@@ -278,7 +279,7 @@ static void draw_bullets( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = 8 * offs + (state->m_videoram[offs] & 0x07); /* ?? */
int sy = 0xff - state->m_videoram[offs + 0x20];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
}
diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c
index 59ad4fcd76b..4e8222c0e7a 100644
--- a/src/mame/video/renegade.c
+++ b/src/mame/video/renegade.c
@@ -25,7 +25,7 @@ WRITE8_MEMBER(renegade_state::renegade_videoram2_w)
WRITE8_MEMBER(renegade_state::renegade_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
}
WRITE8_MEMBER(renegade_state::renegade_scroll0_w)
@@ -97,7 +97,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if (sx > 248)
sx -= 256;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -110,17 +110,17 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
drawgfx_transpen(bitmap, cliprect, machine.gfx[sprite_bank],
sprite_number + 1,
color,
- xflip, flip_screen_get(machine),
- sx, sy + (flip_screen_get(machine) ? -16 : 16), 0);
+ xflip, state->flip_screen(),
+ sx, sy + (state->flip_screen() ? -16 : 16), 0);
}
else
{
- sy += (flip_screen_get(machine) ? -16 : 16);
+ sy += (state->flip_screen() ? -16 : 16);
}
drawgfx_transpen(bitmap, cliprect, machine.gfx[sprite_bank],
sprite_number,
color,
- xflip, flip_screen_get(machine),
+ xflip, state->flip_screen(),
sx, sy, 0);
}
source += 4;
diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c
index 0dde390e6be..c57cf33ec9d 100644
--- a/src/mame/video/retofinv.c
+++ b/src/mame/video/retofinv.c
@@ -137,7 +137,7 @@ WRITE8_MEMBER(retofinv_state::retofinv_gfx_ctrl_w)
switch (offset)
{
case 0:
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
break;
case 1:
@@ -196,7 +196,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap)
sprite &= ~sizex;
sprite &= ~(sizey << 1);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c
index 2c02d44abad..a6a56fccbbf 100644
--- a/src/mame/video/rocnrope.c
+++ b/src/mame/video/rocnrope.c
@@ -96,9 +96,9 @@ WRITE8_MEMBER(rocnrope_state::rocnrope_colorram_w)
WRITE8_MEMBER(rocnrope_state::rocnrope_flipscreen_w)
{
- if (flip_screen_get(machine()) != (~data & 0x01))
+ if (flip_screen() != (~data & 0x01))
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c
index 2fedc274594..09391d06cdc 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -68,7 +68,7 @@ SCREEN_UPDATE_IND16( rohga )
UINT16 priority = decocomn_priority_r(state->m_decocomn, 0, 0xffff);
/* Update playfields */
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
@@ -175,7 +175,7 @@ SCREEN_UPDATE_RGB32( wizdfire )
screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, state->m_spriteram->buffer(), 0x400, true);
/* Update playfields */
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, 0, 0);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
@@ -212,7 +212,7 @@ SCREEN_UPDATE_RGB32( nitrobal )
screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, state->m_spriteram->buffer(), 0x400, false);
/* Update playfields */
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll);
diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c
index 34f606fb9c5..5358ba26516 100644
--- a/src/mame/video/sauro.c
+++ b/src/mame/video/sauro.c
@@ -79,7 +79,7 @@ WRITE8_MEMBER(sauro_state::sauro_palette_bank_w)
WRITE8_MEMBER(sauro_state::sauro_scroll_fg_w)
{
- const int *map = (flip_screen_get(machine()) ? scroll2_map_flip : scroll2_map);
+ const int *map = (flip_screen() ? scroll2_map_flip : scroll2_map);
int scroll = (data & 0xf8) | map[data & 7];
m_fg_tilemap->set_scrollx(0, scroll);
@@ -104,7 +104,7 @@ static void sauro_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, c
sauro_state *state = machine.driver_data<sauro_state>();
UINT8 *spriteram = state->m_spriteram;
int offs,code,sx,sy,color,flipx;
- int flipy = flip_screen_get(machine);
+ int flipy = state->flip_screen();
for (offs = 3; offs < state->m_spriteram_size - 1; offs += 4)
{
@@ -172,7 +172,7 @@ static void trckydoc_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
sauro_state *state = machine.driver_data<sauro_state>();
UINT8 *spriteram = state->m_spriteram;
int offs,code,sy,color,flipx,sx;
- int flipy = flip_screen_get(machine);
+ int flipy = state->flip_screen();
/* Weird, sprites entries don't start on DWORD boundary */
for (offs = 3; offs < state->m_spriteram_size - 1; offs += 4)
diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c
index 0d82dc01d5c..6cc9e857d29 100644
--- a/src/mame/video/sbasketb.c
+++ b/src/mame/video/sbasketb.c
@@ -108,9 +108,9 @@ WRITE8_MEMBER(sbasketb_state::sbasketb_colorram_w)
WRITE8_MEMBER(sbasketb_state::sbasketb_flipscreen_w)
{
- if (flip_screen_get(machine()) != data)
+ if (flip_screen() != data)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
machine().tilemap().mark_all_dirty();
}
}
@@ -152,7 +152,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int flipx = spriteram[offs + 1] & 0x40;
int flipy = spriteram[offs + 1] & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c
index f122165909e..cdcf2dd989c 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -111,7 +111,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int sx = spriteram[i + 2] - ((attr & 0x80) << 1);
int sy = spriteram[i + 3];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c
index 620eb6edc2b..ab3782461c1 100644
--- a/src/mame/video/senjyo.c
+++ b/src/mame/video/senjyo.c
@@ -179,7 +179,7 @@ static void draw_bgbitmap(running_machine &machine, bitmap_ind16 &bitmap,const r
bitmap.fill(0, cliprect);
else
{
- int flip = flip_screen_get(machine);
+ int flip = state->flip_screen();
pen = 0;
count = 0;
@@ -220,7 +220,7 @@ static void draw_radar(running_machine &machine,bitmap_ind16 &bitmap,const recta
sx = (8 * (offs % 8) + x) + 256-64;
sy = ((offs & 0x1ff) / 8) + 96;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 255 - sx;
sy = 255 - sy;
@@ -255,7 +255,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
flipx = spriteram[offs+1] & 0x40;
flipy = spriteram[offs+1] & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
@@ -293,7 +293,7 @@ SCREEN_UPDATE_IND16( senjyo )
palette_set_color(screen.machine(),513,MAKE_RGB(0xff,0xff,0x00)); /* yellow for player */
{
- int flip = flip_screen_get(screen.machine());
+ int flip = state->flip_screen();
int scrollx,scrolly;
for (i = 0;i < 32;i++)
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index 12957753ba3..423b1e62e4c 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -133,15 +133,15 @@ WRITE16_MEMBER(seta2_state::seta2_vregs_w)
switch( offset*2 )
{
case 0x1c: // FLIP SCREEN (myangel) <- this is actually zoom
- flip_screen_set(machine(), data & 1 );
+ flip_screen_set(data & 1 );
if (data & ~1) logerror("CPU #0 PC %06X: flip screen unknown bits %04X\n",cpu_get_pc(&space.device()),data);
break;
case 0x2a: // FLIP X (pzlbowl)
- flip_screen_x_set(machine(), data & 1 );
+ flip_screen_x_set(data & 1 );
if (data & ~1) logerror("CPU #0 PC %06X: flipx unknown bits %04X\n",cpu_get_pc(&space.device()),data);
break;
case 0x2c: // FLIP Y (pzlbowl)
- flip_screen_y_set(machine(), data & 1 );
+ flip_screen_y_set(data & 1 );
if (data & ~1) logerror("CPU #0 PC %06X: flipy unknown bits %04X\n",cpu_get_pc(&space.device()),data);
break;
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index d5ffc428de1..400129ff722 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -104,7 +104,7 @@ WRITE16_MEMBER(sf_state::sf_gfxctrl_w)
if (ACCESSING_BITS_0_7)
{
m_sf_active = data & 0xff;
- flip_screen_set(machine(), data & 0x04);
+ flip_screen_set(data & 0x04);
m_tx_tilemap->enable(data & 0x08);
m_bg_tilemap->enable(data & 0x20);
m_fg_tilemap->enable(data & 0x40);
@@ -144,7 +144,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,const r
{
int c1, c2, c3, c4, t;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 480 - sx;
sy = 224 - sy;
@@ -195,7 +195,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,const r
}
else
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 496 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index a17a3a4074e..9a9430a8da3 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -90,7 +90,7 @@ WRITE16_MEMBER(shangha3_state::shangha3_flipscreen_w)
if (ACCESSING_BITS_0_7)
{
/* bit 7 flips screen, the rest seems to always be set to 0x7e */
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
if ((data & 0x7f) != 0x7e) popmessage("flipscreen_w %02x",data);
}
@@ -131,7 +131,7 @@ WRITE16_MEMBER(shangha3_state::shangha3_blitter_go_w)
zoomx = shangha3_ram[offs+10];
zoomy = shangha3_ram[offs+13];
- if (flip_screen_get(machine()))
+ if (flip_screen())
{
sx = 383 - sx - sizex;
sy = 255 - sy - sizey;
diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c
index f5720fe5ec2..5feb96daa2d 100644
--- a/src/mame/video/shaolins.c
+++ b/src/mame/video/shaolins.c
@@ -125,9 +125,9 @@ WRITE8_MEMBER(shaolins_state::shaolins_nmi_w)
m_nmi_enable = data;
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -170,7 +170,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int sx = 240 - spriteram[offs + 6];
int sy = 248 - spriteram[offs + 4];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 248 - sy;
diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c
index 50e9e64e167..7b1bd3430aa 100644
--- a/src/mame/video/shisen.c
+++ b/src/mame/video/shisen.c
@@ -66,7 +66,7 @@ SCREEN_UPDATE_IND16( sichuan2 )
// on Irem boards, screen flip is handled in both hardware and software.
// this game doesn't have cocktail mode so if there's software control we don't
// know where it is mapped.
- flip_screen_set(screen.machine(), ~input_port_read(screen.machine(), "DSW2") & 1);
+ state->flip_screen_set(~input_port_read(screen.machine(), "DSW2") & 1);
state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index 9bc9c0a9e46..c583867dae6 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -121,7 +121,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int flipx = (attributes & 0x04);
int flipy = 0;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
flipx = !flipx;
flipy = !flipy;
}
@@ -132,7 +132,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
vx = sx;
vy = sy;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
vx = 240 - vx;
vy = 240 - vy;
}
@@ -151,7 +151,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
vx = sx;
vy = sy;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
vx = 240 - vx;
vy = 240 - vy;
}
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index 8d86f22c3e2..bae8bf06958 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -63,7 +63,7 @@ WRITE8_MEMBER(sidearms_state::sidearms_c804_w)
if (m_flipon != (data & 0x80))
{
m_flipon = data & 0x80;
- flip_screen_set(machine(), m_flipon);
+ flip_screen_set(m_flipon);
machine().tilemap().mark_all_dirty();
}
}
diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c
index 9ac24638194..49d6e90782d 100644
--- a/src/mame/video/simpl156.c
+++ b/src/mame/video/simpl156.c
@@ -40,7 +40,7 @@ SCREEN_UPDATE_IND16( simpl156 )
deco16ic_tilemap_1_draw(state->m_deco_tilegen1, bitmap, cliprect, 0, 4);
//FIXME: flip_screen_x should not be written!
- flip_screen_set_no_update(screen.machine(), 1);
+ state->flip_screen_set_no_update(1);
screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, state->m_spriteram, 0x1400/4); // 0x1400/4 seems right for charlien (doesn't initialize any more RAM, so will draw a garbage 0 with more)
return 0;
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index e64222f9d9b..d0c8ea78c68 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -98,7 +98,7 @@ void simpsons_video_banking( running_machine &machine, int bank )
if (bank & 1)
{
space->install_read_bank(0x0000, 0x0fff, "bank5");
- space->install_write_handler(0x0000, 0x0fff, write8_delegate(FUNC(simpsons_state::paletteram_xBBBBBGGGGGRRRRR_be_w), state));
+ space->install_write_handler(0x0000, 0x0fff, write8_delegate(FUNC(simpsons_state::paletteram_xBBBBBGGGGGRRRRR_byte_be_w), state));
memory_set_bankptr(machine, "bank5", state->m_generic_paletteram_8);
}
else
diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c
index 79933a8f91d..a407b7bc717 100644
--- a/src/mame/video/skykid.c
+++ b/src/mame/video/skykid.c
@@ -83,9 +83,9 @@ static TILE_GET_INFO( tx_get_tile_info )
characters when screen is flipped, we have to flip them back. */
SET_TILE_INFO(
0,
- code | (flip_screen_get(machine) ? 0x100 : 0),
+ code | (state->flip_screen() ? 0x100 : 0),
attr & 0x3f,
- flip_screen_get(machine) ? (TILE_FLIPY | TILE_FLIPX) : 0);
+ state->flip_screen() ? (TILE_FLIPY | TILE_FLIPX) : 0);
}
@@ -166,7 +166,7 @@ WRITE8_MEMBER(skykid_state::skykid_scroll_y_w)
WRITE8_MEMBER(skykid_state::skykid_flipscreen_priority_w)
{
m_priority = data;
- flip_screen_set(machine(), offset & 1);
+ flip_screen_set(offset & 1);
}
@@ -206,7 +206,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
sprite &= ~sizex;
sprite &= ~(sizey << 1);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
@@ -234,7 +234,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
SCREEN_UPDATE_IND16( skykid )
{
skykid_state *state = screen.machine().driver_data<skykid_state>();
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
state->m_bg_tilemap->set_scrollx(0, 189 - (state->m_scroll_x ^ 1));
state->m_bg_tilemap->set_scrolly(0, 7 - state->m_scroll_y);
diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c
index 8fb7af976c0..29b7c9f60cc 100644
--- a/src/mame/video/snk.c
+++ b/src/mame/video/snk.c
@@ -489,7 +489,7 @@ WRITE8_MEMBER(snk_state::marvins_palette_bank_w)
WRITE8_MEMBER(snk_state::marvins_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
// other bits unknown
}
@@ -497,7 +497,7 @@ WRITE8_MEMBER(snk_state::marvins_flipscreen_w)
WRITE8_MEMBER(snk_state::sgladiat_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
@@ -507,7 +507,7 @@ WRITE8_MEMBER(snk_state::sgladiat_flipscreen_w)
WRITE8_MEMBER(snk_state::hal21_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4);
if (m_bg_tile_offset != ((data & 0x20) << 3))
@@ -558,7 +558,7 @@ WRITE8_MEMBER(snk_state::aso_videoattrs_w)
*/
- flip_screen_set(machine(), data & 0x20);
+ flip_screen_set(data & 0x20);
m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x10) << 4);
m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x08) << 5);
@@ -581,7 +581,7 @@ WRITE8_MEMBER(snk_state::tnk3_videoattrs_w)
*/
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
if (m_tx_tile_offset != ((data & 0x40) << 2))
{
@@ -661,7 +661,7 @@ WRITE8_MEMBER(snk_state::gwar_tx_bank_w)
WRITE8_MEMBER(snk_state::gwar_videoattrs_w)
{
- flip_screen_set(machine(), data & 0x04);
+ flip_screen_set(data & 0x04);
m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x80) << 1);
m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x40) << 2);
@@ -674,7 +674,7 @@ WRITE8_MEMBER(snk_state::gwar_videoattrs_w)
WRITE8_MEMBER(snk_state::gwara_videoattrs_w)
{
- flip_screen_set(machine(), data & 0x10);
+ flip_screen_set(data & 0x10);
m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7);
m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8);
@@ -733,7 +733,7 @@ static void marvins_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
int flipy = (attributes&0x20);
int flipx = 0;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 89 - 16 - sx;
sy = 262 - 16 - sy;
@@ -800,7 +800,7 @@ static void tnk3_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, co
yflip = attributes & 0x20;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 89 - size - sx; // this causes slight misalignment in tnk3 but is correct for athena and fitegolf
sy = 262 - size - sy;
@@ -935,7 +935,7 @@ static void tdfever_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
if (hw_xflip)
sx = 495 - size - sx;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 495 - size - sx;
sy = 258 - size - sy;
diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c
index b11f0bad8a1..4b13a7a6387 100644
--- a/src/mame/video/snk6502.c
+++ b/src/mame/video/snk6502.c
@@ -135,9 +135,9 @@ WRITE8_MEMBER(snk6502_state::snk6502_flipscreen_w)
/* bit 7 flips screen */
- if (flip_screen_get(machine()) != (data & 0x80))
+ if (flip_screen() != (data & 0x80))
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
machine().tilemap().mark_all_dirty();
}
}
@@ -263,9 +263,9 @@ WRITE8_MEMBER(snk6502_state::satansat_b002_w)
{
/* bit 0 flips screen */
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c
index 260025b03ba..cd7f1c616b5 100644
--- a/src/mame/video/solomon.c
+++ b/src/mame/video/solomon.c
@@ -31,9 +31,9 @@ WRITE8_MEMBER(solomon_state::solomon_colorram2_w)
WRITE8_MEMBER(solomon_state::solomon_flipscreen_w)
{
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -87,7 +87,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int sx = spriteram[offs + 3];
int sy = 241 - spriteram[offs + 2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 242 - sy;
diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c
index 6313bc80e15..673afa94e83 100644
--- a/src/mame/video/sonson.c
+++ b/src/mame/video/sonson.c
@@ -116,7 +116,7 @@ WRITE8_MEMBER(sonson_state::sonson_scrollx_w)
WRITE8_MEMBER(sonson_state::sonson_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -152,7 +152,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = spriteram[offs + 3];
int sy = spriteram[offs + 0];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c
index 7bc4a3d331d..17833416fd6 100644
--- a/src/mame/video/spcforce.c
+++ b/src/mame/video/spcforce.c
@@ -12,7 +12,7 @@
WRITE8_MEMBER(spcforce_state::spcforce_flip_screen_w)
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
}
@@ -20,7 +20,7 @@ SCREEN_UPDATE_IND16( spcforce )
{
spcforce_state *state = screen.machine().driver_data<spcforce_state>();
int offs;
- int flip = flip_screen_get(screen.machine());
+ int flip = state->flip_screen();
/* draw the characters as sprites because they could be overlapping */
bitmap.fill(0, cliprect);
diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c
index 2196e645c4c..25ea2389031 100644
--- a/src/mame/video/spdodgeb.c
+++ b/src/mame/video/spdodgeb.c
@@ -110,7 +110,7 @@ WRITE8_MEMBER(spdodgeb_state::spdodgeb_ctrl_w)
UINT8 *rom = machine().region("maincpu")->base();
/* bit 0 = flip screen */
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
/* bit 1 = ROM bank switch */
memory_set_bankptr(machine(), "bank1",rom + 0x10000 + 0x4000 * ((~data & 0x02) >> 1));
@@ -173,7 +173,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int dy = -16;
int cy;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -192,7 +192,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
break;
case 1: /* double y */
- if (flip_screen_get(machine)) { if (sy > 240) sy -= 256; } else { if (sy < 0) sy += 256; }
+ if (state->flip_screen()) { if (sy > 240) sy -= 256; } else { if (sy < 0) sy += 256; }
cy = sy + dy;
which &= ~1;
DRAW_SPRITE(0,sx,cy);
diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c
index 26fe19838f9..e660190fd86 100644
--- a/src/mame/video/speedbal.c
+++ b/src/mame/video/speedbal.c
@@ -104,7 +104,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
flipx = flipy = 0;
- if(flip_screen_get(machine))
+ if(state->flip_screen())
{
x = 246 - x;
y = 238 - y;
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index d6ab48d1d97..6f638fcc97f 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -83,7 +83,7 @@ WRITE8_MEMBER(srumbler_state::srumbler_background_w)
WRITE8_MEMBER(srumbler_state::srumbler_4009_w)
{
/* bit 0 flips screen */
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
/* bits 4-5 used during attract mode, unknown */
@@ -142,7 +142,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sx = buffered_spriteram[offs + 3] + 0x100 * ( attr & 0x01);
flipy = attr & 0x02;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 496 - sx;
sy = 240 - sy;
@@ -152,7 +152,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code,
colour,
- flip_screen_get(machine),flipy,
+ state->flip_screen(),flipy,
sx, sy,15);
}
}
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index 9e653809643..dae744cb43b 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -38,7 +38,7 @@ SCREEN_UPDATE_RGB32( sshangha )
if (state->m_spriteram2 != NULL)
screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, state->m_spriteram2, 0x800, true);
- screen.machine().tilemap().set_flip_all(flip_screen_x_get(screen.machine()) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ screen.machine().tilemap().set_flip_all(state->flip_screen_x() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
bitmap.fill(get_black_pen(screen.machine()), cliprect);
diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c
index 0e2786dc2c9..828324ed028 100644
--- a/src/mame/video/ssozumo.c
+++ b/src/mame/video/ssozumo.c
@@ -109,7 +109,7 @@ WRITE8_MEMBER(ssozumo_state::ssozumo_scroll_w)
WRITE8_MEMBER(ssozumo_state::ssozumo_flipscreen_w)
{
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -161,7 +161,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int sx = 239 - spriteram[offs + 3];
int sy = (240 - spriteram[offs + 2]) & 0xff;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c
index 5908d0ef31c..ec38b6b51c8 100644
--- a/src/mame/video/stfight.c
+++ b/src/mame/video/stfight.c
@@ -230,7 +230,7 @@ WRITE8_MEMBER(stfight_state::stfight_vh_latch_w)
/* 0x40 = sprites */
m_bg_tilemap->enable(data & 0x20);
m_fg_tilemap->enable(data & 0x10);
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
break;
}
}
@@ -268,7 +268,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
sx -= 0x100;
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -280,7 +280,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
pdrawgfx_transpen(bitmap,cliprect,machine.gfx[4],
code,
color,
- flipx,flip_screen_get(machine),
+ flipx,state->flip_screen(),
sx,sy,
machine.priority_bitmap,
pri ? 0x02 : 0,0x0f);
diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c
index 56a26988371..1dfe1914c6b 100644
--- a/src/mame/video/strnskil.c
+++ b/src/mame/video/strnskil.c
@@ -52,9 +52,9 @@ WRITE8_MEMBER(strnskil_state::strnskil_scrl_ctrl_w)
{
m_scrl_ctrl = data >> 5;
- if (flip_screen_get(machine()) != (data & 0x08))
+ if (flip_screen() != (data & 0x08))
{
- flip_screen_set(machine(), data & 0x08);
+ flip_screen_set(data & 0x08);
machine().tilemap().mark_all_dirty();
}
}
@@ -89,14 +89,14 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
{
int code = spriteram[offs + 1];
int color = spriteram[offs + 2] & 0x3f;
- int flipx = flip_screen_x_get(machine);
- int flipy = flip_screen_y_get(machine);
+ int flipx = state->flip_screen_x();
+ int flipy = state->flip_screen_y();
int sx = spriteram[offs + 3];
int sy = spriteram[offs];
int px, py;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
px = 240 - sx + 0; /* +2 or +0 ? */
py = sy;
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index 92ce0f8be02..93e66cd96bf 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -64,7 +64,7 @@ WRITE16_MEMBER(suna16_state::suna16_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
{
- flip_screen_set(machine(), data & 1 );
+ flip_screen_set(data & 1 );
m_color_bank = ( data & 4 ) >> 2;
}
if (data & ~(1|4)) logerror("CPU#0 PC %06X - Flip screen unknown bits: %04X\n", cpu_get_pc(&space.device()), data);
@@ -74,7 +74,7 @@ WRITE16_MEMBER(suna16_state::bestbest_flipscreen_w)
{
if (ACCESSING_BITS_0_7)
{
- flip_screen_set(machine(), data & 0x10 );
+ flip_screen_set(data & 0x10 );
//m_color_bank = ( data & 0x07 );
}
if (data & ~(0x10)) logerror("CPU#0 PC %06X - Flip screen unknown bits: %04X\n", cpu_get_pc(&space.device()), data);
@@ -185,7 +185,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if (flipx) tile_flipx = !tile_flipx;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = max_x - sx;
sy = max_y - sy;
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index 8aaa375992f..eca66c5fcc7 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -313,7 +313,7 @@ static void draw_normal_sprites(running_machine &machine, bitmap_ind16 &bitmap,c
if (flipx) tile_flipx = !tile_flipx;
if (flipy) tile_flipy = !tile_flipy;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = max_x - sx; tile_flipx = !tile_flipx;
sy = max_y - sy; tile_flipy = !tile_flipy;
@@ -381,7 +381,7 @@ static void draw_text_sprites(running_machine &machine, bitmap_ind16 &bitmap,con
int sx = x + tx * 8;
int sy = (y + real_ty * 8) & 0xff;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = max_x - sx; flipx = !flipx;
sy = max_y - sy; flipy = !flipy;
diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c
index c2e9ce80ef5..7ca2d330970 100644
--- a/src/mame/video/supbtime.c
+++ b/src/mame/video/supbtime.c
@@ -26,7 +26,7 @@ SCREEN_UPDATE_IND16(supbtime)
supbtime_state *state = screen.machine().driver_data<supbtime_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
bitmap.fill(768, cliprect);
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index 5adb09f19ec..54e2b400adb 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -130,7 +130,7 @@ WRITE8_MEMBER(superqix_state::pbillian_0410_w)
memory_set_bank(machine(), "bank1", (data & 0x08) >> 3);
m_nmi_mask = data & 0x10;
- flip_screen_set(machine(), data & 0x20);
+ flip_screen_set(data & 0x20);
}
WRITE8_MEMBER(superqix_state::superqix_0410_w)
@@ -174,7 +174,7 @@ static void pbillian_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
int sx = spriteram[offs + 1] + 256 * (spriteram[offs] & 0x01);
int sy = spriteram[offs + 2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -183,7 +183,7 @@ static void pbillian_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
drawgfx_transpen(bitmap,cliprect, machine.gfx[1],
code,
color,
- flip_screen_get(machine), flip_screen_get(machine),
+ state->flip_screen(), state->flip_screen(),
sx, sy, 0);
}
}
@@ -204,7 +204,7 @@ static void superqix_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
int sx = spriteram[offs + 1];
int sy = spriteram[offs + 2];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -233,7 +233,7 @@ SCREEN_UPDATE_IND16( superqix )
{
superqix_state *state = screen.machine().driver_data<superqix_state>();
state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- copybitmap_trans(bitmap,*state->m_fg_bitmap[state->m_show_bitmap],flip_screen_get(screen.machine()),flip_screen_get(screen.machine()),0,0,cliprect,0);
+ copybitmap_trans(bitmap,*state->m_fg_bitmap[state->m_show_bitmap],state->flip_screen(),state->flip_screen(),0,0,cliprect,0);
superqix_draw_sprites(screen.machine(), bitmap,cliprect);
state->m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
return 0;
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index 97a5c6a281b..9124d8effb8 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -118,7 +118,7 @@ WRITE8_MEMBER(suprloco_state::suprloco_videoram_w)
WRITE8_MEMBER(suprloco_state::suprloco_scrollram_w)
{
- int adj = flip_screen_get(machine()) ? -8 : 8;
+ int adj = flip_screen() ? -8 : 8;
m_scrollram[offset] = data;
m_bg_tilemap->set_scrollx(offset, data - adj);
@@ -144,7 +144,7 @@ WRITE8_MEMBER(suprloco_state::suprloco_control_w)
coin_counter_w(machine(), 0, data & 0x01);
coin_counter_w(machine(), 1, data & 0x02);
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
m_control = data;
}
@@ -173,7 +173,7 @@ INLINE void draw_pixel(bitmap_ind16 &bitmap,const rectangle &cliprect,int x,int
static void draw_sprite(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,int spr_number)
{
suprloco_state *state = machine.driver_data<suprloco_state>();
- int flip = flip_screen_get(machine);
+ int flip = state->flip_screen();
int sx,sy,col,row,height,src,adjy,dy;
UINT8 *spr_reg;
UINT8 *gfx2;
@@ -191,7 +191,7 @@ static void draw_sprite(running_machine &machine, bitmap_ind16 &bitmap,const rec
sx = spr_reg[SPR_X];
sy = spr_reg[SPR_Y_TOP] + 1;
- if (!flip_screen_get(machine))
+ if (!state->flip_screen())
{
adjy = sy;
dy = 1;
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index a964839cf5e..c362df8d860 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -175,7 +175,7 @@ WRITE8_MEMBER(system1_state::system1_videomode_w)
m_video_mode = data;
/* bit 7 is flip screen */
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
@@ -366,7 +366,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 gfxbanks = machine.region("sprites")->bytes() / 0x8000;
const UINT8 *gfxbase = machine.region("sprites")->base();
UINT8 *spriteram = state->m_spriteram;
- int flipscreen = flip_screen_get(machine);
+ int flipscreen = state->flip_screen();
int spritenum;
/* up to 32 sprites total */
@@ -578,7 +578,7 @@ SCREEN_UPDATE_IND16( system1 )
yscroll = videoram[0xfbd];
/* adjust for flipping */
- if (flip_screen_get(screen.machine()))
+ if (state->flip_screen())
{
xscroll = 640 - (xscroll & 0x1ff);
yscroll = 764 - (yscroll & 0x1ff);
@@ -614,7 +614,7 @@ SCREEN_UPDATE_IND16( system2 )
bitmap_ind16 &fgpixmap = state->m_tilemap_page[0]->pixmap();
/* get scroll offsets */
- if (!flip_screen_get(screen.machine()))
+ if (!state->flip_screen())
{
xscroll = ((videoram[0x7c0] | (videoram[0x7c1] << 8)) & 0x1ff) - 512 + 10;
yscroll = videoram[0x7ba];
@@ -657,7 +657,7 @@ SCREEN_UPDATE_IND16( system2_rowscroll )
bitmap_ind16 &fgpixmap = state->m_tilemap_page[0]->pixmap();
/* get scroll offsets */
- if (!flip_screen_get(screen.machine()))
+ if (!state->flip_screen())
{
for (y = 0; y < 32; y++)
rowscroll[y] = ((videoram[0x7c0 + y * 2] | (videoram[0x7c1 + y * 2] << 8)) & 0x1ff) - 512 + 10;
diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c
index 8b9a17c490a..b5a507a4efc 100644
--- a/src/mame/video/tagteam.c
+++ b/src/mame/video/tagteam.c
@@ -115,9 +115,9 @@ WRITE8_MEMBER(tagteam_state::tagteam_control_w)
WRITE8_MEMBER(tagteam_state::tagteam_flipscreen_w)
{
// d0: flip screen
- if (flip_screen_get(machine()) != (data &0x01))
+ if (flip_screen() != (data &0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
@@ -159,7 +159,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if (!(state->m_videoram[offs] & 0x01)) continue;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -177,7 +177,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
code = state->m_videoram[offs + 0x20] + 256 * spritebank;
color = state->m_palettebank;
- sy += (flip_screen_get(machine) ? -256 : 256);
+ sy += (state->flip_screen() ? -256 : 256);
drawgfx_transpen(bitmap, cliprect,
machine.gfx[1],
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index 0d46cb3dbfd..ee7a8c25ada 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -153,7 +153,7 @@ WRITE8_MEMBER(tecmo_state::tecmo_bgscroll_w)
WRITE8_MEMBER(tecmo_state::tecmo_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
@@ -205,7 +205,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
flipx = bank & 1;
flipy = bank & 2;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
xpos = 256 - (8 * size) - xpos;
ypos = 256 - (8 * size) - ypos;
diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c
index 54c657e9ca6..91324c9b8ea 100644
--- a/src/mame/video/tecmo16.c
+++ b/src/mame/video/tecmo16.c
@@ -161,7 +161,7 @@ WRITE16_MEMBER(tecmo16_state::tecmo16_charram_w)
WRITE16_MEMBER(tecmo16_state::tecmo16_flipscreen_w)
{
m_flipscreen = data & 0x01;
- flip_screen_set(machine(), m_flipscreen);
+ flip_screen_set(m_flipscreen);
}
/******************************************************************************/
diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c
index 06cf3d369ed..1a407dbce3d 100644
--- a/src/mame/video/tehkanwc.c
+++ b/src/mame/video/tehkanwc.c
@@ -45,12 +45,12 @@ WRITE8_MEMBER(tehkanwc_state::tehkanwc_scroll_y_w)
WRITE8_MEMBER(tehkanwc_state::tehkanwc_flipscreen_x_w)
{
- flip_screen_x_set(machine(), data & 0x40);
+ flip_screen_x_set(data & 0x40);
}
WRITE8_MEMBER(tehkanwc_state::tehkanwc_flipscreen_y_w)
{
- flip_screen_y_set(machine(), data & 0x40);
+ flip_screen_y_set(data & 0x40);
}
WRITE8_MEMBER(tehkanwc_state::gridiron_led0_w)
@@ -140,13 +140,13 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int sx = spriteram[offs + 2] + ((attr & 0x20) << 3) - 128;
int sy = spriteram[offs + 3];
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index 836edfced3f..b350f092505 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -78,7 +78,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
color += 16 * (spritepalettebank[(tile>>1)&0xff] & 0x0f);
}
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx=240-sx;
sy=240-sy;
@@ -170,7 +170,7 @@ WRITE16_MEMBER(terracre_state::amazon_flipscreen_w)
{
coin_counter_w( machine(), 0, data&0x01 );
coin_counter_w( machine(), 1, (data&0x02)>>1 );
- flip_screen_set(machine(), data&0x04);
+ flip_screen_set(data&0x04);
}
}
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index 7e3e598ad03..e98ceae0979 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -171,7 +171,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if (color & 1) sx -= 256;
if (attr & 1) sy -= 256;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index 49f750ed039..baab84bc1e7 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -19,9 +19,9 @@ WRITE16_MEMBER(tigeroad_state::tigeroad_videoctrl_w)
/* bit 1 flips screen */
- if (flip_screen_get(machine()) != (data & 0x02))
+ if (flip_screen() != (data & 0x02))
{
- flip_screen_set(machine(), data & 0x02);
+ flip_screen_set(data & 0x02);
machine().tilemap().mark_all_dirty();
}
@@ -89,7 +89,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if (sx > 0x100) sx -= 0x200;
if (sy > 0x100) sy -= 0x200;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c
index 90f1cbb92c6..cdba59499eb 100644
--- a/src/mame/video/timeplt.c
+++ b/src/mame/video/timeplt.c
@@ -157,7 +157,7 @@ WRITE8_MEMBER(timeplt_state::timeplt_colorram_w)
WRITE8_MEMBER(timeplt_state::timeplt_flipscreen_w)
{
- flip_screen_set(machine(), ~data & 1);
+ flip_screen_set(~data & 1);
}
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index e6e3c947207..ff533ae3805 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -508,7 +508,7 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_colorram1_w)
{
COMBINE_DATA(&m_colorram1[offset]);
- paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask);
+ paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask);
}
/* sprite palette */
@@ -522,7 +522,7 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_colorram2_w)
{
COMBINE_DATA(&m_colorram2[offset]);
- paletteram16_xBBBBBGGGGGRRRRR_word_w(space, offset+(m_colorram1_size/2), data, mem_mask);
+ paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset+(m_colorram1_size/2), data, mem_mask);
}
READ16_MEMBER(toaplan1_state::toaplan1_spriteram16_r)
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index 535adc31272..a01391a17b4 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -194,7 +194,7 @@ static void toki_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,con
flipy = 0;
tile = (sprite_word[1] & 0xfff) + ((sprite_word[2] & 0x8000) >> 3);
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
x=240-x;
y=240-y;
if (flipx) flipx=0; else flipx=1;
@@ -276,7 +276,7 @@ SCREEN_UPDATE_IND16( toki )
state->m_foreground_layer->set_scrollx(0, foreground_x_scroll );
state->m_foreground_layer->set_scrolly(0, foreground_y_scroll );
- flip_screen_set(screen.machine(), (state->m_scrollram16[0x28]&0x8000)==0);
+ state->flip_screen_set((state->m_scrollram16[0x28]&0x8000)==0);
if (state->m_scrollram16[0x28]&0x100) {
state->m_background_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c
index 1988c6276ae..f3bfbb7378e 100644
--- a/src/mame/video/toypop.c
+++ b/src/mame/video/toypop.c
@@ -216,6 +216,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap)
void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram_base)
{
+ toypop_state *state = machine.driver_data<toypop_state>();
UINT8 *spriteram = spriteram_base + 0x780;
UINT8 *spriteram_2 = spriteram + 0x800;
UINT8 *spriteram_3 = spriteram_2 + 0x800;
@@ -246,7 +247,7 @@ void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangl
sy -= 16 * sizey;
sy = (sy & 0xff) - 32; // fix wraparound
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c
index 2c336a661a4..687365eadaa 100644
--- a/src/mame/video/trackfld.c
+++ b/src/mame/video/trackfld.c
@@ -103,9 +103,9 @@ WRITE8_MEMBER(trackfld_state::trackfld_colorram_w)
WRITE8_MEMBER(trackfld_state::trackfld_flipscreen_w)
{
- if (flip_screen_get(machine()) != data)
+ if (flip_screen() != data)
{
- flip_screen_set(machine(), data);
+ flip_screen_set(data);
machine().tilemap().mark_all_dirty();
}
}
@@ -208,7 +208,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sx = spriteram[offs] - 1;
int sy = 240 - spriteram_2[offs + 1];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 240 - sy;
flipy = !flipy;
@@ -253,7 +253,7 @@ SCREEN_UPDATE_IND16( trackfld )
for (row = 0; row < 32; row++)
{
scrollx = state->m_scroll[row] + 256 * (state->m_scroll2[row] & 0x01);
- if (flip_screen_get(screen.machine())) scrollx = -scrollx;
+ if (state->flip_screen()) scrollx = -scrollx;
state->m_bg_tilemap->set_scrollx(row, scrollx);
}
diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c
index 54ad82225a5..bce50eac705 100644
--- a/src/mame/video/travrusa.c
+++ b/src/mame/video/travrusa.c
@@ -276,7 +276,7 @@ WRITE8_MEMBER(travrusa_state::travrusa_flipscreen_w)
/* screen flip is handled both by software and hardware */
data ^= ~input_port_read(machine(), "DSW2") & 1;
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
coin_counter_w(machine(), 0, data & 0x02);
coin_counter_w(machine(), 1, data & 0x20);
@@ -297,7 +297,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
const rectangle spritevisiblearea(1*8, 31*8-1, 0*8, 24*8-1);
const rectangle spritevisibleareaflip(1*8, 31*8-1, 8*8, 32*8-1);
rectangle clip = cliprect;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
clip &= spritevisibleareaflip;
else
clip &= spritevisiblearea;
@@ -312,7 +312,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
int flipx = attr & 0x40;
int flipy = attr & 0x80;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index 69d15711c2c..a6d4b500e6e 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -144,7 +144,7 @@ WRITE8_MEMBER(tryout_state::tryout_vram_bankswitch_w)
WRITE8_MEMBER(tryout_state::tryout_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
static TILEMAP_MAPPER( get_fg_memory_offset )
@@ -198,7 +198,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
fy = 0;
inc = 16;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
x = 240 - x;
fx = !fx;
@@ -234,7 +234,7 @@ SCREEN_UPDATE_IND16( tryout )
tryout_state *state = screen.machine().driver_data<tryout_state>();
int scrollx = 0;
- if (!flip_screen_get(screen.machine()))
+ if (!state->flip_screen())
state->m_fg_tilemap->set_scrollx(0, 16); /* Assumed hard-wired */
else
state->m_fg_tilemap->set_scrollx(0, -8); /* Assumed hard-wired */
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index 44cd7bad608..d84d9a5c658 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -168,7 +168,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
/* So I'm using this specific check. -kal 11 jul 2002 */
// if(sprite_type == 1) sy=sy+2;
- if( flip_screen_get(machine) )
+ if( state->flip_screen() )
{
drawgfx_transpen( bitmap,cliprect,gfx,
sprite_number&0x7f,
diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c
index 04b924862fa..f77de781803 100644
--- a/src/mame/video/tumblep.c
+++ b/src/mame/video/tumblep.c
@@ -24,7 +24,7 @@ SCREEN_UPDATE_IND16( tumblep )
tumblep_state *state = screen.machine().driver_data<tumblep_state>();
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
- flip_screen_set(screen.machine(), BIT(flip, 7));
+ state->flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll);
bitmap.fill(256, cliprect); /* not verified */
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 901ede8a871..b756b038c86 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -67,8 +67,8 @@ WRITE16_MEMBER(twin16_state::twin16_video_register_w)
case 0:
COMBINE_DATA( &m_video_register );
- flip_screen_x_set(machine(), m_video_register & TWIN16_SCREEN_FLIPX);
- flip_screen_y_set(machine(), m_video_register & TWIN16_SCREEN_FLIPY);
+ flip_screen_x_set(m_video_register & TWIN16_SCREEN_FLIPX);
+ flip_screen_y_set(m_video_register & TWIN16_SCREEN_FLIPY);
break;
diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c
index a23ff24217b..810d79a0442 100644
--- a/src/mame/video/vaportra.c
+++ b/src/mame/video/vaportra.c
@@ -56,7 +56,7 @@ SCREEN_UPDATE_IND16( vaportra )
UINT16 flip = deco16ic_pf_control_r(state->m_deco_tilegen1, 0, 0xffff);
int pri = state->m_priority[0] & 0x03;
- flip_screen_set(screen.machine(), !BIT(flip, 7));
+ state->flip_screen_set(!BIT(flip, 7));
deco16ic_pf_update(state->m_deco_tilegen1, 0, 0);
deco16ic_pf_update(state->m_deco_tilegen2, 0, 0);
diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c
index 69f2302440c..eca20f1b863 100644
--- a/src/mame/video/vastar.c
+++ b/src/mame/video/vastar.c
@@ -154,7 +154,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
flipx = spriteram_3[offs] & 0x02;
flipy = spriteram_3[offs] & 0x01;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
@@ -162,7 +162,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
if (spriteram_2[offs] & 0x08) /* double width */
{
- if (!flip_screen_get(machine))
+ if (!state->flip_screen())
sy = 224 - sy;
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
@@ -179,7 +179,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
}
else
{
- if (!flip_screen_get(machine))
+ if (!state->flip_screen())
sy = 240 - sy;
drawgfx_transpen(bitmap,cliprect,machine.gfx[1],
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index a5429806df6..bc26a22e4e2 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -133,7 +133,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
int flipy = 0;
int dy = -16;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index f48627cfbff..118601240be 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -148,7 +148,7 @@ WRITE8_MEMBER(vulgus_state::vulgus_c804_w)
coin_counter_w(machine(), 1, data & 0x02);
/* bit 7 flips screen */
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
}
@@ -185,7 +185,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
sx = spriteram[offs + 3];
sy = spriteram[offs + 2];
dir = 1;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -200,14 +200,14 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code + i,
col,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx, sy + 16 * i * dir,15);
/* draw again with wraparound */
drawgfx_transpen(bitmap,cliprect,machine.gfx[2],
code + i,
col,
- flip_screen_get(machine),flip_screen_get(machine),
+ state->flip_screen(),state->flip_screen(),
sx, sy + 16 * i * dir - dir * 256,15);
i--;
} while (i >= 0);
diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c
index 999390744b8..66278ed7b0f 100644
--- a/src/mame/video/warpwarp.c
+++ b/src/mame/video/warpwarp.c
@@ -226,7 +226,7 @@ static void draw_ball(running_machine &machine, bitmap_ind16 &bitmap, const rect
{
int x,y,i,j;
- if (flip_screen_get(machine) & 1) {
+ if (state->flip_screen() & 1) {
x = 376 - state->m_ball_h;
y = 280 - state->m_ball_v;
}
diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c
index c6d30d91d30..ee4b3b4c952 100644
--- a/src/mame/video/welltris.c
+++ b/src/mame/video/welltris.c
@@ -165,7 +165,7 @@ WRITE16_MEMBER(welltris_state::welltris_palette_bank_w)
m_char_tilemap->mark_all_dirty();
}
- flip_screen_set(machine(), data & 0x80);
+ flip_screen_set(data & 0x80);
m_spritepalettebank = (data & 0x20) >> 5;
m_pixelpalettebank = (data & 0x08) >> 3;
diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c
index 4ebc7a84147..81cd4996599 100644
--- a/src/mame/video/wrally.c
+++ b/src/mame/video/wrally.c
@@ -125,7 +125,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
if (high_priority != priority) continue;
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
sy = sy + 248;
}
@@ -180,7 +180,7 @@ SCREEN_UPDATE_IND16( wrally )
{
wrally_state *state = screen.machine().driver_data<wrally_state>();
/* set scroll registers */
- if (!flip_screen_get(screen.machine())) {
+ if (!state->flip_screen()) {
state->m_pant[0]->set_scrolly(0, state->m_vregs[0]);
state->m_pant[0]->set_scrollx(0, state->m_vregs[1]+4);
state->m_pant[1]->set_scrolly(0, state->m_vregs[2]);
diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c
index 90e8362bca4..76ac05c2d36 100644
--- a/src/mame/video/wwfsstar.c
+++ b/src/mame/video/wwfsstar.c
@@ -158,7 +158,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
number &= ~(chain - 1);
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipy = !flipy;
flipx = !flipx;
@@ -168,7 +168,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
for (count=0;count<chain;count++)
{
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
if (!flipy)
{
diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c
index 181f0f9adbd..709ed002164 100644
--- a/src/mame/video/wwfwfest.c
+++ b/src/mame/video/wwfwfest.c
@@ -189,7 +189,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
number = (source[2] & 0x00ff) | (source[3] & 0x00ff) << 8;
colourbank = (source[4] & 0x000f);
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
if (flipy) flipy=0; else flipy=1;
if (flipx) flipx=0; else flipx=1;
ypos=240-ypos-state->m_sprite_xoff;
@@ -197,7 +197,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
}
for (count=0;count<chain;count++) {
- if (flip_screen_get(machine)) {
+ if (state->flip_screen()) {
if (!flipy) {
drawgfx_transpen(bitmap,cliprect,gfx,number+count,colourbank,flipx,flipy,xpos,ypos+(16*(chain-1))-(16*count),0);
} else {
diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c
index 9523059c73c..e9b0cdc9a79 100644
--- a/src/mame/video/xain.c
+++ b/src/mame/video/xain.c
@@ -155,7 +155,7 @@ WRITE8_MEMBER(xain_state::xain_scrollyP1_w)
WRITE8_MEMBER(xain_state::xain_flipscreen_w)
{
- flip_screen_set(machine(), data & 1);
+ flip_screen_set(data & 1);
}
@@ -184,7 +184,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
if (sy <= -7) sy += 256;
flipx = attr & 0x40;
flipy = 0;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sx = 238 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c
index 35ce44b092a..143dd8b5fad 100644
--- a/src/mame/video/xevious.c
+++ b/src/mame/video/xevious.c
@@ -188,9 +188,9 @@ static TILE_GET_INFO( get_fg_tile_info )
UINT8 color = ((attr & 0x03) << 4) | ((attr & 0x3c) >> 2);
SET_TILE_INFO(
0,
- state->m_xevious_fg_videoram[tile_index] | (flip_screen_get(machine) ? 0x100 : 0),
+ state->m_xevious_fg_videoram[tile_index] | (state->flip_screen() ? 0x100 : 0),
color,
- TILE_FLIPYX((attr & 0xc0) >> 6) ^ (flip_screen_get(machine) ? TILE_FLIPX : 0));
+ TILE_FLIPYX((attr & 0xc0) >> 6) ^ (state->flip_screen() ? TILE_FLIPX : 0));
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -297,7 +297,7 @@ WRITE8_HANDLER( xevious_vh_latch_w )
state->m_fg_tilemap->set_scrolly(0,scroll);
break;
case 7:
- flip_screen_set(space->machine(), scroll & 1);
+ state->flip_screen_set(scroll & 1);
break;
default:
logerror("CRTC WRITE REG: %x Data: %03x\n",reg, scroll);
@@ -448,7 +448,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
sx = spriteram_2[offs + 1] - 40 + 0x100*(spriteram_3[offs + 1] & 1);
sy = 28*8-spriteram_2[offs]-1;
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c
index b9def6f9b13..a6b9e64517d 100644
--- a/src/mame/video/xxmissio.c
+++ b/src/mame/video/xxmissio.c
@@ -45,7 +45,7 @@ READ8_MEMBER(xxmissio_state::xxmissio_bgram_r)
WRITE8_MEMBER(xxmissio_state::xxmissio_paletteram_w)
{
- paletteram_BBGGRRII_w(space,offset,data);
+ paletteram_BBGGRRII_byte_w(space,offset,data);
}
/****************************************************************************/
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index 045627a66da..5c27d7e809f 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -68,9 +68,9 @@ WRITE8_MEMBER(yiear_state::yiear_videoram_w)
WRITE8_MEMBER(yiear_state::yiear_control_w)
{
/* bit 0 flips screen */
- if (flip_screen_get(machine()) != (data & 0x01))
+ if (flip_screen() != (data & 0x01))
{
- flip_screen_set(machine(), data & 0x01);
+ flip_screen_set(data & 0x01);
machine().tilemap().mark_all_dirty();
}
@@ -120,7 +120,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
int sy = 240 - spriteram[offs + 1];
int sx = spriteram_2[offs];
- if (flip_screen_get(machine))
+ if (state->flip_screen())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c
index 2d4225e33a0..793703ba120 100644
--- a/src/mame/video/yunsun16.c
+++ b/src/mame/video/yunsun16.c
@@ -172,7 +172,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
x += state->m_sprites_scrolldx;
y += state->m_sprites_scrolldy;
- if (flip_screen_get(machine)) // not used?
+ if (state->flip_screen()) // not used?
{
flipx = !flipx; x = max_x - x - 16;
flipy = !flipy; y = max_y - y - 16;
diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c
index 1a8e303723f..848aaefdd3b 100644
--- a/src/mame/video/zaccaria.c
+++ b/src/mame/video/zaccaria.c
@@ -173,12 +173,12 @@ WRITE8_MEMBER(zaccaria_state::zaccaria_attributes_w)
WRITE8_MEMBER(zaccaria_state::zaccaria_flip_screen_x_w)
{
- flip_screen_x_set(machine(), data & 1);
+ flip_screen_x_set(data & 1);
}
WRITE8_MEMBER(zaccaria_state::zaccaria_flip_screen_y_w)
{
- flip_screen_y_set(machine(), data & 1);
+ flip_screen_y_set(data & 1);
}
@@ -206,6 +206,7 @@ offsets 1 and 2 are swapped if accessed from spriteram2
*/
static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect,UINT8 *spriteram,int color,int section)
{
+ zaccaria_state *state = machine.driver_data<zaccaria_state>();
int offs,o1 = 1,o2 = 2;
if (section)
@@ -223,12 +224,12 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
if (sx == 1) continue;
- if (flip_screen_x_get(machine))
+ if (state->flip_screen_x())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y_get(machine))
+ if (state->flip_screen_y())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index 2987eb329ab..5a79f29dde3 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -187,8 +187,8 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_flipscreen_w)
{
/* low bit controls flip; background and sprite flip are handled at render time */
- flip_screen_set_no_update(machine(), ~data & 1);
- m_fg_tilemap->set_flip(flip_screen_get(machine()) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ flip_screen_set_no_update(~data & 1);
+ m_fg_tilemap->set_flip(flip_screen() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
@@ -323,13 +323,13 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
int colorbase = state->m_bg_color + (state->m_congo_color_bank << 8);
int xmask = pixmap.width() - 1;
int ymask = pixmap.height() - 1;
- int flipmask = flip_screen_get(machine) ? 0xff : 0x00;
- int flipoffs = flip_screen_get(machine) ? 0x38 : 0x40;
+ int flipmask = state->flip_screen() ? 0xff : 0x00;
+ int flipoffs = state->flip_screen() ? 0x38 : 0x40;
int x, y;
/* the starting X value is offset by 1 pixel (normal) or 7 pixels */
/* (flipped) due to a delay in the loading */
- if (!flip_screen_get(machine))
+ if (!state->flip_screen())
flipoffs -= 1;
else
flipoffs += 7;
@@ -435,7 +435,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
zaxxon_state *state = machine.driver_data<zaxxon_state>();
UINT8 *spriteram = state->m_spriteram;
const gfx_element *gfx = machine.gfx[2];
- int flip = flip_screen_get(machine);
+ int flip = state->flip_screen();
int flipmask = flip ? 0xff : 0x00;
int offs;
diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c
index 383b81091e6..6c37f790ca5 100644
--- a/src/mame/video/zodiack.c
+++ b/src/mame/video/zodiack.c
@@ -39,9 +39,9 @@ WRITE8_MEMBER( zodiack_state::attributes_w )
WRITE8_MEMBER( zodiack_state::flipscreen_w )
{
- if (flip_screen_get(machine()) != (~data & 0x01))
+ if (flip_screen() != (~data & 0x01))
{
- flip_screen_set(machine(), ~data & 0x01);
+ flip_screen_set(~data & 0x01);
machine().tilemap().mark_all_dirty();
}
}
@@ -127,7 +127,7 @@ void zodiack_state::video_start()
m_fg_tilemap->set_scroll_cols(32);
/* FIXME: flip_screen_x should not be written. */
- flip_screen_set_no_update(machine(), 0);
+ flip_screen_set_no_update(0);
}
void zodiack_state::draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect )
@@ -139,7 +139,7 @@ void zodiack_state::draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprec
x = m_bulletsram[offs + 3] + 7;
y = 255 - m_bulletsram[offs + 1];
- if (flip_screen_get(machine()) && m_percuss_hardware)
+ if (flip_screen() && m_percuss_hardware)
{
y = 255 - y;
}
@@ -166,7 +166,7 @@ void zodiack_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec
flipy = m_spriteram[offs + 1] & 0x80;
spritecode = m_spriteram[offs + 1] & 0x3f;
- if (flip_screen_get(machine()) && m_percuss_hardware)
+ if (flip_screen() && m_percuss_hardware)
{
sy = 240 - sy;
flipy = !flipy;