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

Rename ROM class to Rom

Browse Source
This commit is contained in:
scawful
2024-04-14 14:47:17 -05:00
parent b06e22dc0d
commit 7e46cf1c64
23 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/zelda3/dungeon/room_entrance.h
View File

@@ -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<short>((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_);

18
src/app/zelda3/music/tracker.cc
View File

@@ -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;

20
src/app/zelda3/music/tracker.h
View File

@@ -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

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

@@ -80,7 +80,7 @@ absl::flat_hash_map<int, MapData> 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;

8
src/app/zelda3/overworld/overworld.h
View File

@@ -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];

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

@@ -20,7 +20,7 @@ namespace app {
namespace zelda3 {
namespace overworld {
OverworldMap::OverworldMap(int index, ROM& rom,
OverworldMap::OverworldMap(int index, Rom& rom,
std::vector<gfx::Tile16>& 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,

4
src/app/zelda3/overworld/overworld_map.h
View File

@@ -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<gfx::Tile16>& tiles16);
OverworldMap(int index, Rom& rom, std::vector<gfx::Tile16>& 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_;

2
src/app/zelda3/screen/title_screen.h
View File

@@ -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;