Updated flags for most of second arc

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"

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"

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"

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"