diff --git a/raknet/SAMPRPC.h b/raknet/SAMPRPC.h
index b820778..a4b659c 100644
--- a/raknet/SAMPRPC.h
+++ b/raknet/SAMPRPC.h
@@ -13,165 +13,165 @@
 		\xFA \xFB \xFC \xFD \xFE \xFF
 */
 
-#define RPC_Unk22 "\x22"
-#define RPC_Unk24 "\x24"
-#define RPC_Unk3A "\x3A"
-#define RPC_Unk3B "\x3B"
-#define RPC_Unk3D "\x3D"
-#define RPC_Unk6B "\x6B"
-#define RPC_Unk25 "\x25"
-#define RPC_Unk26 "\x26"
-#define RPC_Unk27 "\x27"
-#define RPC_UpdateScoresPingsIPs "\x9B" //#define RPC_Unk9B "\x9B"
-#define RPC_SvrStats "\x66" //#define RPC_Unk66 "\x66"
-#define RPC_Unk28 "\x28"
-#define RPC_Unk82 "\x82"
-#define RPC_ClientMessage "\x5D" //#define RPC_Unk5D "\x5D"
-#define RPC_WorldTime "\x5E" //#define RPC_Unk5E "\x5E"
-#define RPC_Unk5F "\x5F"
-#define RPC_Unk3F "\x3F"
-#define RPC_Unk97 "\x97"
-#define RPC_ScmEvent "\x60" //#define RPC_Unk60 "\x60"
-#define RPC_Weather "\x98" //#define RPC_Unk98 "\x98"
-#define RPC_Unk1D "\x1D"
-#define RPC_Unk1E "\x1E"
-#define RPC_Unk3C "\x3C"
-#define RPC_Unk20 "\x20"
-#define RPC_UnkA6 "\xA6"
-#define RPC_UnkA3 "\xA3"
-#define RPC_UnkA4 "\xA4"
-#define RPC_UnkA5 "\xA5"
-#define RPC_DamageVehicle "\x6A" //#define RPC_Unk6A "\x6A"
-#define RPC_Unk18 "\x18"
-#define RPC_EnterVehicle "\x1A" //#define RPC_Unk1A "\x1A"
-#define RPC_ExitVehicle "\x9A" //#define RPC_Unk9A "\x9A"
-#define RPC_Unk89 "\x89"
-#define RPC_Unk8A "\x8A"
-#define RPC_Unk8B "\x8B"
-#define RPC_Chat "\x65" //#define RPC_Unk65 "\x65"
-#define RPC_RequestClass "\x80" //#define RPC_Unk80 "\x80"
-#define RPC_RequestSpawn "\x81" //#define RPC_Unk81 "\x81"
-#define RPC_EditAttachedObject "\x74" //#define RPC_Unk74 "\x74"
-#define RPC_EditObject "\x75" //#define RPC_Unk75 "\x75"
-#define RPC_SelectObject "\x1B" //#define RPC_Unk1B "\x1B"
-#define RPC_Unk1C "\x1C"
-#define RPC_UnkAA "\xAA"
-#define RPC_ClientCheck "\x67" //#define RPC_Unk67 "\x67"
-#define RPC_UnkAB "\xAB"
-#define RPC_UnkAC "\xAC"
-#define RPC_PlayerDamage "\x73" //#define RPC_Unk73 "\x73"
-#define RPC_SetInteriorId "\x76" //#define RPC_Unk76 "\x76"
-#define RPC_ScriptCash "\x1F" //#define RPC_Unk1F "\x1F"
-#define RPC_ClickMap "\x77" //#define RPC_Unk77 "\x77"
-#define RPC_VehicleDestroyed "\x88" //#define RPC_Unk88 "\x88"
-#define RPC_PickedUpWeapon "\x61" //#define RPC_Unk61 "\x61"
-#define RPC_PickedUpPickup "\x83" //#define RPC_Unk83 "\x83"
-#define RPC_MenuSelect "\x84" //#define RPC_Unk84 "\x84"
-#define RPC_MenuQuit "\x8C" //#define RPC_Unk8C "\x8C"
-#define RPC_DialogResponse "\x3E" //#define RPC_Unk3E "\x3E"
-#define RPC_ClickPlayer "\x17" //#define RPC_Unk17 "\x17"
-#define RPC_ClientJoin "\x19" //#define RPC_Unk19 "\x19"
-#define RPC_NPCJoin "\x36" //#define RPC_Unk36 "\x36"
-#define RPC_Spawn "\x34" //#define RPC_Unk34 "\x34"
-#define RPC_Death "\x35"
-#define RPC_ServerCommand "\x32" //#define RPC_Unk32 "\x32"
-#define RPC_ClickTextDraw "\x53" //#define RPC_Unk53 "\x53"
-#define RPC_CameraTarget "\xA8" //#define RPC_UnkA8 "\xA8"
-#define RPC_ActorDamage "\xB1" //#define RPC_UnkB1 "\xB1"
+#define RPC_Unk22					"\x22"
+#define RPC_Unk24					"\x24"
+#define RPC_Unk3A					"\x3A"
+#define RPC_Unk3B					"\x3B"
+#define RPC_Unk3D					"\x3D"
+#define RPC_Unk6B					"\x6B"
+#define RPC_Unk25					"\x25"
+#define RPC_Unk26					"\x26"
+#define RPC_Unk27					"\x27"
+#define RPC_UpdateScoresPingsIPs	"\x9B"
+#define RPC_SvrStats				"\x66"
+#define RPC_Unk28					"\x28"
+#define RPC_Unk82					"\x82"
+#define RPC_ClientMessage			"\x5D"
+#define RPC_WorldTime				"\x5E"
+#define RPC_Unk5F					"\x5F"
+#define RPC_Unk3F					"\x3F"
+#define RPC_Unk97					"\x97"
+#define RPC_ScmEvent				"\x60"
+#define RPC_Weather					"\x98"
+#define RPC_Unk1D					"\x1D"
+#define RPC_Unk1E					"\x1E"
+#define RPC_Unk3C					"\x3C"
+#define RPC_Unk20					"\x20"
+#define RPC_UnkA6					"\xA6"
+#define RPC_UnkA3					"\xA3"
+#define RPC_UnkA4					"\xA4"
+#define RPC_UnkA5					"\xA5"
+#define RPC_DamageVehicle			"\x6A"
+#define RPC_Unk18					"\x18"
+#define RPC_EnterVehicle			"\x1A"
+#define RPC_ExitVehicle				"\x9A"
+#define RPC_Unk89					"\x89"
+#define RPC_Unk8A					"\x8A"
+#define RPC_Unk8B					"\x8B"
+#define RPC_Chat					"\x65"
+#define RPC_RequestClass			"\x80"
+#define RPC_RequestSpawn			"\x81"
+#define RPC_EditAttachedObject		"\x74"
+#define RPC_EditObject				"\x75"
+#define RPC_SelectObject			"\x1B"
+#define RPC_Unk1C					"\x1C"
+#define RPC_UnkAA					"\xAA"
+#define RPC_ClientCheck				"\x67"
+#define RPC_UnkAB					"\xAB"
+#define RPC_UnkAC					"\xAC"
+#define RPC_PlayerDamage			"\x73"
+#define RPC_SetInteriorId			"\x76"
+#define RPC_ScriptCash				"\x1F"
+#define RPC_ClickMap				"\x77"
+#define RPC_VehicleDestroyed		"\x88"
+#define RPC_PickedUpWeapon			"\x61"
+#define RPC_PickedUpPickup			"\x83"
+#define RPC_MenuSelect				"\x84"
+#define RPC_MenuQuit				"\x8C"
+#define RPC_DialogResponse			"\x3E"
+#define RPC_ClickPlayer				"\x17"
+#define RPC_ClientJoin				"\x19"
+#define RPC_NPCJoin					"\x36"
+#define RPC_Spawn					"\x34"
+#define RPC_Death					"\x35"
+#define RPC_ServerCommand			"\x32"
+#define RPC_ClickTextDraw			"\x53"
+#define RPC_CameraTarget			"\xA8"
+#define RPC_ActorDamage				"\xB1"
 
-#define RPC_ScrUnkA7 "\xA7"
-#define RPC_ScrUnk38 "\x38"
-#define RPC_ScrUnk90 "\x90"
-#define RPC_ScrUnk91 "\x91"
-#define RPC_ScrSetGravity "\x92" //#define RPC_ScrUnk92 "\x92"
-#define RPC_ScrUnk93 "\x93"
-#define RPC_ScrUnk94 "\x94"
-#define RPC_ScrUnk95 "\x95"
-#define RPC_ScrUnk2C "\x2C"
-#define RPC_ScrUnk2D "\x2D"
-#define RPC_ScrUnk2E "\x2E"
-#define RPC_ScrUnk2F "\x2F"
-#define RPC_ScrUnk4F "\x4F"
-#define RPC_ScrUnk50 "\x50"
-#define RPC_ScrUnk63 "\x63"
-#define RPC_ScrUnk7A "\x7A"
-#define RPC_ScrUnk7B "\x7B"
-#define RPC_ScrUnk7C "\x7C"
-#define RPC_ScrUnk7D "\x7D"
-#define RPC_ScrUnk7E "\x7E"
-#define RPC_ScrUnk7F "\x7F"
-#define RPC_ScrUnk39 "\x39"
-#define RPC_ScrUnk4A "\x4A"
-#define RPC_ScrUnk4B "\x4B"
-#define RPC_ScrUnk85 "\x85"
-#define RPC_ScrUnk86 "\x86"
-#define RPC_ScrUnk87 "\x87"
-#define RPC_ScrUnk69 "\x69"
-#define RPC_ScrAddGangZone "\x6C" // RPC_ScrUnk6C "\x6C"
-#define RPC_ScrRemoveGangZone "\x78" // RPC_ScrUnk78 "\x78"
-#define RPC_ScrFlashGangZone "\x79" // RPC_ScrUnk79 "\x79"
-#define RPC_ScrStopFlashGangZone "\x55" // RPC_ScrUnk55 "\x55"
-#define RPC_ScrUnk56 "\x56"
-#define RPC_ScrUnk57 "\x57"
-#define RPC_ScrUnk58 "\x58"
-#define RPC_ScrUnk68 "\x68"
-#define RPC_ScrUnk59 "\x59"
-#define RPC_ScrUnk5A "\x5A"
-#define RPC_ScrUnk5B "\x5B"
-#define RPC_ScrUnk6F "\x6F"
-#define RPC_ScrUnk62 "\x62"
-#define RPC_ScrUnk5C "\x5C"
-#define RPC_ScrUnk96 "\x96"
-#define RPC_ScrUnk70 "\x70"
-#define RPC_ScrUnk44 "\x44"
-#define RPC_ScrUnk45 "\x45"
-#define RPC_ScrUnk99 "\x99"
-#define RPC_ScrUnk0B "\x0B"
-#define RPC_ScrUnk0C "\x0C"
-#define RPC_ScrUnk0D "\x0D"
-#define RPC_ScrUnk0E "\x0E"
-#define RPC_ScrUnk46 "\x46"
-#define RPC_ScrUnk47 "\x47"
-#define RPC_ScrUnk48 "\x48"
-#define RPC_ScrUnk49 "\x49"
-#define RPC_ScrUnk9C "\x9C"
-#define RPC_ScrUnk9D "\x9D"
-#define RPC_ScrUnk9E "\x9E"
-#define RPC_ScrUnk9F "\x9F"
-#define RPC_ScrUnkA0 "\xA0"
-#define RPC_ScrUnkA1 "\xA1"
-#define RPC_ScrUnkA2 "\xA2"
-#define RPC_ScrUnk0F "\x0F"
-#define RPC_ScrUnk10 "\x10"
-#define RPC_ScrUnk11 "\x11"
-#define RPC_ScrUnk12 "\x12"
-#define RPC_ScrUnk13 "\x13"
-#define RPC_ScrUnk14 "\x14"
-#define RPC_ScrUnk15 "\x15"
-#define RPC_ScrUnk16 "\x16"
-#define RPC_ScrUnk40 "\x40"
-#define RPC_ScrUnk41 "\x41"
-#define RPC_ScrUnk42 "\x42"
-#define RPC_ScrUnk37 "\x37"
-#define RPC_ScrUnk21 "\x21"
-#define RPC_ScrUnk23 "\x23"
-#define RPC_ScrUnk43 "\x43"
-#define RPC_ScrUnk71 "\x71"
-#define RPC_ScrUnk29 "\x29"
-#define RPC_ScrUnk2A "\x2A"
-#define RPC_ScrUnk2B "\x2B"
-#define RPC_ScrUnk51 "\x51"
-#define RPC_ScrUnk52 "\x52"
-#define RPC_ScrUnk53 "\x53"
-#define RPC_ScrUnk54 "\x54"
-#define RPC_ScrUnkA9 "\xA9"
-#define RPC_ScrUnkAD "\xAD"
-#define RPC_ScrUnkAE "\xAE"
-#define RPC_ScrUnkAF "\xAF"
-#define RPC_ScrUnkB0 "\xB0"
-#define RPC_ScrUnkB2 "\xB2"
-#define RPC_ScrUnk30 "\x30"
-#define RPC_ScrInitMenu "\x4C" // RPC_ScrUnk4C "\x4C"
-#define RPC_ScrShowMenu "\x4D" // RPC_ScrUnk4D "\x4D"
-#define RPC_ScrHideMenu "\x4E" // RPC_ScrUnk4E "\x4E"
-#define RPC_ScrUnk31 "\x31"
+#define RPC_ScrUnkA7				"\xA7"
+#define RPC_ScrUnk38				"\x38"
+#define RPC_ScrUnk90				"\x90"
+#define RPC_ScrUnk91				"\x91"
+#define RPC_ScrSetGravity			"\x92"
+#define RPC_ScrUnk93				"\x93"
+#define RPC_ScrUnk94				"\x94"
+#define RPC_ScrUnk95				"\x95"
+#define RPC_ScrUnk2C				"\x2C"
+#define RPC_ScrUnk2D				"\x2D"
+#define RPC_ScrUnk2E				"\x2E"
+#define RPC_ScrUnk2F				"\x2F"
+#define RPC_ScrUnk4F				"\x4F"
+#define RPC_ScrUnk50				"\x50"
+#define RPC_ScrUnk63				"\x63"
+#define RPC_ScrUnk7A				"\x7A"
+#define RPC_ScrUnk7B				"\x7B"
+#define RPC_ScrUnk7C				"\x7C"
+#define RPC_ScrUnk7D				"\x7D"
+#define RPC_ScrUnk7E				"\x7E"
+#define RPC_ScrUnk7F				"\x7F"
+#define RPC_ScrUnk39				"\x39"
+#define RPC_ScrUnk4A				"\x4A"
+#define RPC_ScrUnk4B				"\x4B"
+#define RPC_ScrUnk85				"\x85"
+#define RPC_ScrUnk86				"\x86"
+#define RPC_ScrUnk87				"\x87"
+#define RPC_ScrUnk69				"\x69"
+#define RPC_ScrAddGangZone			"\x6C"
+#define RPC_ScrRemoveGangZone		"\x78"
+#define RPC_ScrFlashGangZone		"\x79"
+#define RPC_ScrStopFlashGangZone	"\x55"
+#define RPC_ScrUnk56				"\x56"
+#define RPC_ScrUnk57				"\x57"
+#define RPC_ScrUnk58				"\x58"
+#define RPC_ScrUnk68				"\x68"
+#define RPC_ScrUnk59				"\x59"
+#define RPC_ScrUnk5A				"\x5A"
+#define RPC_ScrUnk5B				"\x5B"
+#define RPC_ScrUnk6F				"\x6F"
+#define RPC_ScrUnk62				"\x62"
+#define RPC_ScrUnk5C				"\x5C"
+#define RPC_ScrUnk96				"\x96"
+#define RPC_ScrUnk70				"\x70"
+#define RPC_ScrUnk44				"\x44"
+#define RPC_ScrUnk45				"\x45"
+#define RPC_ScrUnk99				"\x99"
+#define RPC_ScrUnk0B				"\x0B"
+#define RPC_ScrUnk0C				"\x0C"
+#define RPC_ScrUnk0D				"\x0D"
+#define RPC_ScrUnk0E				"\x0E"
+#define RPC_ScrUnk46				"\x46"
+#define RPC_ScrUnk47				"\x47"
+#define RPC_ScrUnk48				"\x48"
+#define RPC_ScrUnk49				"\x49"
+#define RPC_ScrUnk9C				"\x9C"
+#define RPC_ScrUnk9D				"\x9D"
+#define RPC_ScrUnk9E				"\x9E"
+#define RPC_ScrUnk9F				"\x9F"
+#define RPC_ScrUnkA0				"\xA0"
+#define RPC_ScrUnkA1				"\xA1"
+#define RPC_ScrUnkA2				"\xA2"
+#define RPC_ScrUnk0F				"\x0F"
+#define RPC_ScrUnk10				"\x10"
+#define RPC_ScrUnk11				"\x11"
+#define RPC_ScrUnk12				"\x12"
+#define RPC_ScrUnk13				"\x13"
+#define RPC_ScrUnk14				"\x14"
+#define RPC_ScrUnk15				"\x15"
+#define RPC_ScrUnk16				"\x16"
+#define RPC_ScrUnk40				"\x40"
+#define RPC_ScrUnk41				"\x41"
+#define RPC_ScrUnk42				"\x42"
+#define RPC_ScrUnk37				"\x37"
+#define RPC_ScrUnk21				"\x21"
+#define RPC_ScrUnk23				"\x23"
+#define RPC_ScrUnk43				"\x43"
+#define RPC_ScrUnk71				"\x71"
+#define RPC_ScrUnk29				"\x29"
+#define RPC_ScrUnk2A				"\x2A"
+#define RPC_ScrUnk2B				"\x2B"
+#define RPC_ScrUnk51				"\x51"
+#define RPC_ScrUnk52				"\x52"
+#define RPC_ScrUnk53				"\x53"
+#define RPC_ScrUnk54				"\x54"
+#define RPC_ScrUnkA9				"\xA9"
+#define RPC_ScrUnkAD				"\xAD"
+#define RPC_ScrUnkAE				"\xAE"
+#define RPC_ScrUnkAF				"\xAF"
+#define RPC_ScrUnkB0				"\xB0"
+#define RPC_ScrUnkB2				"\xB2"
+#define RPC_ScrUnk30				"\x30"
+#define RPC_ScrInitMenu				"\x4C"
+#define RPC_ScrShowMenu				"\x4D"
+#define RPC_ScrHideMenu				"\x4E"
+#define RPC_ScrUnk31				"\x31"