From f7d20dad9ec571f538dfcd90726a4bcd2306a6b8 Mon Sep 17 00:00:00 2001 From: Codex Date: Mon, 2 Nov 2026 23:38:24 +0100 Subject: [PATCH] Name English environment source layout fields (by Codex) --- src/formats/executable_layout.hpp | 7 +++++++ src/launch/fltd.cpp | 8 ++++---- tests/fltd_translation_unit_tests.cpp | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/formats/executable_layout.hpp b/src/formats/executable_layout.hpp index 6edc78b..b9e7f32 100644 --- a/src/formats/executable_layout.hpp +++ b/src/formats/executable_layout.hpp @@ -874,6 +874,13 @@ inline constexpr auto EnglishLayoutTranslation255 = 0x6f0ec; inline constexpr auto EnglishLayoutTranslation256 = 0x6f2ae; inline constexpr auto EnglishLayoutTranslation257 = 0x6f2d4; inline constexpr auto EnglishLayoutTranslation258 = 0x6f2e0; +// English six-budget environment data used by the common monthly model. +inline constexpr auto EnglishEnvironmentTileX = 0x6d230; +inline constexpr auto EnglishEnvironmentTileY = 0x6d238; +inline constexpr auto EnglishEnvironmentYouthColors = 0x6d240; +inline constexpr auto EnglishEnvironmentBudgetSteps = 0x6d244; +inline constexpr auto EnglishEnvironmentYouthPositionSuffix = 0x6d24a; +inline constexpr auto EnglishEnvironmentCostSuffix = 0x6d24f; inline constexpr auto EnglishLayoutTranslation259 = 0x6f2fc; inline constexpr auto EnglishLayoutTranslation26 = 0x6bf2c; inline constexpr auto EnglishLayoutTranslation260 = 0x6f300; diff --git a/src/launch/fltd.cpp b/src/launch/fltd.cpp index 488e0fb..0bfb5c5 100644 --- a/src/launch/fltd.cpp +++ b/src/launch/fltd.cpp @@ -132,10 +132,10 @@ LeImage translate_fltd(const fs::path& fltd_exe) { en(::bmh::layout::EnglishOriginalPointerPixels + i)); // Copy the actual English six-budget geometry, numeric steps and suffixes // for the common monthly environment model. - for(const auto [to,from,count]:{std::array{layout::Environment_FormatError_RuntimeField,0x6d230,6}, - {layout::Environment_FormatError_RuntimeField2,0x6d238,6},{layout::EnvironmentYouthColors,0x6d240,3}, - {layout::EnvironmentBudgetSteps,0x6d244,6},{layout::EnvironmentYouthPositionSuffix,0x6d24a,5}, - {layout::EnvironmentCostSuffix,0x6d24f,2}})for(uint32_t i=0;i{layout::Environment_FormatError_RuntimeField,layout::EnglishEnvironmentTileX,6}, + {layout::Environment_FormatError_RuntimeField2,layout::EnglishEnvironmentTileY,6},{layout::EnvironmentYouthColors,layout::EnglishEnvironmentYouthColors,3}, + {layout::EnvironmentBudgetSteps,layout::EnglishEnvironmentBudgetSteps,6},{layout::EnvironmentYouthPositionSuffix,layout::EnglishEnvironmentYouthPositionSuffix,5}, + {layout::EnvironmentCostSuffix,layout::EnglishEnvironmentCostSuffix,2}})for(uint32_t i=0;i environment_x{20,80,140,200,250,20},environment_y{40,40,40,80,80,140},environment_steps{2,4,5,5,5,5}; - for(uint32_t i=0;i<6;++i){put(0x6d230+i,environment_x[i]);put(0x6d238+i,environment_y[i]);put(0x6d244+i,environment_steps[i]);} - const std::array youth_colors{0x41,0x42,0x43};for(uint32_t i=0;i<3;++i)put(0x6d240+i,youth_colors[i]); + for(uint32_t i=0;i<6;++i){put(layout::EnglishEnvironmentTileX+i,environment_x[i]);put(layout::EnglishEnvironmentTileY+i,environment_y[i]);put(layout::EnglishEnvironmentBudgetSteps+i,environment_steps[i]);} + const std::array youth_colors{0x41,0x42,0x43};for(uint32_t i=0;i<3;++i)put(layout::EnglishEnvironmentYouthColors+i,youth_colors[i]); const std::string position_suffix=". / ",cost_suffix="."; - for(uint32_t i=0;i<=position_suffix.size();++i)put(0x6d24a+i,i(source.data()), std::streamsize(source.size())); } const auto image = launch::translate_fltd(path);