Merge pull request #1270 from AsgardXIV/patch63

Patch 6.3 Support
imchillin · Jan 10, 2023 · c092a5e · c092a5e
2 parents bb4e001 + 72e32ab
commit c092a5e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/Anamnesis/Memory/ActorBasicMemory.cs b/Anamnesis/Memory/ActorBasicMemory.cs
@@ -31,7 +31,7 @@ public enum RenderModes : uint
 	[Bind(0x08c, BindFlags.ActorRefresh)] public ActorTypes ObjectKind { get; set; }
 	[Bind(0x090)] public byte DistanceFromPlayerX { get; set; }
 	[Bind(0x092)] public byte DistanceFromPlayerY { get; set; }
-	[Bind(0x0104)] public RenderModes RenderMode { get; set; }
+	[Bind(0x0114)] public RenderModes RenderMode { get; set; }
 
 	public string Id => $"n{this.NameHash}_d{this.DataId}_o{this.Address}";
 	public string IdNoAddress => $"n{this.NameHash}_d{this.DataId}"; ////_k{this.ObjectKind}";

diff --git a/Anamnesis/Memory/ActorMemory.cs b/Anamnesis/Memory/ActorMemory.cs
@@ -41,8 +41,8 @@ public enum CharacterFlagDefs : byte
 	}
 
 	[Bind(0x008D)] public byte SubKind { get; set; }
-	[Bind(0x00B4)] public float Scale { get; set; }
-	[Bind(0x00F0, BindFlags.Pointer)] public ActorModelMemory? ModelObject { get; set; }
+	[Bind(0x00C4)] public float Scale { get; set; }
+	[Bind(0x0100, BindFlags.Pointer)] public ActorModelMemory? ModelObject { get; set; }
 	[Bind(0x01B4, BindFlags.ActorRefresh)] public int ModelType { get; set; }
 	[Bind(0x01E0)] public byte ClassJob { get; set; }
 	[Bind(0x0660, BindFlags.Pointer)] public ActorMemory? Mount { get; set; }
@@ -56,13 +56,13 @@ public enum CharacterFlagDefs : byte
 	[Bind(0x085F, BindFlags.ActorRefresh)] public CharacterFlagDefs CharacterFlags { get; set; }
 	[Bind(0x0870, BindFlags.Pointer)] public ActorMemory? Ornament { get; set; }
 	[Bind(0x0878)] public ushort OrnamentId { get; set; }
-	[Bind(0x09C0)] public AnimationMemory? Animation { get; set; }
-	[Bind(0x11F4)] public bool IsMotionEnabled { get; set; }
-	[Bind(0x19F8)] public float Transparency { get; set; }
-	[Bind(0x1AD2)] public byte Voice { get; set; }
-	[Bind(0x1AD4)] public byte CharacterModeRaw { get; set; }
-	[Bind(0x1AD5)] public byte CharacterModeInput { get; set; }
-	[Bind(0x1B04)] public byte AttachmentPoint { get; set; }
+	[Bind(0x0900)] public AnimationMemory? Animation { get; set; }
+	[Bind(0x1214)] public bool IsMotionEnabled { get; set; }
+	[Bind(0x1A18)] public float Transparency { get; set; }
+	[Bind(0x1AFE)] public byte Voice { get; set; }
+	[Bind(0x1B00)] public byte CharacterModeRaw { get; set; }
+	[Bind(0x1B01)] public byte CharacterModeInput { get; set; }
+	[Bind(0x1B20)] public byte AttachmentPoint { get; set; }
 
 	public PinnedActor? Pinned { get; set; }
 

diff --git a/Anamnesis/Memory/AnimationMemory.cs b/Anamnesis/Memory/AnimationMemory.cs
@@ -27,11 +27,11 @@ public enum AnimationSlots : int
 		Overlay = 12,
 	}
 
-	[Bind(0x000)] public AnimationIdArrayMemory? AnimationIds { get; set; }
-	[Bind(0x074)] public AnimationSpeedArrayMemory? Speeds { get; set; }
-	[Bind(0x102)] public byte SpeedTrigger { get; set; }
-	[Bind(0x1EC)] public ushort BaseOverride { get; set; }
-	[Bind(0x1EE)] public ushort LipsOverride { get; set; }
+	[Bind(0x0E0)] public AnimationIdArrayMemory? AnimationIds { get; set; }
+	[Bind(0x154)] public AnimationSpeedArrayMemory? Speeds { get; set; }
+	[Bind(0x1E2)] public byte SpeedTrigger { get; set; }
+	[Bind(0x2CC)] public ushort BaseOverride { get; set; }
+	[Bind(0x2CE)] public ushort LipsOverride { get; set; }
 
 	public bool BlendLocked { get; set; } = false;
 

diff --git a/Anamnesis/Memory/GPoseCameraMemory.cs b/Anamnesis/Memory/GPoseCameraMemory.cs
@@ -5,5 +5,5 @@ namespace Anamnesis.Memory;
 
 public class GPoseCameraMemory : MemoryBase
 {
-	[Bind(0x000)] public Vector Position { get; set; }
+	[Bind(0x10)] public Vector Position { get; set; }
 }