diff --git a/src/mame/namco/namcos12.cpp b/src/mame/namco/namcos12.cpp
index a8fdfa2f480..ea1305114a6 100644
--- a/src/mame/namco/namcos12.cpp
+++ b/src/mame/namco/namcos12.cpp
@@ -2068,16 +2068,16 @@ static INPUT_PORTS_START(ghlpanic)
 	PORT_BIT(0x0000f03d, IP_ACTIVE_HIGH, IPT_UNUSED) // P2 UP/P2 DOWN/P2 LEFT/P2 RIGHT/P2 BUTTON2/P2 BUTTON3/P2 BUTTON4/P2 BUTTON5/P2 BUTTON6
 
 	PORT_START("GUN0")
-	PORT_BIT(0xffff, 0x020f - 5, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xc0 - 42, 0x35f + 32) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
+	PORT_BIT(0xffff, 0x020e, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xbe, 0x35f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
 
 	PORT_START("GUN1")
-	PORT_BIT(0xffff, 0x0091 - 6, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x1a - 6, 0x109 - 6) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
+	PORT_BIT(0xffff, 0x0091, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x1a, 0x109) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
 
 	PORT_START("GUN2")
-	PORT_BIT(0xffff, 0x020f - 5, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xc0 - 42, 0x35f + 32) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
+	PORT_BIT(0xffff, 0x020e, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xbe, 0x35f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
 
 	PORT_START("GUN3")
-	PORT_BIT(0xffff, 0x0091 - 6, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x1a - 6, 0x109 - 6) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(2)
+	PORT_BIT(0xffff, 0x0091, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x1a, 0x109) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(2)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START(golgo13)
@@ -2237,16 +2237,16 @@ static INPUT_PORTS_START(ptblank2)
 	PORT_BIT(0x0000f03d, IP_ACTIVE_HIGH, IPT_UNUSED) // P2 UP/P2 DOWN/P2 LEFT/P2 RIGHT/P2 BUTTON2/P2 BUTTON3/P2 BUTTON4/P2 BUTTON5/P2 BUTTON6
 
 	PORT_START("GUN0")
-	PORT_BIT(0xffff, 0x022f - 5, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xd8 - 42, 0x387 + 32) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
+	PORT_BIT(0xffff, 0x0231, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xdc, 0x387) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
 
 	PORT_START("GUN1")
-	PORT_BIT(0xffff, 0x00a3 - 0, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x2c - 2, 0x11b + 1) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
+	PORT_BIT(0xffff, 0x00a1, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x28, 0x11b) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
 
 	PORT_START("GUN2")
-	PORT_BIT(0xffff, 0x022f - 5, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xd8 - 42, 0x387 + 32) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
+	PORT_BIT(0xffff, 0x0231, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xdc, 0x387) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
 
 	PORT_START("GUN3")
-	PORT_BIT(0xffff, 0x00a3 - 0, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x2c - 2, 0x11b + 1) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(2)
+	PORT_BIT(0xffff, 0x00a1, IPT_LIGHTGUN_Y) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x28, 0x11b) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(2)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START(tekken3)