Merge pull request #136 from Pistonight/gdt_common_flag_names

add gdt flag name constant getters

4 files changed, 202 insertions, 61 deletions

diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index 517b5d91..04d0f44e 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -53500,67 +53500,67 @@ Address,Quality,Size,Name
 0x00000071008bf844,U,000092,
 0x00000071008bf8a0,O,000004,_ZN4ksys3gdt15initCommonFlagsEv
 0x00000071008bf8a4,O,148760,_ZN4ksys3gdt16initCommonFlags_Ev
-0x00000071008e3dbc,U,000012,getStr_AoC_HardMode_Enabled
-0x00000071008e3dc8,U,000012,getStrBowPorchStockNum
-0x00000071008e3dd4,U,000012,getStrCaptionPictSize
-0x00000071008e3de0,U,000012,
-0x00000071008e3dec,U,000012,
-0x00000071008e3df8,U,000012,getCurrentRupeeFlagName
-0x00000071008e3e04,U,000012,
-0x00000071008e3e10,U,000012,getStr_DungeonClearSealNum
-0x00000071008e3e1c,U,000012,
-0x00000071008e3e28,U,000012,
-0x00000071008e3e34,U,000012,
-0x00000071008e3e40,U,000012,
-0x00000071008e3e4c,U,000012,
-0x00000071008e3e58,U,000012,
-0x00000071008e3e64,U,000012,
-0x00000071008e3e70,U,000012,
-0x00000071008e3e7c,U,000012,
-0x00000071008e3e88,U,000012,
-0x00000071008e3e94,U,000012,
-0x00000071008e3ea0,U,000012,
-0x00000071008e3eac,U,000012,
-0x00000071008e3eb8,U,000012,
-0x00000071008e3ec4,U,000012,
-0x00000071008e3ed0,U,000012,
-0x00000071008e3edc,U,000012,
-0x00000071008e3ee8,U,000012,
-0x00000071008e3ef4,U,000012,
-0x00000071008e3f00,U,000012,
-0x00000071008e3f0c,U,000012,
-0x00000071008e3f18,U,000012,
-0x00000071008e3f24,U,000012,
-0x00000071008e3f30,U,000012,
-0x00000071008e3f3c,U,000012,
-0x00000071008e3f48,U,000012,
-0x00000071008e3f54,U,000012,
-0x00000071008e3f60,U,000012,
-0x00000071008e3f6c,U,000012,
-0x00000071008e3f78,U,000012,
-0x00000071008e3f84,U,000012,
-0x00000071008e3f90,U,000012,
-0x00000071008e3f9c,U,000012,
-0x00000071008e3fa8,U,000012,
-0x00000071008e3fb4,U,000012,
-0x00000071008e3fc0,U,000012,
-0x00000071008e3fcc,U,000012,
-0x00000071008e3fd8,U,000012,
-0x00000071008e3fe4,U,000012,
-0x00000071008e3ff0,U,000012,
-0x00000071008e3ffc,U,000012,
-0x00000071008e4008,U,000012,
-0x00000071008e4014,U,000012,
-0x00000071008e4020,U,000012,
-0x00000071008e402c,U,000012,
-0x00000071008e4038,U,000012,getStr_IsSaveByAuto
-0x00000071008e4044,U,000012,str_KorokNutsNum
-0x00000071008e4050,U,000012,
-0x00000071008e405c,U,000012,
-0x00000071008e4068,U,000012,
-0x00000071008e4074,U,000012,
-0x00000071008e4080,U,000012,getTrackBlockSaveNumberFlag
-0x00000071008e408c,U,000012,getTrackBlockSaveNumberFlagHard
+0x00000071008e3dbc,O,000012,_ZN4ksys3gdt8flagname20Aoc_HardMode_EnabledEv
+0x00000071008e3dc8,O,000012,_ZN4ksys3gdt8flagname16BowPorchStockNumEv
+0x00000071008e3dd4,O,000012,_ZN4ksys3gdt8flagname15CaptionPictSizeEv
+0x00000071008e3de0,O,000012,_ZN4ksys3gdt8flagname11CurrentHartEv
+0x00000071008e3dec,O,000012,_ZN4ksys3gdt8flagname11CurrentMamoEv
+0x00000071008e3df8,O,000012,_ZN4ksys3gdt8flagname12CurrentRupeeEv
+0x00000071008e3e04,O,000012,_ZN4ksys3gdt8flagname30CurrentTotalGetRupeeInMiniGameEv
+0x00000071008e3e10,O,000012,_ZN4ksys3gdt8flagname19DungeonClearSealNumEv
+0x00000071008e3e1c,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_014_HeadEv
+0x00000071008e3e28,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_014_LowerEv
+0x00000071008e3e34,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_014_UpperEv
+0x00000071008e3e40,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_046_HeadEv
+0x00000071008e3e4c,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_046_LowerEv
+0x00000071008e3e58,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_046_UpperEv
+0x00000071008e3e64,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_048_HeadEv
+0x00000071008e3e70,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_048_LowerEv
+0x00000071008e3e7c,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_048_UpperEv
+0x00000071008e3e88,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_083_HeadEv
+0x00000071008e3e94,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_083_LowerEv
+0x00000071008e3ea0,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_083_UpperEv
+0x00000071008e3eac,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_084_HeadEv
+0x00000071008e3eb8,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_084_LowerEv
+0x00000071008e3ec4,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_084_UpperEv
+0x00000071008e3ed0,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_085_HeadEv
+0x00000071008e3edc,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_085_LowerEv
+0x00000071008e3ee8,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_085_UpperEv
+0x00000071008e3ef4,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_086_HeadEv
+0x00000071008e3f00,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_086_LowerEv
+0x00000071008e3f0c,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_086_UpperEv
+0x00000071008e3f18,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_103_HeadEv
+0x00000071008e3f24,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_103_LowerEv
+0x00000071008e3f30,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_103_UpperEv
+0x00000071008e3f3c,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_104_HeadEv
+0x00000071008e3f48,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_104_LowerEv
+0x00000071008e3f54,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_104_UpperEv
+0x00000071008e3f60,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_105_HeadEv
+0x00000071008e3f6c,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_105_LowerEv
+0x00000071008e3f78,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_105_UpperEv
+0x00000071008e3f84,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_106_HeadEv
+0x00000071008e3f90,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_106_LowerEv
+0x00000071008e3f9c,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_106_UpperEv
+0x00000071008e3fa8,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_111_HeadEv
+0x00000071008e3fb4,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_111_LowerEv
+0x00000071008e3fc0,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_111_UpperEv
+0x00000071008e3fcc,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_112_HeadEv
+0x00000071008e3fd8,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_112_LowerEv
+0x00000071008e3fe4,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_112_UpperEv
+0x00000071008e3ff0,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_113_HeadEv
+0x00000071008e3ffc,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_113_LowerEv
+0x00000071008e4008,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_113_UpperEv
+0x00000071008e4014,O,000012,_ZN4ksys3gdt8flagname20IsGet_Armor_114_HeadEv
+0x00000071008e4020,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_114_LowerEv
+0x00000071008e402c,O,000012,_ZN4ksys3gdt8flagname21IsGet_Armor_114_UpperEv
+0x00000071008e4038,O,000012,_ZN4ksys3gdt8flagname12IsSaveByAutoEv
+0x00000071008e4044,O,000012,_ZN4ksys3gdt8flagname12KorokNutsNumEv
+0x00000071008e4050,O,000012,_ZN4ksys3gdt8flagname18LastSaveTime_LowerEv
+0x00000071008e405c,O,000012,_ZN4ksys3gdt8flagname18LastSaveTime_UpperEv
+0x00000071008e4068,O,000012,_ZN4ksys3gdt8flagname16SaveDistrictNameEv
+0x00000071008e4074,O,000012,_ZN4ksys3gdt8flagname16SaveLocationNameEv
+0x00000071008e4080,O,000012,_ZN4ksys3gdt8flagname20TrackBlockFileNumberEv
+0x00000071008e408c,O,000012,_ZN4ksys3gdt8flagname25TrackBlockFileNumber_HardEv
 0x00000071008e4098,O,000168,_ZN4ksys3gdt26getFlag_100enemy_ActivatedEb
 0x00000071008e4140,O,000168,_ZN4ksys3gdt18getFlagGenericBoolENS0_10FlagHandleEb
 0x00000071008e41e8,O,000168,_ZN4ksys3gdt17getFlagGenericS32ENS0_10FlagHandleEb
diff --git a/src/KingSystem/GameData/CMakeLists.txt b/src/KingSystem/GameData/CMakeLists.txt
index 47aa4b50..29410bd8 100644
--- a/src/KingSystem/GameData/CMakeLists.txt
+++ b/src/KingSystem/GameData/CMakeLists.txt
@@ -12,6 +12,8 @@ target_sources(uking PRIVATE
   gdtManager.h
   gdtSaveMgr.cpp
   gdtSaveMgr.h
+  gdtSpecialFlagNames.cpp
+  gdtSpecialFlagNames.h
   gdtSpecialFlags.cpp
   gdtSpecialFlags.h
   gdtTriggerParam.cpp
diff --git a/src/KingSystem/GameData/gdtSpecialFlagNames.cpp b/src/KingSystem/GameData/gdtSpecialFlagNames.cpp
new file mode 100644
index 00000000..7c58bd12
--- /dev/null
+++ b/src/KingSystem/GameData/gdtSpecialFlagNames.cpp
@@ -0,0 +1,72 @@
+#include "KingSystem/GameData/gdtSpecialFlagNames.h"
+
+namespace ksys::gdt::flagname {
+
+#define GDT_DEFINE_SPECIAL_FLAG_NAME(name)                                                         \
+    const char* name() { return #name; }
+
+GDT_DEFINE_SPECIAL_FLAG_NAME(Aoc_HardMode_Enabled)
+GDT_DEFINE_SPECIAL_FLAG_NAME(BowPorchStockNum)
+GDT_DEFINE_SPECIAL_FLAG_NAME(CaptionPictSize)
+GDT_DEFINE_SPECIAL_FLAG_NAME(CurrentHart)
+GDT_DEFINE_SPECIAL_FLAG_NAME(CurrentMamo)
+GDT_DEFINE_SPECIAL_FLAG_NAME(CurrentRupee)
+GDT_DEFINE_SPECIAL_FLAG_NAME(CurrentTotalGetRupeeInMiniGame)
+GDT_DEFINE_SPECIAL_FLAG_NAME(DungeonClearSealNum)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_014_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_014_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_014_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_046_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_046_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_046_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_048_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_048_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_048_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_083_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_083_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_083_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_084_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_084_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_084_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_085_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_085_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_085_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_086_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_086_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_086_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_103_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_103_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_103_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_104_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_104_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_104_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_105_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_105_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_105_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_106_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_106_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_106_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_111_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_111_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_111_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_112_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_112_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_112_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_113_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_113_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_113_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_114_Head)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_114_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsGet_Armor_114_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(IsSaveByAuto)
+GDT_DEFINE_SPECIAL_FLAG_NAME(KorokNutsNum)
+GDT_DEFINE_SPECIAL_FLAG_NAME(LastSaveTime_Lower)
+GDT_DEFINE_SPECIAL_FLAG_NAME(LastSaveTime_Upper)
+GDT_DEFINE_SPECIAL_FLAG_NAME(SaveDistrictName)
+GDT_DEFINE_SPECIAL_FLAG_NAME(SaveLocationName)
+GDT_DEFINE_SPECIAL_FLAG_NAME(TrackBlockFileNumber)
+GDT_DEFINE_SPECIAL_FLAG_NAME(TrackBlockFileNumber_Hard)
+
+#undef GDT_DEFINE_SPECIAL_FLAG_NAME
+
+}  // namespace ksys::gdt::flagname
diff --git a/src/KingSystem/GameData/gdtSpecialFlagNames.h b/src/KingSystem/GameData/gdtSpecialFlagNames.h
new file mode 100644
index 00000000..6494c33e
--- /dev/null
+++ b/src/KingSystem/GameData/gdtSpecialFlagNames.h
@@ -0,0 +1,67 @@
+#pragma once
+
+namespace ksys::gdt::flagname {
+
+const char* Aoc_HardMode_Enabled();
+const char* BowPorchStockNum();
+const char* CaptionPictSize();
+const char* CurrentHart();
+const char* CurrentMamo();
+const char* CurrentRupee();
+const char* CurrentTotalGetRupeeInMiniGame();
+const char* DungeonClearSealNum();
+const char* IsGet_Armor_014_Head();
+const char* IsGet_Armor_014_Lower();
+const char* IsGet_Armor_014_Upper();
+const char* IsGet_Armor_046_Head();
+const char* IsGet_Armor_046_Lower();
+const char* IsGet_Armor_046_Upper();
+const char* IsGet_Armor_048_Head();
+const char* IsGet_Armor_048_Lower();
+const char* IsGet_Armor_048_Upper();
+const char* IsGet_Armor_083_Head();
+const char* IsGet_Armor_083_Lower();
+const char* IsGet_Armor_083_Upper();
+const char* IsGet_Armor_084_Head();
+const char* IsGet_Armor_084_Lower();
+const char* IsGet_Armor_084_Upper();
+const char* IsGet_Armor_085_Head();
+const char* IsGet_Armor_085_Lower();
+const char* IsGet_Armor_085_Upper();
+const char* IsGet_Armor_086_Head();
+const char* IsGet_Armor_086_Lower();
+const char* IsGet_Armor_086_Upper();
+const char* IsGet_Armor_103_Head();
+const char* IsGet_Armor_103_Lower();
+const char* IsGet_Armor_103_Upper();
+const char* IsGet_Armor_104_Head();
+const char* IsGet_Armor_104_Lower();
+const char* IsGet_Armor_104_Upper();
+const char* IsGet_Armor_105_Head();
+const char* IsGet_Armor_105_Lower();
+const char* IsGet_Armor_105_Upper();
+const char* IsGet_Armor_106_Head();
+const char* IsGet_Armor_106_Lower();
+const char* IsGet_Armor_106_Upper();
+const char* IsGet_Armor_111_Head();
+const char* IsGet_Armor_111_Lower();
+const char* IsGet_Armor_111_Upper();
+const char* IsGet_Armor_112_Head();
+const char* IsGet_Armor_112_Lower();
+const char* IsGet_Armor_112_Upper();
+const char* IsGet_Armor_113_Head();
+const char* IsGet_Armor_113_Lower();
+const char* IsGet_Armor_113_Upper();
+const char* IsGet_Armor_114_Head();
+const char* IsGet_Armor_114_Lower();
+const char* IsGet_Armor_114_Upper();
+const char* IsSaveByAuto();
+const char* KorokNutsNum();
+const char* LastSaveTime_Lower();
+const char* LastSaveTime_Upper();
+const char* SaveDistrictName();
+const char* SaveLocationName();
+const char* TrackBlockFileNumber();
+const char* TrackBlockFileNumber_Hard();
+
+}  // namespace ksys::gdt::flagname