From cb0da9d67474e119d1ada0d0bac81b7b575b0376 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 28 Oct 2026 12:07:13 +0000 Subject: [PATCH] Decompile fn_13690 (GuildWndInfo::Reset) Batch #1313 by ragnarok-clanker: 0 byte-identical, 1 confirmed by peer review. - fn_13690 GuildWndInfo::Reset: logic confirmed by peer review Peer-reviewed-by: Yommy Reviewed-by: ragnarok-clanker --- Source/Contents/UserData/NormalItemSlots.cpp | 16 ++++++++++++++++ Source/Contents/UserData/NormalItemSlots.h | 10 ++++++++++ 2 files changed, 26 insertions(+) diff --git a/Source/Contents/UserData/NormalItemSlots.cpp b/Source/Contents/UserData/NormalItemSlots.cpp index 76ccb759..e778a1ad 100644 --- a/Source/Contents/UserData/NormalItemSlots.cpp +++ b/Source/Contents/UserData/NormalItemSlots.cpp @@ -3,6 +3,12 @@ #include +// GLOBAL: gl_24700 +int g_defaultPlacementWidth = 400; + +// GLOBAL: gl_24701 +int g_defaultPlacementHeight = 317; + // OFFSET: 0x009A6C20 // FUNCTION: fn_13725 void NormalItemSlotWindow::Reset() { @@ -217,6 +223,16 @@ void GuildHelperWndInfo::Reset() { this->height = 150; } +// OFFSET: 0x009A65A0 +// FUNCTION: fn_13690 +void GuildWndInfo::Reset() { + this->x = 0; + this->y = 34; + this->width = g_defaultPlacementWidth; + this->height = g_defaultPlacementHeight; + this->unknown_0010 = 0; +} + // OFFSET: 0x009A65D0 // FUNCTION: fn_13691 void HomunInfoWndInfo::Reset() { diff --git a/Source/Contents/UserData/NormalItemSlots.h b/Source/Contents/UserData/NormalItemSlots.h index c880dcbc..4c351e87 100644 --- a/Source/Contents/UserData/NormalItemSlots.h +++ b/Source/Contents/UserData/NormalItemSlots.h @@ -131,6 +131,12 @@ struct GuildHelperWndInfo : WindowPlacement { void Reset(); }; +struct GuildWndInfo : WindowPlacement { + /* 0010 */ int unknown_0010; + + void Reset(); +}; + struct HomunInfoWndInfo : WindowPlacement { void Reset(); }; @@ -304,9 +310,13 @@ static_assert(sizeof(ItemStoreFindListInfo) == 0x14); static_assert(sizeof(ItemWndInfo) == 0x28); static_assert(sizeof(MiniMapWndInfo) == 0x24); static_assert(sizeof(MessengerGroupWndInfo) == 0x1C); +static_assert(sizeof(GuildWndInfo) == 0x14); static_assert(sizeof(UnusedWndInfoB) == 0x18); #endif +extern int g_defaultPlacementWidth; +extern int g_defaultPlacementHeight; + void ExportNormalItemSlots(Json::Value& data, const NormalItemSlot* slots, const NormalItemSlotWindow& window, bool active); #endif