diff --git a/src/packet/messages.rs b/src/packet/messages.rs
index aa66267..9b8e6ce 100644
--- a/src/packet/messages.rs
+++ b/src/packet/messages.rs
@@ -124,12 +124,12 @@ pub struct PlayerChangedMap {
 
 #[pso_message(0x1F)]
 pub struct PlayerChangedMap2 {
-    unknown1: u32,
+    map_area: u32,
 }
 
 #[pso_message(0x20)]
 pub struct TellOtherPlayerMyLocation {
-    unknown1: u32,
+    map_area: u32,
     x: f32,
     y: f32,
     z: f32,
@@ -212,9 +212,9 @@ pub struct AddItemToInventory {
 pub struct InitializeSpeechNpc {
     unknown1: u16,
     unknown2: u16,
-    location: u32,
-    location2: u32,
-    unknown3: u32,
+    x: f32,
+    z: f32,
+    unknown3: f32,
 }
 
 #[pso_message(0x2D)]
@@ -295,8 +295,8 @@ pub struct PlayerLoadedIn {
 #[pso_message(0x40)]
 pub struct PlayerWalking {
     x: f32,
-    y: f32,
     z: f32,
+    unknown: f32,
 }
 
 #[pso_message(0x42)]
@@ -402,9 +402,9 @@ pub struct TalkToNpc {
 
 #[pso_message(0x55)]
 pub struct PlayerWarped {
+    unknown1: u32,
     x: f32,
     y: f32,
-    z: f32,
 }
 
 #[pso_message(0x58)]