diff --git a/Source/ActorPickNode.cpp b/Source/ActorPickNode.cpp index c2f8baa7..5965a501 100644 --- a/Source/ActorPickNode.cpp +++ b/Source/ActorPickNode.cpp @@ -211,7 +211,6 @@ CView::CView() { *reinterpret_cast(&this->shake.unknown_0010) = 0; } -// OFFSET: 0x00ADAEA0 CView::~CView() { if (this->unknown_01B4) { delete this->unknown_01B4; diff --git a/Source/Archive/GPak.cpp b/Source/Archive/GPak.cpp index bd0e9aab..fb760274 100644 --- a/Source/Archive/GPak.cpp +++ b/Source/Archive/GPak.cpp @@ -1345,7 +1345,6 @@ CGPak::CGPak() : m_file(nullptr), m_version(0), m_entryCount(0), m_tableOffset(0 } // OFFSET: 0x00AE97D0 -// OFFSET: 0x00AE98C0 // FUNCTION: fn_18107 CGPak::~CGPak() { DeleteCriticalSection(&this->m_criticalSection); @@ -1982,7 +1981,6 @@ namespace GPakEx { }; - // OFFSET: 0x006434B0 __declspec(noinline) void XorBuffers(std::uint8_t* output, const std::uint8_t* input, const std::uint8_t* mask, std::size_t length) { for (; length >= 16; length -= 16, output += 16, input += 16, mask += 16) { for (std::size_t i = 0; i < 16; ++i) { @@ -1994,7 +1992,6 @@ namespace GPakEx { } } - // OFFSET: 0x00642B80 std::size_t BlockCipher::AdvancedProcessBlocks(const std::uint8_t* input, const std::uint8_t* xorBlock, std::uint8_t* output, std::size_t length, std::uint32_t flags) const { const std::size_t blockSize = this->BlockSize(); std::ptrdiff_t step = static_cast(blockSize); @@ -2047,8 +2044,6 @@ namespace GPakEx { static_assert(sizeof(CipherModeBase) == 0x20); - // OFFSET: 0x00642B00 - // OFFSET: 0x00642A70 CipherModeBase::~CipherModeBase() { } @@ -2073,7 +2068,6 @@ namespace GPakEx { return length + (blockSize - length % blockSize); } - // OFFSET: 0x00643160 std::size_t CipherModeBase::Process(std::span input, std::span output, bool final) { const bool forward = this->IsForwardTransformation(); const std::size_t blockSize = this->m_cipher->BlockSize(); @@ -2134,7 +2128,6 @@ namespace GPakEx { void ProcessData(std::uint8_t* output, const std::uint8_t* input, std::size_t length) override; }; - // OFFSET: 0x00642E20 void CBC_Encryption::ProcessData(std::uint8_t* output, const std::uint8_t* input, std::size_t length) { const std::size_t blockSize = this->m_cipher->BlockSize(); if (length == 0) { @@ -2155,13 +2148,11 @@ namespace GPakEx { /* 0020 */ std::vector m_temp; }; - // OFFSET: 0x006432C0 void CBC_Decryption::ResizeBuffers() { this->CipherModeBase::ResizeBuffers(); this->m_temp.resize(this->m_cipher->BlockSize()); } - // OFFSET: 0x00642D60 void CBC_Decryption::ProcessData(std::uint8_t* output, const std::uint8_t* input, std::size_t length) { const std::size_t blockSize = this->m_cipher->BlockSize(); if (length == 0) { @@ -2183,13 +2174,11 @@ namespace GPakEx { /* 0020 */ std::vector m_temp; }; - // OFFSET: 0x00643330 void CFB_Decryption::ResizeBuffers() { this->CipherModeBase::ResizeBuffers(); this->m_temp.resize(this->m_cipher->BlockSize()); } - // OFFSET: 0x00642EB0 void CFB_Decryption::ProcessData(std::uint8_t* output, const std::uint8_t* input, std::size_t length) { const std::size_t blockSize = this->m_cipher->BlockSize(); if (length == 0) { @@ -2208,7 +2197,6 @@ namespace GPakEx { void ProcessData(std::uint8_t* output, const std::uint8_t* input, std::size_t length) override; }; - // OFFSET: 0x006430F0 void OFB_Base::ProcessData(std::uint8_t* output, const std::uint8_t* input, std::size_t length) { const std::size_t blockSize = this->m_cipher->BlockSize(); while (length != 0) { diff --git a/Source/Archive/MemMapPakFile.cpp b/Source/Archive/MemMapPakFile.cpp index c385a55d..c760387b 100644 --- a/Source/Archive/MemMapPakFile.cpp +++ b/Source/Archive/MemMapPakFile.cpp @@ -10,7 +10,6 @@ CMemMapPakFile::CMemMapPakFile() : m_handle(nullptr), m_mapping(nullptr), m_view // OFFSET: 0x00AE9850 // FUNCTION: fn_18108 -// OFFSET: 0x00AE9950 CMemMapPakFile::~CMemMapPakFile() { this->Close(); } diff --git a/Source/Archive/PakCrypto.cpp b/Source/Archive/PakCrypto.cpp index fe576b60..2e34f9a4 100644 --- a/Source/Archive/PakCrypto.cpp +++ b/Source/Archive/PakCrypto.cpp @@ -4,6 +4,7 @@ #include namespace myGPack { + // OFFSET: 0x00AEA5C0 // FUNCTION: fn_18121 int DecryptPakData(const BYTE* secret, DWORD secretSize, const BYTE* input, BYTE* output, DWORD dataSize) { HCRYPTPROV provider = 0; diff --git a/Source/Archive/PakFile.cpp b/Source/Archive/PakFile.cpp index f4e6073b..6e043770 100644 --- a/Source/Archive/PakFile.cpp +++ b/Source/Archive/PakFile.cpp @@ -82,8 +82,8 @@ namespace { } // OFFSET: 0x005EF3F0 -// OFFSET: 0x005EF660 // FUNCTION: fn_04004 +// OFFSET: 0x005EF660 // FUNCTION: fn_04009 CPakFile::~CPakFile() = default; diff --git a/Source/Client/Application/UnhandledExceptionHandler.cpp b/Source/Client/Application/UnhandledExceptionHandler.cpp index 132e6f4d..88001761 100644 --- a/Source/Client/Application/UnhandledExceptionHandler.cpp +++ b/Source/Client/Application/UnhandledExceptionHandler.cpp @@ -71,7 +71,6 @@ extern "C" long long __cdecl _Xtime_get_ticks(); CUnhandledExceptionHandler::CUnhandledExceptionHandler() { } -// OFFSET: 0x00635A80 CUnhandledExceptionHandler::~CUnhandledExceptionHandler() = default; // OFFSET: 0x00635AB0 diff --git a/Source/Client/Application/UnhandledExceptionHandler.h b/Source/Client/Application/UnhandledExceptionHandler.h index db25282b..9f63a8a1 100644 --- a/Source/Client/Application/UnhandledExceptionHandler.h +++ b/Source/Client/Application/UnhandledExceptionHandler.h @@ -8,10 +8,8 @@ // VTABLE: vt_00282 class CUnhandledExceptionHandler { public: - // OFFSET: 0x00635A70 CUnhandledExceptionHandler(); - // OFFSET: 0x00635A80 virtual ~CUnhandledExceptionHandler(); }; @@ -19,25 +17,18 @@ public: static_assert(sizeof(CUnhandledExceptionHandler) == 4); #endif -// OFFSET: 0x00635AB0 bool InitUnhandledExceptionHandler(int (*callback)()); -// OFFSET: 0x00635C10 int CleanupUnhandledExceptionHandler(); -// OFFSET: 0x00635C30 INT_PTR CALLBACK DialogFunc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -// OFFSET: 0x00635DB0 BOOL CALLBACK EnumerateLoadedModulesCallback(PCSTR moduleName, ULONG moduleBase, ULONG moduleSize, PVOID userContext); -// OFFSET: 0x00635E00 void __cdecl InvalidParameterHandler(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line, uintptr_t pReserved); -// OFFSET: 0x00635E90 void __cdecl PurecallHandler(); -// OFFSET: 0x00635F00 LONG WINAPI TopLevelExceptionFilter(EXCEPTION_POINTERS* exceptionInfo); #endif diff --git a/Source/Client/Input/Language.cpp b/Source/Client/Input/Language.cpp index 162ea148..e8b2c884 100644 --- a/Source/Client/Input/Language.cpp +++ b/Source/Client/Input/Language.cpp @@ -421,8 +421,6 @@ UIChatHisBox3::UIChatHisBox3() : UIChatHisBox2(), unknown_0130(1), unknown_0134( UIColoringTextViewer::UIColoringTextViewer() : UIListBox(), color(0), lineLimit(0) { } -// OFFSET: 0x0099A060 - // OFFSET: 0x007ECF50 // FUNCTION: fn_09805 UIMacroDetectorWnd::UIMacroDetectorWnd() @@ -432,6 +430,7 @@ UIMacroDetectorWnd::UIMacroDetectorWnd() g_windowMgr.CloseWindow(155); g_windowMgr.CloseWindow(39); } +// OFFSET: 0x0099A060 // FUNCTION: fn_13537 UIRoundBoxTooltipWnd::UIRoundBoxTooltipWnd() : UIFrameWnd(0), viewer(nullptr) { } @@ -491,8 +490,6 @@ CLanguageTH::CLanguageTH() : lexiconLoaded(g_lexiconBoundary.Load()) { UIHairStyleButton::UIHairStyleButton(int style, int sex) : UIBitmapButton(), m_style(style), m_sex(sex), m_race(0), m_preview(nullptr), m_selected(false) { } -// OFFSET: 0x00999FF0 - // OFFSET: 0x00ACD140 // FUNCTION: fn_17755 CLanguageBase::~CLanguageBase() = default; diff --git a/Source/Client/Input/Mouse.cpp b/Source/Client/Input/Mouse.cpp index 1858969d..d68e53a5 100644 --- a/Source/Client/Input/Mouse.cpp +++ b/Source/Client/Input/Mouse.cpp @@ -5,7 +5,6 @@ #include // OFFSET: 0x006370C0 -// OFFSET: 0x006370D0 // FUNCTION: fn_04724 CMouse::~CMouse() = default; diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index 65222260..184a8c7b 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -513,8 +513,6 @@ void CGameMode::UpdateUnknown0628(int id, bool add) { } } -// OFFSET: 0x00CEFFC0 - // OFFSET: 0x00CF0070 // FUNCTION: fn_21410 const char* CGameMode::Unknown04DCText() { @@ -690,10 +688,6 @@ void CGameMode::sub_CEB8E0() { Replay::Instance().Record(static_cast(record.length), &record, 0x2A, 0); } -// OFFSET: 0x00CEBF30 - -// OFFSET: 0x00CEC100 - // OFFSET: 0x00CEC6A0 // FUNCTION: fn_21356 unsigned CGameMode::sub_CEC6A0(const std::vector& data) { @@ -5207,8 +5201,6 @@ bool CGameMode::SaveEmblemFile(const std::vector& data) { return true; } -// OFFSET: 0x00CF0E30 - // OFFSET: 0x00CF0BA0 // FUNCTION: fn_21423 void WriteMyLog(const char* file, int line, const char* format, ...) { @@ -6382,8 +6374,6 @@ void CGameMode::ReceiveUiDragMessage(const unsigned char* message) { this->SendMsg(0x12, 0, 0, 0, 0); } -// OFFSET: 0x00CDBEB0 - // OFFSET: 0x00CEA0C0 // FUNCTION: fn_21349 std::vector CGameMode::SaveGroundItems() { diff --git a/Source/Client/Mode/GameModeHandlers.cpp b/Source/Client/Mode/GameModeHandlers.cpp index 3d58e230..15e5456c 100644 --- a/Source/Client/Mode/GameModeHandlers.cpp +++ b/Source/Client/Mode/GameModeHandlers.cpp @@ -2894,7 +2894,6 @@ struct Unknown015D4818 { Unknown015D4818* g_unknown_015D4818; // OFFSET: 0x00D3BD40 -// OFFSET: 0x03DEA400 // FUNCTION: fn_21790 void CGameMode::ReceivePendingItem1718List(const unsigned char* packet) { if (g_windowMgr.unknown_01E4 || g_windowMgr.LookupWindow(318)) { diff --git a/Source/Client/Mode/GameModeMiniMap.cpp b/Source/Client/Mode/GameModeMiniMap.cpp index eb689ffb..43891643 100644 --- a/Source/Client/Mode/GameModeMiniMap.cpp +++ b/Source/Client/Mode/GameModeMiniMap.cpp @@ -530,6 +530,7 @@ int g_minimapCoordinateDigitValues[4]; int g_screenWidth; +// OFFSET: 0x00CD2A10 // FUNCTION: fn_21261 void CGameMode::DrawMiniMapNumber() { if (this->unknown_0408 == nullptr || this->unknown_0414 == 0) { diff --git a/Source/Client/Mode/GameModeNotices.cpp b/Source/Client/Mode/GameModeNotices.cpp index 6d90bead..095a4f65 100644 --- a/Source/Client/Mode/GameModeNotices.cpp +++ b/Source/Client/Mode/GameModeNotices.cpp @@ -5496,8 +5496,6 @@ struct QuestHuntUpdatePacket { }; #pragma pack(pop) -// OFFSET: 0x00D47760 - #pragma pack(push, 1) struct QuestHuntUpdateEntry2 { /* 0000 */ unsigned int questId; diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index 918e41ce..3b58cf4e 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -1560,8 +1560,6 @@ void CGameMode::ReceiveZoneServerChange(const char* mapName, std::int16_t x, std this->ChangeZoneServer(mapName, x, y, ip, port, std::string()); } -// OFFSET: 0x00D3A1E0 - // OFFSET: 0x00D272A0 // FUNCTION: fn_21688 void CGameMode::ReceiveActorStatusBlock(const unsigned char* packet) { @@ -2683,8 +2681,6 @@ void CGameMode::ReceiveChatEntries(unsigned char* data) { window->SendMsg(nullptr, 0x1B, reinterpret_cast("cancel"), 0, 0, 0); } -// OFFSET: 0x00D795B0 - // OFFSET: 0x00D7A200 // FUNCTION: fn_22189 void CGameMode::ReceivePacket0B73(const unsigned char* data) { @@ -4234,8 +4230,6 @@ void CGameMode::ReceiveStatusBonus(const unsigned char* data) { } } -// OFFSET: 0x00D27EC0 - // OFFSET: 0x00D8A600 // FUNCTION: fn_22220 void CGameMode::ReceiveSwapEquipmentList(const unsigned char* data) { @@ -4450,8 +4444,6 @@ void CGameMode::ReceiveOpenStore(const unsigned char* packet) { this->SendMsg(270, 0, 0, 0, 0); } -// OFFSET: 0x00D3A770 - struct ACTSTRUCT { virtual ~ACTSTRUCT(); @@ -4471,6 +4463,7 @@ struct ACTSTRUCT { // OFFSET: 0x00D051F0 // FUNCTION: fn_21563 ACTSTRUCT::~ACTSTRUCT() = default; +// OFFSET: 0x00D3A770 // FUNCTION: fn_21779 void CGameMode::ReceiveSearchStoreOpen(const unsigned char* packet) { g_session.unknown_5BE0 = packet[4]; @@ -7019,8 +7012,6 @@ void CGameMode::ReceiveBuyingStoreOpenResult(const unsigned char* packet) { } } -// OFFSET: 0x00D316D0 - // OFFSET: 0x00D4B050 // FUNCTION: fn_21863 void CGameMode::ReceiveItemObtainNotice(const unsigned char* packet) { @@ -7108,8 +7099,6 @@ void CGameMode::ReceiveBuyingStoreSellResult(const unsigned char* packet) { g_windowMgr.CloseWindow(179); } -// OFFSET: 0x00D31390 - struct ReputePointEntry { /* 0000 */ std::uint64_t id; /* 0008 */ std::int64_t point; @@ -7196,7 +7185,7 @@ void CGameMode::RefreshEmotionPurchaseSchedule() { manager->RefreshCommands(); } -// OFFSET: 0x00D17BF0 +// OFFSET: 0x00D31390 // FUNCTION: fn_21733 void CGameMode::ReceivePartyItemPickupNotice(const unsigned char* packet) { const std::uint32_t aid = *reinterpret_cast(packet + 2); @@ -7408,6 +7397,7 @@ void CGameMode::ReceiveGuildPositionInfo(const unsigned char* packet) { }); g_windowMgr.RefreshGuildWindows(); } +// OFFSET: 0x00D17BF0 // FUNCTION: fn_21597 void CGameMode::RefreshEmotionSaleSchedule() { g_timeScheduler->sub_BA95F0(6); @@ -7756,8 +7746,6 @@ struct SkillFailurePacket { static_assert(sizeof(SkillFailurePacket) == 0xE); -// OFFSET: 0x00D1E840 - // OFFSET: 0x00D21220 // FUNCTION: fn_21654 void CGameMode::ReceiveBroadcastText(const unsigned char* data) { @@ -9154,7 +9142,7 @@ namespace { static_assert(sizeof(ChatRoomMemberListPacket) == 0x8); } -// OFFSET: 0x00D27420 +// OFFSET: 0x00D1E840 // FUNCTION: fn_21636 void CGameMode::ReceiveSkillFailure(const unsigned char* data) { const auto* packet = reinterpret_cast(data); @@ -9566,6 +9554,7 @@ void CGameMode::ReceiveSkillFailure(const unsigned char* data) { g_windowMgr.SendNotice(1, reinterpret_cast(notice), 0xFF, 0xB, 0, 0); } +// OFFSET: 0x00D27420 // FUNCTION: fn_21690 void CGameMode::ReceiveChatRoomMemberList(const unsigned char* data) { const ChatRoomMemberListPacket* packet = reinterpret_cast(data); @@ -10913,8 +10902,6 @@ struct EquipItemNoticePacket { static_assert(sizeof(EquipItemNoticePacket) == 7); -// OFFSET: 0x00D50AA0 - #pragma pack(push, 1) struct MapMovePacket { /* 0000 */ std::uint16_t packetType; @@ -11073,8 +11060,6 @@ void CGameMode::ApplyGuildStorageLog(std::uint16_t result, const std::vector(data); @@ -11218,6 +11203,7 @@ void CGameMode::ReceiveEquipItemNotice(const unsigned char* data) { } } } +// OFFSET: 0x00D5B3C0 // FUNCTION: fn_21964 void NoticeSkillUse(CGameActor* target, CGameActor* source, std::uint16_t skillId, unsigned char silent) { if (silent == 1) { @@ -14980,10 +14966,6 @@ void CGameMode::ReceiveActorStateEntryNamedBody(const unsigned char* data) { ); } -// OFFSET: 0x00D63D70 - -// OFFSET: 0x00D642F0 - #pragma pack(push, 1) struct RefineBroadcastPacket { /* 0000 */ std::uint16_t packetType; @@ -16695,6 +16677,7 @@ void LaunchSkillActorEffect(CGameActor* actor, short x, short y, std::uint16_t s return; } } +// OFFSET: 0x00D7B640 // FUNCTION: fn_22208 void CGameMode::ReceiveSkillUse(std::uint16_t skillId, int level, std::uint32_t sourceAid, std::uint32_t targetAid, bool result) { CGameActor* source; diff --git a/Source/Client/Session.cpp b/Source/Client/Session.cpp index d0d1ff58..0615b695 100644 --- a/Source/Client/Session.cpp +++ b/Source/Client/Session.cpp @@ -866,8 +866,6 @@ ITEM_INFO CSession::GetExchangeItem(int index) const { return this->m_exchangeItems[index]; } -// OFFSET: 0x00DDC9D0 - // OFFSET: 0x00DDD300 // FUNCTION: fn_23384 std::uint16_t CSession::FindInventoryIndexByItemId(int itemId) { diff --git a/Source/Contents/ActorNameCard.cpp b/Source/Contents/ActorNameCard.cpp index 15e0c6b5..e69b99d3 100644 --- a/Source/Contents/ActorNameCard.cpp +++ b/Source/Contents/ActorNameCard.cpp @@ -1,9 +1,11 @@ #include "Contents/ActorNameCard.h" +// OFFSET: 0x005BEA30 // FUNCTION: fn_03484 CActorNameCard::CActorNameCard() : unknown_0094(0), received(0) { } +// OFFSET: 0x005BEB40 // FUNCTION: fn_03485 CActorNameCard::~CActorNameCard() = default; @@ -23,6 +25,7 @@ void CActorNameCard::Reset() { // FUNCTION: fn_03491 CActorNameCardHolder::CActorNameCardHolder() = default; +// OFFSET: 0x005BF520 // FUNCTION: fn_03493 CActorNameCardHolder::~CActorNameCardHolder() { } diff --git a/Source/Contents/Actors/GameObject.cpp b/Source/Contents/Actors/GameObject.cpp index 79162e28..b7fa053a 100644 --- a/Source/Contents/Actors/GameObject.cpp +++ b/Source/Contents/Actors/GameObject.cpp @@ -91,7 +91,6 @@ CGameObject::CGameObject() : identity(++nextIdentity) { } // OFFSET: 0x00CA8EC0 -// OFFSET: 0x00CA9230 // FUNCTION: fn_20995 CGameObject::~CGameObject() = default; diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index dd00825c..f8fc4e1c 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -2622,8 +2622,6 @@ void UICashEmotionListWnd::SetTab(char tab) { } } -// OFFSET: 0x007C8A40 - // OFFSET: 0x007C8A40 // FUNCTION: fn_09419 void UICashEmotionListWnd::StartExpirySchedule() { @@ -2917,8 +2915,6 @@ int UICashEmotionMiniWnd::SendMsg( return 0; } -// OFFSET: 0x007C9C40 - // OFFSET: 0x007C9C40 // FUNCTION: fn_09438 UICashEmotionPack::UICashEmotionPack() @@ -3565,8 +3561,6 @@ int UICashEmotionPiece::SendMsg( } } -// OFFSET: 0x007CBF20 - // OFFSET: 0x007CBF20 // FUNCTION: fn_09490 UICashEmotionScrollBar::UICashEmotionScrollBar() : UIScrollBar() { diff --git a/Source/Contents/Effects/EZ2STREffect.cpp b/Source/Contents/Effects/EZ2STREffect.cpp index 3b39d04c..70d7bee8 100644 --- a/Source/Contents/Effects/EZ2STREffect.cpp +++ b/Source/Contents/Effects/EZ2STREffect.cpp @@ -5408,7 +5408,6 @@ int CEZ2STRScreenEffect::Slot28() { } // OFFSET: 0x00B52980 - // FUNCTION: fn_19039 void CEZ2STRScreenEffect::Slot01() { CEZ2STRParticle* particle = static_cast( diff --git a/Source/Contents/Effects/Effect.cpp b/Source/Contents/Effects/Effect.cpp index 37e23641..e8e79f37 100644 --- a/Source/Contents/Effects/Effect.cpp +++ b/Source/Contents/Effects/Effect.cpp @@ -25,7 +25,6 @@ CEffect::CEffect(int value) } // OFFSET: 0x00B4DD10 -// OFFSET: 0x00B4DDD0 // FUNCTION: fn_18981 CEffect::~CEffect() = default; diff --git a/Source/Contents/Effects/EffectMemoryMgr.cpp b/Source/Contents/Effects/EffectMemoryMgr.cpp index 1a043ce5..c48fbc15 100644 --- a/Source/Contents/Effects/EffectMemoryMgr.cpp +++ b/Source/Contents/Effects/EffectMemoryMgr.cpp @@ -181,12 +181,12 @@ bool CreateEffectMemoryMgr() { namespace { // OFFSET: 0x00B825B0 -// OFFSET: 0x00B826D0 -// OFFSET: 0x00B82640 -// OFFSET: 0x00B82520 // FUNCTION: fn_19276 +// OFFSET: 0x00B826D0 // FUNCTION: fn_19278 +// OFFSET: 0x00B82640 // FUNCTION: fn_19277 +// OFFSET: 0x00B82520 // FUNCTION: fn_19275 template void CEffectMemoryPool::Free(CParticle* particle) { diff --git a/Source/Contents/Effects/EffectPrimitiveState.cpp b/Source/Contents/Effects/EffectPrimitiveState.cpp index 0c1bf759..3750eb84 100644 --- a/Source/Contents/Effects/EffectPrimitiveState.cpp +++ b/Source/Contents/Effects/EffectPrimitiveState.cpp @@ -160,8 +160,6 @@ EffectPrimitiveState::~EffectPrimitiveState() { std::free(this->textures); } -// OFFSET: 0x00BAE3A0 - // OFFSET: 0x00BAE460 // FUNCTION: fn_19765 void EffectPrimitiveState::GetColorOverride(unsigned char* red, unsigned char* green, unsigned char* blue) { diff --git a/Source/Contents/Effects/Particle.cpp b/Source/Contents/Effects/Particle.cpp index 3dd54135..5281ba37 100644 --- a/Source/Contents/Effects/Particle.cpp +++ b/Source/Contents/Effects/Particle.cpp @@ -132,8 +132,6 @@ CEZ2STRParticle::CEZ2STRParticle(vector3d position, int flags) : CParticle(posit this->Clear(); } -// OFFSET: 0x00B3CF20 - // OFFSET: 0x00B3CFC0 // FUNCTION: fn_18815 void CEZ2STRParticle::Slot01() { diff --git a/Source/Contents/Effects/RagEffect.cpp b/Source/Contents/Effects/RagEffect.cpp index 7fea7a1b..e3a2ae25 100644 --- a/Source/Contents/Effects/RagEffect.cpp +++ b/Source/Contents/Effects/RagEffect.cpp @@ -149,8 +149,6 @@ static void SendAfterimageColor(CGameObject& target, CRagEffect& sender, const v // GLOBAL: gl_25089 int g_statusIconIds[100]; -// OFFSET: 0x00C11C60 - // OFFSET: 0x00C11C60 // FUNCTION: fn_20039 void CRagEffect::Endure() { @@ -687,8 +685,6 @@ void CRagEffect::IncAgility() { this->state.unknown_11C84->slots[0].flag1[0] = 99; } -// OFFSET: 0x00C18490 - // OFFSET: 0x00C18490 // FUNCTION: fn_20063 void CRagEffect::Hit1() { @@ -779,8 +775,6 @@ void CRagEffect::Hit1() { } } -// OFFSET: 0x00C18D90 - // OFFSET: 0x00C18D90 // FUNCTION: fn_20064 void CRagEffect::Hit2(int option) { @@ -834,8 +828,6 @@ void CRagEffect::Hit2(int option) { } } -// OFFSET: 0x00C191D0 - // OFFSET: 0x00C191D0 // FUNCTION: fn_20065 void CRagEffect::Hit3() { @@ -1608,8 +1600,6 @@ bool CRagEffect::Aspersio() { return true; } -// OFFSET: 0x00C0B910 - // OFFSET: 0x00C0B910 // FUNCTION: fn_20017 void CRagEffect::Bash() { @@ -1754,8 +1744,6 @@ static __forceinline void SpawnBottomQuad(CRagEffect& effect, const vector3d& ve quad.textures[0] = g_texMgr.Load("effect\\magic_violet.tga", 0, false, true, false); } -// OFFSET: 0x00C0D630 - // OFFSET: 0x00C0D630 // FUNCTION: fn_20022 void CRagEffect::Bottom2() { @@ -1858,8 +1846,6 @@ bool CRagEffect::ProcessEZ2STRC153A0() { return this->ProcessEZ2STR(0.0f, -80.0f, 0.0f) ? true : false; } -// OFFSET: 0x00C3C7E0 - // OFFSET: 0x00C3C7E0 // FUNCTION: fn_20111 void CRagEffect::Steal() { @@ -2153,8 +2139,6 @@ void CRagEffect::SetStateDuration(int duration) { this->state.duration = duration; } -// OFFSET: 0x00C39EC0 - // OFFSET: 0x00C39EC0 // FUNCTION: fn_20103 bool CRagEffect::Signum() { @@ -3317,8 +3301,6 @@ void CRagEffect::TexturedScatterLow(const char* name, char flag) { } } -// OFFSET: 0x00C6E370 - // OFFSET: 0x00C6E370 // FUNCTION: fn_20302 void CRagEffect::TorchDustRing(const char* name, char kind, std::int16_t angle) { @@ -3563,8 +3545,6 @@ void CRagEffect::BlackMaximize(const char* name) { this->state.unknown_11C84->slots[0].flag1[0] = 1; } -// OFFSET: 0x00C3F7A0 - // OFFSET: 0x00C3F7A0 // FUNCTION: fn_20121 void CRagEffect::WaterBallBurst() { @@ -9405,8 +9385,6 @@ void CRagEffect::AlphaDownRipples(const char* name, char kind) { Owner(this->state.unknown_11C84).InitSegment(); } -// OFFSET: 0x00C0E820 - // OFFSET: 0x00C0E820 // FUNCTION: fn_20027 bool CRagEffect::Coin() { @@ -9451,8 +9429,6 @@ bool CRagEffect::Coin() { return this->state.stateCnt < 100; } -// OFFSET: 0x00C0EBE0 - // OFFSET: 0x00C0EBE0 // FUNCTION: fn_20028 void CRagEffect::ColdHit() { @@ -9725,8 +9701,6 @@ void CRagEffect::SakuraFireArrow() { Owner(this->state.unknown_11C84).InitSegment(); } -// OFFSET: 0x00C6E370 - // OFFSET: 0x00C6D890 // FUNCTION: fn_20300 void CRagEffect::BeginSpellSwirl(int, const char*, char alpha) { @@ -12633,8 +12607,6 @@ void CRagEffect::Bottom_Music(const char* name, char kind) { } } -// OFFSET: 0x00C1A5C0 - // OFFSET: 0x00C1A5C0 // FUNCTION: fn_20069 void CRagEffect::HitDark() { @@ -13496,8 +13468,6 @@ void CRagEffect::Detoxication() { Owner(this->state.unknown_11C84).InitSegment(); } -// OFFSET: 0x00C112D0 - // OFFSET: 0x00C112D0 // FUNCTION: fn_20037 void CRagEffect::EnchantPoison2() { @@ -14363,7 +14333,6 @@ void CRagEffect::BlueRingWave() { this->state.unknown_11C84->slots[3].process = 0; this->state.unknown_11C84->slots[3].alphaT = 1; } -// OFFSET: 0x00C526D0 // OFFSET: 0x00C4A650 // FUNCTION: fn_20170 void CRagEffect::QuadRingStack(const char* name) { @@ -14636,8 +14605,6 @@ void CRagEffect::QuadRingStackSized(const char* name, char kind) { } } -// OFFSET: 0x00C5CC00 - // OFFSET: 0x00C649E0 // FUNCTION: fn_20263 void CRagEffect::sub_C649E0() { @@ -15467,8 +15434,6 @@ bool CRagEffect::StormGust() { return this->ProcessEZ2STR(0.0f, -80.0f, 0.0f) ? true : false; } -// OFFSET: 0x00C0F7E0 - // OFFSET: 0x00C0F7E0 // FUNCTION: fn_20031 void CRagEffect::DecAgility() { @@ -17362,8 +17327,6 @@ void CPlayer::RefreshEffect164() { this->unknown_0544 = this->LaunchEffect(164, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } -// OFFSET: 0x00C40DF0 - // OFFSET: 0x00C4FAB0 // FUNCTION: fn_20183 void CRagEffect::PortalRings() { diff --git a/Source/Contents/Hotkeys/UserHotkeyMgr.cpp b/Source/Contents/Hotkeys/UserHotkeyMgr.cpp index 059a5541..77612bb3 100644 --- a/Source/Contents/Hotkeys/UserHotkeyMgr.cpp +++ b/Source/Contents/Hotkeys/UserHotkeyMgr.cpp @@ -87,7 +87,6 @@ CUserHotkeyMgr* g_userHotkeyMgr; CUserHotkeyMgr::CUserHotkeyMgr() : m_enabled(true), m_loaded(false), m_changes(0), m_version2(false) { } -// OFFSET: 0x005F7CE0 CUserHotkeyMgr::~CUserHotkeyMgr() = default; // OFFSET: 0x005F7F70 diff --git a/Source/Contents/InstantVar.cpp b/Source/Contents/InstantVar.cpp index 07c6b9f4..9cc02924 100644 --- a/Source/Contents/InstantVar.cpp +++ b/Source/Contents/InstantVar.cpp @@ -3,7 +3,6 @@ #include "Contents/Actors/RenderObject.h" // OFFSET: 0x00CA8EE0 -// OFFSET: 0x00CA9260 // FUNCTION: fn_20997 CInstantVar::~CInstantVar() = default; @@ -13,7 +12,6 @@ void CInstantVar::Set(int key, std::int64_t value) { this->m_values[key] = value; } -// OFFSET: 0x0091BE20 std::int64_t CInstantVar::Get(int key) const { const auto entry = this->m_values.find(key); return entry == this->m_values.end() ? 0 : entry->second; diff --git a/Source/Contents/Items/ItemNaming.cpp b/Source/Contents/Items/ItemNaming.cpp index a5014182..cc318aa3 100644 --- a/Source/Contents/Items/ItemNaming.cpp +++ b/Source/Contents/Items/ItemNaming.cpp @@ -909,8 +909,6 @@ int ITEM_INFO::Apprentice(char* output, int& capacity, unsigned char consume) co return written; } -// OFFSET: 0x006D70A0 - // OFFSET: 0x006D70A0 // FUNCTION: fn_06589 int ITEM_INFO::Refine(char* output, int& capacity, unsigned char consume) const { diff --git a/Source/Contents/JobCodeForItem.cpp b/Source/Contents/JobCodeForItem.cpp index 10038df9..8cb6f2dc 100644 --- a/Source/Contents/JobCodeForItem.cpp +++ b/Source/Contents/JobCodeForItem.cpp @@ -4,22 +4,22 @@ #include // OFFSET: 0x006C7720 -// OFFSET: 0x006C7920 -// OFFSET: 0x006C7B30 -// OFFSET: 0x006C7D40 -// OFFSET: 0x006C7F60 -// OFFSET: 0x006C8180 -// OFFSET: 0x006C83A0 -// OFFSET: 0x006C85D0 -// OFFSET: 0x006C8810 // FUNCTION: fn_06421 +// OFFSET: 0x006C7920 // FUNCTION: fn_06422 +// OFFSET: 0x006C7B30 // FUNCTION: fn_06423 +// OFFSET: 0x006C7D40 // FUNCTION: fn_06424 +// OFFSET: 0x006C7F60 // FUNCTION: fn_06425 +// OFFSET: 0x006C8180 // FUNCTION: fn_06426 +// OFFSET: 0x006C83A0 // FUNCTION: fn_06427 +// OFFSET: 0x006C85D0 // FUNCTION: fn_06428 +// OFFSET: 0x006C8810 // FUNCTION: fn_06429 template void CJobCodeForItem::AddJobCodeFromGroups(unsigned long code, Groups... groups) { @@ -53,18 +53,18 @@ template void CJobCodeForItem::AddJobCodeFromGroups(unsigned long, int, int); template void CJobCodeForItem::AddJobCodeFromGroups(unsigned long, int); // OFFSET: 0x006C8A50 -// OFFSET: 0x006C8B10 -// OFFSET: 0x006C8BD0 -// OFFSET: 0x006C8CB0 -// OFFSET: 0x006C8D90 -// OFFSET: 0x006C8F60 -// OFFSET: 0x006C9050 // FUNCTION: fn_06430 +// OFFSET: 0x006C8B10 // FUNCTION: fn_06431 +// OFFSET: 0x006C8BD0 // FUNCTION: fn_06432 +// OFFSET: 0x006C8CB0 // FUNCTION: fn_06433 +// OFFSET: 0x006C8D90 // FUNCTION: fn_06434 +// OFFSET: 0x006C8F60 // FUNCTION: fn_06435 +// OFFSET: 0x006C9050 // FUNCTION: fn_06436 template void CJobCodeForItem::AddJobCode(unsigned long code, Jobs... jobs) { @@ -88,20 +88,20 @@ template void CJobCodeForItem::AddJobCode(unsigned long, JobId, JobId); template void CJobCodeForItem::AddJobCode(unsigned long, JobId); // OFFSET: 0x006C9270 -// OFFSET: 0x006C9350 -// OFFSET: 0x006C9430 -// OFFSET: 0x006C9510 -// OFFSET: 0x006C9600 -// OFFSET: 0x006C96F0 -// OFFSET: 0x006C98F0 -// OFFSET: 0x006C9A00 // FUNCTION: fn_06437 +// OFFSET: 0x006C9350 // FUNCTION: fn_06438 +// OFFSET: 0x006C9430 // FUNCTION: fn_06439 +// OFFSET: 0x006C9510 // FUNCTION: fn_06440 +// OFFSET: 0x006C9600 // FUNCTION: fn_06441 +// OFFSET: 0x006C96F0 // FUNCTION: fn_06442 +// OFFSET: 0x006C98F0 // FUNCTION: fn_06443 +// OFFSET: 0x006C9A00 // FUNCTION: fn_06444 template void CJobCodeForItem::AddJobGroup(unsigned int group, Jobs... jobs) { diff --git a/Source/Contents/Messenger/ClientMessenger.cpp b/Source/Contents/Messenger/ClientMessenger.cpp index 4337acd7..da43dcfa 100644 --- a/Source/Contents/Messenger/ClientMessenger.cpp +++ b/Source/Contents/Messenger/ClientMessenger.cpp @@ -3151,8 +3151,6 @@ int __stdcall sub_6A8350(lua_State* state) { return 0; } -// OFFSET: 0x006A8410 - // OFFSET: 0x006A84D0 // FUNCTION: fn_06102 int __stdcall sub_6A84D0(lua_State* state) { @@ -3183,8 +3181,6 @@ int __stdcall sub_6A8650(lua_State* state) { return 0; } -// OFFSET: 0x006A8710 - // OFFSET: 0x006A87D0 // FUNCTION: fn_06106 int __stdcall sub_6A87D0(lua_State* state) { @@ -3315,10 +3311,6 @@ int __stdcall sub_6A90D0(lua_State* state) { return 0; } -// OFFSET: 0x006A8410 - -// OFFSET: 0x006A8710 - // OFFSET: 0x006A9190 // FUNCTION: fn_06119 int __stdcall sub_6A9190(lua_State* state) { @@ -5505,12 +5497,6 @@ void CSession::UpdateRandomStats() { } } -// OFFSET: 0x00DD8380 - -// OFFSET: 0x00DD8450 - -// OFFSET: 0x00DD8540 - // OFFSET: 0x00DD85A0 // FUNCTION: fn_23308 void ClearMemberFlags(std::uint32_t* flags) { @@ -5528,8 +5514,6 @@ void CSession::ResetEquipment() { g_windowMgr.InvalidateFrames(); } -// OFFSET: 0x00DD8660 - // OFFSET: 0x00DD8750 // FUNCTION: fn_23311 void CSession::ResetSlots() { diff --git a/Source/Contents/Models/ModelNode.cpp b/Source/Contents/Models/ModelNode.cpp index 774d0635..40a41045 100644 --- a/Source/Contents/Models/ModelNode.cpp +++ b/Source/Contents/Models/ModelNode.cpp @@ -20,14 +20,12 @@ C3dNode::~C3dNode() { // FUNCTION: fn_17465 C3dNodeV1::C3dNodeV1() = default; -// OFFSET: 0x00AB6BA0 C3dNodeV1::~C3dNodeV1() = default; // OFFSET: 0x00AB5EA0 // FUNCTION: fn_17466 C3dNodeV2::C3dNodeV2() = default; -// OFFSET: 0x00AB6C50 C3dNodeV2::~C3dNodeV2() = default; // OFFSET: 0x00AB7040 diff --git a/Source/Contents/Models/ModelQuaternion.cpp b/Source/Contents/Models/ModelQuaternion.cpp index b8af9007..b83a9e1d 100644 --- a/Source/Contents/Models/ModelQuaternion.cpp +++ b/Source/Contents/Models/ModelQuaternion.cpp @@ -4,8 +4,8 @@ #include // OFFSET: 0x00554CD0 -// OFFSET: 0x00554B90 // FUNCTION: fn_02030 +// OFFSET: 0x00554B90 // FUNCTION: fn_02029 void QuaternionMatrix(const ModelRotationKey& key, matrix& output) { const float x = key.rotation[0]; diff --git a/Source/Contents/Party/AdvenPartyInfo.cpp b/Source/Contents/Party/AdvenPartyInfo.cpp index c4d17c5c..d853873d 100644 --- a/Source/Contents/Party/AdvenPartyInfo.cpp +++ b/Source/Contents/Party/AdvenPartyInfo.cpp @@ -11,6 +11,5 @@ CAdvenPartyInfo::CAdvenPartyInfo() CAdvenPartyInfo::CAdvenPartyInfo(const CAdvenPartyInfo& other) = default; // OFFSET: 0x005739D0 -// OFFSET: 0x00573AA0 // FUNCTION: fn_02494 CAdvenPartyInfo::~CAdvenPartyInfo() = default; diff --git a/Source/Contents/Party/AdventurerAgencyMgr.cpp b/Source/Contents/Party/AdventurerAgencyMgr.cpp index 31f46bd8..8995f92b 100644 --- a/Source/Contents/Party/AdventurerAgencyMgr.cpp +++ b/Source/Contents/Party/AdventurerAgencyMgr.cpp @@ -26,7 +26,6 @@ CAdventurerAgencyMgr::CAdventurerAgencyMgr() : enabled(true), registered(false), } // OFFSET: 0x005CA880 -// OFFSET: 0x005CA8D0 // FUNCTION: fn_03650 CAdventurerAgencyMgr::~CAdventurerAgencyMgr() = default; diff --git a/Source/Contents/PlayerNameDictionary.cpp b/Source/Contents/PlayerNameDictionary.cpp index 3bb14cb6..ae4c3e2a 100644 --- a/Source/Contents/PlayerNameDictionary.cpp +++ b/Source/Contents/PlayerNameDictionary.cpp @@ -16,7 +16,6 @@ CPlayerNameDictionary::CPlayerNameDictionary() : m_enabled(true) { CPlayerNameDictionary::~CPlayerNameDictionary() { } -// OFFSET: 0x0060AFB0 // OFFSET: 0x0060B010 // FUNCTION: fn_04262 std::string CPlayerNameDictionary::Lookup(std::uint32_t id) { diff --git a/Source/Contents/ReputeMgrLoad.inl b/Source/Contents/ReputeMgrLoad.inl index 5f901150..695ae456 100644 --- a/Source/Contents/ReputeMgrLoad.inl +++ b/Source/Contents/ReputeMgrLoad.inl @@ -127,10 +127,6 @@ bool JsonCppLoader::sub_50B830(std::map* out) { return this->succeeded; } -// OFFSET: 0x0060D060 - -// OFFSET: 0x0060D440 - // OFFSET: 0x0060DC70 // FUNCTION: fn_04294 bool CReputeMgr::sub_60DC70(std::map& groups) { diff --git a/Source/Contents/Skills/PlayerSkillBundle.cpp b/Source/Contents/Skills/PlayerSkillBundle.cpp index 895c53d2..db9f315c 100644 --- a/Source/Contents/Skills/PlayerSkillBundle.cpp +++ b/Source/Contents/Skills/PlayerSkillBundle.cpp @@ -20,7 +20,7 @@ std::size_t SkillIdHash::operator()(std::uint32_t id) const { CPlayerSkillBundle::lcEXCInfo::lcEXCInfo() { } -// OFFSET: 0x00770E90 +// OFFSET: 0x00770A30 // FUNCTION: fn_08260 CPlayerSkillBundle::lcEXCInfo::~lcEXCInfo() = default; @@ -30,7 +30,6 @@ CPlayerSkillBundle::CPlayerSkillBundle() : index(8) { } // OFFSET: 0x00770830 -// OFFSET: 0x00770D40 // FUNCTION: fn_08258 CPlayerSkillBundle::~CPlayerSkillBundle() = default; diff --git a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp index 52c09b85..d00cac99 100644 --- a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp +++ b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp @@ -215,8 +215,6 @@ void CSkillAction_SS_ANTENPOU::Slot11(int level, CGameActor* source, CGameActor* } } -// OFFSET: 0x00795D60 - // OFFSET: 0x00795EE0 // FUNCTION: fn_08800 int CSkillAction_SS_KAGEAKUMU::Slot01() { @@ -238,8 +236,6 @@ void CSkillAction_SS_KAGEAKUMU::Slot08(int level, CGameActor* source) { } } -// OFFSET: 0x00795F00 - // OFFSET: 0x00795F60 // FUNCTION: fn_08803 void CSkillAction_SS_KAGEAKUMU::Slot15(int level, CGameActor* source, CGameActor* target) { @@ -269,8 +265,6 @@ void CSkillAction_SS_HITOUAKUMU::Slot08(int level, CGameActor* source) { } } -// OFFSET: 0x007960E0 - // OFFSET: 0x00796140 // FUNCTION: fn_08807 void CSkillAction_SS_HITOUAKUMU::Slot11(int level, CGameActor* source, CGameActor* target) { @@ -319,8 +313,6 @@ void CSkillAction_SS_ANKOKURYUUAKUMU::Slot08(int level, CGameActor* source) { } } -// OFFSET: 0x007964B0 - // OFFSET: 0x00796510 // FUNCTION: fn_08811 void CSkillAction_SS_ANKOKURYUUAKUMU::Slot11(int level, CGameActor* source, CGameActor* target) { diff --git a/Source/Contents/Store/MCStoreInfoBackup.cpp b/Source/Contents/Store/MCStoreInfoBackup.cpp index 6ab20ca0..31c4b5c9 100644 --- a/Source/Contents/Store/MCStoreInfoBackup.cpp +++ b/Source/Contents/Store/MCStoreInfoBackup.cpp @@ -18,7 +18,6 @@ CMCStoreInfoBackup::CMCStoreInfoBackup() : enabled(true), loaded(false), pending } // OFFSET: 0x00605D70 -// OFFSET: 0x00605DF0 // FUNCTION: fn_04227 CMCStoreInfoBackup::~CMCStoreInfoBackup() = default; diff --git a/Source/Contents/TableMng.cpp b/Source/Contents/TableMng.cpp index 5b43462d..4a8b2fff 100644 --- a/Source/Contents/TableMng.cpp +++ b/Source/Contents/TableMng.cpp @@ -87,7 +87,6 @@ CTableMng::CTableMng() { this->m_entryQueue.clear(); } -// OFFSET: 0x00CA35B0 CTableMng::~CTableMng() { this->Clear(); } diff --git a/Source/Contents/TipBoxTitles.cpp b/Source/Contents/TipBoxTitles.cpp index 8b8b645d..e90f4c4e 100644 --- a/Source/Contents/TipBoxTitles.cpp +++ b/Source/Contents/TipBoxTitles.cpp @@ -100,6 +100,7 @@ CTipBoxMgr::CTipBoxMgr() // INLINED CTipBoxMgr::~CTipBoxMgr() = default; +// OFFSET: 0x007AC710 // FUNCTION: fn_09122 void CTipBoxMgr::AddParagraph(int id, std::string text) { for (;;) { @@ -113,6 +114,7 @@ void CTipBoxMgr::AddParagraph(int id, std::string text) { this->m_entries[id].paragraphs.push_back(std::move(text)); } +// OFFSET: 0x007AC990 // FUNCTION: fn_09123 bool CTipBoxMgr::Create() { if (g_itemTagOwner) { @@ -133,6 +135,7 @@ bool CTipBoxMgr::Create() { return true; } +// OFFSET: 0x007ACB20 // FUNCTION: fn_09124 void CTipBoxMgr::Destroy() { if (g_itemTagOwner) { @@ -141,6 +144,7 @@ void CTipBoxMgr::Destroy() { } } +// OFFSET: 0x007ACB40 // FUNCTION: fn_09125 TipBoxEntry& CTipBoxMgr::SelectRandomTip() { this->m_randomList.clear(); @@ -161,6 +165,7 @@ TipBoxEntry& CTipBoxMgr::SelectRandomTip() { return this->m_currentEntry; } +// OFFSET: 0x007ACC00 // FUNCTION: fn_09126 const TipBoxEntry& CTipBoxMgr::GetTip(int id) const { const auto it = this->m_entries.find(id); diff --git a/Source/Contents/World/WorldSpatialTree.cpp b/Source/Contents/World/WorldSpatialTree.cpp index 2779ff83..c956bd1b 100644 --- a/Source/Contents/World/WorldSpatialTree.cpp +++ b/Source/Contents/World/WorldSpatialTree.cpp @@ -258,8 +258,8 @@ void WorldSpatialTree::RefreshBounds(int depth) { } // OFFSET: 0x00AC84F0 -// OFFSET: 0x00AC86B0 // FUNCTION: fn_17673 +// OFFSET: 0x00AC86B0 // FUNCTION: fn_17676 void WorldSpatialTree::InsertModel(C3dActor& model, int depth) { if (depth == 5) { diff --git a/Source/File/FileCreation.cpp b/Source/File/FileCreation.cpp index c5f69315..ea561cac 100644 --- a/Source/File/FileCreation.cpp +++ b/Source/File/FileCreation.cpp @@ -10,6 +10,7 @@ #include #include +// OFFSET: 0x00AF6960 // FUNCTION: fn_18255 bool CreateDirectoryPath(std::string path) { if (path.empty()) { @@ -32,6 +33,7 @@ bool CreateDirectoryPath(std::string path) { return true; } +// OFFSET: 0x00AF6EA0 // FUNCTION: fn_18256 std::string CreateUniqueFileName(const std::string& filename) { char drive[MAX_PATH]{}; diff --git a/Source/File/FileEnumeration.cpp b/Source/File/FileEnumeration.cpp index 0bdfc2f3..5f24b028 100644 --- a/Source/File/FileEnumeration.cpp +++ b/Source/File/FileEnumeration.cpp @@ -2,6 +2,7 @@ #include +// OFFSET: 0x00AF5080 // FUNCTION: fn_18246 void EnumerateFileNames(std::list& names, const char* directory, const char* pattern) { std::string search(directory); @@ -22,6 +23,7 @@ void EnumerateFileNames(std::list& names, const char* directory, co FindClose(handle); } +// OFFSET: 0x00AF5510 // FUNCTION: fn_18247 void EnumerateFileNames(std::vector& names, const char* directory, const char* pattern) { std::string search(directory); diff --git a/Source/Network/Connection/Connection.cpp b/Source/Network/Connection/Connection.cpp index b62a1eb6..0a61a268 100644 --- a/Source/Network/Connection/Connection.cpp +++ b/Source/Network/Connection/Connection.cpp @@ -23,7 +23,6 @@ CConnection::CConnection() : m_socket(INVALID_SOCKET), m_deferred(0), m_sendDead // OFFSET: 0x00C7C280 // FUNCTION: fn_20384 -// OFFSET: 0x00C7C2F0 CConnection::~CConnection() = default; // OFFSET: 0x00C7C1C0 @@ -31,8 +30,6 @@ CConnection::~CConnection() = default; CRagConnection::CRagConnection() : unknown_006C(0) { } -// OFFSET: 0x00C7C370 - // OFFSET: 0x00C7C4D0 // FUNCTION: fn_20389 bool CConnection::Connect(const ConnectionEndpoint& endpoint) { diff --git a/Source/Network/Http/CURLPostHander.cpp b/Source/Network/Http/CURLPostHander.cpp index 71cad9e0..cfc46a47 100644 --- a/Source/Network/Http/CURLPostHander.cpp +++ b/Source/Network/Http/CURLPostHander.cpp @@ -16,7 +16,6 @@ CCURLPostHander::CCURLPostHander(std::string url) } // OFFSET: 0x005E9710 -// OFFSET: 0x005E97D0 // FUNCTION: fn_03956 CCURLPostHander::~CCURLPostHander() { if (this->m_easy) { diff --git a/Source/Network/TextEncoding.cpp b/Source/Network/TextEncoding.cpp index 2878cc51..86534071 100644 --- a/Source/Network/TextEncoding.cpp +++ b/Source/Network/TextEncoding.cpp @@ -144,6 +144,7 @@ std::string ToUtf8(const std::string& text, UINT codePage) { return result; } +// OFFSET: 0x00AF7110 // FUNCTION: fn_18257 void LowercaseText(std::string& text) { for (unsigned index = 0; index < text.size(); ++index) { @@ -155,6 +156,7 @@ void LowercaseText(std::string& text) { } } +// OFFSET: 0x00AF7450 // FUNCTION: fn_18258 std::wstring DecodeText(UINT codePage, const std::string& text) { const int length = MultiByteToWideChar(codePage, 0, text.data(), static_cast(text.size()), nullptr, 0); @@ -174,6 +176,7 @@ std::wstring DecodeText(UINT codePage, const std::string& text) { return result; } +// OFFSET: 0x00AF8930 // FUNCTION: fn_18265 std::string EncodeText(UINT codePage, const std::wstring& text) { const int length = WideCharToMultiByte(codePage, 0, text.c_str(), -1, nullptr, 0, nullptr, nullptr); diff --git a/Source/Render/DX7/RendererDX7Operations.cpp b/Source/Render/DX7/RendererDX7Operations.cpp index 013717c0..8589c9f4 100644 --- a/Source/Render/DX7/RendererDX7Operations.cpp +++ b/Source/Render/DX7/RendererDX7Operations.cpp @@ -80,8 +80,8 @@ void CRendererDX7::DrawPrimitive(RenderCommand* primitive) { } // OFFSET: 0x0055AD00 -// OFFSET: 0x0055AD50 // FUNCTION: fn_02083 +// OFFSET: 0x0055AD50 // FUNCTION: fn_02084 void CRendererDX7::DrawLightmappedPrimitive(LightmappedPrimitive* primitive) { if (primitive->vertexCount <= 0) { diff --git a/Source/Render/DX7/SurfaceDX7.cpp b/Source/Render/DX7/SurfaceDX7.cpp index 6b6e5b25..5f1256c5 100644 --- a/Source/Render/DX7/SurfaceDX7.cpp +++ b/Source/Render/DX7/SurfaceDX7.cpp @@ -62,7 +62,6 @@ CSurfaceDX7::CSurfaceDX7(DeviceOwnerDX7& owner, IDirectDrawSurface7* surface) : } // OFFSET: 0x00542DC0 -// OFFSET: 0x00542E60 // FUNCTION: fn_01779 CSurfaceDX7::~CSurfaceDX7() { if (this->m_surface) { diff --git a/Source/Render/DX7/TextureDX7.cpp b/Source/Render/DX7/TextureDX7.cpp index 4a39f31a..5c0b9824 100644 --- a/Source/Render/DX7/TextureDX7.cpp +++ b/Source/Render/DX7/TextureDX7.cpp @@ -117,7 +117,6 @@ std::unique_ptr CreateTextureDX7(DeviceOwnerDX7*& owner) { } // OFFSET: 0x00543DC0 -// OFFSET: 0x00543E30 // FUNCTION: fn_01809 CTextureDX7::~CTextureDX7() { if (this->m_surface) { @@ -340,14 +339,12 @@ void CTextureDX7::Fill(const RECT* rectangle, std::uint32_t color) { } } -// OFFSET: 0x00544410 void CTextureDX7::Draw(int x, int y, int width, int height, std::uint32_t color) { this->DrawTo( g_renderer->primitives, g_renderer->queues, x, y, width, height, color, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd ); } -// OFFSET: 0x00544610 void CTextureDX7::Stretch(int x, int y, int width, int height) { this->StretchTo( g_renderer->primitives, g_renderer->queues, x, y, width, height, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd diff --git a/Source/Render/DX9/RenderSystemDX9.cpp b/Source/Render/DX9/RenderSystemDX9.cpp index c6e3fe2c..2f515949 100644 --- a/Source/Render/DX9/RenderSystemDX9.cpp +++ b/Source/Render/DX9/RenderSystemDX9.cpp @@ -11,7 +11,6 @@ CRenderSystemDX9::CRenderSystemDX9() : m_device(new DeviceOwnerDX9), m_defaultTe } // OFFSET: 0x0056D180 -// OFFSET: 0x0056D320 // FUNCTION: fn_02355 CRenderSystemDX9::~CRenderSystemDX9() { delete this->m_device; diff --git a/Source/Render/DX9/RendererDX9.cpp b/Source/Render/DX9/RendererDX9.cpp index 230fbe0d..4aa5af6e 100644 --- a/Source/Render/DX9/RendererDX9.cpp +++ b/Source/Render/DX9/RendererDX9.cpp @@ -19,7 +19,6 @@ CRendererDX9::CRendererDX9(DeviceOwnerDX9& owner) } // OFFSET: 0x00564FE0 -// OFFSET: 0x00565070 // FUNCTION: fn_02210 CRendererDX9::~CRendererDX9() = default; diff --git a/Source/Render/DX9/TextureDX9.cpp b/Source/Render/DX9/TextureDX9.cpp index 3373b4e4..f00437e8 100644 --- a/Source/Render/DX9/TextureDX9.cpp +++ b/Source/Render/DX9/TextureDX9.cpp @@ -202,7 +202,6 @@ SurfaceLock CTextureDX9::Lock() { } // OFFSET: 0x00572D50 -// OFFSET: 0x005737A0 // FUNCTION: fn_02482 void CTextureDX9::Filter() { if (!this->m_dynamic && !this->m_renderTarget && this->m_texture && this->m_texture->GetLevelCount() > 1) { @@ -494,14 +493,12 @@ bool CTextureDX9::CopyTexture(CTexture* source, int sourceX, int sourceY, int so return true; } -// OFFSET: 0x00544410 void CTextureDX9::Draw(int x, int y, int width, int height, std::uint32_t color) { this->DrawTo( g_renderer->primitives, g_renderer->queues, x, y, width, height, color, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd ); } -// OFFSET: 0x00544610 void CTextureDX9::Stretch(int x, int y, int width, int height) { this->StretchTo( g_renderer->primitives, g_renderer->queues, x, y, width, height, g_renderer->fog.supported != 0, g_depthStart, g_depthEnd diff --git a/Source/Render/DeviceContext/DCBitmap.cpp b/Source/Render/DeviceContext/DCBitmap.cpp index e744bd4b..0710ad4c 100644 --- a/Source/Render/DeviceContext/DCBitmap.cpp +++ b/Source/Render/DeviceContext/DCBitmap.cpp @@ -5,7 +5,6 @@ CDCBitmap::CDCBitmap(int width, int height) : m_bitmap(width, height) { } -// OFFSET: 0x00545B20 CDCBitmap::~CDCBitmap() = default; // OFFSET: 0x00569E90 @@ -24,7 +23,6 @@ void CDCBitmap::UploadTexture(CRenderSystemBase& system, CTexture*& texture) { this->m_bitmap.UploadTexture(system, texture); } -// OFFSET: 0x00547D40 void CDCBitmap::Grow(std::uint32_t width, std::uint32_t height) { if (width > this->m_bitmap.width || height > this->m_bitmap.height) { this->m_cache.Clear(); @@ -32,17 +30,14 @@ void CDCBitmap::Grow(std::uint32_t width, std::uint32_t height) { } } -// OFFSET: 0x00547D10 bool CDCBitmap::GetDC(HDC* output) { return this->m_bitmap.GetDC(output); } -// OFFSET: 0x00547D30 void CDCBitmap::ReleaseDC(HDC dc) { this->m_bitmap.ReleaseDC(dc); } -// OFFSET: 0x00548230 void CDCBitmap::Copy(int x, int y, int width, int height, const std::uint32_t* source, bool transparent) { this->m_bitmap.Copy(x, y, width, height, source, transparent); } @@ -69,12 +64,10 @@ void CDCBitmap::SetAlpha(unsigned char maxLuminance) { } } } -// OFFSET: 0x00547D80 void CDCBitmap::ScaleCopy(int x, int y, int sourceWidth, int sourceHeight, int width, int height, const std::uint32_t* source, int option) { this->m_bitmap.ScaleCopy(x, y, sourceWidth, sourceHeight, width, height, source, option); } -// OFFSET: 0x00548780 void CDCBitmap::CopyRegion( int x, int y, int sourceLeft, int sourceTop, int sourceRight, int sourceBottom, const std::uint32_t* source, int sourceWidth, int sourceHeight, bool transparent, bool alpha @@ -82,34 +75,28 @@ void CDCBitmap::CopyRegion( this->m_bitmap.CopyRegion(x, y, sourceLeft, sourceTop, sourceRight, sourceBottom, source, sourceWidth, sourceHeight, transparent, alpha); } -// OFFSET: 0x00547790 void CDCBitmap::CopyFrom(int x, int y, int sourceX, int sourceY, int width, int height, const CDCBitmap& source) { this->m_bitmap.CopyFrom(x, y, sourceX, sourceY, width, height, source.m_bitmap); } -// OFFSET: 0x00547840 void CDCBitmap::BlendFrom(std::uint32_t x, std::uint32_t y, int width, int height, const CDCBitmap& source) { this->m_bitmap.BlendFrom(x, y, width, height, source.m_bitmap, source.m_cache.m_alpha); } -// OFFSET: 0x00545E20 void CDCBitmap::DrawRleSprite( int x, int y, std::span cells, const SpriteRleImage* const* const* images, const std::uint32_t* palette, int cellCount ) { this->m_bitmap.DrawRleSprite(x, y, cells, images, palette, cellCount); } -// OFFSET: 0x00547460 void CDCBitmap::Fill(const RECT* rectangle, std::uint32_t color) { this->m_bitmap.Fill(rectangle, color); } -// OFFSET: 0x00547B80 void CDCBitmap::Draw(CRenderSystemBase& system, int x, int y, int width, int height, std::uint32_t color) { this->m_cache.Draw(this->m_bitmap, system, x, y, width, height, color); } -// OFFSET: 0x00545C40 void CDCBitmap::DrawScaledSprite( int x, int y, int width, int height, std::span cells, const SpriteRleImage* const* const* images, int cellCount, int offsetX, int offsetY, float scale, const std::uint32_t* palette, SpriteAtlas& atlas, CRenderSystemBase& system, int serviceType, std::uint32_t reuseDelay @@ -117,7 +104,6 @@ void CDCBitmap::DrawScaledSprite( this->m_bitmap.DrawScaledSprite(x, y, width, height, cells, images, cellCount, offsetX, offsetY, scale, palette, atlas, system, serviceType, reuseDelay); } -// OFFSET: 0x005469E0 void CDCBitmap::DrawScaledSurface( int x, int y, int width, int height, CSurface* source, int sourceWidth, int sourceHeight, float scaleX, float scaleY, std::uint32_t color, bool mirrored, int offsetX, int offsetY, int sourceX, int sourceY @@ -125,12 +111,10 @@ void CDCBitmap::DrawScaledSurface( this->m_bitmap.DrawScaledSurface(x, y, width, height, source, sourceWidth, sourceHeight, scaleX, scaleY, color, mirrored, offsetX, offsetY, sourceX, sourceY); } -// OFFSET: 0x005489F0 void CDCBitmap::Brighten(int x, int y, int width, int height, int amount) { this->m_bitmap.Brighten(x, y, width, height, amount); } -// OFFSET: 0x00548650 void CDCBitmap::Dim(int x, int y, int width, int height, int percent) { this->m_bitmap.Dim(x, y, width, height, percent); } diff --git a/Source/Render/DeviceContext/DCSurface.cpp b/Source/Render/DeviceContext/DCSurface.cpp index 9f8f0396..68c686ba 100644 --- a/Source/Render/DeviceContext/DCSurface.cpp +++ b/Source/Render/DeviceContext/DCSurface.cpp @@ -184,7 +184,6 @@ CDCSurface::CDCSurface(std::shared_ptr surface) : m_surface(std::move( } // OFFSET: 0x005490D0 -// OFFSET: 0x00549180 // FUNCTION: fn_01865 CDCSurface::~CDCSurface() = default; diff --git a/Source/Render/DeviceContext/DeviceContext.cpp b/Source/Render/DeviceContext/DeviceContext.cpp index 390caeba..2a5d3049 100644 --- a/Source/Render/DeviceContext/DeviceContext.cpp +++ b/Source/Render/DeviceContext/DeviceContext.cpp @@ -1,6 +1,5 @@ #include "Render/DeviceContext/DeviceContext.h" // OFFSET: 0x005459E0 -// OFFSET: 0x00545AF0 // FUNCTION: fn_01834 CDC::~CDC() = default; diff --git a/Source/Render/Primitives/UIRPData.cpp b/Source/Render/Primitives/UIRPData.cpp index 6e8faa15..6ea01416 100644 --- a/Source/Render/Primitives/UIRPData.cpp +++ b/Source/Render/Primitives/UIRPData.cpp @@ -11,7 +11,6 @@ UIRPData::UIRPData() : m_texture(nullptr) { } // OFFSET: 0x00812800 -// OFFSET: 0x008128E0 // FUNCTION: fn_10118 UIRPData::~UIRPData() { delete this->m_texture; diff --git a/Source/Render/RenderSystemBase.h b/Source/Render/RenderSystemBase.h index 4750675a..36cd4fb3 100644 --- a/Source/Render/RenderSystemBase.h +++ b/Source/Render/RenderSystemBase.h @@ -11,7 +11,6 @@ class CTexture; class CRenderSystemBase { public: - // OFFSET: 0x0056B4D0 virtual ~CRenderSystemBase() = default; virtual std::int32_t Backend() = 0; virtual HRESULT Initialize(HWND window) = 0; diff --git a/Source/Render/Renderer.cpp b/Source/Render/Renderer.cpp index 380a67f8..8c50fd93 100644 --- a/Source/Render/Renderer.cpp +++ b/Source/Render/Renderer.cpp @@ -223,5 +223,4 @@ CRenderer::CRenderer() : frame(0), unknown_003C(0), unknown_0040(0), unknown_004 // OFFSET: 0x00562090 // FUNCTION: fn_02175 -// OFFSET: 0x00562260 CRenderer::~CRenderer() = default; diff --git a/Source/Render/Textures/Texture.cpp b/Source/Render/Textures/Texture.cpp index 240675eb..93463c83 100644 --- a/Source/Render/Textures/Texture.cpp +++ b/Source/Render/Textures/Texture.cpp @@ -23,7 +23,6 @@ CTexture::CTexture() } // OFFSET: 0x00572380 -// OFFSET: 0x005723D0 // FUNCTION: fn_02465 CTexture::~CTexture() = default; diff --git a/Source/Resource/EZeffectResource.cpp b/Source/Resource/EZeffectResource.cpp index ed3fce78..19d64500 100644 --- a/Source/Resource/EZeffectResource.cpp +++ b/Source/Resource/EZeffectResource.cpp @@ -24,14 +24,12 @@ EZeffectClip::~EZeffectClip() { } } -// OFFSET: 0x0074CEE0 // OFFSET: 0x0074D570 // FUNCTION: fn_07893 CEZeffectRes::CEZeffectRes() : unknown_D320(0) { } // OFFSET: 0x0074D6F0 -// OFFSET: 0x0074D330 // FUNCTION: fn_07895 CEZeffectRes::~CEZeffectRes() = default; diff --git a/Source/Resource/GifLzw.cpp b/Source/Resource/GifLzw.cpp index 79124820..36d56cc5 100644 --- a/Source/Resource/GifLzw.cpp +++ b/Source/Resource/GifLzw.cpp @@ -13,6 +13,7 @@ namespace { static_assert(sizeof(GifLzwEntry) == 12); } +// OFFSET: 0x0074A840 // FUNCTION: fn_07868 int __stdcall DecodeGifLzw(int minimumCodeSize, const unsigned char* input, int inputBytes, unsigned char* output) { const int clearCode = 1 << minimumCodeSize; diff --git a/Source/Resource/Models/AnimatedModelResource.cpp b/Source/Resource/Models/AnimatedModelResource.cpp index b66233cb..cc81e440 100644 --- a/Source/Resource/Models/AnimatedModelResource.cpp +++ b/Source/Resource/Models/AnimatedModelResource.cpp @@ -71,7 +71,6 @@ C3dAnimModelRes* C3dAnimModelRes::Create() { return new C3dAnimModelRes; } -// OFFSET: 0x00752380 // OFFSET: 0x0075C710 // FUNCTION: fn_08023 void C3dAnimModelRes::Unload() { diff --git a/Source/Resource/ResourceMgr.cpp b/Source/Resource/ResourceMgr.cpp index 8f890a70..e1fd51cd 100644 --- a/Source/Resource/ResourceMgr.cpp +++ b/Source/Resource/ResourceMgr.cpp @@ -34,7 +34,6 @@ unsigned char g_lowercaseTable[256] = { 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, }; -// OFFSET: 0x00AECEE0 bool ResourceNameLess::operator()(const ResourceName* left, const ResourceName* right) const { if (left->hash != right->hash) { return left->hash < right->hash; diff --git a/Source/Resource/World/GroundResource.cpp b/Source/Resource/World/GroundResource.cpp index 2847d995..1614ccf0 100644 --- a/Source/Resource/World/GroundResource.cpp +++ b/Source/Resource/World/GroundResource.cpp @@ -8,7 +8,6 @@ CGndRes::CGndRes() : loaded(0), width(0), height(0), cellSize(10.0f) { } // OFFSET: 0x0074E390 -// OFFSET: 0x0074DD10 // FUNCTION: fn_07908 CGndRes::~CGndRes() = default; diff --git a/Source/Resource/XmlNode.cpp b/Source/Resource/XmlNode.cpp index 29ea8645..954959c9 100644 --- a/Source/Resource/XmlNode.cpp +++ b/Source/Resource/XmlNode.cpp @@ -3,15 +3,18 @@ #include #include +// OFFSET: 0x00AFA470 // FUNCTION: fn_18291 XmlNode::XmlNode(const char* name) : name(name), unknown_0004(0), unknown_0008(0), sibling(nullptr), child(nullptr) { } +// OFFSET: 0x00AFA500 // FUNCTION: fn_18292 XmlNode::~XmlNode() { this->Clear(); } +// OFFSET: 0x00AFA590 // FUNCTION: fn_18293 XmlNode* XmlNode::AppendSibling(XmlNode* node) { XmlNode* current = this; @@ -23,6 +26,7 @@ XmlNode* XmlNode::AppendSibling(XmlNode* node) { return node; } +// OFFSET: 0x00AFA5C0 // FUNCTION: fn_18294 void XmlDocument::Reset() { this->Clear(); @@ -32,6 +36,7 @@ void XmlDocument::Reset() { } } +// OFFSET: 0x00AFA5F0 // FUNCTION: fn_18295 void XmlNode::Clear() { if (this->sibling != nullptr) { @@ -48,6 +53,7 @@ void XmlNode::Clear() { this->unknown_0004 = 0; } +// OFFSET: 0x00AFA6B0 // FUNCTION: fn_18296 XmlNode* XmlNode::FindChild(const char* name) { XmlNode* first = this->child; @@ -62,6 +68,7 @@ XmlNode* XmlNode::FindChild(const char* name) { return first->FindSibling(name); } +// OFFSET: 0x00AFA710 // FUNCTION: fn_18297 XmlNode* XmlNode::FindSibling(const char* name) { for (XmlNode* current = this->sibling; current != nullptr; current = current->sibling) { diff --git a/Source/Security/NProtectGameGuardMgr.cpp b/Source/Security/NProtectGameGuardMgr.cpp index 102a7918..d9c6a3d9 100644 --- a/Source/Security/NProtectGameGuardMgr.cpp +++ b/Source/Security/NProtectGameGuardMgr.cpp @@ -179,8 +179,6 @@ void CNProtectGameGuardMgr::SetError(const char*, int, std::string message) { void CNProtectGameGuardMgr::Send(const char*) { } -// OFFSET: 0x0076C4C0 - // OFFSET: 0x0076D910 // FUNCTION: fn_08219 int __stdcall sub_76D910(int code, const int* packet) { diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index 170b1743..757aa3af 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -273,7 +273,6 @@ UIItemCollectionWnd::~UIItemCollectionWnd() { g_windowMgr.CloseWindow(276); } -// OFFSET: 0x008CC430 UIChooseSellBuyWnd::~UIChooseSellBuyWnd() = default; // INLINED @@ -2345,8 +2344,6 @@ void UINpcTextEditDialogWnd::InsertItemTag(const ITEM_INFO& item) { this->m_tagCtrl->sub_89CFE0(item, 0x12B8A4); } -// OFFSET: 0x008DA690 - // OFFSET: 0x008DACF0 // FUNCTION: fn_12149 void UINpcTextEditDialogWnd::InsertSkillTag(int tagId) { @@ -4164,8 +4161,6 @@ void UISkillNameChangeWnd::Slot15(int, int) { this->m_message0 = 184; } -// OFFSET: 0x008E9C90 - // OFFSET: 0x008EA780 // FUNCTION: fn_12205 void UIToolTipWnd::Slot15(int width, int height) { @@ -7345,8 +7340,6 @@ UIItemCollection_ComparisonWnd::UIItemCollection_ComparisonWnd() : UIItemCollectionWnd() { } -// OFFSET: 0x008C6FA0 - // OFFSET: 0x008C7070 // FUNCTION: fn_11927 UICardItemIllustWnd::UICardItemIllustWnd() @@ -7483,8 +7476,6 @@ UISkillNameChangeWnd::UISkillNameChangeWnd() : UIFrameWnd(0) { } -// OFFSET: 0x008C91F0 - // OFFSET: 0x008C7710 // FUNCTION: fn_11937 UICoupleAcceptWnd::UICoupleAcceptWnd() @@ -7835,8 +7826,6 @@ void UIPartyInvitationToWnd::Slot15(int, int) { g_windowMgr.SetFocus(this->m_edit); } -// OFFSET: 0x008E60A0 - // OFFSET: 0x008F95F0 // FUNCTION: fn_12339 int UICoupleAcceptWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) { @@ -8305,6 +8294,7 @@ void UIPasswordWnd::Slot15(int, int) { this->geometry.unknown_0030 = 0; this->unknown_00BC = 0; } +// OFFSET: 0x008C91F0 // FUNCTION: fn_11978 UIStatusWnd::UIStatusWnd() : UIFrameWnd(0) { @@ -9639,8 +9629,6 @@ UIMakingArrowListWnd::UIMakingArrowListWnd() : UIItemIdentifyWnd() { } -// OFFSET: 0x008C8A50 - // OFFSET: 0x008D4320 // FUNCTION: fn_12107 std::vector UIChooseWarpWnd::Slot44() { @@ -9768,6 +9756,7 @@ void UILoadingWnd::Slot15(int, int) { ResourceMgr::Instance().Load(Resolve(name)); g_windowMgr.SetSurface0478(static_cast(ResourceMgr::Instance().Load(Resolve(name)))); } +// OFFSET: 0x008C8A50 // FUNCTION: fn_11966 UIPetEggListWnd::UIPetEggListWnd() : UIItemIdentifyWnd() { @@ -10469,8 +10458,6 @@ void UITipboxWnd::Slot15(int width, int) { this->unknown_00D0->Invalidate(); } -// OFFSET: 0x008E60A0 - // OFFSET: 0x008F1430 // FUNCTION: fn_12254 void UIStorePasswordInputWnd::Paint() { @@ -11514,8 +11501,6 @@ void UIBookWnd::Slot19() { int ParseItemIdTag(const char* text, const char* end, int& length, int& itemId); -// OFFSET: 0x008F8ED0 - // OFFSET: 0x008F2DF0 // FUNCTION: fn_12262 void UITipboxWnd::PaintAnimations() { @@ -11875,8 +11860,6 @@ int UIChooseWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::in } } -// OFFSET: 0x008FD640 - // OFFSET: 0x008F8640 // FUNCTION: fn_12331 int UIChoose3Wnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) { diff --git a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp index b22a44af..3f8e38b9 100644 --- a/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIExchangeAcceptWnd.cpp @@ -22,7 +22,7 @@ UIExchangeAcceptWnd::UIExchangeAcceptWnd() : UIChooseSellBuyWnd(), saved(nullptr) { } -// OFFSET: 0x008CC9C0 +// OFFSET: 0x008CAAE0 // FUNCTION: fn_11996 UIExchangeAcceptWnd::~UIExchangeAcceptWnd() = default; diff --git a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp index 8ebc0954..0ce6cc20 100644 --- a/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp +++ b/Source/UI/Acceptance/UIJoinPartyAcceptWnd.cpp @@ -16,7 +16,6 @@ UIJoinPartyAcceptWnd::UIJoinPartyAcceptWnd() : UIExchangeAcceptWnd() { } -// OFFSET: 0x008CCEE0 UIJoinPartyAcceptWnd::~UIJoinPartyAcceptWnd() = default; // OFFSET: 0x008FE780 diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.cpp b/Source/UI/AdventureGuide/UIAdventureGuide.cpp index 1cb5b53d..55786549 100644 --- a/Source/UI/AdventureGuide/UIAdventureGuide.cpp +++ b/Source/UI/AdventureGuide/UIAdventureGuide.cpp @@ -66,8 +66,8 @@ template <> AdventureGuide::CUISubTab* CUIListBox::Cr template <> AdventureGuide::CUITab* CUIListBox::CreateItem(); // OFFSET: 0x009C28B0 -// OFFSET: 0x009C2980 // FUNCTION: fn_13993 +// OFFSET: 0x009C2980 // FUNCTION: fn_13994 template void CUIListBox::Slot15(int width, int height) { this->scrollBar = new CUIVScrollBar(); @@ -91,12 +91,12 @@ template void CUIListBox::Slot15(int, int); template void CUIListBox::Slot15(int, int); // OFFSET: 0x009C2A50 -// OFFSET: 0x009C2B20 -// OFFSET: 0x009C2BF0 -// OFFSET: 0x009C2CC0 // FUNCTION: fn_13995 +// OFFSET: 0x009C2B20 // FUNCTION: fn_13996 +// OFFSET: 0x009C2BF0 // FUNCTION: fn_13997 +// OFFSET: 0x009C2CC0 // FUNCTION: fn_13998 template void CUIListBoxEx::Slot15(int width, int height) { this->scrollBar = new CUIVScrollBar(); diff --git a/Source/UI/Buttons/UIBasicButton.cpp b/Source/UI/Buttons/UIBasicButton.cpp index cda6eaf2..49846dbe 100644 --- a/Source/UI/Buttons/UIBasicButton.cpp +++ b/Source/UI/Buttons/UIBasicButton.cpp @@ -12,7 +12,6 @@ UIBasicButton::UIBasicButton() : UIButton(), invalidateParent(0) { this->geometry.height = 20; } -// OFFSET: 0x00852170 UIBasicButton::~UIBasicButton() = default; // OFFSET: 0x00809910 diff --git a/Source/UI/Buttons/UIBitmapButton.cpp b/Source/UI/Buttons/UIBitmapButton.cpp index b95f6bb8..48e25bdd 100644 --- a/Source/UI/Buttons/UIBitmapButton.cpp +++ b/Source/UI/Buttons/UIBitmapButton.cpp @@ -9,7 +9,6 @@ UIBitmapButton::UIBitmapButton() } // OFFSET: 0x008511B0 -// OFFSET: 0x00852220 // FUNCTION: fn_10689 UIBitmapButton::~UIBitmapButton() = default; diff --git a/Source/UI/Buttons/UIBmpTextButton.cpp b/Source/UI/Buttons/UIBmpTextButton.cpp index b4c6ac02..5ae40e40 100644 --- a/Source/UI/Buttons/UIBmpTextButton.cpp +++ b/Source/UI/Buttons/UIBmpTextButton.cpp @@ -11,7 +11,6 @@ UIBmpTextButton::UIBmpTextButton() : UIBitmapButton() { } -// OFFSET: 0x00852360 UIBmpTextButton::~UIBmpTextButton() = default; // OFFSET: 0x007C2340 diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index dad539e3..d64d6f12 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -145,7 +145,6 @@ void UIButton::ResetCursor(int, int) { } // OFFSET: 0x0085EED0 -// OFFSET: 0x03DE9C61 // FUNCTION: fn_10852 void UIButton::Slot31(int x, int y) { if (this->m_disabled != 0) { diff --git a/Source/UI/Buttons/UIJobSlotButton.cpp b/Source/UI/Buttons/UIJobSlotButton.cpp index a1c74670..18e41751 100644 --- a/Source/UI/Buttons/UIJobSlotButton.cpp +++ b/Source/UI/Buttons/UIJobSlotButton.cpp @@ -5,7 +5,6 @@ UIJobSlotButton::UIJobSlotButton() : UIBitmapButton(), selected(0) { } -// OFFSET: 0x007BB6B0 UIJobSlotButton::~UIJobSlotButton() = default; // OFFSET: 0x007BFC70 diff --git a/Source/UI/Buttons/UINaviLinkButton.cpp b/Source/UI/Buttons/UINaviLinkButton.cpp index 166b1553..af70326b 100644 --- a/Source/UI/Buttons/UINaviLinkButton.cpp +++ b/Source/UI/Buttons/UINaviLinkButton.cpp @@ -7,7 +7,6 @@ UINaviLinkButton::UINaviLinkButton() : UITextButton() { } -// OFFSET: 0x00873A90 UINaviLinkButton::~UINaviLinkButton() = default; // OFFSET: 0x00893050 diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index ba6b5de3..03a01e5d 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -64,7 +64,7 @@ int g_screenHeight; UITextButton::UITextButton() : UIButton(), m_outlineColor(0xFFFFFF), m_value(0) { } -// OFFSET: 0x00874690 +// OFFSET: 0x00871D60 // FUNCTION: fn_11110 UITextButton::~UITextButton() = default; @@ -2447,8 +2447,6 @@ void UIComboBox::Paint() { this->parent->Invalidate(); } -// OFFSET: 0x0088AEC0 - // OFFSET: 0x0088F1C0 // FUNCTION: fn_11387 void UIStaticItem_Illust::Paint() { diff --git a/Source/UI/Buttons/UITextureButton.cpp b/Source/UI/Buttons/UITextureButton.cpp index 44733205..a2324aeb 100644 --- a/Source/UI/Buttons/UITextureButton.cpp +++ b/Source/UI/Buttons/UITextureButton.cpp @@ -13,7 +13,6 @@ void UITextureButton::Paint() { } // OFFSET: 0x0085F060 -// OFFSET: 0x03DE9CE2 // FUNCTION: fn_10856 void UITextureButton::Slot31(int x, int y) { if (this->m_disabled == 1) { diff --git a/Source/UI/Cooldowns/CooldownOwner.cpp b/Source/UI/Cooldowns/CooldownOwner.cpp index 4bf66c9d..6dab52a3 100644 --- a/Source/UI/Cooldowns/CooldownOwner.cpp +++ b/Source/UI/Cooldowns/CooldownOwner.cpp @@ -8,8 +8,6 @@ CooldownOwner::CooldownOwner() : m_initialized(false) { this->m_initialized = true; } -// OFFSET: 0x00CA60D0 - // OFFSET: 0x00CA61A0 // FUNCTION: fn_20957 void CooldownOwner::Register(unsigned id, std::uint32_t duration, std::uint32_t start, std::uint32_t elapsed) { diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index e8262f53..e2d0bd93 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -226,7 +226,6 @@ UIEditCtrl::UIEditCtrl() } // OFFSET: 0x008517E0 -// OFFSET: 0x00852980 // FUNCTION: fn_10694 UIEditCtrl::~UIEditCtrl() = default; @@ -463,8 +462,6 @@ void UIEditCtrl3::DrawBlinkingCaret(const std::uint32_t& color) { this->DrawTextAt(1, 0, "|", 0, 0, 12, color, 0, 0); } -// OFFSET: 0x00854130 - // OFFSET: 0x00856F10 // FUNCTION: fn_10757 void UIEditCtrl3::PlaceTags(const int& x, const int& y, const int& firstLine, const int& endLine, const int& line, const int&) { @@ -523,7 +520,6 @@ UISkillListWnd::UISkillListWnd() : UIFrameWnd(0) { UIEditCtrlWheel::UIEditCtrlWheel() : UIEditCtrl() { } -// OFFSET: 0x009701B0 UIEditCtrlWheel::~UIEditCtrlWheel() = default; // OFFSET: 0x0098A240 @@ -9469,8 +9465,6 @@ void UIMerchantItemPurchaseWnd::Paint() { } } -// OFFSET: 0x00981EE0 - // OFFSET: 0x00982A80 // FUNCTION: fn_13344 void UIMerchantShopMakeWnd::Paint() { @@ -10213,6 +10207,7 @@ bool UIEditCtrl3::LinkDisplayName(const std::string& encoded, std::string& outpu return decoded; } +// OFFSET: 0x00981EE0 // FUNCTION: fn_13342 void UIMerchantItemShopWnd::Paint() { this->DrawTitleBar(false, "", 0); diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index b7df8cef..eb1232df 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -27,7 +27,6 @@ UIEditCtrl2::UIEditCtrl2() : UIEditCtrl() { } // OFFSET: 0x008515E0 -// OFFSET: 0x00852700 // FUNCTION: fn_10692 UIEditCtrl2::~UIEditCtrl2() = default; @@ -359,8 +358,8 @@ UIEditCtrl3::UIEditCtrl3(const UIEditCtrl3& other) : UIEditCtrl2(other) { } // OFFSET: 0x00851630 -// OFFSET: 0x00852770 // FUNCTION: fn_10693 +// OFFSET: 0x00852770 // FUNCTION: fn_10715 UIEditCtrl3::~UIEditCtrl3() { this->ClearLineState(); @@ -410,8 +409,6 @@ int UIWhisperEditCtrl::SendMsg(UIWindow* sender, int message, std::intptr_t a, s return 0; } -// OFFSET: 0x00867FC0 - // OFFSET: 0x00853760 // FUNCTION: fn_10741 void UIEditCtrl_OldList::RecallHistory(int step) { @@ -747,12 +744,11 @@ int UIEditCtrl::MeasureText(const std::string& text, const int& bytes) { return this->TextWidth(text.c_str(), bytes, 0, 12, 0, 0); } -// OFFSET: 0x0084F7B0 +// OFFSET: 0x0084F710 // FUNCTION: fn_10660 UIEditCtrl4::UIEditCtrl4() : UIEditCtrl(), placeholderColor(0xFFFFFFFFu), placeholderEnabled(0) { } -// OFFSET: 0x00852870 UIEditCtrl4::~UIEditCtrl4() = default; // OFFSET: 0x0085AA40 @@ -808,7 +804,6 @@ void UIEditCtrl4::SetPlaceholderColor(std::uint32_t color) { UIEditCtrl5::UIEditCtrl5() : UIEditCtrl4() { } -// OFFSET: 0x008528F0 UIEditCtrl5::~UIEditCtrl5() = default; // OFFSET: 0x00864140 diff --git a/Source/UI/Enchant/UIEnchantUI.cpp b/Source/UI/Enchant/UIEnchantUI.cpp index c5fe9219..2bb8313e 100644 --- a/Source/UI/Enchant/UIEnchantUI.cpp +++ b/Source/UI/Enchant/UIEnchantUI.cpp @@ -53,8 +53,8 @@ template <> CEnchantMgr* Singleton::s_instance = nullptr; // OFFSET: 0x009F9B40 -// OFFSET: 0x009F9C10 // FUNCTION: fn_14814 +// OFFSET: 0x009F9C10 // FUNCTION: fn_14815 template void CUIListBoxEx::Slot15(int width, int height) { this->scrollBar = new CUIVScrollBar(); @@ -1297,8 +1297,6 @@ CUIListBoxEx::CUIListBoxEx() unknown_00E0(1), rebind(0) { } -// OFFSET: 0x009F74E0 - // OFFSET: 0x009F7670 // FUNCTION: fn_14774 template <> diff --git a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp index d590f3fc..1706dd7d 100644 --- a/Source/UI/EntryQueue/UIEntryQueueWnd.cpp +++ b/Source/UI/EntryQueue/UIEntryQueueWnd.cpp @@ -65,8 +65,6 @@ int UIEntryQueueHelpWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, UIEntryQueueListBox::UIEntryQueueListBox() : UIListBox() { } -// OFFSET: 0x00BA43F0 - // OFFSET: 0x00BA4490 // FUNCTION: fn_19686 void UIEntryQueueListBox::AddEntry(const char* name, int value) { @@ -101,8 +99,6 @@ UIEntryQueueRequestWnd::UIEntryQueueRequestWnd() : UIFrameWnd(0), m_interval(1000), m_elapsed(0), m_delta(0), m_lastTick(0) { } -// OFFSET: 0x00BA4870 - // OFFSET: 0x00BA48E0 // FUNCTION: fn_19691 bool UIEntryQueueRequestWnd::Create() { @@ -229,8 +225,6 @@ UIEntryQueueStandByWnd::UIEntryQueueStandByWnd() m_rankingText() { } -// OFFSET: 0x00BA5680 - // OFFSET: 0x00BA5700 // FUNCTION: fn_19698 bool UIEntryQueueStandByWnd::Create() { @@ -330,8 +324,6 @@ UIEntryQueueWnd::UIEntryQueueWnd() : UIFrameWnd(0), m_applyButtons(), m_helpButton(nullptr), m_labels(), m_values(), m_list(nullptr), saved(nullptr) { } -// OFFSET: 0x00BA6110 - // OFFSET: 0x00BA6410 // FUNCTION: fn_19706 int UIEntryQueueWnd::SelectedIndex() { diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index 8bd10649..64bcc9c7 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -215,12 +215,12 @@ void GameSettingsUI::CUIGroupSkin::Slot15(int width, int height) { } // OFFSET: 0x00A344D0 -// OFFSET: 0x00A34500 -// OFFSET: 0x00A34530 -// OFFSET: 0x00A34560 // FUNCTION: fn_15407 +// OFFSET: 0x00A34500 // FUNCTION: fn_15408 +// OFFSET: 0x00A34530 // FUNCTION: fn_15409 +// OFFSET: 0x00A34560 // FUNCTION: fn_15410 template void CUIComboBox::Paint() { this->ClearSurface(0xFFFFFFFF); @@ -233,12 +233,12 @@ template void CUIComboBox::Paint(); template void CUIComboBox::Paint(); // OFFSET: 0x00A40040 -// OFFSET: 0x00A40050 -// OFFSET: 0x00A40060 -// OFFSET: 0x00A40070 // FUNCTION: fn_15962 +// OFFSET: 0x00A40050 // FUNCTION: fn_15963 +// OFFSET: 0x00A40060 // FUNCTION: fn_15964 +// OFFSET: 0x00A40070 // FUNCTION: fn_15965 template unsigned int CUIComboBox::Selected() const { return this->listBox->selected; @@ -250,12 +250,12 @@ template unsigned int CUIComboBox:: template unsigned int CUIComboBox::Selected() const; // OFFSET: 0x00A41FE0 -// OFFSET: 0x00A42060 -// OFFSET: 0x00A420E0 -// OFFSET: 0x00A42160 // FUNCTION: fn_16009 +// OFFSET: 0x00A42060 // FUNCTION: fn_16010 +// OFFSET: 0x00A420E0 // FUNCTION: fn_16011 +// OFFSET: 0x00A42160 // FUNCTION: fn_16012 template void CUIComboBox::UpdateListHeight() { const int height = std::min(this->listBox->data.size(), this->visibleItems) * this->itemHeight; @@ -283,12 +283,12 @@ template int CUIComboBox::AddItem(const D& value, bool template int CUIComboBox::AddItem(const std::string& value, bool refresh); // OFFSET: 0x00A1C1B0 -// OFFSET: 0x00A1CC90 -// OFFSET: 0x00A1D770 -// OFFSET: 0x00A1E250 // FUNCTION: fn_15379 +// OFFSET: 0x00A1CC90 // FUNCTION: fn_15380 +// OFFSET: 0x00A1D770 // FUNCTION: fn_15381 +// OFFSET: 0x00A1E250 // FUNCTION: fn_15382 template void CUIComboBox::Create(int width, int itemHeight, int visibleItems) { this->visibleItems = visibleItems; @@ -2218,8 +2218,6 @@ void GameSettingsUI::CUIGroupGraphicsAPI::Slot16() { this->m_backend = backend; } -// OFFSET: 0x00A41560 - // OFFSET: 0x00A41710 // FUNCTION: fn_15992 void GameSettingsUI::CUIGroupProcessPriority::Slot16() { @@ -2331,12 +2329,6 @@ void GameSettingsUI::CUIGroupLogInOut::Slot16() { this->m_title->SetTooltip(tooltipText, std::strlen(tooltipText)); } -// OFFSET: 0x00A1A320 - -// OFFSET: 0x00A1A480 - -// OFFSET: 0x00A1A5E0 - // OFFSET: 0x00A1F890 // FUNCTION: fn_15390 void GameSettingsUI::CUIComboItem::Slot15(int width, int height) { @@ -4278,7 +4270,7 @@ void CUIGameSettingsUI::Slot15(int width, int height) { this->m_tab->Select(basicButton); } - // OFFSET: 0x00A40C40 +// OFFSET: 0x00A40C40 // FUNCTION: fn_15986 void CUIGameSettingsUI::Slot16() { this->Move((g_renderer->viewport.width - this->geometry.width) / 2, (g_renderer->viewport.height - this->geometry.height) / 2); diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index 480c97f9..d1769a68 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -1629,7 +1629,6 @@ void UIGuildSkillWnd::Slot25(int x, int y) { } // OFFSET: 0x0095F460 - // FUNCTION: fn_13079 void UIGuildTotalInfoWnd::Paint() { UIGuildWnd::Paint(); @@ -1993,8 +1992,6 @@ bool UIGuildMemberManageWnd::DrawMember(GuildInfo::Member& member, int& index, i return true; } -// OFFSET: 0x0095E320 - // OFFSET: 0x0095ACC0 // FUNCTION: fn_13062 void UIGuildNoticeWnd::Slot15(int, int) { diff --git a/Source/UI/Items/MergeItemWnd.cpp b/Source/UI/Items/MergeItemWnd.cpp index 840c1e25..465b28a7 100644 --- a/Source/UI/Items/MergeItemWnd.cpp +++ b/Source/UI/Items/MergeItemWnd.cpp @@ -45,8 +45,6 @@ CMergeItemWnd::CMergeItemWnd() m_mergeButton(nullptr), m_cancelButton(nullptr), m_closeButton(nullptr), m_items(), m_resizer(nullptr), m_scrollBar(nullptr), m_itemCount(0), m_columns(0), m_rows(0), m_visibleCount(0), m_scrollRow(0), m_scrollable(0) {} -// OFFSET: 0x007DEF00 - // OFFSET: 0x007DEF80 // FUNCTION: fn_09662 void CMergeItemWnd::SelectSameItems(int id) { diff --git a/Source/UI/Layout/SnapMgr.cpp b/Source/UI/Layout/SnapMgr.cpp index 16c82c28..44f52b86 100644 --- a/Source/UI/Layout/SnapMgr.cpp +++ b/Source/UI/Layout/SnapMgr.cpp @@ -45,7 +45,6 @@ CSnapMgr::CSnapMgr() : root(nullptr) { } // OFFSET: 0x007E23D0 -// OFFSET: 0x007E2520 // FUNCTION: fn_09697 CSnapMgr::~CSnapMgr() { this->Clear(); diff --git a/Source/UI/Layout/SnapObject.cpp b/Source/UI/Layout/SnapObject.cpp index d1616f40..b93d0403 100644 --- a/Source/UI/Layout/SnapObject.cpp +++ b/Source/UI/Layout/SnapObject.cpp @@ -13,8 +13,6 @@ namespace { SnapObject::SnapObject() : window(nullptr), visited(0) { } -// OFFSET: 0x007E2550 -// OFFSET: 0x007E2360 SnapObject::~SnapObject() = default; // OFFSET: 0x007E2770 diff --git a/Source/UI/Lists/UIListBox.cpp b/Source/UI/Lists/UIListBox.cpp index 3f417d79..528e850a 100644 --- a/Source/UI/Lists/UIListBox.cpp +++ b/Source/UI/Lists/UIListBox.cpp @@ -45,7 +45,7 @@ UIServerListBox::UIServerListBox() : UIListBox() { this->unknown_00E0 = 0; } -// OFFSET: 0x00873690 +// OFFSET: 0x00871040 // FUNCTION: fn_11105 UIListBox::~UIListBox() = default; diff --git a/Source/UI/Lists/UIListBoxTemplate.h b/Source/UI/Lists/UIListBoxTemplate.h index 1b194ee3..564da81f 100644 --- a/Source/UI/Lists/UIListBoxTemplate.h +++ b/Source/UI/Lists/UIListBoxTemplate.h @@ -195,16 +195,16 @@ public: void Slot15(int width, int height) override; // OFFSET: 0x009D23B0 - // OFFSET: 0x009D23C0 // FUNCTION: fn_14011 + // OFFSET: 0x009D23C0 // FUNCTION: fn_14012 void Paint() override { this->ClearSurface(0xFFFF00FF); } // OFFSET: 0x009D2410 - // OFFSET: 0x009D2450 // FUNCTION: fn_14017 + // OFFSET: 0x009D2450 // FUNCTION: fn_14018 void Slot35(int value) override { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { @@ -215,8 +215,8 @@ public: } // OFFSET: 0x009D3FD0 - // OFFSET: 0x009D4040 // FUNCTION: fn_14037 + // OFFSET: 0x009D4040 // FUNCTION: fn_14038 void Resize(int width, int height) override { UIWindow::Resize(width, height); @@ -231,8 +231,8 @@ public: } // OFFSET: 0x009DD9A0 - // OFFSET: 0x009DD9F0 // FUNCTION: fn_14345 + // OFFSET: 0x009DD9F0 // FUNCTION: fn_14346 void UpdateScrollBar() { int total = 0; @@ -292,24 +292,24 @@ public: ~CUIListBoxEx() override; void Slot15(int width, int height) override; // OFFSET: 0x00A01E70 - // OFFSET: 0x00A01E80 - // OFFSET: 0x00A0CE60 - // OFFSET: 0x00A63890 // FUNCTION: fn_14832 + // OFFSET: 0x00A01E80 // FUNCTION: fn_14833 + // OFFSET: 0x00A0CE60 // FUNCTION: fn_15037 + // OFFSET: 0x00A63890 // FUNCTION: fn_16437 void Paint() override { this->ClearSurface(0xFFFF00FF); } // OFFSET: 0x00A01E90 - // OFFSET: 0x00A01ED0 - // OFFSET: 0x00A0CE70 - // OFFSET: 0x00A638A0 // FUNCTION: fn_14834 + // OFFSET: 0x00A01ED0 // FUNCTION: fn_14835 + // OFFSET: 0x00A0CE70 // FUNCTION: fn_15038 + // OFFSET: 0x00A638A0 // FUNCTION: fn_16438 void Slot35(int value) override { if (!this->scrollBar->dragging && this->scrollBar->total > this->scrollBar->visible) { @@ -320,10 +320,10 @@ public: } // OFFSET: 0x009F9890 - // OFFSET: 0x009F98F0 - // OFFSET: 0x00A08DE0 // FUNCTION: fn_14810 + // OFFSET: 0x009F98F0 // FUNCTION: fn_14811 + // OFFSET: 0x00A08DE0 // FUNCTION: fn_15032 void ClearItems() { for (T* item : this->items) { @@ -356,8 +356,8 @@ public: } // OFFSET: 0x00A051E0 - // OFFSET: 0x00A662D0 // FUNCTION: fn_14971 + // OFFSET: 0x00A662D0 // FUNCTION: fn_16614 void ClearData() { this->data.clear(); @@ -389,8 +389,8 @@ public: } // OFFSET: 0x009DD950 - // OFFSET: 0x00A06300 // FUNCTION: fn_14344 + // OFFSET: 0x00A06300 // FUNCTION: fn_15001 void UpdateScrollBar() { this->scrollBar->SetTotal(this->data.size() * this->rowHeight + this->itemY); @@ -400,16 +400,16 @@ public: } // OFFSET: 0x009D43D0 - // OFFSET: 0x009D45D0 - // OFFSET: 0x009D47D0 - // OFFSET: 0x009D49D0 - // OFFSET: 0x00A027C0 - // OFFSET: 0x00A029C0 // FUNCTION: fn_14043 + // OFFSET: 0x009D45D0 // FUNCTION: fn_14044 + // OFFSET: 0x009D47D0 // FUNCTION: fn_14045 + // OFFSET: 0x009D49D0 // FUNCTION: fn_14046 + // OFFSET: 0x00A027C0 // FUNCTION: fn_14843 + // OFFSET: 0x00A029C0 // FUNCTION: fn_14844 void OnScroll(int position) { auto it = this->items.begin(); diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index e2485ba2..b0f19b83 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -73,7 +73,6 @@ UIScrollBar::UIScrollBar() thickness(13), minimumThumb(1), horizontalStep(1), verticalStep(1) { } -// OFFSET: 0x00873FA0 UIScrollBar::~UIScrollBar() = default; // OFFSET: 0x0086E4D0 diff --git a/Source/UI/Lists/UIScrollBarNavi.cpp b/Source/UI/Lists/UIScrollBarNavi.cpp index 3cbbf797..88ea1aa7 100644 --- a/Source/UI/Lists/UIScrollBarNavi.cpp +++ b/Source/UI/Lists/UIScrollBarNavi.cpp @@ -10,7 +10,6 @@ UIScrollBar_Navi::UIScrollBar_Navi() : UIScrollBar() { this->thickness = 7; } -// OFFSET: 0x00874080 UIScrollBar_Navi::~UIScrollBar_Navi() = default; // OFFSET: 0x0088E930 diff --git a/Source/UI/MiniPartyGrid.cpp b/Source/UI/MiniPartyGrid.cpp index 4f85b216..3c8c3fb7 100644 --- a/Source/UI/MiniPartyGrid.cpp +++ b/Source/UI/MiniPartyGrid.cpp @@ -5,6 +5,7 @@ int g_miniPartyCellWidth = 177; // GLOBAL: gl_24519 int g_miniPartyCellHeight = 55; +// OFFSET: 0x00737EC0 // FUNCTION: fn_07659 MiniPartyGridPoint* MiniPartyGrid::GetCellPosition(MiniPartyGridPoint* position, int index) const { const int y = this->top + g_miniPartyCellHeight * (index % this->rows); @@ -13,6 +14,7 @@ MiniPartyGridPoint* MiniPartyGrid::GetCellPosition(MiniPartyGridPoint* position, return position; } +// OFFSET: 0x00737EF0 // FUNCTION: fn_07660 MiniPartyGridPoint* MiniPartyGrid::GetWindowPosition(MiniPartyGridPoint* position, int index) const { const int y = this->top + g_miniPartyCellHeight * (index % this->rows); @@ -21,6 +23,7 @@ MiniPartyGridPoint* MiniPartyGrid::GetWindowPosition(MiniPartyGridPoint* positio return position; } +// OFFSET: 0x00737F20 // FUNCTION: fn_07661 int MiniPartyGrid::FindCell(int x, int y) const { const int dx = x - this->left; @@ -56,6 +59,7 @@ int MiniPartyGrid::FindCell(int x, int y) const { return -1; } +// OFFSET: 0x00737FE0 // FUNCTION: fn_07662 int MiniPartyGrid::BuildAvailableCells() { int index = 0; diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index d9135375..b8d13d01 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -34,7 +34,6 @@ UIAdvenPartyBoardWnd::UIAdvenPartyBoardWnd() : UIFrameWnd(0), unknown_0104(0), unknown_0108(0), page(1), totalPages(1), unknown_0114(1), unknown_0118(0), selectedType(0) { } -// OFFSET: 0x007BB590 UIAdvenPartyBoardWnd::~UIAdvenPartyBoardWnd() = default; // OFFSET: 0x007C23C0 diff --git a/Source/UI/Party/UIApplyForPartyWnd.cpp b/Source/UI/Party/UIApplyForPartyWnd.cpp index 3b396865..977a39d4 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.cpp +++ b/Source/UI/Party/UIApplyForPartyWnd.cpp @@ -33,7 +33,6 @@ UIApplyForPartyWnd::UIApplyForPartyWnd() : UIFrameWnd(0) { } -// OFFSET: 0x007BB610 UIApplyForPartyWnd::~UIApplyForPartyWnd() = default; // OFFSET: 0x007C2400 diff --git a/Source/UI/Party/UIPartyInfoWnd.cpp b/Source/UI/Party/UIPartyInfoWnd.cpp index 204383d8..ab87ba9c 100644 --- a/Source/UI/Party/UIPartyInfoWnd.cpp +++ b/Source/UI/Party/UIPartyInfoWnd.cpp @@ -17,7 +17,6 @@ UIPartyInfoWnd::UIPartyInfoWnd() this->m_drawLabel = 0; } -// OFFSET: 0x007BB740 UIPartyInfoWnd::~UIPartyInfoWnd() = default; // OFFSET: 0x007BBEF0 diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index e9f9db2f..e7fcf134 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -52,7 +52,6 @@ UIRegisterPartyWnd::UIRegisterPartyWnd() : UIFrameWnd(0), selectedType(0) { } -// OFFSET: 0x007BB810 UIRegisterPartyWnd::~UIRegisterPartyWnd() = default; // OFFSET: 0x007C2440 diff --git a/Source/UI/Party/UIRequestJoinPartyMgr.cpp b/Source/UI/Party/UIRequestJoinPartyMgr.cpp index dad3ff8a..1fd1b380 100644 --- a/Source/UI/Party/UIRequestJoinPartyMgr.cpp +++ b/Source/UI/Party/UIRequestJoinPartyMgr.cpp @@ -16,7 +16,6 @@ UIRequestJoinPartyMgr::UIRequestJoinPartyMgr(WindowManagerWindows& windows) : m_ } // OFFSET: 0x007BB470 -// OFFSET: 0x007BB880 // FUNCTION: fn_09281 UIRequestJoinPartyMgr::~UIRequestJoinPartyMgr() = default; diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.cpp b/Source/UI/Party/UIRequestJoinPartyWnd.cpp index 301712a0..8cd05780 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.cpp +++ b/Source/UI/Party/UIRequestJoinPartyWnd.cpp @@ -29,7 +29,6 @@ UIRequestJoinPartyWnd::UIRequestJoinPartyWnd() : UIFrameWnd(0) { } -// OFFSET: 0x007BB960 UIRequestJoinPartyWnd::~UIRequestJoinPartyWnd() = default; // OFFSET: 0x007BEFD0 diff --git a/Source/UI/PriceCommission.cpp b/Source/UI/PriceCommission.cpp index 2f2fcc1b..985ac7c9 100644 --- a/Source/UI/PriceCommission.cpp +++ b/Source/UI/PriceCommission.cpp @@ -1,5 +1,6 @@ #include +// OFFSET: 0x004D2D50 // FUNCTION: fn_00161 int PriceCommission(std::int64_t price) { return price > 10000000 ? 5 : 0; diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index 82e10a3d..ffc6beef 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -1012,6 +1012,7 @@ void CUIRenewQuestUI::OnCallback74() { void CUIRenewQuestUI::OnCallback56() { } +// OFFSET: 0x00A66FF0 // FUNCTION: fn_16628 void CUIRenewQuestUI::sub_A66FF0(unsigned int questId) { for (RenewQuestUI::CUIQuestList* list : this->questLists) { @@ -2156,6 +2157,7 @@ RenewQuestUI::CUIQuestItem::CUIQuestItem() RenewQuestUI::CUIQuestList::CUIQuestList() : CUIControl(), list(nullptr), type(1) { } +// OFFSET: 0x00A67E90 // FUNCTION: fn_45515 void CUIRenewQuestUI::OnProcessTabClick() { this->RecordValues(0x16, 1, 0, 0, 0); @@ -2169,6 +2171,7 @@ void CUIRenewQuestUI::OnProcessTabClick() { } } +// OFFSET: 0x00A67EE0 // FUNCTION: fn_45516 void CUIRenewQuestUI::OnRecommendedTabClick() { this->RecordValues(0x16, 2, 0, 0, 0); @@ -2187,6 +2190,7 @@ void CUIRenewQuestUI::OnRecommendedTabClick() { } } +// OFFSET: 0x00A67E40 // FUNCTION: fn_45517 void CUIRenewQuestUI::OnHoldTabClick() { this->RecordValues(0x16, 4, 0, 0, 0); @@ -2200,6 +2204,7 @@ void CUIRenewQuestUI::OnHoldTabClick() { } } +// OFFSET: 0x00A67F50 // FUNCTION: fn_45518 void CUIRenewQuestUI::OnWaitTabClick() { this->RecordValues(0x16, 8, 0, 0, 0); diff --git a/Source/UI/Shortcuts/UIShortCutWnd.cpp b/Source/UI/Shortcuts/UIShortCutWnd.cpp index 3c176a55..2b6fa18b 100644 --- a/Source/UI/Shortcuts/UIShortCutWnd.cpp +++ b/Source/UI/Shortcuts/UIShortCutWnd.cpp @@ -149,7 +149,6 @@ void UIShortCutWnd::Slot19() { this->Invalidate(); } -// OFFSET: 0x00930900 void UIShortCutWnd::Slot26(int x, int y) { ActivateShortcut( *this, this->m_grid, x, y, g_session.ItemSlotActive(), g_session.m_hotkeyPage, this->m_slots, g_session.m_automaticSkills diff --git a/Source/UI/StylingShop/UIStylingShopWnd.cpp b/Source/UI/StylingShop/UIStylingShopWnd.cpp index a1f5b363..947becef 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.cpp +++ b/Source/UI/StylingShop/UIStylingShopWnd.cpp @@ -154,7 +154,6 @@ void UISlotForSelectWnd::Slot25(int x, int y) { } // OFFSET: 0x0082A110 -// OFFSET: 0x03DE9BE0 // FUNCTION: fn_10356 void UIStylingShopButton::Slot31(int, int) { if (this->m_disabled != 0 || g_windowMgr.Capture() != this) { @@ -1488,8 +1487,6 @@ struct StyleChangePacket { }; #pragma pack(pop) -// OFFSET: 0x00824EE0 - #include "Client/Mode/CGameMode.h" #include "Client/Mode/ModeMgr.h" #include "Contents/Actors/Pc.h" @@ -1827,6 +1824,7 @@ void UIShowInfoWnd::Paint() { this->UpdateChangedStyles(); this->DrawPayments(); } +// OFFSET: 0x00824EE0 // FUNCTION: fn_10318 bool UIShowInfoWnd::SendStyleChange() { StyleChangeHeader header = {}; @@ -1983,8 +1981,6 @@ void UIAccessoryShowCase::AddAccessories(int& loaded, int& skipped, const char* } } -// OFFSET: 0x008280F0 - #include "Contents/Items/ItemDescription.h" // OFFSET: 0x0082AAC0 @@ -2175,6 +2171,7 @@ void UIMyStyleWnd::Slot15(int, int) { this->AddChild(this->unknown_00A4[i]); } } +// OFFSET: 0x008280F0 // FUNCTION: fn_10333 void UIAccessoryCusWnd::Slot15(int, int) { this->m_display = new (std::nothrow) UIDisplayCharacter(); diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Text/NavigationLink.cpp index d3db2fa6..69dbf5a4 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Text/NavigationLink.cpp @@ -937,8 +937,6 @@ void CCreateLineInfo::BuildWindows() { } } -// OFFSET: 0x008392C0 - // OFFSET: 0x008392C0 // FUNCTION: fn_10456 void CCreateLineInfo::Rebuild(int) { diff --git a/Source/UI/Text/UIAchWnd.cpp b/Source/UI/Text/UIAchWnd.cpp index 68f108fd..8248ceed 100644 --- a/Source/UI/Text/UIAchWnd.cpp +++ b/Source/UI/Text/UIAchWnd.cpp @@ -51,8 +51,6 @@ UIAchievementWnd::UIAchievementWnd() UIAchievementWnd::~UIAchievementWnd() { } -// OFFSET: 0x007B32B0 - // OFFSET: 0x007B37F0 // FUNCTION: fn_09205 void UIAchListWnd::sub_7B37F0(int index) { diff --git a/Source/UI/Text/UIBalloonText.cpp b/Source/UI/Text/UIBalloonText.cpp index 84399061..d42b0ba2 100644 --- a/Source/UI/Text/UIBalloonText.cpp +++ b/Source/UI/Text/UIBalloonText.cpp @@ -69,7 +69,6 @@ __declspec(noinline) UIBalloonText::UIBalloonText() this->geometry.unknown_0034 = 0; } -// OFFSET: 0x008520F0 UIBalloonText::~UIBalloonText() = default; // OFFSET: 0x00851A00 diff --git a/Source/UI/Text/UIStaticText.cpp b/Source/UI/Text/UIStaticText.cpp index bf48998b..c39cf4ac 100644 --- a/Source/UI/Text/UIStaticText.cpp +++ b/Source/UI/Text/UIStaticText.cpp @@ -14,7 +14,6 @@ __declspec(noinline) UIStaticText::UIStaticText() bold(0), italic(0), tooltipEnabled(0) { } -// OFFSET: 0x00853050 // OFFSET: 0x00851E10 // FUNCTION: fn_10699 UIStaticText::~UIStaticText() = default; diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index 5bc2d00c..35071988 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -75,7 +75,6 @@ UITextViewer::UITextViewer() : UIListBox(), splitTipLinks(0), outline(0), bold(0 this->unknown_00BC = 0; } -// OFFSET: 0x008747F0 UITextViewer::~UITextViewer() = default; // OFFSET: 0x008872A0 diff --git a/Source/UI/Text/UITextViewerLinks.cpp b/Source/UI/Text/UITextViewerLinks.cpp index 841afa0a..935c7ad3 100644 --- a/Source/UI/Text/UITextViewerLinks.cpp +++ b/Source/UI/Text/UITextViewerLinks.cpp @@ -334,7 +334,6 @@ void UITextViewer::AddTipLinks(std::string text, unsigned addedLines) { this->SendMsg(nullptr, 7, 0, 0, 0, 0); } -// OFFSET: 0x00878750 // OFFSET: 0x00878750 // FUNCTION: fn_11212 bool UITextViewer::AddUrlLinks(std::string text, unsigned addedLines) { diff --git a/Source/UI/Text/UITransBalloonText.cpp b/Source/UI/Text/UITransBalloonText.cpp index 6debeff2..7eddaab8 100644 --- a/Source/UI/Text/UITransBalloonText.cpp +++ b/Source/UI/Text/UITransBalloonText.cpp @@ -44,7 +44,6 @@ UITransBalloonText::UITransBalloonText() : UIBalloonText(), m_borderColor(605295 UIAchBalloonText::UIAchBalloonText() : UITransBalloonText(), m_fontFamily(0) { } -// OFFSET: 0x00853210 // OFFSET: 0x00851F40 // FUNCTION: fn_10700 UITransBalloonText::~UITransBalloonText() = default; diff --git a/Source/UI/UICheckAttendanceWnd.cpp b/Source/UI/UICheckAttendanceWnd.cpp index 0dfc4dce..67832c4a 100644 --- a/Source/UI/UICheckAttendanceWnd.cpp +++ b/Source/UI/UICheckAttendanceWnd.cpp @@ -48,10 +48,6 @@ UICheckAttendanceWnd::UICheckAttendanceWnd() this->m_rewardCount = static_cast(g_checkAttendanceMgr->m_rewards.size()); } -// OFFSET: 0x007DCAD0 - -// OFFSET: 0x007DCB40 - // OFFSET: 0x007DCBD0 // FUNCTION: fn_09636 void UICheckAttendanceWnd_Banner::AddBanner(std::string image, std::string url, int action, int argument) { diff --git a/Source/UI/UIStaticBitmap.cpp b/Source/UI/UIStaticBitmap.cpp index 797f5d58..dd9f13c2 100644 --- a/Source/UI/UIStaticBitmap.cpp +++ b/Source/UI/UIStaticBitmap.cpp @@ -12,7 +12,6 @@ UIStaticBitmap::UIStaticBitmap() : UIWindow(0), tooltipX(0), tooltipY(-20), forwardHover(0) { } -// OFFSET: 0x00852F20 UIStaticBitmap::~UIStaticBitmap() = default; // OFFSET: 0x00865740 diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index 04d37b5c..8b3fffe4 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -245,7 +245,6 @@ CUIVScrollBar::CUIVScrollBar() hidden(0), transparent(0), upButton(nullptr) { } -// OFFSET: 0x009C08C0 CUIControl::~CUIControl() = default; // OFFSET: 0x009D5490 @@ -1567,8 +1566,6 @@ CUIImageTextButton::CUIImageTextButton() : CUITextButton(), images(), disabledIm // FUNCTION: fn_14487 CUIImageTextButton::~CUIImageTextButton() = default; -// OFFSET: 0x009E80C0 - // OFFSET: 0x009E8150 // FUNCTION: fn_14490 void CUIImageTextButton::Slot53(int resolveSkin) { @@ -2083,8 +2080,6 @@ void CUIListBoxEx::Resiz this->rebind = 1; } -// OFFSET: 0x009D2930 - // OFFSET: 0x009D4130 // FUNCTION: fn_14040 template <> @@ -2098,8 +2093,6 @@ void CUIListBoxEx: this->rebind = 1; } -// OFFSET: 0x009D2B90 - // OFFSET: 0x009D41B0 // FUNCTION: fn_14041 template <> @@ -2113,8 +2106,6 @@ void CUIListBoxEx::Res this->rebind = 1; } -// OFFSET: 0x009D2DF0 - // OFFSET: 0x009D4230 // FUNCTION: fn_14042 template <> diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index 817a4b6e..d181a51c 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -69,7 +69,6 @@ UIFrameWnd::UIFrameWnd(unsigned char cached) } // OFFSET: 0x008A4E90 -// OFFSET: 0x008A60E0 // FUNCTION: fn_11678 UIFrameWnd::~UIFrameWnd() = default; diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index 78dc9a0c..bd12bdd6 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -258,7 +258,6 @@ UIReplayRECControlWnd::~UIReplayRECControlWnd() { } // OFFSET: 0x008A5220 -// OFFSET: 0x008A64E0 // FUNCTION: fn_11680 UIMessageBox::~UIMessageBox() = default; @@ -1774,8 +1773,6 @@ void UINoticeWnd::Slot15(int, int) { } } -// OFFSET: 0x008B42D0 - // OFFSET: 0x008B42D0 // FUNCTION: fn_11749 void UIReplayRECControlWnd::Slot15(int, int) { diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index 12a1fab5..b9d016bb 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -221,7 +221,6 @@ UIWindow::UIWindow(unsigned char cached) } // OFFSET: 0x00A79E90 -// OFFSET: 0x00A7A050 // FUNCTION: fn_16917 UIWindow::~UIWindow() { this->Slot18(); @@ -2674,8 +2673,6 @@ void UINavigationroadiconWnd::Paint() { this->DrawBitmap(0, titleHeight, bitmap ? &bitmap->image : nullptr, false); } -// OFFSET: 0x005C7CC0 - // OFFSET: 0x005C7CC0 // FUNCTION: fn_03626 int UINavigationV4Wnd::SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) { @@ -3714,8 +3711,6 @@ int UIPrivateAirplaneWnd::SendMsg( return UIFrameWnd::SendMsg(sender, message, argument1, argument2, argument3, argument4); } -// OFFSET: 0x00A7DA40 - // OFFSET: 0x00A7B4D0 // FUNCTION: fn_16930 UIItemTagButton* UIWindow::CreateItemTagButton(const std::string& title, const std::string& label, int tagId, UIWindow* parent, std::uint32_t color) { @@ -3946,7 +3941,6 @@ void UINavigationV4Wnd::DrawTargetSprite(int x, int y, int width, int height, co } -// OFFSET: 0x00A84400 // OFFSET: 0x00A84400 // FUNCTION: fn_17010 int UIWindow::sub_A84400( diff --git a/Source/Utility/AES.cpp b/Source/Utility/AES.cpp index 6f8dbb20..3f55b68d 100644 --- a/Source/Utility/AES.cpp +++ b/Source/Utility/AES.cpp @@ -2,6 +2,7 @@ #include +// OFFSET: 0x0061AE00 // FUNCTION: fn_04417 AES::~AES() { if (m_key != nullptr) { @@ -14,6 +15,7 @@ AES::~AES() { } } +// OFFSET: 0x0061AF30 // FUNCTION: fn_04418 ULONG AES::Decrypt(PUCHAR input, ULONG inputSize, PUCHAR output, ULONG outputSize, UCHAR flags) { PUCHAR iv; @@ -32,6 +34,7 @@ ULONG AES::Decrypt(PUCHAR input, ULONG inputSize, PUCHAR output, ULONG outputSiz return status < 0 ? static_cast(-1) : result; } +// OFFSET: 0x0061B1A0 // FUNCTION: fn_04419 bool AES::Initialize(PUCHAR secret, ULONG secretSize, const UCHAR* iv, ULONG ivSize, int mode) { if (m_key != nullptr) { @@ -98,12 +101,14 @@ bool AES::Initialize(PUCHAR secret, ULONG secretSize, const UCHAR* iv, ULONG ivS return true; } +// OFFSET: 0x0061B3C0 // FUNCTION: fn_04420 bool AES::Initialize(PUCHAR secret, ULONG secretSize, int mode) { UCHAR iv[16]{}; return Initialize(secret, secretSize, iv, sizeof(iv), mode); } +// OFFSET: 0x0061B410 // FUNCTION: fn_04421 bool AES::SetIV(const UCHAR* iv, ULONG ivSize) { if (ivSize != 16) { @@ -114,6 +119,7 @@ bool AES::SetIV(const UCHAR* iv, ULONG ivSize) { return true; } +// OFFSET: 0x0061B440 // FUNCTION: fn_04422 bool AES::SetMode(int mode) { OSVERSIONINFOEXW version{}; diff --git a/Source/Utility/Async/NAsyncWork.cpp b/Source/Utility/Async/NAsyncWork.cpp index 2dc3821d..790c4ccb 100644 --- a/Source/Utility/Async/NAsyncWork.cpp +++ b/Source/Utility/Async/NAsyncWork.cpp @@ -43,7 +43,6 @@ NAsyncWorkPtr::NAsyncWorkPtr(NRecycleObjectPoolMgr* manager, std::string poolNam } // OFFSET: 0x00731B50 -// OFFSET: 0x00731BD0 // FUNCTION: fn_07561 NAsyncWorkPtr::~NAsyncWorkPtr() { if (this->m_work) { diff --git a/Source/Utility/Async/NAsyncWorkMgr.cpp b/Source/Utility/Async/NAsyncWorkMgr.cpp index 199731eb..5b4b1b8b 100644 --- a/Source/Utility/Async/NAsyncWorkMgr.cpp +++ b/Source/Utility/Async/NAsyncWorkMgr.cpp @@ -11,7 +11,6 @@ NAsyncWorkMgr::NAsyncWorkMgr(std::uint32_t workers) : m_enabled(false), m_worker } // OFFSET: 0x00731530 -// OFFSET: 0x007315F0 // FUNCTION: fn_07549 NAsyncWorkMgr::~NAsyncWorkMgr() { for (auto worker = this->m_workers.begin(); worker != this->m_workers.end(); ++worker) { diff --git a/Source/Utility/Async/NAsyncWorkThread.cpp b/Source/Utility/Async/NAsyncWorkThread.cpp index 37676f64..c71b9745 100644 --- a/Source/Utility/Async/NAsyncWorkThread.cpp +++ b/Source/Utility/Async/NAsyncWorkThread.cpp @@ -9,7 +9,6 @@ NAsyncWorkThread::NAsyncWorkThread(NAsyncWorkRequestQueue* requests, NAsyncWorkR } // OFFSET: 0x00732A80 -// OFFSET: 0x00732B40 // FUNCTION: fn_07577 NAsyncWorkThread::~NAsyncWorkThread() { g_messageMgr->Unregister(this->m_objectId, static_cast(this)); diff --git a/Source/Utility/Async/NMessageMgr.cpp b/Source/Utility/Async/NMessageMgr.cpp index bdd82ab2..f7f04110 100644 --- a/Source/Utility/Async/NMessageMgr.cpp +++ b/Source/Utility/Async/NMessageMgr.cpp @@ -7,7 +7,6 @@ // GLOBAL: gl_24361 NMessageMgr* g_messageMgr; -// OFFSET: 0x00732BF0 NInter::~NInter() = default; // INLINED diff --git a/Source/Utility/Async/NMessageQueue.cpp b/Source/Utility/Async/NMessageQueue.cpp index 2815fc68..2ae77c67 100644 --- a/Source/Utility/Async/NMessageQueue.cpp +++ b/Source/Utility/Async/NMessageQueue.cpp @@ -13,7 +13,6 @@ NMessageQueue::NMessageQueue() : m_semaphore(nullptr), m_enabled(false) { } // OFFSET: 0x00736460 -// OFFSET: 0x007364F0 // FUNCTION: fn_07620 NMessageQueue::~NMessageQueue() { if (this->m_semaphore) { diff --git a/Source/Utility/Async/NObject.cpp b/Source/Utility/Async/NObject.cpp index 699a0c03..d60dd0aa 100644 --- a/Source/Utility/Async/NObject.cpp +++ b/Source/Utility/Async/NObject.cpp @@ -12,6 +12,5 @@ NObject::NObject() : m_objectId(++s_nextObjectId) { } // OFFSET: 0x007369D0 -// OFFSET: 0x007369E0 // FUNCTION: fn_07629 NObject::~NObject() = default; diff --git a/Source/Utility/Async/NRecycleObject.h b/Source/Utility/Async/NRecycleObject.h index 770a6e61..4c6f29eb 100644 --- a/Source/Utility/Async/NRecycleObject.h +++ b/Source/Utility/Async/NRecycleObject.h @@ -35,7 +35,6 @@ public: virtual ~NRecycleObjectPoolInter(); }; -// OFFSET: 0x005782C0 inline NRecycleObjectPoolInter::~NRecycleObjectPoolInter() = default; template class NRecycleObjectPool : public NRecycleObjectPoolInter { @@ -56,32 +55,32 @@ public: } // OFFSET: 0x005782F0 - // OFFSET: 0x005783D0 - // OFFSET: 0x005784B0 - // OFFSET: 0x00578590 - // OFFSET: 0x00578670 - // OFFSET: 0x00578750 - // OFFSET: 0x00578830 - // OFFSET: 0x00578910 - // OFFSET: 0x005789F0 - // OFFSET: 0x00578AD0 - // OFFSET: 0x00578BB0 - // OFFSET: 0x00578C90 - // OFFSET: 0x00578D70 - // OFFSET: 0x00578E50 // FUNCTION: fn_02552 + // OFFSET: 0x005783D0 // FUNCTION: fn_02553 + // OFFSET: 0x005784B0 // FUNCTION: fn_02554 + // OFFSET: 0x00578590 // FUNCTION: fn_02555 + // OFFSET: 0x00578670 // FUNCTION: fn_02556 + // OFFSET: 0x00578750 // FUNCTION: fn_02557 + // OFFSET: 0x00578830 // FUNCTION: fn_02558 + // OFFSET: 0x00578910 // FUNCTION: fn_02559 + // OFFSET: 0x005789F0 // FUNCTION: fn_02560 + // OFFSET: 0x00578AD0 // FUNCTION: fn_02561 + // OFFSET: 0x00578BB0 // FUNCTION: fn_02562 + // OFFSET: 0x00578C90 // FUNCTION: fn_02563 + // OFFSET: 0x00578D70 // FUNCTION: fn_02564 + // OFFSET: 0x00578E50 // FUNCTION: fn_02565 T* Acquire() override { NSyncObject held(&this->m_criticalSection); @@ -102,32 +101,32 @@ public: } // OFFSET: 0x0057A6F0 - // OFFSET: 0x0057A780 - // OFFSET: 0x0057A810 - // OFFSET: 0x0057A8A0 - // OFFSET: 0x0057A930 - // OFFSET: 0x0057A9C0 - // OFFSET: 0x0057AA50 - // OFFSET: 0x0057AAE0 - // OFFSET: 0x0057AB70 - // OFFSET: 0x0057AC00 - // OFFSET: 0x0057AC90 - // OFFSET: 0x0057AD20 - // OFFSET: 0x0057ADB0 - // OFFSET: 0x0057AE40 // FUNCTION: fn_02567 + // OFFSET: 0x0057A780 // FUNCTION: fn_02568 + // OFFSET: 0x0057A810 // FUNCTION: fn_02569 + // OFFSET: 0x0057A8A0 // FUNCTION: fn_02570 + // OFFSET: 0x0057A930 // FUNCTION: fn_02571 + // OFFSET: 0x0057A9C0 // FUNCTION: fn_02572 + // OFFSET: 0x0057AA50 // FUNCTION: fn_02573 + // OFFSET: 0x0057AAE0 // FUNCTION: fn_02574 + // OFFSET: 0x0057AB70 // FUNCTION: fn_02575 + // OFFSET: 0x0057AC00 // FUNCTION: fn_02576 + // OFFSET: 0x0057AC90 // FUNCTION: fn_02577 + // OFFSET: 0x0057AD20 // FUNCTION: fn_02578 + // OFFSET: 0x0057ADB0 // FUNCTION: fn_02579 + // OFFSET: 0x0057AE40 // FUNCTION: fn_02580 void Release(NRecycleObject* object) override { NSyncObject held(&this->m_criticalSection); diff --git a/Source/Utility/Async/NRecycleObjectPoolMgr.cpp b/Source/Utility/Async/NRecycleObjectPoolMgr.cpp index edbb5ed6..40a53282 100644 --- a/Source/Utility/Async/NRecycleObjectPoolMgr.cpp +++ b/Source/Utility/Async/NRecycleObjectPoolMgr.cpp @@ -25,7 +25,6 @@ NRecycleObjectPoolMgr::NRecycleObjectPoolMgr() : m_enabled(false) { } // OFFSET: 0x00736DE0 -// OFFSET: 0x00736E50 // FUNCTION: fn_07635 NRecycleObjectPoolMgr::~NRecycleObjectPoolMgr() = default; diff --git a/Source/Utility/CRC32.cpp b/Source/Utility/CRC32.cpp index a3952373..3ed6d84b 100644 --- a/Source/Utility/CRC32.cpp +++ b/Source/Utility/CRC32.cpp @@ -3,6 +3,7 @@ #include #include +// OFFSET: 0x00403140 // FUNCTION: fn_00142 CRC32::CRC32() { for (int i = 0; i < 256; ++i) { @@ -18,10 +19,12 @@ CRC32::CRC32() { } } +// OFFSET: 0x004031E0 // FUNCTION: fn_00143 CRC32::~CRC32() { } +// OFFSET: 0x004031F0 // FUNCTION: fn_00144 bool CRC32::Update(const BYTE* data, int length, DWORD* checksum) { if (data == nullptr) { @@ -36,6 +39,7 @@ bool CRC32::Update(const BYTE* data, int length, DWORD* checksum) { return true; } +// OFFSET: 0x004034A0 // FUNCTION: fn_00145 bool CRC32::UpdateFile(const WCHAR* filename, LONG offset, DWORD length, DWORD* checksum) { BYTE buffer[65536]; @@ -82,6 +86,7 @@ bool CRC32::UpdateFile(const WCHAR* filename, LONG offset, DWORD length, DWORD* return true; } +// OFFSET: 0x00403630 // FUNCTION: fn_00146 DWORD CRC32::Calculate(const char* text) { DWORD checksum = 0xFFFFFFFF; @@ -89,6 +94,7 @@ DWORD CRC32::Calculate(const char* text) { return ~checksum; } +// OFFSET: 0x00403670 // FUNCTION: fn_00147 DWORD CRC32::Calculate(const WCHAR* text) { char converted[MAX_PATH]; @@ -98,6 +104,7 @@ DWORD CRC32::Calculate(const WCHAR* text) { return ~checksum; } +// OFFSET: 0x00403700 // FUNCTION: fn_00148 DWORD CRC32::CalculateLowercase(const char* text) { char lowercase[MAX_PATH]; @@ -108,6 +115,7 @@ DWORD CRC32::CalculateLowercase(const char* text) { return ~checksum; } +// OFFSET: 0x00403790 // FUNCTION: fn_00149 DWORD CRC32::CalculateLowercase(const WCHAR* text) { WCHAR lowercase[MAX_PATH]; @@ -116,6 +124,7 @@ DWORD CRC32::CalculateLowercase(const WCHAR* text) { return Calculate(lowercase); } +// OFFSET: 0x00403800 // FUNCTION: fn_00150 bool CRC32::Calculate(const BYTE* data, int length, DWORD* checksum) { *checksum = 0xFFFFFFFF; @@ -124,6 +133,7 @@ bool CRC32::Calculate(const BYTE* data, int length, DWORD* checksum) { return true; } +// OFFSET: 0x00403830 // FUNCTION: fn_00151 bool CRC32::CalculateFile(const WCHAR* filename, DWORD* checksum) { if (filename == nullptr || *filename == 0) { diff --git a/Source/Utility/FileSignatureVerifier.cpp b/Source/Utility/FileSignatureVerifier.cpp index 4cab60b4..d81efd1e 100644 --- a/Source/Utility/FileSignatureVerifier.cpp +++ b/Source/Utility/FileSignatureVerifier.cpp @@ -31,6 +31,7 @@ BYTE g_rsaPublicKeyBlob[] = { // GLOBAL: gl_24468 DWORD g_rsaPublicKeyBlobLen = 276; +// OFFSET: 0x00402B10 // FUNCTION: fn_00136 FileSignatureVerifier::FileSignatureVerifier() { signature = nullptr; @@ -52,6 +53,7 @@ FileSignatureVerifier::FileSignatureVerifier() { } } +// OFFSET: 0x00402B60 // FUNCTION: fn_45444 FileSignatureVerifier::~FileSignatureVerifier() { if (fileData != nullptr) { @@ -77,6 +79,7 @@ FileSignatureVerifier::~FileSignatureVerifier() { } } +// OFFSET: 0x00402BE0 // FUNCTION: fn_00138 bool FileSignatureVerifier::VerifyBuffer(const WCHAR* fileName, const BYTE* data, DWORD dataSize, bool verifyFileName) { std::memcpy(&footer, data + dataSize - sizeof(footer), sizeof(footer)); @@ -177,6 +180,7 @@ bool FileSignatureVerifier::VerifyBuffer(const WCHAR* fileName, const BYTE* data return true; } +// OFFSET: 0x00402F10 // FUNCTION: fn_00139 bool FileSignatureVerifier::VerifyFile(const WCHAR* fileName, bool verifyFileName) { if (fileName == nullptr) { @@ -226,6 +230,7 @@ bool FileSignatureVerifier::VerifyFile(const WCHAR* fileName, bool verifyFileNam return result; } +// OFFSET: 0x00403050 // FUNCTION: fn_00140 bool FileSignatureVerifier::VerifyBuffer(const char* fileName, const BYTE* data, DWORD dataSize, bool verifyFileName) { WCHAR wideFileName[MAX_PATH]; @@ -233,6 +238,7 @@ bool FileSignatureVerifier::VerifyBuffer(const char* fileName, const BYTE* data, return VerifyBuffer(wideFileName, data, dataSize, verifyFileName); } +// OFFSET: 0x004030D0 // FUNCTION: fn_00141 bool FileSignatureVerifier::VerifyFile(const char* fileName, bool verifyFileName) { WCHAR wideFileName[MAX_PATH]; diff --git a/Source/Utility/GGHash.cpp b/Source/Utility/GGHash.cpp index c1df4ce4..3f2bcc94 100644 --- a/Source/Utility/GGHash.cpp +++ b/Source/Utility/GGHash.cpp @@ -16,12 +16,6 @@ struct GGHashEntry { CGGHash::CGGHash() : m_error(0), m_size(0), m_data(nullptr) { } -// OFFSET: 0x00401300 - -// OFFSET: 0x00401640 - -// OFFSET: 0x00401730 - // OFFSET: 0x00401870 // FUNCTION: fn_00113 DWORD CGGHash::GetSize() const { diff --git a/Source/Utility/GuidParse.cpp b/Source/Utility/GuidParse.cpp index 4339826a..fae97eae 100644 --- a/Source/Utility/GuidParse.cpp +++ b/Source/Utility/GuidParse.cpp @@ -28,6 +28,7 @@ int ParseGuid(const char* text, std::size_t bytes, GUID& output, bool braced) { return count == 11 ? 1 : count == EOF ? -1 : 0; } +// OFFSET: 0x00AF75B0 // FUNCTION: fn_18259 int FormatGuid(char* text, std::size_t bytes, const GUID& value, bool braced) { const char* format = braced ? "{%08X-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}" : "%08X-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX"; diff --git a/Source/Utility/MD5.cpp b/Source/Utility/MD5.cpp index 0cd88d25..b9ff4354 100644 --- a/Source/Utility/MD5.cpp +++ b/Source/Utility/MD5.cpp @@ -14,14 +14,17 @@ namespace { } } +// OFFSET: 0x00401C40 // FUNCTION: fn_00121 MD5::MD5() { } +// OFFSET: 0x00401C50 // FUNCTION: fn_00122 MD5::~MD5() { } +// OFFSET: 0x00401C60 // FUNCTION: fn_00123 const unsigned char* MD5::Decode(std::uint32_t* output, const unsigned char* input, std::uint32_t count) { do { @@ -31,6 +34,7 @@ const unsigned char* MD5::Decode(std::uint32_t* output, const unsigned char* inp return input; } +// OFFSET: 0x00401CA0 // FUNCTION: fn_00124 int MD5::Initialize() { m_state[0] = 0x67452301; @@ -51,6 +55,7 @@ int MD5::Initialize() { (a) = (((a) << (s)) | ((a) >> (32 - (s)))) + (b); \ } while (0) +// OFFSET: 0x00401CD0 // FUNCTION: fn_00125 std::uint32_t* MD5::Transform(std::uint32_t* state, const std::uint32_t* input) { std::uint32_t a = state[0]; @@ -139,6 +144,7 @@ std::uint32_t* MD5::Transform(std::uint32_t* state, const std::uint32_t* input) #undef MD5_F2 #undef MD5_F1 +// OFFSET: 0x00402360 // FUNCTION: fn_00126 __declspec(noinline) void MD5::Update(const unsigned char* input, std::uint32_t length) { std::uint32_t buffered = m_byteCount[0]; @@ -173,6 +179,7 @@ __declspec(noinline) void MD5::Update(const unsigned char* input, std::uint32_t } } +// OFFSET: 0x00402420 // FUNCTION: fn_00127 __declspec(noinline) unsigned char* MD5::Finalize() { const std::uint32_t buffered = m_byteCount[0] & 63; diff --git a/Source/Utility/Math/AffineMatrix.cpp b/Source/Utility/Math/AffineMatrix.cpp index 603913c2..f1ad3997 100644 --- a/Source/Utility/Math/AffineMatrix.cpp +++ b/Source/Utility/Math/AffineMatrix.cpp @@ -181,6 +181,7 @@ void matrix::MakeInverse(const matrix& source) { output[11] = -((secondZ * a[10] + firstZ * a[9]) + thirdZ * a[11]); } +// OFFSET: 0x00554620 // FUNCTION: fn_02026 int matrix::IsIdentity() const { const auto absolute = [](float value) { diff --git a/Source/Utility/NFileLog.cpp b/Source/Utility/NFileLog.cpp index c9b1c821..397734c8 100644 --- a/Source/Utility/NFileLog.cpp +++ b/Source/Utility/NFileLog.cpp @@ -6,6 +6,7 @@ #include #include +// OFFSET: 0x00732E70 // FUNCTION: fn_07589 bool NFileLog::Initialize(const char* directoryName, const char* filePrefix) { char currentDirectory[1024]{}; diff --git a/Source/Utility/NIPAddr.cpp b/Source/Utility/NIPAddr.cpp index 1c49b99e..4f2e257a 100644 --- a/Source/Utility/NIPAddr.cpp +++ b/Source/Utility/NIPAddr.cpp @@ -2,16 +2,19 @@ #include "Utility/NIPAddr.h" +// OFFSET: 0x007349C0 // FUNCTION: fn_07599 NIPAddr::NIPAddr(std::string text) { std::string copy(text); this->address = inet_addr(copy.c_str()); } +// OFFSET: 0x00734BD0 // FUNCTION: fn_07601 NIPAddr::~NIPAddr() { } +// OFFSET: 0x00734CE0 // FUNCTION: fn_07603 bool NIPAddr::IsPrivateAddress(std::uint32_t address) { const std::uint32_t swapped = (address >> 24) | ((address >> 8) & 0x0000FF00u) | ((address << 8) & 0x00FF0000u) | (address << 24); diff --git a/Source/Utility/ProcessSecurity.cpp b/Source/Utility/ProcessSecurity.cpp index 81436988..b03f2c45 100644 --- a/Source/Utility/ProcessSecurity.cpp +++ b/Source/Utility/ProcessSecurity.cpp @@ -10,6 +10,7 @@ int __fastcall sub_AEA5B0(const void* self) { return *reinterpret_cast(static_cast(self) + 0x20); } +// OFFSET: 0x00AEA780 // FUNCTION: fn_18122 int RemoveProtectionTools() { if (_access("nconfig.ini", 6) == 0) { @@ -32,6 +33,7 @@ int RemoveProtectionTools() { return result == 0 ? _unlink("cfindhack.exe") : result; } +// OFFSET: 0x00AEACD0 // FUNCTION: fn_18124 int LoadLibraryFunctions(HMODULE* module, const char* name, int count, ...) { *module = LoadLibraryA(name); @@ -61,6 +63,7 @@ int LoadLibraryFunctions(HMODULE* module, const char* name, int count, ...) { return 0; } +// OFFSET: 0x00AEA820 // FUNCTION: fn_18123 BOOL __stdcall SetDebugPrivilege(int enabled) { BOOL result = FALSE; @@ -91,6 +94,7 @@ BOOL __stdcall SetDebugPrivilege(int enabled) { return result; } +// OFFSET: 0x00AEB050 // FUNCTION: fn_18125 BOOL IsLegacyWindows() { OSVERSIONINFOEXA version; diff --git a/Source/Utility/RegistryKey.cpp b/Source/Utility/RegistryKey.cpp index b678ffa1..8d919adf 100644 --- a/Source/Utility/RegistryKey.cpp +++ b/Source/Utility/RegistryKey.cpp @@ -1,22 +1,26 @@ #include "Utility/RegistryKey.h" +// OFFSET: 0x00AED000 // FUNCTION: fn_18150 bool RegistryKey::Create(HKEY parent, const char* subKey) { DWORD disposition; return RegCreateKeyExA(parent, subKey, 0, nullptr, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, nullptr, &this->handle, &disposition) == ERROR_SUCCESS; } +// OFFSET: 0x00AED030 // FUNCTION: fn_18151 bool RegistryKey::Open(HKEY parent, const char* subKey) { return RegOpenKeyExA(parent, subKey, 0, KEY_ALL_ACCESS, &this->handle) == ERROR_SUCCESS; } +// OFFSET: 0x00AED050 // FUNCTION: fn_18152 bool RegistryKey::Query(const char* name, DWORD expectedType, BYTE* data, DWORD size) { DWORD type; return this->handle != nullptr && RegQueryValueExA(this->handle, name, nullptr, &type, data, &size) == ERROR_SUCCESS && type == expectedType; } +// OFFSET: 0x00AED0C0 // FUNCTION: fn_18153 bool RegistryKey::Set(const char* name, DWORD type, const BYTE* data, DWORD size) { return this->handle != nullptr && RegSetValueExA(this->handle, name, 0, type, data, size) == ERROR_SUCCESS; diff --git a/Source/Utility/Text/FormatString.cpp b/Source/Utility/Text/FormatString.cpp index 25dc8d2f..e121f122 100644 --- a/Source/Utility/Text/FormatString.cpp +++ b/Source/Utility/Text/FormatString.cpp @@ -77,6 +77,7 @@ const char* FormatString(const char* format, ...) { return s_buffer.GetBuffer(); } +// OFFSET: 0x00AF62D0 // FUNCTION: fn_18252 std::string FormatOwnedString(const char* format, ...) { char buffer[4096]; diff --git a/Source/Utility/Threading/NSyncObject.cpp b/Source/Utility/Threading/NSyncObject.cpp index 3c9a2b30..53dc4a76 100644 --- a/Source/Utility/Threading/NSyncObject.cpp +++ b/Source/Utility/Threading/NSyncObject.cpp @@ -7,7 +7,6 @@ NSyncObject::NSyncObject(CRITICAL_SECTION* criticalSection) : m_criticalSection( } // OFFSET: 0x00737150 -// OFFSET: 0x007371A0 // FUNCTION: fn_07641 NSyncObject::~NSyncObject() { LeaveCriticalSection(this->m_criticalSection); diff --git a/Source/Utility/Threading/NThread.cpp b/Source/Utility/Threading/NThread.cpp index 057148c1..2343c09c 100644 --- a/Source/Utility/Threading/NThread.cpp +++ b/Source/Utility/Threading/NThread.cpp @@ -21,7 +21,6 @@ NThread::NThread(std::string name) : m_threadId(0), unknown_0008(true), m_state( } // OFFSET: 0x00737290 -// OFFSET: 0x00737350 // FUNCTION: fn_07644 NThread::~NThread() { this->Stop();