diff --git a/gamedata/sdkhooks.games/engine.ep2v.txt b/gamedata/sdkhooks.games/engine.ep2v.txt
index 83a1b2f6..a94e86fa 100644
--- a/gamedata/sdkhooks.games/engine.ep2v.txt
+++ b/gamedata/sdkhooks.games/engine.ep2v.txt
@@ -7,6 +7,7 @@
 		{
 			"game"	"dod"
 			"game"	"hl2mp"
+			"game"	"tf"
 		}
 		
 		"Offsets"
@@ -146,145 +147,6 @@
 		}
 	}
 	
-	"tf"
-	{
-		"Offsets"
-		{
-			"EndTouch"
-			{
-				"windows"	"99"
-				"linux"		"100"
-				"mac"		"100"
-			}
-			"FireBullets"
-			{
-				"windows"	"111"
-				"linux"		"112"
-				"mac"		"112"
-			}
-			"GetMaxHealth"
-			{
-				"windows"	"116"
-				"linux"		"117"
-				"mac"		"117"				
-			}
-			"GroundEntChanged"
-			{
-				"windows"	"176"
-				"linux"		"177"
-				"mac"		"177"
-			}
-			"OnTakeDamage"
-			{
-				"windows"	"62"
-				"linux"		"63"
-				"mac"		"63"
-			}
-			"PreThink"
-			{
-				"windows"	"330"
-				"linux"		"331"
-				"mac"		"331"
-			}
-			"PostThink"
-			{
-				"windows"	"331"
-				"linux"		"332"
-				"mac"		"332"
-			}
-			"Reload"
-			{
-				"windows"	"274"
-				"linux"		"275"
-				"mac"		"275"
-			}
-			"SetTransmit"
-			{
-				"windows"	"20"
-				"linux"		"21"
-				"mac"		"21"
-			}
-			"ShouldCollide"
-			{
-				"windows"	"16"
-				"linux"		"17"
-				"mac"		"17"
-			}
-			"Spawn"
-			{
-				"windows"	"22"
-				"linux"		"23"
-				"mac"		"23"
-			}
-			"StartTouch"
-			{
-				"windows"	"97"
-				"linux"		"98"
-				"mac"		"98"
-			}
-			"Think"
-			{
-				"windows"	"47"
-				"linux"		"48"
-				"mac"		"48"
-			}
-			"Touch"
-			{
-				"windows"	"98"
-				"linux"		"99"
-				"mac"		"99"
-			}
-			"TraceAttack"
-			{
-				"windows"	"60"
-				"linux"		"61"
-				"mac"		"61"
-			}
-			"Use"
-			{
-				"windows"	"96"
-				"linux"		"97"
-				"mac"		"97"
-			}
-			"VPhysicsUpdate"
-			{
-				"windows"	"156"
-				"linux"		"157"
-				"mac"		"157"
-			}
-			"Weapon_CanSwitchTo"
-			{
-				"windows"	"264"
-				"linux"		"265"
-				"mac"		"265"
-			}
-			"Weapon_CanUse"
-			{
-				"windows"	"258"
-				"linux"		"259"
-				"mac"		"259"
-			}
-			"Weapon_Drop"
-			{
-				"windows"	"261"
-				"linux"		"262"
-				"mac"		"262"
-			}
-			"Weapon_Equip"
-			{
-				"windows"	"259"
-				"linux"		"260"
-				"mac"		"260"
-			}
-			"Weapon_Switch"
-			{
-				"windows"	"262"
-				"linux"		"263"
-				"mac"		"263"
-			}
-		}
-	}
-	
 	"#default"
 	{
 		"#supported"
diff --git a/gamedata/sdktools.games/game.tf.txt b/gamedata/sdktools.games/game.tf.txt
index a74e5a6f..9665436d 100644
--- a/gamedata/sdktools.games/game.tf.txt
+++ b/gamedata/sdktools.games/game.tf.txt
@@ -18,57 +18,57 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"398"
-				"linux"		"399"
-				"mac"		"399"
+				"windows"	"399"
+				"linux"		"400"
+				"mac"		"400"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"268"
-				"linux"		"269"
-				"mac"		"269"
+				"windows"	"269"
+				"linux"		"270"
+				"mac"		"270"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"266"
-				"linux"		"267"
-				"mac"		"267"
+				"windows"	"267"
+				"linux"		"268"
+				"mac"		"268"
 			}
 			"Ignite"
 			{
-				"windows"	"207"
-				"linux"		"208"
-				"mac"		"208"
+				"windows"	"208"
+				"linux"		"209"
+				"mac"		"209"
 			}
 			"Extinguish"
 			{
-				"windows"	"211"
-				"linux"		"212"
-				"mac"		"212"
+				"windows"	"212"
+				"linux"		"213"
+				"mac"		"213"
 			}
 			"Teleport"
 			{
-				"windows"	"107"
-				"linux"		"108"
-				"mac"		"108"
+				"windows"	"108"
+				"linux"		"109"
+				"mac"		"109"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"439"
-				"linux"		"439"
-				"mac"		"439"
+				"windows"	"440"
+				"linux"		"440"
+				"mac"		"440"
 			}
 			"GetVelocity"
 			{
-				"windows"	"139"
-				"linux"		"140"
-				"mac"		"140"
+				"windows"	"140"
+				"linux"		"141"
+				"mac"		"141"
 			}
 			"EyeAngles"
 			{
-				"windows"	"130"
-				"linux"		"131"
-				"mac"		"131"
+				"windows"	"131"
+				"linux"		"132"
+				"mac"		"132"
 			}
 			"SetEntityModel"
 			{
@@ -84,9 +84,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"259"
-				"linux"		"260"
-				"mac"		"260"
+				"windows"	"260"
+				"linux"		"261"
+				"mac"		"261"
 			}
 			"Activate"
 			{
@@ -96,9 +96,9 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"416"
-				"linux"		"417"
-				"mac"		"417"
+				"windows"	"417"
+				"linux"		"418"
+				"mac"		"418"
 			}
 		}
 		
diff --git a/gamedata/sm-tf2.games.txt b/gamedata/sm-tf2.games.txt
index 3cfbba75..4138f5e5 100644
--- a/gamedata/sm-tf2.games.txt
+++ b/gamedata/sm-tf2.games.txt
@@ -67,7 +67,7 @@
 			"AddCondition"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x53\x56\x57\x8B\x7D\x2A\x8B\xF1\x83\xFF\x2A\x7C\x2A\x8D\x2A\x2A\x8D\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\xEB\x2A\x83\xFF\x2A\x7C"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x2A\x53\x56\x8B\x75\x2A\x57\x8B\xD9\x83\xFE\x2A\x7C\x2A\x8D\x2A\x2A\x8D\x2A\x2A\x2A\x2A\x2A\x89\x2A\x2A\xEB\x2A\x83\xFE\x2A\x7C"
 				"linux"		"@_ZN15CTFPlayerShared7AddCondE7ETFCondfP11CBaseEntity"
 				"mac"		"@_ZN15CTFPlayerShared7AddCondE7ETFCondfP11CBaseEntity"
 			}
@@ -132,9 +132,9 @@
 		{
 			"ForceRespawn"
 			{
-				"windows"	"323"
-				"linux"		"324"
-				"mac"		"324"
+				"windows"	"324"
+				"linux"		"325"
+				"mac"		"325"
 			}
 		}
 	}