various changes

network/mhfpacket/msg_mhf_read_mercenary_m.go

@@ -12,7 +12,7 @@ import (
 type MsgMhfReadMercenaryM struct {
 	AckHandle uint32
 	CharID    uint32
-	Unk0      uint32
+	MercID    uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -24,7 +24,7 @@ func (m *MsgMhfReadMercenaryM) Opcode() network.PacketID {
 func (m *MsgMhfReadMercenaryM) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.CharID = bf.ReadUint32()
-	m.Unk0 = bf.ReadUint32()
+	m.MercID = bf.ReadUint32()
 	return nil
 }
 

network/mhfpacket/msg_mhf_read_mercenary_w.go

@@ -11,7 +11,7 @@ import (
 // MsgMhfReadMercenaryW represents the MSG_MHF_READ_MERCENARY_W
 type MsgMhfReadMercenaryW struct {
 	AckHandle uint32
-	Unk0      bool
+	GetPact   bool
 	Unk1      uint8
 	Unk2      uint16 // Hardcoded 0 in the binary
 }
@@ -24,7 +24,7 @@ func (m *MsgMhfReadMercenaryW) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfReadMercenaryW) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Unk0 = bf.ReadBool()
+	m.GetPact = bf.ReadBool()
 	m.Unk1 = bf.ReadUint8()
 	m.Unk2 = bf.ReadUint16()
 	return nil

network/mhfpacket/msg_mhf_save_mercenary.go

@@ -10,11 +10,10 @@ import (
 
 // MsgMhfSaveMercenary represents the MSG_MHF_SAVE_MERCENARY
 type MsgMhfSaveMercenary struct {
-	AckHandle uint32
-	GCP       uint32
-	Unk0      uint32
-	MercData  []byte
-	Unk1      uint32
+	AckHandle  uint32
+	GCP        uint32
+	PactMercID uint32
+	MercData   []byte
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -27,9 +26,10 @@ func (m *MsgMhfSaveMercenary) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
 	m.AckHandle = bf.ReadUint32()
 	bf.ReadUint32() // lenData
 	m.GCP = bf.ReadUint32()
-	m.Unk0 = bf.ReadUint32()
-	m.MercData = bf.ReadBytes(uint(bf.ReadUint32()))
-	m.Unk1 = bf.ReadUint32()
+	m.PactMercID = bf.ReadUint32()
+	dataSize := bf.ReadUint32()
+	_ = bf.ReadUint32() // Merc index?
+	m.MercData = bf.ReadBytes(uint(dataSize))
 	return nil
 }