summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2024-05-18 12:44:19 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2024-05-18 12:44:19 +1000
commitf1e34dd4022e50950ba70bcc1f672134b67a87c1 (patch)
tree2734a02b61e4f6aed256c7a7e7ad5b8109394a8a
parent3a5164288d1c81d400e68b2066c9b2ea303ac727 (diff)
Upgrade my works to GPL 2.0
-rw-r--r--README.md7
-rw-r--r--docs/release/README.md13
-rw-r--r--docs/release/hbmame2459s.zipbin4786139 -> 0 bytes
-rw-r--r--scripts/target/hbmame/hbmame.lua2
-rw-r--r--scripts/target/mame/arcade.lua2
-rw-r--r--src/hbmame/drivers/1942.cpp2
-rw-r--r--src/hbmame/drivers/1943.cpp2
-rw-r--r--src/hbmame/drivers/aerofgt.cpp2
-rw-r--r--src/hbmame/drivers/arkanoid.cpp2
-rw-r--r--src/hbmame/drivers/asteroid.cpp2
-rw-r--r--src/hbmame/drivers/astrocde.cpp2
-rw-r--r--src/hbmame/drivers/astrof.cpp2
-rw-r--r--src/hbmame/drivers/asuka.cpp2
-rw-r--r--src/hbmame/drivers/atarisy1.cpp2
-rw-r--r--src/hbmame/drivers/bagman.cpp2
-rw-r--r--src/hbmame/drivers/blktiger.cpp2
-rw-r--r--src/hbmame/drivers/bloodbro.cpp2
-rw-r--r--src/hbmame/drivers/bombjack.cpp2
-rw-r--r--src/hbmame/drivers/btime.cpp2
-rw-r--r--src/hbmame/drivers/bublbobl.cpp2
-rw-r--r--src/hbmame/drivers/bwidow.cpp2
-rw-r--r--src/hbmame/drivers/cabal.cpp2
-rw-r--r--src/hbmame/drivers/cave.cpp2
-rw-r--r--src/hbmame/drivers/cball.cpp2
-rw-r--r--src/hbmame/drivers/cclimber.cpp2
-rw-r--r--src/hbmame/drivers/centiped.cpp2
-rw-r--r--src/hbmame/drivers/cinemat.cpp2
-rw-r--r--src/hbmame/drivers/cninja.cpp2
-rw-r--r--src/hbmame/drivers/commando.cpp2
-rw-r--r--src/hbmame/drivers/contra.cpp2
-rw-r--r--src/hbmame/drivers/cps1mis.cpp2
-rw-r--r--src/hbmame/drivers/cps2mis.cpp2
-rw-r--r--src/hbmame/drivers/cps2t.cpp2
-rw-r--r--src/hbmame/drivers/cv1k.cpp2
-rw-r--r--src/hbmame/drivers/dbz.cpp2
-rw-r--r--src/hbmame/drivers/ddenlovr.cpp2
-rw-r--r--src/hbmame/drivers/ddragon.cpp2
-rw-r--r--src/hbmame/drivers/dec0.cpp2
-rw-r--r--src/hbmame/drivers/deco32.cpp2
-rw-r--r--src/hbmame/drivers/dkong.cpp2
-rw-r--r--src/hbmame/drivers/docastle.cpp2
-rw-r--r--src/hbmame/drivers/dotrikun.cpp2
-rw-r--r--src/hbmame/drivers/dynax.cpp2
-rw-r--r--src/hbmame/drivers/ertictac.cpp2
-rw-r--r--src/hbmame/drivers/exerion.cpp2
-rw-r--r--src/hbmame/drivers/exidy.cpp2
-rw-r--r--src/hbmame/drivers/flstory.cpp2
-rw-r--r--src/hbmame/drivers/fuukifg3.cpp2
-rw-r--r--src/hbmame/drivers/galaga.cpp2
-rw-r--r--src/hbmame/drivers/galaxian.cpp2
-rw-r--r--src/hbmame/drivers/gauntlet.cpp2
-rw-r--r--src/hbmame/drivers/ginganin.cpp2
-rw-r--r--src/hbmame/drivers/gottlieb.cpp3
-rw-r--r--src/hbmame/drivers/gradius3.cpp4
-rw-r--r--src/hbmame/drivers/hh_sm510.cpp2
-rw-r--r--src/hbmame/drivers/igs011.cpp4
-rw-r--r--src/hbmame/drivers/ikage.cpp4
-rw-r--r--src/hbmame/drivers/itech8.cpp2
-rw-r--r--src/hbmame/drivers/jrpacman.cpp101
-rw-r--r--src/hbmame/drivers/kaneko16.cpp2
-rw-r--r--src/hbmame/drivers/kikikai.cpp4
-rw-r--r--src/hbmame/drivers/kof2000.cpp2
-rw-r--r--src/hbmame/drivers/kof2001.cpp2
-rw-r--r--src/hbmame/drivers/kof2002.cpp2
-rw-r--r--src/hbmame/drivers/kof2003.cpp2
-rw-r--r--src/hbmame/drivers/kof94.cpp2
-rw-r--r--src/hbmame/drivers/kof95.cpp2
-rw-r--r--src/hbmame/drivers/kof96.cpp2
-rw-r--r--src/hbmame/drivers/kof97.cpp2
-rw-r--r--src/hbmame/drivers/kof98.cpp2
-rw-r--r--src/hbmame/drivers/kof99.cpp2
-rw-r--r--src/hbmame/drivers/konamigx.cpp2
-rw-r--r--src/hbmame/drivers/kyugo.cpp2
-rw-r--r--src/hbmame/drivers/lordgun.cpp2
-rw-r--r--src/hbmame/drivers/m52.cpp2
-rw-r--r--src/hbmame/drivers/m92.cpp2
-rw-r--r--src/hbmame/drivers/maketrax.cpp2
-rw-r--r--src/hbmame/drivers/mappy.cpp2
-rw-r--r--src/hbmame/drivers/mario.cpp2
-rw-r--r--src/hbmame/drivers/mcatadv.cpp3
-rw-r--r--src/hbmame/drivers/mcr.cpp2
-rw-r--r--src/hbmame/drivers/mcr3.cpp2
-rw-r--r--src/hbmame/drivers/mgd2.cpp2
-rw-r--r--src/hbmame/drivers/midtunit.cpp2
-rw-r--r--src/hbmame/drivers/midwunit.cpp2
-rw-r--r--src/hbmame/drivers/midyunit.cpp2
-rw-r--r--src/hbmame/drivers/missile.cpp2
-rw-r--r--src/hbmame/drivers/mitchell.cpp2
-rw-r--r--src/hbmame/drivers/mnw.cpp2
-rw-r--r--src/hbmame/drivers/model1.cpp2
-rw-r--r--src/hbmame/drivers/model2.cpp2
-rw-r--r--src/hbmame/drivers/mrdo.cpp2
-rw-r--r--src/hbmame/drivers/mslug.cpp2
-rw-r--r--src/hbmame/drivers/mslug2.cpp2
-rw-r--r--src/hbmame/drivers/mslug3.cpp2
-rw-r--r--src/hbmame/drivers/mslug4.cpp2
-rw-r--r--src/hbmame/drivers/mslug5.cpp2
-rw-r--r--src/hbmame/drivers/mslug6.cpp2
-rw-r--r--src/hbmame/drivers/mslugx.cpp2
-rw-r--r--src/hbmame/drivers/mspacman.cpp2
-rw-r--r--src/hbmame/drivers/multipac.cpp2
-rw-r--r--src/hbmame/drivers/mystwarr.cpp2
-rw-r--r--src/hbmame/drivers/namcona1.cpp2
-rw-r--r--src/hbmame/drivers/namcos2.cpp2
-rw-r--r--src/hbmame/drivers/namcos86.cpp2
-rw-r--r--src/hbmame/drivers/nemesis.cpp2
-rw-r--r--src/hbmame/drivers/neogeo1.cpp2
-rw-r--r--src/hbmame/drivers/neogeohb.cpp1
-rw-r--r--src/hbmame/drivers/ngdoubledr.cpp2
-rw-r--r--src/hbmame/drivers/nggaroup.cpp2
-rw-r--r--src/hbmame/drivers/ngkofmisc.cpp2
-rw-r--r--src/hbmame/drivers/nglastblade.cpp2
-rw-r--r--src/hbmame/drivers/ngrbff.cpp2
-rw-r--r--src/hbmame/drivers/ngrotd.cpp2
-rw-r--r--src/hbmame/drivers/ngsamsho.cpp2
-rw-r--r--src/hbmame/drivers/ngsengoku.cpp2
-rw-r--r--src/hbmame/drivers/ngsvc.cpp2
-rw-r--r--src/hbmame/drivers/ngwh.cpp2
-rw-r--r--src/hbmame/drivers/nmk16.cpp2
-rw-r--r--src/hbmame/drivers/pacland.cpp2
-rw-r--r--src/hbmame/drivers/pcktgal.cpp2
-rw-r--r--src/hbmame/drivers/pengo.cpp2
-rw-r--r--src/hbmame/drivers/pgm.cpp2
-rw-r--r--src/hbmame/drivers/phoenix.cpp2
-rw-r--r--src/hbmame/drivers/playch10.cpp2
-rw-r--r--src/hbmame/drivers/polepos.cpp2
-rw-r--r--src/hbmame/drivers/pooyan.cpp2
-rw-r--r--src/hbmame/drivers/powerins.cpp2
-rw-r--r--src/hbmame/drivers/psikyo.cpp4
-rw-r--r--src/hbmame/drivers/psikyosh.cpp2
-rw-r--r--src/hbmame/drivers/puckman.cpp2
-rw-r--r--src/hbmame/drivers/r2dx_v33.cpp2
-rw-r--r--src/hbmame/drivers/rabbit.cpp2
-rw-r--r--src/hbmame/drivers/raiden2.cpp2
-rw-r--r--src/hbmame/drivers/rallyx.cpp2
-rw-r--r--src/hbmame/drivers/rastan.cpp2
-rw-r--r--src/hbmame/drivers/retofinv.cpp2
-rw-r--r--src/hbmame/drivers/rohga.cpp2
-rw-r--r--src/hbmame/drivers/schaser.cpp2
-rw-r--r--src/hbmame/drivers/scramble.cpp2
-rw-r--r--src/hbmame/drivers/segac2.cpp2
-rw-r--r--src/hbmame/drivers/segag80r.cpp2
-rw-r--r--src/hbmame/drivers/segahang.cpp2
-rw-r--r--src/hbmame/drivers/segaorun.cpp2
-rw-r--r--src/hbmame/drivers/segas16b.cpp2
-rw-r--r--src/hbmame/drivers/segas18.cpp2
-rw-r--r--src/hbmame/drivers/segas24.cpp2
-rw-r--r--src/hbmame/drivers/segas32.cpp2
-rw-r--r--src/hbmame/drivers/seta.cpp2
-rw-r--r--src/hbmame/drivers/seta2.cpp2
-rw-r--r--src/hbmame/drivers/shadfrce.cpp2
-rw-r--r--src/hbmame/drivers/shaolins.cpp2
-rw-r--r--src/hbmame/drivers/sidepckt.cpp2
-rw-r--r--src/hbmame/drivers/silkroad.cpp2
-rw-r--r--src/hbmame/drivers/simple_st0016.cpp2
-rw-r--r--src/hbmame/drivers/snesb.cpp2
-rw-r--r--src/hbmame/drivers/snk6502.cpp2
-rw-r--r--src/hbmame/drivers/snowbros.cpp4
-rw-r--r--src/hbmame/drivers/solomon.cpp4
-rw-r--r--src/hbmame/drivers/spacmiss.cpp2
-rw-r--r--src/hbmame/drivers/ssv.cpp2
-rw-r--r--src/hbmame/drivers/stv.cpp2
-rw-r--r--src/hbmame/drivers/system1.cpp2
-rw-r--r--src/hbmame/drivers/system16.cpp2
-rw-r--r--src/hbmame/drivers/taito_b.cpp2
-rw-r--r--src/hbmame/drivers/taito_f2.cpp2
-rw-r--r--src/hbmame/drivers/taito_f3.cpp2
-rw-r--r--src/hbmame/drivers/taito_l.cpp2
-rw-r--r--src/hbmame/drivers/taito_z.cpp2
-rw-r--r--src/hbmame/drivers/taitosj.cpp2
-rw-r--r--src/hbmame/drivers/taotaido.cpp2
-rw-r--r--src/hbmame/drivers/tecmo.cpp2
-rw-r--r--src/hbmame/drivers/tecmo16.cpp2
-rw-r--r--src/hbmame/drivers/tecmosys.cpp4
-rw-r--r--src/hbmame/drivers/tehkanwc.cpp2
-rw-r--r--src/hbmame/drivers/tempest.cpp2
-rw-r--r--src/hbmame/drivers/terracre.cpp2
-rw-r--r--src/hbmame/drivers/timelimit.cpp2
-rw-r--r--src/hbmame/drivers/timeplt.cpp2
-rw-r--r--src/hbmame/drivers/tmnt.cpp2
-rw-r--r--src/hbmame/drivers/tnzs.cpp2
-rw-r--r--src/hbmame/drivers/toaplan2.cpp2
-rw-r--r--src/hbmame/drivers/trackfld.cpp2
-rw-r--r--src/hbmame/drivers/twincobr.cpp2
-rw-r--r--src/hbmame/drivers/vamphalf.cpp2
-rw-r--r--src/hbmame/drivers/volfied.cpp2
-rw-r--r--src/hbmame/drivers/vsnes.cpp2
-rw-r--r--src/hbmame/drivers/warriorb.cpp2
-rw-r--r--src/hbmame/drivers/wc90b.cpp2
-rw-r--r--src/hbmame/drivers/williams.cpp2
-rw-r--r--src/hbmame/drivers/wiz.cpp2
-rw-r--r--src/hbmame/drivers/yiear.cpp2
-rw-r--r--src/hbmame/drivers/zn.cpp2
-rw-r--r--src/hbmame/hbmame.cpp2
-rw-r--r--src/hbmame/hbmame.lst2
-rw-r--r--src/hbmame/hbmame.mak2
-rw-r--r--src/hbmame/igs/iq_pgm_hb.cpp2
-rw-r--r--src/hbmame/includes/cps2.h2
-rw-r--r--src/hbmame/includes/galaga.h2
-rw-r--r--src/hbmame/includes/galaxian.h2
-rw-r--r--src/hbmame/includes/neogeo.h5
-rw-r--r--src/hbmame/osd/windows/hbmame/hbmame.rc2
-rw-r--r--src/hbmame/video/puckman.cpp2
203 files changed, 216 insertions, 323 deletions
diff --git a/README.md b/README.md
index d01e05170b4..2fc4fab6d81 100644
--- a/README.md
+++ b/README.md
@@ -26,13 +26,16 @@ make TARGET=hbmame OSD=winui SYMBOLS=0 NO_SYMBOLS=1 DEPRECATED=0
Where can I find out more?
==========================
-* [Official HBMAME site](http://hbmame.1emulation.com/)
-* [Forum](http://www.mameworld.info/ubbthreads/postlist.php?Cat=&Board=misfitmame) (bug reports go here too)
+* [Official HBMAME site] http://hbmame.1emulation.com/
+* [Forum] https://www.mameworld.info/ubbthreads/postlist.php?Cat=&Board=misfitmame (bug reports go here too)
+* [Forum] https://www.1emulation.com/forums/forum/125-mameui/
Licensing Information
=====================
+The primary license is GPL_2.0 : https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
+
Information about the MAME content can be found at https://github.com/mamedev/mame/blob/master/README.md
Information about the license can be found in COPYING
diff --git a/docs/release/README.md b/docs/release/README.md
index 947859e0c69..2fc4fab6d81 100644
--- a/docs/release/README.md
+++ b/docs/release/README.md
@@ -12,13 +12,13 @@ How to compile
==============
```
-make PTR64=1 TARGET=hbmame SYMBOLS=0 NO_SYMBOLS=1 DEPRECATED=0
+make TARGET=hbmame SYMBOLS=0 NO_SYMBOLS=1 DEPRECATED=0
```
or
```
-make PTR64=1 TARGET=hbmame SYMBOLS=0 NO_SYMBOLS=1 DEPRECATED=0 OSD=winui
+make TARGET=hbmame OSD=winui SYMBOLS=0 NO_SYMBOLS=1 DEPRECATED=0
```
@@ -26,15 +26,18 @@ make PTR64=1 TARGET=hbmame SYMBOLS=0 NO_SYMBOLS=1 DEPRECATED=0 OSD=winui
Where can I find out more?
==========================
-* [Official HBMAME site](http://hbmame.1emulation.com/)
-* [Forum](http://www.mameworld.info/ubbthreads/postlist.php?Cat=&Board=misfitmame) (bug reports go here too)
+* [Official HBMAME site] http://hbmame.1emulation.com/
+* [Forum] https://www.mameworld.info/ubbthreads/postlist.php?Cat=&Board=misfitmame (bug reports go here too)
+* [Forum] https://www.1emulation.com/forums/forum/125-mameui/
Licensing Information
=====================
+The primary license is GPL_2.0 : https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
+
Information about the MAME content can be found at https://github.com/mamedev/mame/blob/master/README.md
-Information about the MAME license can be found in COPYING
+Information about the license can be found in COPYING
Information about the WINUI portion can be found at https://github.com/Robbbert/mameui/blob/master/docs/winui_license.txt
diff --git a/docs/release/hbmame2459s.zip b/docs/release/hbmame2459s.zip
deleted file mode 100644
index 844c7507c44..00000000000
--- a/docs/release/hbmame2459s.zip
+++ /dev/null
Binary files differ
diff --git a/scripts/target/hbmame/hbmame.lua b/scripts/target/hbmame/hbmame.lua
index bdee9559081..2fada6e875d 100644
--- a/scripts/target/hbmame/hbmame.lua
+++ b/scripts/target/hbmame/hbmame.lua
@@ -1,4 +1,4 @@
--- license:BSD-3-Clause
+-- license:GPL_2.0
-- copyright-holders:Robbbert
---------------------------------------------------------------------------
--
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 5f101510b19..32629f0f28c 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -1,4 +1,4 @@
--- license:BSD-3-Clause
+-- license:GPL_2.0
-- copyright-holders:MAMEdev Team
---------------------------------------------------------------------------
diff --git a/src/hbmame/drivers/1942.cpp b/src/hbmame/drivers/1942.cpp
index 51aeb810c59..5582801b917 100644
--- a/src/hbmame/drivers/1942.cpp
+++ b/src/hbmame/drivers/1942.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/1942.cpp"
diff --git a/src/hbmame/drivers/1943.cpp b/src/hbmame/drivers/1943.cpp
index a12f2376692..6505a1e03a2 100644
--- a/src/hbmame/drivers/1943.cpp
+++ b/src/hbmame/drivers/1943.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/1943.cpp"
diff --git a/src/hbmame/drivers/aerofgt.cpp b/src/hbmame/drivers/aerofgt.cpp
index f6215a03e57..bea1cc0247d 100644
--- a/src/hbmame/drivers/aerofgt.cpp
+++ b/src/hbmame/drivers/aerofgt.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/aerofgt.cpp"
diff --git a/src/hbmame/drivers/arkanoid.cpp b/src/hbmame/drivers/arkanoid.cpp
index ebeaaf1a4ab..b4b413110c2 100644
--- a/src/hbmame/drivers/arkanoid.cpp
+++ b/src/hbmame/drivers/arkanoid.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/arkanoid.cpp"
diff --git a/src/hbmame/drivers/asteroid.cpp b/src/hbmame/drivers/asteroid.cpp
index 2617b1bc574..ef95292c952 100644
--- a/src/hbmame/drivers/asteroid.cpp
+++ b/src/hbmame/drivers/asteroid.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/asteroid.cpp"
diff --git a/src/hbmame/drivers/astrocde.cpp b/src/hbmame/drivers/astrocde.cpp
index 10bb35b36ca..91ef757882a 100644
--- a/src/hbmame/drivers/astrocde.cpp
+++ b/src/hbmame/drivers/astrocde.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/astrocde.cpp"
diff --git a/src/hbmame/drivers/astrof.cpp b/src/hbmame/drivers/astrof.cpp
index dfc9c2a8867..f8aa6f25488 100644
--- a/src/hbmame/drivers/astrof.cpp
+++ b/src/hbmame/drivers/astrof.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/astrof.cpp"
diff --git a/src/hbmame/drivers/asuka.cpp b/src/hbmame/drivers/asuka.cpp
index 561531aed90..b255449a8a2 100644
--- a/src/hbmame/drivers/asuka.cpp
+++ b/src/hbmame/drivers/asuka.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/asuka.cpp"
diff --git a/src/hbmame/drivers/atarisy1.cpp b/src/hbmame/drivers/atarisy1.cpp
index dc6094f039c..b9184443b5e 100644
--- a/src/hbmame/drivers/atarisy1.cpp
+++ b/src/hbmame/drivers/atarisy1.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/atarisy1.cpp"
diff --git a/src/hbmame/drivers/bagman.cpp b/src/hbmame/drivers/bagman.cpp
index fc6db934040..d8bb20704e7 100644
--- a/src/hbmame/drivers/bagman.cpp
+++ b/src/hbmame/drivers/bagman.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/bagman.cpp"
diff --git a/src/hbmame/drivers/blktiger.cpp b/src/hbmame/drivers/blktiger.cpp
index ce9c700f33d..eb645359e96 100644
--- a/src/hbmame/drivers/blktiger.cpp
+++ b/src/hbmame/drivers/blktiger.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/blktiger.cpp"
diff --git a/src/hbmame/drivers/bloodbro.cpp b/src/hbmame/drivers/bloodbro.cpp
index 2906deeec21..5d3da5cd157 100644
--- a/src/hbmame/drivers/bloodbro.cpp
+++ b/src/hbmame/drivers/bloodbro.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/bloodbro.cpp"
diff --git a/src/hbmame/drivers/bombjack.cpp b/src/hbmame/drivers/bombjack.cpp
index f59a58dfc2d..9a802f5b871 100644
--- a/src/hbmame/drivers/bombjack.cpp
+++ b/src/hbmame/drivers/bombjack.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/bombjack.cpp"
diff --git a/src/hbmame/drivers/btime.cpp b/src/hbmame/drivers/btime.cpp
index 41828f6cf6a..8bcfeb6f6cb 100644
--- a/src/hbmame/drivers/btime.cpp
+++ b/src/hbmame/drivers/btime.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/btime.cpp"
diff --git a/src/hbmame/drivers/bublbobl.cpp b/src/hbmame/drivers/bublbobl.cpp
index 0a1f5d43058..cf5578e2bb6 100644
--- a/src/hbmame/drivers/bublbobl.cpp
+++ b/src/hbmame/drivers/bublbobl.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/bublbobl.cpp"
diff --git a/src/hbmame/drivers/bwidow.cpp b/src/hbmame/drivers/bwidow.cpp
index 02c83062476..44d0a8e27b1 100644
--- a/src/hbmame/drivers/bwidow.cpp
+++ b/src/hbmame/drivers/bwidow.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/bwidow.cpp"
diff --git a/src/hbmame/drivers/cabal.cpp b/src/hbmame/drivers/cabal.cpp
index 07f78283547..cf5cac49f51 100644
--- a/src/hbmame/drivers/cabal.cpp
+++ b/src/hbmame/drivers/cabal.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/cabal.cpp"
diff --git a/src/hbmame/drivers/cave.cpp b/src/hbmame/drivers/cave.cpp
index 8536739820a..b7400cbcdd0 100644
--- a/src/hbmame/drivers/cave.cpp
+++ b/src/hbmame/drivers/cave.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/cave.cpp"
diff --git a/src/hbmame/drivers/cball.cpp b/src/hbmame/drivers/cball.cpp
index dfc2d973233..93cd59ec4c7 100644
--- a/src/hbmame/drivers/cball.cpp
+++ b/src/hbmame/drivers/cball.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/cball.cpp"
/***************************************************************************
diff --git a/src/hbmame/drivers/cclimber.cpp b/src/hbmame/drivers/cclimber.cpp
index f0d3da56dfe..019e5fb99e3 100644
--- a/src/hbmame/drivers/cclimber.cpp
+++ b/src/hbmame/drivers/cclimber.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/cclimber.cpp"
diff --git a/src/hbmame/drivers/centiped.cpp b/src/hbmame/drivers/centiped.cpp
index ebbdba1b645..dfa40a49e4d 100644
--- a/src/hbmame/drivers/centiped.cpp
+++ b/src/hbmame/drivers/centiped.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/centiped.cpp"
diff --git a/src/hbmame/drivers/cinemat.cpp b/src/hbmame/drivers/cinemat.cpp
index dcd85df77ca..28fd7e01bed 100644
--- a/src/hbmame/drivers/cinemat.cpp
+++ b/src/hbmame/drivers/cinemat.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/* BBUGTEST NOTES
diff --git a/src/hbmame/drivers/cninja.cpp b/src/hbmame/drivers/cninja.cpp
index 2ced9a1af6a..8c1d2add41b 100644
--- a/src/hbmame/drivers/cninja.cpp
+++ b/src/hbmame/drivers/cninja.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/cninja.cpp"
diff --git a/src/hbmame/drivers/commando.cpp b/src/hbmame/drivers/commando.cpp
index b024165ecea..91793c13e32 100644
--- a/src/hbmame/drivers/commando.cpp
+++ b/src/hbmame/drivers/commando.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/commando.cpp"
diff --git a/src/hbmame/drivers/contra.cpp b/src/hbmame/drivers/contra.cpp
index aaf0a6b24e7..c9eb2cd024c 100644
--- a/src/hbmame/drivers/contra.cpp
+++ b/src/hbmame/drivers/contra.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/contra.cpp"
diff --git a/src/hbmame/drivers/cps1mis.cpp b/src/hbmame/drivers/cps1mis.cpp
index a2b276ef571..b79f5f74e08 100644
--- a/src/hbmame/drivers/cps1mis.cpp
+++ b/src/hbmame/drivers/cps1mis.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/*******************************************************************************************************************
diff --git a/src/hbmame/drivers/cps2mis.cpp b/src/hbmame/drivers/cps2mis.cpp
index ee6ed288070..f59d87ea76a 100644
--- a/src/hbmame/drivers/cps2mis.cpp
+++ b/src/hbmame/drivers/cps2mis.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/*********************************************
diff --git a/src/hbmame/drivers/cps2t.cpp b/src/hbmame/drivers/cps2t.cpp
index 320a2795be6..4a376536560 100644
--- a/src/hbmame/drivers/cps2t.cpp
+++ b/src/hbmame/drivers/cps2t.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders: same as cps2.cpp, plus Zero800
/*******************************************************************************/
diff --git a/src/hbmame/drivers/cv1k.cpp b/src/hbmame/drivers/cv1k.cpp
index 976dbb158fd..e557fb865e9 100644
--- a/src/hbmame/drivers/cv1k.cpp
+++ b/src/hbmame/drivers/cv1k.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/cv1k.cpp"
diff --git a/src/hbmame/drivers/dbz.cpp b/src/hbmame/drivers/dbz.cpp
index c6acfef7f36..00b36fedba1 100644
--- a/src/hbmame/drivers/dbz.cpp
+++ b/src/hbmame/drivers/dbz.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/dbz.cpp"
diff --git a/src/hbmame/drivers/ddenlovr.cpp b/src/hbmame/drivers/ddenlovr.cpp
index 1ad140e01cb..142914c5460 100644
--- a/src/hbmame/drivers/ddenlovr.cpp
+++ b/src/hbmame/drivers/ddenlovr.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/ddenlovr.cpp"
diff --git a/src/hbmame/drivers/ddragon.cpp b/src/hbmame/drivers/ddragon.cpp
index da9c26aed26..e9974d4b40d 100644
--- a/src/hbmame/drivers/ddragon.cpp
+++ b/src/hbmame/drivers/ddragon.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/ddragon.cpp"
diff --git a/src/hbmame/drivers/dec0.cpp b/src/hbmame/drivers/dec0.cpp
index 4f274073c67..2ea2c2c7c38 100644
--- a/src/hbmame/drivers/dec0.cpp
+++ b/src/hbmame/drivers/dec0.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/dec0.cpp"
diff --git a/src/hbmame/drivers/deco32.cpp b/src/hbmame/drivers/deco32.cpp
index 8ba691a74b5..912be5bd544 100644
--- a/src/hbmame/drivers/deco32.cpp
+++ b/src/hbmame/drivers/deco32.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/deco32.cpp"
diff --git a/src/hbmame/drivers/dkong.cpp b/src/hbmame/drivers/dkong.cpp
index b0c512458ca..7f212a01ad2 100644
--- a/src/hbmame/drivers/dkong.cpp
+++ b/src/hbmame/drivers/dkong.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/dkong.cpp"
diff --git a/src/hbmame/drivers/docastle.cpp b/src/hbmame/drivers/docastle.cpp
index a6ac2f9b389..90ccad8b812 100644
--- a/src/hbmame/drivers/docastle.cpp
+++ b/src/hbmame/drivers/docastle.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/docastle.cpp"
diff --git a/src/hbmame/drivers/dotrikun.cpp b/src/hbmame/drivers/dotrikun.cpp
index 7ba9f5bd37a..57ded8aa974 100644
--- a/src/hbmame/drivers/dotrikun.cpp
+++ b/src/hbmame/drivers/dotrikun.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/dotrikun.cpp"
#include "speaker.h"
diff --git a/src/hbmame/drivers/dynax.cpp b/src/hbmame/drivers/dynax.cpp
index 7277423e0cd..dcf04d28ca7 100644
--- a/src/hbmame/drivers/dynax.cpp
+++ b/src/hbmame/drivers/dynax.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/dynax.cpp"
diff --git a/src/hbmame/drivers/ertictac.cpp b/src/hbmame/drivers/ertictac.cpp
index f175893924b..2c430bbec73 100644
--- a/src/hbmame/drivers/ertictac.cpp
+++ b/src/hbmame/drivers/ertictac.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/ertictac.cpp"
diff --git a/src/hbmame/drivers/exerion.cpp b/src/hbmame/drivers/exerion.cpp
index e5d646b191d..08568bac870 100644
--- a/src/hbmame/drivers/exerion.cpp
+++ b/src/hbmame/drivers/exerion.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/exerion.cpp"
diff --git a/src/hbmame/drivers/exidy.cpp b/src/hbmame/drivers/exidy.cpp
index 8a66976f72e..a0bef6beab9 100644
--- a/src/hbmame/drivers/exidy.cpp
+++ b/src/hbmame/drivers/exidy.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/exidy.cpp"
#include "../mame/video/victory.cpp"
diff --git a/src/hbmame/drivers/flstory.cpp b/src/hbmame/drivers/flstory.cpp
index 52681bf5337..77cbca05a96 100644
--- a/src/hbmame/drivers/flstory.cpp
+++ b/src/hbmame/drivers/flstory.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/flstory.cpp"
diff --git a/src/hbmame/drivers/fuukifg3.cpp b/src/hbmame/drivers/fuukifg3.cpp
index ec9058a6c36..2c7b8eb4b26 100644
--- a/src/hbmame/drivers/fuukifg3.cpp
+++ b/src/hbmame/drivers/fuukifg3.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/fuukifg3.cpp"
diff --git a/src/hbmame/drivers/galaga.cpp b/src/hbmame/drivers/galaga.cpp
index 8c70a6be0ec..6f6ba4f82ee 100644
--- a/src/hbmame/drivers/galaga.cpp
+++ b/src/hbmame/drivers/galaga.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/galaga.cpp"
diff --git a/src/hbmame/drivers/galaxian.cpp b/src/hbmame/drivers/galaxian.cpp
index e232c9c3a5d..57efb47a9a8 100644
--- a/src/hbmame/drivers/galaxian.cpp
+++ b/src/hbmame/drivers/galaxian.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/galaxian.cpp"
diff --git a/src/hbmame/drivers/gauntlet.cpp b/src/hbmame/drivers/gauntlet.cpp
index 6bdd6537bc2..19992fd207d 100644
--- a/src/hbmame/drivers/gauntlet.cpp
+++ b/src/hbmame/drivers/gauntlet.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/gauntlet.cpp"
diff --git a/src/hbmame/drivers/ginganin.cpp b/src/hbmame/drivers/ginganin.cpp
index 83259b96883..8d51d511013 100644
--- a/src/hbmame/drivers/ginganin.cpp
+++ b/src/hbmame/drivers/ginganin.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/ginganin.cpp"
diff --git a/src/hbmame/drivers/gottlieb.cpp b/src/hbmame/drivers/gottlieb.cpp
index e3c043ba19e..0e146d60129 100644
--- a/src/hbmame/drivers/gottlieb.cpp
+++ b/src/hbmame/drivers/gottlieb.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/gottlieb.cpp"
@@ -44,7 +44,6 @@ ROM_START( pbert )
ROM_LOAD( "pb-fg0.bin", 0x6000, 0x2000, CRC(495d90e9) SHA1(d4d28c30901eb09da8933c03b2178152f0fc7b84) )
ROM_END
-// E444
ROM_START( qbertb )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "qb-rom2.bin", 0xa000, 0x2000, CRC(fe434526) SHA1(4cfc5d52dd6c82163e035af82d6112c0c93a3797) )
diff --git a/src/hbmame/drivers/gradius3.cpp b/src/hbmame/drivers/gradius3.cpp
index d79856b8c48..c2347202f85 100644
--- a/src/hbmame/drivers/gradius3.cpp
+++ b/src/hbmame/drivers/gradius3.cpp
@@ -1,7 +1,5 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
-// Proyecto De Inicio:"2016/2017"
-// Derechos Del Autor:Gaston90
#include "../mame/drivers/gradius3.cpp"
/***********
diff --git a/src/hbmame/drivers/hh_sm510.cpp b/src/hbmame/drivers/hh_sm510.cpp
index 3c54d3f9b13..dfe97ebb0ed 100644
--- a/src/hbmame/drivers/hh_sm510.cpp
+++ b/src/hbmame/drivers/hh_sm510.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/hh_sm510.cpp"
diff --git a/src/hbmame/drivers/igs011.cpp b/src/hbmame/drivers/igs011.cpp
index eddb5122eba..f659263cab6 100644
--- a/src/hbmame/drivers/igs011.cpp
+++ b/src/hbmame/drivers/igs011.cpp
@@ -1,7 +1,5 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
-// Proyecto De Inicio:"2016/2017"
-// Derechos Del Autor:Gaston90
#include "../mame/drivers/igs011.cpp"
/***************
diff --git a/src/hbmame/drivers/ikage.cpp b/src/hbmame/drivers/ikage.cpp
index 0a1921606f0..005fd4953bf 100644
--- a/src/hbmame/drivers/ikage.cpp
+++ b/src/hbmame/drivers/ikage.cpp
@@ -1,7 +1,5 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
-// Proyecto De Inicio:"2016/2017"
-// Derechos Del Autor:Gaston90
#include "../mame/drivers/lkage.cpp"
/****************************************
diff --git a/src/hbmame/drivers/itech8.cpp b/src/hbmame/drivers/itech8.cpp
index 627d0e9f8dd..fc45ccd924e 100644
--- a/src/hbmame/drivers/itech8.cpp
+++ b/src/hbmame/drivers/itech8.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/itech8.cpp"
diff --git a/src/hbmame/drivers/jrpacman.cpp b/src/hbmame/drivers/jrpacman.cpp
index be5de052328..26750fbf3f2 100644
--- a/src/hbmame/drivers/jrpacman.cpp
+++ b/src/hbmame/drivers/jrpacman.cpp
@@ -1,104 +1,5 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
-/***************************************************************************
-
- Bally/Midway Jr. Pac-Man
-
- Games supported:
- * Jr. Pac-Man
-
- Known issues:
- * none
-
-****************************************************************************
-
- Jr. Pac Man memory map (preliminary)
-
- 0000-3fff ROM
- 4000-47ff Video RAM (also color RAM)
- 4800-4fff RAM
- 8000-dfff ROM
-
- memory mapped ports:
-
- read:
- 5000 P1
- 5040 P2
- 5080 DSW
-
- *
- * IN0 (all bits are inverted)
- * bit 7 : CREDIT
- * bit 6 : COIN 2
- * bit 5 : COIN 1
- * bit 4 : RACK TEST
- * bit 3 : DOWN player 1
- * bit 2 : RIGHT player 1
- * bit 1 : LEFT player 1
- * bit 0 : UP player 1
- *
- *
- * IN1 (all bits are inverted)
- * bit 7 : TABLE or UPRIGHT cabinet select (1 = UPRIGHT)
- * bit 6 : START 2
- * bit 5 : START 1
- * bit 4 : TEST SWITCH
- * bit 3 : DOWN player 2 (TABLE only)
- * bit 2 : RIGHT player 2 (TABLE only)
- * bit 1 : LEFT player 2 (TABLE only)
- * bit 0 : UP player 2 (TABLE only)
- *
- *
- * DSW1 (all bits are inverted)
- * bit 7 : ?
- * bit 6 : difficulty level
- * 1 = Normal 0 = Harder
- * bit 5 :\ bonus pac at xx000 pts
- * bit 4 :/ 00 = 10000 01 = 15000 10 = 20000 11 = 30000
- * bit 3 :\ nr of lives
- * bit 2 :/ 00 = 1 01 = 2 10 = 3 11 = 5
- * bit 1 :\ play mode
- * bit 0 :/ 00 = free play 01 = 1 coin 1 credit
- * 10 = 1 coin 2 credits 11 = 2 coins 1 credit
- *
-
- write:
- 4ff2-4ffd 6 pairs of two bytes:
- the first byte contains the sprite image number (bits 2-7), Y flip (bit 0),
- X flip (bit 1); the second byte the color
- 5000 interrupt enable
- 5001 sound enable
- 5002 unused
- 5003 flip screen
- 5004 unused
- 5005 unused
- 5006 unused
- 5007 coin counter
- 5040-5044 sound voice 1 accumulator (nibbles) (used by the sound hardware only)
- 5045 sound voice 1 waveform (nibble)
- 5046-5049 sound voice 2 accumulator (nibbles) (used by the sound hardware only)
- 504a sound voice 2 waveform (nibble)
- 504b-504e sound voice 3 accumulator (nibbles) (used by the sound hardware only)
- 504f sound voice 3 waveform (nibble)
- 5050-5054 sound voice 1 frequency (nibbles)
- 5055 sound voice 1 volume (nibble)
- 5056-5059 sound voice 2 frequency (nibbles)
- 505a sound voice 2 volume (nibble)
- 505b-505e sound voice 3 frequency (nibbles)
- 505f sound voice 3 volume (nibble)
- 5062-506d Sprite coordinates, x/y pairs for 6 sprites
- 5070 palette bank
- 5071 colortable bank
- 5073 background priority over sprites
- 5074 char gfx bank
- 5075 sprite gfx bank
- 5080 scroll
- 50c0 Watchdog reset
-
- I/O ports:
- OUT on port $0 sets the interrupt vector
-
-***************************************************************************/
#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/hbmame/drivers/kaneko16.cpp b/src/hbmame/drivers/kaneko16.cpp
index 311ed3f5dda..be0f706ee02 100644
--- a/src/hbmame/drivers/kaneko16.cpp
+++ b/src/hbmame/drivers/kaneko16.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/kaneko16.cpp"
diff --git a/src/hbmame/drivers/kikikai.cpp b/src/hbmame/drivers/kikikai.cpp
index 5ce03473b37..a763ea9c6d6 100644
--- a/src/hbmame/drivers/kikikai.cpp
+++ b/src/hbmame/drivers/kikikai.cpp
@@ -1,7 +1,5 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
-// Proyecto De Inicio:"2016/2017"
-// Derechos Del Autor:Gaston90
#include "../mame/drivers/kikikai.cpp"
/***********
diff --git a/src/hbmame/drivers/kof2000.cpp b/src/hbmame/drivers/kof2000.cpp
index ca2afe5a360..2135a9c882b 100644
--- a/src/hbmame/drivers/kof2000.cpp
+++ b/src/hbmame/drivers/kof2000.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof2001.cpp b/src/hbmame/drivers/kof2001.cpp
index a6e5cb7d316..6a39be2be8a 100644
--- a/src/hbmame/drivers/kof2001.cpp
+++ b/src/hbmame/drivers/kof2001.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof2002.cpp b/src/hbmame/drivers/kof2002.cpp
index 6a2480fc7a5..1c3ca3226c4 100644
--- a/src/hbmame/drivers/kof2002.cpp
+++ b/src/hbmame/drivers/kof2002.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof2003.cpp b/src/hbmame/drivers/kof2003.cpp
index e4fa4a13f84..96812463ad8 100644
--- a/src/hbmame/drivers/kof2003.cpp
+++ b/src/hbmame/drivers/kof2003.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof94.cpp b/src/hbmame/drivers/kof94.cpp
index 058f728a68e..4e4b9443726 100644
--- a/src/hbmame/drivers/kof94.cpp
+++ b/src/hbmame/drivers/kof94.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof95.cpp b/src/hbmame/drivers/kof95.cpp
index c8a5440806b..2fd4cecf51f 100644
--- a/src/hbmame/drivers/kof95.cpp
+++ b/src/hbmame/drivers/kof95.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// The King of Fighters '95
diff --git a/src/hbmame/drivers/kof96.cpp b/src/hbmame/drivers/kof96.cpp
index e816b9fa6fa..90579f2b1f4 100644
--- a/src/hbmame/drivers/kof96.cpp
+++ b/src/hbmame/drivers/kof96.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof97.cpp b/src/hbmame/drivers/kof97.cpp
index b0b60a312e4..83dcd3f5f09 100644
--- a/src/hbmame/drivers/kof97.cpp
+++ b/src/hbmame/drivers/kof97.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof98.cpp b/src/hbmame/drivers/kof98.cpp
index 80350252bff..116e2182cc9 100644
--- a/src/hbmame/drivers/kof98.cpp
+++ b/src/hbmame/drivers/kof98.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/kof99.cpp b/src/hbmame/drivers/kof99.cpp
index 19428b73587..3ff6d7cd2b0 100644
--- a/src/hbmame/drivers/kof99.cpp
+++ b/src/hbmame/drivers/kof99.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/konamigx.cpp b/src/hbmame/drivers/konamigx.cpp
index 9c00824ccd7..7d45211f813 100644
--- a/src/hbmame/drivers/konamigx.cpp
+++ b/src/hbmame/drivers/konamigx.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/konamigx.cpp"
diff --git a/src/hbmame/drivers/kyugo.cpp b/src/hbmame/drivers/kyugo.cpp
index 53bf539190e..cc360ed2b61 100644
--- a/src/hbmame/drivers/kyugo.cpp
+++ b/src/hbmame/drivers/kyugo.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/kyugo.cpp"
diff --git a/src/hbmame/drivers/lordgun.cpp b/src/hbmame/drivers/lordgun.cpp
index 9ac2e393381..850d1242faf 100644
--- a/src/hbmame/drivers/lordgun.cpp
+++ b/src/hbmame/drivers/lordgun.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/lordgun.cpp"
diff --git a/src/hbmame/drivers/m52.cpp b/src/hbmame/drivers/m52.cpp
index 5456ef8aaa9..2779b2c965d 100644
--- a/src/hbmame/drivers/m52.cpp
+++ b/src/hbmame/drivers/m52.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/m52.cpp"
diff --git a/src/hbmame/drivers/m92.cpp b/src/hbmame/drivers/m92.cpp
index 05541a7fc62..e78e6448288 100644
--- a/src/hbmame/drivers/m92.cpp
+++ b/src/hbmame/drivers/m92.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/m92.cpp"
diff --git a/src/hbmame/drivers/maketrax.cpp b/src/hbmame/drivers/maketrax.cpp
index 028c3420f84..cb02a57b041 100644
--- a/src/hbmame/drivers/maketrax.cpp
+++ b/src/hbmame/drivers/maketrax.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/*************************************
*
diff --git a/src/hbmame/drivers/mappy.cpp b/src/hbmame/drivers/mappy.cpp
index 7f4379ca6f2..09456e8ff42 100644
--- a/src/hbmame/drivers/mappy.cpp
+++ b/src/hbmame/drivers/mappy.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/mappy.cpp"
diff --git a/src/hbmame/drivers/mario.cpp b/src/hbmame/drivers/mario.cpp
index f4588a9eea4..eb07202c049 100644
--- a/src/hbmame/drivers/mario.cpp
+++ b/src/hbmame/drivers/mario.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/mario.cpp"
diff --git a/src/hbmame/drivers/mcatadv.cpp b/src/hbmame/drivers/mcatadv.cpp
index b0d4e2d0e0f..8a467c07e3b 100644
--- a/src/hbmame/drivers/mcatadv.cpp
+++ b/src/hbmame/drivers/mcatadv.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
//***************************************************************************************************************
#include "../mame/drivers/mcatadv.cpp"
@@ -33,3 +33,4 @@ ROM_START( mcatadvs01 ) // Local text hack to show someone's company name
ROM_END
GAME( 1993, mcatadvs01, mcatadv, mcatadv, mcatadv, mcatadv_state, empty_init, ROT0, "Recreativos Zara, S.L.", "Magical Cat Adventure (R.Zara)", MACHINE_SUPPORTS_SAVE )
+
diff --git a/src/hbmame/drivers/mcr.cpp b/src/hbmame/drivers/mcr.cpp
index b91a3f78eb7..3f55406ad71 100644
--- a/src/hbmame/drivers/mcr.cpp
+++ b/src/hbmame/drivers/mcr.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/mcr.cpp"
diff --git a/src/hbmame/drivers/mcr3.cpp b/src/hbmame/drivers/mcr3.cpp
index bc755ff19e3..faa2e287538 100644
--- a/src/hbmame/drivers/mcr3.cpp
+++ b/src/hbmame/drivers/mcr3.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/mcr3.cpp"
diff --git a/src/hbmame/drivers/mgd2.cpp b/src/hbmame/drivers/mgd2.cpp
index 407d3c342fa..598475bd3d5 100644
--- a/src/hbmame/drivers/mgd2.cpp
+++ b/src/hbmame/drivers/mgd2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/* These sets were dumped with the Mega Game Doctor 2
They are reputed to be bad dumps although I have not observed any problems.
diff --git a/src/hbmame/drivers/midtunit.cpp b/src/hbmame/drivers/midtunit.cpp
index f6dd9e81032..cf2adfb80c4 100644
--- a/src/hbmame/drivers/midtunit.cpp
+++ b/src/hbmame/drivers/midtunit.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/midtunit.cpp"
diff --git a/src/hbmame/drivers/midwunit.cpp b/src/hbmame/drivers/midwunit.cpp
index fafae053a87..db7d261aae2 100644
--- a/src/hbmame/drivers/midwunit.cpp
+++ b/src/hbmame/drivers/midwunit.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/midwunit.cpp"
diff --git a/src/hbmame/drivers/midyunit.cpp b/src/hbmame/drivers/midyunit.cpp
index 9fa56d40bb5..899694e0c96 100644
--- a/src/hbmame/drivers/midyunit.cpp
+++ b/src/hbmame/drivers/midyunit.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/midyunit.cpp"
diff --git a/src/hbmame/drivers/missile.cpp b/src/hbmame/drivers/missile.cpp
index 20f71cd45a4..b5d4d209c2e 100644
--- a/src/hbmame/drivers/missile.cpp
+++ b/src/hbmame/drivers/missile.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/missile.cpp"
diff --git a/src/hbmame/drivers/mitchell.cpp b/src/hbmame/drivers/mitchell.cpp
index bb8be383a6d..70381d17dbe 100644
--- a/src/hbmame/drivers/mitchell.cpp
+++ b/src/hbmame/drivers/mitchell.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/mitchell.cpp"
diff --git a/src/hbmame/drivers/mnw.cpp b/src/hbmame/drivers/mnw.cpp
index ab9310c5389..072792be78c 100644
--- a/src/hbmame/drivers/mnw.cpp
+++ b/src/hbmame/drivers/mnw.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// These games are not working, and are stored here just in case
diff --git a/src/hbmame/drivers/model1.cpp b/src/hbmame/drivers/model1.cpp
index 68952566e25..796120fb81c 100644
--- a/src/hbmame/drivers/model1.cpp
+++ b/src/hbmame/drivers/model1.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/model1.cpp"
diff --git a/src/hbmame/drivers/model2.cpp b/src/hbmame/drivers/model2.cpp
index fb730aa4a6e..03c9a2a0c0b 100644
--- a/src/hbmame/drivers/model2.cpp
+++ b/src/hbmame/drivers/model2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/model2.cpp"
diff --git a/src/hbmame/drivers/mrdo.cpp b/src/hbmame/drivers/mrdo.cpp
index 2ff41d21ea3..e18f53478d1 100644
--- a/src/hbmame/drivers/mrdo.cpp
+++ b/src/hbmame/drivers/mrdo.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/mrdo.cpp"
diff --git a/src/hbmame/drivers/mslug.cpp b/src/hbmame/drivers/mslug.cpp
index eb4eeaf945e..ce6de7a1afc 100644
--- a/src/hbmame/drivers/mslug.cpp
+++ b/src/hbmame/drivers/mslug.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Metal Slug
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/mslug2.cpp b/src/hbmame/drivers/mslug2.cpp
index 0518b6b2bfb..6f73670cd2d 100644
--- a/src/hbmame/drivers/mslug2.cpp
+++ b/src/hbmame/drivers/mslug2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Metal Slug 2
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/mslug3.cpp b/src/hbmame/drivers/mslug3.cpp
index a51b6106751..1f5914038b0 100644
--- a/src/hbmame/drivers/mslug3.cpp
+++ b/src/hbmame/drivers/mslug3.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Metal Slug 3
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/mslug4.cpp b/src/hbmame/drivers/mslug4.cpp
index d30a026d4c5..5c498119ee6 100644
--- a/src/hbmame/drivers/mslug4.cpp
+++ b/src/hbmame/drivers/mslug4.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Metal Slug 4
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/mslug5.cpp b/src/hbmame/drivers/mslug5.cpp
index efc57c9bad8..707dbbc2b2c 100644
--- a/src/hbmame/drivers/mslug5.cpp
+++ b/src/hbmame/drivers/mslug5.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Metal Slug 5
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/mslug6.cpp b/src/hbmame/drivers/mslug6.cpp
index d87817ffafd..a5bf68879a6 100644
--- a/src/hbmame/drivers/mslug6.cpp
+++ b/src/hbmame/drivers/mslug6.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Metal Slug 6
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/mslugx.cpp b/src/hbmame/drivers/mslugx.cpp
index c68108ad4bf..fca77b77332 100644
--- a/src/hbmame/drivers/mslugx.cpp
+++ b/src/hbmame/drivers/mslugx.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Metal Slug X
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/mspacman.cpp b/src/hbmame/drivers/mspacman.cpp
index b2910282c0e..e21aa660727 100644
--- a/src/hbmame/drivers/mspacman.cpp
+++ b/src/hbmame/drivers/mspacman.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/* ===== MS PAC MAN ======
diff --git a/src/hbmame/drivers/multipac.cpp b/src/hbmame/drivers/multipac.cpp
index f1eae1f7aef..4cc8e8da350 100644
--- a/src/hbmame/drivers/multipac.cpp
+++ b/src/hbmame/drivers/multipac.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/**********************************************
Multi-game systems on pacman hardware
diff --git a/src/hbmame/drivers/mystwarr.cpp b/src/hbmame/drivers/mystwarr.cpp
index 341a23b1c89..58d5e52b1e9 100644
--- a/src/hbmame/drivers/mystwarr.cpp
+++ b/src/hbmame/drivers/mystwarr.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/mystwarr.cpp"
diff --git a/src/hbmame/drivers/namcona1.cpp b/src/hbmame/drivers/namcona1.cpp
index 7c5e5e9557d..6c4dcde8841 100644
--- a/src/hbmame/drivers/namcona1.cpp
+++ b/src/hbmame/drivers/namcona1.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/namcona1.cpp"
diff --git a/src/hbmame/drivers/namcos2.cpp b/src/hbmame/drivers/namcos2.cpp
index 0106d73301d..f4dac11d46e 100644
--- a/src/hbmame/drivers/namcos2.cpp
+++ b/src/hbmame/drivers/namcos2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/namcos2.cpp"
diff --git a/src/hbmame/drivers/namcos86.cpp b/src/hbmame/drivers/namcos86.cpp
index 2cbd2b998d8..dd575a0c632 100644
--- a/src/hbmame/drivers/namcos86.cpp
+++ b/src/hbmame/drivers/namcos86.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/namcos86.cpp"
diff --git a/src/hbmame/drivers/nemesis.cpp b/src/hbmame/drivers/nemesis.cpp
index dbe6c7d3c76..a853c7ab42f 100644
--- a/src/hbmame/drivers/nemesis.cpp
+++ b/src/hbmame/drivers/nemesis.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/nemesis.cpp"
diff --git a/src/hbmame/drivers/neogeo1.cpp b/src/hbmame/drivers/neogeo1.cpp
index ba41d51e985..d7f8f455e44 100644
--- a/src/hbmame/drivers/neogeo1.cpp
+++ b/src/hbmame/drivers/neogeo1.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Neogeo hacks that don't warrant their own file
diff --git a/src/hbmame/drivers/neogeohb.cpp b/src/hbmame/drivers/neogeohb.cpp
index d6f7cdce3ce..92775c9df20 100644
--- a/src/hbmame/drivers/neogeohb.cpp
+++ b/src/hbmame/drivers/neogeohb.cpp
@@ -337,6 +337,7 @@ YEAR COMPANY TITLE
2023 Neofid Studios Daemon Claw: Origins of Nnar (https://twitter.com/DAsteborg/status/1696175973253734420)
2024 Neofid Studios Demons of Asteborg DX (https://neofidstudios.itch.io/demons-of-asteborg-dx)
2024 Rosenthal Castle Petal Crash (video on youtube) (https://rosenthalcastle.itch.io/petal-crash-neo)
+2024 Neo Byte Force Captain Barrel (youtube)
*********************************************************************************************************/
diff --git a/src/hbmame/drivers/ngdoubledr.cpp b/src/hbmame/drivers/ngdoubledr.cpp
index b21c39176b1..0675352c852 100644
--- a/src/hbmame/drivers/ngdoubledr.cpp
+++ b/src/hbmame/drivers/ngdoubledr.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Double Dragon
diff --git a/src/hbmame/drivers/nggaroup.cpp b/src/hbmame/drivers/nggaroup.cpp
index 3c7d95af85e..a8aa9f10bac 100644
--- a/src/hbmame/drivers/nggaroup.cpp
+++ b/src/hbmame/drivers/nggaroup.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Garou Mark of the Wolves: mostly hacks of the prototype
diff --git a/src/hbmame/drivers/ngkofmisc.cpp b/src/hbmame/drivers/ngkofmisc.cpp
index 28a7cdb7e2b..bf7b28bf34d 100644
--- a/src/hbmame/drivers/ngkofmisc.cpp
+++ b/src/hbmame/drivers/ngkofmisc.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Miscellaneous King of Fighters games
// kog, cthd, kof2k4, kof10th etc
diff --git a/src/hbmame/drivers/nglastblade.cpp b/src/hbmame/drivers/nglastblade.cpp
index 4766cff4835..c8609107e33 100644
--- a/src/hbmame/drivers/nglastblade.cpp
+++ b/src/hbmame/drivers/nglastblade.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// The Last Blade
diff --git a/src/hbmame/drivers/ngrbff.cpp b/src/hbmame/drivers/ngrbff.cpp
index 66a06253843..f5243a081ba 100644
--- a/src/hbmame/drivers/ngrbff.cpp
+++ b/src/hbmame/drivers/ngrbff.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Fatal Fury 1,2,3,special ; Real Bout Fatal Fury 1,2,special
diff --git a/src/hbmame/drivers/ngrotd.cpp b/src/hbmame/drivers/ngrotd.cpp
index c2fc7a12251..dc252d8d4f4 100644
--- a/src/hbmame/drivers/ngrotd.cpp
+++ b/src/hbmame/drivers/ngrotd.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/ngsamsho.cpp b/src/hbmame/drivers/ngsamsho.cpp
index ca48cdfe4d9..d0e1bcf9a03 100644
--- a/src/hbmame/drivers/ngsamsho.cpp
+++ b/src/hbmame/drivers/ngsamsho.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Samurai Shodown / Samurai Spirits
diff --git a/src/hbmame/drivers/ngsengoku.cpp b/src/hbmame/drivers/ngsengoku.cpp
index 31390a576ce..03a15e95a4b 100644
--- a/src/hbmame/drivers/ngsengoku.cpp
+++ b/src/hbmame/drivers/ngsengoku.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "includes/neogeo.h"
diff --git a/src/hbmame/drivers/ngsvc.cpp b/src/hbmame/drivers/ngsvc.cpp
index f1c440b9043..0e9a2111f2c 100644
--- a/src/hbmame/drivers/ngsvc.cpp
+++ b/src/hbmame/drivers/ngsvc.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// SVCCHAOS SNK vs Capcom
diff --git a/src/hbmame/drivers/ngwh.cpp b/src/hbmame/drivers/ngwh.cpp
index 161bd5d98ad..1cc6a79efda 100644
--- a/src/hbmame/drivers/ngwh.cpp
+++ b/src/hbmame/drivers/ngwh.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// World Heroes hacks
diff --git a/src/hbmame/drivers/nmk16.cpp b/src/hbmame/drivers/nmk16.cpp
index a19aa30ba5c..3725518067a 100644
--- a/src/hbmame/drivers/nmk16.cpp
+++ b/src/hbmame/drivers/nmk16.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/nmk16.cpp"
diff --git a/src/hbmame/drivers/pacland.cpp b/src/hbmame/drivers/pacland.cpp
index a9c05ed87d1..086090b3bcc 100644
--- a/src/hbmame/drivers/pacland.cpp
+++ b/src/hbmame/drivers/pacland.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/pacland.cpp"
diff --git a/src/hbmame/drivers/pcktgal.cpp b/src/hbmame/drivers/pcktgal.cpp
index 161f01ad5f3..706450cef96 100644
--- a/src/hbmame/drivers/pcktgal.cpp
+++ b/src/hbmame/drivers/pcktgal.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/pcktgal.cpp"
diff --git a/src/hbmame/drivers/pengo.cpp b/src/hbmame/drivers/pengo.cpp
index fa3f79e1beb..114e1eff53c 100644
--- a/src/hbmame/drivers/pengo.cpp
+++ b/src/hbmame/drivers/pengo.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "emu.h"
diff --git a/src/hbmame/drivers/pgm.cpp b/src/hbmame/drivers/pgm.cpp
index 23861ae629b..77d146c2455 100644
--- a/src/hbmame/drivers/pgm.cpp
+++ b/src/hbmame/drivers/pgm.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/*
Local numbering scheme: I made this up as a convenience - it is NOT OFFICIAL
diff --git a/src/hbmame/drivers/phoenix.cpp b/src/hbmame/drivers/phoenix.cpp
index 278305bc2c9..24fdc772b09 100644
--- a/src/hbmame/drivers/phoenix.cpp
+++ b/src/hbmame/drivers/phoenix.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/phoenix.cpp"
diff --git a/src/hbmame/drivers/playch10.cpp b/src/hbmame/drivers/playch10.cpp
index f2e8eb970bf..7d96c91ae61 100644
--- a/src/hbmame/drivers/playch10.cpp
+++ b/src/hbmame/drivers/playch10.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/playch10.cpp"
diff --git a/src/hbmame/drivers/polepos.cpp b/src/hbmame/drivers/polepos.cpp
index 8f850c541a9..86e150b472d 100644
--- a/src/hbmame/drivers/polepos.cpp
+++ b/src/hbmame/drivers/polepos.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/polepos.cpp"
diff --git a/src/hbmame/drivers/pooyan.cpp b/src/hbmame/drivers/pooyan.cpp
index 5dca4fc7562..bcb979f4196 100644
--- a/src/hbmame/drivers/pooyan.cpp
+++ b/src/hbmame/drivers/pooyan.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/pooyan.cpp"
diff --git a/src/hbmame/drivers/powerins.cpp b/src/hbmame/drivers/powerins.cpp
index cd318d4d483..860a63ae52a 100644
--- a/src/hbmame/drivers/powerins.cpp
+++ b/src/hbmame/drivers/powerins.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/powerins.cpp"
diff --git a/src/hbmame/drivers/psikyo.cpp b/src/hbmame/drivers/psikyo.cpp
index 970ee9f608d..9bf506e1606 100644
--- a/src/hbmame/drivers/psikyo.cpp
+++ b/src/hbmame/drivers/psikyo.cpp
@@ -1,5 +1,5 @@
-// license:BSD-3-Clause
-// copyright-holders:Gaston90
+// license:GPL_2.0
+// copyright-holders:Robbbert
#include "../mame/drivers/psikyo.cpp"
/********
diff --git a/src/hbmame/drivers/psikyosh.cpp b/src/hbmame/drivers/psikyosh.cpp
index ddc0d3c26a4..5ac073b631c 100644
--- a/src/hbmame/drivers/psikyosh.cpp
+++ b/src/hbmame/drivers/psikyosh.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/psikyosh.cpp"
diff --git a/src/hbmame/drivers/puckman.cpp b/src/hbmame/drivers/puckman.cpp
index 29f580ba6a8..86bac06eeae 100644
--- a/src/hbmame/drivers/puckman.cpp
+++ b/src/hbmame/drivers/puckman.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/*******************************************************
Puckman and Pacman
diff --git a/src/hbmame/drivers/r2dx_v33.cpp b/src/hbmame/drivers/r2dx_v33.cpp
index 46848446bcb..7adf8545044 100644
--- a/src/hbmame/drivers/r2dx_v33.cpp
+++ b/src/hbmame/drivers/r2dx_v33.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/r2dx_v33.cpp"
diff --git a/src/hbmame/drivers/rabbit.cpp b/src/hbmame/drivers/rabbit.cpp
index 1f9787c7bab..d3216293559 100644
--- a/src/hbmame/drivers/rabbit.cpp
+++ b/src/hbmame/drivers/rabbit.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/rabbit.cpp"
diff --git a/src/hbmame/drivers/raiden2.cpp b/src/hbmame/drivers/raiden2.cpp
index c1dea352938..19a0227e3bf 100644
--- a/src/hbmame/drivers/raiden2.cpp
+++ b/src/hbmame/drivers/raiden2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/raiden2.cpp"
diff --git a/src/hbmame/drivers/rallyx.cpp b/src/hbmame/drivers/rallyx.cpp
index 64a3e28e052..82c236a27f0 100644
--- a/src/hbmame/drivers/rallyx.cpp
+++ b/src/hbmame/drivers/rallyx.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/rallyx.cpp"
diff --git a/src/hbmame/drivers/rastan.cpp b/src/hbmame/drivers/rastan.cpp
index eb38fcf09cd..2815bd53bbb 100644
--- a/src/hbmame/drivers/rastan.cpp
+++ b/src/hbmame/drivers/rastan.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/rastan.cpp"
diff --git a/src/hbmame/drivers/retofinv.cpp b/src/hbmame/drivers/retofinv.cpp
index e5174eae70e..c957c35fc28 100644
--- a/src/hbmame/drivers/retofinv.cpp
+++ b/src/hbmame/drivers/retofinv.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/retofinv.cpp"
diff --git a/src/hbmame/drivers/rohga.cpp b/src/hbmame/drivers/rohga.cpp
index e0234ede218..b40a1a79d0a 100644
--- a/src/hbmame/drivers/rohga.cpp
+++ b/src/hbmame/drivers/rohga.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/rohga.cpp"
diff --git a/src/hbmame/drivers/schaser.cpp b/src/hbmame/drivers/schaser.cpp
index 0b5f7c05a2a..cbf2c086087 100644
--- a/src/hbmame/drivers/schaser.cpp
+++ b/src/hbmame/drivers/schaser.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/****************************************************************************************
diff --git a/src/hbmame/drivers/scramble.cpp b/src/hbmame/drivers/scramble.cpp
index 104c2ae776e..1142d85d5aa 100644
--- a/src/hbmame/drivers/scramble.cpp
+++ b/src/hbmame/drivers/scramble.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/scramble.cpp"
diff --git a/src/hbmame/drivers/segac2.cpp b/src/hbmame/drivers/segac2.cpp
index 3ca391f3082..7354a06ce09 100644
--- a/src/hbmame/drivers/segac2.cpp
+++ b/src/hbmame/drivers/segac2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/segac2.cpp"
diff --git a/src/hbmame/drivers/segag80r.cpp b/src/hbmame/drivers/segag80r.cpp
index 20467de710f..11ff4a1e94a 100644
--- a/src/hbmame/drivers/segag80r.cpp
+++ b/src/hbmame/drivers/segag80r.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/segag80r.cpp"
diff --git a/src/hbmame/drivers/segahang.cpp b/src/hbmame/drivers/segahang.cpp
index 80d89d61ce9..f7d6e2459e0 100644
--- a/src/hbmame/drivers/segahang.cpp
+++ b/src/hbmame/drivers/segahang.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/segahang.cpp"
diff --git a/src/hbmame/drivers/segaorun.cpp b/src/hbmame/drivers/segaorun.cpp
index 8350ad91d53..62744a3626b 100644
--- a/src/hbmame/drivers/segaorun.cpp
+++ b/src/hbmame/drivers/segaorun.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/segaorun.cpp"
diff --git a/src/hbmame/drivers/segas16b.cpp b/src/hbmame/drivers/segas16b.cpp
index a552e2f44f0..7bb8e8f4965 100644
--- a/src/hbmame/drivers/segas16b.cpp
+++ b/src/hbmame/drivers/segas16b.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/segas16b.cpp"
diff --git a/src/hbmame/drivers/segas18.cpp b/src/hbmame/drivers/segas18.cpp
index 0ccebdf7e17..d025dae8da8 100644
--- a/src/hbmame/drivers/segas18.cpp
+++ b/src/hbmame/drivers/segas18.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
// Thanks-to: Various people who shall remain unnamed for their own safety
#include "../mame/drivers/segas18.cpp"
diff --git a/src/hbmame/drivers/segas24.cpp b/src/hbmame/drivers/segas24.cpp
index 6c32be439cd..ac2aa60d5c7 100644
--- a/src/hbmame/drivers/segas24.cpp
+++ b/src/hbmame/drivers/segas24.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/segas24.cpp"
diff --git a/src/hbmame/drivers/segas32.cpp b/src/hbmame/drivers/segas32.cpp
index a38dc1a22c2..97501b8448b 100644
--- a/src/hbmame/drivers/segas32.cpp
+++ b/src/hbmame/drivers/segas32.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/segas32.cpp"
diff --git a/src/hbmame/drivers/seta.cpp b/src/hbmame/drivers/seta.cpp
index 8c698aa8876..6dbae138b29 100644
--- a/src/hbmame/drivers/seta.cpp
+++ b/src/hbmame/drivers/seta.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/seta.cpp"
diff --git a/src/hbmame/drivers/seta2.cpp b/src/hbmame/drivers/seta2.cpp
index d0e16bc0850..c8f83c5a924 100644
--- a/src/hbmame/drivers/seta2.cpp
+++ b/src/hbmame/drivers/seta2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/seta2.cpp"
diff --git a/src/hbmame/drivers/shadfrce.cpp b/src/hbmame/drivers/shadfrce.cpp
index 5b8b03aff4d..05dc3545d18 100644
--- a/src/hbmame/drivers/shadfrce.cpp
+++ b/src/hbmame/drivers/shadfrce.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/shadfrce.cpp"
diff --git a/src/hbmame/drivers/shaolins.cpp b/src/hbmame/drivers/shaolins.cpp
index 7c88f2ee2c1..aa70369b35e 100644
--- a/src/hbmame/drivers/shaolins.cpp
+++ b/src/hbmame/drivers/shaolins.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/shaolins.cpp"
diff --git a/src/hbmame/drivers/sidepckt.cpp b/src/hbmame/drivers/sidepckt.cpp
index e1f1e7eb96d..ed869671f49 100644
--- a/src/hbmame/drivers/sidepckt.cpp
+++ b/src/hbmame/drivers/sidepckt.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/sidepckt.cpp"
diff --git a/src/hbmame/drivers/silkroad.cpp b/src/hbmame/drivers/silkroad.cpp
index f41a9559196..ee93e141d47 100644
--- a/src/hbmame/drivers/silkroad.cpp
+++ b/src/hbmame/drivers/silkroad.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/silkroad.cpp"
diff --git a/src/hbmame/drivers/simple_st0016.cpp b/src/hbmame/drivers/simple_st0016.cpp
index cfe4796c09c..cea83374e8f 100644
--- a/src/hbmame/drivers/simple_st0016.cpp
+++ b/src/hbmame/drivers/simple_st0016.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/simple_st0016.cpp"
diff --git a/src/hbmame/drivers/snesb.cpp b/src/hbmame/drivers/snesb.cpp
index f9be9fd19ca..05b5e1a4a15 100644
--- a/src/hbmame/drivers/snesb.cpp
+++ b/src/hbmame/drivers/snesb.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/snesb.cpp"
diff --git a/src/hbmame/drivers/snk6502.cpp b/src/hbmame/drivers/snk6502.cpp
index b58fa3879bd..f10023686bc 100644
--- a/src/hbmame/drivers/snk6502.cpp
+++ b/src/hbmame/drivers/snk6502.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/snk6502.cpp"
diff --git a/src/hbmame/drivers/snowbros.cpp b/src/hbmame/drivers/snowbros.cpp
index 51ada145a2c..aeaef6d1a9b 100644
--- a/src/hbmame/drivers/snowbros.cpp
+++ b/src/hbmame/drivers/snowbros.cpp
@@ -1,5 +1,5 @@
-// license:BSD-3-Clause
-// copyright-holders:Gaston90
+// license:GPL_2.0
+// copyright-holders:Robbbert
#include "../mame/drivers/snowbros.cpp"
#include "../mame/video/kan_pand.cpp"
diff --git a/src/hbmame/drivers/solomon.cpp b/src/hbmame/drivers/solomon.cpp
index 8e1ed7a4c3b..e9a58f9223a 100644
--- a/src/hbmame/drivers/solomon.cpp
+++ b/src/hbmame/drivers/solomon.cpp
@@ -1,7 +1,5 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
-// Proyecto De Inicio:"2016/2017"
-// Derechos Del Autor:Gaston90
#include "../mame/drivers/solomon.cpp"
/*****************
diff --git a/src/hbmame/drivers/spacmiss.cpp b/src/hbmame/drivers/spacmiss.cpp
index de67728eb07..a27249bc257 100644
--- a/src/hbmame/drivers/spacmiss.cpp
+++ b/src/hbmame/drivers/spacmiss.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/****************************************************************************************
diff --git a/src/hbmame/drivers/ssv.cpp b/src/hbmame/drivers/ssv.cpp
index 0fda39bdf3c..389836ba244 100644
--- a/src/hbmame/drivers/ssv.cpp
+++ b/src/hbmame/drivers/ssv.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/ssv.cpp"
diff --git a/src/hbmame/drivers/stv.cpp b/src/hbmame/drivers/stv.cpp
index 3dde7ddcd97..20165a7db8e 100644
--- a/src/hbmame/drivers/stv.cpp
+++ b/src/hbmame/drivers/stv.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/stv.cpp"
diff --git a/src/hbmame/drivers/system1.cpp b/src/hbmame/drivers/system1.cpp
index 9d98c6d42b0..34283721f80 100644
--- a/src/hbmame/drivers/system1.cpp
+++ b/src/hbmame/drivers/system1.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/system1.cpp"
diff --git a/src/hbmame/drivers/system16.cpp b/src/hbmame/drivers/system16.cpp
index 4e7095c6f44..29d5e06f370 100644
--- a/src/hbmame/drivers/system16.cpp
+++ b/src/hbmame/drivers/system16.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/system16.cpp"
diff --git a/src/hbmame/drivers/taito_b.cpp b/src/hbmame/drivers/taito_b.cpp
index 33e1193cbec..fa614ef101e 100644
--- a/src/hbmame/drivers/taito_b.cpp
+++ b/src/hbmame/drivers/taito_b.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/taito_b.cpp"
diff --git a/src/hbmame/drivers/taito_f2.cpp b/src/hbmame/drivers/taito_f2.cpp
index d54897ba1e4..f76103eac9f 100644
--- a/src/hbmame/drivers/taito_f2.cpp
+++ b/src/hbmame/drivers/taito_f2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/taito_f2.cpp"
diff --git a/src/hbmame/drivers/taito_f3.cpp b/src/hbmame/drivers/taito_f3.cpp
index 0805d663fca..19dfd93c602 100644
--- a/src/hbmame/drivers/taito_f3.cpp
+++ b/src/hbmame/drivers/taito_f3.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/taito_f3.cpp"
diff --git a/src/hbmame/drivers/taito_l.cpp b/src/hbmame/drivers/taito_l.cpp
index 2c627529c8e..70774e8f80f 100644
--- a/src/hbmame/drivers/taito_l.cpp
+++ b/src/hbmame/drivers/taito_l.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/taito_l.cpp"
diff --git a/src/hbmame/drivers/taito_z.cpp b/src/hbmame/drivers/taito_z.cpp
index b0dc2597d8c..c87723ebbba 100644
--- a/src/hbmame/drivers/taito_z.cpp
+++ b/src/hbmame/drivers/taito_z.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/taito_z.cpp"
diff --git a/src/hbmame/drivers/taitosj.cpp b/src/hbmame/drivers/taitosj.cpp
index feeb6069866..72fb06f9b37 100644
--- a/src/hbmame/drivers/taitosj.cpp
+++ b/src/hbmame/drivers/taitosj.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/taitosj.cpp"
diff --git a/src/hbmame/drivers/taotaido.cpp b/src/hbmame/drivers/taotaido.cpp
index 363968fe1d1..0da3e277b41 100644
--- a/src/hbmame/drivers/taotaido.cpp
+++ b/src/hbmame/drivers/taotaido.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/taotaido.cpp"
diff --git a/src/hbmame/drivers/tecmo.cpp b/src/hbmame/drivers/tecmo.cpp
index 68379b98297..85c42625246 100644
--- a/src/hbmame/drivers/tecmo.cpp
+++ b/src/hbmame/drivers/tecmo.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/tecmo.cpp"
diff --git a/src/hbmame/drivers/tecmo16.cpp b/src/hbmame/drivers/tecmo16.cpp
index 8779c3a5210..a5885347a3f 100644
--- a/src/hbmame/drivers/tecmo16.cpp
+++ b/src/hbmame/drivers/tecmo16.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/tecmo16.cpp"
diff --git a/src/hbmame/drivers/tecmosys.cpp b/src/hbmame/drivers/tecmosys.cpp
index 2161fb7ffab..8d44c5b77d8 100644
--- a/src/hbmame/drivers/tecmosys.cpp
+++ b/src/hbmame/drivers/tecmosys.cpp
@@ -1,5 +1,5 @@
-// license:BSD-3-Clause
-// Copyright-holders:Gaston90
+// license:GPL_2.0
+// Copyright-holders:Robbbert
#include "../mame/drivers/tecmosys.cpp"
/****************
diff --git a/src/hbmame/drivers/tehkanwc.cpp b/src/hbmame/drivers/tehkanwc.cpp
index 1268071d0b6..d561266b65e 100644
--- a/src/hbmame/drivers/tehkanwc.cpp
+++ b/src/hbmame/drivers/tehkanwc.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/tehkanwc.cpp"
diff --git a/src/hbmame/drivers/tempest.cpp b/src/hbmame/drivers/tempest.cpp
index 8bd899af549..a1e2c487fde 100644
--- a/src/hbmame/drivers/tempest.cpp
+++ b/src/hbmame/drivers/tempest.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/tempest.cpp"
diff --git a/src/hbmame/drivers/terracre.cpp b/src/hbmame/drivers/terracre.cpp
index 545f632b12c..a14d0ea5239 100644
--- a/src/hbmame/drivers/terracre.cpp
+++ b/src/hbmame/drivers/terracre.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/terracre.cpp"
diff --git a/src/hbmame/drivers/timelimit.cpp b/src/hbmame/drivers/timelimit.cpp
index 6084a02bb17..a2ac90bb5a6 100644
--- a/src/hbmame/drivers/timelimit.cpp
+++ b/src/hbmame/drivers/timelimit.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/timelimt.cpp"
diff --git a/src/hbmame/drivers/timeplt.cpp b/src/hbmame/drivers/timeplt.cpp
index 351cca4ee40..39d79091579 100644
--- a/src/hbmame/drivers/timeplt.cpp
+++ b/src/hbmame/drivers/timeplt.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/timeplt.cpp"
diff --git a/src/hbmame/drivers/tmnt.cpp b/src/hbmame/drivers/tmnt.cpp
index c9a9b826aaf..89c0287b4b6 100644
--- a/src/hbmame/drivers/tmnt.cpp
+++ b/src/hbmame/drivers/tmnt.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/tmnt.cpp"
diff --git a/src/hbmame/drivers/tnzs.cpp b/src/hbmame/drivers/tnzs.cpp
index c125363d158..29530418ef9 100644
--- a/src/hbmame/drivers/tnzs.cpp
+++ b/src/hbmame/drivers/tnzs.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/tnzs.cpp"
diff --git a/src/hbmame/drivers/toaplan2.cpp b/src/hbmame/drivers/toaplan2.cpp
index 3fb0bfef0b0..f23d6d84dfd 100644
--- a/src/hbmame/drivers/toaplan2.cpp
+++ b/src/hbmame/drivers/toaplan2.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/toaplan2.cpp"
diff --git a/src/hbmame/drivers/trackfld.cpp b/src/hbmame/drivers/trackfld.cpp
index 680b6b744a9..6534218b36d 100644
--- a/src/hbmame/drivers/trackfld.cpp
+++ b/src/hbmame/drivers/trackfld.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/trackfld.cpp"
diff --git a/src/hbmame/drivers/twincobr.cpp b/src/hbmame/drivers/twincobr.cpp
index 1fa7d78ed7c..e1bff2f3e7c 100644
--- a/src/hbmame/drivers/twincobr.cpp
+++ b/src/hbmame/drivers/twincobr.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/twincobr.cpp"
diff --git a/src/hbmame/drivers/vamphalf.cpp b/src/hbmame/drivers/vamphalf.cpp
index b5fe950e614..9b483099e24 100644
--- a/src/hbmame/drivers/vamphalf.cpp
+++ b/src/hbmame/drivers/vamphalf.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/vamphalf.cpp"
diff --git a/src/hbmame/drivers/volfied.cpp b/src/hbmame/drivers/volfied.cpp
index 9868108936b..a4b68d360e0 100644
--- a/src/hbmame/drivers/volfied.cpp
+++ b/src/hbmame/drivers/volfied.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/volfied.cpp"
diff --git a/src/hbmame/drivers/vsnes.cpp b/src/hbmame/drivers/vsnes.cpp
index 53b64b0e691..0949b45f6ff 100644
--- a/src/hbmame/drivers/vsnes.cpp
+++ b/src/hbmame/drivers/vsnes.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/vsnes.cpp"
diff --git a/src/hbmame/drivers/warriorb.cpp b/src/hbmame/drivers/warriorb.cpp
index a4777319775..39761a00ce9 100644
--- a/src/hbmame/drivers/warriorb.cpp
+++ b/src/hbmame/drivers/warriorb.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/warriorb.cpp"
diff --git a/src/hbmame/drivers/wc90b.cpp b/src/hbmame/drivers/wc90b.cpp
index c98c96587cd..dd76db59ea7 100644
--- a/src/hbmame/drivers/wc90b.cpp
+++ b/src/hbmame/drivers/wc90b.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/wc90b.cpp"
diff --git a/src/hbmame/drivers/williams.cpp b/src/hbmame/drivers/williams.cpp
index 88e7cfbf129..79805b781cc 100644
--- a/src/hbmame/drivers/williams.cpp
+++ b/src/hbmame/drivers/williams.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/williams.cpp"
diff --git a/src/hbmame/drivers/wiz.cpp b/src/hbmame/drivers/wiz.cpp
index 980526f0f84..c823860d7fa 100644
--- a/src/hbmame/drivers/wiz.cpp
+++ b/src/hbmame/drivers/wiz.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/wiz.cpp"
diff --git a/src/hbmame/drivers/yiear.cpp b/src/hbmame/drivers/yiear.cpp
index 3777da29565..b544f100abb 100644
--- a/src/hbmame/drivers/yiear.cpp
+++ b/src/hbmame/drivers/yiear.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/yiear.cpp"
diff --git a/src/hbmame/drivers/zn.cpp b/src/hbmame/drivers/zn.cpp
index 3ed13df2a78..d256ceb21de 100644
--- a/src/hbmame/drivers/zn.cpp
+++ b/src/hbmame/drivers/zn.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/drivers/zn.cpp"
diff --git a/src/hbmame/hbmame.cpp b/src/hbmame/hbmame.cpp
index 94dce2d9cc0..3ff4990f015 100644
--- a/src/hbmame/hbmame.cpp
+++ b/src/hbmame/hbmame.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/***************************************************************************
diff --git a/src/hbmame/hbmame.lst b/src/hbmame/hbmame.lst
index 17c24d249d6..36e8096e819 100644
--- a/src/hbmame/hbmame.lst
+++ b/src/hbmame/hbmame.lst
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/******************************************************************************
diff --git a/src/hbmame/hbmame.mak b/src/hbmame/hbmame.mak
index db57662a651..47a4cb97fd0 100644
--- a/src/hbmame/hbmame.mak
+++ b/src/hbmame/hbmame.mak
@@ -1,4 +1,4 @@
-# license:BSD-3-Clause
+# license:GPL_2.0
# copyright-holders:Robbbert
###########################################################################
#
diff --git a/src/hbmame/igs/iq_pgm_hb.cpp b/src/hbmame/igs/iq_pgm_hb.cpp
index 008d3f95ff6..a46d241bcf0 100644
--- a/src/hbmame/igs/iq_pgm_hb.cpp
+++ b/src/hbmame/igs/iq_pgm_hb.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/*
Local numbering scheme: I made this up as a convenience - it is NOT OFFICIAL
diff --git a/src/hbmame/includes/cps2.h b/src/hbmame/includes/cps2.h
index f6bfb95a15d..1a38e36d266 100644
--- a/src/hbmame/includes/cps2.h
+++ b/src/hbmame/includes/cps2.h
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
/***************************************************************************
diff --git a/src/hbmame/includes/galaga.h b/src/hbmame/includes/galaga.h
index 8a76256a41a..df706c28733 100644
--- a/src/hbmame/includes/galaga.h
+++ b/src/hbmame/includes/galaga.h
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/includes/galaga.h"
#include "sound/samples.h"
diff --git a/src/hbmame/includes/galaxian.h b/src/hbmame/includes/galaxian.h
index 774a8956d8d..0dc22c8333b 100644
--- a/src/hbmame/includes/galaxian.h
+++ b/src/hbmame/includes/galaxian.h
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "../mame/includes/galaxian.h"
diff --git a/src/hbmame/includes/neogeo.h b/src/hbmame/includes/neogeo.h
index d0edecb465d..a931744f777 100644
--- a/src/hbmame/includes/neogeo.h
+++ b/src/hbmame/includes/neogeo.h
@@ -1,11 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail,Ernesto Corvi,Andrew Prime,Zsolt Vasvari
// thanks-to:Fuzz
-/*************************************************************************
-
- Neo-Geo hardware
-
-*************************************************************************/
#include "emu.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/hbmame/osd/windows/hbmame/hbmame.rc b/src/hbmame/osd/windows/hbmame/hbmame.rc
index ca578cfb58c..fa0c0aedc0a 100644
--- a/src/hbmame/osd/windows/hbmame/hbmame.rc
+++ b/src/hbmame/osd/windows/hbmame/hbmame.rc
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
//#define NOWINRES
diff --git a/src/hbmame/video/puckman.cpp b/src/hbmame/video/puckman.cpp
index 20b324d1838..0a284bdeeb2 100644
--- a/src/hbmame/video/puckman.cpp
+++ b/src/hbmame/video/puckman.cpp
@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+// license:GPL_2.0
// copyright-holders:Robbbert
#include "emu.h"