diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps.cpp index 060a6a82bb..0650e3a35e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps.cpp @@ -146,6 +146,8 @@ constexpr std::string_view MAP_NAMES[] = { // Route 7's east gate, where the guard takes the TEA, and Saffron City. "Route7_EastEntrance", "SaffronCity", + // Sabrina's gym: nine rooms joined by teleport pads (warps). + "SaffronCity_Gym", // Cinnabar Island's Center and Blaine's gym, through its quiz doors, and // Route 21 north of it to Pallet Town (12.03). "CinnabarIsland", diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp index c515e04367..5dfca541aa 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp @@ -61,6 +61,7 @@ #include "Programs/AutoStory/PokemonFRLG_AutoStoryRows13_Tests.h" #include "Programs/AutoStory/PokemonFRLG_AutoStoryRows16_Tests.h" #include "Programs/AutoStory/PokemonFRLG_AutoStoryRows17_Tests.h" +#include "Programs/AutoStory/PokemonFRLG_AutoStoryRows18_Tests.h" #include "Programs/AutoStory/PokemonFRLG_AutoStoryTable.h" #include "Programs/AutoStory/PokemonFRLG_AutoStoryTrashCans.h" #include "Programs/AutoStory/Data/Json_Tests.h" @@ -120,6 +121,7 @@ static void add_tests_AutoStoryRows(UnitTestDatabase& database){ add_tests_AutoStorySilph(database); add_tests_AutoStoryMansion(database); add_tests_AutoStoryViridian(database); + add_tests_AutoStorySaffronGym(database); } void add_tests(UnitTestDatabase& database){ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryFaultSweep_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryFaultSweep_Tests.cpp index 91f276348a..8bdee94aa2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryFaultSweep_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryFaultSweep_Tests.cpp @@ -134,6 +134,12 @@ const std::map KNOWN_FAILING{ "fly_celadon: a Fly that doesn't leave Cinnabar Island goes unseen, and the row, which walks on from Celadon's heal spot, ends below Erika: the same fix as 11.01's, the fly landing on its town's tile (FlyTown::landing) checked before the step ends"}, {"PokemonFRLG::AutoStory - Fault sweep: 17.02, warp no-op", "fly_viridian: a Fly that doesn't leave Saffron City goes unseen, and the row, which walks on from Saffron's streets, ends on Viridian's Gym tile: the same fix as 11.01's, the fly landing on its town's tile (FlyTown::landing) checked before the step ends"}, + {"PokemonFRLG::AutoStory - Fault sweep: 18.01, late warp fade", + "pad_to_top_right: a pad hop stays on SaffronCity_Gym, so a fade seen late (or a slow fade-in) leaves no scene change to confirm the warp and the step finds no fade: a scene check for a warp within one map (the player's tile moved from the pad), as the walker's scene_confirms_missed_fade does for a leg"}, + {"PokemonFRLG::AutoStory - Fault sweep: 18.02, late warp fade", + "pad_from_top_right: a pad hop stays on SaffronCity_Gym, so a fade seen late (or a slow fade-in) leaves no scene change to confirm the warp and the step finds no fade: a scene check for a warp within one map (the player's tile moved from the pad), as the walker's scene_confirms_missed_fade does for a leg"}, + {"PokemonFRLG::AutoStory - Fault sweep: 18.02, slow fade-in after every warp", + "pad_from_top_right: a pad hop stays on SaffronCity_Gym, so a fade seen late (or a slow fade-in) leaves no scene change to confirm the warp and the step finds no fade: a scene check for a warp within one map (the player's tile moved from the pad), as the walker's scene_confirms_missed_fade does for a leg"}, {"PokemonFRLG::AutoStory - Fault sweep: 08.03, off the Bicycle at a bike leg", "riding with no fault, route7_underground_exit's warp to UndergroundPath_EastEntrance is not confirmed on the sim (the screen after the fade reads as before the hold): the sim's warp off the Bicycle, before this class can sweep 08.03"}, }; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden18.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden18.h new file mode 100644 index 0000000000..94f5669e11 --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden18.h @@ -0,0 +1,69 @@ +/* FRLG AutoStory Plan Golden, Segment 18 + * + * From: https://github.com/PokemonAutomation/ + * + * The golden's lines for 18.01 and 18.02, Saffron Gym (after + * PokemonFRLG_AutoStoryPlanGolden16.h's, before PokemonFRLG_AutoStoryPlanGolden17.h's + * 17.01), in the story's order. + * + */ + +#ifndef PokemonAutomation_PokemonFRLG_AutoStoryPlanGolden18_H +#define PokemonAutomation_PokemonFRLG_AutoStoryPlanGolden18_H + +#include + +namespace PokemonAutomation{ +namespace NintendoSwitch{ +namespace PokemonFRLG{ + +// The stored plan lines of 18.01 and 18.02, Saffron Gym. +inline constexpr std::string_view FRLG_PLAN_GOLDEN_18[] = { + "18.01 by_pad_to_bottom_right from SaffronCity_Gym (14, 23) facing north to SaffronCity_Gym (17, 20) facing east", + "18.01 walk east 3 -> SaffronCity_Gym (17, 23) [walk only]", + "18.01 walk north 3 -> SaffronCity_Gym (17, 20) [walk only]", + "18.01 face east -> SaffronCity_Gym (17, 20) [walk only]", + "18.01 along_row_22 from SaffronCity_Gym (28, 23) facing east to SaffronCity_Gym (20, 22) facing west", + "18.01 walk north 1 -> SaffronCity_Gym (28, 22) [walk only]", + "18.01 walk west 8 (to wall) -> SaffronCity_Gym (20, 22) [walk only]", + "18.01 below_pad_to_top_right from SaffronCity_Gym (20, 22) facing west to SaffronCity_Gym (20, 21) facing north", + "18.01 walk north 1 -> SaffronCity_Gym (20, 21) [walk only]", + "18.01 by_pad_to_top_left from SaffronCity_Gym (28, 4) facing north to SaffronCity_Gym (20, 6) facing south", + "18.01 walk south 2 -> SaffronCity_Gym (28, 6) [walk only]", + "18.01 walk west 8 (to wall) -> SaffronCity_Gym (20, 6) [walk only]", + "18.01 face south -> SaffronCity_Gym (20, 6) [walk only]", + "18.01 by_pad_to_sabrina from SaffronCity_Gym (0, 4) facing south to SaffronCity_Gym (0, 6) facing south", + "18.01 walk south 2 -> SaffronCity_Gym (0, 6) [walk only]", + "18.01 below_sabrina from SaffronCity_Gym (18, 15) facing south to SaffronCity_Gym (14, 12) facing north", + "18.01 walk west 4 -> SaffronCity_Gym (14, 15) [walk only]", + "18.01 walk north 3 -> SaffronCity_Gym (14, 12) [walk only]", + "18.02 by_pad_out_of_sabrina from SaffronCity_Gym (14, 12) facing north to SaffronCity_Gym (17, 15) facing east", + "18.02 walk south 3 (to wall) -> SaffronCity_Gym (14, 15) [walk only]", + "18.02 walk east 3 -> SaffronCity_Gym (17, 15) [walk only]", + "18.02 by_pad_from_top_left from SaffronCity_Gym (0, 7) facing east to SaffronCity_Gym (0, 5) facing north", + "18.02 walk north 2 -> SaffronCity_Gym (0, 5) [walk only]", + "18.02 along_row_6 from SaffronCity_Gym (20, 7) facing north to SaffronCity_Gym (28, 6) facing east", + "18.02 walk north 1 -> SaffronCity_Gym (20, 6) [walk only]", + "18.02 walk east 8 (to wall) -> SaffronCity_Gym (28, 6) [walk only]", + "18.02 below_pad_from_top_right from SaffronCity_Gym (28, 6) facing east to SaffronCity_Gym (28, 5) facing north", + "18.02 walk north 1 -> SaffronCity_Gym (28, 5) [walk only]", + "18.02 by_pad_from_bottom_right from SaffronCity_Gym (20, 20) facing north to SaffronCity_Gym (28, 22) facing south", + "18.02 walk south 2 -> SaffronCity_Gym (20, 22) [walk only]", + "18.02 walk east 8 (to wall) -> SaffronCity_Gym (28, 22) [walk only]", + "18.02 face south -> SaffronCity_Gym (28, 22) [walk only]", + "18.02 below_center_door from SaffronCity_Gym (18, 20) facing south to SaffronCity (24, 39) facing north", + "18.02 walk south 3 (to wall) -> SaffronCity_Gym (18, 23) [walk only]", + "18.02 walk west 4 -> SaffronCity_Gym (14, 23) [walk only] [tapped]", + "18.02 walk south 1 (warp) -> SaffronCity (46, 13) [walk only]", + "18.02 walk west 17 (to wall) -> SaffronCity (29, 13)", + "18.02 walk north 3 (to wall) -> SaffronCity (29, 10)", + "18.02 walk west 14 (to wall) -> SaffronCity (15, 10)", + "18.02 walk south 29 -> SaffronCity (15, 39)", + "18.02 walk east 9 -> SaffronCity (24, 39)", + "18.02 face north -> SaffronCity (24, 39)", +}; + +} // namespace PokemonFRLG +} // namespace NintendoSwitch +} // namespace PokemonAutomation +#endif diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp index eef3bd93cd..36bb62abf7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp @@ -495,10 +495,17 @@ std::string OverworldStepSim::walk(const StoryStep& step){ // a step one tap at a time, or for a step into a trainer's line by // step_until_seen(), each watched for the trainer. std::string OverworldStepSim::step_ahead(const StoryStep& step){ + const Direction direction = Pokemon::story_arg(step.args, "direction"); if (step.action.empty() && step.pose_after){ + // A step onto a warp waits out its fade, as take_warp_step() does, so + // the next press is not swallowed by the fade. + if (const std::optional warp = warp_press(story_maps(), MapPosition{m_at.map, m_at.tile}, direction)){ + const std::string failure = step_onto_warp(*warp); + m_at = *story_pose(Pokemon::pose_of(*step.pose_after)); + return failure; + } return step_onto(step); } - const Direction direction = Pokemon::story_arg(step.args, "direction"); if (step.action.empty()){ if (const std::optional warp = warp_press(story_maps(), MapPosition{m_at.map, m_at.tile}, direction)){ return step_onto_warp(*warp); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows18_Tests.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows18_Tests.h new file mode 100644 index 0000000000..3cf7db99d7 --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows18_Tests.h @@ -0,0 +1,29 @@ +/* AutoStory Row Tests, Segment 18 + * + * From: https://github.com/PokemonAutomation/ + * + * Registration of the tests that run segment 18's rows (Saffron Gym, whose + * id is a label: the story plays it after Silph Co.) on the overworld sim, + * beside PokemonFRLG_AutoStoryRows16_Tests.h's. + * + */ + +#ifndef PokemonAutomation_PokemonFRLG_AutoStoryRows18_Tests_H +#define PokemonAutomation_PokemonFRLG_AutoStoryRows18_Tests_H + +#include "Common/Cpp/TestRunners/UnitTestDatabase.h" + +namespace PokemonAutomation{ +namespace NintendoSwitch{ +namespace PokemonFRLG{ + + +// Rows 18.01 and 18.02, Saffron Gym's pads, on the overworld sim +// (PokemonFRLG_AutoStorySaffronGym_Tests.cpp). +void add_tests_AutoStorySaffronGym(UnitTestDatabase& database); + + +} // namespace PokemonFRLG +} // namespace NintendoSwitch +} // namespace PokemonAutomation +#endif diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp index 695738d0e9..3e4bac39d0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp @@ -145,7 +145,7 @@ class Test_RunPlan : public UnitTest{ const RunPlanScenario m_scenario; }; -const std::string TODAY = "01.01 01.03 01.04 01.05 02.01 02.02 02.03 03.01 03.02 03.03 04.01 04.02 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 17.02 17.03 17.04 17.04b"; +const std::string TODAY = "01.01 01.03 01.04 01.05 02.01 02.02 02.03 03.01 03.02 03.03 04.01 04.02 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 18.01 18.02 17.02 17.03 17.04 17.04b"; const RunPlanScenario RUN_PLAN_CASES[] = { { @@ -236,11 +236,11 @@ const RunPlanScenario RUN_PLAN_CASES[] = { }, { .input = {.name = "Gift RNG off: 04.03 is passed over", .first = "04.01"}, - .expectation = {.expected_ids = "04.01 04.02 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 17.02 17.03 17.04 17.04b"}, + .expectation = {.expected_ids = "04.01 04.02 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 18.01 18.02 17.02 17.03 17.04 17.04b"}, }, { .input = {.name = "Gift RNG off: 04.03 runs when started at", .first = "04.03"}, - .expectation = {.expected_ids = "04.03 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 17.02 17.03 17.04 17.04b"}, + .expectation = {.expected_ids = "04.03 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 18.01 18.02 17.02 17.03 17.04 17.04b"}, }, { .input = { .name = "Gift RNG: started at 04.03, from the save beside the salesman", @@ -279,7 +279,7 @@ const RunPlanScenario RUN_PLAN_CASES[] = { }, { .input = {.name = "Starter RNG alone: 04.03 runs when started at", .first = "04.03", .handoffs = {.starter_rng = true}}, - .expectation = {.expected_ids = "04.03 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 17.02 17.03 17.04 17.04b"}, + .expectation = {.expected_ids = "04.03 04.04 04.05 04.06 05.01 05.02 05.03 05.04 05.05 05.06 05.07 05.08 05.09 05.10 06.01 06.02 06.03 06.04 07.01 07.02 08.01 08.02 08.03 09.01 09.02 09.03 10.01 10.02 10.03 10.04 10.05 10.06 11.01 11.02 11.03 12.01 12.02 12.02b 12.03 13.01 13.02 13.03 13.04 14.01 14.02 14.02b 14.03 14.04 14.04b 15.01 16.01 18.01 18.02 17.02 17.03 17.04 17.04b"}, }, { .input = { .name = "Starter RNG first, with both on", diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySaffronGym_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySaffronGym_Tests.cpp new file mode 100644 index 0000000000..c6741783cb --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySaffronGym_Tests.cpp @@ -0,0 +1,205 @@ +/* AutoStory Saffron Gym Tests + * + * From: https://github.com/PokemonAutomation/ + * + * Rows 18.01 and 18.02 (StoryData/frlg-18.0[12].plan.json) on the overworld + * sim: Saffron Gym's teleport pads, from the door to the tile below Sabrina + * and back out to Saffron's Center, with no trainer met on the way. + * + */ + +#include +#include +#include +#include +#include +#include +#include "Common/Cpp/Exceptions.h" +#include "Common/Cpp/TestRunners/UnitTest.h" +#include "Pokemon/AutoStory/Pokemon_BuiltinStoryActions.h" +#include "Pokemon/AutoStory/Pokemon_StoryStepExecutor.h" +#include "VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps.h" +#include "VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.h" +#include "PokemonFRLG_AutoStoryEvents.h" +#include "PokemonFRLG_AutoStoryRooms.h" +#include "PokemonFRLG_AutoStoryRowSim.h" +#include "PokemonFRLG_AutoStoryRows18_Tests.h" +#include "PokemonFRLG_AutoStoryTable.h" + +namespace PokemonAutomation{ +namespace NintendoSwitch{ +namespace PokemonFRLG{ + + +namespace{ + +struct AutoStorySaffronGymInput{ + std::string name; + std::function body; +}; + +struct AutoStorySaffronGymExpectation{ + std::string_view description; +}; + +struct AutoStorySaffronGymCase{ + AutoStorySaffronGymInput input; + AutoStorySaffronGymExpectation expectation; +}; + +class Test_AutoStorySaffronGym : public UnitTest{ +public: + explicit Test_AutoStorySaffronGym(AutoStorySaffronGymCase test_case) + : UnitTest(std::format("PokemonFRLG::AutoStory - Simulation: {}", test_case.input.name)) + , m_case(std::move(test_case)) + {} + virtual UnitTestResult run(Logger&, CancellableScope&) const override{ + try{ + return m_case.input.body(); + }catch (Exception& e){ + return std::format("{}: {}", e.name(), e.message()); + } + } + +private: + AutoStorySaffronGymCase m_case; +}; + +const StoryCheckpoint& checkpoint(std::string_view id){ + for (const StoryCheckpoint& row : story_checkpoints()){ + if (row.id == id){ + return row; + } + } + throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, std::format("No checkpoint {}.", id)); +} + +// Where each of `row`'s pad steps (the STEP steps, which are only ever +// onto a pad here) leaves the player, in order, after running the row's +// steps on the sim up to (not including) its Center step. Fails with the +// row's message if a step does not run. +struct PadWalk{ + std::string failure; + std::vector landings; + MapPosition end; + bool clean = false; +}; + +PadWalk walk_pads(const StoryCheckpoint& row){ + PadWalk walk; + StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); + OverworldSim sim(story_maps(), MapPosition{at.map, at.tile}, *at.facing); + for (const StoryStep& step : row.steps){ + if (step.action == CENTER_ENTER_VARIANT){ + break; + } + if (step.kind == StoryStepKind::GAME || step.kind == StoryStepKind::TALK || step.kind == StoryStepKind::BATTLE){ + continue; + } + walk.failure = row_step_on_sim(sim, at, step, row.id); + if (!walk.failure.empty()){ + break; + } + if (step.kind == StoryStepKind::STEP){ + walk.landings.push_back(sim.state().position); + } + } + walk.end = sim.state().position; + walk.clean = sim.state().trainers_beaten.empty() && sim.state().violations.empty(); + return walk; +} + +// The pads, in the order the way in takes them, and where each leaves the +// player: (18, 20) to (28, 23), (20, 20) to (28, 4), (20, 7) to (0, 4), +// (0, 7) to (18, 15) (SaffronCity_Gym map.json warps 3, 24, 22 and 5). +UnitTestResult test_pads_to_sabrina(){ + const PadWalk walk = walk_pads(checkpoint("18.01")); + if (!walk.failure.empty()){ + return walk.failure; + } + const std::vector expected{ + {"SaffronCity_Gym", {28, 23}}, {"SaffronCity_Gym", {28, 4}}, {"SaffronCity_Gym", {0, 4}}, {"SaffronCity_Gym", {18, 15}}, + }; + if (walk.landings != expected){ + return "18.01: the pads did not land on (28, 23), (28, 4), (0, 4) and (18, 15), in that order."; + } + const MapPosition below_sabrina{"SaffronCity_Gym", {14, 12}}; + if (!(walk.end == below_sabrina)){ + return std::format("18.01: ended on {}, not below Sabrina {}.", to_string(walk.end), to_string(below_sabrina)); + } + if (!walk.clean){ + return "18.01: met a trainer or broke a rule on the way."; + } + return true; +} + +// The way out: the same pads the other way, each pair linked both ways, +// then the door onto Saffron City and the street to below the Center's door. +UnitTestResult test_pads_out_to_center(){ + const PadWalk walk = walk_pads(checkpoint("18.02")); + if (!walk.failure.empty()){ + return walk.failure; + } + const std::vector expected{ + {"SaffronCity_Gym", {0, 7}}, {"SaffronCity_Gym", {20, 7}}, {"SaffronCity_Gym", {20, 20}}, {"SaffronCity_Gym", {18, 20}}, + }; + if (walk.landings != expected){ + return "18.02: the pads did not land on (0, 7), (20, 7), (20, 20) and (18, 20), in that order."; + } + const MapPosition below_center{"SaffronCity", {24, 39}}; + if (!(walk.end == below_center)){ + return std::format("18.02: ended on {}, not below Saffron's Center door {}.", to_string(walk.end), to_string(below_center)); + } + if (!walk.clean){ + return "18.02: met a trainer or broke a rule on the way."; + } + return true; +} + +// The control for the two above: the sim does see Cameron (24, 18). Row 21, +// where the planner would walk (20, 21) from (28, 23) if the row did not +// stop on row 22 first, is in his line (24, 19 to 21), so a walk along it +// is seen and fails. +UnitTestResult test_cameron_sees_row_21(){ + OverworldSim sim(story_maps(), MapPosition{"SaffronCity_Gym", {28, 21}}, Direction::WEST); + StoryPose at{"SaffronCity_Gym", {28, 21}, Direction::WEST}; + StoryStep along; + along.kind = StoryStepKind::ROUTE; + along.name = "along_row_21"; + along.args = {{"target", Pokemon::GridPose{"SaffronCity_Gym", {{20, 21}}, Direction::WEST}}, {"fight_wild", false}}; + const std::string failure = row_step_on_sim(sim, at, along, "18.01"); + if (failure.empty() && sim.state().trainers_beaten.empty() && sim.state().violations.empty()){ + return "A walk along row 21 was not seen by Cameron (24, 18)."; + } + return true; +} + +const AutoStorySaffronGymCase AUTO_STORY_SAFFRON_GYM_CASES[] = { + { + .input = {.name = "18.01 Saffron Gym's pads from the door to below Sabrina", .body = test_pads_to_sabrina}, + .expectation = {.description = "four pads, landing in the rooms in order, below Sabrina, nobody met"}, + }, + { + .input = {.name = "18.02 Saffron Gym's pads back out to the Center's door", .body = test_pads_out_to_center}, + .expectation = {.description = "four pads the other way, below Saffron's Center door, nobody met"}, + }, + { + .input = {.name = "Saffron Gym: Cameron sees a walk along row 21", .body = test_cameron_sees_row_21}, + .expectation = {.description = "the sim meets a trainer on row 21, so the rows' row 22 is a real detour"}, + }, +}; + +} // namespace + + +void add_tests_AutoStorySaffronGym(UnitTestDatabase& database){ + for (const auto& item : AUTO_STORY_SAFFRON_GYM_CASES){ + database.add(item); + } +} + + + +} // namespace PokemonFRLG +} // namespace NintendoSwitch +} // namespace PokemonAutomation diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.cpp index 24679243de..d0b160e0cb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.cpp @@ -237,6 +237,7 @@ constexpr std::string_view STORY_ORDER[] = { "12.01", "12.02", "12.02b", "12.03", "13.01", "13.02", "13.03", "13.04", "14.01", "14.02", "14.02b", "14.03", "14.04", "14.04b", "15.01", "16.01", + "18.01", "18.02", "17.02", "17.03", "17.04", "17.04b", }; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryUnauthoredStarts_Tests.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryUnauthoredStarts_Tests.h index 3ba3dbe560..debc7f34a0 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryUnauthoredStarts_Tests.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryUnauthoredStarts_Tests.h @@ -19,13 +19,13 @@ namespace PokemonFRLG{ // Whether checkpoint `id` was authored before the rows that lead up to it: // it starts from its own declared pose, not where the row before it in // the story's order (STORY_ORDER in PokemonFRLG_AutoStoryTable.cpp) ends. -// 17.02 starts at Saffron's Center nurse, where no row before it in the -// order ends (Silph Co.'s 16.01 ends on a pad on 5F; the rest of Silph Co. -// and Sabrina are not authored). 14.01 starts outside the Pokemon Mansion, -// after its Escape Rope (13.04), which is not authored. An id leaves this -// list once the rows before it are in. +// 18.01 (Saffron's gym) starts at Saffron's Center nurse, where no row +// before it in the order ends (Silph Co.'s 16.01 ends on a pad on 5F; the +// rest of Silph Co. is not authored). 14.01 starts outside the Pokemon +// Mansion, after its Escape Rope (13.04), which is not authored. An id +// leaves this list once the rows before it are in. inline bool starts_after_unauthored_rows(std::string_view id){ - return id == "17.02" || id == "14.01"; + return id == "18.01" || id == "14.01"; } diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp index d88532ea20..26543318c3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp @@ -41,6 +41,7 @@ #include "PokemonFRLG_AutoStoryPlanGolden14.h" #include "PokemonFRLG_AutoStoryPlanGolden15.h" #include "PokemonFRLG_AutoStoryPlanGolden16.h" +#include "PokemonFRLG_AutoStoryPlanGolden18.h" #include "PokemonFRLG_AutoStoryPlanGolden17.h" #include "PokemonFRLG_AutoStoryPlanGolden13.h" #include "PokemonFRLG_AutoStoryRows_Tests.h" @@ -292,8 +293,8 @@ UnitTestResult check_checkpoint(const StoryCheckpoint& checkpoint, StoryPose& po // start: starts_after_unauthored_rows()), and adds the plans to `golden`. UnitTestResult chain_story_routes(std::vector& golden){ const std::vector& checkpoints = story_checkpoints(); - if (checkpoints.size() != 70 || checkpoints[0].start){ - return "Expected 70 checkpoints, the first from a new game."; + if (checkpoints.size() != 72 || checkpoints[0].start){ + return "Expected 72 checkpoints, the first from a new game."; } StoryPose pose; for (size_t c = 0; c < checkpoints.size(); c++){ @@ -342,6 +343,7 @@ UnitTestResult test_golden_plans(){ golden.insert(golden.end(), std::begin(FRLG_PLAN_GOLDEN_12_CELADON), std::end(FRLG_PLAN_GOLDEN_12_CELADON)); golden.insert(golden.end(), std::begin(FRLG_PLAN_GOLDEN_15), std::end(FRLG_PLAN_GOLDEN_15)); golden.insert(golden.end(), std::begin(FRLG_PLAN_GOLDEN_16), std::end(FRLG_PLAN_GOLDEN_16)); + golden.insert(golden.end(), std::begin(FRLG_PLAN_GOLDEN_18), std::end(FRLG_PLAN_GOLDEN_18)); golden.insert(golden.end(), std::begin(FRLG_PLAN_GOLDEN_17_GYM), std::end(FRLG_PLAN_GOLDEN_17_GYM)); const size_t stored = golden.size(); size_t first_diff = 0; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-18.01.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-18.01.plan.json new file mode 100644 index 0000000000..e7038e03e9 --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-18.01.plan.json @@ -0,0 +1,225 @@ +{ + "format": "pokesim-authored-checkpoint/1", + "game": "frlg", + "checkpoint": { + "id": "18.01", + "title": "Saffron Gym: the teleport pads from the door to Sabrina's room", + "start": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 14, + 23 + ] + ], + "facing": "north" + }, + "events": [ + { + "id": "by_pad_to_bottom_right", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 17, + 20 + ] + ], + "facing": "east" + } + }, + "why": "from the door mat (14, 23) up the entrance room, round the gym guide (15, 20), to a tile west of the pad (18, 20) (SaffronCity_Gym map.json warp 3), the room's only pad" + }, + { + "id": "pad_to_bottom_right", + "kind": "step", + "args": { + "direction": "east" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 28, + 23 + ] + ], + "facing": "east" + }, + "why": "onto the pad (18, 20), which warps to (28, 23) in the bottom right room" + }, + { + "id": "along_row_22", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 20, + 22 + ] + ], + "facing": "west" + } + }, + "why": "west along row 22 (Cameron (24, 18) sees (24, 19) to (24, 21), so not row 21) to the room's west wall" + }, + { + "id": "below_pad_to_top_right", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 20, + 21 + ] + ], + "facing": "north" + } + }, + "why": "up to the tile below the pad (20, 20): the gym has no way between rooms but its pads" + }, + { + "id": "pad_to_top_right", + "kind": "step", + "args": { + "direction": "north" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 28, + 4 + ] + ], + "facing": "north" + }, + "why": "onto the pad (20, 20), which warps to (28, 4) in the top right room" + }, + { + "id": "by_pad_to_top_left", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 20, + 6 + ] + ], + "facing": "south" + } + }, + "why": "down and west along row 6, below Johan's line (24, 3 to 5), to a tile above the pad (20, 7)" + }, + { + "id": "pad_to_top_left", + "kind": "step", + "args": { + "direction": "south" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 0, + 4 + ] + ], + "facing": "south" + }, + "why": "onto the pad (20, 7), which warps to (0, 4) in the top left room" + }, + { + "id": "by_pad_to_sabrina", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 0, + 6 + ] + ], + "facing": "south" + } + }, + "why": "down column 0, far from Preston's line (4, 3 to 5), to a tile above the pad (0, 7)" + }, + { + "id": "pad_to_sabrina", + "kind": "step", + "args": { + "direction": "south" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 18, + 15 + ] + ], + "facing": "south" + }, + "why": "onto the pad (0, 7), which warps to (18, 15) in Sabrina's room, the middle one" + }, + { + "id": "below_sabrina", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 14, + 12 + ] + ], + "facing": "north" + } + }, + "why": "west and up to the tile below Sabrina (14, 11), facing her" + } + ] + }, + "execution": { + "menu": "full", + "notes": { + "checkpoint": [ + "Starts on the gym's door mat (14, 23), facing north, as the door leaves the player. The way there from Saffron's Center is not authored: Silph Co. (16.0x) comes first and clears Saffron's Rocket Grunts, and one of them (SaffronCity_EventScript_RocketGrunt3, hidden by FLAG_HIDE_SAFFRON_ROCKETS) stands on (46, 13), the only tile the gym's door (46, 12) is entered from; story_maps() still has him, and rows 15.01 and 16.01 need the others there. So this start is on the unauthored-start list.", + "Ends at (14, 12), facing Sabrina (14, 11), where 18.02 starts: the save in front of her.", + "The gym is nine rooms of 9x6 tiles with no door between them: each room's pads (the map's step_on warps) lead to another room's, and the way from the entrance to Sabrina is four of them: (18, 20) to (28, 23), (20, 20) to (28, 4), (20, 7) to (0, 4), (0, 7) to (18, 15). The player lands on a pad and walks off it before the next. The trainers on the way (Cameron (24, 18), Johan (24, 2), Preston (4, 2), sight 3 south) are not fought: each leg keeps out of their lines, and the sim test fails if one is met. The others (Tyron, Amanda, Stacy, Tasha) are in rooms the route does not enter." + ] + } + }, + "metadata": { + "phase": "testing", + "postconditions": { + "position": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 14, + 12 + ] + ], + "facing": "north" + } + } + } +} \ No newline at end of file diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-18.02.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-18.02.plan.json new file mode 100644 index 0000000000..99660a8f29 --- /dev/null +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-18.02.plan.json @@ -0,0 +1,285 @@ +{ + "format": "pokesim-authored-checkpoint/1", + "game": "frlg", + "checkpoint": { + "id": "18.02", + "title": "Saffron Gym: Sabrina and the MARSHBADGE, the pads back out, heal at Saffron's Center", + "start": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 14, + 12 + ] + ], + "facing": "north" + }, + "events": [ + { + "id": "lead_lv46_for_sabrina", + "kind": "game_action", + "action": "level", + "args": { + "slot": 1, + "min": 46 + }, + "why": "the precondition for Sabrina: the lead at least Lv46, pokeguy's Blastoise here (PokemonSimulation docs/battles/pokeguy-conditions.md, sabrina: from 33/143 HP, 98.3% of the sims win, 90.1% to 100.0%); at his level or above, those sims stand for this fight and no new one is needed; below it, the run stops here, before the fight" + }, + { + "id": "challenge_sabrina", + "kind": "talk", + "why": "Sabrina (14, 11)" + }, + { + "id": "sabrina", + "kind": "battle", + "args": { + "trainer": "TRAINER_LEADER_SABRINA", + "foes": [ + "kadabra", + "mr-mime", + "venomoth", + "alakazam" + ] + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 14, + 12 + ] + ], + "facing": "north" + }, + "why": "Sabrina (TRAINER_LEADER_SABRINA): Kadabra Lv38, Mr. Mime Lv37, Venomoth Lv38, Alakazam Lv43 (pokeguy: Water Pulse, Surf, Bite and Blizzard, 1:33:30 to 1:34:38); then the MARSHBADGE and TM04 Calm Mind" + }, + { + "id": "by_pad_out_of_sabrina", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 17, + 15 + ] + ], + "facing": "east" + } + }, + "why": "back to the tile west of the pad (18, 15) the way in landed on" + }, + { + "id": "pad_out_of_sabrina", + "kind": "step", + "args": { + "direction": "east" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 0, + 7 + ] + ], + "facing": "east" + }, + "why": "onto the pad (18, 15), which warps to (0, 7) in the top left room" + }, + { + "id": "by_pad_from_top_left", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 0, + 5 + ] + ], + "facing": "north" + } + }, + "why": "up column 0 to a tile below the pad (0, 4)" + }, + { + "id": "pad_from_top_left", + "kind": "step", + "args": { + "direction": "north" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 20, + 7 + ] + ], + "facing": "north" + }, + "why": "onto the pad (0, 4), which warps to (20, 7) in the top right room" + }, + { + "id": "along_row_6", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 28, + 6 + ] + ], + "facing": "east" + } + }, + "why": "east along row 6 (Johan (24, 2) sees (24, 3) to (24, 5), so not row 5) to the room's east wall" + }, + { + "id": "below_pad_from_top_right", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 28, + 5 + ] + ], + "facing": "north" + } + }, + "why": "up to the tile below the pad (28, 4)" + }, + { + "id": "pad_from_top_right", + "kind": "step", + "args": { + "direction": "north" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 20, + 20 + ] + ], + "facing": "north" + }, + "why": "onto the pad (28, 4), which warps to (20, 20) in the bottom right room" + }, + { + "id": "by_pad_from_bottom_right", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 28, + 22 + ] + ], + "facing": "south" + } + }, + "why": "east along row 22, below Cameron's line (24, 19 to 21), to a tile above the pad (28, 23)" + }, + { + "id": "pad_from_bottom_right", + "kind": "step", + "args": { + "direction": "south" + }, + "declared_after": { + "map": "SaffronCity_Gym", + "tiles": [ + [ + 18, + 20 + ] + ], + "facing": "south" + }, + "why": "onto the pad (28, 23), which warps to (18, 20) in the entrance room" + }, + { + "id": "below_center_door", + "kind": "route", + "action": "run", + "args": { + "target": { + "map": "SaffronCity", + "tiles": [ + [ + 24, + 39 + ] + ], + "facing": "north" + } + }, + "why": "down the entrance room and out of the door (14, 23) onto Saffron City below the gym (46, 13), then through the city to below the Center's door (24, 38)" + }, + { + "id": "saffron_nurse", + "kind": "game_action", + "action": "center_enter", + "declared_after": { + "map": "SaffronCity_PokemonCenter_1F", + "tiles": [ + [ + 7, + 4 + ] + ], + "facing": "north" + }, + "why": "the Center script in: through the door and up to the nurse; no map of the Center" + }, + { + "id": "heal_saffron", + "kind": "heal", + "why": "full HP and PP" + } + ] + }, + "execution": { + "menu": "full", + "notes": { + "checkpoint": [ + "Sabrina (14, 11), talked to from below, from the save in front of her (18.01): Kadabra Lv38, Mr. Mime Lv37, Venomoth Lv38, Alakazam Lv43 (sParty_LeaderSabrina); then the MARSHBADGE and TM04 Calm Mind. PokeGuy has Blastoise at Lv46 here (pokeguy-route.md, section 14).", + "Out by the four pads in reverse, each pair a two-way link: (18, 15) to (0, 7), (0, 4) to (20, 7), (28, 4) to (20, 20), (28, 23) to (18, 20), keeping to the same rows as the way in (18.01). No gym trainer is fought on the way out.", + "Ends at Saffron's nurse, facing her: 17.01's start. Silph Co.'s Rocket Grunts are gone by now (FLAG_HIDE_SAFFRON_ROCKETS), but story_maps() still has them, so the city route here goes round their lines as 15.01's does; the walk out of the gym lands the player on (46, 13), where one of them stands on that map." + ] + } + }, + "metadata": { + "phase": "testing", + "postconditions": { + "position": { + "map": "SaffronCity_PokemonCenter_1F", + "tiles": [ + [ + 7, + 4 + ] + ], + "facing": "north" + } + } + } +} \ No newline at end of file diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index dabb7d7783..82b3632dfc 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -2109,10 +2109,12 @@ file(GLOB LIBRARY_SOURCES Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCeladon_Tests.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCeladonGym_Tests.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySaffron_Tests.cpp + Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySaffronGym_Tests.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCinnabarGym_Tests.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySilph_Tests.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows16_Tests.h Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows17_Tests.h + Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows18_Tests.h Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryMansion_Tests.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryViridian_Tests.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows13_Tests.h @@ -2207,6 +2209,7 @@ file(GLOB LIBRARY_SOURCES Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden15.h Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden16.h Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden17.h + Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden18.h Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPlanGolden13.h Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryResources.cpp Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryResources.h