From db3405dc3ad831cd1d282258b7f5282f11341498 Mon Sep 17 00:00:00 2001 From: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com> Date: Sat, 20 Sep 2025 05:18:55 -0400 Subject: [PATCH] Added COMPOUND_STRINGs to region_map_entries.h (#7669) --- .../region_map/region_map_sections.json.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/data/region_map/region_map_sections.json.txt b/src/data/region_map/region_map_sections.json.txt index 0da2d31794..5c532a050a 100644 --- a/src/data/region_map/region_map_sections.json.txt +++ b/src/data/region_map/region_map_sections.json.txt @@ -2,21 +2,6 @@ #ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H -## for map_section in map_sections -{% if existsIn(map_section, "name") and isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.id) }}{% endif %} -## endfor - -## for map_section in map_sections -{% if existsIn(map_section, "name") %} -{% if getVar(map_section.name) == map_section.id %} -static const u8 sMapName_{{ cleanString(map_section.name) }}[] = _("{{ map_section.name }}"); -{% endif %} -{% if existsIn(map_section, "name_clone") %} -static const u8 sMapName_{{ cleanString(map_section.name) }}_Clone[] = _("{{ map_section.name }}"); -{% endif %} -{% endif %} -## endfor - const struct RegionMapLocation gRegionMapEntries[] = { ## for map_section in map_sections [{{ map_section.id }}] = { @@ -41,7 +26,7 @@ const struct RegionMapLocation gRegionMapEntries[] = { .height = 1, {% endif %} {% if existsIn(map_section, "name") %} - .name = sMapName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %}, + .name = COMPOUND_STRING("{{ map_section.name }}"), {% else %} .name = (const u8[])_(""), {% endif %}