Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
51cb266
FRLG AutoStory: checkpoints 00.01-00.10 as authored JSON, on #312's a…
dayfine Nov 10, 2026
3f0b338
FRLG AutoStory: delete the C++ story rows, parity proven
dayfine Nov 10, 2026
636f021
Merge frlg/stage1-json (#330) into frlg/stage2-json: stage 2's rows a…
dayfine Nov 10, 2026
9d54f1b
FRLG AutoStory: delete stage 2's C++ story rows, parity proven
dayfine Nov 10, 2026
b9ac130
Merge pull request #331 from dayfine/frlg/stage2-json
dayfine Nov 10, 2026
34fecef
Merge frlg/stage2-rng (#331) into frlg/stage3-json: stage 3's rows as…
dayfine Nov 10, 2026
68b113f
FRLG AutoStory: delete stage 3's C++ story rows, parity proven
dayfine Nov 10, 2026
7f7a9cf
Merge pull request #333 from dayfine/frlg/stage3-json
dayfine Nov 10, 2026
703f5e8
Merge frlg/stage3-mtmoon (#333) into frlg/stage4-json: stage 4's rows…
dayfine Nov 10, 2026
25ce096
FRLG AutoStory: delete stage 4's C++ story rows, parity proven
dayfine Nov 10, 2026
48f46db
Merge pull request #334 from dayfine/frlg/stage4-json
dayfine Nov 10, 2026
b28ee6e
Merge frlg/stage4-cerulean (#334) into frlg/stage5-json: stage 5's ro…
dayfine Nov 10, 2026
0d47b00
FRLG AutoStory: delete stage 5's C++ story rows, parity proven
dayfine Nov 10, 2026
c4b55d7
Merge pull request #336 from dayfine/frlg/stage5-json
dayfine Nov 10, 2026
201cda0
Merge frlg/stage5-bill (#336) into frlg/stage6-json: stage 6's rows a…
dayfine Nov 10, 2026
e3ab8e1
FRLG AutoStory: delete stage 6's C++ story rows, parity proven
dayfine Nov 10, 2026
7dadd34
Merge pull request #337 from dayfine/frlg/stage6-json
dayfine Nov 10, 2026
93703c5
Merge frlg/stage6-vermilion (#337) into frlg/stage7-json: stage 7's r…
dayfine Nov 10, 2026
9d78b82
FRLG AutoStory: delete stage 7's C++ story rows, parity proven
dayfine Nov 10, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SerialPrograms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ pa_embed_text_files(SerialProgramsLib "${FRLG_MAP_RESOURCES}"
pa_embed_text_files(SerialProgramsLib Source/VideoGames/PokemonFRLG/Programs/AutoStory/BattleData
VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryBattleData.h PokemonAutomation::NintendoSwitch::PokemonFRLG autostory_battle_json)
pa_embed_text_files(SerialProgramsLib Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData
VideoGames/PokemonFRLG/Programs/AutoStory/Data/JsonParser.h PokemonAutomation::NintendoSwitch::PokemonFRLG autostory_checkpoint_json)
VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.h PokemonAutomation::NintendoSwitch::PokemonFRLG autostory_checkpoint_json)


# Create binary target
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,20 @@ class RouteLogLines{
for (const RouteStep& step : steps){
legs.push_back({.leg = route_log_leg(step), .after = route_tiles(step.end)});
}
m_calls.log(ROUTE_LOG_TAG + Pokemon::route_plan_line(m_label, route_tiles(from), legs));
m_calls.log(std::string(ROUTE_LOG_TAG) + Pokemon::route_plan_line(m_label, route_tiles(from), legs));
}
void leg(size_t index, const std::vector<RouteStep>& steps) const{
const RouteStep& step = steps[index];
m_calls.log(ROUTE_LOG_TAG + Pokemon::route_leg_line(index + 1, steps.size(), {.leg = route_log_leg(step), .after = route_tiles(step.end)}));
m_calls.log(std::string(ROUTE_LOG_TAG) + Pokemon::route_leg_line(index + 1, steps.size(), {.leg = route_log_leg(step), .after = route_tiles(step.end)}));
}
void end(const RouteStep& step, const std::optional<MapPosition>& at, EndBasis basis, const std::string& why) const{
m_calls.log(ROUTE_LOG_TAG + Pokemon::route_leg_end_line(m_label, route_log_leg(step), route_tiles(at), basis, why));
m_calls.log(std::string(ROUTE_LOG_TAG) + Pokemon::route_leg_end_line(m_label, route_log_leg(step), route_tiles(at), basis, why));
}
void trainer_stopped(const RouteStep& step, const MapPosition& at) const{
m_calls.log(ROUTE_LOG_TAG + Pokemon::route_replan_line(m_label, route_log_leg(step), "stopped by a trainer who saw the player", route_tiles(at)));
m_calls.log(std::string(ROUTE_LOG_TAG) + Pokemon::route_replan_line(m_label, route_log_leg(step), "stopped by a trainer who saw the player", route_tiles(at)));
}
void found(const MapPosition& at, size_t holds) const{
m_calls.log(ROUTE_LOG_TAG + Pokemon::route_found_line(m_label, route_tiles(at), holds));
m_calls.log(std::string(ROUTE_LOG_TAG) + Pokemon::route_found_line(m_label, route_tiles(at), holds));
}
// Step `number` (from 1) of a plan whose first `holds` steps are holds
// to walls, walked to its end.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Pokemon FRLG Tests

Check warning on line 1 in SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health (advisory)

<file>: file_lines=1000 (advisory above 500, limit 1000)
*
* From: https://github.com/PokemonAutomation/
*
Expand Down Expand Up @@ -51,6 +51,7 @@
#include "Programs/AutoStory/PokemonFRLG_AutoStoryPaceSim.h"
#include "Programs/AutoStory/PokemonFRLG_AutoStoryPcStorage.h"
#include "Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop.h"
#include "Programs/AutoStory/PokemonFRLG_AutoStoryRows_Tests.h"
#include "Programs/AutoStory/PokemonFRLG_AutoStoryTable.h"
#include "Programs/AutoStory/PokemonFRLG_AutoStoryTrashCans.h"
#include "Programs/AutoStory/Data/Json_Tests.h"
Expand Down Expand Up @@ -890,7 +891,6 @@
add_tests_NamingText(database);
}

// The story's rows on the overworld sim, a file of tests per stage.
static void add_tests_AutoStoryRows(UnitTestDatabase& database){
add_tests_AutoStoryVermilion(database);
add_tests_AutoStoryVermilionGym(database);
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <utility>
#include "Common/Cpp/Json/JsonArray.h"
#include "Common/Cpp/Json/JsonObject.h"
#include "Pokemon/AutoStory/Pokemon_StoryStepJson.h"
#include "Pokemon/AutoStory/Data/Pokemon_StoryStepJson.h"
#include "LegacyJsonFormat.h"
#include "JsonWriter.h"

Expand Down
Loading
Loading