diff --git a/resources/data/constants.yml b/resources/data/constants.yml
index 7a05ddd9..7e275be0 100644
--- a/resources/data/constants.yml
+++ b/resources/data/constants.yml
@@ -8,7 +8,7 @@ BASE_INVENTORY_ACTION: 211
 BEAST_TRIBE_ARRAY_SIZE: 20
 BEGINNER_TRAINING_ARRAY_SIZE: 4
 BUDDY_EQUIP_BITMASK_SIZE: 13
-CAUGHT_FISH_BITMASK_SIZE: 190
+CAUGHT_FISH_BITMASK_SIZE: 191
 CAUGHT_SPEARFISH_BITMASK_SIZE: 38
 CHOCOBO_TAXI_STANDS_BITMASK_SIZE: 12
 CLASSJOB_ARRAY_SIZE: 35
@@ -17,7 +17,7 @@ COMPLETED_LEVEQUEST_BITMASK_SIZE: 226
 COMPLETED_QUEST_BITMASK_SIZE: 751
 COMPLETED_RECIPES_BITMASK_SIZE: 801
 CRYSTALLINE_CONFLICT_ARRAY_SIZE: 3
-CUTSCENE_SEEN_BITMASK_SIZE: 180
+CUTSCENE_SEEN_BITMASK_SIZE: 183
 DUNGEON_ARRAY_SIZE: 18
 FRAMERS_KIT_BITMASK_SIZE: 33
 FRONTLINE_ARRAY_SIZE: 2
@@ -27,22 +27,22 @@ GRIDANIA_POS_START: 2213211
 GUILDHEST_ARRAY_SIZE: 10
 LIMSA_POS_START: 4101800
 LOBBY_GAME_VERSION: 7500
-MAIL_DELETE_RESULT: 431
-MAIL_SEND_RESULT: 769
-MAIL_TAKE_ATTACHMENTS_RESULT: 912
+MAIL_DELETE_RESULT: 318
+MAIL_SEND_RESULT: 321
+MAIL_TAKE_ATTACHMENTS_RESULT: 825
 MASKED_CARNIVALE_ARRAY_SIZE: 4
 MINION_BITMASK_SIZE: 75
 MISC_CONTENT_ARRAY_SIZE: 4
 MOUNT_BITMASK_SIZE: 45
-OBFUSCATION_ENABLED_MODE: 72
+OBFUSCATION_ENABLED_MODE: 24
 OBFUSCATION_TABLE_MAX:
-- 86
-- 72
-- 152
+- 75
+- 41
+- 117
 OBFUSCATION_TABLE_RADIXES:
-- 119
-- 119
-- 104
+- 88
+- 120
+- 131
 ORCHESTRION_ROLL_BITMASK_SIZE: 112
 ORNAMENT_BITMASK_SIZE: 8
 RAID_ARRAY_SIZE: 28
diff --git a/resources/data/scrambler/daytable.bin b/resources/data/scrambler/daytable.bin
index a18c2686..e92d10a5 100644
Binary files a/resources/data/scrambler/daytable.bin and b/resources/data/scrambler/daytable.bin differ
diff --git a/resources/data/scrambler/midtable.bin b/resources/data/scrambler/midtable.bin
index a8867610..59e404ad 100644
Binary files a/resources/data/scrambler/midtable.bin and b/resources/data/scrambler/midtable.bin differ
diff --git a/resources/data/scrambler/opcodekeytable.bin b/resources/data/scrambler/opcodekeytable.bin
index 6398787f..9c7362cd 100644
Binary files a/resources/data/scrambler/opcodekeytable.bin and b/resources/data/scrambler/opcodekeytable.bin differ
diff --git a/resources/data/scrambler/table0.bin b/resources/data/scrambler/table0.bin
index edd850b0..1fad20c3 100644
Binary files a/resources/data/scrambler/table0.bin and b/resources/data/scrambler/table0.bin differ
diff --git a/resources/data/scrambler/table1.bin b/resources/data/scrambler/table1.bin
index 0dd5028b..30b6e123 100644
Binary files a/resources/data/scrambler/table1.bin and b/resources/data/scrambler/table1.bin differ
diff --git a/resources/data/scrambler/table2.bin b/resources/data/scrambler/table2.bin
index 6ea7eb10..9fdb1b66 100644
Binary files a/resources/data/scrambler/table2.bin and b/resources/data/scrambler/table2.bin differ