diff --git a/common/eq_dictionary.cpp b/common/eq_dictionary.cpp
index f85d3110f..3756ca8fe 100644
--- a/common/eq_dictionary.cpp
+++ b/common/eq_dictionary.cpp
@@ -539,7 +539,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_POSSESSIONS_SIZE,
 /*Underfoot*/	EmuConstants::MAP_POSSESSIONS_SIZE,
 /*RoF*/			EmuConstants::MAP_POSSESSIONS_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_POSSESSIONS_SIZE,
 
 /*NPC*/			EmuConstants::MAP_POSSESSIONS_SIZE,
 /*Merc*/		EmuConstants::MAP_POSSESSIONS_SIZE,
@@ -554,7 +554,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_BANK_SIZE,
 /*Underfoot*/	EmuConstants::MAP_BANK_SIZE,
 /*RoF*/			EmuConstants::MAP_BANK_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_BANK_SIZE,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
@@ -569,7 +569,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_SHARED_BANK_SIZE,
 /*Underfoot*/	EmuConstants::MAP_SHARED_BANK_SIZE,
 /*RoF*/			EmuConstants::MAP_SHARED_BANK_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_SHARED_BANK_SIZE,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
@@ -584,7 +584,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_TRADE_SIZE,
 /*Underfoot*/	EmuConstants::MAP_TRADE_SIZE,
 /*RoF*/			EmuConstants::MAP_TRADE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_TRADE_SIZE,
 
 /*NPC*/			4,
 /*Merc*/		4,
@@ -599,7 +599,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_WORLD_SIZE,
 /*Underfoot*/	EmuConstants::MAP_WORLD_SIZE,
 /*RoF*/			EmuConstants::MAP_WORLD_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_WORLD_SIZE,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
@@ -614,7 +614,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_LIMBO_SIZE,
 /*Underfoot*/	EmuConstants::MAP_LIMBO_SIZE,
 /*RoF*/			EmuConstants::MAP_LIMBO_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_LIMBO_SIZE,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
@@ -629,7 +629,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_TRIBUTE_SIZE,
 /*Underfoot*/	EmuConstants::MAP_TRIBUTE_SIZE,
 /*RoF*/			EmuConstants::MAP_TRIBUTE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_TRIBUTE_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -644,7 +644,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_TROPHY_TRIBUTE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_TROPHY_TRIBUTE_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -659,7 +659,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_GUILD_TRIBUTE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_GUILD_TRIBUTE_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -674,7 +674,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_MERCHANT_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_MERCHANT_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -689,7 +689,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_DELETED_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_DELETED_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -704,7 +704,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			SoD::consts::MAP_CORPSE_SIZE,
 /*Underfoot*/	Underfoot::consts::MAP_CORPSE_SIZE,
 /*RoF*/			RoF::consts::MAP_CORPSE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		RoF2::consts::MAP_CORPSE_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -719,7 +719,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			EmuConstants::MAP_BAZAAR_SIZE,
 /*Underfoot*/	EmuConstants::MAP_BAZAAR_SIZE,
 /*RoF*/			EmuConstants::MAP_BAZAAR_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_BAZAAR_SIZE,
 
 /*NPC*/			0, // this may need to be 'EmuConstants::MAP_BAZAAR_SIZE' if offline client traders respawn as an npc
 /*Merc*/		0,
@@ -734,7 +734,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			SoD::consts::MAP_INSPECT_SIZE,
 /*Underfoot*/	Underfoot::consts::MAP_INSPECT_SIZE,
 /*RoF*/			RoF::consts::MAP_INSPECT_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		RoF2::consts::MAP_INSPECT_SIZE,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
@@ -749,7 +749,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_REAL_ESTATE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_REAL_ESTATE_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -764,7 +764,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_VIEW_MOD_PC_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_VIEW_MOD_PC_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -779,7 +779,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_VIEW_MOD_BANK_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_VIEW_MOD_BANK_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -794,7 +794,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -809,7 +809,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -824,7 +824,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_ALT_STORAGE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_ALT_STORAGE_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -839,7 +839,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_ARCHIVED_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_ARCHIVED_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -854,7 +854,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_MAIL_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_MAIL_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -869,7 +869,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -884,7 +884,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			NOT_USED,
 /*Underfoot*/	NOT_USED,
 /*RoF*/			EmuConstants::MAP_KRONO_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_KRONO_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -899,7 +899,7 @@ uint16 EQLimits::InventoryMapSize(int16 map, uint32 version) {
 /*SoD*/			0,
 /*Underfoot*/	0,
 /*RoF*/			EmuConstants::MAP_OTHER_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::MAP_OTHER_SIZE,
 
 /*NPC*/			0,
 /*Merc*/		0,
@@ -1012,7 +1012,7 @@ bool EQLimits::AllowsEmptyBagInBag(uint32 version) {
 /*SoD*/			SoD::limits::ALLOWS_EMPTY_BAG_IN_BAG,
 /*Underfoot*/	Underfoot::limits::ALLOWS_EMPTY_BAG_IN_BAG,
 /*RoF*/			RoF::limits::ALLOWS_EMPTY_BAG_IN_BAG,
-/*RoF2*/		false,
+/*RoF2*/		RoF2::limits::ALLOWS_EMPTY_BAG_IN_BAG,
 
 /*NPC*/			false,
 /*Merc*/		false,
@@ -1033,7 +1033,7 @@ bool EQLimits::AllowsClickCastFromBag(uint32 version) {
 /*SoD*/			SoD::limits::ALLOWS_CLICK_CAST_FROM_BAG,
 /*Underfoot*/	Underfoot::limits::ALLOWS_CLICK_CAST_FROM_BAG,
 /*RoF*/			RoF::limits::ALLOWS_CLICK_CAST_FROM_BAG,
-/*RoF2*/		false,
+/*RoF2*/		RoF2::limits::ALLOWS_CLICK_CAST_FROM_BAG,
 
 /*NPC*/			false,
 /*Merc*/		false,
@@ -1054,7 +1054,7 @@ uint16 EQLimits::ItemCommonSize(uint32 version) {
 /*SoD*/			EmuConstants::ITEM_COMMON_SIZE,
 /*Underfoot*/	EmuConstants::ITEM_COMMON_SIZE,
 /*RoF*/			EmuConstants::ITEM_COMMON_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::ITEM_COMMON_SIZE,
 
 /*NPC*/			EmuConstants::ITEM_COMMON_SIZE,
 /*Merc*/		EmuConstants::ITEM_COMMON_SIZE,
@@ -1074,7 +1074,7 @@ uint16 EQLimits::ItemContainerSize(uint32 version) {
 /*SoD*/			EmuConstants::ITEM_CONTAINER_SIZE,
 /*Underfoot*/	EmuConstants::ITEM_CONTAINER_SIZE,
 /*RoF*/			EmuConstants::ITEM_CONTAINER_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::ITEM_CONTAINER_SIZE,
 
 /*NPC*/			EmuConstants::ITEM_CONTAINER_SIZE,
 /*Merc*/		EmuConstants::ITEM_CONTAINER_SIZE,
@@ -1094,7 +1094,7 @@ bool EQLimits::CoinHasWeight(uint32 version) {
 /*SoD*/			SoD::limits::COIN_HAS_WEIGHT,
 /*Underfoot*/	Underfoot::limits::COIN_HAS_WEIGHT,
 /*RoF*/			RoF::limits::COIN_HAS_WEIGHT,
-/*RoF2*/		true,
+/*RoF2*/		RoF::limits::COIN_HAS_WEIGHT,
 
 /*NPC*/			true,
 /*Merc*/		true,
@@ -1114,7 +1114,7 @@ uint32 EQLimits::BandoliersCount(uint32 version) {
 /*SoD*/			EmuConstants::BANDOLIERS_COUNT,
 /*Underfoot*/	EmuConstants::BANDOLIERS_COUNT,
 /*RoF*/			EmuConstants::BANDOLIERS_COUNT,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::BANDOLIERS_COUNT,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
@@ -1134,7 +1134,7 @@ uint32 EQLimits::BandolierSize(uint32 version) {
 /*SoD*/			EmuConstants::BANDOLIER_SIZE,
 /*Underfoot*/	EmuConstants::BANDOLIER_SIZE,
 /*RoF*/			EmuConstants::BANDOLIER_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::BANDOLIER_SIZE,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
@@ -1154,7 +1154,7 @@ uint32 EQLimits::PotionBeltSize(uint32 version) {
 /*SoD*/			EmuConstants::POTION_BELT_SIZE,
 /*Underfoot*/	EmuConstants::POTION_BELT_SIZE,
 /*RoF*/			EmuConstants::POTION_BELT_SIZE,
-/*RoF2*/		0,
+/*RoF2*/		EmuConstants::POTION_BELT_SIZE,
 
 /*NPC*/			NOT_USED,
 /*Merc*/		NOT_USED,
diff --git a/utils/patches/patch_RoF2.conf b/utils/patches/patch_RoF2.conf
index 589c47468..8c15c59c6 100644
--- a/utils/patches/patch_RoF2.conf
+++ b/utils/patches/patch_RoF2.conf
@@ -100,9 +100,9 @@ OP_SendAAStats=0x43c8
 OP_AAExpUpdate=0x7d14
 OP_ExpUpdate=0x20ed
 OP_HPUpdate=0x2828
-OP_ManaChange=0x43af
+OP_ManaChange=0x5467
 OP_TGB=0x0876
-OP_SpecialMesg=0x0083
+OP_SpecialMesg=0x083
 OP_GuildMemberList=0x12a6
 OP_GuildMOTD=0x3e13
 OP_CharInventory=0x5ca6
@@ -119,7 +119,7 @@ OP_GuildInvite=0x7099
 OP_GuildRemove=0x1444
 OP_GuildPeace=0x67e3
 OP_SetGuildMOTD=0x0b0b
-OP_GuildList=0x507a
+OP_GuildList=0x6279
 OP_GuildWar=0x1ffb
 OP_GuildLeader=0x7e09
 OP_GuildDelete=0x3708
@@ -132,7 +132,7 @@ OP_GuildBank=0x5134
 OP_SetGuildRank=0x0b9c
 OP_GuildUpdateURLAndChannel=0x2958
 OP_GuildStatus=0x7326
-OP_GuildCreate=0x1dc8
+OP_GuildCreate=0x76d9
 OP_GuildMemberLevelUpdate=0x0000	# Unused?
 OP_ZoneGuildList=0x0000				# Unused?
 OP_GetGuildsList=0x0000				# Unused?
@@ -166,7 +166,7 @@ OP_InspectRequest=0x57bc
 OP_InspectAnswer=0x71ac
 OP_InspectMessageUpdate=0x4d25
 OP_BeginCast=0x318f
-OP_ColoredText=0x0000
+OP_ColoredText=0x43af
 OP_ConsentResponse=0x384a
 OP_MemorizeSpell=0x217c
 OP_SwapSpell=0x0efa
@@ -179,8 +179,8 @@ OP_Illusion=0x312a
 OP_MoneyOnCorpse=0x5f44
 OP_RandomReply=0x106b
 OP_DenyResponse=0x2382
-OP_SkillUpdate=0x004c
-OP_GMTrainSkillConfirm=0x66dd
+OP_SkillUpdate=0x04c
+OP_GMTrainSkillConfirm=0x4b64
 OP_RandomReq=0x7b10
 OP_Death=0x6517
 OP_GMTraining=0x1966
@@ -194,7 +194,7 @@ OP_AutoFire=0x241e
 OP_PetCommands=0x0159
 OP_DeleteSpell=0x52e5
 OP_Surname=0x0423
-OP_ClearSurname=0x7d23
+OP_ClearSurname=0x3fb0
 OP_FaceChange=0x5578
 OP_SenseHeading=0x260a
 OP_Action=0x744c
@@ -212,19 +212,19 @@ OP_AssistGroup=0x27f8
 OP_MoveCoin=0x0bcf
 OP_ZonePlayerToBind=0x0ecb
 OP_KeyRing=0x6857
-OP_WhoAllRequest=0x65ab
-OP_WhoAllResponse=0x7c88
+OP_WhoAllRequest=0x674b
+OP_WhoAllResponse=0x51b8
 OP_FriendsWho=0x3956
 OP_ConfirmDelete=0x43a3
 OP_Logout=0x4ac6
 OP_Rewind=0x1745
 OP_TargetCommand=0x58e2
 OP_Hide=0x67fe
-OP_Jump=0x2060
+OP_Jump=0x31f4
 OP_Camp=0x28ec
 OP_Emote=0x373b
 OP_SetRunMode=0x009f
-OP_BankerChange=0x383c
+OP_BankerChange=0x791e
 OP_TargetMouse=0x075d
 OP_MobHealth=0x37b1
 OP_InitialMobHealth=0x0000	# Unused?
@@ -243,7 +243,7 @@ OP_MoveItem=0x32ee
 OP_DeleteItem=0x18ad
 OP_DeleteCharge=0x01b8
 OP_ItemPacket=0x368e
-OP_ItemLinkResponse=0x633c
+OP_ItemLinkResponse=0x70c0
 OP_ItemLinkClick=0x4cef
 OP_ItemPreview=0x6b5c
 OP_NewSpawn=0x6097
@@ -297,7 +297,7 @@ OP_DelegateAbility=0x76b8
 OP_SetGroupTarget=0x2814
 OP_Charm=0x5d92
 OP_Stun=0x36a4
-OP_SendFindableNPCs=0x3897
+OP_SendFindableNPCs=0x7e62
 OP_FindPersonRequest=0x5cea
 OP_FindPersonReply=0x7e58
 OP_Sound=0x1a30
@@ -305,23 +305,23 @@ OP_PetBuffWindow=0x5882
 OP_LevelAppearance=0x3bc9
 OP_Translocate=0x6580
 OP_Sacrifice=0x1821
-OP_PopupResponse=0x214a
-OP_OnLevelMessage=0x4fd0
+OP_PopupResponse=0x08a6
+OP_OnLevelMessage=0x4d6e
 OP_AugmentInfo=0x0afb
-OP_Petition=0x5f03
+OP_Petition=0x3de3
 OP_SomeItemPacketMaybe=0x747c
-OP_PVPStats=0x6f4b
-OP_PVPLeaderBoardRequest=0x3707
-OP_PVPLeaderBoardReply=0x25b7
-OP_PVPLeaderBoardDetailsRequest=0x15a9
-OP_PVPLeaderBoardDetailsReply=0x04aa
-OP_RestState=0x00f
+OP_PVPStats=0x4b15
+OP_PVPLeaderBoardRequest=0x04aa
+OP_PVPLeaderBoardReply=0x071f
+OP_PVPLeaderBoardDetailsRequest=0x3707
+OP_PVPLeaderBoardDetailsReply=0x25b7
+OP_RestState=0x000f
 OP_RespawnWindow=0x28bc
 OP_LDoNButton=0x5327
 OP_SetStartCity=0x6326
 OP_VoiceMacroIn=0x17fd
 OP_VoiceMacroOut=0x409a
-OP_ItemViewUnknown=0x2289
+OP_ItemViewUnknown=0x465b
 OP_VetRewardsAvaliable=0x590e
 OP_VetClaimRequest=0x1126
 OP_VetClaimReply=0x16d4
@@ -330,43 +330,43 @@ OP_DisciplineTimer=0x6989
 OP_BecomeCorpse=0x0000			# Unused?
 OP_Action2=0x0000				# Unused?
 OP_MobUpdate=0x2c84
-OP_NPCMoveUpdate=0x189c
+OP_NPCMoveUpdate=0x5892
 OP_CameraEffect=0x127f
 OP_SpellEffect=0x5936
-OP_RemoveNimbusEffect=0xc693
-OP_AltCurrency=0x7121
-OP_AltCurrencyMerchantRequest=0x6b6d
-OP_AltCurrencyMerchantReply=0x74ec
-OP_AltCurrencyPurchase=0x61cb
-OP_AltCurrencySell=0x0165
-OP_AltCurrencySellSelection=0x5409
-OP_AltCurrencyReclaim=0x532a
+OP_RemoveNimbusEffect=0x7b1e
+OP_AltCurrency=0x62ab
+OP_AltCurrencyMerchantRequest=0x61cb
+OP_AltCurrencyMerchantReply=0x5409
+OP_AltCurrencyPurchase=0x0165
+OP_AltCurrencySell=0x74ec
+OP_AltCurrencySellSelection=0x3788
+OP_AltCurrencyReclaim=0x3899
 OP_CrystalCountUpdate=0x467f
 OP_CrystalCreate=0x7aee
 OP_CrystalReclaim=0x2439
 OP_Untargetable=0x053c
 OP_IncreaseStats=0x70a3
-OP_Weblink=0x18d3
+OP_Weblink=0x6f4b
 OP_OpenContainer=0x0000
 OP_Marquee=0x0000
-OP_ItemRecastDelay=0x08a6
+OP_ItemRecastDelay=0x15a9
 #OP_OpenInventory=0x0000			# Likely does not exist in RoF -U
 
-OP_DzQuit=0xb2e3
-OP_DzListTimers=0x7b68
-OP_DzAddPlayer=0x4701
-OP_DzRemovePlayer=0x1abc
-OP_DzSwapPlayer=0x405b
-OP_DzMakeLeader=0x543d
-OP_DzPlayerList=0x14c6
-OP_DzJoinExpeditionConfirm=0x7f4b
-OP_DzJoinExpeditionReply=0x1950
-OP_DzExpeditionInfo=0x9119
-OP_DzExpeditionList=0x205f
-OP_DzMemberStatus=0x32f0
-OP_DzLeaderStatus=0x3de9
-OP_DzExpeditionEndsWarning=0x5189
-OP_DzMemberList=0x5ae4
+OP_DzQuit=0x205f
+OP_DzListTimers=0x0398
+OP_DzAddPlayer=0x59ca
+OP_DzRemovePlayer=0x4701
+OP_DzSwapPlayer=0x1abc
+OP_DzMakeLeader=0x405b
+OP_DzPlayerList=0x543d
+OP_DzJoinExpeditionConfirm=0x14c6
+OP_DzJoinExpeditionReply=0x7f4b
+OP_DzExpeditionInfo=0x4f7e
+OP_DzExpeditionList=0x9119
+OP_DzMemberStatus=0xb2e3
+OP_DzLeaderStatus=0x32f0
+OP_DzExpeditionEndsWarning=0x7e94
+OP_DzMemberList=0x3de9
 OP_DzCompass=0x3e0e
 OP_DzChooseZone=0x0000
 
@@ -428,15 +428,15 @@ OP_FinishWindow2=0x40ef
 
 # Sent on Live for what seems to be item existance verification
 # Ex. Before Right Click Effect happens from items
-OP_ItemVerifyRequest=0x097b
-OP_ItemVerifyReply=0x2115
+OP_ItemVerifyRequest=0x189c
+OP_ItemVerifyReply=0x097b
 
 # merchant stuff
-OP_ShopPlayerSell=0x1901
+OP_ShopPlayerSell=0x0000
 OP_ShopRequest=0x4fed
 OP_ShopEnd=0x30a8
 OP_ShopEndConfirm=0x3196
-OP_ShopPlayerBuy=0x04c
+OP_ShopPlayerBuy=0x0ddd
 OP_ShopDelItem=0x724f
 
 # tradeskill stuff:
@@ -444,7 +444,7 @@ OP_ClickObject=0x4aa1
 OP_ClickObjectAction=0x0c1e
 OP_ClearObject=0x7a11
 OP_RecipeDetails=0x40d7
-OP_RecipesFavorite=0x5c74
+OP_RecipesFavorite=0x71b1
 OP_RecipesSearch=0x1db6
 OP_RecipeReply=0x6e02
 OP_RecipeAutoCombine=0x6261
@@ -484,16 +484,16 @@ OP_AdventureLeaderboardReply=0x7f79
 
 # Group Opcodes
 OP_GroupDisband=0x4c10
-OP_GroupInvite=0x1649
-OP_GroupFollow=0x05ce
+OP_GroupInvite=0x6110
+OP_GroupFollow=0x1649
 OP_GroupUpdate=0x3abb
 OP_GroupUpdateB=0x6194
 OP_GroupCancelInvite=0x0000
 OP_GroupAcknowledge=0x7323
 OP_GroupDelete=0x0f6c
-OP_CancelInvite=0x32c2
-OP_GroupFollow2=0x2a50
-OP_GroupInvite2=0x6c65
+OP_CancelInvite=0x2a50
+OP_GroupFollow2=0x2060
+OP_GroupInvite2=0x32c2
 OP_GroupDisbandYou=0x1ae5
 OP_GroupDisbandOther=0x74da
 OP_GroupLeaderChange=0x21b4
@@ -501,7 +501,7 @@ OP_GroupRoles=0x70e2
 OP_GroupMakeLeader=0x4229
 OP_DoGroupLeadershipAbility=0x1fb5
 OP_GroupLeadershipAAUpdate=0x02cf
-OP_GroupMentor=0x5892
+OP_GroupMentor=0x3342
 OP_InspectBuffs=0x486c
 
 # LFG/LFP Opcodes
@@ -535,12 +535,12 @@ OP_Bind_Wound=0x0386
 OP_LDoNOpen=0x3d5c
 
 # Task packets
-OP_TaskDescription=0x083
-OP_TaskActivity=0x3714
+OP_TaskDescription=0x3714
+OP_TaskActivity=0x08d3
 OP_CompletedTasks=0x4eba
 OP_TaskActivityComplete=0x5e19
 OP_AcceptNewTask=0x0a23
-OP_CancelTask=0x08d3
+OP_CancelTask=0x39f0
 OP_TaskMemberList=0x5727
 OP_OpenNewTasksWindow=0x48a2
 OP_AvaliableTask=0x36e8
@@ -657,4 +657,4 @@ OP_RAWOutOfSession=0x0000
 
 # we need to document the differences between these packets to make identifying them easier
 OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs
-OP_InitialHPUpdate=0x0000
\ No newline at end of file
+OP_InitialHPUpdate=0x0000
diff --git a/utils/scripts/opcode_scripts/.gitignore b/utils/scripts/opcode_scripts/.gitignore
new file mode 100644
index 000000000..4104a1572
--- /dev/null
+++ b/utils/scripts/opcode_scripts/.gitignore
@@ -0,0 +1,3 @@
+# Input and Output txt and conf files.
+*.txt
+*.conf