From 06afc24ddca70813d0a9ca70269475e8cdd009d6 Mon Sep 17 00:00:00 2001
From: Maple <8961085+MapleHinata@users.noreply.github.com>
Date: Tue, 23 May 2023 13:57:56 -0300
Subject: [PATCH] Update ExdData to latest definitions

---
 src/common/CommonGen.h              | 1579 +++++++++++++--------------
 src/common/Exd/ExdDataGenerated.cpp |  237 +++-
 src/common/Exd/ExdDataGenerated.h   |  375 ++++++-
 src/tools/exd_common_gen/main.cpp   |    2 +-
 4 files changed, 1315 insertions(+), 878 deletions(-)

diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h
index b124e604..bff47197 100644
--- a/src/common/CommonGen.h
+++ b/src/common/CommonGen.h
@@ -8,832 +8,791 @@
    To change the content edit tools/exd_common_gen */
 namespace Sapphire::Common {
 
-   ///////////////////////////////////////////////////////////
-   //ActionCategory.exd
-   enum class ActionCategory : uint8_t
-   {
-      None = 0,
-      Autoattack = 1,
-      Spell = 2,
-      Weaponskill = 3,
-      Ability = 4,
-      Item = 5,
-      DoLAbility = 6,
-      DoHAbility = 7,
-      Event = 8,
-      LimitBreak = 9,
-      System = 10,
-      System1 = 11,
-      Mount = 12,
-      Special = 13,
-      ItemManipulation = 14,
-      LimitBreak1 = 15,
-      //1 = 16,
-      Artillery = 17,
-      //2 = 18,
-   };
+    ///////////////////////////////////////////////////////////
+    //ActionCategory.exd
+    enum class ActionCategory : uint8_t {
+        None = 0,
+        Autoattack = 1,
+        Spell = 2,
+        Weaponskill = 3,
+        Ability = 4,
+        Item = 5,
+        DoLAbility = 6,
+        DoHAbility = 7,
+        Event = 8,
+        LimitBreak = 9,
+        System = 10,
+        System1 = 11,
+        Mount = 12,
+        Special = 13,
+        ItemManipulation = 14,
+        LimitBreak1 = 15,
+        //1 = 16,
+        Artillery = 17,
+        //2 = 18,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //BaseParam.exd
-   enum class BaseParam : uint8_t
-   {
-      None = 0,
-      Strength = 1,
-      Dexterity = 2,
-      Vitality = 3,
-      Intelligence = 4,
-      Mind = 5,
-      Piety = 6,
-      HP = 7,
-      MP = 8,
-      TP = 9,
-      GP = 10,
-      CP = 11,
-      PhysicalDamage = 12,
-      MagicDamage = 13,
-      Delay = 14,
-      AdditionalEffect = 15,
-      AttackSpeed = 16,
-      BlockRate = 17,
-      BlockStrength = 18,
-      Tenacity = 19,
-      AttackPower = 20,
-      Defense = 21,
-      DirectHitRate = 22,
-      Evasion = 23,
-      MagicDefense = 24,
-      CriticalHitPower = 25,
-      CriticalHitResilience = 26,
-      CriticalHit = 27,
-      CriticalHitEvasion = 28,
-      SlashingResistance = 29,
-      PiercingResistance = 30,
-      BluntResistance = 31,
-      ProjectileResistance = 32,
-      AttackMagicPotency = 33,
-      HealingMagicPotency = 34,
-      EnhancementMagicPotency = 35,
-      ElementalBonus = 36,
-      FireResistance = 37,
-      IceResistance = 38,
-      WindResistance = 39,
-      EarthResistance = 40,
-      LightningResistance = 41,
-      WaterResistance = 42,
-      MagicResistance = 43,
-      Determination = 44,
-      SkillSpeed = 45,
-      SpellSpeed = 46,
-      Haste = 47,
-      Morale = 48,
-      Enmity = 49,
-      EnmityReduction = 50,
-      DesynthesisSkillGain = 51,
-      EXPBonus = 52,
-      Regen = 53,
-      Refresh = 54,
-      MainAttribute = 55,
-      SecondaryAttribute = 56,
-      SlowResistance = 57,
-      PetrificationResistance = 58,
-      ParalysisResistance = 59,
-      SilenceResistance = 60,
-      BlindResistance = 61,
-      PoisonResistance = 62,
-      StunResistance = 63,
-      SleepResistance = 64,
-      BindResistance = 65,
-      HeavyResistance = 66,
-      DoomResistance = 67,
-      ReducedDurabilityLoss = 68,
-      IncreasedSpiritbondGain = 69,
-      Craftsmanship = 70,
-      Control = 71,
-      Gathering = 72,
-      Perception = 73,
-   };
+    ///////////////////////////////////////////////////////////
+    //BaseParam.exd
+    enum class BaseParam : uint8_t {
+        None = 0,
+        Strength = 1,
+        Dexterity = 2,
+        Vitality = 3,
+        Intelligence = 4,
+        Mind = 5,
+        Piety = 6,
+        HP = 7,
+        MP = 8,
+        TP = 9,
+        GP = 10,
+        CP = 11,
+        PhysicalDamage = 12,
+        MagicDamage = 13,
+        Delay = 14,
+        AdditionalEffect = 15,
+        AttackSpeed = 16,
+        BlockRate = 17,
+        BlockStrength = 18,
+        Tenacity = 19,
+        AttackPower = 20,
+        Defense = 21,
+        DirectHitRate = 22,
+        Evasion = 23,
+        MagicDefense = 24,
+        CriticalHitPower = 25,
+        CriticalHitResilience = 26,
+        CriticalHit = 27,
+        CriticalHitEvasion = 28,
+        SlashingResistance = 29,
+        PiercingResistance = 30,
+        BluntResistance = 31,
+        ProjectileResistance = 32,
+        AttackMagicPotency = 33,
+        HealingMagicPotency = 34,
+        EnhancementMagicPotency = 35,
+        ElementalBonus = 36,
+        FireResistance = 37,
+        IceResistance = 38,
+        WindResistance = 39,
+        EarthResistance = 40,
+        LightningResistance = 41,
+        WaterResistance = 42,
+        MagicResistance = 43,
+        Determination = 44,
+        SkillSpeed = 45,
+        SpellSpeed = 46,
+        Haste = 47,
+        Morale = 48,
+        Enmity = 49,
+        EnmityReduction = 50,
+        DesynthesisSkillGain = 51,
+        EXPBonus = 52,
+        Regen = 53,
+        Refresh = 54,
+        MainAttribute = 55,
+        SecondaryAttribute = 56,
+        SlowResistance = 57,
+        PetrificationResistance = 58,
+        ParalysisResistance = 59,
+        SilenceResistance = 60,
+        BlindResistance = 61,
+        PoisonResistance = 62,
+        StunResistance = 63,
+        SleepResistance = 64,
+        BindResistance = 65,
+        HeavyResistance = 66,
+        DoomResistance = 67,
+        ReducedDurabilityLoss = 68,
+        IncreasedSpiritbondGain = 69,
+        Craftsmanship = 70,
+        Control = 71,
+        Gathering = 72,
+        Perception = 73,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //BeastReputationRank.exd
-   enum class BeastReputationRank : uint8_t
-   {
-      None = 0,
-      Neutral = 1,
-      Recognized = 2,
-      Friendly = 3,
-      Trusted = 4,
-      Respected = 5,
-      Honored = 6,
-      Sworn = 7,
-      Allied = 8,
-   };
+    ///////////////////////////////////////////////////////////
+    //BeastReputationRank.exd
+    enum class BeastReputationRank : uint8_t {
+        None = 0,
+        Neutral = 1,
+        Recognized = 2,
+        Friendly = 3,
+        Trusted = 4,
+        Respected = 5,
+        Honored = 6,
+        Sworn = 7,
+        Allied = 8,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //BeastTribe.exd
-   enum class BeastTribe : uint8_t
-   {
-      None = 0,
-      Amaljaa = 1,
-      Sylphs = 2,
-      Kobolds = 3,
-      Sahagin = 4,
-      Ixal = 5,
-      VanuVanu = 6,
-      Vath = 7,
-      Moogles = 8,
-      Kojin = 9,
-      Ananta = 10,
-      Namazu = 11,
-      Pixies = 12,
-      Qitari = 13,
-      Dwarves = 14,
-      Arkasodara = 15,
-      Omicrons = 16,
-      Loporrits = 17,
-   };
+    ///////////////////////////////////////////////////////////
+    //BeastTribe.exd
+    enum class BeastTribe : uint8_t {
+        None = 0,
+        Amaljaa = 1,
+        Sylphs = 2,
+        Kobolds = 3,
+        Sahagin = 4,
+        Ixal = 5,
+        VanuVanu = 6,
+        Vath = 7,
+        Moogles = 8,
+        Kojin = 9,
+        Ananta = 10,
+        Namazu = 11,
+        Pixies = 12,
+        Qitari = 13,
+        Dwarves = 14,
+        Arkasodara = 15,
+        Omicrons = 16,
+        Loporrits = 17,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //ClassJob.exd
-   enum class ClassJob : uint8_t
-   {
-      Adventurer = 0,
-      Gladiator = 1,
-      Pugilist = 2,
-      Marauder = 3,
-      Lancer = 4,
-      Archer = 5,
-      Conjurer = 6,
-      Thaumaturge = 7,
-      Carpenter = 8,
-      Blacksmith = 9,
-      Armorer = 10,
-      Goldsmith = 11,
-      Leatherworker = 12,
-      Weaver = 13,
-      Alchemist = 14,
-      Culinarian = 15,
-      Miner = 16,
-      Botanist = 17,
-      Fisher = 18,
-      Paladin = 19,
-      Monk = 20,
-      Warrior = 21,
-      Dragoon = 22,
-      Bard = 23,
-      Whitemage = 24,
-      Blackmage = 25,
-      Arcanist = 26,
-      Summoner = 27,
-      Scholar = 28,
-      Rogue = 29,
-      Ninja = 30,
-      Machinist = 31,
-      Darkknight = 32,
-      Astrologian = 33,
-      Samurai = 34,
-      Redmage = 35,
-      Bluemage = 36,
-      Gunbreaker = 37,
-      Dancer = 38,
-      Reaper = 39,
-      Sage = 40,
-   };
+    ///////////////////////////////////////////////////////////
+    //ClassJob.exd
+    enum class ClassJob : uint8_t {
+        Adventurer = 0,
+        Gladiator = 1,
+        Pugilist = 2,
+        Marauder = 3,
+        Lancer = 4,
+        Archer = 5,
+        Conjurer = 6,
+        Thaumaturge = 7,
+        Carpenter = 8,
+        Blacksmith = 9,
+        Armorer = 10,
+        Goldsmith = 11,
+        Leatherworker = 12,
+        Weaver = 13,
+        Alchemist = 14,
+        Culinarian = 15,
+        Miner = 16,
+        Botanist = 17,
+        Fisher = 18,
+        Paladin = 19,
+        Monk = 20,
+        Warrior = 21,
+        Dragoon = 22,
+        Bard = 23,
+        Whitemage = 24,
+        Blackmage = 25,
+        Arcanist = 26,
+        Summoner = 27,
+        Scholar = 28,
+        Rogue = 29,
+        Ninja = 30,
+        Machinist = 31,
+        Darkknight = 32,
+        Astrologian = 33,
+        Samurai = 34,
+        Redmage = 35,
+        Bluemage = 36,
+        Gunbreaker = 37,
+        Dancer = 38,
+        Reaper = 39,
+        Sage = 40,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //ContentType.exd
-   enum class ContentType : uint8_t
-   {
-      None = 0,
-      DutyRoulette = 1,
-      Dungeons = 2,
-      Guildhests = 3,
-      Trials = 4,
-      Raids = 5,
-      PvP = 6,
-      QuestBattles = 7,
-      FATEs = 8,
-      TreasureHunt = 9,
-      Levequests = 10,
-      GrandCompany = 11,
-      Companions = 12,
-      TribalQuests = 13,
-      OverallCompletion = 14,
-      PlayerCommendation = 15,
-      DisciplesoftheLand = 16,
-      DisciplesoftheHand = 17,
-      RetainerVentures = 18,
-      GoldSaucer = 19,
-      //1 = 20,
-      DeepDungeons = 21,
-      //2 = 22,
-      //3 = 23,
-      WondrousTails = 24,
-      CustomDeliveries = 25,
-      Eureka = 26,
-      //4 = 27,
-      UltimateRaids = 28,
-      //5 = 29,
-      VCDungeonFinder = 30,
-   };
+    ///////////////////////////////////////////////////////////
+    //ContentType.exd
+    enum class ContentType : uint8_t {
+        None = 0,
+        DutyRoulette = 1,
+        Dungeons = 2,
+        Guildhests = 3,
+        Trials = 4,
+        Raids = 5,
+        PvP = 6,
+        QuestBattles = 7,
+        FATEs = 8,
+        TreasureHunt = 9,
+        Levequests = 10,
+        GrandCompany = 11,
+        Companions = 12,
+        TribalQuests = 13,
+        OverallCompletion = 14,
+        PlayerCommendation = 15,
+        DisciplesoftheLand = 16,
+        DisciplesoftheHand = 17,
+        RetainerVentures = 18,
+        GoldSaucer = 19,
+        //1 = 20,
+        DeepDungeons = 21,
+        //2 = 22,
+        //3 = 23,
+        WondrousTails = 24,
+        CustomDeliveries = 25,
+        Eureka = 26,
+        //4 = 27,
+        UltimateRaids = 28,
+        //5 = 29,
+        VAndCDungeonFinder = 30,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //EmoteCategory.exd
-   enum class EmoteCategory : uint8_t
-   {
-      None = 0,
-      General = 1,
-      Special = 2,
-      Expressions = 3,
-      //1 = 4,
-   };
+    ///////////////////////////////////////////////////////////
+    //EmoteCategory.exd
+    enum class EmoteCategory : uint8_t {
+        None = 0, General = 1, Special = 2, Expressions = 3,
+        //1 = 4,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //ExVersion.exd
-   enum class ExVersion : uint8_t
-   {
-      ARealmReborn = 0,
-      Heavensward = 1,
-      Stormblood = 2,
-      Shadowbringers = 3,
-      Endwalker = 4,
-   };
+    ///////////////////////////////////////////////////////////
+    //ExVersion.exd
+    enum class ExVersion : uint8_t {
+        ARealmReborn = 0, Heavensward = 1, Stormblood = 2, Shadowbringers = 3, Endwalker = 4,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //GrandCompany.exd
-   enum class GrandCompany : uint8_t
-   {
-      None = 0,
-      Maelstrom = 1,
-      OrderoftheTwinAdder = 2,
-      ImmortalFlames = 3,
-   };
+    ///////////////////////////////////////////////////////////
+    //GrandCompany.exd
+    enum class GrandCompany : uint8_t {
+        None = 0, Maelstrom = 1, OrderoftheTwinAdder = 2, ImmortalFlames = 3,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //GuardianDeity.exd
-   enum class GuardianDeity : uint8_t
-   {
-      None = 0,
-      HalonetheFury = 1,
-      MenphinatheLover = 2,
-      ThaliaktheScholar = 3,
-      NymeiatheSpinner = 4,
-      LlymlaentheNavigator = 5,
-      OschontheWanderer = 6,
-      ByregottheBuilder = 7,
-      RhalgrtheDestroyer = 8,
-      AzeymatheWarden = 9,
-      NaldthaltheTraders = 10,
-      NophicatheMatron = 11,
-      AlthyktheKeeper = 12,
-   };
+    ///////////////////////////////////////////////////////////
+    //GuardianDeity.exd
+    enum class GuardianDeity : uint8_t {
+        None = 0,
+        HalonetheFury = 1,
+        MenphinatheLover = 2,
+        ThaliaktheScholar = 3,
+        NymeiatheSpinner = 4,
+        LlymlaentheNavigator = 5,
+        OschontheWanderer = 6,
+        ByregottheBuilder = 7,
+        RhalgrtheDestroyer = 8,
+        AzeymatheWarden = 9,
+        NaldthaltheTraders = 10,
+        NophicatheMatron = 11,
+        AlthyktheKeeper = 12,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //ItemUICategory.exd
-   enum class ItemUICategory : uint8_t
-   {
-      None = 0,
-      PugilistsArm = 1,
-      GladiatorsArm = 2,
-      MaraudersArm = 3,
-      ArchersArm = 4,
-      LancersArm = 5,
-      OnehandedThaumaturgesArm = 6,
-      TwohandedThaumaturgesArm = 7,
-      OnehandedConjurersArm = 8,
-      TwohandedConjurersArm = 9,
-      ArcanistsGrimoire = 10,
-      Shield = 11,
-      CarpentersPrimaryTool = 12,
-      CarpentersSecondaryTool = 13,
-      BlacksmithsPrimaryTool = 14,
-      BlacksmithsSecondaryTool = 15,
-      ArmorersPrimaryTool = 16,
-      ArmorersSecondaryTool = 17,
-      GoldsmithsPrimaryTool = 18,
-      GoldsmithsSecondaryTool = 19,
-      LeatherworkersPrimaryTool = 20,
-      LeatherworkersSecondaryTool = 21,
-      WeaversPrimaryTool = 22,
-      WeaversSecondaryTool = 23,
-      AlchemistsPrimaryTool = 24,
-      AlchemistsSecondaryTool = 25,
-      CulinariansPrimaryTool = 26,
-      CulinariansSecondaryTool = 27,
-      MinersPrimaryTool = 28,
-      MinersSecondaryTool = 29,
-      BotanistsPrimaryTool = 30,
-      BotanistsSecondaryTool = 31,
-      FishersPrimaryTool = 32,
-      FishingTackle = 33,
-      Head = 34,
-      Body = 35,
-      Legs = 36,
-      Hands = 37,
-      Feet = 38,
-      Unobtainable = 39,
-      Necklace = 40,
-      Earrings = 41,
-      Bracelets = 42,
-      Ring = 43,
-      Medicine = 44,
-      Ingredient = 45,
-      Meal = 46,
-      Seafood = 47,
-      Stone = 48,
-      Metal = 49,
-      Lumber = 50,
-      Cloth = 51,
-      Leather = 52,
-      Bone = 53,
-      Reagent = 54,
-      Dye = 55,
-      Part = 56,
-      Furnishing = 57,
-      Materia = 58,
-      Crystal = 59,
-      Catalyst = 60,
-      Miscellany = 61,
-      SoulCrystal = 62,
-      Other = 63,
-      ConstructionPermit = 64,
-      Roof = 65,
-      ExteriorWall = 66,
-      Window = 67,
-      Door = 68,
-      RoofDecoration = 69,
-      ExteriorWallDecoration = 70,
-      Placard = 71,
-      Fence = 72,
-      InteriorWall = 73,
-      Flooring = 74,
-      CeilingLight = 75,
-      OutdoorFurnishing = 76,
-      Table = 77,
-      Tabletop = 78,
-      Wallmounted = 79,
-      Rug = 80,
-      Minion = 81,
-      Gardening = 82,
-      Demimateria = 83,
-      RoguesArm = 84,
-      SeasonalMiscellany = 85,
-      TripleTriadCard = 86,
-      DarkKnightsArm = 87,
-      MachinistsArm = 88,
-      AstrologiansArm = 89,
-      AirshipHull = 90,
-      AirshipRigging = 91,
-      AirshipAftcastle = 92,
-      AirshipForecastle = 93,
-      OrchestrionRoll = 94,
-      Painting = 95,
-      SamuraisArm = 96,
-      RedMagesArm = 97,
-      ScholarsArm = 98,
-      FishersSecondaryTool = 99,
-      Currency = 100,
-      SubmersibleHull = 101,
-      SubmersibleStern = 102,
-      SubmersibleBow = 103,
-      SubmersibleBridge = 104,
-      BlueMagesArm = 105,
-      GunbreakersArm = 106,
-      DancersArm = 107,
-      ReapersArm = 108,
-      SagesArm = 109,
-   };
+    ///////////////////////////////////////////////////////////
+    //ItemUICategory.exd
+    enum class ItemUICategory : uint8_t {
+        None = 0,
+        PugilistsArm = 1,
+        GladiatorsArm = 2,
+        MaraudersArm = 3,
+        ArchersArm = 4,
+        LancersArm = 5,
+        OnehandedThaumaturgesArm = 6,
+        TwohandedThaumaturgesArm = 7,
+        OnehandedConjurersArm = 8,
+        TwohandedConjurersArm = 9,
+        ArcanistsGrimoire = 10,
+        Shield = 11,
+        CarpentersPrimaryTool = 12,
+        CarpentersSecondaryTool = 13,
+        BlacksmithsPrimaryTool = 14,
+        BlacksmithsSecondaryTool = 15,
+        ArmorersPrimaryTool = 16,
+        ArmorersSecondaryTool = 17,
+        GoldsmithsPrimaryTool = 18,
+        GoldsmithsSecondaryTool = 19,
+        LeatherworkersPrimaryTool = 20,
+        LeatherworkersSecondaryTool = 21,
+        WeaversPrimaryTool = 22,
+        WeaversSecondaryTool = 23,
+        AlchemistsPrimaryTool = 24,
+        AlchemistsSecondaryTool = 25,
+        CulinariansPrimaryTool = 26,
+        CulinariansSecondaryTool = 27,
+        MinersPrimaryTool = 28,
+        MinersSecondaryTool = 29,
+        BotanistsPrimaryTool = 30,
+        BotanistsSecondaryTool = 31,
+        FishersPrimaryTool = 32,
+        FishingTackle = 33,
+        Head = 34,
+        Body = 35,
+        Legs = 36,
+        Hands = 37,
+        Feet = 38,
+        Unobtainable = 39,
+        Necklace = 40,
+        Earrings = 41,
+        Bracelets = 42,
+        Ring = 43,
+        Medicine = 44,
+        Ingredient = 45,
+        Meal = 46,
+        Seafood = 47,
+        Stone = 48,
+        Metal = 49,
+        Lumber = 50,
+        Cloth = 51,
+        Leather = 52,
+        Bone = 53,
+        Reagent = 54,
+        Dye = 55,
+        Part = 56,
+        Furnishing = 57,
+        Materia = 58,
+        Crystal = 59,
+        Catalyst = 60,
+        Miscellany = 61,
+        SoulCrystal = 62,
+        Other = 63,
+        ConstructionPermit = 64,
+        Roof = 65,
+        ExteriorWall = 66,
+        Window = 67,
+        Door = 68,
+        RoofDecoration = 69,
+        ExteriorWallDecoration = 70,
+        Placard = 71,
+        Fence = 72,
+        InteriorWall = 73,
+        Flooring = 74,
+        CeilingLight = 75,
+        OutdoorFurnishing = 76,
+        Table = 77,
+        Tabletop = 78,
+        Wallmounted = 79,
+        Rug = 80,
+        Minion = 81,
+        Gardening = 82,
+        Demimateria = 83,
+        RoguesArm = 84,
+        SeasonalMiscellany = 85,
+        TripleTriadCard = 86,
+        DarkKnightsArm = 87,
+        MachinistsArm = 88,
+        AstrologiansArm = 89,
+        AirshipHull = 90,
+        AirshipRigging = 91,
+        AirshipAftcastle = 92,
+        AirshipForecastle = 93,
+        OrchestrionRoll = 94,
+        Painting = 95,
+        SamuraisArm = 96,
+        RedMagesArm = 97,
+        ScholarsArm = 98,
+        FishersSecondaryTool = 99,
+        Currency = 100,
+        SubmersibleHull = 101,
+        SubmersibleStern = 102,
+        SubmersibleBow = 103,
+        SubmersibleBridge = 104,
+        BlueMagesArm = 105,
+        GunbreakersArm = 106,
+        DancersArm = 107,
+        ReapersArm = 108,
+        SagesArm = 109,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //ItemSearchCategory.exd
-   enum class ItemSearchCategory : uint8_t
-   {
-      None = 0,
-      PrimaryArms = 1,
-      PrimaryTools = 2,
-      PrimaryTools1 = 3,
-      Armor = 4,
-      Accessories = 5,
-      Medicines = 6,
-      Materials = 7,
-      Other = 8,
-      PugilistsArms = 9,
-      GladiatorsArms = 10,
-      MaraudersArms = 11,
-      ArchersArms = 12,
-      LancersArms = 13,
-      ThaumaturgesArms = 14,
-      ConjurersArms = 15,
-      ArcanistsArms = 16,
-      Shields = 17,
-      DancersArms = 18,
-      CarpentersTools = 19,
-      BlacksmithsTools = 20,
-      ArmorersTools = 21,
-      GoldsmithsTools = 22,
-      LeatherworkersTools = 23,
-      WeaversTools = 24,
-      AlchemistsTools = 25,
-      CulinariansTools = 26,
-      MinersTools = 27,
-      BotanistsTools = 28,
-      FishersTools = 29,
-      FishingTackle = 30,
-      Head = 31,
-      Undershirts = 32,
-      Body = 33,
-      Undergarments = 34,
-      Legs = 35,
-      Hands = 36,
-      Feet = 37,
-      Waist = 38,
-      Necklaces = 39,
-      Earrings = 40,
-      Bracelets = 41,
-      Rings = 42,
-      Medicine = 43,
-      Ingredients = 44,
-      Meals = 45,
-      Seafood = 46,
-      Stone = 47,
-      Metal = 48,
-      Lumber = 49,
-      Cloth = 50,
-      Leather = 51,
-      Bone = 52,
-      Reagents = 53,
-      Dyes = 54,
-      WeaponParts = 55,
-      Furnishings = 56,
-      Materia = 57,
-      Crystals = 58,
-      Catalysts = 59,
-      Miscellany = 60,
-      SoulCrystals = 61,
-      Arrows = 62,
-      QuestItems = 63,
-      Other1 = 64,
-      ExteriorFixtures = 65,
-      InteriorFixtures = 66,
-      OutdoorFurnishings = 67,
-      ChairsandBeds = 68,
-      Tables = 69,
-      Tabletop = 70,
-      Wallmounted = 71,
-      Rugs = 72,
-      RoguesArms = 73,
-      SeasonalMiscellany = 74,
-      Minions = 75,
-      DarkKnightsArms = 76,
-      MachinistsArms = 77,
-      AstrologiansArms = 78,
-      AirshipSubmersibleComponents = 79,
-      OrchestrionComponents = 80,
-      GardeningItems = 81,
-      Paintings = 82,
-      SamuraisArms = 83,
-      RedMagesArms = 84,
-      ScholarsArms = 85,
-      GunbreakersArms = 86,
-      DancersArms1 = 87,
-      ReapersArms = 88,
-      SagesArms = 89,
-      RegistrableMiscellany = 90,
-      /* 1 = 91,
-      2 = 92,
-      3 = 93,
-      4 = 94,
-      5 = 95,
-      6 = 96,
-      7 = 97,
-      8 = 98,
-      9 = 99,
-      10 = 100, */
-   };
+    ///////////////////////////////////////////////////////////
+    //ItemSearchCategory.exd
+    enum class ItemSearchCategory : uint8_t {
+        None = 0,
+        PrimaryArms = 1,
+        PrimaryTools = 2,
+        PrimaryTools1 = 3,
+        Armor = 4,
+        Accessories = 5,
+        Medicines = 6,
+        Materials = 7,
+        Other = 8,
+        PugilistsArms = 9,
+        GladiatorsArms = 10,
+        MaraudersArms = 11,
+        ArchersArms = 12,
+        LancersArms = 13,
+        ThaumaturgesArms = 14,
+        ConjurersArms = 15,
+        ArcanistsArms = 16,
+        Shields = 17,
+        DancersArms = 18,
+        CarpentersTools = 19,
+        BlacksmithsTools = 20,
+        ArmorersTools = 21,
+        GoldsmithsTools = 22,
+        LeatherworkersTools = 23,
+        WeaversTools = 24,
+        AlchemistsTools = 25,
+        CulinariansTools = 26,
+        MinersTools = 27,
+        BotanistsTools = 28,
+        FishersTools = 29,
+        FishingTackle = 30,
+        Head = 31,
+        Undershirts = 32,
+        Body = 33,
+        Undergarments = 34,
+        Legs = 35,
+        Hands = 36,
+        Feet = 37,
+        Waist = 38,
+        Necklaces = 39,
+        Earrings = 40,
+        Bracelets = 41,
+        Rings = 42,
+        Medicine = 43,
+        Ingredients = 44,
+        Meals = 45,
+        Seafood = 46,
+        Stone = 47,
+        Metal = 48,
+        Lumber = 49,
+        Cloth = 50,
+        Leather = 51,
+        Bone = 52,
+        Reagents = 53,
+        Dyes = 54,
+        WeaponParts = 55,
+        Furnishings = 56,
+        Materia = 57,
+        Crystals = 58,
+        Catalysts = 59,
+        Miscellany = 60,
+        SoulCrystals = 61,
+        Arrows = 62,
+        QuestItems = 63,
+        Other1 = 64,
+        ExteriorFixtures = 65,
+        InteriorFixtures = 66,
+        OutdoorFurnishings = 67,
+        ChairsandBeds = 68,
+        Tables = 69,
+        Tabletop = 70,
+        Wallmounted = 71,
+        Rugs = 72,
+        RoguesArms = 73,
+        SeasonalMiscellany = 74,
+        Minions = 75,
+        DarkKnightsArms = 76,
+        MachinistsArms = 77,
+        AstrologiansArms = 78,
+        AirshipAndSubmersibleComponents = 79,
+        OrchestrionComponents = 80,
+        GardeningItems = 81,
+        Paintings = 82,
+        SamuraisArms = 83,
+        RedMagesArms = 84,
+        ScholarsArms = 85,
+        GunbreakersArms = 86,
+        DancersArms1 = 87,
+        ReapersArms = 88,
+        SagesArms = 89,
+        RegistrableMiscellany = 90,
+        /*1 = 91,
+        2 = 92,
+        3 = 93,
+        4 = 94,
+        5 = 95,
+        6 = 96,
+        7 = 97,
+        8 = 98,
+        9 = 99,
+        10 = 100,*/
+    };
 
-   ///////////////////////////////////////////////////////////
-   //OnlineStatus.exd
-   enum class OnlineStatus : uint8_t
-   {
-      None = 0,
-      GameQA = 1,
-      GameMaster = 2,
-      GameMaster1 = 3,
-      EventParticipant = 4,
-      Disconnected = 5,
-      WaitingforFriendListApproval = 6,
-      WaitingforLinkshellApproval = 7,
-      WaitingforFreeCompanyApproval = 8,
-      NotFound = 9,
-      Offline = 10,
-      BattleMentor = 11,
-      Busy = 12,
-      PvP = 13,
-      PlayingTripleTriad = 14,
-      ViewingCutscene = 15,
-      UsingaChocoboPorter = 16,
-      AwayfromKeyboard = 17,
-      CameraMode = 18,
-      LookingforRepairs = 19,
-      LookingtoRepair = 20,
-      LookingtoMeldMateria = 21,
-      Roleplaying = 22,
-      LookingforParty = 23,
-      SwordforHire = 24,
-      WaitingforDutyFinder = 25,
-      RecruitingPartyMembers = 26,
-      Mentor = 27,
-      PvEMentor = 28,
-      TradeMentor = 29,
-      PvPMentor = 30,
-      Returner = 31,
-      NewAdventurer = 32,
-      AllianceLeader = 33,
-      AlliancePartyLeader = 34,
-      AlliancePartyMember = 35,
-      PartyLeader = 36,
-      PartyMember = 37,
-      PartyLeaderCrossworld = 38,
-      PartyMemberCrossworld = 39,
-      AnotherWorld = 40,
-      SharingDuty = 41,
-      SimilarDuty = 42,
-      InDuty = 43,
-      TrialAdventurer = 44,
-      FreeCompany = 45,
-      GrandCompany = 46,
-      Online = 47,
-   };
+    ///////////////////////////////////////////////////////////
+    //OnlineStatus.exd
+    enum class OnlineStatus : uint8_t {
+        None = 0,
+        GameQA = 1,
+        GameMaster = 2,
+        GameMaster1 = 3,
+        EventParticipant = 4,
+        Disconnected = 5,
+        WaitingforFriendListApproval = 6,
+        WaitingforLinkshellApproval = 7,
+        WaitingforFreeCompanyApproval = 8,
+        NotFound = 9,
+        Offline = 10,
+        BattleMentor = 11,
+        Busy = 12,
+        PvP = 13,
+        PlayingTripleTriad = 14,
+        ViewingCutscene = 15,
+        UsingaChocoboPorter = 16,
+        AwayfromKeyboard = 17,
+        CameraMode = 18,
+        LookingforRepairs = 19,
+        LookingtoRepair = 20,
+        LookingtoMeldMateria = 21,
+        Roleplaying = 22,
+        LookingforParty = 23,
+        SwordforHire = 24,
+        WaitingforDutyFinder = 25,
+        RecruitingPartyMembers = 26,
+        Mentor = 27,
+        PvEMentor = 28,
+        TradeMentor = 29,
+        PvPMentor = 30,
+        Returner = 31,
+        NewAdventurer = 32,
+        AllianceLeader = 33,
+        AlliancePartyLeader = 34,
+        AlliancePartyMember = 35,
+        PartyLeader = 36,
+        PartyMember = 37,
+        PartyLeaderCrossworld = 38,
+        PartyMemberCrossworld = 39,
+        AnotherWorld = 40,
+        SharingDuty = 41,
+        SimilarDuty = 42,
+        InDuty = 43,
+        TrialAdventurer = 44,
+        FreeCompany = 45,
+        GrandCompany = 46,
+        Online = 47,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //Race.exd
-   enum class Race : uint8_t
-   {
-      None = 0,
-      Hyur = 1,
-      Elezen = 2,
-      Lalafell = 3,
-      Miqote = 4,
-      Roegadyn = 5,
-      AuRa = 6,
-      Hrothgar = 7,
-      Viera = 8,
-   };
+    ///////////////////////////////////////////////////////////
+    //Race.exd
+    enum class Race : uint8_t {
+        None = 0, Hyur = 1, Elezen = 2, Lalafell = 3, Miqote = 4, Roegadyn = 5, AuRa = 6, Hrothgar = 7, Viera = 8,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //Tribe.exd
-   enum class Tribe : uint8_t
-   {
-      None = 0,
-      Midlander = 1,
-      Highlander = 2,
-      Wildwood = 3,
-      Duskwight = 4,
-      Plainsfolk = 5,
-      Dunesfolk = 6,
-      SeekeroftheSun = 7,
-      KeeperoftheMoon = 8,
-      SeaWolf = 9,
-      Hellsguard = 10,
-      Raen = 11,
-      Xaela = 12,
-      Helions = 13,
-      TheLost = 14,
-      Rava = 15,
-      Veena = 16,
-   };
+    ///////////////////////////////////////////////////////////
+    //Tribe.exd
+    enum class Tribe : uint8_t {
+        None = 0,
+        Midlander = 1,
+        Highlander = 2,
+        Wildwood = 3,
+        Duskwight = 4,
+        Plainsfolk = 5,
+        Dunesfolk = 6,
+        SeekeroftheSun = 7,
+        KeeperoftheMoon = 8,
+        SeaWolf = 9,
+        Hellsguard = 10,
+        Raen = 11,
+        Xaela = 12,
+        Helions = 13,
+        TheLost = 14,
+        Rava = 15,
+        Veena = 16,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //Town.exd
-   enum class Town : uint8_t
-   {
-      Nowheresville = 0,
-      LimsaLominsa = 1,
-      Gridania = 2,
-      Uldah = 3,
-      Ishgard = 4,
-      /*  = 5,
-      1 = 6, */
-      Kugane = 7,
-      /* 2 = 8,
-      3 = 9, */
-      Crystarium = 10,
-      //4 = 11,
-      OldSharlayan = 12,
-      //5 = 13,
-   };
+    ///////////////////////////////////////////////////////////
+    //Town.exd
+    enum class Town : uint8_t {
+        Nowheresville = 0, LimsaLominsa = 1, Gridania = 2, Uldah = 3, Ishgard = 4, //= 5,
+        //1 = 6,
+        Kugane = 7, //2 = 8,
+        //3 = 9,
+        Crystarium = 10, //4 = 11,
+        OldSharlayan = 12,
+        //5 = 13,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //Weather.exd
-   enum class Weather : uint8_t
-   {
-      None = 0,
-      ClearSkies = 1,
-      FairSkies = 2,
-      Clouds = 3,
-      Fog = 4,
-      Wind = 5,
-      Gales = 6,
-      Rain = 7,
-      Showers = 8,
-      Thunder = 9,
-      Thunderstorms = 10,
-      DustStorms = 11,
-      Sandstorms = 12,
-      HotSpells = 13,
-      HeatWaves = 14,
-      Snow = 15,
-      Blizzards = 16,
-      Gloom = 17,
-      Auroras = 18,
-      Darkness = 19,
-      Tension = 20,
-      Clouds1 = 21,
-      StormClouds = 22,
-      RoughSeas = 23,
-      RoughSeas1 = 24,
-      Louring = 25,
-      HeatWaves1 = 26,
-      Gloom1 = 27,
-      Gales1 = 28,
-      Eruptions = 29,
-      FairSkies1 = 30,
-      FairSkies2 = 31,
-      FairSkies3 = 32,
-      FairSkies4 = 33,
-      FairSkies5 = 34,
-      Irradiance = 35,
-      CoreRadiation = 36,
-      CoreRadiation1 = 37,
-      CoreRadiation2 = 38,
-      CoreRadiation3 = 39,
-      ShelfClouds = 40,
-      ShelfClouds1 = 41,
-      ShelfClouds2 = 42,
-      ShelfClouds3 = 43,
-      Oppression = 44,
-      Oppression1 = 45,
-      Oppression2 = 46,
-      Oppression3 = 47,
-      Oppression4 = 48,
-      UmbralWind = 49,
-      UmbralStatic = 50,
-      Smoke = 51,
-      FairSkies6 = 52,
-      RoyalLevin = 53,
-      Hyperelectricity = 54,
-      RoyalLevin1 = 55,
-      Oppression5 = 56,
-      Thunder1 = 57,
-      Thunder2 = 58,
-      CutScene = 59,
-      Multiplicity = 60,
-      Multiplicity1 = 61,
-      Rain1 = 62,
-      FairSkies7 = 63,
-      Rain2 = 64,
-      FairSkies8 = 65,
-      Dragonstorms = 66,
-      Dragonstorms1 = 67,
-      Subterrain = 68,
-      Concordance = 69,
-      Concordance1 = 70,
-      BeyondTime = 71,
-      BeyondTime1 = 72,
-      BeyondTime2 = 73,
-      DemonicInfinity = 74,
-      DemonicInfinity1 = 75,
-      DemonicInfinity2 = 76,
-      DimensionalDisruption = 77,
-      DimensionalDisruption1 = 78,
-      DimensionalDisruption2 = 79,
-      Revelstorms = 80,
-      Revelstorms1 = 81,
-      EternalBliss = 82,
-      EternalBliss1 = 83,
-      Wyrmstorms = 84,
-      Wyrmstorms1 = 85,
-      Revelstorms2 = 86,
-      Quicklevin = 87,
-      Thunder3 = 88,
-      DimensionalDisruption3 = 89,
-      FairSkies9 = 90,
-      ClearSkies1 = 91,
-      WhiteCyclones = 92,
-      WhiteCyclones1 = 93,
-      WhiteCyclones2 = 94,
-      Ultimania = 95,
-      WhiteCyclones3 = 96,
-      Moonlight = 97,
-      Moonlight1 = 98,
-      Moonlight2 = 99,
-      Moonlight3 = 100,
-      RedMoon = 101,
-      Scarlet = 102,
-      Scarlet1 = 103,
-      Scarlet2 = 104,
-      FairSkies10 = 105,
-      FairSkies11 = 106,
-      FairSkies12 = 107,
-      FairSkies13 = 108,
-      Flames = 109,
-      Tsunamis = 110,
-      Cyclones = 111,
-      Geostorms = 112,
-      TrueBlue = 113,
-      TrueBlue1 = 114,
-      TrueBlue2 = 115,
-      UmbralTurbulence = 116,
-      TrueBlue3 = 117,
-      EverlastingLight = 118,
-      Gales2 = 119,
-      Termination = 120,
-      Termination1 = 121,
-      Dreams = 122,
-      Dreams1 = 123,
-      Dreams2 = 124,
-      Brilliance = 125,
-      Brilliance1 = 126,
-      Termination2 = 127,
-      Termination3 = 128,
-      EverlastingLight1 = 129,
-      Eruptions1 = 130,
-      Termination4 = 131,
-      FairSkies14 = 132,
-      UmbralFlare = 133,
-      UmbralDuststorm = 134,
-      UmbralLevin = 135,
-      UmbralTempest = 136,
-      Starshower = 137,
-      Delirium = 138,
-      Clouds2 = 139,
-      Clouds3 = 140,
-      Irradiance1 = 141,
-      Irradiance2 = 142,
-      StormClouds1 = 143,
-      Firestorm = 144,
-      SpectralCurrent = 145,
-      //1 = 146,
-      Climactic = 147,
-      MoonDust = 148,
-      AstromagneticStorm = 149,
-      Apocalypse = 150,
-      Polarization = 151,
-      Polarization1 = 152,
-      Polarization2 = 153,
-      Polarization3 = 154,
-      Polarization4 = 155,
-      Projection = 156,
-      Pandaemonium = 157,
-      Pandaemonium1 = 158,
-      Pandaemonium2 = 159,
-      Ultimatum = 160,
-      Inevitability = 161,
-      Transcendence = 162,
-      Transcendence1 = 163,
-      Transcendence2 = 164,
-      Transcendence3 = 165,
-      Transcendence4 = 166,
-      Transcendence5 = 167,
-      Transcendence6 = 168,
-      Transcendence7 = 169,
-      Dragonstorms2 = 170,
-      Vacuity = 171,
-      Vacuity1 = 172,
-      Vacuity2 = 173,
-      DimensionalDisruption4 = 174,
-      DimensionalDisruption5 = 175,
-      DimensionalDisruption6 = 176,
-   };
+    ///////////////////////////////////////////////////////////
+    //Weather.exd
+    enum class Weather : uint8_t {
+        None = 0,
+        ClearSkies = 1,
+        FairSkies = 2,
+        Clouds = 3,
+        Fog = 4,
+        Wind = 5,
+        Gales = 6,
+        Rain = 7,
+        Showers = 8,
+        Thunder = 9,
+        Thunderstorms = 10,
+        DustStorms = 11,
+        Sandstorms = 12,
+        HotSpells = 13,
+        HeatWaves = 14,
+        Snow = 15,
+        Blizzards = 16,
+        Gloom = 17,
+        Auroras = 18,
+        Darkness = 19,
+        Tension = 20,
+        Clouds1 = 21,
+        StormClouds = 22,
+        RoughSeas = 23,
+        RoughSeas1 = 24,
+        Louring = 25,
+        HeatWaves1 = 26,
+        Gloom1 = 27,
+        Gales1 = 28,
+        Eruptions = 29,
+        FairSkies1 = 30,
+        FairSkies2 = 31,
+        FairSkies3 = 32,
+        FairSkies4 = 33,
+        FairSkies5 = 34,
+        Irradiance = 35,
+        CoreRadiation = 36,
+        CoreRadiation1 = 37,
+        CoreRadiation2 = 38,
+        CoreRadiation3 = 39,
+        ShelfClouds = 40,
+        ShelfClouds1 = 41,
+        ShelfClouds2 = 42,
+        ShelfClouds3 = 43,
+        Oppression = 44,
+        Oppression1 = 45,
+        Oppression2 = 46,
+        Oppression3 = 47,
+        Oppression4 = 48,
+        UmbralWind = 49,
+        UmbralStatic = 50,
+        Smoke = 51,
+        FairSkies6 = 52,
+        RoyalLevin = 53,
+        Hyperelectricity = 54,
+        RoyalLevin1 = 55,
+        Oppression5 = 56,
+        Thunder1 = 57,
+        Thunder2 = 58,
+        CutScene = 59,
+        Multiplicity = 60,
+        Multiplicity1 = 61,
+        Rain1 = 62,
+        FairSkies7 = 63,
+        Rain2 = 64,
+        FairSkies8 = 65,
+        Dragonstorms = 66,
+        Dragonstorms1 = 67,
+        Subterrain = 68,
+        Concordance = 69,
+        Concordance1 = 70,
+        BeyondTime = 71,
+        BeyondTime1 = 72,
+        BeyondTime2 = 73,
+        DemonicInfinity = 74,
+        DemonicInfinity1 = 75,
+        DemonicInfinity2 = 76,
+        DimensionalDisruption = 77,
+        DimensionalDisruption1 = 78,
+        DimensionalDisruption2 = 79,
+        Revelstorms = 80,
+        Revelstorms1 = 81,
+        EternalBliss = 82,
+        EternalBliss1 = 83,
+        Wyrmstorms = 84,
+        Wyrmstorms1 = 85,
+        Revelstorms2 = 86,
+        Quicklevin = 87,
+        Thunder3 = 88,
+        DimensionalDisruption3 = 89,
+        FairSkies9 = 90,
+        ClearSkies1 = 91,
+        WhiteCyclones = 92,
+        WhiteCyclones1 = 93,
+        WhiteCyclones2 = 94,
+        Ultimania = 95,
+        WhiteCyclones3 = 96,
+        Moonlight = 97,
+        Moonlight1 = 98,
+        Moonlight2 = 99,
+        Moonlight3 = 100,
+        RedMoon = 101,
+        Scarlet = 102,
+        Scarlet1 = 103,
+        Scarlet2 = 104,
+        FairSkies10 = 105,
+        FairSkies11 = 106,
+        FairSkies12 = 107,
+        FairSkies13 = 108,
+        Flames = 109,
+        Tsunamis = 110,
+        Cyclones = 111,
+        Geostorms = 112,
+        TrueBlue = 113,
+        TrueBlue1 = 114,
+        TrueBlue2 = 115,
+        UmbralTurbulence = 116,
+        TrueBlue3 = 117,
+        EverlastingLight = 118,
+        Gales2 = 119,
+        Termination = 120,
+        Termination1 = 121,
+        Dreams = 122,
+        Dreams1 = 123,
+        Dreams2 = 124,
+        Brilliance = 125,
+        Brilliance1 = 126,
+        Termination2 = 127,
+        Termination3 = 128,
+        EverlastingLight1 = 129,
+        Eruptions1 = 130,
+        Termination4 = 131,
+        FairSkies14 = 132,
+        UmbralFlare = 133,
+        UmbralDuststorm = 134,
+        UmbralLevin = 135,
+        UmbralTempest = 136,
+        Starshower = 137,
+        Delirium = 138,
+        Clouds2 = 139,
+        Clouds3 = 140,
+        Irradiance1 = 141,
+        Irradiance2 = 142,
+        StormClouds1 = 143,
+        Firestorm = 144,
+        SpectralCurrent = 145,
+        //1 = 146,
+        Climactic = 147,
+        MoonDust = 148,
+        AstromagneticStorm = 149,
+        Apocalypse = 150,
+        Polarization = 151,
+        Polarization1 = 152,
+        Polarization2 = 153,
+        Polarization3 = 154,
+        Polarization4 = 155,
+        Projection = 156,
+        Pandaemonium = 157,
+        Pandaemonium1 = 158,
+        Pandaemonium2 = 159,
+        Ultimatum = 160,
+        Inevitability = 161,
+        Transcendence = 162,
+        Transcendence1 = 163,
+        Transcendence2 = 164,
+        Transcendence3 = 165,
+        Transcendence4 = 166,
+        Transcendence5 = 167,
+        Transcendence6 = 168,
+        Transcendence7 = 169,
+        Dragonstorms2 = 170,
+        Vacuity = 171,
+        Vacuity1 = 172,
+        Vacuity2 = 173,
+        DimensionalDisruption4 = 174,
+        DimensionalDisruption5 = 175,
+        DimensionalDisruption6 = 176,
+        Pandaemonium3 = 177,
+        Pandaemonium4 = 178,
+    };
 
-   ///////////////////////////////////////////////////////////
-   //HousingAppeal.exd
-   enum class HousingAppeal : uint8_t
-   {
-      None = 0,
-      Emporium = 1,
-      Boutique = 2,
-      DesignerHome = 3,
-      MessageBook = 4,
-      Tavern = 5,
-      Eatery = 6,
-      ImmersiveExperience = 7,
-      Cafe = 8,
-      Aquarium = 9,
-      Sanctum = 10,
-      Venue = 11,
-      Florist = 12,
-      // = 13,
-      Library = 14,
-      PhotoStudio = 15,
-      HauntedHouse = 16,
-      Atelier = 17,
-      Bathhouse = 18,
-      Garden = 19,
-      FarEastern = 20,
-      VisitorsWelcome = 21,
-      Bakery = 22,
-      UnderRenovation = 23,
-      ConcertHall = 24,
-   };
+    ///////////////////////////////////////////////////////////
+    //HousingAppeal.exd
+    enum class HousingAppeal : uint8_t {
+        None = 0,
+        Emporium = 1,
+        Boutique = 2,
+        DesignerHome = 3,
+        MessageBook = 4,
+        Tavern = 5,
+        Eatery = 6,
+        ImmersiveExperience = 7,
+        Cafe = 8,
+        Aquarium = 9,
+        Sanctum = 10,
+        Venue = 11,
+        Florist = 12,
+        //= 13,
+        Library = 14,
+        PhotoStudio = 15,
+        HauntedHouse = 16,
+        Atelier = 17,
+        Bathhouse = 18,
+        Garden = 19,
+        FarEastern = 20,
+        VisitorsWelcome = 21,
+        Bakery = 22,
+        UnderRenovation = 23,
+        ConcertHall = 24,
+    };
 }
 #endif
\ No newline at end of file
diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index c3ef8c64..7f7180e7 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -557,17 +557,17 @@ Sapphire::Data::AOZContent::AOZContent( uint32_t row_id, Sapphire::Data::ExdData
   act1FightType = exdData->getField< uint8_t >( row, 2 );
   act1 = exdData->getField< uint16_t >( row, 3 );
   arenaType1 = exdData->getField< uint8_t >( row, 4 );
-  act2FightType = exdData->getField< uint16_t >( row, 5 );
-  act2 = exdData->getField< uint8_t >( row, 6 );
-  arenaType2 = exdData->getField< uint16_t >( row, 7 );
-  act3FightType = exdData->getField< uint8_t >( row, 8 );
-  act3 = exdData->getField< uint16_t >( row, 9 );
-  arenaType3 = exdData->getField< uint8_t >( row, 10 );
-  contentEntry = exdData->getField< uint16_t >( row, 11 );
-  order = exdData->getField< uint8_t >( row, 12 );
-  gilReward = exdData->getField< uint16_t >( row, 13 );
-  alliedSealsReward = exdData->getField< uint32_t >( row, 14 );
-  tomestonesReward = exdData->getField< uint8_t >( row, 15 );
+  act2FightType = exdData->getField< uint8_t >( row, 6 );
+  act2 = exdData->getField< uint16_t >( row, 7 );
+  arenaType2 = exdData->getField< uint8_t >( row, 8 );
+  act3FightType = exdData->getField< uint8_t >( row, 10 );
+  act3 = exdData->getField< uint16_t >( row, 11 );
+  arenaType3 = exdData->getField< uint8_t >( row, 12 );
+  contentEntry = exdData->getField< uint32_t >( row, 14 );
+  order = exdData->getField< uint8_t >( row, 15 );
+  gilReward = exdData->getField< uint16_t >( row, 16 );
+  alliedSealsReward = exdData->getField< uint16_t >( row, 17 );
+  tomestonesReward = exdData->getField< uint16_t >( row, 18 );
 }
 
 Sapphire::Data::AOZContentBriefingBNpc::AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -600,6 +600,12 @@ Sapphire::Data::AOZContentBriefingBNpc::AOZContentBriefingBNpc( uint32_t row_id,
   flatOrDeathVuln = exdData->getField< bool >( row, 24 );
 }
 
+Sapphire::Data::AOZContentBriefingObject::AOZContentBriefingObject( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_AOZContentBriefingObjectDat.get_row( row_id, subRow );
+  icon = exdData->getField< uint32_t >( row, 0 );
+}
+
 Sapphire::Data::AOZReport::AOZReport( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AOZReportDat.get_row( row_id );
@@ -1956,11 +1962,11 @@ Sapphire::Data::CollectablesShopItem::CollectablesShopItem( uint32_t row_id, uin
   item = exdData->getField< uint32_t >( row, 0 );
   collectablesShopItemGroup = exdData->getField< uint8_t >( row, 1 );
   levelMin = exdData->getField< uint16_t >( row, 2 );
-  levelMax = exdData->getField< uint32_t >( row, 3 );
-  stars = exdData->getField< uint16_t >( row, 4 );
-  key = exdData->getField< uint8_t >( row, 5 );
-  collectablesShopRefine = exdData->getField< uint8_t >( row, 6 );
-  collectablesShopRewardScrip = exdData->getField< uint16_t >( row, 7 );
+  levelMax = exdData->getField< uint16_t >( row, 4 );
+  stars = exdData->getField< uint8_t >( row, 5 );
+  key = exdData->getField< uint8_t >( row, 6 );
+  collectablesShopRefine = exdData->getField< uint16_t >( row, 7 );
+  collectablesShopRewardScrip = exdData->getField< uint16_t >( row, 8 );
 }
 
 Sapphire::Data::CollectablesShopItemGroup::CollectablesShopItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2408,11 +2414,11 @@ Sapphire::Data::ContentRoulette::ContentRoulette( uint32_t row_id, Sapphire::Dat
   rewardTomeA = exdData->getField< uint16_t >( row, 17 );
   rewardTomeB = exdData->getField< uint16_t >( row, 18 );
   rewardTomeC = exdData->getField< uint16_t >( row, 19 );
-  sortKey = exdData->getField< uint32_t >( row, 22 );
-  contentMemberType = exdData->getField< uint8_t >( row, 24 );
-  requireAllDuties = exdData->getField< bool >( row, 35 );
-  contentRouletteOpenRule = exdData->getField< bool >( row, 37 );
-  instanceContent = exdData->getField< uint8_t >( row, 38 );
+  sortKey = exdData->getField< uint8_t >( row, 23 );
+  contentMemberType = exdData->getField< uint8_t >( row, 25 );
+  requireAllDuties = exdData->getField< bool >( row, 36 );
+  contentRouletteOpenRule = exdData->getField< uint8_t >( row, 38 );
+  instanceContent = exdData->getField< uint16_t >( row, 39 );
 }
 
 Sapphire::Data::ContentRouletteOpenRule::ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2661,6 +2667,11 @@ Sapphire::Data::CustomTalk::CustomTalk( uint32_t row_id, Sapphire::Data::ExdData
   specialLinks = exdData->getField< uint32_t >( row, 75 );
 }
 
+Sapphire::Data::CustomTalkDefineClient::CustomTalkDefineClient( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CustomTalkDefineClientDat.get_row( row_id, subRow );
+}
+
 Sapphire::Data::CustomTalkNestHandlers::CustomTalkNestHandlers( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CustomTalkNestHandlersDat.get_row( row_id, subRow );
@@ -3465,6 +3476,12 @@ Sapphire::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Sapphire:
   icon.push_back( exdData->getField< uint32_t >( row, 18 ) );
 }
 
+Sapphire::Data::EventIconPriorityPair::EventIconPriorityPair( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_EventIconPriorityPairDat.get_row( row_id );
+  icon1 = exdData->getField< uint32_t >( row, 0 );
+}
+
 Sapphire::Data::EventIconType::EventIconType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_EventIconTypeDat.get_row( row_id );
@@ -3838,6 +3855,18 @@ Sapphire::Data::FishingBaitParameter::FishingBaitParameter( uint32_t row_id, Sap
   auto row = exdData->m_FishingBaitParameterDat.get_row( row_id );
 }
 
+Sapphire::Data::FishingNoteInfo::FishingNoteInfo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FishingNoteInfoDat.get_row( row_id );
+  size = exdData->getField< uint8_t >( row, 0 );
+  aquariumWater = exdData->getField< uint8_t >( row, 1 );
+  weatherRestriction = exdData->getField< uint8_t >( row, 2 );
+  timeRestriction = exdData->getField< uint8_t >( row, 3 );
+  specialConditions = exdData->getField< uint8_t >( row, 4 );
+  isCollectable = exdData->getField< uint8_t >( row, 5 );
+  item = exdData->getField< int32_t >( row, 6 );
+}
+
 Sapphire::Data::FishingRecordType::FishingRecordType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_FishingRecordTypeDat.get_row( row_id );
@@ -3890,10 +3919,13 @@ Sapphire::Data::FishParameter::FishParameter( uint32_t row_id, Sapphire::Data::E
   text = exdData->getField< std::string >( row, 0 );
   item = exdData->getField< int32_t >( row, 1 );
   gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
+  oceanStars = exdData->getField< uint8_t >( row, 3 );
   isHidden = exdData->getField< bool >( row, 4 );
-  fishingRecordType = exdData->getField< uint16_t >( row, 6 );
-  fishingSpot = exdData->getField< bool >( row, 8 );
-  gatheringSubCategory = exdData->getField< uint32_t >( row, 9 );
+  fishingRecordType = exdData->getField< uint8_t >( row, 5 );
+  fishingSpot = exdData->getField< uint16_t >( row, 6 );
+  gatheringSubCategory = exdData->getField< uint16_t >( row, 7 );
+  isInLog = exdData->getField< bool >( row, 8 );
+  achievementCredit = exdData->getField< uint32_t >( row, 9 );
 }
 
 Sapphire::Data::FittingShop::FittingShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6321,8 +6353,8 @@ Sapphire::Data::IKDRoute::IKDRoute( uint32_t row_id, Sapphire::Data::ExdDataGene
 {
   auto row = exdData->m_IKDRouteDat.get_row( row_id );
   image = exdData->getField< uint32_t >( row, 6 );
-  territoryType = exdData->getField< uint32_t >( row, 7 );
-  name = exdData->getField< uint32_t >( row, 8 );
+  territoryType = exdData->getField< uint32_t >( row, 9 );
+  name = exdData->getField< std::string >( row, 11 );
 }
 
 Sapphire::Data::IKDRouteTable::IKDRouteTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7023,6 +7055,11 @@ Sapphire::Data::MainCommandCategory::MainCommandCategory( uint32_t row_id, Sapph
   name = exdData->getField< std::string >( row, 1 );
 }
 
+Sapphire::Data::MandervilleWeaponEnhance::MandervilleWeaponEnhance( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MandervilleWeaponEnhanceDat.get_row( row_id );
+}
+
 Sapphire::Data::ManeuversArmor::ManeuversArmor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ManeuversArmorDat.get_row( row_id );
@@ -7116,7 +7153,7 @@ Sapphire::Data::Marker::Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerate
 {
   auto row = exdData->m_MarkerDat.get_row( row_id );
   icon = exdData->getField< int32_t >( row, 0 );
-  name = exdData->getField< uint8_t >( row, 1 );
+  name = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::Materia::Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7132,17 +7169,17 @@ Sapphire::Data::Materia::Materia( uint32_t row_id, Sapphire::Data::ExdDataGenera
   item.push_back( exdData->getField< int32_t >( row, 7 ) );
   item.push_back( exdData->getField< int32_t >( row, 8 ) );
   item.push_back( exdData->getField< int32_t >( row, 9 ) );
-  baseParam = exdData->getField< int32_t >( row, 10 );
-  value.push_back( exdData->getField< int32_t >( row, 11 ) );
-  value.push_back( exdData->getField< int32_t >( row, 12 ) );
-  value.push_back( exdData->getField< int32_t >( row, 13 ) );
-  value.push_back( exdData->getField< int32_t >( row, 14 ) );
-  value.push_back( exdData->getField< int32_t >( row, 15 ) );
-  value.push_back( exdData->getField< int32_t >( row, 16 ) );
-  value.push_back( exdData->getField< int32_t >( row, 17 ) );
-  value.push_back( exdData->getField< int32_t >( row, 18 ) );
-  value.push_back( exdData->getField< int32_t >( row, 19 ) );
-  value.push_back( exdData->getField< int32_t >( row, 20 ) );
+  baseParam = exdData->getField< uint8_t >( row, 16 );
+  value.push_back( exdData->getField< int16_t >( row, 17 ) );
+  value.push_back( exdData->getField< int16_t >( row, 18 ) );
+  value.push_back( exdData->getField< int16_t >( row, 19 ) );
+  value.push_back( exdData->getField< int16_t >( row, 20 ) );
+  value.push_back( exdData->getField< int16_t >( row, 21 ) );
+  value.push_back( exdData->getField< int16_t >( row, 22 ) );
+  value.push_back( exdData->getField< int16_t >( row, 23 ) );
+  value.push_back( exdData->getField< int16_t >( row, 24 ) );
+  value.push_back( exdData->getField< int16_t >( row, 25 ) );
+  value.push_back( exdData->getField< int16_t >( row, 26 ) );
 }
 
 Sapphire::Data::MateriaGrade::MateriaGrade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7204,6 +7241,41 @@ Sapphire::Data::MiniGameRA::MiniGameRA( uint32_t row_id, Sapphire::Data::ExdData
   bGM = exdData->getField< int32_t >( row, 3 );
 }
 
+Sapphire::Data::MiniGameTurnBreakAction::MiniGameTurnBreakAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MiniGameTurnBreakActionDat.get_row( row_id );
+}
+
+Sapphire::Data::MiniGameTurnBreakConst::MiniGameTurnBreakConst( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MiniGameTurnBreakConstDat.get_row( row_id );
+}
+
+Sapphire::Data::MiniGameTurnBreakEnemy::MiniGameTurnBreakEnemy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MiniGameTurnBreakEnemyDat.get_row( row_id );
+}
+
+Sapphire::Data::MiniGameTurnBreakPop::MiniGameTurnBreakPop( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MiniGameTurnBreakPopDat.get_row( row_id, subRow );
+}
+
+Sapphire::Data::MiniGameTurnBreakPopOffset::MiniGameTurnBreakPopOffset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MiniGameTurnBreakPopOffsetDat.get_row( row_id );
+}
+
+Sapphire::Data::MiniGameTurnBreakStage::MiniGameTurnBreakStage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MiniGameTurnBreakStageDat.get_row( row_id );
+}
+
+Sapphire::Data::MiniGameTurnBreakStatus::MiniGameTurnBreakStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MiniGameTurnBreakStatusDat.get_row( row_id );
+}
+
 Sapphire::Data::MinionRace::MinionRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MinionRaceDat.get_row( row_id );
@@ -7353,6 +7425,16 @@ Sapphire::Data::MJICraftworksPopularity::MJICraftworksPopularity( uint32_t row_i
   popularity.push_back( exdData->getField< uint8_t >( row, 68 ) );
   popularity.push_back( exdData->getField< uint8_t >( row, 69 ) );
   popularity.push_back( exdData->getField< uint8_t >( row, 70 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 71 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 72 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 73 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 74 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 75 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 76 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 77 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 78 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 79 ) );
+  popularity.push_back( exdData->getField< uint8_t >( row, 80 ) );
 }
 
 Sapphire::Data::MJICraftworksPopularityType::MJICraftworksPopularityType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7409,6 +7491,13 @@ Sapphire::Data::MJIFunction::MJIFunction( uint32_t row_id, Sapphire::Data::ExdDa
   auto row = exdData->m_MJIFunctionDat.get_row( row_id );
 }
 
+Sapphire::Data::MJIGardenscaping::MJIGardenscaping( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MJIGardenscapingDat.get_row( row_id );
+  level = exdData->getField< uint8_t >( row, 0 );
+  item = exdData->getField< int32_t >( row, 5 );
+}
+
 Sapphire::Data::MJIGathering::MJIGathering( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MJIGatheringDat.get_row( row_id );
@@ -7512,6 +7601,18 @@ Sapphire::Data::MJIMinionPopAreas::MJIMinionPopAreas( uint32_t row_id, Sapphire:
   auto row = exdData->m_MJIMinionPopAreasDat.get_row( row_id );
 }
 
+Sapphire::Data::MJIName::MJIName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MJINameDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+}
+
 Sapphire::Data::MJIProgress::MJIProgress( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MJIProgressDat.get_row( row_id );
@@ -8003,10 +8104,10 @@ Sapphire::Data::OmikujiGuidance::OmikujiGuidance( uint32_t row_id, Sapphire::Dat
 Sapphire::Data::OnlineStatus::OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_OnlineStatusDat.get_row( row_id );
-  list = exdData->getField< bool >( row, 0 );
-  priority = exdData->getField< bool >( row, 2 );
-  name = exdData->getField< uint8_t >( row, 3 );
+  list = exdData->getField< bool >( row, 1 );
+  priority = exdData->getField< uint8_t >( row, 3 );
   icon = exdData->getField< uint32_t >( row, 4 );
+  name = exdData->getField< std::string >( row, 6 );
 }
 
 Sapphire::Data::OpenContent::OpenContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -10259,11 +10360,24 @@ Sapphire::Data::QuestEffectDefine::QuestEffectDefine( uint32_t row_id, uint32_t
   effect = exdData->getField< uint16_t >( row, 0 );
 }
 
+Sapphire::Data::QuestEventAreaEntranceInfo::QuestEventAreaEntranceInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestEventAreaEntranceInfoDat.get_row( row_id, subRow );
+  quest = exdData->getField< uint32_t >( row, 0 );
+  location = exdData->getField< uint32_t >( row, 2 );
+}
+
 Sapphire::Data::QuestLinkMarker::QuestLinkMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_QuestLinkMarkerDat.get_row( row_id, subRow );
 }
 
+Sapphire::Data::QuestLinkMarkerIcon::QuestLinkMarkerIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestLinkMarkerIconDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
+}
+
 Sapphire::Data::QuestLinkMarkerSet::QuestLinkMarkerSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_QuestLinkMarkerSetDat.get_row( row_id );
@@ -11119,8 +11233,9 @@ Sapphire::Data::SpearfishingItem::SpearfishingItem( uint32_t row_id, Sapphire::D
   description = exdData->getField< std::string >( row, 0 );
   item = exdData->getField< int32_t >( row, 1 );
   gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
-  fishingRecordType = exdData->getField< uint16_t >( row, 5 );
-  territoryType = exdData->getField< uint16_t >( row, 6 );
+  fishingRecordType = exdData->getField< uint8_t >( row, 4 );
+  territoryType = exdData->getField< uint16_t >( row, 5 );
+  isVisible = exdData->getField< bool >( row, 7 );
 }
 
 Sapphire::Data::SpearfishingNotebook::SpearfishingNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -13289,7 +13404,7 @@ Sapphire::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Sap
   y = exdData->getField< int16_t >( row, 3 );
   z = exdData->getField< int16_t >( row, 4 );
   map = exdData->getField< uint8_t >( row, 5 );
-  passengers = exdData->getField< bool >( row, 6 );
+  startingPoint = exdData->getField< bool >( row, 6 );
   stars = exdData->getField< uint8_t >( row, 7 );
   rankReq = exdData->getField< uint8_t >( row, 8 );
   ceruleumTankReq = exdData->getField< uint8_t >( row, 9 );
@@ -13434,6 +13549,21 @@ Sapphire::Data::TofuObjectCategory::TofuObjectCategory( uint32_t row_id, Sapphir
   auto row = exdData->m_TofuObjectCategoryDat.get_row( row_id );
 }
 
+Sapphire::Data::TofuPreset::TofuPreset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_TofuPresetDat.get_row( row_id );
+}
+
+Sapphire::Data::TofuPresetCategory::TofuPresetCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_TofuPresetCategoryDat.get_row( row_id );
+}
+
+Sapphire::Data::TofuPresetObject::TofuPresetObject( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_TofuPresetObjectDat.get_row( row_id );
+}
+
 Sapphire::Data::Tomestones::Tomestones( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_TomestonesDat.get_row( row_id );
@@ -14112,6 +14242,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_AOZBossDat = setupDatAccess( "AOZBoss", xiv::exd::Language::none );
     m_AOZContentDat = setupDatAccess( "AOZContent", xiv::exd::Language::none );
     m_AOZContentBriefingBNpcDat = setupDatAccess( "AOZContentBriefingBNpc", xiv::exd::Language::none );
+    m_AOZContentBriefingObjectDat = setupDatAccess( "AOZContentBriefingObject", xiv::exd::Language::none );
     m_AOZReportDat = setupDatAccess( "AOZReport", xiv::exd::Language::none );
     m_AOZScoreDat = setupDatAccess( "AOZScore", xiv::exd::Language::en );
     m_AquariumFishDat = setupDatAccess( "AquariumFish", xiv::exd::Language::none );
@@ -14247,6 +14378,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_CreditListDat = setupDatAccess( "CreditList", xiv::exd::Language::none );
     m_CreditListTextDat = setupDatAccess( "CreditListText", xiv::exd::Language::en );
     m_CustomTalkDat = setupDatAccess( "CustomTalk", xiv::exd::Language::en );
+    m_CustomTalkDefineClientDat = setupDatAccess( "CustomTalkDefineClient", xiv::exd::Language::none );
     m_CustomTalkNestHandlersDat = setupDatAccess( "CustomTalkNestHandlers", xiv::exd::Language::none );
     m_CutsceneDat = setupDatAccess( "Cutscene", xiv::exd::Language::none );
     m_CutSceneIncompQuestDat = setupDatAccess( "CutSceneIncompQuest", xiv::exd::Language::none );
@@ -14314,6 +14446,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_EventActionDat = setupDatAccess( "EventAction", xiv::exd::Language::en );
     m_EventCustomIconTypeDat = setupDatAccess( "EventCustomIconType", xiv::exd::Language::none );
     m_EventIconPriorityDat = setupDatAccess( "EventIconPriority", xiv::exd::Language::none );
+    m_EventIconPriorityPairDat = setupDatAccess( "EventIconPriorityPair", xiv::exd::Language::none );
     m_EventIconTypeDat = setupDatAccess( "EventIconType", xiv::exd::Language::none );
     m_EventItemDat = setupDatAccess( "EventItem", xiv::exd::Language::en );
     m_EventItemCastTimelineDat = setupDatAccess( "EventItemCastTimeline", xiv::exd::Language::none );
@@ -14348,6 +14481,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_FestivalDat = setupDatAccess( "Festival", xiv::exd::Language::none );
     m_FieldMarkerDat = setupDatAccess( "FieldMarker", xiv::exd::Language::en );
     m_FishingBaitParameterDat = setupDatAccess( "FishingBaitParameter", xiv::exd::Language::none );
+    m_FishingNoteInfoDat = setupDatAccess( "FishingNoteInfo", xiv::exd::Language::none );
     m_FishingRecordTypeDat = setupDatAccess( "FishingRecordType", xiv::exd::Language::none );
     m_FishingRecordTypeTransientDat = setupDatAccess( "FishingRecordTypeTransient", xiv::exd::Language::none );
     m_FishingSpotDat = setupDatAccess( "FishingSpot", xiv::exd::Language::en );
@@ -14524,6 +14658,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MacroIconRedirectOldDat = setupDatAccess( "MacroIconRedirectOld", xiv::exd::Language::none );
     m_MainCommandDat = setupDatAccess( "MainCommand", xiv::exd::Language::en );
     m_MainCommandCategoryDat = setupDatAccess( "MainCommandCategory", xiv::exd::Language::en );
+    m_MandervilleWeaponEnhanceDat = setupDatAccess( "MandervilleWeaponEnhance", xiv::exd::Language::none );
     m_ManeuversArmorDat = setupDatAccess( "ManeuversArmor", xiv::exd::Language::en );
     m_MapDat = setupDatAccess( "Map", xiv::exd::Language::none );
     m_MapConditionDat = setupDatAccess( "MapCondition", xiv::exd::Language::none );
@@ -14543,6 +14678,13 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_McGuffinDat = setupDatAccess( "McGuffin", xiv::exd::Language::none );
     m_McGuffinUIDataDat = setupDatAccess( "McGuffinUIData", xiv::exd::Language::en );
     m_MiniGameRADat = setupDatAccess( "MiniGameRA", xiv::exd::Language::none );
+    m_MiniGameTurnBreakActionDat = setupDatAccess( "MiniGameTurnBreakAction", xiv::exd::Language::en );
+    m_MiniGameTurnBreakConstDat = setupDatAccess( "MiniGameTurnBreakConst", xiv::exd::Language::none );
+    m_MiniGameTurnBreakEnemyDat = setupDatAccess( "MiniGameTurnBreakEnemy", xiv::exd::Language::none );
+    m_MiniGameTurnBreakPopDat = setupDatAccess( "MiniGameTurnBreakPop", xiv::exd::Language::none );
+    m_MiniGameTurnBreakPopOffsetDat = setupDatAccess( "MiniGameTurnBreakPopOffset", xiv::exd::Language::none );
+    m_MiniGameTurnBreakStageDat = setupDatAccess( "MiniGameTurnBreakStage", xiv::exd::Language::none );
+    m_MiniGameTurnBreakStatusDat = setupDatAccess( "MiniGameTurnBreakStatus", xiv::exd::Language::en );
     m_MinionRaceDat = setupDatAccess( "MinionRace", xiv::exd::Language::en );
     m_MinionRulesDat = setupDatAccess( "MinionRules", xiv::exd::Language::en );
     m_MinionSkillTypeDat = setupDatAccess( "MinionSkillType", xiv::exd::Language::en );
@@ -14561,6 +14703,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MJIDisposalShopUICategoryDat = setupDatAccess( "MJIDisposalShopUICategory", xiv::exd::Language::en );
     m_MJIFarmPastureRankDat = setupDatAccess( "MJIFarmPastureRank", xiv::exd::Language::none );
     m_MJIFunctionDat = setupDatAccess( "MJIFunction", xiv::exd::Language::none );
+    m_MJIGardenscapingDat = setupDatAccess( "MJIGardenscaping", xiv::exd::Language::none );
     m_MJIGatheringDat = setupDatAccess( "MJIGathering", xiv::exd::Language::none );
     m_MJIGatheringItemDat = setupDatAccess( "MJIGatheringItem", xiv::exd::Language::none );
     m_MJIGatheringObjectDat = setupDatAccess( "MJIGatheringObject", xiv::exd::Language::none );
@@ -14573,6 +14716,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MJILandmarkPlaceDat = setupDatAccess( "MJILandmarkPlace", xiv::exd::Language::none );
     m_MJILivelyActorDat = setupDatAccess( "MJILivelyActor", xiv::exd::Language::none );
     m_MJIMinionPopAreasDat = setupDatAccess( "MJIMinionPopAreas", xiv::exd::Language::none );
+    m_MJINameDat = setupDatAccess( "MJIName", xiv::exd::Language::en );
     m_MJIProgressDat = setupDatAccess( "MJIProgress", xiv::exd::Language::en );
     m_MJIRankDat = setupDatAccess( "MJIRank", xiv::exd::Language::none );
     m_MJIRecipeDat = setupDatAccess( "MJIRecipe", xiv::exd::Language::none );
@@ -14674,7 +14818,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_QuestDerivedClassDat = setupDatAccess( "QuestDerivedClass", xiv::exd::Language::none );
     m_QuestEffectDat = setupDatAccess( "QuestEffect", xiv::exd::Language::none );
     m_QuestEffectDefineDat = setupDatAccess( "QuestEffectDefine", xiv::exd::Language::none );
+    m_QuestEventAreaEntranceInfoDat = setupDatAccess( "QuestEventAreaEntranceInfo", xiv::exd::Language::none );
     m_QuestLinkMarkerDat = setupDatAccess( "QuestLinkMarker", xiv::exd::Language::none );
+    m_QuestLinkMarkerIconDat = setupDatAccess( "QuestLinkMarkerIcon", xiv::exd::Language::none );
     m_QuestLinkMarkerSetDat = setupDatAccess( "QuestLinkMarkerSet", xiv::exd::Language::none );
     m_QuestRedoDat = setupDatAccess( "QuestRedo", xiv::exd::Language::none );
     m_QuestRedoChapterUIDat = setupDatAccess( "QuestRedoChapterUI", xiv::exd::Language::en );
@@ -14770,6 +14916,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_TofuEditParamDat = setupDatAccess( "TofuEditParam", xiv::exd::Language::en );
     m_TofuObjectDat = setupDatAccess( "TofuObject", xiv::exd::Language::en );
     m_TofuObjectCategoryDat = setupDatAccess( "TofuObjectCategory", xiv::exd::Language::en );
+    m_TofuPresetDat = setupDatAccess( "TofuPreset", xiv::exd::Language::en );
+    m_TofuPresetCategoryDat = setupDatAccess( "TofuPresetCategory", xiv::exd::Language::en );
+    m_TofuPresetObjectDat = setupDatAccess( "TofuPresetObject", xiv::exd::Language::none );
     m_TomestonesDat = setupDatAccess( "Tomestones", xiv::exd::Language::none );
     m_TomestonesItemDat = setupDatAccess( "TomestonesItem", xiv::exd::Language::none );
     m_TopicSelectDat = setupDatAccess( "TopicSelect", xiv::exd::Language::en );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 9f342264..c25f70cc 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -76,6 +76,7 @@ struct AOZArrangement;
 struct AOZBoss;
 struct AOZContent;
 struct AOZContentBriefingBNpc;
+struct AOZContentBriefingObject;
 struct AOZReport;
 struct AOZScore;
 struct AquariumFish;
@@ -211,6 +212,7 @@ struct CreditCast;
 struct CreditList;
 struct CreditListText;
 struct CustomTalk;
+struct CustomTalkDefineClient;
 struct CustomTalkNestHandlers;
 struct Cutscene;
 struct CutSceneIncompQuest;
@@ -278,6 +280,7 @@ struct EurekaSphereElementAdjust;
 struct EventAction;
 struct EventCustomIconType;
 struct EventIconPriority;
+struct EventIconPriorityPair;
 struct EventIconType;
 struct EventItem;
 struct EventItemCastTimeline;
@@ -312,6 +315,7 @@ struct FCRights;
 struct Festival;
 struct FieldMarker;
 struct FishingBaitParameter;
+struct FishingNoteInfo;
 struct FishingRecordType;
 struct FishingRecordTypeTransient;
 struct FishingSpot;
@@ -488,6 +492,7 @@ struct MacroIcon;
 struct MacroIconRedirectOld;
 struct MainCommand;
 struct MainCommandCategory;
+struct MandervilleWeaponEnhance;
 struct ManeuversArmor;
 struct Map;
 struct MapCondition;
@@ -507,6 +512,13 @@ struct MateriaTomestoneRate;
 struct McGuffin;
 struct McGuffinUIData;
 struct MiniGameRA;
+struct MiniGameTurnBreakAction;
+struct MiniGameTurnBreakConst;
+struct MiniGameTurnBreakEnemy;
+struct MiniGameTurnBreakPop;
+struct MiniGameTurnBreakPopOffset;
+struct MiniGameTurnBreakStage;
+struct MiniGameTurnBreakStatus;
 struct MinionRace;
 struct MinionRules;
 struct MinionSkillType;
@@ -525,6 +537,7 @@ struct MJIDisposalShopItem;
 struct MJIDisposalShopUICategory;
 struct MJIFarmPastureRank;
 struct MJIFunction;
+struct MJIGardenscaping;
 struct MJIGathering;
 struct MJIGatheringItem;
 struct MJIGatheringObject;
@@ -537,6 +550,7 @@ struct MJILandmark;
 struct MJILandmarkPlace;
 struct MJILivelyActor;
 struct MJIMinionPopAreas;
+struct MJIName;
 struct MJIProgress;
 struct MJIRank;
 struct MJIRecipe;
@@ -638,7 +652,9 @@ struct QuestDefineClient;
 struct QuestDerivedClass;
 struct QuestEffect;
 struct QuestEffectDefine;
+struct QuestEventAreaEntranceInfo;
 struct QuestLinkMarker;
+struct QuestLinkMarkerIcon;
 struct QuestLinkMarkerSet;
 struct QuestRedo;
 struct QuestRedoChapterUI;
@@ -734,6 +750,9 @@ struct Title;
 struct TofuEditParam;
 struct TofuObject;
 struct TofuObjectCategory;
+struct TofuPreset;
+struct TofuPresetCategory;
+struct TofuPresetObject;
 struct Tomestones;
 struct TomestonesItem;
 struct TopicSelect;
@@ -1350,17 +1369,17 @@ struct AOZContent
   uint8_t act1FightType;
   uint16_t act1;
   uint8_t arenaType1;
-  uint16_t act2FightType;
-  uint8_t act2;
-  uint16_t arenaType2;
+  uint8_t act2FightType;
+  uint16_t act2;
+  uint8_t arenaType2;
   uint8_t act3FightType;
   uint16_t act3;
   uint8_t arenaType3;
-  uint16_t contentEntry;
+  uint32_t contentEntry;
   uint8_t order;
   uint16_t gilReward;
-  uint32_t alliedSealsReward;
-  uint8_t tomestonesReward;
+  uint16_t alliedSealsReward;
+  uint16_t tomestonesReward;
 
   AOZContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1396,6 +1415,13 @@ struct AOZContentBriefingBNpc
   AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct AOZContentBriefingObject
+{
+  uint32_t icon;
+
+  AOZContentBriefingObject( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct AOZReport
 {
   uint8_t reward;
@@ -2444,10 +2470,10 @@ struct CollectablesShopItem
   uint32_t item;
   uint8_t collectablesShopItemGroup;
   uint16_t levelMin;
-  uint32_t levelMax;
-  uint16_t stars;
+  uint16_t levelMax;
+  uint8_t stars;
   uint8_t key;
-  uint8_t collectablesShopRefine;
+  uint16_t collectablesShopRefine;
   uint16_t collectablesShopRewardScrip;
 
   CollectablesShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
@@ -2835,11 +2861,11 @@ struct ContentRoulette
   uint16_t rewardTomeA;
   uint16_t rewardTomeB;
   uint16_t rewardTomeC;
-  uint32_t sortKey;
+  uint8_t sortKey;
   uint8_t contentMemberType;
   bool requireAllDuties;
-  bool contentRouletteOpenRule;
-  uint8_t instanceContent;
+  uint8_t contentRouletteOpenRule;
+  uint16_t instanceContent;
 
   ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -3039,6 +3065,12 @@ struct CustomTalk
   CustomTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct CustomTalkDefineClient
+{
+
+  CustomTalkDefineClient( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct CustomTalkNestHandlers
 {
   uint32_t nestHandler;
@@ -3749,6 +3781,13 @@ struct EventIconPriority
   EventIconPriority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct EventIconPriorityPair
+{
+  uint32_t icon1;
+
+  EventIconPriorityPair( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct EventIconType
 {
   uint32_t npcIconAvailable;
@@ -4081,6 +4120,19 @@ struct FishingBaitParameter
   FishingBaitParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FishingNoteInfo
+{
+  uint8_t size;
+  uint8_t aquariumWater;
+  uint8_t weatherRestriction;
+  uint8_t timeRestriction;
+  uint8_t specialConditions;
+  uint8_t isCollectable;
+  int32_t item;
+
+  FishingNoteInfo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct FishingRecordType
 {
   int32_t addon;
@@ -4126,10 +4178,13 @@ struct FishParameter
   std::string text;
   int32_t item;
   uint16_t gatheringItemLevel;
+  uint8_t oceanStars;
   bool isHidden;
-  uint16_t fishingRecordType;
-  bool fishingSpot;
-  uint32_t gatheringSubCategory;
+  uint8_t fishingRecordType;
+  uint16_t fishingSpot;
+  uint16_t gatheringSubCategory;
+  bool isInLog;
+  uint32_t achievementCredit;
 
   FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5235,7 +5290,7 @@ struct IKDRoute
 {
   uint32_t image;
   uint32_t territoryType;
-  uint32_t name;
+  std::string name;
 
   IKDRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5877,6 +5932,12 @@ struct MainCommandCategory
   MainCommandCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MandervilleWeaponEnhance
+{
+
+  MandervilleWeaponEnhance( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ManeuversArmor
 {
   std::vector< uint32_t > bNpcBase;
@@ -5974,7 +6035,7 @@ struct MapType
 struct Marker
 {
   int32_t icon;
-  uint8_t name;
+  std::string name;
 
   Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5982,8 +6043,8 @@ struct Marker
 struct Materia
 {
   std::vector< int32_t > item;
-  int32_t baseParam;
-  std::vector< int32_t > value;
+  uint8_t baseParam;
+  std::vector< int16_t > value;
 
   Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6042,6 +6103,48 @@ struct MiniGameRA
   MiniGameRA( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MiniGameTurnBreakAction
+{
+
+  MiniGameTurnBreakAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MiniGameTurnBreakConst
+{
+
+  MiniGameTurnBreakConst( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MiniGameTurnBreakEnemy
+{
+
+  MiniGameTurnBreakEnemy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MiniGameTurnBreakPop
+{
+
+  MiniGameTurnBreakPop( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MiniGameTurnBreakPopOffset
+{
+
+  MiniGameTurnBreakPopOffset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MiniGameTurnBreakStage
+{
+
+  MiniGameTurnBreakStage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MiniGameTurnBreakStatus
+{
+
+  MiniGameTurnBreakStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct MinionRace
 {
   std::string name;
@@ -6185,6 +6288,14 @@ struct MJIFunction
   MJIFunction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MJIGardenscaping
+{
+  uint8_t level;
+  int32_t item;
+
+  MJIGardenscaping( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct MJIGathering
 {
   uint8_t gatheringObject;
@@ -6292,6 +6403,19 @@ struct MJIMinionPopAreas
   MJIMinionPopAreas( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MJIName
+{
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+
+  MJIName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct MJIProgress
 {
   std::string vision;
@@ -6816,9 +6940,9 @@ struct OmikujiGuidance
 struct OnlineStatus
 {
   bool list;
-  bool priority;
-  uint8_t name;
+  uint8_t priority;
   uint32_t icon;
+  std::string name;
 
   OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -7420,12 +7544,27 @@ struct QuestEffectDefine
   QuestEffectDefine( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct QuestEventAreaEntranceInfo
+{
+  uint32_t quest;
+  uint32_t location;
+
+  QuestEventAreaEntranceInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct QuestLinkMarker
 {
 
   QuestLinkMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct QuestLinkMarkerIcon
+{
+  uint32_t icon;
+
+  QuestLinkMarkerIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct QuestLinkMarkerSet
 {
 
@@ -8088,8 +8227,9 @@ struct SpearfishingItem
   std::string description;
   int32_t item;
   uint16_t gatheringItemLevel;
-  uint16_t fishingRecordType;
+  uint8_t fishingRecordType;
   uint16_t territoryType;
+  bool isVisible;
 
   SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -8252,7 +8392,7 @@ struct SubmarineExploration
   int16_t y;
   int16_t z;
   uint8_t map;
-  bool passengers;
+  bool startingPoint;
   uint8_t stars;
   uint8_t rankReq;
   uint8_t ceruleumTankReq;
@@ -8414,6 +8554,24 @@ struct TofuObjectCategory
   TofuObjectCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct TofuPreset
+{
+
+  TofuPreset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct TofuPresetCategory
+{
+
+  TofuPresetCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct TofuPresetObject
+{
+
+  TofuPresetObject( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Tomestones
 {
   uint16_t weeklyLimit;
@@ -9074,6 +9232,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_AOZBossDat;
      xiv::exd::Exd m_AOZContentDat;
      xiv::exd::Exd m_AOZContentBriefingBNpcDat;
+     xiv::exd::Exd m_AOZContentBriefingObjectDat;
      xiv::exd::Exd m_AOZReportDat;
      xiv::exd::Exd m_AOZScoreDat;
      xiv::exd::Exd m_AquariumFishDat;
@@ -9209,6 +9368,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CreditListDat;
      xiv::exd::Exd m_CreditListTextDat;
      xiv::exd::Exd m_CustomTalkDat;
+     xiv::exd::Exd m_CustomTalkDefineClientDat;
      xiv::exd::Exd m_CustomTalkNestHandlersDat;
      xiv::exd::Exd m_CutsceneDat;
      xiv::exd::Exd m_CutSceneIncompQuestDat;
@@ -9276,6 +9436,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_EventActionDat;
      xiv::exd::Exd m_EventCustomIconTypeDat;
      xiv::exd::Exd m_EventIconPriorityDat;
+     xiv::exd::Exd m_EventIconPriorityPairDat;
      xiv::exd::Exd m_EventIconTypeDat;
      xiv::exd::Exd m_EventItemDat;
      xiv::exd::Exd m_EventItemCastTimelineDat;
@@ -9310,6 +9471,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_FestivalDat;
      xiv::exd::Exd m_FieldMarkerDat;
      xiv::exd::Exd m_FishingBaitParameterDat;
+     xiv::exd::Exd m_FishingNoteInfoDat;
      xiv::exd::Exd m_FishingRecordTypeDat;
      xiv::exd::Exd m_FishingRecordTypeTransientDat;
      xiv::exd::Exd m_FishingSpotDat;
@@ -9486,6 +9648,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MacroIconRedirectOldDat;
      xiv::exd::Exd m_MainCommandDat;
      xiv::exd::Exd m_MainCommandCategoryDat;
+     xiv::exd::Exd m_MandervilleWeaponEnhanceDat;
      xiv::exd::Exd m_ManeuversArmorDat;
      xiv::exd::Exd m_MapDat;
      xiv::exd::Exd m_MapConditionDat;
@@ -9505,6 +9668,13 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_McGuffinDat;
      xiv::exd::Exd m_McGuffinUIDataDat;
      xiv::exd::Exd m_MiniGameRADat;
+     xiv::exd::Exd m_MiniGameTurnBreakActionDat;
+     xiv::exd::Exd m_MiniGameTurnBreakConstDat;
+     xiv::exd::Exd m_MiniGameTurnBreakEnemyDat;
+     xiv::exd::Exd m_MiniGameTurnBreakPopDat;
+     xiv::exd::Exd m_MiniGameTurnBreakPopOffsetDat;
+     xiv::exd::Exd m_MiniGameTurnBreakStageDat;
+     xiv::exd::Exd m_MiniGameTurnBreakStatusDat;
      xiv::exd::Exd m_MinionRaceDat;
      xiv::exd::Exd m_MinionRulesDat;
      xiv::exd::Exd m_MinionSkillTypeDat;
@@ -9523,6 +9693,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MJIDisposalShopUICategoryDat;
      xiv::exd::Exd m_MJIFarmPastureRankDat;
      xiv::exd::Exd m_MJIFunctionDat;
+     xiv::exd::Exd m_MJIGardenscapingDat;
      xiv::exd::Exd m_MJIGatheringDat;
      xiv::exd::Exd m_MJIGatheringItemDat;
      xiv::exd::Exd m_MJIGatheringObjectDat;
@@ -9535,6 +9706,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MJILandmarkPlaceDat;
      xiv::exd::Exd m_MJILivelyActorDat;
      xiv::exd::Exd m_MJIMinionPopAreasDat;
+     xiv::exd::Exd m_MJINameDat;
      xiv::exd::Exd m_MJIProgressDat;
      xiv::exd::Exd m_MJIRankDat;
      xiv::exd::Exd m_MJIRecipeDat;
@@ -9636,7 +9808,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_QuestDerivedClassDat;
      xiv::exd::Exd m_QuestEffectDat;
      xiv::exd::Exd m_QuestEffectDefineDat;
+     xiv::exd::Exd m_QuestEventAreaEntranceInfoDat;
      xiv::exd::Exd m_QuestLinkMarkerDat;
+     xiv::exd::Exd m_QuestLinkMarkerIconDat;
      xiv::exd::Exd m_QuestLinkMarkerSetDat;
      xiv::exd::Exd m_QuestRedoDat;
      xiv::exd::Exd m_QuestRedoChapterUIDat;
@@ -9732,6 +9906,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_TofuEditParamDat;
      xiv::exd::Exd m_TofuObjectDat;
      xiv::exd::Exd m_TofuObjectCategoryDat;
+     xiv::exd::Exd m_TofuPresetDat;
+     xiv::exd::Exd m_TofuPresetCategoryDat;
+     xiv::exd::Exd m_TofuPresetObjectDat;
      xiv::exd::Exd m_TomestonesDat;
      xiv::exd::Exd m_TomestonesItemDat;
      xiv::exd::Exd m_TopicSelectDat;
@@ -9846,6 +10023,7 @@ struct ZoneSharedGroup
      using AOZBossPtr = std::shared_ptr< AOZBoss >;
      using AOZContentPtr = std::shared_ptr< AOZContent >;
      using AOZContentBriefingBNpcPtr = std::shared_ptr< AOZContentBriefingBNpc >;
+     using AOZContentBriefingObjectPtr = std::shared_ptr< AOZContentBriefingObject >;
      using AOZReportPtr = std::shared_ptr< AOZReport >;
      using AOZScorePtr = std::shared_ptr< AOZScore >;
      using AquariumFishPtr = std::shared_ptr< AquariumFish >;
@@ -9981,6 +10159,7 @@ struct ZoneSharedGroup
      using CreditListPtr = std::shared_ptr< CreditList >;
      using CreditListTextPtr = std::shared_ptr< CreditListText >;
      using CustomTalkPtr = std::shared_ptr< CustomTalk >;
+     using CustomTalkDefineClientPtr = std::shared_ptr< CustomTalkDefineClient >;
      using CustomTalkNestHandlersPtr = std::shared_ptr< CustomTalkNestHandlers >;
      using CutscenePtr = std::shared_ptr< Cutscene >;
      using CutSceneIncompQuestPtr = std::shared_ptr< CutSceneIncompQuest >;
@@ -10048,6 +10227,7 @@ struct ZoneSharedGroup
      using EventActionPtr = std::shared_ptr< EventAction >;
      using EventCustomIconTypePtr = std::shared_ptr< EventCustomIconType >;
      using EventIconPriorityPtr = std::shared_ptr< EventIconPriority >;
+     using EventIconPriorityPairPtr = std::shared_ptr< EventIconPriorityPair >;
      using EventIconTypePtr = std::shared_ptr< EventIconType >;
      using EventItemPtr = std::shared_ptr< EventItem >;
      using EventItemCastTimelinePtr = std::shared_ptr< EventItemCastTimeline >;
@@ -10082,6 +10262,7 @@ struct ZoneSharedGroup
      using FestivalPtr = std::shared_ptr< Festival >;
      using FieldMarkerPtr = std::shared_ptr< FieldMarker >;
      using FishingBaitParameterPtr = std::shared_ptr< FishingBaitParameter >;
+     using FishingNoteInfoPtr = std::shared_ptr< FishingNoteInfo >;
      using FishingRecordTypePtr = std::shared_ptr< FishingRecordType >;
      using FishingRecordTypeTransientPtr = std::shared_ptr< FishingRecordTypeTransient >;
      using FishingSpotPtr = std::shared_ptr< FishingSpot >;
@@ -10258,6 +10439,7 @@ struct ZoneSharedGroup
      using MacroIconRedirectOldPtr = std::shared_ptr< MacroIconRedirectOld >;
      using MainCommandPtr = std::shared_ptr< MainCommand >;
      using MainCommandCategoryPtr = std::shared_ptr< MainCommandCategory >;
+     using MandervilleWeaponEnhancePtr = std::shared_ptr< MandervilleWeaponEnhance >;
      using ManeuversArmorPtr = std::shared_ptr< ManeuversArmor >;
      using MapPtr = std::shared_ptr< Map >;
      using MapConditionPtr = std::shared_ptr< MapCondition >;
@@ -10277,6 +10459,13 @@ struct ZoneSharedGroup
      using McGuffinPtr = std::shared_ptr< McGuffin >;
      using McGuffinUIDataPtr = std::shared_ptr< McGuffinUIData >;
      using MiniGameRAPtr = std::shared_ptr< MiniGameRA >;
+     using MiniGameTurnBreakActionPtr = std::shared_ptr< MiniGameTurnBreakAction >;
+     using MiniGameTurnBreakConstPtr = std::shared_ptr< MiniGameTurnBreakConst >;
+     using MiniGameTurnBreakEnemyPtr = std::shared_ptr< MiniGameTurnBreakEnemy >;
+     using MiniGameTurnBreakPopPtr = std::shared_ptr< MiniGameTurnBreakPop >;
+     using MiniGameTurnBreakPopOffsetPtr = std::shared_ptr< MiniGameTurnBreakPopOffset >;
+     using MiniGameTurnBreakStagePtr = std::shared_ptr< MiniGameTurnBreakStage >;
+     using MiniGameTurnBreakStatusPtr = std::shared_ptr< MiniGameTurnBreakStatus >;
      using MinionRacePtr = std::shared_ptr< MinionRace >;
      using MinionRulesPtr = std::shared_ptr< MinionRules >;
      using MinionSkillTypePtr = std::shared_ptr< MinionSkillType >;
@@ -10295,6 +10484,7 @@ struct ZoneSharedGroup
      using MJIDisposalShopUICategoryPtr = std::shared_ptr< MJIDisposalShopUICategory >;
      using MJIFarmPastureRankPtr = std::shared_ptr< MJIFarmPastureRank >;
      using MJIFunctionPtr = std::shared_ptr< MJIFunction >;
+     using MJIGardenscapingPtr = std::shared_ptr< MJIGardenscaping >;
      using MJIGatheringPtr = std::shared_ptr< MJIGathering >;
      using MJIGatheringItemPtr = std::shared_ptr< MJIGatheringItem >;
      using MJIGatheringObjectPtr = std::shared_ptr< MJIGatheringObject >;
@@ -10307,6 +10497,7 @@ struct ZoneSharedGroup
      using MJILandmarkPlacePtr = std::shared_ptr< MJILandmarkPlace >;
      using MJILivelyActorPtr = std::shared_ptr< MJILivelyActor >;
      using MJIMinionPopAreasPtr = std::shared_ptr< MJIMinionPopAreas >;
+     using MJINamePtr = std::shared_ptr< MJIName >;
      using MJIProgressPtr = std::shared_ptr< MJIProgress >;
      using MJIRankPtr = std::shared_ptr< MJIRank >;
      using MJIRecipePtr = std::shared_ptr< MJIRecipe >;
@@ -10408,7 +10599,9 @@ struct ZoneSharedGroup
      using QuestDerivedClassPtr = std::shared_ptr< QuestDerivedClass >;
      using QuestEffectPtr = std::shared_ptr< QuestEffect >;
      using QuestEffectDefinePtr = std::shared_ptr< QuestEffectDefine >;
+     using QuestEventAreaEntranceInfoPtr = std::shared_ptr< QuestEventAreaEntranceInfo >;
      using QuestLinkMarkerPtr = std::shared_ptr< QuestLinkMarker >;
+     using QuestLinkMarkerIconPtr = std::shared_ptr< QuestLinkMarkerIcon >;
      using QuestLinkMarkerSetPtr = std::shared_ptr< QuestLinkMarkerSet >;
      using QuestRedoPtr = std::shared_ptr< QuestRedo >;
      using QuestRedoChapterUIPtr = std::shared_ptr< QuestRedoChapterUI >;
@@ -10504,6 +10697,9 @@ struct ZoneSharedGroup
      using TofuEditParamPtr = std::shared_ptr< TofuEditParam >;
      using TofuObjectPtr = std::shared_ptr< TofuObject >;
      using TofuObjectCategoryPtr = std::shared_ptr< TofuObjectCategory >;
+     using TofuPresetPtr = std::shared_ptr< TofuPreset >;
+     using TofuPresetCategoryPtr = std::shared_ptr< TofuPresetCategory >;
+     using TofuPresetObjectPtr = std::shared_ptr< TofuPresetObject >;
      using TomestonesPtr = std::shared_ptr< Tomestones >;
      using TomestonesItemPtr = std::shared_ptr< TomestonesItem >;
      using TopicSelectPtr = std::shared_ptr< TopicSelect >;
@@ -10618,6 +10814,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_AOZBossIdList;
      std::set< uint32_t > m_AOZContentIdList;
      std::set< uint32_t > m_AOZContentBriefingBNpcIdList;
+     std::set< uint32_t > m_AOZContentBriefingObjectIdList;
      std::set< uint32_t > m_AOZReportIdList;
      std::set< uint32_t > m_AOZScoreIdList;
      std::set< uint32_t > m_AquariumFishIdList;
@@ -10753,6 +10950,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CreditListIdList;
      std::set< uint32_t > m_CreditListTextIdList;
      std::set< uint32_t > m_CustomTalkIdList;
+     std::set< uint32_t > m_CustomTalkDefineClientIdList;
      std::set< uint32_t > m_CustomTalkNestHandlersIdList;
      std::set< uint32_t > m_CutsceneIdList;
      std::set< uint32_t > m_CutSceneIncompQuestIdList;
@@ -10820,6 +11018,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_EventActionIdList;
      std::set< uint32_t > m_EventCustomIconTypeIdList;
      std::set< uint32_t > m_EventIconPriorityIdList;
+     std::set< uint32_t > m_EventIconPriorityPairIdList;
      std::set< uint32_t > m_EventIconTypeIdList;
      std::set< uint32_t > m_EventItemIdList;
      std::set< uint32_t > m_EventItemCastTimelineIdList;
@@ -10854,6 +11053,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_FestivalIdList;
      std::set< uint32_t > m_FieldMarkerIdList;
      std::set< uint32_t > m_FishingBaitParameterIdList;
+     std::set< uint32_t > m_FishingNoteInfoIdList;
      std::set< uint32_t > m_FishingRecordTypeIdList;
      std::set< uint32_t > m_FishingRecordTypeTransientIdList;
      std::set< uint32_t > m_FishingSpotIdList;
@@ -11030,6 +11230,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MacroIconRedirectOldIdList;
      std::set< uint32_t > m_MainCommandIdList;
      std::set< uint32_t > m_MainCommandCategoryIdList;
+     std::set< uint32_t > m_MandervilleWeaponEnhanceIdList;
      std::set< uint32_t > m_ManeuversArmorIdList;
      std::set< uint32_t > m_MapIdList;
      std::set< uint32_t > m_MapConditionIdList;
@@ -11049,6 +11250,13 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_McGuffinIdList;
      std::set< uint32_t > m_McGuffinUIDataIdList;
      std::set< uint32_t > m_MiniGameRAIdList;
+     std::set< uint32_t > m_MiniGameTurnBreakActionIdList;
+     std::set< uint32_t > m_MiniGameTurnBreakConstIdList;
+     std::set< uint32_t > m_MiniGameTurnBreakEnemyIdList;
+     std::set< uint32_t > m_MiniGameTurnBreakPopIdList;
+     std::set< uint32_t > m_MiniGameTurnBreakPopOffsetIdList;
+     std::set< uint32_t > m_MiniGameTurnBreakStageIdList;
+     std::set< uint32_t > m_MiniGameTurnBreakStatusIdList;
      std::set< uint32_t > m_MinionRaceIdList;
      std::set< uint32_t > m_MinionRulesIdList;
      std::set< uint32_t > m_MinionSkillTypeIdList;
@@ -11067,6 +11275,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MJIDisposalShopUICategoryIdList;
      std::set< uint32_t > m_MJIFarmPastureRankIdList;
      std::set< uint32_t > m_MJIFunctionIdList;
+     std::set< uint32_t > m_MJIGardenscapingIdList;
      std::set< uint32_t > m_MJIGatheringIdList;
      std::set< uint32_t > m_MJIGatheringItemIdList;
      std::set< uint32_t > m_MJIGatheringObjectIdList;
@@ -11079,6 +11288,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MJILandmarkPlaceIdList;
      std::set< uint32_t > m_MJILivelyActorIdList;
      std::set< uint32_t > m_MJIMinionPopAreasIdList;
+     std::set< uint32_t > m_MJINameIdList;
      std::set< uint32_t > m_MJIProgressIdList;
      std::set< uint32_t > m_MJIRankIdList;
      std::set< uint32_t > m_MJIRecipeIdList;
@@ -11180,7 +11390,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_QuestDerivedClassIdList;
      std::set< uint32_t > m_QuestEffectIdList;
      std::set< uint32_t > m_QuestEffectDefineIdList;
+     std::set< uint32_t > m_QuestEventAreaEntranceInfoIdList;
      std::set< uint32_t > m_QuestLinkMarkerIdList;
+     std::set< uint32_t > m_QuestLinkMarkerIconIdList;
      std::set< uint32_t > m_QuestLinkMarkerSetIdList;
      std::set< uint32_t > m_QuestRedoIdList;
      std::set< uint32_t > m_QuestRedoChapterUIIdList;
@@ -11276,6 +11488,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_TofuEditParamIdList;
      std::set< uint32_t > m_TofuObjectIdList;
      std::set< uint32_t > m_TofuObjectCategoryIdList;
+     std::set< uint32_t > m_TofuPresetIdList;
+     std::set< uint32_t > m_TofuPresetCategoryIdList;
+     std::set< uint32_t > m_TofuPresetObjectIdList;
      std::set< uint32_t > m_TomestonesIdList;
      std::set< uint32_t > m_TomestonesItemIdList;
      std::set< uint32_t > m_TopicSelectIdList;
@@ -11660,6 +11875,12 @@ const std::set< uint32_t >& getAOZContentBriefingBNpcIdList()
       loadIdList( m_AOZContentBriefingBNpcDat, m_AOZContentBriefingBNpcIdList );
    return m_AOZContentBriefingBNpcIdList;
 }
+const std::set< uint32_t >& getAOZContentBriefingObjectIdList()
+{
+   if( m_AOZContentBriefingObjectIdList.size() == 0 )
+      loadIdList( m_AOZContentBriefingObjectDat, m_AOZContentBriefingObjectIdList );
+   return m_AOZContentBriefingObjectIdList;
+}
 const std::set< uint32_t >& getAOZReportIdList()
 {
    if( m_AOZReportIdList.size() == 0 )
@@ -12470,6 +12691,12 @@ const std::set< uint32_t >& getCustomTalkIdList()
       loadIdList( m_CustomTalkDat, m_CustomTalkIdList );
    return m_CustomTalkIdList;
 }
+const std::set< uint32_t >& getCustomTalkDefineClientIdList()
+{
+   if( m_CustomTalkDefineClientIdList.size() == 0 )
+      loadIdList( m_CustomTalkDefineClientDat, m_CustomTalkDefineClientIdList );
+   return m_CustomTalkDefineClientIdList;
+}
 const std::set< uint32_t >& getCustomTalkNestHandlersIdList()
 {
    if( m_CustomTalkNestHandlersIdList.size() == 0 )
@@ -12872,6 +13099,12 @@ const std::set< uint32_t >& getEventIconPriorityIdList()
       loadIdList( m_EventIconPriorityDat, m_EventIconPriorityIdList );
    return m_EventIconPriorityIdList;
 }
+const std::set< uint32_t >& getEventIconPriorityPairIdList()
+{
+   if( m_EventIconPriorityPairIdList.size() == 0 )
+      loadIdList( m_EventIconPriorityPairDat, m_EventIconPriorityPairIdList );
+   return m_EventIconPriorityPairIdList;
+}
 const std::set< uint32_t >& getEventIconTypeIdList()
 {
    if( m_EventIconTypeIdList.size() == 0 )
@@ -13076,6 +13309,12 @@ const std::set< uint32_t >& getFishingBaitParameterIdList()
       loadIdList( m_FishingBaitParameterDat, m_FishingBaitParameterIdList );
    return m_FishingBaitParameterIdList;
 }
+const std::set< uint32_t >& getFishingNoteInfoIdList()
+{
+   if( m_FishingNoteInfoIdList.size() == 0 )
+      loadIdList( m_FishingNoteInfoDat, m_FishingNoteInfoIdList );
+   return m_FishingNoteInfoIdList;
+}
 const std::set< uint32_t >& getFishingRecordTypeIdList()
 {
    if( m_FishingRecordTypeIdList.size() == 0 )
@@ -14132,6 +14371,12 @@ const std::set< uint32_t >& getMainCommandCategoryIdList()
       loadIdList( m_MainCommandCategoryDat, m_MainCommandCategoryIdList );
    return m_MainCommandCategoryIdList;
 }
+const std::set< uint32_t >& getMandervilleWeaponEnhanceIdList()
+{
+   if( m_MandervilleWeaponEnhanceIdList.size() == 0 )
+      loadIdList( m_MandervilleWeaponEnhanceDat, m_MandervilleWeaponEnhanceIdList );
+   return m_MandervilleWeaponEnhanceIdList;
+}
 const std::set< uint32_t >& getManeuversArmorIdList()
 {
    if( m_ManeuversArmorIdList.size() == 0 )
@@ -14246,6 +14491,48 @@ const std::set< uint32_t >& getMiniGameRAIdList()
       loadIdList( m_MiniGameRADat, m_MiniGameRAIdList );
    return m_MiniGameRAIdList;
 }
+const std::set< uint32_t >& getMiniGameTurnBreakActionIdList()
+{
+   if( m_MiniGameTurnBreakActionIdList.size() == 0 )
+      loadIdList( m_MiniGameTurnBreakActionDat, m_MiniGameTurnBreakActionIdList );
+   return m_MiniGameTurnBreakActionIdList;
+}
+const std::set< uint32_t >& getMiniGameTurnBreakConstIdList()
+{
+   if( m_MiniGameTurnBreakConstIdList.size() == 0 )
+      loadIdList( m_MiniGameTurnBreakConstDat, m_MiniGameTurnBreakConstIdList );
+   return m_MiniGameTurnBreakConstIdList;
+}
+const std::set< uint32_t >& getMiniGameTurnBreakEnemyIdList()
+{
+   if( m_MiniGameTurnBreakEnemyIdList.size() == 0 )
+      loadIdList( m_MiniGameTurnBreakEnemyDat, m_MiniGameTurnBreakEnemyIdList );
+   return m_MiniGameTurnBreakEnemyIdList;
+}
+const std::set< uint32_t >& getMiniGameTurnBreakPopIdList()
+{
+   if( m_MiniGameTurnBreakPopIdList.size() == 0 )
+      loadIdList( m_MiniGameTurnBreakPopDat, m_MiniGameTurnBreakPopIdList );
+   return m_MiniGameTurnBreakPopIdList;
+}
+const std::set< uint32_t >& getMiniGameTurnBreakPopOffsetIdList()
+{
+   if( m_MiniGameTurnBreakPopOffsetIdList.size() == 0 )
+      loadIdList( m_MiniGameTurnBreakPopOffsetDat, m_MiniGameTurnBreakPopOffsetIdList );
+   return m_MiniGameTurnBreakPopOffsetIdList;
+}
+const std::set< uint32_t >& getMiniGameTurnBreakStageIdList()
+{
+   if( m_MiniGameTurnBreakStageIdList.size() == 0 )
+      loadIdList( m_MiniGameTurnBreakStageDat, m_MiniGameTurnBreakStageIdList );
+   return m_MiniGameTurnBreakStageIdList;
+}
+const std::set< uint32_t >& getMiniGameTurnBreakStatusIdList()
+{
+   if( m_MiniGameTurnBreakStatusIdList.size() == 0 )
+      loadIdList( m_MiniGameTurnBreakStatusDat, m_MiniGameTurnBreakStatusIdList );
+   return m_MiniGameTurnBreakStatusIdList;
+}
 const std::set< uint32_t >& getMinionRaceIdList()
 {
    if( m_MinionRaceIdList.size() == 0 )
@@ -14354,6 +14641,12 @@ const std::set< uint32_t >& getMJIFunctionIdList()
       loadIdList( m_MJIFunctionDat, m_MJIFunctionIdList );
    return m_MJIFunctionIdList;
 }
+const std::set< uint32_t >& getMJIGardenscapingIdList()
+{
+   if( m_MJIGardenscapingIdList.size() == 0 )
+      loadIdList( m_MJIGardenscapingDat, m_MJIGardenscapingIdList );
+   return m_MJIGardenscapingIdList;
+}
 const std::set< uint32_t >& getMJIGatheringIdList()
 {
    if( m_MJIGatheringIdList.size() == 0 )
@@ -14426,6 +14719,12 @@ const std::set< uint32_t >& getMJIMinionPopAreasIdList()
       loadIdList( m_MJIMinionPopAreasDat, m_MJIMinionPopAreasIdList );
    return m_MJIMinionPopAreasIdList;
 }
+const std::set< uint32_t >& getMJINameIdList()
+{
+   if( m_MJINameIdList.size() == 0 )
+      loadIdList( m_MJINameDat, m_MJINameIdList );
+   return m_MJINameIdList;
+}
 const std::set< uint32_t >& getMJIProgressIdList()
 {
    if( m_MJIProgressIdList.size() == 0 )
@@ -15032,12 +15331,24 @@ const std::set< uint32_t >& getQuestEffectDefineIdList()
       loadIdList( m_QuestEffectDefineDat, m_QuestEffectDefineIdList );
    return m_QuestEffectDefineIdList;
 }
+const std::set< uint32_t >& getQuestEventAreaEntranceInfoIdList()
+{
+   if( m_QuestEventAreaEntranceInfoIdList.size() == 0 )
+      loadIdList( m_QuestEventAreaEntranceInfoDat, m_QuestEventAreaEntranceInfoIdList );
+   return m_QuestEventAreaEntranceInfoIdList;
+}
 const std::set< uint32_t >& getQuestLinkMarkerIdList()
 {
    if( m_QuestLinkMarkerIdList.size() == 0 )
       loadIdList( m_QuestLinkMarkerDat, m_QuestLinkMarkerIdList );
    return m_QuestLinkMarkerIdList;
 }
+const std::set< uint32_t >& getQuestLinkMarkerIconIdList()
+{
+   if( m_QuestLinkMarkerIconIdList.size() == 0 )
+      loadIdList( m_QuestLinkMarkerIconDat, m_QuestLinkMarkerIconIdList );
+   return m_QuestLinkMarkerIconIdList;
+}
 const std::set< uint32_t >& getQuestLinkMarkerSetIdList()
 {
    if( m_QuestLinkMarkerSetIdList.size() == 0 )
@@ -15608,6 +15919,24 @@ const std::set< uint32_t >& getTofuObjectCategoryIdList()
       loadIdList( m_TofuObjectCategoryDat, m_TofuObjectCategoryIdList );
    return m_TofuObjectCategoryIdList;
 }
+const std::set< uint32_t >& getTofuPresetIdList()
+{
+   if( m_TofuPresetIdList.size() == 0 )
+      loadIdList( m_TofuPresetDat, m_TofuPresetIdList );
+   return m_TofuPresetIdList;
+}
+const std::set< uint32_t >& getTofuPresetCategoryIdList()
+{
+   if( m_TofuPresetCategoryIdList.size() == 0 )
+      loadIdList( m_TofuPresetCategoryDat, m_TofuPresetCategoryIdList );
+   return m_TofuPresetCategoryIdList;
+}
+const std::set< uint32_t >& getTofuPresetObjectIdList()
+{
+   if( m_TofuPresetObjectIdList.size() == 0 )
+      loadIdList( m_TofuPresetObjectDat, m_TofuPresetObjectIdList );
+   return m_TofuPresetObjectIdList;
+}
 const std::set< uint32_t >& getTomestonesIdList()
 {
    if( m_TomestonesIdList.size() == 0 )
diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp
index 72af848a..e209793d 100644
--- a/src/tools/exd_common_gen/main.cpp
+++ b/src/tools/exd_common_gen/main.cpp
@@ -132,7 +132,7 @@ int main( int argc, char** argv )
   result += generateEnum( "GuardianDeity", 0, "uint8_t" );
   result += generateEnum( "ItemUICategory", 0, "uint8_t" );
   result += generateEnum( "ItemSearchCategory", 0, "uint8_t" );
-  result += generateEnum( "OnlineStatus", 3, "uint8_t" );
+  result += generateEnum( "OnlineStatus", 6, "uint8_t" );
   result += generateEnum( "Race", 1, "uint8_t" );
   result += generateEnum( "Tribe", 0, "uint8_t" );
   result += generateEnum( "Town", 0, "uint8_t" );