diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index b27004886..64f25c9e1 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -427,12 +427,14 @@ namespace Dalamud {
});
}
+#if DEBUG
private void OnDebugZoneDownInjectCommand(string command, string arguments) {
var data = File.ReadAllBytes(arguments);
Framework.Network.InjectZoneProtoPacket(data);
Framework.Gui.Chat.Print($"{arguments} OK with {data.Length} bytes");
}
+#endif
private void OnRouletteBonusNotifyCommand(string command, string arguments)
{
diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index f9f143d39..9e7a3bee3 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -14,9 +14,9 @@
true
- 4.1.0.8
- 4.1.0.8
- 4.1.0.8
+ 4.3.0.0
+ 4.3.0.0
+ 4.3.0.0
@@ -41,7 +41,7 @@
-
+
diff --git a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
index 4a5b94782..04838b2c9 100644
--- a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
+++ b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
@@ -15,7 +15,7 @@ namespace Dalamud.Game.ClientState
protected override void Setup64Bit(SigScanner sig) {
ActorTable = sig.Module.BaseAddress + 0x1BFBA38;
LocalContentId = sig.Module.BaseAddress + 0x1C2E000;
- JobGaugeData = sig.Module.BaseAddress + 0x1BF8110;
+ JobGaugeData = sig.Module.BaseAddress + 0x1C00110;
}
}
}
diff --git a/Dalamud/Game/Internal/Gui/IconReplacer.cs b/Dalamud/Game/Internal/Gui/IconReplacer.cs
index bf12d4e60..16c89702e 100644
--- a/Dalamud/Game/Internal/Gui/IconReplacer.cs
+++ b/Dalamud/Game/Internal/Gui/IconReplacer.cs
@@ -35,13 +35,13 @@ namespace Dalamud.Game.Internal.Gui {
this.Address = new IconReplacerAddressResolver();
this.Address.Setup(scanner);
- this.byteBase = scanner.Module.BaseAddress;
- //this.comboTimer = byteBase + 0x1BB0B50;
- this.comboTimer = scanner.ScanText("E8 ?? ?? ?? ?? 80 7E 21 00") + 0x178;
+ this.byteBase = scanner.Module.BaseAddress;
+ this.comboTimer = byteBase + 0x1BB8B50;
+ //this.comboTimer = scanner.ScanText("E8 ?? ?? ?? ?? 80 7E 21 00") + 0x178;
this.lastComboMove = this.comboTimer + 0x4;
- //this.playerLevel = byteBase + 0x1C28FA8 + 0x78;
- this.playerLevel = scanner.ScanText("E8 ?? ?? ?? ?? 88 45 EF") + 0x4D;
+ this.playerLevel = byteBase + 0x1C30FA8 + 0x78;
+ //this.playerLevel = scanner.ScanText("E8 ?? ?? ?? ?? 88 45 EF") + 0x4D;
CustomIDs = new HashSet();
VanillaIDs = new HashSet();
@@ -849,7 +849,7 @@ namespace Dalamud.Game.Internal.Gui {
private unsafe delegate int* getArray(long* address);
private unsafe IntPtr FindBuffAddress() {
- IntPtr randomAddress = byteBase + 0x1BFFBE0;
+ IntPtr randomAddress = byteBase + 0x1C07BE0;
IntPtr num = Marshal.ReadIntPtr(randomAddress);
IntPtr step2 = (IntPtr)(Marshal.ReadInt64(num) + 0x248);
IntPtr step3 = Marshal.ReadIntPtr(step2);
diff --git a/Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs b/Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs
index 2fa72347b..c5b5917e4 100644
--- a/Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs
+++ b/Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs
@@ -10,11 +10,11 @@ namespace Dalamud.Game.Internal.Gui {
public IntPtr IsIconReplaceable { get; private set; }
protected override void Setup64Bit(SigScanner sig) {
- //this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00");
- this.GetIcon = sig.ScanText("E8 ?? ?? ?? ?? F6 DB 8B C8");
+ this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00");
+ //this.GetIcon = sig.ScanText("E8 ?? ?? ?? ?? F6 DB 8B C8");
- //this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb");
- this.IsIconReplaceable = sig.ScanText("81 F9 ?? ?? ?? ?? 7F 39 81 F9 ?? ?? ?? ??");
+ this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb");
+ //this.IsIconReplaceable = sig.ScanText("81 F9 ?? ?? ?? ?? 7F 39 81 F9 ?? ?? ?? ??");
}
}
}