# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1689746277 25200
# Node ID e734bfae80c79980b0faf67dfacac090f0653431
# Parent  26597f9805b4eecf2c2e1d281904e54b38ff2dd0# Parent  215c2afbe8961f2707be2434bb6a166a3db172d7
Merge

diff -r 26597f9805b4 -r e734bfae80c7 rom.db
--- a/rom.db	Tue Jul 18 21:46:09 2023 -0700
+++ b/rom.db	Tue Jul 18 22:57:57 2023 -0700
@@ -909,6 +909,14 @@
 		2 gamepad3.2
 	}
 }
+00004016 {
+	name Forgotten Worlds
+	#Immediage game over with a 6-button controller due to a bad detection routine
+	device_overrides {
+		1 gamepad3.1
+		2 gamepad3.2
+	}
+}
 #Automatically hook up the mouse in the appropriate port for the games I've tested
 T-76076 {
 	name Nobunaga's Ambition
@@ -1421,6 +1429,36 @@
 		2 gamepad3.2
 	}
 }
+T-122036 {
+	name Outworld 2375 AD
+	HeartbeatTrainer {
+		size 512
+	}
+	device_overrides {
+		1 heartbeat_trainer.1
+		2 gamepad3.2
+	}
+}
+T-122016 {
+	name NHLPA Hockey
+	HeartbeatTrainer {
+		size 512
+	}
+	device_overrides {
+		1 heartbeat_trainer.1
+		2 gamepad3.2
+	}
+}
+T-50086 {
+	name PGA Tour Golf II
+	HeartbeatTrainer {
+		size 512
+	}
+	device_overrides {
+		1 heartbeat_trainer.1
+		2 gamepad3.2
+	}
+}
 T-172116 {
 	name Triple Play: Gold Edition
 	SRAM {
diff -r 26597f9805b4 -r e734bfae80c7 util.c
--- a/util.c	Tue Jul 18 21:46:09 2023 -0700
+++ b/util.c	Tue Jul 18 22:57:57 2023 -0700
@@ -266,7 +266,7 @@
 			*(cur_out++) = 0x80 | (code & 0x3F);
 		} else {
 			//TODO: Deal with surrogate pairs
-			*(cur_out++) = 0xF0 | code >> 12;
+			*(cur_out++) = 0xE0 | code >> 12;
 			*(cur_out++) = 0x80 | (code >> 6 & 0x3F);
 			*(cur_out++) = 0x80 | (code & 0x3F);
 		}