OverworldEntity update: Entrances, Exits, Items

This commit is contained in:
scawful
2024-01-27 15:55:47 -05:00
parent c4a44fbc10
commit e086f12ade
19 changed files with 1009 additions and 384 deletions

View File

@@ -17,8 +17,12 @@ namespace core {
std::shared_ptr<ExperimentFlags::Flags> ExperimentFlags::flags_;
std::string UppercaseHexByte(uint8_t byte) {
std::string result = absl::StrFormat("0x%02X", byte);
std::string UppercaseHexByte(uint8_t byte, bool leading) {
if (leading) {
std::string result = absl::StrFormat("0x%02X", byte);
return result;
}
std::string result = absl::StrFormat("%02X", byte);
return result;
}
std::string UppercaseHexWord(uint16_t word) {

View File

@@ -65,13 +65,16 @@ class ExperimentFlags {
bool kSaveOverworldMaps = false;
// Save overworld entrances to the ROM.
bool kSaveOverworldEntrances = false;
bool kSaveOverworldEntrances = true;
// Save overworld exits to the ROM.
bool kSaveOverworldExits = false;
bool kSaveOverworldExits = true;
// Save overworld items to the ROM.
bool kSaveOverworldItems = true;
// Save overworld properties to the ROM.
bool kSaveOverworldProperties = false;
bool kSaveOverworldProperties = true;
} overworld;
};
@@ -232,7 +235,7 @@ class ImGuiIdIssuer {
}
};
std::string UppercaseHexByte(uint8_t byte);
std::string UppercaseHexByte(uint8_t byte, bool leading = false);
std::string UppercaseHexWord(uint16_t word);
std::string UppercaseHexLong(uint32_t dword);

View File

@@ -68,6 +68,15 @@
} \
}
#define RETURN_VOID_IF_ERROR(expression) \
{ \
auto error = expression; \
if (!error.ok()) { \
std::cout << error.ToString() << std::endl; \
return; \
} \
}
#define RETURN_IF_ERROR(expression) \
{ \
auto error = expression; \
@@ -136,7 +145,7 @@ namespace app {
namespace core {
constexpr uint32_t kRedPen = 0xFF0000FF;
constexpr float kYazeVersion = 0.06;
constexpr float kYazeVersion = 0.07;
// ============================================================================
// Magic numbers