From 511abc0c30d6f9fb499e95928c9dc8d02835943b Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Sat, 7 Nov 2026 08:11:38 +0000 Subject: [PATCH] Decompile 4 functions in Source/Contents/CashEmotionMgr.cpp, Source/UI/Buttons/UIButton.cpp Batch #14211 by Yommy: 3 byte-identical, 1 confirmed by peer review. - fn_10847 UISpriteButton2::Slot25: byte-identical - fn_10848 UISpriteButton::Slot25: byte-identical - fn_10870 UISpriteButton2::Slot27: logic confirmed by peer review - fn_10698 UISpriteButton::~UISpriteButton: byte-identical Peer-reviewed-by: secret, KWDev, codeplay Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- Source/Contents/CashEmotionMgr.cpp | 29 ----------------------------- Source/UI/Buttons/UIButton.cpp | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index 7710e46a9..8dec9f708 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -3860,10 +3860,6 @@ UISpriteButton2::~UISpriteButton2() { this->m_target = nullptr; } -// OFFSET: 0x00851C70 -// FUNCTION: fn_10698 -UISpriteButton::~UISpriteButton() = default; - // OFFSET: 0x0085CF90 // FUNCTION: fn_10810 void UIHeadsprButton::Paint() { @@ -4026,22 +4022,6 @@ void UISpriteButton::Slot26(int x, int y) { this->Root()->Slot26(this->geometry.x + x, this->geometry.y + y); } -// OFFSET: 0x0085ED70 -// FUNCTION: fn_10847 -void UISpriteButton2::Slot25(int x, int y) { - UIButton::Slot25(x, y); - if (this->m_target) { - this->m_target->Slot25(this->geometry.x + x, this->geometry.y + y); - } -} - -// OFFSET: 0x0085EDC0 -// FUNCTION: fn_10848 -void UISpriteButton::Slot25(int x, int y) { - UIButton::Slot25(x, y); - this->Root()->Slot25(this->geometry.x + x, this->geometry.y + y); -} - // OFFSET: 0x0085F160 // FUNCTION: fn_10857 void UISpriteButton2::Slot47() { @@ -4074,15 +4054,6 @@ void UISpriteButton2::Slot48() { } } -// OFFSET: 0x0085F7A0 -// FUNCTION: fn_10870 -void UISpriteButton2::Slot27(int x, int y) { - UIButton::Slot27(x, y); - if (this->m_target) { - this->m_target->Slot27(this->geometry.x + x, this->geometry.y + y); - } -} - // OFFSET: 0x0085F870 // FUNCTION: fn_10871 void UISpriteButton::Slot27(int x, int y) { diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index b8e1b5a9c..449f7c668 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -12,6 +12,7 @@ #include "Script/LuaScript.h" #include "UI/Window/UIWindowMgr.h" #include "UI/Buttons/UIButton.h" +#include "UI/Buttons/UISpriteButton.h" #include @@ -27,6 +28,10 @@ UIButton::UIButton() : UIWindow(0) { // FUNCTION: fn_10690 UIButton::~UIButton() = default; +// OFFSET: 0x00851C70 +// FUNCTION: fn_10698 +UISpriteButton::~UISpriteButton() = default; + // OFFSET: 0x0085C450 // FUNCTION: fn_10800 void UIButton::Paint() { @@ -64,6 +69,22 @@ void UIButton::Slot25(int, int) { this->Invalidate(); } +// OFFSET: 0x0085ED70 +// FUNCTION: fn_10847 +void UISpriteButton2::Slot25(int x, int y) { + UIButton::Slot25(x, y); + if (this->m_target) { + this->m_target->Slot25(this->geometry.x + x, this->geometry.y + y); + } +} + +// OFFSET: 0x0085EDC0 +// FUNCTION: fn_10848 +void UISpriteButton::Slot25(int x, int y) { + UIButton::Slot25(x, y); + this->Root()->Slot25(this->geometry.x + x, this->geometry.y + y); +} + // OFFSET: 0x0085E8B0 // FUNCTION: fn_10830 void UIButton::Slot26(int x, int y) { @@ -103,6 +124,15 @@ void UIButton::Slot27(int x, int y) { } } +// OFFSET: 0x0085F7A0 +// FUNCTION: fn_10870 +void UISpriteButton2::Slot27(int x, int y) { + UIButton::Slot27(x, y); + if (this->m_target) { + this->m_target->Slot27(this->geometry.x + x, this->geometry.y + y); + } +} + // OFFSET: 0x0085F180 // FUNCTION: fn_10858 void UIButton::Slot28(int x, int y) {