From 624babe1112102b88e357c816b6d325a4fd64ee3 Mon Sep 17 00:00:00 2001 From: dayfine Date: Wed, 11 Nov 2026 12:42:08 -0800 Subject: [PATCH 1/2] Pokemon: Move Direction into Pokemon_Direction.h Direction, ALL_DIRECTIONS and direction_name() move unchanged from Navigation/Pokemon_Grid.{h,cpp} to Pokemon/Pokemon_Direction.{h,cpp}. Grid.h includes the new header, so grid code is unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss --- .../Pokemon/Navigation/Pokemon_Grid.cpp | 15 -------- .../Source/Pokemon/Navigation/Pokemon_Grid.h | 18 ++-------- .../Source/Pokemon/Pokemon_Direction.cpp | 30 ++++++++++++++++ .../Source/Pokemon/Pokemon_Direction.h | 36 +++++++++++++++++++ SerialPrograms/cmake/SourceFiles.cmake | 2 ++ 5 files changed, 70 insertions(+), 31 deletions(-) create mode 100644 SerialPrograms/Source/Pokemon/Pokemon_Direction.cpp create mode 100644 SerialPrograms/Source/Pokemon/Pokemon_Direction.h diff --git a/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.cpp b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.cpp index 62ec864f74..84fa47bcb1 100644 --- a/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.cpp +++ b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.cpp @@ -11,21 +11,6 @@ namespace PokemonAutomation{ namespace Pokemon{ -std::string direction_name(Direction direction){ - switch (direction){ - case Direction::NORTH: - return "north"; - case Direction::EAST: - return "east"; - case Direction::SOUTH: - return "south"; - case Direction::WEST: - return "west"; - } - return "?"; -} - - TilePos TilePos::next(Direction direction) const{ switch (direction){ case Direction::NORTH: diff --git a/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h index f0b1af8313..23129b1dc8 100644 --- a/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h +++ b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h @@ -2,7 +2,7 @@ * * From: https://github.com/PokemonAutomation/ * - * Tiles and directions on an overworld grid, shared by the games that + * Tiles on an overworld grid, shared by the games that * move the player a tile at a time. * */ @@ -14,26 +14,12 @@ #include #include #include +#include "Pokemon/Pokemon_Direction.h" namespace PokemonAutomation{ namespace Pokemon{ -// Row 0 is the top of a map, so SOUTH increases y. -enum class Direction{ - NORTH, - EAST, - SOUTH, - WEST, -}; -// Array containing all four cardinal directions. -constexpr Direction ALL_DIRECTIONS[] = { - Direction::NORTH, Direction::EAST, Direction::SOUTH, Direction::WEST, -}; -// Returns the lowercase name string of a cardinal direction. -std::string direction_name(Direction direction); - - // Grid coordinate with integer x and y components. struct TilePos{ int x = 0; diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Direction.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Direction.cpp new file mode 100644 index 0000000000..0663f79588 --- /dev/null +++ b/SerialPrograms/Source/Pokemon/Pokemon_Direction.cpp @@ -0,0 +1,30 @@ +/* Direction + * + * From: https://github.com/PokemonAutomation/ + * + */ + +#include "Pokemon_Direction.h" + +namespace PokemonAutomation{ +namespace Pokemon{ + + +std::string direction_name(Direction direction){ + switch (direction){ + case Direction::NORTH: + return "north"; + case Direction::EAST: + return "east"; + case Direction::SOUTH: + return "south"; + case Direction::WEST: + return "west"; + } + return "?"; +} + + + +} // namespace Pokemon +} // namespace PokemonAutomation diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Direction.h b/SerialPrograms/Source/Pokemon/Pokemon_Direction.h new file mode 100644 index 0000000000..5024b3ec69 --- /dev/null +++ b/SerialPrograms/Source/Pokemon/Pokemon_Direction.h @@ -0,0 +1,36 @@ +/* Direction + * + * From: https://github.com/PokemonAutomation/ + * + * The four cardinal directions the player can face or move in. + * + */ + +#ifndef PokemonAutomation_Pokemon_Direction_H +#define PokemonAutomation_Pokemon_Direction_H + +#include + +namespace PokemonAutomation{ +namespace Pokemon{ + + +// Row 0 is the top of a map, so SOUTH increases y. +enum class Direction{ + NORTH, + EAST, + SOUTH, + WEST, +}; +// Array containing all four cardinal directions. +constexpr Direction ALL_DIRECTIONS[] = { + Direction::NORTH, Direction::EAST, Direction::SOUTH, Direction::WEST, +}; +// Returns the lowercase name string of a cardinal direction. +std::string direction_name(Direction direction); + + + +} // namespace Pokemon +} // namespace PokemonAutomation +#endif diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index e3573ae182..7336f4309b 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -1514,6 +1514,8 @@ file(GLOB LIBRARY_SOURCES Source/Pokemon/Pokemon_CollectedPokemonInfo.cpp Source/Pokemon/Pokemon_CollectedPokemonInfo.h Source/Pokemon/Pokemon_DataTypes.h + Source/Pokemon/Pokemon_Direction.cpp + Source/Pokemon/Pokemon_Direction.h Source/Pokemon/Pokemon_EncounterStats.cpp Source/Pokemon/Pokemon_EncounterStats.h Source/Pokemon/Pokemon_Gf2Matrix.cpp From 7058630ee935d2c037ef5206ef78e26db0c80cd6 Mon Sep 17 00:00:00 2001 From: dayfine Date: Wed, 11 Nov 2026 14:47:13 -0800 Subject: [PATCH 2/2] Pokemon: Move Direction next to Grid in Pokemon/Navigation Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss --- .../Source/Pokemon/{ => Navigation}/Pokemon_Direction.cpp | 0 .../Source/Pokemon/{ => Navigation}/Pokemon_Direction.h | 0 SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h | 2 +- SerialPrograms/cmake/SourceFiles.cmake | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename SerialPrograms/Source/Pokemon/{ => Navigation}/Pokemon_Direction.cpp (100%) rename SerialPrograms/Source/Pokemon/{ => Navigation}/Pokemon_Direction.h (100%) diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Direction.cpp b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Direction.cpp similarity index 100% rename from SerialPrograms/Source/Pokemon/Pokemon_Direction.cpp rename to SerialPrograms/Source/Pokemon/Navigation/Pokemon_Direction.cpp diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Direction.h b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Direction.h similarity index 100% rename from SerialPrograms/Source/Pokemon/Pokemon_Direction.h rename to SerialPrograms/Source/Pokemon/Navigation/Pokemon_Direction.h diff --git a/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h index 23129b1dc8..29952d347e 100644 --- a/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h +++ b/SerialPrograms/Source/Pokemon/Navigation/Pokemon_Grid.h @@ -14,7 +14,7 @@ #include #include #include -#include "Pokemon/Pokemon_Direction.h" +#include "Pokemon_Direction.h" namespace PokemonAutomation{ namespace Pokemon{ diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index 7336f4309b..f48941b9b2 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -1458,6 +1458,8 @@ file(GLOB LIBRARY_SOURCES Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h Source/Pokemon/Inference/Pokemon_TypeReader.cpp Source/Pokemon/Inference/Pokemon_TypeReader.h + Source/Pokemon/Navigation/Pokemon_Direction.cpp + Source/Pokemon/Navigation/Pokemon_Direction.h Source/Pokemon/Navigation/Pokemon_Grid.cpp Source/Pokemon/Navigation/Pokemon_Grid.h Source/Pokemon/Options/Pokemon_BoxSortingTable.cpp @@ -1514,8 +1516,6 @@ file(GLOB LIBRARY_SOURCES Source/Pokemon/Pokemon_CollectedPokemonInfo.cpp Source/Pokemon/Pokemon_CollectedPokemonInfo.h Source/Pokemon/Pokemon_DataTypes.h - Source/Pokemon/Pokemon_Direction.cpp - Source/Pokemon/Pokemon_Direction.h Source/Pokemon/Pokemon_EncounterStats.cpp Source/Pokemon/Pokemon_EncounterStats.h Source/Pokemon/Pokemon_Gf2Matrix.cpp