From 7e46cf1c6423944540d34140f98389835442039e Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 14 Apr 2024 14:47:17 -0500 Subject: [PATCH] Rename ROM class to Rom --- src/app/editor/context/entrance_context.h | 2 +- src/app/editor/graphics_editor.h | 4 ++-- src/app/editor/master_editor.cc | 2 +- src/app/editor/modules/tile16_editor.h | 2 +- src/app/emu/snes.cc | 2 +- src/app/emu/snes.h | 4 ++-- src/app/gfx/compression.cc | 4 ++-- src/app/gui/pipeline.cc | 2 +- src/app/gui/pipeline.h | 2 +- src/app/rom.cc | 22 +++++++++++----------- src/app/rom.h | 12 ++++++------ src/app/zelda3/dungeon/room_entrance.h | 4 ++-- src/app/zelda3/music/tracker.cc | 18 +++++++++--------- src/app/zelda3/music/tracker.h | 20 ++++++++++---------- src/app/zelda3/overworld/overworld.cc | 6 +++--- src/app/zelda3/overworld/overworld.h | 8 ++++---- src/app/zelda3/overworld/overworld_map.cc | 4 ++-- src/app/zelda3/overworld/overworld_map.h | 4 ++-- src/app/zelda3/screen/title_screen.h | 2 +- src/cli/command_handler.cc | 2 +- src/cli/command_handler.h | 2 +- test/gfx/compression_test.cc | 22 +++++++++++----------- test/zelda3/room_object_test.cc | 4 ++-- 23 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/app/editor/context/entrance_context.h b/src/app/editor/context/entrance_context.h index 98d82780..9a57ffe5 100644 --- a/src/app/editor/context/entrance_context.h +++ b/src/app/editor/context/entrance_context.h @@ -14,7 +14,7 @@ namespace context { class EntranceContext { public: - absl::Status LoadEntranceTileTypes(ROM& rom) { + absl::Status LoadEntranceTileTypes(Rom& rom) { int offset_low = 0xDB8BF; int offset_high = 0xDB917; diff --git a/src/app/editor/graphics_editor.h b/src/app/editor/graphics_editor.h index 6f27dd37..07f4c9cf 100644 --- a/src/app/editor/graphics_editor.h +++ b/src/app/editor/graphics_editor.h @@ -165,8 +165,8 @@ class GraphicsEditor : public SharedROM { GfxEditMode gfx_edit_mode_ = GfxEditMode::kSelect; - ROM temp_rom_; - ROM tilemap_rom_; + Rom temp_rom_; + Rom tilemap_rom_; zelda3::overworld::Overworld overworld_; MemoryEditor cgx_memory_editor_; MemoryEditor col_memory_editor_; diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index 4c4b7720..87a6297e 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -468,7 +468,7 @@ void MasterEditor::DrawViewMenu() { static MemoryEditor mem_edit; static MemoryEditor comp_edit; static bool show_compare_rom = false; - static ROM comparison_rom; + static Rom comparison_rom; ImGui::Begin("Hex Editor", &show_memory_editor); if (ImGui::Button("Compare Rom")) { auto file_name = FileDialogWrapper::ShowOpenFileDialog(); diff --git a/src/app/editor/modules/tile16_editor.h b/src/app/editor/modules/tile16_editor.h index 3b450798..d7e6c68f 100644 --- a/src/app/editor/modules/tile16_editor.h +++ b/src/app/editor/modules/tile16_editor.h @@ -132,7 +132,7 @@ class Tile16Editor : public context::GfxContext, public SharedROM { gfx::BitmapTable graphics_bin_; - ROM transfer_rom_; + Rom transfer_rom_; absl::Status transfer_status_; }; diff --git a/src/app/emu/snes.cc b/src/app/emu/snes.cc index 5e747a2c..2ac655f7 100644 --- a/src/app/emu/snes.cc +++ b/src/app/emu/snes.cc @@ -106,7 +106,7 @@ RomInfo SNES::ReadRomHeader(uint32_t offset) { return romInfo; } -void SNES::Init(ROM& rom) { +void SNES::Init(Rom& rom) { // Perform a long jump into a FastROM bank (if the ROM speed is FastROM) // Disable the emulation flag (switch to 65816 native mode) cpu_.E = 0; diff --git a/src/app/emu/snes.h b/src/app/emu/snes.h index 74ff2b68..84ba8026 100644 --- a/src/app/emu/snes.h +++ b/src/app/emu/snes.h @@ -30,7 +30,7 @@ class SNES : public DirectMemoryAccess { RomInfo ReadRomHeader(uint32_t offset); // Initialization - void Init(ROM& rom); + void Init(Rom& rom); // Main emulation loop void Run(); @@ -72,7 +72,7 @@ class SNES : public DirectMemoryAccess { return static_cast(cpu_mode_); } - void SetupMemory(ROM& rom) { + void SetupMemory(Rom& rom) { // Setup observers for the memory space memory_.AddObserver(&apu_); memory_.AddObserver(&ppu_); diff --git a/src/app/gfx/compression.cc b/src/app/gfx/compression.cc index 0891428e..aaeab86e 100644 --- a/src/app/gfx/compression.cc +++ b/src/app/gfx/compression.cc @@ -474,7 +474,7 @@ Bytes CreateCompressionString(CompressionPiecePointer& start, int mode) { absl::Status ValidateCompressionResult(CompressionPiecePointer& chain_head, int mode, int start, int src_data_pos) { if (chain_head->next != nullptr) { - ROM temp_rom; + Rom temp_rom; RETURN_IF_ERROR( temp_rom.LoadFromBytes(CreateCompressionString(chain_head->next, mode))) ASSIGN_OR_RETURN(auto decomp_data, @@ -1173,7 +1173,7 @@ void AddCompressionToChain(CompressionContext& context) { absl::Status ValidateCompressionResultV3(const CompressionContext& context) { if (!context.compressed_data.empty()) { - ROM temp_rom; + Rom temp_rom; RETURN_IF_ERROR(temp_rom.LoadFromBytes(context.compressed_data)); ASSIGN_OR_RETURN(auto decomp_data, DecompressV2(temp_rom.data(), 0, temp_rom.size())) diff --git a/src/app/gui/pipeline.cc b/src/app/gui/pipeline.cc index ad7144be..5ea218d0 100644 --- a/src/app/gui/pipeline.cc +++ b/src/app/gui/pipeline.cc @@ -159,7 +159,7 @@ void BitmapCanvasPipeline(gui::Canvas& canvas, const gfx::Bitmap& bitmap, } void BuildAndRenderBitmapPipeline(int width, int height, int depth, Bytes data, - ROM& z3_rom, gfx::Bitmap& bitmap, + Rom& z3_rom, gfx::Bitmap& bitmap, gfx::SnesPalette& palette) { bitmap.Create(width, height, depth, data); bitmap.ApplyPalette(palette); diff --git a/src/app/gui/pipeline.h b/src/app/gui/pipeline.h index ac33de13..f095d162 100644 --- a/src/app/gui/pipeline.h +++ b/src/app/gui/pipeline.h @@ -39,7 +39,7 @@ void GraphicsManagerCanvasPipeline(int width, int height, int tile_size, const gfx::BitmapManager& graphics_manager); void BuildAndRenderBitmapPipeline(int width, int height, int depth, Bytes data, - ROM& z3_rom, gfx::Bitmap& bitmap, + Rom& z3_rom, gfx::Bitmap& bitmap, gfx::SnesPalette& palette); void FileDialogPipeline(absl::string_view display_key, diff --git a/src/app/rom.cc b/src/app/rom.cc index 727aba85..cdcad79a 100644 --- a/src/app/rom.cc +++ b/src/app/rom.cc @@ -192,7 +192,7 @@ absl::Status LoadOverworldMiniMapPalettes( } } // namespace palette_group_internal -absl::StatusOr ROM::Load2BppGraphics() { +absl::StatusOr Rom::Load2BppGraphics() { Bytes sheet; const uint8_t sheets[] = {113, 114, 218, 219, 220, 221}; @@ -208,7 +208,7 @@ absl::StatusOr ROM::Load2BppGraphics() { return sheet; } -absl::Status ROM::LoadLinkGraphics() { +absl::Status Rom::LoadLinkGraphics() { const auto link_gfx_offset = 0x80000; // $10:8000 const auto link_gfx_length = 0x800; // 0x4000 or 0x7000? link_palette_ = palette_groups_.armors[0]; @@ -233,7 +233,7 @@ absl::Status ROM::LoadLinkGraphics() { return absl::OkStatus(); } -absl::Status ROM::LoadAllGraphicsData() { +absl::Status Rom::LoadAllGraphicsData() { constexpr uint32_t kNumGfxSheets = 223; Bytes sheet; bool bpp3 = false; @@ -291,7 +291,7 @@ absl::Status ROM::LoadAllGraphicsData() { using namespace palette_group_internal; -absl::Status ROM::LoadAllPalettes() { +absl::Status Rom::LoadAllPalettes() { RETURN_IF_ERROR(LoadOverworldMainPalettes(rom_data_, palette_groups_)) RETURN_IF_ERROR(LoadOverworldAuxiliaryPalettes(rom_data_, palette_groups_)) RETURN_IF_ERROR(LoadOverworldAnimatedPalettes(rom_data_, palette_groups_)) @@ -310,7 +310,7 @@ absl::Status ROM::LoadAllPalettes() { return absl::OkStatus(); } -absl::Status ROM::LoadFromFile(const absl::string_view& filename, +absl::Status Rom::LoadFromFile(const absl::string_view& filename, bool z3_load) { // Set filename filename_ = filename; @@ -375,7 +375,7 @@ absl::Status ROM::LoadFromFile(const absl::string_view& filename, return absl::OkStatus(); } -absl::Status ROM::LoadFromPointer(uchar* data, size_t length) { +absl::Status Rom::LoadFromPointer(uchar* data, size_t length) { if (!data) return absl::InvalidArgumentError( "Could not load ROM: parameter `data` is empty."); @@ -385,7 +385,7 @@ absl::Status ROM::LoadFromPointer(uchar* data, size_t length) { return absl::OkStatus(); } -absl::Status ROM::LoadFromBytes(const Bytes& data) { +absl::Status Rom::LoadFromBytes(const Bytes& data) { if (data.empty()) { return absl::InvalidArgumentError( "Could not load ROM: parameter `data` is empty."); @@ -396,7 +396,7 @@ absl::Status ROM::LoadFromBytes(const Bytes& data) { return absl::OkStatus(); } -absl::Status ROM::SaveToFile(bool backup, bool save_new, std::string filename) { +absl::Status Rom::SaveToFile(bool backup, bool save_new, std::string filename) { absl::Status non_firing_status; if (rom_data_.empty()) { return absl::InternalError("ROM data is empty."); @@ -491,7 +491,7 @@ absl::Status ROM::SaveToFile(bool backup, bool save_new, std::string filename) { return absl::OkStatus(); } -absl::Status ROM::SavePalette(int index, const std::string& group_name, +absl::Status Rom::SavePalette(int index, const std::string& group_name, gfx::SnesPalette& palette) { // Iterate through all colors in the palette for (size_t j = 0; j < palette.size(); ++j) { @@ -506,7 +506,7 @@ absl::Status ROM::SavePalette(int index, const std::string& group_name, return absl::OkStatus(); } -absl::Status ROM::SaveAllPalettes() { +absl::Status Rom::SaveAllPalettes() { palette_groups_.for_each([&](gfx::PaletteGroup& group) { for (size_t i = 0; i < group.size(); ++i) { SavePalette(i, group.name(), *group.mutable_palette(i)); @@ -516,7 +516,7 @@ absl::Status ROM::SaveAllPalettes() { return absl::OkStatus(); } -std::shared_ptr SharedROM::shared_rom_ = nullptr; +std::shared_ptr SharedROM::shared_rom_ = nullptr; } // namespace app } // namespace yaze \ No newline at end of file diff --git a/src/app/rom.h b/src/app/rom.h index b419b5c6..d9968770 100644 --- a/src/app/rom.h +++ b/src/app/rom.h @@ -127,7 +127,7 @@ constexpr uint32_t kGfxGroupsPointer = 0x6237; /** * @brief The ROM class is used to load, save, and modify ROM data. */ -class ROM : public core::ExperimentFlags { +class Rom : public core::ExperimentFlags { public: /** * @brief Loads 2bpp graphics from ROM data. @@ -683,23 +683,23 @@ class SharedROM { SharedROM() = default; virtual ~SharedROM() = default; - std::shared_ptr shared_rom() { + std::shared_ptr shared_rom() { if (!shared_rom_) { - shared_rom_ = std::make_shared(); + shared_rom_ = std::make_shared(); } return shared_rom_; } auto rom() { if (!shared_rom_) { - shared_rom_ = std::make_shared(); + shared_rom_ = std::make_shared(); } - ROM* rom = shared_rom_.get(); + Rom* rom = shared_rom_.get(); return rom; } // private: - static std::shared_ptr shared_rom_; + static std::shared_ptr shared_rom_; }; } // namespace app diff --git a/src/app/zelda3/dungeon/room_entrance.h b/src/app/zelda3/dungeon/room_entrance.h index 4d432526..0819dd88 100644 --- a/src/app/zelda3/dungeon/room_entrance.h +++ b/src/app/zelda3/dungeon/room_entrance.h @@ -103,7 +103,7 @@ class RoomEntrance { public: RoomEntrance() = default; - RoomEntrance(ROM& rom, uint8_t entrance_id, bool is_spawn_point = false) + RoomEntrance(Rom& rom, uint8_t entrance_id, bool is_spawn_point = false) : entrance_id_(entrance_id) { room_ = static_cast((rom[entrance_room + (entrance_id * 2) + 1] << 8) + @@ -209,7 +209,7 @@ class RoomEntrance { } } - void Save(ROM& rom, int entrance_id, bool is_spawn_point = false) { + void Save(Rom& rom, int entrance_id, bool is_spawn_point = false) { if (!is_spawn_point) { rom.WriteShort(entrance_room + (entrance_id * 2), room_); rom.WriteShort(entrance_yposition + (entrance_id * 2), y_position_); diff --git a/src/app/zelda3/music/tracker.cc b/src/app/zelda3/music/tracker.cc index db5d2905..ff824339 100644 --- a/src/app/zelda3/music/tracker.cc +++ b/src/app/zelda3/music/tracker.cc @@ -64,7 +64,7 @@ SongSPCBlock *Tracker::AllocSPCBlock(int len, int bank) { // ============================================================================= -unsigned char *Tracker::GetSPCAddr(ROM &rom, unsigned short addr, short bank) { +unsigned char *Tracker::GetSPCAddr(Rom &rom, unsigned short addr, short bank) { unsigned char *rom_ptr; unsigned short a; unsigned short b; @@ -126,7 +126,7 @@ short Tracker::AllocSPCCommand() { // ============================================================================= -short Tracker::GetBlockTime(ROM &rom, short num, short prevtime) { +short Tracker::GetBlockTime(Rom &rom, short num, short prevtime) { SPCCommand *spc_command = current_spc_command_; SPCCommand *spc_command2; @@ -220,7 +220,7 @@ short Tracker::GetBlockTime(ROM &rom, short num, short prevtime) { // ============================================================================= -short Tracker::LoadSPCCommand(ROM &rom, unsigned short addr, short bank, +short Tracker::LoadSPCCommand(Rom &rom, unsigned short addr, short bank, int t) { int b = 0; int c = 0; @@ -391,7 +391,7 @@ short Tracker::LoadSPCCommand(ROM &rom, unsigned short addr, short bank, // ============================================================================= -void Tracker::LoadSongs(ROM &rom) { +void Tracker::LoadSongs(Rom &rom) { unsigned char *b; unsigned char *c; unsigned char *d; @@ -661,7 +661,7 @@ void Tracker::LoadSongs(ROM &rom) { w_modf = 0; } -short Tracker::SaveSPCCommand(ROM &rom, short num, short songtime, +short Tracker::SaveSPCCommand(Rom &rom, short num, short songtime, short endtr) { SPCCommand *spc_command = current_spc_command_; SPCCommand *spc_command2; @@ -784,7 +784,7 @@ short Tracker::SaveSPCCommand(ROM &rom, short num, short songtime, // ============================================================================= -int Tracker::WriteSPCData(ROM &rom, void *buf, int len, int addr, int spc, +int Tracker::WriteSPCData(Rom &rom, void *buf, int len, int addr, int spc, int limit) { unsigned char *rom_data = rom.data(); @@ -814,7 +814,7 @@ int Tracker::WriteSPCData(ROM &rom, void *buf, int len, int addr, int spc, // ============================================================================= -void Tracker::SaveSongs(ROM &rom) { +void Tracker::SaveSongs(Rom &rom) { int i; int j; int k; @@ -1264,7 +1264,7 @@ void Tracker::SaveSongs(ROM &rom) { // ============================================================================= -void Tracker::EditTrack(ROM &rom, short i) { +void Tracker::EditTrack(Rom &rom, short i) { int j, k, l; SongRange *sr = song_range_; SPCCommand *spc_command; @@ -1314,7 +1314,7 @@ void Tracker::EditTrack(ROM &rom, short i) { // CRITICAL_SECTION cs_song; // ============================================================================= -void Tracker::NewSR(ROM &rom, int bank) { +void Tracker::NewSR(Rom &rom, int bank) { SPCCommand *spc_command; SongRange *sr; diff --git a/src/app/zelda3/music/tracker.h b/src/app/zelda3/music/tracker.h index 640d4b02..dd66d49c 100644 --- a/src/app/zelda3/music/tracker.h +++ b/src/app/zelda3/music/tracker.h @@ -17,7 +17,7 @@ namespace yaze { namespace app { namespace zelda3 { - + /** * @namespace yaze::app::zelda3::music * @brief Contains classes and functions for handling music data in Zelda 3. @@ -176,24 +176,24 @@ class Tracker { public: SongSPCBlock *AllocSPCBlock(int len, int bank); - unsigned char *GetSPCAddr(ROM &rom, unsigned short addr, short bank); + unsigned char *GetSPCAddr(Rom &rom, unsigned short addr, short bank); short AllocSPCCommand(); - short GetBlockTime(ROM &rom, short num, short prevtime); + short GetBlockTime(Rom &rom, short num, short prevtime); - short SaveSPCCommand(ROM &rom, short num, short songtime, short endtr); - short LoadSPCCommand(ROM &rom, unsigned short addr, short bank, int t); + short SaveSPCCommand(Rom &rom, short num, short songtime, short endtr); + short LoadSPCCommand(Rom &rom, unsigned short addr, short bank, int t); - void SaveSongs(ROM &rom); + void SaveSongs(Rom &rom); - void LoadSongs(ROM &rom); + void LoadSongs(Rom &rom); - int WriteSPCData(ROM &rom, void *buf, int len, int addr, int spc, int limit); + int WriteSPCData(Rom &rom, void *buf, int len, int addr, int spc, int limit); - void EditTrack(ROM &rom, short i); + void EditTrack(Rom &rom, short i); - void NewSR(ROM &rom, int bank); + void NewSR(Rom &rom, int bank); private: // A "modified" flag diff --git a/src/app/zelda3/overworld/overworld.cc b/src/app/zelda3/overworld/overworld.cc index 7a3d9c89..6bb106f4 100644 --- a/src/app/zelda3/overworld/overworld.cc +++ b/src/app/zelda3/overworld/overworld.cc @@ -80,7 +80,7 @@ absl::flat_hash_map parseFile(const std::string &filename) { } // namespace -absl::Status Overworld::Load(ROM &rom) { +absl::Status Overworld::Load(Rom &rom) { rom_ = rom; AssembleMap32Tiles(); @@ -527,7 +527,7 @@ absl::Status Overworld::LoadSpritesFromMap(int sprite_start, int sprite_count, // --------------------------------------------------------------------------- -absl::Status Overworld::Save(ROM &rom) { +absl::Status Overworld::Save(Rom &rom) { rom_ = rom; RETURN_IF_ERROR(SaveMap16Tiles()) @@ -1513,7 +1513,7 @@ absl::Status Overworld::DecompressProtoMapTiles(const std::string &filename) { return absl::OkStatus(); } -absl::Status Overworld::LoadPrototype(ROM &rom, +absl::Status Overworld::LoadPrototype(Rom &rom, const std::string &tilemap_filename) { rom_ = rom; diff --git a/src/app/zelda3/overworld/overworld.h b/src/app/zelda3/overworld/overworld.h index 6937efcc..5e3656fc 100644 --- a/src/app/zelda3/overworld/overworld.h +++ b/src/app/zelda3/overworld/overworld.h @@ -483,7 +483,7 @@ struct MapData { class Overworld : public SharedROM, public core::ExperimentFlags { public: OWBlockset &GetMapTiles(int world_type); - absl::Status Load(ROM &rom); + absl::Status Load(Rom &rom); absl::Status LoadOverworldMaps(); void LoadTileTypes(); void LoadEntrances(); @@ -494,7 +494,7 @@ class Overworld : public SharedROM, public core::ExperimentFlags { absl::Status LoadSpritesFromMap(int spriteStart, int spriteCount, int spriteIndex); - absl::Status Save(ROM &rom); + absl::Status Save(Rom &rom); absl::Status SaveOverworldMaps(); absl::Status SaveLargeMaps(); absl::Status SaveEntrances(); @@ -506,7 +506,7 @@ class Overworld : public SharedROM, public core::ExperimentFlags { absl::Status SaveMap32Tiles(); absl::Status SaveMapProperties(); - absl::Status LoadPrototype(ROM &rom_, const std::string &tilemap_filename); + absl::Status LoadPrototype(Rom &rom_, const std::string &tilemap_filename); void Destroy() { for (auto &map : overworld_maps_) { @@ -597,7 +597,7 @@ class Overworld : public SharedROM, public core::ExperimentFlags { int current_map_ = 0; uchar map_parent_[160]; - ROM rom_; + Rom rom_; OWMapTiles map_tiles_; uint8_t all_tiles_types_[0x200]; diff --git a/src/app/zelda3/overworld/overworld_map.cc b/src/app/zelda3/overworld/overworld_map.cc index 199aec84..42d1c3ae 100644 --- a/src/app/zelda3/overworld/overworld_map.cc +++ b/src/app/zelda3/overworld/overworld_map.cc @@ -20,7 +20,7 @@ namespace app { namespace zelda3 { namespace overworld { -OverworldMap::OverworldMap(int index, ROM& rom, +OverworldMap::OverworldMap(int index, Rom& rom, std::vector& tiles16) : parent_(index), index_(index), rom_(rom), tiles16_(tiles16) { LoadAreaInfo(); @@ -230,7 +230,7 @@ void OverworldMap::LoadAreaGraphics() { namespace palette_internal { -absl::Status SetColorsPalette(ROM& rom, int index, gfx::SnesPalette& current, +absl::Status SetColorsPalette(Rom& rom, int index, gfx::SnesPalette& current, gfx::SnesPalette main, gfx::SnesPalette animated, gfx::SnesPalette aux1, gfx::SnesPalette aux2, gfx::SnesPalette hud, gfx::SnesColor bgrcolor, diff --git a/src/app/zelda3/overworld/overworld_map.h b/src/app/zelda3/overworld/overworld_map.h index 85d3109c..f3c47a28 100644 --- a/src/app/zelda3/overworld/overworld_map.h +++ b/src/app/zelda3/overworld/overworld_map.h @@ -30,7 +30,7 @@ static constexpr int kTileOffsets[] = {0, 8, 4096, 4104}; class OverworldMap : public editor::context::GfxContext { public: OverworldMap() = default; - OverworldMap(int index, ROM& rom, std::vector& tiles16); + OverworldMap(int index, Rom& rom, std::vector& tiles16); absl::Status BuildMap(int count, int game_state, int world, OWBlockset& world_blockset); @@ -134,7 +134,7 @@ class OverworldMap : public editor::context::GfxContext { uchar area_music_[4]; uchar static_graphics_[16]; - ROM rom_; + Rom rom_; Bytes all_gfx_; Bytes current_blockset_; Bytes current_gfx_; diff --git a/src/app/zelda3/screen/title_screen.h b/src/app/zelda3/screen/title_screen.h index fb618fea..17c4f1ae 100644 --- a/src/app/zelda3/screen/title_screen.h +++ b/src/app/zelda3/screen/title_screen.h @@ -63,7 +63,7 @@ class TitleScreen { bool mouseDown = false; bool mdown = false; - ROM rom_; + Rom rom_; gfx::OamTile oam_data[10]; gfx::OamTile selected_oam_tile; diff --git a/src/cli/command_handler.cc b/src/cli/command_handler.cc index 91ef70a3..6b604c38 100644 --- a/src/cli/command_handler.cc +++ b/src/cli/command_handler.cc @@ -18,7 +18,7 @@ absl::Status Tile16Transfer::handle(const std::vector& arg_vec) { RETURN_IF_ERROR(rom_.LoadFromFile(arg_vec[0])) // Load the destination rom - ROM dest_rom; + Rom dest_rom; RETURN_IF_ERROR(dest_rom.LoadFromFile(arg_vec[1])) std::vector tileIDs; diff --git a/src/cli/command_handler.h b/src/cli/command_handler.h index d4fcc507..31ab98d8 100644 --- a/src/cli/command_handler.h +++ b/src/cli/command_handler.h @@ -60,7 +60,7 @@ class CommandHandler { virtual ~CommandHandler() = default; virtual absl::Status handle(const std::vector& arg_vec) = 0; - app::ROM rom_; + app::Rom rom_; }; class ApplyPatch : public CommandHandler { diff --git a/test/gfx/compression_test.cc b/test/gfx/compression_test.cc index 50a2cfa3..2056cd65 100644 --- a/test/gfx/compression_test.cc +++ b/test/gfx/compression_test.cc @@ -13,7 +13,7 @@ namespace yaze_test { namespace gfx_test { -using yaze::app::ROM; +using yaze::app::Rom; using yaze::app::gfx::lc_lz2::CompressionContext; using yaze::app::gfx::lc_lz2::CompressionPiece; using yaze::app::gfx::lc_lz2::CompressV2; @@ -32,7 +32,7 @@ using ::testing::TypedEq; namespace { -Bytes ExpectCompressOk(ROM& rom, uchar* in, int in_size) { +Bytes ExpectCompressOk(Rom& rom, uchar* in, int in_size) { auto load_status = rom.LoadFromPointer(in, in_size); EXPECT_TRUE(load_status.ok()); auto compression_status = CompressV3(rom.vector(), 0, in_size); @@ -41,7 +41,7 @@ Bytes ExpectCompressOk(ROM& rom, uchar* in, int in_size) { return compressed_bytes; } -Bytes ExpectDecompressBytesOk(ROM& rom, Bytes& in) { +Bytes ExpectDecompressBytesOk(Rom& rom, Bytes& in) { auto load_status = rom.LoadFromBytes(in); EXPECT_TRUE(load_status.ok()); auto decompression_status = DecompressV2(rom.data(), 0, in.size()); @@ -50,7 +50,7 @@ Bytes ExpectDecompressBytesOk(ROM& rom, Bytes& in) { return decompressed_bytes; } -Bytes ExpectDecompressOk(ROM& rom, uchar* in, int in_size) { +Bytes ExpectDecompressOk(Rom& rom, uchar* in, int in_size) { auto load_status = rom.LoadFromPointer(in, in_size); EXPECT_TRUE(load_status.ok()); auto decompression_status = DecompressV2(rom.data(), 0, in_size); @@ -130,7 +130,7 @@ TEST(LC_LZ2_CompressionTest, RepeatedBytesBeforeUncompressableRepeated) { } TEST(LC_LZ2_CompressionTest, CompressionDecompressionEmptyData) { - ROM rom; + Rom rom; uchar empty_input[0] = {}; auto comp_result = ExpectCompressOk(rom, empty_input, 0); EXPECT_EQ(0, comp_result.size()); @@ -164,7 +164,7 @@ TEST(LC_LZ2_CompressionTest, NewDecompressionPieceOk) { // TODO: Check why header built is off by one // 0x25 instead of 0x24 TEST(LC_LZ2_CompressionTest, CompressionSingleSet) { - ROM rom; + Rom rom; uchar single_set[5] = {0x2A, 0x2A, 0x2A, 0x2A, 0x2A}; uchar single_set_expected[3] = {BUILD_HEADER(1, 5), 0x2A, 0xFF}; @@ -173,7 +173,7 @@ TEST(LC_LZ2_CompressionTest, CompressionSingleSet) { } TEST(LC_LZ2_CompressionTest, CompressionSingleWord) { - ROM rom; + Rom rom; uchar single_word[6] = {0x2A, 0x01, 0x2A, 0x01, 0x2A, 0x01}; uchar single_word_expected[4] = {BUILD_HEADER(0x02, 0x06), 0x2A, 0x01, 0xFF}; @@ -182,7 +182,7 @@ TEST(LC_LZ2_CompressionTest, CompressionSingleWord) { } TEST(LC_LZ2_CompressionTest, CompressionSingleIncrement) { - ROM rom; + Rom rom; uchar single_inc[3] = {0x01, 0x02, 0x03}; uchar single_inc_expected[3] = {BUILD_HEADER(0x03, 0x03), 0x01, 0xFF}; auto comp_result = ExpectCompressOk(rom, single_inc, 3); @@ -190,7 +190,7 @@ TEST(LC_LZ2_CompressionTest, CompressionSingleIncrement) { } TEST(LC_LZ2_CompressionTest, CompressionSingleCopy) { - ROM rom; + Rom rom; uchar single_copy[4] = {0x03, 0x0A, 0x07, 0x14}; uchar single_copy_expected[6] = { BUILD_HEADER(0x00, 0x04), 0x03, 0x0A, 0x07, 0x14, 0xFF}; @@ -404,7 +404,7 @@ TEST(CheckIncByteV3Test, NotAnIncreasingSequence) { } TEST(LC_LZ2_CompressionTest, DecompressionValidCommand) { - ROM rom; + Rom rom; Bytes simple_copy_input = {BUILD_HEADER(0x00, 0x02), 0x2A, 0x45, 0xFF}; uchar simple_copy_output[2] = {0x2A, 0x45}; auto decomp_result = ExpectDecompressBytesOk(rom, simple_copy_input); @@ -412,7 +412,7 @@ TEST(LC_LZ2_CompressionTest, DecompressionValidCommand) { } TEST(LC_LZ2_CompressionTest, DecompressionMixingCommand) { - ROM rom; + Rom rom; uchar random1_i[11] = {BUILD_HEADER(0x01, 0x03), 0x2A, BUILD_HEADER(0x00, 0x04), diff --git a/test/zelda3/room_object_test.cc b/test/zelda3/room_object_test.cc index d9416d26..b63aefd1 100644 --- a/test/zelda3/room_object_test.cc +++ b/test/zelda3/room_object_test.cc @@ -13,11 +13,11 @@ namespace yaze_test { namespace zelda3_test { -using yaze::app::ROM; +using yaze::app::Rom; using yaze::app::zelda3::dungeon::DungeonObjectRenderer; TEST(DungeonObjectTest, RenderObjectsAsBitmaps) { - ROM rom; + Rom rom; // rom.LoadFromFile("/Users/scawful/Code/yaze/build/bin/zelda3.sfc")); // EXPECT_EQ(rom_status, absl::Status::ok());