diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h
index c93a77ea..5ccefb40 100644
--- a/src/common/CommonGen.h
+++ b/src/common/CommonGen.h
@@ -475,30 +475,32 @@ enum class OnlineStatus : uint8_t
   Offline = 10,
   Busy = 11,
   PvP = 12,
-  ViewingCutscene = 13,
-  UsingaChocoboPorter = 14,
-  AwayfromKeyboard = 15,
-  LookingforRepairs = 16,
-  LookingtoRepair = 17,
-  LookingtoMeldMateria = 18,
-  LookingforParty = 19,
-  //Missing = 20
-  WaitingforDutyFinder = 21,
-  RecruitingPartyMembers = 22,
-  AllianceLeader = 23,
-  AlliancePartyLeader = 24,
-  AlliancePartyMember = 25,
-  PartyLeader = 26,
-  PartyMember = 27,
-  AnotherWorld = 28,
-  SharingDuty = 29,
-  SimilarDuty = 30,
-  InDuty = 31,
-  TrialAdventurer = 32,
-  NewAdventurer = 33,
-  FreeCompany = 34,
-  GrandCompany = 35,
-  Online = 36,
+  PlayingTripleTriad = 13,
+  ViewingCutscene = 14,
+  UsingaChocoboPorter = 15,
+  AwayfromKeyboard = 16,
+  LookingforRepairs = 17,
+  LookingtoRepair = 18,
+  LookingtoMeldMateria = 19,
+  LookingforParty = 20,
+  //Missing = 21
+  WaitingforDutyFinder = 22,
+  RecruitingPartyMembers = 23,
+  NewAdventurer = 24,
+  AllianceLeader = 25,
+  AlliancePartyLeader = 26,
+  AlliancePartyMember = 27,
+  PartyLeader = 28,
+  PartyMember = 29,
+  AnotherWorld = 30,
+  SharingDuty = 31,
+  SimilarDuty = 32,
+  InDuty = 33,
+  TrialAdventurer = 34,
+
+  FreeCompany = 35,
+  GrandCompany = 36,
+  Online = 37,
 };
 
 ///////////////////////////////////////////////////////////
@@ -512,8 +514,6 @@ enum class Race : uint8_t
   Miqote = 4,
   Roegadyn = 5,
   AuRa = 6,
-  Hrothgar = 7,
-  Viera = 8,
 };
 
 ///////////////////////////////////////////////////////////
@@ -548,8 +548,6 @@ enum class Town : uint8_t
   Gridania = 2,
   Uldah = 3,
   Ishgard = 4,
-  Kugane = 7,
-  TheCrystarium = 10,
 };
 
 ///////////////////////////////////////////////////////////
@@ -612,81 +610,6 @@ enum class Weather : uint8_t
   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,
-  FairSkies10 = 101,
-  Scarlet = 102,
-  Scarlet1 = 103,
-  Scarlet2 = 104,
-  FairSkies11 = 105,
-  FairSkies12 = 106,
-  FairSkies13 = 107,
-  FairSkies14 = 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,
-  Termination4 = 131,
 };
 
 ///////////////////////////////////////////////////////////