diff --git a/.github/workflows/cpp-ci-serial-programs-base.yml b/.github/workflows/cpp-ci-serial-programs-base.yml index 812c582a21..e052e8e948 100644 --- a/.github/workflows/cpp-ci-serial-programs-base.yml +++ b/.github/workflows/cpp-ci-serial-programs-base.yml @@ -106,7 +106,7 @@ jobs: uses: actions/checkout@v7 with: repository: dayfine/PokemonSimulation - ref: bdca47c5045797be1d2a1f0931ad6a8f15ab3225 + ref: d3eea1b5c04180f8b60eb98b0d65f70aca6b1abb path: StoryReplaySource - name: Verify replay preview bytes and independently regenerate its route input @@ -279,12 +279,12 @@ jobs: if: startsWith(inputs.os, 'ubuntu') && inputs.run-tests run: | cd Arduino-Source/SerialPrograms/bin - cp ../Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.05.plan.json frlg-parcel.native.json + cp ../Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.01.plan.json frlg-parcel.native.json python3 - <<'PYTHON' import json from pathlib import Path data = json.loads(Path('frlg-parcel.native.json').read_text()) - assert data['game'] == 'frlg' and data['checkpoint']['id'] == '00.05' + assert data['game'] == 'frlg' and data['checkpoint']['id'] == '02.01' assert len(data['checkpoint']['events']) == 3 PYTHON diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TeachScreenReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TeachScreenReader.cpp index d898916ba1..c49410faf8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TeachScreenReader.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TeachScreenReader.cpp @@ -541,7 +541,7 @@ void add_tests_TeachScreenReader(UnitTestDatabase& database){ "KnownMoves_eng.png", "StopQuestion_eng.png", "DidNotLearn_eng.png", - // HM01 to an Oddish with two free slots (00.23, console B). + // HM01 to an Oddish with two free slots (06.02, console B). "MachineSet_eng.png", }){ database.add(std::format("PokemonFRLG/TeachScreenReader/{}", image)); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_BikeSpinMechanics.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_BikeSpinMechanics.h index ae9283b104..b610810a8c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_BikeSpinMechanics.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_BikeSpinMechanics.h @@ -26,7 +26,7 @@ namespace MovementMechanics{ // tiles, the same each time: a tile per 100ms, so an open leg's hold of // (n - 1) tiles and a half moves n. 112ms a tile (a wall-to-wall time // of the motion on screen) held "west 16 (open)" for 17 or 18 tiles on -// Route 8 (00.30 run 2). Not the decompilation's 4 frames a tile (67ms): +// Route 8 (08.03 run 2). Not the decompilation's 4 frames a tile (67ms): // the bike speeds up from rest. inline constexpr Milliseconds BIKE_TILE_TIME(100); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_MovementMechanics.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_MovementMechanics.h index 8c186fd894..a89674104d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_MovementMechanics.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_MovementMechanics.h @@ -21,7 +21,7 @@ * tap's start is ignored. * - Taps with no release between them are one hold: after a turn, 3 of * them took 0 or 1 steps. - * After a battle (console B, 2026-11-09 15:50, 00.28 winston_line): a + * After a battle (console B, 2026-11-09 15:50, 08.01 winston_line): a * step tap sent as flee_battle() returned, on the black's end, was lost; * one more tap by hand stepped. * @@ -46,7 +46,7 @@ namespace MovementMechanics{ // Walking: a tile per 16 frames at 60 fps (console B, 2026-11-09). inline constexpr Milliseconds TILE_TIME(267); // Running with B held: a tile per 8 frames (console B, 2026-11-02, video -// of run 00.11). +// of run 04.01). inline constexpr Milliseconds RUN_TILE_TIME(133); // Surfing: a tile per 8 frames. inline constexpr Milliseconds SURF_TILE_TIME(133); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBikeTaps.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBikeTaps.h index fb5bb67188..7721f8c09d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBikeTaps.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBikeTaps.h @@ -48,7 +48,7 @@ struct BikeTapCalls{ // game may miss a turn tap (MovementMechanics::MAX_TURN_TAPS). constexpr int STEP_TAP_TRIES = 3; // How far a sure start may be off before a blocked tap finds the player: -// three runs of 00.30 stood 3 tiles off (console B, 2026-11-09). +// three runs of 08.03 stood 3 tiles off (console B, 2026-11-09). constexpr int BLOCKED_TAP_SLACK = 3; // Walks the open leg `step` a tap at a time: on the Bicycle each tap is diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBike_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBike_Tests.cpp index 8fc91a73c5..701d7faf3a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBike_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldBike_Tests.cpp @@ -234,7 +234,7 @@ ImageRGB32 periodic_floor(size_t scroll){ return image; } -// Rocket Hideout B3F (00.32 run 1): a tap east over a floor that repeats +// Rocket Hideout B3F (09.02 run 1): a tap east over a floor that repeats // every tile left the top band the same, so the tap read as a turn. UnitTestResult test_scroll_over_periodic_floor(){ const ImageFloatBox game(0, 0, 1, 1); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldFacing.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldFacing.h index 191d96f375..4468966f13 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldFacing.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldFacing.h @@ -28,7 +28,7 @@ std::optional read_facing(ConsoleHandle& console, ProControllerContex // old way, and a leg's hold then spends its first 8 frames turning // (pokefirered PlayerTurnInPlace(), a fast walk in place): a one-tile // hold only turns the player, with nothing to show it (console B, -// 2026-11-09, 00.28 run 2: the step north onto Rock Tunnel B1F row 34). +// 2026-11-09, 08.01 run 2: the step north onto Rock Tunnel B1F row 34). // A facing that can't be read is taken as turned: a tap while facing the // way already would take a step. void turn_to(ConsoleHandle& console, ProControllerContext& context, Direction direction); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldLateBattle_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldLateBattle_Tests.cpp index d6b6b4e46b..895d809f79 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldLateBattle_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldLateBattle_Tests.cpp @@ -112,7 +112,7 @@ std::string bound_text(const std::optional& bound){ return bound ? std::format("{} to {}", bound->min, bound->max) : std::string("no bound"); } -// Console B, FRLG 00.27 run 2, 2026-11-09 (~/FRLGLab/captures/ +// Console B, FRLG 07.02 run 2, 2026-11-09 (~/FRLGLab/captures/ // 2026-11-09-0027-route10-legs.log): on the open leg "east 11" across // Route 10, wild battles (Voltorb) showed only after the hold. The walker // took the player to be anywhere on the leg ("stopped 0 to 11 tiles in") @@ -120,7 +120,7 @@ std::string bound_text(const std::optional& bound){ // the leg crosses Route 10's grass on row 10, the battle's flashes are // missed, its text box ("Wild appeared!") shows // LATE_WILD_BATTLE_DELAY after its step and its HP boxes 800 ms after -// that, as in Mt. Moon (console B, 2026-11-03, row 00.13). After running, +// that, as in Mt. Moon (console B, 2026-11-03, row 04.05). After running, // the walker must bound the player to a few tiles around the battle's. class Test_OverworldLateBattle : public UnitTest{ public: diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps_Tests.cpp index 07970fdc8b..cbd71d09a3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps_Tests.cpp @@ -592,7 +592,7 @@ UnitTestResult check_found_again(const std::vector& maps, const MapPosi return true; } -// 00.11's way from Pewter into Route 3 and 00.12's over Route 3 and 4. +// 04.01's way from Pewter into Route 3 and 04.02's over Route 3 and 4. UnitTestResult test_found_again_route3_route4(){ const std::vector maps = overworld_maps(); const UnitTestResult into_route3 = check_found_again(maps, {"PewterCity", {17, 26}}, {"Route3", {13, 8}}); @@ -618,7 +618,7 @@ UnitTestResult test_trainer_stops(){ }; const Case cases[] = { { - .name = "Route 3, Lass Robin, east along row 9 (00.12)", + .name = "Route 3, Lass Robin, east along row 9 (04.02)", .start = {"Route3", {36, 9}}, .direction = Direction::EAST, .tiles = 11, .to_wall = true, .player = {"Route3", {40, 9}}, .trainer = {"Route3", {40, 10}}, }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecovery.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecovery.cpp index a9fbb05920..b4b0b362d3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecovery.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecovery.cpp @@ -63,7 +63,7 @@ int sight_onto(const std::vector& maps, const MapPosition& tile){ // How far the holds that find the player after an open leg, and the way // back, may walk, per tile of the leg. 2 left Rocket Hideout B3F's "west // 7" off the stairs unchecked: the hold to its west wall and back walk up -// to 18, and the leg ended short (00.31 r1, console B, 2026-11-10). Route +// to 18, and the leg ended short (09.01 r1, console B, 2026-11-10). Route // 1's "west 4", whose holds walk 30, stays unchecked. constexpr int OPEN_LEG_CHECK_TILES_PER_TILE = 3; @@ -87,7 +87,7 @@ bool is_wall_hold(const RouteStep& next){ // misses the arrow, or walks onto another, and ends elsewhere in the maze: // "south 2" before Rocket Hideout B3F's "east 2" onto the arrow (3, 16) // ended a tile short, the east leg walked into a wall, and the walk after -// it slid up to (10, 13) (00.31 r1 run 3, console B, 2026-11-10). +// it slid up to (10, 13) (09.01 r1 run 3, console B, 2026-11-10). bool is_slide(const RouteStep& next){ return next.action == RouteAction::WALK && next.spin_tiles && !next.warps; } diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecoveryWalk.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecoveryWalk.h index a65eca8c20..f119a51436 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecoveryWalk.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecoveryWalk.h @@ -38,7 +38,7 @@ constexpr double WALL_TAP_MOVED_RMSD = 20.0; // How much a counted tap scrolled the map: the largest RMSD between `before` // and `after` over the four edge quarters (top, bottom, left, right) of // `game`, all clear of the player in the middle. One band alone misses a -// step over a floor that repeats every tile (Rocket Hideout B3F, 00.32): a +// step over a floor that repeats every tile (Rocket Hideout B3F, 09.02): a // one-tile scroll leaves the band nearly the same. double tap_scroll_change(const ImageViewRGB32& before, const ImageViewRGB32& after, const ImageFloatBox& game); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRouteSteps.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRouteSteps.h index 7bff035849..bb82a42efd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRouteSteps.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRouteSteps.h @@ -63,7 +63,7 @@ struct RouteStep{ // WALK on foot: walked a tap at a time, each a tile, and each checked // to have moved (count_step_taps()), as through the hideout's arrow // floors, where a hold that ends a tile off slides the player - // elsewhere (console B, 2026-11-10, 00.31 r1). + // elsewhere (console B, 2026-11-10, 09.01 r1). bool tapped = false; // WALK, SURF: a wild Pokemon can appear on the way: the step crosses // tall grass or water. Elsewhere (indoors, streets) no wild battle can @@ -72,13 +72,13 @@ struct RouteStep{ // WALK: the steps (from 1) onto a connected map. The game holds the // player up a tile before each while it loads the map: a hold timed // by the tiles alone ended a tile short (console B, 2026-11-03, rows - // 00.14, 00.16 and 00.20). + // 04.06, 05.05 and 05.09). std::vector connection_steps = {}; // WALK onto a warp: how many tiles further the player may stand from // it than planned, which the hold goes on for, stopping at the fade. // An open leg over a map connection before it may end a tile further // on, when the game doesn't hold the player up there (console B, - // 2026-11-03, row 00.24). Set by with_warp_slack() when a route runs. + // 2026-11-03, row 06.03). Set by with_warp_slack() when a route runs. int warp_slack = 0; // Which way the player faces after the step. Arriving at a door or a // cave mouth, the game walks the player a tile out, facing south. diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.cpp index 5641773380..ba2eca4850 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.cpp @@ -499,7 +499,7 @@ void OverworldSim::take_steps(Direction direction, Milliseconds pressed, Millise if (m_script.connections_stall && step->map != m_map && !step->warped){ // The step onto a connected map waits a tile while the game // loads it: a hold timed by its tiles alone ended a tile short - // (console B, 2026-11-03, rows 00.14, 00.16 and 00.20). + // (console B, 2026-11-03, rows 04.06, 05.05 and 05.09). pressed += tile; if (pressed >= end){ return; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.h index 4946e27117..a088708313 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.h @@ -251,20 +251,20 @@ struct SimWalkerRules{ // A leg onto a warp whose fade was a wild battle's (its wipe passes for // the fade) stops before the warp, and the player is found again on it. // Without it the walker stopped as off the route (console B, - // 2026-11-03, Mt. Moon 1F, row 00.13). + // 2026-11-03, Mt. Moon 1F, row 04.05). bool find_player_after_warp_battle = true; // After a leg's watch saw nothing, a battle's text box on screen (its // HP boxes still to come) is watched on for, and the leg taken as // stopped part-way. Without it the walker took "south 15 (to wall)" // as walked and the next leg into the battle (console B, 2026-11-03, - // Mt. Moon B1F, row 00.13). + // Mt. Moon B1F, row 04.05). bool watch_on_for_unseen_battle = true; // The same after a leg the maps see no wild tiles on (RouteStep::wild), // which the leg and its watch don't watch for battles: on Mt. Moon // B2F's tiles closed on one side, which the maps don't mark as wild, a // battle on "east 7 (to wall)" left black after the leg, the leg was // taken as walked and the next one held from where the battle was - // (console B, 2026-11-03, row 00.13). + // (console B, 2026-11-03, row 04.05). bool watch_on_after_unmarked_leg = true; // Before a step, a battle on its way (its text box or wipe) is watched // on for, and the step before it taken as stopped part-way, not the @@ -273,29 +273,29 @@ struct SimWalkerRules{ // A hold over a step onto a connected map is a tile longer for it // (RouteStep::connection_steps). Without it the open leg north from // Cerulean City onto Nugget Bridge ended a tile short (console B, - // 2026-11-03, rows 00.16 and 00.20). + // 2026-11-03, rows 05.05 and 05.09). bool hold_over_connections = true; // An open leg after whose hold a wild battle was seen is placed by the // battle's first timed screen event (place_late_stop()). Without it the // player may be anywhere on the leg: on Route 10, "east 11" was found - // again from all 12 of its tiles (console B, 2026-11-09, 00.27 run 2). + // again from all 12 of its tiles (console B, 2026-11-09, 07.02 run 2). bool place_late_battle = true; // The watch for a warp's fade starts with the hold onto the warp // (Pokemon::WatchAlong), not when it ends. Without it a fade over // before the hold ended was missed, and the walk stopped on "no fade in // and out after walking onto the warp" though it had warped (console B, - // 2026-11-09 01:41, 00.27, the warp to CeruleanCity: the watch started + // 2026-11-09 01:41, 07.02, the warp to CeruleanCity: the watch started // about 1.3 s into the hold). bool watch_fade_along_hold = true; // A warp's fade is taken as the warp only once the screen after it // shows the player off the map they held from (warp_left_scene()). // Without it a black that cleared with the player where they were was - // taken as the warp (console B, 2026-11-10 01:44, 00.31 run 4). + // taken as the warp (console B, 2026-11-10 01:44, 09.01 run 4). bool confirm_warp_destination = true; // A turn tap is checked by the facing on screen, and tapped again // while the player faces another way (OverworldWalkSteps::turn_to()). // Without it a dropped tap left a one-tile leg turning the player - // only, taken as walked (console B, 2026-11-09, 00.28 run 2). + // only, taken as walked (console B, 2026-11-09, 08.01 run 2). bool confirm_turn = true; // The speed the walker goes at: its turn taps // (OverworldWalkSteps::turns_first()) and its holds' tile time. @@ -304,7 +304,7 @@ struct SimWalkerRules{ // tile (count_bike_taps()), and one that doesn't move finds the player // ahead of a block. Without it the leg is one hold, and a start off // along the leg ends it off with nothing to show it (console B, - // 2026-11-09, 00.30: three runs 3 tiles east after Route 8's legs). + // 2026-11-09, 08.03: three runs 3 tiles east after Route 8's legs). bool count_bike_taps = true; // How far apart, start to start, the counted taps are // (MovementMechanics::BIKE_TAP_PERIOD). @@ -316,14 +316,14 @@ struct SimWalkerRules{ // A dark cave's overworld isn't a battle on its way // (OverworldWalkSteps::dark_cave_screen()). Without it the check // before each step watched for a battle on it (console B, 2026-11-09, - // 00.28: "running from a wild Pokemon", then "not a battle"). + // 08.01: "running from a wild Pokemon", then "not a battle"). bool dark_cave_not_battle = true; // A stop on an open leg that started in a dark cave may be anywhere on // the leg (whole_leg()). Without it the stop is placed by the dark // screen's black, read as the battle at the hold's start: a battle at // the end of "east 12" on Rock Tunnel B1F was placed 0 to 3 tiles in, // and the player was found again at a wall 5 tiles off (console B, - // 2026-11-09, 00.28). + // 2026-11-09, 08.01). bool whole_leg_in_dark = true; // The end of a trainer's battle the walker fought, as the story's // battle loop takes it on the screen the sim shows after it: its diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSimState.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSimState.h index eeb4b93885..0d336a4d5c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSimState.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSimState.h @@ -40,8 +40,8 @@ struct SimScript{ std::set wild_floor_maps; // Whether the game holds the player up a tile on a step onto a // connected map. It did north onto Nugget Bridge (console B, - // 2026-11-03, rows 00.16 and 00.20), not south from Route 6 into - // Vermilion City (row 00.24). + // 2026-11-03, rows 05.05 and 05.09), not south from Route 6 into + // Vermilion City (row 06.03). bool connections_stall = true; // Wild battles at the game's own odds instead of `encounters`, on the // maps named here, with their land encounter rate (pokefirered @@ -52,18 +52,18 @@ struct SimScript{ // the game misses, by number from 1; the player goes on facing the old // way. The game drops none from a standstill (MovementMechanics: 70 of // 70 turned); these test the walker's check of the turn - // (SimWalkerRules::confirm_turn) after 00.28 run 2 (console B, + // (SimWalkerRules::confirm_turn) after 08.01 run 2 (console B, // 2026-11-09), where a one-tile leg only turned the player. std::set dropped_turn_taps; // Fault injection: steps onto a warp, by number from 1, that show the // fade's black and clear with the player where they were, not warped - // (console B, 2026-11-10 01:44, 00.31 run 4, "east 1 (warp)" on B4F). + // (console B, 2026-11-10 01:44, 09.01 run 4, "east 1 (warp)" on B4F). std::set black_without_warp; // The player rides the Bicycle: a tap facing another way takes a step // too, a hold through a turn loses no tile // (MovementMechanics::BIKE_TAP_ONLY_TURNS), and no step tap is // ignored: a 40ms turn tap and a 56ms hold 340ms after it took two - // tiles (console B, 2026-11-09, 00.30). At the start: SELECT gets on + // tiles (console B, 2026-11-09, 08.03). At the start: SELECT gets on // and off (OverworldSim::press_select()), a warp gets off. Each tap is // a tile; one in MovementMechanics::BIKE_FAST_TAP_DROP_EVERY of those // that start sooner than BIKE_TAP_DROP_PERIOD after the last is @@ -75,7 +75,7 @@ struct SimScript{ // Caves dark without Flash (Rock Tunnel): the overworld is black but // for a lit circle on the player, which the walker's battle text box // check and screen observer read as a battle on its way (console B, - // 2026-11-09, 00.28), unless SimWalkerRules::dark_cave_not_battle. + // 2026-11-09, 08.01), unless SimWalkerRules::dark_cave_not_battle. std::set dark_maps; // A lift's map, and where its door lets the player out for each floor // on its panel's menu, top first (pokefirered setdynamicwarp in diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim_Tests.cpp index bcba68da11..07683de8c7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim_Tests.cpp @@ -292,7 +292,7 @@ UnitTestResult test_forest_north_gate(){ return true; } -// Console B, 2026-11-03, Mt. Moon 1F (row 00.13): a wild battle whose +// Console B, 2026-11-03, Mt. Moon 1F (row 04.05): a wild battle whose // flashes were missed started on the leg south onto the ladder; its wipe // passed for the ladder's fade, and the walker stopped as off the route, // on the leg a tile short of the ladder. Here on the leg through the @@ -521,7 +521,7 @@ UnitTestResult test_mart_exit(){ return true; } -// Mt. Moon (story row 00.13): every floor tile has wild encounters, and +// Mt. Moon (story row 04.05): every floor tile has wild encounters, and // the floors join by ladders taken on stepping onto them. From the Moon // Stone (3, 2) on 1F down to the foot of B2F's ladder: two ladders, each // a fade. @@ -535,7 +535,7 @@ UnitTestResult test_mt_moon_ladders(){ } // The Moon Stone's ball (3, 2) on Mt. Moon 1F is a short way off the way -// down: from (11, 3), where 00.13's walk up column 11 ends, to face it +// down: from (11, 3), where 04.05's walk up column 11 ends, to face it // and then on to B1F costs a few tiles more than going straight, and // both walks end where they were planned to. UnitTestResult test_moon_stone_detour(){ @@ -566,7 +566,7 @@ UnitTestResult test_moon_stone_detour(){ } // Mt. Moon B2F: the Grunt at (37, 21) looks around (sight 3) over the -// only way east. 00.13 crosses his room on legs to walls; the sim's +// only way east. 04.05 crosses his room on legs to walls; the sim's // trainers see every way they may look, so he sees the player on // (37, 22), is fought, and the leg is held on to its wall. UnitTestResult test_mt_moon_grunt_mid_leg(){ @@ -584,7 +584,7 @@ UnitTestResult test_mt_moon_grunt_mid_leg(){ return true; } -// Mt. Moon B2F: 00.13's open leg east along the bottom row, (8, 38) to +// Mt. Moon B2F: 04.05's open leg east along the bottom row, (8, 38) to // (11, 38), ends a tile short with nothing on screen. The hold north // after it would end on (10, 21), a column west of the Grunt's line the // table steps into from (11, 21): the walker finds the player at walls @@ -622,7 +622,7 @@ UnitTestResult test_mt_moon_late_battle(){ return true; } -// Console B, 2026-11-03 (row 00.13, b2f_ladder_foot): a wild battle whose +// Console B, 2026-11-03 (row 04.05, b2f_ladder_foot): a wild battle whose // flashes were missed started on "south 3 (warp)" from (5, 3) to 1F's // ladder; its wipe passed for the ladder's fade, and the walker stopped as // off the route, with the player on (5, 5). A battle on the leg's first or @@ -650,7 +650,7 @@ UnitTestResult test_mt_moon_battle_on_ladder_leg(){ return true; } -// Console B, 2026-11-03 (row 00.13, b2f_ladder_foot): on B1F a wild +// Console B, 2026-11-03 (row 04.05, b2f_ladder_foot): on B1F a wild // battle started part-way down "south 15 (to wall)" from (3, 3), with its // flashes missed. Its HP boxes came over 5 s after the step, after the // leg's watch had ended on the battle's empty text box: the leg was taken @@ -689,7 +689,7 @@ UnitTestResult test_mt_moon_battle_seen_after_wall_leg(){ return true; } -// Console B, 2026-11-03 (row 00.13, b2f_south): on Mt. Moon B2F a wild +// Console B, 2026-11-03 (row 04.05, b2f_south): on Mt. Moon B2F a wild // battle started on the first step of "east 7 (to wall)" from (39, 14), // along tiles closed on their north side, which the maps didn't mark as // wild then: the leg watched only for messages, and the screen was black @@ -791,7 +791,7 @@ UnitTestResult test_mt_moon_way_out(){ return true; } -// Story row 00.14: from Route 4 east of Mt. Moon along the upper road to +// Story row 04.06: from Route 4 east of Mt. Moon along the upper road to // above the ledge row 9, out of Lass Crissy's line (75, 3); one step // south hops the ledge onto the lower road two tiles down; from there // into Cerulean City and its Pokemon Center by one door. No route plans @@ -816,7 +816,7 @@ UnitTestResult test_route4_to_cerulean(){ return true; } -// Story rows 00.14b and 00.14c in Cerulean Gym (pokefirered map.json): +// Story rows 05.01 and 05.02 in Cerulean Gym (pokefirered map.json): // from the Center into the Gym, up column 9 to (9, 13), west to (4, 13), // then to walls round the pool's west and north sides and west to (9, 7) // below Misty's platform, meeting no one; and back from beside her (9, 6) @@ -865,7 +865,7 @@ UnitTestResult test_cerulean_gym_walks(){ return true; } -// The straight ways in Cerulean Gym that 00.14b and 00.14c keep off: the +// The straight ways in Cerulean Gym that 05.01 and 05.02 keep off: the // step onto (9, 12) meets Swimmer Luis, and the step onto (8, 7), // misty_front, Picnicker Diana. UnitTestResult test_cerulean_gym_lines(){ @@ -889,7 +889,7 @@ UnitTestResult test_cerulean_gym_lines(){ return true; } -// Story rows 00.15 and 00.16: out of Cerulean's Pokemon Center by its mat +// Story rows 05.03 and 05.05: out of Cerulean's Pokemon Center by its mat // to below the rival's trigger row, and on north across the city's edge // onto Nugget Bridge, below Cale's row, meeting no one. UnitTestResult test_cerulean_to_bridge(){ @@ -904,7 +904,7 @@ UnitTestResult test_cerulean_to_bridge(){ return true; } -// Story row 00.16 up Nugget Bridge: the short legs between the five +// Story row 05.05 up Nugget Bridge: the short legs between the five // trainers' rows meet no one; and the step from the tile below each row // onto it is in that trainer's sight, beside them, so they fight there // without walking: Cale, Ali, Timmy, Reli and Ethan. @@ -934,7 +934,7 @@ UnitTestResult test_nugget_bridge_legs(){ -// Story row 00.24 from Route 6 to Vermilion City's nurse: the open leg +// Story row 06.03 from Route 6 to Vermilion City's nurse: the open leg // south 14 crosses onto Vermilion City and is held a tile longer for the // game holding the player up there. It didn't: the player ended a tile // south of (23, 7), the leg west on (15, 8), and the north 1 onto the diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSpin_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSpin_Tests.cpp index 433eb39443..25e5fd55c5 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSpin_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSpin_Tests.cpp @@ -193,7 +193,7 @@ UnitTestResult test_sim_walker_walks_slide(){ } -// 00.31 r1 (console B, 2026-11-10), Rocket Hideout B3F: off the stairs from +// 09.01 r1 (console B, 2026-11-10), Rocket Hideout B3F: off the stairs from // B2F, the open leg west along the top corridor ended short, so the hold // south to the wall stayed in the corridor, and the legs through the // spinners after it all ran there: the walk ended a few tiles west of the @@ -224,7 +224,7 @@ UnitTestResult test_short_leg_off_hideout_stairs(){ } -// 00.31 r1 run 3 (console B, 2026-11-10), Rocket Hideout B3F: "south 2" +// 09.01 r1 run 3 (console B, 2026-11-10), Rocket Hideout B3F: "south 2" // from (1, 14), at the wall, ended a tile short at (1, 15) with nothing // seen. "east 2", meant to step onto the arrow (3, 16), walked into the // wall east of (1, 15); the position check after the next leg took that diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk.cpp index 9af689c1cd..e069a62f34 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk.cpp @@ -385,7 +385,7 @@ void wait_out_fade(ConsoleHandle& console, ProControllerContext& context, const } // namespace // A black screen that clears with the player where they were is no warp -// (console B, 2026-11-10 01:44, 00.31 run 4: "east 1 (warp)" was taken as +// (console B, 2026-11-10 01:44, 09.01 run 4: "east 1 (warp)" was taken as // walked while the player stayed on B4F). void wait_out_warp( ConsoleHandle& console, ProControllerContext& context, const RouteStep& step, @@ -461,7 +461,7 @@ void clear_open_message( // the watch after "south 15 (to wall)" ended on the box still empty, the // leg was taken as walked to its wall, and the next leg was walked into // the battle, 5 tiles short of where it was planned from (console B, -// 2026-11-03, row 00.13). +// 2026-11-03, row 04.05). namespace{ // What on screen shows a wild battle on its way: its text box, or the diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkBattles.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkBattles.h index d870f6fa60..cd6ac0e11b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkBattles.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkBattles.h @@ -31,7 +31,7 @@ namespace OverworldWalkSteps{ // the maps see no wild tiles (RouteStep::wild): they miss some. Mt. Moon // B2F's tiles closed on one side are cave floor too, and a battle on // "east 7 (to wall)" there left the screen black after the leg, which -// was taken as walked (console B, 2026-11-03, row 00.13). +// was taken as walked (console B, 2026-11-03, row 04.05). size_t clear_unseen_battle( ConsoleHandle& console, ProControllerContext& context, const OverworldInterrupts& wild, const RouteStep& step @@ -53,7 +53,7 @@ bool run_from_battle_after_warp(ConsoleHandle& console, ProControllerContext& co // Whether `screen` is the overworld of a cave dark without Flash (Rock // Tunnel): black around a lit circle on the player in the middle. The // battle text box detector and the black screen check read its black as -// a battle on its way (console B, 2026-11-09, 00.28: the check before +// a battle on its way (console B, 2026-11-09, 08.01: the check before // each step ran a 15 s battle loop on it, "not a battle", and an open // leg's stop was placed by it 0 to 3 tiles in, where the battle came at // the leg's end). A battle's wipe is black in the middle too; its text diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkWatches.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkWatches.h index bd3c02e119..876eefacd1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkWatches.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkWatches.h @@ -47,7 +47,7 @@ inline constexpr Milliseconds AFTER_WILD_LEG_WATCH(3500); // After a leg's watch saw nothing, but the screen shows a battle on its // way: how long to watch on for its HP boxes. In Mt. Moon they came over // 5s after the step that set the battle off, after the watch had ended on -// the battle's empty text box (console B, 2026-11-03, row 00.13). +// the battle's empty text box (console B, 2026-11-03, row 04.05). inline constexpr Milliseconds UNSEEN_BATTLE_WATCH(5000); // How long clear_open_message() watches for the message it saw. inline constexpr Milliseconds OPEN_MESSAGE_WATCH(1000); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk_Tests.cpp index 16c66be336..a3b5748f51 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk_Tests.cpp @@ -155,7 +155,7 @@ struct TurnTapCase{ const MapPosition TURN_START{"ViridianForest", {13, 28}}; const MapPosition TURN_END{"ViridianForest", {12, 28}}; -// Console B, 2026-11-09 (00.28 run 2): the game missed the turn tap before +// Console B, 2026-11-09 (08.01 run 2): the game missed the turn tap before // a one-tile open leg, the leg's hold only turned the player, and the leg // was taken as walked. On the sim, a leg west 1 for a player facing north. class Test_OverworldTurnTap : public UnitTest{ @@ -202,7 +202,7 @@ const TurnTapCase TURN_TAP_CASES[] = { {.input = {.name = "dropped, tapped again", .dropped_turn_taps = {1}}, .expectation = {.end = TURN_END}}, {.input = {.name = "dropped twice, tapped again", .dropped_turn_taps = {1, 2}}, .expectation = {.end = TURN_END}}, {.input = {.name = "dropped, not checked: the leg only turns", .dropped_turn_taps = {1}, .confirm_turn = false}, .expectation = {.end = TURN_START}}, - // Console B, 2026-11-09 (00.30): on the Bicycle the turn tap took a + // Console B, 2026-11-09 (08.03): on the Bicycle the turn tap took a // step, each one-tile leg went two, and the walk to Route 8 ended on // Route 12. {.input = {.name = "on the bike, no turn tap", .on_bike = true}, .expectation = {.end = TURN_END}}, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkedTiles.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkedTiles.h index 0f4223164d..2c23ed7c0c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkedTiles.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalkedTiles.h @@ -43,7 +43,7 @@ WalkedTiles walked_near(const RouteStep& step, int estimate, Milliseconds tile_t // there, which it doesn't always do: south from Route 6 into Vermilion // City it didn't, the player ended a tile further south, and the north 1 // onto the Pokemon Center's door stopped below it (console B, 2026-11-03, -// row 00.24). Until a leg to a wall that way or a warp places the player +// row 06.03). Until a leg to a wall that way or a warp places the player // again, they may stand a tile further on; a warp walked back that way is // held a tile further for it. std::vector with_warp_slack(std::vector route); @@ -55,7 +55,7 @@ WalkedTiles whole_leg(const RouteStep& step); // cave's screen (OverworldWalkSteps::dark_cave_screen()). There the timing // has no basis: the screen is black before any battle's wipe, and a // battle at the end of "east 12" on Rock Tunnel B1F was placed 0 to 3 -// tiles in (console B, 2026-11-09, 00.28). The player, "found again" at +// tiles in (console B, 2026-11-09, 08.01). The player, "found again" at // a wall from those, was 5 tiles off. WalkedTiles stop_tiles(const RouteStep& step, WalkedTiles timed, bool dark); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWarpFade_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWarpFade_Tests.cpp index dbaa49462c..30f666859b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWarpFade_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWarpFade_Tests.cpp @@ -57,7 +57,7 @@ const MapPosition MART{"ViridianCity_Mart", {4, 3}}; // Where the Mart's exit mat, (4, 7), puts the player. const MapPosition OUTSIDE{"ViridianCity", {36, 20}}; -// 00.27 (console B, 2026-11-09 01:41), the warp to CeruleanCity: "no fade +// 07.02 (console B, 2026-11-09 01:41), the warp to CeruleanCity: "no fade // in and out after walking onto the warp", the watch for the fade having // started about 1.3 s into the hold, after the fade was over. Here the // walk out of Viridian Mart, south 5 onto its mat, is held as to a wall, @@ -126,7 +126,7 @@ const WarpFadeCase WARP_FADE_CASES[] = { .expectation = {.failure = "the warp to ViridianCity not confirmed", .warps = 0}, }, { - // 00.31 run 4 (console B, 2026-11-10 01:44): taken as walked. + // 09.01 run 4 (console B, 2026-11-10 01:44): taken as walked. .input = {.name = "black without a warp, any black taken as the warp", .fade = 1000ms, .black_without_warp = {1}, .confirm_destination = false}, .expectation = {.failure = "", .warps = 0}, }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/Data/Json_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/Data/Json_Tests.cpp index d8badf0286..d8a3bccffc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/Data/Json_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/Data/Json_Tests.cpp @@ -32,8 +32,8 @@ struct ExportCase{ }; const ExportCase CASES[] = { - {.input = {.id = "00.05"}, .expectation = {.menu = "before_pokedex"}}, - {.input = {.id = "00.05", .custom = true}, .expectation = { + {.input = {.id = "02.01"}, .expectation = {.menu = "before_pokedex"}}, + {.input = {.id = "02.01", .custom = true}, .expectation = { .menu = "full", .native_json = R"({"menu":"full","supplies":{"potions":2,"antidotes":3,"parlyz_heals":4,"pocket":["antidote",""],"status":"PSN","hurt":true,"hp_red":true,"hp_fill":0.25,"lead":{"species":"wartortle","moves":[{"move":"bite","pp":0}],"moves_through_level":18,"moves_read":true,"level":19,"stats":{"hp":50,"attack":20,"defense":30,"sp_attack":40,"sp_defense":35,"speed":25}},"protected_slots":[0,2],"foes":["staryu"],"trainer":"misty","risk":"high","foe_out":"staryu","wild_foes":["pidgey"]}})" }}, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.cpp index 58f0cef9cd..0e68163a75 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.cpp @@ -58,8 +58,8 @@ std::unique_ptr AutoStory_Descriptor::make_stats() const{ namespace{ -// The start and end dropdowns' entries: the table's checkpoints, 00.01 to -// 00.12b. The options hold a reference to it. +// The start and end dropdowns' entries: the table's checkpoints, 01.01 to +// 04.03. The options hold a reference to it. const StringSelectDatabase& checkpoint_database(){ static const std::vector labels = []{ std::vector result; @@ -82,37 +82,37 @@ const std::string KEEP_START_FRAME_TEXT = const std::string RUN_STARTER_RNG_TEXT = "Run Starter RNG in AutoStory:
Off by default. Instead of stopping for them, run SID Helper's steps on the " "new game's keyboard when the RNG plan has no SID, and Starter RNG's attempts from a save south of the table at the " - "end of 00.04, as the RNG plan lists them. A shiny Squirtle goes on to the rival's battle, saves after it and the run " + "end of 01.05, as the RNG plan lists them. A shiny Squirtle goes on to the rival's battle, saves after it and the run " "goes on; otherwise the run stops with the save south of the table.
" "SID Helper's timing needs the text speed and button settings already saved, as with Stop for SID Helper."; const std::string RUN_GIFT_RNG_TEXT = - "Run Gift RNG in AutoStory:
Off by default. After 00.12 saves beside the Magikarp salesman in Route 4's " + "Run Gift RNG in AutoStory:
Off by default. After 04.02 saves beside the Magikarp salesman in Route 4's " "Pokemon Center, run Gift RNG's attempts for the Magikarp from that save, as the RNG plan lists them for its TID and " - "SID (set by Run Starter RNG in AutoStory, or typed in). A shiny Magikarp is saved there (00.12b) and the run goes " + "SID (set by Run Starter RNG in AutoStory, or typed in). A shiny Magikarp is saved there (04.03) and the run goes " "on; otherwise the run stops with the save beside the salesman.
" - "To try again from that save, start at 00.12b with this on: it loads the save and runs the attempts first. " - "After Gift RNG run by hand, start at 00.12b with this off.
" + "To try again from that save, start at 04.03 with this on: it loads the save and runs the attempts first. " + "After Gift RNG run by hand, start at 04.03 with this off.
" "English only. The Magikarp costs 500 and needs a free party slot; AutoStory's options leave the text fast."; AutoStory::AutoStory() : RUN(checkpoint_database(), Pokemon::FireRedLeafGreenLanguages_Database()) , NEW_GAME_FROM_TITLE( "New game from the title screen:
The game is on its title screen with no save data. " - "Needed to start at 00.01. Otherwise the program loads the save, which must be the one the start checkpoint begins from.", + "Needed to start at 01.01. Otherwise the program loads the save, which must be the one the start checkpoint begins from.", LockMode::LOCK_WHILE_RUNNING, true ) , PLAYER_NAME( false, - "Player name:
Typed on the new game's keyboard (00.01). Empty keeps the game's default name. " + "Player name:
Typed on the new game's keyboard (01.01). Empty keeps the game's default name. " "The rival always keeps the default name.", LockMode::LOCK_WHILE_RUNNING, "Kosmos", "" ) , STOP_FOR_SID_HELPER( - "Stop for SID Helper:
Off by default. At 00.01, stop on the player's keyboard with the name typed and OK not pressed, " - "where the SID Helper program starts. After SID Helper, start AutoStory at 00.01b, with the game as SID Helper left it " + "Stop for SID Helper:
Off by default. At 01.01, stop on the player's keyboard with the name typed and OK not pressed, " + "where the SID Helper program starts. After SID Helper, start AutoStory at 01.02, with the game as SID Helper left it " "(the Trainer Card, or HOME): it closes the card, sets the options and saves in the bedroom.
" "SID Helper needs the text speed and button settings already saved. On a cartridge with that save, choose NEW GAME " "by hand and start AutoStory on the first message.", @@ -120,10 +120,10 @@ AutoStory::AutoStory() false ) , STOP_FOR_STARTER_RNG( - "Stop for Starter RNG:
Off by default. At the end of 00.04, save south of the table facing Squirtle's ball " + "Stop for Starter RNG:
Off by default. At the end of 01.05, save south of the table facing Squirtle's ball " "and stop, where the Starter RNG program starts. After Starter RNG, save right after the rival's battle without moving " - "and start AutoStory at 00.05, listing the targets to try from the RNG plan.
" - "With this off, 00.04 and 00.04b run as one checkpoint, as before.", + "and start AutoStory at 02.01, listing the targets to try from the RNG plan.
" + "With this off, 01.05 and 01.06 run as one checkpoint, as before.", LockMode::LOCK_WHILE_RUNNING, false ) @@ -149,7 +149,7 @@ AutoStory::AutoStory() // The save loaded must be the one checkpoint `first` starts from: one left // by an earlier checkpoint (a run that failed before saving) would start -// it in the wrong place (console B, 2026-11-01: 00.09 on the forest's +// it in the wrong place (console B, 2026-11-01: 03.02 on the forest's // save). Checked on the SAVE card; a card that can't be read is let pass. static void check_start_save( SingleSwitchProgramEnvironment& env, StoryEnv& story, const StoryCheckpoint& checkpoint @@ -199,7 +199,7 @@ Pokemon::SegmentHooks story_hooks(SingleSwitchProgramEnvironment& env, StoryEnv& } // The save reloaded must be where the checkpoint starts: a save // that didn't happen leaves an older one (console B, 2026-11-02: - // 00.02 walked the bedroom's route in Pewter City). + // 01.03 walked the bedroom's route in Pewter City). try{ soft_reset(story.console, story.context); const std::string error = check_save_place(story, story.start_map); @@ -292,7 +292,7 @@ static void check_setup( throw UserSetupError(console, "The start checkpoint must not come after the end checkpoint."); } if (first == 0 && !new_game_from_title){ - throw UserSetupError(console, "Checkpoint 00.01 starts a new game: start on the title screen with no save."); + throw UserSetupError(console, "Checkpoint 01.01 starts a new game: start on the title screen with no save."); } if (first == 0){ check_player_name(console, player_name); @@ -361,7 +361,7 @@ static void stop_for_sid_helper( play_new_game_to_player_name(env.console, context, player_name); stop_for_handoff(env, notification, "Stopped for SID Helper: the player's name is typed and OK is not pressed. Run SID Helper now, " - "enter its Target Advances and # Candidate SIDs in the RNG plan, then start AutoStory at 00.01b." + "enter its Target Advances and # Candidate SIDs in the RNG plan, then start AutoStory at 01.02." ); } @@ -434,7 +434,7 @@ static void stop_for_starter_rng( "Run Starter RNG (Squirtle, FireRed, Sound " + sound + ") with attempt 1's Target Seed and Advances. " "If it hits the target and it isn't shiny, load this save and run the next attempt. If it is shiny, " "its SID is the one listed (or one of them): enter it as the RNG plan's SID. " - "Then save right after the rival's battle, without moving, and start AutoStory at 00.05.", + "Then save right after the rival's battle, without moving, and start AutoStory at 02.01.", attempts ); } @@ -472,7 +472,7 @@ static void run_story_rows( // SID Helper's steps in the program, from the player's keyboard: the name // typed, then the intro at SID Helper's timing into the bedroom, and the -// Trainer Card opened to read the TID. Ends on the card, where 00.01b +// Trainer Card opened to read the TID. Ends on the card, where 01.02 // starts. static void set_sid_in_program( SingleSwitchProgramEnvironment& env, ProControllerContext& context, @@ -491,7 +491,7 @@ static void set_sid_in_program( navigate_to_trainer_card(env.console, context); const std::optional tid = try_read_trainer_card_tid(env.console, context, language); if (!tid){ - env.console.log("Couldn't read the TID on the Trainer Card; 00.04 reads it again.", COLOR_ORANGE); + env.console.log("Couldn't read the TID on the Trainer Card; 01.05 reads it again.", COLOR_ORANGE); return; } env.console.log(rng_log_tid(*tid, true)); @@ -593,7 +593,7 @@ static bool run_gift_rng_in_program( } // After a shiny Squirtle: off its summary, and the rows to run next: the -// rival's battle, which saves (00.04b), and the rows after it to `last`. +// rival's battle, which saves (01.06), and the rows after it to `last`. // Until that save, a reload would load the save under the ball and lose // the shiny, so a failure stops the run instead. static StoryRunPlan after_shiny_starter( @@ -610,7 +610,7 @@ static StoryRunPlan after_shiny_starter( return plan; } -// After a shiny Magikarp: the rows to run next, from 00.12b, which leaves +// After a shiny Magikarp: the rows to run next, from 04.03, which leaves // its summary and saves, to `last`. Until that save, a failure stops the // run, as after a shiny Squirtle. static StoryRunPlan after_shiny_magikarp( @@ -638,8 +638,8 @@ static void send_story_finished( } StoryHandoffs AutoStory::story_handoffs() const{ - // Running Starter RNG here splits 00.04 at the ball as its stop does, - // and sets the SID at 00.01 when it isn't known. + // Running Starter RNG here splits 01.05 at the ball as its stop does, + // and sets the SID at 01.01 when it isn't known. return StoryHandoffs{ .sid_helper = RUN_STARTER_RNG ? static_cast(RNG_PLAN.SID).empty() : bool(STOP_FOR_SID_HELPER), .starter_rng = STOP_FOR_STARTER_RNG || RUN_STARTER_RNG, @@ -670,7 +670,7 @@ void AutoStory::program(SingleSwitchProgramEnvironment& env, ProControllerContex } if (plan.stop == StoryHandoff::SID_HELPER){ set_sid_in_program(env, context, player_name, RNG_PLAN, RUN.language()); - first = checkpoint_index(checkpoints, "00.01b"); + first = checkpoint_index(checkpoints, "01.02"); plan = plan_story_run(checkpoints, first, last, handoffs); } StoryEnv story = story_env(env, context, checkpoints[first], RUN.check_level(), KEEP_START_FRAME); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.h index 03849904cc..b21f9ed433 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory.h @@ -58,21 +58,21 @@ class AutoStory : public SingleSwitchProgramInstance{ SingleSwitchProgramEnvironment& env, ProControllerContext& context, StoryEnv& story, StoryExecutor& executor, StoryRunPlan plan ); - // After 00.04 saved under Squirtle's ball (row `ball_row`): the stop + // After 01.05 saved under Squirtle's ball (row `ball_row`): the stop // for Starter RNG, or its attempts run here. Returns the rows to run // after a shiny, or nothing once the run has stopped. std::optional after_starter_ball( SingleSwitchProgramEnvironment& env, ProControllerContext& context, StoryEnv& story, const StarterRngPlanned& planned, size_t ball_row ); - // Started at 00.12b (row `first`) with Run Gift RNG in AutoStory on, + // Started at 04.03 (row `first`) with Run Gift RNG in AutoStory on, // the save beside the salesman loaded: Gift RNG's attempts, then for a // shiny the rows after them. As run_story_plan() returns. std::optional run_from_gift_rng_save( SingleSwitchProgramEnvironment& env, ProControllerContext& context, StoryEnv& story, StoryExecutor& executor, size_t first ); - // After 00.12 saved beside the Magikarp salesman (row `salesman_row`): + // After 04.02 saved beside the Magikarp salesman (row `salesman_row`): // Gift RNG's attempts run here. Returns the rows to run after a shiny, // or nothing once the run has stopped. std::optional after_magikarp_salesman( @@ -91,7 +91,7 @@ class AutoStory : public SingleSwitchProgramInstance{ // Runs SID Helper's steps and Starter RNG's attempts in the program // instead of stopping for them. BooleanCheckBoxOption RUN_STARTER_RNG; - // Runs Gift RNG's attempts for the Magikarp in the program after 00.12. + // Runs Gift RNG's attempts for the Magikarp in the program after 04.02. BooleanCheckBoxOption RUN_GIFT_RNG; StarterRngPlanOptions RNG_PLAN; EventNotificationOption NOTIFICATION_SHINY; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryBattleDecisions.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryBattleDecisions.h index ffb4ec5568..914d5cb826 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryBattleDecisions.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryBattleDecisions.h @@ -134,7 +134,7 @@ class EvolutionHold{ // safely!"), the text box with no HP box and no arrow or YES/NO, as // "What? is evolving!" shows through the animation; not a // dark cave's overworld, whose black reads as the text box (console B, - // 2026-11-09, 00.28 hiker_lenny: three holds, then a stop). Nothing + // 2026-11-09, 08.01 hiker_lenny: three holds, then a stop). Nothing // is pressed while it shows, for at most EVOLUTION_HOLDS in all in a // battle, in case it is something else. bool holds(const BattleTextScreen& screen) const; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCeladon_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCeladon_Tests.cpp index c09b35a636..af222f36e8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCeladon_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCeladon_Tests.cpp @@ -2,12 +2,12 @@ * * From: https://github.com/PokemonAutomation/ * - * Rows from 00.26 on (StoryData/frlg-00.26.plan.json and after) on the - * overworld sim: 00.26 from where 00.25 ends, to the Fan Club's chairman, + * Rows from 07.01 on (StoryData/frlg-07.01.plan.json and after) on the + * overworld sim: 07.01 from where 06.04 ends, to the Fan Club's chairman, * north past Route 6's trainers, through the tree into Cerulean, to the * Bike Shop's clerk, the Mart and the nurse, with Oak's aide on - * Vermilion's (25, 7); and what its Mart step buys. 00.27 from where - * 00.26 ends, east over Route 9 to Route 10's Pokemon Center. + * Vermilion's (25, 7); and what its Mart step buys. 07.02 from where + * 07.01 ends, east over Route 9 to Route 10's Pokemon Center. * */ @@ -100,9 +100,9 @@ MapData& map_named(std::vector& maps, const std::string& name){ throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "No map " + name + "."); } -// The maps as 00.25 leaves them: story_maps() with Oak's aide on +// The maps as 06.04 leaves them: story_maps() with Oak's aide on // Vermilion's (25, 7), shown by Lt. Surge's win, and Route 6's Jeff -// beaten (00.21). Isabelle and Elijah are not. +// beaten (05.10). Isabelle and Elijah are not. std::vector maps_after_surge(){ const std::vector all = overworld_maps(); std::set flags = map_flag_set(all, "after_hall_of_fame"); @@ -157,23 +157,23 @@ UnitTestResult starts_where_ends(const std::string& previous, const std::string& return true; } -// 00.26 starts at Vermilion's nurse, where 00.25 ends. +// 07.01 starts at Vermilion's nurse, where 06.04 ends. UnitTestResult test_starts_where_lt_surge_ends(){ - return starts_where_ends("00.25", "00.26"); + return starts_where_ends("06.04", "07.01"); } -// 00.27 starts at Cerulean's nurse, where 00.26 ends. +// 07.02 starts at Cerulean's nurse, where 07.01 ends. UnitTestResult test_starts_where_bicycle_ends(){ - return starts_where_ends("00.26", "00.27"); + return starts_where_ends("07.01", "07.02"); } -// 00.26 on the sim from Vermilion's nurse to Cerulean's, the maps as -// 00.25 leaves them: no trainer meets the player (Isabelle and Elijah +// 07.01 on the sim from Vermilion's nurse to Cerulean's, the maps as +// 06.04 leaves them: no trainer meets the player (Isabelle and Elijah // stay unfought), no violation, each talk faces the one it's for (the // chairman beside the player, the Bike Shop's clerk across the counter), // and the walk ends at Cerulean's nurse. UnitTestResult test_bike_voucher_row(){ - const StoryCheckpoint& row = checkpoint("00.26"); + const StoryCheckpoint& row = checkpoint("07.01"); const std::vector maps = maps_after_surge(); const MapData& city = *std::find_if(maps.begin(), maps.end(), [](const MapData& map){ return map.name == VERMILION; }); if (object_at(city, {25, 7}) == nullptr){ @@ -188,7 +188,7 @@ UnitTestResult test_bike_voucher_row(){ const bool counter = here.map == BIKE_SHOP; const MapObject* person = object_ahead(maps, here, counter ? 2 : 1); if (person == nullptr || (counter && object_ahead(maps, here, 1) != nullptr)){ - return std::format("00.26/{}: no one to talk to from {}.", step.name, to_string(sim.state().position)); + return std::format("07.01/{}: no one to talk to from {}.", step.name, to_string(sim.state().position)); } talked_to.push_back(person->name); } @@ -198,43 +198,43 @@ UnitTestResult test_bike_voucher_row(){ // A walk the sim's player didn't finish, stopped by someone the // maps the program plans on don't have. if (!(sim.state().position == MapPosition{at.map, at.tile})){ - return std::format("00.26/{}: expected {}, on {}.", step.name, to_string(MapPosition{at.map, at.tile}), to_string(sim.state().position)); + return std::format("07.01/{}: expected {}, on {}.", step.name, to_string(MapPosition{at.map, at.tile}), to_string(sim.state().position)); } } if (talked_to != std::vector{"gentleman", "man"}){ - return "00.26: expected to talk to the chairman, then the Bike Shop's clerk."; + return "07.01: expected to talk to the chairman, then the Bike Shop's clerk."; } if (!sim.state().trainers_beaten.empty() || !sim.state().violations.empty()){ - return "00.26: a battle or a violation on the way" + (sim.state().violations.empty() ? std::string(".") : ": " + sim.state().violations.back()); + return "07.01: a battle or a violation on the way" + (sim.state().violations.empty() ? std::string(".") : ": " + sim.state().violations.back()); } const MapPosition nurse{CERULEAN_CENTER, {7, 4}}; if (!(sim.state().position == nurse)){ - return "00.26: ended on " + to_string(sim.state().position) + ", not Cerulean's nurse."; + return "07.01: ended on " + to_string(sim.state().position) + ", not Cerulean's nurse."; } return true; } -// 00.26's Mart step, at its money floor: 5 Repels and 2 Escape Ropes, +// 07.01's Mart step, at its money floor: 5 Repels and 2 Escape Ropes, // and 3000 or more left. UnitTestResult test_repels_and_escape_ropes(){ - const StoryCheckpoint& row = checkpoint("00.26"); + const StoryCheckpoint& row = checkpoint("07.01"); const auto step = std::find_if(row.steps.begin(), row.steps.end(), [](const StoryStep& data){ return data.action == MART_ACTION; }); if (step == row.steps.end()){ - return "00.26: expected a Mart step."; + return "07.01: expected a Mart step."; } const std::optional parsed = mart_plan_of(step->args); if (!parsed){ - return "00.26: expected a Mart plan."; + return "07.01: expected a Mart plan."; } const MartPlan& plan = *parsed; if (plan.map != CERULEAN_MART || !plan.money_floor){ - return "00.26: expected the Mart step at Cerulean's Mart, with a money floor."; + return "07.01: expected the Mart step at Cerulean's Mart, with a money floor."; } const std::optional> buys = plan_mart_buys(mart_stock(plan.map), plan, *plan.money_floor); if (!buys){ - return "00.26: the Mart step names an item Cerulean's Mart doesn't sell."; + return "07.01: the Mart step names an item Cerulean's Mart doesn't sell."; } size_t repels = 0; size_t escape_ropes = 0; @@ -245,18 +245,18 @@ UnitTestResult test_repels_and_escape_ropes(){ spent += buy.cost; } if (repels < 5 || escape_ropes != 2 || *plan.money_floor < spent + 3000){ - return std::format("00.26: bought {} Repels and {} Escape Ropes for {} from {}.", repels, escape_ropes, spent, *plan.money_floor); + return std::format("07.01: bought {} Repels and {} Escape Ropes for {} from {}.", repels, escape_ropes, spent, *plan.money_floor); } return true; } -// 00.27 on the sim from Cerulean's nurse to Route 10's, the maps as 00.26 +// 07.02 on the sim from Cerulean's nurse to Route 10's, the maps as 07.01 // leaves them, both trees grown back: the trees cut, Alicia, Jeremy and // Conner fought where the table steps into their lines and no one else // met (Brice, Caitlin and the rest unfought), no violation, each step // ending where the table says, and the walk ending at Route 10's nurse. UnitTestResult test_route10_row(){ - const StoryCheckpoint& row = checkpoint("00.27"); + const StoryCheckpoint& row = checkpoint("07.02"); const std::vector maps = maps_after_surge(); StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); OverworldSim sim(maps, MapPosition{at.map, at.tile}, *at.facing); @@ -267,23 +267,23 @@ UnitTestResult test_route10_row(){ // A step into a trainer's line ends where the battle after it says. const bool into_line = step.kind == StoryStepKind::STEP && !step.action.empty(); if (!into_line && !(sim.state().position == MapPosition{at.map, at.tile})){ - return std::format("00.27/{}: expected {}, on {}.", step.name, to_string(MapPosition{at.map, at.tile}), to_string(sim.state().position)); + return std::format("07.02/{}: expected {}, on {}.", step.name, to_string(MapPosition{at.map, at.tile}), to_string(sim.state().position)); } } if (sim.state().trainers_beaten != std::vector{"picnicker", "hiker", "bug_catcher"}){ - return "00.27: expected to fight Alicia, Jeremy and Conner, no one else; fought " + std::to_string(sim.state().trainers_beaten.size()) + "."; + return "07.02: expected to fight Alicia, Jeremy and Conner, no one else; fought " + std::to_string(sim.state().trainers_beaten.size()) + "."; } if (!sim.state().violations.empty()){ - return "00.27: a violation on the way: " + sim.state().violations.back(); + return "07.02: a violation on the way: " + sim.state().violations.back(); } const MapPosition nurse{ROUTE10_CENTER, {7, 4}}; if (!(sim.state().position == nurse)){ - return "00.27: ended on " + to_string(sim.state().position) + ", not Route 10's nurse."; + return "07.02: ended on " + to_string(sim.state().position) + ", not Route 10's nurse."; } return true; } -// The next row starts from 00.27's save in Route 10's Center, whose save +// The next row starts from 07.02's save in Route 10's Center, whose save // card says ROUTE 10: a place of its own, not Route 1's. UnitTestResult test_route10_save_place(){ if (save_card_place(ROUTE10_CENTER) != "route-10" || save_card_place("Route1") == "route-10"){ @@ -292,7 +292,7 @@ UnitTestResult test_route10_save_place(){ return true; } -// 00.27's walk from Route 9 (70, 8) to Route 10's nurse: its steps from +// 07.02's walk from Route 9 (70, 8) to Route 10's nurse: its steps from // route10_ledge_end to route10_nurse. Console B, 2026-11-09, the walk // then planned in one ended its open legs a tile from a blocker, and both // runs ended "no fade in and out" at the Center's door (13, 20): @@ -303,14 +303,14 @@ UnitTestResult test_route10_save_place(){ // - run 2: the leg down column 16 ended a tile short, on (16, 20), west // 3 met the Center's east wall (15, 20) and north 1 ended on (16, 19). std::vector route10_walk(){ - const StoryCheckpoint& row = checkpoint("00.27"); + const StoryCheckpoint& row = checkpoint("07.02"); const auto named = [&row](std::string_view name){ return std::find_if(row.steps.begin(), row.steps.end(), [&](const StoryStep& data){ return data.name == name; }); }; const auto first = named("route10_ledge_end"); const auto last = named("route10_nurse"); if (first == row.steps.end() || last == row.steps.end() || last < first){ - throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "00.27: no steps route10_ledge_end to route10_nurse."); + throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "07.02: no steps route10_ledge_end to route10_nurse."); } return std::vector(first, last + 1); } @@ -322,7 +322,7 @@ const StoryPose ROUTE10_WALK_START{ROUTE9, {70, 8}, Direction::EAST}; std::string route10_walk_rest(OverworldSim& sim, StoryPose at, const std::vector& steps, size_t first){ std::string failure; for (size_t c = first; c < steps.size() && failure.empty(); c++){ - failure = row_step_on_sim(sim, at, steps[c], "00.27"); + failure = row_step_on_sim(sim, at, steps[c], "07.02"); } const MapPosition nurse{ROUTE10_CENTER, {7, 4}}; if (!failure.empty() || !(sim.state().position == nurse)){ @@ -407,39 +407,39 @@ UnitTestResult test_route10_tile_off_after_open_legs(){ const AutoStoryCeladonCase AUTO_STORY_CELADON_CASES[] = { { - .input = {"00.26 starts where 00.25 ends", test_starts_where_lt_surge_ends}, + .input = {"07.01 starts where 06.04 ends", test_starts_where_lt_surge_ends}, .expectation = {}, }, { - .input = {"00.26 the Fan Club, Route 6 and the Underground Path north, the Bike Shop, past Oak's aide", test_bike_voucher_row}, + .input = {"07.01 the Fan Club, Route 6 and the Underground Path north, the Bike Shop, past Oak's aide", test_bike_voucher_row}, .expectation = {}, }, { - .input = {"00.26 Repels and Escape Ropes, 3000 left", test_repels_and_escape_ropes}, + .input = {"07.01 Repels and Escape Ropes, 3000 left", test_repels_and_escape_ropes}, .expectation = {}, }, { - .input = {"00.27 starts where 00.26 ends", test_starts_where_bicycle_ends}, + .input = {"07.02 starts where 07.01 ends", test_starts_where_bicycle_ends}, .expectation = {}, }, { - .input = {"00.27 the two trees, Route 9's Alicia, Jeremy and Conner, to Route 10's Pokemon Center", test_route10_row}, + .input = {"07.02 the two trees, Route 9's Alicia, Jeremy and Conner, to Route 10's Pokemon Center", test_route10_row}, .expectation = {}, }, { - .input = {"00.27 saves in Route 10's Pokemon Center, ROUTE 10 on the save card", test_route10_save_place}, + .input = {"07.02 saves in Route 10's Pokemon Center, ROUTE 10 on the save card", test_route10_save_place}, .expectation = {}, }, { - .input = {"00.27 route10_nurse: the crossing onto Route 10 not held up", test_route10_crossing_not_held_up}, + .input = {"07.02 route10_nurse: the crossing onto Route 10 not held up", test_route10_crossing_not_held_up}, .expectation = {}, }, { - .input = {"00.27 route10_nurse: the leg down column 16 a tile short", test_route10_column_16_short}, + .input = {"07.02 route10_nurse: the leg down column 16 a tile short", test_route10_column_16_short}, .expectation = {}, }, { - .input = {"00.27 route10_nurse: a tile off after each open leg", test_route10_tile_off_after_open_legs}, + .input = {"07.02 route10_nurse: a tile off after each open leg", test_route10_tile_off_after_open_legs}, .expectation = {}, }, }; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCheckpoints.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCheckpoints.h index 4c7861c8f1..5defa199a4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCheckpoints.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryCheckpoints.h @@ -80,14 +80,14 @@ struct StoryRunPlan{ // plays the new game to the player's keyboard and stops there. // STARTER_RNG: the run stops after `rows`, the last of which saves at // the starter's ball. GIFT_RNG: likewise, beside the Magikarp salesman; - // with `rows` empty, the run started at 00.12b and takes Gift RNG from + // with `rows` empty, the run started at 04.03 and takes Gift RNG from // the save beside the salesman, where the row before `first` ends. StoryHandoff stop = StoryHandoff::NONE; }; // The rows of `checkpoints` from `first` to `last`, both inclusive, as a // run with `handoffs` takes them: live-start rows only when the run -// starts there (00.12b with Gift RNG's handoff on starts at the handoff +// starts there (04.03 with Gift RNG's handoff on starts at the handoff // instead), a run that reaches a handoff that is on stops for it, and // a STARTER_RNG row whose handoff is off is joined with the row after it, // under its own id. diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryChoice_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryChoice_Tests.cpp index 4c53ca27ac..f7aab6bd4b 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryChoice_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryChoice_Tests.cpp @@ -133,7 +133,7 @@ std::vector choice_cases(){ }, // The console has no reader for the prompt's text: the table has // walked the player to face the wanted fossil, so YES takes it - // (console B: answering NO and stopping left 00.13 stuck there). + // (console B: answering NO and stopping left 04.05 stuck there). { .name = "an unread prompt: YES, facing the wanted fossil", .setup = [](FakeFossilRoom& room){ room.offer_readable = false; }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryEvents.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryEvents.cpp index e84549216d..997160b306 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryEvents.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryEvents.cpp @@ -293,7 +293,7 @@ const std::vector& story_maps(){ std::set flags = map_flag_set(all, "after_hall_of_fame"); flags.merge(map_flag_set(all, "new_game")); // The one ball the story picks up in its way: B2F's MOON STONE - // blocks column 2 of the arrow floor (00.32's moon_stone). + // blocks column 2 of the arrow floor (09.02's moon_stone). flags.insert("FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE"); return overworld_maps(flags); }(); @@ -425,7 +425,7 @@ std::optional wall_beside(const MapData& map, const TilePos& tile){ namespace{ // A talk to a person or an item ball opens a message; an A that opens -// none faced nothing (00.31 b3f_rare_candy, console B, 2026-11-10: one A, +// none faced nothing (09.01 b3f_rare_candy, console B, 2026-11-10: one A, // "done", on the wrong floor). The message is left open for the next step. bool talk_opens_message(ConsoleHandle& console, ProControllerContext& context){ WhiteDialogWatcher opened(COLOR_RED); 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 e68ca120d1..bfef69ed47 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryFaultSweep_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryFaultSweep_Tests.cpp @@ -8,18 +8,18 @@ * - SCENE_END_POSE: a step the sim does not play (a scene, a talk, an * event) that moved the player leaves them on another walkable tile * within one of the table's pose, while the program goes on from the - * table's (BDSP 00.03, lab-B 2026-11-09). + * table's (BDSP 01.04, lab-B 2026-11-09). * - WILD_BATTLES: wild battles at the game's own odds on every map with - * land encounters, over GAME_ODDS_SEEDS seeds (00.28's Rock Tunnel). + * land encounters, over GAME_ODDS_SEEDS seeds (08.01's Rock Tunnel). * - LATE_FADE: every warp's fade ends LATE_FADE later than the sim's - * usual (00.27's warp to Cerulean City). + * usual (07.02's warp to Cerulean City). * - DARK_CAVE: the caves without Flash dark (DARK_MAPS), so each * battle there ends on the dark cave's overworld, with no wild - * battles and with them at the game's odds (00.28 hiker_lenny, lab-B + * battles and with them at the game's odds (08.01 hiker_lenny, lab-B * 2026-11-09). * - LOST_TAP: a wild battle on each tile of each step into a trainer's * line before its last, so the next tap comes as the overworld comes - * back, inside the lockout after a battle (00.28 winston_line, console + * back, inside the lockout after a battle (08.01 winston_line, console * B, 2026-11-09 15:50). The step alone, from where the clean run took * it, on its map made a wild floor. * @@ -91,7 +91,7 @@ std::string_view fault_class_name(FaultClass fault){ // Sweeps the program fails today, by test name, with the likely fix. const std::map KNOWN_FAILING{ - {"PokemonFRLG::AutoStory - Fault sweep: 00.06, wild battles at the game's odds", + {"PokemonFRLG::AutoStory - Fault sweep: 02.02, wild battles at the game's odds", "below_oak on Route 1 gives up after 9 stops part-way (seeds 16, 30): count stops that make no progress, not every battle"}, }; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind.h index 8cbbc577c4..8cc899f6a4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind.h @@ -55,7 +55,7 @@ namespace PokemonFRLG{ GrindResult run_grind(Logger& logger, GrindActions& actions, const MemberReader& reader, const GrindPlan& plan); // Before the walk out to the patch: whether the member `plan` grinds, as -// read, already has its level. Nothing is fought. 00.24 walked to Route +// read, already has its level. Nothing is fought. 06.03 walked to Route // 6's grass and back at Lv29 (console B, 2026-11-03). bool grind_reached_already(Logger& logger, GrindActions& actions, const MemberReader& reader, const GrindPlan& plan); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind_Tests.cpp index f240de6879..599c653db3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryGrind_Tests.cpp @@ -303,7 +303,7 @@ UnitTestResult test_grind_args(){ } // The check in the Center before the walk out: a lead already at the -// plan's level needs no trip (00.24 walked to Route 6's grass and back at +// plan's level needs no trip (06.03 walked to Route 6's grass and back at // Lv29, console B, 2026-11-03); one short of it does. Nothing is fought // either way. UnitTestResult test_grind_reached_already(){ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryHideout_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryHideout_Tests.cpp index 0f093f2675..0e2c4b6c10 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryHideout_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryHideout_Tests.cpp @@ -137,7 +137,7 @@ std::string poster_on_sim(){ const MapPosition below_poster{"CeladonCity_GameCorner", {GAME_CORNER_POSTER.x, GAME_CORNER_POSTER.y + 1}}; OverworldSim sim({room}, below_poster, Direction::NORTH); StoryPose at{below_poster.map, below_poster.point, Direction::NORTH}; - const std::string failure = row_step_on_sim(sim, at, poster_switch_step("poster_switch"), "00.31"); + const std::string failure = row_step_on_sim(sim, at, poster_switch_step("poster_switch"), "09.01"); if (!failure.empty()){ return failure; } @@ -183,7 +183,7 @@ std::string lift_on_sim(){ const MapPosition below_door = exits[1]; OverworldSim sim(maps, below_door, Direction::NORTH, script); StoryPose at{below_door.map, below_door.point, Direction::NORTH}; - const std::string failure = row_step_on_sim(sim, at, lift_floor_step("lift_to_b4f", "B2F", "B4F"), "00.32"); + const std::string failure = row_step_on_sim(sim, at, lift_floor_step("lift_to_b4f", "B2F", "B4F"), "09.02"); if (!failure.empty()){ return failure; } @@ -279,7 +279,7 @@ std::string short_holds_on_sim(const MapPosition& start, Direction facing, const return ""; } -// 00.31's taps through B3F's arrow floor (frlg-00.31.plan.json's +// 09.01's taps through B3F's arrow floor (frlg-09.01.plan.json's // b3f_arrow_maze and b3f_back_to_candy_row, pokeguy's way): down from // the stairs (18, 2) to below the stairs to B4F (15, 19), and back from // them (15, 18) to the stop (10, 13). The routes planned after them, @@ -330,7 +330,7 @@ UnitTestResult test_b3f_maze_taps(){ return true; } -// 00.32's taps (frlg-00.32.plan.json): B3F from below its Rare Candy up +// 09.02's taps (frlg-09.02.plan.json): B3F from below its Rare Candy up // to the top corridor, and B2F's arrows to the MOON STONE's stop and on // to the lift room's stop (13, 20), up to row 17 and on to below the // lift, and B4F from the left Grunt to the right one, Giovanni and the @@ -507,7 +507,7 @@ const AutoStoryHideoutBodyCase HIDEOUT_BODY_CASES[] = { }, { .input = {.name = "B2F's arrow floor to the lift a tap at a time", .body = test_b2f_maze_taps}, - .expectation = {.description = "00.32's taps and the routes between them, any turn dropped or hold short"}, + .expectation = {.description = "09.02's taps and the routes between them, any turn dropped or hold short"}, }, { .input = {.name = "B4F's left Grunt from the lift's exit", .body = test_b4f_left_guard_from_below_lift_door}, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryLavender_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryLavender_Tests.cpp index 84ff385466..fa7c9d8258 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryLavender_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryLavender_Tests.cpp @@ -2,10 +2,10 @@ * * From: https://github.com/PokemonAutomation/ * - * Rows from 00.28 on (PokemonFRLG_AutoStoryTableLavender.cpp) on the - * overworld sim: 00.28 from Route 10's Pokemon Center through Rock Tunnel - * to its south mouth, 00.29 down Route 10 to Lavender Town's Center, and - * 00.30 west over Route 8 and under Saffron to Celadon City. + * Rows from 08.01 on (PokemonFRLG_AutoStoryTableLavender.cpp) on the + * overworld sim: 08.01 from Route 10's Pokemon Center through Rock Tunnel + * to its south mouth, 08.02 down Route 10 to Lavender Town's Center, and + * 08.03 west over Route 8 and under Saffron to Celadon City. * Each row whole, each open leg a tile short or long, and a wild battle * on every open leg in the tunnel. * @@ -92,7 +92,7 @@ const StoryCheckpoint& checkpoint(std::string_view id){ return *row; } -// The maps as 00.27 leaves them: the story's flags, Rock Tunnel's and +// The maps as 07.02 leaves them: the story's flags, Rock Tunnel's and // Route 10's trainers unfought. std::vector maps_after_route10(){ const std::vector all = overworld_maps(); @@ -159,20 +159,20 @@ const std::vector ROCK_TUNNEL_TRAINERS{ "poke_maniac", "poke_maniac", "picnicker", "hiker", "hiker", "picnicker", "hiker", "poke_maniac", "picnicker", }; -// 00.28 on the sim: the tree cut, the nine trainers fought where the +// 08.01 on the sim: the tree cut, the nine trainers fought where the // table steps into their lines (Cooper by the walker, on the leg past // him), no one else met, and the walk out of the south mouth. UnitTestResult test_rock_tunnel_row(Logger&){ - return row_on_sim("00.28", SimScript{}, {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); + return row_on_sim("08.01", SimScript{}, {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); } -// 00.28 with a wild battle on the 3rd step on the tunnel's floor, mid-way +// 08.01 with a wild battle on the 3rd step on the tunnel's floor, mid-way // down the leg to the wall (17, 8): the walker runs, holds the leg to its // wall again, and nothing else changes. UnitTestResult test_rock_tunnel_wild_battles(Logger&){ SimScript script; script.encounters.push_back(SimEncounter{.grass_step = 3}); - return row_on_sim("00.28", script, {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); + return row_on_sim("08.01", script, {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); } // Wild battles on the tunnel's floor, `gaps` steps apart in turn, from the @@ -187,7 +187,7 @@ SimScript battles_every(const std::vector& gaps){ return script; } -// 00.28's step `name`: where it is in the row. +// 08.01's step `name`: where it is in the row. size_t step_index(const StoryCheckpoint& row, std::string_view name){ for (size_t c = 0; c < row.steps.size(); c++){ if (row.steps[c].name == name){ @@ -204,7 +204,7 @@ size_t step_index(const StoryCheckpoint& row, std::string_view name){ // ("stopped part-way 9 times"). From Winston's tile, with a battle every // 10 to 14 steps, the steps from below_martha_line on reach Martha's line. UnitTestResult test_b1f_row37_battles_every_12(Logger&){ - const StoryCheckpoint& row = checkpoint("00.28"); + const StoryCheckpoint& row = checkpoint("08.01"); const size_t first = step_index(row, "below_martha_line"); StoryPose at{ROCK_TUNNEL_B1F, {29, 37}, Direction::NORTH}; OverworldSim sim(maps_after_route10(), MapPosition{at.map, at.tile}, *at.facing, battles_every({12, 10, 14, 11, 13})); @@ -221,7 +221,7 @@ UnitTestResult test_b1f_row37_battles_every_12(Logger&){ // From Winston's tile, below_martha_line, martha_line and Martha's battle // on `sim`: the failure, or empty once Martha alone is fought. std::string winston_to_martha(OverworldSim& sim){ - const StoryCheckpoint& row = checkpoint("00.28"); + const StoryCheckpoint& row = checkpoint("08.01"); StoryPose at{ROCK_TUNNEL_B1F, {29, 37}, Direction::NORTH}; for (size_t c = step_index(row, "below_martha_line"); c <= step_index(row, "picnicker_martha"); c++){ if (const std::string failure = row_step_on_sim(sim, at, row.steps[c], row.id); !failure.empty()){ @@ -255,14 +255,14 @@ UnitTestResult test_b1f_martha_after_row38_battle(Logger&){ return true; } -// Regression: console B, 2026-11-09 15:50, 00.28 winston_line, dark: from +// Regression: console B, 2026-11-09 15:50, 08.01 winston_line, dark: from // (32, 37) west into Winston's line, a wild battle on the 2nd tap's tile // (30, 37), run from; the 3rd tap, sent as the battle's black ended, was // lost, and the step failed no_trainer. After the battle the next tap // waits for the overworld (wait_out_battle_exit()): Winston sees the // player on (29, 37). UnitTestResult test_winston_line_battle_on_tap_2(Logger&){ - const StoryCheckpoint& row = checkpoint("00.28"); + const StoryCheckpoint& row = checkpoint("08.01"); SimScript script; script.dark_maps = {ROCK_TUNNEL_1F, ROCK_TUNNEL_B1F}; script.wild_floor_maps = {ROCK_TUNNEL_B1F}; @@ -285,13 +285,13 @@ UnitTestResult test_winston_line_battle_on_tap_2(Logger&){ // Rock Tunnel has no Flash: both floors are dark. const std::set ROCK_TUNNEL_DARK{ROCK_TUNNEL_1F, ROCK_TUNNEL_B1F}; -// Regression: console B, 2026-11-09, 00.28 hiker_lenny: won, and the dark +// Regression: console B, 2026-11-09, 08.01 hiker_lenny: won, and the dark // overworld after it was taken for an evolution until fight_battle() gave -// up. 00.28 dark: every trainer's battle ends on the dark cave's overworld. +// up. 08.01 dark: every trainer's battle ends on the dark cave's overworld. UnitTestResult test_rock_tunnel_dark_battle_ends(Logger&){ SimScript script; script.dark_maps = ROCK_TUNNEL_DARK; - return row_on_sim("00.28", script, {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); + return row_on_sim("08.01", script, {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); } // below_martha_line as `legs` from Winston's tile (29, 37) on `sim`, by the @@ -373,7 +373,7 @@ UnitTestResult test_b1f_dark_martha_battle_anywhere(Logger&){ return true; } -// 00.28 whole with a wild battle every 7 to 25 steps on the tunnel's floor, +// 08.01 whole with a wild battle every 7 to 25 steps on the tunnel's floor, // the gaps drawn from each of these seeds: the row ends where it should. UnitTestResult test_rock_tunnel_frequent_battles(Logger&){ std::string failures; @@ -385,7 +385,7 @@ UnitTestResult test_rock_tunnel_frequent_battles(Logger&){ gaps.push_back(gap(random)); } const UnitTestResult result = row_on_sim( - "00.28", battles_every(gaps), {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}} + "08.01", battles_every(gaps), {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}} ); if (result.result != UnitTestResult::PASSED){ failures += std::format("{}Seed {}: {}", failures.empty() ? "" : " | ", seed, result.message); @@ -465,7 +465,7 @@ std::string numbers_summary(const std::vector& runs){ ); } -// The land encounter rates of the maps 00.28 and 00.29 walk (pokefirered +// The land encounter rates of the maps 08.01 and 08.02 walk (pokefirered // src/data/wild_encounters.json, FireRed). const std::map ROCK_TUNNEL_ENCOUNTER_RATES{ {ROCK_TUNNEL_1F, 7}, @@ -475,12 +475,12 @@ const std::map ROCK_TUNNEL_ENCOUNTER_RATES{ constexpr unsigned GAME_ODDS_SEEDS = 30; -// 00.28 whole, its wild battles at the game's own odds (OverworldSim:: +// 08.01 whole, its wild battles at the game's own odds (OverworldSim:: // rolls_encounter()), from each of these seeds: every run ends where it // should. Logs the runs' numbers and the step taps the game ignored. UnitTestResult test_rock_tunnel_game_odds(Logger& logger){ - OverworldSim clean_sim = row_start_sim("00.28", SimScript{}); - if (const UnitTestResult clean = row_checked(clean_sim, "00.28", {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); clean.result != UnitTestResult::PASSED){ + OverworldSim clean_sim = row_start_sim("08.01", SimScript{}); + if (const UnitTestResult clean = row_checked(clean_sim, "08.01", {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); clean.result != UnitTestResult::PASSED){ return clean; } std::vector runs; @@ -491,8 +491,8 @@ UnitTestResult test_rock_tunnel_game_odds(Logger& logger){ script.encounter_rates = ROCK_TUNNEL_ENCOUNTER_RATES; script.encounter_seed = seed; script.dark_maps = ROCK_TUNNEL_DARK; - OverworldSim sim = row_start_sim("00.28", script); - const UnitTestResult result = row_checked(sim, "00.28", {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); + OverworldSim sim = row_start_sim("08.01", script); + const UnitTestResult result = row_checked(sim, "08.01", {ROCK_TUNNEL_TRAINERS}, MapPosition{ROUTE10, {8, 58}}); const bool passed = result.result == UnitTestResult::PASSED; runs.push_back(row_numbers(sim.state(), passed, clean_sim.state())); ignored += sim.state().step_taps_ignored; @@ -501,7 +501,7 @@ UnitTestResult test_rock_tunnel_game_odds(Logger& logger){ } } logger.log(std::format( - "00.28 at the game's encounter odds, {} step taps ignored: {}", ignored, numbers_summary(runs) + "08.01 at the game's encounter odds, {} step taps ignored: {}", ignored, numbers_summary(runs) )); if (!failures.empty()){ return failures; @@ -510,9 +510,9 @@ UnitTestResult test_rock_tunnel_game_odds(Logger& logger){ } -// 00.29 on the sim: no trainer met, the ledge hopped, Lavender's nurse. +// 08.02 on the sim: no trainer met, the ledge hopped, Lavender's nurse. UnitTestResult test_lavender_row(Logger&){ - return row_on_sim("00.29", SimScript{}, {{}}, MapPosition{LAVENDER_CENTER, {7, 4}}); + return row_on_sim("08.02", SimScript{}, {{}}, MapPosition{LAVENDER_CENTER, {7, 4}}); } // Where an open leg of two tiles or more ends a tile short or long, the @@ -570,15 +570,15 @@ UnitTestResult tile_off_after_open_legs(std::string_view id){ } UnitTestResult test_rock_tunnel_tile_off(Logger&){ - return tile_off_after_open_legs("00.28"); + return tile_off_after_open_legs("08.01"); } UnitTestResult test_lavender_tile_off(Logger&){ - return tile_off_after_open_legs("00.29"); + return tile_off_after_open_legs("08.02"); } -// 00.29 saves in Lavender Town's Pokemon Center, LAVENDER TOWN on the -// save card; 00.28 on Route 10. +// 08.02 saves in Lavender Town's Pokemon Center, LAVENDER TOWN on the +// save card; 08.01 on Route 10. UnitTestResult test_save_places(Logger&){ if (save_card_place(LAVENDER_CENTER) != "lavender-town" || save_card_place(ROUTE10) != "route-10"){ return "Wrong save card places for Lavender Town's Center or Route 10."; @@ -586,18 +586,18 @@ UnitTestResult test_save_places(Logger&){ return true; } -// 00.30 on the sim: the Mart, Route 8 with only Rich fought (the walker +// 08.03 on the sim: the Mart, Route 8 with only Rich fought (the walker // keeps out of the other trainers' lines), the Underground Path, the // Pidgey's grass and Celadon City, below its Center's door. The Center // has no map: its way in is stubbed. UnitTestResult test_celadon_way_row(Logger&){ - return row_on_sim("00.30", SimScript{}, {{"old_man_1"}}, MapPosition{"CeladonCity", {48, 12}}); + return row_on_sim("08.03", SimScript{}, {{"old_man_1"}}, MapPosition{"CeladonCity", {48, 12}}); } -// 00.30's walk into Route 7's grass with a wild battle on its one grass +// 08.03's walk into Route 7's grass with a wild battle on its one grass // step (Route 7's land rate is 21): it still ends on the Pidgey's tile. UnitTestResult test_route7_grass_battles(Logger&){ - const StoryCheckpoint& row = checkpoint("00.30"); + const StoryCheckpoint& row = checkpoint("08.03"); const size_t index = step_index(row, "pidgey_grass"); const MapPosition end{"Route7", {14, 6}}; SimScript script; @@ -631,7 +631,7 @@ std::vector maps_after_rich(){ return maps; } -// The walker believes the player stands on `believed`, a tile 00.30's +// The walker believes the player stands on `believed`, a tile 08.03's // steps from Rich's battle on pass through, while the player stands on // `actual`. struct OffStart{ @@ -650,7 +650,7 @@ const OffStart ROUTE8_OFF_STARTS[] = { {{26, 7}, {28, 10}}, }; -// 00.30's steps from `first` to `last`, as the table lays them out from +// 08.03's steps from `first` to `last`, as the table lays them out from // `at`: the first that starts on `tile`, and where the table says the // player stands then. Nothing if none does. std::optional> step_starting_on( @@ -669,7 +669,7 @@ std::optional> step_starting_on( return std::nullopt; } -// Console B, 2026-11-09 (00.30, three runs): after Route 8's open legs +// Console B, 2026-11-09 (08.03, three runs): after Route 8's open legs // the player stood 3 tiles east of where the walker believed, the hold // north to the Underground Path's door ran up column 17 to the cliff // (16, 2), and the step onto the door bumped the house: "no fade in and @@ -677,7 +677,7 @@ std::optional> step_starting_on( // steps on to Route 7 meet no trainer and come out of the Underground // Path where the table says. UnitTestResult test_route8_west_off_start(Logger&){ - const StoryCheckpoint& row = checkpoint("00.30"); + const StoryCheckpoint& row = checkpoint("08.03"); const size_t first = step_index(row, "west_of_glenn_column"); const size_t last = step_index(row, "route7_underground_exit"); const StoryPose after_rich{"Route8", {55, 18}, Direction::NORTH}; @@ -711,7 +711,7 @@ UnitTestResult test_route8_west_off_start(Logger&){ return true; } -// 00.30 saves in Celadon City's Pokemon Center: CELADON CITY on the save +// 08.03 saves in Celadon City's Pokemon Center: CELADON CITY on the save // card. UnitTestResult test_celadon_save_place(Logger&){ if (save_card_place("CeladonCity_PokemonCenter_1F") != "celadon-city"){ @@ -720,14 +720,14 @@ UnitTestResult test_celadon_save_place(Logger&){ return true; } -// 00.31 on the sim: out of Celadon's Center, the Game Corner's poster +// 09.01 on the sim: out of Celadon's Center, the Game Corner's poster // Grunt, the switch, the Rocket Hideout down to B4F's Lift Key Grunt, the // LIFT KEY, and back up to B3F below its Rare Candy. // A battle a talk starts (the poster Grunt's) is the sim's to skip: it // leaves the player where the plan says, and the trainer walks off // (talk_battle_hide_flag()). UnitTestResult test_hideout_row(Logger&){ - const StoryCheckpoint& row = checkpoint("00.31"); + const StoryCheckpoint& row = checkpoint("09.01"); StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); std::vector maps = maps_after_route10(); auto sim = std::make_unique(maps, MapPosition{at.map, at.tile}, *at.facing); @@ -736,7 +736,7 @@ UnitTestResult test_hideout_row(Logger&){ const std::optional hidden = talk_battle_hide_flag(step); if (!hidden){ if (const std::string failure = row_step_on_sim(*sim, at, step, row.id); !failure.empty()){ - return "00.31: ended on " + to_string(sim->state().position) + "; " + failure; + return "09.01: ended on " + to_string(sim->state().position) + "; " + failure; } continue; } @@ -749,14 +749,14 @@ UnitTestResult test_hideout_row(Logger&){ } fought.insert(fought.end(), sim->state().trainers_beaten.begin(), sim->state().trainers_beaten.end()); if (fought != std::vector{"rocket_m"}){ - return std::format("00.31: fought {} trainers on the sim, not the Lift Key Grunt alone.", fought.size()); + return std::format("09.01: fought {} trainers on the sim, not the Lift Key Grunt alone.", fought.size()); } if (!sim->state().violations.empty()){ - return "00.31: a violation on the way: " + sim->state().violations.back(); + return "09.01: a violation on the way: " + sim->state().violations.back(); } const MapPosition end{"RocketHideout_B3F", {12, 13}}; if (!(sim->state().position == end)){ - return "00.31: ended on " + to_string(sim->state().position) + ", not " + to_string(end) + "."; + return "09.01: ended on " + to_string(sim->state().position) + ", not " + to_string(end) + "."; } return true; } @@ -764,13 +764,13 @@ UnitTestResult test_hideout_row(Logger&){ } // namespace -// 00.32 on the sim: from below B3F's Rare Candy back up to B2F, through +// 09.02 on the sim: from below B3F's Rare Candy back up to B2F, through // its arrows (the MOON STONE ball stands in the way and is picked up), // the lift to B4F, the two door guards, Giovanni, and beside the SILPH // SCOPE. The talk-started battles are the sim's to skip; the MOON // STONE's pickup hides its ball, as the game does. UnitTestResult test_hideout_giovanni_row(Logger&){ - const StoryCheckpoint& row = checkpoint("00.32"); + const StoryCheckpoint& row = checkpoint("09.02"); StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); std::vector maps = maps_after_route10(); if (std::none_of(maps.begin(), maps.end(), [](const MapData& map){ return map.name == LIFT_MAP; })){ @@ -788,7 +788,7 @@ UnitTestResult test_hideout_giovanni_row(Logger&){ continue; } if (const std::string failure = row_step_on_sim(*sim, at, step, row.id); !failure.empty()){ - return "00.32: ended on " + to_string(sim->state().position) + "; " + failure; + return "09.02: ended on " + to_string(sim->state().position) + "; " + failure; } if (step.name == "moon_stone"){ for (MapData& map : maps){ @@ -798,39 +798,39 @@ UnitTestResult test_hideout_giovanni_row(Logger&){ } } if (!sim->state().trainers_beaten.empty()){ - return std::format("00.32: walked into {} trainers' lines on the sim.", sim->state().trainers_beaten.size()); + return std::format("09.02: walked into {} trainers' lines on the sim.", sim->state().trainers_beaten.size()); } if (!sim->state().violations.empty()){ - return "00.32: a violation on the way: " + sim->state().violations.back(); + return "09.02: a violation on the way: " + sim->state().violations.back(); } const MapPosition end{"RocketHideout_B4F", {21, 5}}; if (!(sim->state().position == end)){ - return "00.32: ended on " + to_string(sim->state().position) + ", not " + to_string(end) + "."; + return "09.02: ended on " + to_string(sim->state().position) + ", not " + to_string(end) + "."; } return true; } const AutoStoryLavenderCase AUTO_STORY_LAVENDER_CASES[] = { - {.input = {"00.28 the tree, Rock Tunnel's nine trainers, out of its south mouth", test_rock_tunnel_row}, .expectation = {}}, - {.input = {"00.28 a wild battle mid-leg in the tunnel", test_rock_tunnel_wild_battles}, .expectation = {}}, - {.input = {"00.28 dark: each trainer's battle ends on the dark cave's overworld", test_rock_tunnel_dark_battle_ends}, .expectation = {}}, - {.input = {"00.28 a tile off after each open leg", test_rock_tunnel_tile_off}, .expectation = {}}, - {.input = {"00.28 B1F row 37 with a wild battle every 10 to 14 steps", test_b1f_row37_battles_every_12}, .expectation = {}}, - {.input = {"00.28 a wild battle every 7 to 25 steps, 12 seeds", test_rock_tunnel_frequent_battles}, .expectation = {}}, - {.input = {"00.28 wild battles at the game's odds, 30 seeds", test_rock_tunnel_game_odds}, .expectation = {}}, - {.input = {"00.28 B1F a wild battle into row 38, then a step short: Martha still sees the player", test_b1f_martha_after_row38_battle}, .expectation = {}}, - {.input = {"00.28 B1F dark, the 13:35 legs: a battle at the end of the walk back along row 38", test_b1f_dark_row38_battle_old_legs}, .expectation = {}}, - {.input = {"00.28 B1F dark, a wild battle on any step to Martha's line", test_b1f_dark_martha_battle_anywhere}, .expectation = {}}, - {.input = {"00.28 B1F dark, winston_line: a wild battle on the 2nd tap, the 3rd after it", test_winston_line_battle_on_tap_2}, .expectation = {}}, - {.input = {"00.29 Route 10 south, the ledge, Lavender Town's Pokemon Center", test_lavender_row}, .expectation = {}}, - {.input = {"00.29 a tile off after each open leg", test_lavender_tile_off}, .expectation = {}}, - {.input = {"00.28 and 00.29 save on Route 10 and in Lavender Town", test_save_places}, .expectation = {}}, - {.input = {"00.30 Lavender's Mart, Route 8 past Rich alone, the Underground Path, Route 7 to Celadon City", test_celadon_way_row}, .expectation = {}}, - {.input = {"00.30 a wild battle on the step into Route 7's grass", test_route7_grass_battles}, .expectation = {}}, - {.input = {"00.30 Route 8 west from a start up to 3 tiles off", test_route8_west_off_start}, .expectation = {}}, - {.input = {"00.30 saves in Celadon City's Pokemon Center", test_celadon_save_place}, .expectation = {}}, - {.input = {"00.31 the Game Corner's poster, the Rocket Hideout to B4F's LIFT KEY and B3F's Rare Candy", test_hideout_row}, .expectation = {}}, - {.input = {"00.32 B2F's arrows, the lift, the door guards, Giovanni and the SILPH SCOPE", test_hideout_giovanni_row}, .expectation = {}}, + {.input = {"08.01 the tree, Rock Tunnel's nine trainers, out of its south mouth", test_rock_tunnel_row}, .expectation = {}}, + {.input = {"08.01 a wild battle mid-leg in the tunnel", test_rock_tunnel_wild_battles}, .expectation = {}}, + {.input = {"08.01 dark: each trainer's battle ends on the dark cave's overworld", test_rock_tunnel_dark_battle_ends}, .expectation = {}}, + {.input = {"08.01 a tile off after each open leg", test_rock_tunnel_tile_off}, .expectation = {}}, + {.input = {"08.01 B1F row 37 with a wild battle every 10 to 14 steps", test_b1f_row37_battles_every_12}, .expectation = {}}, + {.input = {"08.01 a wild battle every 7 to 25 steps, 12 seeds", test_rock_tunnel_frequent_battles}, .expectation = {}}, + {.input = {"08.01 wild battles at the game's odds, 30 seeds", test_rock_tunnel_game_odds}, .expectation = {}}, + {.input = {"08.01 B1F a wild battle into row 38, then a step short: Martha still sees the player", test_b1f_martha_after_row38_battle}, .expectation = {}}, + {.input = {"08.01 B1F dark, the 13:35 legs: a battle at the end of the walk back along row 38", test_b1f_dark_row38_battle_old_legs}, .expectation = {}}, + {.input = {"08.01 B1F dark, a wild battle on any step to Martha's line", test_b1f_dark_martha_battle_anywhere}, .expectation = {}}, + {.input = {"08.01 B1F dark, winston_line: a wild battle on the 2nd tap, the 3rd after it", test_winston_line_battle_on_tap_2}, .expectation = {}}, + {.input = {"08.02 Route 10 south, the ledge, Lavender Town's Pokemon Center", test_lavender_row}, .expectation = {}}, + {.input = {"08.02 a tile off after each open leg", test_lavender_tile_off}, .expectation = {}}, + {.input = {"08.01 and 08.02 save on Route 10 and in Lavender Town", test_save_places}, .expectation = {}}, + {.input = {"08.03 Lavender's Mart, Route 8 past Rich alone, the Underground Path, Route 7 to Celadon City", test_celadon_way_row}, .expectation = {}}, + {.input = {"08.03 a wild battle on the step into Route 7's grass", test_route7_grass_battles}, .expectation = {}}, + {.input = {"08.03 Route 8 west from a start up to 3 tiles off", test_route8_west_off_start}, .expectation = {}}, + {.input = {"08.03 saves in Celadon City's Pokemon Center", test_celadon_save_place}, .expectation = {}}, + {.input = {"09.01 the Game Corner's poster, the Rocket Hideout to B4F's LIFT KEY and B3F's Rare Candy", test_hideout_row}, .expectation = {}}, + {.input = {"09.02 B2F's arrows, the lift, the door guards, Giovanni and the SILPH SCOPE", test_hideout_giovanni_row}, .expectation = {}}, }; void add_tests_AutoStoryLavender(UnitTestDatabase& database){ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPaceSim_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPaceSim_Tests.cpp index 79d8ae39e6..253c327744 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPaceSim_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPaceSim_Tests.cpp @@ -71,7 +71,7 @@ class SimCapture : public CaptureActions{ SimPatch& m_patch; }; -// Console B, 2026-11-03 (m63, 00.20 run 2): the capture paced on Route +// Console B, 2026-11-03 (m63, 05.09 run 2): the capture paced on Route // 24's (5, 19), in Camper Shane's sight; after the first wild battle he // walked up ("I saw your feat from the grass!"), and pacing ended // "no-battle-not-overworld" under his message. On the sim, a capture @@ -156,7 +156,7 @@ class SimConsoleCapture : public CaptureActions{ size_t m_read = 0; }; -// Console B, 2026-11-09 (00.30 run 5): catch_pidgey started on Route 7's +// Console B, 2026-11-09 (08.03 run 5): catch_pidgey started on Route 7's // (14, 6) on the Bicycle, ran from 4 wild battles and then paced 4 minutes // on the flowers east of the grass (11..18, 2..6). On the Bicycle a tap // facing another way steps too, so each turn of the pace took a tile, and diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPacing.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPacing.h index 7c36a7674a..6145e6a245 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPacing.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPacing.h @@ -24,7 +24,7 @@ namespace PokemonFRLG{ // Before pacing: gets the player off the Bicycle with SELECT, checked, // and once more if they still ride. On the Bicycle a tap facing another // way steps as well as turns, so pacing's turns walk it off the patch -// (console B, 2026-11-09, 00.30 run 5: Route 7's grass). Returns whether +// (console B, 2026-11-09, 08.03 run 5: Route 7's grass). Returns whether // the player is on foot. bool select_off_bike(const OverworldWalkSteps::BikeSelectCalls& calls); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty.cpp index c42f45ace3..c769fe016c 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty.cpp @@ -94,8 +94,8 @@ constexpr Evolution EVOLUTIONS[] = { // other move offered over four is declined. Squirtle's is the speedrun's: // Water Gun where Bubble was (so the attack stays bottom left), Bite over // Tail Whip. TM and tutor moves are not level-up prompts and are not -// here; no rule replaces them, so Water Pulse (TM03, 00.14c) and Mega Kick -// (Route 4's tutor, 00.14) are kept over every later level-up move. +// here; no rule replaces them, so Water Pulse (TM03, 05.02) and Mega Kick +// (Route 4's tutor, 04.06) are kept over every later level-up move. struct LearnRule{ std::string_view line; std::string_view move; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty_Tests.cpp index b9a66c7e10..12fc97e335 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryParty_Tests.cpp @@ -608,7 +608,7 @@ UnitTestResult test_run_then_overworld(Logger&){ return "START never looked for the overworld in the dark cave."; } -// Regression: console B, 2026-11-09, 00.28 hiker_lenny in Rock Tunnel +// Regression: console B, 2026-11-09, 08.01 hiker_lenny in Rock Tunnel // without Flash: the battle won with a move, then the dark cave's // overworld, black but for the lit circle on the player, read as the // text box with no HP box. The loop held B for an evolution three times diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPoses.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPoses.h index 90e5e66629..03700ed58e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPoses.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryPoses.h @@ -51,7 +51,7 @@ struct StoryPose{ }; // The variant of a ROUTE or LEGS step that runs, with B held: the player -// has the Running Shoes (00.10 on). +// has the Running Shoes (03.03 on). inline const std::string RUN_VARIANT = "run"; // The GAME step that closes the Trainer Card SID Helper leaves open. diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.cpp index 1b810ac2cd..17de77c1e1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.cpp @@ -44,19 +44,19 @@ std::string starter_rng_loop_message(const StarterRngLoopResult& result){ ); case StarterRngLoopEnd::TARGET: return "Starter RNG hit the target (shiny not required). Nothing was saved after it: the game is where " - "Starter RNG's calibration left it. Play to the rival's battle and save by hand, then start AutoStory at 00.05."; + "Starter RNG's calibration left it. Play to the rival's battle and save by hand, then start AutoStory at 02.01."; case StarterRngLoopEnd::OUT_OF_ATTEMPTS: return std::format( "Starter RNG: every planned attempt hit its target and none was shiny. SIDs left: {}. " - "The save is still south of the table: raise the RNG plan's max attempts and start AutoStory at 00.04 again.", sids + "The save is still south of the table: raise the RNG plan's max attempts and start AutoStory at 01.05 again.", sids ); case StarterRngLoopEnd::MISSED_EVERY_ATTEMPT_LEFT: return "Starter RNG: every attempt left missed its target more often than the retries allow, or Starter RNG " "refused its timings (see the log). The save is still south of the table: check the RNG plan's sound setting " - "and start AutoStory at 00.04 again."; + "and start AutoStory at 01.05 again."; case StarterRngLoopEnd::OUT_OF_TIME: return std::format( - "Starter RNG: out of time after {} attempts. The save is still south of the table: start AutoStory at 00.04 again.", + "Starter RNG: out of time after {} attempts. The save is still south of the table: start AutoStory at 01.05 again.", result.attempts_run ); } @@ -65,16 +65,16 @@ std::string starter_rng_loop_message(const StarterRngLoopResult& result){ std::string gift_rng_loop_message(const StarterRngLoopResult& result){ - const std::string save = "The save is still beside the salesman, facing him: start AutoStory at 00.12b with Run Gift " + const std::string save = "The save is still beside the salesman, facing him: start AutoStory at 04.03 with Run Gift " "RNG in AutoStory on to try again, or run Gift RNG (Magikarp) from it by hand with an attempt from the log, then " - "start AutoStory at 00.12b with that option off."; + "start AutoStory at 04.03 with that option off."; switch (result.end){ case StarterRngLoopEnd::SHINY: - return "Gift RNG: shiny Magikarp, on the planned target. 00.12b saves it."; + return "Gift RNG: shiny Magikarp, on the planned target. 04.03 saves it."; case StarterRngLoopEnd::SHINY_OFF_TARGET: - return "Gift RNG: shiny Magikarp, but not the planned target. 00.12b saves it."; + return "Gift RNG: shiny Magikarp, but not the planned target. 04.03 saves it."; case StarterRngLoopEnd::TARGET: - return "Gift RNG hit the target (shiny not required). Nothing was saved after it: start AutoStory at 00.12b " + return "Gift RNG hit the target (shiny not required). Nothing was saved after it: start AutoStory at 04.03 " "to save the Magikarp where it stands."; case StarterRngLoopEnd::OUT_OF_ATTEMPTS: return std::format( diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.h index cdbb0c4591..46a8cb06e2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.h @@ -58,7 +58,7 @@ class CalibrationSavingSteps : public StarterRngLoopSteps{ // The rows a run takes after a shiny from the loop, which leaves the player // under Squirtle's ball with the rival's ball taken: the row after -// `ball_row` (00.04b) from its step after "rival_takes_bulbasaur", then +// `ball_row` (01.06) from its step after "rival_takes_bulbasaur", then // the rows after it to `last` as plan_story_run() takes them with // `handoffs`, with the handoff they stop at. Throws InternalProgramError // for a table without that row or step. @@ -68,7 +68,7 @@ StoryRunPlan rows_after_starter_rng( // The rows a run takes after a shiny Magikarp from the loop, which leaves // its summary open beside the salesman: the row after `salesman_row` -// (00.12b), which leaves the summary and saves, then the rows after it to +// (04.03), which leaves the summary and saves, then the rows after it to // `last` as plan_story_run() takes them with `handoffs`. Throws // InternalProgramError for a table whose next row doesn't leave the // summary. diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop_Tests.cpp index dda1d61eb1..03f6121ffc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop_Tests.cpp @@ -118,11 +118,11 @@ std::string first_step(const StoryRunPlan& plan){ return plan.rows.empty() || plan.rows.front().steps.empty() ? "" : plan.rows.front().steps.front().name; } -// After a shiny, 00.04b picks up at the rival's trigger and runs on, to +// After a shiny, 01.06 picks up at the rival's trigger and runs on, to // Gift RNG's stop when it is on. UnitTestResult test_rows_after_shiny(){ const std::vector& checkpoints = story_checkpoints(); - const size_t ball_row = row_index("00.04"); + const size_t ball_row = row_index("01.05"); struct Case{ std::string last; StoryHandoffs handoffs = {}; @@ -130,14 +130,14 @@ UnitTestResult test_rows_after_shiny(){ StoryHandoff stop = StoryHandoff::NONE; }; const std::vector cases = { - {.last = "00.04", .ids = "00.04b"}, - {.last = "00.04b", .ids = "00.04b"}, - {.last = "00.05", .ids = "00.04b,00.05"}, - {.last = "00.12b", .ids = "00.04b,00.05,00.06,00.07,00.08,00.09,00.10,00.11,00.12"}, + {.last = "01.05", .ids = "01.06"}, + {.last = "01.06", .ids = "01.06"}, + {.last = "02.01", .ids = "01.06,02.01"}, + {.last = "04.03", .ids = "01.06,02.01,02.02,02.03,03.01,03.02,03.03,04.01,04.02"}, { - .last = "00.12b", + .last = "04.03", .handoffs = {.starter_rng = true, .gift_rng = true}, - .ids = "00.04b,00.05,00.06,00.07,00.08,00.09,00.10,00.11,00.12", + .ids = "01.06,02.01,02.02,02.03,03.01,03.02,03.03,04.01,04.02", .stop = StoryHandoff::GIFT_RNG, }, }; @@ -154,24 +154,24 @@ UnitTestResult test_rows_after_shiny(){ } -// What the run says when Gift RNG's loop ends: a shiny goes on to 00.12b; +// What the run says when Gift RNG's loop ends: a shiny goes on to 04.03; // otherwise the save beside the salesman is where to go on from. UnitTestResult test_gift_messages(){ struct Case{ StarterRngLoopResult result; std::string expected; }; - const std::string save = "The save is still beside the salesman, facing him: start AutoStory at 00.12b with Run Gift " + const std::string save = "The save is still beside the salesman, facing him: start AutoStory at 04.03 with Run Gift " "RNG in AutoStory on to try again, or run Gift RNG (Magikarp) from it by hand with an attempt from the log, then " - "start AutoStory at 00.12b with that option off."; + "start AutoStory at 04.03 with that option off."; const std::vector cases = { { .result = {.end = StarterRngLoopEnd::SHINY, .attempts_run = 1, .remaining_sids = {300}, .sid = uint16_t(300)}, - .expected = "Gift RNG: shiny Magikarp, on the planned target. 00.12b saves it.", + .expected = "Gift RNG: shiny Magikarp, on the planned target. 04.03 saves it.", }, { .result = {.end = StarterRngLoopEnd::SHINY_OFF_TARGET, .attempts_run = 1, .remaining_sids = {300}, .sid = std::nullopt}, - .expected = "Gift RNG: shiny Magikarp, but not the planned target. 00.12b saves it.", + .expected = "Gift RNG: shiny Magikarp, but not the planned target. 04.03 saves it.", }, { .result = {.end = StarterRngLoopEnd::OUT_OF_ATTEMPTS, .attempts_run = 3, .remaining_sids = {}, .sid = std::nullopt}, @@ -192,24 +192,24 @@ UnitTestResult test_gift_messages(){ return true; } -// 00.12 saves facing the salesman for Gift RNG; after a shiny Magikarp, -// 00.12b leaves its summary and saves there, then the run goes on. +// 04.02 saves facing the salesman for Gift RNG; after a shiny Magikarp, +// 04.03 leaves its summary and saves there, then the run goes on. UnitTestResult test_rows_after_magikarp(){ const std::vector& checkpoints = story_checkpoints(); - const size_t salesman_row = row_index("00.12"); + const size_t salesman_row = row_index("04.02"); const StoryCheckpoint& salesman = checkpoints[salesman_row]; const StoryCheckpoint& after = checkpoints[salesman_row + 1]; const std::optional start = after.start ? story_pose(Pokemon::pose_of(*after.start)) : std::nullopt; if (salesman.handoff != StoryHandoff::GIFT_RNG || !after.live_start || !start || start->map != "Route4_PokemonCenter_1F" || !(start->tile == TilePos{2, 3}) || start->facing != Direction::WEST ){ - return "Expected 00.12 to be Gift RNG's handoff and 00.12b to start from the live game at (2, 3) facing west."; + return "Expected 04.02 to be Gift RNG's handoff and 04.03 to start from the live game at (2, 3) facing west."; } - for (std::string_view last : {"00.12", "00.12b"}){ + for (std::string_view last : {"04.02", "04.03"}){ const StoryRunPlan plan = rows_after_gift_rng(checkpoints, salesman_row, row_index(last), StoryHandoffs{.gift_rng = true}); - if (joined_ids(plan) != "00.12b" || first_step(plan) != LEAVE_GIFT_SUMMARY || plan.stop != StoryHandoff::NONE){ + if (joined_ids(plan) != "04.03" || first_step(plan) != LEAVE_GIFT_SUMMARY || plan.stop != StoryHandoff::NONE){ return std::format( - "To {}: expected 00.12b from {}; got {} from {}", last, LEAVE_GIFT_SUMMARY, joined_ids(plan), first_step(plan) + "To {}: expected 04.03 from {}; got {} from {}", last, LEAVE_GIFT_SUMMARY, joined_ids(plan), first_step(plan) ); } } @@ -356,7 +356,7 @@ const AutoStoryRngLoopTestCase AUTO_STORY_RNG_LOOP_CASES[] = { .expectation = {.description = "formats notifications for gift rng encounters"}, }, { - .input = {.name = "00.12 and 00.12b: rows after a shiny Magikarp", .body = test_rows_after_magikarp}, + .input = {.name = "04.02 and 04.03: rows after a shiny Magikarp", .body = test_rows_after_magikarp}, .expectation = {.description = "plans continuation rows following shiny magikarp"}, }, { diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp index 744899b06e..397b96750d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp @@ -398,7 +398,7 @@ namespace{ // with a move: the battle loop's polls replayed through its EvolutionHold // and BattleEndWatch, as BattleLoop::step() takes them. The overworld of a // dark cave reads as the battle's text box with no HP box (console B, -// 2026-11-09, 00.28 hiker_lenny: three 20 s holds for an evolution, then +// 2026-11-09, 08.01 hiker_lenny: three 20 s holds for an evolution, then // "no battle screen and no START menu for 60 s after the battle"). Empty // once START would look for the overworld, else the loop's failure. std::string battle_end_on_sim(const OverworldSim& sim){ @@ -559,7 +559,7 @@ namespace{ // Whether the sim can walk a Pokemon Center's way in or out of `step`: // the map it ends on is built into the program. Celadon's Center has no -// map yet (00.30), so its way in is stubbed. +// map yet (08.03), so its way in is stubbed. bool center_walkable(const StoryStep& step){ if (!is_center_variant(step.action)){ return false; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.h index e067d842fa..c151d60494 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.h @@ -72,7 +72,7 @@ class StoryMapsSim : public Pokemon::TableExecutor{ const std::map& bag() const{ return m_bag; } - // "00.03/oak: a dialog pops up before it.", and how it was cleared. + // "01.04/oak: a dialog pops up before it.", and how it was cleared. const std::vector& dialog_notes() const{ return m_dialog_notes; } diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSimStubs.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSimStubs.h index 922310049e..1d3fef33d1 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSimStubs.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSimStubs.h @@ -45,7 +45,7 @@ class SimStubs{ std::vector m_rows; }; -// Each attempt's stubs, a line a row: "00.03: 2 stubbed: oak, rival". +// Each attempt's stubs, a line a row: "01.04: 2 stubbed: oak, rival". std::string stub_report(const std::vector& rows); // A failed step fails the run as it threw: a simulation has no save to diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows_Tests.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows_Tests.h index 1f419186a1..6b15acaab2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows_Tests.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRows_Tests.h @@ -17,14 +17,14 @@ namespace NintendoSwitch{ namespace PokemonFRLG{ -// Rows 00.21 and 00.22 on the overworld sim (PokemonFRLG_AutoStoryVermilion_Tests.cpp). +// Rows 05.10 and 06.01 on the overworld sim (PokemonFRLG_AutoStoryVermilion_Tests.cpp). void add_tests_AutoStoryVermilion(UnitTestDatabase& database); -// Rows 00.23 to 00.25 on the overworld sim (PokemonFRLG_AutoStoryVermilionGym_Tests.cpp). +// Rows 06.02 to 06.04 on the overworld sim (PokemonFRLG_AutoStoryVermilionGym_Tests.cpp). void add_tests_AutoStoryVermilionGym(UnitTestDatabase& database); -// Rows from 00.26 on on the overworld sim (PokemonFRLG_AutoStoryCeladon_Tests.cpp), +// Rows from 07.01 on on the overworld sim (PokemonFRLG_AutoStoryCeladon_Tests.cpp), // with add_tests_AutoStoryLavender(). void add_tests_AutoStoryCeladon(UnitTestDatabase& database); -// Rows from 00.28 on on the overworld sim (PokemonFRLG_AutoStoryLavender_Tests.cpp). +// Rows from 08.01 on on the overworld sim (PokemonFRLG_AutoStoryLavender_Tests.cpp). void add_tests_AutoStoryLavender(UnitTestDatabase& database); 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 eaf483c8ce..1bfb846f94 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp @@ -4,7 +4,7 @@ * * Which rows of the story table a run takes (plan_story_run()) with the * RNG programs' handoffs on and off, the rows the handoffs split or - * join, Misty in Cerulean Gym, and what 00.15 runs before the rival. + * join, Misty in Cerulean Gym, and what 05.03 runs before the rival. * */ @@ -139,24 +139,24 @@ class Test_RunPlan : public UnitTest{ const RunPlanScenario m_scenario; }; -const std::string TODAY = "00.01 00.02 00.03 00.04 00.05 00.06 00.07 00.08 00.09 00.10 00.11 00.12 00.12c 00.13 00.14 00.14b 00.14c 00.15 00.15b 00.16 00.17 00.18 00.19 00.20 00.21 00.22 00.23 00.24 00.25 00.26 00.27 00.28 00.29 00.30 00.31 00.32"; +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"; const RunPlanScenario RUN_PLAN_CASES[] = { { - .input = {.name = "handoffs off: the story as before", .first = "00.01"}, + .input = {.name = "handoffs off: the story as before", .first = "01.01"}, .expectation = {.expected_ids = TODAY}, }, { - .input = {.name = "handoffs off: a range", .first = "00.02", .last = "00.04"}, - .expectation = {.expected_ids = "00.02 00.03 00.04"}, + .input = {.name = "handoffs off: a range", .first = "01.03", .last = "01.05"}, + .expectation = {.expected_ids = "01.03 01.04 01.05"}, }, { - .input = {.name = "handoffs off: Mt. Moon to Nugget Bridge", .first = "00.13", .last = "00.16"}, - .expectation = {.expected_ids = "00.13 00.14 00.14b 00.14c 00.15 00.15b 00.16"}, + .input = {.name = "handoffs off: Mt. Moon to Nugget Bridge", .first = "04.05", .last = "05.05"}, + .expectation = {.expected_ids = "04.05 04.06 05.01 05.02 05.03 05.04 05.05"}, }, { - .input = { .name = "SID Helper: 00.01 stops on the keyboard", - .first = "00.01", + .input = { .name = "SID Helper: 01.01 stops on the keyboard", + .first = "01.01", .handoffs = {.sid_helper = true}, }, .expectation = { @@ -166,79 +166,79 @@ const RunPlanScenario RUN_PLAN_CASES[] = { }, { .input = { - .name = "SID Helper: back in at 00.01b", - .first = "00.01b", - .last = "00.03", + .name = "SID Helper: back in at 01.02", + .first = "01.02", + .last = "01.04", .handoffs = {.sid_helper = true}, }, .expectation = { - .expected_ids = "00.01b 00.02 00.03", + .expected_ids = "01.02 01.03 01.04", }, }, { - .input = {.name = "00.01b runs when started at, option off", .first = "00.01b", .last = "00.02"}, - .expectation = {.expected_ids = "00.01b 00.02"}, + .input = {.name = "01.02 runs when started at, option off", .first = "01.02", .last = "01.03"}, + .expectation = {.expected_ids = "01.02 01.03"}, }, { - .input = {.name = "SID Helper: a later start passes over it", .first = "00.02", .last = "00.03", .handoffs = {.sid_helper = true}}, - .expectation = {.expected_ids = "00.02 00.03"}, + .input = {.name = "SID Helper: a later start passes over it", .first = "01.03", .last = "01.04", .handoffs = {.sid_helper = true}}, + .expectation = {.expected_ids = "01.03 01.04"}, }, { - .input = {.name = "handoffs off: an end at 00.04 still takes the rival's battle", .first = "00.03", .last = "00.04"}, - .expectation = {.expected_ids = "00.03 00.04"}, + .input = {.name = "handoffs off: an end at 01.05 still takes the rival's battle", .first = "01.04", .last = "01.05"}, + .expectation = {.expected_ids = "01.04 01.05"}, }, { .input = { - .name = "Starter RNG: stops after 00.04's save", - .first = "00.02", + .name = "Starter RNG: stops after 01.05's save", + .first = "01.03", .handoffs = {.starter_rng = true}, }, .expectation = { - .expected_ids = "00.02 00.03 00.04", + .expected_ids = "01.03 01.04 01.05", .expected_stop = StoryHandoff::STARTER_RNG, }, }, { - .input = {.name = "00.04b runs from its own save", .first = "00.04b", .last = "00.05"}, - .expectation = {.expected_ids = "00.04b 00.05"}, + .input = {.name = "01.06 runs from its own save", .first = "01.06", .last = "02.01"}, + .expectation = {.expected_ids = "01.06 02.01"}, }, { - .input = {.name = "Starter RNG: a later start doesn't stop", .first = "00.05", .last = "00.06", .handoffs = {.starter_rng = true}}, - .expectation = {.expected_ids = "00.05 00.06"}, + .input = {.name = "Starter RNG: a later start doesn't stop", .first = "02.01", .last = "02.02", .handoffs = {.starter_rng = true}}, + .expectation = {.expected_ids = "02.01 02.02"}, }, { .input = { .name = "both handoffs, back in after SID Helper", - .first = "00.01b", + .first = "01.02", .handoffs = {.sid_helper = true, .starter_rng = true}, }, .expectation = { - .expected_ids = "00.01b 00.02 00.03 00.04", + .expected_ids = "01.02 01.03 01.04 01.05", .expected_stop = StoryHandoff::STARTER_RNG, }, }, { .input = { - .name = "Gift RNG: stops after 00.12's save", - .first = "00.11", + .name = "Gift RNG: stops after 04.02's save", + .first = "04.01", .handoffs = {.gift_rng = true}, }, .expectation = { - .expected_ids = "00.11 00.12", + .expected_ids = "04.01 04.02", .expected_stop = StoryHandoff::GIFT_RNG, }, }, { - .input = {.name = "Gift RNG off: 00.12b is passed over", .first = "00.11"}, - .expectation = {.expected_ids = "00.11 00.12 00.12c 00.13 00.14 00.14b 00.14c 00.15 00.15b 00.16 00.17 00.18 00.19 00.20 00.21 00.22 00.23 00.24 00.25 00.26 00.27 00.28 00.29 00.30 00.31 00.32"}, + .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"}, }, { - .input = {.name = "Gift RNG off: 00.12b runs when started at", .first = "00.12b"}, - .expectation = {.expected_ids = "00.12b 00.12c 00.13 00.14 00.14b 00.14c 00.15 00.15b 00.16 00.17 00.18 00.19 00.20 00.21 00.22 00.23 00.24 00.25 00.26 00.27 00.28 00.29 00.30 00.31 00.32"}, + .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"}, }, { - .input = { .name = "Gift RNG: started at 00.12b, from the save beside the salesman", - .first = "00.12b", + .input = { .name = "Gift RNG: started at 04.03, from the save beside the salesman", + .first = "04.03", .handoffs = {.gift_rng = true}, }, .expectation = { @@ -248,8 +248,8 @@ const RunPlanScenario RUN_PLAN_CASES[] = { }, { .input = { - .name = "Gift RNG: started at 00.12b with Starter RNG on too", - .first = "00.12b", + .name = "Gift RNG: started at 04.03 with Starter RNG on too", + .first = "04.03", .handoffs = {.sid_helper = true, .starter_rng = true, .gift_rng = true}, }, .expectation = { @@ -258,16 +258,16 @@ const RunPlanScenario RUN_PLAN_CASES[] = { }, }, { - .input = {.name = "Starter RNG alone: 00.12b runs when started at", .first = "00.12b", .handoffs = {.starter_rng = true}}, - .expectation = {.expected_ids = "00.12b 00.12c 00.13 00.14 00.14b 00.14c 00.15 00.15b 00.16 00.17 00.18 00.19 00.20 00.21 00.22 00.23 00.24 00.25 00.26 00.27 00.28 00.29 00.30 00.31 00.32"}, + .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"}, }, { .input = { .name = "Starter RNG first, with both on", - .first = "00.03", + .first = "01.04", .handoffs = {.starter_rng = true, .gift_rng = true}, }, .expectation = { - .expected_ids = "00.03 00.04", + .expected_ids = "01.04 01.05", .expected_stop = StoryHandoff::STARTER_RNG, }, }, @@ -287,48 +287,48 @@ std::string step_names(const StoryCheckpoint& checkpoint){ return text; } -// With Starter RNG's handoff off, 00.04 and 00.04b run as the one 00.04 +// With Starter RNG's handoff off, 01.05 and 01.06 run as the one 01.05 // the story had before the split: from the lab's table to the rival's // battle, saving once with the starter's START menu. UnitTestResult test_starter_rows_joined(){ const std::vector& checkpoints = story_checkpoints(); - const StoryRunPlan plan = plan_story_run(checkpoints, row_index("00.04"), row_index("00.04b"), StoryHandoffs{}); + const StoryRunPlan plan = plan_story_run(checkpoints, row_index("01.05"), row_index("01.06"), StoryHandoffs{}); const std::string expected_steps = "below_squirtle squirtle_ball choose_squirtle no_nickname rival_takes_bulbasaur above_rival_trigger rival_trigger rival_battle"; if (plan.rows.size() != 1){ return "Expected one checkpoint, got \"" + joined_ids(plan.rows) + "\"."; } const StoryCheckpoint& row = plan.rows[0]; - if (row.id != "00.04" || row.title != "Squirtle, then the rival's battle" || step_names(row) != expected_steps){ - return "Expected 00.04 \"Squirtle, then the rival's battle\": " + expected_steps + if (row.id != "01.05" || row.title != "Squirtle, then the rival's battle" || step_names(row) != expected_steps){ + return "Expected 01.05 \"Squirtle, then the rival's battle\": " + expected_steps + "; got " + row.id + " \"" + row.title + "\": " + step_names(row); } const std::optional start = story_pose(Pokemon::pose_of(*row.start)); if (!start || start->map != "PalletTown_ProfessorOaksLab" || !(start->tile == TilePos{6, 4}) || row.menu != StartMenu::BEFORE_POKEDEX){ - return "Expected the joined 00.04 to start at the table (6, 4) and save with the starter's START menu."; + return "Expected the joined 01.05 to start at the table (6, 4) and save with the starter's START menu."; } - // Split, 00.04 saves under the ball facing it, before the starter. - const StoryCheckpoint& to_ball = checkpoints[row_index("00.04")]; - const std::optional ball = story_pose(Pokemon::pose_of(*checkpoints[row_index("00.04b")].start)); + // Split, 01.05 saves under the ball facing it, before the starter. + const StoryCheckpoint& to_ball = checkpoints[row_index("01.05")]; + const std::optional ball = story_pose(Pokemon::pose_of(*checkpoints[row_index("01.06")].start)); if (to_ball.handoff != StoryHandoff::STARTER_RNG || to_ball.menu != StartMenu::BEFORE_POKEMON || !ball || !(ball->tile == TilePos{9, 5}) || ball->facing != Direction::NORTH ){ - return "Expected 00.04 to end under Squirtle's ball (9, 5) facing north, saving before the starter."; + return "Expected 01.05 to end under Squirtle's ball (9, 5) facing north, saving before the starter."; } return true; } // The ways back in after SID Helper and Gift RNG load no save and start -// where 00.01 and 00.12 leave the player, so the rows after them follow +// where 01.01 and 04.02 leave the player, so the rows after them follow // unchanged. UnitTestResult test_after_sid_helper_row(){ - const StoryCheckpoint& sid = story_checkpoints()[row_index("00.01b")]; + const StoryCheckpoint& sid = story_checkpoints()[row_index("01.02")]; if (!sid.live_start || story_checkpoints()[0].handoff != StoryHandoff::SID_HELPER){ - return "Expected 00.01 to be SID Helper's handoff and 00.01b to start from the live game."; + return "Expected 01.01 to be SID Helper's handoff and 01.02 to start from the live game."; } for (const StoryCheckpoint& checkpoint : story_checkpoints()){ - if (checkpoint.live_start != (checkpoint.id == "00.01b" || checkpoint.id == "00.12b")){ - return checkpoint.id + ": only 00.01b and 00.12b start from the live game."; + if (checkpoint.live_start != (checkpoint.id == "01.02" || checkpoint.id == "04.03")){ + return checkpoint.id + ": only 01.02 and 04.03 start from the live game."; } } return true; @@ -392,23 +392,23 @@ bool plans(const Pokemon::Pose& from, const Pokemon::Pose& to){ ).has_value(); } -// 00.15, before the rival, from the Center: first TM03 Water Pulse over +// 05.03, before the rival, from the Center: first TM03 Water Pulse over // Tail Whip if the lead doesn't know it, so the sim plays it in the // GRIND; Potions from Cerulean's Mart (a loaded save's bag may hold too // few for the wild battles a GRIND fights), and at its money floor 2 or // more Awakenings for the rival's Sleep Powder; then a GRIND on Route 4's // grass east of Mt. Moon to Lv22, where console B's lead beat the rival -// 00.15b fights, healing at Cerulean's Center; its trip there plans both ways. +// 05.04 fights, healing at Cerulean's Center; its trip there plans both ways. UnitTestResult test_cerulean_mart_and_grind(){ - const StoryCheckpoint& row = story_checkpoints()[row_index("00.15")]; + const StoryCheckpoint& row = story_checkpoints()[row_index("05.03")]; const std::vector& steps = row.steps; const std::optional start = row.start ? story_pose(Pokemon::pose_of(*row.start)) : std::nullopt; if (!start || start->map != "CeruleanCity_PokemonCenter_1F"){ - return "00.15: expected it to start in Cerulean's Center."; + return "05.03: expected it to start in Cerulean's Center."; } const std::optional teach = steps.empty() ? std::nullopt : teach_of(steps[0]); if (!teach || teach->item != "tm03" || teach->move != "water-pulse" || teach->member != 0 || teach->forget_move != "tail-whip"){ - return "00.15: expected it to start with TM03 Water Pulse over the lead's Tail Whip."; + return "05.03: expected it to start with TM03 Water Pulse over the lead's Tail Whip."; } const size_t mart = find_step(steps, 0, [](const StoryStep& step){ const std::optional plan = mart_of(step); @@ -419,7 +419,7 @@ UnitTestResult test_cerulean_mart_and_grind(){ return plan && plan->member == 0 && plan->level >= 22; }); if (mart == steps.size() || grind == steps.size()){ - return "00.15: expected a Cerulean Mart step buying Potions, then a GRIND of the lead to Lv22 or more."; + return "05.03: expected a Cerulean Mart step buying Potions, then a GRIND of the lead to Lv22 or more."; } const MartPlan plan = *mart_of(steps[mart]); const std::optional> buys = plan.money_floor @@ -429,64 +429,64 @@ UnitTestResult test_cerulean_mart_and_grind(){ return buy.item == "awakening" && buy.quantity >= 2; }); if (!awakenings){ - return "00.15: expected the Mart step to buy 2 or more Awakenings at its money floor."; + return "05.03: expected the Mart step to buy 2 or more Awakenings at its money floor."; } const std::optional clerk = mart > 0 ? story_pose_arg(steps[mart - 1], "target") : std::nullopt; if (!clerk || clerk->map != "CeruleanCity_Mart"){ - return "00.15: expected the Mart step right after a route to the clerk."; + return "05.03: expected the Mart step right after a route to the clerk."; } const auto trip = grind_trip(steps, grind); if (!trip){ - return "00.15: expected the GRIND right after a route to its patch, with the nurse as its target."; + return "05.03: expected the GRIND right after a route to its patch, with the nurse as its target."; } const auto& [patch, nurse] = *trip; const std::optional nurse_pose = story_pose(nurse); if (!nurse_pose || nurse_pose->map != "CeruleanCity_PokemonCenter_1F" || !plans(patch, nurse) || !plans(nurse, patch)){ - return "00.15: expected the GRIND's trips to Cerulean's nurse and back to plan."; + return "05.03: expected the GRIND's trips to Cerulean's nurse and back to plan."; } return true; } -// 00.15b, the rival's battle as its own checkpoint, as every battle lost -// twice or more gets: it starts from a save, 00.15's on (23, 7) below his +// 05.04, the rival's battle as its own checkpoint, as every battle lost +// twice or more gets: it starts from a save, 05.03's on (23, 7) below his // trigger with the nurse just before, so a verify run or a retry reloads // right before him; and his is its only battle. First Water Pulse over // Tail Whip if the lead doesn't know it: console B's save (2026-11-03) is // past the TEACH that failed there, which does nothing once it is known. UnitTestResult test_cerulean_rival_row(){ const std::vector& checkpoints = story_checkpoints(); - const size_t index = row_index("00.15b"); + const size_t index = row_index("05.04"); const StoryCheckpoint& rival = checkpoints[index]; const std::optional start = rival.start ? story_pose(Pokemon::pose_of(*rival.start)) : std::nullopt; if (!start || rival.live_start || start->map != "CeruleanCity" || !(start->tile == TilePos{23, 7}) || save_card_place(start->map).empty() ){ - return "00.15b: expected it to start from a save on (23, 7) in Cerulean City."; + return "05.04: expected it to start from a save on (23, 7) in Cerulean City."; } std::string battles; for (const StoryStep& step : rival.steps){ battles += step.kind == StoryStepKind::BATTLE ? " " + step.name : ""; } if (battles != " rival_cerulean" || rival.steps.size() != 3 || rival.steps[1].name != "rival_trigger"){ - return "00.15b: expected a TEACH, the step onto his trigger and his battle; its battles:" + battles; + return "05.04: expected a TEACH, the step onto his trigger and his battle; its battles:" + battles; } const std::optional teach = teach_of(rival.steps[0]); if (rival.steps[0].kind != StoryStepKind::GAME || !teach || teach->item != "tm03" || teach->move != "water-pulse" || teach->member != 0 || teach->forget_move != "tail-whip" ){ - return "00.15b: expected it to start with TM03 Water Pulse over the lead's Tail Whip."; + return "05.04: expected it to start with TM03 Water Pulse over the lead's Tail Whip."; } const StoryCheckpoint& before = checkpoints[index - 1]; const size_t n = before.steps.size(); const std::optional end = n > 0 ? story_pose_arg(before.steps[n - 1], "target") : std::nullopt; - if (before.id != "00.15" || n < 2 || before.steps[n - 2].kind != StoryStepKind::HEAL + if (before.id != "05.03" || n < 2 || before.steps[n - 2].kind != StoryStepKind::HEAL || !end || end->map != start->map || !(end->tile == start->tile) ){ - return "00.15: expected it to end with the nurse, then the walk to (23, 7) where 00.15b starts."; + return "05.03: expected it to end with the nurse, then the walk to (23, 7) where 05.04 starts."; } for (const StoryStep& step : before.steps){ if (step.kind == StoryStepKind::BATTLE){ - return "00.15: expected no trainer battle before its save; found " + step.name + "."; + return "05.03: expected no trainer battle before its save; found " + step.name + "."; } } return true; @@ -501,17 +501,17 @@ std::string battle_names(const StoryCheckpoint& row){ return battles; } -// 00.14b, before Misty: Potions at Cerulean's Mart, then into the Gym to -// a save on (9, 7), below her platform; no battle. 00.14c, Misty's battle +// 05.01, before Misty: Potions at Cerulean's Mart, then into the Gym to +// a save on (9, 7), below her platform; no battle. 05.02, Misty's battle // as its own checkpoint: it starts from that save, talks to her from // beside her, (9, 6), and hers is its only battle; then TM03 Water Pulse // in place of Tail Whip. UnitTestResult test_misty_rows(){ const std::vector& checkpoints = story_checkpoints(); - const StoryCheckpoint& gym = checkpoints[row_index("00.14b")]; - const StoryCheckpoint& misty = checkpoints[row_index("00.14c")]; - if (checkpoints[row_index("00.14b") - 1].id != "00.14" || checkpoints[row_index("00.14c") + 1].id != "00.15"){ - return "Expected 00.14b and 00.14c between 00.14 and 00.15."; + const StoryCheckpoint& gym = checkpoints[row_index("05.01")]; + const StoryCheckpoint& misty = checkpoints[row_index("05.02")]; + if (checkpoints[row_index("05.01") - 1].id != "04.06" || checkpoints[row_index("05.02") + 1].id != "05.03"){ + return "Expected 05.01 and 05.02 between 04.06 and 05.03."; } const std::vector& steps = gym.steps; const size_t mart = find_step(steps, 0, [](const StoryStep& step){ @@ -519,41 +519,41 @@ UnitTestResult test_misty_rows(){ return plan && plan->map == "CeruleanCity_Mart" && !plan->lines.empty() && plan->lines[0].item == "potion"; }); if (mart == steps.size() || !battle_names(gym).empty()){ - return "00.14b: expected a Cerulean Mart step buying Potions and no battle; its battles:" + battle_names(gym); + return "05.01: expected a Cerulean Mart step buying Potions and no battle; its battles:" + battle_names(gym); } const std::optional start = misty.start ? story_pose(Pokemon::pose_of(*misty.start)) : std::nullopt; if (!start || misty.live_start || start->map != "CeruleanCity_Gym" || !(start->tile == TilePos{9, 7}) || save_card_place(start->map).empty() ){ - return "00.14c: expected it to start from a save on (9, 7) in Cerulean Gym."; + return "05.02: expected it to start from a save on (9, 7) in Cerulean Gym."; } if (battle_names(misty) != " misty" || misty.steps.size() < 3 || misty.steps[1].kind != StoryStepKind::TALK || misty.steps[2].name != "misty" ){ - return "00.14c: expected a walk beside Misty, the talk and her battle, the only one; its battles:" + battle_names(misty); + return "05.02: expected a walk beside Misty, the talk and her battle, the only one; its battles:" + battle_names(misty); } const std::optional beside = story_pose_arg(misty.steps[0], "target"); if (!beside || !(beside->tile == TilePos{9, 6}) || beside->facing != Direction::WEST){ - return "00.14c: expected the talk from (9, 6), facing Misty (8, 6)."; + return "05.02: expected the talk from (9, 6), facing Misty (8, 6)."; } const size_t teach = find_step(misty.steps, 0, [](const StoryStep& step){ const std::optional plan = teach_of(step); return plan && plan->item == "tm03" && plan->move == "water-pulse" && plan->member == 0 && plan->forget_move == "tail-whip"; }); if (teach == misty.steps.size()){ - return "00.14c: expected TM03 Water Pulse taught to the lead in place of Tail Whip."; + return "05.02: expected TM03 Water Pulse taught to the lead in place of Tail Whip."; } return true; } -// 00.14b in order (Misty lost to at Lv20, console B, run m51): the Mart +// 05.01 in order (Misty lost to at Lv20, console B, run m51): the Mart // first, Potions then Super Potions, the Potions enough for the GRIND's // wild battles at the table's money floor and at least one Super Potion // after them; a GRIND of the lead to Lv23 on Route 4, from a route to its // patch, with Cerulean's nurse as its target; the nurse; then the walk // into the Gym, ending on (9, 7). UnitTestResult test_misty_grind_order(){ - const std::vector& steps = story_checkpoints()[row_index("00.14b")].steps; + const std::vector& steps = story_checkpoints()[row_index("05.01")].steps; std::optional plan; const size_t mart = find_step(steps, 0, [&](const StoryStep& step){ plan = mart_of(step); @@ -562,11 +562,11 @@ UnitTestResult test_misty_grind_order(){ if (mart == steps.size() || plan->lines.size() < 2 || plan->lines[0].item != "potion" || plan->lines[1].item != "super-potion" || !plan->money_floor ){ - return "00.14b: expected a Cerulean Mart step buying Potions, then Super Potions, with a money floor."; + return "05.01: expected a Cerulean Mart step buying Potions, then Super Potions, with a money floor."; } const std::optional> buys = plan_mart_buys(mart_stock(plan->map), *plan, *plan->money_floor); if (!buys || buys->size() < 2 || (*buys)[0].quantity < 2 || (*buys)[1].item != "super-potion"){ - return "00.14b: expected the money floor to buy 2 or more Potions and a Super Potion."; + return "05.01: expected the money floor to buy 2 or more Potions and a Super Potion."; } const size_t grind = find_step(steps, mart, [](const StoryStep& step){ const std::optional grind_plan = grind_of(step); @@ -574,13 +574,13 @@ UnitTestResult test_misty_grind_order(){ }); const auto trip = grind_trip(steps, grind); if (!trip){ - return "00.14b: expected a GRIND of the lead to Lv23 after the Mart, right after a route to its patch, the nurse its target."; + return "05.01: expected a GRIND of the lead to Lv23 after the Mart, right after a route to its patch, the nurse its target."; } const std::optional patch = story_pose(trip->first), nurse = story_pose(trip->second); if (!patch || patch->map != "Route4" || !nurse || nurse->map != "CeruleanCity_PokemonCenter_1F" || !plans(trip->first, trip->second) || !plans(trip->second, trip->first) ){ - return "00.14b: expected the GRIND on Route 4, its trips to Cerulean's nurse and back planning."; + return "05.01: expected the GRIND on Route 4, its trips to Cerulean's nurse and back planning."; } const size_t heal = find_step(steps, grind + 1, [](const StoryStep& step){ return step.name == "heal_cerulean"; @@ -590,7 +590,7 @@ UnitTestResult test_misty_grind_order(){ return pose && pose->map == "CeruleanCity_Gym"; }); if (heal == steps.size() || gym == steps.size() || heal > gym){ - return "00.14b: expected the nurse after the GRIND, then the walk into the Gym."; + return "05.01: expected the nurse after the GRIND, then the walk into the Gym."; } StoryPose end; for (const StoryStep& step : steps){ @@ -598,7 +598,7 @@ UnitTestResult test_misty_grind_order(){ end = pose ? *pose : end; } if (end.map != "CeruleanCity_Gym"){ - return "00.14b: expected the row to end in Cerulean Gym."; + return "05.01: expected the row to end in Cerulean Gym."; } return true; } @@ -608,27 +608,27 @@ UnitTestResult test_misty_grind_order(){ const AutoStoryCase AUTO_STORY_CASES[] = { { - .input = {"00.01b and 00.12b: back in after SID Helper and Gift RNG", test_after_sid_helper_row}, + .input = {"01.02 and 04.03: back in after SID Helper and Gift RNG", test_after_sid_helper_row}, .expectation = {}, }, { - .input = {"00.04 and 00.04b: one checkpoint with Starter RNG off", test_starter_rows_joined}, + .input = {"01.05 and 01.06: one checkpoint with Starter RNG off", test_starter_rows_joined}, .expectation = {}, }, { - .input = {"00.15: Potions at Cerulean's Mart and a GRIND before the rival", test_cerulean_mart_and_grind}, + .input = {"05.03: Potions at Cerulean's Mart and a GRIND before the rival", test_cerulean_mart_and_grind}, .expectation = {}, }, { - .input = {"00.15b: the rival's battle alone, from a save before him", test_cerulean_rival_row}, + .input = {"05.04: the rival's battle alone, from a save before him", test_cerulean_rival_row}, .expectation = {}, }, { - .input = {"00.14b and 00.14c: Cerulean Gym, then Misty alone from a save before her", test_misty_rows}, + .input = {"05.01 and 05.02: Cerulean Gym, then Misty alone from a save before her", test_misty_rows}, .expectation = {}, }, { - .input = {"00.14b: Potions and Super Potions, a GRIND to Lv23, the nurse, then the Gym", test_misty_grind_order}, + .input = {"05.01: Potions and Super Potions, a GRIND to Lv23, the nurse, then the Gym", test_misty_grind_order}, .expectation = {}, }, }; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryScreenEvents_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryScreenEvents_Tests.cpp index 146e19cdcf..2871f561bf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryScreenEvents_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryScreenEvents_Tests.cpp @@ -94,7 +94,7 @@ const ScreenEventsCase SCREEN_EVENTS_CASES[] = { .expectation = {{ScreenEvent::FADE_WHITE}}, }, { - // Rock Tunnel without Flash (console B, 2026-11-09, 00.28): its + // Rock Tunnel without Flash (console B, 2026-11-09, 08.01): its // black read as a battle's text box before each step. .input = {"a dark cave, black but for a lit middle, shows nothing", 0xff000000, 0xff8c7c64}, .expectation = {{}}, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_Tests.cpp index 48145de2bc..6a3d5e0278 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_Tests.cpp @@ -239,7 +239,7 @@ UnitTestResult test_whole_story(){ if (report.one_shot_passes() != report.checkpoints_run){ return "Expected every checkpoint one-shot:" + joined(sim.lines); } - // 00.07's shopping, with the cursor staying on each row bought. + // 02.03's shopping, with the cursor staying on each row bought. const std::map bought{{"potion", 5}, {"antidote", 3}, {"parlyz_heal", 1}}; if (sim.game.bag() != bought){ std::string text; @@ -279,9 +279,9 @@ UnitTestResult test_stubbed_steps_need_the_console(Logger& logger){ UnitTestResult test_start_and_end(){ Simulation sim; - const Pokemon::SegmentReport report = sim.run({.from = "00.05", .to = "00.07"}); - if (!report.completed || sim.begun() != std::vector{"00.05", "00.06", "00.07"}){ - return "Expected 00.05 to 00.07 only:" + joined(sim.begun()); + const Pokemon::SegmentReport report = sim.run({.from = "02.01", .to = "02.03"}); + if (!report.completed || sim.begun() != std::vector{"02.01", "02.02", "02.03"}){ + return "Expected 02.01 to 02.03 only:" + joined(sim.begun()); } return true; } @@ -290,27 +290,27 @@ UnitTestResult test_start_and_end(){ // the checkpoint reloads its last save and runs again from its start. UnitTestResult test_retry_from_save(){ Simulation sim; - sim.game.failures["00.08/forest_north"] = {.failure = "operation_failed", .times = 1}; - const Pokemon::SegmentReport report = sim.run({.from = "00.08", .to = "00.09"}); - if (!report.completed || report.reloads != 1 || sim.begun() != std::vector{"00.08", "00.08", "00.09"} - || sim.count("00.08/forest_east") != 2 + sim.game.failures["03.01/forest_north"] = {.failure = "operation_failed", .times = 1}; + const Pokemon::SegmentReport report = sim.run({.from = "03.01", .to = "03.02"}); + if (!report.completed || report.reloads != 1 || sim.begun() != std::vector{"03.01", "03.01", "03.02"} + || sim.count("03.01/forest_east") != 2 ){ - return "Expected 00.08 reloaded once and run again from its start:" + joined(sim.game.trace); + return "Expected 03.01 reloaded once and run again from its start:" + joined(sim.game.trace); } - if (std::find(sim.lines.begin(), sim.lines.end(), "[Checkpoint] 00.08: passed on attempt 2 (1 reset)") == sim.lines.end()){ + if (std::find(sim.lines.begin(), sim.lines.end(), "[Checkpoint] 03.01: passed on attempt 2 (1 reset)") == sim.lines.end()){ return "Expected the retried pass logged:" + joined(sim.lines); } return true; } -// console B, FRLG 00.27, 2026-11-09: the save stood below Cerulean Center's -// door (22, 19), and the run walked as if from the counter where 00.27 -// starts. It, and 00.09 from below Pewter Center's door (17, 25), stop +// console B, FRLG 07.02, 2026-11-09: the save stood below Cerulean Center's +// door (22, 19), and the run walked as if from the counter where 07.02 +// starts. It, and 03.02 from below Pewter Center's door (17, 25), stop // before any step or save. UnitTestResult test_save_off_start_pose(){ const std::pair CASES[] = { - {"00.09", StoryPose{"PewterCity", TilePos{17, 26}, Direction::SOUTH}}, - {"00.27", StoryPose{"CeruleanCity", TilePos{22, 20}, Direction::SOUTH}}, + {"03.02", StoryPose{"PewterCity", TilePos{17, 26}, Direction::SOUTH}}, + {"07.02", StoryPose{"CeruleanCity", TilePos{22, 20}, Direction::SOUTH}}, }; for (const auto& [id, save] : CASES){ Simulation sim; @@ -330,21 +330,21 @@ UnitTestResult test_save_off_start_pose(){ // Brock's battle lost every time: three attempts, then the stop. UnitTestResult test_gives_up_after_attempts(){ Simulation sim; - sim.game.failures["00.09/brock"] = {.failure = "blackout", .times = 10}; - const Pokemon::SegmentReport report = sim.run({.from = "00.09", .to = std::nullopt}); - if (report.completed || report.reloads != 2 || report.failed_checkpoint != "00.09" || report.failed_event != "brock" - || report.failure.failure != "blackout" || sim.count("00.09/brock") != 3 || !sim.saves.empty() + sim.game.failures["03.02/brock"] = {.failure = "blackout", .times = 10}; + const Pokemon::SegmentReport report = sim.run({.from = "03.02", .to = std::nullopt}); + if (report.completed || report.reloads != 2 || report.failed_checkpoint != "03.02" || report.failed_event != "brock" + || report.failure.failure != "blackout" || sim.count("03.02/brock") != 3 || !sim.saves.empty() ){ - return "Expected 00.09 tried 3 times, then a stop on Brock:" + joined(sim.game.trace) + joined(sim.lines); + return "Expected 03.02 tried 3 times, then a stop on Brock:" + joined(sim.game.trace) + joined(sim.lines); } return true; } -// Walks `step` of 00.14 on `sim` from `at`, where the table says the +// Walks `step` of 04.06 on `sim` from `at`, where the table says the // player stands, and moves `at` to where it says the step ends. Returns // the failure, or empty. std::string walk_on_sim(OverworldSim& sim, StoryPose& at, const StoryStep& step){ - const std::string where = "00.14/" + step.name + ": "; + const std::string where = "04.06/" + step.name + ": "; // A walk that ends on an open leg may leave the player short of it. bool open_end = false; if (step.kind == StoryStepKind::ROUTE || step.kind == StoryStepKind::LEGS){ @@ -371,7 +371,7 @@ std::string walk_on_sim(OverworldSim& sim, StoryPose& at, const StoryStep& step) return ""; } -// Console B, 2026-11-03 (row 00.14): the open leg east from Route 4 +// Console B, 2026-11-03 (row 04.06): the open leg east from Route 4 // into Cerulean City ended a tile short, on (6, 20), with nothing on // screen. No hold to a wall finds the player there, and the walk went on // a column off, the hold south stopped by the fence on (6, 23), to a @@ -379,10 +379,10 @@ std::string walk_on_sim(OverworldSim& sim, StoryPose& at, const StoryStep& step) // foot of Route 4's ledge, the row's walks on the sim reach the nurse // with that leg whole or a tile short. UnitTestResult test_cerulean_entry_short(){ - const StoryCheckpoint* row = &checkpoint_row("00.14"); + const StoryCheckpoint* row = &checkpoint_row("04.06"); const auto hop = std::find_if(row->steps.begin(), row->steps.end(), [](const StoryStep& step){ return step.name == "ledge_hop"; }); if (hop == row->steps.end() || !hop->pose_after){ - return "00.14: no ledge_hop."; + return "04.06: no ledge_hop."; } for (int short_by : {0, 1}){ StoryPose at = *story_pose(Pokemon::pose_of(*hop->pose_after)); @@ -399,23 +399,23 @@ UnitTestResult test_cerulean_entry_short(){ return true; } -// Console B, 2026-11-03 (row 00.16), twice: the open leg north from +// Console B, 2026-11-03 (row 05.05), twice: the open leg north from // Cerulean City onto Nugget Bridge ended on (11, 33), a tile short of // (11, 32), and the one step onto Cale's row reached only (11, 32), out // of his sight: "bug_catcher_cale: failed: no_battle". From the walk's // end, whole or a tile short, the five trainers are met and beaten on // the sim, each battle on the trainer's row. UnitTestResult test_nugget_bridge_short(){ - const StoryCheckpoint* row = &checkpoint_row("00.16"); + const StoryCheckpoint* row = &checkpoint_row("05.05"); const auto walk = std::find_if(row->steps.begin(), row->steps.end(), [](const StoryStep& step){ return step.name == "below_cale_line"; }); if (walk == row->steps.end() || !walk->args.contains("target")){ - return "No step 00.16/below_cale_line."; + return "No step 05.05/below_cale_line."; } for (int short_by : {0, 1}){ StoryPose at = *story_pose(Pokemon::pose_of(Pokemon::story_arg(walk->args, "target"))); OverworldSim sim(story_maps(), MapPosition{at.map, {at.tile.x, at.tile.y + short_by}}, Direction::NORTH); for (auto step = walk + 1; step != row->steps.end() && step->kind != StoryStepKind::READY; ++step){ - const std::string failure = row_step_on_sim(sim, at, *step, "00.16"); + const std::string failure = row_step_on_sim(sim, at, *step, "05.05"); if (!failure.empty()){ return std::format("Walk {} tile(s) short: ", short_by) + failure; } @@ -427,17 +427,17 @@ UnitTestResult test_nugget_bridge_short(){ return true; } -// 00.17 on the sim, from its start on Route 24 to the Sea Cottage: +// 05.06 on the sim, from its start on Route 24 to the Sea Cottage: // Franklin, Kelsey, Nob and Haley are met on the steps into their lines // and beaten there. The sim's trainers who look around see every way // they may look, so Youngster Dan sees the player on (20, 4), walks up // to (21, 4) and is fought there, off the way on. UnitTestResult test_route25_trainers(){ - const StoryCheckpoint* row = &checkpoint_row("00.17"); + const StoryCheckpoint* row = &checkpoint_row("05.06"); 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){ - const std::string failure = row_step_on_sim(sim, at, step, "00.17"); + const std::string failure = row_step_on_sim(sim, at, step, "05.06"); if (!failure.empty()){ return failure; } @@ -448,23 +448,23 @@ UnitTestResult test_route25_trainers(){ for (const std::string& name : sim.state().trainers_beaten){ beaten += " " + name; } - return "00.17: expected Franklin, Dan, Kelsey, Nob and Haley beaten; beat" + beaten + "."; + return "05.06: expected Franklin, Dan, Kelsey, Nob and Haley beaten; beat" + beaten + "."; } if (!(sim.state().position == MapPosition{"Route25_SeaCottage", {7, 8}})){ - return "00.17: expected to end in the Sea Cottage on (7, 8), not " + to_string(sim.state().position) + "."; + return "05.06: expected to end in the Sea Cottage on (7, 8), not " + to_string(sim.state().position) + "."; } return true; } -// 00.20 on the sim, its walks from the Center: over Nugget Bridge, whose -// trainers 00.16 beat (they stand there, but don't battle), onto Route +// 05.09 on the sim, its walks from the Center: over Nugget Bridge, whose +// trainers 05.05 beat (they stand there, but don't battle), onto Route // 24's grass at (4, 19) out of Camper Shane's sight, and back to the // nurse. No trainer battles on the way. The open leg north from Cerulean // City onto the bridge crosses onto Route 24, where the game holds the // player up a tile: held for its tiles alone it ended on (11, 16), a tile // short, and the leg west bumped the bridge's posts (console B, -// 2026-11-03, row 00.20, twice). -// The story maps after 00.16: Nugget Bridge's trainers beaten, standing +// 2026-11-03, row 05.09, twice). +// The story maps after 05.05: Nugget Bridge's trainers beaten, standing // on columns 10 and 12 without battling. std::vector maps_bridge_beaten(){ std::vector maps = story_maps(); @@ -482,7 +482,7 @@ std::vector maps_bridge_beaten(){ } UnitTestResult test_oddish_walks(){ - const StoryCheckpoint* row = &checkpoint_row("00.20"); + const StoryCheckpoint* row = &checkpoint_row("05.09"); StoryPose at = *story_pose(Pokemon::pose_of(*row->start)); OverworldSim sim(maps_bridge_beaten(), MapPosition{at.map, at.tile}, *at.facing); const std::map ends{ @@ -495,17 +495,17 @@ UnitTestResult test_oddish_walks(){ if (step.kind != StoryStepKind::ROUTE && step.kind != StoryStepKind::LEGS){ continue; } - const std::string failure = row_step_on_sim(sim, at, step, "00.20"); + const std::string failure = row_step_on_sim(sim, at, step, "05.09"); if (!failure.empty()){ return failure; } const auto end = ends.find(step.name); if (end == ends.end() || !(sim.state().position == end->second)){ - return "00.20/" + step.name + ": ended on " + to_string(sim.state().position) + "."; + return "05.09/" + step.name + ": ended on " + to_string(sim.state().position) + "."; } } if (!sim.state().trainers_beaten.empty() || !sim.state().violations.empty()){ - return "00.20: a trainer's battle or a violation on the way."; + return "05.09: a trainer's battle or a violation on the way."; } return true; } @@ -531,7 +531,7 @@ std::optional target_of(const StoryStep& step){ return target == nullptr ? std::nullopt : std::optional(Pokemon::pose_of(*target)); } -// Console B, 2026-11-03 (row 00.20, run m61): the Oddish's battle came +// Console B, 2026-11-03 (row 05.09, run m61): the Oddish's battle came // on the pace's far step, so the capture left the player on (3, 19), not // the table's (4, 19). The walk back planned from (4, 19) went a column // west of its plan, down the bridge's column 10, not 11, and stopped @@ -539,18 +539,18 @@ std::optional target_of(const StoryStep& step){ // warp to the Center never came. On the sim, the battle on either step // of the pace, the row's later walks, from the capture's tiles, reach the // nurse. -// Console B, 2026-11-03 (m63, 00.20 verify run 2): the open leg west +// Console B, 2026-11-03 (m63, 05.09 verify run 2): the open leg west // from Nugget Bridge's head ended a tile short, so the walk down onto the // grass ended on (5, 19), in Camper Shane's sight; after the first wild // battle he walked up ("I saw your feat from the grass!") and the capture // stopped. From the Mart, the walk to the patch on the sim keeps out of // his sight with the leg west whole or a tile short. UnitTestResult test_oddish_patch_west_short(){ - const StoryCheckpoint* row = &checkpoint_row("00.20"); + const StoryCheckpoint* row = &checkpoint_row("05.09"); const auto mart = std::find_if(row->steps.begin(), row->steps.end(), [](const StoryStep& step){ return step.name == "mart_clerk"; }); const auto patch = std::find_if(row->steps.begin(), row->steps.end(), [](const StoryStep& step){ return step.name == "oddish_patch"; }); if (mart == row->steps.end() || patch == row->steps.end() || !target_of(*mart) || !target_of(*patch)){ - return "00.20: no mart_clerk or oddish_patch."; + return "05.09: no mart_clerk or oddish_patch."; } for (int short_by : {0, 1}){ StoryPose at = *story_pose(*target_of(*mart)); @@ -559,7 +559,7 @@ UnitTestResult test_oddish_patch_west_short(){ // over the bridge, then the 8th, west from the bridge's head. script.short_holds[8] = short_by; OverworldSim sim(maps_bridge_beaten(), MapPosition{at.map, at.tile}, *at.facing, script); - const std::string failure = row_step_on_sim(sim, at, *patch, "00.20"); + const std::string failure = row_step_on_sim(sim, at, *patch, "05.09"); const std::string label = std::format("West leg {} tile(s) short: ", short_by); if (!failure.empty()){ return label + failure; @@ -576,14 +576,14 @@ UnitTestResult test_oddish_patch_west_short(){ } UnitTestResult test_oddish_battle_on_far_step(){ - const StoryCheckpoint* row = &checkpoint_row("00.20"); + const StoryCheckpoint* row = &checkpoint_row("05.09"); const auto capture = std::find_if(row->steps.begin(), row->steps.end(), [](const StoryStep& step){ return step.name == "catch_oddish"; }); if (capture == row->steps.end() || capture + 1 == row->steps.end() || !target_of(*(capture + 1))){ - return "00.20: no catch_oddish with a route after it."; + return "05.09: no catch_oddish with a route after it."; } const auto patch = std::find_if(row->steps.begin(), capture, [](const StoryStep& step){ return step.name == "oddish_patch"; }); if (patch == capture || !target_of(*patch)){ - return "00.20: no oddish_patch before catch_oddish."; + return "05.09: no oddish_patch before catch_oddish."; } // The sim starts on the patch (3, 19): grass step 1 is the pace's far // step onto (4, 19), step 2 the one back. @@ -606,17 +606,17 @@ UnitTestResult test_oddish_battle_on_far_step(){ if (!route){ return label + "no route from the capture's tiles."; } - if (const std::string failure = walk_paced_route(sim, *route, "00.20/" + back.name); !failure.empty()){ + if (const std::string failure = walk_paced_route(sim, *route, "05.09/" + back.name); !failure.empty()){ return label + failure; } for (auto step = capture + 2; step != row->steps.end(); ++step){ - const std::string failure = row_step_on_sim(sim, at, *step, "00.20"); + const std::string failure = row_step_on_sim(sim, at, *step, "05.09"); if (!failure.empty()){ return label + failure; } } if (!(sim.state().position == MapPosition{"CeruleanCity_PokemonCenter_1F", {7, 4}})){ - return label + "00.20 ended on " + to_string(sim.state().position) + ", not the nurse."; + return label + "05.09 ended on " + to_string(sim.state().position) + ", not the nurse."; } } return true; @@ -671,20 +671,20 @@ UnitTestResult test_routes_after_pacing(){ } } if (checked < 3){ - return std::format("Expected the routes after 00.14b's and 00.15's GRINDs and 00.20's capture; checked {}.", checked); + return std::format("Expected the routes after 05.01's and 05.03's GRINDs and 05.09's capture; checked {}.", checked); } return true; } -// 00.14 on the sim, from Mt. Moon's exit (32, 6): east and up through +// 04.06 on the sim, from Mt. Moon's exit (32, 6): east and up through // (48, 5) into the tutors' pen on Route 4 to (50, 4), facing the Mega // Kick tutor (50, 3), then on to above the ledge (93, 8). Each walk ends // where the table says, and no trainer sees the player on the way. UnitTestResult test_mega_kick_tutor_walks(){ - const StoryCheckpoint* row = &checkpoint_row("00.14"); + const StoryCheckpoint* row = &checkpoint_row("04.06"); const auto ledge = std::find_if(row->steps.begin(), row->steps.end(), [](const StoryStep& step){ return step.name == "above_ledge"; }); if (ledge == row->steps.end()){ - return "00.14: no above_ledge."; + return "04.06: no above_ledge."; } StoryPose at = *story_pose(Pokemon::pose_of(*row->start)); OverworldSim sim(story_maps(), MapPosition{at.map, at.tile}, *at.facing); @@ -693,27 +693,27 @@ UnitTestResult test_mega_kick_tutor_walks(){ if (step->kind != StoryStepKind::ROUTE && step->kind != StoryStepKind::LEGS){ continue; } - const std::string failure = row_step_on_sim(sim, at, *step, "00.14"); + const std::string failure = row_step_on_sim(sim, at, *step, "04.06"); if (!failure.empty()){ return failure; } if (!(sim.state().position == MapPosition{at.map, at.tile})){ - return "00.14/" + step->name + ": expected " + to_string(MapPosition{at.map, at.tile}) + ", but on " + to_string(sim.state().position) + "."; + return "04.06/" + step->name + ": expected " + to_string(MapPosition{at.map, at.tile}) + ", but on " + to_string(sim.state().position) + "."; } if (sim.state().position == MapPosition{"Route4", {50, 4}} && sim.state().facing == Direction::NORTH){ at_tutor = true; } } if (!at_tutor){ - return "00.14: no walk ended on Route 4's (50, 4) facing the Mega Kick tutor (50, 3)."; + return "04.06: no walk ended on Route 4's (50, 4) facing the Mega Kick tutor (50, 3)."; } if (!sim.state().trainers_beaten.empty() || !sim.state().violations.empty()){ - return "00.14: a trainer's battle or a violation on the way."; + return "04.06: a trainer's battle or a violation on the way."; } return true; } -// Console B, 2026-11-03 (row 00.18): after his scene Bill stands on +// Console B, 2026-11-03 (row 05.07): after his scene Bill stands on // (7, 6), east of the player on (6, 6), not on the maps' (7, 5). The // walk out planned east onto (7, 6) and south to the mat (7, 9); the // east tap bumped Bill, and the hold south took the player down column 6 @@ -722,10 +722,10 @@ UnitTestResult test_mega_kick_tutor_walks(){ // didn't warp from (6, 9)), the row's walks after the ticket end each // where the table says and leave on Route 25's (51, 5). UnitTestResult test_out_of_bill_cottage(){ - const StoryCheckpoint* row = &checkpoint_row("00.18"); + const StoryCheckpoint* row = &checkpoint_row("05.07"); const auto ticket = std::find_if(row->steps.begin(), row->steps.end(), [](const StoryStep& step){ return step.name == "ss_ticket"; }); if (ticket == row->steps.end() || !ticket->pose_after){ - return "00.18: no ss_ticket."; + return "05.07: no ss_ticket."; } std::vector maps = story_maps(); for (MapData& map : maps){ @@ -746,19 +746,19 @@ UnitTestResult test_out_of_bill_cottage(){ if (step->kind != StoryStepKind::ROUTE && step->kind != StoryStepKind::LEGS){ continue; } - const std::string failure = row_step_on_sim(sim, at, *step, "00.18"); + const std::string failure = row_step_on_sim(sim, at, *step, "05.07"); if (!failure.empty()){ return failure; } if (!(sim.state().position == MapPosition{at.map, at.tile})){ - return "00.18/" + step->name + ": expected " + to_string(MapPosition{at.map, at.tile}) + ", but on " + to_string(sim.state().position) + "."; + return "05.07/" + step->name + ": expected " + to_string(MapPosition{at.map, at.tile}) + ", but on " + to_string(sim.state().position) + "."; } } if (!(sim.state().position == MapPosition{"Route25", {51, 5}})){ - return "00.18: expected to leave onto Route 25's (51, 5), not " + to_string(sim.state().position) + "."; + return "05.07: expected to leave onto Route 25's (51, 5), not " + to_string(sim.state().position) + "."; } if (!sim.state().violations.empty()){ - return "00.18: violations:" + joined(sim.state().violations); + return "05.07: violations:" + joined(sim.state().violations); } return true; } @@ -820,14 +820,14 @@ const AutoStorySimulationTestCase AUTO_STORY_SIMULATION_CASES[] = { {.input = {.name = "start and end checkpoints", .body = test_start_and_end}, .expectation = {.description = "executes segment bounded by start and end checkpoints"}}, {.input = {.name = "a failed walk reloads its checkpoint's save", .body = test_retry_from_save}, .expectation = {.description = "reloads checkpoint save state on simulated movement failure"}}, {.input = {.name = "a battle lost every time stops after 3 attempts", .body = test_gives_up_after_attempts}, .expectation = {.description = "aborts after three consecutive battle blackouts"}}, - {.input = {.name = "00.14 into Cerulean, the entry leg a tile short", .body = test_cerulean_entry_short}, .expectation = {.description = "recovers when entering Cerulean City if movement ends one tile short"}}, - {.input = {.name = "00.14 from Mt. Moon to the Mega Kick tutor, then above the ledge", .body = test_mega_kick_tutor_walks}, .expectation = {.description = "verifies route navigation from Mt. Moon to tutor and past ledge"}}, - {.input = {.name = "00.16 Nugget Bridge, the walk onto it a tile short", .body = test_nugget_bridge_short}, .expectation = {.description = "completes Nugget Bridge battles even if initial approach stops short"}}, - {.input = {.name = "00.17 Route 25, its four trainers and Dan", .body = test_route25_trainers}, .expectation = {.description = "simulates Route 25 trainer battles and Dan detour"}}, - {.input = {.name = "00.18 out of Bill's Sea Cottage, Bill on (7, 6)", .body = test_out_of_bill_cottage}, .expectation = {.description = "simulates exiting Bill sea cottage with Bill relocated"}}, - {.input = {.name = "00.20 to Route 24's grass and back, past Shane", .body = test_oddish_walks}, .expectation = {.description = "navigates to Route 24 grass avoiding trainer line of sight"}}, - {.input = {.name = "00.20 back to the Center, the Oddish's battle on the pace's far step", .body = test_oddish_battle_on_far_step}, .expectation = {.description = "handles Oddish capture encounter occurring on far pace step"}}, - {.input = {.name = "00.20 onto the grass out of Shane's sight, the leg west a tile short", .body = test_oddish_patch_west_short}, .expectation = {.description = "recovers when approaching grass patch with short western leg"}}, + {.input = {.name = "04.06 into Cerulean, the entry leg a tile short", .body = test_cerulean_entry_short}, .expectation = {.description = "recovers when entering Cerulean City if movement ends one tile short"}}, + {.input = {.name = "04.06 from Mt. Moon to the Mega Kick tutor, then above the ledge", .body = test_mega_kick_tutor_walks}, .expectation = {.description = "verifies route navigation from Mt. Moon to tutor and past ledge"}}, + {.input = {.name = "05.05 Nugget Bridge, the walk onto it a tile short", .body = test_nugget_bridge_short}, .expectation = {.description = "completes Nugget Bridge battles even if initial approach stops short"}}, + {.input = {.name = "05.06 Route 25, its four trainers and Dan", .body = test_route25_trainers}, .expectation = {.description = "simulates Route 25 trainer battles and Dan detour"}}, + {.input = {.name = "05.07 out of Bill's Sea Cottage, Bill on (7, 6)", .body = test_out_of_bill_cottage}, .expectation = {.description = "simulates exiting Bill sea cottage with Bill relocated"}}, + {.input = {.name = "05.09 to Route 24's grass and back, past Shane", .body = test_oddish_walks}, .expectation = {.description = "navigates to Route 24 grass avoiding trainer line of sight"}}, + {.input = {.name = "05.09 back to the Center, the Oddish's battle on the pace's far step", .body = test_oddish_battle_on_far_step}, .expectation = {.description = "handles Oddish capture encounter occurring on far pace step"}}, + {.input = {.name = "05.09 onto the grass out of Shane's sight, the leg west a tile short", .body = test_oddish_patch_west_short}, .expectation = {.description = "recovers when approaching grass patch with short western leg"}}, {.input = {.name = "the routes after pacing, from either of its tiles", .body = test_routes_after_pacing}, .expectation = {.description = "plans valid routes regardless of which pacing tile character ends on"}}, {.input = {.name = "a save off the start pose stops before any step", .body = test_save_off_start_pose}, .expectation = {.description = "fails the start check without walking or saving"}}, {.input = {.name = "a dialog pops up before every step", .body = test_dialog_before_every_step}, .expectation = {.description = "cleared between steps, the story passes; left up, a walk fails on it"}}, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryStartFrames_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryStartFrames_Tests.cpp index f6a9cfb692..27ab064b24 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryStartFrames_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryStartFrames_Tests.cpp @@ -298,8 +298,8 @@ const ReadCase READ_CASES[] = { }; -// console B, FRLG 00.27, 2026-11-09: the save stood outside Cerulean -// Center's door, not at the counter where 00.27 starts, and the run walked +// console B, FRLG 07.02, 2026-11-09: the save stood outside Cerulean +// Center's door, not at the counter where 07.02 starts, and the run walked // off. A checkpoint of one walk with the console's start check on frames // (add_start_check(), as build_checkpoint() adds it): the walk runs only // when the screen after the save loads shows the kept frame's place, or @@ -353,7 +353,7 @@ class Test_StartFrameCheck : public UnitTest{ private: static Pokemon::Checkpoint one_walk(size_t& walks){ Pokemon::Checkpoint checkpoint; - checkpoint.id = "00.27"; + checkpoint.id = "07.02"; Pokemon::Event walk; walk.name = "to_the_door"; walk.act = [&walks](Pokemon::RunState&){ @@ -389,15 +389,15 @@ const StartCheckCase START_CHECK_CASES[] = { }; -// The store, given two frames for 00.28 (outside the door, then the -// counter): what it finds for 00.28 and 00.27. +// The store, given two frames for 08.01 (outside the door, then the +// counter): what it finds for 08.01 and 07.02. struct StoreInput{ std::string name; // A folder to keep them in; none for the simulation's store. bool has_folder; }; struct StoreExpectation{ - // 00.28's frame is found, and is the last one kept (the counter). + // 08.01's frame is found, and is the last one kept (the counter). bool finds_last; }; struct StoreCase{ @@ -424,17 +424,17 @@ class Test_StartFrameStore : public UnitTest{ private: UnitTestResult check(const StartFrameStore& store) const{ - if (store.load("00.28")){ + if (store.load("08.01")){ return "expected no frame before one is kept"; } - const bool kept = store.save("00.28", start_frame(outside_door()), "test") - && store.save("00.28", start_frame(at_counter()), "test"); - const std::optional found = store.load("00.28"); + const bool kept = store.save("08.01", start_frame(outside_door()), "test") + && store.save("08.01", start_frame(at_counter()), "test"); + const std::optional found = store.load("08.01"); const bool finds_last = kept && found && found->width() == 240 && found->height() == 160 && same_start_place(compare_start_frames(*found, at_counter())); - if (finds_last != m_case.expectation.finds_last || store.load("00.27")){ + if (finds_last != m_case.expectation.finds_last || store.load("07.02")){ return std::format( - "expected 00.28's last frame {}found and none for 00.27; kept: {}, found: {}", + "expected 08.01's last frame {}found and none for 07.02; kept: {}, found: {}", m_case.expectation.finds_last ? "" : "not ", kept, found.has_value() ); } diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.h index ec960d1f99..3c96de3850 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.h @@ -6,10 +6,16 @@ * 3 to the Magikarp salesman in Route 4's Pokemon Center, through Mt. * Moon to Route 4 east of it, and on to Cerulean City, Misty, its rival, * Nugget Bridge and Bill, then Route 6 to Vermilion City, the S.S. - * Anne's HM01 and Lt. Surge, as story checkpoints 00.01 to 00.25, each - * saved at its end. After 00.10 every route and leg runs. Taken from a by-hand run on + * Anne's HM01 and Lt. Surge, as story checkpoints 01.01 to 06.04, each + * saved at its end. After 03.03 every route and leg runs. Taken from a by-hand run on * console B (2026-11-01) and the pokefirered map scripts. * + * An id is part.NN, checkpoint NN of that part of Bulbapedia's FireRed + * and LeafGreen walkthrough (parts 1 to 9 here). The order follows our + * setup and can differ in other runs: the rival battles depend on the + * starter, Route 11 and Diglett's Cave are skipped, the Bike Voucher is + * fetched as a detour, and the Rocket Hideout comes before Celadon Gym. + * * Each checkpoint is an authored JSON file in StoryData/ * (frlg-.plan.json, format pokesim-authored-checkpoint/1): the shared * checkpoint, its steps each an action with args, read against FRLG's @@ -59,12 +65,12 @@ const std::vector>& autostory_checkpoint_jso // action args it doesn't take, or has notes for a step it doesn't have. StoryCheckpoint read_story_checkpoint_file(const JsonValue& value, std::string_view source); -// Checkpoints 00.01 to 00.27, in order: every file in StoryData/. With -// 00.01b, the way back in after SID Helper, after 00.01, 00.04 split in two at Squirtle's ball for -// Starter RNG: 00.04 and 00.04b, 00.12b, the way back in after Gift RNG, -// after 00.12, 00.12c, the Magikarp put in BOX 1, after it, 00.14b and -// 00.14c, Cerulean Gym to a save below Misty's platform and Misty alone -// from it, and 00.15b, the rival in Cerulean alone, from 00.15's save +// Checkpoints 01.01 to 07.02, in order: every file in StoryData/. With +// 01.02, the way back in after SID Helper, after 01.01, 01.05 split in two at Squirtle's ball for +// Starter RNG: 01.05 and 01.06, 04.03, the way back in after Gift RNG, +// after 04.02, 04.04, the Magikarp put in BOX 1, after it, 05.01 and +// 05.02, Cerulean Gym to a save below Misty's platform and Misty alone +// from it, and 05.04, the rival in Cerulean alone, from 05.03's save // below his trigger. const std::vector& story_checkpoints(); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens.h index 7ee8a1c5ce..571b170a30 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens.h @@ -17,7 +17,7 @@ * pokemon_special_anim.c), the member on pale blue diamonds: "Machine * set!", which waits for A (B there cancels the teach), the disc's * wobble, " learned !", then the TM CASE's list (console B, - * 00.23: HM01 to an Oddish with two free slots). With four: " + * 06.02: HM01 to an Oddish with two free slots). With four: " * wants to learn the move .", "However, already knows four * moves.", "Should a move be deleted and replaced with ?" YES/NO * (YES on top), YES: "Which move should be forgotten?", then KNOWN diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens_Tests.cpp index cad2d6d3eb..88445df489 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTeachScreens_Tests.cpp @@ -12,7 +12,7 @@ * pokemon_special_anim.c, Task_UseTM_NoForget / Task_ForgetMove, then * Task_MachineSet): "Machine set!" waits for A and B cancels the teach; * the wobble and " learned !" run on their own. Console B, - * 00.23 (2026-11-03): HM01 to an Oddish with two free slots stopped on + * 06.02 (2026-11-03): HM01 to an Oddish with two free slots stopped on * "Machine set!", read as "other", and gave up. * */ @@ -506,7 +506,7 @@ void three_moves_scene_unread(FakeTeachGame& game){ three_moves(game); game.scene_unread = true; } -// 00.23 on console B: HM01 to the Oddish (slot 2), ABSORB and SWEET +// 06.02 on console B: HM01 to the Oddish (slot 2), ABSORB and SWEET // SCENT. void oddish_cut(FakeTeachGame& game){ game.tms = {{"water-pulse", 1}, {"cut", 1}}; @@ -596,7 +596,7 @@ std::vector scene_screens_cases(){ .moves = {"bite", "bubble", "withdraw", "water-pulse"}, }, { - .name = "console B 00.23: HM01 to the Oddish, two free slots", + .name = "console B 06.02: HM01 to the Oddish, two free slots", .setup = oddish_cut, .plan = {.item = "hm01", .move = "cut", .member = 1}, .moves = {"absorb", "sweet-scent", "cut"}, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrainerMessage.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrainerMessage.h index 97b53216a3..807afd4d62 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrainerMessage.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrainerMessage.h @@ -47,7 +47,7 @@ inline constexpr Milliseconds BATTLE_EXIT_TIMEOUT(10000); // nothing (wait_for_quiet_overworld()) for MovementMechanics:: // AFTER_BATTLE_QUIET, at most BATTLE_EXIT_TIMEOUT, and logs how the screen // ended. A tap sent as the battle's black ends is lost (console B, -// 2026-11-09, 00.28 winston_line). +// 2026-11-09, 08.01 winston_line). void wait_out_battle_exit(ConsoleHandle& console, ProControllerContext& context); diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrashCanLayout.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrashCanLayout.h index 55bae87db6..c3055a2a84 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrashCanLayout.h +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTrashCanLayout.h @@ -44,7 +44,7 @@ struct TrashCanStand{ // Position and facing to inspect a trash can. TrashCanStand trash_can_stand(int can); -// `maps` with Vermilion Gym's trainers where their battles in 00.23 leave +// `maps` with Vermilion Gym's trainers where their battles in 06.02 leave // them, beaten (PokemonFRLG_AutoStoryTableVermilionGym.cpp): Sailor // Dwayne on (8, 14), Engineer Baily on (2, 12), Gentleman Tucker on // (6, 8). The search plans its walks between the cans on these, not on diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilionGym_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilionGym_Tests.cpp index 6553ad25e3..681eeb4852 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilionGym_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilionGym_Tests.cpp @@ -2,7 +2,7 @@ * * From: https://github.com/PokemonAutomation/ * - * Rows 00.23 to 00.25 (StoryData/frlg-00.23..25.plan.json) on the + * Rows 06.02 to 06.04 (StoryData/frlg-06.02..25.plan.json) on the * overworld sim: the tree cut on the way in and out, the gym's three * trainers fought where the table says, the trash can search walking * between the cans clear of where the trainers stand after their battles @@ -117,8 +117,8 @@ MapData& map_named(std::vector& maps, const std::string& name){ throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "No map " + name + "."); } -// `maps` with the trainers beaten that rows before 00.24 fought: Route -// 6's Jeff (00.21) and Vermilion Gym's three (00.23). +// `maps` with the trainers beaten that rows before 06.03 fought: Route +// 6's Jeff (05.10) and Vermilion Gym's three (06.02). std::vector maps_after_gym(std::vector maps = story_maps()){ for (MapObject& object : map_named(maps, GYM).objects){ object.trainer.reset(); @@ -231,10 +231,10 @@ class SimGym{ bool m_first_found = false; }; -// Row 00.23 from steps `first` to `last` (exclusive) on `sim`, the trash +// Row 06.02 from steps `first` to `last` (exclusive) on `sim`, the trash // cans drawn as `draws` say. std::string run_gym_steps(OverworldSim& sim, StoryPose& at, size_t first, size_t last, const std::vector& draws){ - const StoryCheckpoint& row = checkpoint("00.23"); + const StoryCheckpoint& row = checkpoint("06.02"); for (size_t c = first; c < last; c++){ const StoryStep& step = row.steps[c]; if (step.action == TRASH_CANS_VARIANT){ @@ -242,7 +242,7 @@ std::string run_gym_steps(OverworldSim& sim, StoryPose& at, size_t first, size_t SimGym gym(sim, at, draws); const TrashCanResult result = run_trash_cans(logger, [&](int can){ return gym.check(can); }); if (result.end != TrashCanEnd::OPENED || !gym.open){ - return "00.23/trash_cans: " + std::string(trash_can_end_name(result.end)) + " " + gym.error; + return "06.02/trash_cans: " + std::string(trash_can_end_name(result.end)) + " " + gym.error; } continue; } @@ -253,13 +253,13 @@ std::string run_gym_steps(OverworldSim& sim, StoryPose& at, size_t first, size_t return ""; } -// 00.23 on the sim from the nurse to the nurse: the tree cut, Dwayne, +// 06.02 on the sim from the nurse to the nurse: the tree cut, Dwayne, // Baily and Tucker fought in that order where the table says and no one // else, the cans searched, out past the tree grown back. The switches // found at once (under 3 and 4), and after a wrong guess's reset (under // 3 and 8, then 13 and 14). UnitTestResult test_gym_row(){ - const StoryCheckpoint& row = checkpoint("00.23"); + const StoryCheckpoint& row = checkpoint("06.02"); for (const std::vector& draws : {std::vector{{3, 4}}, std::vector{{3, 8}, {13, 14}}}){ StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); OverworldSim sim(story_maps(), MapPosition{at.map, at.tile}, *at.facing); @@ -268,10 +268,10 @@ UnitTestResult test_gym_row(){ } const std::vector expected{"sailor", "balding_man", "gentleman"}; if (sim.state().trainers_beaten != expected || !sim.state().violations.empty()){ - return "00.23: expected Dwayne, Baily and Tucker beaten and no violation; beat" + beaten_list(sim) + "."; + return "06.02: expected Dwayne, Baily and Tucker beaten and no violation; beat" + beaten_list(sim) + "."; } if (!(sim.state().position == MapPosition{VERMILION_CENTER, {7, 4}})){ - return "00.23: expected to end at Vermilion's nurse, not " + to_string(sim.state().position) + "."; + return "06.02: expected to end at Vermilion's nurse, not " + to_string(sim.state().position) + "."; } } return true; @@ -281,7 +281,7 @@ UnitTestResult test_gym_row(){ // their battles leave them: every can's stand reached from (5, 8) and from // every other stand, and the way out to the nurse from every stand. UnitTestResult test_cans_from_everywhere(){ - const StoryCheckpoint& row = checkpoint("00.23"); + const StoryCheckpoint& row = checkpoint("06.02"); StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); OverworldSim sim(story_maps(), MapPosition{at.map, at.tile}, *at.facing); const size_t cans = step_index(row, "trash_cans"); @@ -337,11 +337,11 @@ UnitTestResult test_tree_shuts_the_yard(){ return true; } -// 00.24 and 00.25 on the sim, the gym as 00.23 leaves it: to Route 6's +// 06.03 and 06.04 on the sim, the gym as 06.02 leaves it: to Route 6's // grass round Isabelle's line and back, to below Surge through the beams, // and from him back out past the tree to the nurse, meeting no one. UnitTestResult test_to_surge_and_out(){ - for (std::string_view id : {"00.24", "00.25"}){ + for (std::string_view id : {"06.03", "06.04"}){ const StoryCheckpoint& row = checkpoint(id); StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); OverworldSim sim(maps_after_gym(), MapPosition{at.map, at.tile}, *at.facing); @@ -353,25 +353,25 @@ UnitTestResult test_to_surge_and_out(){ if (!sim.state().trainers_beaten.empty() || !sim.state().violations.empty()){ return std::format("{}: a battle or a violation on the way.", id); } - const MapPosition end = id == "00.24" ? MapPosition{GYM, {5, 3}} : MapPosition{VERMILION_CENTER, {7, 4}}; + const MapPosition end = id == "06.03" ? MapPosition{GYM, {5, 3}} : MapPosition{VERMILION_CENTER, {7, 4}}; if (!(sim.state().position == end)){ return std::format("{}: ended on {}, not {}.", id, to_string(sim.state().position), to_string(end)); } } - const StoryPose next = *story_pose(Pokemon::pose_of(*checkpoint("00.25").start)); + const StoryPose next = *story_pose(Pokemon::pose_of(*checkpoint("06.04").start)); if (!(next.tile == TilePos{5, 3}) || next.map != GYM){ - return "00.25 doesn't start where 00.24 ends."; + return "06.04 doesn't start where 06.03 ends."; } return true; } -// Console B, 00.25 (2026-11-03 18:17): the walk to the nurse went up +// Console B, 06.04 (2026-11-03 18:17): the walk to the nurse went up // column 27 to row 7 and west along it, into Oak's aide on (25, 7), there // since Surge's win; the leg was taken as walked and the step into the -// Center's door went into a house's wall. 00.25 from Surge to the nurse +// Center's door went into a house's wall. 06.04 from Surge to the nurse // with the aide there, meeting no one. UnitTestResult test_out_past_oaks_aide(){ - const StoryCheckpoint& row = checkpoint("00.25"); + const StoryCheckpoint& row = checkpoint("06.04"); const std::vector maps = maps_after_surge(); const MapData& city = *std::find_if(maps.begin(), maps.end(), [](const MapData& map){ return map.name == VERMILION; }); if (object_at(city, {25, 7}) == nullptr){ @@ -391,16 +391,16 @@ UnitTestResult test_out_past_oaks_aide(){ return true; } -// 00.24 with a lead at the grind's level already: the check in the Center +// 06.03 with a lead at the grind's level already: the check in the Center // comes first, and with its flag set the walk to Route 6's grass, the // grind and the way back are skipped; the rest goes from the nurse to // below Surge on the sim. Console B walked out and back at Lv29 // (2026-11-03). UnitTestResult test_lead_ready_skips_grind(){ - const StoryCheckpoint& row = checkpoint("00.24"); + const StoryCheckpoint& row = checkpoint("06.03"); const StoryStep& check = row.steps.front(); if (check.action != GRIND_CHECK_ACTION || !grind_plan_of(check.args)){ - return "Expected 00.24 to start with the grind's check, not " + check.name + "."; + return "Expected 06.03 to start with the grind's check, not " + check.name + "."; } StoryPose at = *story_pose(Pokemon::pose_of(*row.start)); OverworldSim sim(maps_after_gym(), MapPosition{at.map, at.tile}, *at.facing); @@ -427,27 +427,27 @@ UnitTestResult test_lead_ready_skips_grind(){ const AutoStoryVermilionGymCase AUTO_STORY_VERMILION_GYM_CASES[] = { { - .input = {"00.23 the tree shuts the gym's yard until cut", test_tree_shuts_the_yard}, + .input = {"06.02 the tree shuts the gym's yard until cut", test_tree_shuts_the_yard}, .expectation = {}, }, { - .input = {"00.23 Vermilion Gym: Dwayne, Baily and Tucker, the cans at once or after a reset", test_gym_row}, + .input = {"06.02 Vermilion Gym: Dwayne, Baily and Tucker, the cans at once or after a reset", test_gym_row}, .expectation = {}, }, { - .input = {"00.23 every can's stand from Tucker's tile and from every other, and out", test_cans_from_everywhere}, + .input = {"06.02 every can's stand from Tucker's tile and from every other, and out", test_cans_from_everywhere}, .expectation = {}, }, { - .input = {"00.24 and 00.25 through the beams to Lt. Surge and out", test_to_surge_and_out}, + .input = {"06.03 and 06.04 through the beams to Lt. Surge and out", test_to_surge_and_out}, .expectation = {}, }, { - .input = {"00.25 out to the nurse past Oak's aide on (25, 7)", test_out_past_oaks_aide}, + .input = {"06.04 out to the nurse past Oak's aide on (25, 7)", test_out_past_oaks_aide}, .expectation = {}, }, { - .input = {"00.24 with the lead at its level already: no trip to Route 6", test_lead_ready_skips_grind}, + .input = {"06.03 with the lead at its level already: no trip to Route 6", test_lead_ready_skips_grind}, .expectation = {}, }, }; diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilion_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilion_Tests.cpp index d06dcbec85..36c4cf04d3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilion_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryVermilion_Tests.cpp @@ -2,7 +2,7 @@ * * From: https://github.com/PokemonAutomation/ * - * Rows 00.21 (Cerulean to Vermilion City) and 00.22 (the S.S. Anne) on + * Rows 05.10 (Cerulean to Vermilion City) and 06.01 (the S.S. Anne) on * the overworld sim: their walks reach their ends, and meet only the * trainers the table fights. * @@ -83,7 +83,7 @@ size_t step_index(const StoryCheckpoint& row, const std::string& name){ return step - row.steps.begin(); } -// Runs row 00.21's steps from `first` to its end on `sim` from `at`, and +// Runs row 05.10's steps from `first` to its end on `sim` from `at`, and // checks that only Jeff ("camper") was fought and the walk ended at // Vermilion's nurse. std::string run_to_vermilion(OverworldSim& sim, StoryPose at, const StoryCheckpoint& row, size_t first){ @@ -94,15 +94,15 @@ std::string run_to_vermilion(OverworldSim& sim, StoryPose at, const StoryCheckpo } } if (sim.state().trainers_beaten != std::vector{"camper"} || !sim.state().violations.empty()){ - return "00.21: expected Jeff alone beaten and no violation; beat" + beaten_list(sim) + "."; + return "05.10: expected Jeff alone beaten and no violation; beat" + beaten_list(sim) + "."; } if (!(sim.state().position == MapPosition{"VermilionCity_PokemonCenter_1F", {7, 4}})){ - return "00.21: expected to end at Vermilion's nurse, not " + to_string(sim.state().position) + "."; + return "05.10: expected to end at Vermilion's nurse, not " + to_string(sim.state().position) + "."; } return ""; } -// 00.21 on the sim, from Cerulean's Pokemon Center through the burgled +// 05.10 on the sim, from Cerulean's Pokemon Center through the burgled // house to (32, 7), west of the Rocket, meeting no one; his trigger and // battle aren't the sim's, so from where his battle leaves the player: // Route 5, the Underground Path and Route 6, down column 15 out of @@ -111,9 +111,9 @@ std::string run_to_vermilion(OverworldSim& sim, StoryPose at, const StoryCheckpo // walk onto Route 6's column 15 ended a tile short, on column 16: the // same. UnitTestResult test_route6_jeff_only(){ - const StoryCheckpoint* row = checkpoint("00.21"); + const StoryCheckpoint* row = checkpoint("05.10"); if (row == nullptr){ - return "No checkpoint 00.21."; + return "No checkpoint 05.10."; } StoryPose at = *story_pose(Pokemon::pose_of(*row->start)); OverworldSim house(story_maps(), MapPosition{at.map, at.tile}, *at.facing); @@ -124,7 +124,7 @@ UnitTestResult test_route6_jeff_only(){ } } if (!(house.state().position == MapPosition{"CeruleanCity", {32, 7}}) || !house.state().trainers_beaten.empty()){ - return std::format("00.21: expected to reach (32, 7) west of the Rocket, meeting no one, not {}.", to_string(house.state().position)); + return std::format("05.10: expected to reach (32, 7) west of the Rocket, meeting no one, not {}.", to_string(house.state().position)); } const size_t battle = step_index(*row, "rocket_grunt"); const StoryPose after_rocket = *story_pose(Pokemon::pose_of(*row->steps[battle].pose_after)); @@ -166,15 +166,15 @@ StoryPose pose_after(const StoryPose& at, const StoryStep& step){ return at; } -// 00.22's walks on the sim, each from where the table says it starts: to +// 06.01's walks on the sim, each from where the table says it starts: to // the harbor short of the ticket check, aboard and along 2F short of the // rival's trigger row (30..32, 6), into the Captain's office behind him, // back to 1F's door, and from the pier to the nurse. None meets a // trainer: the ship's are in its cabins and on its deck. UnitTestResult test_ss_anne_walks(){ - const StoryCheckpoint* row = checkpoint("00.22"); + const StoryCheckpoint* row = checkpoint("06.01"); if (row == nullptr){ - return "No checkpoint 00.22."; + return "No checkpoint 06.01."; } StoryPose at = *story_pose(Pokemon::pose_of(*row->start)); bool before_rival = true; @@ -186,27 +186,27 @@ UnitTestResult test_ss_anne_walks(){ } const std::optional> route = walked_route(at, step); if (!route || route->empty()){ - return "00.22/" + step.name + ": no route."; + return "06.01/" + step.name + ": no route."; } const MapPosition start{at.map, at.tile}; if (steps_onto(*route, start, "VermilionCity", {{22, 33}, {23, 33}}) || (before_rival && steps_onto(*route, start, "SSAnne_2F_Corridor", {{30, 6}, {31, 6}, {32, 6}})) ){ - return "00.22/" + step.name + ": crosses a trigger before its step."; + return "06.01/" + step.name + ": crosses a trigger before its step."; } OverworldSim sim(story_maps(), start, *at.facing); if (const std::string failure = row_step_on_sim(sim, at, step, row->id); !failure.empty()){ return failure; } if (!(sim.state().position == MapPosition{at.map, at.tile})){ - return "00.22/" + step.name + ": ended on " + to_string(sim.state().position) + ", not " + to_string(MapPosition{at.map, at.tile}) + "."; + return "06.01/" + step.name + ": ended on " + to_string(sim.state().position) + ", not " + to_string(MapPosition{at.map, at.tile}) + "."; } if (!sim.state().trainers_beaten.empty() || !sim.state().violations.empty()){ - return "00.22/" + step.name + ": a trainer's battle or a violation on the way."; + return "06.01/" + step.name + ": a trainer's battle or a violation on the way."; } } if (!(MapPosition{at.map, at.tile} == MapPosition{"VermilionCity_PokemonCenter_1F", {7, 4}})){ - return "00.22: expected to end at Vermilion's nurse."; + return "06.01: expected to end at Vermilion's nurse."; } return true; } @@ -216,11 +216,11 @@ UnitTestResult test_ss_anne_walks(){ const AutoStoryVermilionCase AUTO_STORY_VERMILION_CASES[] = { { - .input = {"00.21 to Vermilion, only Jeff on Route 6, the walk onto column 15 whole or a tile short", test_route6_jeff_only}, + .input = {"05.10 to Vermilion, only Jeff on Route 6, the walk onto column 15 whole or a tile short", test_route6_jeff_only}, .expectation = {}, }, { - .input = {"00.22 the S.S. Anne's walks, short of the ticket check and the rival's trigger", test_ss_anne_walks}, + .input = {"06.01 the S.S. Anne's walks, short of the ticket check and the rival's trigger", test_ss_anne_walks}, .expectation = {}, }, }; 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 06e0ba6f5b..78fe116d7d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp @@ -291,7 +291,7 @@ UnitTestResult check_legs_on( return true; } -// 00.09, each walk from where the one before leaves the player. +// 03.02, each walk from where the one before leaves the player. UnitTestResult test_pewter_gym_walks(){ const MapPosition nurse{"PewterCity_PokemonCenter_1F", {7, 4}}; // In by the door's mat (6, 14), straight up column 6 to below Liam's row. @@ -322,7 +322,7 @@ UnitTestResult test_pewter_gym_walks(){ ); } -// 00.10: out of the Gym to the aide's top trigger. The route keeps off his +// 03.03: out of the Gym to the aide's top trigger. The route keeps off his // three trigger tiles (46, 21..23), which would start the scene a step // early, and the step east from its end lands on (46, 21). UnitTestResult test_pewter_aide_walk(){ @@ -356,8 +356,8 @@ UnitTestResult test_pewter_aide_walk(){ return true; } -// Every ROUTE and LEGS after the Running Shoes (00.10) runs, or after the -// BICYCLE (00.26) may ride; none before. +// Every ROUTE and LEGS after the Running Shoes (03.03) runs, or after the +// BICYCLE (07.01) may ride; none before. UnitTestResult test_runs_after_shoes(){ bool has_shoes = false; bool has_bike = false; @@ -373,11 +373,11 @@ UnitTestResult test_runs_after_shoes(){ } runs += has_shoes ? 1 : 0; } - has_shoes = has_shoes || checkpoint.id == "00.10"; - has_bike = has_bike || checkpoint.id == "00.26"; + has_shoes = has_shoes || checkpoint.id == "03.03"; + has_bike = has_bike || checkpoint.id == "07.01"; } if (!has_shoes || runs == 0){ - return "No checkpoint 00.10, where the player gets the Running Shoes, or no route after it."; + return "No checkpoint 03.03, where the player gets the Running Shoes, or no route after it."; } return true; } @@ -622,7 +622,7 @@ UnitTestResult test_trainer_lines(){ return result; } } - has_shoes = has_shoes || checkpoint.id == "00.10"; + has_shoes = has_shoes || checkpoint.id == "03.03"; } if (beaten.size() != 30){ return "Expected to fight Colton, Greg and James on Route 3, the Grunt at (12, 20) in Mt. Moon, Nugget Bridge's five" @@ -633,22 +633,22 @@ UnitTestResult test_trainer_lines(){ return true; } -// 00.12's walk east over Route 3 crosses Lass Robin's sight (she wanders +// 04.02's walk east over Route 3 crosses Lass Robin's sight (she wanders // x 40, y 10..12, looking north and south, sight 3) on (40, 9) only: if // she sees the player, the walk goes on from there (console B, // 2026-11-02, she stopped "east 11 (to wall)" there). UnitTestResult test_robin_crossing(){ for (const StoryCheckpoint& checkpoint : story_checkpoints()){ - if (checkpoint.id != "00.12" || checkpoint.steps.empty() || checkpoint.steps[0].name != "route4_nurse"){ + if (checkpoint.id != "04.02" || checkpoint.steps.empty() || checkpoint.steps[0].name != "route4_nurse"){ continue; } const std::vector> expected{MapPosition{"Route3", {40, 9}}}; if (wanderer_stops(one_tile(Pokemon::grid_pose_of(*checkpoint.start)), checkpoint.steps[0]) != expected){ - return "Expected 00.12/route4_nurse to cross Lass Robin's sight once, the walk placing her stop on Route3 (40, 9)."; + return "Expected 04.02/route4_nurse to cross Lass Robin's sight once, the walk placing her stop on Route3 (40, 9)."; } return true; } - return "No step 00.12/route4_nurse."; + return "No step 04.02/route4_nurse."; } // A scene the table starts on a step onto its trigger, and the walks of @@ -704,14 +704,14 @@ UnitTestResult check_trigger(const TriggerCase& c){ return "No step " + c.checkpoint + "/" + c.step + "."; } -// 00.15b meets the rival on the middle of his three trigger tiles, row 6 +// 05.04 meets the rival on the middle of his three trigger tiles, row 6 // at x 22..24 north of Cerulean (VAR_MAP_SCENE_CERULEAN_CITY_RIVAL 0), -// and 00.16 the Rocket on the east one of his two, (10..11, 15) on Nugget +// and 05.05 the Rocket on the east one of his two, (10..11, 15) on Nugget // Bridge (VAR_MAP_SCENE_ROUTE24 0), each from the tile below. UnitTestResult test_cerulean_triggers(){ const TriggerCase CASES[] = { - {.checkpoint = "00.15b", .step = "rival_trigger", .map = "CeruleanCity", .y = 6, .x0 = 22, .x1 = 24, .onto_x = 23}, - {.checkpoint = "00.16", .step = "rocket_trigger", .map = "Route24", .y = 15, .x0 = 10, .x1 = 11, .onto_x = 11}, + {.checkpoint = "05.04", .step = "rival_trigger", .map = "CeruleanCity", .y = 6, .x0 = 22, .x1 = 24, .onto_x = 23}, + {.checkpoint = "05.05", .step = "rocket_trigger", .map = "Route24", .y = 15, .x0 = 10, .x1 = 11, .onto_x = 11}, }; for (const TriggerCase& c : CASES){ if (UnitTestResult result = check_trigger(c); result.result != UnitTestResult::PASSED){ @@ -721,13 +721,13 @@ UnitTestResult test_cerulean_triggers(){ return true; } -// 00.16 steps beside Nugget Bridge's five trainers from the south, one +// 05.05 steps beside Nugget Bridge's five trainers from the south, one // step at a time, each battle right after its step: Cale, Ali, Timmy, // Reli and Ethan, by where they stand. UnitTestResult test_nugget_bridge_order(){ - const StoryCheckpoint* checkpoint = find_checkpoint("00.16"); + const StoryCheckpoint* checkpoint = find_checkpoint("05.05"); if (checkpoint == nullptr){ - return "No checkpoint 00.16."; + return "No checkpoint 05.05."; } const std::vector& steps = checkpoint->steps; std::string met; @@ -736,16 +736,16 @@ UnitTestResult test_nugget_bridge_order(){ const MapData* map = find_map_named(pose.map); const MapObject* trainer = steps[c].kind == StoryStepKind::STEP && map ? trainer_seeing(*map, step_end(pose, steps[c], {}), {}, false) : nullptr; if (trainer != nullptr && (c + 1 == steps.size() || steps[c + 1].kind != StoryStepKind::BATTLE)){ - return "00.16/" + steps[c].name + ": no battle right after the step."; + return "05.05/" + steps[c].name + ": no battle right after the step."; } met += trainer ? " " + to_string(TilePos{trainer->x, trainer->y}) : ""; if (UnitTestResult result = advance(pose, steps[c]); result.result != UnitTestResult::PASSED){ - return "00.16 " + result.message; + return "05.05 " + result.message; } } const std::string expected = " (12, 31) (10, 28) (12, 25) (10, 22) (12, 19)"; if (met != expected){ - return "00.16: expected the five bridge trainers south to north," + expected + "; met" + met + "."; + return "05.05: expected the five bridge trainers south to north," + expected + "; met" + met + "."; } return true; } @@ -781,7 +781,7 @@ UnitTestResult test_save_places(){ } // A reload's save checked against the checkpoint's start: a save left in -// Pewter City (a new game whose save didn't happen) can't start 00.02 in +// Pewter City (a new game whose save didn't happen) can't start 01.03 in // the bedroom. The check takes no checks level: Fast runs it too. UnitTestResult test_save_place_error(){ struct Case{ @@ -946,11 +946,11 @@ UnitTestResult test_intro_names(){ return true; } -// 00.12c stores the Magikarp Gift RNG bought; with Gift RNG off there is +// 04.04 stores the Magikarp Gift RNG bought; with Gift RNG off there is // none, and the deposit is skipped instead of refused. UnitTestResult test_magikarp_deposit_skippable(){ for (const StoryCheckpoint& checkpoint : story_checkpoints()){ - if (checkpoint.id != "00.12c"){ + if (checkpoint.id != "04.04"){ continue; } for (const StoryStep& step : checkpoint.steps){ @@ -959,9 +959,9 @@ UnitTestResult test_magikarp_deposit_skippable(){ return true; } } - return "00.12c: expected a deposit of the second slot, skipped if the party hasn't got it."; + return "04.04: expected a deposit of the second slot, skipped if the party hasn't got it."; } - return "No checkpoint 00.12c."; + return "No checkpoint 04.04."; } // set_options()'s RIGHT presses from each value an old save can leave: @@ -1062,7 +1062,7 @@ const AutoStoryTestCase AUTO_STORY_CASES[] = { .expectation = {.description = "verifies trainer interruption on route 3"}, }, { - .input = {.name = "00.12c: the Magikarp's deposit is skipped without Gift RNG", .body = test_magikarp_deposit_skippable}, + .input = {.name = "04.04: the Magikarp's deposit is skipped without Gift RNG", .body = test_magikarp_deposit_skippable}, .expectation = {.description = "skips magikarp deposit when gift rng is disabled"}, }, { diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/binding.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/binding.json index 067fa631d3..3eb131a68e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/binding.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/binding.json @@ -1,8 +1,8 @@ { "format": "pokesim-story-replay-binding/1", "capture": { - "file": "data/story/native/frlg-parcel-00.05.json", - "sha256": "8b0c04f2e1507aee0f0927a8d022b8b431036431e95f8893aa7a2383360f8504", + "file": "data/story/native/frlg-parcel-02.01.json", + "sha256": "793abfef624f690c73cd0bb2e2a149da5f4c8654b50ffbd5905e27d88e1b0c04", "source_revision": "b170b7d2103e887ded825c37fdbdc19fd654fca8" }, "map_revision": "e52be04ed7bb007c7219c7d2c96963cf053e0000", diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/capture.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/capture.json index 2090ba206e..7310babb8e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/capture.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/capture.json @@ -2,7 +2,7 @@ "format": "pokesim-native-checkpoint-export/1", "game": "frlg", "checkpoint": { - "id": "00.05", + "id": "02.01", "title": "Route 1 to Viridian Mart: Oak's Parcel", "start": { "certainty": "tile", diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/pin.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/pin.json index 1289d24a91..165ee3d668 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/pin.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/pin.json @@ -1,24 +1,24 @@ { "format": "pokesim-native-replay-preview/1", "repository": "dayfine/PokemonSimulation", - "revision": "bdca47c5045797be1d2a1f0931ad6a8f15ab3225", + "revision": "d3eea1b5c04180f8b60eb98b0d65f70aca6b1abb", "status": "preview-unmerged-PR-73", "files": { "binding": { "path": "data/story/parcel-pilot/binding.json", - "sha256": "ce91aba96599f443910dc76a985b97a45b8a76bcbbb1c9824cd247a627d946f4" + "sha256": "a29dd87a33c56dd108956d3a691646dbed850b376df6b9f019977dac979a5ed2" }, "cases": { "path": "data/story/parcel-pilot/cases.json", "sha256": "0dee2991120d12f01e67f6e97a4fb815b4d2f54a423739bc1a6aa4f2509f599e" }, "capture": { - "path": "data/story/native/frlg-parcel-00.05.json", - "sha256": "8b0c04f2e1507aee0f0927a8d022b8b431036431e95f8893aa7a2383360f8504" + "path": "data/story/native/frlg-parcel-02.01.json", + "sha256": "793abfef624f690c73cd0bb2e2a149da5f4c8654b50ffbd5905e27d88e1b0c04" } }, "candidate": { - "sha256": "78219878fedc2c531a4b0faabbe215193ebc7e842dee0237ff52d296a6d614ac", + "sha256": "019e0d77f4f2c15a295e6ac2cfdf31ad836255acdc40a54fee042fddc96373fb", "producer": "checkpoint_replay.run actual route actions; expectations are not read" } } diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/route-candidate.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/route-candidate.json index 2ce8d3ce63..c2f0cb0214 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/route-candidate.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/ReplayData/route-candidate.json @@ -1,7 +1,7 @@ { "format": "pokesim-route-candidate/1", - "binding_sha256": "ce91aba96599f443910dc76a985b97a45b8a76bcbbb1c9824cd247a627d946f4", - "checkpoint": "00.05", + "binding_sha256": "a29dd87a33c56dd108956d3a691646dbed850b376df6b9f019977dac979a5ed2", + "checkpoint": "02.01", "routes": { "below_mart_door": [ { diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.01.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.01.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.01.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.01.plan.json index 4a051b5b16..96ddd874ef 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.01.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.01", + "id": "01.01", "title": "new game to the bedroom", "events": [ { diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.01b.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.02.plan.json similarity index 95% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.01b.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.02.plan.json index e64cad0a98..ca06ea7176 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.01b.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.01b", + "id": "01.02", "title": "after SID Helper: close the Trainer Card, save in the bedroom", "start": {"map": "PalletTown_PlayersHouse_2F", "tiles": [[6, 6]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.02.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.03.plan.json similarity index 93% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.02.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.03.plan.json index 06d522c23d..bd701d43ea 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.02.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.03.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.02", + "id": "01.03", "title": "bedroom to Pallet Town", "start": {"map": "PalletTown_PlayersHouse_2F", "tiles": [[6, 6]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.03.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.04.plan.json similarity index 95% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.03.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.04.plan.json index 0a86b054dc..e3eabf0b0e 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.03.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.04.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.03", + "id": "01.04", "title": "Oak stops the player and walks them to the lab", "start": {"map": "PalletTown", "tiles": [[6, 8]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.04.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.05.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.04.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.05.plan.json index a49a93050b..094053bfaf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.04.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.05.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.04", + "id": "01.05", "title": "to Squirtle's ball, south of the table", "start": {"map": "PalletTown_ProfessorOaksLab", "tiles": [[6, 4]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.04b.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.06.plan.json similarity index 95% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.04b.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.06.plan.json index 9480ed6556..9c152675c8 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.04b.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-01.06.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.04b", + "id": "01.06", "title": "Squirtle, then the rival's battle", "start": {"map": "PalletTown_ProfessorOaksLab", "tiles": [[9, 5]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.05.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.01.plan.json similarity index 95% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.05.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.01.plan.json index 19e8a2e15e..4e136e4488 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.05.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.05", + "id": "02.01", "title": "Route 1 to Viridian Mart: Oak's Parcel", "start": {"map": "PalletTown_ProfessorOaksLab", "tiles": [[7, 8]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.06.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.02.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.06.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.02.plan.json index f58aba06bb..f5e4fc8fe2 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.06.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.06", + "id": "02.02", "title": "Oak's Parcel to the Pokedex", "start": {"map": "ViridianCity_Mart", "tiles": [[4, 3]], "facing": "west"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.07.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.03.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.07.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.03.plan.json index 75e4db6a09..7d632b6e48 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.07.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-02.03.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.07", + "id": "02.03", "title": "Viridian shopping, then into Viridian Forest", "start": {"map": "PalletTown_ProfessorOaksLab", "tiles": [[6, 4]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.08.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.01.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.08.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.01.plan.json index ddb92f9f99..b843c73693 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.08.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.08", + "id": "03.01", "title": "Viridian Forest to Pewter Center", "start": {"map": "ViridianForest", "tiles": [[29, 62]], "facing": "north"}, "events": [ @@ -66,7 +66,7 @@ }, "notes": { "checkpoint": [ - "The supplies bought in 00.07." + "The supplies bought in 02.03." ], "forest_east": [ "Wild battles are fought for EXP. Straight up the east side from the entrance, each leg ending on a wall (the Boy at (45, 58) stops the east one). Rick (47, 45) sees (42..46, 45), so the last leg meets his battle and is held on to its wall after it. The by-hand run's detour west to (13, 46) and back is dropped." diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.09.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.02.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.09.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.02.plan.json index 103deb8066..daf8a7f291 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.09.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.09", + "id": "03.02", "title": "Pewter Gym: Camper Liam, then Brock", "start": {"map": "PewterCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.10.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.03.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.10.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.03.plan.json index 8687203adb..c84b95c817 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.10.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-03.03.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.10", + "id": "03.03", "title": "Pewter: the Running Shoes from Oak's aide", "start": {"map": "PewterCity_Gym", "tiles": [[6, 6]], "facing": "north"}, "events": [ @@ -52,7 +52,7 @@ "RunningShoesAideTriggerTop: the aide talks from (46, 20), no YES/NO; the player only turns up. He walks off and is removed; FLAG_SYS_B_DASH is set (console B, 2026-11-02: about 20 B presses to the overworld)." ], "below_pewter_center": [ - "Where the by-hand walk stopped to start 00.11 (console B, 2026-11-02)." + "Where the by-hand walk stopped to start 04.01 (console B, 2026-11-02)." ] } }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.11.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.01.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.11.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.01.plan.json index b3346eafc5..6cbf4c0ea3 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.11.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.11", + "id": "04.01", "title": "Pewter Center, then Route 3's trainers", "start": {"map": "PewterCity", "tiles": [[17, 26]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.02.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.02.plan.json index de54d42cfa..6f1f39da72 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.12", + "id": "04.02", "title": "Route 3 and 4 to the Magikarp salesman", "start": {"map": "Route3", "tiles": [[36, 8]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12b.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.03.plan.json similarity index 83% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12b.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.03.plan.json index f3150745d3..5d17946533 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12b.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.03.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.12b", + "id": "04.03", "title": "after Gift RNG: save with the Magikarp", "start": {"map": "Route4_PokemonCenter_1F", "tiles": [[2, 3]], "facing": "west"}, "events": [ @@ -21,7 +21,7 @@ "live_start": true, "notes": { "checkpoint": [ - "Gift RNG buys the Magikarp (500 of the money 00.12 brings) without moving the player and leaves its summary open, or HOME. This saves the shiny where 00.12 ended. A run started here with Gift RNG's handoff on loads the save beside the salesman and runs Gift RNG first." + "Gift RNG buys the Magikarp (500 of the money 04.02 brings) without moving the player and leaves its summary open, or HOME. This saves the shiny where 04.02 ended. A run started here with Gift RNG's handoff on loads the save beside the salesman and runs Gift RNG first." ] } }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12c.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.04.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12c.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.04.plan.json index e6e3c76ae2..a7d36fefe4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.12c.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.04.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.12c", + "id": "04.04", "title": "Route 4 Center: the Magikarp into BOX 1", "start": {"map": "Route4_PokemonCenter_1F", "tiles": [[2, 3]], "facing": "west"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.13.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.05.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.13.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.05.plan.json index 54ad67342e..37cb0a6ad4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.13.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.05.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.13", + "id": "04.05", "title": "Mt. Moon: a Moon Stone, a Rocket, Miguel and the Helix Fossil", "start": {"map": "Route4_PokemonCenter_1F", "tiles": [[11, 2]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.06.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.06.plan.json index db055712e4..3d1ef9ad07 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-04.06.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.14", + "id": "04.06", "title": "Route 4: Mega Kick from its tutor, then east to Cerulean's Pokemon Center", "start": {"map": "Route4", "tiles": [[32, 6]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14b.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.01.plan.json similarity index 90% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14b.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.01.plan.json index 40e06f9bf6..5aa99f1b54 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14b.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.14b", + "id": "05.01", "title": "Cerulean: Potions, a GRIND to Lv23, then into the Gym, saved below Misty's platform", "start": {"map": "CeruleanCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -98,9 +98,9 @@ "lead": "after_brock", "notes": { "checkpoint": [ - "Cerulean Gym (pokefirered CeruleanCity_Gym map.json and scripts.inc): a pool with walkways. Misty (8, 6) stands on a platform (7..9, 6) above row 7. Picnicker Diana (4, 7) faces east, sight 4, over (5..8, 7), so misty_front (8, 7) is in her line; Swimmer Luis (10, 12) in the water faces west, sight 1, over (9, 12), on column 9 north of the door. No gym trainer has to be fought for Misty, so neither is: from the door up column 9 to row 13 (a route there, so the planner's walk to a wall doesn't run on past it through (9, 12)), west to (4, 13), and to walls round the pool's west and north sides, (4, 10), (12, 10), (12, 7), then west to (9, 7), the tile below the platform's east end, out of Diana's line. 00.14c steps up onto (9, 6) and talks to Misty from beside her.", - "Misty beat a Lv20 Wartortle (console B, run m51), so first a GRIND to Lv23 on 00.15's patch. Gen 3 numbers (pokefirered: her mons have IV 0; Wartortle taken at IV 15, no EVs): Starmie Lv21 has 56 HP, Atk 36, SpA 47, SpD 40. Bite is Dark, special in Gen 3, no STAB, x2 on Psychic: at Lv23 (SpA 39) it does 23..28, three hits (two on top rolls); at Lv20, 20..24. Her Swift (physical, 60) does 9..11 to a Lv23 Wartortle (about 67 HP, Def 45) and Water Pulse (STAB, resisted) 8..10: 6 or more hits, though m51 saw about 20 a turn. Her Recover (28) and Super Potion undo a Bite, so the margin is in Bite's damage.", - "The Mart comes before the GRIND: its wild battles are fought only with 2 or more Potions, and 00.14's save has none (m51 met Misty with only the 5 this row bought). 5 Potions (row 3, 300 each), then up to 3 Super Potions (row 2, 700), last so they take the Items pocket's last row; the battle doesn't use them yet. The money box can't be read, so the floor stands for it, and a floor above the money fails the step (the quantity box wraps). Prizes (pokefirered: 4 x last level x the class's factor) from a new game's 3000, less Viridian's 2000 and the Magikarp's 500: Liam 220, Brock 1400, Route 3's bug catchers 360, the Mt. Moon grunt 416 and Miguel 288 (the first rival's 80 only if won), at least 3184 here. Floor and budget 3000: 5 Potions and 2 Super Potions, 2900. Misty's 2100 (4 x 21 x 25) then leaves 00.15 its floor of 1500. Then the nurse, and the save before Misty, so her battle is its own checkpoint, 00.14c, verified and retried from it. 00.15's GRIND then fights until the sim beats the Cerulean rival often enough." + "Cerulean Gym (pokefirered CeruleanCity_Gym map.json and scripts.inc): a pool with walkways. Misty (8, 6) stands on a platform (7..9, 6) above row 7. Picnicker Diana (4, 7) faces east, sight 4, over (5..8, 7), so misty_front (8, 7) is in her line; Swimmer Luis (10, 12) in the water faces west, sight 1, over (9, 12), on column 9 north of the door. No gym trainer has to be fought for Misty, so neither is: from the door up column 9 to row 13 (a route there, so the planner's walk to a wall doesn't run on past it through (9, 12)), west to (4, 13), and to walls round the pool's west and north sides, (4, 10), (12, 10), (12, 7), then west to (9, 7), the tile below the platform's east end, out of Diana's line. 05.02 steps up onto (9, 6) and talks to Misty from beside her.", + "Misty beat a Lv20 Wartortle (console B, run m51), so first a GRIND to Lv23 on 05.03's patch. Gen 3 numbers (pokefirered: her mons have IV 0; Wartortle taken at IV 15, no EVs): Starmie Lv21 has 56 HP, Atk 36, SpA 47, SpD 40. Bite is Dark, special in Gen 3, no STAB, x2 on Psychic: at Lv23 (SpA 39) it does 23..28, three hits (two on top rolls); at Lv20, 20..24. Her Swift (physical, 60) does 9..11 to a Lv23 Wartortle (about 67 HP, Def 45) and Water Pulse (STAB, resisted) 8..10: 6 or more hits, though m51 saw about 20 a turn. Her Recover (28) and Super Potion undo a Bite, so the margin is in Bite's damage.", + "The Mart comes before the GRIND: its wild battles are fought only with 2 or more Potions, and 04.06's save has none (m51 met Misty with only the 5 this row bought). 5 Potions (row 3, 300 each), then up to 3 Super Potions (row 2, 700), last so they take the Items pocket's last row; the battle doesn't use them yet. The money box can't be read, so the floor stands for it, and a floor above the money fails the step (the quantity box wraps). Prizes (pokefirered: 4 x last level x the class's factor) from a new game's 3000, less Viridian's 2000 and the Magikarp's 500: Liam 220, Brock 1400, Route 3's bug catchers 360, the Mt. Moon grunt 416 and Miguel 288 (the first rival's 80 only if won), at least 3184 here. Floor and budget 3000: 5 Potions and 2 Super Potions, 2900. Misty's 2100 (4 x 21 x 25) then leaves 05.03 its floor of 1500. Then the nurse, and the save before Misty, so her battle is its own checkpoint, 05.02, verified and retried from it. 05.03's GRIND then fights until the sim beats the Cerulean rival often enough." ] } }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14c.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.02.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14c.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.02.plan.json index 9b82cdb2a4..e0430b4ebf 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.14c.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.14c", + "id": "05.02", "title": "Cerulean Gym: Misty, then Water Pulse", "start": {"map": "CeruleanCity_Gym", "tiles": [[9, 7]], "facing": "west"}, "events": [ @@ -72,7 +72,7 @@ "lead": "after_brock", "notes": { "checkpoint": [ - "Misty (TRAINER_LEADER_MISTY: Staryu Lv18, Starmie Lv21), talked to from (9, 6), beside her on the platform. Her win text runs on to the CASCADE BADGE, TM03 (Water Pulse) and its explanation, all read with the battle's. Bite is chosen against her party (Starmie is Water/Psychic). Back to the nurse round the pool's west side, out of Luis's line; then Water Pulse in place of Tail Whip, last, at the Center, from the bag's TM CASE. Ends where 00.15 starts." + "Misty (TRAINER_LEADER_MISTY: Staryu Lv18, Starmie Lv21), talked to from (9, 6), beside her on the platform. Her win text runs on to the CASCADE BADGE, TM03 (Water Pulse) and its explanation, all read with the battle's. Bite is chosen against her party (Starmie is Water/Psychic). Back to the nurse round the pool's west side, out of Luis's line; then Water Pulse in place of Tail Whip, last, at the Center, from the bag's TM CASE. Ends where 05.03 starts." ] } }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.15.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.03.plan.json similarity index 71% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.15.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.03.plan.json index ac04f2b8e0..5ddbd5224f 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.15.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.03.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.15", + "id": "05.03", "title": "Cerulean: Water Pulse, Potions, a GRIND until the rival is winnable, then saved below his trigger", "start": {"map": "CeruleanCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -92,7 +92,7 @@ "lead": "after_brock", "notes": { "checkpoint": [ - "Before the rival north of Cerulean (00.15b), from the Center: first TM03 Water Pulse over Tail Whip, if the lead doesn't know it yet, so the GRIND's sim plays it (a run without TM03 from Misty skips the step). Then 3 Potions at the Mart (CeruleanCity_Mart_Items: POTION is row 3, 300 each; Mt. Moon's trainers leave well over the floor) and 2 Awakenings (row 6, 250 each; pokefirered items.json) for the rival's Bulbasaur's Sleep Powder (console B, m56: asleep at 34/65 HP, it fainted two turns later with 15 Potions), 1400 of the floor's 1500. Then a GRIND on Route 4's grass east of Mt. Moon (75..86, 11..17; Spearow, Rattata, Ekans and Mankey around Lv10, about 80 EXP each), healing at the Center, until the battle sim beats the rival 00.15b fights 50% or more: the win chance his battle refuses below. Console B's Wartortle (Lv22, 65 HP, Water Pulse) is about 42% there and 62% at Lv23; Lv28 (about 88%, some 120 battles from Lv22) is the cap. Then the nurse, and the save on (23, 7), the tile below his trigger: his battle is its own checkpoint, 00.15b, verified and retried from this save." + "Before the rival north of Cerulean (05.04), from the Center: first TM03 Water Pulse over Tail Whip, if the lead doesn't know it yet, so the GRIND's sim plays it (a run without TM03 from Misty skips the step). Then 3 Potions at the Mart (CeruleanCity_Mart_Items: POTION is row 3, 300 each; Mt. Moon's trainers leave well over the floor) and 2 Awakenings (row 6, 250 each; pokefirered items.json) for the rival's Bulbasaur's Sleep Powder (console B, m56: asleep at 34/65 HP, it fainted two turns later with 15 Potions), 1400 of the floor's 1500. Then a GRIND on Route 4's grass east of Mt. Moon (75..86, 11..17; Spearow, Rattata, Ekans and Mankey around Lv10, about 80 EXP each), healing at the Center, until the battle sim beats the rival 05.04 fights 50% or more: the win chance his battle refuses below. Console B's Wartortle (Lv22, 65 HP, Water Pulse) is about 42% there and 62% at Lv23; Lv28 (about 88%, some 120 battles from Lv22) is the cap. Then the nurse, and the save on (23, 7), the tile below his trigger: his battle is its own checkpoint, 05.04, verified and retried from this save." ] } }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.15b.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.04.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.15b.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.04.plan.json index 383136aa45..fbfa4e03fc 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.15b.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.04.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.15b", + "id": "05.04", "title": "Cerulean: Water Pulse if not known, then the rival north of the city", "start": {"map": "CeruleanCity", "tiles": [[23, 7]], "facing": "north"}, "events": [ @@ -43,7 +43,7 @@ "lead": "after_brock", "notes": { "checkpoint": [ - "The rival north of Cerulean (CeruleanCity scripts.inc): the only way north to Nugget Bridge is columns 22..24, and a step onto row 6 there (CeruleanCity_EventScript_RivalTrigger*, VAR_MAP_SCENE_CERULEAN_CITY_RIVAL 0) brings him down to the player. From the middle, (23, 6), he stops at (23, 5); after the battle he walks round the player and off south, and the player, turning to watch him, ends facing south. His FAME CHECKER's text is read to the overworld with the battle's. For a player who took Squirtle he has Pidgeotto Lv17, Abra Lv16, Rattata Lv15 and Bulbasaur Lv18 (sParty_RivalCeruleanBulbasaur), whose Vine Whip and Sleep Powder are the danger. The row starts from 00.15's save below the trigger, and saves after him. First TM03 Water Pulse over Tail Whip (from the bag, where the player stands), if the lead doesn't know it yet: console B's save (2026-11-03) is past Misty's TEACH, which failed there. Where she taught it, the step reads the moves and does nothing." + "The rival north of Cerulean (CeruleanCity scripts.inc): the only way north to Nugget Bridge is columns 22..24, and a step onto row 6 there (CeruleanCity_EventScript_RivalTrigger*, VAR_MAP_SCENE_CERULEAN_CITY_RIVAL 0) brings him down to the player. From the middle, (23, 6), he stops at (23, 5); after the battle he walks round the player and off south, and the player, turning to watch him, ends facing south. His FAME CHECKER's text is read to the overworld with the battle's. For a player who took Squirtle he has Pidgeotto Lv17, Abra Lv16, Rattata Lv15 and Bulbasaur Lv18 (sParty_RivalCeruleanBulbasaur), whose Vine Whip and Sleep Powder are the danger. The row starts from 05.03's save below the trigger, and saves after him. First TM03 Water Pulse over Tail Whip (from the bag, where the player stands), if the lead doesn't know it yet: console B's save (2026-11-03) is past Misty's TEACH, which failed there. Where she taught it, the step reads the moves and does nothing." ] } }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.16.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.05.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.16.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.05.plan.json index 0d19759910..9074306b2d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.16.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.05.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.16", + "id": "05.05", "title": "Nugget Bridge: the nurse, five trainers and the Rocket", "start": {"map": "CeruleanCity", "tiles": [[23, 6]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.17.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.06.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.17.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.06.plan.json index 063c87c4b8..017b2262f4 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.17.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.06.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.17", + "id": "05.06", "title": "Route 24 and 25 to Bill's Sea Cottage: Franklin, Kelsey, Nob and Haley", "start": {"map": "Route24", "tiles": [[11, 15]], "facing": "east"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.18.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.07.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.18.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.07.plan.json index ce6a0dcb99..6c35572170 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.18.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.07.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.18", + "id": "05.07", "title": "Bill's Sea Cottage: the Cell Separator and the S.S. Ticket", "start": {"map": "Route25_SeaCottage", "tiles": [[7, 8]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.19.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.08.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.19.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.08.plan.json index aec59c3685..80199af3df 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.19.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.08.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.19", + "id": "05.08", "title": "Route 25's south path back to Cerulean's Pokemon Center", "start": {"map": "Route25", "tiles": [[51, 5]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.20.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.09.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.20.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.09.plan.json index 6dba500518..31dbcdb16a 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.20.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.09.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.20", + "id": "05.09", "title": "Route 24's grass: an Oddish for Cut, then the Center", "start": {"map": "CeruleanCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -72,8 +72,8 @@ "notes": { "checkpoint": [ "Stopgap for console B's save, which caught nothing on Route 1. A new playthrough should instead catch a Rattata on Route 1 or 22 early, as its Cut user and spare member, and drop this row (and its walk over Nugget Bridge and back).", - "An Oddish for HM01 Cut, and a second member behind the lead (docs/design/AutoStory-FRLG-FutureEvents.md, \"Console B run choices\"). Route 24's grass (Route24 map.json: x 3..5, rows 19..31, west of Nugget Bridge) is the nearest to the Center with Oddish: FireRed's sRoute24_FireRed (pokefirered wild_encounters.json) has it in 25% of battles, Lv12..14, as Route 25's grass; Routes 5 and 6 aren't on the story's maps yet. Up the bridge, whose trainers 00.16 beat, west along rows 10..15 to the cliff (3, 15) and down column 3 to the grass's first row, (3, 19); the step paces east to (4, 19) and back. Camper Shane (5, 21) faces north, sight 5, over (5, 16..20): column 5 is kept off. The leg west ends on the cliff, not open: on console B (m63) an open leg west to (4, 15) ended a tile short, and the walk down column 5 came into Shane's sight.", - "First 7 Poke Balls at the Mart (row 1, 200 each; the bag isn't read, so the step buys them whatever the bag holds). The floor, from 00.15's 1500 less its 1400: the rival's 288 (4 x 18 x 4), the Rocket's 480 (4 x 15 x 8), Franklin's 540 and Nob's 468 (hikers, 9) alone make 1876 (pokefirered gTrainerMoneyTable). An Oddish at full HP (catch rate 255) stays in a Poke Ball about 1 time in 3 (Gen 3: a = 85, four shakes of 0.76), so 7 balls catch it about 94% of the time; the step throws 7 at most, in 30 battles (none an Oddish: 0.02%). Nothing weakens it: the HP bar isn't read on the console yet.", + "An Oddish for HM01 Cut, and a second member behind the lead (docs/design/AutoStory-FRLG-FutureEvents.md, \"Console B run choices\"). Route 24's grass (Route24 map.json: x 3..5, rows 19..31, west of Nugget Bridge) is the nearest to the Center with Oddish: FireRed's sRoute24_FireRed (pokefirered wild_encounters.json) has it in 25% of battles, Lv12..14, as Route 25's grass; Routes 5 and 6 aren't on the story's maps yet. Up the bridge, whose trainers 05.05 beat, west along rows 10..15 to the cliff (3, 15) and down column 3 to the grass's first row, (3, 19); the step paces east to (4, 19) and back. Camper Shane (5, 21) faces north, sight 5, over (5, 16..20): column 5 is kept off. The leg west ends on the cliff, not open: on console B (m63) an open leg west to (4, 15) ended a tile short, and the walk down column 5 came into Shane's sight.", + "First 7 Poke Balls at the Mart (row 1, 200 each; the bag isn't read, so the step buys them whatever the bag holds). The floor, from 05.03's 1500 less its 1400: the rival's 288 (4 x 18 x 4), the Rocket's 480 (4 x 15 x 8), Franklin's 540 and Nob's 468 (hikers, 9) alone make 1876 (pokefirered gTrainerMoneyTable). An Oddish at full HP (catch rate 255) stays in a Poke Ball about 1 time in 3 (Gen 3: a = 85, four shakes of 0.76), so 7 balls catch it about 94% of the time; the step throws 7 at most, in 30 battles (none an Oddish: 0.02%). Nothing weakens it: the HP bar isn't read on the console yet.", "The Oddish joins the party second. Battles keep the lead in (PokemonFRLG_AutoStoryBattleDecisions.h): the Oddish is sent only when the lead faints in a trainer's battle, which counts as lost. Back to the nurse, and the save in the Center." ] } diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.21.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.10.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.21.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.10.plan.json index 39da1ef70b..25570a94ab 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.21.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-05.10.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.21", + "id": "05.10", "title": "The Cerulean Rocket, Route 5, the Underground Path and Route 6 to Vermilion's Pokemon Center: Jeff", "start": {"map": "CeruleanCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.22.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.01.plan.json similarity index 96% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.22.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.01.plan.json index 172506f15d..adb340a9da 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.22.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.22", + "id": "06.01", "title": "The S.S. Anne: the rival, HM01 Cut from the Captain, back to Vermilion's Pokemon Center", "start": {"map": "VermilionCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -156,7 +156,7 @@ "lead": "after_brock", "notes": { "checkpoint": [ - "The S.S. Anne (VermilionCity, SSAnne_* scripts.inc). The step onto (23, 33) (VermilionCity_EventScript_CheckTicket) has the sailor (24, 33) ask for a ticket; the S.S. TICKET (00.18) is shown and the player turns east to him. Then onto the pier (23, 34), along the gangway, through 1F, by legs off its cabins' doormats on row 10, which planned routes cross, and up its stairs (3, 8) to 2F. The step onto (30, 6), below the Captain's door (30, 2) (SSAnne_2F_Corridor_EventScript_RivalTriggerLeft), brings the rival out and down to (30, 5); the player keeps facing north, and after the battle he walks round the player and off. For a player who took Squirtle: Pidgeotto Lv19, Raticate Lv16, Kadabra Lv18, Ivysaur Lv20. The ship's trainers are in its cabins and on its deck, off the way. The Captain (5, 4) faces up; talked to from (5, 5) he is rubbed on the back and gives HM01 (VAR_MAP_SCENE_VERMILION_CITY 1). Back out through 1F's door (19, 1): on the gangway the ship sails (SSAnne_Exterior_ExitSSAnne), the player is put on (23, 34) and walked up to (23, 32) (VermilionCity_EventScript_ExitSSAnne). Cut is taught later, to the Oddish." + "The S.S. Anne (VermilionCity, SSAnne_* scripts.inc). The step onto (23, 33) (VermilionCity_EventScript_CheckTicket) has the sailor (24, 33) ask for a ticket; the S.S. TICKET (05.07) is shown and the player turns east to him. Then onto the pier (23, 34), along the gangway, through 1F, by legs off its cabins' doormats on row 10, which planned routes cross, and up its stairs (3, 8) to 2F. The step onto (30, 6), below the Captain's door (30, 2) (SSAnne_2F_Corridor_EventScript_RivalTriggerLeft), brings the rival out and down to (30, 5); the player keeps facing north, and after the battle he walks round the player and off. For a player who took Squirtle: Pidgeotto Lv19, Raticate Lv16, Kadabra Lv18, Ivysaur Lv20. The ship's trainers are in its cabins and on its deck, off the way. The Captain (5, 4) faces up; talked to from (5, 5) he is rubbed on the back and gives HM01 (VAR_MAP_SCENE_VERMILION_CITY 1). Back out through 1F's door (19, 1): on the gangway the ship sails (SSAnne_Exterior_ExitSSAnne), the player is put on (23, 34) and walked up to (23, 32) (VermilionCity_EventScript_ExitSSAnne). Cut is taught later, to the Oddish." ] } }, diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.23.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.02.plan.json similarity index 95% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.23.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.02.plan.json index 0077160402..cefb1b1ba6 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.23.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.23", + "id": "06.02", "title": "Vermilion Gym: Cut and Dig, the tree, Dwayne, Baily and Tucker, the trash cans", "start": {"map": "VermilionCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -187,7 +187,7 @@ "lead": "after_brock", "notes": { "checkpoint": [ - "HM01 Cut, from the S.S. Anne (00.22), to the Oddish (00.20), second in the party: a wild Oddish of Lv12 to 14 knows 2 or 3 moves (Absorb, Sweet Scent, Poison Powder at 14), so it has room. TM28 Dig, from the Cerulean Rocket (00.21), to the lead in place of Withdraw: Ground, twice as strong on Lt. Surge's three, it is the lead's best move against him. Vermilion's tree (19, 24) (EventScript_CutTree) is the only way into the gym's yard, row 24 being walls but for it; the gym's door is (14, 25). In the gym, the trainers as below, then the trash cans until the door opens; out, the tree cut again from below, and back to the nurse.", + "HM01 Cut, from the S.S. Anne (06.01), to the Oddish (05.09), second in the party: a wild Oddish of Lv12 to 14 knows 2 or 3 moves (Absorb, Sweet Scent, Poison Powder at 14), so it has room. TM28 Dig, from the Cerulean Rocket (05.10), to the lead in place of Withdraw: Ground, twice as strong on Lt. Surge's three, it is the lead's best move against him. Vermilion's tree (19, 24) (EventScript_CutTree) is the only way into the gym's yard, row 24 being walls but for it; the gym's door is (14, 25). In the gym, the trainers as below, then the trash cans until the door opens; out, the tree cut again from below, and back to the nurse.", "The gym (VermilionCity_Gym map.json, scripts.inc), 11 x 20, entered on (5, 19): the cans on rows 10, 12 and 14 at x 1, 3, 5, 7, 9 (PokemonFRLG_AutoStoryTrashCans.h), the beams across rows 6 and 7 that the two switches turn off, Lt. Surge (5, 2) facing down above them. Its trainers, sight 3:", "Sailor Dwayne (8, 13) and Engineer Baily (2, 11) look around (MOVEMENT_TYPE_LOOK_AROUND): between them they see across rows 11 and 13 and down columns 2 and 8, so no way from the door to the cans keeps out of their sight. Each is fought from the second tile of his line, stepped onto from beside it, out of sight, and waited on there until he turns to the player (\"trainer_wait\"): Dwayne from (8, 15), stepped onto from (7, 15), Baily from (2, 13), from (3, 13). Each walks up a tile, Dwayne to (8, 14), Baily to (2, 12), and stays there while the player is in the gym.", "Gentleman Tucker (7, 8) faces west over (4..6, 8): fought on the step up from (5, 9) onto (5, 8); he walks up to (6, 8).", diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.24.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.03.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.24.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.03.plan.json index 577e9c68a8..ba1f5e5dfd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.24.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.03.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.24", + "id": "06.03", "title": "Route 6's grass until the lead is Lv31, then through the open beams to Lt. Surge", "start": {"map": "VermilionCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.25.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.04.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.25.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.04.plan.json index 7d72d919f0..26cdd3319d 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.25.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-06.04.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.25", + "id": "06.04", "title": "Vermilion Gym: Lt. Surge, the THUNDERBADGE, then the Center", "start": {"map": "VermilionCity_Gym", "tiles": [[5, 3]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.26.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-07.01.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.26.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-07.01.plan.json index 1ee5abc86d..28e446f227 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.26.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-07.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.26", + "id": "07.01", "title": "The BIKE VOUCHER from the Fan Club, back north to Cerulean, the BICYCLE, Repels and Escape Ropes", "start": {"map": "VermilionCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -149,8 +149,8 @@ "notes": { "checkpoint": [ "The BIKE VOUCHER and the BICYCLE, from Vermilion's Center to Cerulean's (pokeguy 43:50 to 45:00).", - "The Pokemon Fan Club (VermilionCity_PokemonFanClub map.json, scripts.inc), in by Vermilion's (12, 17): the chairman (5, 4) sits above a table (5..6, 5..6) with the worker (6, 4) east of him, so he is talked to from (4, 4), west of him. \"Did you come to hear about my POKEMON?\" YES: his story, then the BIKE VOUCHER (FLAG_GOT_BIKE_VOUCHER). Oak's aide stands on Vermilion's (25, 7) since Lt. Surge, where the story's maps don't have him: the way planned from the Center's door goes east along his row 7, so the walk goes down to the water (14, 10) first, as 00.25 came up from it. From the Fan Club, up to (22, 10) first, so that the way on to Route 6 goes up column 22, west of him, not round by column 27.", - "Route 6 north, the trainers as 00.21 left them: Jeff (13, 33) beaten, Isabelle (13, 32) and Elijah (20, 25) not. As in 00.24, onto Jeff's row, west to the wall (7, 33) and up to row 31, above Isabelle's line; then east along row 31 to the wall (17, 31) and up column 16, west of Elijah's line (17..19, 25) and east of Keigo's (4..8, 16), to the ledge (16, 11). The first three legs are 00.24's, walked on console B; the two after end on walls, which the walker holds again after a wild battle in the grass.", + "The Pokemon Fan Club (VermilionCity_PokemonFanClub map.json, scripts.inc), in by Vermilion's (12, 17): the chairman (5, 4) sits above a table (5..6, 5..6) with the worker (6, 4) east of him, so he is talked to from (4, 4), west of him. \"Did you come to hear about my POKEMON?\" YES: his story, then the BIKE VOUCHER (FLAG_GOT_BIKE_VOUCHER). Oak's aide stands on Vermilion's (25, 7) since Lt. Surge, where the story's maps don't have him: the way planned from the Center's door goes east along his row 7, so the walk goes down to the water (14, 10) first, as 06.04 came up from it. From the Fan Club, up to (22, 10) first, so that the way on to Route 6 goes up column 22, west of him, not round by column 27.", + "Route 6 north, the trainers as 05.10 left them: Jeff (13, 33) beaten, Isabelle (13, 32) and Elijah (20, 25) not. As in 06.03, onto Jeff's row, west to the wall (7, 33) and up to row 31, above Isabelle's line; then east along row 31 to the wall (17, 31) and up column 16, west of Elijah's line (17..19, 25) and east of Keigo's (4..8, 16), to the ledge (16, 11). The first three legs are 06.03's, walked on console B; the two after end on walls, which the walker holds again after a wild battle in the grass.", "The Underground Path north, Route 5's sides, which have no trainer, and Cerulean's south edge, whose way into the city without the burgled house is the tree (26, 32) (pokeguy 44:42).", "The Bike Shop (CeruleanCity_BikeShop), in by (13, 28): the clerk (9, 3) is across the counter (8, 3), talked to from (7, 3). With the voucher he gives the BICYCLE (FLAG_GOT_BICYCLE) with no YES/NO; it isn't registered or ridden yet.", "The Mart: 5 Repels (row 9, 350 each) and 2 Escape Ropes (row 8, 550 each; pokefirered items.json), 2850 in all. Console B had about 9000 after Lt. Surge (2026-11-03); the floor of 6000 leaves 3000 or more after them.", diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.27.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-07.02.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.27.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-07.02.plan.json index c42beb62ef..ee98e4edab 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.27.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-07.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.27", + "id": "07.02", "title": "East over Route 9 to Route 10's Pokemon Center: the two trees, Alicia, Jeremy and Conner", "start": {"map": "CeruleanCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -213,7 +213,7 @@ "notes": { "checkpoint": [ "East out of Cerulean over Route 9 to Route 10's Pokemon Center (pokeguy 45:12 to 47:27), on foot: the Bicycle isn't registered yet.", - "Cerulean (CeruleanCity map.json): the way east, column 39..40 up from row 33 to rows 18..19 and out of the city's east edge, is reached from the city only through the tree (26, 32), grown back since 00.26 (its flag is a FLAG_TEMP), or the burgled house. Cut from above. Route 9 joins the city's rows 18..19 by its rows 8..9 (offset -10); its tree (2, 8) (FLAG_TEMP_12) closes them, (2, 9) being rock: cut from (1, 8), west of it.", + "Cerulean (CeruleanCity map.json): the way east, column 39..40 up from row 33 to rows 18..19 and out of the city's east edge, is reached from the city only through the tree (26, 32), grown back since 07.01 (its flag is a FLAG_TEMP), or the burgled house. Cut from above. Route 9 joins the city's rows 18..19 by its rows 8..9 (offset -10); its tree (2, 8) (FLAG_TEMP_12) closes them, (2, 9) being rock: cut from (1, 8), west of it.", "Route 9 (Route9 map.json, scripts.inc), its ledges all facing south. Of its nine trainers, three can't be walked around, as in pokeguy's run, where Jeremy happened to look away:", "Picnicker Alicia (14, 10) faces west, sight 3, over (11..13, 10), the only tiles above the ledge row 11 the way west goes down by: fought on the step onto (11, 10); she walks up to (12, 10). Then down the ledge (11, 11).", "Hiker Jeremy (20, 17) looks north and west (FACE_UP_AND_LEFT), sight 4: north over (20, 13..16), every way east of column 19 below the rocks of row 12. Fought on (20, 13), waiting for him to look north (trainer_wait); he walks up to (20, 14).", diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.28.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.01.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.28.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.01.plan.json index 9e552b3016..a132e16b38 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.28.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.28", + "id": "08.01", "title": "Through Rock Tunnel: Ashton, Winston, Martha, Allen, Lenny, Sofia, Dudley, Cooper and Dana", "start": {"map": "Route10_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -375,7 +375,7 @@ "1F Lenny (7, 5) looks south over (7, 6..9), the way east from the ladder (4, 2): stepped into from (6, 9), the end of column 6. The way on to the ladder (20, 13) keeps west of Lucas's line (16..19, 17): down column 11, up column 14 to row 16.", "B1F Sofia (11, 15) looks south over (11, 16..19), the way west: stepped into along row 16 from (12..14, 16).", "B1F Dudley (5, 11) looks south over (5, 12..15): stepped into from (8, 15) along row 15.", - "B1F Cooper (2, 6) looks around (sight 2) by the ladder (2, 3): the leg up column 1 to the wall (1, 2) passes him on (1, 6); if he looks west, story_interrupts() fights him and the leg is held on to its wall, as Mt. Moon's Grunt in 00.13.", + "B1F Cooper (2, 6) looks around (sight 2) by the ladder (2, 3): the leg up column 1 to the wall (1, 2) passes him on (1, 6); if he looks west, story_interrupts() fights him and the leg is held on to its wall, as Mt. Moon's Grunt in 04.05.", "1F Dana (26, 28) looks south over (26, 29..31), the only way west to the south mouth: stepped into along row 31 from (27..29, 31).", "Unverified on the console: Rock Tunnel is dark without Flash, and the overworld, fade, dialog and battle detectors haven't been measured under its darkness (~/FRLGLab/notes/2026-11-09-0028-dark-measure.md). Every step from rock_tunnel_1f to route10_south depends on them.", "The corner (11, 35), wall north and rock west, finds the player from any of (11..14, 35) after a battle; east to the wall (19, 35) did not (console B, 2026-11-09 13:35: found 5 tiles off)." diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.29.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.02.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.29.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.02.plan.json index 33b988b0e5..413c4562bb 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.29.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.29", + "id": "08.02", "title": "Route 10 south to Lavender Town's Pokemon Center", "start": {"map": "Route10", "tiles": [[8, 58]], "facing": "south"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.30.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.03.plan.json similarity index 94% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.30.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.03.plan.json index 2314bc6445..a85c5e67c7 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.30.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-08.03.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.30", + "id": "08.03", "title": "Lavender Mart, then west over Route 8 on the Bicycle, the Underground Path, a Pidgey on Route 7, Celadon's Pokemon Center", "start": {"map": "LavenderTown_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ @@ -10,7 +10,7 @@ "id": "register_bike", "kind": "game_action", "action": "register_bike", - "why": "the BICYCLE (00.26) registered for SELECT, which gets on and off in about 1 s (console B, 2026-11-09); here until 00.26's plan (frlg/stage7-celadon, #224) takes it right after the Bicycle" + "why": "the BICYCLE (07.01) registered for SELECT, which gets on and off in about 1 s (console B, 2026-11-09); here until 07.01's plan (frlg/stage7-celadon, #224) takes it right after the Bicycle" }, { "id": "east_of_mart_door", @@ -49,7 +49,7 @@ "floor": 9000, "items": [{"item": "escape-rope", "quantity": 4}, {"item": "super-repel", "quantity": 7}] }, - "why": "pokeguy 54:18: 4 Escape Ropes (the Rocket Hideout, 00.31) and 7 Super Repels (Pokemon Tower)" + "why": "pokeguy 54:18: 4 Escape Ropes (the Rocket Hideout, 09.01) and 7 Super Repels (Pokemon Tower)" }, { "id": "out_of_lavender_mart", @@ -216,7 +216,7 @@ "lead": "after_brock", "notes": { "checkpoint": [ - "PokeGuy's way from Lavender Town to Celadon City (pokeguy 54:18 on): the Lavender Mart, Route 8 west on the BICYCLE (00.26), Gamer Rich, the Underground Path's east-west tunnel to Route 7, a Pidgey from Route 7's grass to carry HM02 Fly later, and Celadon's Pokemon Center.", + "PokeGuy's way from Lavender Town to Celadon City (pokeguy 54:18 on): the Lavender Mart, Route 8 west on the BICYCLE (07.01), Gamer Rich, the Underground Path's east-west tunnel to Route 7, a Pidgey from Route 7's grass to carry HM02 Fly later, and Celadon's Pokemon Center.", "No Repel: the way keeps off grass. Route 8's grass (34..46, 9..18) is penned in by the Cut trees (47, 12) and (33, 15); Route 7's (11..18, 2..6) is east of the way north from the Underground Path's door (7, 14). The Underground Path has no wild Pokemon (pokefirered wild_encounters.json lists none), and the Pidgey is caught where Route 7's grass is walked on purpose.", "Route 8's trainers (Route8 map.json): Julia (62, 14) looks west 6, Rich (55, 15) south 3, Glenn (51, 6) all ways 4, Paige (29, 3) and Andrea (29, 5) west 3, Leslie (29, 4) and Megan (29, 6) east 6, Stan (21, 3) all ways 1, Eli and Anne (40, 3), (41, 3) south 1, Ricardo (14, 16) and Jaren (24, 17) all ways 1, Aidan (9, 6) east 4. Below the wall (56..61, 6..13) the only ways west are row 14, Julia's line, and rows 15..18, which cross Rich's column: his line (55, 16..18) is the one taken." ], diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.31.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-09.01.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.31.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-09.01.plan.json index 3be1225000..84e8890023 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.31.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-09.01.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.31", + "id": "09.01", "title": "Celadon Game Corner and the Rocket Hideout down to B4F: the poster guard, the Lift Key Grunt, the LIFT KEY and B3F's Rare Candy", "start": {"map": "CeladonCity_PokemonCenter_1F", "tiles": [[7, 4]], "facing": "north"}, "events": [ diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.32.plan.json b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-09.02.plan.json similarity index 97% rename from SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.32.plan.json rename to SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-09.02.plan.json index 8831895e7d..34d319e710 100644 --- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-00.32.plan.json +++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData/frlg-09.02.plan.json @@ -2,7 +2,7 @@ "format": "pokesim-authored-checkpoint/1", "game": "frlg", "checkpoint": { - "id": "00.32", + "id": "09.02", "title": "Rocket Hideout: B2F's arrows and the MOON STONE, the lift to B4F, the two door guards, Giovanni, the SILPH SCOPE and an Escape Rope out", "start": {"map": "RocketHideout_B3F", "tiles": [[12, 13]], "facing": "north"}, "events": [ diff --git a/devtools/story-export/README.md b/devtools/story-export/README.md index 8195c7b3fe..ff99152e34 100644 --- a/devtools/story-export/README.md +++ b/devtools/story-export/README.md @@ -10,7 +10,7 @@ From a clean committed checkout with the usual native build dependencies: ```sh cmake -S SerialPrograms -B build -DPA_FRLG_STORY_EXPORT=ON cmake --build build --target StoryCheckpointExport -j4 -build/StoryCheckpointExport 00.05 > frlg-parcel.native.json +build/StoryCheckpointExport 02.01 > frlg-parcel.native.json ``` On multi-configuration generators add `--config RelWithDebInfo`, then run diff --git a/devtools/story-export/frlg_main.cpp b/devtools/story-export/frlg_main.cpp index 72d3a0bbcf..c6a60ac12c 100644 --- a/devtools/story-export/frlg_main.cpp +++ b/devtools/story-export/frlg_main.cpp @@ -1,7 +1,7 @@ /* Offline evaluated FRLG table export. No console or profile initialization. * cmake -S SerialPrograms -B build -DPA_FRLG_STORY_EXPORT=ON * cmake --build build --target StoryCheckpointExport -j4 - * build/StoryCheckpointExport 00.05 > frlg-parcel.native.json + * build/StoryCheckpointExport 02.01 > frlg-parcel.native.json * Format the captured JSON with PokemonSimulation's contract formatter. */ #include diff --git a/devtools/story-replay/README.md b/devtools/story-replay/README.md index 7610fb6eac..b909290552 100644 --- a/devtools/story-replay/README.md +++ b/devtools/story-replay/README.md @@ -23,7 +23,7 @@ GitHub CI builds/tests on the fork; Ubuntu additionally uploads `Programs/AutoStory/ReplayData/` contains exact `binding.json` / `cases.json` copies from the immutable PokemonSimulation revision in `pin.json`. The capture -is `capture.json` there, the bytes of the old table export of 00.05 that +is `capture.json` there, the bytes of the old table export of 02.01 that `binding.json` pins; the replay reads its checkpoint in the #312 step format (a route's target and a step's direction as args). These are **PR #73 preview test fixtures**, not an approved resource/production-plan adoption. diff --git a/docs/design/AutoStory-FRLG-Sizing.md b/docs/design/AutoStory-FRLG-Sizing.md index 38c25aa5e8..7110e9c708 100644 --- a/docs/design/AutoStory-FRLG-Sizing.md +++ b/docs/design/AutoStory-FRLG-Sizing.md @@ -155,7 +155,7 @@ A seeded fake game with odds from the decomp. Not written yet. Doesn't block M2 | E5 | Starter-RNG entry point for GiftRng | new | ~300 | | main; testable from a manual save | | M12 | RNG routines made callable, then AutoStory hand-offs | new | not sized | | refactors: main; hand-offs: B15 | -AutoStory joins this track only at the hand-off: names at 00.01 and the starter after 00.03/00.04, both after B15. +AutoStory joins this track only at the hand-off: names at 01.01 and the starter after 01.04/01.05, both after B15. ## 5. Lab tooling and run records (M4, [#138](https://github.com/dayfine/Arduino-Source/issues/138)) diff --git a/docs/design/AutoStory.md b/docs/design/AutoStory.md index 1534c01d57..0b225f704e 100644 --- a/docs/design/AutoStory.md +++ b/docs/design/AutoStory.md @@ -925,8 +925,8 @@ later change): | `capture` | `species` word, `catches`, `encounters`, `balls` numbers, all required; `pace` word | | | `level` | `slot`, `min` numbers, required | Built in C++, not in a plan. | | `fossil` | `fossil` word (`helix`, `dome`), required | | -| `use_item` | `item` word, required; `slot` number | 00.30 onwards. | -| `lift_floor` | `from`, `to` words, required | 00.30 onwards. | +| `use_item` | `item` word, required; `slot` number | 08.03 onwards. | +| `lift_floor` | `from`, `to` words, required | 08.03 onwards. | Plain names such as `run`, `trainer_line`, `cut_tree` and `bike` take no arguments and stay as they are.