diff --git a/Source/Archive/GPak.cpp b/Source/Archive/GPak.cpp index de097624c..95ff0f774 100644 --- a/Source/Archive/GPak.cpp +++ b/Source/Archive/GPak.cpp @@ -55,7 +55,7 @@ namespace { struct PakHeaderFile { /* 0000 */ char signature[16]; - /* 0010 */ std::uint8_t unknown_0010[14]; + /* 0010 */ std::uint8_t padding_0010[14]; /* 001E */ std::uint32_t tableOffset; /* 0022 */ std::uint32_t seed; /* 0026 */ std::uint32_t entryCount; @@ -64,7 +64,7 @@ namespace { struct PakHeaderFile64 { /* 0000 */ char signature[16]; - /* 0010 */ std::uint8_t unknown_0010[14]; + /* 0010 */ std::uint8_t padding_0010[14]; /* 001E */ std::uint64_t tableOffset; /* 0026 */ std::uint32_t entryCount; /* 002A */ std::uint32_t version; @@ -99,9 +99,9 @@ namespace { struct PakAuxiliaryFile { /* 0000 */ std::uint8_t version; - /* 0001 */ std::uint8_t unknown_0001[3]; + /* 0001 */ std::uint8_t padding_0001[3]; /* 0004 */ std::uint64_t identifier; - /* 000C */ std::uint32_t unknown_000C; + /* 000C */ std::uint32_t padding_000C; }; #pragma pack(pop) @@ -1530,7 +1530,7 @@ struct PakLinkNode { }; struct PakIntrusiveLink { - /* 0000 */ unsigned int unknown_0000; + /* 0000 */ unsigned int padding_0000; /* 0004 */ PakLinkNode* m_prev; /* 0008 */ PakLinkNode* m_next; @@ -1568,7 +1568,7 @@ __declspec(noinline) PakUniformRandom::PakUniformRandom(int minimum, int maximum struct PakAuxiliaryHeader { /* 0000 */ std::uint8_t version; /* 0001 */ std::uint8_t keySource; - /* 0002 */ std::uint8_t unknown_0002[2]; + /* 0002 */ std::uint8_t padding_0002[2]; /* 0004 */ std::uint32_t checksum; /* 0008 */ std::uint8_t payload[96]; }; @@ -1585,7 +1585,7 @@ struct PakAuxiliaryContext { struct PakAuxiliaryState { /* 0000 */ HashTable_655340 m_handlers; /* 0020 */ PakMaskedKey48 m_key; - /* 0055 */ std::uint8_t unknown_0055[107]; + /* 0055 */ std::uint8_t padding_0055[107]; /* 00C0 */ AES* m_cipher; bool DecodeHeader(PakSpan_655A30 name, std::uint8_t* data, std::uint32_t size, PakAuxiliaryHeader* header); diff --git a/Source/Archive/GPak.h b/Source/Archive/GPak.h index 3cb941cde..356cc8a6f 100644 --- a/Source/Archive/GPak.h +++ b/Source/Archive/GPak.h @@ -26,10 +26,10 @@ namespace myGPack { /* 0000 */ std::uint32_t alignedSize; /* 0004 */ std::uint32_t compressedSize; /* 0008 */ std::uint32_t originalSize; - /* 000C */ std::uint32_t unknown_000C; + /* 000C */ std::uint32_t padding_000C; /* 0010 */ std::uint64_t dataOffset; /* 0018 */ std::uint8_t flags; - /* 0019 */ std::uint8_t unknown_0019[3]; + /* 0019 */ std::uint8_t padding_0019[3]; /* 001C */ PakName name; }; @@ -47,7 +47,7 @@ struct PakAuxiliary { void Apply(const void* data, std::uint32_t size, const void* auxData, std::uint32_t auxSize); bool Extract(std::string_view name, const std::uint8_t* data, std::uint32_t size, std::span scratch, void* output, std::uint32_t outputSize, unsigned flags); - /* 0000 */ std::uint8_t unknown_0000[244]; + /* 0000 */ std::uint8_t padding_0000[244]; }; static_assert(sizeof(PakAuxiliary) == 244); @@ -72,7 +72,7 @@ protected: /* 0008 */ CPakFile* m_file; /* 000C */ std::uint32_t m_version; /* 0010 */ std::uint32_t m_entryCount; - /* 0014 */ std::uint32_t unknown_0014; + /* 0014 */ std::uint32_t padding_0014; /* 0018 */ std::uint64_t m_tableOffset; /* 0020 */ std::uint32_t m_tableSize; /* 0024 */ std::vector m_entries; diff --git a/Source/Client/Browser/BrowserCommandTarget.h b/Source/Client/Browser/BrowserCommandTarget.h index 1676b2c97..d00d68117 100644 --- a/Source/Client/Browser/BrowserCommandTarget.h +++ b/Source/Client/Browser/BrowserCommandTarget.h @@ -10,7 +10,7 @@ class BrowserClientSite; class BrowserCommandTarget final : public IOleCommandTarget { public: // INLINED - explicit BrowserCommandTarget(BrowserClientSite* site) : unknown_0004(0), m_site(site) { + explicit BrowserCommandTarget(BrowserClientSite* site) : padding_0004(0), m_site(site) { } ~BrowserCommandTarget(); @@ -21,7 +21,7 @@ public: HRESULT STDMETHODCALLTYPE Exec(const GUID* group, DWORD command, DWORD options, VARIANT* input, VARIANT* output) override; private: - /* 0004 */ int unknown_0004; + /* 0004 */ int padding_0004; /* 0008 */ BrowserClientSite* m_site; }; diff --git a/Source/Client/Browser/BrowserDocumentUI.h b/Source/Client/Browser/BrowserDocumentUI.h index c431c4b29..ca927eb3c 100644 --- a/Source/Client/Browser/BrowserDocumentUI.h +++ b/Source/Client/Browser/BrowserDocumentUI.h @@ -10,7 +10,7 @@ class BrowserClientSite; class BrowserDocumentUI final : public IDocHostUIHandler { public: // INLINED - explicit BrowserDocumentUI(BrowserClientSite* site) : unknown_0004(0), m_site(site) { + explicit BrowserDocumentUI(BrowserClientSite* site) : padding_0004(0), m_site(site) { } ~BrowserDocumentUI(); @@ -35,7 +35,7 @@ public: HRESULT STDMETHODCALLTYPE FilterDataObject(IDataObject* data, IDataObject** filtered) override; private: - /* 0004 */ int unknown_0004; + /* 0004 */ int padding_0004; /* 0008 */ BrowserClientSite* m_site; }; diff --git a/Source/Client/Browser/BrowserInPlace.h b/Source/Client/Browser/BrowserInPlace.h index ed14b871c..eb6126f07 100644 --- a/Source/Client/Browser/BrowserInPlace.h +++ b/Source/Client/Browser/BrowserInPlace.h @@ -9,7 +9,7 @@ class BrowserClientSite; class BrowserInPlaceFrame final : public IOleInPlaceFrame { public: // INLINED - explicit BrowserInPlaceFrame(BrowserClientSite* site) : unknown_0004(0), m_site(site) { + explicit BrowserInPlaceFrame(BrowserClientSite* site) : padding_0004(0), m_site(site) { } ~BrowserInPlaceFrame(); @@ -30,14 +30,14 @@ public: HRESULT STDMETHODCALLTYPE TranslateAccelerator(MSG* message, WORD id) override; private: - /* 0004 */ int unknown_0004; + /* 0004 */ int padding_0004; /* 0008 */ BrowserClientSite* m_site; }; class BrowserInPlaceSite final : public IOleInPlaceSite { public: // INLINED - explicit BrowserInPlaceSite(BrowserClientSite* site) : unknown_0004(0), m_frame(new BrowserInPlaceFrame(site)), m_site(site) { + explicit BrowserInPlaceSite(BrowserClientSite* site) : padding_0004(0), m_frame(new BrowserInPlaceFrame(site)), m_site(site) { } // INLINED ~BrowserInPlaceSite() { @@ -62,7 +62,7 @@ public: HRESULT STDMETHODCALLTYPE OnPosRectChange(const RECT* position) override; private: - /* 0004 */ int unknown_0004; + /* 0004 */ int padding_0004; /* 0008 */ BrowserInPlaceFrame* m_frame; /* 000C */ BrowserClientSite* m_site; }; diff --git a/Source/Client/Browser/WebBrowser.h b/Source/Client/Browser/WebBrowser.h index a22aae078..027fb1d50 100644 --- a/Source/Client/Browser/WebBrowser.h +++ b/Source/Client/Browser/WebBrowser.h @@ -46,7 +46,7 @@ public: /* 0010 */ HWND browserWindow; /* 0014 */ int cursorState; /* 0018 */ unsigned char auxiliaryVisible; - /* 0019 */ unsigned char unknown_0019[3]; + /* 0019 */ unsigned char padding_0019[3]; /* 001C */ int screenWidth; /* 0020 */ int screenHeight; /* 0024 */ DWORD cookie; @@ -56,7 +56,7 @@ public: /* 0034 */ int width; /* 0038 */ int height; /* 003C */ unsigned char restoreOption; - /* 003D */ unsigned char unknown_003D[3]; + /* 003D */ unsigned char padding_003D[3]; }; extern WNDPROC lpPrevWndFunc; @@ -70,7 +70,7 @@ enum class BrowserCommand : WORD { Navigate = 1000 }; #if defined(_WIN32) && !defined(_WIN64) static_assert(offsetof(CWebBrowser, host) == 0xC); -static_assert(offsetof(CWebBrowser, unknown_0019) == 0x19); +static_assert(offsetof(CWebBrowser, padding_0019) == 0x19); static_assert(offsetof(CWebBrowser, cookie) == 0x24); static_assert(offsetof(CWebBrowser, restoreOption) == 0x3C); static_assert(sizeof(CWebBrowser) == 0x40); diff --git a/Source/Client/Input/Language.h b/Source/Client/Input/Language.h index 54d561103..0def4a692 100644 --- a/Source/Client/Input/Language.h +++ b/Source/Client/Input/Language.h @@ -37,14 +37,14 @@ struct CLanguageBase { /* 0070 */ std::string candidate; /* 0088 */ int compositionCursor; /* 008C */ unsigned char password; - /* 008D */ unsigned char unknown_008D; + /* 008D */ unsigned char padding_008D; /* 008E */ std::uint16_t language; /* 0090 */ unsigned codePage; /* 0094 */ int underlineStart; /* 0098 */ int underlineEnd; /* 009C */ std::string servicePrefix; /* 00B4 */ std::uint16_t alternateLanguage; - /* 00B6 */ unsigned char unknown_00B6[2]; + /* 00B6 */ unsigned char padding_00B6[2]; CLanguageBase(); const char* Candidate(int index) const; diff --git a/Source/Client/Input/LanguageTC.h b/Source/Client/Input/LanguageTC.h index c10893bd9..a12571e68 100644 --- a/Source/Client/Input/LanguageTC.h +++ b/Source/Client/Input/LanguageTC.h @@ -19,7 +19,7 @@ struct CLanguageTC : CLanguageBase { /* 00C0 */ std::array mappings; /* 04C0 */ unsigned char keyStrokeEnabled; /* 04C1 */ std::uint8_t keyStroke; - /* 04C2 */ unsigned char unknown_04C2[2]; + /* 04C2 */ unsigned char padding_04C2[2]; CLanguageTC(); ~CLanguageTC() override; diff --git a/Source/Client/Input/Mouse.h b/Source/Client/Input/Mouse.h index dcabbfe0f..3bfb0be35 100644 --- a/Source/Client/Input/Mouse.h +++ b/Source/Client/Input/Mouse.h @@ -29,7 +29,7 @@ public: /* 0030 */ std::uint32_t pressTicks[2] = {}; /* 0038 */ std::uint32_t doubleClickTime = 500; /* 003C */ std::uint8_t active = 1; - /* 003D */ std::uint8_t unknown_003D[3] = {}; + /* 003D */ std::uint8_t padding_003D[3] = {}; }; extern CMouse g_mouse; diff --git a/Source/Client/Mode/CGameMode.h b/Source/Client/Mode/CGameMode.h index 3366ab288..e9bdef89e 100644 --- a/Source/Client/Mode/CGameMode.h +++ b/Source/Client/Mode/CGameMode.h @@ -108,7 +108,7 @@ public: void ReceiveMacroReporterList(int count, const int* aids); /* 0058 */ unsigned char areaBounds[0x10]; /* 0068 */ char mapName[16]; - /* 0078 */ unsigned char unknown_0078[0xC]; + /* 0078 */ unsigned char padding_0078[0xC]; /* 0084 */ std::vector mapResources; /* 0090 */ unsigned char minimapBmpName[0x3C]; /* 00CC */ CWorld* scene; @@ -166,7 +166,7 @@ public: /* 02E0 */ int menuTargetAid; /* 02E4 */ unsigned char nameBalloonSize[0x08]; /* 02EC */ std::string menuTargetName; - /* 0304 */ unsigned char unknown_0304[0x04]; + /* 0304 */ unsigned char padding_0304[0x04]; /* 0308 */ ModeDragState drag; /* 03C8 */ std::string chatRoomTitle; /* 03E0 */ std::string chatRoomPassword; @@ -196,12 +196,12 @@ public: /* 05B4 */ int yggdrasilUsePending; /* 05B8 */ int lastPickItemTime; /* 05BC */ int chatLogLines; - /* 05C0 */ unsigned char unknown_05C0[0x04]; + /* 05C0 */ unsigned char padding_05C0[0x04]; /* 05C4 */ int bossMonsterX; /* 05C8 */ int bossMonsterY; /* 05CC */ unsigned char bossAlarmAndCopyNameFlags[0x02]; /* 05CE */ unsigned char inventoryChanged; - /* 05CF */ unsigned char unknown_05CF; + /* 05CF */ unsigned char padding_05CF; /* 05D0 */ UIWindow* statusIconTooltip; /* 05D4 */ std::list periodicTicks; /* 05DC */ std::map miniMapTooltipWindows; @@ -220,9 +220,9 @@ public: /* 0624 */ unsigned char isInitializing[0x4]; /* 0628 */ std::unordered_set petFriendlyNoticeIds; /* 0648 */ unsigned char recordItemPickups; - /* 0649 */ unsigned char unknown_0649[0x3]; + /* 0649 */ unsigned char padding_0649[0x3]; /* 064C */ std::unordered_map itemPickupCounts; - /* 066C */ unsigned char unknown_066C[0x4]; + /* 066C */ unsigned char padding_066C[0x4]; std::string MapName(); UIBroadcastBalloon* EnsureBroadcastBalloon(); @@ -386,12 +386,12 @@ public: void ProcessActorClick(int& handled, ActorPickInfo* pick, CGameActor* actor); void ProcessActorPick(int& handled, ActorPickInfo* pick, CGameActor* actor); void ReceiveSkillUpdate( - std::uint16_t id, std::int16_t level, std::int16_t spCost, unsigned char upgradable, std::int16_t range, int type, std::int16_t unknown + std::uint16_t id, std::int16_t level, std::int16_t spCost, unsigned char upgradable, std::int16_t range, int type, std::int16_t learnedLevel ); void ApplySkillUpdatePacket(const void* packet); void ReceiveLearnedSkill( std::uint16_t id, std::int16_t level, int type, std::uint8_t upgradable, std::int16_t spCost, std::int16_t range, - std::int16_t unknown0030 + std::int16_t padding_0030 ); void ApplyAdditionalSkillPacket(const void* packet); std::uint32_t FindChatRoomActorId(std::uint32_t key); @@ -480,7 +480,7 @@ public: void ShowNoticeBalloon(const std::vector* lines); void UpdateBalloons(); void ChangeZoneServer(std::string mapName, int x, int y, int ip, int port, std::string host); - const char* Unknown04DCText(); + const char* RecordChat4Text(); CPlayer* Player(); MinimapMarker* FindMinimapMarker(std::uint32_t key); float CameraDesiredYaw(); @@ -584,13 +584,13 @@ public: void ReceiveGuildLeave2(const unsigned char* data); void ReceivePartyInfo2(const unsigned char* data); void ReceiveWhisper(const unsigned char* data); - void RefreshInventoryOrEquipItem(std::uint16_t itemId, unsigned char unknownValue, std::uint16_t refine, ItemCardSlots cards, ItemSlotOptions options); + void RefreshInventoryOrEquipItem(std::uint16_t itemId, unsigned char damaged, std::uint16_t refine, ItemCardSlots cards, ItemSlotOptions options); void RefreshInventoryOrEquipItem2(const unsigned char* data); void ReceiveRankingList(const unsigned char* data); void ApplyStatusIcons(int level, unsigned int flags); void ReceiveGuildStorageLogItems(const unsigned char* data); void ReceiveWhisper2(const unsigned char* data); - void ProcessWhisper(int unknown_0004, std::string name, std::string text, bool flag); + void ProcessWhisper(int padding_0004, std::string name, std::string text, bool flag); void SpawnGroundSkill(std::uint32_t aid, std::uint32_t owner, int value, std::int16_t x, std::int16_t y, int type, signed char level, unsigned char visible, unsigned char flags); void Zc_Skill_Entry(const unsigned char* record); void ReceiveStatusChangeEntry(const unsigned char* record); @@ -919,12 +919,12 @@ public: void ReceiveActorStateEntryNamedOld(const unsigned char* data); void ReceiveActorStateEntryOld(const unsigned char* data); void SpawnStandingPc( - std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short unknown_0024, int unknown_0028, int unknown_002C, - short unknown_0030, short unknown_004C, short unknown_0050, short unknown_0054, short unknown_0058, short robe, std::string name + std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short padding_0024, int padding_0028, int padding_002C, + short padding_0030, short padding_004C, short padding_0050, short padding_0054, short padding_0058, short robe, std::string name ); void SpawnStandingPc2( - std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short unknown_0024, int unknown_0028, int unknown_002C, - short unknown_0030, short unknown_004C, short unknown_0050, short unknown_0054, short unknown_0058, short robe, std::string name, short unknown_0078 + std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short padding_0024, int padding_0028, int padding_002C, + short padding_0030, short padding_004C, short padding_0050, short padding_0054, short padding_0058, short robe, std::string name, short padding_0078 ); void SpawnMirrorActor(std::uint32_t aid, std::uint32_t owner, short x, short y); void ReceiveActorMoveEntryOld(const unsigned char* data); @@ -1003,7 +1003,7 @@ static_assert(offsetof(CGameMode, statusIconTooltip) == 0x5D0); static_assert(offsetof(CGameMode, notificationWindows) == 0x604); static_assert(offsetof(CGameMode, petFriendlyNoticeIds) == 0x628); static_assert(offsetof(CGameMode, itemPickupCounts) == 0x64C); -static_assert(offsetof(CGameMode, unknown_066C) == 0x66C); +static_assert(offsetof(CGameMode, padding_066C) == 0x66C); static_assert(sizeof(CGameMode) == 0x670); #endif @@ -1022,10 +1022,10 @@ extern std::map g_miniMapEffectMarkers; extern char g_pendingWhisperCount; void CloseWhisperRecord(); extern unsigned char g_gameModePacketBuffer[0x10000]; -extern int g_unknown173A5BC; -extern int g_unknown_01738268; -extern int g_unknown_0173826C; -extern int g_unknown_01738270; +extern int g_overweightThresholdPercent; +extern int g_buyingStoreMode; +extern int g_buyingStoreDbNumber; +extern int g_buyingStoreNoPermission; extern std::string g_gameModeNamelessTag; void __stdcall OpenWordDisplay(CGameActor* actor); diff --git a/Source/Client/Mode/CLoginMode.h b/Source/Client/Mode/CLoginMode.h index b14c094cf..3ab633a9a 100644 --- a/Source/Client/Mode/CLoginMode.h +++ b/Source/Client/Mode/CLoginMode.h @@ -65,11 +65,11 @@ struct CharacterInfo { }; struct CharacterSlotExtension { - /* 0000 */ unsigned char unknown_0000; + /* 0000 */ unsigned char padding_0000; /* 0001 */ std::uint32_t code; /* 0005 */ std::uint32_t time1; /* 0009 */ std::uint32_t time2; - /* 000D */ unsigned char unknown_000D[7]; + /* 000D */ unsigned char padding_000D[7]; }; #pragma pack(pop) @@ -113,9 +113,9 @@ public: /* 01CC */ int characterCount; /* 01D0 */ unsigned char loginExtra[0x8]; /* 01D8 */ int receivedCharacterCount; - /* 01DC */ int unknown_01DC; + /* 01DC */ int padding_01DC; /* 01E0 */ bool characterDeleted; - /* 01E1 */ unsigned char unknown_01E1[0x3]; + /* 01E1 */ unsigned char padding_01E1[0x3]; /* 01E4 */ std::uint32_t otpStarted; /* 01E8 */ unsigned char serverList[0x3E80]; /* 4068 */ CharacterInfo characters[68]; @@ -126,10 +126,10 @@ public: /* 6F18 */ int passwordRetryCount; /* 6F1C */ std::vector noticeCommands; /* 6F28 */ int authChallengeId; - /* 6F2C */ std::vector unknown_6F2C; + /* 6F2C */ std::vector padding_6F2C; /* 6F38 */ std::vector accountInfo; /* 6F44 */ unsigned char savedInlineCharset; - /* 6F45 */ unsigned char unknown_6F45[0x3]; + /* 6F45 */ unsigned char padding_6F45[0x3]; /* 6F48 */ int selectedAccount; /* 6F4C */ int selectedSecondaryAccount; /* 6F50 */ std::string keycryptErrorInfo; @@ -137,7 +137,7 @@ public: /* 6F74 */ bool loginResponseReceived; /* 6F75 */ bool otpPending; /* 6F76 */ bool otpTimedOut; - /* 6F77 */ unsigned char unknown_6F77[0x1]; + /* 6F77 */ unsigned char padding_6F77[0x1]; /* 6F78 */ int remainingLoginSeconds; int Run() override; diff --git a/Source/Client/Mode/GameMode.cpp b/Source/Client/Mode/GameMode.cpp index 116640c96..0664f0841 100644 --- a/Source/Client/Mode/GameMode.cpp +++ b/Source/Client/Mode/GameMode.cpp @@ -527,7 +527,7 @@ __declspec(noinline) void CGameMode::UpdatePetFriendlyNoticeIds(int id, bool add // OFFSET: 0x00CF0070 // FUNCTION: fn_21410 -const char* CGameMode::Unknown04DCText() { +const char* CGameMode::RecordChat4Text() { return reinterpret_cast(reinterpret_cast(this) + 0x4DC)->c_str(); } @@ -937,7 +937,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i case MM_ADD_ITEM_TO_STORE: { g_session.FlagInventoryItem(static_cast(argument1)); const GameModePacketWordDword packet{ - g_unknown_01738268 != 0 ? 0x9E1 : 0x364, + g_buyingStoreMode != 0 ? 0x9E1 : 0x364, static_cast(argument1), static_cast(argument2) }; GetRagConnection().Send(g_packetLengths.FixedLength(packet.packetId), &packet); @@ -946,14 +946,14 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i case MM_MOVE_ITEM_FROM_STORE_TO_BODY: { g_session.FlagCartItem(static_cast(argument1)); const GameModePacketWordDword packet{ - g_unknown_01738268 != 0 ? 0x9E2 : 0x365, + g_buyingStoreMode != 0 ? 0x9E2 : 0x365, static_cast(argument1), static_cast(argument2) }; GetRagConnection().Send(g_packetLengths.FixedLength(packet.packetId), &packet); return 0; } case MM_CLOSE_STORE: { - const std::uint16_t packet = g_unknown_01738268 != 0 ? 0x9BE : 0x193; + const std::uint16_t packet = g_buyingStoreMode != 0 ? 0x9BE : 0x193; GetRagConnection().Send(g_packetLengths.FixedLength(packet), &packet); return 0; } @@ -995,7 +995,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i if (!this->IsMenuWindowOpen()) { g_session.FlagCartItem(static_cast(argument1)); const GameModePacketWordDword packet{ - g_unknown_01738268 != 0 ? 0x9E4 : 0x128, + g_buyingStoreMode != 0 ? 0x9E4 : 0x128, static_cast(argument1), static_cast(argument2) }; GetRagConnection().Send(g_packetLengths.FixedLength(packet.packetId), &packet); @@ -1005,7 +1005,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i if (!this->IsMenuWindowOpen()) { g_session.FlagMerchantShopItem(static_cast(argument1)); const GameModePacketWordDword packet{ - g_unknown_01738268 != 0 ? 0x9E3 : 0x129, + g_buyingStoreMode != 0 ? 0x9E3 : 0x129, static_cast(argument1), static_cast(argument2) }; GetRagConnection().Send(g_packetLengths.FixedLength(packet.packetId), &packet); @@ -4175,7 +4175,7 @@ int CGameMode::SendMsg(int event, int argument1, int argument2, int argument3, i case MM_MOVE_ITEM_TO_PERSONAL: { g_session.FlagCartItem(static_cast(argument1)); const GameModePacketDwordWordDword packet{ - 0xC22, g_unknown_01738268 != 0 ? 1U : 0U, static_cast(argument1), static_cast(argument2) + 0xC22, g_buyingStoreMode != 0 ? 1U : 0U, static_cast(argument1), static_cast(argument2) }; GetRagConnection().Send(g_packetLengths.FixedLength(packet.packetId), &packet); return 0; @@ -5295,15 +5295,15 @@ std::string CGameMode::HuntTargetText(const RenewQuestOngoingInfo& quest, int in std::string text; if (std::strlen(quest.m_huntName[index]) == 0) { text = static_cast( - g_renewQuestMgr->GetMonsterConditionText(quest.m_huntUnknown01A0[index], quest.m_huntUnknown01AC[index], quest.m_huntUnknown01B2[index])); + g_renewQuestMgr->GetMonsterConditionText(quest.m_huntConditionFlags[index], quest.m_huntMinLevel[index], quest.m_huntMaxLevel[index])); } else { text = static_cast(FormatOwnedString("%s", quest.m_huntName[index])); } - if (quest.m_huntUnknown00E0[index] == quest.m_huntUnknown0180[index]) { + if (quest.m_huntKillCount[index] == quest.m_huntMaxCount[index]) { text = static_cast(FormatOwnedString("%s [ %s ]", text.c_str(), LookupMessage(MSI_COMPLETE_HUNTING_QUEST))); } else { - text = static_cast(FormatOwnedString("%s [ %d / %d ]", text.c_str(), quest.m_huntUnknown00E0[index], quest.m_huntUnknown0180[index])); + text = static_cast(FormatOwnedString("%s [ %d / %d ]", text.c_str(), quest.m_huntKillCount[index], quest.m_huntMaxCount[index])); } return text; @@ -6107,7 +6107,7 @@ struct GameModeUiKindTextMessage { /* 0002 */ std::uint16_t type; /* 0004 */ std::uint16_t length; /* 0006 */ int kind; - /* 000A */ int unknown_000A; + /* 000A */ int padding_000A; /* 000E */ char text[1]; }; @@ -6492,7 +6492,7 @@ struct ZoneEnterPacket { /* 0002 */ std::uint32_t aid; /* 0006 */ std::uint32_t gid; /* 000A */ int authCode; - /* 000E */ unsigned char unknown_000E[4]; + /* 000E */ unsigned char padding_000E[4]; /* 0012 */ std::uint32_t clientTime; /* 0016 */ unsigned char sex; }; @@ -7266,7 +7266,7 @@ void CGameMode::InitializeState() { g_windowMgr.EnsureWindow(WID_QUIKSLOTWND); } - if (g_session.m_partyBooking.unknown_0000) { + if (g_session.m_partyBooking.seekWindowOpen) { g_windowMgr.EnsureWindow(WID_SEEKPARTYWND); } @@ -7769,7 +7769,7 @@ namespace EquipmentProperties { class CEquipmentPropertiesMgr { public: virtual ~CEquipmentPropertiesMgr(); - /* 0004 */ unsigned char unknown_0004[0x1F8]; + /* 0004 */ unsigned char padding_0004[0x1F8]; CEquipmentPropertiesMgr(); void RefreshPretend(); @@ -8052,7 +8052,7 @@ void CGameMode::ReceiveSkillList(int packetType, const std::vector(&this->equipmentRequestState[0x0C]) = 0; @@ -8062,7 +8062,7 @@ void CGameMode::ReceiveSkillUpdate( skill.upgradable = upgradable; skill.range = range; skill.type = type; - skill.learnedLevel = unknown; + skill.learnedLevel = learnedLevel; skill.id = id; if (g_session.IsHomunculusSkill(id)) { @@ -9048,7 +9048,7 @@ void CGameMode::ProcessInput() { } if ((handled == 1 || g_mouse.buttons[0] == 1) && g_mouse.buttons[0] == 1) { - g_unknown173AD3F = false; + g_moveRequestPending = false; this->SendMsg(MM_CANCEL_USE_SKILL, 0, 0, 0, 0); if (timeGetTime() > this->noMoveStartTick + 5000) { this->noMove = 0; @@ -9474,13 +9474,13 @@ void CGameMode::ExecuteTalkType(int talkType, std::string* arguments) { g_windowMgr.SendNotice(UIM_OPENCHATWND, 0, 0, 0, 0, 0); g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(LookupMessage(g_serviceOptions.Get(0xB) ? 0x1B : 0x1C)), 0x64FFFF, 0, 0, 0); if (g_serviceOptions.Get(0xB)) { - g_soundMgr->unknown = 0; + g_soundMgr->tingOnly = 0; } g_windowMgr.RefreshGameSettings(); break; case TT_TINGONLY_ON_OFF: - g_soundMgr->unknown = g_soundMgr->unknown == 0; - g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(LookupMessage(g_soundMgr->unknown ? 0x5DA : 0x5DB)), 0x64FFFF, 0, 0, 0); + g_soundMgr->tingOnly = g_soundMgr->tingOnly == 0; + g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(LookupMessage(g_soundMgr->tingOnly ? 0x5DA : 0x5DB)), 0x64FFFF, 0, 0, 0); break; case TT_FRAMESKIP_ON_OFF: g_frameskip = 1 - g_frameskip; @@ -10137,7 +10137,7 @@ void CGameMode::ProcessActorPick(int& handled, ActorPickInfo* pick, CGameActor* bool resetCursor = false; if (pick) { if (this->scene->isBattleFieldMode != 0) { - if (actor && g_session.playerTeam[0] != actor->render.unknown_00FB) { + if (actor && g_session.playerTeam[0] != actor->render.battleTeam) { attack = 1; } } else { @@ -10586,7 +10586,7 @@ int CGameMode::HandleActorPick(ActorPickInfo* pick, int result) { attack = 1; } } - } else if (actor != nullptr && g_session.playerTeam[0] != actor->render.unknown_00FB) { + } else if (actor != nullptr && g_session.playerTeam[0] != actor->render.battleTeam) { attack = 1; } diff --git a/Source/Client/Mode/GameModeHandlers.cpp b/Source/Client/Mode/GameModeHandlers.cpp index 678f1dcca..cd96a53a1 100644 --- a/Source/Client/Mode/GameModeHandlers.cpp +++ b/Source/Client/Mode/GameModeHandlers.cpp @@ -112,7 +112,7 @@ struct RuneRewardStepEntry { struct RuneListPacket { /* 0000 */ std::int16_t id; /* 0002 */ std::uint16_t length; - /* 0004 */ unsigned char unknown_0004; + /* 0004 */ unsigned char padding_0004; /* 0005 */ std::uint16_t tagId; /* 0007 */ std::uint16_t count; }; @@ -534,7 +534,7 @@ void CGameMode::ReceivePartyBookingRegisterResult(const unsigned char* packet) { void CGameMode::ReceivePartyBookingUpdateResult(const unsigned char* packet) { const std::int16_t result = *reinterpret_cast(packet + 2); if (result == 0) { - g_session.m_partyBooking.unknown_0034 = GetTickCount(); + g_session.m_partyBooking.registeredTick = GetTickCount(); g_windowMgr.EnsureWindow(WID_SEEKPARTYWND); UISeekPartyWnd* seekWindow = static_cast(g_windowMgr.LookupWindow(WID_SEEKPARTYWND)); if (seekWindow) { @@ -2246,7 +2246,7 @@ void CGameMode::ReceiveAchievementResult(unsigned char result, int id) { const int index = g_session.AddAchievementJobTitle(id); if (index != -1) { - g_session.AddUnknownId(index); + g_session.AddAchievementId(index); } } @@ -2870,31 +2870,31 @@ struct Item1718PendingRecord { /* 0009 */ std::int32_t itemId; /* 000D */ std::uint16_t sprite; /* 000F */ std::uint32_t location; - /* 0013 */ unsigned char unknown_0013[6]; + /* 0013 */ unsigned char padding_0013[6]; }; #pragma pack(pop) static_assert(sizeof(Item1718PendingRecord) == 0x19); struct Unknown015D4818Values { - /* 0000 */ std::uint32_t unknown_0000[2]; + /* 0000 */ std::uint32_t padding_0000[2]; /* 0008 */ std::uint32_t location; - /* 000C */ std::uint32_t unknown_000C[25]; + /* 000C */ std::uint32_t padding_000C[25]; /* 0070 */ std::uint32_t sprite; }; struct Unknown015D4818Entry { - /* 0000 */ std::uint32_t unknown_0000[2]; + /* 0000 */ std::uint32_t padding_0000[2]; /* 0008 */ Unknown015D4818Values values; }; struct Unknown015D4818 { - /* 0000 */ std::uint32_t unknown_0000; + /* 0000 */ std::uint32_t padding_0000; /* 0004 */ Unknown015D4818Entry* entry; }; // GLOBAL: gl_25368 -Unknown015D4818* g_unknown_015D4818; +Unknown015D4818* g_pendingCashItemList; // OFFSET: 0x00D3BD40 // FUNCTION: fn_21790 @@ -2921,8 +2921,8 @@ void CGameMode::ReceivePendingItem1718List(const unsigned char* packet) { item.id = -1; item.identified = 1; g_session.AddShopItem(item, 0); - if (g_unknown_015D4818 && g_unknown_015D4818->entry) { - Unknown015D4818Values& values = g_unknown_015D4818->entry->values; + if (g_pendingCashItemList && g_pendingCashItemList->entry) { + Unknown015D4818Values& values = g_pendingCashItemList->entry->values; values.sprite = record->sprite; values.location = record->location; } diff --git a/Source/Client/Mode/GameModeItemLists.cpp b/Source/Client/Mode/GameModeItemLists.cpp index c0ecbad48..1c0f70be1 100644 --- a/Source/Client/Mode/GameModeItemLists.cpp +++ b/Source/Client/Mode/GameModeItemLists.cpp @@ -20,7 +20,7 @@ public: CEquipmentPropertiesMgr(); void AddExpansion(const int& kind, const int& itemId, bool notify); - unsigned char unknown_0000[0x1FC]; + unsigned char padding_0000[0x1FC]; }; } diff --git a/Source/Client/Mode/GameModeNotices.cpp b/Source/Client/Mode/GameModeNotices.cpp index 3df519cfa..33e7c114b 100644 --- a/Source/Client/Mode/GameModeNotices.cpp +++ b/Source/Client/Mode/GameModeNotices.cpp @@ -275,7 +275,7 @@ struct RouletteInfoSlot { /* 0002 */ std::int16_t column; /* 0004 */ int itemId; /* 0008 */ std::int16_t count; - /* 000A */ std::int16_t unknown_000A; + /* 000A */ std::int16_t padding_000A; }; struct RouletteInfoPacket { @@ -1835,13 +1835,13 @@ void CGameMode::ReceiveMacroReporterList(int count, const int* aids) { } // GLOBAL: gl_25111 -int g_unknown_01738268; +int g_buyingStoreMode; // GLOBAL: gl_25112 -int g_unknown_0173826C; +int g_buyingStoreDbNumber; // GLOBAL: gl_25113 -int g_unknown_01738270; +int g_buyingStoreNoPermission; @@ -1866,9 +1866,9 @@ void CGameMode::ReceiveStorageClose(const AchievementStatePacket* packet) { } g_session.ClearCartItems(); - g_unknown_01738268 = 0; - g_unknown_0173826C = 0; - g_unknown_01738270 = 0; + g_buyingStoreMode = 0; + g_buyingStoreDbNumber = 0; + g_buyingStoreNoPermission = 0; } // OFFSET: 0x00D6C460 @@ -2102,12 +2102,12 @@ void CGameMode::ReceiveBuyingStoreResult(const BuyingStoreResultPacket* packet) std::memset(text, 0, 250); message = 0x9C1; } else if (result == 3) { - g_unknown_01738270 = 1; + g_buyingStoreNoPermission = 1; std::memset(text, 0, 250); message = 0x9C2; } else if (result == 1) { - g_unknown_01738268 = 1; - g_unknown_0173826C = packet->value; + g_buyingStoreMode = 1; + g_buyingStoreDbNumber = packet->value; if (packet->value != 0) { return; } @@ -5067,12 +5067,12 @@ void CGameMode::ReceiveOngoingQuestList(const unsigned char* data) { const auto* hunt = reinterpret_cast(cursor); cursor += sizeof(OngoingQuestHunt); info.m_huntId[i] = hunt->huntId; - info.m_huntUnknown01A0[i] = hunt->conditionFlags; - info.m_huntUnknown00D4[i] = hunt->mobId; - info.m_huntUnknown00E0[i] = hunt->count; - info.m_huntUnknown0180[i] = hunt->maxCount; - info.m_huntUnknown01AC[i] = hunt->minLevel; - info.m_huntUnknown01B2[i] = hunt->maxLevel; + info.m_huntConditionFlags[i] = hunt->conditionFlags; + info.m_huntMobId[i] = hunt->mobId; + info.m_huntKillCount[i] = hunt->count; + info.m_huntMaxCount[i] = hunt->maxCount; + info.m_huntMinLevel[i] = hunt->minLevel; + info.m_huntMaxLevel[i] = hunt->maxLevel; const int mobId = hunt->mobId; if ((mobId < 1001 || mobId > 3998) && static_cast(mobId - 20021) > 11978) { if (mobId == 0x1099) { @@ -5127,12 +5127,12 @@ void CGameMode::ReceiveOngoingQuestList2(const unsigned char* data) { const auto* hunt = reinterpret_cast(cursor); cursor += sizeof(OngoingQuestHunt2); info.m_huntId[i] = hunt->huntId; - info.m_huntUnknown01A0[i] = hunt->conditionFlags; - info.m_huntUnknown00D4[i] = hunt->mobId; - info.m_huntUnknown00E0[i] = hunt->count; - info.m_huntUnknown0180[i] = hunt->maxCount; - info.m_huntUnknown01AC[i] = hunt->minLevel; - info.m_huntUnknown01B2[i] = hunt->maxLevel; + info.m_huntConditionFlags[i] = hunt->conditionFlags; + info.m_huntMobId[i] = hunt->mobId; + info.m_huntKillCount[i] = hunt->count; + info.m_huntMaxCount[i] = hunt->maxCount; + info.m_huntMinLevel[i] = hunt->minLevel; + info.m_huntMaxLevel[i] = hunt->maxLevel; const int mobId = hunt->mobId; if ((mobId < 1001 || mobId > 3998) && static_cast(mobId - 20021) > 11978) { if (mobId == 0x1099) { @@ -5610,17 +5610,17 @@ void CGameMode::ReceiveQuestHuntUpdate(const unsigned char* data) { } } if (index < 3) { - info.m_huntUnknown00E0[index] = entry.count; - info.m_huntUnknown0180[index] = entry.maxCount; + info.m_huntKillCount[index] = entry.count; + info.m_huntMaxCount[index] = entry.maxCount; notices.push_back(this->HuntTargetText(info, index)); std::string name; - if (info.m_huntUnknown00D4[index] == 0x7CFF) { - name.assign(g_renewQuestMgr->GetMonsterConditionText(info.m_huntUnknown01A0[index], info.m_huntUnknown01AC[index], info.m_huntUnknown01B2[index])); + if (info.m_huntMobId[index] == 0x7CFF) { + name.assign(g_renewQuestMgr->GetMonsterConditionText(info.m_huntConditionFlags[index], info.m_huntMinLevel[index], info.m_huntMaxLevel[index])); } else { name.assign(info.m_huntName[index]); } - name = static_cast(FormatOwnedString(LookupMessage(MSI_CLEAR_QUEST_MONSTER), info.m_title.c_str(), name.c_str(), info.m_huntUnknown00E0[index], entry.maxCount)); + name = static_cast(FormatOwnedString(LookupMessage(MSI_CLEAR_QUEST_MONSTER), info.m_title.c_str(), name.c_str(), info.m_huntKillCount[index], entry.maxCount)); g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(name.c_str()), 0xFFFF, 19, 0, 0); g_renewQuestMgr->SetOngoingQuest(entry.questId, info); } @@ -5656,17 +5656,17 @@ void CGameMode::ReceiveQuestHuntUpdate2(const unsigned char* data) { } } if (index < 3) { - info.m_huntUnknown00E0[index] = entry.count; - info.m_huntUnknown0180[index] = entry.maxCount; + info.m_huntKillCount[index] = entry.count; + info.m_huntMaxCount[index] = entry.maxCount; notices.push_back(this->HuntTargetText(info, index)); std::string name; - if (info.m_huntUnknown00D4[index] == 0x7CFF) { - name.assign(g_renewQuestMgr->GetMonsterConditionText(info.m_huntUnknown01A0[index], info.m_huntUnknown01AC[index], info.m_huntUnknown01B2[index])); + if (info.m_huntMobId[index] == 0x7CFF) { + name.assign(g_renewQuestMgr->GetMonsterConditionText(info.m_huntConditionFlags[index], info.m_huntMinLevel[index], info.m_huntMaxLevel[index])); } else { name.assign(info.m_huntName[index]); } - name = static_cast(FormatOwnedString(LookupMessage(MSI_CLEAR_QUEST_MONSTER), info.m_title.c_str(), name.c_str(), info.m_huntUnknown00E0[index], entry.maxCount)); + name = static_cast(FormatOwnedString(LookupMessage(MSI_CLEAR_QUEST_MONSTER), info.m_title.c_str(), name.c_str(), info.m_huntKillCount[index], entry.maxCount)); g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(name.c_str()), 0xFFFF, 19, 0, 0); g_renewQuestMgr->SetOngoingQuest(entry.questId, info); } @@ -7375,7 +7375,7 @@ struct EquipItemUpdatePacket { // OFFSET: 0x00D6D850 // FUNCTION: fn_22091 -void CGameMode::RefreshInventoryOrEquipItem(std::uint16_t itemId, unsigned char unknownValue, std::uint16_t refine, ItemCardSlots cards, ItemSlotOptions options) { +void CGameMode::RefreshInventoryOrEquipItem(std::uint16_t itemId, unsigned char damaged, std::uint16_t refine, ItemCardSlots cards, ItemSlotOptions options) { ITEM_INFO item = LookupClientItemByIdentity(g_session.m_inventoryItems, itemId); int lookup = 0; int slot = 0; @@ -7388,7 +7388,7 @@ void CGameMode::RefreshInventoryOrEquipItem(std::uint16_t itemId, unsigned char } } - item.damaged = unknownValue; + item.damaged = damaged; item.refiningLevel = refine; std::memcpy(item.cards, cards.cards, sizeof(cards.cards)); item.optionCount = CountItemSlotOptions(options.options); @@ -7648,7 +7648,7 @@ void CGameMode::ApplyStatusIcons(int level, unsigned int flags) { // OFFSET: 0x00D1A520 // FUNCTION: fn_21618 -void CGameMode::ProcessWhisper(int unknown_0004, std::string name, std::string text, bool flag) { +void CGameMode::ProcessWhisper(int shortcutId, std::string name, std::string text, bool flag) { const std::string sender(name); std::vector message(text.begin(), text.end()); message.push_back('\0'); @@ -7657,7 +7657,7 @@ void CGameMode::ProcessWhisper(int unknown_0004, std::string name, std::string t line.append(" : "); line.append(message.data()); - if (g_windowMgr.ShowWhisperFrom(name.c_str(), line.c_str(), 0x222222, static_cast(unknown_0004)) != 0) { + if (g_windowMgr.ShowWhisperFrom(name.c_str(), line.c_str(), 0x222222, static_cast(shortcutId)) != 0) { if (g_session.autoReplyState[0] != 0) { char notice[24]; std::sprintf(notice, LookupMessage(MSI_AUTO_MSG2)); @@ -7704,22 +7704,22 @@ void CGameMode::ProcessWhisper(int unknown_0004, std::string name, std::string t if (g_windowMgr.IsFriend(name.c_str())) { prefix = "[ Friend "; prefix.append(sender); - if (unknown_0004 != 0) { - prefix.append(" (" + ShortcutFilename(static_cast(unknown_0004)) + ")"); + if (shortcutId != 0) { + prefix.append(" (" + ShortcutFilename(static_cast(shortcutId)) + ")"); } prefix = prefix + " ] : " + message.data(); } else if (flag) { prefix = "[ "; prefix.append(sender); - if (unknown_0004 != 0) { - prefix.append(" (" + ShortcutFilename(static_cast(unknown_0004)) + ")"); + if (shortcutId != 0) { + prefix.append(" (" + ShortcutFilename(static_cast(shortcutId)) + ")"); } prefix = prefix + " ] : " + message.data(); } else if (g_session.IsGuildMemberName(name.c_str())) { prefix = "[ Member "; prefix.append(sender); - if (unknown_0004 != 0) { - prefix.append(" (" + ShortcutFilename(static_cast(unknown_0004)) + ")"); + if (shortcutId != 0) { + prefix.append(" (" + ShortcutFilename(static_cast(shortcutId)) + ")"); } prefix = prefix + " ] : " + message.data(); } else { @@ -7733,8 +7733,8 @@ void CGameMode::ProcessWhisper(int unknown_0004, std::string name, std::string t } prefix = "( From "; prefix.append(sender); - if (unknown_0004 != 0) { - prefix.append(" [" + ShortcutFilename(static_cast(unknown_0004)) + "]"); + if (shortcutId != 0) { + prefix.append(" [" + ShortcutFilename(static_cast(shortcutId)) + "]"); } prefix = prefix + " ) : " + message.data(); } diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index 2cce4521b..8f910608d 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -184,7 +184,7 @@ namespace { struct SimulationPacketHeader { /* 0000 */ std::uint16_t packetType; /* 0002 */ std::uint16_t length; - /* 0004 */ std::uint32_t unknown_0004; + /* 0004 */ std::uint32_t padding_0004; /* 0008 */ int value; /* 000C */ unsigned char name[0x18]; }; @@ -192,9 +192,9 @@ namespace { struct EnchantSimulationRecord { /* 0000 */ int itemId; /* 0004 */ int resultItemId; - /* 0008 */ std::uint32_t unknown_0008[2]; + /* 0008 */ std::uint32_t padding_0008[2]; /* 0010 */ int rate; - /* 0014 */ std::uint32_t unknown_0014; + /* 0014 */ std::uint32_t padding_0014; /* 0018 */ int count; }; @@ -217,7 +217,7 @@ namespace { /* 0007 */ int second; /* 000B */ std::uint16_t current; /* 000D */ std::uint16_t total; - /* 000F */ unsigned char unknown_000F[4]; + /* 000F */ unsigned char padding_000F[4]; /* 0013 */ char name[1]; }; @@ -1357,7 +1357,7 @@ void CGameMode::ReceiveHpSpRecovery(const unsigned char* packet, int variant) { } // GLOBAL: gl_24965 -int g_unknown173A5BC; +int g_overweightThresholdPercent; // OFFSET: 0x00D50580 // FUNCTION: fn_21884 @@ -1369,7 +1369,7 @@ void CGameMode::IgnoreRemovedPacket7(const unsigned char*) { __declspec(noinline) void CGameMode::ReceiveOverweightThreshold(const unsigned char* packet) { const int value = *reinterpret_cast(packet + 2); if (value > 0) { - g_unknown173A5BC = value; + g_overweightThresholdPercent = value; } } @@ -4189,7 +4189,7 @@ public: void RefreshExpansion(const int& kind, const int& itemId); CEquipmentWearable* FindProperty1(const int& key); void UnequipWearable(const int& location); - unsigned char unknown_0004[0x1F8]; + unsigned char padding_0004[0x1F8]; }; } @@ -4743,9 +4743,9 @@ void CGameMode::ReceiveParChange(unsigned char* data) { const int percent = (g_session.m_weight * 100) / (g_session.m_maxWeight < 1 ? 1 : g_session.m_maxWeight); if (oldPercent < percent) { - if (percent >= g_unknown173A5BC && oldPercent < g_unknown173A5BC) { + if (percent >= g_overweightThresholdPercent && oldPercent < g_overweightThresholdPercent) { g_windowMgr.SendNotice(UIM_OPENCHATWND, 0, 0, 0, 0, 0); - text = FormatOwnedString(LookupMessage(MSI_USA_LOGINERRORMSG_UNKNOWN), g_unknown173A5BC); + text = FormatOwnedString(LookupMessage(MSI_USA_LOGINERRORMSG_UNKNOWN), g_overweightThresholdPercent); g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(text.c_str()), 0xFF, 8, 0, 0); } if (percent > 89 && oldPercent < 90) { @@ -4757,7 +4757,7 @@ void CGameMode::ReceiveParChange(unsigned char* data) { if (oldPercent <= percent) { break; } - if (percent < g_unknown173A5BC && g_unknown173A5BC <= oldPercent) { + if (percent < g_overweightThresholdPercent && g_overweightThresholdPercent <= oldPercent) { g_windowMgr.SendNotice(UIM_OPENCHATWND, 0, 0, 0, 0, 0); g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(LookupMessage(MSI_NO_RECOVER_OVERWEIGHT_RELEASED)), 0xFFFF00, 8, 0, 0); } @@ -7592,11 +7592,11 @@ void CGameMode::ReceiveAddQuest64(const unsigned char* data) { for (int i = 0; i < packet->huntCount; ++i) { const AddQuestHunt64& hunt = hunts[i]; info.m_huntId[i] = hunt.huntId; - info.m_huntUnknown01A0[i] = hunt.condition; - info.m_huntUnknown00D4[i] = hunt.mobId; - info.m_huntUnknown00E0[i] = hunt.count; - info.m_huntUnknown01AC[i] = hunt.minLevel; - info.m_huntUnknown01B2[i] = hunt.maxLevel; + info.m_huntConditionFlags[i] = hunt.condition; + info.m_huntMobId[i] = hunt.mobId; + info.m_huntKillCount[i] = hunt.count; + info.m_huntMinLevel[i] = hunt.minLevel; + info.m_huntMaxLevel[i] = hunt.maxLevel; const int mobId = hunt.mobId; if ((mobId < 1001 || mobId > 3998) && static_cast(mobId - 20021) > 11978) { if (mobId == 0x1099) { @@ -7645,11 +7645,11 @@ void CGameMode::ReceiveAddQuest(const unsigned char* data) { for (int i = 0; i < packet->huntCount; ++i) { const AddQuestHunt& hunt = hunts[i]; info.m_huntId[i] = hunt.huntId; - info.m_huntUnknown01A0[i] = hunt.condition; - info.m_huntUnknown00D4[i] = hunt.mobId; - info.m_huntUnknown00E0[i] = hunt.count; - info.m_huntUnknown01AC[i] = hunt.minLevel; - info.m_huntUnknown01B2[i] = hunt.maxLevel; + info.m_huntConditionFlags[i] = hunt.condition; + info.m_huntMobId[i] = hunt.mobId; + info.m_huntKillCount[i] = hunt.count; + info.m_huntMinLevel[i] = hunt.minLevel; + info.m_huntMaxLevel[i] = hunt.maxLevel; const int mobId = hunt.mobId; if ((mobId < 1001 || mobId > 3998) && static_cast(mobId - 20021) > 11978) { if (mobId == 0x1099) { @@ -10361,7 +10361,7 @@ static_assert(sizeof(ActorDisappearPacket) == 7); void CGameMode::ReceiveActorDisappear(const unsigned char* data) { const ActorDisappearPacket* packet = reinterpret_cast(data); this->nameCard.Erase(packet->aid); - g_session.EraseUnknownKey(packet->aid); + g_session.EraseSummonHp(packet->aid); if (g_session.elementalGid == packet->aid) { g_session.SetElementalGid(-1); } @@ -11886,8 +11886,8 @@ static_assert(sizeof(ActorStandEntry) == 0x7C); // OFFSET: 0x00D7AFA0 // FUNCTION: fn_22199 void CGameMode::SpawnStandingPc( - std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short unknown_0024, int unknown_0028, int unknown_002C, - short unknown_0030, short unknown_004C, short unknown_0050, short unknown_0054, short unknown_0058, short robe, std::string name + std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short head, int weapon, int shield, + short accessory, short accessory2, short accessory3, short headPalette, short bodyPalette, short robe, std::string name ) { ActorStandEntry entry; entry.aid = aid; @@ -11896,14 +11896,14 @@ void CGameMode::SpawnStandingPc( entry.cellX = cellX; entry.cellY = cellY; entry.direction = 4; - entry.head = unknown_0024; - entry.weapon = unknown_0028; - entry.shield = unknown_002C; - entry.accessory = unknown_0030; - entry.accessory2 = unknown_004C; - entry.accessory3 = unknown_0050; - entry.headPalette = unknown_0054; - entry.bodyPalette = unknown_0058; + entry.head = head; + entry.weapon = weapon; + entry.shield = shield; + entry.accessory = accessory; + entry.accessory2 = accessory2; + entry.accessory3 = accessory3; + entry.headPalette = headPalette; + entry.bodyPalette = bodyPalette; entry.robe = robe; if (name.size() != 0) { this->nameCard.SetName(aid, name); @@ -11927,8 +11927,8 @@ void CGameMode::SpawnStandingPc( // OFFSET: 0x00D7B170 // FUNCTION: fn_22200 void CGameMode::SpawnStandingPc2( - std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short unknown_0024, int unknown_0028, int unknown_002C, - short unknown_0030, short unknown_004C, short unknown_0050, short unknown_0054, short unknown_0058, short robe, std::string name, short unknown_0078 + std::uint32_t aid, int job, short cellX, short cellY, unsigned char sex, short head, int weapon, int shield, + short accessory, short accessory2, short accessory3, short headPalette, short bodyPalette, short robe, std::string name, short bodyCostume ) { ActorStandEntry entry; entry.aid = aid; @@ -11937,16 +11937,16 @@ void CGameMode::SpawnStandingPc2( entry.cellX = cellX; entry.cellY = cellY; entry.direction = 4; - entry.head = unknown_0024; - entry.weapon = unknown_0028; - entry.shield = unknown_002C; - entry.accessory = unknown_0030; - entry.accessory2 = unknown_004C; - entry.accessory3 = unknown_0050; - entry.headPalette = unknown_0054; - entry.bodyPalette = unknown_0058; + entry.head = head; + entry.weapon = weapon; + entry.shield = shield; + entry.accessory = accessory; + entry.accessory2 = accessory2; + entry.accessory3 = accessory3; + entry.headPalette = headPalette; + entry.bodyPalette = bodyPalette; entry.robe = robe; - entry.bodyCostume = unknown_0078; + entry.bodyCostume = bodyCostume; if (name.size() != 0) { this->nameCard.SetName(aid, name); } @@ -15103,7 +15103,7 @@ void CGameMode::ReceiveActorStateEntryNamedBody(const unsigned char* data) { #pragma pack(push, 1) struct RefineBroadcastPacket { /* 0000 */ std::uint16_t packetType; - /* 0002 */ std::uint16_t unknown_0002; + /* 0002 */ std::uint16_t padding_0002; /* 0004 */ int itemId; /* 0008 */ char name[24]; /* 0020 */ int materialId; @@ -15113,7 +15113,7 @@ struct RefineBroadcastPacket { struct TradeBroadcastPacket { /* 0000 */ std::uint16_t packetType; - /* 0002 */ std::uint16_t unknown_0002; + /* 0002 */ std::uint16_t padding_0002; /* 0004 */ int itemId; /* 0008 */ char name[24]; /* 0020 */ char otherName[24]; @@ -15121,7 +15121,7 @@ struct TradeBroadcastPacket { struct ItemBroadcastPacket { /* 0000 */ std::uint16_t packetType; - /* 0002 */ std::uint16_t unknown_0002; + /* 0002 */ std::uint16_t padding_0002; /* 0004 */ int itemId; /* 0008 */ char name[24]; }; @@ -20281,7 +20281,7 @@ struct ItemSlotOptions { struct ChatRoomMemberUpdateInfo { /* 0000 */ std::string title; - /* 0018 */ std::string unknown_0018; + /* 0018 */ std::string padding_0018; /* 0030 */ int type; /* 0034 */ int memberCount; /* 0038 */ int memberLimit; @@ -20290,7 +20290,7 @@ struct ChatRoomMemberUpdateInfo { #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(ChatRoomMemberUpdateInfo) == 0x40); -static_assert(offsetof(ChatRoomMemberUpdateInfo, unknown_0018) == 0x18); +static_assert(offsetof(ChatRoomMemberUpdateInfo, padding_0018) == 0x18); static_assert(offsetof(ChatRoomMemberUpdateInfo, type) == 0x30); #endif @@ -25039,9 +25039,9 @@ void CGameMode::ProcessIncomingPackets() { RenewQuestOngoingInfo info = quest; for (int index = i; index < 3; ++index) { - if (*reinterpret_cast(entry + 4) == info.m_huntUnknown00D4[index]) { - info.m_huntUnknown00E0[index] = *reinterpret_cast(entry + 0xA); - info.m_huntUnknown0180[index] = *reinterpret_cast(entry + 8); + if (*reinterpret_cast(entry + 4) == info.m_huntMobId[index]) { + info.m_huntKillCount[index] = *reinterpret_cast(entry + 0xA); + info.m_huntMaxCount[index] = *reinterpret_cast(entry + 8); g_renewQuestMgr->SetOngoingQuest(*reinterpret_cast(entry), info); break; } diff --git a/Source/Client/Mode/LoginMode.cpp b/Source/Client/Mode/LoginMode.cpp index 0c6b67c15..be289fcc2 100644 --- a/Source/Client/Mode/LoginMode.cpp +++ b/Source/Client/Mode/LoginMode.cpp @@ -132,7 +132,7 @@ struct AcceptEnterPacket { /* 0000 */ std::int16_t id; /* 0002 */ std::uint16_t length; /* 0004 */ CharacterSlotExtension extension; - /* 0018 */ unsigned char unknown_0018[3]; + /* 0018 */ unsigned char padding_0018[3]; /* 001B */ CharacterInfo characters[1]; }; @@ -325,7 +325,7 @@ const char* g_loginWallpaperName = ""; struct SessionAccount { /* 0000 */ int sex; - /* 0004 */ int unknown_0004; + /* 0004 */ int padding_0004; /* 0008 */ int authCode; /* 000C */ int userLevel; /* 0010 */ std::uint32_t lastLoginIp; @@ -665,7 +665,7 @@ void CLoginMode::ReceiveCharacterSlots(const CharacterSlotsPacket* packet) { SecureZeroMemory(this->characters, sizeof(this->characters)); g_session.characterSlotState = 0; this->receivedCharacterCount = 0; - this->unknown_01DC = 0; + this->padding_01DC = 0; this->slotExtension = packet->extension; this->slotExtension.code = htonl(this->slotExtension.code); @@ -2233,7 +2233,7 @@ void CLoginMode::ShowLoginError(int code, int argument) { // OFFSET: 0x00D8C6A0 // FUNCTION: fn_22258 -CLoginMode::CLoginMode() : wallpaperName(), noticeCommands(), unknown_6F2C(), accountInfo(), keycryptErrorInfo(), mapStates() { +CLoginMode::CLoginMode() : wallpaperName(), noticeCommands(), padding_6F2C(), accountInfo(), keycryptErrorInfo(), mapStates() { this->fadeInRequested = 1; this->nextKeepaliveTime = timeGetTime() + 12000; this->savedInlineCharset = g_inlineCharset; @@ -2243,7 +2243,7 @@ CLoginMode::CLoginMode() : wallpaperName(), noticeCommands(), unknown_6F2C(), ac this->passwordRetryCount = 0; SecureZeroMemory(this->characters, sizeof(this->characters)); this->receivedCharacterCount = 0; - this->unknown_01DC = 0; + this->padding_01DC = 0; this->characterDeleted = false; } @@ -2914,7 +2914,7 @@ void CLoginMode::PollNetworkStatus() { case ID_ZC_RECOVER_PENALTY_OVERWEIGHT: { const int value = reinterpret_cast(g_gameModePacketBuffer)->value; if (value > 0) { - g_unknown173A5BC = value; + g_overweightThresholdPercent = value; } break; } @@ -3435,7 +3435,7 @@ struct ZoneEnterPacket { /* 0002 */ std::uint32_t aid; /* 0006 */ std::uint32_t gid; /* 000A */ int authCode; - /* 000E */ unsigned char unknown_000E[4]; + /* 000E */ unsigned char padding_000E[4]; /* 0012 */ std::uint32_t clientTime; /* 0016 */ unsigned char sex; }; @@ -4189,7 +4189,7 @@ void CLoginMode::OnChangeState(int value) { g_session.m_playerY = header.cellY; g_session.m_playerDir = header.playerDirection; g_windowMgr.ApplyReplayOptions(header.options); - g_session.ResetUnknownState(); + g_session.ResetCharacterSlotState(); g_session.ReadReplayCharacter(Replay::Instance().ReadSection(3)); char mapName[56]; std::sprintf(mapName, "%s.rsw", g_session.m_navigationPlayerMap); diff --git a/Source/Client/Replay.cpp b/Source/Client/Replay.cpp index 185784c29..8d47158d9 100644 --- a/Source/Client/Replay.cpp +++ b/Source/Client/Replay.cpp @@ -868,7 +868,7 @@ ReplayFileList& ReplayFileList::Instance() { // FUNCTION: fn_19339 bool Replay::SetHeaderInfo( std::uint32_t key0, std::uint32_t key1, const char* characterName, const char* mapName, int accountId, int cellX, int cellY, int playerDirection, int service, - int serviceType, int unknown0014 + int serviceType, int sessionSyncValue ) { if (!characterName || !mapName) { return false; @@ -877,7 +877,7 @@ bool Replay::SetHeaderInfo( std::memcpy(this->header.characterName, characterName, sizeof(this->header.characterName)); this->header.service = service; this->header.serviceType = serviceType; - this->header.sessionSyncValue = unknown0014; + this->header.sessionSyncValue = sessionSyncValue; this->header.key0 = key0; this->header.key1 = key1; this->header.accountId = accountId; @@ -1151,7 +1151,7 @@ std::vector CSession::BuildCompanionReplayRecords() { namespace { #pragma pack(push, 1) struct ReplayShopNameRecord { - /* 0000 */ std::int16_t unknown; + /* 0000 */ std::int16_t padding_0000; /* 0002 */ char name[16]; /* 0012 */ int shopId; }; @@ -1297,7 +1297,7 @@ std::vector CSession::BuildShopReplayRecords() { AppendRecord(records, MakeReplayRecord(7500, nullptr, 0)); for (auto it = this->m_nameToId.begin(); it != this->m_nameToId.end(); ++it) { ReplayShopNameRecord value; - value.unknown = 0; + value.padding_0000 = 0; value.shopId = it->second; std::memset(value.name, 0, sizeof(value.name)); std::memcpy(value.name, it->first.c_str(), (std::min)(it->first.size(), sizeof(value.name))); diff --git a/Source/Client/Replay.h b/Source/Client/Replay.h index 131f28737..46deab2f5 100644 --- a/Source/Client/Replay.h +++ b/Source/Client/Replay.h @@ -24,10 +24,10 @@ struct ReplayCachedPacket { #pragma pack(push, 1) struct ReplayOptions { - /* 0000 */ unsigned char unknown_0000[6]; + /* 0000 */ unsigned char padding_0000[6]; /* 0006 */ unsigned char recordRestricted; /* 0007 */ unsigned char showItemSlots; - /* 0008 */ unsigned char unknown_0008[22]; + /* 0008 */ unsigned char padding_0008[22]; unsigned char Get(ReplayRecordOption option) const { return reinterpret_cast(this)[static_cast(option)]; @@ -150,7 +150,7 @@ public: void Rewind(); bool SetHeaderInfo( std::uint32_t key0, std::uint32_t key1, const char* characterName, const char* mapName, int accountId, int cellX, int cellY, int playerDirection, int service, - int serviceType, int unknown0014 + int serviceType, int padding_0014 ); void IncreaseSpeed(); void DecreaseSpeed(); diff --git a/Source/Client/Session.cpp b/Source/Client/Session.cpp index 658eab46e..d4c73597a 100644 --- a/Source/Client/Session.cpp +++ b/Source/Client/Session.cpp @@ -253,7 +253,7 @@ __declspec(noinline) int CSession::HasSwapEquipmentItem(std::uint32_t id) const // OFFSET: 0x00E3DB20 // FUNCTION: fn_24194 -bool CSession::ResetUnknownState() { +bool CSession::ResetCharacterSlotState() { this->m_normalSlotCount = 1; this->m_premiumSlotCount = 1; this->m_billingSlotCount = 1; @@ -1453,7 +1453,7 @@ int CSession::GetItem1718QuantityOf(const ITEM_INFO& item) const { // OFFSET: 0x00DDFDE0 // FUNCTION: fn_23447 -std::uint16_t CSession::GetItem1718Unknown006CByItemId(const ITEM_INFO& item) const { +std::uint16_t CSession::GetShopItemPriceFactorByItemId(const ITEM_INFO& item) const { for (std::list::const_iterator it = this->shopItems.begin(); it != this->shopItems.end(); ++it) { if (std::atoi(it->itemId.c_str()) == std::atoi(item.itemId.c_str())) { return it->priceFactor; @@ -1465,7 +1465,7 @@ std::uint16_t CSession::GetItem1718Unknown006CByItemId(const ITEM_INFO& item) co // OFFSET: 0x00DDFE60 // FUNCTION: fn_23448 -std::uint16_t CSession::GetItem1718Unknown006COf(const ITEM_INFO& item) const { +std::uint16_t CSession::GetShopItemPriceFactor(const ITEM_INFO& item) const { for (auto it = this->shopItems.begin(); it != this->shopItems.end(); ++it) { if (it->identity[1] == item.identity[1]) { return it->priceFactor; @@ -1477,10 +1477,10 @@ std::uint16_t CSession::GetItem1718Unknown006COf(const ITEM_INFO& item) const { // OFFSET: 0x00DDFE90 // FUNCTION: fn_23449 -std::uint16_t CSession::SumItem1720Unknown006CByItemId() const { +std::uint16_t CSession::SumPurchasePriceFactorByItemId() const { std::uint16_t total = 0; for (std::list::const_iterator it = this->purchaseItems.begin(); it != this->purchaseItems.end(); ++it) { - total += it->quantity * this->GetItem1718Unknown006CByItemId(*it); + total += it->quantity * this->GetShopItemPriceFactorByItemId(*it); } return total; @@ -1488,10 +1488,10 @@ std::uint16_t CSession::SumItem1720Unknown006CByItemId() const { // OFFSET: 0x00DDFF60 // FUNCTION: fn_23450 -std::uint16_t CSession::SumItem1720Unknown006C() const { +std::uint16_t CSession::SumPurchasePriceFactor() const { std::uint16_t total = 0; for (auto it = this->purchaseItems.begin(); it != this->purchaseItems.end(); ++it) { - total += it->quantity * this->GetItem1718Unknown006COf(*it); + total += it->quantity * this->GetShopItemPriceFactor(*it); } return total; @@ -2166,7 +2166,7 @@ void CSession::SetMercSkillLevel(int skillId, int level) { // OFFSET: 0x00DFFC40 // FUNCTION: fn_23630 -void CSession::SetItem1768Unknown0014(int index, std::uint32_t value) { +void CSession::SetMerchantPurchaseSavedPrice(int index, std::uint32_t value) { int position = 0; for (ITEM_INFO& item : this->merchantPurchaseSavedItems) { if (position == index) { @@ -6396,10 +6396,10 @@ void CSession::InitResourceNameTables() { shieldJobNames[403] = KarnosBodyPath1().Text(); shieldJobNames[404] = KarnosBodyPath2().Text(); shieldJobNames[405] = AliteaBodyPath1().Text(); - std::vector& unknownNames = reinterpret_cast&>(this->additionalSpriteNames[0x08]); - unknownNames.resize(2, "f"); - unknownNames[0] = "f"; - unknownNames[1] = ""; + std::vector& femaleSuffixNames = reinterpret_cast&>(this->additionalSpriteNames[0x08]); + femaleSuffixNames.resize(2, "f"); + femaleSuffixNames[0] = "f"; + femaleSuffixNames[1] = ""; std::vector& weaponNames = reinterpret_cast&>(this->m_weaponNamesBegin); weaponNames.resize(105, ""); for (int index = 0; index < 105; ++index) { @@ -6930,7 +6930,7 @@ void CSession::LoadSessionTables() { [](const char* left, const char* right) { return std::strcmp(left, right) < 0; }); session->LoadMapViewParameters(); - session->InitUnknownMapTables(); + session->InitSkillEffectIds(); ImportMessageTable(); g_forbiddenWords.Load("manner.txt"); session->LoadXmlTables(); diff --git a/Source/Client/Session.h b/Source/Client/Session.h index 8ffa8e6a8..617a61a86 100644 --- a/Source/Client/Session.h +++ b/Source/Client/Session.h @@ -47,7 +47,7 @@ struct SessionRecord6144 { /* 0004 */ std::uint32_t objectives[10] = {}; /* 002C */ int completedAt = 0; /* 0030 */ std::uint8_t rewarded = 0; - /* 0031 */ std::uint8_t unknown_0031; + /* 0031 */ std::uint8_t padding_0031; /* 0032 */ std::int16_t year; /* 0034 */ std::int16_t month; /* 0036 */ std::int16_t day; @@ -85,7 +85,7 @@ struct SessionRecord6178Entry { }; struct SessionRecord6178 { - /* 0000 */ unsigned char unknown_0000 = 0; + /* 0000 */ unsigned char padding_0000 = 0; /* 0001 */ unsigned char completed = 0; /* 0004 */ int id = -1; /* 0008 */ std::string title; @@ -190,7 +190,7 @@ public: /* 00B4 */ int m_simplifiedSkillList; /* 00B8 */ int m_showSkillDescription; /* 00BC */ unsigned char m_hotkeyPage; - /* 00BD */ unsigned char unknown_00BD[3]; + /* 00BD */ unsigned char padding_00BD[3]; /* 00C0 */ std::string m_hotkeyDescriptions[36]; /* 0420 */ std::uint32_t hotkeySkillLevels[36]; /* 04B0 */ NormalItemSlot m_shortcutSlots[36]; @@ -199,7 +199,7 @@ public: /* 06AC */ NormalItemSlot m_normalItemSlots[9]; /* 06EB */ NormalItemSlot quickSlot; /* 06F2 */ NormalItemSlot alternateQuickSlot; - /* 06F9 */ unsigned char unknown_06F9[0x03]; + /* 06F9 */ unsigned char padding_06F9[0x03]; /* 06FC */ int mainShortcutRow; /* 0700 */ std::map skillFollowEffects; /* 0708 */ std::map skillEffectIds; @@ -210,7 +210,7 @@ public: /* 073C */ std::map m_noSubChatWnds; /* 0744 */ std::map m_subChatWnds; /* 074C */ bool m_canDragWnd; - /* 074D */ unsigned char unknown_074D[0x03]; + /* 074D */ unsigned char padding_074D[0x03]; /* 0750 */ std::uint32_t m_prohibitionTarget; /* 0754 */ std::vector m_prohibitionLog; /* 0760 */ std::string m_accountName; @@ -227,7 +227,7 @@ public: /* 07A4 */ std::uint32_t m_timeAttackCountdown; /* 07A8 */ std::uint32_t m_timeAttackStart; /* 07AC */ int m_timeAttackVisible; - /* 07B0 */ unsigned char unknown_07B0[4]; + /* 07B0 */ unsigned char padding_07B0[4]; }; }; /* 07B4 */ unsigned char m_playerNameKey[0x40]; @@ -243,7 +243,7 @@ public: /* 0EF4 */ unsigned char accessoryAppearance[0x0C]; /* 0F00 */ int m_robe; /* 0F04 */ bool m_newRobeDrawOnTop; - /* 0F05 */ unsigned char unknown_0F05[0x03]; + /* 0F05 */ unsigned char padding_0F05[0x03]; /* 0F08 */ int m_bodyCostume; /* 0F0C */ unsigned char statusLevelEffects[0x08]; /* 0F14 */ std::uint32_t m_jobFlags; @@ -283,7 +283,7 @@ public: /* 0FA8 */ std::vector m_jobNameTable; /* 0FB4 */ std::map m_jobNameTableWoman; /* 0FBC */ std::map m_jobNameTableMan; - /* 0FC4 */ std::map unknown_0FC4; + /* 0FC4 */ std::map padding_0FC4; /* 0FCC */ std::vector m_sexLabels; /* 0FD8 */ std::vector m_jobKeyNames; /* 0FE4 */ std::list m_pingSamples; @@ -350,7 +350,7 @@ public: /* 1784 */ std::list inventoryCategories[11]; /* 17DC */ std::list m_partyMembers; /* 17E4 */ std::list m_friends; - /* 17EC */ unsigned char unknown_17EC[0x04]; + /* 17EC */ unsigned char padding_17EC[0x04]; /* 17F0 */ ITEM_INFO equippedItems[10]; /* 21A0 */ ITEM_INFO alternateEquippedItems[10]; /* 2B50 */ ITEM_INFO costumeItems[10]; @@ -366,8 +366,8 @@ public: /* 5248 */ std::vector m_indoorRswNames; /* 5254 */ std::map m_npcLocationRadius; /* 525C */ unsigned char weaponSoundTables[0x24]; - /* 5280 */ std::list unknown_5280; - /* 5288 */ unsigned char unknown_5288[0x0C]; + /* 5280 */ std::list padding_5280; + /* 5288 */ unsigned char padding_5288[0x0C]; /* 5294 */ const char* const* m_bodyJobNames; /* 5298 */ unsigned char m_bodyJobNamesEndAndCapacity[0x08]; /* 52A0 */ const char* const* m_sexNames; @@ -439,7 +439,7 @@ public: /* 55D0 */ int homunMaxSp; /* 55D4 */ int homunFriendly; /* 55D8 */ int homunAccessory; - /* 55DC */ unsigned char unknown_55DC[4]; + /* 55DC */ unsigned char padding_55DC[4]; /* 55E0 */ std::int64_t m_homunExp; /* 55E8 */ std::int64_t m_homunMaxExp; /* 55F0 */ int homunHunger; @@ -479,13 +479,13 @@ public: /* 56B8 */ unsigned char autoReplyState[0x1C]; /* 56D4 */ int m_storePasswordMode; /* 56D8 */ bool m_passwordInputAlternate; - /* 56D9 */ unsigned char unknown_56D9[0x7]; + /* 56D9 */ unsigned char padding_56D9[0x7]; /* 56E0 */ int m_passwordWndMode; /* 56E4 */ std::uint32_t m_loginAccountId; /* 56E8 */ std::int32_t m_passwordWndAccountId; /* 56EC */ bool m_launchAccountEnabled; /* 56ED */ char m_loginErrorText[500]; - /* 58E1 */ unsigned char unknown_58E1[0x19]; + /* 58E1 */ unsigned char padding_58E1[0x19]; /* 58FA */ char clientVersion[0x18]; /* 5912 */ unsigned char characterRenameEnabled; /* 5913 */ unsigned char characterRenameData[0x25]; @@ -511,9 +511,9 @@ public: union { /* 59DC */ unsigned char mouseAndChannelOptions[0x19C]; struct { - /* 59DC */ unsigned char unknown_59DC_0000[0x194]; + /* 59DC */ unsigned char padding_59DC[0x194]; /* 5B70 */ bool m_lockMouse; - /* 5B71 */ unsigned char unknown_5B71[3]; + /* 5B71 */ unsigned char padding_5B71[3]; /* 5B74 */ int m_channelCopId; }; }; @@ -574,19 +574,19 @@ public: /* 61B3 */ bool m_itemDefaultSort; /* 61B4 */ bool m_itemAscendingOrder; /* 61B5 */ bool m_itemDescendingOrder; - /* 61B6 */ unsigned char unknown_61B6[2]; + /* 61B6 */ unsigned char padding_61B6[2]; }; }; /* 61B8 */ ITEM_INFO swapCostumeItems[10]; /* 6B68 */ ITEM_INFO swapEquippedItems[10]; - /* 7518 */ ITEM_INFO unknown_7518[10]; + /* 7518 */ ITEM_INFO padding_7518[10]; /* 7EC8 */ std::uint32_t swapArrowIndex; /* 7ECC */ unsigned char swapEquipmentFlag[0x04]; /* 7ED0 */ int minimumNameLength; /* 7ED4 */ std::uint32_t nameValidationTick; /* 7ED8 */ int m_swapEquipmentMode = 0; /* 7EDC */ bool m_showMenuIcon; - /* 7EDD */ unsigned char unknown_7EDD[3]; + /* 7EDD */ unsigned char padding_7EDD[3]; /* 7EE0 */ std::map m_robeAlpha; /* 7EE8 */ unsigned char maxBaseLevel[4]; /* 7EEC */ int m_maxLevel; @@ -598,7 +598,7 @@ public: union { /* 7F7D */ unsigned char homunculusFeedOptions[0x0F]; struct { - /* 7F7D */ unsigned char unknown_7F7D_0000[0x0B]; + /* 7F7D */ unsigned char padding_7F7D[0x0B]; /* 7F88 */ bool m_loginModeFlag; }; }; @@ -773,7 +773,7 @@ public: void FormatMonsterSpeech(char* text, char* output, std::uint32_t aid, int feminine); bool UpdateHomunSkill(const CSkillInfo& value, unsigned char notify); bool UpdateMercSkill(const CSkillInfo& value, unsigned char notify); - void AddUnknownId(int id); + void AddAchievementId(int id); EquipSlots GetEquipSlots(int location); bool EquipInventoryItem(const ITEM_INFO& item, const char* name); bool UnequipItem(int location, std::uint32_t identity); @@ -792,7 +792,7 @@ public: void ClearShortcutSlots(); void ClearSecondaryShortcutSlots(); void ClearHotkeySkillLevels(); - void EraseUnknownKey(std::int64_t key); + void EraseSummonHp(std::int64_t key); std::int64_t FindSummonHp(std::int64_t key) const; std::int64_t FindSummonMaxHp(std::int64_t key) const; SessionRecord6144 FindAchievementRecord(int key) const; @@ -886,7 +886,7 @@ public: void NotifyMercSkillWindows(); int GetPetActionNumber(int hungerLevel, int friendlyLevel, int action); void InitPetActionTable(); - void InitUnknownMapTables(); + void InitSkillEffectIds(); int GetPetFriendlyState(int friendly); void GetPetFriendlyStateString(int friendly, char* buffer); int GetPetHungryState(int hunger); @@ -899,7 +899,7 @@ public: bool IsPlayerPerformerJob(int job) const; bool IsSpecialMonsterJob(int job) const; bool IsRestrictedCharacterSlot(int value) const; - bool ResetUnknownState(); + bool ResetCharacterSlotState(); __declspec(noinline) bool IsSecondJob(int job); void UpdateBodyStyle(int job, int style, int renderJob); std::string GetBodyJobName(int job); @@ -918,7 +918,7 @@ public: void LoadExternalSettings(); void ReloadLanguageTables(); bool AddInventoryItem(const ITEM_INFO& item, unsigned char refresh); - void AddShopItem(const RawItemBasic& item, int quantity, std::uint16_t unknown_006C); + void AddShopItem(const RawItemBasic& item, int quantity, std::uint16_t padding_006C); void AddShopItem(const RawItemBasic& item, int mode); bool AddMerchantPurchaseSavedItem(const ITEM_INFO& item, unsigned char alternate, unsigned char refresh); bool AddMerchantShopItem(const ITEM_INFO& item); @@ -965,7 +965,7 @@ public: void ClearCartItems(); void CopyItems1740To1750(); void CopyItems1760To1770(); - std::pair FindMerchantMyShopItem(const ITEM_INFO& item, unsigned char unknown); + std::pair FindMerchantMyShopItem(const ITEM_INFO& item, unsigned char wholeItem); void ClearMiniPartyRecords(); void ResetStatBonuses(); void ResetHotkeyDescriptions(); @@ -1132,10 +1132,10 @@ public: ITEM_INFO GetAlternateEquippedItemAt(int index) const; int GetItem1718QuantityByItemId(const ITEM_INFO& item) const; int GetItem1718QuantityOf(const ITEM_INFO& item) const; - std::uint16_t GetItem1718Unknown006CByItemId(const ITEM_INFO& item) const; - std::uint16_t GetItem1718Unknown006COf(const ITEM_INFO& item) const; - std::uint16_t SumItem1720Unknown006CByItemId() const; - std::uint16_t SumItem1720Unknown006C() const; + std::uint16_t GetShopItemPriceFactorByItemId(const ITEM_INFO& item) const; + std::uint16_t GetShopItemPriceFactor(const ITEM_INFO& item) const; + std::uint16_t SumPurchasePriceFactorByItemId() const; + std::uint16_t SumPurchasePriceFactor() const; ITEM_INFO FindItem1720ByItemId(const char* itemId) const; ITEM_INFO GetItem1720At(int index) const; int GetItem1720QuantityByItemId(const char* itemId) const; @@ -1213,7 +1213,7 @@ public: void SetHomunSkillLevel(int skillId, int level); void UpdateInventoryItem(const ITEM_INFO& item, unsigned char refresh); void SetMercSkillLevel(int skillId, int level); - void SetItem1768Unknown0014(int index, std::uint32_t value); + void SetMerchantPurchaseSavedPrice(int index, std::uint32_t value); void AddMiniPartyRecord(int id, std::uint32_t value); void SetExchangeMoney(int value); void SetOtherExchangeMoney(int value); diff --git a/Source/Client/SessionState.cpp b/Source/Client/SessionState.cpp index d0f99fa58..d682a373b 100644 --- a/Source/Client/SessionState.cpp +++ b/Source/Client/SessionState.cpp @@ -356,7 +356,7 @@ void CSession::ResolvePendingActorName(std::uint32_t id, const char* name) { // OFFSET: 0x00E1A5E0 // FUNCTION: fn_23849 -void CSession::InitUnknownMapTables() { +void CSession::InitSkillEffectIds() { int key; this->skillEffectIds.clear(); diff --git a/Source/Client/Stove/StoveMgr.cpp b/Source/Client/Stove/StoveMgr.cpp index 87a172fbd..791bebbc3 100644 --- a/Source/Client/Stove/StoveMgr.cpp +++ b/Source/Client/Stove/StoveMgr.cpp @@ -36,7 +36,7 @@ void OnStoveAllProductsFetched(Stove::PCSDK::CallbackResult callbackResult, cons void OnStoveInitialized(Stove::PCSDK::CallbackResult callbackResult); void OnStoveShutdown(Stove::PCSDK::CallbackResult callbackResult, Stove::PCSDK::Base::StovePCShutdown shutdown); void OnStovePurchaseStarted(Stove::PCSDK::CallbackResult callbackResult, Stove::PCSDK::IAP::StovePCPurchaseResult purchaseResult); -void OnStovePurchaseConfirmed(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int unknown1, unsigned int count, int unknown2, int unknown3); +void OnStovePurchaseConfirmed(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int productCount, unsigned int count, int remainingCount, int resultCode); // STRING: st_01259 const wchar_t g_stoveCategoryIdA[] = L"44C71118750747D"; @@ -153,7 +153,7 @@ struct CategoryProductsCallback { }; struct ConfirmPurchaseCallback { - void operator()(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int unknown1, unsigned int count, int unknown2, int unknown3) const; + void operator()(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int productCount, unsigned int count, int remainingCount, int resultCode) const; }; // OFFSET: 0x0063A780 @@ -188,8 +188,8 @@ void OnStovePurchaseStarted(Stove::PCSDK::CallbackResult callbackResult, Stove:: // OFFSET: 0x0063A9D0 // FUNCTION: fn_04776 -void OnStovePurchaseConfirmed(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int unknown1, unsigned int count, int unknown2, int unknown3) { - ConfirmPurchaseCallback()(callbackResult, purchased, unknown1, count, unknown2, unknown3); +void OnStovePurchaseConfirmed(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int productCount, unsigned int count, int remainingCount, int resultCode) { + ConfirmPurchaseCallback()(callbackResult, purchased, productCount, count, remainingCount, resultCode); } // OFFSET: 0x0063AA50 @@ -474,8 +474,8 @@ EncryptedName<129, 0x2D3B15774149D5DDULL>& PurchaseCheckingMessage::operator()() // OFFSET: 0x0063D5D0 // FUNCTION: fn_04791 -void ConfirmPurchaseCallback::operator()(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int unknown1, unsigned int count, int unknown2, - int unknown3) const { +void ConfirmPurchaseCallback::operator()(Stove::PCSDK::CallbackResult callbackResult, bool purchased, int productCount, unsigned int count, int remainingCount, + int resultCode) const { g_stoveWaitingCallback = false; if (callbackResult.GetResult().IsSuccessful()) { if (count != 0 && purchased == true) { diff --git a/Source/Client/Stove/StovePCSDK.h b/Source/Client/Stove/StovePCSDK.h index a81474b5a..7300777c0 100644 --- a/Source/Client/Stove/StovePCSDK.h +++ b/Source/Client/Stove/StovePCSDK.h @@ -10,7 +10,7 @@ namespace Stove::PCSDK { bool IsSuccessful() const; - /* 0000 */ std::uint8_t unknown_0000[12]; + /* 0000 */ std::uint8_t padding_0000[12]; }; struct __declspec(dllimport) CallbackResult { @@ -19,7 +19,7 @@ namespace Stove::PCSDK { Result GetResult() const; - /* 0000 */ std::uint8_t unknown_0000[28]; + /* 0000 */ std::uint8_t padding_0000[28]; }; namespace Base { @@ -36,7 +36,7 @@ namespace Stove::PCSDK { StovePCShutdown(const StovePCShutdown& other); ~StovePCShutdown(); - /* 0000 */ void* unknown_0000[3]; + /* 0000 */ void* padding_0000[3]; }; struct __declspec(dllimport) StovePCInitializeParam { @@ -45,7 +45,7 @@ namespace Stove::PCSDK { void SetEnvironment(const wchar_t* environment); void SetApplicationKey(const wchar_t* applicationKey); - /* 0000 */ std::uint8_t unknown_0000[36]; + /* 0000 */ std::uint8_t padding_0000[36]; }; struct __declspec(dllimport) StovePCUser { @@ -55,7 +55,7 @@ namespace Stove::PCSDK { std::uint64_t GetMemberNumber() const; std::uint64_t GetGameUserId() const; - /* 0000 */ void* unknown_0000[5]; + /* 0000 */ void* padding_0000[5]; }; } @@ -70,7 +70,7 @@ namespace Stove::PCSDK { StovePCPaymentOption(const StovePCPaymentOption& other); void SetOperation(StovePCPaymentOperation operation); - /* 0000 */ void* unknown_0000[6]; + /* 0000 */ void* padding_0000[6]; }; struct __declspec(dllimport) StovePCTermsOption : StovePCPaymentOption { @@ -84,7 +84,7 @@ namespace Stove::PCSDK { void SetPageNumber(int pageNumber); void SetPageSize(int pageSize); - /* 0000 */ void* unknown_0000[3]; + /* 0000 */ void* padding_0000[3]; }; struct StovePCPurchaseOption : StovePCPaymentOption { @@ -103,7 +103,7 @@ namespace Stove::PCSDK { std::int64_t GetProductId() const; void SetProductId(std::int64_t productId); - /* 0000 */ void* unknown_0000[5]; + /* 0000 */ void* padding_0000[5]; }; struct __declspec(dllimport) StovePCStartPurchaseParam { @@ -113,7 +113,7 @@ namespace Stove::PCSDK { void SetOrderProduct(int index, const StovePCOrderProduct* orderProduct); void SetPurchaseOption(StovePCPurchaseOption option); - /* 0000 */ void* unknown_0000[10]; + /* 0000 */ void* padding_0000[10]; }; struct __declspec(dllimport) StovePCPurchasedProduct { @@ -132,14 +132,14 @@ namespace Stove::PCSDK { std::int64_t GetSaleBeginDate() const; std::int64_t GetSaleEndDate() const; - /* 0000 */ std::uint8_t unknown_0000[156]; + /* 0000 */ std::uint8_t padding_0000[156]; }; struct __declspec(dllimport) StovePCPurchaseResult { StovePCPurchaseResult(const StovePCPurchaseResult& other); ~StovePCPurchaseResult(); - /* 0000 */ std::uint8_t unknown_0000[48]; + /* 0000 */ std::uint8_t padding_0000[48]; }; } } diff --git a/Source/Contents/AchievementMgr.cpp b/Source/Contents/AchievementMgr.cpp index cbf79df0b..6ffbc652f 100644 --- a/Source/Contents/AchievementMgr.cpp +++ b/Source/Contents/AchievementMgr.cpp @@ -277,13 +277,13 @@ bool CAchievementMgr::LoadAchievementInfo() { // OFFSET: 0x0066ED90 // FUNCTION: fn_05323 -std::pair CAchievementMgr::InsertAchieveInfo(int id, std::string title, std::string unknown0018, std::string description, int points) { +std::pair CAchievementMgr::InsertAchieveInfo(int id, std::string title, std::string summaryText, std::string description, int points) { if (this->achievements.find(id) != this->achievements.end()) { const std::string message = FormatOwnedString("duplicate achievement info [%d]", id); return std::make_pair(false, message); } - if (this->achievements.insert(std::pair(id, AchievementInfo(title, unknown0018, description, points))).second) { + if (this->achievements.insert(std::pair(id, AchievementInfo(title, summaryText, description, points))).second) { return std::make_pair(true, "good"); } @@ -293,7 +293,7 @@ std::pair CAchievementMgr::InsertAchieveInfo(int id, std::str // OFFSET: 0x0066F170 // FUNCTION: fn_05324 -std::pair CAchievementMgr::InsertAchieveResource(int id, std::string text, int unknown0018, int unknown001C) { +std::pair CAchievementMgr::InsertAchieveResource(int id, std::string text, int targetCount, int conditionId) { const auto found = this->achievements.find(id); if (found == this->achievements.end()) { const std::string message = FormatOwnedString("achievement info [%d] cannot be find", id); @@ -303,7 +303,7 @@ std::pair CAchievementMgr::InsertAchieveResource(int id, std: std::vector& rewards = found->second.rewards; const auto end = rewards.end(); if (std::find_if(rewards.begin(), end, [text](const AchievementReward& reward) { return text.compare(reward.text) == 0; }) == end) { - const AchievementReward reward(text, unknown0018, unknown001C); + const AchievementReward reward(text, targetCount, conditionId); rewards.push_back(reward); return std::make_pair(true, "good"); } @@ -415,10 +415,10 @@ int CAchievementMgr::L_InsertAchieveInfo(lua_State* state) { } else { const int id = static_cast(lua_tonumber(state, -5)); const std::string title = lua_tostring(state, -4); - const std::string unknown0018 = lua_tostring(state, -3); + const std::string summaryText = lua_tostring(state, -3); const std::string description = lua_tostring(state, -2); const std::pair result = - g_achievementMgr->InsertAchieveInfo(id, title, unknown0018, description, static_cast(lua_tonumber(state, -1))); + g_achievementMgr->InsertAchieveInfo(id, title, summaryText, description, static_cast(lua_tonumber(state, -1))); if (!result.first) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertAchieveInfo : %s", result.second.c_str())); @@ -448,9 +448,9 @@ int CAchievementMgr::L_InsertAchieveResource(lua_State* state) { } else { const int id = static_cast(lua_tonumber(state, -4)); const std::string text = lua_tostring(state, -3); - const int unknown0018 = static_cast(lua_tonumber(state, -2)); + const int targetCount = static_cast(lua_tonumber(state, -2)); const std::pair result = - g_achievementMgr->InsertAchieveResource(id, text, unknown0018, static_cast(lua_tonumber(state, -1))); + g_achievementMgr->InsertAchieveResource(id, text, targetCount, static_cast(lua_tonumber(state, -1))); if (!result.first) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertAchieveResource : %s", result.second.c_str())); diff --git a/Source/Contents/AchievementMgr.h b/Source/Contents/AchievementMgr.h index 3579d09bd..b6c986dc7 100644 --- a/Source/Contents/AchievementMgr.h +++ b/Source/Contents/AchievementMgr.h @@ -10,10 +10,10 @@ struct lua_State; struct AchievementReward { // INLINED - AchievementReward(std::string text, int unknown0018, int unknown001C) { + AchievementReward(std::string text, int targetCount, int conditionId) { this->text = text; - this->targetCount = unknown0018; - this->conditionId = unknown001C; + this->targetCount = targetCount; + this->conditionId = conditionId; } /* 0000 */ std::string text; @@ -26,8 +26,8 @@ struct AchievementInfo { AchievementInfo() { } // INLINED - AchievementInfo(std::string title, std::string unknown0018, std::string description, int points) - : title(title), summaryText(unknown0018), description(description), points(points) { + AchievementInfo(std::string title, std::string summaryText, std::string description, int points) + : title(title), summaryText(summaryText), description(description), points(points) { } /* 0000 */ std::string title; @@ -73,8 +73,8 @@ public: int GetAchievementCount(int group, int index); int GetCompletedCount(int group, int index); bool FindTab(int id, int& group, int& index); - std::pair InsertAchieveInfo(int id, std::string title, std::string unknown0018, std::string description, int points); - std::pair InsertAchieveResource(int id, std::string text, int unknown0018, int unknown001C); + std::pair InsertAchieveInfo(int id, std::string title, std::string padding_0018, std::string description, int points); + std::pair InsertAchieveResource(int id, std::string text, int padding_0018, int padding_001C); std::pair InsertAchieveRewardBuff(int id, int value); std::pair InsertAchieveRewardItem(int id, int value); std::pair InsertAchieveRewardTitle(int id, int value); diff --git a/Source/Contents/Actors/CharacterRender.cpp b/Source/Contents/Actors/CharacterRender.cpp index 570a7c1d0..2d28ee798 100644 --- a/Source/Contents/Actors/CharacterRender.cpp +++ b/Source/Contents/Actors/CharacterRender.cpp @@ -49,7 +49,7 @@ CCharacterRender::CCharacterRender(int width, int renderHeight) : headJob(0), lowerHeadgear(0), upperHeadgear(0), middleHeadgear(0), lowerHeadgearLocation(0), upperHeadgearLocation(0), middleHeadgearLocation(0), madogearType(0), riding(0), bodyCostume(0), viewportOffsetX(0), viewportOffsetY(80.0f), bodyBlend(-1), bodyCellX(-1), bodyCellY(-1), viewportWidth(width), viewportHeight(renderHeight), cameraDistance(400.0f), cameraPitch(-45.0f), - cameraYaw(0.0f), unknown_007C(0.0f), unknown_0080(0.0f), unknown_0084(0.0f), cameraUpX(0.0f), cameraUpY(1.0f), cameraUpZ(0), + cameraYaw(0.0f), padding_007C(0.0f), padding_0080(0.0f), padding_0084(0.0f), cameraUpX(0.0f), cameraUpY(1.0f), cameraUpZ(0), screenX(0), screenY(0), robe(0), isHelmRobe(0) { this->positionX = 0; this->positionY = 0; diff --git a/Source/Contents/Actors/CharacterRender.h b/Source/Contents/Actors/CharacterRender.h index ffd75e450..58a424d2e 100644 --- a/Source/Contents/Actors/CharacterRender.h +++ b/Source/Contents/Actors/CharacterRender.h @@ -66,9 +66,9 @@ public: /* 0070 */ float cameraDistance; /* 0074 */ float cameraPitch; /* 0078 */ float cameraYaw; - /* 007C */ float unknown_007C; - /* 0080 */ float unknown_0080; - /* 0084 */ float unknown_0084; + /* 007C */ float padding_007C; + /* 0080 */ float padding_0080; + /* 0084 */ float padding_0084; /* 0088 */ float cameraUpX; /* 008C */ float cameraUpY; /* 0090 */ int cameraUpZ; diff --git a/Source/Contents/Actors/EffectActors.h b/Source/Contents/Actors/EffectActors.h index 543375127..79c3ada82 100644 --- a/Source/Contents/Actors/EffectActors.h +++ b/Source/Contents/Actors/EffectActors.h @@ -27,7 +27,7 @@ public: void Render(int argument) override; /* 0138 */ float spriteOffset; - /* 013C */ std::uint32_t unknown_013C; + /* 013C */ std::uint32_t padding_013C; }; class CMasterChaser : public CRenderObject { @@ -38,7 +38,7 @@ public: void ClearChaseState(); /* 0138 */ std::uint32_t chaseState; - /* 013C */ std::uint32_t unknown_013C; + /* 013C */ std::uint32_t padding_013C; }; class CNumEffect : public CRenderObject { diff --git a/Source/Contents/Actors/GameActor.h b/Source/Contents/Actors/GameActor.h index 5b2b84fd5..0ee2fc8ab 100644 --- a/Source/Contents/Actors/GameActor.h +++ b/Source/Contents/Actors/GameActor.h @@ -21,7 +21,7 @@ enum { }; struct ActorHitInfo { - /* 0000 */ int unknown_0000; + /* 0000 */ int padding_0000; /* 0004 */ int damage; /* 0008 */ int extraDamage; /* 000C */ int type; @@ -83,11 +83,11 @@ public: /* 018C */ int actorTitleWindow; /* 0190 */ unsigned char hitWaveName[0x80]; /* 0210 */ std::uint16_t characterLevel; - /* 0212 */ unsigned char unknown_0212[0x02]; + /* 0212 */ unsigned char padding_0212[0x02]; /* 0214 */ vector3d accel; /* 0220 */ MovementRouteInterpolation route; /* 0238 */ unsigned char isNeverAnimation; - /* 0239 */ unsigned char unknown_0239[0x03]; + /* 0239 */ unsigned char padding_0239[0x03]; /* 023C */ int pathStartCell; /* 0240 */ float dist; /* 0244 */ std::uint32_t lastProcessStateTime; @@ -114,13 +114,13 @@ public: /* 02B0 */ int willBeDead; /* 02B4 */ int hasLevelAura; /* 02B8 */ unsigned char levelAuraType; - /* 02B9 */ unsigned char unknown_02B9[0x03]; + /* 02B9 */ unsigned char padding_02B9[0x03]; /* 02BC */ int bodyState; /* 02C0 */ std::uint32_t stateFlags; /* 02C4 */ int effectState; /* 02C8 */ int healthState; /* 02CC */ unsigned char isRiding; - /* 02CD */ unsigned char unknown_02CD[0x03]; + /* 02CD */ unsigned char padding_02CD[0x03]; /* 02D0 */ float damageDestX; /* 02D4 */ float damageDestZ; /* 02D8 */ int effectLaunchCnt; @@ -136,12 +136,12 @@ public: /* 0300 */ int hpGaugeWindow; /* 0304 */ unsigned char hpGaugeFlags; /* 0305 */ unsigned char hasSp; - /* 0306 */ unsigned char unknown_0306[2]; + /* 0306 */ unsigned char padding_0306[2]; /* 0308 */ int spGaugeValue; /* 030C */ int homunAI; /* 0310 */ int merAI; /* 0314 */ unsigned char objectType; - /* 0315 */ unsigned char unknown_0315[3]; + /* 0315 */ unsigned char padding_0315[3]; /* 0318 */ float homunMsg[6]; /* 0330 */ float homunResMsg[6]; /* 0348 */ float merMsg[6]; @@ -158,13 +158,13 @@ public: /* 03D8 */ int secondFollowerEffect; /* 03DC */ int mountedState; union { /* 03E0 */ std::uint16_t actorFlags; struct { unsigned char storedActorEntry; /* 03E1 */ bool modelReady; }; }; - /* 03E2 */ unsigned char unknown_03E2[0x06]; + /* 03E2 */ unsigned char padding_03E2[0x06]; /* 03E8 */ std::int64_t maximumValue; /* 03F0 */ vector3d positionDelta; /* 03FC */ std::set exclusiveEffects; /* 0404 */ int shapeShift; /* 0408 */ int savedShapeShift; - /* 040C */ unsigned char unknown_040C[0x04]; + /* 040C */ unsigned char padding_040C[0x04]; int Get8Dir(float angle) override; void SetRenderInfo(const float* bounds, float x, float y) override; diff --git a/Source/Contents/Actors/GameObject.cpp b/Source/Contents/Actors/GameObject.cpp index e2acc7a41..a77c3500c 100644 --- a/Source/Contents/Actors/GameObject.cpp +++ b/Source/Contents/Actors/GameObject.cpp @@ -3375,7 +3375,7 @@ void CGameActor::SendMsg(CGameObject* sender, int message, int a, int b, int c, this->LaunchEffect(0x220, vector3d{0.0f, 0.0f, 0.0f}, 0.0f); } break; - case EFST_UNKNOWN_NAME: + case EFST_SHOW_HP: this->hasHp = (static_cast(e) << 32 | static_cast(d)) != 0; break; case EFST_HAT_EFFECT: diff --git a/Source/Contents/Actors/GndRiser.h b/Source/Contents/Actors/GndRiser.h index 91a2b83e8..7ee3a2be6 100644 --- a/Source/Contents/Actors/GndRiser.h +++ b/Source/Contents/Actors/GndRiser.h @@ -17,7 +17,7 @@ public: /* 0158 */ int lifetime; /* 015C */ int screenX; /* 0160 */ int screenY; - /* 0164 */ int unknown_0164; + /* 0164 */ int padding_0164; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Actors/GrannyGameActor.h b/Source/Contents/Actors/GrannyGameActor.h index e27e4d898..f6831236b 100644 --- a/Source/Contents/Actors/GrannyGameActor.h +++ b/Source/Contents/Actors/GrannyGameActor.h @@ -45,10 +45,10 @@ public: /* 050C */ granny_system_clock clock; /* 051C */ granny_system_clock lastClock; /* 052C */ float motionProgress; - /* 0530 */ unsigned char unknown_0530[0x08]; + /* 0530 */ unsigned char padding_0530[0x08]; /* 0538 */ float angle; /* 053C */ unsigned char alpha; - /* 053D */ unsigned char unknown_053D[0x03]; + /* 053D */ unsigned char padding_053D[0x03]; /* 0540 */ unsigned brightness; /* 0544 */ int motion; /* 0548 */ unsigned char currentFrame[0x04]; @@ -57,7 +57,7 @@ public: /* 0654 */ int cellTexture; /* 0658 */ granny_control* controls[20]; /* 06A8 */ unsigned char initializeFacing; - /* 06A9 */ unsigned char unknown_06A9[0x03]; + /* 06A9 */ unsigned char padding_06A9[0x03]; /* 06AC */ CTexture* meshTextures[30]; /* 0724 */ std::uint16_t* meshIndices[30]; /* 079C */ int meshTriangleCounts[30]; diff --git a/Source/Contents/Actors/MousePointer.h b/Source/Contents/Actors/MousePointer.h index e2625e23d..8f5c6f791 100644 --- a/Source/Contents/Actors/MousePointer.h +++ b/Source/Contents/Actors/MousePointer.h @@ -14,7 +14,7 @@ public: void SendMsg(CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m) override; /* 0138 */ int m_remainingFrames; - /* 013C */ int unknown_013C; + /* 013C */ int padding_013C; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Actors/Npc.h b/Source/Contents/Actors/Npc.h index f589b6e2c..f81e7f386 100644 --- a/Source/Contents/Actors/Npc.h +++ b/Source/Contents/Actors/Npc.h @@ -44,7 +44,7 @@ public: /* 0438 */ int attachedEffectId; /* 0438 */ std::int16_t minimapMarkerCell[2]; }; - /* 043C */ int unknown_043C; + /* 043C */ int padding_043C; }; class CCharacterNpc : public CNpc { @@ -72,9 +72,9 @@ public: /* 0440 */ float hallucinationOffset; /* 0444 */ int fadeStep; - /* 0448 */ int unknown_0448; - /* 044C */ int unknown_044C; - /* 0450 */ int unknown_0450; + /* 0448 */ int padding_0448; + /* 044C */ int padding_044C; + /* 0450 */ int padding_0450; /* 0454 */ int processCount; }; @@ -89,7 +89,7 @@ public: void Render(int argument) override; /* 0440 */ std::uint32_t processCount; - /* 0444 */ int unknown_0444; + /* 0444 */ int padding_0444; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Actors/Pc.h b/Source/Contents/Actors/Pc.h index 54f236357..b254c6d60 100644 --- a/Source/Contents/Actors/Pc.h +++ b/Source/Contents/Actors/Pc.h @@ -103,11 +103,11 @@ public: void DrawBody(int argument, int layer, const float* position, float x, float y, float distanceScale, float scale, float depth); void RenderOverlaySprite(const float* matrix, int); void UpdateGaugeWindow(); - void DrawLayers(const float* matrix, int unknown0030, char blendVariant); + void DrawLayers(const float* matrix, int padding_0030, char blendVariant); float* GetExtent(float* extent) const override; - /* 0410 */ unsigned char unknown_0410[4]; + /* 0410 */ unsigned char padding_0410[4]; /* 0414 */ CMsgEffect* msgEffect; /* 0418 */ std::string imfName; /* 0430 */ int honor; @@ -134,7 +134,7 @@ public: /* 04A0 */ int blend; /* 04A4 */ int layerCellX; /* 04A8 */ int layerCellY; - /* 04AC */ std::map> unknown_04AC; + /* 04AC */ std::map> padding_04AC; /* 04B4 */ std::vector equipSprites; /* 04C0 */ std::vector equipActions; /* 04CC */ int pkState; @@ -142,10 +142,10 @@ public: /* 04D4 */ int appearanceJob; /* 04D8 */ unsigned char alternateDoramAppearance[1]; /* 04D9 */ bool isHelmRobe; - /* 04DA */ unsigned char unknown_04DA[2]; + /* 04DA */ unsigned char padding_04DA[2]; /* 04DC */ int madogearType; /* 04E0 */ bool arrowEffectSuppressed; - /* 04E1 */ unsigned char unknown_04E1[0x03]; + /* 04E1 */ unsigned char padding_04E1[0x03]; /* 04E4 */ float extentLeft; /* 04E8 */ float extentTop; /* 04EC */ float extentRight; @@ -181,7 +181,7 @@ public: void Render(int argument) override; /* 0510 */ CPc* sourcePc; - /* 0514 */ int unknown_0514; + /* 0514 */ int padding_0514; }; class CHalluPC2 : public CPc { @@ -195,7 +195,7 @@ public: void Render(int argument) override; /* 0510 */ CPc* sourcePc; - /* 0514 */ int unknown_0514; + /* 0514 */ int padding_0514; }; class CPlayer : public CPc { @@ -294,14 +294,14 @@ public: /* 0430 */ int headDir; /* 0434 */ int head; /* 0438 */ int headPalette; - /* 043C */ unsigned char unknown_043C[4]; + /* 043C */ unsigned char padding_043C[4]; /* 0440 */ int weapon; /* 0444 */ int secondaryWeapon; /* 0448 */ int accessory; /* 044C */ int accessory2; /* 0450 */ int accessory3; /* 0454 */ int shield; - /* 0458 */ unsigned char unknown_0458[8]; + /* 0458 */ unsigned char padding_0458[8]; /* 0460 */ std::string headPaletteName; /* 0478 */ UIWindow* gaugeWindow; /* 047C */ int pkRank; @@ -320,26 +320,26 @@ public: /* 0F2C */ int baseAnimation; /* 0F30 */ float angle; /* 0F34 */ unsigned char alpha; - /* 0F35 */ unsigned char unknown_0F35[0x03]; + /* 0F35 */ unsigned char padding_0F35[0x03]; /* 0F38 */ unsigned brightness; /* 0F3C */ int motion; /* 0F40 */ unsigned char currentFrame[4]; /* 0F44 */ char modelName[0x104]; - /* 1048 */ unsigned char unknown_1048[8]; + /* 1048 */ unsigned char padding_1048[8]; /* 1050 */ granny_control* controls[20]; /* 10A0 */ unsigned char snapFacing; - /* 10A1 */ unsigned char unknown_10A1[3]; + /* 10A1 */ unsigned char padding_10A1[3]; /* 10A4 */ int renderFrame; /* 10A8 */ CTexture* meshTextures[10][30]; /* 1558 */ std::uint16_t* meshIndices[10][30]; /* 1A08 */ int meshTriangleCounts[10][30]; /* 1EB8 */ matrix meshTransforms[30]; - /* 2458 */ unsigned char unknown_2458[0xF8]; + /* 2458 */ unsigned char padding_2458[0xF8]; /* 2550 */ granny_world_pose* worldPose; /* 2554 */ CTexture* shadowTexture; /* 2558 */ std::vector attachmentPositions; /* 2564 */ int attachLayer; - /* 2568 */ int unknown_2568; + /* 2568 */ int padding_2568; /* 256C */ matrix attachTransform; }; @@ -392,6 +392,6 @@ static_assert(offsetof(CPc, arrowEffectSuppressed) == 0x4E0); #endif extern unsigned char g_statusRefreshSuppressed; -extern bool g_unknown173AD3F; +extern bool g_moveRequestPending; #endif diff --git a/Source/Contents/Actors/Player.cpp b/Source/Contents/Actors/Player.cpp index ecae23030..d272c47ba 100644 --- a/Source/Contents/Actors/Player.cpp +++ b/Source/Contents/Actors/Player.cpp @@ -889,7 +889,7 @@ void CPc::RenderBodyOutline(int layer, const float* position, float x, float y, this->RaiseTransformPriority((box[3] - box[1]) / 4); quad.image = image; quad.color = color; - if (this->render.unknown_0130[0] == 1) { + if (this->render.translucentOther[0] == 1) { quad.color = color & 0xFFFFFF | 0x46000000; } @@ -2046,7 +2046,7 @@ void CPc::DrawBody(int, int layer, const float* position, float x, float y, floa } this->RaiseTransformPriority((box[3] - box[1]) / 4); - if (this->render.unknown_0130[0] == 1) { + if (this->render.translucentOther[0] == 1) { quad.color = quad.color & 0xFFFFFF | 0x46000000; } @@ -2302,9 +2302,9 @@ void CPc::Render(int argument) { } } - this->render.unknown_0130[0] = 0; + this->render.translucentOther[0] = 0; if (g_serviceOptions.Get(0x109) && this->render.accountId != g_session.m_aid) { - this->render.unknown_0130[0] = 1; + this->render.translucentOther[0] = 1; } const float* matrix = reinterpret_cast(argument); @@ -2354,9 +2354,9 @@ void CPc::Render(int argument) { // OFFSET: 0x00DAD8C0 // FUNCTION: fn_22599 -void CPc::DrawLayers(const float* matrix, int unknown0030, char blendVariant) { +void CPc::DrawLayers(const float* matrix, int blendMode, char blendVariant) { SpriteLayerRenderer renderer(this); - renderer.Render(matrix, unknown0030, blendVariant); + renderer.Render(matrix, blendMode, blendVariant); } // OFFSET: 0x00DABF50 @@ -3831,7 +3831,7 @@ void CPlayer::ReapplySkillEffects() { } // GLOBAL: gl_25218 -bool g_unknown173AD3F; +bool g_moveRequestPending; struct PlayerSkillRequest { int skill; @@ -3913,7 +3913,7 @@ void CPlayer::SendMsg( } break; case AM_REQ_MOVE_PRIMITIVE: - g_unknown173AD3F = false; + g_moveRequestPending = false; if (timeGetTime() > this->standTick + 350) { this->standTick = timeGetTime(); mode->SendMsg(MM_REQUEST_MOVE, b, d, 0, 0); diff --git a/Source/Contents/Actors/RenderObject.cpp b/Source/Contents/Actors/RenderObject.cpp index f1bbed097..8afc14f1e 100644 --- a/Source/Contents/Actors/RenderObject.cpp +++ b/Source/Contents/Actors/RenderObject.cpp @@ -144,11 +144,11 @@ public: /* 0118 */ granny_system_clock clock; /* 0128 */ granny_system_clock startClock; /* 0138 */ float animationTime; - /* 013C */ unsigned char unknown_013C[4]; + /* 013C */ unsigned char padding_013C[4]; /* 0140 */ int tick; /* 0144 */ float angle; /* 0148 */ unsigned char alpha; - /* 0149 */ unsigned char unknown_0149[3]; + /* 0149 */ unsigned char padding_0149[3]; /* 014C */ unsigned brightness; /* 0150 */ char name[0x108]; }; @@ -2682,11 +2682,11 @@ void CCharacterNpc::Render(int) { struct CharacterNpcViewInfo { /* 0000 */ int aid; /* 0004 */ int job; - /* 0008 */ int unknown_0008[10]; + /* 0008 */ int padding_0008[10]; /* 0030 */ int standAccessory; - /* 0034 */ int unknown_0034; + /* 0034 */ int padding_0034; /* 0038 */ int moveAccessory; - /* 003C */ int unknown_003C[4]; + /* 003C */ int padding_003C[4]; /* 004C */ int standAccessory2; /* 0050 */ int standAccessory3OrMoveAccessory2; /* 0054 */ int standBodyPaletteOrMoveAccessory3; @@ -2694,7 +2694,7 @@ struct CharacterNpcViewInfo { /* 005C */ int moveHeadPalette; /* 0060 */ int guildId; /* 0064 */ int guildEmblemVersion; - /* 0068 */ int unknown_0068[2]; + /* 0068 */ int padding_0068[2]; /* 0070 */ int robe; /* 0074 */ int robeAlt; /* 0078 */ int standBodyStyle; @@ -3629,8 +3629,8 @@ void CGameActor::ProcessHitMessage(CGameObject*, const ActorHitInfo* info, int, int damage = info->damage; int hitCount = info->hitCount; const int extraDamage = info->extraDamage; - const int unknown_001C = info->cellX; - const int unknown_0020 = info->cellY; + const int cellX = info->cellX; + const int cellY = info->cellY; const int attackSpeed = info->attackSpeed; const int motionSpeed = info->motionSpeed; @@ -3762,8 +3762,8 @@ void CGameActor::ProcessHitMessage(CGameObject*, const ActorHitInfo* info, int, message.targetAid = this->hitTargetAid; message.time = timeGetTime() + delay; message.attackerAid = this->render.accountId; - message.cellX = unknown_001C; - message.cellY = unknown_0020; + message.cellX = cellX; + message.cellY = cellY; message.hitEffect = flag; message.effectId = effectId; message.blueDamage = info->blueDamage; @@ -5311,8 +5311,8 @@ void CGameActor::ProcessSkillMessage(CGameObject*, const ActorSkillInfo* info, i int hitCount = info->hitCount; const int skillId = info->skillId; int type = info->type; - const int unknown_001C = info->cellX; - const int unknown_0020 = info->cellY; + const int cellX = info->cellX; + const int cellY = info->cellY; const int attackSpeed = info->attackSpeed; const int motionSpeed = info->motionSpeed; if (hitCount <= 0 || hitCount > 36) { @@ -5418,8 +5418,8 @@ void CGameActor::ProcessSkillMessage(CGameObject*, const ActorSkillInfo* info, i message.damage = damage; message.time = timeGetTime() + delay; message.attackerAid = this->render.accountId; - message.cellX = unknown_001C; - message.cellY = unknown_0020; + message.cellX = cellX; + message.cellY = cellY; message.hitEffect = effect; message.effectId = followEffect; message.monsterValue = level; @@ -5443,8 +5443,8 @@ void CGameActor::ProcessSkillMessage(CGameObject*, const ActorSkillInfo* info, i message.damage = damage; message.time = timeGetTime() + delay; message.attackerAid = this->render.accountId; - message.cellX = unknown_001C; - message.cellY = unknown_0020; + message.cellX = cellX; + message.cellY = cellY; message.hitEffect = -1; message.effectId = -1; message.monsterValue = level; @@ -5689,8 +5689,8 @@ void CGameActor::ProcessSkillMessage(CGameObject*, const ActorSkillInfo* info, i message.damage = damage; message.time = timeGetTime() + delay; message.attackerAid = this->render.accountId; - message.cellX = unknown_001C; - message.cellY = unknown_0020; + message.cellX = cellX; + message.cellY = cellY; message.hitEffect = effect; message.effectId = followEffect; message.monsterValue = level; diff --git a/Source/Contents/Actors/RenderObjectState.cpp b/Source/Contents/Actors/RenderObjectState.cpp index 0dec737bc..acb938a1b 100644 --- a/Source/Contents/Actors/RenderObjectState.cpp +++ b/Source/Contents/Actors/RenderObjectState.cpp @@ -93,7 +93,7 @@ void RenderObjectState::Reset() { this->hoverAngle = 0; this->hoverHeight = 0; this->fontSequenceState = 0; - this->unknown_0100 = 0; + this->padding_0100 = 0; this->accountId = 0; this->specialMotionLocked = 0; this->frameSequenceActive = 0; diff --git a/Source/Contents/Actors/RenderObjectState.h b/Source/Contents/Actors/RenderObjectState.h index 8bcbf1e9a..1704af1e0 100644 --- a/Source/Contents/Actors/RenderObjectState.h +++ b/Source/Contents/Actors/RenderObjectState.h @@ -59,7 +59,7 @@ struct RenderObjectState { /* 00A4 */ std::uint16_t visibilityState; /* 00A4 */ unsigned char visibilityOptions[2]; }; - /* 00A6 */ unsigned char unknown_00A6[2]; + /* 00A6 */ unsigned char padding_00A6[2]; /* 00A8 */ std::uint32_t isCharacter; /* 00AC */ int screenX; /* 00B0 */ int screenY; @@ -73,7 +73,7 @@ struct RenderObjectState { /* 00C3 */ unsigned char sequenceFinishAnimation; /* 00C4 */ unsigned char sequenceFinishFrame; /* 00C5 */ unsigned char sequenceIndex; - /* 00C6 */ unsigned char unknown_00C6[2]; + /* 00C6 */ unsigned char padding_00C6[2]; /* 00C8 */ std::uint32_t frameSequenceActive; /* 00CC */ int sequenceLoop; /* 00D0 */ int sequenceTimed; @@ -92,30 +92,30 @@ struct RenderObjectState { /* 00F0 */ unsigned char pulsePhases[2]; }; /* 00F2 */ unsigned char outlineAlpha; - /* 00F3 */ unsigned char unknown_00F3; + /* 00F3 */ unsigned char padding_00F3; /* 00F4 */ short effectPhase; /* 00F6 */ unsigned char tintPhase; - /* 00F7 */ unsigned char unknown_00F7; + /* 00F7 */ unsigned char runStartTick; /* 00F8 */ short hoverAngle; /* 00FA */ unsigned char hoverHeight; - /* 00FB */ unsigned char unknown_00FB; + /* 00FB */ unsigned char battleTeam; union { /* 00FC */ std::uint32_t fontSequenceState; /* 00FC */ unsigned char fontSequenceBytes[4]; }; - /* 0100 */ unsigned char unknown_0100; - /* 0101 */ unsigned char unknown_0101[3]; + /* 0100 */ unsigned char padding_0100; + /* 0101 */ unsigned char padding_0101[3]; /* 0104 */ CSprRes* sprite; /* 0108 */ CActRes* action; /* 010C */ std::uint32_t spriteJob; /* 0110 */ std::uint32_t accountId; /* 0114 */ unsigned char specialMotionLocked; - /* 0115 */ unsigned char unknown_0115[3]; + /* 0115 */ unsigned char padding_0115[3]; /* 0118 */ CInstantVar instant; /* 0124 */ std::uint32_t blendFlags; /* 0128 */ std::uint32_t hoverOffsetLow; /* 012C */ std::uint32_t hoverOffsetHigh; - /* 0130 */ unsigned char unknown_0130[8]; + /* 0130 */ unsigned char translucentOther[8]; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Actors/Skill.cpp b/Source/Contents/Actors/Skill.cpp index c0bb75936..ba6906394 100644 --- a/Source/Contents/Actors/Skill.cpp +++ b/Source/Contents/Actors/Skill.cpp @@ -354,9 +354,9 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int case AM_SKILL: { const SkillHitMessage* hit = reinterpret_cast(b); const int skillId = hit->skillId; - const int unknown_0014 = hit->monsterValue; - const int unknown_001C = hit->cellX; - const int unknown_0020 = hit->cellY; + const int monsterValue = hit->monsterValue; + const int cellX = hit->cellX; + const int cellY = hit->cellY; const int motionSpeed = hit->motionSpeed; int hitCount = hit->hitCount; if (hitCount == 0) { @@ -447,11 +447,11 @@ void CSkill::SendMsg(CGameObject* sender, int message, int a, int b, int c, int damageMessage.damage = damage; damageMessage.time = timeGetTime(); damageMessage.attackerAid = this->skillAid; - damageMessage.cellX = unknown_001C; - damageMessage.cellY = unknown_0020; + damageMessage.cellX = cellX; + damageMessage.cellY = cellY; damageMessage.hitEffect = effectId; damageMessage.effectId = -1; - damageMessage.monsterValue = unknown_0014; + damageMessage.monsterValue = monsterValue; damageMessage.motionSpeed = static_cast(motionSpeed) / 288.0f; damageMessage.blueDamage = 0; damageMessage.skillId = skillId; diff --git a/Source/Contents/Actors/Skill.h b/Source/Contents/Actors/Skill.h index 70250cdbc..0e2426ff4 100644 --- a/Source/Contents/Actors/Skill.h +++ b/Source/Contents/Actors/Skill.h @@ -31,10 +31,10 @@ public: /* 0420 */ CRagEffect* m_effect; /* 0424 */ int m_effectId; /* 0428 */ bool m_hasEffect; - /* 0429 */ unsigned char unknown_0429[0x03]; + /* 0429 */ unsigned char padding_0429[0x03]; /* 042C */ int range; /* 0430 */ std::vector m_targets; - /* 043C */ int unknown_043C; + /* 043C */ int padding_043C; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/AdventureGuideMgr.cpp b/Source/Contents/AdventureGuideMgr.cpp index 0f5a9a14c..e16a2a68d 100644 --- a/Source/Contents/AdventureGuideMgr.cpp +++ b/Source/Contents/AdventureGuideMgr.cpp @@ -170,9 +170,9 @@ int InsertEpisodeSubMenu(lua_State* state) { const int id = static_cast(lua_tonumber(state, -5)); const int minLevel = static_cast(lua_tonumber(state, -4)); const int maxLevel = static_cast(lua_tonumber(state, -3)); - const int unknown = static_cast(lua_tonumber(state, -2)); + const int questId = static_cast(lua_tonumber(state, -2)); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertEpisodeSubMenu(id, minLevel, maxLevel, unknown, text); + const AdventureGuideResult result = g_adventureGuideMgr->InsertEpisodeSubMenu(id, minLevel, maxLevel, questId, text); if (!result.ok) { lua_pushboolean(state, 0); @@ -240,11 +240,11 @@ int InsertEpisodeContents(lua_State* state) { const int menu = static_cast(lua_tonumber(state, -7)); const int minLevel = static_cast(lua_tonumber(state, -6)); const int maxLevel = static_cast(lua_tonumber(state, -5)); - const int unknown = static_cast(lua_tonumber(state, -4)); + const int questId = static_cast(lua_tonumber(state, -4)); const bool flag = lua_tonumber(state, -3) != 0; const std::string first = lua_tostring(state, -2); const std::string second = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertEpisodeContents(id, menu, minLevel, maxLevel, unknown, flag, first, second); + const AdventureGuideResult result = g_adventureGuideMgr->InsertEpisodeContents(id, menu, minLevel, maxLevel, questId, flag, first, second); if (!result.ok) { lua_pushboolean(state, 0); @@ -1324,11 +1324,11 @@ AdventureGuideResult CAdventureGuideMgr::InsertDungeonSubMenu(int id, int minLev // OFFSET: 0x006654E0 // FUNCTION: fn_05243 -AdventureGuideResult CAdventureGuideMgr::InsertEpisodeContents(int id, int menu, int minLevel, int maxLevel, int unknown, bool flag, std::string_view first, std::string_view second) { +AdventureGuideResult CAdventureGuideMgr::InsertEpisodeContents(int id, int menu, int minLevel, int maxLevel, int questId, bool flag, std::string_view first, std::string_view second) { AdventureGuideContents contents; contents.minLevel = minLevel; contents.maxLevel = maxLevel; - contents.questId = unknown; + contents.questId = questId; contents.flag = flag; contents.first = first; contents.second = second; @@ -1352,11 +1352,11 @@ AdventureGuideResult CAdventureGuideMgr::InsertEpisodeReward(int id, std::string // OFFSET: 0x00665940 // FUNCTION: fn_05245 -AdventureGuideResult CAdventureGuideMgr::InsertEpisodeSubMenu(int id, int minLevel, int maxLevel, int unknown, std::string_view text) { +AdventureGuideResult CAdventureGuideMgr::InsertEpisodeSubMenu(int id, int minLevel, int maxLevel, int questId, std::string_view text) { AdventureGuideDetail detail; detail.minLevel = minLevel; detail.maxLevel = maxLevel; - detail.questId = unknown; + detail.questId = questId; detail.text = text; for (auto& [key, intro] : m_intros) { if (intro.type == 1) { diff --git a/Source/Contents/AdventureGuideMgr.h b/Source/Contents/AdventureGuideMgr.h index 1b2455753..322fa07e0 100644 --- a/Source/Contents/AdventureGuideMgr.h +++ b/Source/Contents/AdventureGuideMgr.h @@ -112,8 +112,8 @@ public: __declspec(noinline) AdventureGuideResult InsertGuideMenu(int type, int id, std::string_view name, std::string_view text); __declspec(noinline) AdventureGuideResult InsertIntroContents(int id, std::string_view title, std::string_view text); - __declspec(noinline) AdventureGuideResult InsertEpisodeSubMenu(int id, int minLevel, int maxLevel, int unknown, std::string_view text); - __declspec(noinline) AdventureGuideResult InsertEpisodeContents(int id, int menu, int minLevel, int maxLevel, int unknown, bool flag, std::string_view first, std::string_view second); + __declspec(noinline) AdventureGuideResult InsertEpisodeSubMenu(int id, int minLevel, int maxLevel, int questId, std::string_view text); + __declspec(noinline) AdventureGuideResult InsertEpisodeContents(int id, int menu, int minLevel, int maxLevel, int questId, bool flag, std::string_view first, std::string_view second); __declspec(noinline) AdventureGuideResult InsertEpisodeReward(int id, std::string_view text); __declspec(noinline) AdventureGuideResult InsertQuestSubMenu(int id, int minLevel, int maxLevel, std::string_view text); __declspec(noinline) AdventureGuideResult InsertQuestContents(int id, int menu, int minLevel, int maxLevel, bool flag, std::string_view first, std::string_view second); diff --git a/Source/Contents/CashEmotionMgr.cpp b/Source/Contents/CashEmotionMgr.cpp index 7844693c1..1076e72b1 100644 --- a/Source/Contents/CashEmotionMgr.cpp +++ b/Source/Contents/CashEmotionMgr.cpp @@ -478,8 +478,8 @@ __declspec(noinline) std::pair CashEmotionCommand::Get(int index) cons // OFFSET: 0x00592520 // FUNCTION: fn_02856 -CashEmotionData::CashEmotionData(int id, int subId, const char* name, int unknown20, int unknown24, int actId, int sprId) - : id(id), subId(subId), name(name), actionIndex(unknown20), frameIndex(unknown24), actId(actId), sprId(sprId) { +CashEmotionData::CashEmotionData(int id, int subId, const char* name, int actionIndex, int frameIndex, int actId, int sprId) + : id(id), subId(subId), name(name), actionIndex(actionIndex), frameIndex(frameIndex), actId(actId), sprId(sprId) { } // OFFSET: 0x00592820 @@ -502,7 +502,7 @@ bool CashEmotionPackOrder::operator()(const int& left, const int& right) const { // OFFSET: 0x00596430 // FUNCTION: fn_02915 CCashEmotionMgr::CCashEmotionMgr() - : m_enabled(true), unknown_0005{}, m_action(nullptr), basePackId(0), packs{}, m_emotionsByPack{}, emotionOrder{}, m_packNames{}, actIds{}, + : m_enabled(true), padding_0005{}, m_action(nullptr), basePackId(0), packs{}, m_emotionsByPack{}, emotionOrder{}, m_packNames{}, actIds{}, m_commands{}, packOrder{} { } @@ -863,7 +863,7 @@ const char* CCashEmotionMgr::GetPackTitle(int packId) { // OFFSET: 0x0059A110 // FUNCTION: fn_02954 -int CCashEmotionMgr::GetPackUnknown18(int packId) { +int CCashEmotionMgr::GetPackPrice(int packId) { auto it = this->packs.find(packId); if (this->packs.end() == it) { return -1; @@ -1029,7 +1029,7 @@ std::vector CCashEmotionMgr::SortUnownedPacks(const char* filter) { // OFFSET: 0x0059AD40 // FUNCTION: fn_02965 -int CCashEmotionMgr::GetPackUnknown24(int packId) { +int CCashEmotionMgr::GetPackPeriod(int packId) { auto it = this->packs.find(packId); if (this->packs.end() == it) { return 0; @@ -1128,18 +1128,18 @@ void CCashEmotionMgr::AddShortcut(const std::string& name, int packId, int emoti // OFFSET: 0x0059B8F0 // FUNCTION: fn_02970 -bool CCashEmotionMgr::AddEmotion(int packId, int emotionId, const char* name, int unknown20, int unknown24, const char* actFile, const char* sprFile) { +bool CCashEmotionMgr::AddEmotion(int packId, int emotionId, const char* name, int actionIndex, int frameIndex, const char* actFile, const char* sprFile) { const int actId = this->GetActFilePath(actFile, true); const int sprId = this->GetSprFilePath(sprFile, true); bool inserted = false; auto it = this->m_emotionsByPack.find(packId); if (this->m_emotionsByPack.end() != it) { - return it->second.try_emplace(emotionId, packId, emotionId, name, unknown20, unknown24, actId, sprId).second; + return it->second.try_emplace(emotionId, packId, emotionId, name, actionIndex, frameIndex, actId, sprId).second; } CashEmotionTable table; - if (table.try_emplace(emotionId, packId, emotionId, name, unknown20, unknown24, actId, sprId).second == true) { + if (table.try_emplace(emotionId, packId, emotionId, name, actionIndex, frameIndex, actId, sprId).second == true) { inserted = this->m_emotionsByPack.emplace(packId, table).second; } @@ -1157,7 +1157,7 @@ static void AddSearchKey(std::unordered_map>& i // OFFSET: 0x0059BC30 // FUNCTION: fn_02971 -void CCashEmotionMgr::InsertEmotion(const int packId, const int emotionId, int unknown20, int unknown24, const char* actFile, const char* sprFile) { +void CCashEmotionMgr::InsertEmotion(const int packId, const int emotionId, int actionIndex, int frameIndex, const char* actFile, const char* sprFile) { const char* packName = this->GetPackTitle(packId); if (!packName) { return; @@ -1169,7 +1169,7 @@ void CCashEmotionMgr::InsertEmotion(const int packId, const int emotionId, int u } std::string name = FormatOwnedString("%s_%s", baseName, packName); - this->AddEmotion(packId, emotionId, name.c_str(), unknown20, unknown24, actFile, sprFile); + this->AddEmotion(packId, emotionId, name.c_str(), actionIndex, frameIndex, actFile, sprFile); AddSearchKey(this->m_searchIndex, name.c_str(), packId, emotionId); @@ -1433,7 +1433,7 @@ void CCashEmotionMgr::ShowErrorMessage(const char* key, int value) { // OFFSET: 0x0059D040 // FUNCTION: fn_02984 -void CCashEmotionMgr::Unknown59D040(int, int) { +void CCashEmotionMgr::EmptyHandler59D040(int, int) { } // OFFSET: 0x0059D090 @@ -1511,14 +1511,14 @@ int CCashEmotionMgr::InsertEmotionListTable(lua_State* state) { const int packId = luaL_checkinteger(state, 1); const int emotionId = luaL_checkinteger(state, 2); const std::string key = FromUtf8(luaL_checkstring(state, 3), g_textCodePage); - const int unknown20 = luaL_checkinteger(state, 4); - const int unknown24 = luaL_checkinteger(state, 5); + const int actionIndex = luaL_checkinteger(state, 4); + const int frameIndex = luaL_checkinteger(state, 5); const std::string actFile = FromUtf8(luaL_checkstring(state, 6), g_textCodePage); const std::string sprFile = FromUtf8(luaL_checkstring(state, 7), g_textCodePage); const char* result; if (key.empty()) { - g_cashEmotionMgr->AddEmotion(packId, emotionId, "", unknown20, unknown24, actFile.c_str(), sprFile.c_str()); + g_cashEmotionMgr->AddEmotion(packId, emotionId, "", actionIndex, frameIndex, actFile.c_str(), sprFile.c_str()); result = nullptr; } else { const char* name = g_simpleStringMgr->GetString(key.c_str()); @@ -1527,7 +1527,7 @@ int CCashEmotionMgr::InsertEmotionListTable(lua_State* state) { } result = nullptr; - if (g_cashEmotionMgr->AddEmotion(packId, emotionId, name, unknown20, unknown24, actFile.c_str(), sprFile.c_str())) { + if (g_cashEmotionMgr->AddEmotion(packId, emotionId, name, actionIndex, frameIndex, actFile.c_str(), sprFile.c_str())) { result = name; } } @@ -1582,12 +1582,12 @@ int CCashEmotionMgr::InsertEmotionMsgListTableForCustom(lua_State* state) { int CCashEmotionMgr::InsertEmotionVarientListTable(lua_State* state) { const int packId = luaL_checkinteger(state, 1); const int emotionId = luaL_checkinteger(state, 2); - const int unknown20 = luaL_checkinteger(state, 3); - const int unknown24 = luaL_checkinteger(state, 4); + const int actionIndex = luaL_checkinteger(state, 3); + const int frameIndex = luaL_checkinteger(state, 4); const std::string actFile = FromUtf8(luaL_checkstring(state, 5), g_textCodePage); const std::string sprFile = FromUtf8(luaL_checkstring(state, 6), g_textCodePage); - g_cashEmotionMgr->InsertEmotion(packId, emotionId, unknown20, unknown24, actFile.c_str(), sprFile.c_str()); + g_cashEmotionMgr->InsertEmotion(packId, emotionId, actionIndex, frameIndex, actFile.c_str(), sprFile.c_str()); return 1; } @@ -1628,8 +1628,8 @@ int CCashEmotionMgr::InsertPackInfo(lua_State* state) { const char* name = g_simpleStringMgr->GetString(title.c_str()); const int saleType = luaL_checkinteger(state, 3); - const int unknown18 = luaL_checkinteger(state, 4); - if (!(saleType == 0 && unknown18 == 0) && !(saleType == 1 && unknown18 != 0)) { + const int price = luaL_checkinteger(state, 4); + if (!(saleType == 0 && price == 0) && !(saleType == 1 && price != 0)) { g_cashEmotionMgr->ShowErrorMessage("EMSG_ERR_SALE_TYPE", packId); return 1; } @@ -1660,14 +1660,14 @@ int CCashEmotionMgr::InsertPackInfo(lua_State* state) { } const int useType = luaL_checkinteger(state, 8); - const int unknown24 = luaL_checkinteger(state, 9); - if (!(useType == 0 && unknown24 == 0) && !(useType == 1 && unknown24 != 0)) { + const int period = luaL_checkinteger(state, 9); + if (!(useType == 0 && period == 0) && !(useType == 1 && period != 0)) { g_cashEmotionMgr->ShowErrorMessage("EMSG_ERR_USE_TIME", packId); return 1; } const char limited = static_cast(luaL_checkinteger(state, 10)); - if (g_cashEmotionMgr->packs.try_emplace(packId, name, unknown18, startTime, endTime, unknown24, limited).second == true) { + if (g_cashEmotionMgr->packs.try_emplace(packId, name, price, startTime, endTime, period, limited).second == true) { g_cashEmotionMgr->packOrder.push_back(packId); } @@ -1931,7 +1931,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_Purchase::Refresh(const char } else { pack->SetTitle(nullptr); } - pack->m_limited = g_cashEmotionMgr->GetPackUnknown24(packId) > 0; + pack->m_limited = g_cashEmotionMgr->GetPackPeriod(packId) > 0; pack->Move(9, y); y += height; this->AddChild(pack); @@ -2146,7 +2146,7 @@ __declspec(noinline) void UICashEmotionListChildWnd_UnPurchased::Refresh(const c } else { pack->SetTitle(nullptr); } - pack->m_limited = g_cashEmotionMgr->GetPackUnknown24(packId) > 0; + pack->m_limited = g_cashEmotionMgr->GetPackPeriod(packId) > 0; pack->Move(9, y); y += height; this->AddChild(pack); @@ -2409,7 +2409,7 @@ int UICashEmotionListWnd::SetPeriod(int packId) { return 0; } - const int period = g_cashEmotionMgr->GetPackUnknown24(packId); + const int period = g_cashEmotionMgr->GetPackPeriod(packId); if (period < 1) { this->m_period->Show(0); } else { @@ -2519,7 +2519,7 @@ int UICashEmotionListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a } } - const int price = g_cashEmotionMgr->GetPackUnknown18(packId); + const int price = g_cashEmotionMgr->GetPackPrice(packId); if (price < 0) { return 0; } @@ -2552,7 +2552,7 @@ int UICashEmotionListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a packet.id = 0xBEC; packet.packId = g_cashEmotionMgr->selectedPackId; packet.itemId = g_cashEmotionMgr->purchaseItemId; - packet.price = g_cashEmotionMgr->GetPackUnknown18(packet.packId); + packet.price = g_cashEmotionMgr->GetPackPrice(packet.packId); GetRagConnection().Send(sizeof(packet), &packet); } return 0; @@ -2999,7 +2999,7 @@ void UICashEmotionPack::UpdateExpiry(Timestamp* expiry) { // OFFSET: 0x007CA100 // FUNCTION: fn_09443 std::string UICashEmotionPack::GetPriceText(int packId) { - int price = g_cashEmotionMgr->GetPackUnknown18(packId); + int price = g_cashEmotionMgr->GetPackPrice(packId); if (price > 0) { const char* format = g_simpleStringMgr->GetString("EMSG_PURCHASE_PRICE"); if (format) { diff --git a/Source/Contents/CashEmotionMgr.h b/Source/Contents/CashEmotionMgr.h index 2f3340781..8e6098231 100644 --- a/Source/Contents/CashEmotionMgr.h +++ b/Source/Contents/CashEmotionMgr.h @@ -39,7 +39,7 @@ public: }; struct CashEmotionData { - CashEmotionData(int id, int subId, const char* name, int unknown20, int unknown24, int actId, int sprId); + CashEmotionData(int id, int subId, const char* name, int actionIndex, int frameIndex, int actId, int sprId); /* 0000 */ int id; /* 0004 */ int subId; @@ -52,8 +52,8 @@ struct CashEmotionData { struct CashEmotionPack { // INLINED - CashEmotionPack(const char* name, int unknown18, unsigned int startTime, unsigned int endTime, int unknown24, char unknown28) - : name(name), price(unknown18), startTime(startTime), endTime(endTime), period(unknown24), saleBadge(unknown28), + CashEmotionPack(const char* name, int price, unsigned int startTime, unsigned int endTime, int period, char saleBadge) + : name(name), price(price), startTime(startTime), endTime(endTime), period(period), saleBadge(saleBadge), originalStartTime(startTime), originalEndTime(endTime) { } @@ -142,7 +142,7 @@ public: CashEmotionTable* GetPackEmotionTable(int packId); CashEmotionPack* GetPack(int packId); const char* GetPackTitle(int packId); - int GetPackUnknown18(int packId); + int GetPackPrice(int packId); __declspec(noinline) Timestamp* FindExpiry(int packId); __declspec(noinline) std::vector SortOwnedPacks(const char* filter); __declspec(noinline) unsigned int GetPackEndTime(int packId); @@ -154,7 +154,7 @@ public: std::vector SortPacks(const std::vector& packs, const char* filter); __declspec(noinline) const char* GetSprFileName(int sprId); __declspec(noinline) std::vector SortUnownedPacks(const char* filter); - __declspec(noinline) int GetPackUnknown24(int packId); + __declspec(noinline) int GetPackPeriod(int packId); void SetOwnedPack(int packId, unsigned int expiry); int LookupSpecialEmotion(CashEmotionSpecial type); int LookupSpecialEmotion(CashEmotionSpecial type, const char* name); @@ -170,7 +170,7 @@ public: bool RemoveExpiredPacks(); bool UpdatePurchasedPackExpiry(); void ShowErrorMessage(const char* key, int value); - void Unknown59D040(int argument1, int argument2); + void EmptyHandler59D040(int argument1, int argument2); __declspec(noinline) int GetServerTime(); // INLINED int BasePackId() const { @@ -185,14 +185,14 @@ public: int GetActFilePath(const char* name, bool add); int GetSprFilePath(const char* name, bool add); int RegisterFileName(std::unordered_map& ids, CashEmotionFileNames& names, std::function nextId, const char* name, bool add); - bool AddEmotion(int packId, int emotionId, const char* name, int unknown20, int unknown24, const char* actFile, const char* sprFile); + bool AddEmotion(int packId, int emotionId, const char* name, int actionIndex, int frameIndex, const char* actFile, const char* sprFile); void LoadScripts(); - void InsertEmotion(int packId, int emotionId, int unknown20, int unknown24, const char* actFile, const char* sprFile); + void InsertEmotion(int packId, int emotionId, int actionIndex, int frameIndex, const char* actFile, const char* sprFile); void AcquirePack(int packId, unsigned int expiry); protected: /* 0004 */ bool m_enabled; - /* 0005 */ std::uint8_t unknown_0005[3]; + /* 0005 */ std::uint8_t padding_0005[3]; /* 0008 */ ICashEmotionAction* m_action; /* 000C */ int basePackId; /* 0010 */ std::unordered_map packs; diff --git a/Source/Contents/ClanInfo.cpp b/Source/Contents/ClanInfo.cpp index 46f06c6c3..cc78dc3c1 100644 --- a/Source/Contents/ClanInfo.cpp +++ b/Source/Contents/ClanInfo.cpp @@ -50,7 +50,7 @@ void CClanInfo::Destroy() { void CClanInfo::Clear() { this->m_clanName = ""; this->m_masterName = ""; - this->unknown_0034 = 0; + this->allyClanCount = 0; this->m_connectedMembers = 0; this->m_totalMembers = 0; this->m_mapName = ""; diff --git a/Source/Contents/ClanInfo.h b/Source/Contents/ClanInfo.h index a977fd11e..09f529d28 100644 --- a/Source/Contents/ClanInfo.h +++ b/Source/Contents/ClanInfo.h @@ -11,7 +11,7 @@ public: /* 0000 */ bool m_isInitialized; /* 0004 */ std::string m_clanName; /* 001C */ std::string m_masterName; - /* 0034 */ int unknown_0034; + /* 0034 */ int allyClanCount; /* 0038 */ int m_connectedMembers; /* 003C */ int m_totalMembers; /* 0040 */ std::string m_mapName; @@ -33,7 +33,7 @@ extern CClanInfo* g_clanInfo; static_assert(sizeof(CClanInfo) == 0x68); static_assert(offsetof(CClanInfo, m_clanName) == 0x04); static_assert(offsetof(CClanInfo, m_masterName) == 0x1C); -static_assert(offsetof(CClanInfo, unknown_0034) == 0x34); +static_assert(offsetof(CClanInfo, allyClanCount) == 0x34); static_assert(offsetof(CClanInfo, m_mapName) == 0x40); static_assert(offsetof(CClanInfo, m_clanId) == 0x58); static_assert(offsetof(CClanInfo, m_hasClan) == 0x5C); diff --git a/Source/Contents/ClientItemLists.cpp b/Source/Contents/ClientItemLists.cpp index d44fc6d0e..1ac007c93 100644 --- a/Source/Contents/ClientItemLists.cpp +++ b/Source/Contents/ClientItemLists.cpp @@ -212,12 +212,12 @@ public: class CEquipmentPropertiesMgr { public: virtual ~CEquipmentPropertiesMgr(); - unsigned char unknown_0004[0x9]; + unsigned char padding_0004[0x9]; bool m_dirty; - unsigned char unknown_000E[0x12]; + unsigned char padding_000E[0x12]; UIWindow* m_window; /* 0024 */ std::unordered_map properties1; - /* 0044 */ unsigned char unknown_0044[0x1B8]; + /* 0044 */ unsigned char padding_0044[0x1B8]; CEquipmentPropertiesMgr(); CEquipmentWearable* FindProperty1(const int& key); @@ -878,11 +878,11 @@ bool CSession::Equip(const ITEM_INFO& item) { // OFFSET: 0x00DD75C0 // FUNCTION: fn_23291 -void CSession::AddShopItem(const RawItemBasic& item, int quantity, std::uint16_t unknown_006C) { +void CSession::AddShopItem(const RawItemBasic& item, int quantity, std::uint16_t priceFactor) { ITEM_INFO value; value.AssignBasic(item); value.quantity = quantity; - value.priceFactor = unknown_006C; + value.priceFactor = priceFactor; value.refiningLevel = 0; value.damaged = 0; value.SetItemId(std::atoi(value.itemId.c_str())); diff --git a/Source/Contents/ClientState.cpp b/Source/Contents/ClientState.cpp index 4383cb922..b9c64ebee 100644 --- a/Source/Contents/ClientState.cpp +++ b/Source/Contents/ClientState.cpp @@ -44,7 +44,7 @@ namespace { }; struct ReplayShopNameRecord { - /* 0000 */ std::int16_t unknown; + /* 0000 */ std::int16_t padding_0000; /* 0002 */ char name[16]; /* 0012 */ int shopId; }; diff --git a/Source/Contents/ClientTiming.cpp b/Source/Contents/ClientTiming.cpp index fae3e70ed..baa0b3068 100644 --- a/Source/Contents/ClientTiming.cpp +++ b/Source/Contents/ClientTiming.cpp @@ -71,15 +71,15 @@ const char* DecryptName(const char (&source)[Length]) { } struct NaviUnknownBlock { - /* 0000 */ int unknown_0000; - /* 0004 */ int unknown_0004; - /* 0008 */ int unknown_0008; - /* 000C */ int unknown_000C; - /* 0010 */ int unknown_0010; - /* 0014 */ int unknown_0014; - /* 0018 */ int unknown_0018; - /* 001C */ int unknown_001C; - /* 0020 */ int unknown_0020; + /* 0000 */ int padding_0000; + /* 0004 */ int padding_0004; + /* 0008 */ int padding_0008; + /* 000C */ int padding_000C; + /* 0010 */ int padding_0010; + /* 0014 */ int padding_0014; + /* 0018 */ int padding_0018; + /* 001C */ int padding_001C; + /* 0020 */ int padding_0020; NaviUnknownBlock(); }; @@ -100,8 +100,8 @@ CNavi_Object::CNavi_Object() // OFFSET: 0x00B8C990 // FUNCTION: fn_19427 NaviUnknownBlock::NaviUnknownBlock() - : unknown_0000(0), unknown_0004(0), unknown_0008(0), unknown_000C(0), unknown_0010(0), unknown_0014(0), unknown_0018(0), unknown_001C(0), - unknown_0020(0) { + : padding_0000(0), padding_0004(0), padding_0008(0), padding_000C(0), padding_0010(0), padding_0014(0), padding_0018(0), padding_001C(0), + padding_0020(0) { } // OFFSET: 0x00B8C710 @@ -136,7 +136,7 @@ CNavi_Link::CNavi_Link() : linkedCellX(0), linkedCellY(0) { // OFFSET: 0x00B8C2B0 // FUNCTION: fn_19422 CNavi_Link::CNavi_Link( - int type, int index, const char* name, const char* title, int cellX, int cellY, CNaviInfo* info, CNaviInfo* linkedInfo, int unknown80, int unknown84 + int type, int index, const char* name, const char* title, int cellX, int cellY, CNaviInfo* info, CNaviInfo* linkedInfo, int linkedCellX, int linkedCellY ) : linkedCellX(0), linkedCellY(0) { this->type = type; @@ -151,8 +151,8 @@ CNavi_Link::CNavi_Link( this->cellY = cellY; this->info = info; this->linkedInfo = linkedInfo; - this->linkedCellX = unknown80; - this->linkedCellY = unknown84; + this->linkedCellX = linkedCellX; + this->linkedCellY = linkedCellY; this->depth = 0; } diff --git a/Source/Contents/Configuration/GameSettingsMgr.h b/Source/Contents/Configuration/GameSettingsMgr.h index fe1a5fdaf..9e6b41026 100644 --- a/Source/Contents/Configuration/GameSettingsMgr.h +++ b/Source/Contents/Configuration/GameSettingsMgr.h @@ -23,7 +23,7 @@ struct GameSettingsOption { /* 003C */ int tipBoxId = 0; /* 0040 */ std::string description; /* 0058 */ unsigned char defaultValue; - /* 0059 */ unsigned char unknown_0059[3]; + /* 0059 */ unsigned char padding_0059[3]; /* 005C */ int enabledMessage = 4698; /* 0060 */ int disabledMessage = 4698; }; diff --git a/Source/Contents/Configuration/ServiceOptions.cpp b/Source/Contents/Configuration/ServiceOptions.cpp index 2d2984cba..053d95a76 100644 --- a/Source/Contents/Configuration/ServiceOptions.cpp +++ b/Source/Contents/Configuration/ServiceOptions.cpp @@ -67,7 +67,7 @@ struct GameSettingsOption { /* 003C */ int tipBoxId = 0; /* 0040 */ std::string description; /* 0058 */ unsigned char defaultValue; - /* 0059 */ unsigned char unknown_0059[3]; + /* 0059 */ unsigned char padding_0059[3]; /* 005C */ int enabledMessage = 4698; /* 0060 */ int disabledMessage = 4698; }; diff --git a/Source/Contents/EffectResourceSwitcher.h b/Source/Contents/EffectResourceSwitcher.h index 492b10f36..3e871587f 100644 --- a/Source/Contents/EffectResourceSwitcher.h +++ b/Source/Contents/EffectResourceSwitcher.h @@ -55,7 +55,7 @@ public: class EffectResourceSwitcher : public CEffect { public: /* 00CC */ unsigned char active; - /* 00CD */ unsigned char unknown_00CD[3]; + /* 00CD */ unsigned char padding_00CD[3]; /* 00D0 */ CEZ2STREffectEx* effect; /* 00D4 */ vector3d spawnPosition; /* 00E0 */ std::string sourceName; diff --git a/Source/Contents/Effects/AcidifiedThrow.h b/Source/Contents/Effects/AcidifiedThrow.h index 517479a3b..b967b6e7b 100644 --- a/Source/Contents/Effects/AcidifiedThrow.h +++ b/Source/Contents/Effects/AcidifiedThrow.h @@ -21,7 +21,7 @@ public: /* 00CC */ EZ2STREmitter* projectileEmitter; /* 00D0 */ EZ2STREmitter* impactEmitters[3]; /* 00DC */ bool active; - /* 00DD */ unsigned char unknown_00DD[3]; + /* 00DD */ unsigned char padding_00DD[3]; /* 00E0 */ float trajectoryTime; /* 00E4 */ vector3d impactPosition; }; diff --git a/Source/Contents/Effects/ArrowEffect.h b/Source/Contents/Effects/ArrowEffect.h index 0dbfa22a4..3f8c2ff8c 100644 --- a/Source/Contents/Effects/ArrowEffect.h +++ b/Source/Contents/Effects/ArrowEffect.h @@ -23,7 +23,7 @@ public: /* 0160 */ float startFrame; /* 0164 */ std::uint32_t targetAid; /* 0168 */ int frameCount; - /* 016C */ int unknown_016C; + /* 016C */ int padding_016C; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Effects/AxeBoomerang.h b/Source/Contents/Effects/AxeBoomerang.h index 8b5ddeea8..29f29c36c 100644 --- a/Source/Contents/Effects/AxeBoomerang.h +++ b/Source/Contents/Effects/AxeBoomerang.h @@ -21,7 +21,7 @@ public: /* 00CC */ EZ2STREmitter* emitter; /* 00D0 */ unsigned char alive; /* 00D1 */ unsigned char returning; - /* 00D2 */ unsigned char unknown_00D2[2]; + /* 00D2 */ unsigned char padding_00D2[2]; /* 00D4 */ int processCount; /* 00D8 */ float trajectoryTime; /* 00DC */ vector3d particlePosition; diff --git a/Source/Contents/Effects/BlastForge.h b/Source/Contents/Effects/BlastForge.h index 060597130..345e5e26c 100644 --- a/Source/Contents/Effects/BlastForge.h +++ b/Source/Contents/Effects/BlastForge.h @@ -25,7 +25,7 @@ public: /* 00D4 */ CEZ2STRParticle* blastParticle; /* 00D8 */ CEZ2STRParticle* blastBottomParticle; /* 00DC */ unsigned char openToggle; - /* 00DD */ unsigned char unknown_00DD[3]; + /* 00DD */ unsigned char padding_00DD[3]; /* 00E0 */ std::int64_t startTime; }; diff --git a/Source/Contents/Effects/CharacterParticleBundle.h b/Source/Contents/Effects/CharacterParticleBundle.h index 4cbde07bf..504634c70 100644 --- a/Source/Contents/Effects/CharacterParticleBundle.h +++ b/Source/Contents/Effects/CharacterParticleBundle.h @@ -26,7 +26,7 @@ public: virtual void ProcessParticle(CEZ2STRParticle* particle); virtual void RenderParticle(CEZ2STRParticle* particle); - /* 00CC */ int unknown_00CC; + /* 00CC */ int padding_00CC; /* 00D0 */ long long startTime; /* 00D8 */ int elapsedFrames; /* 00DC */ std::vector particles; diff --git a/Source/Contents/Effects/DummyEffectLauncher.h b/Source/Contents/Effects/DummyEffectLauncher.h index ecd9c0947..dd5c3259a 100644 --- a/Source/Contents/Effects/DummyEffectLauncher.h +++ b/Source/Contents/Effects/DummyEffectLauncher.h @@ -11,7 +11,7 @@ public: void SendMsg(CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m) override; /* 0158 */ int lifeFrames; - /* 015C */ int unknown_015C; + /* 015C */ int padding_015C; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Effects/EZ2STREffect.cpp b/Source/Contents/Effects/EZ2STREffect.cpp index b6a0c5c43..4198309b1 100644 --- a/Source/Contents/Effects/EZ2STREffect.cpp +++ b/Source/Contents/Effects/EZ2STREffect.cpp @@ -123,7 +123,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_BITE_SCAR: offset += 5; break; - case EF_UNK_2006: + case EF_KVASIRSONATA: offset += 5; break; case EF_D_TAIL: @@ -235,7 +235,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_ARBITRIUM_HIT: offset -= 6; break; - case EF_UNK_1830: + case EF_ABYSS_DAGGER_HIT_1830: offset -= 6; break; case EF_DEEP_BLIND_TRAP: @@ -253,7 +253,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_HAWK_BOOMERANG_HIT: offset -= 6; break; - case EF_UNK_2050: + case EF_ROSEBLOSSOM_SHOT: offset -= 6; break; case EF_TERRA_DRIVE_HIT: @@ -262,7 +262,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_ABYSS_DAGGER_HIT_3: offset -= 6; break; - case EF_UNK_2160: + case EF_OVERSLASH_HIT: offset -= 6; break; case EF_WE_ONEFOREVER: @@ -313,7 +313,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_SOLID_TRAP_HIT: offset -= 4; break; - case EF_UNK_1898: + case EF_IMPACT_CRATER_HIT: offset -= 4; break; case EF_HAWK_RUSH: @@ -334,7 +334,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_DIAMOND_STORM_BOTTOM: offset -= 4; break; - case EF_UNK_2048: + case EF_ROSEBLOSSOM_HIT: offset -= 4; break; case EF_FRENZY_SHOT_HIT: @@ -396,13 +396,13 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_TETRA_VORTEX_CAST: offset -= 2; break; - case EF_UNK_1863: + case EF_NEW_ENCHANTING_SHADOW_BOTTOM: offset -= 2; break; case EF_SWIFT_TRAP_CAST: offset -= 2; break; - case EF_UNK_1953: + case EF_SHADOW_STAB: offset -= 2; break; case EF_SPELL_ENCHANTING: @@ -444,31 +444,31 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_NEW_AROMAOIL_BOTTOM: case EF_NEW_BATHFOAM: case EF_NEW_BATHFOAM_BOTTOM: - case EF_UNK_1670: - case EF_UNK_1671: - case EF_UNK_1672: - case EF_UNK_1673: - case EF_UNK_1674: - case EF_UNK_1710: - case EF_UNK_1711: - case EF_UNK_1712: - case EF_UNK_1713: - case EF_UNK_1714: - case EF_UNK_1715: - case EF_UNK_1716: - case EF_UNK_1717: - case EF_UNK_1718: - case EF_UNK_1719: - case EF_UNK_1720: - case EF_UNK_1721: + case EF_STORMSLASH_1: + case EF_STORMSLASH_2: + case EF_STORMSLASH_3: + case EF_STORMSLASH_4: + case EF_STORMSLASH_5: + case EF_SERVANT_SIGN: + case EF_SERVANT_SIGN_DOWN: + case EF_SERVANT_SIGN_DOWN_BOTTOM: + case EF_SERVANT_PHANTOM_DOWN: + case EF_SERVANT_PHANTOM_HIT: + case EF_SERVANT_PHANTOM_HIT_BOTTOM: + case EF_SERVANT_PHANTOM_SUB: + case EF_SERVANT_PHANTOM_SUB_BOTTOM: + case EF_SERVANT_DEMOLITION_COLLECT: + case EF_SERVANT_DEMOLITION_HIT: + case EF_SERVANT_DEMOLITION_LEFTDOWN: + case EF_SERVANT_DEMOLITION_RIGHTDOWN: case EF_DRAGONIC_AURA: case EF_DRAGONIC_AURA_BOTTOM: case EF_DRAGONIC_AURA_HIT: case EF_DRAGONIC_AURA_HIT_BOTTOM: case EF_DRAGONIC_AURA_BUFF: case EF_DRAGONIC_AURA_BUFF_BOTTOM: - case EF_UNK_1728: - case EF_UNK_1729: + case EF_MADNESS_CRUSHER: + case EF_MADNESS_CRUSHER_BOTTOM: case EF_NEW_AUTOSHADOWSPELL: case EF_NEW_AUTOSHADOWSPELL_BOTTOM: case EF_DESTRUCTIVE_HURRICANE: @@ -519,8 +519,8 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_STRATUM_TREMOR_CAST: case EF_STRATUM_TREMOR_CAST_BOTTOM: case EF_STRATUM_TREMOR_HIT: - case EF_UNK_1895: - case EF_UNK_1896: + case EF_IMPACT_CRATER: + case EF_IMPACT_CRATER_BOTTOM: case EF_WIND_SIGN: case EF_WIND_SIGN_LOOP: case EF_HAWK_BOOMERANG_CAST: @@ -565,12 +565,12 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_SOUND_BLEND_CAST: case EF_SOUND_BLEND_CAST_BOTTOM: case EF_SOUND_BLEND_RED: - case EF_UNK_2065: - case EF_UNK_2066: - case EF_UNK_2067: - case EF_UNK_2068: - case EF_UNK_2069: - case EF_UNK_2070: + case EF_JAWAII_SERENADE: + case EF_JAWAII_SERENADE_CAST: + case EF_JAWAII_SERENADE_CAST_BOTTOM: + case EF_PRONMARCH: + case EF_PRONMARCH_CAST: + case EF_PRONMARCH_CAST_BOTTOM: case EF_NIFLHEIM: case EF_NIFLHEIM_CAST: case EF_ABYSS_STRIKE_CAST: @@ -586,16 +586,16 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_TERREMOTUS_CAST_BOTTOM: case EF_TERREMOTUS_HIT: case EF_TERREMOTUS_PROTECT: - case EF_UNK_2116: - case EF_UNK_2117: - case EF_UNK_2118: - case EF_UNK_2119: - case EF_UNK_2120: - case EF_UNK_2121: + case EF_GEF_NOCTURN: + case EF_GEF_NOCTURN_CAST: + case EF_GEF_NOCTURN_CAST_BOTTOM: + case EF_ROKI_CAPRICCIO: + case EF_ROKI_CAPRICCIO_CAST: + case EF_ROKI_CAPRICCIO_CAST_BOTTOM: case EF_MUSICAL_INTERLUDE: case EF_MUSICAL_INTERLUDE_CAST: - case EF_UNK_2124: - case EF_UNK_2125: + case EF_AIN_RHAPSODY: + case EF_AIN_RHAPSODY_CAST: case EF_TERRA_DRIVE: case EF_TERRA_DRIVE_BOTTOM: case EF_TERRA_DRIVE_CAST: @@ -616,46 +616,46 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_ELEMENTAL_BUSTER_WIND: case EF_ELEMENTAL_BUSTER_WIND_BOTTOM: case EF_ELEMENTAL_BUSTER_WIND_HIT: - case EF_UNK_2157: - case EF_UNK_2158: - case EF_UNK_2159: + case EF_OVERSLASH: + case EF_OVERSLASH_BOTTOM: + case EF_OVERSLASH_CAST: case EF_ADVANCED_PROTECTION: case EF_ADVANCED_PROTECTION_BOTTOM: case EF_ADVANCED_PROTECTION_CAST: case EF_ADVANCED_PROTECTION_CAST_BOTTOM: - case EF_UNK_2166: - case EF_UNK_2167: - case EF_UNK_2168: - case EF_UNK_2169: - case EF_UNK_2170: - case EF_UNK_2171: - case EF_UNK_2172: - case EF_UNK_2173: - case EF_UNK_2174: - case EF_UNK_2175: - case EF_UNK_2176: - case EF_UNK_2177: - case EF_UNK_2178: - case EF_UNK_2179: - case EF_UNK_2180: - case EF_UNK_2181: - case EF_UNK_2182: + case EF_CROSS_RAIN_BOTTOM: + case EF_CROSS_RAIN_CAST: + case EF_CROSS_RAIN_CAST_BOTTOM: + case EF_GUARD_STANCE: + case EF_GUARD_STANCE_CAST: + case EF_GUARD_STANCE_CAST_BOTTOM: + case EF_ATTACK_STANCE: + case EF_ATTACK_STANCE_CAST: + case EF_ATTACK_STANCE_CAST_BOTTOM: + case EF_GRAND_JUDGEMENT: + case EF_GRAND_JUDGEMENT_BOTTOM: + case EF_GRAND_JUDGEMENT_BUFF: + case EF_GRAND_JUDGEMENT_CAST: + case EF_GRAND_JUDGEMENT_CAST_BOTTOM: + case EF_HOLY_SHIELD_CAST: + case EF_HOLY_SHIELD: + case EF_HOLY_SHIELD_LOOP: case EF_THE_W_PROTECTION: case EF_THE_W_PROTECTION_CAST: - case EF_UNK_2188: - case EF_UNK_2189: - case EF_UNK_2190: - case EF_UNK_2191: - case EF_UNK_2192: - case EF_UNK_2193: - case EF_UNK_2194: - case EF_UNK_2196: - case EF_UNK_2197: - case EF_UNK_2198: - case EF_UNK_2199: - case EF_UNK_2200: - case EF_UNK_2201: - case EF_UNK_2202: + case EF_GUARDIANSHIELD: + case EF_GUARDIANSHIELD_BOTTOM: + case EF_GUARDIANSHIELD_SUB: + case EF_JUDGEMENT_CROSS: + case EF_JUDGEMENT_CROSS_BOTTOM: + case EF_JUDGEMENT_CROSS_CAST: + case EF_JUDGEMENT_CROSS_CAST_BOTTOM: + case EF_REBOUND_SHIELD: + case EF_REBOUND_SHIELD_BOTTOM: + case EF_REBOUND_SHIELD_CAST: + case EF_REBOUND_SHIELD_CAST_BOTTOM: + case EF_ULTIMATESACRIFICE: + case EF_ULTIMATESACRIFICE_BOTTOM: + case EF_ULTIMATESACRIFICE_SHINE: case EF_HELLTREE_CAST: case EF_HELLTREE_CAST_BOTTOM: case EF_HELLTREE_DUSTY: @@ -688,7 +688,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_STATE_FROSTBITE_FINISH: case EF_STATE_CRYSTALLIZATION: case EF_STATE_DEADLYPOISON: - case EF_UNK_2280: + case EF_SERVANT_SIGN_BOTTOM: offset -= 2; break; case EF_NEW_ARMSCANNON_01_UP: @@ -702,10 +702,10 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_EFFLIGO_HIT: case EF_FLAME_TRAP: case EF_FLAME_TRAP_HIT: - case EF_UNK_1950: - case EF_UNK_1952: - case EF_UNK_1954: - case EF_UNK_1955: + case EF_CRESCIVEBOLT_CAST: + case EF_CRESCIVEBOLT_HIT: + case EF_ETERNAL_SLASH_HIT: + case EF_SHADOW_STAB_HIT2: case EF_SERPENS_BOTTOM: case EF_SERPENS_CAST_BOTTOM: case EF_ETERNAL_SLASH_HIT_3: @@ -805,9 +805,9 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_COMPETENTIA_LOOP_BOTTOM: case EF_SINCERE_FAITH: case EF_SINCERE_FAITH_BOTTOM: - case EF_UNK_2000: - case EF_UNK_2001: - case EF_UNK_2002: + case EF_MYSTICSYMPHONY: + case EF_MYSTICSYMPHONY_CAST: + case EF_MYSTICSYMPHONY_NOTE: case EF_ABYSS_SQUARE: case EF_ABYSS_SQUARE_BOTTOM: --offset; @@ -818,7 +818,7 @@ int GetHatEffectOffsetY(int id, CGameActor* actor) { case EF_CRYSTAL_IMPACT_BUFF: offset += 4; break; - case EF_UNK_1862: + case EF_NEW_ENCHANTING_SHADOW: --offset; break; case EF_BENEDICTUM: @@ -987,11 +987,11 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_NEW_UNLIMIT: case EF_NEW_UNLIMIT_BOTTOM: case EF_NEW_EPICLESIS: - case EF_UNK_1670: - case EF_UNK_1671: - case EF_UNK_1672: - case EF_UNK_1673: - case EF_UNK_1674: + case EF_STORMSLASH_1: + case EF_STORMSLASH_2: + case EF_STORMSLASH_3: + case EF_STORMSLASH_4: + case EF_STORMSLASH_5: case EF_NEW_POWERSWING_01: case EF_NEW_POWERSWING_05: case EF_NEW_POWERSWING_07: @@ -1001,26 +1001,26 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_NEW_VULCANARM_BOTTOM: case EF_NEW_VULCANARM_SHOTHOLE: case EF_NEW_EARTHDRIVE_TARGET: - case EF_UNK_1710: - case EF_UNK_1711: - case EF_UNK_1712: - case EF_UNK_1713: - case EF_UNK_1714: - case EF_UNK_1715: - case EF_UNK_1716: - case EF_UNK_1717: - case EF_UNK_1718: - case EF_UNK_1719: - case EF_UNK_1720: - case EF_UNK_1721: + case EF_SERVANT_SIGN: + case EF_SERVANT_SIGN_DOWN: + case EF_SERVANT_SIGN_DOWN_BOTTOM: + case EF_SERVANT_PHANTOM_DOWN: + case EF_SERVANT_PHANTOM_HIT: + case EF_SERVANT_PHANTOM_HIT_BOTTOM: + case EF_SERVANT_PHANTOM_SUB: + case EF_SERVANT_PHANTOM_SUB_BOTTOM: + case EF_SERVANT_DEMOLITION_COLLECT: + case EF_SERVANT_DEMOLITION_HIT: + case EF_SERVANT_DEMOLITION_LEFTDOWN: + case EF_SERVANT_DEMOLITION_RIGHTDOWN: case EF_DRAGONIC_AURA: case EF_DRAGONIC_AURA_BOTTOM: case EF_DRAGONIC_AURA_HIT: case EF_DRAGONIC_AURA_HIT_BOTTOM: case EF_DRAGONIC_AURA_BUFF: case EF_DRAGONIC_AURA_BUFF_BOTTOM: - case EF_UNK_1728: - case EF_UNK_1729: + case EF_MADNESS_CRUSHER: + case EF_MADNESS_CRUSHER_BOTTOM: case EF_NEW_AUTOSHADOWSPELL: case EF_NEW_AUTOSHADOWSPELL_BOTTOM: case EF_DESTRUCTIVE_HURRICANE: @@ -1041,8 +1041,8 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_ROCKDOWN_CAST: case EF_ROCKDOWN_CAST_BOTTOM: case EF_ROCKDOWN_HIT: - case EF_UNK_1750: - case EF_UNK_1751: + case EF_VIGOR_CAST: + case EF_VIGOR_BUFF: case EF_RAIN_OF_CRYSTAL: case EF_RAIN_OF_CRYSTAL_BOTTOM: case EF_CRIMSON_ARROW_CAST: @@ -1103,9 +1103,9 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_ARBITRIUM: case EF_ARBITRIUM_BOTTOM: case EF_ARBITRIUM_HIT: - case EF_UNK_1827: - case EF_UNK_1828: - case EF_UNK_1830: + case EF_DANCING_KNIFE_CAST: + case EF_DANCING_KNIFE_CAST_BOTTOM: + case EF_ABYSS_DAGGER_HIT_1830: case EF_NEW_REPARATIO_CAST: case EF_NEW_REPARATIO_CAST_BOTTOM: case EF_NEW_REPARATIO: @@ -1131,8 +1131,8 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_CRYSTAL_IMPACT_BUFF: case EF_RELIGIO: case EF_RELIGIO_CAST: - case EF_UNK_1862: - case EF_UNK_1863: + case EF_NEW_ENCHANTING_SHADOW: + case EF_NEW_ENCHANTING_SHADOW_BOTTOM: case EF_FATAL_SHADOW_CROW: case EF_FATAL_SHADOW_CROW_BOTTOM: case EF_FATAL_SHADOW_CROW_HIT: @@ -1157,9 +1157,9 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_STRATUM_TREMOR_HIT: case EF_STRATUM_TREMOR: case EF_STRATUM_TREMOR_BOTTOM: - case EF_UNK_1895: - case EF_UNK_1896: - case EF_UNK_1898: + case EF_IMPACT_CRATER: + case EF_IMPACT_CRATER_BOTTOM: + case EF_IMPACT_CRATER_HIT: case EF_WIND_SIGN: case EF_WIND_SIGN_LOOP: case EF_ABR_MOTHER_CAST: @@ -1199,11 +1199,11 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_NEW_AXE_STOMP_08: case EF_NEW_AXE_STOMP_09: case EF_NEW_AXE_STOMP_11: - case EF_UNK_1950: - case EF_UNK_1952: - case EF_UNK_1953: - case EF_UNK_1954: - case EF_UNK_1955: + case EF_CRESCIVEBOLT_CAST: + case EF_CRESCIVEBOLT_HIT: + case EF_SHADOW_STAB: + case EF_ETERNAL_SLASH_HIT: + case EF_SHADOW_STAB_HIT2: case EF_SINCERE_FAITH: case EF_SINCERE_FAITH_BOTTOM: case EF_ABYSS_DAGGER: @@ -1236,15 +1236,15 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_EXPLOSION_BLASTER_BOTTOM: case EF_EXPLOSION_BLASTER_HIT: case EF_FIRM_FAITH: - case EF_UNK_2000: - case EF_UNK_2001: - case EF_UNK_2002: + case EF_MYSTICSYMPHONY: + case EF_MYSTICSYMPHONY_CAST: + case EF_MYSTICSYMPHONY_NOTE: case EF_ACTIVITY_BURN: case EF_ACTIVITY_BURN_CAST: case EF_ACTIVITY_BURN_CAST_BOTTOM: - case EF_UNK_2006: - case EF_UNK_2007: - case EF_UNK_2008: + case EF_KVASIRSONATA: + case EF_KVASIRSONATA_CAST: + case EF_KVASIRSONATA_CAST_BOTTOM: case EF_SERPENS_BOTTOM: case EF_SERPENS_CAST: case EF_SERPENS_CAST_BOTTOM: @@ -1281,11 +1281,11 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_LIGHTNING_LAND_CAST: case EF_LIGHTNING_LAND_CAST_BOTTOM: case EF_LIGHTNING_LAND_HIT: - case EF_UNK_2046: - case EF_UNK_2047: - case EF_UNK_2048: - case EF_UNK_2049: - case EF_UNK_2050: + case EF_ROSEBLOSSOM_CAST: + case EF_ROSEBLOSSOM_CAST_BOTTOM: + case EF_ROSEBLOSSOM_HIT: + case EF_ROSEBLOSSOM_ROSE: + case EF_ROSEBLOSSOM_SHOT: case EF_FIRST_BRAND: case EF_FIRST_BRAND_AURA: case EF_FIRST_BRAND_HIT: @@ -1300,15 +1300,15 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_SOUND_BLEND_CAST_BOTTOM: case EF_SOUND_BLEND_RED: case EF_METALLIC_FURY: - case EF_UNK_2065: - case EF_UNK_2066: - case EF_UNK_2067: - case EF_UNK_2068: - case EF_UNK_2069: - case EF_UNK_2070: - case EF_UNK_2071: - case EF_UNK_2072: - case EF_UNK_2073: + case EF_JAWAII_SERENADE: + case EF_JAWAII_SERENADE_CAST: + case EF_JAWAII_SERENADE_CAST_BOTTOM: + case EF_PRONMARCH: + case EF_PRONMARCH_CAST: + case EF_PRONMARCH_CAST_BOTTOM: + case EF_RHYTHMSHOOTING_CAST: + case EF_RHYTHMSHOOTING_CAST_BOTTOM: + case EF_RHYTHMSHOOTING_HIT: case EF_NIFLHEIM: case EF_NIFLHEIM_CAST: case EF_SECOND_FAITH: @@ -1345,16 +1345,16 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_THIRD_PUNISH: case EF_THIRD_PUNISH_BOTTOM: case EF_FRENZY_SHOT_HIT: - case EF_UNK_2116: - case EF_UNK_2117: - case EF_UNK_2118: - case EF_UNK_2119: - case EF_UNK_2120: - case EF_UNK_2121: + case EF_GEF_NOCTURN: + case EF_GEF_NOCTURN_CAST: + case EF_GEF_NOCTURN_CAST_BOTTOM: + case EF_ROKI_CAPRICCIO: + case EF_ROKI_CAPRICCIO_CAST: + case EF_ROKI_CAPRICCIO_CAST_BOTTOM: case EF_MUSICAL_INTERLUDE: case EF_MUSICAL_INTERLUDE_CAST: - case EF_UNK_2124: - case EF_UNK_2125: + case EF_AIN_RHAPSODY: + case EF_AIN_RHAPSODY_CAST: case EF_ABYSS_SLAYER: case EF_ABYSS_SLAYER_CAST: case EF_ABYSS_SLAYER_CAST_BOTTOM: @@ -1385,49 +1385,49 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_ELEMENTAL_BUSTER_WIND_HIT: case EF_UNLUCKY_RUSH_CAST: case EF_ABYSS_DAGGER_HIT_3: - case EF_UNK_2157: - case EF_UNK_2158: - case EF_UNK_2159: - case EF_UNK_2160: + case EF_OVERSLASH: + case EF_OVERSLASH_BOTTOM: + case EF_OVERSLASH_CAST: + case EF_OVERSLASH_HIT: case EF_ADVANCED_PROTECTION: case EF_ADVANCED_PROTECTION_BOTTOM: case EF_ADVANCED_PROTECTION_CAST: case EF_ADVANCED_PROTECTION_CAST_BOTTOM: - case EF_UNK_2166: - case EF_UNK_2167: - case EF_UNK_2168: - case EF_UNK_2169: - case EF_UNK_2170: - case EF_UNK_2171: - case EF_UNK_2172: - case EF_UNK_2173: - case EF_UNK_2174: - case EF_UNK_2175: - case EF_UNK_2176: - case EF_UNK_2177: - case EF_UNK_2178: - case EF_UNK_2179: - case EF_UNK_2180: - case EF_UNK_2181: - case EF_UNK_2182: + case EF_CROSS_RAIN_BOTTOM: + case EF_CROSS_RAIN_CAST: + case EF_CROSS_RAIN_CAST_BOTTOM: + case EF_GUARD_STANCE: + case EF_GUARD_STANCE_CAST: + case EF_GUARD_STANCE_CAST_BOTTOM: + case EF_ATTACK_STANCE: + case EF_ATTACK_STANCE_CAST: + case EF_ATTACK_STANCE_CAST_BOTTOM: + case EF_GRAND_JUDGEMENT: + case EF_GRAND_JUDGEMENT_BOTTOM: + case EF_GRAND_JUDGEMENT_BUFF: + case EF_GRAND_JUDGEMENT_CAST: + case EF_GRAND_JUDGEMENT_CAST_BOTTOM: + case EF_HOLY_SHIELD_CAST: + case EF_HOLY_SHIELD: + case EF_HOLY_SHIELD_LOOP: case EF_SHIELD_SHOOTING_CAST: case EF_SHIELD_SHOOTING_HIT: case EF_THE_W_PROTECTION: case EF_THE_W_PROTECTION_CAST: - case EF_UNK_2188: - case EF_UNK_2189: - case EF_UNK_2190: - case EF_UNK_2191: - case EF_UNK_2192: - case EF_UNK_2193: - case EF_UNK_2194: - case EF_UNK_2196: - case EF_UNK_2197: - case EF_UNK_2198: - case EF_UNK_2199: - case EF_UNK_2200: - case EF_UNK_2201: - case EF_UNK_2202: + case EF_GUARDIANSHIELD: + case EF_GUARDIANSHIELD_BOTTOM: + case EF_GUARDIANSHIELD_SUB: + case EF_JUDGEMENT_CROSS: + case EF_JUDGEMENT_CROSS_BOTTOM: + case EF_JUDGEMENT_CROSS_CAST: + case EF_JUDGEMENT_CROSS_CAST_BOTTOM: + case EF_REBOUND_SHIELD: + case EF_REBOUND_SHIELD_BOTTOM: + case EF_REBOUND_SHIELD_CAST: + case EF_REBOUND_SHIELD_CAST_BOTTOM: + case EF_ULTIMATESACRIFICE: + case EF_ULTIMATESACRIFICE_BOTTOM: + case EF_ULTIMATESACRIFICE_SHINE: case EF_ACIDIFIED_ZONE_FIRE_CAST: case EF_ACIDIFIED_ZONE_FIRE_CAST_BOTTOM: case EF_ACIDIFIED_ZONE_FIRE_HIT: @@ -1492,7 +1492,7 @@ bool CEZ2STRScreenEffect::IsAttachedToHead() const { case EF_STATE_CRYSTALLIZATION: case EF_STATE_DEADLYPOISON: case EF_THIRD_CONSECRATION_BOTTOM: - case EF_UNK_2280: + case EF_SERVANT_SIGN_BOTTOM: case EF_NPC_KILLING_AURA_HIT: case EF_NPC_CANE_OF_EVIL_EYE: case EF_TOXIN_OF_MANDARA_BOMB: @@ -1687,11 +1687,11 @@ bool CEZ2STRScreenEffect::IsAlive() { case EF_RED_WAVE_2: case EF_RED_WAVE_3: case EF_NEW_EPICLESIS: - case EF_UNK_1710: + case EF_SERVANT_SIGN: case EF_DRAGONIC_AURA_BUFF: case EF_DRAGONIC_AURA_BUFF_BOTTOM: case EF_DEADLY_PROJECTION: - case EF_UNK_1751: + case EF_VIGOR_BUFF: case EF_MYSTERY_ILLUSION: case EF_MYSTERY_ILLUSION_BOTTOM: case EF_TORNADO_STORM: @@ -1708,14 +1708,14 @@ bool CEZ2STRScreenEffect::IsAlive() { case EF_STRATUM_TREMOR_BOTTOM: case EF_WIND_SIGN_LOOP: case EF_FLAME_TRAP: - case EF_UNK_1962: + case EF_CALUMITYGALE_LOOP: case EF_FIRST_FAITH_POWER: case EF_JUDGE: case EF_JUDGE_AURA: case EF_THIRD_EXOR_FLAME: case EF_THIRD_EXOR_FLAME_AURA: case EF_OLEUM_SANCTUM_LOOP: - case EF_UNK_2002: + case EF_MYSTICSYMPHONY_NOTE: case EF_VENOM_SWAMP_BOTTOM: case EF_LIGHTNING_LAND: case EF_LIGHTNING_LAND_BOTTOM: @@ -1729,9 +1729,9 @@ bool CEZ2STRScreenEffect::IsAlive() { case EF_ABYSS_SLAYER: case EF_ABYSS_SQUARE: case EF_ABYSS_SQUARE_BOTTOM: - case EF_UNK_2166: - case EF_UNK_2177: - case EF_UNK_2182: + case EF_CROSS_RAIN_BOTTOM: + case EF_GRAND_JUDGEMENT_BUFF: + case EF_HOLY_SHIELD_LOOP: case EF_ACIDIFIED_ZONE_FIRE_LOOP: case EF_ACIDIFIED_ZONE_FIRE_LOOP_BOTTOM: case EF_ACIDIFIED_ZONE_WATER_LOOP: @@ -1744,7 +1744,7 @@ bool CEZ2STRScreenEffect::IsAlive() { case EF_STATE_CONFLAGRATION: case EF_STATE_FROSTBITE: case EF_STATE_CRYSTALLIZATION: - case EF_UNK_2280: + case EF_SERVANT_SIGN_BOTTOM: case EF_NPC_KILLING_AURA: case EF_NPC_20TH_CRYSTAL_S: case EF_NPC_20TH_CRYSTAL_M: @@ -3386,13 +3386,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { particle->Open("new_axeboomerang\\new_axeboomerang_hit\\new_axeboomerang_hit.str"); } break; - case EF_UNK_1661: + case EF_HACKANDSLASH: particle->Load("hackandslash\\hackandslash\\hackandslash.str"); break; - case EF_UNK_1662: + case EF_HACKANDSLASH_BOTTOM: particle->Load("hackandslash\\hackandslash_bottom\\hackandslash_bottom.str"); break; - case EF_UNK_1663: + case EF_HACKANDSLASH_HIT: particle->Load("hackandslash\\hackandslash_hit\\hackandslash_hit.str"); break; case EF_NEW_SPELLFIST_FIRE: @@ -3430,19 +3430,19 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { particle->Open("new_spellfist\\new_spellfist_wind\\new_spellfist_wind.str"); } break; - case EF_UNK_1670: + case EF_STORMSLASH_1: particle->Load("stormslash\\stormslash\\stormslash_1.str"); break; - case EF_UNK_1671: + case EF_STORMSLASH_2: particle->Load("stormslash\\stormslash\\stormslash_2.str"); break; - case EF_UNK_1672: + case EF_STORMSLASH_3: particle->Load("stormslash\\stormslash\\stormslash_3.str"); break; - case EF_UNK_1673: + case EF_STORMSLASH_4: particle->Load("stormslash\\stormslash\\stormslash_4.str"); break; - case EF_UNK_1674: + case EF_STORMSLASH_5: particle->Load("stormslash\\stormslash\\stormslash_5.str"); break; case EF_NEW_CARTBOOST: @@ -3560,13 +3560,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { particle->Open("new_windcutter\\new_windcutter_target\\new_windcutter_target.str"); } break; - case EF_UNK_1695: + case EF_NEW_SERVANTWEAPON_HIT: particle->Load("new_servantweapon\\new_servantweapon_hit\\new_servantweapon_hit.str"); break; - case EF_UNK_1696: + case EF_NEW_SERVANTWEAPON_HIT_BOTTOM: particle->Load("new_servantweapon\\new_servantweapon_hit_bottom\\new_servantweapon_hit_bottom.str"); break; - case EF_UNK_1697: + case EF_NEW_SERVANTWEAPON_SHOOT_BOTTOM: particle->Load("new_servantweapon\\new_servantweapon_shoot_bottom\\new_servantweapon_shoot_bottom.str"); break; case EF_NEW_POWERSWING_01: @@ -3646,43 +3646,43 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { particle->Open("new_earthdrive\\new_earthdrive_target\\new_earthdrive_target.str"); } break; - case EF_UNK_1710: + case EF_SERVANT_SIGN: particle->Load("servant_sign\\servant_sign\\servant_sign.str"); break; - case EF_UNK_2280: + case EF_SERVANT_SIGN_BOTTOM: particle->Load("servant_sign\\servant_sign_bottom\\servant_sign_bottom.str"); break; - case EF_UNK_1711: + case EF_SERVANT_SIGN_DOWN: particle->Load("servant_sign\\servant_sign_down\\servant_sign_down.str"); break; - case EF_UNK_1712: + case EF_SERVANT_SIGN_DOWN_BOTTOM: particle->Load("servant_sign\\servant_sign_down_bottom\\servant_sign_down_bottom.str"); break; - case EF_UNK_1713: + case EF_SERVANT_PHANTOM_DOWN: particle->Load("servant_phantom\\servant_phantom_down\\servant_phantom_down.str"); break; - case EF_UNK_1714: + case EF_SERVANT_PHANTOM_HIT: particle->Load("servant_phantom\\servant_phantom_hit\\servant_phantom_hit.str"); break; - case EF_UNK_1715: + case EF_SERVANT_PHANTOM_HIT_BOTTOM: particle->Load("servant_phantom\\servant_phantom_hit_bottom\\servant_phantom_hit_bottom.str"); break; - case EF_UNK_1716: + case EF_SERVANT_PHANTOM_SUB: particle->Load("servant_phantom\\servant_phantom_sub\\servant_phantom_sub.str"); break; - case EF_UNK_1717: + case EF_SERVANT_PHANTOM_SUB_BOTTOM: particle->Load("servant_phantom\\servant_phantom_sub_bottom\\servant_phantom_sub_bottom.str"); break; - case EF_UNK_1718: + case EF_SERVANT_DEMOLITION_COLLECT: particle->Load("servant_demolition\\servant_demolition_collect\\servant_demolition_collect.str"); break; - case EF_UNK_1719: + case EF_SERVANT_DEMOLITION_HIT: particle->Load("servant_demolition\\servant_demolition_hit\\servant_demolition_hit.str"); break; - case EF_UNK_1720: + case EF_SERVANT_DEMOLITION_LEFTDOWN: particle->Load("servant_demolition\\servant_demolition_leftdown\\servant_demolition_leftdown.str"); break; - case EF_UNK_1721: + case EF_SERVANT_DEMOLITION_RIGHTDOWN: particle->Load("servant_demolition\\servant_demolition_rightdown\\servant_demolition_rightdown.str"); break; case EF_DRAGONIC_AURA: @@ -3703,16 +3703,16 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_DRAGONIC_AURA_BUFF_BOTTOM: particle->Load("dragonnic_ora\\dragonnic_ora_buff_bottom\\dragonnic_ora_buff_bottom.str"); break; - case EF_UNK_1728: + case EF_MADNESS_CRUSHER: particle->Load("madness_crusher\\madness_crusher\\madness_crusher.str"); break; - case EF_UNK_1729: + case EF_MADNESS_CRUSHER_BOTTOM: particle->Load("madness_crusher\\madness_crusher_bottom\\madness_crusher_bottom.str"); break; - case EF_UNK_1750: + case EF_VIGOR_CAST: particle->Load("vigor\\vigor_cast\\vigor_cast.str"); break; - case EF_UNK_1751: + case EF_VIGOR_BUFF: particle->Load("vigor\\vigor_buff\\vigor_buff.str"); break; case EF_NEW_AUTOSHADOWSPELL: @@ -3810,13 +3810,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_VIOLENT_QUAKE_BOTTOM: particle->Load("violentquake\\violentquake_bottom\\violentquake_bottom.str"); break; - case EF_UNK_1765: + case EF_NEW_CHARGINGPIERCE_CAST: particle->Load("new_chargingpierce\\new_chargingpierce_cast\\new_chargingpierce_cast.str"); break; - case EF_UNK_1766: + case EF_NEW_CHARGINGPIERCE_CAST_BOTTOM: particle->Load("new_chargingpierce\\new_chargingpierce_cast_bottom\\new_chargingpierce_cast_bottom.str"); break; - case EF_UNK_1767: + case EF_NEW_CHARGINGPIERCE_HIT: particle->Load("new_chargingpierce\\new_chargingpierce_hit\\new_chargingpierce_hit.str"); break; case EF_ASTRAL_STRIKE_CAST: @@ -4038,13 +4038,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_ARBITRIUM_HIT: particle->Load("arbitrium\\arbitrium_hit\\arbitrium_hit.str"); break; - case EF_UNK_1827: + case EF_DANCING_KNIFE_CAST: particle->Load("dancing_knife\\dancing_knife_cast\\dancing_knife_cast.str"); break; - case EF_UNK_1828: + case EF_DANCING_KNIFE_CAST_BOTTOM: particle->Load("dancing_knife\\dancing_knife_cast_bottom\\dancing_knife_cast_bottom.str"); break; - case EF_UNK_1830: + case EF_ABYSS_DAGGER_HIT_1830: particle->Load("abyss_dagger\\abyss_dagger_hit\\abyss_dagger_hit.str"); break; case EF_ETERNAL_SLASH_HIT_1: @@ -4134,10 +4134,10 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_CRYSTAL_IMPACT_BUFF: particle->Load("crystal_impact\\crystal_impact_buff\\crystal_impact_buff.str"); break; - case EF_UNK_1862: + case EF_NEW_ENCHANTING_SHADOW: particle->Load("enchanting_shadow\\enchanting_shadow\\new_enchanting_shadow.str"); break; - case EF_UNK_1863: + case EF_NEW_ENCHANTING_SHADOW_BOTTOM: particle->Load("enchanting_shadow\\enchanting_shadow_bottom\\new_enchanting_shadow_bottom.str"); break; case EF_FLAME_TRAP_HIT: @@ -4164,7 +4164,7 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_FATAL_SHADOW_CROW_HIT: particle->Load("fatal_shadow_crow\\fatal_shadow_crow_hit\\fatal_shadow_crow_hit.str"); break; - case EF_UNK_1868: + case EF_SHADOW_EXCEED_CAST: particle->Load("shadow_exceed\\shadow_exceed_cast\\shadow_exceed_cast.str"); break; case EF_DEEP_BLIND_TRAP: @@ -4176,13 +4176,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_DEEP_BLIND_TRAP_HIT: particle->Load("deepblindtrap\\deepblindtrap_hit\\deepblindtrap_hit.str"); break; - case EF_UNK_1960: + case EF_CALUMITYGALE: particle->Load("4wh_calumitygale\\calumitygale\\calumitygale.str"); break; - case EF_UNK_1961: + case EF_CALUMITYGALE_CAST: particle->Load("4wh_calumitygale\\calumitygale_cast\\calumitygale_cast.str"); break; - case EF_UNK_1962: + case EF_CALUMITYGALE_LOOP: particle->Load("4wh_calumitygale\\calumitygale_loop\\calumitygale_loop.str"); break; case EF_SWIFT_TRAP: @@ -4230,13 +4230,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_STRATUM_TREMOR_BOTTOM: particle->Load("strantumtremor\\strantumtremor_bottom\\strantumtremor_bottom.str"); break; - case EF_UNK_1895: + case EF_IMPACT_CRATER: particle->Load("impact_crater\\impact_crater\\impact_crater.str"); break; - case EF_UNK_1896: + case EF_IMPACT_CRATER_BOTTOM: particle->Load("impact_crater\\impact_crater_bottom\\impact_crater_bottom.str"); break; - case EF_UNK_1898: + case EF_IMPACT_CRATER_HIT: particle->Load("impact_crater\\impact_crater_hit\\impact_crater_hit.str"); break; case EF_WIND_SIGN: @@ -4287,19 +4287,19 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_NEW_POTENT_VENOM: particle->Load("new_potent_venom\\new_potent_venom.str"); break; - case EF_UNK_1950: + case EF_CRESCIVEBOLT_CAST: particle->Load("crescivebolt\\crescivebolt_cast\\crescivebolt_cast.str"); break; - case EF_UNK_1952: + case EF_CRESCIVEBOLT_HIT: particle->Load("crescivebolt\\crescivebolt_hit\\crescivebolt_hit.str"); break; - case EF_UNK_1953: + case EF_SHADOW_STAB: particle->Load("shadow_stab\\shadow_stab\\shadow_stab.str"); break; - case EF_UNK_1954: + case EF_ETERNAL_SLASH_HIT: particle->Load("eternal_slash\\eternal_slash_hit\\eternal_slash_hit.str"); break; - case EF_UNK_1955: + case EF_SHADOW_STAB_HIT2: particle->Load("shadow_stab\\shadow_stab_hit2\\shadow_stab_hit2.str"); break; case EF_FIRST_FAITH_POWER: @@ -4452,13 +4452,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_GALE_STORM_HIT: particle->Load("galestorm\\galestorm_hit\\galestorm_hit.str"); break; - case EF_UNK_2006: + case EF_KVASIRSONATA: particle->Load("4tr_kvasirsonata\\kvasirsonata\\kvasirsonata.str"); break; - case EF_UNK_2007: + case EF_KVASIRSONATA_CAST: particle->Load("4tr_kvasirsonata\\kvasirsonata_cast\\kvasirsonata_cast.str"); break; - case EF_UNK_2008: + case EF_KVASIRSONATA_CAST_BOTTOM: particle->Load("4tr_kvasirsonata\\kvasirsonata_cast_bottom\\kvasirsonata_cast_bottom.str"); break; case EF_POWERFUL_FAITH: @@ -4476,13 +4476,13 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_FIRM_FAITH: particle->Load("firmfaith\\firmfaith\\firmfaith.str"); break; - case EF_UNK_2000: + case EF_MYSTICSYMPHONY: particle->Load("mysticsymphony\\mysticsymphony\\mysticsymphony.str"); break; - case EF_UNK_2001: + case EF_MYSTICSYMPHONY_CAST: particle->Load("mysticsymphony\\mysticsymphony_cast\\mysticsymphony_cast.str"); break; - case EF_UNK_2002: + case EF_MYSTICSYMPHONY_NOTE: particle->Load("mysticsymphony\\mysticsymphony_note\\mysticsymphony_note.str"); break; case EF_ACTIVITY_BURN: @@ -4569,19 +4569,19 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_DIAMOND_STORM_HIT: particle->Load("diamond_storm\\diamond_storm_hit\\diamond_storm_hit.str"); break; - case EF_UNK_2046: + case EF_ROSEBLOSSOM_CAST: particle->Load("roseblossom\\roseblossom_cast\\roseblossom_cast.str"); break; - case EF_UNK_2047: + case EF_ROSEBLOSSOM_CAST_BOTTOM: particle->Load("roseblossom\\roseblossom_cast_bottom\\roseblossom_cast_bottom.str"); break; - case EF_UNK_2048: + case EF_ROSEBLOSSOM_HIT: particle->Load("roseblossom\\roseblossom_hit\\roseblossom_hit.str"); break; - case EF_UNK_2049: + case EF_ROSEBLOSSOM_ROSE: particle->Load("roseblossom\\roseblossom_rose\\roseblossom_rose.str"); break; - case EF_UNK_2050: + case EF_ROSEBLOSSOM_SHOT: particle->Load("roseblossom\\roseblossom_shot\\roseblossom_shot.str"); break; case EF_VENOM_SWAMP_BOTTOM: @@ -4665,31 +4665,31 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_METALLIC_FURY: particle->Load("metalicfury\\metalicfury\\metalicfury.str"); break; - case EF_UNK_2065: + case EF_JAWAII_SERENADE: particle->Load("jawaii_serenade\\jawaii_serenade\\jawaii_serenade.str"); break; - case EF_UNK_2066: + case EF_JAWAII_SERENADE_CAST: particle->Load("jawaii_serenade\\jawaii_serenade_cast\\jawaii_serenade_cast.str"); break; - case EF_UNK_2067: + case EF_JAWAII_SERENADE_CAST_BOTTOM: particle->Load("jawaii_serenade\\jawaii_serenade_cast_bottom\\jawaii_serenade_cast_bottom.str"); break; - case EF_UNK_2068: + case EF_PRONMARCH: particle->Load("pronmarch\\pronmarch\\pronmarch.str"); break; - case EF_UNK_2069: + case EF_PRONMARCH_CAST: particle->Load("pronmarch\\pronmarch_cast\\pronmarch_cast.str"); break; - case EF_UNK_2070: + case EF_PRONMARCH_CAST_BOTTOM: particle->Load("pronmarch\\pronmarch_cast_bottom\\pronmarch_cast_bottom.str"); break; - case EF_UNK_2071: + case EF_RHYTHMSHOOTING_CAST: particle->Load("rhythmshooting\\rhythmshooting_cast\\rhythmshooting_cast.str"); break; - case EF_UNK_2072: + case EF_RHYTHMSHOOTING_CAST_BOTTOM: particle->Load("rhythmshooting\\rhythmshooting_cast_bottom\\rhythmshooting_cast_bottom.str"); break; - case EF_UNK_2073: + case EF_RHYTHMSHOOTING_HIT: particle->Load("rhythmshooting\\rhythmshooting_hit\\rhythmshooting_hit.str"); break; case EF_NIFLHEIM: @@ -4785,22 +4785,22 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_FRENZY_SHOT_HIT: particle->Load("frenzy_shot\\frenzy_shot_hit\\frenzy_shot_hit.str"); break; - case EF_UNK_2116: + case EF_GEF_NOCTURN: particle->Load("gef_nocturn\\gef_nocturn\\gef_nocturn.str"); break; - case EF_UNK_2117: + case EF_GEF_NOCTURN_CAST: particle->Load("gef_nocturn\\gef_nocturn_cast\\gef_nocturn_cast.str"); break; - case EF_UNK_2118: + case EF_GEF_NOCTURN_CAST_BOTTOM: particle->Load("gef_nocturn\\gef_nocturn_cast_bottom\\gef_nocturn_cast_bottom.str"); break; - case EF_UNK_2119: + case EF_ROKI_CAPRICCIO: particle->Load("roki_capriccio\\roki_capriccio\\roki_capriccio.str"); break; - case EF_UNK_2120: + case EF_ROKI_CAPRICCIO_CAST: particle->Load("roki_capriccio\\roki_capriccio_cast\\roki_capriccio_cast.str"); break; - case EF_UNK_2121: + case EF_ROKI_CAPRICCIO_CAST_BOTTOM: particle->Load("roki_capriccio\\roki_capriccio_cast_bottom\\roki_capriccio_cast_bottom.str"); break; case EF_MUSICAL_INTERLUDE: @@ -4809,10 +4809,10 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_MUSICAL_INTERLUDE_CAST: particle->Load("musical_interlude\\musical_interlude_cast\\musical_interlude_cast.str"); break; - case EF_UNK_2124: + case EF_AIN_RHAPSODY: particle->Load("ain_rhapsody\\ain_rhapsody\\ain_rhapsody.str"); break; - case EF_UNK_2125: + case EF_AIN_RHAPSODY_CAST: particle->Load("ain_rhapsody\\ain_rhapsody_cast\\ain_rhapsody_cast.str"); break; case EF_TERRA_DRIVE: @@ -4884,16 +4884,16 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_ABYSS_DAGGER_HIT_3: particle->Load("abyss_dagger\\abyss_dagger_hit\\abyss_dagger_hit.str"); break; - case EF_UNK_2157: + case EF_OVERSLASH: particle->Load("overslash\\overslash\\overslash.str"); break; - case EF_UNK_2158: + case EF_OVERSLASH_BOTTOM: particle->Load("overslash\\overslash_bottom\\overslash_bottom.str"); break; - case EF_UNK_2159: + case EF_OVERSLASH_CAST: particle->Load("overslash\\overslash_cast\\overslash_cast.str"); break; - case EF_UNK_2160: + case EF_OVERSLASH_HIT: particle->Load("overslash\\overslash_hit\\overslash_hit.str"); break; case EF_ADVANCED_PROTECTION: @@ -4908,55 +4908,55 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_ADVANCED_PROTECTION_CAST_BOTTOM: particle->Load("adv_protection\\adv_protection_cast_bottom\\adv_protection_cast_bottom.str"); break; - case EF_UNK_2166: + case EF_CROSS_RAIN_BOTTOM: particle->Load("crossrain\\cross_rain_bottom\\cross_rain_bottom.str"); break; - case EF_UNK_2167: + case EF_CROSS_RAIN_CAST: particle->Load("crossrain\\cross_rain_cast\\cross_rain_cast.str"); break; - case EF_UNK_2168: + case EF_CROSS_RAIN_CAST_BOTTOM: particle->Load("crossrain\\cross_rain_cast_bottom\\cross_rain_cast_bottom.str"); break; - case EF_UNK_2169: + case EF_GUARD_STANCE: particle->Load("guard_stance\\guard_stance\\guard_stance.str"); break; - case EF_UNK_2170: + case EF_GUARD_STANCE_CAST: particle->Load("guard_stance\\guard_stance_cast\\guard_stance_cast.str"); break; - case EF_UNK_2171: + case EF_GUARD_STANCE_CAST_BOTTOM: particle->Load("guard_stance\\guard_stance_cast_bottom\\guard_stance_cast_bottom.str"); break; - case EF_UNK_2172: + case EF_ATTACK_STANCE: particle->Load("attack_stance\\attack_stance\\attack_stance.str"); break; - case EF_UNK_2173: + case EF_ATTACK_STANCE_CAST: particle->Load("attack_stance\\attack_stance_cast\\attack_stance_cast.str"); break; - case EF_UNK_2174: + case EF_ATTACK_STANCE_CAST_BOTTOM: particle->Load("attack_stance\\attack_stance_cast_bottom\\attack_stance_cast_bottom.str"); break; - case EF_UNK_2175: + case EF_GRAND_JUDGEMENT: particle->Load("grand_judgement\\grand_judgement\\grand_judgement.str"); break; - case EF_UNK_2176: + case EF_GRAND_JUDGEMENT_BOTTOM: particle->Load("grand_judgement\\grand_judgement_bottom\\grand_judgement_bottom.str"); break; - case EF_UNK_2177: + case EF_GRAND_JUDGEMENT_BUFF: particle->Load("grand_judgement\\grand_judgement_buff\\grand_judgement_buff.str"); break; - case EF_UNK_2178: + case EF_GRAND_JUDGEMENT_CAST: particle->Load("grand_judgement\\grand_judgement_cast\\grand_judgement_cast.str"); break; - case EF_UNK_2179: + case EF_GRAND_JUDGEMENT_CAST_BOTTOM: particle->Load("grand_judgement\\grand_judgement_cast_bottom\\grand_judgement_cast_bottom.str"); break; - case EF_UNK_2181: + case EF_HOLY_SHIELD: particle->Load("holy_shield\\holy_shield\\holy_shield.str"); break; - case EF_UNK_2180: + case EF_HOLY_SHIELD_CAST: particle->Load("holy_shield\\holy_shield_cast\\holy_shield_cast.str"); break; - case EF_UNK_2182: + case EF_HOLY_SHIELD_LOOP: particle->Load("holy_shield\\holy_shield_loop\\holy_shield_loop.str"); break; case EF_SHIELD_SHOOTING_CAST: @@ -4971,46 +4971,46 @@ void CEZ2STRScreenEffect::InitParticle(CEZ2STRParticle* particle, int id) { case EF_THE_W_PROTECTION_CAST: particle->Load("the_w_protection\\the_w_protection_cast\\the_w_protection_cast.str"); break; - case EF_UNK_2188: + case EF_GUARDIANSHIELD: particle->Load("guardianshield\\guardianshield\\guardianshield.str"); break; - case EF_UNK_2189: + case EF_GUARDIANSHIELD_BOTTOM: particle->Load("guardianshield\\guardianshield_bottom\\guardianshield_bottom.str"); break; - case EF_UNK_2190: + case EF_GUARDIANSHIELD_SUB: particle->Load("guardianshield\\guardianshield_sub\\guardianshield_sub.str"); break; - case EF_UNK_2191: + case EF_JUDGEMENT_CROSS: particle->Load("judgement_cross\\judgement_cross\\judgement_cross.str"); break; - case EF_UNK_2192: + case EF_JUDGEMENT_CROSS_BOTTOM: particle->Load("judgement_cross\\judgement_cross_bottom\\judgement_cross_bottom.str"); break; - case EF_UNK_2193: + case EF_JUDGEMENT_CROSS_CAST: particle->Load("judgement_cross\\judgement_cross_cast\\judgement_cross_cast.str"); break; - case EF_UNK_2194: + case EF_JUDGEMENT_CROSS_CAST_BOTTOM: particle->Load("judgement_cross\\judgement_cross_cast_bottom\\judgement_cross_cast_bottom.str"); break; - case EF_UNK_2196: + case EF_REBOUND_SHIELD: particle->Load("rebound_shield\\rebound_shield\\rebound_shield.str"); break; - case EF_UNK_2197: + case EF_REBOUND_SHIELD_BOTTOM: particle->Load("rebound_shield\\rebound_shield_bottom\\rebound_shield_bottom.str"); break; - case EF_UNK_2198: + case EF_REBOUND_SHIELD_CAST: particle->Load("rebound_shield\\rebound_shield_cast\\rebound_shield_cast.str"); break; - case EF_UNK_2199: + case EF_REBOUND_SHIELD_CAST_BOTTOM: particle->Load("rebound_shield\\rebound_shield_cast_bottom\\rebound_shield_cast_bottom.str"); break; - case EF_UNK_2200: + case EF_ULTIMATESACRIFICE: particle->Load("ultimate_sacrifice\\ultimatesacrifice\\ultimatesacrifice.str"); break; - case EF_UNK_2201: + case EF_ULTIMATESACRIFICE_BOTTOM: particle->Load("ultimate_sacrifice\\ultimatesacrifice_bottom\\ultimatesacrifice_bottom.str"); break; - case EF_UNK_2202: + case EF_ULTIMATESACRIFICE_SHINE: particle->Load("ultimate_sacrifice\\ultimatesacrifice_shine\\ultimatesacrifice_shine.str"); break; case EF_ACIDIFIED_ZONE_FIRE_CAST: @@ -5658,11 +5658,11 @@ void CEZ2STRScreenEffect::Open() { case EF_RED_WAVE_2: case EF_RED_WAVE_3: case EF_NEW_EPICLESIS: - case EF_UNK_1710: + case EF_SERVANT_SIGN: case EF_DRAGONIC_AURA_BUFF: case EF_DRAGONIC_AURA_BUFF_BOTTOM: case EF_DEADLY_PROJECTION: - case EF_UNK_1751: + case EF_VIGOR_BUFF: case EF_MYSTERY_ILLUSION: case EF_TORNADO_STORM_BOTTOM: case EF_VIOLENT_QUAKE_BOTTOM: @@ -5680,14 +5680,14 @@ void CEZ2STRScreenEffect::Open() { case EF_STRATUM_TREMOR_BOTTOM: case EF_WIND_SIGN_LOOP: case EF_FLAME_TRAP: - case EF_UNK_1962: + case EF_CALUMITYGALE_LOOP: case EF_FIRST_FAITH_POWER: case EF_JUDGE: case EF_JUDGE_AURA: case EF_THIRD_EXOR_FLAME: case EF_THIRD_EXOR_FLAME_AURA: case EF_OLEUM_SANCTUM_LOOP: - case EF_UNK_2002: + case EF_MYSTICSYMPHONY_NOTE: case EF_VENOM_SWAMP_BOTTOM: case EF_LIGHTNING_LAND: case EF_LIGHTNING_LAND_BOTTOM: @@ -5701,9 +5701,9 @@ void CEZ2STRScreenEffect::Open() { case EF_ABYSS_SLAYER: case EF_ABYSS_SQUARE: case EF_ABYSS_SQUARE_BOTTOM: - case EF_UNK_2166: - case EF_UNK_2177: - case EF_UNK_2182: + case EF_CROSS_RAIN_BOTTOM: + case EF_GRAND_JUDGEMENT_BUFF: + case EF_HOLY_SHIELD_LOOP: case EF_ACIDIFIED_ZONE_FIRE_LOOP: case EF_ACIDIFIED_ZONE_FIRE_LOOP_BOTTOM: case EF_ACIDIFIED_ZONE_WATER_LOOP: @@ -5716,7 +5716,7 @@ void CEZ2STRScreenEffect::Open() { case EF_STATE_CONFLAGRATION: case EF_STATE_FROSTBITE: case EF_STATE_CRYSTALLIZATION: - case EF_UNK_2280: + case EF_SERVANT_SIGN_BOTTOM: case EF_NPC_KILLING_AURA: case EF_NPC_20TH_CRYSTAL_S: case EF_NPC_20TH_CRYSTAL_M: @@ -6012,7 +6012,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\EF_GlassWall.wav", 0x1e, 0); break; - case EF_UNK_1662: + case EF_HACKANDSLASH_BOTTOM: this->particle->flags = 13; this->AddEvent(0, "effect\\DK_HACKANDSLASHER.wav", 0, 0); break; @@ -6033,12 +6033,12 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(1, nullptr, 0x14, 0); break; - case EF_UNK_1712: + case EF_SERVANT_SIGN_DOWN_BOTTOM: this->particle->flags = 13; this->AddEvent(0, "effect\\DK_SERVANT_W_SIGN.wav", 0x28, 0); break; - case EF_UNK_1714: + case EF_SERVANT_PHANTOM_HIT: this->AddEvent(0, "effect\\DK_SERVANT_W_PHANTOM.wav", 0, 0); break; @@ -6050,7 +6050,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\DK_DRAGONIC_AURA2.wav", 1, 0); break; - case EF_UNK_1728: + case EF_MADNESS_CRUSHER: this->AddEvent(0, "effect\\DK_MADNESS_CRUSHER.wav", 1, 0); break; @@ -6070,7 +6070,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\AG_ROCK_DOWN.wav", 0, 0); break; - case EF_UNK_1767: + case EF_NEW_CHARGINGPIERCE_HIT: this->AddEvent(0, "effect\\DK_CHARGINGPIERCE1.wav", 0, 0); break; @@ -6078,19 +6078,19 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\AG_FROZEN_SLASH.wav", 0, 0); break; - case EF_UNK_1750: + case EF_VIGOR_CAST: this->AddEvent(0, "effect\\DK_VIGOR.wav", 0, 0); break; - case EF_UNK_1719: + case EF_SERVANT_DEMOLITION_HIT: this->AddEvent(0, "effect\\DK_SERVANT_W_DEMOL.wav", 0, 0); break; - case EF_UNK_1670: - case EF_UNK_1671: - case EF_UNK_1672: - case EF_UNK_1673: - case EF_UNK_1674: + case EF_STORMSLASH_1: + case EF_STORMSLASH_2: + case EF_STORMSLASH_3: + case EF_STORMSLASH_4: + case EF_STORMSLASH_5: for (int i = 0; i <= this->id - 0x686; ++i) { this->AddEvent(0, FormatOwnedString("effect\\DK_STORMSLASH%d.wav", rand() % 4 + 1).c_str(), i * 15, 0); } @@ -6141,7 +6141,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\AG_CRYSTAL_IMPACT.wav", 0, 0); break; - case EF_UNK_1961: + case EF_CALUMITYGALE_CAST: case EF_INCREASING_ACTIVITY_CAST_BOTTOM: case EF_ACTIVITY_BURN_CAST_BOTTOM: case EF_SERPENS_CAST_BOTTOM: @@ -6149,9 +6149,9 @@ void CEZ2STRScreenEffect::InitEvents() { case EF_PROCELLA_CAST_BOTTOM: case EF_TERREMOTUS_CAST_BOTTOM: case EF_TERRA_DRIVE_CAST_BOTTOM: - case EF_UNK_2171: - case EF_UNK_2174: - case EF_UNK_2179: + case EF_GUARD_STANCE_CAST_BOTTOM: + case EF_ATTACK_STANCE_CAST_BOTTOM: + case EF_GRAND_JUDGEMENT_CAST_BOTTOM: case EF_HELLTREE_CAST_BOTTOM: case EF_WOODEN_WARRIOR_CAST_BOTTOM: case EF_WOODEN_FAIRY_CAST_BOTTOM: @@ -6175,26 +6175,26 @@ void CEZ2STRScreenEffect::InitEvents() { case EF_ARGUTUS_TELUM_CAST: case EF_PRESENS_ACIES_CAST: case EF_ARBITRIUM_CAST: - case EF_UNK_1827: + case EF_DANCING_KNIFE_CAST: case EF_RELIGIO_CAST: - case EF_UNK_1862: - case EF_UNK_1868: + case EF_NEW_ENCHANTING_SHADOW: + case EF_SHADOW_EXCEED_CAST: case EF_SOLID_TRAP_CAST: case EF_BENEDICTUM_CAST: case EF_NEW_DILECTIO_HEAL_CAST: - case EF_UNK_1950: + case EF_CRESCIVEBOLT_CAST: case EF_PNEUMATICUS_PROCELLA_CAST: case EF_HAWK_BOOMERANG_CAST: case EF_GALE_STORM_CAST: case EF_FIRST_FAITH_POWER_CAST: case EF_JUDGE_CAST: case EF_THIRD_EXOR_FLAME_CAST: - case EF_UNK_2159: - case EF_UNK_2167: - case EF_UNK_2180: + case EF_OVERSLASH_CAST: + case EF_CROSS_RAIN_CAST: + case EF_HOLY_SHIELD_CAST: case EF_SHIELD_SHOOTING_CAST: - case EF_UNK_2193: - case EF_UNK_2198: + case EF_JUDGEMENT_CROSS_CAST: + case EF_REBOUND_SHIELD_CAST: this->AddEvent(0, "effect\\EF_BeginSpell.wav", 0, 0); break; @@ -6213,7 +6213,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\IQ_THIRD_PUNISH.wav", 0, 0); break; - case EF_UNK_2008: + case EF_KVASIRSONATA_CAST_BOTTOM: this->particle->flags = 13; this->AddEvent(0, "effect\\TR_KVASIR_SONATA.wav", 0, 0); break; @@ -6237,7 +6237,7 @@ void CEZ2STRScreenEffect::InitEvents() { } break; - case EF_UNK_1953: { + case EF_SHADOW_STAB: { float fromReciprocalDepth = 0.0f; float toReciprocalDepth = 0.0f; float fromX; @@ -6297,23 +6297,23 @@ void CEZ2STRScreenEffect::InitEvents() { break; } - case EF_UNK_2001: + case EF_MYSTICSYMPHONY_CAST: this->particle->flags = 13; [[fallthrough]]; - case EF_UNK_2007: + case EF_KVASIRSONATA_CAST: case EF_CHAIN_REACTION_SHOT_CAST: - case EF_UNK_2046: + case EF_ROSEBLOSSOM_CAST: case EF_SOUND_BLEND_CAST: - case EF_UNK_2066: - case EF_UNK_2069: - case EF_UNK_2071: + case EF_JAWAII_SERENADE_CAST: + case EF_PRONMARCH_CAST: + case EF_RHYTHMSHOOTING_CAST: case EF_NIFLHEIM_CAST: case EF_ABYSS_STRIKE_CAST: - case EF_UNK_2117: - case EF_UNK_2120: + case EF_GEF_NOCTURN_CAST: + case EF_ROKI_CAPRICCIO_CAST: case EF_MUSICAL_INTERLUDE_CAST: - case EF_UNK_2125: + case EF_AIN_RHAPSODY_CAST: case EF_ABYSS_SLAYER_CAST: case EF_UNLUCKY_RUSH_CAST: case EF_ADVANCED_PROTECTION_CAST: @@ -6385,7 +6385,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\EM_LIGHTNING_LAND.wav", 0, 0); break; - case EF_UNK_2050: { + case EF_ROSEBLOSSOM_SHOT: { float fromReciprocalDepth = 0.0f; float toReciprocalDepth = 0.0f; float fromX; @@ -6414,7 +6414,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\EM_CONFLAGRATION.wav", 0, 0); break; - case EF_UNK_2065: + case EF_JAWAII_SERENADE: this->particle->flags = 13; this->AddEvent(0, "effect\\TR_JAWAII_SERENADE.wav", 0, 0); break; @@ -6440,7 +6440,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\WH_WIND_SIGN.wav", 0, 0); break; - case EF_UNK_1960: + case EF_CALUMITYGALE: this->AddEvent(0, "effect\\WH_CALAMITYGALE.wav", 0, 0); break; @@ -6471,7 +6471,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\EM_TERRA_DRIVE.wav", 0, 0); break; - case EF_UNK_1954: + case EF_ETERNAL_SLASH_HIT: this->AddEvent(0, "effect\\SHC_SHADOW_STAB.wav", 0, 0); break; @@ -6479,7 +6479,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\SHC_ETERNAL_SLASH.wav", 0, 0); break; - case EF_UNK_1898: + case EF_IMPACT_CRATER_HIT: this->AddEvent(0, "effect\\SHC_IMPACT_CRATER.wav", 0, 0); break; @@ -6509,7 +6509,7 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\BO_WOODEN_ATTACK.wav", 0, 0); break; - case EF_UNK_2049: + case EF_ROSEBLOSSOM_ROSE: this->AddEvent(0, "effect\\TR_ROSEBLOSSOM_ROSE.wav", 0, 0); break; @@ -6525,15 +6525,15 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\TR_METALIC_FURY.wav", 0, 0); break; - case EF_UNK_2116: + case EF_GEF_NOCTURN: this->AddEvent(0, "effect\\TR_GEF_NOCTURN.wav", 0, 0); break; - case EF_UNK_2119: + case EF_ROKI_CAPRICCIO: this->AddEvent(0, "effect\\TR_ROKI_CAPRICCIO.wav", 0, 0); break; - case EF_UNK_2124: + case EF_AIN_RHAPSODY: this->AddEvent(0, "effect\\TR_AIN_RHAPSODY.wav", 0, 0); break; @@ -6545,11 +6545,11 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(0, "effect\\TR_NIPELHEIM_REQUIEM.wav", 0, 0); break; - case EF_UNK_2068: + case EF_PRONMARCH: this->AddEvent(0, "effect\\TR_PRON_MARCH.wav", 0, 0); break; - case EF_UNK_2000: + case EF_MYSTICSYMPHONY: this->AddEvent(0, "effect\\TR_MYSTIC_SYMPHONY.wav", 0, 0); break; @@ -6674,36 +6674,36 @@ void CEZ2STRScreenEffect::InitEvents() { this->AddEvent(1, nullptr, 0, 0); break; - case EF_UNK_2169: - case EF_UNK_2172: + case EF_GUARD_STANCE: + case EF_ATTACK_STANCE: this->AddEvent(0, "effect\\IG_GUARD_STANCE.wav", 0, 0); break; - case EF_UNK_2190: + case EF_GUARDIANSHIELD_SUB: this->AddEvent(0, "effect\\IG_GUARDIAN_SHIELD.wav", 0, 0); break; - case EF_UNK_2196: + case EF_REBOUND_SHIELD: this->AddEvent(0, "effect\\IG_REBOUND_SHIELD.wav", 0, 0); break; - case EF_UNK_2200: + case EF_ULTIMATESACRIFICE: this->AddEvent(0, "effect\\IG_ULTIMATE_SACRIFICE.wav", 0, 0); break; - case EF_UNK_2181: + case EF_HOLY_SHIELD: this->AddEvent(0, "effect\\IG_HOLY_SHIELD1.wav", 0, 0); break; - case EF_UNK_2182: + case EF_HOLY_SHIELD_LOOP: this->AddEvent(0, "effect\\IG_HOLY_SHIELD2.wav", 0x22, 0); break; - case EF_UNK_2175: + case EF_GRAND_JUDGEMENT: this->AddEvent(0, "effect\\IG_GRAND_JUDGEMENT.wav", 0, 0); break; - case EF_UNK_2157: + case EF_OVERSLASH: this->AddEvent(0, "effect\\IG_OVERSLASH.wav", 0, 0); break; @@ -6832,20 +6832,20 @@ void CEZ2STRScreenEffect::InitEvents() { case EF_NEW_OVERBRAND_CAST_BOTTOM: case EF_NEW_WINDCUTTER_BOTTOM_01: case EF_NEW_WINDCUTTER_BOTTOM_05: - case EF_UNK_1696: - case EF_UNK_1697: + case EF_NEW_SERVANTWEAPON_HIT_BOTTOM: + case EF_NEW_SERVANTWEAPON_SHOOT_BOTTOM: case EF_NEW_VULCANARM_BOTTOM: case EF_NEW_EARTHDRIVE_BOTTOM: - case EF_UNK_1715: - case EF_UNK_1717: + case EF_SERVANT_PHANTOM_HIT_BOTTOM: + case EF_SERVANT_PHANTOM_SUB_BOTTOM: case EF_DRAGONIC_AURA_BOTTOM: case EF_DRAGONIC_AURA_HIT_BOTTOM: case EF_DRAGONIC_AURA_BUFF_BOTTOM: - case EF_UNK_1729: + case EF_MADNESS_CRUSHER_BOTTOM: case EF_NEW_AUTOSHADOWSPELL_BOTTOM: case EF_DESTRUCTIVE_HURRICANE_BOTTOM: case EF_ROCKDOWN_BOTTOM: - case EF_UNK_1766: + case EF_NEW_CHARGINGPIERCE_CAST_BOTTOM: case EF_MYSTERY_ILLUSION_BOTTOM: case EF_TORNADO_STORM_BOTTOM: case EF_VIOLENT_QUAKE_BOTTOM: @@ -6855,8 +6855,8 @@ void CEZ2STRScreenEffect::InitEvents() { case EF_ARBITRIUM_CAST_BOTTOM: case EF_COMPETENTIA_LOOP_BOTTOM: case EF_CRYSTAL_IMPACT_CAST_BOTTOM: - case EF_UNK_1863: - case EF_UNK_1896: + case EF_NEW_ENCHANTING_SHADOW_BOTTOM: + case EF_IMPACT_CRATER_BOTTOM: case EF_ABR_INFINITY_BOTTOM: case EF_ABR_INFINITY_CAST: case EF_NEW_DILECTIO_HEAL_CAST_BOTTOM: @@ -6871,21 +6871,21 @@ void CEZ2STRScreenEffect::InitEvents() { case EF_DILUVIO_ICE_BOTTOM: case EF_ARDOR_BOTTOM: case EF_LIGHTNING_LAND_BOTTOM: - case EF_UNK_2047: + case EF_ROSEBLOSSOM_CAST_BOTTOM: case EF_FIRST_BRAND_AURA: case EF_CONFLAGRATION_BOTTOM: case EF_SOUND_BLEND_CAST_BOTTOM: - case EF_UNK_2067: - case EF_UNK_2070: - case EF_UNK_2072: + case EF_JAWAII_SERENADE_CAST_BOTTOM: + case EF_PRONMARCH_CAST_BOTTOM: + case EF_RHYTHMSHOOTING_CAST_BOTTOM: case EF_SECOND_FAITH_AURA: case EF_ABYSS_STRIKE_BOTTOM: case EF_ABYSS_STRIKE_CAST_BOTTOM: case EF_ABYSS_STRIKE_GROUND_BOTTOM: case EF_MASSIVE_FLAME_BLASTER_HIT_BOTTOM: case EF_PROCELLA_BOTTOM: - case EF_UNK_2118: - case EF_UNK_2121: + case EF_GEF_NOCTURN_CAST_BOTTOM: + case EF_ROKI_CAPRICCIO_CAST_BOTTOM: case EF_ABYSS_SLAYER_CAST_BOTTOM: case EF_ABYSS_SQUARE_BOTTOM: case EF_TERRA_DRIVE_BOTTOM: @@ -6894,18 +6894,18 @@ void CEZ2STRScreenEffect::InitEvents() { case EF_ELEMENTAL_BUSTER_POISON_BOTTOM: case EF_ELEMENTAL_BUSTER_WATER_BOTTOM: case EF_ELEMENTAL_BUSTER_WIND_BOTTOM: - case EF_UNK_2158: + case EF_OVERSLASH_BOTTOM: case EF_ADVANCED_PROTECTION_BOTTOM: case EF_ADVANCED_PROTECTION_CAST_BOTTOM: - case EF_UNK_2166: - case EF_UNK_2168: - case EF_UNK_2176: - case EF_UNK_2189: - case EF_UNK_2192: - case EF_UNK_2194: - case EF_UNK_2197: - case EF_UNK_2199: - case EF_UNK_2201: + case EF_CROSS_RAIN_BOTTOM: + case EF_CROSS_RAIN_CAST_BOTTOM: + case EF_GRAND_JUDGEMENT_BOTTOM: + case EF_GUARDIANSHIELD_BOTTOM: + case EF_JUDGEMENT_CROSS_BOTTOM: + case EF_JUDGEMENT_CROSS_CAST_BOTTOM: + case EF_REBOUND_SHIELD_BOTTOM: + case EF_REBOUND_SHIELD_CAST_BOTTOM: + case EF_ULTIMATESACRIFICE_BOTTOM: case EF_ACIDIFIED_ZONE_FIRE_CAST_BOTTOM: case EF_ACIDIFIED_ZONE_FIRE_START_BOTTOM: case EF_ACIDIFIED_ZONE_FIRE_LOOP_BOTTOM: @@ -6925,7 +6925,7 @@ void CEZ2STRScreenEffect::InitEvents() { case EF_PROCELLA_GRACE_BREEZE_BOTTOM: case EF_TERREMOTUS_EARTH_CARE_BOTTOM: case EF_THIRD_CONSECRATION_BOTTOM: - case EF_UNK_2280: + case EF_SERVANT_SIGN_BOTTOM: case EF_NPC_KILLING_AURA: case EF_TOXIN_OF_MANDARA_BOMB_BOTTOM: case EF_NEEDLE_STINGER_BOTTOM: diff --git a/Source/Contents/Effects/EZ2STREffectEx.h b/Source/Contents/Effects/EZ2STREffectEx.h index f9d5b7d16..334e0a2cd 100644 --- a/Source/Contents/Effects/EZ2STREffectEx.h +++ b/Source/Contents/Effects/EZ2STREffectEx.h @@ -32,7 +32,7 @@ public: /* 00CC */ EZ2STREmitter* emitter; /* 00D0 */ unsigned char timed; - /* 00D1 */ unsigned char unknown_00D1[3]; + /* 00D1 */ unsigned char padding_00D1[3]; /* 00D4 */ int frameStep; /* 00D8 */ unsigned char alternateRender; }; diff --git a/Source/Contents/Effects/Effect.h b/Source/Contents/Effects/Effect.h index 7a5d52873..fbbd4b963 100644 --- a/Source/Contents/Effects/Effect.h +++ b/Source/Contents/Effects/Effect.h @@ -73,7 +73,7 @@ public: /* 002C */ int effectLifetime; /* 0030 */ int effectArgument; /* 0034 */ unsigned char outsideRange; - /* 0035 */ unsigned char unknown_0035[3]; + /* 0035 */ unsigned char padding_0035[3]; /* 0038 */ int range; /* 003C */ unsigned char areaParameters[12]; /* 0048 */ int scaleParameter; @@ -85,10 +85,10 @@ public: /* 00C0 */ unsigned char retained; /* 00C1 */ unsigned char emissionStopped; /* 00C2 */ unsigned char forceRender; - /* 00C3 */ unsigned char unknown_00C3; + /* 00C3 */ unsigned char padding_00C3; /* 00C4 */ int instanceId; /* 00C8 */ unsigned char headAttached; - /* 00C9 */ unsigned char unknown_00C9[3]; + /* 00C9 */ unsigned char padding_00C9[3]; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Effects/EffectActor.cpp b/Source/Contents/Effects/EffectActor.cpp index 704354aa7..e0e48e908 100644 --- a/Source/Contents/Effects/EffectActor.cpp +++ b/Source/Contents/Effects/EffectActor.cpp @@ -3,7 +3,7 @@ #include "Contents/Effects/RagEffect.h" // INLINED -EffectActorState::EffectActorState() : unknown_0138(-1), unknown_013C(0), effectLaunched(0), first(nullptr), second(nullptr) { +EffectActorState::EffectActorState() : padding_0138(-1), padding_013C(0), effectLaunched(0), first(nullptr), second(nullptr) { } // INLINED @@ -13,7 +13,7 @@ EffectActorState::~EffectActorState() { // OFFSET: 0x00CA82E0 // FUNCTION: fn_20987 EffectActor::EffectActor() { - this->render.unknown_0130[0] = 0; + this->render.translucentOther[0] = 0; } // OFFSET: 0x00CA8C40 @@ -35,10 +35,10 @@ EffectActor::~EffectActor() { // OFFSET: 0x00CAF4B0 // FUNCTION: fn_21083 void EffectActor::ResetEffectState() { - this->state.unknown_0138 = -1; - this->state.unknown_013C = 0; + this->state.padding_0138 = -1; + this->state.padding_013C = 0; this->state.effectLaunched = 0; this->state.first = nullptr; this->state.second = nullptr; - this->render.unknown_0130[0] = 0; + this->render.translucentOther[0] = 0; } diff --git a/Source/Contents/Effects/EffectActor.h b/Source/Contents/Effects/EffectActor.h index 2b0e36a50..8682f447f 100644 --- a/Source/Contents/Effects/EffectActor.h +++ b/Source/Contents/Effects/EffectActor.h @@ -14,8 +14,8 @@ struct EffectActorState { EffectActorState(); ~EffectActorState(); - /* 0138 */ int unknown_0138; - /* 013C */ std::uint32_t unknown_013C; + /* 0138 */ int padding_0138; + /* 013C */ std::uint32_t padding_013C; /* 0140 */ std::uint32_t effectLaunched; /* 0144 */ std::list effects; /* 014C */ CRagEffect* first; diff --git a/Source/Contents/Effects/EffectEmitter.h b/Source/Contents/Effects/EffectEmitter.h index 05a2afb7d..906c1d0ff 100644 --- a/Source/Contents/Effects/EffectEmitter.h +++ b/Source/Contents/Effects/EffectEmitter.h @@ -6,31 +6,31 @@ #include struct EZ2STREmitter { - /* 0000 */ unsigned char unknown_0000[0x24]; + /* 0000 */ unsigned char padding_0000[0x24]; /* 0024 */ vector3d position; - /* 0030 */ unsigned char unknown_0030[0x14]; + /* 0030 */ unsigned char padding_0030[0x14]; /* 0044 */ int alpha; - /* 0048 */ unsigned char unknown_0048[0x8]; + /* 0048 */ unsigned char padding_0048[0x8]; /* 0050 */ int baseAngle; - /* 0054 */ unsigned char unknown_0054[0x70]; + /* 0054 */ unsigned char padding_0054[0x70]; /* 00C4 */ float angle; - /* 00C8 */ unsigned char unknown_00C8[0x4]; + /* 00C8 */ unsigned char padding_00C8[0x4]; /* 00CC */ float lifetime; /* 00D0 */ vector3d offset; - /* 00DC */ unsigned char unknown_00DC[0xC]; + /* 00DC */ unsigned char padding_00DC[0xC]; /* 00E8 */ int elapsed; - /* 00EC */ unsigned char unknown_00EC[0x1DC]; + /* 00EC */ unsigned char padding_00EC[0x1DC]; /* 02C8 */ vector3d velocity; - /* 02D4 */ unsigned char unknown_02D4[0x4]; + /* 02D4 */ unsigned char padding_02D4[0x4]; /* 02D8 */ float speed; - /* 02DC */ unsigned char unknown_02DC[0x39E8]; + /* 02DC */ unsigned char padding_02DC[0x39E8]; /* 3CC4 */ int currentFrame; /* 3CC8 */ int frameCount; - /* 3CCC */ unsigned char unknown_3CCC[0x28C]; + /* 3CCC */ unsigned char padding_3CCC[0x28C]; /* 3F58 */ int playbackState; /* 3F5C */ unsigned char looping; /* 3F5D */ unsigned char fadeOut; - /* 3F5E */ unsigned char unknown_3F5E[0x3A]; + /* 3F5E */ unsigned char padding_3F5E[0x3A]; /* 3F98 */ int lifetimeLimit; /* 3F9C */ int remainingLoops; /* 3FA0 */ int duration; @@ -39,7 +39,7 @@ struct EZ2STREmitter { /* 3FAC */ float yaw; /* 3FB0 */ float scale; /* 3FB4 */ float remainingTime; - /* 3FB8 */ unsigned char unknown_3FB8[0x30]; + /* 3FB8 */ unsigned char padding_3FB8[0x30]; /* 3FE8 */ unsigned char flipX; /* 3FE9 */ unsigned char flipY; /* 3FEA */ unsigned char repeatFrame; diff --git a/Source/Contents/Effects/EffectLists.cpp b/Source/Contents/Effects/EffectLists.cpp index e94919fc9..a03465e0a 100644 --- a/Source/Contents/Effects/EffectLists.cpp +++ b/Source/Contents/Effects/EffectLists.cpp @@ -1849,7 +1849,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_PNEUMA, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1130, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_BAKURETSU_HADOU, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_FIREDANCE, new (std::nothrow) CEffectAllocator)) { @@ -1885,37 +1885,37 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_1146, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1147, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_POPCORN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1151, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_NOTHING, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1152, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_WATER, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1153, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_GROUND, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1154, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_FIRE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1155, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_WIND, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1156, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_POISON, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1157, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_SAINT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1158, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_DARKNESS, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1159, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_TELEKINESIS, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1160, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMMUNE_PROPERTY_UNDEAD, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1187, new (std::nothrow) CEffectAllocator)) { @@ -1927,7 +1927,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_1191, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1192, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_RANDOM_OPT_YELLOW, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1196, new (std::nothrow) CEffectAllocator)) { @@ -1942,7 +1942,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_LIGHTSPHERE_STAR, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1200, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_THUNDER_PLAZMA_BLAST, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1201, new (std::nothrow) CEffectAllocator)) { @@ -1957,10 +1957,10 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_1211, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1212, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SUBJECT_AURA_1212, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1213, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SUBJECT_AURA_1213, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1214, new (std::nothrow) CEffectAllocator)) { @@ -2014,7 +2014,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_BOOK_OF_DIMENSION, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1232, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_BOOK_OF_CREATINGSTAR, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_CURSE_EXPLOSION, new (std::nothrow) CEffectAllocator)) { @@ -2023,13 +2023,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_SOUL_REAPER, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1235, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SOUL_SHADOW, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1236, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SOUL_FAIRY, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1237, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SOUL_FALCON, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_SOUL_CURSE, new (std::nothrow) CEffectAllocator)) { @@ -2351,7 +2351,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_NEW_BANISHINGPOINT_11, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1377, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_VALKYRIE_WING, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_DRAGONBREATH_BOMB, new (std::nothrow) CEffectAllocator)) { @@ -2462,7 +2462,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_NEW_COMET_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1419, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_C_AMDARAIS_EFFECT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_RAYOFGENESIS, new (std::nothrow) CEffectAllocator)) { @@ -2987,13 +2987,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_RED_WAVE_3, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1617, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_BLACKBUBBLE_SMALL, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1618, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_BLACKBUBBLE_MIDIUM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1619, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_BLACKBUBBLE_LARGE, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_WALLOFTHORN_CAST, new (std::nothrow) CEffectAllocator)) { @@ -3107,13 +3107,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_NEW_AXEBOOMERANG_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1661, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_HACKANDSLASH, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1662, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_HACKANDSLASH_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1663, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_HACKANDSLASH_HIT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_SPELLFIST_FIRE, new (std::nothrow) CEffectAllocator)) { @@ -3131,19 +3131,19 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_NEW_SPELLFIST_WIND, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1670, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_STORMSLASH_1, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1671, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_STORMSLASH_2, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1672, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_STORMSLASH_3, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1673, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_STORMSLASH_4, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1674, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_STORMSLASH_5, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_CARTBOOST, new (std::nothrow) CEffectAllocator)) { @@ -3203,13 +3203,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_1694, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1695, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_SERVANTWEAPON_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1696, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_SERVANTWEAPON_HIT_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1697, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_SERVANTWEAPON_SHOOT_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_POWERSWING_01, new (std::nothrow) CEffectAllocator)) { @@ -3245,43 +3245,43 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_NEW_EARTHDRIVE_TARGET, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1710, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_SIGN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2280, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_SIGN_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1711, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_SIGN_DOWN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1712, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_SIGN_DOWN_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1713, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_PHANTOM_DOWN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1714, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_PHANTOM_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1715, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_PHANTOM_HIT_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1716, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_PHANTOM_SUB, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1717, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_PHANTOM_SUB_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1718, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_DEMOLITION_COLLECT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1719, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_DEMOLITION_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1720, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_DEMOLITION_LEFTDOWN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1721, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERVANT_DEMOLITION_RIGHTDOWN, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_DRAGONIC_AURA, new (std::nothrow) CEffectAllocator)) { @@ -3302,16 +3302,16 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_DRAGONIC_AURA_BUFF_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1728, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_MADNESS_CRUSHER, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1729, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_MADNESS_CRUSHER_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1750, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_VIGOR_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1751, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_VIGOR_BUFF, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_AUTOSHADOWSPELL, new (std::nothrow) CEffectAllocator)) { @@ -3386,7 +3386,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_1755, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1756, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CRIMSONARROW, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_CRIMSON_ARROW_CAST, new (std::nothrow) CEffectAllocator)) { @@ -3398,7 +3398,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_CRIMSON_ARROW_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1760, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_VIOLENTQUAKE, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_VIOLENT_QUAKE_CAST, new (std::nothrow) CEffectAllocator)) { @@ -3419,13 +3419,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_1764, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1765, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_CHARGINGPIERCE_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1766, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_CHARGINGPIERCE_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1767, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_CHARGINGPIERCE_HIT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1768, new (std::nothrow) CEffectAllocator)) { @@ -3665,13 +3665,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_1829, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1827, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DANCING_KNIFE_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1828, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DANCING_KNIFE_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1830, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ABYSS_DAGGER_HIT_1830, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_REPARATIO_CAST, new (std::nothrow) CEffectAllocator)) { @@ -3740,10 +3740,10 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_CRYSTAL_IMPACT_BUFF, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1862, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_ENCHANTING_SHADOW, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1863, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_NEW_ENCHANTING_SHADOW_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_RELIGIO, new (std::nothrow) CEffectAllocator)) { @@ -3761,19 +3761,19 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_FATAL_SHADOW_CROW_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1869, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DROPITEM_BLUE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1870, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DROPITEM_GREEN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1871, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DROPITEM_RED, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1189, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DROPITEM_YELLOW, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1190, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DROPITEM_PURPLE, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1186, new (std::nothrow) CEffectAllocator)) { @@ -3791,7 +3791,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_2467, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1868, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SHADOW_EXCEED_CAST, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1867, new (std::nothrow) CEffectAllocator)) { @@ -3851,13 +3851,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_STRATUM_TREMOR_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1895, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMPACT_CRATER, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1896, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMPACT_CRATER_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1898, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_IMPACT_CRATER_HIT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_WIND_SIGN, new (std::nothrow) CEffectAllocator)) { @@ -3944,34 +3944,34 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_ETERNAL_SLASH_HIT_2, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1960, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CALUMITYGALE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1961, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CALUMITYGALE_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1962, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CALUMITYGALE_LOOP, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NEW_POTENT_VENOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1950, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CRESCIVEBOLT_CAST, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_1951, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1952, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CRESCIVEBOLT_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1953, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SHADOW_STAB, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1954, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ETERNAL_SLASH_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_1955, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SHADOW_STAB_HIT2, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_SINCERE_FAITH, new (std::nothrow) CEffectAllocator)) { @@ -4145,13 +4145,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_FIRM_FAITH, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2006, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_KVASIRSONATA, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2007, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_KVASIRSONATA_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2008, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_KVASIRSONATA_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_CHAIN_REACTION_SHOT_CAST, new (std::nothrow) CEffectAllocator)) { @@ -4169,13 +4169,13 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_CHAIN_REACTION_SHOT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2000, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_MYSTICSYMPHONY, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2001, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_MYSTICSYMPHONY_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2002, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_MYSTICSYMPHONY_NOTE, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_ACTIVITY_BURN, new (std::nothrow) CEffectAllocator)) { @@ -4235,7 +4235,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_SPELL_ENCHANTING, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2026, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_DIAMOND_STORM, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_DIAMOND_STORM_BOTTOM, new (std::nothrow) CEffectAllocator)) { @@ -4262,19 +4262,19 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_VENOM_SWAMP_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2046, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROSEBLOSSOM_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2047, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROSEBLOSSOM_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2048, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROSEBLOSSOM_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2049, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROSEBLOSSOM_ROSE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2050, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROSEBLOSSOM_SHOT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_ARDOR, new (std::nothrow) CEffectAllocator)) { @@ -4346,34 +4346,34 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_METALLIC_FURY, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2065, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JAWAII_SERENADE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2066, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JAWAII_SERENADE_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2067, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JAWAII_SERENADE_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2068, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_PRONMARCH, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2069, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_PRONMARCH_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2070, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_PRONMARCH_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2071, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_RHYTHMSHOOTING_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2072, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_RHYTHMSHOOTING_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2073, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_RHYTHMSHOOTING_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2074, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_RHYTHMSHOOTING_SHOT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_NIFLHEIM, new (std::nothrow) CEffectAllocator)) { @@ -4472,28 +4472,28 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_ABYSS_DAGGER_HIT_2, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2114, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_FRENZY_SHOT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_FRENZY_SHOT_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2116, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GEF_NOCTURN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2117, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GEF_NOCTURN_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2118, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GEF_NOCTURN_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2119, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROKI_CAPRICCIO, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2120, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROKI_CAPRICCIO_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2121, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ROKI_CAPRICCIO_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_MUSICAL_INTERLUDE, new (std::nothrow) CEffectAllocator)) { @@ -4502,10 +4502,10 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_MUSICAL_INTERLUDE_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2124, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_AIN_RHAPSODY, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2125, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_AIN_RHAPSODY_CAST, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_TERRA_DRIVE, new (std::nothrow) CEffectAllocator)) { @@ -4571,7 +4571,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_ELEMENTAL_BUSTER_WIND_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2154, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_UNLUCKY_RUSH, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNLUCKY_RUSH_CAST, new (std::nothrow) CEffectAllocator)) { @@ -4580,16 +4580,16 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_ABYSS_DAGGER_HIT_3, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2157, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_OVERSLASH, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2158, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_OVERSLASH_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2159, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_OVERSLASH_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2160, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_OVERSLASH_HIT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_ADVANCED_PROTECTION, new (std::nothrow) CEffectAllocator)) { @@ -4607,58 +4607,58 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_2462, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2165, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CROSS_RAIN, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2166, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CROSS_RAIN_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2167, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CROSS_RAIN_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2168, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_CROSS_RAIN_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2175, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GRAND_JUDGEMENT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2176, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GRAND_JUDGEMENT_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2177, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GRAND_JUDGEMENT_BUFF, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2178, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GRAND_JUDGEMENT_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2179, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GRAND_JUDGEMENT_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2169, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GUARD_STANCE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2170, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GUARD_STANCE_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2171, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GUARD_STANCE_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2172, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ATTACK_STANCE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2173, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ATTACK_STANCE_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2174, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ATTACK_STANCE_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2181, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_HOLY_SHIELD, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2180, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_HOLY_SHIELD_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2182, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_HOLY_SHIELD_LOOP, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_2183, new (std::nothrow) CEffectAllocator)) { @@ -4676,49 +4676,49 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_THE_W_PROTECTION_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2188, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GUARDIANSHIELD, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2189, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GUARDIANSHIELD_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2190, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_GUARDIANSHIELD_SUB, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2191, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JUDGEMENT_CROSS, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2192, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JUDGEMENT_CROSS_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2193, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JUDGEMENT_CROSS_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2194, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JUDGEMENT_CROSS_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2195, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_JUDGEMENT_CROSS_SHOT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2196, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_REBOUND_SHIELD, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2197, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_REBOUND_SHIELD_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2198, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_REBOUND_SHIELD_CAST, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2199, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_REBOUND_SHIELD_CAST_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2200, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ULTIMATESACRIFICE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2201, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ULTIMATESACRIFICE_BOTTOM, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2202, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ULTIMATESACRIFICE_SHINE, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_ACIDIFIED_ZONE_FIRE_CAST, new (std::nothrow) CEffectAllocator)) { @@ -5125,7 +5125,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_NPC_GATE_SKYBLUE, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2394, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_SERPENT_SHADOW, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_2400, new (std::nothrow) CEffectAllocator)) { @@ -5161,22 +5161,22 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_2412, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2420, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_VIOLEN_HIT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2424, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_C_AURA_OF_GHOST_S, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2428, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_ATQUE_POENITENTIA, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2429, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_PERM_FROST_OBLIVION, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2430, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_C_GUIDE_OF_DEAD_TEXT, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2431, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_C_MEDJED_TEXT, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_2441, new (std::nothrow) CEffectAllocator)) { @@ -5194,7 +5194,7 @@ bool EffectLists::RegisterAllocators() { if (!this->RegisterAllocator(EF_UNK_2473, new (std::nothrow) CEffectAllocator)) { return false; } - if (!this->RegisterAllocator(EF_UNK_2458, new (std::nothrow) CEffectAllocator)) { + if (!this->RegisterAllocator(EF_S_BEELZEBUB_WING, new (std::nothrow) CEffectAllocator)) { return false; } if (!this->RegisterAllocator(EF_UNK_2443, new (std::nothrow) CEffectAllocator)) { diff --git a/Source/Contents/Effects/EffectPrimitiveState.h b/Source/Contents/Effects/EffectPrimitiveState.h index 12410d425..e6efb970b 100644 --- a/Source/Contents/Effects/EffectPrimitiveState.h +++ b/Source/Contents/Effects/EffectPrimitiveState.h @@ -29,17 +29,17 @@ struct EffectPrimitiveRecord { struct EffectPrimitiveSlot { EffectPrimitiveSlot(); /* 0000 */ char life; - /* 0001 */ unsigned char unknown_0001; + /* 0001 */ unsigned char padding_0001; /* 0002 */ std::int16_t alphaB; /* 0004 */ std::int16_t alphaT; /* 0006 */ std::int16_t fullDisplayAngle; /* 0008 */ float maxHeight; /* 000C */ int process; /* 0010 */ std::int16_t rotStart; - /* 0012 */ unsigned char unknown_0012[2]; + /* 0012 */ unsigned char padding_0012[2]; /* 0014 */ float height[21]; /* 0068 */ char flag1[21]; - /* 007D */ unsigned char unknown_007D; + /* 007D */ unsigned char padding_007D; /* 007E */ std::int16_t riseAngle; /* 0080 */ float distance; union { @@ -98,7 +98,7 @@ struct EffectPrimitiveState { /* 024C */ int greenSpeed; /* 0250 */ int blueSpeed; /* 0254 */ unsigned char repeatAnim; - /* 0255 */ unsigned char unknown_0255[3]; + /* 0255 */ unsigned char padding_0255[3]; /* 0258 */ std::vector chPoint; /* 0264 */ std::vector chVal1; /* 0270 */ std::vector chVal2; diff --git a/Source/Contents/Effects/EffectTypes.cpp b/Source/Contents/Effects/EffectTypes.cpp index fe6b8a339..5cd929196 100644 --- a/Source/Contents/Effects/EffectTypes.cpp +++ b/Source/Contents/Effects/EffectTypes.cpp @@ -1136,7 +1136,7 @@ static std::unordered_map BuildLifetimes() { result[EF_SU_POWEROFFLOCK] = 1127; result[EF_UNK_1128] = 1128; result[EF_SU_SVG_SPIRIT] = 1129; - result[EF_UNK_1130] = 1130; + result[EF_BAKURETSU_HADOU] = 1130; result[EF_SU_SPIRIT_OF_LIFE] = 99; result[EF_SU_STOOP] = 99999999; result[EF_FIREDANCE] = 1133; @@ -1153,20 +1153,20 @@ static std::unordered_map BuildLifetimes() { result[EF_UNK_1144] = 100; result[EF_RL_HAMMER_OF_GOD] = 99999999; result[EF_UNK_1146] = 1146; - result[EF_UNK_1147] = 99999999; + result[EF_POPCORN] = 99999999; result[EF_RL_R_TRIP] = 9999999; result[EF_IMMUNE_PROPERTY] = 99999; result[EF_MOVE_COORDINATE] = 300; - result[EF_UNK_1151] = 1151; - result[EF_UNK_1152] = 1152; - result[EF_UNK_1153] = 1153; - result[EF_UNK_1154] = 1154; - result[EF_UNK_1155] = 1155; - result[EF_UNK_1156] = 1156; - result[EF_UNK_1157] = 1157; - result[EF_UNK_1158] = 1158; - result[EF_UNK_1159] = 1159; - result[EF_UNK_1160] = 1160; + result[EF_IMMUNE_PROPERTY_NOTHING] = 1151; + result[EF_IMMUNE_PROPERTY_WATER] = 1152; + result[EF_IMMUNE_PROPERTY_GROUND] = 1153; + result[EF_IMMUNE_PROPERTY_FIRE] = 1154; + result[EF_IMMUNE_PROPERTY_WIND] = 1155; + result[EF_IMMUNE_PROPERTY_POISON] = 1156; + result[EF_IMMUNE_PROPERTY_SAINT] = 1157; + result[EF_IMMUNE_PROPERTY_DARKNESS] = 1158; + result[EF_IMMUNE_PROPERTY_TELEKINESIS] = 1159; + result[EF_IMMUNE_PROPERTY_UNDEAD] = 1160; result[EF_QUAGMIRE_VISUAL] = 150; result[EF_LORD_OF_VERMILLION_VISUAL] = 9999; result[EF_METEOR_STORM_VISUAL] = 9999; @@ -1195,10 +1195,10 @@ static std::unordered_map BuildLifetimes() { result[EF_UNK_1186] = 1186; result[EF_UNK_1187] = 1187; result[EF_UNK_1188] = 1188; - result[EF_UNK_1189] = 1189; - result[EF_UNK_1190] = 1190; + result[EF_DROPITEM_YELLOW] = 1189; + result[EF_DROPITEM_PURPLE] = 1190; result[EF_UNK_1191] = 1191; - result[EF_UNK_1192] = 1192; + result[EF_RANDOM_OPT_YELLOW] = 1192; result[EF_UNK_1193] = 1193; result[EF_UNK_1194] = 1194; result[EF_AUTOSHADOWSPELL_ACTIVE] = 1195; @@ -1206,7 +1206,7 @@ static std::unordered_map BuildLifetimes() { result[EF_LIGHTSPHERE_SUN] = 1197; result[EF_LIGHTSPHERE_MOON] = 1198; result[EF_LIGHTSPHERE_STAR] = 1199; - result[EF_UNK_1200] = 1200; + result[EF_THUNDER_PLAZMA_BLAST] = 1200; result[EF_UNK_1201] = 1201; result[EF_NOVAEXPLOSING] = 1202; result[EF_STAR_EMPEROR] = 1203; @@ -1218,8 +1218,8 @@ static std::unordered_map BuildLifetimes() { result[EF_BLINK_BODY] = 100; result[EF_LINELINK5] = 200; result[EF_UNK_1211] = 1211; - result[EF_UNK_1212] = 1212; - result[EF_UNK_1213] = 1213; + result[EF_SUBJECT_AURA_1212] = 1212; + result[EF_SUBJECT_AURA_1213] = 1213; result[EF_UNK_1214] = 1214; result[EF_UNK_1215] = 1215; result[EF_UNK_1216] = 1216; @@ -1238,12 +1238,12 @@ static std::unordered_map BuildLifetimes() { result[EF_NEWMOON_KICK] = 1229; result[EF_FULLMOON_KICK] = 1230; result[EF_BOOK_OF_DIMENSION] = 1231; - result[EF_UNK_1232] = 1232; + result[EF_BOOK_OF_CREATINGSTAR] = 1232; result[EF_CURSE_EXPLOSION] = 1233; result[EF_SOUL_REAPER] = 1234; - result[EF_UNK_1235] = 1235; - result[EF_UNK_1236] = 1236; - result[EF_UNK_1237] = 1237; + result[EF_SOUL_SHADOW] = 1235; + result[EF_SOUL_FAIRY] = 1236; + result[EF_SOUL_FALCON] = 1237; result[EF_SOUL_CURSE] = 1238; result[EF_PROMINENCE_KICK] = 1239; result[EF_SOUL_REAPER_COLLECT] = 1240; @@ -1383,7 +1383,7 @@ static std::unordered_map BuildLifetimes() { result[EF_NEW_BANISHINGPOINT_05] = 1374; result[EF_NEW_BANISHINGPOINT_07] = 1375; result[EF_NEW_BANISHINGPOINT_11] = 1376; - result[EF_UNK_1377] = 99999999; + result[EF_VALKYRIE_WING] = 99999999; result[EF_NEW_DRAGONBREATH_BOMB] = 1378; result[EF_NEW_DRAGONBREATH_BOMB_BOTTOM] = 1379; result[EF_NEW_DRAGONBREATH_01] = 1380; @@ -1425,7 +1425,7 @@ static std::unordered_map BuildLifetimes() { result[EF_NEW_COMET_SUB_EXP] = 1416; result[EF_NEW_COMET_SUB_EXP_BOTTOM] = 1417; result[EF_NEW_MOON_SLASH] = 1418; - result[EF_UNK_1419] = 1419; + result[EF_C_AMDARAIS_EFFECT] = 1419; result[EF_NEW_GRANDCROSS] = 99999999; result[EF_NEW_COMET_CAST] = 1421; result[EF_NEW_CART_CANNON_CAST] = 1422; @@ -1623,9 +1623,9 @@ static std::unordered_map BuildLifetimes() { result[EF_RED_WAVE_1] = 1614; result[EF_RED_WAVE_2] = 1615; result[EF_RED_WAVE_3] = 1616; - result[EF_UNK_1617] = 1617; - result[EF_UNK_1618] = 1618; - result[EF_UNK_1619] = 1619; + result[EF_BLACKBUBBLE_SMALL] = 1617; + result[EF_BLACKBUBBLE_MIDIUM] = 1618; + result[EF_BLACKBUBBLE_LARGE] = 1619; result[EF_NEW_WALLOFTHORN_CAST] = 1620; result[EF_NEW_WALLOFTHORN_CAST_BOTTOM] = 1621; result[EF_NEW_EARTHGRAVE_BOTTOM] = 1622; @@ -1667,20 +1667,20 @@ static std::unordered_map BuildLifetimes() { result[EF_NEW_AXEBOOMERANG_CAST] = 1658; result[EF_NEW_AXEBOOMERANG_CAST_BOTTOM] = 1659; result[EF_NEW_AXEBOOMERANG_HIT] = 1660; - result[EF_UNK_1661] = 1661; - result[EF_UNK_1662] = 1662; - result[EF_UNK_1663] = 1663; + result[EF_HACKANDSLASH] = 1661; + result[EF_HACKANDSLASH_BOTTOM] = 1662; + result[EF_HACKANDSLASH_HIT] = 1663; result[EF_NEW_SANCTUARY] = 100; result[EF_NEW_SPELLFIST_FIRE] = 1665; result[EF_NEW_SPELLFIST_FIRE_BOTTOM] = 1666; result[EF_NEW_SPELLFIST_WATER] = 1667; result[EF_NEW_SPELLFIST_WATER_BOTTOM] = 1668; result[EF_NEW_SPELLFIST_WIND] = 1669; - result[EF_UNK_1670] = 1670; - result[EF_UNK_1671] = 1671; - result[EF_UNK_1672] = 1672; - result[EF_UNK_1673] = 1673; - result[EF_UNK_1674] = 1674; + result[EF_STORMSLASH_1] = 1670; + result[EF_STORMSLASH_2] = 1671; + result[EF_STORMSLASH_3] = 1672; + result[EF_STORMSLASH_4] = 1673; + result[EF_STORMSLASH_5] = 1674; result[EF_NEW_CARTBOOST] = 1675; result[EF_NEW_CARTBOOST_BOTTOM] = 1676; result[EF_NEW_SAFETYWALL] = 60; @@ -1701,9 +1701,9 @@ static std::unordered_map BuildLifetimes() { result[EF_NEW_WINDCUTTER_BOTTOM_05] = 1692; result[EF_NEW_WINDCUTTER_TARGET] = 1693; result[EF_UNK_1694] = 1694; - result[EF_UNK_1695] = 1695; - result[EF_UNK_1696] = 1696; - result[EF_UNK_1697] = 1697; + result[EF_NEW_SERVANTWEAPON_HIT] = 1695; + result[EF_NEW_SERVANTWEAPON_HIT_BOTTOM] = 1696; + result[EF_NEW_SERVANTWEAPON_SHOOT_BOTTOM] = 1697; result[EF_NEW_POWERSWING_01] = 1698; result[EF_NEW_POWERSWING_05] = 1699; result[EF_NEW_POWERSWING_07] = 1700; @@ -1716,26 +1716,26 @@ static std::unordered_map BuildLifetimes() { result[EF_NEW_EARTHDRIVE_BOTTOM] = 1707; result[EF_NEW_EARTHDRIVE_TARGET] = 1708; result[EF_NEW_EARTHDRIVE_CAST] = 40; - result[EF_UNK_1710] = 1710; - result[EF_UNK_1711] = 1711; - result[EF_UNK_1712] = 1712; - result[EF_UNK_1713] = 1713; - result[EF_UNK_1714] = 1714; - result[EF_UNK_1715] = 1715; - result[EF_UNK_1716] = 1716; - result[EF_UNK_1717] = 1717; - result[EF_UNK_1718] = 1718; - result[EF_UNK_1719] = 1719; - result[EF_UNK_1720] = 1720; - result[EF_UNK_1721] = 1721; + result[EF_SERVANT_SIGN] = 1710; + result[EF_SERVANT_SIGN_DOWN] = 1711; + result[EF_SERVANT_SIGN_DOWN_BOTTOM] = 1712; + result[EF_SERVANT_PHANTOM_DOWN] = 1713; + result[EF_SERVANT_PHANTOM_HIT] = 1714; + result[EF_SERVANT_PHANTOM_HIT_BOTTOM] = 1715; + result[EF_SERVANT_PHANTOM_SUB] = 1716; + result[EF_SERVANT_PHANTOM_SUB_BOTTOM] = 1717; + result[EF_SERVANT_DEMOLITION_COLLECT] = 1718; + result[EF_SERVANT_DEMOLITION_HIT] = 1719; + result[EF_SERVANT_DEMOLITION_LEFTDOWN] = 1720; + result[EF_SERVANT_DEMOLITION_RIGHTDOWN] = 1721; result[EF_DRAGONIC_AURA] = 1722; result[EF_DRAGONIC_AURA_BOTTOM] = 1723; result[EF_DRAGONIC_AURA_HIT] = 1724; result[EF_DRAGONIC_AURA_HIT_BOTTOM] = 1725; result[EF_DRAGONIC_AURA_BUFF] = 1726; result[EF_DRAGONIC_AURA_BUFF_BOTTOM] = 1727; - result[EF_UNK_1728] = 1728; - result[EF_UNK_1729] = 1729; + result[EF_MADNESS_CRUSHER] = 1728; + result[EF_MADNESS_CRUSHER_BOTTOM] = 1729; result[EF_NEW_AUTOSHADOWSPELL] = 1730; result[EF_NEW_AUTOSHADOWSPELL_BOTTOM] = 1731; result[EF_DESTRUCTIVE_HURRICANE] = 1732; @@ -1756,24 +1756,24 @@ static std::unordered_map BuildLifetimes() { result[EF_ROCKDOWN_CAST] = 1747; result[EF_ROCKDOWN_CAST_BOTTOM] = 1748; result[EF_ROCKDOWN_HIT] = 1749; - result[EF_UNK_1750] = 1750; - result[EF_UNK_1751] = 1751; + result[EF_VIGOR_CAST] = 1750; + result[EF_VIGOR_BUFF] = 1751; result[EF_UNK_1752] = 1752; result[EF_RAIN_OF_CRYSTAL] = 1753; result[EF_RAIN_OF_CRYSTAL_BOTTOM] = 1754; result[EF_UNK_1755] = 1755; - result[EF_UNK_1756] = 1756; + result[EF_CRIMSONARROW] = 1756; result[EF_CRIMSON_ARROW_CAST] = 1757; result[EF_CRIMSON_ARROW_CAST_BOTTOM] = 1758; result[EF_CRIMSON_ARROW_HIT] = 1759; - result[EF_UNK_1760] = 1760; + result[EF_VIOLENTQUAKE] = 1760; result[EF_VIOLENT_QUAKE_CAST] = 1761; result[EF_VIOLENT_QUAKE_CAST_BOTTOM] = 1762; result[EF_VIOLENT_QUAKE_HIT] = 1763; result[EF_UNK_1764] = 1764; - result[EF_UNK_1765] = 1765; - result[EF_UNK_1766] = 1766; - result[EF_UNK_1767] = 1767; + result[EF_NEW_CHARGINGPIERCE_CAST] = 1765; + result[EF_NEW_CHARGINGPIERCE_CAST_BOTTOM] = 1766; + result[EF_NEW_CHARGINGPIERCE_HIT] = 1767; result[EF_UNK_1768] = 1768; result[EF_ASTRAL_STRIKE_CAST] = 1769; result[EF_ASTRAL_STRIKE_CAST_BOTTOM] = 1770; @@ -1833,10 +1833,10 @@ static std::unordered_map BuildLifetimes() { result[EF_ARBITRIUM] = 1824; result[EF_ARBITRIUM_BOTTOM] = 1825; result[EF_ARBITRIUM_HIT] = 1826; - result[EF_UNK_1827] = 1827; - result[EF_UNK_1828] = 1828; + result[EF_DANCING_KNIFE_CAST] = 1827; + result[EF_DANCING_KNIFE_CAST_BOTTOM] = 1828; result[EF_UNK_1829] = 1829; - result[EF_UNK_1830] = 1830; + result[EF_ABYSS_DAGGER_HIT_1830] = 1830; result[EF_NEW_REPARATIO_CAST] = 1831; result[EF_NEW_REPARATIO_CAST_BOTTOM] = 1832; result[EF_NEW_REPARATIO] = 1833; @@ -1868,16 +1868,16 @@ static std::unordered_map BuildLifetimes() { result[EF_CRYSTAL_IMPACT_BUFF] = 1859; result[EF_RELIGIO] = 1860; result[EF_RELIGIO_CAST] = 1861; - result[EF_UNK_1862] = 1862; - result[EF_UNK_1863] = 1863; + result[EF_NEW_ENCHANTING_SHADOW] = 1862; + result[EF_NEW_ENCHANTING_SHADOW_BOTTOM] = 1863; result[EF_FATAL_SHADOW_CROW] = 1864; result[EF_FATAL_SHADOW_CROW_BOTTOM] = 1865; result[EF_FATAL_SHADOW_CROW_HIT] = 1866; result[EF_UNK_1867] = 1867; - result[EF_UNK_1868] = 1868; - result[EF_UNK_1869] = 1869; - result[EF_UNK_1870] = 1870; - result[EF_UNK_1871] = 1871; + result[EF_SHADOW_EXCEED_CAST] = 1868; + result[EF_DROPITEM_BLUE] = 1869; + result[EF_DROPITEM_GREEN] = 1870; + result[EF_DROPITEM_RED] = 1871; result[EF_NEW_PNEUMA] = 1872; result[EF_DEEP_BLIND_TRAP_CAST] = 1873; result[EF_DEEP_BLIND_TRAP] = 1874; @@ -1901,10 +1901,10 @@ static std::unordered_map BuildLifetimes() { result[EF_STRATUM_TREMOR_HIT] = 1892; result[EF_STRATUM_TREMOR] = 1893; result[EF_STRATUM_TREMOR_BOTTOM] = 1894; - result[EF_UNK_1895] = 1895; - result[EF_UNK_1896] = 1896; + result[EF_IMPACT_CRATER] = 1895; + result[EF_IMPACT_CRATER_BOTTOM] = 1896; result[EF_UNK_1897] = 1897; - result[EF_UNK_1898] = 1898; + result[EF_IMPACT_CRATER_HIT] = 1898; result[EF_WIND_SIGN] = 1899; result[EF_WIND_SIGN_LOOP] = 1900; result[EF_ABR_MOTHER_CAST] = 1901; @@ -1956,19 +1956,19 @@ static std::unordered_map BuildLifetimes() { result[EF_NEW_AXE_STOMP_08] = 1947; result[EF_NEW_AXE_STOMP_09] = 1948; result[EF_NEW_AXE_STOMP_11] = 1949; - result[EF_UNK_1950] = 1950; + result[EF_CRESCIVEBOLT_CAST] = 1950; result[EF_UNK_1951] = 1951; - result[EF_UNK_1952] = 1952; - result[EF_UNK_1953] = 1953; - result[EF_UNK_1954] = 1954; - result[EF_UNK_1955] = 1955; + result[EF_CRESCIVEBOLT_HIT] = 1952; + result[EF_SHADOW_STAB] = 1953; + result[EF_ETERNAL_SLASH_HIT] = 1954; + result[EF_SHADOW_STAB_HIT2] = 1955; result[EF_UNK_1956] = 1956; result[EF_UNK_1957] = 1957; result[EF_PNEUMATICUS_PROCELLA_CAST] = 1958; result[EF_PNEUMATICUS_PROCELLA_RING] = 1959; - result[EF_UNK_1960] = 1960; - result[EF_UNK_1961] = 1961; - result[EF_UNK_1962] = 1962; + result[EF_CALUMITYGALE] = 1960; + result[EF_CALUMITYGALE_CAST] = 1961; + result[EF_CALUMITYGALE_LOOP] = 1962; result[EF_SINCERE_FAITH_RING] = 1963; result[EF_SINCERE_FAITH] = 1964; result[EF_SINCERE_FAITH_BOTTOM] = 1965; @@ -2006,15 +2006,15 @@ static std::unordered_map BuildLifetimes() { result[EF_EXPLOSION_BLASTER_HIT] = 1997; result[EF_FIRM_FAITH_RING] = 1998; result[EF_FIRM_FAITH] = 1999; - result[EF_UNK_2000] = 2000; - result[EF_UNK_2001] = 2001; - result[EF_UNK_2002] = 2002; + result[EF_MYSTICSYMPHONY] = 2000; + result[EF_MYSTICSYMPHONY_CAST] = 2001; + result[EF_MYSTICSYMPHONY_NOTE] = 2002; result[EF_ACTIVITY_BURN] = 2003; result[EF_ACTIVITY_BURN_CAST] = 2004; result[EF_ACTIVITY_BURN_CAST_BOTTOM] = 2005; - result[EF_UNK_2006] = 2006; - result[EF_UNK_2007] = 2007; - result[EF_UNK_2008] = 2008; + result[EF_KVASIRSONATA] = 2006; + result[EF_KVASIRSONATA_CAST] = 2007; + result[EF_KVASIRSONATA_CAST_BOTTOM] = 2008; result[EF_SERPENS_BOTTOM] = 2009; result[EF_SERPENS_CAST] = 2010; result[EF_SERPENS_CAST_BOTTOM] = 2011; @@ -2032,7 +2032,7 @@ static std::unordered_map BuildLifetimes() { result[EF_DILUVIO_HIT] = 2023; result[EF_DILUVIO_ARMOR] = 2024; result[EF_SPELL_ENCHANTING] = 2025; - result[EF_UNK_2026] = 60; + result[EF_DIAMOND_STORM] = 60; result[EF_DIAMOND_STORM_BOTTOM] = 60; result[EF_DIAMOND_STORM_CAST] = 2028; result[EF_DIAMOND_STORM_CAST_BOTTOM] = 2029; @@ -2052,11 +2052,11 @@ static std::unordered_map BuildLifetimes() { result[EF_LIGHTNING_LAND_CAST] = 2043; result[EF_LIGHTNING_LAND_CAST_BOTTOM] = 2044; result[EF_LIGHTNING_LAND_HIT] = 2045; - result[EF_UNK_2046] = 2046; - result[EF_UNK_2047] = 2047; - result[EF_UNK_2048] = 2048; - result[EF_UNK_2049] = 2049; - result[EF_UNK_2050] = 2050; + result[EF_ROSEBLOSSOM_CAST] = 2046; + result[EF_ROSEBLOSSOM_CAST_BOTTOM] = 2047; + result[EF_ROSEBLOSSOM_HIT] = 2048; + result[EF_ROSEBLOSSOM_ROSE] = 2049; + result[EF_ROSEBLOSSOM_SHOT] = 2050; result[EF_FIRST_BRAND] = 2051; result[EF_FIRST_BRAND_AURA] = 2052; result[EF_FIRST_BRAND_HIT] = 2053; @@ -2071,16 +2071,16 @@ static std::unordered_map BuildLifetimes() { result[EF_SOUND_BLEND_CAST_BOTTOM] = 2062; result[EF_SOUND_BLEND_RED] = 2063; result[EF_METALLIC_FURY] = 2064; - result[EF_UNK_2065] = 2065; - result[EF_UNK_2066] = 2066; - result[EF_UNK_2067] = 2067; - result[EF_UNK_2068] = 2068; - result[EF_UNK_2069] = 2069; - result[EF_UNK_2070] = 2070; - result[EF_UNK_2071] = 2071; - result[EF_UNK_2072] = 2072; - result[EF_UNK_2073] = 2073; - result[EF_UNK_2074] = 2074; + result[EF_JAWAII_SERENADE] = 2065; + result[EF_JAWAII_SERENADE_CAST] = 2066; + result[EF_JAWAII_SERENADE_CAST_BOTTOM] = 2067; + result[EF_PRONMARCH] = 2068; + result[EF_PRONMARCH_CAST] = 2069; + result[EF_PRONMARCH_CAST_BOTTOM] = 2070; + result[EF_RHYTHMSHOOTING_CAST] = 2071; + result[EF_RHYTHMSHOOTING_CAST_BOTTOM] = 2072; + result[EF_RHYTHMSHOOTING_HIT] = 2073; + result[EF_RHYTHMSHOOTING_SHOT] = 2074; result[EF_NIFLHEIM] = 2075; result[EF_NIFLHEIM_CAST] = 2076; result[EF_UNK_2077] = 2077; @@ -2120,18 +2120,18 @@ static std::unordered_map BuildLifetimes() { result[EF_ABYSS_STRIKE_HIT_2] = 2111; result[EF_THIRD_PUNISH] = 2095; result[EF_THIRD_PUNISH_BOTTOM] = 2096; - result[EF_UNK_2114] = 2114; + result[EF_FRENZY_SHOT] = 2114; result[EF_FRENZY_SHOT_HIT] = 2115; - result[EF_UNK_2116] = 2116; - result[EF_UNK_2117] = 2117; - result[EF_UNK_2118] = 2118; - result[EF_UNK_2119] = 2119; - result[EF_UNK_2120] = 2120; - result[EF_UNK_2121] = 2121; + result[EF_GEF_NOCTURN] = 2116; + result[EF_GEF_NOCTURN_CAST] = 2117; + result[EF_GEF_NOCTURN_CAST_BOTTOM] = 2118; + result[EF_ROKI_CAPRICCIO] = 2119; + result[EF_ROKI_CAPRICCIO_CAST] = 2120; + result[EF_ROKI_CAPRICCIO_CAST_BOTTOM] = 2121; result[EF_MUSICAL_INTERLUDE] = 2122; result[EF_MUSICAL_INTERLUDE_CAST] = 2123; - result[EF_UNK_2124] = 2124; - result[EF_UNK_2125] = 2125; + result[EF_AIN_RHAPSODY] = 2124; + result[EF_AIN_RHAPSODY_CAST] = 2125; result[EF_ABYSS_SLAYER] = 2126; result[EF_ABYSS_SLAYER_CAST] = 2127; result[EF_ABYSS_SLAYER_CAST_BOTTOM] = 2128; @@ -2160,55 +2160,55 @@ static std::unordered_map BuildLifetimes() { result[EF_ELEMENTAL_BUSTER_WIND] = 2151; result[EF_ELEMENTAL_BUSTER_WIND_BOTTOM] = 2152; result[EF_ELEMENTAL_BUSTER_WIND_HIT] = 2153; - result[EF_UNK_2154] = 2154; + result[EF_UNLUCKY_RUSH] = 2154; result[EF_UNLUCKY_RUSH_CAST] = 2155; result[EF_ABYSS_DAGGER_HIT_3] = 2156; - result[EF_UNK_2157] = 2157; - result[EF_UNK_2158] = 2158; - result[EF_UNK_2159] = 2159; - result[EF_UNK_2160] = 2160; + result[EF_OVERSLASH] = 2157; + result[EF_OVERSLASH_BOTTOM] = 2158; + result[EF_OVERSLASH_CAST] = 2159; + result[EF_OVERSLASH_HIT] = 2160; result[EF_ADVANCED_PROTECTION] = 2161; result[EF_ADVANCED_PROTECTION_BOTTOM] = 2162; result[EF_ADVANCED_PROTECTION_CAST] = 2163; result[EF_ADVANCED_PROTECTION_CAST_BOTTOM] = 2164; - result[EF_UNK_2165] = 2165; - result[EF_UNK_2166] = 2166; - result[EF_UNK_2167] = 2167; - result[EF_UNK_2168] = 2168; - result[EF_UNK_2169] = 2169; - result[EF_UNK_2170] = 2170; - result[EF_UNK_2171] = 2171; - result[EF_UNK_2172] = 2172; - result[EF_UNK_2173] = 2173; - result[EF_UNK_2174] = 2174; - result[EF_UNK_2175] = 2175; - result[EF_UNK_2176] = 2176; - result[EF_UNK_2177] = 2177; - result[EF_UNK_2178] = 2178; - result[EF_UNK_2179] = 2179; - result[EF_UNK_2180] = 2180; - result[EF_UNK_2181] = 2181; - result[EF_UNK_2182] = 2182; + result[EF_CROSS_RAIN] = 2165; + result[EF_CROSS_RAIN_BOTTOM] = 2166; + result[EF_CROSS_RAIN_CAST] = 2167; + result[EF_CROSS_RAIN_CAST_BOTTOM] = 2168; + result[EF_GUARD_STANCE] = 2169; + result[EF_GUARD_STANCE_CAST] = 2170; + result[EF_GUARD_STANCE_CAST_BOTTOM] = 2171; + result[EF_ATTACK_STANCE] = 2172; + result[EF_ATTACK_STANCE_CAST] = 2173; + result[EF_ATTACK_STANCE_CAST_BOTTOM] = 2174; + result[EF_GRAND_JUDGEMENT] = 2175; + result[EF_GRAND_JUDGEMENT_BOTTOM] = 2176; + result[EF_GRAND_JUDGEMENT_BUFF] = 2177; + result[EF_GRAND_JUDGEMENT_CAST] = 2178; + result[EF_GRAND_JUDGEMENT_CAST_BOTTOM] = 2179; + result[EF_HOLY_SHIELD_CAST] = 2180; + result[EF_HOLY_SHIELD] = 2181; + result[EF_HOLY_SHIELD_LOOP] = 2182; result[EF_UNK_2183] = 2183; result[EF_SHIELD_SHOOTING_CAST] = 2184; result[EF_SHIELD_SHOOTING_HIT] = 2185; result[EF_THE_W_PROTECTION] = 2186; result[EF_THE_W_PROTECTION_CAST] = 2187; - result[EF_UNK_2188] = 2188; - result[EF_UNK_2189] = 2189; - result[EF_UNK_2190] = 2190; - result[EF_UNK_2191] = 2191; - result[EF_UNK_2192] = 2192; - result[EF_UNK_2193] = 2193; - result[EF_UNK_2194] = 2194; - result[EF_UNK_2195] = 2195; - result[EF_UNK_2196] = 2196; - result[EF_UNK_2197] = 2197; - result[EF_UNK_2198] = 2198; - result[EF_UNK_2199] = 2199; - result[EF_UNK_2200] = 2200; - result[EF_UNK_2201] = 2201; - result[EF_UNK_2202] = 2202; + result[EF_GUARDIANSHIELD] = 2188; + result[EF_GUARDIANSHIELD_BOTTOM] = 2189; + result[EF_GUARDIANSHIELD_SUB] = 2190; + result[EF_JUDGEMENT_CROSS] = 2191; + result[EF_JUDGEMENT_CROSS_BOTTOM] = 2192; + result[EF_JUDGEMENT_CROSS_CAST] = 2193; + result[EF_JUDGEMENT_CROSS_CAST_BOTTOM] = 2194; + result[EF_JUDGEMENT_CROSS_SHOT] = 2195; + result[EF_REBOUND_SHIELD] = 2196; + result[EF_REBOUND_SHIELD_BOTTOM] = 2197; + result[EF_REBOUND_SHIELD_CAST] = 2198; + result[EF_REBOUND_SHIELD_CAST_BOTTOM] = 2199; + result[EF_ULTIMATESACRIFICE] = 2200; + result[EF_ULTIMATESACRIFICE_BOTTOM] = 2201; + result[EF_ULTIMATESACRIFICE_SHINE] = 2202; result[EF_UNK_2203] = 2203; result[EF_ACIDIFIED_ZONE_FIRE_CAST] = 2204; result[EF_ACIDIFIED_ZONE_FIRE_CAST_BOTTOM] = 2205; @@ -2286,7 +2286,7 @@ static std::unordered_map BuildLifetimes() { result[EF_UNK_2277] = 99999; result[EF_UNK_2278] = 99999; result[EF_THIRD_CONSECRATION_BOTTOM] = 2279; - result[EF_UNK_2280] = 2280; + result[EF_SERVANT_SIGN_BOTTOM] = 2280; result[EF_UNK_2281] = 2281; result[EF_UNK_2282] = 2281; result[EF_UNK_2283] = 2282; @@ -2373,9 +2373,9 @@ static std::unordered_map BuildLifetimes() { result[EF_POK_104] = 99999999; result[EF_POK_105] = 99999999; result[EF_UNK_2366] = 2366; - result[EF_UNKNOWN_RING_YELLOW] = 40; - result[EF_UNKNOWN_SPELL] = 100; - result[EF_UNKNOWN_RING_WHITE] = 40; + result[EF_BEGINSPELL_RING_YELLOW] = 40; + result[EF_BEGINSPELL_SWIRL] = 100; + result[EF_BEGINSPELL_RING_WHITE] = 40; result[EF_UNK_2370] = 2370; result[EF_TETRA_VORTEX_WATER_SUB_2] = 2371; result[EF_TETRA_VORTEX_EARTH_SUB_2] = 2372; @@ -2400,7 +2400,7 @@ static std::unordered_map BuildLifetimes() { result[EF_UNK_2391] = 999999; result[EF_UNK_2392] = 999999; result[EF_UNK_2393] = 999999; - result[EF_UNK_2394] = 2394; + result[EF_SERPENT_SHADOW] = 2394; result[EF_RUNE_ACTIVE_FINISH] = 2395; result[EF_RUNESET_ACTIVE] = 2396; result[EF_RUNESET_UPGRADE_SUCCESS] = 2397; @@ -2428,10 +2428,10 @@ static std::unordered_map BuildLifetimes() { result[EF_RG_COIN_BLUE] = 3000; result[EF_RG_COIN_BLUE_2] = 3000; result[EF_UNK_2438] = 2438; - result[EF_UNK_2439] = 300; + result[EF_CRUEL_BITE_LINE] = 300; result[EF_UNK_2440] = 99999999; result[EF_UNK_2441] = 300; - result[EF_UNK_2442] = 300; + result[EF_QUILL_SPEAR_LINE] = 300; result[EF_UNK_2443] = 99999999; result[EF_UNK_2444] = 500; result[EF_UNK_2445] = 2435; diff --git a/Source/Contents/Effects/EffectTypes.h b/Source/Contents/Effects/EffectTypes.h index f645e4c87..8582d793f 100644 --- a/Source/Contents/Effects/EffectTypes.h +++ b/Source/Contents/Effects/EffectTypes.h @@ -1135,7 +1135,7 @@ enum RagEffectID : std::int32_t { EF_SU_POWEROFFLOCK = 1127, EF_UNK_1128 = 1128, EF_SU_SVG_SPIRIT = 1129, - EF_UNK_1130 = 1130, + EF_BAKURETSU_HADOU = 1130, EF_SU_SPIRIT_OF_LIFE = 1131, EF_SU_STOOP = 1132, EF_FIREDANCE = 1133, @@ -1152,20 +1152,20 @@ enum RagEffectID : std::int32_t { EF_UNK_1144 = 1144, EF_RL_HAMMER_OF_GOD = 1145, EF_UNK_1146 = 1146, - EF_UNK_1147 = 1147, + EF_POPCORN = 1147, EF_RL_R_TRIP = 1148, EF_IMMUNE_PROPERTY = 1149, EF_MOVE_COORDINATE = 1150, - EF_UNK_1151 = 1151, - EF_UNK_1152 = 1152, - EF_UNK_1153 = 1153, - EF_UNK_1154 = 1154, - EF_UNK_1155 = 1155, - EF_UNK_1156 = 1156, - EF_UNK_1157 = 1157, - EF_UNK_1158 = 1158, - EF_UNK_1159 = 1159, - EF_UNK_1160 = 1160, + EF_IMMUNE_PROPERTY_NOTHING = 1151, + EF_IMMUNE_PROPERTY_WATER = 1152, + EF_IMMUNE_PROPERTY_GROUND = 1153, + EF_IMMUNE_PROPERTY_FIRE = 1154, + EF_IMMUNE_PROPERTY_WIND = 1155, + EF_IMMUNE_PROPERTY_POISON = 1156, + EF_IMMUNE_PROPERTY_SAINT = 1157, + EF_IMMUNE_PROPERTY_DARKNESS = 1158, + EF_IMMUNE_PROPERTY_TELEKINESIS = 1159, + EF_IMMUNE_PROPERTY_UNDEAD = 1160, EF_QUAGMIRE_VISUAL = 1161, EF_LORD_OF_VERMILLION_VISUAL = 1162, EF_METEOR_STORM_VISUAL = 1163, @@ -1194,10 +1194,10 @@ enum RagEffectID : std::int32_t { EF_UNK_1186 = 1186, EF_UNK_1187 = 1187, EF_UNK_1188 = 1188, - EF_UNK_1189 = 1189, - EF_UNK_1190 = 1190, + EF_DROPITEM_YELLOW = 1189, + EF_DROPITEM_PURPLE = 1190, EF_UNK_1191 = 1191, - EF_UNK_1192 = 1192, + EF_RANDOM_OPT_YELLOW = 1192, EF_UNK_1193 = 1193, EF_UNK_1194 = 1194, EF_AUTOSHADOWSPELL_ACTIVE = 1195, @@ -1205,7 +1205,7 @@ enum RagEffectID : std::int32_t { EF_LIGHTSPHERE_SUN = 1197, EF_LIGHTSPHERE_MOON = 1198, EF_LIGHTSPHERE_STAR = 1199, - EF_UNK_1200 = 1200, + EF_THUNDER_PLAZMA_BLAST = 1200, EF_UNK_1201 = 1201, EF_NOVAEXPLOSING = 1202, EF_STAR_EMPEROR = 1203, @@ -1217,8 +1217,8 @@ enum RagEffectID : std::int32_t { EF_BLINK_BODY = 1209, EF_LINELINK5 = 1210, EF_UNK_1211 = 1211, - EF_UNK_1212 = 1212, - EF_UNK_1213 = 1213, + EF_SUBJECT_AURA_1212 = 1212, + EF_SUBJECT_AURA_1213 = 1213, EF_UNK_1214 = 1214, EF_UNK_1215 = 1215, EF_UNK_1216 = 1216, @@ -1237,12 +1237,12 @@ enum RagEffectID : std::int32_t { EF_NEWMOON_KICK = 1229, EF_FULLMOON_KICK = 1230, EF_BOOK_OF_DIMENSION = 1231, - EF_UNK_1232 = 1232, + EF_BOOK_OF_CREATINGSTAR = 1232, EF_CURSE_EXPLOSION = 1233, EF_SOUL_REAPER = 1234, - EF_UNK_1235 = 1235, - EF_UNK_1236 = 1236, - EF_UNK_1237 = 1237, + EF_SOUL_SHADOW = 1235, + EF_SOUL_FAIRY = 1236, + EF_SOUL_FALCON = 1237, EF_SOUL_CURSE = 1238, EF_PROMINENCE_KICK = 1239, EF_SOUL_REAPER_COLLECT = 1240, @@ -1382,7 +1382,7 @@ enum RagEffectID : std::int32_t { EF_NEW_BANISHINGPOINT_05 = 1374, EF_NEW_BANISHINGPOINT_07 = 1375, EF_NEW_BANISHINGPOINT_11 = 1376, - EF_UNK_1377 = 1377, + EF_VALKYRIE_WING = 1377, EF_NEW_DRAGONBREATH_BOMB = 1378, EF_NEW_DRAGONBREATH_BOMB_BOTTOM = 1379, EF_NEW_DRAGONBREATH_01 = 1380, @@ -1424,7 +1424,7 @@ enum RagEffectID : std::int32_t { EF_NEW_COMET_SUB_EXP = 1416, EF_NEW_COMET_SUB_EXP_BOTTOM = 1417, EF_NEW_MOON_SLASH = 1418, - EF_UNK_1419 = 1419, + EF_C_AMDARAIS_EFFECT = 1419, EF_NEW_GRANDCROSS = 1420, EF_NEW_COMET_CAST = 1421, EF_NEW_CART_CANNON_CAST = 1422, @@ -1622,9 +1622,9 @@ enum RagEffectID : std::int32_t { EF_RED_WAVE_1 = 1614, EF_RED_WAVE_2 = 1615, EF_RED_WAVE_3 = 1616, - EF_UNK_1617 = 1617, - EF_UNK_1618 = 1618, - EF_UNK_1619 = 1619, + EF_BLACKBUBBLE_SMALL = 1617, + EF_BLACKBUBBLE_MIDIUM = 1618, + EF_BLACKBUBBLE_LARGE = 1619, EF_NEW_WALLOFTHORN_CAST = 1620, EF_NEW_WALLOFTHORN_CAST_BOTTOM = 1621, EF_NEW_EARTHGRAVE_BOTTOM = 1622, @@ -1666,20 +1666,20 @@ enum RagEffectID : std::int32_t { EF_NEW_AXEBOOMERANG_CAST = 1658, EF_NEW_AXEBOOMERANG_CAST_BOTTOM = 1659, EF_NEW_AXEBOOMERANG_HIT = 1660, - EF_UNK_1661 = 1661, - EF_UNK_1662 = 1662, - EF_UNK_1663 = 1663, + EF_HACKANDSLASH = 1661, + EF_HACKANDSLASH_BOTTOM = 1662, + EF_HACKANDSLASH_HIT = 1663, EF_NEW_SANCTUARY = 1664, EF_NEW_SPELLFIST_FIRE = 1665, EF_NEW_SPELLFIST_FIRE_BOTTOM = 1666, EF_NEW_SPELLFIST_WATER = 1667, EF_NEW_SPELLFIST_WATER_BOTTOM = 1668, EF_NEW_SPELLFIST_WIND = 1669, - EF_UNK_1670 = 1670, - EF_UNK_1671 = 1671, - EF_UNK_1672 = 1672, - EF_UNK_1673 = 1673, - EF_UNK_1674 = 1674, + EF_STORMSLASH_1 = 1670, + EF_STORMSLASH_2 = 1671, + EF_STORMSLASH_3 = 1672, + EF_STORMSLASH_4 = 1673, + EF_STORMSLASH_5 = 1674, EF_NEW_CARTBOOST = 1675, EF_NEW_CARTBOOST_BOTTOM = 1676, EF_NEW_SAFETYWALL = 1677, @@ -1700,9 +1700,9 @@ enum RagEffectID : std::int32_t { EF_NEW_WINDCUTTER_BOTTOM_05 = 1692, EF_NEW_WINDCUTTER_TARGET = 1693, EF_UNK_1694 = 1694, - EF_UNK_1695 = 1695, - EF_UNK_1696 = 1696, - EF_UNK_1697 = 1697, + EF_NEW_SERVANTWEAPON_HIT = 1695, + EF_NEW_SERVANTWEAPON_HIT_BOTTOM = 1696, + EF_NEW_SERVANTWEAPON_SHOOT_BOTTOM = 1697, EF_NEW_POWERSWING_01 = 1698, EF_NEW_POWERSWING_05 = 1699, EF_NEW_POWERSWING_07 = 1700, @@ -1715,26 +1715,26 @@ enum RagEffectID : std::int32_t { EF_NEW_EARTHDRIVE_BOTTOM = 1707, EF_NEW_EARTHDRIVE_TARGET = 1708, EF_NEW_EARTHDRIVE_CAST = 1709, - EF_UNK_1710 = 1710, - EF_UNK_1711 = 1711, - EF_UNK_1712 = 1712, - EF_UNK_1713 = 1713, - EF_UNK_1714 = 1714, - EF_UNK_1715 = 1715, - EF_UNK_1716 = 1716, - EF_UNK_1717 = 1717, - EF_UNK_1718 = 1718, - EF_UNK_1719 = 1719, - EF_UNK_1720 = 1720, - EF_UNK_1721 = 1721, + EF_SERVANT_SIGN = 1710, + EF_SERVANT_SIGN_DOWN = 1711, + EF_SERVANT_SIGN_DOWN_BOTTOM = 1712, + EF_SERVANT_PHANTOM_DOWN = 1713, + EF_SERVANT_PHANTOM_HIT = 1714, + EF_SERVANT_PHANTOM_HIT_BOTTOM = 1715, + EF_SERVANT_PHANTOM_SUB = 1716, + EF_SERVANT_PHANTOM_SUB_BOTTOM = 1717, + EF_SERVANT_DEMOLITION_COLLECT = 1718, + EF_SERVANT_DEMOLITION_HIT = 1719, + EF_SERVANT_DEMOLITION_LEFTDOWN = 1720, + EF_SERVANT_DEMOLITION_RIGHTDOWN = 1721, EF_DRAGONIC_AURA = 1722, EF_DRAGONIC_AURA_BOTTOM = 1723, EF_DRAGONIC_AURA_HIT = 1724, EF_DRAGONIC_AURA_HIT_BOTTOM = 1725, EF_DRAGONIC_AURA_BUFF = 1726, EF_DRAGONIC_AURA_BUFF_BOTTOM = 1727, - EF_UNK_1728 = 1728, - EF_UNK_1729 = 1729, + EF_MADNESS_CRUSHER = 1728, + EF_MADNESS_CRUSHER_BOTTOM = 1729, EF_NEW_AUTOSHADOWSPELL = 1730, EF_NEW_AUTOSHADOWSPELL_BOTTOM = 1731, EF_DESTRUCTIVE_HURRICANE = 1732, @@ -1755,24 +1755,24 @@ enum RagEffectID : std::int32_t { EF_ROCKDOWN_CAST = 1747, EF_ROCKDOWN_CAST_BOTTOM = 1748, EF_ROCKDOWN_HIT = 1749, - EF_UNK_1750 = 1750, - EF_UNK_1751 = 1751, + EF_VIGOR_CAST = 1750, + EF_VIGOR_BUFF = 1751, EF_UNK_1752 = 1752, EF_RAIN_OF_CRYSTAL = 1753, EF_RAIN_OF_CRYSTAL_BOTTOM = 1754, EF_UNK_1755 = 1755, - EF_UNK_1756 = 1756, + EF_CRIMSONARROW = 1756, EF_CRIMSON_ARROW_CAST = 1757, EF_CRIMSON_ARROW_CAST_BOTTOM = 1758, EF_CRIMSON_ARROW_HIT = 1759, - EF_UNK_1760 = 1760, + EF_VIOLENTQUAKE = 1760, EF_VIOLENT_QUAKE_CAST = 1761, EF_VIOLENT_QUAKE_CAST_BOTTOM = 1762, EF_VIOLENT_QUAKE_HIT = 1763, EF_UNK_1764 = 1764, - EF_UNK_1765 = 1765, - EF_UNK_1766 = 1766, - EF_UNK_1767 = 1767, + EF_NEW_CHARGINGPIERCE_CAST = 1765, + EF_NEW_CHARGINGPIERCE_CAST_BOTTOM = 1766, + EF_NEW_CHARGINGPIERCE_HIT = 1767, EF_UNK_1768 = 1768, EF_ASTRAL_STRIKE_CAST = 1769, EF_ASTRAL_STRIKE_CAST_BOTTOM = 1770, @@ -1832,10 +1832,10 @@ enum RagEffectID : std::int32_t { EF_ARBITRIUM = 1824, EF_ARBITRIUM_BOTTOM = 1825, EF_ARBITRIUM_HIT = 1826, - EF_UNK_1827 = 1827, - EF_UNK_1828 = 1828, + EF_DANCING_KNIFE_CAST = 1827, + EF_DANCING_KNIFE_CAST_BOTTOM = 1828, EF_UNK_1829 = 1829, - EF_UNK_1830 = 1830, + EF_ABYSS_DAGGER_HIT_1830 = 1830, EF_NEW_REPARATIO_CAST = 1831, EF_NEW_REPARATIO_CAST_BOTTOM = 1832, EF_NEW_REPARATIO = 1833, @@ -1867,16 +1867,16 @@ enum RagEffectID : std::int32_t { EF_CRYSTAL_IMPACT_BUFF = 1859, EF_RELIGIO = 1860, EF_RELIGIO_CAST = 1861, - EF_UNK_1862 = 1862, - EF_UNK_1863 = 1863, + EF_NEW_ENCHANTING_SHADOW = 1862, + EF_NEW_ENCHANTING_SHADOW_BOTTOM = 1863, EF_FATAL_SHADOW_CROW = 1864, EF_FATAL_SHADOW_CROW_BOTTOM = 1865, EF_FATAL_SHADOW_CROW_HIT = 1866, EF_UNK_1867 = 1867, - EF_UNK_1868 = 1868, - EF_UNK_1869 = 1869, - EF_UNK_1870 = 1870, - EF_UNK_1871 = 1871, + EF_SHADOW_EXCEED_CAST = 1868, + EF_DROPITEM_BLUE = 1869, + EF_DROPITEM_GREEN = 1870, + EF_DROPITEM_RED = 1871, EF_NEW_PNEUMA = 1872, EF_DEEP_BLIND_TRAP_CAST = 1873, EF_DEEP_BLIND_TRAP = 1874, @@ -1900,10 +1900,10 @@ enum RagEffectID : std::int32_t { EF_STRATUM_TREMOR_HIT = 1892, EF_STRATUM_TREMOR = 1893, EF_STRATUM_TREMOR_BOTTOM = 1894, - EF_UNK_1895 = 1895, - EF_UNK_1896 = 1896, + EF_IMPACT_CRATER = 1895, + EF_IMPACT_CRATER_BOTTOM = 1896, EF_UNK_1897 = 1897, - EF_UNK_1898 = 1898, + EF_IMPACT_CRATER_HIT = 1898, EF_WIND_SIGN = 1899, EF_WIND_SIGN_LOOP = 1900, EF_ABR_MOTHER_CAST = 1901, @@ -1955,19 +1955,19 @@ enum RagEffectID : std::int32_t { EF_NEW_AXE_STOMP_08 = 1947, EF_NEW_AXE_STOMP_09 = 1948, EF_NEW_AXE_STOMP_11 = 1949, - EF_UNK_1950 = 1950, + EF_CRESCIVEBOLT_CAST = 1950, EF_UNK_1951 = 1951, - EF_UNK_1952 = 1952, - EF_UNK_1953 = 1953, - EF_UNK_1954 = 1954, - EF_UNK_1955 = 1955, + EF_CRESCIVEBOLT_HIT = 1952, + EF_SHADOW_STAB = 1953, + EF_ETERNAL_SLASH_HIT = 1954, + EF_SHADOW_STAB_HIT2 = 1955, EF_UNK_1956 = 1956, EF_UNK_1957 = 1957, EF_PNEUMATICUS_PROCELLA_CAST = 1958, EF_PNEUMATICUS_PROCELLA_RING = 1959, - EF_UNK_1960 = 1960, - EF_UNK_1961 = 1961, - EF_UNK_1962 = 1962, + EF_CALUMITYGALE = 1960, + EF_CALUMITYGALE_CAST = 1961, + EF_CALUMITYGALE_LOOP = 1962, EF_SINCERE_FAITH_RING = 1963, EF_SINCERE_FAITH = 1964, EF_SINCERE_FAITH_BOTTOM = 1965, @@ -2005,15 +2005,15 @@ enum RagEffectID : std::int32_t { EF_EXPLOSION_BLASTER_HIT = 1997, EF_FIRM_FAITH_RING = 1998, EF_FIRM_FAITH = 1999, - EF_UNK_2000 = 2000, - EF_UNK_2001 = 2001, - EF_UNK_2002 = 2002, + EF_MYSTICSYMPHONY = 2000, + EF_MYSTICSYMPHONY_CAST = 2001, + EF_MYSTICSYMPHONY_NOTE = 2002, EF_ACTIVITY_BURN = 2003, EF_ACTIVITY_BURN_CAST = 2004, EF_ACTIVITY_BURN_CAST_BOTTOM = 2005, - EF_UNK_2006 = 2006, - EF_UNK_2007 = 2007, - EF_UNK_2008 = 2008, + EF_KVASIRSONATA = 2006, + EF_KVASIRSONATA_CAST = 2007, + EF_KVASIRSONATA_CAST_BOTTOM = 2008, EF_SERPENS_BOTTOM = 2009, EF_SERPENS_CAST = 2010, EF_SERPENS_CAST_BOTTOM = 2011, @@ -2031,7 +2031,7 @@ enum RagEffectID : std::int32_t { EF_DILUVIO_HIT = 2023, EF_DILUVIO_ARMOR = 2024, EF_SPELL_ENCHANTING = 2025, - EF_UNK_2026 = 2026, + EF_DIAMOND_STORM = 2026, EF_DIAMOND_STORM_BOTTOM = 2027, EF_DIAMOND_STORM_CAST = 2028, EF_DIAMOND_STORM_CAST_BOTTOM = 2029, @@ -2051,11 +2051,11 @@ enum RagEffectID : std::int32_t { EF_LIGHTNING_LAND_CAST = 2043, EF_LIGHTNING_LAND_CAST_BOTTOM = 2044, EF_LIGHTNING_LAND_HIT = 2045, - EF_UNK_2046 = 2046, - EF_UNK_2047 = 2047, - EF_UNK_2048 = 2048, - EF_UNK_2049 = 2049, - EF_UNK_2050 = 2050, + EF_ROSEBLOSSOM_CAST = 2046, + EF_ROSEBLOSSOM_CAST_BOTTOM = 2047, + EF_ROSEBLOSSOM_HIT = 2048, + EF_ROSEBLOSSOM_ROSE = 2049, + EF_ROSEBLOSSOM_SHOT = 2050, EF_FIRST_BRAND = 2051, EF_FIRST_BRAND_AURA = 2052, EF_FIRST_BRAND_HIT = 2053, @@ -2070,16 +2070,16 @@ enum RagEffectID : std::int32_t { EF_SOUND_BLEND_CAST_BOTTOM = 2062, EF_SOUND_BLEND_RED = 2063, EF_METALLIC_FURY = 2064, - EF_UNK_2065 = 2065, - EF_UNK_2066 = 2066, - EF_UNK_2067 = 2067, - EF_UNK_2068 = 2068, - EF_UNK_2069 = 2069, - EF_UNK_2070 = 2070, - EF_UNK_2071 = 2071, - EF_UNK_2072 = 2072, - EF_UNK_2073 = 2073, - EF_UNK_2074 = 2074, + EF_JAWAII_SERENADE = 2065, + EF_JAWAII_SERENADE_CAST = 2066, + EF_JAWAII_SERENADE_CAST_BOTTOM = 2067, + EF_PRONMARCH = 2068, + EF_PRONMARCH_CAST = 2069, + EF_PRONMARCH_CAST_BOTTOM = 2070, + EF_RHYTHMSHOOTING_CAST = 2071, + EF_RHYTHMSHOOTING_CAST_BOTTOM = 2072, + EF_RHYTHMSHOOTING_HIT = 2073, + EF_RHYTHMSHOOTING_SHOT = 2074, EF_NIFLHEIM = 2075, EF_NIFLHEIM_CAST = 2076, EF_UNK_2077 = 2077, @@ -2119,18 +2119,18 @@ enum RagEffectID : std::int32_t { EF_ABYSS_STRIKE_HIT_2 = 2111, EF_THIRD_PUNISH = 2112, EF_THIRD_PUNISH_BOTTOM = 2113, - EF_UNK_2114 = 2114, + EF_FRENZY_SHOT = 2114, EF_FRENZY_SHOT_HIT = 2115, - EF_UNK_2116 = 2116, - EF_UNK_2117 = 2117, - EF_UNK_2118 = 2118, - EF_UNK_2119 = 2119, - EF_UNK_2120 = 2120, - EF_UNK_2121 = 2121, + EF_GEF_NOCTURN = 2116, + EF_GEF_NOCTURN_CAST = 2117, + EF_GEF_NOCTURN_CAST_BOTTOM = 2118, + EF_ROKI_CAPRICCIO = 2119, + EF_ROKI_CAPRICCIO_CAST = 2120, + EF_ROKI_CAPRICCIO_CAST_BOTTOM = 2121, EF_MUSICAL_INTERLUDE = 2122, EF_MUSICAL_INTERLUDE_CAST = 2123, - EF_UNK_2124 = 2124, - EF_UNK_2125 = 2125, + EF_AIN_RHAPSODY = 2124, + EF_AIN_RHAPSODY_CAST = 2125, EF_ABYSS_SLAYER = 2126, EF_ABYSS_SLAYER_CAST = 2127, EF_ABYSS_SLAYER_CAST_BOTTOM = 2128, @@ -2159,55 +2159,55 @@ enum RagEffectID : std::int32_t { EF_ELEMENTAL_BUSTER_WIND = 2151, EF_ELEMENTAL_BUSTER_WIND_BOTTOM = 2152, EF_ELEMENTAL_BUSTER_WIND_HIT = 2153, - EF_UNK_2154 = 2154, + EF_UNLUCKY_RUSH = 2154, EF_UNLUCKY_RUSH_CAST = 2155, EF_ABYSS_DAGGER_HIT_3 = 2156, - EF_UNK_2157 = 2157, - EF_UNK_2158 = 2158, - EF_UNK_2159 = 2159, - EF_UNK_2160 = 2160, + EF_OVERSLASH = 2157, + EF_OVERSLASH_BOTTOM = 2158, + EF_OVERSLASH_CAST = 2159, + EF_OVERSLASH_HIT = 2160, EF_ADVANCED_PROTECTION = 2161, EF_ADVANCED_PROTECTION_BOTTOM = 2162, EF_ADVANCED_PROTECTION_CAST = 2163, EF_ADVANCED_PROTECTION_CAST_BOTTOM = 2164, - EF_UNK_2165 = 2165, - EF_UNK_2166 = 2166, - EF_UNK_2167 = 2167, - EF_UNK_2168 = 2168, - EF_UNK_2169 = 2169, - EF_UNK_2170 = 2170, - EF_UNK_2171 = 2171, - EF_UNK_2172 = 2172, - EF_UNK_2173 = 2173, - EF_UNK_2174 = 2174, - EF_UNK_2175 = 2175, - EF_UNK_2176 = 2176, - EF_UNK_2177 = 2177, - EF_UNK_2178 = 2178, - EF_UNK_2179 = 2179, - EF_UNK_2180 = 2180, - EF_UNK_2181 = 2181, - EF_UNK_2182 = 2182, + EF_CROSS_RAIN = 2165, + EF_CROSS_RAIN_BOTTOM = 2166, + EF_CROSS_RAIN_CAST = 2167, + EF_CROSS_RAIN_CAST_BOTTOM = 2168, + EF_GUARD_STANCE = 2169, + EF_GUARD_STANCE_CAST = 2170, + EF_GUARD_STANCE_CAST_BOTTOM = 2171, + EF_ATTACK_STANCE = 2172, + EF_ATTACK_STANCE_CAST = 2173, + EF_ATTACK_STANCE_CAST_BOTTOM = 2174, + EF_GRAND_JUDGEMENT = 2175, + EF_GRAND_JUDGEMENT_BOTTOM = 2176, + EF_GRAND_JUDGEMENT_BUFF = 2177, + EF_GRAND_JUDGEMENT_CAST = 2178, + EF_GRAND_JUDGEMENT_CAST_BOTTOM = 2179, + EF_HOLY_SHIELD_CAST = 2180, + EF_HOLY_SHIELD = 2181, + EF_HOLY_SHIELD_LOOP = 2182, EF_UNK_2183 = 2183, EF_SHIELD_SHOOTING_CAST = 2184, EF_SHIELD_SHOOTING_HIT = 2185, EF_THE_W_PROTECTION = 2186, EF_THE_W_PROTECTION_CAST = 2187, - EF_UNK_2188 = 2188, - EF_UNK_2189 = 2189, - EF_UNK_2190 = 2190, - EF_UNK_2191 = 2191, - EF_UNK_2192 = 2192, - EF_UNK_2193 = 2193, - EF_UNK_2194 = 2194, - EF_UNK_2195 = 2195, - EF_UNK_2196 = 2196, - EF_UNK_2197 = 2197, - EF_UNK_2198 = 2198, - EF_UNK_2199 = 2199, - EF_UNK_2200 = 2200, - EF_UNK_2201 = 2201, - EF_UNK_2202 = 2202, + EF_GUARDIANSHIELD = 2188, + EF_GUARDIANSHIELD_BOTTOM = 2189, + EF_GUARDIANSHIELD_SUB = 2190, + EF_JUDGEMENT_CROSS = 2191, + EF_JUDGEMENT_CROSS_BOTTOM = 2192, + EF_JUDGEMENT_CROSS_CAST = 2193, + EF_JUDGEMENT_CROSS_CAST_BOTTOM = 2194, + EF_JUDGEMENT_CROSS_SHOT = 2195, + EF_REBOUND_SHIELD = 2196, + EF_REBOUND_SHIELD_BOTTOM = 2197, + EF_REBOUND_SHIELD_CAST = 2198, + EF_REBOUND_SHIELD_CAST_BOTTOM = 2199, + EF_ULTIMATESACRIFICE = 2200, + EF_ULTIMATESACRIFICE_BOTTOM = 2201, + EF_ULTIMATESACRIFICE_SHINE = 2202, EF_UNK_2203 = 2203, EF_ACIDIFIED_ZONE_FIRE_CAST = 2204, EF_ACIDIFIED_ZONE_FIRE_CAST_BOTTOM = 2205, @@ -2285,7 +2285,7 @@ enum RagEffectID : std::int32_t { EF_UNK_2277 = 2277, EF_UNK_2278 = 2278, EF_THIRD_CONSECRATION_BOTTOM = 2279, - EF_UNK_2280 = 2280, + EF_SERVANT_SIGN_BOTTOM = 2280, EF_UNK_2281 = 2281, EF_UNK_2282 = 2282, EF_UNK_2283 = 2283, @@ -2372,9 +2372,9 @@ enum RagEffectID : std::int32_t { EF_POK_104 = 2364, EF_POK_105 = 2365, EF_UNK_2366 = 2366, - EF_UNKNOWN_RING_YELLOW = 2367, - EF_UNKNOWN_SPELL = 2368, - EF_UNKNOWN_RING_WHITE = 2369, + EF_BEGINSPELL_RING_YELLOW = 2367, + EF_BEGINSPELL_SWIRL = 2368, + EF_BEGINSPELL_RING_WHITE = 2369, EF_UNK_2370 = 2370, EF_TETRA_VORTEX_WATER_SUB_2 = 2371, EF_TETRA_VORTEX_EARTH_SUB_2 = 2372, @@ -2399,7 +2399,7 @@ enum RagEffectID : std::int32_t { EF_UNK_2391 = 2391, EF_UNK_2392 = 2392, EF_UNK_2393 = 2393, - EF_UNK_2394 = 2394, + EF_SERPENT_SHADOW = 2394, EF_RUNE_ACTIVE_FINISH = 2395, EF_RUNESET_ACTIVE = 2396, EF_RUNESET_UPGRADE_SUCCESS = 2397, @@ -2425,18 +2425,18 @@ enum RagEffectID : std::int32_t { EF_ABC_CROSSIMPACT_LINE = 2417, EF_UNK_2418 = 2418, EF_UNK_2419 = 2419, - EF_UNK_2420 = 2420, + EF_VIOLEN_HIT = 2420, EF_RUNE_SLOT_SMALL = 2421, EF_RUNE_SLOT_BIG = 2422, EF_UNK_2423 = 2423, - EF_UNK_2424 = 2424, + EF_C_AURA_OF_GHOST_S = 2424, EF_WH_WILD_WALK = 2425, EF_FORCE_ANIM_27 = 2426, EF_HEAL_BLUE_2 = 2427, - EF_UNK_2428 = 2428, - EF_UNK_2429 = 2429, - EF_UNK_2430 = 2430, - EF_UNK_2431 = 2431, + EF_ATQUE_POENITENTIA = 2428, + EF_PERM_FROST_OBLIVION = 2429, + EF_C_GUIDE_OF_DEAD_TEXT = 2430, + EF_C_MEDJED_TEXT = 2431, EF_UNK_2432 = 2432, EF_UNK_2433 = 2433, EF_UNK_2434 = 2434, @@ -2444,10 +2444,10 @@ enum RagEffectID : std::int32_t { EF_RG_COIN_BLUE = 2436, EF_RG_COIN_BLUE_2 = 2437, EF_UNK_2438 = 2438, - EF_UNK_2439 = 2439, + EF_CRUEL_BITE_LINE = 2439, EF_UNK_2440 = 2440, EF_UNK_2441 = 2441, - EF_UNK_2442 = 2442, + EF_QUILL_SPEAR_LINE = 2442, EF_UNK_2443 = 2443, EF_UNK_2444 = 2444, EF_UNK_2445 = 2445, @@ -2463,7 +2463,7 @@ enum RagEffectID : std::int32_t { EF_UNK_2455 = 2455, EF_UNK_2456 = 2456, EF_UNK_2457 = 2457, - EF_UNK_2458 = 2458, + EF_S_BEELZEBUB_WING = 2458, EF_UNK_2460 = 2460, EF_UNK_2461 = 2461, EF_UNK_2462 = 2462, @@ -3154,7 +3154,7 @@ enum efst_type : std::int16_t { EFST_REUSE_LIMIT_ECL, EFST_M_LIFEPOTION, EFST_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT, - EFST_UNKNOWN_NAME, + EFST_SHOW_HP, EFST_ON_PUSH_CART, EFST_HAT_EFFECT, EFST_FLOWER_LEAF, diff --git a/Source/Contents/Effects/ElectricEffect.h b/Source/Contents/Effects/ElectricEffect.h index db9380d7d..8ac61b87d 100644 --- a/Source/Contents/Effects/ElectricEffect.h +++ b/Source/Contents/Effects/ElectricEffect.h @@ -20,7 +20,7 @@ public: void AddBolt(int tilt); /* 00CC */ short angle; - /* 00CE */ unsigned char unknown_00CE[2]; + /* 00CE */ unsigned char padding_00CE[2]; /* 00D0 */ vector3d path[2]; /* 00E8 */ vector3d lastEdge[2]; /* 0100 */ int tick; diff --git a/Source/Contents/Effects/EmitterEffect.h b/Source/Contents/Effects/EmitterEffect.h index 829ad2c4a..e3ec38b9c 100644 --- a/Source/Contents/Effects/EmitterEffect.h +++ b/Source/Contents/Effects/EmitterEffect.h @@ -54,10 +54,10 @@ public: /* 0158 */ float particleSpeed; /* 015C */ bool depth; /* 015D */ bool billboard; - /* 015E */ unsigned char unknown_015E[2]; + /* 015E */ unsigned char padding_015E[2]; /* 0160 */ float rotation[3]; /* 016C */ unsigned char fixedAlpha; - /* 016D */ unsigned char unknown_016D[3]; + /* 016D */ unsigned char padding_016D[3]; /* 0170 */ std::vector particles; /* 017C */ ParticlePool pool; /* 0188 */ int duration; diff --git a/Source/Contents/Effects/FortuneKissEffect.h b/Source/Contents/Effects/FortuneKissEffect.h index b6111bf72..e022f6bb4 100644 --- a/Source/Contents/Effects/FortuneKissEffect.h +++ b/Source/Contents/Effects/FortuneKissEffect.h @@ -16,7 +16,7 @@ public: void Close() override; bool IsAlive() override; - /* 00CC */ unsigned char unknown_00CC[0x38]; + /* 00CC */ unsigned char padding_00CC[0x38]; /* 0104 */ int angle; /* 0108 */ std::vector particles; }; diff --git a/Source/Contents/Effects/MagicFloorEffect.h b/Source/Contents/Effects/MagicFloorEffect.h index a6565bd9b..222721d52 100644 --- a/Source/Contents/Effects/MagicFloorEffect.h +++ b/Source/Contents/Effects/MagicFloorEffect.h @@ -22,14 +22,14 @@ public: void AddClouds(int layer); /* 00CC */ EffectPoint lastPoints[2]; - /* 00E4 */ EffectPoint unknown_00E4[2]; + /* 00E4 */ EffectPoint padding_00E4[2]; /* 00FC */ std::vector floors; /* 0108 */ std::vector particles; }; #if defined(_WIN32) && !defined(_WIN64) static_assert(offsetof(CMagicFloorEffect, lastPoints) == 0xCC); -static_assert(offsetof(CMagicFloorEffect, unknown_00E4) == 0xE4); +static_assert(offsetof(CMagicFloorEffect, padding_00E4) == 0xE4); static_assert(offsetof(CMagicFloorEffect, floors) == 0xFC); static_assert(offsetof(CMagicFloorEffect, particles) == 0x108); static_assert(sizeof(CMagicFloorEffect) == 0x114); diff --git a/Source/Contents/Effects/MandraAttackEffect.h b/Source/Contents/Effects/MandraAttackEffect.h index a29f16744..0820c6f6b 100644 --- a/Source/Contents/Effects/MandraAttackEffect.h +++ b/Source/Contents/Effects/MandraAttackEffect.h @@ -12,7 +12,7 @@ public: void SendMsg(CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m) override; /* 0138 */ float startFrame; - /* 013C */ int unknown_013C; + /* 013C */ int padding_013C; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Effects/MonsterSkillEffects.cpp b/Source/Contents/Effects/MonsterSkillEffects.cpp index 4c4dbcafb..818dccd15 100644 --- a/Source/Contents/Effects/MonsterSkillEffects.cpp +++ b/Source/Contents/Effects/MonsterSkillEffects.cpp @@ -1853,27 +1853,27 @@ bool CDropItemEffect::IsAlive() { // FUNCTION: fn_07310 void CDropItemEffect::OpenEmitters() { switch (this->id) { - case EF_UNK_1190: + case EF_DROPITEM_PURPLE: AsParticle(this->emitters[0])->Open("new_dropitem\\dropitem_purple\\dropitem_purple\\dropitem_purple.str"); AsParticle(this->emitters[1])->Open("new_dropitem\\dropitem_purple\\dropitem_purple_bottom\\dropitem_purple_bottom.str"); this->soundName = "drop_purple.wav"; break; - case EF_UNK_1189: + case EF_DROPITEM_YELLOW: AsParticle(this->emitters[0])->Open("new_dropitem\\dropitem_yellow\\dropitem_yellow\\dropitem_yellow.str"); AsParticle(this->emitters[1])->Open("new_dropitem\\dropitem_yellow\\dropitem_yellow_bottom\\dropitem_yellow_bottom.str"); this->soundName = "drop_yellow.wav"; break; - case EF_UNK_1869: + case EF_DROPITEM_BLUE: AsParticle(this->emitters[0])->Open("new_dropitem\\dropitem_blue\\dropitem_blue\\dropitem_blue.str"); AsParticle(this->emitters[1])->Open("new_dropitem\\dropitem_blue\\dropitem_blue_bottom\\dropitem_blue_bottom.str"); this->soundName = "drop_blue.wav"; break; - case EF_UNK_1870: + case EF_DROPITEM_GREEN: AsParticle(this->emitters[0])->Open("new_dropitem\\dropitem_green\\dropitem_green\\dropitem_green.str"); AsParticle(this->emitters[1])->Open("new_dropitem\\dropitem_green\\dropitem_green_bottom\\dropitem_green_bottom.str"); this->soundName = "drop_green.wav"; break; - case EF_UNK_1871: + case EF_DROPITEM_RED: AsParticle(this->emitters[0])->Open("new_dropitem\\dropitem_red\\dropitem_red\\dropitem_red.str"); AsParticle(this->emitters[1])->Open("new_dropitem\\dropitem_red\\dropitem_red_bottom\\dropitem_red_bottom.str"); this->soundName = "drop_red.wav"; @@ -1918,7 +1918,7 @@ CJupitelThunderHit::CJupitelThunderHit() : CEffect(-1) { void CJupitelThunderHit::SpawnHit() { switch (this->id) { case EF_YUFITELHIT: - case EF_UNK_1200: + case EF_THUNDER_PLAZMA_BLAST: this->textures.push_back("effect\\thunder_plazma_blast_a.bmp"); this->textures.push_back("effect\\thunder_plazma_blast_b.bmp"); this->textures.push_back("effect\\thunder_ball_d.bmp"); @@ -2625,10 +2625,10 @@ void CRandomOptEffect::Init() { case EF_UNK_1188: particle->SetColor(0, 100, 150); break; - case EF_UNK_1189: + case EF_DROPITEM_YELLOW: particle->SetColor(255, 255, 128); break; - case EF_UNK_1190: + case EF_DROPITEM_PURPLE: particle->SetColor(128, 0, 255); break; case EF_UNK_1191: @@ -3626,7 +3626,7 @@ void CSevereRainStorm::SpawnParticles() { this->SpawnSevereRain(); } break; - case EF_UNK_2026: + case EF_DIAMOND_STORM: if (this->elapsedFrames % 5 == 0) { vector3d position = {this->position[0], this->position[1], this->position[2]}; position.x = (static_cast(ClampedRandom(451)) - 225.0f) * 0.1f + position.x; @@ -3638,7 +3638,7 @@ void CSevereRainStorm::SpawnParticles() { this->emitters.push_back(emitter); } break; - case EF_UNK_2165: + case EF_CROSS_RAIN: if (this->elapsedFrames % (9 - this->effectLevel / 3) == 0) { const long long ranges[10] = {3, 3, 3, 5, 5, 5, 7, 7, 7, 9}; const long long spread = ranges[std::min(static_cast(this->effectLevel), 10u) - 1] * 50; @@ -3904,7 +3904,7 @@ void CSevereRainStorm::Open() { bool CSevereRainStorm::IsAlive() { switch (this->id) { case EF_UNK_1752: - case EF_UNK_2165: + case EF_CROSS_RAIN: case EF_UNK_2462: return this->ActorExists(); case EF_UNK_1276: @@ -3912,7 +3912,7 @@ bool CSevereRainStorm::IsAlive() { return false; } break; - case EF_UNK_2026: + case EF_DIAMOND_STORM: if (EffectLifetime(2026) < this->elapsedFrames) { return false; } @@ -4027,7 +4027,7 @@ void CCrimsonArrowEffect::Open() { EZ2STREmitter* emitter = reinterpret_cast(arrow); switch (this->id) { - case EF_UNK_1756: + case EF_CRIMSONARROW: arrow->Load("crimsonarrow\\crimsonarrow\\crimsonarrow.str"); emitter->offset.x = 0.0f; emitter->offset.y = -13.0f; @@ -4035,7 +4035,7 @@ void CCrimsonArrowEffect::Open() { arrow->m_angle = static_cast(angle); this->AddEvent(0, "effect\\AG_CRIMSON_ARROW1.wav", 0, 0); break; - case EF_UNK_2074: + case EF_RHYTHMSHOOTING_SHOT: arrow->Load("rhythmshooting\\rhythmshooting_shot\\rhythmshooting_shot.str"); emitter->offset.x = 0.0f; emitter->offset.y = -8.0f; @@ -4043,7 +4043,7 @@ void CCrimsonArrowEffect::Open() { arrow->m_angle = static_cast(angle + 180.0); this->AddEvent(0, "effect\\TR_RHYTHMSHOOTING.wav", 0, 0); break; - case EF_UNK_2114: + case EF_FRENZY_SHOT: arrow->Load("frenzy_shot\\frenzy_shot\\frenzy_shot.str"); emitter->offset.x = 0.0f; emitter->offset.y = -4.0f; @@ -4051,11 +4051,11 @@ void CCrimsonArrowEffect::Open() { arrow->m_angle = static_cast(angle); this->AddEvent(0, "effect\\ABC_FRENZY_SHOT.wav", 0, 0); break; - case EF_UNK_2154: + case EF_UNLUCKY_RUSH: arrow->Load("unlucky_rush\\unlucky_rush\\unlucky_rush.str"); arrow->m_angle = static_cast(angle); break; - case EF_UNK_2195: + case EF_JUDGEMENT_CROSS_SHOT: arrow->Load("judgement_cross\\judgement_cross_shot\\judgement_cross_shot.str"); arrow->m_angle = static_cast(angle + 180.0); break; diff --git a/Source/Contents/Effects/MonsterSkillEffects.h b/Source/Contents/Effects/MonsterSkillEffects.h index fe7023fdd..a23162a00 100644 --- a/Source/Contents/Effects/MonsterSkillEffects.h +++ b/Source/Contents/Effects/MonsterSkillEffects.h @@ -117,7 +117,7 @@ public: /* 00CC */ std::vector emitters; /* 00D8 */ unsigned char fadingIn; - /* 00D9 */ unsigned char unknown_00D9[3]; + /* 00D9 */ unsigned char padding_00D9[3]; /* 00DC */ unsigned int expireTime; }; @@ -148,7 +148,7 @@ public: /* 00CC */ std::vector emitters; /* 00D8 */ std::vector secondStrikeEmitters; /* 00E4 */ unsigned char secondStrike; - /* 00E5 */ unsigned char unknown_00E5[3]; + /* 00E5 */ unsigned char padding_00E5[3]; }; class CEternalSlashAttackEffect : public CEffect { @@ -218,13 +218,13 @@ public: /* 00CC */ std::list emitters; /* 00D4 */ std::string leftTexture; /* 00EC */ std::string rightTexture; - /* 0104 */ int unknown_0104; + /* 0104 */ int padding_0104; /* 0108 */ double stepDistance; /* 0110 */ unsigned char leftFoot; - /* 0111 */ unsigned char unknown_0111[3]; + /* 0111 */ unsigned char padding_0111[3]; /* 0114 */ vector3d lastPosition; /* 0120 */ float lastGroundHeight; - /* 0124 */ int unknown_0124; + /* 0124 */ int padding_0124; }; class CFootprintStrEffect : public CEffect { @@ -278,7 +278,7 @@ public: void Close() override; bool IsAlive() override; - /* 00CC */ unsigned char unknown_00CC[4]; + /* 00CC */ unsigned char padding_00CC[4]; /* 00D0 */ long long maxLevel; /* 00D8 */ long long level; /* 00E0 */ std::map waves; @@ -297,7 +297,7 @@ public: /* 00CC */ std::vector particles; /* 00D8 */ unsigned char loaded; - /* 00D9 */ unsigned char unknown_00D9[3]; + /* 00D9 */ unsigned char padding_00D9[3]; }; class CPetitioEffect : public CEffect { @@ -337,7 +337,7 @@ public: } /* 00CC */ bool active; - /* 00CD */ unsigned char unknown_00CD[3]; + /* 00CD */ unsigned char padding_00CD[3]; /* 00D0 */ EZ2STREmitter* emitter; }; @@ -513,7 +513,7 @@ public: void InitEvents() override; void OpenEmitters(); - /* 00CC */ int unknown_00CC; + /* 00CC */ int padding_00CC; /* 00D0 */ int emitterCount; /* 00D4 */ std::vector emitters; /* 00E0 */ std::string soundPath; @@ -534,7 +534,7 @@ public: /* 00CC */ std::list emitters; /* 00D4 */ std::list finishedEmitters; - /* 00DC */ int unknown_00DC; + /* 00DC */ int padding_00DC; union { struct { /* 00E0 */ int countLow; @@ -550,7 +550,7 @@ public: /* 0100 */ vector3d targetPosition; /* 010C */ vector3d originPosition; /* 0118 */ vector3d orbitCenter; - /* 0124 */ int unknown_0124; + /* 0124 */ int padding_0124; /* 0128 */ double orbitRadius; /* 0130 */ double startAngle; }; diff --git a/Source/Contents/Effects/MsgEffect.h b/Source/Contents/Effects/MsgEffect.h index a44ca944c..8e83bb74c 100644 --- a/Source/Contents/Effects/MsgEffect.h +++ b/Source/Contents/Effects/MsgEffect.h @@ -20,7 +20,7 @@ public: void FollowOwner(); /* 0158 */ bool m_visible; - /* 0159 */ unsigned char unknown_0159[0x03]; + /* 0159 */ unsigned char padding_0159[0x03]; /* 015C */ CGameObject* m_owner; /* 0160 */ vector3d m_drift; /* 016C */ vector3d origin; diff --git a/Source/Contents/Effects/Particle.h b/Source/Contents/Effects/Particle.h index 7d86e4c6e..1a7dd00a5 100644 --- a/Source/Contents/Effects/Particle.h +++ b/Source/Contents/Effects/Particle.h @@ -37,7 +37,7 @@ struct EZeffectData { /* 0000 */ int maximumFrame; /* 0004 */ int fps; /* 0008 */ int clipCount; - /* 000C */ int unknown_000C; + /* 000C */ int padding_000C; /* 0010 */ EZeffectClip clips[60]; }; @@ -71,7 +71,7 @@ public: /* 003C */ short red; /* 003E */ short green; /* 0040 */ short blue; - /* 0042 */ unsigned char unknown_0042[2]; + /* 0042 */ unsigned char padding_0042[2]; /* 0044 */ int alpha; /* 0048 */ unsigned char effectParameters[4]; /* 004C */ int phaseParameter; @@ -160,10 +160,10 @@ public: /* 3FE0 */ long long m_lift; /* 3FE8 */ bool m_flipX; /* 3FE9 */ bool m_flipY; - /* 3FEA */ short unknown_3FEA = 0; + /* 3FEA */ short padding_3FEA = 0; /* 3FEC */ float m_screenShiftX = 0; /* 3FF0 */ float m_screenShiftY = 0; - /* 3FF4 */ int unknown_3FF4; + /* 3FF4 */ int padding_3FF4; }; void InitParticleQuad(RenderVertex* vertices); diff --git a/Source/Contents/Effects/PartyMemberEffects.cpp b/Source/Contents/Effects/PartyMemberEffects.cpp index 7ec745e5a..c791d151a 100644 --- a/Source/Contents/Effects/PartyMemberEffects.cpp +++ b/Source/Contents/Effects/PartyMemberEffects.cpp @@ -32,7 +32,7 @@ namespace { } /* 11CA8 */ int duration; - /* 11CAC */ int unknown_11CAC; + /* 11CAC */ int padding_11CAC; /* 11CB0 */ int first; /* 11CB4 */ int second; }; diff --git a/Source/Contents/Effects/RagEffect.cpp b/Source/Contents/Effects/RagEffect.cpp index 7c4105483..b423214dd 100644 --- a/Source/Contents/Effects/RagEffect.cpp +++ b/Source/Contents/Effects/RagEffect.cpp @@ -6464,7 +6464,7 @@ void CRagEffect::DigitalSpace(int effectId) { } if (this->state.parent && this->state.currentPrimitive) { - this->state.lastPrim->state.alpha = static_cast(this->state.parent->render.unknown_0130[0] ? 70 : 255); + this->state.lastPrim->state.alpha = static_cast(this->state.parent->render.translucentOther[0] ? 70 : 255); } if (this->state.stateCnt == this->state.duration - 1) { @@ -17226,7 +17226,7 @@ void CPlayer::UpdateFootprints(int kind) { if (kind == 1) { mode->LaunchDummyEffect(&this->footprintPosition, (this->footprintCounter != interval) + 326, 333, angle); - } else if (kind == 2 && this->render.unknown_00F7 > static_cast(interval)) { + } else if (kind == 2 && this->render.runStartTick > static_cast(interval)) { if (this->footprintCounter == interval) { mode->LaunchDummyEffect(&this->footprintPosition, 447, 333, angle); } else { @@ -22862,7 +22862,7 @@ bool CRagEffect::OnProcess3() { case EF_POK_105: this->TexturedClassChange(105); break; - case EF_UNKNOWN_RING_YELLOW: + case EF_BEGINSPELL_RING_YELLOW: this->render.position = this->state.parent->render.position; if (this->state.stateCnt == 0) { PlayEffectWave(*this, "effect\\EF_BeginSpell.wav"); @@ -22870,10 +22870,10 @@ bool CRagEffect::OnProcess3() { this->TexturedQuadRingSized(25, "effect\\ring_yellow.tga", 0); } break; - case EF_UNKNOWN_SPELL: + case EF_BEGINSPELL_SWIRL: this->BeginSpellSwirl(45, "", 11); break; - case EF_UNKNOWN_RING_WHITE: + case EF_BEGINSPELL_RING_WHITE: if (this->state.stateCnt == 0) { g_soundMgr->PlayWave("effect\\EF_BeginSpell.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); } @@ -22936,7 +22936,7 @@ bool CRagEffect::OnProcess3() { } this->HealRingSparkle("effect\\ring_blue.tga", 2); break; - case EF_UNK_2439: + case EF_CRUEL_BITE_LINE: { const char* line = g_serviceOptions.Get(229) ? "effect\\DRUID\\DR_CRUEL_BITE\\min_cruel_bite_line\\line_red.tga" : "effect\\DRUID\\DR_CRUEL_BITE\\cruel_bite_line\\line_red.tga"; const char* black = g_serviceOptions.Get(229) ? "effect\\DRUID\\DR_CRUEL_BITE\\min_cruel_bite_line\\line_black.tga" : "effect\\DRUID\\DR_CRUEL_BITE\\cruel_bite_line\\line_black.tga"; @@ -22948,7 +22948,7 @@ bool CRagEffect::OnProcess3() { } } break; - case EF_UNK_2442: + case EF_QUILL_SPEAR_LINE: { const char* line = g_serviceOptions.Get(229) ? "effect\\DRUID\\AT_QUILL_SPEAR\\min_quill_spear_line\\line_color.tga" : "effect\\DRUID\\AT_QUILL_SPEAR\\quill_spear_line\\line_color.tga"; const char* black = g_serviceOptions.Get(229) ? "effect\\DRUID\\AT_QUILL_SPEAR\\min_quill_spear_line\\line_black.tga" : "effect\\DRUID\\AT_QUILL_SPEAR\\quill_spear_line\\line_black.tga"; @@ -25191,7 +25191,7 @@ bool CRagEffect::OnProcess() { case EF_RUN: if ((this->state.parent->render.flags & 0x8000) == 0) { this->state.parent->render.flags += 0x8000; - this->state.parent->render.unknown_00F7 = static_cast(this->state.stateCnt); + this->state.parent->render.runStartTick = static_cast(this->state.stateCnt); } break; case EF_STOPEFFECT: diff --git a/Source/Contents/Effects/RagEffectState.h b/Source/Contents/Effects/RagEffectState.h index 85201e6f4..68372351d 100644 --- a/Source/Contents/Effects/RagEffectState.h +++ b/Source/Contents/Effects/RagEffectState.h @@ -51,10 +51,10 @@ struct RagEffectState { }; /* 11B50 */ std::int32_t colorChannels[4]; /* 11B60 */ unsigned char forceRender; - /* 11B61 */ unsigned char unknown_11C99[3]; + /* 11B61 */ unsigned char padding_11B61[3]; /* 11B64 */ std::uint32_t tag; /* 11B68 */ unsigned char visibilityFlags; - /* 11B69 */ unsigned char unknown_11CA1[7]; + /* 11B69 */ unsigned char padding_11B69[7]; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/Effects/RichManKim.h b/Source/Contents/Effects/RichManKim.h index baeb8f49b..a2097a8af 100644 --- a/Source/Contents/Effects/RichManKim.h +++ b/Source/Contents/Effects/RichManKim.h @@ -16,7 +16,7 @@ public: void Close() override; bool IsAlive() override; - /* 00CC */ unsigned char unknown_00CC[0x38]; + /* 00CC */ unsigned char padding_00CC[0x38]; /* 0104 */ int angleIndex; /* 0108 */ std::vector particles; }; diff --git a/Source/Contents/Effects/SpriteEffect.cpp b/Source/Contents/Effects/SpriteEffect.cpp index 882027a68..9b102d356 100644 --- a/Source/Contents/Effects/SpriteEffect.cpp +++ b/Source/Contents/Effects/SpriteEffect.cpp @@ -104,7 +104,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->frameDelay = 4.0f; particle->scale = 1.5f; break; - case EF_UNK_1130: + case EF_BAKURETSU_HADOU: particle->SetSprite("이팩트\\bakuretsu_hadou\\bakuretsu_hadou.spr"); particle->SetAction("이팩트\\bakuretsu_hadou\\bakuretsu_hadou.act"); particle->renderOptions |= 0x200; @@ -113,91 +113,91 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 0; particle->frameDelay = 8.0f; break; - case EF_UNK_1147: + case EF_POPCORN: particle->SetSprite("이팩트\\EF_POPCORN\\EF_POPCORN.spr"); particle->SetAction("이팩트\\EF_POPCORN\\EF_POPCORN.act"); particle->loopMode = 1; particle->depthOffset = 0.0003f; particle->frameDelay = 8.0f; break; - case EF_UNK_1151: + case EF_IMMUNE_PROPERTY_NOTHING: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_NOTHING.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_NOTHING.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1152: + case EF_IMMUNE_PROPERTY_WATER: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_WATER.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_WATER.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1153: + case EF_IMMUNE_PROPERTY_GROUND: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_GROUND.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_GROUND.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1154: + case EF_IMMUNE_PROPERTY_FIRE: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_FIRE.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_FIRE.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1155: + case EF_IMMUNE_PROPERTY_WIND: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_WIND.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_WIND.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1156: + case EF_IMMUNE_PROPERTY_POISON: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_POISON.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_POISON.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1157: + case EF_IMMUNE_PROPERTY_SAINT: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_SAINT.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_SAINT.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1158: + case EF_IMMUNE_PROPERTY_DARKNESS: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_DARKNESS.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_DARKNESS.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1159: + case EF_IMMUNE_PROPERTY_TELEKINESIS: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_TELEKINESIS.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_TELEKINESIS.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1160: + case EF_IMMUNE_PROPERTY_UNDEAD: particle->SetSprite("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_UNDEAD.spr"); particle->SetAction("이팩트\\EF_IMMUNE_PROPERTY\\EF_IMMUNE_PROPERTY_UNDEAD.act"); particle->loopMode = 0; particle->depthOffset = 0.0003f; break; - case EF_UNK_1192: + case EF_RANDOM_OPT_YELLOW: particle->SetSprite("이팩트\\random_opt_spr\\yellow.spr"); particle->SetAction("이팩트\\random_opt_spr\\yellow.act"); particle->loopMode = 0; particle->frameDelay = 4.0f; break; case EF_UNK_1211: - case EF_UNK_1212: - case EF_UNK_1213: + case EF_SUBJECT_AURA_1212: + case EF_SUBJECT_AURA_1213: particle->SetSprite("이팩트\\subject_aura\\subject_aura.spr"); particle->SetAction("이팩트\\subject_aura\\subject_aura.act"); particle->frameDelay = 8.0f; particle->loopMode = 0; particle->depthOffset = 0.0003f; particle->flags = 0x101; - if (this->id == EF_UNK_1212) { + if (this->id == EF_SUBJECT_AURA_1212) { particle->animation = 0; - } else if (this->id == EF_UNK_1213) { + } else if (this->id == EF_SUBJECT_AURA_1213) { particle->animation = 1; } else if (this->id == EF_UNK_1211) { particle->animation = 2; @@ -210,7 +210,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 1; particle->flags = 0x101; break; - case EF_UNK_1232: + case EF_BOOK_OF_CREATINGSTAR: particle->SetSprite("이팩트\\book_of_creatingstar\\book_of_creatingstar.spr"); particle->SetAction("이팩트\\book_of_creatingstar\\book_of_creatingstar.act"); particle->frameDelay = 4.0f; @@ -231,7 +231,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 1; particle->flags = 0x101; break; - case EF_UNK_1235: + case EF_SOUL_SHADOW: particle->SetSprite("이팩트\\soul_shadow\\soul_shadow.spr"); particle->SetAction("이팩트\\soul_shadow\\soul_shadow.act"); particle->depthOffset = 0.0003f; @@ -239,7 +239,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 1; particle->flags = 0x101; break; - case EF_UNK_1236: + case EF_SOUL_FAIRY: particle->SetSprite("이팩트\\soul_fairy\\soul_fairy.spr"); particle->SetAction("이팩트\\soul_fairy\\soul_fairy.act"); particle->depthOffset = 0.0003f; @@ -247,7 +247,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 1; particle->flags = 0x101; break; - case EF_UNK_1237: + case EF_SOUL_FALCON: particle->SetSprite("이팩트\\soul_falcon\\soul_falcon.spr"); particle->SetAction("이팩트\\soul_falcon\\soul_falcon.act"); particle->depthOffset = 0.0003f; @@ -263,7 +263,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 1; particle->flags = 0x101; break; - case EF_UNK_1377: + case EF_VALKYRIE_WING: particle->SetSprite("이팩트\\valkyrie_wing\\valkyrie_wing.spr"); particle->SetAction("이팩트\\valkyrie_wing\\valkyrie_wing.act"); particle->loopMode = 0; @@ -271,7 +271,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->frameDelay = 6.0f; particle->flags = 0x101; break; - case EF_UNK_1419: + case EF_C_AMDARAIS_EFFECT: particle->SetSprite("이팩트\\c_amdarais_effect.spr"); particle->SetAction("이팩트\\c_amdarais_effect.act"); particle->depthOffset = 0.0001f; @@ -279,7 +279,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 0; particle->flags = 1; break; - case EF_UNK_1617: + case EF_BLACKBUBBLE_SMALL: particle->SetSprite("이팩트\\black_bubble\\small\\blackbubble_small.spr"); particle->SetAction("이팩트\\black_bubble\\small\\blackbubble_small.act"); particle->depthOffset = 0.0001f; @@ -287,7 +287,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 0; particle->flags = 1; break; - case EF_UNK_1618: + case EF_BLACKBUBBLE_MIDIUM: particle->SetSprite("이팩트\\black_bubble\\midium\\blackbubble_midium.spr"); particle->SetAction("이팩트\\black_bubble\\midium\\blackbubble_midium.act"); particle->depthOffset = 0.0001f; @@ -295,7 +295,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 0; particle->flags = 1; break; - case EF_UNK_1619: + case EF_BLACKBUBBLE_LARGE: particle->SetSprite("이팩트\\black_bubble\\large\\blackbubble_large.spr"); particle->SetAction("이팩트\\black_bubble\\large\\blackbubble_large.act"); particle->depthOffset = 0.0001f; @@ -303,7 +303,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 0; particle->flags = 1; break; - case EF_UNK_2394: + case EF_SERPENT_SHADOW: particle->SetSprite("이팩트\\Serpent_Shadow\\Serpent_Shadow.spr"); particle->SetAction("이팩트\\Serpent_Shadow\\Serpent_Shadow.act"); particle->loopMode = 0; @@ -311,35 +311,35 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->frameDelay = 4.0f; particle->flags = 0xD; break; - case EF_UNK_2420: + case EF_VIOLEN_HIT: particle->SetSprite("몬스터\\violen_hit.spr"); particle->SetAction("몬스터\\violen_hit.act"); particle->loopMode = 1; particle->depthOffset = 0.001f; particle->frameDelay = 4.0f; break; - case EF_UNK_2424: + case EF_C_AURA_OF_GHOST_S: particle->SetSprite("이팩트\\C_Aura_Of_Ghost_S\\C_Aura_Of_Ghost_S.spr"); particle->SetAction("이팩트\\C_Aura_Of_Ghost_S\\C_Aura_Of_Ghost_S.act"); particle->loopMode = 0; particle->depthOffset = 0.001f; particle->frameDelay = 4.0f; break; - case EF_UNK_2430: + case EF_C_GUIDE_OF_DEAD_TEXT: particle->SetSprite("이팩트\\C_Guide_Of_Dead_Text\\C_Guide_Of_Dead_Text.spr"); particle->SetAction("이팩트\\C_Guide_Of_Dead_Text\\C_Guide_Of_Dead_Text.act"); particle->loopMode = 0; particle->depthOffset = 0.001f; particle->frameDelay = 12.0f; break; - case EF_UNK_2431: + case EF_C_MEDJED_TEXT: particle->SetSprite("이팩트\\C_Medjed_Text\\C_Medjed_Text.spr"); particle->SetAction("이팩트\\C_Medjed_Text\\C_Medjed_Text.act"); particle->loopMode = 0; particle->depthOffset = 0.001f; particle->frameDelay = 12.0f; break; - case EF_UNK_2428: + case EF_ATQUE_POENITENTIA: particle->SetSprite("이팩트\\Atque_Poenitentia\\Atque_Poenitentia.spr"); particle->SetAction("이팩트\\Atque_Poenitentia\\Atque_Poenitentia.act"); particle->loopMode = 0; @@ -347,7 +347,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->frameDelay = 4.0f; particle->flags = 0xD; break; - case EF_UNK_2429: + case EF_PERM_FROST_OBLIVION: particle->SetSprite("이팩트\\Perm_Frost_Oblivion\\Perm_Frost_Oblivion.spr"); particle->SetAction("이팩트\\Perm_Frost_Oblivion\\Perm_Frost_Oblivion.act"); particle->depthOffset = 0.001f; @@ -355,7 +355,7 @@ void CSpriteEffect::SetupParticle(CSpriteParticle* particle) { particle->loopMode = 0; particle->flags = 1; break; - case EF_UNK_2458: + case EF_S_BEELZEBUB_WING: particle->SetSprite("이팩트\\S_Beelzebub_Wing\\S_Beelzebub_Wing.spr"); particle->SetAction("이팩트\\S_Beelzebub_Wing\\S_Beelzebub_Wing.act"); particle->flags = 1; @@ -405,7 +405,7 @@ bool CSpriteEffect::IsAlive() { switch (this->id) { case EF_GROUND_EXPLOSION: return !this->IsFinished(); - case EF_UNK_1192: { + case EF_RANDOM_OPT_YELLOW: { if (this->actor == 0) { return false; } @@ -425,33 +425,33 @@ bool CSpriteEffect::IsAlive() { return true; } - case EF_UNK_1130: - case EF_UNK_1151: - case EF_UNK_1152: - case EF_UNK_1153: - case EF_UNK_1154: - case EF_UNK_1155: - case EF_UNK_1156: - case EF_UNK_1157: - case EF_UNK_1158: - case EF_UNK_1159: - case EF_UNK_1160: + case EF_BAKURETSU_HADOU: + case EF_IMMUNE_PROPERTY_NOTHING: + case EF_IMMUNE_PROPERTY_WATER: + case EF_IMMUNE_PROPERTY_GROUND: + case EF_IMMUNE_PROPERTY_FIRE: + case EF_IMMUNE_PROPERTY_WIND: + case EF_IMMUNE_PROPERTY_POISON: + case EF_IMMUNE_PROPERTY_SAINT: + case EF_IMMUNE_PROPERTY_DARKNESS: + case EF_IMMUNE_PROPERTY_TELEKINESIS: + case EF_IMMUNE_PROPERTY_UNDEAD: case EF_UNK_1211: - case EF_UNK_1212: - case EF_UNK_1213: - case EF_UNK_1377: - case EF_UNK_1419: - case EF_UNK_1617: - case EF_UNK_1618: - case EF_UNK_1619: - case EF_UNK_2394: - case EF_UNK_2424: - case EF_UNK_2428: - case EF_UNK_2429: - case EF_UNK_2430: - case EF_UNK_2431: + case EF_SUBJECT_AURA_1212: + case EF_SUBJECT_AURA_1213: + case EF_VALKYRIE_WING: + case EF_C_AMDARAIS_EFFECT: + case EF_BLACKBUBBLE_SMALL: + case EF_BLACKBUBBLE_MIDIUM: + case EF_BLACKBUBBLE_LARGE: + case EF_SERPENT_SHADOW: + case EF_C_AURA_OF_GHOST_S: + case EF_ATQUE_POENITENTIA: + case EF_PERM_FROST_OBLIVION: + case EF_C_GUIDE_OF_DEAD_TEXT: + case EF_C_MEDJED_TEXT: case EF_UNK_2443: - case EF_UNK_2458: + case EF_S_BEELZEBUB_WING: return this->ActorExists(); } @@ -482,7 +482,7 @@ void CSpriteEffect::OnProcess() { ++particle->elapsedFrames; switch (this->id) { - case EF_UNK_1130: { + case EF_BAKURETSU_HADOU: { int height = 8; if (CGameActor* actor = static_cast(FindRenderObject(this->actor))) { height = static_cast(actor->GetNameOffset() + 8.0f); @@ -492,22 +492,22 @@ void CSpriteEffect::OnProcess() { SetOffsetPosition(particle->position, this->position, offset); break; } - case EF_UNK_1147: - case EF_UNK_1192: { + case EF_POPCORN: + case EF_RANDOM_OPT_YELLOW: { const vector3d offset = {0.0f, -10.0f, 0.0f}; SetOffsetPosition(particle->position, this->position, offset); break; } - case EF_UNK_1151: - case EF_UNK_1152: - case EF_UNK_1153: - case EF_UNK_1154: - case EF_UNK_1155: - case EF_UNK_1156: - case EF_UNK_1157: - case EF_UNK_1158: - case EF_UNK_1159: - case EF_UNK_1160: { + case EF_IMMUNE_PROPERTY_NOTHING: + case EF_IMMUNE_PROPERTY_WATER: + case EF_IMMUNE_PROPERTY_GROUND: + case EF_IMMUNE_PROPERTY_FIRE: + case EF_IMMUNE_PROPERTY_WIND: + case EF_IMMUNE_PROPERTY_POISON: + case EF_IMMUNE_PROPERTY_SAINT: + case EF_IMMUNE_PROPERTY_DARKNESS: + case EF_IMMUNE_PROPERTY_TELEKINESIS: + case EF_IMMUNE_PROPERTY_UNDEAD: { int height = 25; if (CGameActor* actor = static_cast(FindRenderObject(this->actor))) { height = static_cast(actor->GetNameOffset() + 25.0f); @@ -518,8 +518,8 @@ void CSpriteEffect::OnProcess() { break; } case EF_UNK_1211: - case EF_UNK_1212: - case EF_UNK_1213: { + case EF_SUBJECT_AURA_1212: + case EF_SUBJECT_AURA_1213: { CGameActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor) { break; @@ -530,7 +530,7 @@ void CSpriteEffect::OnProcess() { SetOffsetPosition(particle->position, this->position, offset); break; } - case EF_UNK_1377: { + case EF_VALKYRIE_WING: { CGameActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor) { break; @@ -541,8 +541,8 @@ void CSpriteEffect::OnProcess() { SetOffsetPosition(particle->position, this->position, offset); break; } - case EF_UNK_2394: - case EF_UNK_2424: { + case EF_SERPENT_SHADOW: + case EF_C_AURA_OF_GHOST_S: { CGameActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor) { break; @@ -553,7 +553,7 @@ void CSpriteEffect::OnProcess() { SetOffsetPosition(particle->position, this->position, offset); break; } - case EF_UNK_2428: { + case EF_ATQUE_POENITENTIA: { CGameActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor) { break; @@ -565,7 +565,7 @@ void CSpriteEffect::OnProcess() { SetOffsetPosition(particle->position, this->position, offset); break; } - case EF_UNK_2429: { + case EF_PERM_FROST_OBLIVION: { CGameActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor) { break; @@ -576,8 +576,8 @@ void CSpriteEffect::OnProcess() { SetOffsetPosition(particle->position, this->position, offset); break; } - case EF_UNK_2430: - case EF_UNK_2431: { + case EF_C_GUIDE_OF_DEAD_TEXT: + case EF_C_MEDJED_TEXT: { CGameActor* actor = static_cast(FindRenderObject(this->actor)); if (!actor) { break; @@ -596,7 +596,7 @@ void CSpriteEffect::OnProcess() { particle->position.y = this->position[1]; particle->position.z = this->position[2]; break; - case EF_UNK_2458: + case EF_S_BEELZEBUB_WING: particle->applyActorExtent = 1; particle->applyActorLift = 1; particle->screenOffsetY = -105.0f; diff --git a/Source/Contents/Effects/SpriteParticle.h b/Source/Contents/Effects/SpriteParticle.h index a564635e4..adb509d43 100644 --- a/Source/Contents/Effects/SpriteParticle.h +++ b/Source/Contents/Effects/SpriteParticle.h @@ -19,7 +19,7 @@ public: /* 02BC */ unsigned char applyActorExtent; /* 02BD */ unsigned char applyActorLift; - /* 02BE */ unsigned char unknown_02BE[2]; + /* 02BE */ unsigned char padding_02BE[2]; /* 02C0 */ float screenOffsetX; /* 02C4 */ float screenOffsetY; /* 02C8 */ vector3d velocity; diff --git a/Source/Contents/Effects/StarEffect.h b/Source/Contents/Effects/StarEffect.h index 2934ffa67..73b8fde05 100644 --- a/Source/Contents/Effects/StarEffect.h +++ b/Source/Contents/Effects/StarEffect.h @@ -18,7 +18,7 @@ public: void SetupParticle(CParticle* particle); void UpdateParticle(CParticle* particle); - /* 00CC */ unsigned char unknown_00CC[0x34]; + /* 00CC */ unsigned char padding_00CC[0x34]; /* 0100 */ std::vector particles; }; diff --git a/Source/Contents/Effects/ViolentQuakeEffect.cpp b/Source/Contents/Effects/ViolentQuakeEffect.cpp index d75866755..05f666bb9 100644 --- a/Source/Contents/Effects/ViolentQuakeEffect.cpp +++ b/Source/Contents/Effects/ViolentQuakeEffect.cpp @@ -69,7 +69,7 @@ void CViolentQuakeEffect::Close() { // FUNCTION: fn_07533 void CViolentQuakeEffect::Open() { switch (this->id) { - case EF_UNK_1760: { + case EF_VIOLENTQUAKE: { CEZ2STRParticle* emitter = static_cast(CreateEZ2STRParticle(reinterpret_cast(this->position), 5)); emitter->Load(FormatOwnedString("violentquake\\violentquake\\violentquake_%02d.str", std::max(0, rand() % 3) + 1)); emitter->offsetX = 0.0f; diff --git a/Source/Contents/Effects/WhirlwindEffect.h b/Source/Contents/Effects/WhirlwindEffect.h index a494d3115..a3aaa0980 100644 --- a/Source/Contents/Effects/WhirlwindEffect.h +++ b/Source/Contents/Effects/WhirlwindEffect.h @@ -11,7 +11,7 @@ struct CWhirlwindEffect : CRagEffect { } /* 11CA8 */ int duration; - /* 11CAC */ int unknown_11CAC; + /* 11CAC */ int padding_11CAC; /* 11CB0 */ std::chrono::steady_clock::time_point endTime; bool OnProcess() override; diff --git a/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp b/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp index 8814ffe34..acfa91c2c 100644 --- a/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp +++ b/Source/Contents/Emblems/EmblemDataUploadAsyncWork.cpp @@ -81,8 +81,8 @@ void CEmblemDataUploadAsyncWork::Bind(std::string url, std::uint32_t accountId, this->m_accountName = accountName; this->m_guildId = guildId; this->m_path = path; - const std::uint8_t unknown[] = {0x62, 0x97, 0x24, 0xD7, 0x8C, 0xDA, 0x41, 0xC5}; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0xC52FB5FBB94FF917ULL>(unknown)), sourceFile, 54); + const std::uint8_t diagnosticSource[] = {0x62, 0x97, 0x24, 0xD7, 0x8C, 0xDA, 0x41, 0xC5}; + AsyncDiagnostic diagnostic(false, std::string(DecryptName<0xC52FB5FBB94FF917ULL>(diagnosticSource)), sourceFile, 54); this->m_diagnostic.MoveFrom(diagnostic); } diff --git a/Source/Contents/EnchantMgr.cpp b/Source/Contents/EnchantMgr.cpp index 9c58db103..37536cdb2 100644 --- a/Source/Contents/EnchantMgr.cpp +++ b/Source/Contents/EnchantMgr.cpp @@ -523,7 +523,7 @@ int L_SetSuccessRate(lua_State* L) { // OFFSET: 0x00689250 // FUNCTION: fn_05583 -void EnchantMgrUnknown689250() { +void EnchantMgrNullSub() { } // OFFSET: 0x006821B0 diff --git a/Source/Contents/EnchantMgr.h b/Source/Contents/EnchantMgr.h index 3780a8f39..b949aae04 100644 --- a/Source/Contents/EnchantMgr.h +++ b/Source/Contents/EnchantMgr.h @@ -40,7 +40,7 @@ struct EnchantInfo { /* 0010 */ uint32_t condition2; /* 0014 */ bool approveRandomOption; /* 0018 */ std::vector slots; - /* 0024 */ uint8_t unknown_0024[0x4]; + /* 0024 */ uint8_t padding_0024[0x4]; /* 0028 */ bool resetEnabled; /* 0030 */ uint64_t resetRate; /* 0038 */ uint64_t resetCost; diff --git a/Source/Contents/FlyingShipRouteInfo.cpp b/Source/Contents/FlyingShipRouteInfo.cpp index 123cb1e38..a06600c6e 100644 --- a/Source/Contents/FlyingShipRouteInfo.cpp +++ b/Source/Contents/FlyingShipRouteInfo.cpp @@ -12,7 +12,7 @@ // OFFSET: 0x009105F0 // FUNCTION: fn_12503 CFlyingShipRouteInfo::CFlyingShipRouteInfo() - : unknown_0010(0), unknown_0014(0), segmentIndex(0), segmentProgress(0), segmentLength(0), travelledDistance(0), routeReset(1), routeType(0), lineColor(0), + : padding_0010(0), padding_0014(0), segmentIndex(0), segmentProgress(0), segmentLength(0), travelledDistance(0), routeReset(1), routeType(0), lineColor(0), routeState(0) { } diff --git a/Source/Contents/FlyingShipRouteInfo.h b/Source/Contents/FlyingShipRouteInfo.h index c040c47e6..cb391e88d 100644 --- a/Source/Contents/FlyingShipRouteInfo.h +++ b/Source/Contents/FlyingShipRouteInfo.h @@ -35,8 +35,8 @@ public: void Update(UIRoMapWnd* wnd, float elapsed); /* 0004 */ std::vector entries; - /* 0010 */ int unknown_0010; - /* 0014 */ int unknown_0014; + /* 0010 */ int padding_0010; + /* 0014 */ int padding_0014; /* 0018 */ int segmentIndex; /* 001C */ float segmentProgress; /* 0020 */ float segmentLength; diff --git a/Source/Contents/Ground/GroundSpatial.h b/Source/Contents/Ground/GroundSpatial.h index 6494ba9b3..7d61672a4 100644 --- a/Source/Contents/Ground/GroundSpatial.h +++ b/Source/Contents/Ground/GroundSpatial.h @@ -31,7 +31,7 @@ struct GroundCell { /* 0048 */ GroundQuad* side2; /* 004C */ std::uint32_t frame; /* 0050 */ unsigned char color[3]; - /* 0053 */ unsigned char unknown_0053; + /* 0053 */ unsigned char padding_0053; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/GuildInfo.cpp b/Source/Contents/GuildInfo.cpp index 7d2fe0ad2..fb970c71d 100644 --- a/Source/Contents/GuildInfo.cpp +++ b/Source/Contents/GuildInfo.cpp @@ -61,9 +61,9 @@ void GuildInfo::RemoveAgitId(int value) { // OFFSET: 0x00AE42C0 // FUNCTION: fn_18034 -void GuildInfo::RemoveRelatedGuild(int unknown_0000, int unknown_0004) { +void GuildInfo::RemoveRelatedGuild(int guildId, int relation) { for (auto it = this->relatedGuilds.begin(); it != this->relatedGuilds.end(); ++it) { - if (it->guildId == unknown_0000 && it->relation == unknown_0004) { + if (it->guildId == guildId && it->relation == relation) { this->relatedGuilds.erase(it); g_windowMgr.RefreshGuildWindows(); return; @@ -90,10 +90,10 @@ int GuildInfo::GetAgitId(int index) { // OFFSET: 0x00AE4690 // FUNCTION: fn_18037 -int GuildInfo::CountRelatedGuilds(int unknown_0004) { +int GuildInfo::CountRelatedGuilds(int relation) { int count = 0; for (auto it = this->relatedGuilds.begin(); it != this->relatedGuilds.end(); ++it) { - if (it->relation == unknown_0004) { + if (it->relation == relation) { ++count; } } @@ -155,9 +155,9 @@ void GuildInfo::Init() { // OFFSET: 0x00AE49F0 // FUNCTION: fn_18040 -bool GuildInfo::HasRelatedGuild(int unknown_0000) { +bool GuildInfo::HasRelatedGuild(int guildId) { for (auto it = this->relatedGuilds.begin(); it != this->relatedGuilds.end(); ++it) { - if (it->guildId == unknown_0000 && it->relation == 0) { + if (it->guildId == guildId && it->relation == 0) { return true; } } @@ -221,10 +221,10 @@ void GuildInfo::UpdateCharacterName(int characterId, const char* name) { this->masterName = name; } - std::string unknownName = LookupMessage(MSI_NAMELESS_USER); + std::string namelessUserName = LookupMessage(MSI_NAMELESS_USER); for (auto it = this->m_members.begin(); it != this->m_members.end(); ++it) { if (it->characterId == characterId) { - if (it->name.empty() || it->name == unknownName) { + if (it->name.empty() || it->name == namelessUserName) { it->name = name; } break; @@ -233,7 +233,7 @@ void GuildInfo::UpdateCharacterName(int characterId, const char* name) { for (auto it = this->bannedMembers.begin(); it != this->bannedMembers.end(); ++it) { if (it->characterId == characterId) { - if (it->name.empty() || it->name == unknownName) { + if (it->name.empty() || it->name == namelessUserName) { it->name = name; } break; @@ -247,12 +247,12 @@ void GuildInfo::UpdateCharacterName(int characterId, const char* name) { // OFFSET: 0x00AE4F50 // FUNCTION: fn_18045 -void GuildInfo::UpdateMemberStatus(int accountId, int online, int characterId, short unknown_002C, short unknown_0020, short unknown_0024) { +void GuildInfo::UpdateMemberStatus(int accountId, int online, int characterId, short sex, short head, short headPalette) { for (auto it = this->m_members.begin(); it != this->m_members.end(); ++it) { if (characterId == it->characterId) { - it->sex = unknown_002C; - it->head = unknown_0020; - it->headPalette = unknown_0024; + it->sex = sex; + it->head = head; + it->headPalette = headPalette; it->online = online; break; } diff --git a/Source/Contents/GuildInfo.h b/Source/Contents/GuildInfo.h index 9bbc765d4..168bb56e8 100644 --- a/Source/Contents/GuildInfo.h +++ b/Source/Contents/GuildInfo.h @@ -100,16 +100,16 @@ public: void ClearAgitIds(); void ClearMembers(); void RemoveAgitId(int value); - void RemoveRelatedGuild(int unknown_0000, int unknown_0004); + void RemoveRelatedGuild(int padding_0000, int padding_0004); int GetMemberAccountId(const char* name); int GetAgitId(int index); - int CountRelatedGuilds(int unknown_0004); + int CountRelatedGuilds(int padding_0004); int GetAgitCount(); void Init(); - bool HasRelatedGuild(int unknown_0000); + bool HasRelatedGuild(int padding_0000); void UpdateMemberExpRatios(); int DeleteMember(const char* name); - void UpdateMemberStatus(int accountId, int online, int characterId, short unknown_002C, short unknown_0020, short unknown_0024); + void UpdateMemberStatus(int accountId, int online, int characterId, short padding_002C, short padding_0020, short padding_0024); void SetMemberOnline(int accountId, int online); void SetMasterCharacterId(int characterId); void UpdatePosition(Unknown00D4Entry entry); diff --git a/Source/Contents/Hotkeys/InterfaceHotkey.h b/Source/Contents/Hotkeys/InterfaceHotkey.h index 560aaa47b..5e133d5ad 100644 --- a/Source/Contents/Hotkeys/InterfaceHotkey.h +++ b/Source/Contents/Hotkeys/InterfaceHotkey.h @@ -62,11 +62,11 @@ enum InterfaceHotkey : int { HK_COSEQUIPWND_ONOFF = 56, HK_PARTYBOARDWND_ONOFF = 57, HK_HUNTINGQUEST_INFO_ONOFF = 58, - HK_UNKNOWN_62 = 62, - HK_UNKNOWN_64 = 64, - HK_UNKNOWN_65 = 65, - HK_UNKNOWN_66 = 66, - HK_UNKNOWN_67 = 67, + HK_HIDDEN_62 = 62, + HK_HIDDEN_64 = 64, + HK_HIDDEN_65 = 65, + HK_HIDDEN_66 = 66, + HK_HIDDEN_67 = 67, }; enum MacroHotkey : int { diff --git a/Source/Contents/Hotkeys/UserHotkeyMgr.cpp b/Source/Contents/Hotkeys/UserHotkeyMgr.cpp index a26f5ebc5..f46ca4f15 100644 --- a/Source/Contents/Hotkeys/UserHotkeyMgr.cpp +++ b/Source/Contents/Hotkeys/UserHotkeyMgr.cpp @@ -27,19 +27,19 @@ namespace { if (index == HK_HUNTINGQUEST_INFO_ONOFF) { return true; } - if (index == HK_UNKNOWN_62) { + if (index == HK_HIDDEN_62) { return true; } - if (index == HK_UNKNOWN_64) { + if (index == HK_HIDDEN_64) { return true; } - if (index == HK_UNKNOWN_66) { + if (index == HK_HIDDEN_66) { return true; } - if (index == HK_UNKNOWN_65) { + if (index == HK_HIDDEN_65) { return true; } - if (index == HK_UNKNOWN_67) { + if (index == HK_HIDDEN_67) { return true; } if (index == HK_BUTTONS_RELOCATE) { diff --git a/Source/Contents/Items/ItemInfo.h b/Source/Contents/Items/ItemInfo.h index 20c49899f..e4f9bf0a1 100644 --- a/Source/Contents/Items/ItemInfo.h +++ b/Source/Contents/Items/ItemInfo.h @@ -17,19 +17,19 @@ struct RawItemData { /* 0018 */ std::uint32_t type; /* 001C */ std::uint32_t refiningLevel; /* 0020 */ unsigned char identified; - /* 0021 */ unsigned char unknown_0021[27]; + /* 0021 */ unsigned char padding_0021[27]; /* 003C */ std::string itemId; /* 0054 */ unsigned char skillNameAndLevel[28]; /* 0070 */ std::uint32_t cards[4]; - /* 0080 */ unsigned char unknown_0080[8]; + /* 0080 */ unsigned char padding_0080[8]; /* 0088 */ std::int32_t optionCount; /* 008C */ unsigned char options[25]; - /* 00A5 */ unsigned char unknown_00A5[7]; + /* 00A5 */ unsigned char padding_00A5[7]; /* 00AC */ std::int16_t grade; /* 00AE */ unsigned char hasIndex; - /* 00AF */ unsigned char unknown_00AF; + /* 00AF */ unsigned char padding_00AF; /* 00B0 */ std::uint32_t location; - /* 00B4 */ std::uint32_t unknown_00B4; + /* 00B4 */ std::uint32_t padding_00B4; /* 00B8 */ std::uint32_t sprite; }; diff --git a/Source/Contents/Items/ItemNaming.cpp b/Source/Contents/Items/ItemNaming.cpp index 156bb10e9..a933dd8d1 100644 --- a/Source/Contents/Items/ItemNaming.cpp +++ b/Source/Contents/Items/ItemNaming.cpp @@ -780,14 +780,14 @@ __declspec(noinline) void LoadItemNameTables() { } } - ITEM_DESC& unknown = FindItemDescription(0, g_itemDescriptions); - unknown.identifiedName = "Unknown Item"; - unknown.identifiedResource = "\xbb\xe7\xb0\xfa"; - unknown.identifiedDescription.push_back("Unknown Item"); - unknown.unidentifiedName = "Unknown Item"; - unknown.unidentifiedResource = "\xbb\xe7\xb0\xfa"; - unknown.unidentifiedDescription.push_back("Unknown Item"); - FindItemDescription(-1, g_itemDescriptions) = unknown; + ITEM_DESC& unknownItemDesc = FindItemDescription(0, g_itemDescriptions); + unknownItemDesc.identifiedName = "Unknown Item"; + unknownItemDesc.identifiedResource = "\xbb\xe7\xb0\xfa"; + unknownItemDesc.identifiedDescription.push_back("Unknown Item"); + unknownItemDesc.unidentifiedName = "Unknown Item"; + unknownItemDesc.unidentifiedResource = "\xbb\xe7\xb0\xfa"; + unknownItemDesc.unidentifiedDescription.push_back("Unknown Item"); + FindItemDescription(-1, g_itemDescriptions) = unknownItemDesc; ItemCardName& sorry = FindItemCardName(0, g_itemCardNames); sorry.name = "sorry"; diff --git a/Source/Contents/Items/RuneSystem.h b/Source/Contents/Items/RuneSystem.h index 659eab8f0..7da79021a 100644 --- a/Source/Contents/Items/RuneSystem.h +++ b/Source/Contents/Items/RuneSystem.h @@ -61,7 +61,7 @@ class RuneSetData : public RuneData { public: /* 0050 */ std::vector m_slots; /* 005C */ std::vector m_descriptions[6]; - /* 00A4 */ int unknown_00A4; + /* 00A4 */ int padding_00A4; /* 00A8 */ int m_gradeList[15]; /* 00E4 */ int m_grade; /* 00E8 */ int m_gradeLevel; diff --git a/Source/Contents/Jobs/JobInheritance.cpp b/Source/Contents/Jobs/JobInheritance.cpp index 44264c358..1559891a7 100644 --- a/Source/Contents/Jobs/JobInheritance.cpp +++ b/Source/Contents/Jobs/JobInheritance.cpp @@ -1805,9 +1805,9 @@ public: class CEquipmentPropertiesMgr { public: virtual ~CEquipmentPropertiesMgr(); - /* 0004 */ unsigned char unknown_0004[0x9]; + /* 0004 */ unsigned char padding_0004[0x9]; /* 000D */ bool m_dirty; - /* 000E */ unsigned char unknown_000E[0x12]; + /* 000E */ unsigned char padding_000E[0x12]; /* 0020 */ UIWindow* observerWindow; /* 0024 */ std::unordered_map properties1; diff --git a/Source/Contents/MapSkyMgr.cpp b/Source/Contents/MapSkyMgr.cpp index e5ac4d46d..d8954e85f 100644 --- a/Source/Contents/MapSkyMgr.cpp +++ b/Source/Contents/MapSkyMgr.cpp @@ -18,11 +18,11 @@ #include struct MapSkyCloud : CEffect { - /* 00CC */ unsigned char unknown_00CC[0x28]; + /* 00CC */ unsigned char padding_00CC[0x28]; /* 00F4 */ unsigned char colorR; /* 00F5 */ unsigned char colorG; /* 00F6 */ unsigned char colorB; - /* 00F7 */ unsigned char unknown_00F7; + /* 00F7 */ unsigned char padding_00F7; /* 00F8 */ float velocityX; /* 00FC */ float velocityY; /* 0100 */ float velocityZ; diff --git a/Source/Contents/MapSkyMgr.h b/Source/Contents/MapSkyMgr.h index 251368657..505e0bc83 100644 --- a/Source/Contents/MapSkyMgr.h +++ b/Source/Contents/MapSkyMgr.h @@ -39,7 +39,7 @@ public: /* 002C */ float fog[3]; /* 0038 */ float lightColor[3]; /* 0044 */ CRagEffect* effect; - /* 0048 */ unsigned char unknown_0048[0x10]; + /* 0048 */ unsigned char padding_0048[0x10]; /* 0058 */ int counter; }; diff --git a/Source/Contents/Messenger/ClientMessenger.cpp b/Source/Contents/Messenger/ClientMessenger.cpp index 904e9432c..736cf327f 100644 --- a/Source/Contents/Messenger/ClientMessenger.cpp +++ b/Source/Contents/Messenger/ClientMessenger.cpp @@ -319,7 +319,7 @@ namespace EquipmentProperties { /* 0004 */ CLuaInstance script; /* 000C */ bool loadValid; /* 000D */ bool m_dirty = false; - /* 0010 */ int unknown_0010; + /* 0010 */ int padding_0010; /* 0014 */ int shopId; /* 0018 */ EquipmentPropertyStore* store; /* 001C */ int currentEquipment; @@ -568,7 +568,7 @@ __declspec(noinline) std::map& Equip // OFFSET: 0x006A1AA0 // FUNCTION: fn_06013 EquipmentProperties::CEquipmentPropertiesMgr::CEquipmentPropertiesMgr() - : loadValid(1), unknown_0010(-1), shopId(-1), store(new EquipmentPropertyStore), currentEquipment(0), notifyWindow(0) { + : loadValid(1), padding_0010(-1), shopId(-1), store(new EquipmentPropertyStore), currentEquipment(0), notifyWindow(0) { } // OFFSET: 0x006ABE90 @@ -5204,7 +5204,7 @@ void CSession::SetPartyLeader(std::uint32_t accountId, int leader) { } struct ItemNotificationWindow : UIWindow { - /* 007C */ unsigned char unknown_007C[0x38]; + /* 007C */ unsigned char padding_007C[0x38]; /* 00B4 */ MessengerMember member; }; @@ -5857,7 +5857,7 @@ struct MessengerLinkNode { }; struct MessengerIntrusiveLink { - /* 0000 */ unsigned int unknown_0000; + /* 0000 */ unsigned int padding_0000; /* 0004 */ MessengerLinkNode* m_prev; /* 0008 */ MessengerLinkNode* m_next; diff --git a/Source/Contents/Models/ModelActor.h b/Source/Contents/Models/ModelActor.h index f5139640c..6a1cb6e56 100644 --- a/Source/Contents/Models/ModelActor.h +++ b/Source/Contents/Models/ModelActor.h @@ -31,13 +31,13 @@ public: /* 0034 */ matrix transform; /* 0064 */ matrix inverseTransform; /* 0094 */ unsigned char dirty; - /* 0095 */ unsigned char unknown_0095[3]; + /* 0095 */ unsigned char padding_0095[3]; /* 0098 */ OrientedBounds oriented; /* 00D4 */ float corners[8][3]; /* 0134 */ float minimum[3]; /* 0140 */ float maximum[3]; /* 014C */ unsigned char enabled; - /* 014D */ unsigned char unknown_014D[3]; + /* 014D */ unsigned char padding_014D[3]; /* 0150 */ unsigned renderFrame; /* 0154 */ unsigned char occlusionEnabled; /* 0155 */ unsigned char occluded; @@ -88,7 +88,7 @@ public: /* 0170 */ std::list roots; /* 0178 */ float framesPerSecond; - /* 017C */ unsigned char unknown_017C[4]; + /* 017C */ unsigned char padding_017C[4]; /* 0180 */ double duration; /* 0188 */ unsigned startTick; }; diff --git a/Source/Contents/Movies/BinkMovie.h b/Source/Contents/Movies/BinkMovie.h index d324575f8..1eb9a7498 100644 --- a/Source/Contents/Movies/BinkMovie.h +++ b/Source/Contents/Movies/BinkMovie.h @@ -26,7 +26,7 @@ private: /* 0000 */ BinkHandle* m_handle; /* 0004 */ int m_state; /* 0008 */ int m_loop; - /* 000C */ int unknown_000C; + /* 000C */ int padding_000C; /* 0010 */ CFile* m_file; }; diff --git a/Source/Contents/NavigationManager.h b/Source/Contents/NavigationManager.h index a3cd97de0..800aba37d 100644 --- a/Source/Contents/NavigationManager.h +++ b/Source/Contents/NavigationManager.h @@ -139,7 +139,7 @@ public: void ClearLinkedLinks(); int LinkedLinkCount() const; CNavi_Link(); - CNavi_Link(int type, int index, const char* name, const char* title, int cellX, int cellY, CNaviInfo* info, CNaviInfo* linkedInfo, int unknown80, int unknown84); + CNavi_Link(int type, int index, const char* name, const char* title, int cellX, int cellY, CNaviInfo* info, CNaviInfo* linkedInfo, int linkedCellX, int linkedCellY); ~CNavi_Link() override; int GetId() const override; diff --git a/Source/Contents/NavigationSource.cpp b/Source/Contents/NavigationSource.cpp index 4105e80ac..223d15e09 100644 --- a/Source/Contents/NavigationSource.cpp +++ b/Source/Contents/NavigationSource.cpp @@ -573,8 +573,8 @@ CNavi_Link* CNavigationManager::ReadObject(const char* record) { std::string map(record + offset, record + offset + length); offset += length; - const int unknown80 = *reinterpret_cast(record + offset); - const int unknown84 = *reinterpret_cast(record + offset + 4); + const int linkedCellX = *reinterpret_cast(record + offset); + const int linkedCellY = *reinterpret_cast(record + offset + 4); length = *reinterpret_cast(record + offset + 8); offset += 10; std::string linkedMap(record + offset, record + offset + length); @@ -588,7 +588,7 @@ CNavi_Link* CNavigationManager::ReadObject(const char* record) { return nullptr; } return info->FindMatchingLink( - CNavi_Link(type, index, name.c_str(), title.c_str(), cellX, cellY, info, linkedInfo, unknown80, unknown84) + CNavi_Link(type, index, name.c_str(), title.c_str(), cellX, cellY, info, linkedInfo, linkedCellX, linkedCellY) ); } diff --git a/Source/Contents/Party/LoadPartyListAsyncWork.cpp b/Source/Contents/Party/LoadPartyListAsyncWork.cpp index fd8949f67..963dd75dc 100644 --- a/Source/Contents/Party/LoadPartyListAsyncWork.cpp +++ b/Source/Contents/Party/LoadPartyListAsyncWork.cpp @@ -86,8 +86,8 @@ void CLoadPartyListAsyncWork::Bind( this->m_filter = filter; this->m_page = page; this->m_search = search; - const std::uint8_t unknown[] = {0x80, 0xE9, 0x96, 0x93, 0x58, 0x52, 0x01, 0x93}; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x936F3D2FFDFD87F5ULL>(unknown), 54); + const std::uint8_t diagnosticSource[] = {0x80, 0xE9, 0x96, 0x93, 0x58, 0x52, 0x01, 0x93}; + AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x936F3D2FFDFD87F5ULL>(diagnosticSource), 54); this->m_diagnostic.MoveFrom(diagnostic); this->m_windows = &windows; } diff --git a/Source/Contents/Party/PartyBookingMgr.cpp b/Source/Contents/Party/PartyBookingMgr.cpp index 7ff13a9f5..cfefee46c 100644 --- a/Source/Contents/Party/PartyBookingMgr.cpp +++ b/Source/Contents/Party/PartyBookingMgr.cpp @@ -19,7 +19,7 @@ PartyBookingEntry::PartyBookingEntry(const PartyBookingEntry& other) = default; // OFFSET: 0x00B15C80 // FUNCTION: fn_18432 -PartyBookingMgr::PartyBookingMgr() : unknown_0000(0) { +PartyBookingMgr::PartyBookingMgr() : seekWindowOpen(0) { this->m_lastPage = true; this->m_lastIndex = -1; this->m_regionNames.clear(); @@ -231,7 +231,7 @@ void PartyBookingMgr::AddEntries(const PARTY_BOOKING_AD_INFO* infos, int count, void PartyBookingMgr::Reset() { this->m_lastPage = true; this->m_lastIndex = -1; - this->unknown_0000 = 0; + this->seekWindowOpen = 0; this->m_entries.clear(); this->m_pending.clear(); } diff --git a/Source/Contents/Party/PartyBookingMgr.h b/Source/Contents/Party/PartyBookingMgr.h index a7328e505..bb3540cd1 100644 --- a/Source/Contents/Party/PartyBookingMgr.h +++ b/Source/Contents/Party/PartyBookingMgr.h @@ -50,7 +50,7 @@ public: void OnAdvertisement(PARTY_BOOKING_AD_INFO info); std::pair MakeEntry(PARTY_BOOKING_AD_INFO info); - /* 0000 */ int unknown_0000; + /* 0000 */ int seekWindowOpen; /* 0004 */ bool m_alarm; /* 0005 */ bool m_filterEnabled; /* 0008 */ std::vector m_regionNames; @@ -59,7 +59,7 @@ public: /* 0024 */ std::map m_pending; /* 002C */ bool m_lastPage; /* 0030 */ int m_lastIndex; - /* 0034 */ int unknown_0034; + /* 0034 */ int registeredTick; /* 0038 */ int m_filterLevel; /* 003C */ int m_filterMap; /* 0040 */ int m_filterJob; diff --git a/Source/Contents/Party/RegisterPartyAsyncWork.cpp b/Source/Contents/Party/RegisterPartyAsyncWork.cpp index c63043e56..dcc7f93f5 100644 --- a/Source/Contents/Party/RegisterPartyAsyncWork.cpp +++ b/Source/Contents/Party/RegisterPartyAsyncWork.cpp @@ -78,8 +78,8 @@ void CRegisterPartyAsyncWork::Bind( this->m_url = url; this->m_token = token; this->m_info = info; - const std::uint8_t unknown[] = {0x80, 0xE9, 0x96, 0x93, 0x58, 0x52, 0x01, 0x93}; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0x936F3D2FFDFD87F5ULL>(unknown)), sourceFile, 50); + const std::uint8_t diagnosticSource[] = {0x80, 0xE9, 0x96, 0x93, 0x58, 0x52, 0x01, 0x93}; + AsyncDiagnostic diagnostic(false, std::string(DecryptName<0x936F3D2FFDFD87F5ULL>(diagnosticSource)), sourceFile, 50); this->m_diagnostic.MoveFrom(diagnostic); } diff --git a/Source/Contents/PetEvolutionMgr.h b/Source/Contents/PetEvolutionMgr.h index 8b7b9b5be..878859832 100644 --- a/Source/Contents/PetEvolutionMgr.h +++ b/Source/Contents/PetEvolutionMgr.h @@ -22,7 +22,7 @@ public: // INLINED virtual ~CPetEvolutionMgr() { this->m_recipes.clear(); - this->unknown_0010.clear(); + this->padding_0010.clear(); this->m_autoFeeding.clear(); } @@ -40,7 +40,7 @@ public: /* 0004 */ bool m_isValid; /* 0008 */ std::map> m_recipes; - /* 0010 */ std::map unknown_0010; + /* 0010 */ std::map padding_0010; /* 0018 */ std::vector m_autoFeeding; }; diff --git a/Source/Contents/PetStatus.cpp b/Source/Contents/PetStatus.cpp index 510dbd730..03614532e 100644 --- a/Source/Contents/PetStatus.cpp +++ b/Source/Contents/PetStatus.cpp @@ -105,8 +105,8 @@ void CSession::GetPetHungryStateString(int hunger, char* buffer) { } } - const char unknown[] = {'\xB8', '\xF4', '\xB6', '\xF3', '\xBF', '\xE4', '.', '\0'}; - std::memcpy(buffer, unknown, sizeof(unknown)); + const char unknownStateText[] = {'\xB8', '\xF4', '\xB6', '\xF3', '\xBF', '\xE4', '.', '\0'}; + std::memcpy(buffer, unknownStateText, sizeof(unknownStateText)); } // OFFSET: 0x00E12830 diff --git a/Source/Contents/RenewQuestMgr.cpp b/Source/Contents/RenewQuestMgr.cpp index 25d3035fe..301ed1855 100644 --- a/Source/Contents/RenewQuestMgr.cpp +++ b/Source/Contents/RenewQuestMgr.cpp @@ -32,15 +32,15 @@ extern "C" { struct RenewQuestOngoingRecord { /* 0000 */ unsigned int questId; /* 0004 */ unsigned char state; - /* 0005 */ unsigned char unknown_0005; + /* 0005 */ unsigned char padding_0005; /* 0006 */ short huntCount; /* 0008 */ short year; /* 000A */ short month; /* 000C */ short day; /* 000E */ short hour; /* 0010 */ unsigned short minute; - /* 0012 */ unsigned short unknown_0012; - /* 0014 */ unsigned int unknown_0014; + /* 0012 */ unsigned short padding_0012; + /* 0014 */ unsigned int padding_0014; }; struct RenewQuestHuntRecord { @@ -92,9 +92,9 @@ RenewQuestOngoingInfo::RenewQuestOngoingInfo() : m_simpleView(true), baseExpRewa this->m_descriptions.clear(); this->m_rewards.clear(); for (int index = 0; index < 3; ++index) { - this->m_huntUnknown00D4[index] = 31999; - this->m_huntUnknown01AC[index] = -1; - this->m_huntUnknown01B2[index] = -1; + this->m_huntMobId[index] = 31999; + this->m_huntMinLevel[index] = -1; + this->m_huntMaxLevel[index] = -1; } for (int index = 0; index < 3; ++index) { @@ -107,7 +107,7 @@ RenewQuestOngoingInfo::RenewQuestOngoingInfo() : m_simpleView(true), baseExpRewa // OFFSET: 0x006765C0 // FUNCTION: fn_05420 RenewQuestInfo::RenewQuestInfo() - : m_state(1), m_title(""), m_icon(""), m_iconTooltip(""), summary(""), unknown_0064(""), npcSprite(""), destinationMap(""), + : m_state(1), m_title(""), m_icon(""), m_iconTooltip(""), summary(""), padding_0064(""), npcSprite(""), destinationMap(""), destinationX(0), destinationY(0) {} // OFFSET: 0x00676770 @@ -347,16 +347,16 @@ std::string RenewQuestOngoingInfo::GetHuntText(int index) const { } std::string text; - const short minLevel = this->m_huntUnknown01AC[index]; - const short maxLevel = this->m_huntUnknown01B2[index]; - if (this->m_huntUnknown00D4[index] == 31999) { - text = static_cast(g_renewQuestMgr->GetMonsterConditionText(this->m_huntUnknown01A0[index], minLevel, maxLevel)); + const short minLevel = this->m_huntMinLevel[index]; + const short maxLevel = this->m_huntMaxLevel[index]; + if (this->m_huntMobId[index] == 31999) { + text = static_cast(g_renewQuestMgr->GetMonsterConditionText(this->m_huntConditionFlags[index], minLevel, maxLevel)); } else { const char* name = this->m_huntName[index]; - if (this->m_huntUnknown01AC[index] >= 0 && this->m_huntUnknown01B2[index] >= 0 && (minLevel != 0 || this->m_huntUnknown01B2[index] != 0)) { + if (this->m_huntMinLevel[index] >= 0 && this->m_huntMaxLevel[index] >= 0 && (minLevel != 0 || this->m_huntMaxLevel[index] != 0)) { if (minLevel == 0) { text = std::format("{} Lv.{}▼", name, maxLevel); - } else if (this->m_huntUnknown01B2[index] != 0) { + } else if (this->m_huntMaxLevel[index] != 0) { text = std::format("{} Lv.{}~Lv.{}", name, minLevel, maxLevel); } else { text = std::format("{} Lv.{}▲", name, minLevel); @@ -366,9 +366,9 @@ std::string RenewQuestOngoingInfo::GetHuntText(int index) const { } } - const short goal = this->m_huntUnknown0180[index]; + const short goal = this->m_huntMaxCount[index]; if (goal > 0) { - const short count = this->m_huntUnknown00E0[index]; + const short count = this->m_huntKillCount[index]; if (count == goal) { text = std::format("{} ( {} )", text, LookupMessage(MSI_COMPLETE_HUNTING_QUEST)); } else { @@ -452,12 +452,12 @@ void CRenewQuestMgr::WriteOngoingQuests(char* buffer) { for (int index = 0; index < huntCount; ++index) { RenewQuestHuntRecord hunt = {}; hunt.huntId = static_cast(info.m_huntId[index]); - hunt.monsterCondition = info.m_huntUnknown01A0[index]; - hunt.monsterId = info.m_huntUnknown00D4[index]; - hunt.minLevel = info.m_huntUnknown01AC[index]; - hunt.maxLevel = info.m_huntUnknown01B2[index]; - hunt.killCount = info.m_huntUnknown00E0[index]; - hunt.killGoal = info.m_huntUnknown0180[index]; + hunt.monsterCondition = info.m_huntConditionFlags[index]; + hunt.monsterId = info.m_huntMobId[index]; + hunt.minLevel = info.m_huntMinLevel[index]; + hunt.maxLevel = info.m_huntMaxLevel[index]; + hunt.killCount = info.m_huntKillCount[index]; + hunt.killGoal = info.m_huntMaxCount[index]; strncpy_s(hunt.name, sizeof(hunt.name), info.m_huntName[index], _TRUNCATE); *reinterpret_cast(buffer + offset) = hunt; offset += sizeof(RenewQuestHuntRecord); @@ -525,8 +525,8 @@ void CRenewQuestMgr::AddNewQuest(unsigned int id) { // FUNCTION: fn_05451 void CRenewQuestMgr::AddOngoingQuest(unsigned int id, RenewQuestOngoingInfo& info) { int type = 0; - int unknown2 = 0; - int unknown1 = 0; + int destinationY = 0; + int destinationX = 0; const char* text7 = nullptr; const char* text6 = nullptr; const char* text5 = nullptr; @@ -536,7 +536,7 @@ void CRenewQuestMgr::AddOngoingQuest(unsigned int id, RenewQuestOngoingInfo& inf const char* title = nullptr; bool simpleView = true; if (g_session.m_hotkeyScript->Call("GetOngoingQuestInfoByID", "d>bsssssssddd", id, &simpleView, &title, &icon, &text3, &text4, &text5, &text6, - &text7, &unknown1, &unknown2, &type)) { + &text7, &destinationX, &destinationY, &type)) { info.m_title = title ? title : ""; info.m_icon = icon ? icon : ""; info.summary = text3 ? text3 : ""; @@ -544,8 +544,8 @@ void CRenewQuestMgr::AddOngoingQuest(unsigned int id, RenewQuestOngoingInfo& inf info.destinationMap = text5 ? text5 : ""; info.baseExpReward = text6 ? text6 : ""; info.jobExpReward = text7 ? text7 : ""; - info.destinationX = unknown1; - info.destinationY = unknown2; + info.destinationX = destinationX; + info.destinationY = destinationY; info.m_simpleView = simpleView; info.questType = type; if (type == 1) { @@ -752,24 +752,24 @@ void CRenewQuestMgr::ReadOngoingQuests(const char* buffer, unsigned int) { RenewQuestHuntRecord huntRecord; memcpy_s(&huntRecord, sizeof(huntRecord), buffer + offset, sizeof(huntRecord)); info.m_huntId[hunt] = huntRecord.huntId; - info.m_huntUnknown01A0[hunt] = huntRecord.monsterCondition; - info.m_huntUnknown00D4[hunt] = huntRecord.monsterId; - info.m_huntUnknown00E0[hunt] = huntRecord.killCount; - info.m_huntUnknown0180[hunt] = huntRecord.killGoal; - info.m_huntUnknown01AC[hunt] = huntRecord.minLevel; - info.m_huntUnknown01B2[hunt] = huntRecord.maxLevel; + info.m_huntConditionFlags[hunt] = huntRecord.monsterCondition; + info.m_huntMobId[hunt] = huntRecord.monsterId; + info.m_huntKillCount[hunt] = huntRecord.killCount; + info.m_huntMaxCount[hunt] = huntRecord.killGoal; + info.m_huntMinLevel[hunt] = huntRecord.minLevel; + info.m_huntMaxLevel[hunt] = huntRecord.maxLevel; strncpy_s(info.m_huntName[hunt], sizeof(info.m_huntName[hunt]), huntRecord.name, _TRUNCATE); offset += sizeof(RenewQuestHuntRecord); } else { RenewQuestShortHuntRecord huntRecord; memcpy_s(&huntRecord, sizeof(huntRecord), buffer + offset, sizeof(huntRecord)); info.m_huntId[hunt] = huntRecord.huntId; - info.m_huntUnknown01A0[hunt] = huntRecord.monsterCondition; - info.m_huntUnknown00D4[hunt] = huntRecord.monsterId; - info.m_huntUnknown00E0[hunt] = huntRecord.killCount; - info.m_huntUnknown0180[hunt] = huntRecord.killGoal; - info.m_huntUnknown01AC[hunt] = huntRecord.minLevel; - info.m_huntUnknown01B2[hunt] = huntRecord.maxLevel; + info.m_huntConditionFlags[hunt] = huntRecord.monsterCondition; + info.m_huntMobId[hunt] = huntRecord.monsterId; + info.m_huntKillCount[hunt] = huntRecord.killCount; + info.m_huntMaxCount[hunt] = huntRecord.killGoal; + info.m_huntMinLevel[hunt] = huntRecord.minLevel; + info.m_huntMaxLevel[hunt] = huntRecord.maxLevel; strncpy_s(info.m_huntName[hunt], sizeof(info.m_huntName[hunt]), huntRecord.name, sizeof(huntRecord.name)); offset += sizeof(RenewQuestShortHuntRecord); } diff --git a/Source/Contents/RenewQuestMgr.h b/Source/Contents/RenewQuestMgr.h index e95eb0782..40f968b62 100644 --- a/Source/Contents/RenewQuestMgr.h +++ b/Source/Contents/RenewQuestMgr.h @@ -20,7 +20,7 @@ struct RenewQuestInfo { /* 001C */ std::string m_icon; /* 0034 */ std::string m_iconTooltip; /* 004C */ std::string summary; - /* 0064 */ std::string unknown_0064; + /* 0064 */ std::string padding_0064; /* 007C */ std::string npcSprite; /* 0094 */ std::string destinationMap; /* 00AC */ int destinationX; @@ -37,17 +37,17 @@ struct RenewQuestOngoingInfo : RenewQuestInfo { /* 00C8 */ short m_day; /* 00CA */ short m_hour; /* 00CC */ unsigned short m_minute; - /* 00CE */ short unknown_00CE; - /* 00D0 */ short unknown_00D0; + /* 00CE */ short padding_00CE; + /* 00D0 */ short padding_00D0; /* 00D2 */ char m_huntCount; - /* 00D4 */ int m_huntUnknown00D4[3]; - /* 00E0 */ short m_huntUnknown00E0[3]; + /* 00D4 */ int m_huntMobId[3]; + /* 00E0 */ short m_huntKillCount[3]; /* 00E6 */ char m_huntName[3][0x33]; - /* 0180 */ short m_huntUnknown0180[3]; + /* 0180 */ short m_huntMaxCount[3]; /* 0188 */ __int64 m_huntId[3]; - /* 01A0 */ int m_huntUnknown01A0[3]; - /* 01AC */ short m_huntUnknown01AC[3]; - /* 01B2 */ short m_huntUnknown01B2[3]; + /* 01A0 */ int m_huntConditionFlags[3]; + /* 01AC */ short m_huntMinLevel[3]; + /* 01B2 */ short m_huntMaxLevel[3]; /* 01B8 */ std::string baseExpReward; /* 01D0 */ std::string jobExpReward; /* 01E8 */ std::vector> m_rewards; diff --git a/Source/Contents/RodexMailStore.h b/Source/Contents/RodexMailStore.h index 7f384e4bb..57b05171c 100644 --- a/Source/Contents/RodexMailStore.h +++ b/Source/Contents/RodexMailStore.h @@ -11,7 +11,7 @@ struct RodexMail { /* 0000 */ unsigned char isRead; /* 0001 */ unsigned char type; - /* 0002 */ std::array unknown_0002; + /* 0002 */ std::array padding_0002; /* 0004 */ std::string sender; /* 001C */ int sentAt; /* 0020 */ int expiresAt; @@ -21,7 +21,7 @@ struct RodexMail { /* 0055 */ std::array attachments; /* 0188 */ std::int64_t zeny; /* 0190 */ std::uint8_t isReturned = 0; - /* 0191 */ std::array unknown_0191; + /* 0191 */ std::array padding_0191; /* 0194 */ int isKnownSender = -1; }; @@ -51,7 +51,7 @@ public: void PurgeFlagged(); /* 0000 */ bool m_isValid; - /* 0004 */ int unknown_0004; + /* 0004 */ int padding_0004; union { struct { /* 0008 */ int currentMailIdLow; diff --git a/Source/Contents/Schedule/Schedule.cpp b/Source/Contents/Schedule/Schedule.cpp index ae62dd8b7..c03690e7b 100644 --- a/Source/Contents/Schedule/Schedule.cpp +++ b/Source/Contents/Schedule/Schedule.cpp @@ -8,12 +8,12 @@ std::mt19937 g_scheduleRandomEngine; // OFFSET: 0x00BA8930 // FUNCTION: fn_19725 -CSchedule::CSchedule(const std::uint64_t& timestamp, const std::int64_t& interval, int scheduleType, int serial, int unknown) { +CSchedule::CSchedule(const std::uint64_t& timestamp, const std::int64_t& interval, int scheduleType, int serial, int userValue) { this->serial = serial; this->timestamp = timestamp; this->interval = interval; this->scheduleType = scheduleType; - this->userValue = unknown; + this->userValue = userValue; this->active = true; this->pending = 0; this->processCount = 0; diff --git a/Source/Contents/Schedule/Schedule.h b/Source/Contents/Schedule/Schedule.h index a8a0205ee..ae98f3144 100644 --- a/Source/Contents/Schedule/Schedule.h +++ b/Source/Contents/Schedule/Schedule.h @@ -13,27 +13,27 @@ class CSchedulerIDAlocator { public: virtual ~CSchedulerIDAlocator(); - /* 0004 */ int unknown_0004; + /* 0004 */ int padding_0004; }; class CSchedule { public: - CSchedule(const std::uint64_t& timestamp, const std::int64_t& interval, int scheduleType, int serial, int unknown); + CSchedule(const std::uint64_t& timestamp, const std::int64_t& interval, int scheduleType, int serial, int userValue); virtual void Process(const std::uint64_t& now); virtual ~CSchedule(); bool CheckTime(const std::uint64_t& now); - /* 0004 */ std::uint8_t unknown_0004[0x4]; + /* 0004 */ std::uint8_t padding_0004[0x4]; /* 0008 */ int serial; - /* 000C */ std::uint8_t unknown_000C[0x4]; + /* 000C */ std::uint8_t padding_000C[0x4]; /* 0010 */ std::uint64_t timestamp; /* 0018 */ std::int64_t interval; /* 0020 */ int scheduleType; /* 0024 */ bool active; /* 0025 */ std::uint8_t pending; - /* 0026 */ std::uint8_t unknown_0026[2]; + /* 0026 */ std::uint8_t padding_0026[2]; /* 0028 */ int processCount; /* 002C */ int userValue; }; diff --git a/Source/Contents/Schedule/ShutDownSchedule.h b/Source/Contents/Schedule/ShutDownSchedule.h index 4c9ab31e5..7708176bb 100644 --- a/Source/Contents/Schedule/ShutDownSchedule.h +++ b/Source/Contents/Schedule/ShutDownSchedule.h @@ -10,8 +10,8 @@ public: void Process(const std::uint64_t& now) override; __declspec(noinline) void UpdateNotice(); - /* 0030 */ void* unknown_0030; - /* 0034 */ std::uint32_t unknown_0034; + /* 0030 */ void* padding_0030; + /* 0034 */ std::uint32_t padding_0034; /* 0038 */ int seconds; /* 003C */ int noticeIndex; }; diff --git a/Source/Contents/SignBoard/SignBoard.h b/Source/Contents/SignBoard/SignBoard.h index 7df38a520..3933246ab 100644 --- a/Source/Contents/SignBoard/SignBoard.h +++ b/Source/Contents/SignBoard/SignBoard.h @@ -57,9 +57,9 @@ public: void SetWindowImage(const std::string& name); /* 0138 */ int type; - /* 013C */ int unknown_013C; + /* 013C */ int padding_013C; /* 0140 */ UIWindow* window; - /* 0144 */ int unknown_0144; + /* 0144 */ int padding_0144; }; struct SignBoardInfo { diff --git a/Source/Contents/Skills/ClientSkills.cpp b/Source/Contents/Skills/ClientSkills.cpp index 04a19b511..9789113e2 100644 --- a/Source/Contents/Skills/ClientSkills.cpp +++ b/Source/Contents/Skills/ClientSkills.cpp @@ -250,7 +250,7 @@ bool CSession::UpdateSkill(const CSkillInfo& value, unsigned char notify, unsign if (CSkillInfo::UsesLevel(*this->m_hotkeyScript, static_cast(snapshot.id)) && snapshot.level != 0) { const int saved = this->UseLevel(static_cast(snapshot.id)); if (saved <= 0 || saved > snapshot.level) { - this->m_skillBundle.SetUnknownValue(static_cast(snapshot.id), snapshot.level); + this->m_skillBundle.SetSkillValue(static_cast(snapshot.id), snapshot.level); } } } @@ -358,7 +358,7 @@ bool CSession::UpdateMercSkill(const CSkillInfo& value, unsigned char notify) { // OFFSET: 0x00E07410 // FUNCTION: fn_23743 -void CSession::AddUnknownId(int id) { +void CSession::AddAchievementId(int id) { if (std::find(this->achievementIds.begin(), this->achievementIds.end(), id) == this->achievementIds.end()) { this->achievementIds.push_back(id); } @@ -491,7 +491,7 @@ void CSession::ClearHotkeySkillLevels() { // OFFSET: 0x00E083D0 // FUNCTION: fn_23760 -void CSession::EraseUnknownKey(std::int64_t key) { +void CSession::EraseSummonHp(std::int64_t key) { auto first = this->summonHp.find(key); if (this->summonHp.end() != first) { this->summonHp.erase(first); @@ -948,7 +948,7 @@ namespace EquipmentProperties { class CEquipmentPropertiesMgr { public: virtual ~CEquipmentPropertiesMgr(); - unsigned char unknown_0004[0x1F8]; + unsigned char padding_0004[0x1F8]; CEquipmentPropertiesMgr(); __declspec(noinline) void EquipWearable(const ITEM_INFO* item, bool notify); diff --git a/Source/Contents/Skills/PlayerSkillBundle.cpp b/Source/Contents/Skills/PlayerSkillBundle.cpp index 9f1c86bac..15f35f286 100644 --- a/Source/Contents/Skills/PlayerSkillBundle.cpp +++ b/Source/Contents/Skills/PlayerSkillBundle.cpp @@ -359,7 +359,7 @@ void CPlayerSkillBundle::ResetFirstLevelChange() { // OFFSET: 0x00771FA0 // FUNCTION: fn_08294 -void CPlayerSkillBundle::SetUnknownValue(int id, int value) { +void CPlayerSkillBundle::SetSkillValue(int id, int value) { if (static_cast(id) - 1u <= 0x1F3D) { this->skillValues[id] = value; } diff --git a/Source/Contents/Skills/PlayerSkillBundle.h b/Source/Contents/Skills/PlayerSkillBundle.h index 20d7075a4..12bad0613 100644 --- a/Source/Contents/Skills/PlayerSkillBundle.h +++ b/Source/Contents/Skills/PlayerSkillBundle.h @@ -54,7 +54,7 @@ public: void ClearLevelChanges(); void MarkLevelChanges(); void ResetFirstLevelChange(); - void SetUnknownValue(int id, int value); + void SetSkillValue(int id, int value); /* 0004 */ std::list skills; /* 000C */ std::unordered_map index; diff --git a/Source/Contents/Skills/SkillLevelConfig.cpp b/Source/Contents/Skills/SkillLevelConfig.cpp index 3b0a33a81..d91b8e07d 100644 --- a/Source/Contents/Skills/SkillLevelConfig.cpp +++ b/Source/Contents/Skills/SkillLevelConfig.cpp @@ -14,7 +14,7 @@ void CCharacterLinkedUserDataMgr::LoadUseSkillLevels(Json::Value& data) { if ((*it).isObject()) { int id = (*it).get("SKID", 0).asInt(); int level = (*it).get("SKLv", 0).asInt(); - g_session.m_skillBundle.SetUnknownValue(id, level); + g_session.m_skillBundle.SetSkillValue(id, level); } } } diff --git a/Source/Contents/Skills/SkillLevelRegistry.cpp b/Source/Contents/Skills/SkillLevelRegistry.cpp index 69f7ccd8c..967f1bfb6 100644 --- a/Source/Contents/Skills/SkillLevelRegistry.cpp +++ b/Source/Contents/Skills/SkillLevelRegistry.cpp @@ -49,7 +49,7 @@ void LoadSkillUseLevelRegistry() { }; for (int id = 1; id < 7999; ++id) { - g_session.m_skillBundle.SetUnknownValue(id, read(id)); + g_session.m_skillBundle.SetSkillValue(id, read(id)); } for (int id = 8000; id < 8061; ++id) { diff --git a/Source/Contents/Sound/SoundMaker.cpp b/Source/Contents/Sound/SoundMaker.cpp index 6b7c7633e..71b8d45e9 100644 --- a/Source/Contents/Sound/SoundMaker.cpp +++ b/Source/Contents/Sound/SoundMaker.cpp @@ -712,10 +712,10 @@ void CHalluPlant::SendMsg( struct NpcAppearInfo { /* 0000 */ int aid; /* 0004 */ int job; - /* 0008 */ int unknown_0008[22]; + /* 0008 */ int padding_0008[22]; /* 0060 */ int guildId; /* 0064 */ int guildVersion; - /* 0068 */ int unknown_0068[3]; + /* 0068 */ int padding_0068[3]; /* 0074 */ int ownerId; }; diff --git a/Source/Contents/Sound/SoundMgr.cpp b/Source/Contents/Sound/SoundMgr.cpp index cc3c4c2eb..2bb2944b3 100644 --- a/Source/Contents/Sound/SoundMgr.cpp +++ b/Source/Contents/Sound/SoundMgr.cpp @@ -589,7 +589,7 @@ void CSoundMgr::PlayWave(const char* name, float x, float y, float z, int maximu static constexpr char permittedName[] = "버튼소리.wav"; - if (this->unknown != 0 && std::strcmp(name, permittedName) != 0) { + if (this->tingOnly != 0 && std::strcmp(name, permittedName) != 0) { return; } diff --git a/Source/Contents/Sound/SoundMgr.h b/Source/Contents/Sound/SoundMgr.h index 1b7b3ebfa..2305ff903 100644 --- a/Source/Contents/Sound/SoundMgr.h +++ b/Source/Contents/Sound/SoundMgr.h @@ -50,8 +50,8 @@ public: /* 0004 */ HANDLE fadeThread = INVALID_HANDLE_VALUE; /* 0008 */ unsigned threadId = 0; /* 000C */ std::uint8_t initialized = 0; - /* 000D */ std::uint8_t unknown_000D[3]; - /* 0010 */ int unknown = 0; + /* 000D */ std::uint8_t padding_000D[3]; + /* 0010 */ int tingOnly = 0; /* 0014 */ int secondaryEnabled = 0; /* 0018 */ void* driver = nullptr; /* 001C */ void* stream = nullptr; @@ -60,7 +60,7 @@ public: /* 00E4 */ int streamVolume = 100; /* 00E8 */ int sampleVolume = 100; /* 00EC */ int volumeMaxDist = 250; - /* 00F0 */ int unknown40 = 40; + /* 00F0 */ int padding_00F0 = 40; /* 00F4 */ int rate = 0; /* 00F8 */ int bits = 0; /* 00FC */ int channels = 0; @@ -80,7 +80,7 @@ public: /* 0410 */ void* secondaryStream = nullptr; /* 0414 */ std::uint8_t fadePending = 0; /* 0415 */ std::uint8_t reopenPending = 0; - /* 0416 */ std::uint8_t unknown_0416[2]; + /* 0416 */ std::uint8_t padding_0416[2]; /* 0418 */ DWORD fadeExit = 1; private: @@ -94,8 +94,8 @@ static_assert(sizeof(std::string) == 0x18); static_assert(offsetof(CSoundMgr, fadeThread) == 0x004); static_assert(offsetof(CSoundMgr, threadId) == 0x008); static_assert(offsetof(CSoundMgr, initialized) == 0x00C); -static_assert(offsetof(CSoundMgr, unknown_000D) == 0x000D); -static_assert(offsetof(CSoundMgr, unknown) == 0x010); +static_assert(offsetof(CSoundMgr, padding_000D) == 0x000D); +static_assert(offsetof(CSoundMgr, tingOnly) == 0x010); static_assert(offsetof(CSoundMgr, secondaryEnabled) == 0x014); static_assert(offsetof(CSoundMgr, driver) == 0x018); static_assert(offsetof(CSoundMgr, stream) == 0x01C); @@ -104,7 +104,7 @@ static_assert(offsetof(CSoundMgr, targetVolume) == 0x0E0); static_assert(offsetof(CSoundMgr, streamVolume) == 0x0E4); static_assert(offsetof(CSoundMgr, sampleVolume) == 0x0E8); static_assert(offsetof(CSoundMgr, volumeMaxDist) == 0x0EC); -static_assert(offsetof(CSoundMgr, unknown40) == 0x0F0); +static_assert(offsetof(CSoundMgr, padding_00F0) == 0x0F0); static_assert(offsetof(CSoundMgr, rate) == 0x0F4); static_assert(offsetof(CSoundMgr, bits) == 0x0F8); static_assert(offsetof(CSoundMgr, channels) == 0x0FC); @@ -124,7 +124,7 @@ static_assert(offsetof(CSoundMgr, sample3DCount) == 0x40C); static_assert(offsetof(CSoundMgr, secondaryStream) == 0x410); static_assert(offsetof(CSoundMgr, fadePending) == 0x414); static_assert(offsetof(CSoundMgr, reopenPending) == 0x415); -static_assert(offsetof(CSoundMgr, unknown_0416) == 0x0416); +static_assert(offsetof(CSoundMgr, padding_0416) == 0x0416); static_assert(offsetof(CSoundMgr, fadeExit) == 0x418); static_assert(sizeof(CSoundMgr) == 0x41C); #endif diff --git a/Source/Contents/SpriteLayerDrawing.cpp b/Source/Contents/SpriteLayerDrawing.cpp index c5930085d..ddb690ff4 100644 --- a/Source/Contents/SpriteLayerDrawing.cpp +++ b/Source/Contents/SpriteLayerDrawing.cpp @@ -25,13 +25,13 @@ // OFFSET: 0x0063F500 // FUNCTION: fn_04807 -void SpriteLayerRenderer::Render(const float* matrix, int unknown0030, char blendVariant) { +void SpriteLayerRenderer::Render(const float* matrix, int blendMode, char blendVariant) { if (!this->pc) { return; } std::memcpy(this->matrix, matrix, sizeof(this->matrix)); - this->blendMode = unknown0030; + this->blendMode = blendMode; this->blendVariant = blendVariant; this->layerShift = 0; this->swingX = 0; @@ -381,7 +381,7 @@ void SpriteLayerRenderer::DrawRobe(bool drawOnTop) { this->layerShift, this->layerShift, this->distanceScale, cell, this->x, this->y, &this->position.x, this->scale, &bottomRhw, &topRhw, image, &quad, reinterpret_cast(&box), &quadColor, 0, 0, !drawOnTop ); - if (this->pc->render.unknown_0130[0] == 1) { + if (this->pc->render.translucentOther[0] == 1) { quad.color = static_cast(static_cast(static_cast(static_cast(quad.color >> 24) * (70.0f / 255.0f)))) << 24 | (quad.color & 0xFFFFFF); } @@ -638,7 +638,7 @@ void SpriteLayerRenderer::DrawLayer( this->depthBias = ((quad.topRhw + quad.bottomRhw) - (quad.top + quad.bottom) * depthScale) * g_depthAverageHalf; } - if (this->pc->render.unknown_0130[0] == 1) { + if (this->pc->render.translucentOther[0] == 1) { quad.color = static_cast(static_cast(static_cast(static_cast(quad.color >> 24) * (70.0f / 255.0f)))) << 24 | (quad.color & 0xFFFFFF); } diff --git a/Source/Contents/SpriteLayerDrawing.h b/Source/Contents/SpriteLayerDrawing.h index 2c87915c1..7e60f9986 100644 --- a/Source/Contents/SpriteLayerDrawing.h +++ b/Source/Contents/SpriteLayerDrawing.h @@ -43,7 +43,7 @@ public: explicit SpriteLayerRenderer(CPc* pc) : pc(pc), position(), depthScale(1.0f), depthBias(0.0f) { } - void Render(const float* matrix, int unknown0030, char blendVariant); + void Render(const float* matrix, int padding_0030, char blendVariant); void QueueQuad(int layer, const SpriteQuad* quad, const std::uint32_t* palette, int blend); void DrawLayerOutlines(std::uint32_t color); void DrawRobe(bool drawOnTop); diff --git a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp index 4d4c5b060..87bff0aa1 100644 --- a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp +++ b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.cpp @@ -87,8 +87,8 @@ void CMCStoreInfoBackupLoadAsyncWork::Bind( this->m_url = url; this->m_token = token; this->m_response = ""; - const std::uint8_t unknown[] = {0xA4, 0x0F, 0x9A, 0xE7, 0x18, 0x3E, 0x8B, 0xD3}; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0xD3E5516F89F161D1ULL>(unknown)), loadSource, 55); + const std::uint8_t diagnosticSource[] = {0xA4, 0x0F, 0x9A, 0xE7, 0x18, 0x3E, 0x8B, 0xD3}; + AsyncDiagnostic diagnostic(false, std::string(DecryptName<0xD3E5516F89F161D1ULL>(diagnosticSource)), loadSource, 55); this->m_diagnostic.MoveFrom(diagnostic); this->m_type = type; } @@ -160,8 +160,8 @@ void CMCStoreInfoBackupSaveAsyncWork::Bind( this->m_url = url; this->m_token = token; this->m_data = data; - const std::uint8_t unknown[] = {0xCC, 0x63, 0x44, 0xCF, 0x34, 0x94, 0x61, 0x49}; - AsyncDiagnostic diagnostic(false, std::string(DecryptName<0x490FFB43A12F0DB9ULL>(unknown)), saveSource, 57); + const std::uint8_t diagnosticSource[] = {0xCC, 0x63, 0x44, 0xCF, 0x34, 0x94, 0x61, 0x49}; + AsyncDiagnostic diagnostic(false, std::string(DecryptName<0x490FFB43A12F0DB9ULL>(diagnosticSource)), saveSource, 57); this->m_diagnostic.MoveFrom(diagnostic); this->m_type = type; } diff --git a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.h b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.h index e04e0e25d..48a695335 100644 --- a/Source/Contents/Store/MCStoreInfoBackupAsyncWork.h +++ b/Source/Contents/Store/MCStoreInfoBackupAsyncWork.h @@ -25,7 +25,7 @@ protected: /* 0090 */ AsyncDiagnostic m_diagnostic; /* 00C8 */ int m_type; - /* 00CC */ int unknown_00CC; + /* 00CC */ int padding_00CC; }; class CMCStoreInfoBackupSaveAsyncWork : public NAsyncWork { @@ -49,7 +49,7 @@ protected: /* 0090 */ AsyncDiagnostic m_diagnostic; /* 00C8 */ std::string m_response; /* 00E0 */ int m_type; - /* 00E4 */ unsigned char unknown_00E4[4]; + /* 00E4 */ unsigned char padding_00E4[4]; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp b/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp index 5c6298b4e..0c7a9d7f4 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp +++ b/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.cpp @@ -82,8 +82,8 @@ void CAccountLinkedUserDataLoadAsyncWork::Bind(std::uint32_t accountId, std::str this->m_url = url; this->m_response = ""; - const std::uint8_t unknown[] = {0xC2, 0x69, 0x3C, 0xA3, 0x5C, 0x88, 0x45, 0x81}; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x812BE72BCD5707B7ULL>(unknown), 50); + const std::uint8_t diagnosticSource[] = {0xC2, 0x69, 0x3C, 0xA3, 0x5C, 0x88, 0x45, 0x81}; + AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x812BE72BCD5707B7ULL>(diagnosticSource), 50); this->m_diagnostic.MoveFrom(diagnostic); } diff --git a/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.h b/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.h index 493953b0e..356954c2f 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.h +++ b/Source/Contents/UserData/AccountLinkedUserDataLoadAsyncWork.h @@ -19,7 +19,7 @@ protected: /* 0044 */ std::string m_url; /* 005C */ std::string m_response; /* 0074 */ AsyncDiagnostic m_diagnostic; - /* 00AC */ int unknown_00AC; + /* 00AC */ int padding_00AC; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp b/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp index e3494a44b..437801609 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp +++ b/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp @@ -82,8 +82,8 @@ void CAccountLinkedUserDataSaveAsyncWork::Bind(std::uint32_t accountId, std::str this->m_url = url; this->m_token = token; this->m_data = data; - const std::uint8_t unknown[] = {0xC2, 0x69, 0x3C, 0xA3, 0x5C, 0x88, 0x45, 0x81}; - AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x812BE72BCD5707B7ULL>(unknown), 54); + const std::uint8_t diagnosticSource[] = {0xC2, 0x69, 0x3C, 0xA3, 0x5C, 0x88, 0x45, 0x81}; + AsyncDiagnostic diagnostic = Diagnostic(false, DecryptName<0x812BE72BCD5707B7ULL>(diagnosticSource), 54); this->m_diagnostic.MoveFrom(diagnostic); } diff --git a/Source/Contents/UserData/NormalItemSlots.h b/Source/Contents/UserData/NormalItemSlots.h index 6f3523e2c..87f12ecd5 100644 --- a/Source/Contents/UserData/NormalItemSlots.h +++ b/Source/Contents/UserData/NormalItemSlots.h @@ -110,9 +110,9 @@ struct AchTracingWndInfo : WindowPlacement { struct BasicInfoWndInfo : WindowPlacement { /* 0010 */ unsigned char mode; - /* 0011 */ unsigned char unknown_0011; + /* 0011 */ unsigned char padding_0011; /* 0012 */ unsigned char expanded; - /* 0013 */ unsigned char unknown_0013; + /* 0013 */ unsigned char padding_0013; void Reset(); int IsValid(); diff --git a/Source/Contents/WorldView/WorldViewData.cpp b/Source/Contents/WorldView/WorldViewData.cpp index 1af8770b2..23600cba8 100644 --- a/Source/Contents/WorldView/WorldViewData.cpp +++ b/Source/Contents/WorldView/WorldViewData.cpp @@ -41,7 +41,7 @@ __declspec(noinline) CWorldViewWorld::CWorldViewWorld(const char* name, const ch // OFFSET: 0x00613050 // FUNCTION: fn_04346 -__declspec(noinline) CWorldViewField::CWorldViewField(WorldViewArea area, const char* name, const char* unknown2, const char* unknown3) { +__declspec(noinline) CWorldViewField::CWorldViewField(WorldViewArea area, const char* name, const char* fieldName, const char* description) { this->left = area.left; this->top = area.top; this->right = area.right; @@ -50,11 +50,11 @@ __declspec(noinline) CWorldViewField::CWorldViewField(WorldViewArea area, const if (name) { this->name = name; } - if (unknown2) { - this->fieldName = unknown2; + if (fieldName) { + this->fieldName = fieldName; } - if (unknown3) { - this->description = unknown3; + if (description) { + this->description = description; } } diff --git a/Source/Contents/WorldView/WorldViewData.h b/Source/Contents/WorldView/WorldViewData.h index febda24a4..aff6b26e4 100644 --- a/Source/Contents/WorldView/WorldViewData.h +++ b/Source/Contents/WorldView/WorldViewData.h @@ -20,7 +20,7 @@ struct WorldViewArea { class CWorldViewField { public: - CWorldViewField(WorldViewArea area, const char* name, const char* unknown2, const char* unknown3); + CWorldViewField(WorldViewArea area, const char* name, const char* fieldName, const char* description); /* 0000 */ int left = 0; /* 0004 */ int top = 0; @@ -83,7 +83,7 @@ struct WorldViewRecord { /* 0010 */ int screenTop = 0; /* 0014 */ int screenRight = 0; /* 0018 */ int screenBottom = 0; - /* 001C */ int unknown_001C = 0; + /* 001C */ int padding_001C = 0; /* 0020 */ std::string name; /* 0038 */ int left = 0; /* 003C */ int top = 0; diff --git a/Source/Network/Connection/Connection.cpp b/Source/Network/Connection/Connection.cpp index 89ca6d24c..a45db268b 100644 --- a/Source/Network/Connection/Connection.cpp +++ b/Source/Network/Connection/Connection.cpp @@ -27,7 +27,7 @@ CConnection::~CConnection() = default; // OFFSET: 0x00C7C1C0 // FUNCTION: fn_20383 -CRagConnection::CRagConnection() : unknown_006C(0) { +CRagConnection::CRagConnection() : padding_006C(0) { } // INLINED diff --git a/Source/Network/Connection/Connection.h b/Source/Network/Connection/Connection.h index c4e8e8b74..11396c672 100644 --- a/Source/Network/Connection/Connection.h +++ b/Source/Network/Connection/Connection.h @@ -64,7 +64,7 @@ public: short GetPacketType(const char* packet); private: - /* 006C */ unsigned char unknown_006C; + /* 006C */ unsigned char padding_006C; }; CRagConnection& GetRagConnection(); diff --git a/Source/Network/Packets/SkillUpdatePacket.cpp b/Source/Network/Packets/SkillUpdatePacket.cpp index 4690d2e8f..5af552cdf 100644 --- a/Source/Network/Packets/SkillUpdatePacket.cpp +++ b/Source/Network/Packets/SkillUpdatePacket.cpp @@ -52,7 +52,7 @@ void CGameMode::ApplySkillUpdatePacket(const void* packet) { // OFFSET: 0x00D06AF0 // FUNCTION: fn_21577 void CGameMode::ReceiveLearnedSkill( - std::uint16_t id, std::int16_t level, int type, std::uint8_t upgradable, std::int16_t spCost, std::int16_t range, std::int16_t unknown0030 + std::uint16_t id, std::int16_t level, int type, std::uint8_t upgradable, std::int16_t spCost, std::int16_t range, std::int16_t learnedLevel ) { CSkillInfo value; value.type = type; @@ -62,7 +62,7 @@ void CGameMode::ReceiveLearnedSkill( value.name = value.IdName(*g_session.m_hotkeyScript); value.spCost = spCost; value.range = range; - value.learnedLevel = unknown0030; + value.learnedLevel = learnedLevel; value.apCost = value.UseApAmount(*g_session.m_hotkeyScript, level); g_session.m_skillBundle.RecordLevelChange(value); diff --git a/Source/Render/DX7/DeviceOwnerDX7.h b/Source/Render/DX7/DeviceOwnerDX7.h index a1418f264..88dd6162d 100644 --- a/Source/Render/DX7/DeviceOwnerDX7.h +++ b/Source/Render/DX7/DeviceOwnerDX7.h @@ -94,7 +94,7 @@ public: /* 0228 */ DWORD maxTextureAspectRatio; /* 022C */ bool colorKeySupported; /* 022D */ bool largeTextures; - /* 022E */ std::uint8_t unknown_022E[26]; + /* 022E */ std::uint8_t padding_022E[26]; /* 0248 */ bool surfacesLost; }; diff --git a/Source/Render/DX7/DirectDrawEnumeration.h b/Source/Render/DX7/DirectDrawEnumeration.h index 52e1215f2..7f38c72f9 100644 --- a/Source/Render/DX7/DirectDrawEnumeration.h +++ b/Source/Render/DX7/DirectDrawEnumeration.h @@ -15,7 +15,7 @@ struct DirectDrawDeviceRecord { /* 029C */ DDCAPS emulationCaps; /* 0418 */ DDSURFACEDESC2 selectedMode; /* 0494 */ DWORD primary; - /* 0498 */ DWORD unknown_0498; + /* 0498 */ DWORD padding_0498; /* 049C */ GUID renderIdentity; /* 04AC */ GUID drawIdentity; /* 04BC */ DDSURFACEDESC2* modes; diff --git a/Source/Render/DX9/DeviceOwnerDX9.h b/Source/Render/DX9/DeviceOwnerDX9.h index fc0878176..570d04e0b 100644 --- a/Source/Render/DX9/DeviceOwnerDX9.h +++ b/Source/Render/DX9/DeviceOwnerDX9.h @@ -41,7 +41,7 @@ public: /* 0680 */ IDirect3DSurface9* backBuffer; /* 0684 */ IDirect3DSurface9* capturedBackBuffer; /* 0688 */ bool dynamicTextures; - /* 0689 */ unsigned char unknown_0689[3]; + /* 0689 */ unsigned char padding_0689[3]; /* 068C */ HRESULT lastPresent; }; @@ -49,7 +49,7 @@ public: static_assert(sizeof(DeviceOwnerDX9) == 0x690); static_assert(offsetof(DeviceOwnerDX9, state) == 0x000C); static_assert(offsetof(DeviceOwnerDX9, dynamicTextures) == 0x0688); -static_assert(offsetof(DeviceOwnerDX9, unknown_0689) == 0x0689); +static_assert(offsetof(DeviceOwnerDX9, padding_0689) == 0x0689); static_assert(offsetof(DeviceOwnerDX9, lastPresent) == 0x068C); #endif diff --git a/Source/Render/Primitives/LightmappedPrimitive.h b/Source/Render/Primitives/LightmappedPrimitive.h index 71316456e..32d81ae47 100644 --- a/Source/Render/Primitives/LightmappedPrimitive.h +++ b/Source/Render/Primitives/LightmappedPrimitive.h @@ -45,7 +45,7 @@ struct ModelRenderCommand { /* 000C */ std::uint16_t* indices; /* 0010 */ std::uint32_t indexCount; /* 0014 */ std::uint16_t renderEnabled; - /* 0016 */ std::uint16_t unknown_0016; + /* 0016 */ std::uint16_t padding_0016; /* 0018 */ std::uint32_t renderStateA; /* 001C */ std::uint32_t renderStateB; /* 0020 */ std::uint32_t renderStateC; diff --git a/Source/Render/Primitives/RenderPrimitive.h b/Source/Render/Primitives/RenderPrimitive.h index 1acbfbfa4..be239057f 100644 --- a/Source/Render/Primitives/RenderPrimitive.h +++ b/Source/Render/Primitives/RenderPrimitive.h @@ -35,7 +35,7 @@ struct RenderCommand { /* 000C */ std::uint16_t* indices; /* 0010 */ std::uint32_t indexCount; /* 0014 */ std::uint16_t depthFlags; - /* 0016 */ std::uint16_t unknown_0016; + /* 0016 */ std::uint16_t padding_0016; /* 0018 */ std::uint32_t sourceBlend; /* 001C */ std::uint32_t destinationBlend; /* 0020 */ std::uint32_t textureMode; @@ -70,7 +70,7 @@ static_assert(offsetof(RenderVertex, u) == 0x0018); static_assert(offsetof(RenderVertex, v) == 0x001C); static_assert(offsetof(RenderTriangle, texture) == 0x0060); static_assert(offsetof(RenderTriangle, destinationBlend) == 0x0068); -static_assert(offsetof(RenderCommand, unknown_0016) == 0x0016); +static_assert(offsetof(RenderCommand, padding_0016) == 0x0016); static_assert(offsetof(RenderCommand, primitiveType) == 0x0024); static_assert(offsetof(RenderPrimitive, quad) == 0x0028); #endif diff --git a/Source/Render/Primitives/ScreenLine.cpp b/Source/Render/Primitives/ScreenLine.cpp index 8b102a412..9cdf76c55 100644 --- a/Source/Render/Primitives/ScreenLine.cpp +++ b/Source/Render/Primitives/ScreenLine.cpp @@ -366,7 +366,7 @@ void UIRoMapWnd::DrawSelectedMapPreview() { const int savedTop = record->top; const int savedRight = record->right; const int savedBottom = record->bottom; - const int savedUnknown = record->areaFlags; + const int savedAreaFlags = record->areaFlags; if (g_kafraServiceMapList.find(std::string(record->name)) != g_kafraServiceMapList.end()) { WorldViewRecord* current = this->selectedRecord; @@ -384,7 +384,7 @@ void UIRoMapWnd::DrawSelectedMapPreview() { record->top = savedTop; record->right = savedRight; record->bottom = savedBottom; - record->areaFlags = savedUnknown; + record->areaFlags = savedAreaFlags; record = this->selectedRecord; int x = record->right + 10; diff --git a/Source/Render/Renderer.cpp b/Source/Render/Renderer.cpp index 51670aed1..a884e0f4b 100644 --- a/Source/Render/Renderer.cpp +++ b/Source/Render/Renderer.cpp @@ -214,7 +214,7 @@ timer: // OFFSET: 0x00560A40 // FUNCTION: fn_02161 -CRenderer::CRenderer() : frame(0), viewDirectionX(0), viewDirectionY(0), viewDirectionZ(0), twoPass(0), unknown_004C(0) { +CRenderer::CRenderer() : frame(0), viewDirectionX(0), viewDirectionY(0), viewDirectionZ(0), twoPass(0), padding_004C(0) { this->atlas.Initialize(50); this->fog.enabled = 0; this->fog.dirty = 1; diff --git a/Source/Render/Renderer.h b/Source/Render/Renderer.h index bcb4d39b3..ffdf9a6d6 100644 --- a/Source/Render/Renderer.h +++ b/Source/Render/Renderer.h @@ -60,8 +60,8 @@ public: /* 0040 */ int viewDirectionY; /* 0044 */ int viewDirectionZ; /* 0048 */ unsigned char twoPass; - /* 0049 */ unsigned char unknown_0049[3]; - /* 004C */ int unknown_004C; + /* 0049 */ unsigned char padding_0049[3]; + /* 004C */ int padding_004C; /* 0050 */ RenderCommandPool commands; /* 0070 */ RenderPrimitivePool primitives; /* 0090 */ LightmappedPrimitivePool lightmapped; @@ -69,7 +69,7 @@ public: /* 00C0 */ SpriteAtlas atlas; /* 0150 */ RendererFogDX9 fog; /* 015C */ RenderQueues queues; - /* 024C */ unsigned unknown_024C; + /* 024C */ unsigned textureFormat; /* 0250 */ RendererBackBuffer backBuffer; CRenderer(const CRenderer&) = delete; @@ -82,7 +82,7 @@ int ScaleByScreenHeight(int value); #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(CRenderer) == 0x25C); -static_assert(offsetof(CRenderer, unknown_0049) == 0x0049); +static_assert(offsetof(CRenderer, padding_0049) == 0x0049); static_assert(offsetof(CRenderer, commands) == 0x0050); static_assert(offsetof(CRenderer, primitives) == 0x0070); static_assert(offsetof(CRenderer, lightmapped) == 0x0090); diff --git a/Source/Render/RendererDX7.cpp b/Source/Render/RendererDX7.cpp index aeb598de3..8415a5cc9 100644 --- a/Source/Render/RendererDX7.cpp +++ b/Source/Render/RendererDX7.cpp @@ -13,7 +13,7 @@ CRendererDX7::CRendererDX7() { this->boundLightmap = nullptr; this->fog.enabled = 0; this->fog.supported = 0; - this->unknown_004C = 0; + this->padding_004C = 0; if (this->queues.lightmapped.first.capacity() < 1000) { this->queues.lightmapped.first.reserve(1000); @@ -92,5 +92,5 @@ void CRendererDX7::SetCamera(const float* eye, const float* target, const float* // OFFSET: 0x0055F690 // FUNCTION: fn_02117 void CRendererDX7::SetTextureFormat(unsigned format) { - this->unknown_024C = format; + this->textureFormat = format; } diff --git a/Source/Render/RendererDX7.h b/Source/Render/RendererDX7.h index e56f8b1d2..73c2e6974 100644 --- a/Source/Render/RendererDX7.h +++ b/Source/Render/RendererDX7.h @@ -21,7 +21,7 @@ public: /* 026C */ CTextureDX7* boundLightmap; /* 0270 */ unsigned clearColor; /* 0274 */ IDirect3DDevice7* device; - /* 0278 */ unsigned char unknown_0278[4]; + /* 0278 */ unsigned char padding_0278[4]; /* 027C */ unsigned screenWidth; /* 0280 */ unsigned screenHeight; diff --git a/Source/Render/Text/EmbedFont.cpp b/Source/Render/Text/EmbedFont.cpp index 588a455dd..91e057d37 100644 --- a/Source/Render/Text/EmbedFont.cpp +++ b/Source/Render/Text/EmbedFont.cpp @@ -13,7 +13,7 @@ CEmbedFont* g_embedFont; // INLINED -CEmbedFont::CEmbedFont() : m_module(nullptr), m_unknownC(0) { +CEmbedFont::CEmbedFont() : m_module(nullptr), padding_000C(0) { std::memset(this->m_rootUrl, 0, sizeof(this->m_rootUrl)); } diff --git a/Source/Render/Text/EmbedFont.h b/Source/Render/Text/EmbedFont.h index 0dbb0acaf..c1ea2977a 100644 --- a/Source/Render/Text/EmbedFont.h +++ b/Source/Render/Text/EmbedFont.h @@ -30,8 +30,8 @@ public: int Load(HANDLE* fontReference, const char* familyName, const char* path); /* 0004 */ HMODULE m_module; - /* 0008 */ int m_unknown8; - /* 000C */ int m_unknownC; + /* 0008 */ int padding_0008; + /* 000C */ int padding_000C; /* 0010 */ char m_rootUrl[256]; }; diff --git a/Source/Render/Text/TextContext.h b/Source/Render/Text/TextContext.h index 698bbfddc..51e214f16 100644 --- a/Source/Render/Text/TextContext.h +++ b/Source/Render/Text/TextContext.h @@ -34,7 +34,7 @@ private: /* 000C */ int m_family; /* 0010 */ int m_height; /* 0014 */ unsigned m_charset; - /* 0018 */ unsigned char unknown_0018[5]; + /* 0018 */ unsigned char padding_0018[5]; /* 001D */ unsigned char m_bold; /* 001E */ unsigned char m_italic; SIZE MeasurePart(const char* text, int bytes, unsigned charset); diff --git a/Source/Render/Textures/Texture.h b/Source/Render/Textures/Texture.h index 9fe46bd35..ce5c140ac 100644 --- a/Source/Render/Textures/Texture.h +++ b/Source/Render/Textures/Texture.h @@ -62,7 +62,7 @@ protected: friend class TextureCache; /* 0004 */ std::int32_t m_format; /* 0008 */ std::uint16_t textureFlags; - /* 000A */ std::uint8_t unknown_000A[2]; + /* 000A */ std::uint8_t padding_000A[2]; /* 000C */ std::uint32_t m_textureWidth; /* 0010 */ std::uint32_t m_textureHeight; /* 0014 */ std::uint32_t m_width; diff --git a/Source/Resource/BinkRuntime.h b/Source/Resource/BinkRuntime.h index 76cdd1bf0..84dd00f0f 100644 --- a/Source/Resource/BinkRuntime.h +++ b/Source/Resource/BinkRuntime.h @@ -10,7 +10,7 @@ struct BinkHandle { /* 0004 */ std::uint32_t height; /* 0008 */ std::uint32_t frames; /* 000C */ std::uint32_t frame; - /* 0010 */ unsigned char unknown_0010[0xDC]; + /* 0010 */ unsigned char padding_0010[0xDC]; /* 00EC */ std::int32_t paused; }; diff --git a/Source/Resource/GifLzw.cpp b/Source/Resource/GifLzw.cpp index cda667b53..e704cc1d6 100644 --- a/Source/Resource/GifLzw.cpp +++ b/Source/Resource/GifLzw.cpp @@ -5,7 +5,7 @@ namespace { struct GifLzwEntry { /* 0000 */ unsigned char value; - /* 0001 */ unsigned char unknown_0001[3]; + /* 0001 */ unsigned char padding_0001[3]; /* 0004 */ int prefix; /* 0008 */ int length; }; diff --git a/Source/Resource/GifResource.cpp b/Source/Resource/GifResource.cpp index fbe1b487f..7473ee090 100644 --- a/Source/Resource/GifResource.cpp +++ b/Source/Resource/GifResource.cpp @@ -63,7 +63,7 @@ CBitmapRes::CBitmapRes() { // OFFSET: 0x0074A250 // FUNCTION: fn_07862 -CGifRes::CGifRes() : loopCount(0), unknown_0132(0), currentFrame(0), lastFrameTime(0), animated(false), frameChanged(false) { +CGifRes::CGifRes() : loopCount(0), padding_0132(0), currentFrame(0), lastFrameTime(0), animated(false), frameChanged(false) { } // INLINED @@ -137,7 +137,7 @@ void CGifRes::Unload() { this->frames.clear(); this->loopCount = 0; - this->unknown_0132 = 0; + this->padding_0132 = 0; this->currentFrame = 0; if (this->image.pixels) { diff --git a/Source/Resource/GifResource.h b/Source/Resource/GifResource.h index f874739af..cc2eaa8fc 100644 --- a/Source/Resource/GifResource.h +++ b/Source/Resource/GifResource.h @@ -28,7 +28,7 @@ public: /* 0124 */ std::vector frames; /* 0130 */ std::uint16_t loopCount; - /* 0132 */ std::uint16_t unknown_0132; + /* 0132 */ std::uint16_t padding_0132; /* 0134 */ std::uint16_t currentFrame; /* 0138 */ DWORD lastFrameTime; /* 013C */ bool animated; diff --git a/Source/Resource/Models/AnimatedModelResource.cpp b/Source/Resource/Models/AnimatedModelResource.cpp index 37428a2ae..f47859193 100644 --- a/Source/Resource/Models/AnimatedModelResource.cpp +++ b/Source/Resource/Models/AnimatedModelResource.cpp @@ -77,7 +77,7 @@ C3dAnimModelRes::C3dAnimModelRes() : originX(0.0f) { this->originX = 0.0f; this->originY = 0.0f; this->originZ = 0.0f; - this->unknown_0150 = 0; + this->padding_0150 = 0; this->alpha = 255; } diff --git a/Source/Resource/Models/AnimatedModelResource.h b/Source/Resource/Models/AnimatedModelResource.h index 0a65b8610..093e0afd7 100644 --- a/Source/Resource/Models/AnimatedModelResource.h +++ b/Source/Resource/Models/AnimatedModelResource.h @@ -24,7 +24,7 @@ struct AnimatedModelFrame { struct AnimatedModelRecord { ~AnimatedModelRecord(); - /* 0000 */ unsigned char unknown_0000[0x84]; + /* 0000 */ unsigned char padding_0000[0x84]; /* 0084 */ std::string* names; }; @@ -73,7 +73,7 @@ public: /* 0144 */ int frameCount; /* 0148 */ int animationLength; /* 014C */ float speed; - /* 0150 */ std::uint32_t unknown_0150; + /* 0150 */ std::uint32_t padding_0150; /* 0154 */ float originX; /* 0158 */ float originY; /* 015C */ float originZ; diff --git a/Source/Resource/Models/GrannyModelResource.h b/Source/Resource/Models/GrannyModelResource.h index 1273160eb..dbd7f579f 100644 --- a/Source/Resource/Models/GrannyModelResource.h +++ b/Source/Resource/Models/GrannyModelResource.h @@ -75,7 +75,7 @@ struct granny_model { }; struct granny_file_info { - /* 0000 */ unsigned char unknown_0000[0x10]; + /* 0000 */ unsigned char padding_0000[0x10]; /* 0010 */ std::int32_t textureCount; /* 0014 */ granny_texture** textures; /* 0018 */ unsigned char materialTable[8]; @@ -197,7 +197,7 @@ public: granny_file* ReadAnimationFile(const char* name, const char* suffix); /* 0000 */ float animationDuration; - /* 0004 */ unsigned char unknown_0004[0x14C]; + /* 0004 */ unsigned char padding_0004[0x14C]; /* 0150 */ granny_file* file; /* 0154 */ int textureCount; /* 0158 */ GrannyTextureEntry* textures; @@ -207,13 +207,13 @@ public: /* 0168 */ granny_local_pose* localPose; /* 016C */ int deformBufferSize; /* 0170 */ int animationMode; - /* 0174 */ unsigned char unknown_0174[8]; + /* 0174 */ unsigned char padding_0174[8]; /* 017C */ char fileName[MAX_PATH]; /* 0280 */ granny_animation* animations[100][20]; }; struct GrannyHairPivot { - /* 0000 */ int unknown_0000; + /* 0000 */ int padding_0000; /* 0004 */ int mesh; /* 0008 */ matrix transform; }; @@ -245,7 +245,7 @@ public: granny_world_pose* Animate(float seconds, granny_model_instance* instance); /* 0110 */ float animationDuration; - /* 0114 */ unsigned char unknown_0114[0x14C]; + /* 0114 */ unsigned char padding_0114[0x14C]; /* 0260 */ granny_file* file; /* 0264 */ int textureCount; /* 0268 */ GrannyTextureEntry* textures; @@ -255,7 +255,7 @@ public: /* 0278 */ void* localPose; /* 027C */ int deformBufferSize; /* 0280 */ int animationMode; - /* 0284 */ int unknown_0284; + /* 0284 */ int padding_0284; /* 0288 */ void* deformBuffer; /* 028C */ char fileName[MAX_PATH]; /* 0390 */ const granny_model* model; diff --git a/Source/Resource/Models/ModelMesh.h b/Source/Resource/Models/ModelMesh.h index 5bb0d4e9c..0db0c1d27 100644 --- a/Source/Resource/Models/ModelMesh.h +++ b/Source/Resource/Models/ModelMesh.h @@ -13,7 +13,7 @@ struct ModelFace { /* 0000 */ std::uint16_t vertices[3]; /* 0006 */ std::uint16_t textureVertices[3]; /* 000C */ std::uint16_t texture; - /* 000E */ std::uint16_t unknown_000E; + /* 000E */ std::uint16_t padding_000E; /* 0010 */ std::uint32_t twoSided; /* 0014 */ std::vector smoothing; }; @@ -42,7 +42,7 @@ struct ModelMesh { /* 001C */ std::array* vertexNormals; /* 0020 */ unsigned char parentMesh[4]; /* 0024 */ std::array, 32> indices; - /* 01A4 */ unsigned char unknown_01A4[48]; + /* 01A4 */ unsigned char padding_01A4[48]; void CalculateNormals(); }; @@ -52,7 +52,7 @@ static_assert(sizeof(ModelFace) == 32); static_assert(offsetof(ModelFace, vertices) == 0x00); static_assert(offsetof(ModelFace, textureVertices) == 0x06); static_assert(offsetof(ModelFace, texture) == 0x0C); -static_assert(offsetof(ModelFace, unknown_000E) == 0x0E); +static_assert(offsetof(ModelFace, padding_000E) == 0x0E); static_assert(offsetof(ModelFace, twoSided) == 0x10); static_assert(offsetof(ModelFace, smoothing) == 0x14); static_assert(sizeof(ModelMesh) == 0x1D4); @@ -64,7 +64,7 @@ static_assert(offsetof(ModelMesh, textureVertices) == 0x14); static_assert(offsetof(ModelMesh, faceNormals) == 0x18); static_assert(offsetof(ModelMesh, vertexNormals) == 0x1C); static_assert(offsetof(ModelMesh, indices) == 0x24); -static_assert(offsetof(ModelMesh, unknown_01A4) == 0x1A4); +static_assert(offsetof(ModelMesh, padding_01A4) == 0x1A4); #endif #endif diff --git a/Source/Resource/Models/ModelResourceV2.cpp b/Source/Resource/Models/ModelResourceV2.cpp index d974c301b..c07416733 100644 --- a/Source/Resource/Models/ModelResourceV2.cpp +++ b/Source/Resource/Models/ModelResourceV2.cpp @@ -14,7 +14,7 @@ struct ModelFaceRecord { /* 0000 */ std::uint16_t vertices[3]; /* 0006 */ std::uint16_t textureVertices[3]; /* 000C */ std::uint16_t texture; - /* 000E */ std::uint16_t unknown_000E; + /* 000E */ std::uint16_t padding_000E; /* 0010 */ std::uint32_t twoSided; /* 0014 */ std::uint32_t smoothing; }; diff --git a/Source/Resource/ResourceMgr.cpp b/Source/Resource/ResourceMgr.cpp index d792f6393..0d34f388f 100644 --- a/Source/Resource/ResourceMgr.cpp +++ b/Source/Resource/ResourceMgr.cpp @@ -43,7 +43,7 @@ __declspec(noinline) bool ResourceNameLess::operator()(const ResourceName* left, } // INLINED -ResourceMgr::ResourceMgr() : unknown_004C{} { +ResourceMgr::ResourceMgr() : padding_004C{} { InitializeCriticalSection(&this->m_lock); } diff --git a/Source/Resource/ResourceMgr.h b/Source/Resource/ResourceMgr.h index 3b1c75ce7..09e8186a5 100644 --- a/Source/Resource/ResourceMgr.h +++ b/Source/Resource/ResourceMgr.h @@ -54,7 +54,7 @@ private: /* 0020 */ std::vector> m_resources; /* 002C */ CRITICAL_SECTION m_lock; /* 0044 */ std::map m_aliases; - /* 004C */ std::uint32_t unknown_004C[17]; + /* 004C */ std::uint32_t padding_004C[17]; /* 0090 */ std::vector m_transient; void EraseTransient(CRes* resource); CRes* LoadNamed(const char* name); diff --git a/Source/Resource/World/GroundResource.h b/Source/Resource/World/GroundResource.h index e1831f75d..34614a7fd 100644 --- a/Source/Resource/World/GroundResource.h +++ b/Source/Resource/World/GroundResource.h @@ -39,7 +39,7 @@ public: /* 0110 */ int loaded; /* 0114 */ unsigned char major; /* 0115 */ unsigned char minor; - /* 0116 */ unsigned char unknown_0116[2]; + /* 0116 */ unsigned char padding_0116[2]; /* 0118 */ int width; /* 011C */ int height; /* 0120 */ float cellSize; diff --git a/Source/Resource/World/WorldResource.cpp b/Source/Resource/World/WorldResource.cpp index 82b7ff5b8..e39e6d6a5 100644 --- a/Source/Resource/World/WorldResource.cpp +++ b/Source/Resource/World/WorldResource.cpp @@ -265,7 +265,7 @@ bool C3dWorldRes::Load(const char* name) { switch (type) { case 1: { int animation; - int unknown; + int animationType; int modelIndex = -1; float speed; unsigned char flag; @@ -274,7 +274,7 @@ bool C3dWorldRes::Load(const char* name) { input.Read(lastName, 40); input.Read(&animation, sizeof(animation)); input.Read(&speed, sizeof(speed)); - input.Read(&unknown, sizeof(unknown)); + input.Read(&animationType, sizeof(animationType)); if (major > 2 || (major == 2 && minor >= 6 && build >= 186)) { input.Read(&flag, 1); @@ -294,7 +294,7 @@ bool C3dWorldRes::Load(const char* name) { } } else { animation = 0; - unknown = 0; + animationType = 0; speed = 1.0f; } @@ -308,7 +308,7 @@ bool C3dWorldRes::Load(const char* name) { std::strcpy(record->node, wire.node); record->animationSpeed = speed; record->animation = animation; - record->animationType = unknown; + record->animationType = animationType; std::memcpy(record->position, wire.position, sizeof(record->position)); std::memcpy(record->rotation, wire.rotation, sizeof(record->rotation)); std::memcpy(record->scale, wire.scale, sizeof(record->scale)); diff --git a/Source/Resource/World/WorldResource.h b/Source/Resource/World/WorldResource.h index f7c769812..b789675fa 100644 --- a/Source/Resource/World/WorldResource.h +++ b/Source/Resource/World/WorldResource.h @@ -22,7 +22,7 @@ struct WorldModelRecord { /* 00F4 */ float animationSpeed; /* 00F8 */ unsigned char legacyPosition[12]; /* 0104 */ unsigned char flag; - /* 0105 */ unsigned char unknown_0105[3]; + /* 0105 */ unsigned char padding_0105[3]; /* 0108 */ int index; }; @@ -81,10 +81,10 @@ public: /* 01AC */ float ambient[3]; /* 01B8 */ unsigned char major; /* 01B9 */ unsigned char minor; - /* 01BA */ unsigned char unknown_01BA[2]; + /* 01BA */ unsigned char padding_01BA[2]; /* 01BC */ int bounds[4]; /* 01CC */ unsigned char flag; - /* 01CD */ unsigned char unknown_01CD[3]; + /* 01CD */ unsigned char padding_01CD[3]; }; static_assert(sizeof(WorldModelRecord) == 268); diff --git a/Source/Script/LuaScript.cpp b/Source/Script/LuaScript.cpp index e1b3421eb..32c4031a0 100644 --- a/Source/Script/LuaScript.cpp +++ b/Source/Script/LuaScript.cpp @@ -57,7 +57,7 @@ class LuaScriptBag { public: void Add(std::string left, std::string right); - /* 0000 */ unsigned char unknown_0000[0x7C]; + /* 0000 */ unsigned char padding_0000[0x7C]; /* 007C */ std::vector> pairs; }; @@ -68,7 +68,7 @@ void LuaScriptBag::Add(std::string left, std::string right) { } struct CashShopBannerWindow { - /* 0000 */ unsigned char unknown_0000[0xBC]; + /* 0000 */ unsigned char padding_0000[0xBC]; /* 00BC */ LuaScriptBag* banners; /* 00C0 */ LuaScriptBag* banners2; }; diff --git a/Source/Security/NProtectGameGuardMgr.h b/Source/Security/NProtectGameGuardMgr.h index 386875097..189f1f74b 100644 --- a/Source/Security/NProtectGameGuardMgr.h +++ b/Source/Security/NProtectGameGuardMgr.h @@ -29,7 +29,7 @@ public: virtual ~CNProtectGameGuardMgr(); /* 0004 */ bool m_initialized; - /* 0008 */ unsigned int unknown_0008; + /* 0008 */ unsigned int padding_0008; /* 000C */ void* m_gameLib; /* 0010 */ bool m_hasError; /* 0014 */ std::string m_errorMessage; diff --git a/Source/Security/ReassemblyPacketMgr.cpp b/Source/Security/ReassemblyPacketMgr.cpp index c39631bbc..2761beab1 100644 --- a/Source/Security/ReassemblyPacketMgr.cpp +++ b/Source/Security/ReassemblyPacketMgr.cpp @@ -22,9 +22,9 @@ int CReassemblyPacketImpl::IsReady() { // OFFSET: 0x00B154E0 // FUNCTION: fn_18419 CReassemblyPacketImpl::CReassemblyPacketImpl() { - this->unknown_0004 = 0; - this->unknown_0008 = 0; - this->unknown_000C = 0; + this->padding_0004 = 0; + this->padding_0008 = 0; + this->padding_000C = 0; this->m_valid = true; } diff --git a/Source/Security/ReassemblyPacketMgr.h b/Source/Security/ReassemblyPacketMgr.h index e899e288f..73e4067db 100644 --- a/Source/Security/ReassemblyPacketMgr.h +++ b/Source/Security/ReassemblyPacketMgr.h @@ -16,9 +16,9 @@ public: int Notify(int event); /* 0000 */ bool m_valid; - /* 0004 */ int unknown_0004; - /* 0008 */ int unknown_0008; - /* 000C */ int unknown_000C; + /* 0004 */ int padding_0004; + /* 0008 */ int padding_0008; + /* 000C */ int padding_000C; }; class CReassemblyPacketMgr { @@ -50,7 +50,7 @@ extern CReassemblyPacketMgr* g_reassemblyPacketMgr; #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(CReassemblyPacketImpl) == 0x10); -static_assert(offsetof(CReassemblyPacketImpl, unknown_000C) == 0xC); +static_assert(offsetof(CReassemblyPacketImpl, padding_000C) == 0xC); static_assert(sizeof(CReassemblyPacketMgr) == 1); #endif diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index e2afa2760..e5ec66417 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -4427,7 +4427,7 @@ void UInCashWnd::DrawItems() { // OFFSET: 0x008E3C80 // FUNCTION: fn_12183 void UIMonsterDisplayWnd::OnCreate(int, int) { - this->unknown_00E4 = 0; + this->padding_00E4 = 0; this->titleText = LookupMessage(MSI_ITEM_NAME); this->AddCloseButton("", 0); } @@ -7343,7 +7343,7 @@ UISelectCartWnd::UISelectCartWnd() // OFFSET: 0x008C9280 // FUNCTION: fn_11979 UIStorePasswordInputWnd::UIStorePasswordInputWnd() - : UIFrameWnd(0), unknown_00BC(-1), unknown_00C0(2) { + : UIFrameWnd(0), padding_00BC(-1), padding_00C0(2) { std::memset(this->currentPassword, 0, sizeof(this->currentPassword)); std::memset(this->newPassword, 0, sizeof(this->newPassword)); std::memset(this->confirmPassword, 0, sizeof(this->confirmPassword)); @@ -7369,7 +7369,7 @@ UIStorePasswordInputWnd::UIStorePasswordInputWnd() // OFFSET: 0x008C8D40 // FUNCTION: fn_11972 UISecondPasswordInputWnd::UISecondPasswordInputWnd() - : UIStorePasswordInputWnd(), passwordLength(4), inputMode(0), unknown_0120(0), keypadButtons(), instructionText(nullptr) { + : UIStorePasswordInputWnd(), passwordLength(4), inputMode(0), padding_0120(0), keypadButtons(), instructionText(nullptr) { this->actionButtons[0] = nullptr; this->actionButtons[1] = nullptr; this->actionButtons[2] = nullptr; diff --git a/Source/UI/Buttons/UIBmpRadioBtn.h b/Source/UI/Buttons/UIBmpRadioBtn.h index 22bb0ce06..defcd8152 100644 --- a/Source/UI/Buttons/UIBmpRadioBtn.h +++ b/Source/UI/Buttons/UIBmpRadioBtn.h @@ -40,7 +40,7 @@ public: } bool SetBitmap(const char* name, int state); - void AddText(int id, int height, std::uint32_t color, bool bold, bool unknown, int x, int y); + void AddText(int id, int height, std::uint32_t color, bool bold, bool drawShadow, int x, int y); // INLINED void SetLabel(std::string label) { this->m_label = label; @@ -50,7 +50,7 @@ public: protected: /* 007C */ std::string m_names[4]; /* 00DC */ bool m_hovered; - /* 00DD */ unsigned char unknown_00DD[3]; + /* 00DD */ unsigned char padding_00DD[3]; /* 00E0 */ std::string m_tooltip; /* 00F8 */ bool m_disabled; /* 00FC */ int m_value; diff --git a/Source/UI/Buttons/UIBmpTextButton2.h b/Source/UI/Buttons/UIBmpTextButton2.h index 0d55b993f..389d1c6d8 100644 --- a/Source/UI/Buttons/UIBmpTextButton2.h +++ b/Source/UI/Buttons/UIBmpTextButton2.h @@ -9,7 +9,7 @@ struct BmpTextButtonLabel { /* 0000 */ std::string text; - /* 0018 */ int unknown_0018; + /* 0018 */ int padding_0018; /* 001C */ int x; /* 0020 */ int y; /* 0024 */ int height; diff --git a/Source/UI/Buttons/UIDescriptRace.h b/Source/UI/Buttons/UIDescriptRace.h index 6982396b1..2df7804a2 100644 --- a/Source/UI/Buttons/UIDescriptRace.h +++ b/Source/UI/Buttons/UIDescriptRace.h @@ -7,15 +7,15 @@ #include struct UIDescriptRaceText { - /* 0000 */ int unknown_0000; - /* 0004 */ int unknown_0004; + /* 0000 */ int padding_0000; + /* 0004 */ int padding_0004; /* 0008 */ std::string names[5]; /* 0080 */ std::string descriptions[5]; /* 00F8 */ std::string title; - /* 0110 */ int unknown_0110; - /* 0114 */ int unknown_0114; - /* 0118 */ std::string unknown_0118; - /* 0130 */ std::string unknown_0130; + /* 0110 */ int padding_0110; + /* 0114 */ int padding_0114; + /* 0118 */ std::string padding_0118; + /* 0130 */ std::string padding_0130; }; // VTABLE: vt_00998 @@ -30,7 +30,7 @@ public: /* 0120 */ int m_race; /* 0124 */ UIDescriptRaceText m_text; - /* 026C */ unsigned char unknown_026C[0x14]; + /* 026C */ unsigned char padding_026C[0x14]; /* 0280 */ unsigned char m_noRace; /* 0284 */ int m_frameIndex; /* 0288 */ std::uint32_t m_createTime; diff --git a/Source/UI/Buttons/UIItemTagButton.h b/Source/UI/Buttons/UIItemTagButton.h index d9b20ec37..49bc3b059 100644 --- a/Source/UI/Buttons/UIItemTagButton.h +++ b/Source/UI/Buttons/UIItemTagButton.h @@ -17,7 +17,7 @@ public: void OnMouseHover(int x, int y) override; /* 00F8 */ unsigned char itemPayload[0xF0]; - /* 01E8 */ unsigned char unknown_01E8[0x8]; + /* 01E8 */ unsigned char padding_01E8[0x8]; /* 01F0 */ int column; /* 01F4 */ int line; /* 01F8 */ int tipId; diff --git a/Source/UI/Buttons/UITVTextButton.h b/Source/UI/Buttons/UITVTextButton.h index 72d49dfbd..8ee2273b3 100644 --- a/Source/UI/Buttons/UITVTextButton.h +++ b/Source/UI/Buttons/UITVTextButton.h @@ -28,14 +28,14 @@ protected: /* 00B6 */ unsigned char mousePressed; /* 00B7 */ unsigned char m_border; /* 00B8 */ unsigned char m_fill; - /* 00B9 */ unsigned char unknown_00B9[0x3]; + /* 00B9 */ unsigned char padding_00B9[0x3]; /* 00BC */ std::uint32_t m_borderColor; /* 00C0 */ std::uint32_t m_fillColor; /* 00C4 */ std::uint32_t m_textColor; /* 00C8 */ std::uint32_t m_outlineColor; /* 00CC */ std::uint32_t m_highlightColor; /* 00D0 */ unsigned char m_outlined; - /* 00D1 */ unsigned char unknown_00D1[0x3]; + /* 00D1 */ unsigned char padding_00D1[0x3]; /* 00D4 */ int m_fontHeight; /* 00D8 */ int m_fontFamily; /* 00DC */ std::string displayText; diff --git a/Source/UI/Buttons/UITextButton.cpp b/Source/UI/Buttons/UITextButton.cpp index 2b9665f6d..27bdf7510 100644 --- a/Source/UI/Buttons/UITextButton.cpp +++ b/Source/UI/Buttons/UITextButton.cpp @@ -340,7 +340,7 @@ void UITVTextButton::SetLabel(std::string text) { // OFFSET: 0x0089CC30 // FUNCTION: fn_11592 -void UIBmpRadioBtn::AddText(int id, int height, std::uint32_t color, bool bold, bool unknown, int x, int y) { +void UIBmpRadioBtn::AddText(int id, int height, std::uint32_t color, bool bold, bool drawShadow, int x, int y) { UIBmpRadioBtnText text; text.id = id; text.x = x; @@ -348,7 +348,7 @@ void UIBmpRadioBtn::AddText(int id, int height, std::uint32_t color, bool bold, text.height = height; text.bold = bold; text.color = color; - text.drawShadow = unknown; + text.drawShadow = drawShadow; if (x == -1000) { const int textWidth = diff --git a/Source/UI/Buttons/UITextureButton.h b/Source/UI/Buttons/UITextureButton.h index 2a131e628..ef7024b44 100644 --- a/Source/UI/Buttons/UITextureButton.h +++ b/Source/UI/Buttons/UITextureButton.h @@ -12,8 +12,8 @@ public: void OnLBtnUp(int x, int y) override; void VisitChildren() override; - /* 00B4 */ int unknown_00B4; - /* 00B8 */ int unknown_00B8; + /* 00B4 */ int padding_00B4; + /* 00B8 */ int padding_00B8; /* 00BC */ std::string normalTexture; /* 00D4 */ std::string hoverTexture; diff --git a/Source/UI/Chat/UINewChatWnd.h b/Source/UI/Chat/UINewChatWnd.h index 97d08619b..39c76551b 100644 --- a/Source/UI/Chat/UINewChatWnd.h +++ b/Source/UI/Chat/UINewChatWnd.h @@ -51,7 +51,7 @@ public: /* 00D8 */ std::uint32_t m_listColor; /* 00DC */ unsigned char m_secondaryStateStorage[0x4]; /* 00E0 */ UIWindow* m_inputButtons[3]; - /* 00EC */ unsigned char unknown_00EC[0x4]; + /* 00EC */ unsigned char padding_00EC[0x4]; /* 00F0 */ int m_menuMode; /* 00F4 */ std::vector m_tabs; /* 0100 */ UIWindow* m_headerButtons[2]; @@ -65,7 +65,7 @@ public: /* 0124 */ int m_inputAreaHeight; /* 0128 */ UIWindow* m_headerButton; /* 012C */ UIWindow* m_chatModeButton; - /* 0130 */ unsigned char unknown_0130[0x8]; + /* 0130 */ unsigned char padding_0130[0x8]; /* 0138 */ UITabControl* m_tabControl; /* 013C */ UIWindow* m_suggestions; }; diff --git a/Source/UI/Chat/UISubChatHisWnd.h b/Source/UI/Chat/UISubChatHisWnd.h index aa0c27300..99902b98f 100644 --- a/Source/UI/Chat/UISubChatHisWnd.h +++ b/Source/UI/Chat/UISubChatHisWnd.h @@ -58,7 +58,7 @@ private: /* 00F0 */ int headerHeight; /* 00F4 */ int m_index; /* 00F8 */ bool m_options[25]; - /* 0111 */ unsigned char unknown_0111[3]; + /* 0111 */ unsigned char padding_0111[3]; /* 0114 */ std::string m_name; /* 012C */ UIEditCtrl* m_edit; }; diff --git a/Source/UI/Clan/UIClanWnd.cpp b/Source/UI/Clan/UIClanWnd.cpp index dba6dbd56..4e55ecaf3 100644 --- a/Source/UI/Clan/UIClanWnd.cpp +++ b/Source/UI/Clan/UIClanWnd.cpp @@ -45,7 +45,7 @@ void UIClanInfoManageWnd::OnCreate(int width, int height) { this->allyRow = -1; this->hostileRow = -1; if (g_clanInfo->m_hasClan) { - g_clanInfo->unknown_0034 = 1; + g_clanInfo->allyClanCount = 1; } this->LoadEmblem(); @@ -59,7 +59,7 @@ void UIClanInfoManageWnd::Paint() { std::memset(text, 0, sizeof(text)); std::sprintf(text, "%s : %s", LookupMessage(MSI_HOSTILITY_CLAN), g_clanInfo->m_clanName.c_str()); this->DrawTextAt(8, 49, text, 0, 0, 12, 0, 0, 0); - std::sprintf(text, "%s : %d", LookupMessage(MSI_ALLY_CLAN), g_clanInfo->unknown_0034); + std::sprintf(text, "%s : %d", LookupMessage(MSI_ALLY_CLAN), g_clanInfo->allyClanCount); this->DrawTextAt(8, 65, text, 0, 0, 12, 0, 0, 0); std::sprintf(text, "%s : %s", LookupMessage(MSI_VIEW_CLAN_MSG), g_clanInfo->m_masterName.c_str()); this->DrawTextAt(8, 81, text, 0, 0, 12, 0, 0, 0); diff --git a/Source/UI/Dialogs/UILoadingWnd.h b/Source/UI/Dialogs/UILoadingWnd.h index c8bec3046..c6ad86fe6 100644 --- a/Source/UI/Dialogs/UILoadingWnd.h +++ b/Source/UI/Dialogs/UILoadingWnd.h @@ -13,7 +13,7 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - /* 00B4 */ unsigned char unknown_00B4[0x4]; + /* 00B4 */ unsigned char padding_00B4[0x4]; /* 00B8 */ UIBarGraph2* m_progressBar; }; diff --git a/Source/UI/Dialogs/UIMiniMapWnd.h b/Source/UI/Dialogs/UIMiniMapWnd.h index 85391cd64..270fa85f5 100644 --- a/Source/UI/Dialogs/UIMiniMapWnd.h +++ b/Source/UI/Dialogs/UIMiniMapWnd.h @@ -37,7 +37,7 @@ public: /* 00C4 */ UIBitmapButton* memoButtons[20]; /* 0114 */ int memoCount; /* 0118 */ unsigned char dragging; - /* 0119 */ unsigned char unknown_0119[0x3]; + /* 0119 */ unsigned char padding_0119[0x3]; /* 011C */ UICheckBox* questCheckBox; /* 0120 */ UICheckBox* townCheckBox; /* 0124 */ UICheckBox* guildCheckBox; diff --git a/Source/UI/Dialogs/UIPasswordWnd.h b/Source/UI/Dialogs/UIPasswordWnd.h index 0120ba73f..ad598c9e6 100644 --- a/Source/UI/Dialogs/UIPasswordWnd.h +++ b/Source/UI/Dialogs/UIPasswordWnd.h @@ -39,10 +39,10 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - /* 00B4 */ unsigned char unknown_00B4[0x8]; - /* 00BC */ int unknown_00BC; - /* 00C0 */ int unknown_00C0; - /* 00C4 */ unsigned char unknown_00C4[0xC]; + /* 00B4 */ unsigned char padding_00B4[0x8]; + /* 00BC */ int padding_00BC; + /* 00C0 */ int padding_00C0; + /* 00C4 */ unsigned char padding_00C4[0xC]; /* 00D0 */ char currentPassword[9]; /* 00D9 */ char newPassword[9]; /* 00E2 */ char confirmPassword[9]; @@ -71,7 +71,7 @@ public: /* 010C */ int passwordLength; /* 0110 */ unsigned char m_digits[10]; /* 011C */ int inputMode; - /* 0120 */ int unknown_0120; + /* 0120 */ int padding_0120; /* 0124 */ UIBitmapButton* keypadButtons[11]; /* 0150 */ UIBitmapButton* actionButtons[5]; /* 0164 */ UIStaticText* instructionText; diff --git a/Source/UI/Dialogs/UIRestartWnd.h b/Source/UI/Dialogs/UIRestartWnd.h index 585ff5d98..d02f06875 100644 --- a/Source/UI/Dialogs/UIRestartWnd.h +++ b/Source/UI/Dialogs/UIRestartWnd.h @@ -10,7 +10,7 @@ public: int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; void OnCreate(int width, int height) override; - /* 00B4 */ unsigned char unknown_00B4[4]; + /* 00B4 */ unsigned char padding_00B4[4]; }; #endif diff --git a/Source/UI/Dialogs/UISayDialogWnd.h b/Source/UI/Dialogs/UISayDialogWnd.h index 968bd7694..6ead900c7 100644 --- a/Source/UI/Dialogs/UISayDialogWnd.h +++ b/Source/UI/Dialogs/UISayDialogWnd.h @@ -12,7 +12,7 @@ public: UISayDialogWnd(); /* 00B4 */ UIWindow* m_viewer; /* 00B8 */ std::list m_buttons; - /* 00C0 */ std::list unknown_00C0; + /* 00C0 */ std::list padding_00C0; /* 00C8 */ int m_responseMessage; /* 00CC */ int m_responseId; /* 00D0 */ WindowPlacement* m_placement; diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 4910913b9..0aec7eae0 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -1011,15 +1011,15 @@ void UIItemStoreSubWnd::DragAndDrop(int x, int y, std::intptr_t value) { // FUNCTION: fn_13274 void UIItemStoreWnd::DragAndDrop(int x, int y, std::intptr_t value) { char text[250]; - if (g_unknown_01738268) { - if (g_unknown_01738270 == 1) { + if (g_buyingStoreMode) { + if (g_buyingStoreNoPermission == 1) { std::memset(text, 0, 250); std::sprintf(text, LookupMessage(MSI_GUILD_STORAGE_PERMISSON_WARNING_MSG)); g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(text), 0xFF, 0, 0, 0); return; } - if (!g_unknown_0173826C && !g_unknown_01738270) { + if (!g_buyingStoreDbNumber && !g_buyingStoreNoPermission) { std::memset(text, 0, 250); std::sprintf(text, LookupMessage(MSI_BARGAINSALE_TOOLWND_DB_NUMBER)); g_windowMgr.SendNotice(UIM_PUSHINTOCHATHISTORY, reinterpret_cast(text), 0xFF, 0, 0, 0); @@ -7771,7 +7771,7 @@ UIItemStoreFindWnd::UIItemStoreFindWnd() : UIItemBaseWnd() { this->columns = 1; this->visibleRows = 3; this->scrollOverflow = 0; - this->unknown_0120 = 18; + this->padding_0120 = 18; } // OFFSET: 0x0096EB70 @@ -7783,7 +7783,7 @@ UIItemStoreSubWnd::UIItemStoreSubWnd() : UIItemBaseWnd() { this->columns = 1; this->visibleRows = 3; this->scrollOverflow = 0; - this->unknown_011C = 18; + this->padding_011C = 18; } // OFFSET: 0x0096EC60 @@ -7815,7 +7815,7 @@ UIItemStoreWnd::UIItemStoreWnd() : UIItemBaseWnd() { void UIItemStoreWnd::OnCreate(int width, int height) { this->title = new UIStaticText(); this->title->SetSize(70, 15); - this->title->SetText(LookupMessage(g_unknown_01738268 ? 2500 : 169), 0); + this->title->SetText(LookupMessage(g_buyingStoreMode ? 2500 : 169), 0); this->title->Move(16, 2); this->title->shadow = 1; this->AddChild(this->title); @@ -8099,7 +8099,7 @@ UINoticeMessageBox_LockSellItem::UINoticeMessageBox_LockSellItem() : UIFrameWnd( // OFFSET: 0x0096FB70 // FUNCTION: fn_13238 UIItemStoreWnd::~UIItemStoreWnd() { - g_unknown_01738268 = 0; + g_buyingStoreMode = 0; } // OFFSET: 0x0096FC10 @@ -11705,7 +11705,7 @@ int UIMerchantShopMakeWnd::SendMsg(UIWindow* sender, int message, std::intptr_t error = 602; goto showError; } - g_session.SetItem1768Unknown0014(i, price); + g_session.SetMerchantPurchaseSavedPrice(i, price); } if (this->mode != 0) { for (int i = 0; i < this->slotCount; ++i) { diff --git a/Source/UI/Edit/UIEditCtrl.h b/Source/UI/Edit/UIEditCtrl.h index 5391f4f68..a7fa1206b 100644 --- a/Source/UI/Edit/UIEditCtrl.h +++ b/Source/UI/Edit/UIEditCtrl.h @@ -262,8 +262,8 @@ public: protected: public: - /* 0084 */ int unknown_0084; - /* 0088 */ int unknown_0088; + /* 0084 */ int padding_0084; + /* 0088 */ int padding_0088; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/Edit/UIEditVariants.cpp b/Source/UI/Edit/UIEditVariants.cpp index a3cd8ea9b..4a720e347 100644 --- a/Source/UI/Edit/UIEditVariants.cpp +++ b/Source/UI/Edit/UIEditVariants.cpp @@ -1109,8 +1109,8 @@ void UIEditCtrl3::ClearLineState() { // OFFSET: 0x0086E7D0 // FUNCTION: fn_11077 UIShowAndEditTimeCtrl::UIShowAndEditTimeCtrl() : UIWindow(0) { - this->unknown_0084 = 0; - this->unknown_0088 = 0; + this->padding_0084 = 0; + this->padding_0088 = 0; } #include "UI/Edit/UIItemTagCtrl.h" diff --git a/Source/UI/Enchant/EnchantUI.h b/Source/UI/Enchant/EnchantUI.h index 4aa876f98..2041f53ba 100644 --- a/Source/UI/Enchant/EnchantUI.h +++ b/Source/UI/Enchant/EnchantUI.h @@ -37,7 +37,7 @@ public: /* 00F4 */ CUITextViewer* textViewer; /* 00F8 */ uint64_t group; /* 0100 */ EnchantInfo* enchantInfo; - /* 0104 */ int unknown_0104; + /* 0104 */ int padding_0104; // INLINED CUIEnchantUI() diff --git a/Source/UI/GameSettings/GameSettingsUI.h b/Source/UI/GameSettings/GameSettingsUI.h index c5889755d..69c8b318b 100644 --- a/Source/UI/GameSettings/GameSettingsUI.h +++ b/Source/UI/GameSettings/GameSettingsUI.h @@ -57,7 +57,7 @@ public: /* 0090 */ int width; /* 0094 */ int itemHeight; /* 0098 */ int visibleItems; - /* 009C */ int unknown_009C; + /* 009C */ int padding_009C; /* 00A0 */ std::function onSelect; /* 00C8 */ std::function onChange; }; diff --git a/Source/UI/Guild/UIGuildWnd.cpp b/Source/UI/Guild/UIGuildWnd.cpp index f917b8a51..2f7abfabe 100644 --- a/Source/UI/Guild/UIGuildWnd.cpp +++ b/Source/UI/Guild/UIGuildWnd.cpp @@ -60,7 +60,7 @@ int g_guildTotalInfoRowHeight = 19; int g_guildTotalInfoColumnWidths[4] = {151, 82, 70, 70}; struct GuildTotalInfoEntry { - /* 0000 */ int unknown_0000; + /* 0000 */ int padding_0000; /* 0004 */ std::string name; /* 001C */ int level; /* 0020 */ int memberCount; @@ -269,7 +269,7 @@ UIGuildBanishedMemberWnd::UIGuildBanishedMemberWnd() // OFFSET: 0x009539C0 // FUNCTION: fn_12997 UIGuildInfoManageWnd::UIGuildInfoManageWnd() - : UIGuildWnd(), emblemFiles(), emblemMenuEntries(), unknown_00EC(0), unknown_00F0(0), m_guildId(g_guildInfo.m_guildId) { + : UIGuildWnd(), emblemFiles(), emblemMenuEntries(), padding_00EC(0), padding_00F0(0), m_guildId(g_guildInfo.m_guildId) { } // OFFSET: 0x00953B00 @@ -2070,7 +2070,7 @@ int UIGuildSkillWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a1, st if (level > skill.level) { level = skill.level; } - g_session.m_skillBundle.SetUnknownValue(skill.id, level); + g_session.m_skillBundle.SetSkillValue(skill.id, level); this->Invalidate(); } return 0; @@ -2091,7 +2091,7 @@ int UIGuildSkillWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a1, st if (level > skill.level) { level = skill.level; } - g_session.m_skillBundle.SetUnknownValue(skill.id, level); + g_session.m_skillBundle.SetSkillValue(skill.id, level); this->Invalidate(); } return 0; diff --git a/Source/UI/Guild/UIGuildWnd.h b/Source/UI/Guild/UIGuildWnd.h index 7ac48a10d..0ceeaa5c3 100644 --- a/Source/UI/Guild/UIGuildWnd.h +++ b/Source/UI/Guild/UIGuildWnd.h @@ -115,8 +115,8 @@ protected: /* 00D4 */ UIBitmapButton* m_disbandButton; /* 00D8 */ std::list emblemFiles; /* 00E0 */ std::vector emblemMenuEntries; - /* 00EC */ int unknown_00EC; - /* 00F0 */ int unknown_00F0; + /* 00EC */ int padding_00EC; + /* 00F0 */ int padding_00F0; /* 00F4 */ std::uint32_t m_guildId; /* 00F8 */ int m_allyRow; /* 00FC */ int m_hostileRow; @@ -240,7 +240,7 @@ protected: CSkillInfo VisibleSkillAt(int row); void UpdateSkillButtons(); - /* 00D0 */ unsigned char unknown_00D0[0x04]; + /* 00D0 */ unsigned char padding_00D0[0x04]; /* 00D4 */ UIScrollBar* m_scrollBar; /* 00D8 */ UIBitmapButton* m_actionButtons[2]; /* 00E0 */ UIBitmapButton* m_nextButtons[7]; diff --git a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp index aceb4bb8f..679399668 100644 --- a/Source/UI/Item/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Item/UIEquipmentPropertiesWnd.cpp @@ -33,7 +33,7 @@ public: void SetWindow(UIWindow* window); void GetDescriptions(const int& group, std::list& lines); - /* 0000 */ unsigned char unknown_0000[0x1FC]; + /* 0000 */ unsigned char padding_0000[0x1FC]; }; // INLINED @@ -234,8 +234,8 @@ bool CUIEquipmentPropertiesWnd::IsTransmitMouseInput() { template <> CUIListBoxEx::CUIListBoxEx() : CUIControl(), hoverImage(), pressedImage(), disabledImage(), imageNames(), disabledName(), scrollBar(nullptr), - itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), unknown_00C5{}, items(), data(), - selected(static_cast(-1)), selectionFlag(1), rebind(0), unknown_00E2{}, onSelect(), binder() { + itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), padding_00C5{}, items(), data(), + selected(static_cast(-1)), selectionFlag(1), rebind(0), padding_00E2{}, onSelect(), binder() { } // OFFSET: 0x00A08680 diff --git a/Source/UI/Item/UIItemStoreFindWnd.h b/Source/UI/Item/UIItemStoreFindWnd.h index 82a5250b2..8bf1dcfb6 100644 --- a/Source/UI/Item/UIItemStoreFindWnd.h +++ b/Source/UI/Item/UIItemStoreFindWnd.h @@ -29,19 +29,19 @@ public: void OnCreate(int width, int height) override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - /* 00F0 */ unsigned char unknown_00F0[0xC]; + /* 00F0 */ unsigned char padding_00F0[0xC]; /* 00FC */ UIBitmapButton* closeButton; - /* 0100 */ unsigned char unknown_0100[0x14]; + /* 0100 */ unsigned char padding_0100[0x14]; /* 0114 */ UIResizer* resizeHandle; /* 0118 */ UIStaticText* title; - /* 011C */ unsigned char unknown_011C[0x4]; - /* 0120 */ int unknown_0120; + /* 011C */ unsigned char padding_011C[0x4]; + /* 0120 */ int padding_0120; /* 0124 */ std::string statusText; /* 013C */ std::string searchText; /* 0154 */ ItemStoreFindWndInfo* saved; - /* 0158 */ unsigned char unknown_0158[0x4]; + /* 0158 */ unsigned char padding_0158[0x4]; /* 015C */ bool sorted; - /* 015D */ unsigned char unknown_015D[0x7]; + /* 015D */ unsigned char padding_015D[0x7]; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/Item/UIItemStoreSubWnd.h b/Source/UI/Item/UIItemStoreSubWnd.h index e9372cca0..924079dea 100644 --- a/Source/UI/Item/UIItemStoreSubWnd.h +++ b/Source/UI/Item/UIItemStoreSubWnd.h @@ -40,17 +40,17 @@ public: bool FilterByName3(std::string query); void OnCreate(int width, int height) override; - /* 00F0 */ unsigned char unknown_00F0[0x20]; + /* 00F0 */ unsigned char padding_00F0[0x20]; /* 0110 */ UIResizer* resizeHandle; /* 0114 */ UIStaticText* title; - /* 0118 */ unsigned char unknown_0118[0x04]; - /* 011C */ int unknown_011C; + /* 0118 */ unsigned char padding_0118[0x04]; + /* 011C */ int padding_011C; /* 0120 */ std::string footerText; /* 0138 */ std::string nameFilter; /* 0150 */ ItemStoreFindSlotInfo* saved; /* 0154 */ int tabIndex; /* 0158 */ unsigned char sortEnabled; - /* 0159 */ unsigned char unknown_0159[7]; + /* 0159 */ unsigned char padding_0159[7]; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/Item/UIItemStoreWnd.h b/Source/UI/Item/UIItemStoreWnd.h index 87cbd9d56..3a1f1213f 100644 --- a/Source/UI/Item/UIItemStoreWnd.h +++ b/Source/UI/Item/UIItemStoreWnd.h @@ -38,7 +38,7 @@ public: /* 0140 */ UIWindow* m_searchWindow; /* 0144 */ std::string m_capacityText; /* 015C */ UIStaticText* title; - /* 0160 */ unsigned char unknown_0160[0x04]; + /* 0160 */ unsigned char padding_0160[0x04]; /* 0164 */ ItemStoreFindListInfo* saved; /* 0168 */ UITab* tabBar; /* 016C */ int m_sortOptionA; diff --git a/Source/UI/Item/UIParaItemShopWnd.cpp b/Source/UI/Item/UIParaItemShopWnd.cpp index a1d7d5688..17a1309a3 100644 --- a/Source/UI/Item/UIParaItemShopWnd.cpp +++ b/Source/UI/Item/UIParaItemShopWnd.cpp @@ -342,11 +342,11 @@ int UIParaItemPurchaseWnd::SendMsg(UIWindow* sender, int message, std::intptr_t if (item.quantity > 0) { std::uint16_t weight; if (item.flags[3] == 1) { - const std::uint16_t added = g_session.GetItem1718Unknown006COf(item) * static_cast(item.quantity); - weight = added + g_session.SumItem1720Unknown006C(); + const std::uint16_t added = g_session.GetShopItemPriceFactor(item) * static_cast(item.quantity); + weight = added + g_session.SumPurchasePriceFactor(); } else { - const std::uint16_t added = g_session.GetItem1718Unknown006CByItemId(item) * static_cast(item.quantity); - weight = added + g_session.SumItem1720Unknown006CByItemId(); + const std::uint16_t added = g_session.GetShopItemPriceFactorByItemId(item) * static_cast(item.quantity); + weight = added + g_session.SumPurchasePriceFactorByItemId(); } if (!affordable) { diff --git a/Source/UI/Items/UIEquipWnd.h b/Source/UI/Items/UIEquipWnd.h index ddef1f43f..3660fb1c4 100644 --- a/Source/UI/Items/UIEquipWnd.h +++ b/Source/UI/Items/UIEquipWnd.h @@ -29,7 +29,7 @@ public: /* 00D8 */ int contentOffset; /* 00DC */ UICheckBox* allowViewCheck; /* 00E0 */ UICheckBox* swapModeCheck; - /* 00E4 */ unsigned char unknown_00E4[0x08]; + /* 00E4 */ unsigned char padding_00E4[0x08]; /* 00EC */ UITabControl* m_tabs; /* 00F0 */ int m_page; /* 00F4 */ int m_contentTop; @@ -43,7 +43,7 @@ public: /* 0130 */ UIBitmapButton* unequipButton; /* 0134 */ UIWindow* m_scrollBar; /* 0138 */ UIWindow* damageSkinButtons[6]; - /* 0150 */ int unknown_0150; + /* 0150 */ int padding_0150; /* 0154 */ int m_firstSlot; /* 0158 */ int m_hoverSlot; /* 015C */ int damageSkinMode; diff --git a/Source/UI/Items/UIExchangeWnd.h b/Source/UI/Items/UIExchangeWnd.h index e9588ee5d..1ad919ddf 100644 --- a/Source/UI/Items/UIExchangeWnd.h +++ b/Source/UI/Items/UIExchangeWnd.h @@ -15,7 +15,7 @@ public: /* 00B4 */ UIWindow* m_buttons[3]; /* 00C0 */ UIEditCtrl* zenyEdit; /* 00C4 */ UIWindow* m_scrollBar; - /* 00C8 */ unsigned char unknown_00C8[0x04]; + /* 00C8 */ unsigned char padding_00C8[0x04]; /* 00CC */ int isLocalTrader; /* 00D0 */ int localConfirmed; /* 00D4 */ int remoteConfirmed; @@ -26,10 +26,10 @@ public: /* 00F0 */ std::string partnerName; /* 0108 */ int partnerId; /* 010C */ short partnerLevel; - /* 010E */ unsigned char unknown_010E[0x04]; + /* 010E */ unsigned char padding_010E[0x04]; /* 0112 */ short m_rowHeight; /* 0114 */ short m_hoverX; - /* 0116 */ unsigned char unknown_0116[0x02]; + /* 0116 */ unsigned char padding_0116[0x02]; /* 0118 */ UICheckBox* screenshotCheckBox; /* 011C */ unsigned char takeScreenshot; /* 0120 */ int m_moneyLength; diff --git a/Source/UI/Items/UIItemCollectionWnd.h b/Source/UI/Items/UIItemCollectionWnd.h index fa99c9f50..5316a355a 100644 --- a/Source/UI/Items/UIItemCollectionWnd.h +++ b/Source/UI/Items/UIItemCollectionWnd.h @@ -30,15 +30,15 @@ public: __declspec(property(get = ItemIdText)) std::string& m_itemIdText; - /* 00B4 */ unsigned char unknown_00B4[0x4]; + /* 00B4 */ unsigned char padding_00B4[0x4]; /* 00B8 */ ITEM_INFO m_item; /* 01B0 */ UITextViewer* m_viewer; /* 01B4 */ UIBitmapButton* m_viewButton; /* 01B8 */ UISpriteButton* m_readButtons[2]; /* 01C0 */ std::uint32_t m_previewTick; /* 01C4 */ std::string m_bitmapName; - /* 01DC */ std::string unknown_01DC; - /* 01F4 */ unsigned char unknown_01F4[0x4]; + /* 01DC */ std::string padding_01DC; + /* 01F4 */ unsigned char padding_01F4[0x4]; /* 01F8 */ int m_kind; /* 01FC */ int m_optionCount; /* 0200 */ WindowPlacement* m_placement; @@ -56,7 +56,7 @@ public: /* 023C */ UIBasicButton* m_withdrawButton; /* 0240 */ std::map> m_cardTexts; /* 0248 */ int m_extraHeight; - /* 024C */ unsigned char unknown_024C[0x4]; + /* 024C */ unsigned char padding_024C[0x4]; void Move(int x, int y) override; void OnProcess() override; diff --git a/Source/UI/Items/UIItemRepairWnd.h b/Source/UI/Items/UIItemRepairWnd.h index dba178dec..db1d5e7a9 100644 --- a/Source/UI/Items/UIItemRepairWnd.h +++ b/Source/UI/Items/UIItemRepairWnd.h @@ -13,7 +13,7 @@ class UIListBox; struct UIItemRepairEntry { /* 0000 */ std::int16_t index; /* 0002 */ std::int32_t itemId; - /* 0006 */ unsigned char unknown_0006[0x12]; + /* 0006 */ unsigned char padding_0006[0x12]; }; #pragma pack(pop) diff --git a/Source/UI/Items/UISwapEquipmentWnd.h b/Source/UI/Items/UISwapEquipmentWnd.h index dd0f74532..56fec834c 100644 --- a/Source/UI/Items/UISwapEquipmentWnd.h +++ b/Source/UI/Items/UISwapEquipmentWnd.h @@ -37,7 +37,7 @@ public: void DrawEquipmentSlots(); protected: - /* 00B4 */ std::uint32_t unknown_00B4; + /* 00B4 */ std::uint32_t padding_00B4; /* 00B8 */ UISwapBitmapButton* m_swapButton; /* 00BC */ int equipmentPage; /* 00C0 */ std::uint32_t previewTick; diff --git a/Source/UI/Lists/TableBox.cpp b/Source/UI/Lists/TableBox.cpp index 5ae39c380..9b6ea0b62 100644 --- a/Source/UI/Lists/TableBox.cpp +++ b/Source/UI/Lists/TableBox.cpp @@ -2,10 +2,10 @@ // OFFSET: 0x0086C120 // FUNCTION: fn_11021 -TableBox::TableBox() : UIWindow(0), unknown_007C(), borderColor(0xFFFFFF) { +TableBox::TableBox() : UIWindow(0), padding_007C(), borderColor(0xFFFFFF) { } // OFFSET: 0x0086EE30 // FUNCTION: fn_11084 -UITableBox::UITableBox() : UIWindow(0), unknown_007C(0), unknown_0080(0), unknown_0084(0) { +UITableBox::UITableBox() : UIWindow(0), padding_007C(0), padding_0080(0), padding_0084(0) { } diff --git a/Source/UI/Lists/TableBox.h b/Source/UI/Lists/TableBox.h index de340bdc2..51aa1d710 100644 --- a/Source/UI/Lists/TableBox.h +++ b/Source/UI/Lists/TableBox.h @@ -10,7 +10,7 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - /* 007C */ unsigned char unknown_007C[0x4]; + /* 007C */ unsigned char padding_007C[0x4]; /* 0080 */ std::uint32_t borderColor; }; @@ -21,9 +21,9 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - /* 007C */ int unknown_007C; - /* 0080 */ int unknown_0080; - /* 0084 */ int unknown_0084; + /* 007C */ int padding_007C; + /* 0080 */ int padding_0080; + /* 0084 */ int padding_0084; }; #endif diff --git a/Source/UI/Lists/UIListBox.h b/Source/UI/Lists/UIListBox.h index 6cada3682..a085382ed 100644 --- a/Source/UI/Lists/UIListBox.h +++ b/Source/UI/Lists/UIListBox.h @@ -47,7 +47,7 @@ public: /* 00B0 */ UIScrollBar* horizontalBar; /* 00B4 */ int transparent; /* 00B8 */ int lineHeight; - /* 00BC */ int unknown_00BC; + /* 00BC */ int plainTextMode; /* 00C0 */ std::uint32_t selectionColor; /* 00C4 */ unsigned char selectable; /* 00C8 */ std::uint32_t textColor; diff --git a/Source/UI/Lists/UIListBoxEx.h b/Source/UI/Lists/UIListBoxEx.h index d2d90ac9b..d73e5ed14 100644 --- a/Source/UI/Lists/UIListBoxEx.h +++ b/Source/UI/Lists/UIListBoxEx.h @@ -44,7 +44,7 @@ public: /* 00AC */ UIScrollBar* horizontalBar; /* 00B0 */ int transparent; /* 00B4 */ int lineHeight; - /* 00B8 */ int unknown_00B8; + /* 00B8 */ int padding_00B8; /* 00BC */ std::uint32_t selectionColor; protected: diff --git a/Source/UI/Lists/UIListBoxID.h b/Source/UI/Lists/UIListBoxID.h index dd3e387a9..5e1b9f61c 100644 --- a/Source/UI/Lists/UIListBoxID.h +++ b/Source/UI/Lists/UIListBoxID.h @@ -43,7 +43,7 @@ public: /* 00AC */ UIScrollBar* horizontalBar; /* 00B0 */ int transparent; /* 00B4 */ int lineHeight; - /* 00B8 */ unsigned char unknown_00B8[0x4]; + /* 00B8 */ unsigned char padding_00B8[0x4]; /* 00BC */ std::uint32_t selectionColor; }; diff --git a/Source/UI/Lists/UIListBoxTemplate.h b/Source/UI/Lists/UIListBoxTemplate.h index cbf98877b..eb051ca2f 100644 --- a/Source/UI/Lists/UIListBoxTemplate.h +++ b/Source/UI/Lists/UIListBoxTemplate.h @@ -302,7 +302,7 @@ public: /* 00C4 */ std::list items; /* 00CC */ T* selected; /* 00D0 */ unsigned char locked; - /* 00D1 */ unsigned char unknown_00D1[0x07]; + /* 00D1 */ unsigned char padding_00D1[0x07]; /* 00D8 */ std::function onSelect; }; @@ -521,13 +521,13 @@ public: /* 00BC */ int itemX; /* 00C0 */ int itemY; /* 00C4 */ unsigned char layoutFlag; - /* 00C5 */ unsigned char unknown_00C5[0x03]; + /* 00C5 */ unsigned char padding_00C5[0x03]; /* 00C8 */ std::vector items; /* 00D4 */ std::list data; /* 00DC */ unsigned int selected; /* 00E0 */ unsigned char selectionFlag; /* 00E1 */ unsigned char rebind; - /* 00E2 */ unsigned char unknown_00E2[0x06]; + /* 00E2 */ unsigned char padding_00E2[0x06]; /* 00E8 */ std::function onSelect; /* 0110 */ std::function binder; }; diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index 65d40e92f..7c5e6d78d 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -1767,7 +1767,7 @@ bool UIGage::CanHitTest() { // OFFSET: 0x0087C3F0 // FUNCTION: fn_11253 void UITabControl::Configure( - int layout, int tabHeight, int tabPadding, unsigned char uniformWidths, unsigned char unknownA9, unsigned char unknownA8, std::uint32_t activeFillColor, + int layout, int tabHeight, int tabPadding, unsigned char uniformWidths, unsigned char skipTabFill, unsigned char allowTabRename, std::uint32_t activeFillColor, std::uint32_t inactiveFillColor, std::uint32_t activeBorderColor, std::uint32_t inactiveBorderColor, std::uint32_t activeTextColor, std::uint32_t inactiveTextColor ) { @@ -1777,8 +1777,8 @@ void UITabControl::Configure( this->tabHeight = tabHeight; this->tabPadding = tabPadding; this->uniformWidths = uniformWidths; - this->skipTabFill = unknownA9; - this->allowTabRename = unknownA8; + this->skipTabFill = skipTabFill; + this->allowTabRename = allowTabRename; this->activeFillColor = activeFillColor ? activeFillColor : 0xFFFFFF; this->inactiveFillColor = inactiveFillColor ? inactiveFillColor : 0xFFFFFF; this->activeBorderColor = activeBorderColor ? activeBorderColor : 0xC3C3C3; @@ -1966,8 +1966,8 @@ std::string UIChatHisBox::RenderItemLinks(const char* lineText, std::string& sou this->TextWidth(label.c_str(), 0, 0, 12, 0, 0) + 1, button->geometry.height); - const std::string unknownName = LookupMessage(MSI_NAMELESS_USER); - if (label.find(unknownName) != std::string::npos) { + const std::string namelessUserName = LookupMessage(MSI_NAMELESS_USER); + if (label.find(namelessUserName) != std::string::npos) { std::uint32_t creator[2]; std::memcpy(creator, item.cards + 8, sizeof(creator)); button->tipId = creator[0] + (creator[1] << 16); diff --git a/Source/UI/Lists/UITabControl.h b/Source/UI/Lists/UITabControl.h index 36f152920..615b2e748 100644 --- a/Source/UI/Lists/UITabControl.h +++ b/Source/UI/Lists/UITabControl.h @@ -26,7 +26,7 @@ public: void SetFlag(int index, bool value); __declspec(noinline) void HideEdit(); void Configure( - int layout, int tabHeight, int tabPadding, unsigned char uniformWidths, unsigned char unknownA9, unsigned char unknownA8, std::uint32_t activeFillColor, + int layout, int tabHeight, int tabPadding, unsigned char uniformWidths, unsigned char skipTabFill, unsigned char allowTabRename, std::uint32_t activeFillColor, std::uint32_t inactiveFillColor, std::uint32_t activeBorderColor, std::uint32_t inactiveBorderColor, std::uint32_t activeTextColor, std::uint32_t inactiveTextColor ); @@ -44,7 +44,7 @@ public: /* 0084 */ int tabHeight; /* 0088 */ int tabPadding; /* 008C */ unsigned char uniformWidths; - /* 008D */ unsigned char unknown_008D[0x3]; + /* 008D */ unsigned char padding_008D[0x3]; /* 0090 */ std::uint32_t activeFillColor; /* 0094 */ std::uint32_t inactiveFillColor; /* 0098 */ std::uint32_t activeBorderColor; diff --git a/Source/UI/Lists/UITagListBox.cpp b/Source/UI/Lists/UITagListBox.cpp index a1cab7ddb..bc42f7700 100644 --- a/Source/UI/Lists/UITagListBox.cpp +++ b/Source/UI/Lists/UITagListBox.cpp @@ -84,7 +84,7 @@ void UITagListBox::Paint() { } if (first < end) { - if ((this->unknown_00BC & 255) == 0) { + if ((this->plainTextMode & 255) == 0) { for (int index = first; index < end; ++index) { const std::string& line = this->lines[index]; const int y = (index - first) * this->lineHeight + 4; @@ -391,7 +391,7 @@ void UITagListBox::AppendText(std::intptr_t argument1, std::intptr_t argument2, this->AddLine(lines[index].c_str()); } - this->unknown_00BC = (this->unknown_00BC & ~255) | 1; + this->plainTextMode = (this->plainTextMode & ~255) | 1; } else { if (argument4 != 0) { int extra = 0; @@ -409,7 +409,7 @@ void UITagListBox::AppendText(std::intptr_t argument1, std::intptr_t argument2, this->AppendTaggedLines(parsed, tags, width == 0 ? 35 : width); } - this->unknown_00BC &= ~255; + this->plainTextMode &= ~255; } this->Invalidate(); diff --git a/Source/UI/Lists/UITreeView.h b/Source/UI/Lists/UITreeView.h index 82277f6f6..c4f4cd93f 100644 --- a/Source/UI/Lists/UITreeView.h +++ b/Source/UI/Lists/UITreeView.h @@ -17,10 +17,10 @@ struct UITreeNode { /* 0004 */ int expanded; /* 0008 */ int icon; /* 000C */ char name[0x100]; - /* 010C */ unsigned char unknown_010C[0x5E]; + /* 010C */ unsigned char padding_010C[0x5E]; /* 016A */ unsigned char draggable; /* 016B */ unsigned char container; - /* 016C */ unsigned char unknown_016C[0x4]; + /* 016C */ unsigned char padding_016C[0x4]; /* 0170 */ UITreeNode* parent; /* 0174 */ UITVBitmapButton* expandButton; /* 0178 */ UITVBitmapButton* collapseButton; diff --git a/Source/UI/Lists/UIVScrollBar.h b/Source/UI/Lists/UIVScrollBar.h index 893d01ec5..f561c0ea4 100644 --- a/Source/UI/Lists/UIVScrollBar.h +++ b/Source/UI/Lists/UIVScrollBar.h @@ -52,7 +52,7 @@ public: /* 00A9 */ unsigned char hidden; /* 00AA */ unsigned char transparent; /* 00AC */ std::string backgroundName; - /* 00C4 */ int unknown_00C4; + /* 00C4 */ int padding_00C4; /* 00C8 */ std::function onChange; }; diff --git a/Source/UI/Navigation/UINavigationV4Wnd.h b/Source/UI/Navigation/UINavigationV4Wnd.h index 4faa4de7c..28c6724de 100644 --- a/Source/UI/Navigation/UINavigationV4Wnd.h +++ b/Source/UI/Navigation/UINavigationV4Wnd.h @@ -70,10 +70,10 @@ public: /* 0100 */ UIWindow* moveButton; /* 0104 */ std::vector routeFiles; /* 0110 */ NavigationWindowInfo* info; - /* 0114 */ int unknown_0114; + /* 0114 */ int padding_0114; /* 0118 */ int noticeUntil; /* 011C */ int animationDuration; - /* 0120 */ unsigned char unknown_0120[4]; + /* 0120 */ unsigned char padding_0120[4]; }; class UIStaticBitmap; diff --git a/Source/UI/Navigation/UIPrivateAirplaneWnd.h b/Source/UI/Navigation/UIPrivateAirplaneWnd.h index 0a112c2c2..01b1427df 100644 --- a/Source/UI/Navigation/UIPrivateAirplaneWnd.h +++ b/Source/UI/Navigation/UIPrivateAirplaneWnd.h @@ -18,7 +18,7 @@ public: int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; protected: - /* 00B4 */ void* unknown_controls; + /* 00B4 */ void* padding_00B4; /* 00B8 */ std::string m_text; /* 00D0 */ std::vector m_buttons; }; diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index 25444150a..da1e1a402 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -43,7 +43,7 @@ namespace { // OFFSET: 0x007BAC40 // FUNCTION: fn_09274 UIAdvenPartyBoardWnd::UIAdvenPartyBoardWnd() - : UIFrameWnd(0), unknown_0104(0), unknown_0108(0), page(1), totalPages(1), unknown_0114(1), unknown_0118(0), selectedType(0) { + : UIFrameWnd(0), padding_0104(0), padding_0108(0), page(1), totalPages(1), padding_0114(1), padding_0118(0), selectedType(0) { } UIAdvenPartyBoardWnd::~UIAdvenPartyBoardWnd() = default; diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.h b/Source/UI/Party/UIAdvenPartyBoardWnd.h index 2803d71d3..e22e5013a 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.h +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.h @@ -36,7 +36,7 @@ public: void SetOwnParty(CAdvenPartyInfo value); /* 00B4 */ UIStaticText* pageText; - /* 00B8 */ UIWindow* unknown_00B8; + /* 00B8 */ UIWindow* padding_00B8; /* 00BC */ UIBitmapButton* refresh; /* 00C0 */ UIEditCtrl* memo; /* 00C4 */ UIPartyInfoWnd* rows[10]; @@ -45,20 +45,20 @@ public: /* 00F4 */ UIBasicButton* stop; /* 00F8 */ UIBitmapButton* previous; /* 00FC */ UIBitmapButton* next; - /* 0100 */ int unknown_0100; - /* 0104 */ int unknown_0104; - /* 0108 */ int unknown_0108; + /* 0100 */ int padding_0100; + /* 0104 */ int padding_0104; + /* 0108 */ int padding_0108; /* 010C */ int page; /* 0110 */ int totalPages; - /* 0114 */ unsigned char unknown_0114; - /* 0118 */ int unknown_0118; - /* 011C */ std::uint32_t unknown_011C; + /* 0114 */ unsigned char padding_0114; + /* 0118 */ int padding_0118; + /* 011C */ std::uint32_t padding_011C; /* 0120 */ AdvenPartyBoardWndInfo* saved; /* 0124 */ UIEditCtrl* minimum; /* 0128 */ UIEditCtrl* maximum; /* 012C */ UIJobSlotButton* jobs[4]; /* 013C */ UIComboBoxDef2Wnd* types; - /* 0140 */ std::vector unknown_0140; + /* 0140 */ std::vector padding_0140; /* 014C */ int selectedType; /* 0150 */ unsigned char searching; diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.h b/Source/UI/Party/UIRequestJoinPartyWnd.h index e17c863ba..5666f6045 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.h +++ b/Source/UI/Party/UIRequestJoinPartyWnd.h @@ -23,12 +23,12 @@ public: /* 00B4 */ UITextViewer* details; /* 00B8 */ UITextViewer* blockText; /* 00BC */ UICheckBox* block; - /* 00C0 */ std::uint32_t unknown_00C0; - /* 00C4 */ std::uint32_t unknown_00C4; - /* 00C8 */ std::uint32_t unknown_00C8; - /* 00CC */ std::uint32_t unknown_00CC; - /* 00D0 */ std::uint32_t unknown_00D0; - /* 00D4 */ std::uint32_t unknown_00D4; + /* 00C0 */ std::uint32_t padding_00C0; + /* 00C4 */ std::uint32_t padding_00C4; + /* 00C8 */ std::uint32_t padding_00C8; + /* 00CC */ std::uint32_t padding_00CC; + /* 00D0 */ std::uint32_t padding_00D0; + /* 00D4 */ std::uint32_t padding_00D4; /* 00D8 */ std::uint32_t characterId; /* 00DC */ std::uint32_t accountId; /* 00E0 */ std::int16_t job; diff --git a/Source/UI/ProbabilityTable/UIProbabilityTable.h b/Source/UI/ProbabilityTable/UIProbabilityTable.h index 91cfb2cd1..5612a165d 100644 --- a/Source/UI/ProbabilityTable/UIProbabilityTable.h +++ b/Source/UI/ProbabilityTable/UIProbabilityTable.h @@ -15,7 +15,7 @@ class CItemData { public: /* 0000 */ std::uint32_t color = 0xFFFFFFFF; /* 0004 */ std::string name; - /* 001C */ int unknown_001C; + /* 001C */ int padding_001C; /* 0020 */ double probability = 0.0; }; @@ -30,7 +30,7 @@ public: /* 00E8 */ CUITextViewer* nameText; /* 00EC */ CUITextViewer* probabilityText; /* 00F0 */ std::uint32_t backgroundColor; - /* 00F4 */ unsigned char unknown_00F4[0x04]; + /* 00F4 */ unsigned char padding_00F4[0x04]; }; } diff --git a/Source/UI/Quest/UIQuestDisplay.cpp b/Source/UI/Quest/UIQuestDisplay.cpp index a4bbf22fe..cd415ea5f 100644 --- a/Source/UI/Quest/UIQuestDisplay.cpp +++ b/Source/UI/Quest/UIQuestDisplay.cpp @@ -94,13 +94,13 @@ void UIQuestDisplay::Paint() { } else { for (int index = 0; index < info.m_huntCount; ++index) { std::string hunt; - if (info.m_huntUnknown00D4[index] == 31999) { + if (info.m_huntMobId[index] == 31999) { hunt = static_cast( - g_renewQuestMgr->GetMonsterConditionText(info.m_huntUnknown01A0[index], info.m_huntUnknown01AC[index], info.m_huntUnknown01B2[index]) + g_renewQuestMgr->GetMonsterConditionText(info.m_huntConditionFlags[index], info.m_huntMinLevel[index], info.m_huntMaxLevel[index]) ); } else { - const short minLevel = info.m_huntUnknown01AC[index]; - const short maxLevel = info.m_huntUnknown01B2[index]; + const short minLevel = info.m_huntMinLevel[index]; + const short maxLevel = info.m_huntMaxLevel[index]; const char* name = info.m_huntName[index]; if (minLevel > -1 && maxLevel > -1 && (minLevel != 0 || maxLevel != 0)) { if (minLevel == 0) { @@ -129,9 +129,9 @@ void UIQuestDisplay::Paint() { description = std::move(huntNavigation); description = static_cast(DisplayQuestTextTag(description)); - const short goal = info.m_huntUnknown0180[index]; + const short goal = info.m_huntMaxCount[index]; if (goal > 0) { - const short count = info.m_huntUnknown00E0[index]; + const short count = info.m_huntKillCount[index]; if (count == goal) { hunt = static_cast(FormatOwnedString("%s ( %s )", hunt.c_str(), LookupMessage(MSI_COMPLETE_HUNTING_QUEST))); } else { diff --git a/Source/UI/Quest/UIRenewQuestUI.cpp b/Source/UI/Quest/UIRenewQuestUI.cpp index d4af33ed9..465ed9de6 100644 --- a/Source/UI/Quest/UIRenewQuestUI.cpp +++ b/Source/UI/Quest/UIRenewQuestUI.cpp @@ -784,7 +784,7 @@ public: void Select(CUIListItem* const& item); private: - /* 0000 */ void* unknown_0000; + /* 0000 */ void* padding_0000; /* 0004 */ CUIListBoxEx* listBox; }; diff --git a/Source/UI/Quest/UIRenewQuestWnd.cpp b/Source/UI/Quest/UIRenewQuestWnd.cpp index 2e508cf75..681df2cc8 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.cpp +++ b/Source/UI/Quest/UIRenewQuestWnd.cpp @@ -208,9 +208,9 @@ void UIOngoingQuestScrollWnd::RefreshHuntTexts() { for (int index = 0; index < quest.m_huntCount; ++index) { std::string text; - if (quest.m_huntUnknown00D4[index] != 31999) { - const short minLevel = quest.m_huntUnknown01AC[index]; - const short maxLevel = quest.m_huntUnknown01B2[index]; + if (quest.m_huntMobId[index] != 31999) { + const short minLevel = quest.m_huntMinLevel[index]; + const short maxLevel = quest.m_huntMaxLevel[index]; const char* name = quest.m_huntName[index]; if (minLevel > -1 && maxLevel > -1 && (minLevel != 0 || maxLevel != 0)) { if (minLevel == 0) { @@ -225,12 +225,12 @@ void UIOngoingQuestScrollWnd::RefreshHuntTexts() { } } else { text = static_cast( - g_renewQuestMgr->GetMonsterConditionText(quest.m_huntUnknown01A0[index], quest.m_huntUnknown01AC[index], quest.m_huntUnknown01B2[index])); + g_renewQuestMgr->GetMonsterConditionText(quest.m_huntConditionFlags[index], quest.m_huntMinLevel[index], quest.m_huntMaxLevel[index])); } - const short goal = quest.m_huntUnknown0180[index]; + const short goal = quest.m_huntMaxCount[index]; if (goal > 0) { - const short count = quest.m_huntUnknown00E0[index]; + const short count = quest.m_huntKillCount[index]; if (count != goal) { text = static_cast(FormatOwnedString("%s ( %d / %d )", text.c_str(), count, goal)); } else { @@ -448,7 +448,7 @@ void UIOngoingQuestScrollWnd::SetQuest(unsigned int questId) { // OFFSET: 0x007FAF70 // FUNCTION: fn_09949 UIRecommededQuestScrollWnd::UIRecommededQuestScrollWnd(int width, int height) - : UIScrollWnd(width, height, 0), m_questId(0), unknown_00B4(14) { + : UIScrollWnd(width, height, 0), m_questId(0), padding_00B4(14) { this->OnCreate(width, height); } diff --git a/Source/UI/Quest/UIRenewQuestWnd.h b/Source/UI/Quest/UIRenewQuestWnd.h index 5cdb48eb6..da06533f3 100644 --- a/Source/UI/Quest/UIRenewQuestWnd.h +++ b/Source/UI/Quest/UIRenewQuestWnd.h @@ -71,7 +71,7 @@ public: void SetQuest(unsigned int questId); /* 00B0 */ int m_questId; - /* 00B4 */ int unknown_00B4; + /* 00B4 */ int padding_00B4; }; class UIRenewDetailQuestInfoWnd : public UIFrameWnd { diff --git a/Source/UI/Rodex/UIRodexComposeWnd.h b/Source/UI/Rodex/UIRodexComposeWnd.h index 9cad5a44e..2e854e012 100644 --- a/Source/UI/Rodex/UIRodexComposeWnd.h +++ b/Source/UI/Rodex/UIRodexComposeWnd.h @@ -63,7 +63,7 @@ public: /* 00E4 */ int m_reservedStateB; /* 00E8 */ std::list m_items; /* 00F0 */ int m_itemIndex; - /* 00F4 */ int unknown_00F4; + /* 00F4 */ int padding_00F4; /* 00F8 */ std::int64_t m_tax; /* 0100 */ UIEditCtrl* m_tagCtrl; }; diff --git a/Source/UI/RuneSystem/UIRuneSystemWindows.h b/Source/UI/RuneSystem/UIRuneSystemWindows.h index 9d2a4e3e4..64a421933 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWindows.h +++ b/Source/UI/RuneSystem/UIRuneSystemWindows.h @@ -320,7 +320,7 @@ public: int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; __declspec(noinline) void SelectTab(); - /* 00B4 */ int unknown_00B4; + /* 00B4 */ int padding_00B4; /* 00B8 */ std::int64_t m_nextTick; /* 00C0 */ UIRuneSystemTab* m_tab; /* 00C4 */ UIEquipRuneSetWnd* m_equipRuneSet; diff --git a/Source/UI/RuneSystem/UIRuneSystemWnd.h b/Source/UI/RuneSystem/UIRuneSystemWnd.h index 8447a7376..a1d9d7782 100644 --- a/Source/UI/RuneSystem/UIRuneSystemWnd.h +++ b/Source/UI/RuneSystem/UIRuneSystemWnd.h @@ -322,7 +322,7 @@ public: int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; __declspec(noinline) void SelectTab(); - /* 00B4 */ int unknown_00B4; + /* 00B4 */ int padding_00B4; /* 00B8 */ std::int64_t m_nextTick; /* 00C0 */ UIRuneSystemTab* m_tab; /* 00C4 */ UIEquipRuneSetWnd* m_equipRuneSet; diff --git a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp index 293f70be7..ecd97d35c 100644 --- a/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp +++ b/Source/UI/SelectPackageItemBox/UISelectPackageItemBox.cpp @@ -43,8 +43,8 @@ void CUIListBoxEx CUIListBoxEx::CUIListBoxEx() : CUIControl(), hoverImage(), pressedImage(), disabledImage(), imageNames(), disabledName(), scrollBar(nullptr), - itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), unknown_00C5{}, items(), data(), - selected(static_cast(-1)), selectionFlag(1), rebind(0), unknown_00E2{}, onSelect(), binder() { + itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), padding_00C5{}, items(), data(), + selected(static_cast(-1)), selectionFlag(1), rebind(0), padding_00E2{}, onSelect(), binder() { } // OFFSET: 0x00A686A0 @@ -52,8 +52,8 @@ CUIListBoxEx::CUIListBoxEx() template <> CUIListBoxEx::CUIListBoxEx() : CUIControl(), hoverImage(), pressedImage(), disabledImage(), imageNames(), disabledName(), scrollBar(nullptr), - itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), unknown_00C5{}, items(), data(), - selected(static_cast(-1)), selectionFlag(1), rebind(0), unknown_00E2{}, onSelect(), binder() { + itemWidth(0), rowHeight(0), itemX(0), itemY(0), layoutFlag(0), padding_00C5{}, items(), data(), + selected(static_cast(-1)), selectionFlag(1), rebind(0), padding_00E2{}, onSelect(), binder() { } // OFFSET: 0x00A68860 diff --git a/Source/UI/Shop/UIMerchantItemMyShopWnd.h b/Source/UI/Shop/UIMerchantItemMyShopWnd.h index 507895812..684469af3 100644 --- a/Source/UI/Shop/UIMerchantItemMyShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemMyShopWnd.h @@ -33,7 +33,7 @@ public: /* 0100 */ int buyingShop; /* 0104 */ UICheckBox* saleAlarm; /* 0108 */ unsigned char shopOpen; - /* 0109 */ unsigned char unknown_0109[0x03]; + /* 0109 */ unsigned char padding_0109[0x03]; /* 010C */ int offlineStoreId; /* 0110 */ std::uint32_t startTick; /* 0114 */ std::uint32_t duration; diff --git a/Source/UI/Shop/UIMerchantShopMakeWnd.h b/Source/UI/Shop/UIMerchantShopMakeWnd.h index 60002be15..2c56c80f0 100644 --- a/Source/UI/Shop/UIMerchantShopMakeWnd.h +++ b/Source/UI/Shop/UIMerchantShopMakeWnd.h @@ -43,7 +43,7 @@ public: /* 00B4 */ std::string title; /* 00CC */ UIEditCtrl* titleEdit; - /* 00D0 */ unsigned char unknown_00D0[0x8]; + /* 00D0 */ unsigned char padding_00D0[0x8]; /* 00D8 */ int editIndex; /* 00DC */ UIWindow* notice; /* 00E0 */ UIEditCtrl* priceEdits[13]; diff --git a/Source/UI/Shop/UIMerchantShopTitle.h b/Source/UI/Shop/UIMerchantShopTitle.h index 82a271b1f..044a88cad 100644 --- a/Source/UI/Shop/UIMerchantShopTitle.h +++ b/Source/UI/Shop/UIMerchantShopTitle.h @@ -21,7 +21,7 @@ public: /* 007C */ UIStaticText* label; /* 0080 */ std::uint32_t ownerAid; /* 0084 */ std::int16_t fontStyle; - /* 0086 */ unsigned char unknown_0086[2]; + /* 0086 */ unsigned char padding_0086[2]; /* 0088 */ int buyingShop; }; diff --git a/Source/UI/Shortcuts/ShortcutCooldowns.cpp b/Source/UI/Shortcuts/ShortcutCooldowns.cpp index d4f62a38b..7e226f0e5 100644 --- a/Source/UI/Shortcuts/ShortcutCooldowns.cpp +++ b/Source/UI/Shortcuts/ShortcutCooldowns.cpp @@ -76,7 +76,7 @@ int CSession::IsMercenarySkill(unsigned id) const { namespace { struct SearchStoreEntry { - /* 0000 */ unsigned char unknown_0000[8]; + /* 0000 */ unsigned char padding_0000[8]; /* 0008 */ char storeName[80]; /* 0058 */ int price; /* 005C */ std::uint16_t quantity; diff --git a/Source/UI/StylingShop/UIStylingShopWnd.cpp b/Source/UI/StylingShop/UIStylingShopWnd.cpp index 3dcfa6a59..f6a819012 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.cpp +++ b/Source/UI/StylingShop/UIStylingShopWnd.cpp @@ -1156,7 +1156,7 @@ void UIMyStyleWnd::SaveLikeList() { struct LikeStyle { int slotNum; - int unknown_04; + int padding_0004; int robe; int headStyle; int bodyStyle; @@ -2016,7 +2016,7 @@ void UIMyStyleWnd::LoadLikeList() { struct LikeStyle { int slotNum; - int unknown_04; + int padding_0004; int robe; int headStyle; int bodyStyle; diff --git a/Source/UI/StylingShop/UIStylingShopWnd.h b/Source/UI/StylingShop/UIStylingShopWnd.h index fd9b932ab..75e4ebf84 100644 --- a/Source/UI/StylingShop/UIStylingShopWnd.h +++ b/Source/UI/StylingShop/UIStylingShopWnd.h @@ -71,7 +71,7 @@ public: /* 00A0 */ unsigned char showPayments; /* 00A1 */ unsigned char showPaymentItems; /* 00A2 */ unsigned char showDottedLines; - /* 00A3 */ unsigned char unknown_00A3; + /* 00A3 */ unsigned char padding_00A3; /* 00A4 */ int m_checkTop; /* 00A8 */ int paymentFontSize; /* 00AC */ bool m_buyable; @@ -96,7 +96,7 @@ public: /* 007C */ UIDisplayCharacter* m_display; /* 0080 */ UIShowInfoWnd* m_showInfo; /* 0084 */ bool primaryTabVisible; - /* 0085 */ bool unknown_0085; + /* 0085 */ bool padding_0085; /* 0086 */ bool accessoryTabVisible; void OnCreate(int width, int height) override; @@ -173,7 +173,7 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; - /* 00B0 */ unsigned char unknown_00B0[12]; + /* 00B0 */ unsigned char padding_00B0[12]; /* 00BC */ std::vector m_itemFrames; }; diff --git a/Source/UI/Text/CreateLineInfo.h b/Source/UI/Text/CreateLineInfo.h index 1c9fd6140..4ba7f4c9e 100644 --- a/Source/UI/Text/CreateLineInfo.h +++ b/Source/UI/Text/CreateLineInfo.h @@ -96,7 +96,7 @@ public: CCreateLineInfo( UIWindow* parent, const char* text, int width, int lineSpacing, std::uint32_t color, int fontHeight, LineFontFlags flags, bool outlineEnabled, - int outlineColorValue, bool unknown0030, int shadowColorValue, unsigned char align + int outlineColorValue, bool padding_0030, int shadowColorValue, unsigned char align ); virtual ~CCreateLineInfo(); diff --git a/Source/UI/Text/NavigationLink.cpp b/Source/UI/Text/NavigationLink.cpp index 4e58ec856..bc7b088e5 100644 --- a/Source/UI/Text/NavigationLink.cpp +++ b/Source/UI/Text/NavigationLink.cpp @@ -78,7 +78,7 @@ namespace LineCutter { /* 0080 */ int m_fontHeight; /* 0084 */ unsigned char m_bold; /* 0085 */ unsigned char m_italic; - /* 0086 */ unsigned char unknown_0086[2]; + /* 0086 */ unsigned char padding_0086[2]; /* 0088 */ unsigned char m_outlined; /* 008C */ std::uint32_t m_outlineColor; /* 0090 */ unsigned char m_shadowed; @@ -690,7 +690,7 @@ void UIItemImage::Paint() { // FUNCTION: fn_10433 CCreateLineInfo::CCreateLineInfo( UIWindow* parent, const char* text, int width, int lineSpacing, std::uint32_t color, int fontHeight, LineFontFlags flags, bool outlineEnabled, - int outlineColorValue, bool unknown0030, int shadowColorValue, unsigned char align + int outlineColorValue, bool shadow, int shadowColorValue, unsigned char align ) : m_align(align), m_newSegment(true), m_height(0) { if (parent && (this->m_parent = parent, text)) { @@ -703,7 +703,7 @@ CCreateLineInfo::CCreateLineInfo( this->m_fontHeight = fontHeight; this->m_bold = flags.bold; this->m_italic = flags.italic; - this->shadow = unknown0030; + this->shadow = shadow; this->shadowColor = shadowColorValue; this->outline = outlineEnabled; this->outlineColor = outlineColorValue; diff --git a/Source/UI/Text/TextMarkup.h b/Source/UI/Text/TextMarkup.h index 67e723a60..460332d8f 100644 --- a/Source/UI/Text/TextMarkup.h +++ b/Source/UI/Text/TextMarkup.h @@ -8,7 +8,7 @@ struct TextLink { /* 0000 */ std::uint32_t position; - /* 0004 */ std::byte unknown_0004[8]; + /* 0004 */ std::byte padding_0004[8]; /* 000C */ std::string display; /* 0024 */ std::string metadata; }; @@ -31,7 +31,7 @@ void ExtractUrlTextLinks(const std::string& text, std::vector& links); #if defined(_WIN32) && !defined(_WIN64) static_assert(sizeof(TextLink) == 60); static_assert(offsetof(TextLink, position) == 0x0); -static_assert(offsetof(TextLink, unknown_0004) == 0x4); +static_assert(offsetof(TextLink, padding_0004) == 0x4); static_assert(offsetof(TextLink, display) == 0xC); static_assert(offsetof(TextLink, metadata) == 0x24); #endif diff --git a/Source/UI/Text/UIString.h b/Source/UI/Text/UIString.h index f1dabed56..c6ebdcb4c 100644 --- a/Source/UI/Text/UIString.h +++ b/Source/UI/Text/UIString.h @@ -15,7 +15,7 @@ public: void ParseTags(std::string text); virtual void SetText(int width, int height, std::string text); - /* 007C */ int unknown_007C; + /* 007C */ int padding_007C; /* 0080 */ int enabled; /* 0084 */ std::string link; /* 009C */ int red; diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index d0e6f20d1..dd7a82bfa 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -32,7 +32,7 @@ UITextViewer::UITextViewer() : UIListBox(), splitTipLinks(0), outline(0), bold(0 this->backgroundColor = 0xFF000000u | RGB(red, green, blue); this->Invalidate(); - this->unknown_00BC = 0; + this->plainTextMode = 0; } UITextViewer::~UITextViewer() = default; @@ -205,7 +205,7 @@ void UITextViewer::Paint() { } } - const bool plain = (this->unknown_00BC & 255) != 0; + const bool plain = (this->plainTextMode & 255) != 0; for (int index = first; index < end; ++index) { const auto& line = this->lines[index]; diff --git a/Source/UI/Text/UITextViewer.h b/Source/UI/Text/UITextViewer.h index ff1b03f0a..3da6dcb35 100644 --- a/Source/UI/Text/UITextViewer.h +++ b/Source/UI/Text/UITextViewer.h @@ -28,7 +28,7 @@ public: /* 00D4 */ std::vector links; /* 00E0 */ std::uint32_t backgroundColor; - /* 00E4 */ int unknown_00E4; + /* 00E4 */ int padding_00E4; /* 00E8 */ unsigned char splitTipLinks; /* 00E9 */ unsigned char outline; /* 00EA */ unsigned char bold; diff --git a/Source/UI/Text/UITextViewerMessages.cpp b/Source/UI/Text/UITextViewerMessages.cpp index 76c0174b6..45f7fd9a6 100644 --- a/Source/UI/Text/UITextViewerMessages.cpp +++ b/Source/UI/Text/UITextViewerMessages.cpp @@ -152,7 +152,7 @@ __forceinline void UITextViewer::AppendText(char* text, int width, int carriageR this->AddLine(wrapped[index].c_str()); } - this->unknown_00BC = (this->unknown_00BC & ~255) | 1; + this->plainTextMode = (this->plainTextMode & ~255) | 1; return; } @@ -202,7 +202,7 @@ __forceinline void UITextViewer::AppendText(char* text, int width, int carriageR } } - this->unknown_00BC &= ~255; + this->plainTextMode &= ~255; } // OFFSET: 0x00899E90 @@ -237,7 +237,7 @@ int UITextViewer::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 for (const auto& line : wrapped) { this->AddLine(line.c_str()); } - this->unknown_00BC = (this->unknown_00BC & ~255) | 1; + this->plainTextMode = (this->plainTextMode & ~255) | 1; this->Invalidate(); return 0; } @@ -287,7 +287,7 @@ int UITextViewer::SendMsg(UIWindow* sender, int message, std::intptr_t argument1 } } - this->unknown_00BC &= ~255; + this->plainTextMode &= ~255; this->Invalidate(); return 0; } diff --git a/Source/UI/Text/UITransBalloonText.cpp b/Source/UI/Text/UITransBalloonText.cpp index 0c9cef85a..4b05211e3 100644 --- a/Source/UI/Text/UITransBalloonText.cpp +++ b/Source/UI/Text/UITransBalloonText.cpp @@ -119,9 +119,9 @@ void UITransBalloonText::OnCreate(int, int) { this->m_rectangle.y = this->geometry.y; this->m_rectangle.width = this->geometry.width; this->m_rectangle.height = this->geometry.height; - this->m_rectangle.unknown_00B0 = 0; + this->m_rectangle.padding_00B0 = 0; this->m_rectangle.color = 1711276032u; - this->m_rectangle.unknown_00B8 = 0; + this->m_rectangle.padding_00B8 = 0; this->m_fontMode = 0; } diff --git a/Source/UI/Text/UITransBalloonText.h b/Source/UI/Text/UITransBalloonText.h index c49ab1a4b..656adee2b 100644 --- a/Source/UI/Text/UITransBalloonText.h +++ b/Source/UI/Text/UITransBalloonText.h @@ -10,9 +10,9 @@ struct BalloonRectangle { /* 00A4 */ int y; /* 00A8 */ int width; /* 00AC */ int height; - /* 00B0 */ std::uint32_t unknown_00B0; + /* 00B0 */ std::uint32_t padding_00B0; /* 00B4 */ std::uint32_t color; - /* 00B8 */ std::uint32_t unknown_00B8; + /* 00B8 */ std::uint32_t padding_00B8; }; class UITransBalloonText : public UIBalloonText { @@ -68,9 +68,9 @@ static_assert(offsetof(BalloonRectangle, x) + 0xA0 == 0xA0); static_assert(offsetof(BalloonRectangle, y) + 0xA0 == 0xA4); static_assert(offsetof(BalloonRectangle, width) + 0xA0 == 0xA8); static_assert(offsetof(BalloonRectangle, height) + 0xA0 == 0xAC); -static_assert(offsetof(BalloonRectangle, unknown_00B0) + 0xA0 == 0xB0); +static_assert(offsetof(BalloonRectangle, padding_00B0) + 0xA0 == 0xB0); static_assert(offsetof(BalloonRectangle, color) + 0xA0 == 0xB4); -static_assert(offsetof(BalloonRectangle, unknown_00B8) + 0xA0 == 0xB8); +static_assert(offsetof(BalloonRectangle, padding_00B8) + 0xA0 == 0xB8); static_assert(sizeof(UITransBalloonText) == 0xCC); #endif diff --git a/Source/UI/UIChangeMaterialWnd.h b/Source/UI/UIChangeMaterialWnd.h index 9772a7ab8..86fe601a4 100644 --- a/Source/UI/UIChangeMaterialWnd.h +++ b/Source/UI/UIChangeMaterialWnd.h @@ -112,7 +112,7 @@ public: void RefreshVisibleEntries(); void UpdateScrollBar(); void SetSelectedIndex(int index); - void OnLBtnUp(int unknown, int position) override; + void OnLBtnUp(int x, int position) override; void SelectNextItem(int delta); void ShiftSelectedIndex(int value); void OnCreate(int width, int height) override; @@ -129,7 +129,7 @@ public: /* 00D8 */ UIScrollBar* m_scrollBar; /* 00DC */ std::vector m_items; /* 00E8 */ std::vector m_entries; - /* 00F4 */ std::uint32_t unknown_00F4; + /* 00F4 */ std::uint32_t padding_00F4; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/UIMacroDetectorWnd.h b/Source/UI/UIMacroDetectorWnd.h index 79d621ce9..e8bf461ea 100644 --- a/Source/UI/UIMacroDetectorWnd.h +++ b/Source/UI/UIMacroDetectorWnd.h @@ -35,7 +35,7 @@ public: /* 00C8 */ int m_imageSize; /* 00CC */ int m_imageReceived; /* 00D0 */ unsigned char remainingAttempts; - /* 00D1 */ unsigned char unknown_00D1[3]; + /* 00D1 */ unsigned char padding_00D1[3]; /* 00D4 */ std::uint32_t totalDuration; /* 00D8 */ std::uint32_t startTick; /* 00DC */ std::uint32_t messageDuration; diff --git a/Source/UI/UIMacroUserInfoWnd.cpp b/Source/UI/UIMacroUserInfoWnd.cpp index 514ab21c5..f1d4f0fe1 100644 --- a/Source/UI/UIMacroUserInfoWnd.cpp +++ b/Source/UI/UIMacroUserInfoWnd.cpp @@ -43,8 +43,8 @@ // OFFSET: 0x007EE980 // FUNCTION: fn_09831 -MacroReporterEntry::MacroReporterEntry(std::string name, int id, short unknown_001C) - : name(name), id(id), reportValue(unknown_001C) {} +MacroReporterEntry::MacroReporterEntry(std::string name, int id, short reportValue) + : name(name), id(id), reportValue(reportValue) {} // OFFSET: 0x007EEA00 // FUNCTION: fn_09832 @@ -351,8 +351,8 @@ bool UIMacroReporterWnd::ValidateNames(unsigned char notify) { name += ".rsw"; const char* displayName = g_session.GetMapDisplayName(name.c_str()); - const std::string unknownMap = LookupMessage(MSI_NOWHERE); - if (unknownMap.compare(displayName) == 0) { + const std::string nowhereMapName = LookupMessage(MSI_NOWHERE); + if (nowhereMapName.compare(displayName) == 0) { if (notify == 1) { g_windowMgr.SendNotice( 1, diff --git a/Source/UI/UIMacroUserInfoWnd.h b/Source/UI/UIMacroUserInfoWnd.h index ba48b62bb..3f562876f 100644 --- a/Source/UI/UIMacroUserInfoWnd.h +++ b/Source/UI/UIMacroUserInfoWnd.h @@ -28,7 +28,7 @@ public: struct MacroReporterEntry { MacroReporterEntry() = default; - MacroReporterEntry(std::string name, int id, short unknown_001C); + MacroReporterEntry(std::string name, int id, short padding_001C); /* 0000 */ std::string name; /* 0018 */ int id; @@ -40,7 +40,7 @@ struct MacroReporterState { /* 0004 */ int height; /* 0008 */ int x; /* 000C */ int y; - /* 0010 */ unsigned char unknown_0010; + /* 0010 */ unsigned char padding_0010; /* 0011 */ bool activeOnly; /* 0014 */ std::vector entries; }; diff --git a/Source/UI/Window/FrameFocus.cpp b/Source/UI/Window/FrameFocus.cpp index 13c9bac36..a6008ce28 100644 --- a/Source/UI/Window/FrameFocus.cpp +++ b/Source/UI/Window/FrameFocus.cpp @@ -25,7 +25,7 @@ bool UIWindowMgr::IsOrderFixed(int id) { case WID_ITEMSELLWND: case WID_COMBOBOXWND: case WID_CHATROOMWND: case WID_PASSWORDWND: case 31: case WID_EXCHANGEACCEPTWND: case WID_ITEMSTOREWND: case WID_MESSENGERGROUPWND: case WID_JOINPARTYACCEPTWND: case WID_SHORTCUTWND: case WID_CHOOSEWARPWND: case WID_MERCHANTMIRRORITEMWND: case WID_MERCHANTITEMMYSHOPWND: case WID_NOTIFYJOBLEVELUPWND: case WID_ITEMPARAMCHANGEDISPLAYWND: case WID_NPCEDITDIALOGWND: case WID_NOTIFYITEMOBTAINWND: case WID_GUILDINFOMANAGEWND: case WID_GUILDMEMBERMANAGEWND: case WID_GUILDPOSITIONMANAGEWND: case WID_GUILDSKILLWND: case WID_GUILDBANISHEDMEMBERWND: case WID_GUILDNOTICEWND: case WID_GUILDTOTALINFOWND: case 67: case WID_JOINGUILDACCEPTWND: case WID_ITEMIDENTIFYWND: case WID_ITEMCOMPOSITIONWND: case WID_ILLUSTWND: case WID_MAKETARGETLISTWND: case WID_MAKETARGETPROCESSWND: case WID_MAKETARGETRESULTWND: case WID_PETEGGLISTWND: case WID_PETTAMINGDECEIVEWND: case WID_MAKINGARROWLISTWND: case WID_SELECTCARTWND: case WID_SPELLLISTWND: case WID_NPCTEXTEDITDIALOGWND: case WID_GRAFFISTRBOXWND: case WID_COUPLEACCEPTWND: case WID_BABYACCEPTWND: case WID_ITEMREPAIRWND: case WID_JOINFRIENDACCEPTWND: case WID_WEAPONREFINEWND: case 115: case WID_AUTOMESSAGEWND: case 123: - case 124: case WID_SELCHARFORUSERVERWND: case WID_CHANGENAMEWND: case WID_SUBCHATHISWND_UNKNOWN_03E4: case WID_SUBCHATHISWND_UNKNOWN_03E8: case WID_SUBCHATMINIWND: case 136: case WID_MEMORIALDUNWND: case WID_YOURITEMWND: case 144: case 154: case WID_HOTKEYWND: case WID_RELOADLUASCRIPTWND: case WID_QUIKSLOTWND: + case 124: case WID_SELCHARFORUSERVERWND: case WID_CHANGENAMEWND: case WID_SUBCHATHISWND: case WID_SUBCHATHISWND2: case WID_SUBCHATMINIWND: case 136: case WID_MEMORIALDUNWND: case WID_YOURITEMWND: case 144: case 154: case WID_HOTKEYWND: case WID_RELOADLUASCRIPTWND: case WID_QUIKSLOTWND: case WID_ITEMSHOPWND2: case WID_ITEMSELLWND2: case WID_SEEKPARTYWND: case WID_MERCHANTMIRRORITEMWND_MODE_1: case WID_MERCHANTITEMMYSHOPWND_MODE_1: case WID_MERCHANTITEMSHOPWND_MODE_1: case WID_MERCHANTMIRRORITEMWND_MODE_2: case WID_LOGINOTPWND: case WID_SHOWINFO_TESTLAYER: case WID_SELECTREPLAYDATAWND: case WID_REPLAYCONTROLWND: case WID_MERCHANTSHOPTITLE: case WID_NCASH_CALLWND: case WID_COLLECTIONSYSTEMWND: case WID_REPLAYRECCONTROLWND: case WID_SECONDPASSWORDINPUTWND: case WID_SECONDPASSWORDEDITWND: case WID_QUESTDISPLAY: case WID_MULTIILLUSTWND_SLOT_0: case WID_MULTIILLUSTWND_SLOT_1: case WID_MULTIILLUSTWND_SLOT_2: case WID_MULTIILLUSTWND_SLOT_3: case WID_MULTIILLUSTWND_SLOT_4: case WID_MULTIILLUSTWND_SLOT_5: case WID_MULTIILLUSTWND_SLOT_6: case WID_MULTIILLUSTWND_SLOT_7: case WID_MULTIILLUSTWND_SLOT_8: case WID_MULTIILLUSTWND_SLOT_9: case WID_SAYDIALOGWND_OVERLAY: case WID_MERGEITEMWND: case WID_GUILD_STORAGE_LOG: case WID_MERCHANTITEMLOGWND_MODE_0: case WID_MERCHANTITEMLOGWND_MODE_1: case WID_OPENMAILBOXWND: case WID_MILEAGEWND: case WID_OPENROULLETTEWND: case WID_ROULLETTEWND: case WID_ACHTRACINGWND: case WID_NEWSELECTCHARWND: case WID_NEWMAKECHARWND: case WID_CAPTCHAREGISTERWND: case WID_MACRODETECTORWND: diff --git a/Source/UI/Window/UIAccountLimitedToolWnd.h b/Source/UI/Window/UIAccountLimitedToolWnd.h index 512d5cd77..41a2426ee 100644 --- a/Source/UI/Window/UIAccountLimitedToolWnd.h +++ b/Source/UI/Window/UIAccountLimitedToolWnd.h @@ -21,7 +21,7 @@ public: /* 00B8 */ UITextViewer* m_viewer; /* 00BC */ UIEditCtrl* m_edits[15]; /* 00F8 */ UIBitmapButton* m_buttons[3]; - /* 0104 */ std::string unknown_0104; + /* 0104 */ std::string padding_0104; }; #endif diff --git a/Source/UI/Window/UIBalloonOpenBtn.h b/Source/UI/Window/UIBalloonOpenBtn.h index 092434f0a..11cad9c5a 100644 --- a/Source/UI/Window/UIBalloonOpenBtn.h +++ b/Source/UI/Window/UIBalloonOpenBtn.h @@ -17,7 +17,7 @@ public: int SendMsg(UIWindow* sender, int message, std::intptr_t argument1, std::intptr_t argument2, std::intptr_t argument3, std::intptr_t argument4) override; protected: - /* 00B4 */ std::uint32_t unknown_00B4; + /* 00B4 */ std::uint32_t padding_00B4; /* 00B8 */ std::int64_t m_openTime; /* 00C0 */ std::int64_t m_openDelay; /* 00C8 */ int m_balloonId; diff --git a/Source/UI/Window/UIBasicInfoWnd.cpp b/Source/UI/Window/UIBasicInfoWnd.cpp index f38245521..29bfed239 100644 --- a/Source/UI/Window/UIBasicInfoWnd.cpp +++ b/Source/UI/Window/UIBasicInfoWnd.cpp @@ -434,7 +434,7 @@ void UIBasicInfoWnd::DrawExpanded() { } const int denominator = g_session.m_maxWeight < 1 ? 1 : g_session.m_maxWeight; - const std::uint32_t weightColor = 100 * g_session.m_weight / denominator >= g_unknown173A5BC ? 255 : 0; + const std::uint32_t weightColor = 100 * g_session.m_weight / denominator >= g_overweightThresholdPercent ? 255 : 0; this->DrawRightAlignedText( this->geometry.width - zenyWidth - 5, this->layoutOffset + 103, weightText.c_str(), 0, 1, 14, weightColor, 0 ); @@ -790,7 +790,7 @@ void UIBasicInfoWnd::Paint() { if (capacity < 1) { capacity = 1; } - const std::uint32_t color = g_session.m_weight * 100 / capacity >= g_unknown173A5BC ? 255 : 0; + const std::uint32_t color = g_session.m_weight * 100 / capacity >= g_overweightThresholdPercent ? 255 : 0; this->DrawRightAlignedText(this->geometry.width - zenyWidth - 10, this->layoutOffset + 103, text, std::strlen(text), 1, 14, color, 0); } } diff --git a/Source/UI/Window/UIBasicInfoWnd.h b/Source/UI/Window/UIBasicInfoWnd.h index a8facd237..fdbb10b78 100644 --- a/Source/UI/Window/UIBasicInfoWnd.h +++ b/Source/UI/Window/UIBasicInfoWnd.h @@ -28,10 +28,10 @@ public: /* 00B4 */ int collapsedHeight; /* 00B8 */ int expandedHeight; /* 00BC */ unsigned char mode; - /* 00BD */ unsigned char unknown_00BD[0x3]; + /* 00BD */ unsigned char padding_00BD[0x3]; /* 00C0 */ UIStaticText* nameText; /* 00C4 */ BasicInfoWndInfo* saved; - /* 00C8 */ unsigned char unknown_00C8[0x20]; + /* 00C8 */ unsigned char padding_00C8[0x20]; /* 00E8 */ UIWindow* hpBar; /* 00EC */ UIWindow* spBar; /* 00F0 */ UIWindow* baseExpBar; diff --git a/Source/UI/Window/UIBattleMsgOptionWnd.h b/Source/UI/Window/UIBattleMsgOptionWnd.h index 245385261..ed7dc8d0e 100644 --- a/Source/UI/Window/UIBattleMsgOptionWnd.h +++ b/Source/UI/Window/UIBattleMsgOptionWnd.h @@ -33,7 +33,7 @@ public: /* 0108 */ int chatWindowIndex; /* 010C */ int allChecked; /* 0110 */ unsigned char useMainChatOptions; - /* 0111 */ unsigned char unknown_0111[0x3]; + /* 0111 */ unsigned char padding_0111[0x3]; /* 0114 */ UICheckBox* m_allCheckBox; }; diff --git a/Source/UI/Window/UICollectionSystemWnd.h b/Source/UI/Window/UICollectionSystemWnd.h index e55a11241..e5e183f34 100644 --- a/Source/UI/Window/UICollectionSystemWnd.h +++ b/Source/UI/Window/UICollectionSystemWnd.h @@ -24,7 +24,7 @@ private: /* 00C0 */ int m_frame; /* 00C4 */ int m_lastFrame; /* 00C8 */ bool m_paused; - /* 00C9 */ unsigned char unknown_00C9[3]; + /* 00C9 */ unsigned char padding_00C9[3]; /* 00CC */ std::uint32_t m_lastTick; /* 00D0 */ CActRes* m_action; /* 00D4 */ CSprRes* m_sprite; diff --git a/Source/UI/Window/UIControl.cpp b/Source/UI/Window/UIControl.cpp index 5d57d006b..0b2a3134d 100644 --- a/Source/UI/Window/UIControl.cpp +++ b/Source/UI/Window/UIControl.cpp @@ -58,7 +58,7 @@ public: void SetHighlightedEntry(CUIListItem* const& item); private: - /* 0000 */ void* unknown_0000; + /* 0000 */ void* padding_0000; /* 0004 */ CUIListBox* listBox; }; @@ -85,7 +85,7 @@ public: void Select(CUIListItem* const& item); private: - /* 0000 */ void* unknown_0000; + /* 0000 */ void* padding_0000; /* 0004 */ CUIListBoxEx* listBox; }; diff --git a/Source/UI/Window/UIControl.h b/Source/UI/Window/UIControl.h index e5714aba7..8ba2e4aaf 100644 --- a/Source/UI/Window/UIControl.h +++ b/Source/UI/Window/UIControl.h @@ -111,7 +111,7 @@ public: void SetOnChange(std::function handler); /* 0080 */ CUITabButton* current; - /* 0084 */ unsigned char unknown_0084[0x04]; + /* 0084 */ unsigned char padding_0084[0x04]; /* 0088 */ std::function onChange; /* 00B0 */ std::function onChanging; }; @@ -133,7 +133,7 @@ public: /* 0080 */ int state; /* 0084 */ unsigned char disabled; - /* 0085 */ unsigned char unknown_0085[0x03]; + /* 0085 */ unsigned char padding_0085[0x03]; /* 0088 */ std::string tooltip; /* 00A0 */ unsigned char clickHandlerStorage[0x24]; /* 00C4 */ UIWindow* clickWindow; @@ -173,7 +173,7 @@ public: /* 0148 */ int fontIndex; /* 014C */ int fontHeight; /* 0150 */ unsigned char bold; - /* 0151 */ unsigned char unknown_0151[0x03]; + /* 0151 */ unsigned char padding_0151[0x03]; /* 0154 */ std::map textColors; /* 015C */ std::uint32_t disabledTextColor; /* 0160 */ unsigned char shadow; @@ -198,7 +198,7 @@ public: /* 0198 */ CResPtr disabledImage; /* 019C */ std::map imageNames; /* 01A4 */ std::string disabledName; - /* 01BC */ unsigned char unknown_01BC[0x04]; + /* 01BC */ unsigned char padding_01BC[0x04]; }; class CUIBasicButton : public CUITextButton { @@ -245,7 +245,7 @@ public: /* 01D4 */ SkinPaletteCell normalCell; /* 01DC */ SkinPaletteCell selectedCell; /* 01E4 */ SkinPaletteCell borderCell; - /* 01EC */ unsigned char unknown_01EC[4]; + /* 01EC */ unsigned char padding_01EC[4]; }; class CUIImageButton : public CUIButton { @@ -288,7 +288,7 @@ class CUITitleBar : public CUIControl { public: // INLINED explicit CUITitleBar() - : CUIControl(), resizable(1), left(), middle(), right(), leftName(), middleName(), rightName(), unknown_00D8(), titleText(nullptr), + : CUIControl(), resizable(1), left(), middle(), right(), leftName(), middleName(), rightName(), padding_00D8(), titleText(nullptr), firstButton(nullptr), secondButton(nullptr) { } @@ -311,7 +311,7 @@ public: /* 0090 */ std::string leftName; /* 00A8 */ std::string middleName; /* 00C0 */ std::string rightName; - /* 00D8 */ unsigned char unknown_00D8[0x04]; + /* 00D8 */ unsigned char padding_00D8[0x04]; /* 00DC */ class CUIStaticText* titleText; /* 00E0 */ UIWindow* firstButton; /* 00E4 */ UIWindow* secondButton; @@ -387,7 +387,7 @@ public: /* 00AC */ int deltaX; /* 00B0 */ int deltaY; /* 00B4 */ std::string imageName; - /* 00CC */ unsigned char unknown_00CC[0x04]; + /* 00CC */ unsigned char padding_00CC[0x04]; /* 00D0 */ std::function onResize; }; diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index 6f3646c59..d61bcdd67 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -916,7 +916,7 @@ int UIChatRoomWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std:: this->memberRoles[std::string(reinterpret_cast(a))] = static_cast(b); int color = 0; if (b != 0) { - if (g_serviceOptions.Get(11) && g_soundMgr->unknown != 0) { + if (g_serviceOptions.Get(11) && g_soundMgr->tingOnly != 0) { g_soundMgr->PlayWave("버튼소리.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); } } else { @@ -1135,10 +1135,10 @@ UILoginOTPWnd::UILoginOTPWnd() UILoginWnd::UILoginWnd() : UIFrameWnd(0), savedAccounts(), loginTypeCombo(0), loginExtra("G000") { this->idEdit = nullptr; this->passwordEdit = nullptr; - this->unknown_00C4 = 0; + this->padding_00C4 = 0; this->saveId = 0; - this->unknown_00CC = 1; - this->unknown_00D0 = 0; - this->unknown_00D4 = 0; + this->padding_00CC = 1; + this->padding_00D0 = 0; + this->padding_00D4 = 0; this->backgroundWindow = nullptr; } diff --git a/Source/UI/Window/UIHotKeyWnd.cpp b/Source/UI/Window/UIHotKeyWnd.cpp index e0008a102..29c9a4853 100644 --- a/Source/UI/Window/UIHotKeyWnd.cpp +++ b/Source/UI/Window/UIHotKeyWnd.cpp @@ -44,11 +44,11 @@ namespace { case HK_MENUICON_HIDE: case HK_TWITTERWND: case HK_HUNTINGQUEST_INFO_ONOFF: - case HK_UNKNOWN_62: - case HK_UNKNOWN_64: - case HK_UNKNOWN_65: - case HK_UNKNOWN_66: - case HK_UNKNOWN_67: + case HK_HIDDEN_62: + case HK_HIDDEN_64: + case HK_HIDDEN_65: + case HK_HIDDEN_66: + case HK_HIDDEN_67: return true; default: return false; diff --git a/Source/UI/Window/UIHotKeyWnd.h b/Source/UI/Window/UIHotKeyWnd.h index 3324499bd..9ce8f1f24 100644 --- a/Source/UI/Window/UIHotKeyWnd.h +++ b/Source/UI/Window/UIHotKeyWnd.h @@ -53,7 +53,7 @@ public: /* 010C */ int m_page; /* 0110 */ int m_pageCount; /* 0114 */ unsigned char m_paged; - /* 0115 */ unsigned char unknown_0115[0x3]; + /* 0115 */ unsigned char padding_0115[0x3]; /* 0118 */ UIButton* m_prevButton; /* 011C */ UIButton* m_nextButton; }; diff --git a/Source/UI/Window/UIJobListWnd.h b/Source/UI/Window/UIJobListWnd.h index 2dd19758b..3b9e68361 100644 --- a/Source/UI/Window/UIJobListWnd.h +++ b/Source/UI/Window/UIJobListWnd.h @@ -25,7 +25,7 @@ protected: /* 00B4 */ UIStaticText* m_title; /* 00B8 */ UICheckBox* m_jobChecks[6]; /* 00D0 */ UIBitmapButton* m_okButton; - /* 00D4 */ unsigned char unknown_00D4[0x14]; + /* 00D4 */ unsigned char padding_00D4[0x14]; /* 00E8 */ int m_selectionState; /* 00EC */ JobListWndInfo* m_saved; }; diff --git a/Source/UI/Window/UILoginWnd.h b/Source/UI/Window/UILoginWnd.h index e9026f426..22a220857 100644 --- a/Source/UI/Window/UILoginWnd.h +++ b/Source/UI/Window/UILoginWnd.h @@ -30,12 +30,12 @@ public: /* 00BC */ UIWindow* backgroundWindow; /* 00C0 */ bool idPlaceholder; /* 00C1 */ bool passwordPlaceholder; - /* 00C2 */ unsigned char unknown_00C2[0x2]; - /* 00C4 */ int unknown_00C4; + /* 00C2 */ unsigned char padding_00C2[0x2]; + /* 00C4 */ int padding_00C4; /* 00C8 */ int saveId; - /* 00CC */ int unknown_00CC; - /* 00D0 */ int unknown_00D0; - /* 00D4 */ int unknown_00D4; + /* 00CC */ int padding_00CC; + /* 00D0 */ int padding_00D0; + /* 00D4 */ int padding_00D4; /* 00D8 */ std::vector savedAccounts; /* 00E4 */ int accountListOpen; /* 00E8 */ UIComboBoxDef2Wnd* loginTypeCombo; diff --git a/Source/UI/Window/UIMakeCharWnd.h b/Source/UI/Window/UIMakeCharWnd.h index b4ff2567e..5c1b0023b 100644 --- a/Source/UI/Window/UIMakeCharWnd.h +++ b/Source/UI/Window/UIMakeCharWnd.h @@ -22,7 +22,7 @@ public: /* 00B4 */ UIBitmapEditCtrl* m_nameEdit; /* 00B8 */ CharacterInfo m_info; - /* 0167 */ unsigned char unknown_0167; + /* 0167 */ unsigned char padding_0167; /* 0168 */ CharSlotInfo m_view; /* 02C4 */ UIBitmapButton* m_rotateLeftButton; /* 02C8 */ UIBitmapButton* m_rotateRightButton; diff --git a/Source/UI/Window/UIMerInfoWnd.h b/Source/UI/Window/UIMerInfoWnd.h index f6a77f2d9..489588786 100644 --- a/Source/UI/Window/UIMerInfoWnd.h +++ b/Source/UI/Window/UIMerInfoWnd.h @@ -16,7 +16,7 @@ public: void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; - /* 00B4 */ int unknown_00B4; + /* 00B4 */ int padding_00B4; /* 00B8 */ UIBitmapButton* button; /* 00BC */ UIBarGraphPlayer* hpBar; /* 00C0 */ UIBarGraphPlayer* spBar; diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index b61c8fb66..ced97ea83 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -2682,7 +2682,7 @@ UINoticeWnd::UINoticeWnd() : UIFrameWnd(0) { this->m_texts[i] = new UIStaticText(); } this->lineCount = 20; - this->unknown_010C = 0; + this->padding_010C = 0; this->m_noticeCount = 0; this->m_index = 0; this->m_scrollPositions[0] = 0; diff --git a/Source/UI/Window/UIMessageBox.h b/Source/UI/Window/UIMessageBox.h index 2ffeb8118..4b32a0109 100644 --- a/Source/UI/Window/UIMessageBox.h +++ b/Source/UI/Window/UIMessageBox.h @@ -19,11 +19,11 @@ public: void Configure(const char* text, int type, bool defaultAccept, int timeout, const char* caption, int width, int height, int modal, const char* icon); /* 00B4 */ UITextViewer* viewer; - /* 00B8 */ int unknown_00B8; + /* 00B8 */ int padding_00B8; /* 00BC */ int counting; /* 00C0 */ std::uint32_t started; /* 00C4 */ std::uint32_t deadline; - /* 00C8 */ int unknown_00C8; + /* 00C8 */ int padding_00C8; /* 00CC */ std::uint32_t remaining; /* 00D0 */ std::string format; /* 00E8 */ std::string messageText; diff --git a/Source/UI/Window/UIMonsterDisplayWnd.h b/Source/UI/Window/UIMonsterDisplayWnd.h index d921eb6cf..3e224e7e1 100644 --- a/Source/UI/Window/UIMonsterDisplayWnd.h +++ b/Source/UI/Window/UIMonsterDisplayWnd.h @@ -10,7 +10,7 @@ public: UIMonsterDisplayWnd(); /* 00B4 */ std::string m_name; /* 00CC */ std::string titleText; - /* 00E4 */ unsigned char unknown_00E4; + /* 00E4 */ unsigned char padding_00E4; void OnCreate(int width, int height) override; diff --git a/Source/UI/Window/UINewMakeCharWnd.h b/Source/UI/Window/UINewMakeCharWnd.h index a0651314a..3064ecee4 100644 --- a/Source/UI/Window/UINewMakeCharWnd.h +++ b/Source/UI/Window/UINewMakeCharWnd.h @@ -51,7 +51,7 @@ protected: #pragma pack(push, 1) struct MakeCharacterStatus { /* 0000 */ std::int64_t exp; - /* 0008 */ unsigned char unknown_0008[0x24]; + /* 0008 */ unsigned char padding_0008[0x24]; /* 002C */ std::int16_t jobPoint; /* 002E */ std::int64_t hp; /* 0036 */ std::int64_t maxHp; @@ -84,7 +84,7 @@ public: /* 01FC */ int actionBase; /* 0200 */ int m_action; /* 0204 */ int m_frame; - /* 0208 */ unsigned char unknown_0208[0x8]; + /* 0208 */ unsigned char padding_0208[0x8]; /* 0210 */ unsigned char characterData[0x04]; /* 0214 */ MakeCharacterStatus m_status; /* 0264 */ short m_job; @@ -102,9 +102,9 @@ public: /* 027C */ char m_name[24]; /* 0294 */ unsigned char m_stats[6]; /* 029A */ unsigned char m_slot; - /* 029B */ unsigned char unknown_029B[0x23]; + /* 029B */ unsigned char padding_029B[0x23]; /* 02BE */ unsigned char m_sex; - /* 02BF */ unsigned char unknown_02BF; + /* 02BF */ unsigned char padding_02BF; union { /* 02C0 */ int nameEditStorage; UIEditCtrl2* m_nameEdit; diff --git a/Source/UI/Window/UINewSkillListWnd.cpp b/Source/UI/Window/UINewSkillListWnd.cpp index bcc424a43..e06558ca4 100644 --- a/Source/UI/Window/UINewSkillListWnd.cpp +++ b/Source/UI/Window/UINewSkillListWnd.cpp @@ -1415,7 +1415,7 @@ int UINewSkillListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s if (level > skill.level) { level = skill.level; } - g_session.m_skillBundle.SetUnknownValue(skill.id, level); + g_session.m_skillBundle.SetSkillValue(skill.id, level); this->m_needsRedraw = 1; this->Invalidate(); } diff --git a/Source/UI/Window/UINewSkillListWnd.h b/Source/UI/Window/UINewSkillListWnd.h index 80253ebb9..467cc0502 100644 --- a/Source/UI/Window/UINewSkillListWnd.h +++ b/Source/UI/Window/UINewSkillListWnd.h @@ -81,13 +81,13 @@ public: /* 0270 */ unsigned char m_scrollable; /* 0271 */ unsigned char m_needsRedraw; /* 0272 */ unsigned char m_locked; - /* 0273 */ unsigned char unknown_0273; + /* 0273 */ unsigned char padding_0273; /* 0274 */ std::uint32_t m_lastTick; /* 0278 */ std::list m_lists[4]; /* 0298 */ std::list m_values; /* 02A0 */ std::list m_plannedSkillLevels; /* 02A8 */ bool m_showDetail; - /* 02A9 */ unsigned char unknown_02A9[3]; + /* 02A9 */ unsigned char padding_02A9[3]; /* 02AC */ int m_detailId; }; diff --git a/Source/UI/Window/UINoticeWnd.h b/Source/UI/Window/UINoticeWnd.h index 7c2e64ad4..6ebbc36c7 100644 --- a/Source/UI/Window/UINoticeWnd.h +++ b/Source/UI/Window/UINoticeWnd.h @@ -16,9 +16,9 @@ public: void LoadNotice(); /* 00B4 */ UIStaticText* m_texts[19]; - /* 0100 */ unsigned char unknown_0100[0x08]; + /* 0100 */ unsigned char padding_0100[0x08]; /* 0108 */ int lineCount; - /* 010C */ int unknown_010C; + /* 010C */ int padding_010C; /* 0110 */ const char* m_patchFile; /* 0114 */ int m_noticeCount; /* 0118 */ int m_index; diff --git a/Source/UI/Window/UIReplayRECControlWnd.h b/Source/UI/Window/UIReplayRECControlWnd.h index c4eea49c6..2a7918753 100644 --- a/Source/UI/Window/UIReplayRECControlWnd.h +++ b/Source/UI/Window/UIReplayRECControlWnd.h @@ -28,7 +28,7 @@ public: void AnimateLoading(); /* 00B4 */ int mode; - /* 00B8 */ int unknown_00B8; + /* 00B8 */ int padding_00B8; union { struct { /* 00BC */ UIWindow* recordStartButton; @@ -51,7 +51,7 @@ public: /* 00F0 */ std::uint32_t recordStart; /* 00F4 */ UIWindow* options[10]; /* 011C */ unsigned char recordOptions[10]; - /* 0126 */ unsigned char unknown_0126[2]; + /* 0126 */ unsigned char padding_0126[2]; union { struct { /* 0128 */ UIWindow* userFilenameCheckBox; @@ -61,7 +61,7 @@ public: }; /* 0130 */ bool replayPathEnabled; /* 0131 */ bool replayOption119; - /* 0132 */ unsigned char unknown_0132[2]; + /* 0132 */ unsigned char padding_0132[2]; /* 0134 */ UIEditCtrl* filenameEdit; /* 0138 */ ReplayRECControlWndInfo* saved; }; diff --git a/Source/UI/Window/UIRoMapWnd.cpp b/Source/UI/Window/UIRoMapWnd.cpp index d76224cdd..297b75a50 100644 --- a/Source/UI/Window/UIRoMapWnd.cpp +++ b/Source/UI/Window/UIRoMapWnd.cpp @@ -71,7 +71,7 @@ __declspec(noinline) void UIRoMapWnd::ClearRecords() { this->previewArea = 0; this->selectedRecord = 0; this->hoveredRecord = 0; - this->unknown_00CC = 0; + this->padding_00CC = 0; } // OFFSET: 0x0091E0F0 diff --git a/Source/UI/Window/UIRoMapWnd.h b/Source/UI/Window/UIRoMapWnd.h index 4d57fd974..86ee306f2 100644 --- a/Source/UI/Window/UIRoMapWnd.h +++ b/Source/UI/Window/UIRoMapWnd.h @@ -32,14 +32,14 @@ struct RoMapMarker { struct RoMapTooltipBox { // INLINED - RoMapTooltipBox(int x, int y, int width, int height) : x(x), y(y), width(width), height(height), unknown_0010(1) { + RoMapTooltipBox(int x, int y, int width, int height) : x(x), y(y), width(width), height(height), padding_0010(1) { } /* 0000 */ int x; /* 0004 */ int y; /* 0008 */ int width; /* 000C */ int height; - /* 0010 */ int unknown_0010; + /* 0010 */ int padding_0010; }; void SetRoMapMarker(std::string name, const WorldViewArea& area, RoMapMarker& marker); @@ -107,7 +107,7 @@ private: /* 00C0 */ WorldViewRecord* selectedRecord; /* 00C4 */ RoMapTooltipBox* hoverTooltip; /* 00C8 */ int* previewArea; - /* 00CC */ unsigned char unknown_00CC; + /* 00CC */ unsigned char padding_00CC; /* 00D0 */ int previewTexture; /* 00D4 */ unsigned char m_showLabels; /* 00D8 */ std::uint32_t m_lastTime; diff --git a/Source/UI/Window/UISecondCostumeWnd.h b/Source/UI/Window/UISecondCostumeWnd.h index 278b68d11..4ea262481 100644 --- a/Source/UI/Window/UISecondCostumeWnd.h +++ b/Source/UI/Window/UISecondCostumeWnd.h @@ -43,8 +43,8 @@ protected: /* 00D0 */ std::vector m_entries[4]; /* 0100 */ std::uint32_t m_previewStartTime; /* 0104 */ int m_page; - /* 0108 */ std::string unknown_0108[7]; - /* 01B0 */ std::string unknown_01B0[7]; + /* 0108 */ std::string padding_0108[7]; + /* 01B0 */ std::string padding_01B0[7]; }; #if defined(_WIN32) && !defined(_WIN64) diff --git a/Source/UI/Window/UISeekPartyListWnd.cpp b/Source/UI/Window/UISeekPartyListWnd.cpp index e9fec821a..287485ff1 100644 --- a/Source/UI/Window/UISeekPartyListWnd.cpp +++ b/Source/UI/Window/UISeekPartyListWnd.cpp @@ -226,7 +226,7 @@ void UISeekPartyListWnd::OnCreate(int width, int height) { this->m_columnCount = 1; this->m_visibleRows = 5; this->m_scrollable = 0; - this->unknown_01B4 = 0; + this->padding_01B4 = 0; this->InitRegionFilter(); this->InitJobFilter(); this->UpdateScrollBar(); @@ -684,10 +684,10 @@ void UISeekPartyListWnd::SelectJobCategory(int category) { UISeekPartyListWnd::UISeekPartyListWnd() : UIFrameWnd(0), m_title(nullptr), m_levelLabel(nullptr), m_mapLabel(nullptr), m_jobLabel(nullptr), m_filterLabel0(nullptr), m_filterLabel1(nullptr), m_filterLabel2(nullptr), m_filterLabel3(nullptr), - unknown_00D4(nullptr), m_footerText(nullptr), m_searchEdit(nullptr), m_regionCombo(nullptr), m_mapCombo(nullptr), m_jobCategoryCombo(nullptr), m_jobCombo(nullptr), m_alarmCheck(nullptr), - m_findButton(nullptr), m_okButton(nullptr), m_chatButton(nullptr), m_scrollBar(nullptr), unknown_010C(), m_regionMaps(), m_jobOptions(), m_region(0), - m_jobCategory(0), m_jobCategoryChanged(0), unknown_0194(), m_restoreHeight(0), m_minimized(0), m_filterLevel(-5), m_filterMap(-5), m_filterJob(-5), - unknown_01CA() { - this->unknown_01C1[0] = 1; + padding_00D4(nullptr), m_footerText(nullptr), m_searchEdit(nullptr), m_regionCombo(nullptr), m_mapCombo(nullptr), m_jobCategoryCombo(nullptr), m_jobCombo(nullptr), m_alarmCheck(nullptr), + m_findButton(nullptr), m_okButton(nullptr), m_chatButton(nullptr), m_scrollBar(nullptr), padding_010C(), m_regionMaps(), m_jobOptions(), m_region(0), + m_jobCategory(0), m_jobCategoryChanged(0), padding_0194(), m_restoreHeight(0), m_minimized(0), m_filterLevel(-5), m_filterMap(-5), m_filterJob(-5), + padding_01CA() { + this->padding_01C1[0] = 1; this->m_refreshButton = nullptr; } diff --git a/Source/UI/Window/UISeekPartyListWnd.h b/Source/UI/Window/UISeekPartyListWnd.h index 7954d279e..3f8bc281e 100644 --- a/Source/UI/Window/UISeekPartyListWnd.h +++ b/Source/UI/Window/UISeekPartyListWnd.h @@ -53,7 +53,7 @@ protected: /* 00C8 */ UIStaticText* m_filterLabel1; /* 00CC */ UIStaticText* m_filterLabel2; /* 00D0 */ UIStaticText* m_filterLabel3; - /* 00D4 */ UIWindow* unknown_00D4; + /* 00D4 */ UIWindow* padding_00D4; /* 00D8 */ UIStaticText* m_footerText; /* 00DC */ UIEditCtrl* m_searchEdit; /* 00E0 */ UIComboBoxDefWnd* m_regionCombo; @@ -67,27 +67,27 @@ protected: /* 0100 */ UITextButton* m_refreshButton; /* 0104 */ UIBitmapButton* m_tabButton; /* 0108 */ UIScrollBar* m_scrollBar; - /* 010C */ unsigned char unknown_010C[0x4]; + /* 010C */ unsigned char padding_010C[0x4]; /* 0110 */ std::map> m_regionMaps; /* 0118 */ std::vector m_jobOptions[9]; /* 0184 */ int m_region; /* 0188 */ int m_mapIndex; /* 018C */ int m_jobCategory; /* 0190 */ int m_jobCategoryChanged; - /* 0194 */ unsigned char unknown_0194[0x10]; + /* 0194 */ unsigned char padding_0194[0x10]; /* 01A4 */ int m_firstRow; /* 01A8 */ int m_hoverIndex; /* 01AC */ int m_columnCount; /* 01B0 */ int m_visibleRows; - /* 01B4 */ int unknown_01B4; + /* 01B4 */ int padding_01B4; /* 01B8 */ int m_scrollable; /* 01BC */ int m_restoreHeight; /* 01C0 */ unsigned char m_minimized; - /* 01C1 */ unsigned char unknown_01C1[0x3]; + /* 01C1 */ unsigned char padding_01C1[0x3]; /* 01C4 */ short m_filterLevel; /* 01C6 */ short m_filterMap; /* 01C8 */ short m_filterJob; - /* 01CA */ unsigned char unknown_01CA[6]; + /* 01CA */ unsigned char padding_01CA[6]; /* 01D0 */ SeekPartyListWndInfo* m_saved; }; diff --git a/Source/UI/Window/UISeekPartyMBWnd.h b/Source/UI/Window/UISeekPartyMBWnd.h index 4bb88baf0..c309f83af 100644 --- a/Source/UI/Window/UISeekPartyMBWnd.h +++ b/Source/UI/Window/UISeekPartyMBWnd.h @@ -44,7 +44,7 @@ protected: /* 00C8 */ UIComboBoxDefWnd* m_typeCombo; /* 00CC */ UIComboBoxDefWnd* m_subTypeCombo; /* 00D0 */ UIComboBoxDefWnd* m_jobCategoryCombo; - /* 00D4 */ unsigned char unknown_00D4[0x30]; + /* 00D4 */ unsigned char padding_00D4[0x30]; /* 0104 */ std::map m_jobChecks[9]; /* 014C */ std::map>> m_subTypes; /* 0154 */ UIBitmapButton* cancelButton; @@ -55,7 +55,7 @@ protected: /* 0164 */ int m_restoreHeight; /* 0168 */ unsigned char m_minimized; /* 0169 */ SeekPartyRegistration m_registration; - /* 0179 */ unsigned char unknown_0179[3]; + /* 0179 */ unsigned char padding_0179[3]; /* 017C */ SeekPartyMBWndInfo* m_saved; }; diff --git a/Source/UI/Window/UISeekPartyWnd.cpp b/Source/UI/Window/UISeekPartyWnd.cpp index d24dd3e1e..18376197e 100644 --- a/Source/UI/Window/UISeekPartyWnd.cpp +++ b/Source/UI/Window/UISeekPartyWnd.cpp @@ -26,7 +26,7 @@ UISeekPartyWnd::UISeekPartyWnd() : UIFrameWnd(0) { this->m_frameTick = 0; this->expandedHeight = 0; this->m_minimized = 0; - this->m_elapsed = GetTickCount() - g_session.m_partyBooking.unknown_0034; + this->m_elapsed = GetTickCount() - g_session.m_partyBooking.registeredTick; } // OFFSET: 0x009281A0 diff --git a/Source/UI/Window/UISeekPartyWnd.h b/Source/UI/Window/UISeekPartyWnd.h index 217898add..d07c351ea 100644 --- a/Source/UI/Window/UISeekPartyWnd.h +++ b/Source/UI/Window/UISeekPartyWnd.h @@ -22,7 +22,7 @@ public: protected: /* 00B4 */ UIStaticText* m_label; - /* 00B8 */ unsigned char unknown_00B8[4]; + /* 00B8 */ unsigned char padding_00B8[4]; /* 00BC */ UIBitmapButton* m_cancelButton; /* 00C0 */ UIBitmapButton* m_rewriteButton; /* 00C4 */ int m_level; @@ -31,10 +31,10 @@ protected: /* 00D0 */ std::uint32_t m_elapsed; /* 00D4 */ std::uint32_t m_frameElapsed; /* 00D8 */ std::uint32_t m_frameTick; - /* 00DC */ unsigned char unknown_00DC[0x104]; + /* 00DC */ unsigned char padding_00DC[0x104]; /* 01E0 */ int expandedHeight; /* 01E4 */ unsigned char m_minimized; - /* 01E5 */ unsigned char unknown_01E5[3]; + /* 01E5 */ unsigned char padding_01E5[3]; /* 01E8 */ SeekPartyWndInfo* m_saved; }; diff --git a/Source/UI/Window/UISerachStoreInfoWnd.cpp b/Source/UI/Window/UISerachStoreInfoWnd.cpp index 5d038e572..85e95d8ef 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.cpp +++ b/Source/UI/Window/UISerachStoreInfoWnd.cpp @@ -48,7 +48,7 @@ static_assert(offsetof(SearchStoreQueryPacket, ids) == 0xF); struct SearchStoreResult { /* 0000 */ int storeId; /* 0004 */ int accountId; - /* 0008 */ unsigned char unknown_0008[0x58]; + /* 0008 */ unsigned char padding_0008[0x58]; /* 0060 */ ITEM_INFO item; }; diff --git a/Source/UI/Window/UISerachStoreInfoWnd.h b/Source/UI/Window/UISerachStoreInfoWnd.h index 887f99ac5..26a517ce1 100644 --- a/Source/UI/Window/UISerachStoreInfoWnd.h +++ b/Source/UI/Window/UISerachStoreInfoWnd.h @@ -27,7 +27,7 @@ protected: /* 00CC */ UIBitmapButton* m_findButton; /* 00D0 */ UITextButton* m_prevButton; /* 00D4 */ UITextButton* m_nextButton; - /* 00D8 */ UIWindow* unknown_00D8; + /* 00D8 */ UIWindow* padding_00D8; /* 00DC */ int m_page; /* 00E0 */ int m_hoverRow; /* 00E4 */ int m_searchType; diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index 08ad80825..088deb0ef 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -3159,8 +3159,8 @@ void UINavigationV4Wnd::SelectRoute(int route) { std::string text; for (int index = 0; index < count; ++index) { NavigationTarget target = g_navigationManager.GetState(g_navigationManager.nodePaths[route][index]); - const bool unknownCell = target.x == -1000 && target.y == -1000; - if (unknownCell) { + const bool cellUnset = target.x == -1000 && target.y == -1000; + if (cellUnset) { text = this->MobName(static_cast(target.object)); } else { text = this->ObjectLabel(target.type, target.object); diff --git a/Source/UI/Window/UIWindow.h b/Source/UI/Window/UIWindow.h index 7c0de5c7a..10828b76a 100644 --- a/Source/UI/Window/UIWindow.h +++ b/Source/UI/Window/UIWindow.h @@ -226,7 +226,7 @@ protected: /* 0050 */ std::list m_children; /* 0058 */ int m_dirty; /* 005C */ std::vector m_overlayPrimitives; - /* 0068 */ std::vector unknown_0068; + /* 0068 */ std::vector padding_0068; /* 0074 */ std::uint32_t m_uid; /* 0078 */ unsigned char m_cached; /* 0079 */ unsigned char m_clip; diff --git a/Source/UI/Window/UIWindowMgr.cpp b/Source/UI/Window/UIWindowMgr.cpp index bfc55ecf0..23faf56e6 100644 --- a/Source/UI/Window/UIWindowMgr.cpp +++ b/Source/UI/Window/UIWindowMgr.cpp @@ -271,11 +271,11 @@ struct ShortcutRotatePacket { struct AiCommand { /* 0000 */ int type; - /* 0004 */ int unknown_0004; - /* 0008 */ int unknown_0008; - /* 000C */ int unknown_000C; - /* 0010 */ int unknown_0010; - /* 0014 */ int unknown_0014; + /* 0004 */ int padding_0004; + /* 0008 */ int padding_0008; + /* 000C */ int padding_000C; + /* 0010 */ int padding_0010; + /* 0014 */ int padding_0014; AiCommand() { std::memset(this, 0, sizeof(*this)); @@ -795,10 +795,10 @@ void UIWindowMgr::ResetWindows() { this->partyBookingHelpWnd = 0; this->collectionSystemWnd = nullptr; this->replayRecordControlWnd = nullptr; - this->unknown_01D8 = 0; + this->padding_01D8 = 0; this->questDisplayWnd = nullptr; this->navigationWnd = nullptr; - this->unknown_0440 = 0; + this->padding_0440 = 0; this->clanInfoManageWnd = nullptr; this->bankNewWnd = nullptr; this->messageBoxes.clear(); @@ -868,7 +868,7 @@ void UIWindowMgr::ResetWindows() { // FUNCTION: fn_17086 UIWindowMgr::UIWindowMgr() : activeWindowId(0), retainedPersistentWindow(false), changeNameWnd(nullptr), previousMouseX(-1), previousMouseY(-1), basicInfoExpanded(true), - dropDownBoxWnd(nullptr), macroReporterVisible(false), unknown_4F211(false), waitDBSaveWnd(nullptr) { + dropDownBoxWnd(nullptr), macroReporterVisible(false), padding_4F211(false), waitDBSaveWnd(nullptr) { this->ResetWindows(); this->backgroundSurface = nullptr; this->screenWidth = 0; @@ -883,8 +883,8 @@ UIWindowMgr::UIWindowMgr() this->minimapMarkersVisible = 1; this->minimapColor = 0xAAFFFFFFu; this->drawCompass = 1; - this->unknown_04F8 = 0; - this->unknown_04F4 = 0; + this->padding_04F8 = 0; + this->padding_04F4 = 0; this->framesInvalidated = 0; this->chatWndStickOn = 1; this->battleSubChatEnabled = 0; @@ -3675,7 +3675,7 @@ bool UIWindowMgr::CloseWindow(int id) { closed = true; } break; - case WID_SUBCHATHISWND_UNKNOWN_03E4: + case WID_SUBCHATHISWND: if (this->subChatHistoryWnd) { reinterpret_cast(this->subChatHistoryWnd)->StoreInfo(); this->Schedule(reinterpret_cast(this->subChatHistoryWnd)); @@ -3683,7 +3683,7 @@ bool UIWindowMgr::CloseWindow(int id) { closed = true; } break; - case WID_SUBCHATHISWND_UNKNOWN_03E8: + case WID_SUBCHATHISWND2: if (this->secondSubChatHistoryWnd) { reinterpret_cast(this->secondSubChatHistoryWnd)->StoreInfo(); this->Schedule(reinterpret_cast(this->secondSubChatHistoryWnd)); @@ -3778,7 +3778,7 @@ bool UIWindowMgr::CloseWindow(int id) { this->Schedule(this->seekPartyWnd); this->seekPartyWnd = nullptr; closed = true; - g_session.m_partyBooking.unknown_0000 = 0; + g_session.m_partyBooking.seekWindowOpen = 0; } break; case WID_SEEKPARTYMBWND: @@ -5062,7 +5062,7 @@ UIWindow* UIWindowMgr::EnsureWindow(int id) { this->seekPartyWnd->SendMsg(nullptr, UM_SETINFO, reinterpret_cast(base + 0x6DC), 0, 0, 0); } window->Show(1); - g_session.m_partyBooking.unknown_0000 = 1; + g_session.m_partyBooking.seekWindowOpen = 1; break; case WID_SEEKPARTYMBWND: if (this->seekPartyWnd == nullptr) { @@ -6489,7 +6489,7 @@ UIWindow* UIWindowMgr::EnsureWindow(int id) { } window->Show(1); break; - case WID_SUBCHATHISWND_UNKNOWN_03E4: + case WID_SUBCHATHISWND: window = reinterpret_cast(this->subChatHistoryWnd); if (window == nullptr) { window = new UISubChatHisWnd(); @@ -6501,7 +6501,7 @@ UIWindow* UIWindowMgr::EnsureWindow(int id) { } window->Show(0); break; - case WID_SUBCHATHISWND_UNKNOWN_03E8: + case WID_SUBCHATHISWND2: window = reinterpret_cast(this->secondSubChatHistoryWnd); if (window == nullptr) { window = new UISubChatHisWnd(); diff --git a/Source/UI/Window/UIWindowMgr.h b/Source/UI/Window/UIWindowMgr.h index fe03c6814..d0d0c65d5 100644 --- a/Source/UI/Window/UIWindowMgr.h +++ b/Source/UI/Window/UIWindowMgr.h @@ -30,8 +30,8 @@ struct WindowTextEntry { struct WindowTextRecord { /* 0000 */ std::string text; - /* 0018 */ std::uint32_t unknown_0018; - /* 001C */ std::uint32_t unknown_001C; + /* 0018 */ std::uint32_t padding_0018; + /* 001C */ std::uint32_t padding_001C; }; struct SavedWindowRectangle { @@ -68,83 +68,83 @@ public: /* 0034 */ int chatWndY; /* 0038 */ int chatWndHeight; /* 003C */ int chatWndVisible; - /* 0040 */ int unknown_0040; - /* 0044 */ int unknown_0044; + /* 0040 */ int padding_0040; + /* 0044 */ int padding_0044; /* 0048 */ int skillDescriptionVisible; /* 004C */ int chatWndStatus; /* 0050 */ float minimapZoom; /* 0054 */ unsigned char minimapMarkersVisible; - /* 0055 */ unsigned char unknown_0055[3]; + /* 0055 */ unsigned char padding_0055[3]; /* 0058 */ int itemStoreWindowCount; /* 005C */ std::uint32_t minimapColor; /* 0060 */ int drawCompass; /* 0064 */ int dragAllItems; /* 0068 */ int compactCompositionLayout; /* 006C */ int rightToLeftChatEnabled; - /* 0070 */ int unknown_0070; - /* 0074 */ int unknown_0074; - /* 0078 */ int unknown_0078; - /* 007C */ int unknown_007C; - /* 0080 */ int unknown_0080; - /* 0084 */ int unknown_0084; - /* 0088 */ int unknown_0088; - /* 008C */ int unknown_008C; - /* 0090 */ int unknown_0090; - /* 0094 */ int unknown_0094; - /* 0098 */ int unknown_0098; - /* 009C */ int unknown_009C; - /* 00A0 */ int unknown_00A0; - /* 00A4 */ int unknown_00A4; - /* 00A8 */ int unknown_00A8; - /* 00AC */ int unknown_00AC; - /* 00B0 */ int unknown_00B0; - /* 00B4 */ int unknown_00B4; - /* 00B8 */ int unknown_00B8; - /* 00BC */ int unknown_00BC; - /* 00C0 */ int unknown_00C0; - /* 00C4 */ int unknown_00C4; - /* 00C8 */ int unknown_00C8; - /* 00CC */ int unknown_00CC; - /* 00D0 */ int unknown_00D0; - /* 00D4 */ int unknown_00D4; - /* 00D8 */ int unknown_00D8; - /* 00DC */ int unknown_00DC; - /* 00E0 */ int unknown_00E0; - /* 00E4 */ int unknown_00E4; - /* 00E8 */ int unknown_00E8; - /* 00EC */ int unknown_00EC; - /* 00F0 */ int unknown_00F0; - /* 00F4 */ int unknown_00F4; - /* 00F8 */ int unknown_00F8; - /* 00FC */ int unknown_00FC; - /* 0100 */ int unknown_0100; - /* 0104 */ int unknown_0104; - /* 0108 */ int unknown_0108; - /* 010C */ int unknown_010C; - /* 0110 */ int unknown_0110; - /* 0114 */ int unknown_0114; - /* 0118 */ int unknown_0118; - /* 011C */ int unknown_011C; - /* 0120 */ int unknown_0120; - /* 0124 */ int unknown_0124; - /* 0128 */ int unknown_0128; - /* 012C */ int unknown_012C; - /* 0130 */ int unknown_0130; - /* 0134 */ int unknown_0134; - /* 0138 */ int unknown_0138; - /* 013C */ int unknown_013C; - /* 0140 */ int unknown_0140; - /* 0144 */ int unknown_0144; - /* 0148 */ int unknown_0148; - /* 014C */ int unknown_014C; - /* 0150 */ int unknown_0150; - /* 0154 */ int unknown_0154; - /* 0158 */ int unknown_0158; - /* 015C */ int unknown_015C; - /* 0160 */ int unknown_0160; - /* 0164 */ int unknown_0164; - /* 0168 */ int unknown_0168; - /* 016C */ int unknown_016C; + /* 0070 */ int padding_0070; + /* 0074 */ int padding_0074; + /* 0078 */ int padding_0078; + /* 007C */ int padding_007C; + /* 0080 */ int padding_0080; + /* 0084 */ int padding_0084; + /* 0088 */ int padding_0088; + /* 008C */ int padding_008C; + /* 0090 */ int padding_0090; + /* 0094 */ int padding_0094; + /* 0098 */ int padding_0098; + /* 009C */ int padding_009C; + /* 00A0 */ int padding_00A0; + /* 00A4 */ int padding_00A4; + /* 00A8 */ int padding_00A8; + /* 00AC */ int padding_00AC; + /* 00B0 */ int padding_00B0; + /* 00B4 */ int padding_00B4; + /* 00B8 */ int padding_00B8; + /* 00BC */ int padding_00BC; + /* 00C0 */ int padding_00C0; + /* 00C4 */ int padding_00C4; + /* 00C8 */ int padding_00C8; + /* 00CC */ int padding_00CC; + /* 00D0 */ int padding_00D0; + /* 00D4 */ int padding_00D4; + /* 00D8 */ int padding_00D8; + /* 00DC */ int padding_00DC; + /* 00E0 */ int padding_00E0; + /* 00E4 */ int padding_00E4; + /* 00E8 */ int padding_00E8; + /* 00EC */ int padding_00EC; + /* 00F0 */ int padding_00F0; + /* 00F4 */ int padding_00F4; + /* 00F8 */ int padding_00F8; + /* 00FC */ int padding_00FC; + /* 0100 */ int padding_0100; + /* 0104 */ int padding_0104; + /* 0108 */ int padding_0108; + /* 010C */ int padding_010C; + /* 0110 */ int padding_0110; + /* 0114 */ int padding_0114; + /* 0118 */ int padding_0118; + /* 011C */ int padding_011C; + /* 0120 */ int padding_0120; + /* 0124 */ int padding_0124; + /* 0128 */ int padding_0128; + /* 012C */ int padding_012C; + /* 0130 */ int padding_0130; + /* 0134 */ int padding_0134; + /* 0138 */ int padding_0138; + /* 013C */ int padding_013C; + /* 0140 */ int padding_0140; + /* 0144 */ int padding_0144; + /* 0148 */ int padding_0148; + /* 014C */ int padding_014C; + /* 0150 */ int padding_0150; + /* 0154 */ int padding_0154; + /* 0158 */ int padding_0158; + /* 015C */ int padding_015C; + /* 0160 */ int padding_0160; + /* 0164 */ int padding_0164; + /* 0168 */ int padding_0168; + /* 016C */ int padding_016C; /* 0170 */ std::set persistentWindows; /* 0178 */ bool retainedPersistentWindow; /* 017C */ std::list rendered; @@ -162,7 +162,7 @@ public: /* 01CC */ UIWindow* loginWnd; /* 01D0 */ UIWindow* loginOTPWnd; /* 01D4 */ UIWindow* itemWnd; - /* 01D8 */ std::uint32_t unknown_01D8; + /* 01D8 */ std::uint32_t padding_01D8; /* 01DC */ UIWindow* basicInfoWnd; /* 01E0 */ UIWindow* equipWnd; /* 01E4 */ UIWindow* nCashWnd; @@ -284,7 +284,7 @@ public: /* 03F0 */ std::uint32_t subChatMiniWnd; /* 03F4 */ unsigned short chatWndStickOn; /* 03F6 */ unsigned char battleSubChatEnabled; - /* 03F7 */ unsigned char unknown_03F7; + /* 03F7 */ unsigned char padding_03F7; /* 03F8 */ UIWindow* memorialDunWnd; /* 03FC */ UIWindow* otherEquipWnd; /* 0400 */ UIWindow* modal; @@ -303,7 +303,7 @@ public: /* 0434 */ UIWindow* guildTipWnd; /* 0438 */ UIWindow* createGuildWnd; /* 043C */ UIWindow* createGuildAlternateWnd; - /* 0440 */ std::uint32_t unknown_0440; + /* 0440 */ std::uint32_t padding_0440; /* 0444 */ UIWindow* clanInfoManageWnd; /* 0448 */ UIWindow* bankNewWnd; /* 044C */ UIWindow* guildStorageLogWnd; @@ -320,7 +320,7 @@ public: /* 0478 */ UIWindow* backgroundSurface; /* 047C */ int screenWidth; /* 0480 */ int screenHeight; - /* 0484 */ std::string unknown_0484; + /* 0484 */ std::string padding_0484; /* 049C */ short loginGridX; /* 049E */ short loginGridY; /* 04A0 */ POINTS loginSidePanelOffset; @@ -328,17 +328,17 @@ public: /* 04A8 */ POINTS loginButtonPanelOffset; /* 04AC */ POINTS loginExtraPanelOffset; /* 04B0 */ unsigned char loginDragRegion; - /* 04B1 */ unsigned char unknown_04B1[3]; + /* 04B1 */ unsigned char padding_04B1[3]; /* 04B4 */ int gradeImageWidth; /* 04B8 */ int gradeImageHeight; /* 04BC */ int gradeImageX; /* 04C0 */ int gradeImageY; /* 04C4 */ std::list pendingNoticeLines; - /* 04CC */ std::list unknown_04CC; - /* 04D4 */ std::list unknown_04D4; + /* 04CC */ std::list padding_04CC; + /* 04D4 */ std::list padding_04D4; /* 04DC */ std::string chatInputText; - /* 04F4 */ int unknown_04F4; - /* 04F8 */ int unknown_04F8; + /* 04F4 */ int padding_04F4; + /* 04F8 */ int padding_04F8; /* 04FC */ int framesInvalidated; /* 0500 */ std::map namedWindows; /* 0508 */ int windowVisibilityState; @@ -357,7 +357,7 @@ public: /* 05BC */ int optionWndVisible; /* 05C0 */ unsigned char shortenItemPlacement[0x10]; /* 05D0 */ int shortenItemWndVisible; - /* 05D4 */ unsigned char unknown_05D4[0x168]; + /* 05D4 */ unsigned char padding_05D4[0x168]; /* 073C */ int messengerGroupWndVisible; /* 0740 */ unsigned char messengerPartyTabState[0x08]; /* 0748 */ NormalItemSlotWindow m_normalItemSlotWindow; @@ -367,7 +367,7 @@ public: /* 0790 */ int merchantItemWndVisible; /* 0794 */ unsigned char merchantMirrorItemPlacement[0xB4]; /* 0848 */ WindowPlacement m_whisperPlacement; - /* 0858 */ unsigned char unknown_0858[0x94]; + /* 0858 */ unsigned char padding_0858[0x94]; /* 08EC */ int homunculusSkillWndVisible; /* 08F0 */ unsigned char mercenaryInfoAndSkillPlacement[0x20]; /* 0910 */ int mercenarySkillWndVisible; @@ -379,7 +379,7 @@ public: /* 09D0 */ CWebBrowser* specialBrowser; /* 09D4 */ unsigned char entryQueueStandbyPlacement[0x10]; /* 09E4 */ std::vector messageBoxes; - /* 09F0 */ unsigned char unknown_09F0[0x40]; + /* 09F0 */ unsigned char padding_09F0[0x40]; /* 0A30 */ UIWindow* dropDownBoxWnd; /* 0A34 */ WindowPolicyEntry policy[10041]; /* 4F154 */ unsigned char navigationPlacement[16]; @@ -416,8 +416,8 @@ public: /* 4F1FC */ UIWindow* macroDetectorEditWnd; /* 4F200 */ unsigned char macroReporterPlacement[16]; /* 4F210 */ bool macroReporterVisible; - /* 4F211 */ bool unknown_4F211; - /* 4F214 */ std::vector unknown_4F214; + /* 4F211 */ bool padding_4F211; + /* 4F214 */ std::vector padding_4F214; /* 4F220 */ unsigned char previewEquipPlacement[0x18]; /* 4F238 */ int miniPartyWidth; /* 4F23C */ int miniPartyHeight; @@ -637,10 +637,10 @@ static_assert(offsetof(UIWindowMgr, chatWnd) == 0x1C8); static_assert(offsetof(UIWindowMgr, shortCutWnd) == 0x1E8); static_assert(offsetof(UIWindowMgr, skillDescribeWnd) == 0x230); static_assert(offsetof(UIWindowMgr, modal) == 0x400); -static_assert(offsetof(UIWindowMgr, unknown_0484) == 0x484); +static_assert(offsetof(UIWindowMgr, padding_0484) == 0x484); static_assert(offsetof(UIWindowMgr, pendingNoticeLines) == 0x4C4); -static_assert(offsetof(UIWindowMgr, unknown_04CC) == 0x4CC); -static_assert(offsetof(UIWindowMgr, unknown_04D4) == 0x4D4); +static_assert(offsetof(UIWindowMgr, padding_04CC) == 0x4CC); +static_assert(offsetof(UIWindowMgr, padding_04D4) == 0x4D4); static_assert(offsetof(UIWindowMgr, chatInputText) == 0x4DC); static_assert(offsetof(UIWindowMgr, namedWindows) == 0x500); static_assert(offsetof(UIWindowMgr, hiddenWindows) == 0x50C); @@ -649,7 +649,7 @@ static_assert(offsetof(UIWindowMgr, messageBoxes) == 0x9E4); static_assert(offsetof(UIWindowMgr, policy) == 0xA34); static_assert(offsetof(UIWindowMgr, savedRectangles) == 0x4F190); static_assert(offsetof(UIWindowMgr, overlays) == 0x4F198); -static_assert(offsetof(UIWindowMgr, unknown_4F214) == 0x4F214); +static_assert(offsetof(UIWindowMgr, padding_4F214) == 0x4F214); static_assert(offsetof(UIWindowMgr, snapExcluded) == 0x4F240); static_assert(offsetof(UIWindowMgr, closedMiniPartyIds) == 0x4F248); static_assert(offsetof(UIWindowMgr, savedWindowIds) == 0x4F280); diff --git a/Source/UI/Window/WindowId.h b/Source/UI/Window/WindowId.h index abfdbcfde..108d7dcb2 100644 --- a/Source/UI/Window/WindowId.h +++ b/Source/UI/Window/WindowId.h @@ -106,8 +106,8 @@ enum WindowId : int { WID_SELCHARFORUSERVERWND = 127, WID_CHANGENAMEWND = 128, WID_REBIRTHWND = 129, - WID_SUBCHATHISWND_UNKNOWN_03E4 = 130, - WID_SUBCHATHISWND_UNKNOWN_03E8 = 131, + WID_SUBCHATHISWND = 130, + WID_SUBCHATHISWND2 = 131, WID_BATTLEMSGOPTIONWND = 132, WID_SUBCHATMINIWND = 133, WID_MEMORIALDUNWND = 137, diff --git a/Source/Utility/Async/NAsyncWork.h b/Source/Utility/Async/NAsyncWork.h index eea427501..213dadac1 100644 --- a/Source/Utility/Async/NAsyncWork.h +++ b/Source/Utility/Async/NAsyncWork.h @@ -19,7 +19,7 @@ public: } protected: - /* 001C */ std::uint32_t unknown_001C; + /* 001C */ std::uint32_t padding_001C; /* 0020 */ std::uint32_t m_group; /* 0024 */ std::uint32_t m_key; }; diff --git a/Source/Utility/Async/NRecycleObjectPoolMgr.h b/Source/Utility/Async/NRecycleObjectPoolMgr.h index 425650fcc..32adef1d1 100644 --- a/Source/Utility/Async/NRecycleObjectPoolMgr.h +++ b/Source/Utility/Async/NRecycleObjectPoolMgr.h @@ -16,7 +16,7 @@ public: protected: struct NameHash { - /* 0000 */ std::uint8_t unknown_0000 = 0; + /* 0000 */ std::uint8_t padding_0000 = 0; std::size_t operator()(const std::string& name) const; }; diff --git a/Source/Utility/Cipher/CipherPrimitives.cpp b/Source/Utility/Cipher/CipherPrimitives.cpp index f7ab20239..9697ba9be 100644 --- a/Source/Utility/Cipher/CipherPrimitives.cpp +++ b/Source/Utility/Cipher/CipherPrimitives.cpp @@ -168,9 +168,9 @@ unsigned char g_fealRotateTable[256]; struct KeyedBoxContext { /* 0000 */ int blockSize; - /* 0004 */ int unknown_0004; - /* 0008 */ int unknown_0008; - /* 000C */ int unknown_000C; + /* 0004 */ int padding_0004; + /* 0008 */ int padding_0008; + /* 000C */ int padding_000C; /* 0010 */ int startRound; /* 0014 */ unsigned char boxes[1][256]; }; diff --git a/Source/Utility/JsonCppLoader.h b/Source/Utility/JsonCppLoader.h index 358cfc717..f4cba52cf 100644 --- a/Source/Utility/JsonCppLoader.h +++ b/Source/Utility/JsonCppLoader.h @@ -54,7 +54,7 @@ public: const JsonObject* ObjectRange() const; /* 0000 */ unsigned char type; - /* 0001 */ unsigned char unknown_0001; + /* 0001 */ unsigned char padding_0001; /* 0002 */ unsigned short smallValue; /* 0004 */ void* pointer; /* 0008 */ long long integer; diff --git a/Source/Utility/Lexicon/LexiconSerializer.h b/Source/Utility/Lexicon/LexiconSerializer.h index 13a1d22d4..f5f3e3025 100644 --- a/Source/Utility/Lexicon/LexiconSerializer.h +++ b/Source/Utility/Lexicon/LexiconSerializer.h @@ -6,13 +6,13 @@ struct LexiconNode { /* 0000 */ unsigned char value; /* 0001 */ unsigned char terminal; - /* 0002 */ unsigned char unknown_0002[2]; + /* 0002 */ unsigned char padding_0002[2]; /* 0004 */ LexiconNode* sibling; /* 0008 */ LexiconNode* child; }; struct LexiconHeader { - /* 0000 */ unsigned char unknown_0000[0x104]; + /* 0000 */ unsigned char padding_0000[0x104]; /* 0104 */ std::uint32_t wordCount; /* 0108 */ std::uint32_t nodeCount; /* 010C */ std::uint32_t total; diff --git a/Source/Utility/NFileLog.h b/Source/Utility/NFileLog.h index 77c1648a7..0e95b3c14 100644 --- a/Source/Utility/NFileLog.h +++ b/Source/Utility/NFileLog.h @@ -13,7 +13,7 @@ public: bool Initialize(const char* directoryName, const char* prefix); - /* 0004 */ std::uint32_t unknown_0004; + /* 0004 */ std::uint32_t padding_0004; /* 0008 */ CRITICAL_SECTION criticalSection; /* 0020 */ char directory[1024]; /* 0420 */ char prefix[1024]; diff --git a/Source/Utility/Threading/NThread.cpp b/Source/Utility/Threading/NThread.cpp index bf3d3e70e..364782e62 100644 --- a/Source/Utility/Threading/NThread.cpp +++ b/Source/Utility/Threading/NThread.cpp @@ -31,7 +31,7 @@ namespace { NThread::NThread(std::string name) : m_state(0), m_name(name) { this->m_handle = nullptr; this->m_threadId = 0; - this->unknown_0008 = true; + this->padding_0008 = true; } // OFFSET: 0x00737290 diff --git a/Source/Utility/Threading/NThread.h b/Source/Utility/Threading/NThread.h index 30853c198..a3c0a56a1 100644 --- a/Source/Utility/Threading/NThread.h +++ b/Source/Utility/Threading/NThread.h @@ -18,7 +18,7 @@ public: protected: /* 0004 */ unsigned m_threadId; - /* 0008 */ bool unknown_0008; + /* 0008 */ bool padding_0008; /* 000C */ std::uint32_t m_state; /* 0010 */ HANDLE m_handle; /* 0014 */ std::string m_name;