scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor hex string handling: replace UppercaseHex functions with Hex equivalents

Browse Source
This commit is contained in:
scawful
2024-12-30 09:48:19 -05:00
parent f13ce9d6fd
commit 59e59f8a38
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/editor/dungeon/dungeon_editor.cc
View File

@@ -328,7 +328,7 @@ void DungeonEditor::DrawRoomSelector() {
for (const auto each_room_name : zelda3::kRoomNames) { for (const auto each_room_name : zelda3::kRoomNames) {
rom()->resource_label()->SelectableLabelWithNameEdit( rom()->resource_label()->SelectableLabelWithNameEdit(
current_room_id_ == i, "Dungeon Room Names", current_room_id_ == i, "Dungeon Room Names",
core::UppercaseHexByte(i), each_room_name.data()); core::HexByte(i), each_room_name.data());
if (ImGui::IsItemClicked()) { if (ImGui::IsItemClicked()) {
// TODO: Jump to tab if room is already open // TODO: Jump to tab if room is already open
current_room_id_ = i; current_room_id_ = i;
@@ -402,7 +402,7 @@ void DungeonEditor::DrawEntranceSelector() {
for (int i = 0; i < 0x85 + 7; i++) { for (int i = 0; i < 0x85 + 7; i++) {
rom()->resource_label()->SelectableLabelWithNameEdit( rom()->resource_label()->SelectableLabelWithNameEdit(
current_entrance_id_ == i, "Dungeon Entrance Names", current_entrance_id_ == i, "Dungeon Entrance Names",
core::UppercaseHexByte(i), core::HexByte(i),
zelda3::kEntranceNames[i].data()); zelda3::kEntranceNames[i].data());
if (ImGui::IsItemClicked()) { if (ImGui::IsItemClicked()) {

2
src/app/editor/editor_manager.cc
View File

@@ -355,7 +355,7 @@ void EditorManager::DrawInfoPopup() {
if (BeginPopupModal("ROM Information", nullptr, if (BeginPopupModal("ROM Information", nullptr,
ImGuiWindowFlags_AlwaysAutoResize)) { ImGuiWindowFlags_AlwaysAutoResize)) {
Text("Title: %s", rom()->title().c_str()); Text("Title: %s", rom()->title().c_str());
Text("ROM Size: %s", core::UppercaseHexLongLong(rom()->size()).c_str()); Text("ROM Size: %s", core::HexLongLong(rom()->size()).c_str());
if (Button("Close", gui::kDefaultModalSize) || if (Button("Close", gui::kDefaultModalSize) ||
IsKeyPressed(ImGuiKey_Escape)) { IsKeyPressed(ImGuiKey_Escape)) {

4
src/app/editor/graphics/screen_editor.cc
View File

@@ -167,7 +167,7 @@ absl::Status ScreenEditor::LoadDungeonMaps() {
gdata[j] = rom()->data()[pc_ptr_gfx++]; gdata[j] = rom()->data()[pc_ptr_gfx++];
} }
std::string label = core::UppercaseHexByte(rdata[j]); std::string label = core::HexByte(rdata[j]);
dungeon_map_labels_[d][i][j] = label; dungeon_map_labels_[d][i][j] = label;
} }
@@ -318,7 +318,7 @@ void ScreenEditor::DrawDungeonMapsTabs() {
std::string label = std::string label =
dungeon_map_labels_[selected_dungeon][floor_number][j]; dungeon_map_labels_[selected_dungeon][floor_number][j];
screen_canvas_.DrawText(label, (posX * 2), (posY * 2)); screen_canvas_.DrawText(label, (posX * 2), (posY * 2));
std::string gfx_id = core::UppercaseHexByte(tile16_id); std::string gfx_id = core::HexByte(tile16_id);
screen_canvas_.DrawText(gfx_id, (posX * 2), (posY * 2) + 16); screen_canvas_.DrawText(gfx_id, (posX * 2), (posY * 2) + 16);
} }
} }

2
src/app/editor/graphics/tile16_editor.cc
View File

@@ -59,7 +59,7 @@ absl::Status Tile16Editor::InitBlockset(
RETURN_IF_ERROR(LoadTile8()); RETURN_IF_ERROR(LoadTile8());
ImVector<std::string> tile16_names; ImVector<std::string> tile16_names;
for (int i = 0; i < 0x200; ++i) { for (int i = 0; i < 0x200; ++i) {
std::string str = core::UppercaseHexByte(all_tiles_types_[i]); std::string str = core::HexByte(all_tiles_types_[i]);
tile16_names.push_back(str); tile16_names.push_back(str);
} }

12
src/app/editor/message/message_editor.cc
View File

@@ -88,7 +88,7 @@ absl::Status MessageEditor::Initialize() {
for (const auto& each_message : list_of_texts_) { for (const auto& each_message : list_of_texts_) {
std::cout << "Message #" << each_message.ID << " at address " std::cout << "Message #" << each_message.ID << " at address "
<< core::UppercaseHexLong(each_message.Address) << std::endl; << core::HexLong(each_message.Address) << std::endl;
std::cout << " " << each_message.RawString << std::endl; std::cout << " " << each_message.RawString << std::endl;
// Each string has a [:XX] char encoded // Each string has a [:XX] char encoded
@@ -173,7 +173,7 @@ void MessageEditor::DrawMessageList() {
for (const auto& message : list_of_texts_) { for (const auto& message : list_of_texts_) {
TableNextColumn(); TableNextColumn();
if (Button(core::UppercaseHexWord(message.ID).c_str())) { if (Button(core::HexWord(message.ID).c_str())) {
current_message_ = message; current_message_ = message;
DrawMessagePreview(); DrawMessagePreview();
} }
@@ -182,7 +182,7 @@ void MessageEditor::DrawMessageList() {
TableNextColumn(); TableNextColumn();
TextWrapped( TextWrapped(
"%s", "%s",
core::UppercaseHexLong(list_of_texts_[message.ID].Address).c_str()); core::HexLong(list_of_texts_[message.ID].Address).c_str());
} }
EndTable(); EndTable();
@@ -252,7 +252,7 @@ void MessageEditor::DrawDictionary() {
for (const auto& dictionary : all_dictionaries_) { for (const auto& dictionary : all_dictionaries_) {
TableNextColumn(); TableNextColumn();
Text("%s", core::UppercaseHexWord(dictionary.ID).c_str()); Text("%s", core::HexWord(dictionary.ID).c_str());
TableNextColumn(); TableNextColumn();
Text("%s", dictionary.Contents.c_str()); Text("%s", dictionary.Contents.c_str());
} }
@@ -332,7 +332,7 @@ void MessageEditor::ReadAllTextDataV2() {
current_raw_message.append("["); current_raw_message.append("[");
current_raw_message.append(DICTIONARYTOKEN); current_raw_message.append(DICTIONARYTOKEN);
current_raw_message.append(":"); current_raw_message.append(":");
current_raw_message.append(core::UppercaseHexWord(dictionary)); current_raw_message.append(core::HexWord(dictionary));
current_raw_message.append("]"); current_raw_message.append("]");
uint32_t address = core::Get24LocalFromPC( uint32_t address = core::Get24LocalFromPC(
@@ -432,7 +432,7 @@ void MessageEditor::ReadAllTextData() {
current_message_raw.append("["); current_message_raw.append("[");
current_message_raw.append(DICTIONARYTOKEN); current_message_raw.append(DICTIONARYTOKEN);
current_message_raw.append(":"); current_message_raw.append(":");
current_message_raw.append(core::UppercaseHexWord(dictionary)); current_message_raw.append(core::HexWord(dictionary));
current_message_raw.append("]"); current_message_raw.append("]");
uint32_t address = core::Get24LocalFromPC( uint32_t address = core::Get24LocalFromPC(

2
src/app/editor/overworld/entity.cc
View File

@@ -91,7 +91,7 @@ void HandleEntityDragging(zelda3::GameEntity *entity, ImVec2 canvas_p0,
ImGui::SetDragDropPayload("ENTITY_PAYLOAD", &entity, ImGui::SetDragDropPayload("ENTITY_PAYLOAD", &entity,
sizeof(zelda3::GameEntity)); sizeof(zelda3::GameEntity));
Text("Moving %s ID: %s", entity_type.c_str(), Text("Moving %s ID: %s", entity_type.c_str(),
core::UppercaseHexByte(entity->entity_id_).c_str()); core::HexByte(entity->entity_id_).c_str());
ImGui::EndDragDropSource(); ImGui::EndDragDropSource();
} }
MoveEntityOnGrid(dragged_entity, canvas_p0, scrolling, free_movement); MoveEntityOnGrid(dragged_entity, canvas_p0, scrolling, free_movement);

6
src/app/editor/overworld/overworld_editor.cc
View File

@@ -789,7 +789,7 @@ void OverworldEditor::DrawOverworldEntrances(ImVec2 canvas_p0, ImVec2 scrolling,
color = ImVec4(255, 255, 255, 200); color = ImVec4(255, 255, 255, 200);
} }
ow_map_canvas_.DrawRect(each.x_, each.y_, 16, 16, color); ow_map_canvas_.DrawRect(each.x_, each.y_, 16, 16, color);
std::string str = core::UppercaseHexByte(each.entrance_id_); std::string str = core::HexByte(each.entrance_id_);
if (current_mode == EditingMode::ENTRANCES) { if (current_mode == EditingMode::ENTRANCES) {
HandleEntityDragging(&each, canvas_p0, scrolling, is_dragging_entity_, HandleEntityDragging(&each, canvas_p0, scrolling, is_dragging_entity_,
@@ -872,7 +872,7 @@ void OverworldEditor::DrawOverworldExits(ImVec2 canvas_p0, ImVec2 scrolling) {
} }
} }
std::string str = core::UppercaseHexByte(i); std::string str = core::HexByte(i);
ow_map_canvas_.DrawText(str, each.x_, each.y_); ow_map_canvas_.DrawText(str, each.x_, each.y_);
} }
i++; i++;
@@ -1367,7 +1367,7 @@ absl::Status OverworldEditor::UpdateUsageStats() {
ImGuiWindowFlags_HorizontalScrollbar)) { ImGuiWindowFlags_HorizontalScrollbar)) {
for (int i = 0; i < 0x81; i++) { for (int i = 0; i < 0x81; i++) {
auto entrance_name = rom()->resource_label()->GetLabel( auto entrance_name = rom()->resource_label()->GetLabel(
"Dungeon Entrance Names", core::UppercaseHexByte(i)); "Dungeon Entrance Names", core::HexByte(i));
std::string str = absl::StrFormat("%#x - %s", i, entrance_name); std::string str = absl::StrFormat("%#x - %s", i, entrance_name);
if (Selectable(str.c_str(), selected_entrance_ == i, if (Selectable(str.c_str(), selected_entrance_ == i,
overworld_.entrances().at(i).deleted overworld_.entrances().at(i).deleted

2
src/app/editor/sprite/sprite_editor.cc
View File

@@ -190,7 +190,7 @@ void SpriteEditor::DrawSpritesList() {
int i = 0; int i = 0;
for (const auto each_sprite_name : zelda3::kSpriteDefaultNames) { for (const auto each_sprite_name : zelda3::kSpriteDefaultNames) {
rom()->resource_label()->SelectableLabelWithNameEdit( rom()->resource_label()->SelectableLabelWithNameEdit(
current_sprite_id_ == i, "Sprite Names", core::UppercaseHexByte(i), current_sprite_id_ == i, "Sprite Names", core::HexByte(i),
zelda3::kSpriteDefaultNames[i].data()); zelda3::kSpriteDefaultNames[i].data());
if (ImGui::IsItemClicked()) { if (ImGui::IsItemClicked()) {
current_sprite_id_ = i; current_sprite_id_ = i;

12
src/app/rom.h
View File

@@ -329,7 +329,7 @@ class Rom : public core::ExperimentFlags {
} }
rom_data_[addr] = value; rom_data_[addr] = value;
std::string log_str = absl::StrFormat("WriteByte: %#06X: %s", addr, std::string log_str = absl::StrFormat("WriteByte: %#06X: %s", addr,
core::UppercaseHexByte(value).data()); core::HexByte(value).data());
core::Logger::log(log_str); core::Logger::log(log_str);
return absl::OkStatus(); return absl::OkStatus();
} }
@@ -344,7 +344,7 @@ class Rom : public core::ExperimentFlags {
rom_data_[addr] = (uint8_t)(value & 0xFF); rom_data_[addr] = (uint8_t)(value & 0xFF);
rom_data_[addr + 1] = (uint8_t)((value >> 8) & 0xFF); rom_data_[addr + 1] = (uint8_t)((value >> 8) & 0xFF);
core::Logger::log(absl::StrFormat("WriteWord: %#06X: %s", addr, core::Logger::log(absl::StrFormat("WriteWord: %#06X: %s", addr,
core::UppercaseHexWord(value))); core::HexWord(value)));
return absl::OkStatus(); return absl::OkStatus();
} }
@@ -358,7 +358,7 @@ class Rom : public core::ExperimentFlags {
rom_data_[addr] = (uint8_t)(value & 0xFF); rom_data_[addr] = (uint8_t)(value & 0xFF);
rom_data_[addr + 1] = (uint8_t)((value >> 8) & 0xFF); rom_data_[addr + 1] = (uint8_t)((value >> 8) & 0xFF);
core::Logger::log(absl::StrFormat("WriteShort: %#06X: %s", addr, core::Logger::log(absl::StrFormat("WriteShort: %#06X: %s", addr,
core::UppercaseHexWord(value))); core::HexWord(value)));
return absl::OkStatus(); return absl::OkStatus();
} }
@@ -373,7 +373,7 @@ class Rom : public core::ExperimentFlags {
rom_data_[addr + 1] = (uint8_t)((value >> 8) & 0xFF); rom_data_[addr + 1] = (uint8_t)((value >> 8) & 0xFF);
rom_data_[addr + 2] = (uint8_t)((value >> 16) & 0xFF); rom_data_[addr + 2] = (uint8_t)((value >> 16) & 0xFF);
core::Logger::log(absl::StrFormat("WriteLong: %#06X: %s", addr, core::Logger::log(absl::StrFormat("WriteLong: %#06X: %s", addr,
core::UppercaseHexLong(value))); core::HexLong(value)));
return absl::OkStatus(); return absl::OkStatus();
} }
@@ -388,7 +388,7 @@ class Rom : public core::ExperimentFlags {
rom_data_[addr + i] = data[i]; rom_data_[addr + i] = data[i];
} }
core::Logger::log(absl::StrFormat("WriteVector: %#06X: %s", addr, core::Logger::log(absl::StrFormat("WriteVector: %#06X: %s", addr,
core::UppercaseHexByte(data[0]))); core::HexByte(data[0])));
return absl::OkStatus(); return absl::OkStatus();
} }
@@ -398,7 +398,7 @@ class Rom : public core::ExperimentFlags {
// Write the 16-bit color value to the ROM at the specified address // Write the 16-bit color value to the ROM at the specified address
core::Logger::log(absl::StrFormat("WriteColor: %#06X: %s", address, core::Logger::log(absl::StrFormat("WriteColor: %#06X: %s", address,
core::UppercaseHexWord(bgr))); core::HexWord(bgr)));
return WriteShort(address, bgr); return WriteShort(address, bgr);
} }

22
src/app/zelda3/overworld/overworld.cc
View File

@@ -573,7 +573,7 @@ absl::Status Overworld::SaveOverworldMaps() {
if ((pos + size_a) >= 0x6411F && (pos + size_a) <= 0x70000) { if ((pos + size_a) >= 0x6411F && (pos + size_a) <= 0x70000) {
core::Logger::log("Pos set to overflow region for map " + core::Logger::log("Pos set to overflow region for map " +
std::to_string(i) + " at " + std::to_string(i) + " at " +
core::UppercaseHexLong(pos)); core::HexLong(pos));
pos = OverworldMapDataOverflow; // 0x0F8780; pos = OverworldMapDataOverflow; // 0x0F8780;
} }
@@ -610,8 +610,8 @@ absl::Status Overworld::SaveOverworldMaps() {
int snes_pos = core::PcToSnes(pos); int snes_pos = core::PcToSnes(pos);
map_pointers1[i] = snes_pos; map_pointers1[i] = snes_pos;
core::Logger::log("Saving map pointers1 and compressed data for map " + core::Logger::log("Saving map pointers1 and compressed data for map " +
core::UppercaseHexByte(i) + " at " + core::HexByte(i) + " at " +
core::UppercaseHexLong(snes_pos)); core::HexLong(snes_pos));
RETURN_IF_ERROR(rom()->WriteLong( RETURN_IF_ERROR(rom()->WriteLong(
rom()->version_constants().kCompressedAllMap32PointersLow + (3 * i), rom()->version_constants().kCompressedAllMap32PointersLow + (3 * i),
snes_pos)); snes_pos));
@@ -621,8 +621,8 @@ absl::Status Overworld::SaveOverworldMaps() {
// Save pointer for map1 // Save pointer for map1
int snes_pos = map_pointers1[map_pointers1_id[i]]; int snes_pos = map_pointers1[map_pointers1_id[i]];
core::Logger::log("Saving map pointers1 for map " + core::Logger::log("Saving map pointers1 for map " +
core::UppercaseHexByte(i) + " at " + core::HexByte(i) + " at " +
core::UppercaseHexLong(snes_pos)); core::HexLong(snes_pos));
RETURN_IF_ERROR(rom()->WriteLong( RETURN_IF_ERROR(rom()->WriteLong(
rom()->version_constants().kCompressedAllMap32PointersLow + (3 * i), rom()->version_constants().kCompressedAllMap32PointersLow + (3 * i),
snes_pos)); snes_pos));
@@ -634,8 +634,8 @@ absl::Status Overworld::SaveOverworldMaps() {
if ((pos + b.size()) >= 0x6411F && (pos + b.size()) <= 0x70000) { if ((pos + b.size()) >= 0x6411F && (pos + b.size()) <= 0x70000) {
core::Logger::log("Pos set to overflow region for map " + core::Logger::log("Pos set to overflow region for map " +
core::UppercaseHexByte(i) + " at " + core::HexByte(i) + " at " +
core::UppercaseHexLong(pos)); core::HexLong(pos));
pos = OverworldMapDataOverflow; pos = OverworldMapDataOverflow;
} }
@@ -645,8 +645,8 @@ absl::Status Overworld::SaveOverworldMaps() {
int snes_pos = core::PcToSnes(pos); int snes_pos = core::PcToSnes(pos);
map_pointers2[i] = snes_pos; map_pointers2[i] = snes_pos;
core::Logger::log("Saving map pointers2 and compressed data for map " + core::Logger::log("Saving map pointers2 and compressed data for map " +
core::UppercaseHexByte(i) + " at " + core::HexByte(i) + " at " +
core::UppercaseHexLong(snes_pos)); core::HexLong(snes_pos));
RETURN_IF_ERROR(rom()->WriteLong( RETURN_IF_ERROR(rom()->WriteLong(
rom()->version_constants().kCompressedAllMap32PointersHigh + (3 * i), rom()->version_constants().kCompressedAllMap32PointersHigh + (3 * i),
snes_pos)); snes_pos));
@@ -656,8 +656,8 @@ absl::Status Overworld::SaveOverworldMaps() {
// Save pointer for map2 // Save pointer for map2
int snes_pos = map_pointers2[map_pointers2_id[i]]; int snes_pos = map_pointers2[map_pointers2_id[i]];
core::Logger::log("Saving map pointers2 for map " + core::Logger::log("Saving map pointers2 for map " +
core::UppercaseHexByte(i) + " at " + core::HexByte(i) + " at " +
core::UppercaseHexLong(snes_pos)); core::HexLong(snes_pos));
RETURN_IF_ERROR(rom()->WriteLong( RETURN_IF_ERROR(rom()->WriteLong(
rom()->version_constants().kCompressedAllMap32PointersHigh + (3 * i), rom()->version_constants().kCompressedAllMap32PointersHigh + (3 * i),
snes_pos)); snes_pos));

6
src/app/zelda3/overworld/overworld_map.cc
View File

@@ -378,11 +378,11 @@ void OverworldMap::LoadMainBlocksets() {
// during the BuildBitmap step (or a new one specifically for animating). // during the BuildBitmap step (or a new one specifically for animating).
void OverworldMap::DrawAnimatedTiles() { void OverworldMap::DrawAnimatedTiles() {
std::cout << "static_graphics_[6] = " std::cout << "static_graphics_[6] = "
<< core::UppercaseHexByte(static_graphics_[6]) << std::endl; << core::HexByte(static_graphics_[6]) << std::endl;
std::cout << "static_graphics_[7] = " std::cout << "static_graphics_[7] = "
<< core::UppercaseHexByte(static_graphics_[7]) << std::endl; << core::HexByte(static_graphics_[7]) << std::endl;
std::cout << "static_graphics_[8] = " std::cout << "static_graphics_[8] = "
<< core::UppercaseHexByte(static_graphics_[8]) << std::endl; << core::HexByte(static_graphics_[8]) << std::endl;
if (static_graphics_[7] == 0x5B) { if (static_graphics_[7] == 0x5B) {
static_graphics_[7] = 0x5A; static_graphics_[7] = 0x5A;
} else { } else {