diff --git a/src/devtools/game-data/maps/AgataForest.yml b/src/devtools/game-data/maps/AgataForest.yml
index 9c3990c..feb9ece 100644
--- a/src/devtools/game-data/maps/AgataForest.yml
+++ b/src/devtools/game-data/maps/AgataForest.yml
@@ -1,123 +1,124 @@
-# Map: AgataForest
-
-worldStateBits:
-  1: "Have Water Lily, Will Travel quest ended"
-  2: "Sapling of Agata Forest quest started"
-  3: "Restored sapling; Sapling of Agata Forest ended"
-  4: "Triggered hut dialogue"
-  8: "Crack to sapling blown up"
-  10: "Area restored"
-  11: "Divine instrument tutorial triggered"
-  12: "Waka cutscene triggered"
-  14: "Interacted with giant bud"
-  15: "Dungeon entrance cutscene triggered"
-  16: "Dungeon entrance opened"
-  17: "Sleepy bear gave praise for giant seed"
-  18: "Sleepy bear now standing on giant seed"
-  19: "Sleepy bear gave praise for giant cabbage"
-  20: "Sleepy bear now standing on giant cabbage"
-  21: "Sleepy bear now standing on giant hive (completed)"
-  22: "Cursed grass behind Hitoshio Spring rejuvenated"
-  23: "Rejuvenated cursed grass by forest hut"
-  24: "Kokari stole ruins key"
-  26: "Spoke with Kokari while he's got ruins key"
-  27: "Ume is rescued"
-  28: "Log minigame started"
-  29: "Log bridge placed; A Son's Determination ended"
-  31: "Spoke with Kushi before filling barrel"
-  32: "Started filling Kushi's sake barrel"
-  33: "Kushi's Distress quest ended"
-  34: "Canine Tracker appeared"
-  35: "Ume's Lost Again ended; Ume the Meal started"
-  39: "Triggered guide for Crescent tutorial (failed twice)"
-  40: "Failed crescent tutorial"
-  41: "Ume the Meal ended"
-  42: "Ume reappeared"
-  43: "Ume is able to be fought"
-  44: "Defeated Ume"
-  45: "Transitioned after defeating Ume"
-  47: "Crack on dungeon side cliff blown up"
-  48: "Spoke with Karude intro 1"
-  49: "Spoke with Karude intro 2; Hard Working Son started"
-  50: "Spoke with Karude post-rescue 1"
-  51: "Spoke with Karude post-Taka Pass rejuvenation"
-  52: "Spoke with Karude post-Kusa"
-  55: "Spoke with Kokari first time"
-  56: "Spoke with Kokari second time; The Lost Key started; Ume is Lost started"
-  57: "Spoke with Kokari third time"
-  58: "Spoke with Kokari at night"
-  59: "Bashed Kokari while crying"
-  63: "Ruins key spawns; The Lost Key ended"
-  64: "Spoke with Kokari post-log minigame"
-  65: "Spoke with Kokari post-Taka Pass rejuvenation"
-  66: "End fishing without catching any fish"
-  67: "Ume's Lost Again started"
-  68: "Spoke with Kokari directly before Whopper fishing"
-  71: "Spoke with Susano first time"
-  72: "Kushi's Distress quest started"
-  73: "Susano has no more food"
-  75: "Spoke with merchant"
-  77: "Spoke with Kiba"
-  78: "Spoke with Kiba 2"
-  81: "Spoke with Kushi 2nd time before filling up barrel"
-  82: "Spoke with Kushi 3rd time before filling up barrel"
-  83: "Spoke with Kushi while trying to lift barrel"
-  86: "Interacted with sleepy bear first time"
-  87: "Interacted with sapling"
-  88: "Interacted with dungeon entrance first time"
-  90: "Interacted with rapids first time"
-
-collectedObjects:
-  0: "Bulb on giant rock island sapling side (Holy Bone S)"
-  1: "Bulb on northwstern most island (Glass Beads)"
-  2: "Bulb on giant rock island other side (Lacquerware Set)"
-  3: "Bulb on island closest to waterfall (Steel Fist Sake)"
-  4: "Bulb by forest hut closer (Wooden Bear)"
-  5: "Bulb by forest hut further (Exorcism Slip S)"
-  6: "Bulb by waterfall (Inkfinity Stone)"
-  7: "Bulb by fortune cave entrance (Traveler's Charm)"
-  8: "Bulb on middle island (Coral Fragment)"
-  9: "Clover at Hitoshio Spring hard digging spot"
-  10: "Bulb at grass behind Hitoshio Spring waterfall (Incense Burner)"
-  11: "Sapling chest (Devout Beads)"
-  12: "Buried chest on dungeon side cliff (Stray Bead)"
-  13: "Cave fire chest left (Bull Horn)"
-  14: "Cave fire chest middle (Stray Bead)"
-  15: "Cave fire chest right (Holy Bone M)"
-  16: "Chest at Hitoshio Spring vine (Stray Bead)"
-  17: "Vine to tree above island by waterfall (Stray Bead)"
-  18: "Vine to tree above rock island (Bull Horn)"
-  19: "Chest above spout in cave (Lacquerware Set)"
-  20: "Clover behind sapling"
-  21: "Buried chest right of ramp outside fortune cave (Dragonfly Bead)"
-  22: "Buried chest behind forest hut (Stray Bead)"
-  23: "Buried chest on middle island (Steel Soul Sake)"
-  24: "Iron rock by rapids destroyed"
-  25: "Clover under iron rock by rapids"
-  26: "Clover under diamond rock in cave"
-  27: "Diamond rock in cave destroyed"
-  28: "Clover in dungeon side cliff cave"
-  29: "Buried chest under leaf pile on entrance ramp (Exorcism Slip M)"
-  30: "Buried chest under leaves by upper Shinshu exit (Pearl)"
-  31: "Buried chest under leaves by Taka Pass exit (Holy Bone M)"
-  32: "Buried chest in hard ground in front of Tsuta Ruins (Bull Statue)"
-  33: "Chest by Taka Pass exit ([Ink Bullet Tips])"
-  35: "Chest by Kiba ([Battle Tips])"
-  36: "Chest at dungeon entrance ([Enhancing Weapons])"
-
-areasRestored:
-  16: "Cursed grass behind Hitoshio Spring waterfall"
-  17: "Cursed grass by forest hut"
-  18: "Hell gate in front of dungeon"
-  19: "Hell gate area near waterfall (releases nut)"
-  31: "Main area"
-
-fightsCleared:
-  0: "Gate in front of dungeon"
-  8: "Gate near waterfall"
-  11: "Canine Warrior Ume"
-
-npcs:
-  0: "Karude"
-  1: "Kokari"
-  4: "Kushi"
+# Map: AgataForest
+
+worldStateBits:
+  1: "Have Water Lily, Will Travel quest ended"
+  2: "Sapling of Agata Forest quest started"
+  3: "Restored sapling; Sapling of Agata Forest ended"
+  4: "Triggered hut dialogue"
+  8: "Crack to sapling blown up"
+  10: "Area restored"
+  11: "Divine instrument tutorial triggered"
+  12: "Waka cutscene triggered"
+  14: "Interacted with giant bud"
+  15: "Dungeon entrance cutscene triggered"
+  16: "Dungeon entrance opened"
+  17: "Sleepy bear gave praise for giant seed"
+  18: "Sleepy bear now standing on giant seed"
+  19: "Sleepy bear gave praise for giant cabbage"
+  20: "Sleepy bear now standing on giant cabbage"
+  21: "Sleepy bear now standing on giant hive (completed)"
+  22: "Cursed grass behind Hitoshio Spring rejuvenated"
+  23: "Rejuvenated cursed grass by forest hut"
+  24: "Kokari stole ruins key"
+  26: "Spoke with Kokari while he's got ruins key"
+  27: "Ume is rescued"
+  28: "Log minigame started"
+  29: "Log bridge placed; A Son's Determination ended"
+  31: "Spoke with Kushi before filling barrel"
+  32: "Started filling Kushi's sake barrel"
+  33: "Kushi's Distress quest ended"
+  34: "Canine Tracker appeared"
+  35: "Ume's Lost Again ended; Ume the Meal started"
+  38: "Cleared Crescent constellation minigame"
+  39: "Triggered guide for Crescent tutorial (failed twice)"
+  40: "Failed crescent tutorial"
+  41: "Ume the Meal ended"
+  42: "Ume reappeared"
+  43: "Ume is able to be fought"
+  44: "Defeated Ume"
+  45: "Transitioned after defeating Ume"
+  47: "Crack on dungeon side cliff blown up"
+  48: "Spoke with Karude intro 1"
+  49: "Spoke with Karude intro 2; Hard Working Son started"
+  50: "Spoke with Karude post-rescue 1"
+  51: "Spoke with Karude post-Taka Pass rejuvenation"
+  52: "Spoke with Karude post-Kusa"
+  55: "Spoke with Kokari first time"
+  56: "Spoke with Kokari second time; The Lost Key started; Ume is Lost started"
+  57: "Spoke with Kokari third time"
+  58: "Spoke with Kokari at night"
+  59: "Bashed Kokari while crying"
+  63: "Ruins key spawns; The Lost Key ended"
+  64: "Spoke with Kokari post-log minigame"
+  65: "Spoke with Kokari post-Taka Pass rejuvenation"
+  66: "End fishing without catching any fish"
+  67: "Ume's Lost Again started"
+  68: "Spoke with Kokari directly before Whopper fishing"
+  71: "Spoke with Susano first time"
+  72: "Kushi's Distress quest started"
+  73: "Susano has no more food"
+  75: "Spoke with merchant"
+  77: "Spoke with Kiba"
+  78: "Spoke with Kiba 2"
+  81: "Spoke with Kushi 2nd time before filling up barrel"
+  82: "Spoke with Kushi 3rd time before filling up barrel"
+  83: "Spoke with Kushi while trying to lift barrel"
+  86: "Interacted with sleepy bear first time"
+  87: "Interacted with sapling"
+  88: "Interacted with dungeon entrance first time"
+  90: "Interacted with rapids first time"
+
+collectedObjects:
+  0: "Bulb on giant rock island sapling side (Holy Bone S)"
+  1: "Bulb on northwstern most island (Glass Beads)"
+  2: "Bulb on giant rock island other side (Lacquerware Set)"
+  3: "Bulb on island closest to waterfall (Steel Fist Sake)"
+  4: "Bulb by forest hut closer (Wooden Bear)"
+  5: "Bulb by forest hut further (Exorcism Slip S)"
+  6: "Bulb by waterfall (Inkfinity Stone)"
+  7: "Bulb by fortune cave entrance (Traveler's Charm)"
+  8: "Bulb on middle island (Coral Fragment)"
+  9: "Clover at Hitoshio Spring hard digging spot"
+  10: "Bulb at grass behind Hitoshio Spring waterfall (Incense Burner)"
+  11: "Sapling chest (Devout Beads)"
+  12: "Buried chest on dungeon side cliff (Stray Bead)"
+  13: "Cave fire chest left (Bull Horn)"
+  14: "Cave fire chest middle (Stray Bead)"
+  15: "Cave fire chest right (Holy Bone M)"
+  16: "Chest at Hitoshio Spring vine (Stray Bead)"
+  17: "Vine to tree above island by waterfall (Stray Bead)"
+  18: "Vine to tree above rock island (Bull Horn)"
+  19: "Chest above spout in cave (Lacquerware Set)"
+  20: "Clover behind sapling"
+  21: "Buried chest right of ramp outside fortune cave (Dragonfly Bead)"
+  22: "Buried chest behind forest hut (Stray Bead)"
+  23: "Buried chest on middle island (Steel Soul Sake)"
+  24: "Iron rock by rapids destroyed"
+  25: "Clover under iron rock by rapids"
+  26: "Clover under diamond rock in cave"
+  27: "Diamond rock in cave destroyed"
+  28: "Clover in dungeon side cliff cave"
+  29: "Buried chest under leaf pile on entrance ramp (Exorcism Slip M)"
+  30: "Buried chest under leaves by upper Shinshu exit (Pearl)"
+  31: "Buried chest under leaves by Taka Pass exit (Holy Bone M)"
+  32: "Buried chest in hard ground in front of Tsuta Ruins (Bull Statue)"
+  33: "Chest by Taka Pass exit ([Ink Bullet Tips])"
+  35: "Chest by Kiba ([Battle Tips])"
+  36: "Chest at dungeon entrance ([Enhancing Weapons])"
+
+areasRestored:
+  16: "Cursed grass behind Hitoshio Spring waterfall"
+  17: "Cursed grass by forest hut"
+  18: "Hell gate in front of dungeon"
+  19: "Hell gate area near waterfall (releases nut)"
+  31: "Main area"
+
+fightsCleared:
+  0: "Gate in front of dungeon"
+  8: "Gate near waterfall"
+  11: "Canine Warrior Ume"
+
+npcs:
+  0: "Karude"
+  1: "Kokari"
+  4: "Kushi"
diff --git a/src/devtools/game-data/maps/CalcifiedCavern.yml b/src/devtools/game-data/maps/CalcifiedCavern.yml
index 68fda32..64dca15 100644
--- a/src/devtools/game-data/maps/CalcifiedCavern.yml
+++ b/src/devtools/game-data/maps/CalcifiedCavern.yml
@@ -1,27 +1,28 @@
-# Map: CalcifiedCavern
-
-worldStateBits:
-  1: "Collected Mask"
-  2: "Picked up Thunder Brew"
-  3: "Door into Moon Cave unlocked"
-  4: "First Cavern camera pan"
-  5: "Spawned Mask chest"
-  6: "Approached Imp guards with mask"
-  7: "Spoke to Imps guarding door first time"
-  8: "Rejected first Mask design"
-  9: "Finished first Mask design"
-  10: "Drawing on Mask"
-  12: "Started Black Imp Demon Gate fight"
-  13: "Imps started giving random vegetables (end of new dialogue)"
-  15: "Black Imp intro cutscene triggered"
-
-collectedObjects:
-  0: "Chest after Black Imp Demon Gate (Mask)"
-  1: "Chest on path to Mask (Holy Bone S)"
-
-areasRestored:
-  16: "Mask chest area"
-
-fightsCleared:
-  0: "Started Black Imp Demon Gate fight"
-  1: "Cleared Black Imp Demon Gate fight"
+# Map: CalcifiedCavern
+
+worldStateBits:
+  1: "Collected Mask"
+  2: "Picked up Thunder Brew"
+  3: "Door into Moon Cave unlocked"
+  4: "First Cavern camera pan"
+  5: "Spawned Mask chest"
+  6: "Approached Imp guards with mask"
+  7: "Spoke to Imps guarding door first time"
+  8: "Rejected first Mask design"
+  9: "Finished first Mask design"
+  10: "Drawing on Mask"
+  11: "Started Black Imp Demon Gate fight"
+  12: "Started Black Imp Demon Gate fight"
+  13: "Imps started giving random vegetables (end of new dialogue)"
+  15: "Black Imp intro cutscene triggered"
+
+collectedObjects:
+  0: "Chest after Black Imp Demon Gate (Mask)"
+  1: "Chest on path to Mask (Holy Bone S)"
+
+areasRestored:
+  16: "Mask chest area"
+
+fightsCleared:
+  0: "Started Black Imp Demon Gate fight"
+  1: "Cleared Black Imp Demon Gate fight"
diff --git a/src/devtools/game-data/maps/CityCheckpoint.yml b/src/devtools/game-data/maps/CityCheckpoint.yml
index 594be97..c3fd7ee 100644
--- a/src/devtools/game-data/maps/CityCheckpoint.yml
+++ b/src/devtools/game-data/maps/CityCheckpoint.yml
@@ -1,33 +1,42 @@
-# Map: CityCheckpoint
-
-worldStateBits:
-  1: "Bringing Down the Bridge ended"
-  2: "Speak to Merchant first time"
-  7: "Speak to Soldier second time (pre-Moon Cave)"
-  8: "Speak to Yoichi first time"
-  9: "Speak to Yoichi second time"
-  10: "Speak to Mrs. Pine first time"
-  12: "Speak to Tea Customer first time"
-  27: "Read sign in front of Big Drawbridge"
-  28: "Read sign in front of Big Drawbridge"
-  35: "Speak to Soldier first time"
-  36: "Speak to Yoichi first time (pre-Moon Cave)"
-  42: "City Checkpoint quest ended"
-  43: "Bringing Down the Bridge quest started"
-
-collectedObjects:
-  0: "Clover near furthest downstream cliffs"
-  3: "Clover in cave behind waterfall"
-  4: "Chest behind Merchant (Bull Horns)"
-  5: "Chest under wooden ramp [Mother Tree]"
-  6: "Buried chest near furthest downstream cliffs (Stray Bead)"
-  7: "Buried chest downstream of waterfall (Exorcism Slip S)"
-  10: "Chest on fire near waterfall (Stray Bead)"
-
-treesBloomed:
-  0: "Next to Mrs Pine's tea shop"
-
-npcs:
-  1: "Tea Customer"
-  3: "Soldier"
-  4: "Yoichi"
+# Map: CityCheckpoint
+
+worldStateBits:
+  1: "Bringing Down the Bridge ended"
+  2: "Speak to Merchant first time"
+  6: "Speak to Soldier first time"
+  7: "Speak to Soldier second time (pre-Moon Cave)"
+  8: "Speak to Yoichi first time"
+  9: "Speak to Yoichi second time"
+  10: "Speak to Mrs. Pine first time"
+  12: "Speak to Tea Customer first time"
+  27: "Read sign in front of Big Drawbridge"
+  28: "Read sign in front of Big Drawbridge"
+  35: "Speak to Soldier first time"
+  36: "Speak to Yoichi first time (pre-Moon Cave)"
+  42: "City Checkpoint quest ended"
+  43: "Bringing Down the Bridge quest started"
+
+collectedObjects:
+  0: "Clover near furthest downstream cliffs"
+  3: "Clover in cave behind waterfall"
+  4: "Chest behind Merchant (Bull Horns)"
+  5: "Chest under wooden ramp [Mother Tree]"
+  6: "Buried chest near furthest downstream cliffs (Stray Bead)"
+  7: "Buried chest downstream of waterfall (Exorcism Slip S)"
+  10: "Chest on fire near waterfall (Stray Bead)"
+
+areasRestored:
+  16: "Cursed Grass inside cannon remnants"
+  17: "Cursed Grass by big gear"
+  19: "Cursed Grass directly right of bridge"
+  20: "Cursed Grass further right of bridge"
+  22: "Both 16 and 17 restored"
+  23: "Both 19 and 20 restored"
+
+treesBloomed:
+  0: "Next to Mrs Pine's tea shop"
+
+npcs:
+  1: "Tea Customer"
+  3: "Soldier"
+  4: "Yoichi"
diff --git a/src/devtools/game-data/maps/ImperialPalaceAmmySize.yml b/src/devtools/game-data/maps/ImperialPalaceAmmySize.yml
index 14220a7..48d1c10 100644
--- a/src/devtools/game-data/maps/ImperialPalaceAmmySize.yml
+++ b/src/devtools/game-data/maps/ImperialPalaceAmmySize.yml
@@ -1,6 +1,8 @@
-# Map: ImperialPalaceAmmySize
-
-worldStateBits:
-  4: "Kaguya's Lament ended"
-  9: "A Tiny Problem ended"
-  13: "A Suspicious Emperor started"
+# Map: ImperialPalaceAmmySize
+
+worldStateBits:
+  4: "Kaguya's Lament ended"
+  9: "A Tiny Problem ended"
+  13: "A Suspicious Emperor started"
+  15: "Obtained Mist Warp"
+  16: "Obtained Mist Warp"
\ No newline at end of file
diff --git a/src/devtools/game-data/maps/ImperialPalaceBlightArena.yml b/src/devtools/game-data/maps/ImperialPalaceBlightArena.yml
index 4b3314d..3e380f5 100644
--- a/src/devtools/game-data/maps/ImperialPalaceBlightArena.yml
+++ b/src/devtools/game-data/maps/ImperialPalaceBlightArena.yml
@@ -1,4 +1,5 @@
-# Map: ImperialPalaceBlightArena
-
-worldStateBits:
-  2: "A Suspicious Emperor quest ended"
+# Map: ImperialPalaceBlightArena
+
+worldStateBits:
+  1: "Started cutscene introducing Blight"
+  2: "A Suspicious Emperor quest ended"
diff --git a/src/devtools/game-data/maps/ImperialPalaceIssunSize.yml b/src/devtools/game-data/maps/ImperialPalaceIssunSize.yml
index c2d1f43..e664550 100644
--- a/src/devtools/game-data/maps/ImperialPalaceIssunSize.yml
+++ b/src/devtools/game-data/maps/ImperialPalaceIssunSize.yml
@@ -1,4 +1,70 @@
-# Map: ImperialPalaceIssunSize
-
-worldStateBits:
-  19: "Kaguya's Lament quest started"
+# Map: ImperialPalaceIssunSize
+
+worldStateBits:
+  1: "Entered for the first time"
+  2: "Started Issun (x1000) tutorial"
+  3: "Completely finished tutorial"
+  4: "Finished Issun (x1000) tutorial"
+  5: "Finished Issun (x1000) tutorial"
+  6: "Failed Issun (x1000) tutorial (unsets itself)"
+  7: "Failed Issun (x1000) tutorial (unsets itself)"
+  10: "Guide visible"
+  11: "Finished Issun (x1000) tutorial"
+  12: "Footstep approached (Issun starts speaking)"
+  13: "Camera pan to Blocking Spider"
+  14: "Noticed Kaguya"
+  15: "Finished speaking to Kaguya"
+  19: "Kaguya's Lament quest started"
+  21: "Entered underground area"
+  22: "Entered Veil of Mist room"
+  23: "Blocking Spider blocking exit of Veil of Mist room"
+  24: "Cut Veil of Mist flask down"
+  25: "Cut Veil of Mist flask down"
+  26: "Cutscene inside Veil of Mist flask triggered"
+  27: "Galestorm used in Veil of Mist flask"
+  31: "Veil of Mist constellation active"
+  32: "Veil of Mist constellation active"
+  33: "Veil of Mist constellation completed"
+  34: "Veil of Mist constellation completed"
+  35: "Veil of Mist tutorial active"
+  36: "Veil of Mist tutorial active"
+  37: "Veil of Mist tutorial completed"
+  38: "Post-Veil of Mist tutorial completed dialogue"
+  39: "Spoke to Kaguya after learning Veil of Mist"
+  40: "Entered Emperor's room"
+  44: "Footstep approached"
+  45: "Footstep approached"
+  48: "Mound of dirt exploded"
+  51: "Wall to Veil of Mist jar exploded"
+  52: "Lockjaw at beginning of area defeated"
+  53: "Veil of Mist silhouette active"
+  54: "Veil of Mist constellation guide active"
+  55: "Veil of Mist constellation completed"
+  56: "Veil of Mist guide active"
+  57: "Veil of Mist guide inactive"
+  58: "Finished Issun (x1000) tutorial"
+  59: "Finished Issun (x1000) tutorial"
+  60: "Triggered fight outside of Veil of Mist room"
+  64: "Jumped on foot"
+  65: "Jumped on foot dialogue ended"
+  67: "Thunder Mirror cutscene started"
+  68: "Approached swirling mist tornado on Emperor's rafters"
+  69: "Galestorm used in Veil of Mist flask"
+  70: "Galestorm used in Veil of Mist flask"
+  71: "Galestorm used in Veil of Mist flask"
+  72: "Veil of Mist tutorial failed"
+
+collectedObjects:
+  0: "Issun (x1000) tutorial chest (Holy Bone S)"
+  1: "Chest behind Cherry Bomb wall in big foot room (Exorcism Slip S)"
+  2: "Clover at beginning of underground area"
+  3: "Clover past red and yellow spiders in underground area"
+  4: "Clover after mushrooms in underground area"
+  5: "Chest in Emperor's rafters on side path (Imperial Palace Map)"
+  6: "Issun chest in Emperor's rafters on side path (Exorcism Slip M)"
+  7: "Issun chest in Emperor's rafters (Vengeance Slip)"
+  8: "Chest behind Cherry Bomb wall with Exorcism Key in front (Golden Peach)"
+  9: "Issun chest behind spiderweb in underground area"
+  10: "Normal chest near Kaguya (Traveler's Charm)"
+  14: "Issun chest near Kaguya (Godly Charm)"
+  15: "Issun chest underneath Shishi odori (Inkfinity Stone)"
diff --git a/src/devtools/game-data/maps/MoonCaveInterior.yml b/src/devtools/game-data/maps/MoonCaveInterior.yml
index 6159510..6dcd122 100644
--- a/src/devtools/game-data/maps/MoonCaveInterior.yml
+++ b/src/devtools/game-data/maps/MoonCaveInterior.yml
@@ -1,141 +1,143 @@
-# Map: MoonCaveInterior
-
-worldStateBits:
-  1: "Interior intro camera pan"
-  2: "Orochi's Appetizer quest started"
-  3: "Amiji rescued"
-  4: "Defeat first Lockjaw"
-  5: "Slashed first eyeball lock"
-  6: "Door to Ogre Liver opened"
-  7: "Spawned Ogre Liver chest"
-  8: "Fragile bridge broke"
-  9: "Fragile bridge primed to break"
-  10: "Defeated Demon Gate in bamboo switch area"
-  11: "Water level lowered"
-  12: "Defeated Black Imp under elevator"
-  13: "Power Slashed eyeball under elevator"
-  14: "Opened floor under elevator"
-  15: "Power Slash all eyes leading to Inferno"
-  17: "Completed Inferno constellation"
-  19: "Defeat second Lockjaw"
-  18: "Issun text after Inferno"
-  19: "Open door to Inferno"
-  20: "Orochi roars post-Eyeball of Fire"
-  21: "Slashed eyeball in sand room"
-  22: "Wind started first time to make bridge"
-  23: "Stone ball torches turned on"
-  24: "Blew up wall with cannon"
-  25: "Blew up wall with cannon"
-  26: "Orochi's Appetizer quest ended"
-  28: "Orochi's appetizer completed"
-  29: "Rung bell before appetizer is ready"
-  30: "Started ringing bell after appetizer is ready"
-  31: "Rung bell 8 times after appetizer is ready"
-  32: "Started bringing appetizer to Orochi cutscene"
-  33: "Appetizer rising up elevator"
-  34: "Too scared to go see Orochi"
-  50: "Elevator being raised"
-  54: "Spawned Eyeball of Fire chest"
-  55: "Lips of Ice chest spawned"
-  56: "Black Demon Horn chest spawned"
-  57: "Obtained Ogre Liver"
-  58: "Obtained Lips of Ice"
-  59: "Obtained Eyeball of Fire"
-  60: "Obtained Black Demon Horn"
-  61: "Able to give an ingredient to Amiji"
-  64: "Sand room stone ball checkpoint #1 (before wind bridge)"
-  65: "Sand room stone ball checkpoint #2 (after wind bridge)"
-  66: "Defeated Ice Lips for Inferno"
-  69: "Started Moegami cutscene"
-  70: "Failed Inferno tutorial"
-  71: "Cleared Inferno tutorial"
-  73: "Kitchen intro camera pan cutscene"
-  74: "First Waterspout cutscene deactivated"
-  75: "Showing basement eyes cutscene"
-  77: "2nd floor main room camera pan cutscene"
-  81: "Rejuvinate broken bridge"
-  82: "Started Fire Eye cutscene"
-  83: "Started Fire Eye fight"
-  84: "Galestorm sand bridge first time"
-  85: "Spoke to Amiji (unset after leaving room)"
-  86: "Spoke to Amiji with no ingredients (unset after leaving room)"
-  87: "Spoke to Amiji with Ogre Liver"
-  90: "Spoke to Imp near Calcified Cavern door first time"
-  91: "Spoke to bell guard Imp first time"
-  92: "Spoke to bell guard Imp after finishing Orochi's apprtizer"
-  93: "Spoke to Imp operating elevator first time"
-  94: "Spoke to elevator Imp after lowering water level"
-  95: "Spoke to Imp at bottom of elevator shaft"
-  97: "Spoke to post-Inferno elevator Imp first time"
-  98: "Spoke to Imp in pit with bamboo switch"
-  99: "Spoke to Merchant first time"
-  100: "Spoke to Imp chef before rescuing Amiji"
-  101: "Spoke to Imp chef after rescuing Amiji"
-  102: "Spoke to Imp chef after finding all ingredients"
-  103: "Blew up wall past Inferno"
-  104: "Blew up wall in pit of sand room"
-  105: "Bombed crack in wall at mid-point of vine flower room"
-  106: "Used Power Slash on elevator Imp first time"
-  107: "Watching Demon Scroll appear after ringing bell early"
-  109: "Issun text coming back to broken bridge"
-  110: "Used Power Slash on elevator Imp first time"
-
-collectedObjects:
-  0: "Chest past Vine Flower path (Ogre Liver)"
-  1: "Chest after Demon Gate past cannon-blasted hallway (Black Demon Horn)"
-  2: "Chest after Demon Gate past ice wall in kitchen (Lips of Ice)"
-  3: "Chest after Demon Gate past fragile bridge room (Eyeball of Fire)"
-  4: "Chest past bomb wall in post-Inferno room (Inkfinity Stone)"
-  5: "Chest on 2nd level of main room (Crystal)"
-  6: "Clover in main room post-Lips of Ice"
-  7: "Frozen chest in main area post-Black Demon Horn (Golden Peach)"
-  8: "Chest in main room post-Eyeball of Fire (Kutani Pottery)"
-  9: "Chest at end of sand room (Dungeon Map)"
-  10: "Bulb behind wall crack in Vine Flower room (Vengance Slip)"
-  11: "Chest above Amiji (Exorcism Slip M)"
-  12: "Frozen chest next to Merchant (Incense Burner)"
-  13: "Chest in bamboo switch room (Exorcism Slip S)"
-  16: "Chest in pit of sand room (Pearl)"
-  17: "Frozen chest in middle of far room past fragile bridge (Exorcism Slip L)"
-  18: "Frozen chest on right in far room past fragile bridge (Bull Horn)"
-  19: "Frozen chest on left in far room past fragile bridge (Steel Fist Sake)"
-  21: "Frozen chest on upper platform in cannon-broken "
-  22: "Clover on ledge in beginning of sand room"
-  23: "Clover near pits past wind bridge"
-
-areasRestored:
-  17: "Restored pond in bamboo switch area"
-  18: "Eyeball of Fire chest"
-  19: "Lips of Ice chest"
-  20: "Black Demon Horn chest"
-
-fightsCleared:
-  0: "Ice Lips in Inferno room"
-  1: "Demon Gate for Ogre Liver chest"
-  2: "Demon Gate in bamboo switch area"
-  3: "Started Fire Eye fight"
-  4: "Black Imp in room below elevator"
-  5: "Demon Gate for Lips of Ice chest"
-  6: "Demon Gate for Black Demon Horn chest"
-  7: "Imps before Inferno room"
-  8: "Black Imp past cannon-blasted wall"
-  10: "Cleared Fire Eye fight"
-
-mapsExplored:
-  2: "Amiji's Kitchen"
-  3: "Vine Flower room"
-  4: "Treasure room behind crack in Vine Flower room"
-  5: "Past first eyeball lock"
-  7: "Fragile bridge room"
-  8: "Basement area"
-  9: "Inferno room"
-  10: "Post-Inferno room"
-  11: "Post-Inferno room past bomb wall"
-  12: "Past ice wall in kitchen"
-  13: "Past ice in fragile bridge room"
-  15: "Sand room"
-  17: "Behind broken 4F wall"
-  18: "Demon Gate room in Black Demon Horn hallway"
-
-npcs:
-  2: "Imp (Epicurean Bell guard)"
+# Map: MoonCaveInterior
+
+worldStateBits:
+  1: "Interior intro camera pan"
+  2: "Orochi's Appetizer quest started"
+  3: "Amiji rescued"
+  4: "Defeat first Lockjaw"
+  5: "Slashed first eyeball lock"
+  6: "Door to Ogre Liver opened"
+  7: "Spawned Ogre Liver chest"
+  8: "Fragile bridge broke"
+  9: "Fragile bridge primed to break"
+  10: "Defeated Demon Gate in bamboo switch area"
+  11: "Water level lowered"
+  12: "Defeated Black Imp under elevator"
+  13: "Power Slashed eyeball under elevator"
+  14: "Opened floor under elevator"
+  15: "Power Slash all eyes leading to Inferno"
+  17: "Completed Inferno constellation"
+  19: "Defeat second Lockjaw"
+  18: "Issun text after Inferno"
+  19: "Open door to Inferno"
+  20: "Orochi roars post-Eyeball of Fire"
+  21: "Slashed eyeball in sand room"
+  22: "Wind started first time to make bridge"
+  23: "Stone ball torches turned on"
+  24: "Blew up wall with cannon"
+  25: "Blew up wall with cannon"
+  26: "Orochi's Appetizer quest ended"
+  28: "Orochi's appetizer completed"
+  29: "Rung bell before appetizer is ready"
+  30: "Started ringing bell after appetizer is ready"
+  31: "Rung bell 8 times after appetizer is ready"
+  32: "Started bringing appetizer to Orochi cutscene"
+  33: "Appetizer rising up elevator"
+  34: "Too scared to go see Orochi"
+  50: "Elevator being raised"
+  54: "Spawned Eyeball of Fire chest"
+  55: "Lips of Ice chest spawned"
+  56: "Black Demon Horn chest spawned"
+  57: "Obtained Ogre Liver"
+  58: "Obtained Lips of Ice"
+  59: "Obtained Eyeball of Fire"
+  60: "Obtained Black Demon Horn"
+  61: "Able to give an ingredient to Amiji"
+  64: "Sand room stone ball checkpoint #1 (before wind bridge)"
+  65: "Sand room stone ball checkpoint #2 (after wind bridge)"
+  66: "Defeated Ice Lips for Inferno"
+  69: "Started Moegami cutscene"
+  70: "Failed Inferno tutorial"
+  71: "Cleared Inferno tutorial"
+  73: "Kitchen intro camera pan cutscene"
+  74: "First Waterspout cutscene deactivated"
+  75: "Showing basement eyes cutscene"
+  76: "Showing Konohana Blossom cutscene"
+  77: "2nd floor main room camera pan cutscene"
+  81: "Rejuvinate broken bridge"
+  82: "Started Fire Eye cutscene"
+  83: "Started Fire Eye fight"
+  84: "Galestorm sand bridge first time"
+  85: "Spoke to Amiji (unset after leaving room)"
+  86: "Spoke to Amiji with no ingredients (unset after leaving room)"
+  87: "Spoke to Amiji with Ogre Liver"
+  90: "Spoke to Imp near Calcified Cavern door first time"
+  91: "Spoke to bell guard Imp first time"
+  92: "Spoke to bell guard Imp after finishing Orochi's apprtizer"
+  93: "Spoke to Imp operating elevator first time"
+  94: "Spoke to elevator Imp after lowering water level"
+  95: "Spoke to Imp at bottom of elevator shaft"
+  97: "Spoke to post-Inferno elevator Imp first time"
+  98: "Spoke to Imp in pit with bamboo switch"
+  99: "Spoke to Merchant first time"
+  100: "Spoke to Imp chef before rescuing Amiji"
+  101: "Spoke to Imp chef after rescuing Amiji"
+  102: "Spoke to Imp chef after finding all ingredients"
+  103: "Blew up wall past Inferno"
+  104: "Blew up wall in pit of sand room"
+  105: "Bombed crack in wall at mid-point of vine flower room"
+  106: "Used Power Slash on elevator Imp first time"
+  107: "Watching Demon Scroll appear after ringing bell early"
+  109: "Issun text coming back to broken bridge"
+  110: "Used Power Slash on elevator Imp first time"
+
+collectedObjects:
+  0: "Chest past Vine Flower path (Ogre Liver)"
+  1: "Chest after Demon Gate past cannon-blasted hallway (Black Demon Horn)"
+  2: "Chest after Demon Gate past ice wall in kitchen (Lips of Ice)"
+  3: "Chest after Demon Gate past fragile bridge room (Eyeball of Fire)"
+  4: "Chest past bomb wall in post-Inferno room (Inkfinity Stone)"
+  5: "Chest on 2nd level of main room (Crystal)"
+  6: "Clover in main room post-Lips of Ice"
+  7: "Frozen chest in main area post-Black Demon Horn (Golden Peach)"
+  8: "Chest in main room post-Eyeball of Fire (Kutani Pottery)"
+  9: "Chest at end of sand room (Dungeon Map)"
+  10: "Bulb behind wall crack in Vine Flower room (Vengance Slip)"
+  11: "Chest above Amiji (Exorcism Slip M)"
+  12: "Frozen chest next to Merchant (Incense Burner)"
+  13: "Chest in bamboo switch room (Exorcism Slip S)"
+  16: "Chest in pit of sand room (Pearl)"
+  17: "Frozen chest in middle of far room past fragile bridge (Exorcism Slip L)"
+  18: "Frozen chest on right in far room past fragile bridge (Bull Horn)"
+  19: "Frozen chest on left in far room past fragile bridge (Steel Fist Sake)"
+  20: "Frozen chest on small ledge in far room past fragile bridge (Holy Bone S)"
+  21: "Frozen chest on upper platform in cannon-broken "
+  22: "Clover on ledge in beginning of sand room"
+  23: "Clover near pits past wind bridge"
+
+areasRestored:
+  17: "Restored pond in bamboo switch area"
+  18: "Eyeball of Fire chest"
+  19: "Lips of Ice chest"
+  20: "Black Demon Horn chest"
+
+fightsCleared:
+  0: "Ice Lips in Inferno room"
+  1: "Demon Gate for Ogre Liver chest"
+  2: "Demon Gate in bamboo switch area"
+  3: "Started Fire Eye fight"
+  4: "Black Imp in room below elevator"
+  5: "Demon Gate for Lips of Ice chest"
+  6: "Demon Gate for Black Demon Horn chest"
+  7: "Imps before Inferno room"
+  8: "Black Imp past cannon-blasted wall"
+  10: "Cleared Fire Eye fight"
+
+mapsExplored:
+  2: "Amiji's Kitchen"
+  3: "Vine Flower room"
+  4: "Treasure room behind crack in Vine Flower room"
+  5: "Past first eyeball lock"
+  7: "Fragile bridge room"
+  8: "Basement area"
+  9: "Inferno room"
+  10: "Post-Inferno room"
+  11: "Post-Inferno room past bomb wall"
+  12: "Past ice wall in kitchen"
+  13: "Past ice in fragile bridge room"
+  15: "Sand room"
+  17: "Behind broken 4F wall"
+  18: "Demon Gate room in Black Demon Horn hallway"
+
+npcs:
+  2: "Imp (Epicurean Bell guard)"
diff --git a/src/devtools/game-data/maps/MoonCaveStaircaseandOrochiArena.yml b/src/devtools/game-data/maps/MoonCaveStaircaseandOrochiArena.yml
index 21627e9..2196b00 100644
--- a/src/devtools/game-data/maps/MoonCaveStaircaseandOrochiArena.yml
+++ b/src/devtools/game-data/maps/MoonCaveStaircaseandOrochiArena.yml
@@ -1,27 +1,28 @@
-# Map: MoonCaveEntrance
-
-worldStateBits:
-  2: "Started Orochi battle"
-  3: "Started Orochi battle"
-  4: "Triggered Orochi intro cutscene"
-  5: "Started Orochi battle for real"
-  6: "Triggered Susano entrance cutscene"
-  7: "Defeated phase 2"
-  9: "Being scolded by Issun for trying to leave"
-  11: "Scolded by Issun for trying to leave 1st time"
-  12: "Issun talking about pit (unflips when not talking, flips for good after pep talk)"
-  13: "Got closer to pit (can trigger turn-around pep talk)"
-  16: "Moon power for Susano cutscene"
-  17: "Drew moon for Susano"
-  32: "Started Orochi battle"
-  64: "Orochi roaring demonstration"
-  65: "First head drunk"
-  67: "Orochi's body drunk cutscene"
-  68: "First head wasted"
-  70: "Spoke to Merchant first time"
-
-areasRestored:
-  31: "Entered first time/Restored from Dark head's cursed zone"
-
-mapsExplored:
-  20: "Staircase/Entrance"
+# Map: MoonCaveEntrance
+
+worldStateBits:
+  2: "Started Orochi battle"
+  3: "Started Orochi battle"
+  4: "Triggered Orochi intro cutscene"
+  5: "Started Orochi battle for real"
+  6: "Triggered Susano entrance cutscene"
+  7: "Defeated phase 2"
+  9: "Being scolded by Issun for trying to leave"
+  10: "Orochi vulnerable"
+  11: "Scolded by Issun for trying to leave 1st time"
+  12: "Issun talking about pit (unflips when not talking, flips for good after pep talk)"
+  13: "Got closer to pit (can trigger turn-around pep talk)"
+  16: "Moon power for Susano cutscene"
+  17: "Drew moon for Susano"
+  32: "Started Orochi battle"
+  64: "Orochi roaring demonstration"
+  65: "First head drunk"
+  67: "Orochi's body drunk cutscene"
+  68: "First head wasted"
+  70: "Spoke to Merchant first time"
+
+areasRestored:
+  31: "Entered first time/Restored from Dark head's cursed zone"
+
+mapsExplored:
+  20: "Staircase/Entrance"
diff --git a/src/devtools/game-data/maps/RyoshimaCoast.yml b/src/devtools/game-data/maps/RyoshimaCoast.yml
index d92d48f..ca21bdd 100644
--- a/src/devtools/game-data/maps/RyoshimaCoast.yml
+++ b/src/devtools/game-data/maps/RyoshimaCoast.yml
@@ -1,58 +1,70 @@
-# Map: RyoshimaCoast
-
-worldStateBits:
-  2: "First entrance dialogue"
-  3: "Sapling bloomed"
-  4: "Triggered Headless Guardian fight"
-  5: "Crack to water cave in cursed Ryoshima bombed"
-  6: "Water cave second pond filled"
-  7: "Water cave third pond filled"
-  8: "Sapling pond filled"
-  9: "Triggered sapling view cutscene"
-  10: "Sapling grown"
-  11: "Triggered restoring right tri-cursed grass"
-  12: "Triggered restoring left tri-cursed grass"
-  13: "Triggered restoring middle tri-cursed grass"
-  15: "Post-restoration"
-  16: "Post-restoration"
-  18: "Triggered Ubume fight"
-  20: "Inaba returned to Animal Lover (Stray Bead)"
-  33: "Lookout tower climb attempt"
-  35: "Lookout tower climb attempt"
-  49: "Bad Feeling Confirmed ended"
-  53: "Spoke with Animal Lover first time"
-  55: "Spoke with large soldier at N Ryo gate"
-  59: "Spoke with skinny soldier at N Ryo gate"
-  70: "Spoke with merchant"
-  73: "Hard ground to Bandit Spider arena broken"
-
-collectedObjects:
-  1: "Clover in front of Madame Fawn's cave"
-  3: "Clover at lookout by sunken ship"
-  6: "Buried chest on dojo island hard ground (Stray Bead)"
-  12: "Clover by entrance to Seian hard ground"
-  19: "Chest on dojo island (Exorcism Slip S)"
-  20: "Chest at end of dock (Dragonfly Bead)"
-  21: "Clover right of dock shore"
-  22: "Buried chest at entrance to Seian (Crystal)"
-  23: "Chest outside entrance to Seian (Steel Fist Sake)"
-  38: "Clam in front of merchant (Holy Bone S)"
-  40: "Clam at outermost part of beach (Coral Fragment)"
-  41: "Clam between dock and outermost part (Traveler's Charm)"
-  42: "Clam left of dock shore (Dragonfly Bead)"
-  43: "Clam right of dock shore (Pearl)"
-  44: "Clam to right of lookout (Glass Beads)"
-  45: "Clam below lookout (Mermaid Coin)"
-
-areasRestored:
-  16: "Right tri-cursed grass"
-  17: "Left tri-cursed grass"
-  18: "Middle tri-cursed grass"
-  19: "Gate area just outside Seian exit"
-  20: "N Ryoshima exit mermaid pond"
-  31: "Ryoshima Coast"
-
-fightsCleared:
-  0: "Gate outside Seian exit"
-  1: "Gate by N Ryoshima exit"
-  18: "Ubume intro"
+# Map: RyoshimaCoast
+
+worldStateBits:
+  2: "First entrance dialogue"
+  3: "Sapling bloomed"
+  4: "Triggered Headless Guardian fight"
+  5: "Crack to water cave in cursed Ryoshima bombed"
+  6: "Water cave second pond filled"
+  7: "Water cave third pond filled"
+  8: "Sapling pond filled"
+  9: "Triggered sapling view cutscene"
+  10: "Sapling grown"
+  11: "Triggered restoring right tri-cursed grass"
+  12: "Triggered restoring left tri-cursed grass"
+  13: "Triggered restoring middle tri-cursed grass"
+  15: "Post-restoration"
+  16: "Post-restoration"
+  18: "Triggered Ubume fight"
+  20: "Inaba returned to Animal Lover (Stray Bead)"
+  33: "Lookout tower climb attempt"
+  35: "Lookout tower climb attempt"
+  36: "Lookout tower climbed"
+  37: "Issun dialogue after using Crescent"
+  38: "Sunken Ship accessible"
+  40: "Being chased by Water Dragon"
+  41: "Successfully made it to shore"
+  49: "Bad Feeling Confirmed ended"
+  53: "Spoke with Animal Lover first time"
+  54: "Spoke with Animal Lover after returning Inaba"
+  55: "Spoke with large soldier at N Ryo gate"
+  59: "Spoke with skinny soldier at N Ryo gate"
+  62: "Spoke with Fisherman first time"
+  63: "Spoke with Fisherman second time"
+  66: "Spoke to Onigiri Sensei"
+  68: "Onigiri Sensei ready to teach"
+  69: "Spoke to Priest"
+  70: "Spoke with merchant"
+  73: "Hard ground to Bandit Spider arena broken"
+
+collectedObjects:
+  1: "Clover in front of Madame Fawn's cave"
+  3: "Clover at lookout by sunken ship"
+  6: "Buried chest on dojo island hard ground (Stray Bead)"
+  12: "Clover by entrance to Seian hard ground"
+  18: "Chest on platform on dojo island (Crystal)"
+  19: "Chest on dojo island (Exorcism Slip S)"
+  20: "Chest at end of dock (Dragonfly Bead)"
+  21: "Clover right of dock shore"
+  22: "Buried chest at entrance to Seian (Crystal)"
+  23: "Chest outside entrance to Seian (Steel Fist Sake)"
+  38: "Clam in front of merchant (Holy Bone S)"
+  40: "Clam at outermost part of beach (Coral Fragment)"
+  41: "Clam between dock and outermost part (Traveler's Charm)"
+  42: "Clam left of dock shore (Dragonfly Bead)"
+  43: "Clam right of dock shore (Pearl)"
+  44: "Clam to right of lookout (Glass Beads)"
+  45: "Clam below lookout (Mermaid Coin)"
+
+areasRestored:
+  16: "Right tri-cursed grass"
+  17: "Left tri-cursed grass"
+  18: "Middle tri-cursed grass"
+  19: "Gate area just outside Seian exit"
+  20: "N Ryoshima exit mermaid pond"
+  31: "Ryoshima Coast"
+
+fightsCleared:
+  0: "Gate outside Seian exit"
+  1: "Gate by N Ryoshima exit"
+  18: "Ubume intro"
diff --git a/src/devtools/game-data/maps/SasaSanctuary.yml b/src/devtools/game-data/maps/SasaSanctuary.yml
index 9a39263..657f218 100644
--- a/src/devtools/game-data/maps/SasaSanctuary.yml
+++ b/src/devtools/game-data/maps/SasaSanctuary.yml
@@ -1,79 +1,81 @@
-# Map: SasaSanctuary
-
-worldStateBits:
-  1: "Entry dialogue trigger"
-  4: "Waterspout constellation appeared"
-  5: "Kaguya's Memories ended"
-  6: "Finished second part of Waterspout tutorial"
-  8: "Finish first part of Waterspout tutorial"
-  9: "Spring No More ended"
-  11: "Entering first time cutscene"
-  12: "Rejection quest started"
-  13: "Chun returned home; gate opened"
-  14: "Reward for finding Chun cutscene started"
-  16: "Finished Waterspout constellation minigame"
-  17: "Blocked Path ended"
-  18: "Cut glowing bamboo with Take (far left)"
-  19: "Cut glowing bamboo with Take (middle left)"
-  20: "Cut glowing bamboo with Take (middle)"
-  21: "Cut glowing bamboo with Take (middle right)"
-  22: "Cut glowing bamboo with Take (far right)"
-  23: "Take left bamboo"
-  24: "Started Take fight"
-  25: "Defeated Take"
-  26: "Enter after defeating Crimson Helm"
-  27: "Nuregami intro cutscene"
-  28: "Waterspout tutorial ending cutscene"
-  30: "Patrons spawned in bath"
-  31: "Finished glowing bamboo cutscene"
-  32: "Cut wrong bamboo"
-  34: "Bamboo begins to glow"
-  35: "Blocked Path started"
-  36: "Mermaid coin stock added to shops"
-  38: "Spoke to Mr Bamboo during the day post-Crimson Helm"
-  39: "Spoke to Mr Bamboo at night post-Crimson Helm"
-  44: "Spoke to inside Bath Attendant first time"
-  45: "Talked to Tai first time (Canine tracker appears)"
-  47: "Talked to Tai after defeating Take"
-  48: "Refused to fight Take"
-  50: "Spoke to Tai after defeating Crimson Helm"
-  52: "Spoke to Head Servant first time"
-  53: "Spoke to blue hair pin Servant first time"
-  54: "Spoke to low double bun Servant first time"
-  55: "Spoke to yellow flower Servant first time"
-  56: "Spoke to high double buns Servant first time"
-  58: "Spoke to glasses Servant first time"
-  59: "Spoke to tiger Guest's room Servant first time"
-  60: "Spoke to Mistress first time"
-  61: "Spring No More started"
-  62: "Spoke to Bath Attendant outside 2nd time"
-  63: "Spoke to Bath Attendant after getting Waterspout"
-  64: "Spoke to large sparrow Bather first time"
-  65: "Spoke to tiger Guest first time"
-  66: "Spoke to Merchant first time"
-  68: "Talked to Take after defeating him"
-  69: "Spoke to Take after defeating Crimson Helm"
-  70: "Spoke to Take first time"
-
-collectedObjects:
-  0: "4th chest on the left in Jumba's room (Vase)"
-  1: "2nd chest on the left in Jumba's room (Dragonfly Beads)"
-  2: "5th chest on the right in Jumba's room (Coral Fragment)"
-  3: "3rd chest on the right in Jumba's room (Wooden Bear)"
-  4: "1st chest on the right in Jumba's room (Glass Beads)"
-  5: "4th chest on the right in Jumba's room (Holy Bone S)"
-  6: "2nd chest on the right in Jumba's room (Traveler's Charm)"
-  7: "5th chest on the left in Jumba's room (Exorcism Slip S)"
-  8: "3rd chest on the left in Jumba's room (Steel Fist Sake)"
-  9: "1st chest on the left in Jumba's room (Steel Soul Sake)"
-  10: "Clover on ledge above hot spring"
-  11: "Buried chest right outside Sanctuary (Stray Bead)"
-  12: "Buried chest in grass patch left of the hot spring (Lacquerware Set)"
-  13: "Buried chest up 2 sets of stairs in bamboo forest (Incense Burner)"
-  14: "Daruma doll in Merchant's room (Stray Bead)"
-  16: "Buried chest on right in rabbit clearing (Stray Bead)"
-  17: "Buried chest on left in rabbit clearing (Golden Peach)"
-
-npcs:
-  0: "Mr Bamboo"
-  5: "Bath Attendant"
+# Map: SasaSanctuary
+
+worldStateBits:
+  1: "Entry dialogue trigger"
+  4: "Waterspout constellation appeared"
+  5: "Kaguya's Memories ended"
+  6: "Finished second part of Waterspout tutorial"
+  8: "Finish first part of Waterspout tutorial"
+  9: "Spring No More ended"
+  11: "Entering first time cutscene"
+  12: "Rejection quest started"
+  13: "Chun returned home; gate opened"
+  14: "Reward for finding Chun cutscene started"
+  16: "Finished Waterspout constellation minigame"
+  17: "Blocked Path ended"
+  18: "Cut glowing bamboo with Take (far left)"
+  19: "Cut glowing bamboo with Take (middle left)"
+  20: "Cut glowing bamboo with Take (middle)"
+  21: "Cut glowing bamboo with Take (middle right)"
+  22: "Cut glowing bamboo with Take (far right)"
+  23: "Take left bamboo"
+  24: "Started Take fight"
+  25: "Defeated Take"
+  26: "Enter after defeating Crimson Helm"
+  27: "Nuregami intro cutscene"
+  28: "Waterspout tutorial ending cutscene"
+  30: "Patrons spawned in bath"
+  31: "Finished glowing bamboo cutscene"
+  32: "Cut wrong bamboo"
+  33: "Kaguya leaves"
+  34: "Bamboo begins to glow"
+  35: "Blocked Path started"
+  36: "Mermaid coin stock added to shops"
+  38: "Spoke to Mr Bamboo during the day post-Crimson Helm"
+  39: "Spoke to Mr Bamboo at night post-Crimson Helm"
+  41: "Started Mr Bamboo and Kaguya cutscene"
+  44: "Spoke to inside Bath Attendant first time"
+  45: "Talked to Tai first time (Canine tracker appears)"
+  47: "Talked to Tai after defeating Take"
+  48: "Refused to fight Take"
+  50: "Spoke to Tai after defeating Crimson Helm"
+  52: "Spoke to Head Servant first time"
+  53: "Spoke to blue hair pin Servant first time"
+  54: "Spoke to low double bun Servant first time"
+  55: "Spoke to yellow flower Servant first time"
+  56: "Spoke to high double buns Servant first time"
+  58: "Spoke to glasses Servant first time"
+  59: "Spoke to tiger Guest's room Servant first time"
+  60: "Spoke to Mistress first time"
+  61: "Spring No More started"
+  62: "Spoke to Bath Attendant outside 2nd time"
+  63: "Spoke to Bath Attendant after getting Waterspout"
+  64: "Spoke to large sparrow Bather first time"
+  65: "Spoke to tiger Guest first time"
+  66: "Spoke to Merchant first time"
+  68: "Talked to Take after defeating him"
+  69: "Spoke to Take after defeating Crimson Helm"
+  70: "Spoke to Take first time"
+
+collectedObjects:
+  0: "4th chest on the left in Jumba's room (Vase)"
+  1: "2nd chest on the left in Jumba's room (Dragonfly Beads)"
+  2: "5th chest on the right in Jumba's room (Coral Fragment)"
+  3: "3rd chest on the right in Jumba's room (Wooden Bear)"
+  4: "1st chest on the right in Jumba's room (Glass Beads)"
+  5: "4th chest on the right in Jumba's room (Holy Bone S)"
+  6: "2nd chest on the right in Jumba's room (Traveler's Charm)"
+  7: "5th chest on the left in Jumba's room (Exorcism Slip S)"
+  8: "3rd chest on the left in Jumba's room (Steel Fist Sake)"
+  9: "1st chest on the left in Jumba's room (Steel Soul Sake)"
+  10: "Clover on ledge above hot spring"
+  11: "Buried chest right outside Sanctuary (Stray Bead)"
+  12: "Buried chest in grass patch left of the hot spring (Lacquerware Set)"
+  13: "Buried chest up 2 sets of stairs in bamboo forest (Incense Burner)"
+  14: "Daruma doll in Merchant's room (Stray Bead)"
+  16: "Buried chest on right in rabbit clearing (Stray Bead)"
+  17: "Buried chest on left in rabbit clearing (Golden Peach)"
+
+npcs:
+  0: "Mr Bamboo"
+  5: "Bath Attendant"
diff --git a/src/devtools/game-data/maps/SeianCityAristocraticQtr.yml b/src/devtools/game-data/maps/SeianCityAristocraticQtr.yml
index 737a7df..86d3459 100644
--- a/src/devtools/game-data/maps/SeianCityAristocraticQtr.yml
+++ b/src/devtools/game-data/maps/SeianCityAristocraticQtr.yml
@@ -1,11 +1,56 @@
-# Map: SeianCityAristocraticQtr
-
-worldStateBits:
-  7: "Fishing for Trouble ended; Living Sword started"
-  9: "Living Sword ended"
-  30: "Watery Wants quest started"
-  31: "Watery Wants quest ended"
-  33: "Fishing for Trouble started"
-  40: "Wanted: Prayer Slips quest started"
-  43: "Wanted: Prayer Slips quest ended; Sunken Treasure quest started; Fox Rods started"
-  102: "Tight Security quest started"
+# Map: SeianCityAristocraticQtr
+
+worldStateBits:
+  1: "Sunken Treasure quest started(?)"
+  7: "Fishing for Trouble ended; Living Sword started"
+  9: "Living Sword ended"
+  10: "Bridge raised"
+  15: "Issun dialog on bridge before Waka"
+  16: "Returned Prayer Slips to Rao"
+  23: "Set before fishing minigame, unset after"
+  24: "Fishing minigame completed"
+  26: "Spoke to Kaguya second time"
+  27: "Spoke to Kaguya first time"
+  28: "Spoke to Kaguya second time"
+  30: "Watery Wants quest started"
+  31: "Watery Wants quest ended"
+  32: "Spoke to Benkai"
+  33: "Fishing for Trouble started"
+  36: "Spoke to Waka first time"
+  37: "Spoke to Waka second time"
+  38: "Spoke to Rao first time"
+  39: "Spoke to Rao second time"
+  40: "Wanted: Prayer Slips quest started"
+  41: "Listened to Rao"
+  42: "Agreed to help Rao"
+  43: "Wanted: Prayer Slips quest ended; Sunken Treasure quest started; Fox Rods started"
+  47: "Spoke to Rao after Wanted: Prayer Slips quest start"
+  48: "Returned Prayer Slips to Rao"
+  54: "Spoke to red-clothed man"
+  57: "Spoke to green-clothed man"
+  63: "Spoke to woman in house right of gate"
+  66: "Spoke to woman in house near Mermaid Spring"
+  70: "Spoke to man in house right of gate"
+  73: "Spoke to man in house near Mermaid Spring"
+  79: "Spoke to blue-clothed man"
+  82: "Spoke to yellow-clothed woman"
+  85: "Spoke to guard left of gate"
+  93: "Spoke to guard right of gate"
+  97: "Seen by guards outside of Himiko's Palace"
+  102: "Tight Security quest started"
+
+collectedObjects:
+  4: "Chest left of house near Mermaid Spring (Exorcism Slip S)
+  5: "Buried chest southright of house near Mermaid Spring (Crystal)"
+  13: "Chest right of Rao (Travel Scroll)"
+  14: "Chest left of Rao (Exorcism Slip M)"
+  15: "Buried chest directly east of Rao's house (Crystal)"
+  18: "Chest in house right of gate (Holy Bone S)"
+  19: "Clover across river of west waterwheel"
+  20: "Chest right of guardhouse (Steel Fist Sake)"
+  22: "Chest directly west of Rao's house (Inkfinity Stone)"
+  21: "Chest left of guardhouse (Crystal)"
+  23: "Buried chest near west waterwheel (Golden Peach)"
+  26: "Chest in house near Mermaid Spring (Steel Soul Sake)"
+  30: "Clover on furthest northwest point of map"
+  31: "Chest inside guardhouse (Pearl)"
\ No newline at end of file
diff --git a/src/devtools/game-data/maps/SeianCityCommonersQtr.yml b/src/devtools/game-data/maps/SeianCityCommonersQtr.yml
index 8559ebd..60ff3a7 100644
--- a/src/devtools/game-data/maps/SeianCityCommonersQtr.yml
+++ b/src/devtools/game-data/maps/SeianCityCommonersQtr.yml
@@ -1,9 +1,63 @@
-# Map: SeianCityCommonersQtr
-
-worldStateBits:
-  17: "Carpenter's Project ended"
-  26: "Kaguya's Memories started"
-  37: "A Tiny Problem started"
-  69: "To the Capital! quest ended; Capital Under Misty Siege started"
-  70: "Capital Under Misty Siege ended; Himiko, Queen of Nippon started"
-  113: "Carpenter's Project started"
+# Map: SeianCityCommonersQtr
+
+worldStateBits:
+  15: "Water reutned to canal"
+  16: "Spoke to Mr. Flower after blooming all trees"
+  17: "Carpenter's Project ended"
+  18: "Restored water to pond underneath Waka's Palace"
+  26: "Kaguya's Memories started"
+  27: "Completed Mr. Flower's Gura Shuffle"
+  29: "Completed Mr. Flower's Gura Shuffle"
+  37: "A Tiny Problem started"
+  38: "Gave Blossom the Herbal Medicine"
+  69: "To the Capital! quest ended; Capital Under Misty Siege started"
+  70: "Capital Under Misty Siege ended; Himiko, Queen of Nippon started"
+  75: "Spoke to Blossom's Papa inside the house"
+  76: "Spoke to Blossom's Papa outside the house"
+  78: "Spoke to woman near canal pier during green mist"
+  86: "Spoke to Mr. Flower, first time"
+  87: "Spoke to Mr. Flower, second time"
+  92: "Spoke to woman near ladder pier during green mist"
+  101: "Spoke to Naguri first time"
+  102: "Spoke to Naguri second time"
+  113: "Carpenter's Project started"
+  129: "Spoke to Tool Dealer during green mist"
+  130: "Spoke to Tool Dealer after green mist"
+  133: "Spoke to Weapon Dealer during green mist"
+  134: "Spoke to Weapon Dealer after green mist"
+  139: "Spoke to Masu during green mist"
+  140: "Spoke to Masu inside restaurant, first time"
+  142: "Spoke to Masu, obtained Masu's Monster Manifest"
+  145: "Spoke to Blossom"
+  150: "Spoke to Blossom after waking up Blossom's Papa"
+  155: "Spoke to Samurai Dandy during green mist"
+  156: "Spoke to Samurai Dandy after green mist, first time"
+  157: "Spoke to Samurai Dandy after green mist, second time"
+  158: "Spoke to man in front of bridge during green mist"
+  160: "Spoke to city dweller in restaurant"
+  167: "Spoke to Hayate during green mist"
+  173: "Spoke to wide guard left of gate during green mist"
+  176: "Spoke to skinny guard right of gate during green mist"
+  188: "Spoke to Soldier near Waterspout during green mist"
+  
+collectedObjects:
+  0: "Chest in canal (Incense Burner)"
+  2: "Chest in canal near Naguri (Exorcism Slip S)"
+  3: "Chest in canal (Mermaid Coin)"
+  4: "Chest in canal (Lacquerware Set)"
+  5: "Chest in canal (Bull Horn)"
+  6: "Chest in canal (Steel Fist Sake)"
+  7: "Chest in canal (Vengeance Slip)"
+  10: "Chest in canal (Steel Soul Sake)"
+  11: "Chest buried by triple grass (Exorcism Slip M)"
+  17: "Chest right of gate (Holy Bone S)
+  18: "Chest on upper left loft of storehouse (Glass Beads)"
+  19: "Left chest on storehouse floor (Holy Bone S)"
+  20: "Left chest on back loft of storehouse (Crystal)"
+  21: "Middle chest on back loft of storehouse (Exorcism Slip S)"
+  22: "Right chest on back loft of storehouse (Crystal)"
+  23: "Right chest on storehouse floor (Incense Burner)"
+  24: "Chest inside cage of storehouse (Sun Fragment)"
+  25: "Chest outside of cage of storehouse (Pearl)"
+  26: "Chest behind Kimono House (Traveler's Charm)"
+  28: "Buried chest back left of restaurant (Crystal)"
\ No newline at end of file
diff --git a/src/devtools/game-data/maps/SeianCityCommonersQtrKimonoShop.yml b/src/devtools/game-data/maps/SeianCityCommonersQtrKimonoShop.yml
index e69de29..feddb23 100644
--- a/src/devtools/game-data/maps/SeianCityCommonersQtrKimonoShop.yml
+++ b/src/devtools/game-data/maps/SeianCityCommonersQtrKimonoShop.yml
@@ -0,0 +1,2 @@
+collectedObjects:
+  0: "Buried chest right inside shop (Crystal)"
\ No newline at end of file
diff --git a/src/devtools/game-data/maps/SunkenShip.yml b/src/devtools/game-data/maps/SunkenShip.yml
index 73eb4b7..83d0e19 100644
--- a/src/devtools/game-data/maps/SunkenShip.yml
+++ b/src/devtools/game-data/maps/SunkenShip.yml
@@ -1,5 +1,55 @@
-# Map: SunkenShip
-
-worldStateBits:
-  1: "Fox Rods quest ended"
-  3: "Sunken Treasure quest ended"
+# Map: SunkenShip
+
+worldStateBits:
+  1: "Fox Rods quest ended"
+  2: "Flooded ship"
+  3: "Sunken Treasure quest ended"
+  4: "In Prayer Slip tutorial"
+  5: "After Rao dialogue after first door breaking"
+  6: "First door broken"
+  7: "First door broken"
+  8: "First door broken"
+  10: "Failed Prayer Slip tutorial (Unset after dialogue)"
+  11: "Failed Prayer Slip tutorial (Unset after dialogue)"
+  12: "Main room pan"
+  13: "Moon room pan"
+  14: "Flooded ship"
+  15: "Rao dialogue in Moon room after flooding ship"
+  16: "Cannon room pan"
+  21: "Red Barrel cut down"
+  22: "Red Barrel cut down"
+  23: "Lockjaw defeated"
+  24: "Entered treasure room"
+  27: "Red Barrel on weight"
+  28: "Red Barrel on weight"
+  29: "Red Barrel on weight"
+  31: "First door broken"
+  32: "Third door broken"
+  33: "Second door broken"
+  36: "Purified first Ghost Imp"
+  37: "Purified third Ghost Imp"
+  38: "Purified second Ghost Imp"
+  39: "Purified fourth Ghost Imp in cannon room"
+  40: "Purified sixth Ghost Imp (right of trio)"
+  41: "Purified fifth Ghost Imp (left of trio)"
+  42: "Ichiro and Jiro fight start"
+  43: "Saburo fight start"
+  44: "Prayer Slip guide active"
+  45: "Rao dialogue in Moon room"
+  46: "Purified sixth Ghost Imp (middle of trio)"
+  49: "Cannon used"
+  53: "Prayer Slip guide active"
+  54: "Giant kelp hand active"
+
+collectedObjects:
+  0: "Middle chest on bottom of room (Scroll)"
+  1: "Left chest on bottom of room (Holy Bone M)"
+  2: "Right chest on bottom of room (Bull Horn)"
+  3: "Clover in moon room"
+  4: "Chest in upper destroyable board (Sun Fragment)"
+  6: "Chest in alcove before large kelp monster room (Crystal)"
+  7: "Chest in middle of room (Lucky Hammer)"
+  9: "Chest closest to entrance of treasure room (Lacquerware Set)"
+  10: "Chest right of second Golden Gate (Holy Bone S)"
+  11: "Chest near red barrel weight (Monkey Statue)"
+  12: "Chest in middle destroyable board (Pearl)"
\ No newline at end of file