Skip to content

Split prefix in RANDO_ENUM_ITEM #6645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pepe20129 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Split prefix in RANDO_ENUM_ITEM #6645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f12ddef
Split prefix in RANDO_ENUM_ITEM
Pepe20129 May 26, 2026
8097317
clang...
Pepe20129 May 26, 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 soh/soh/Enhancements/debugger/debugSaveEditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ const std::vector<FlagTable> flagTables = {
RANDOMIZER_INF,
(RAND_INF_MAX + 15) / 16,
{
#define RANDO_ENUM_ITEM(rand_inf) { rand_inf, #rand_inf },
#define RANDO_ENUM_ITEM(prefix, rand_inf) { prefix##_##rand_inf, #prefix "_" #rand_inf },
#include "soh/Enhancements/randomizer/randomizerEnums/RandomizerInf.h"
#undef RANDO_ENUM_ITEM
} },
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/randomizer/option.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ RandomizerCheck LocationOption::GetKey() const {
return static_cast<RandomizerCheck>(key);
}

#define RANDO_ENUM_ITEM(enum) { enum, #enum },
#define RANDO_ENUM_ITEM(prefix, enum) { prefix##_##enum, #prefix "_" #enum },

std::unordered_map<RandomizerTrick, std::string> trickNames = {
#include "randomizerEnums/RandomizerTrick.h"
Expand Down
4 changes: 2 additions & 2 deletions soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
static const std::unordered_map<std::string_view, EnumName> map = [] { \
std::unordered_map<std::string_view, EnumName> m;

#define RANDO_ENUM_ITEM(name, ...) m.emplace(#name, name);
#define RANDO_ENUM_ITEM(prefix, name, ...) m.emplace(#prefix "_" #name, prefix##_##name);

#define RANDO_ENUM_END(EnumName) \
return m; \
Expand All @@ -25,7 +25,7 @@
static const std::unordered_map<EnumName, std::string_view> map = [] { \
std::unordered_map<EnumName, std::string_view> m;

#define RANDO_ENUM_ITEM(name, ...) m.emplace(name, #name);
#define RANDO_ENUM_ITEM(prefix, name, ...) m.emplace(prefix##_##name, #prefix "_" #name);

#define RANDO_ENUM_END(EnumName) \
return m; \
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/randomizer/randomizerEnums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#if !defined(RANDO_ENUM_BEGIN) && !defined(RANDO_ENUM_ITEM) && !defined(RANDO_ENUM_END)
// clang-format off
#define RANDO_ENUM_BEGIN(EnumName) typedef enum EnumName {
#define RANDO_ENUM_ITEM(name, ...) name __VA_OPT__(=) __VA_ARGS__,
#define RANDO_ENUM_ITEM(prefix, name, ...) prefix ## _ ## name __VA_OPT__(=) __VA_ARGS__,
#define RANDO_ENUM_END(EnumName) } EnumName;
#define RANDO_ENUM__CLEANUP
// clang-format on
Expand Down
Loading
Loading