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

naming refactor

Browse Source
This commit is contained in:
Justin Scofield
2022-09-10 21:48:49 -05:00
parent e4b802c3b0
commit 2c0bbd3457
6 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,18 +24,18 @@ class Overworld {
auto GetTiles16() const { return tiles16; }
auto GetOverworldMap(uint index) { return overworld_maps_[index]; }
auto GetOverworldMaps() const { return overworld_maps_; }
auto GetCurrentBlockset() const {
return overworld_maps_[current_map_].GetCurrentBlockset();
auto AreaGraphics() const {
return overworld_maps_[current_map_].AreaGraphics();
}
auto GetCurrentGraphics() const {
return overworld_maps_[current_map_].GetCurrentGraphics();
auto AreaPalette() const {
return overworld_maps_[current_map_].AreaPalette();
}
auto GetCurrentBitmapData() const {
return overworld_maps_[current_map_].GetBitmapData();
}
auto GetCurrentPalette() const {
return overworld_maps_[current_map_].GetCurrentPalette();
auto BitmapData() const { return overworld_maps_[current_map_].BitmapData(); }
auto Tile16Blockset() const {
return overworld_maps_[current_map_].Tile16Blockset();
}
auto isLoaded() const { return is_loaded_; }
void SetCurrentMap(int i) { current_map_ = i; }

3
src/app/zelda3/overworld_map.cc
View File

@@ -156,6 +156,7 @@ OverworldMap::OverworldMap(int index, ROM& rom,
absl::Status OverworldMap::BuildMap(int count, int game_state, int world,
uchar* map_parent,
OWBlockset& world_blockset) {
game_state_ = game_state;
world_ = world;
if (large_map_) {
parent_ = map_parent[index_];
@@ -496,7 +497,7 @@ absl::Status OverworldMap::BuildTiles16Gfx(int count) {
auto destination = xx + yy + offset + (mx + (my * 0x80));
current_blockset_[destination] =
current_gfx_[source] + (info.palette_ * 0x10);
(current_gfx_[source] & 0x0F) + (info.palette_ * 0x10);
}
}
}

11
src/app/zelda3/overworld_map.h
View File

@@ -28,14 +28,13 @@ class OverworldMap {
absl::Status BuildMap(int count, int game_state, int world, uchar* map_parent,
OWBlockset& world_blockset);
auto GetCurrentBlockset() const { return current_blockset_; }
auto GetCurrentGraphics() const { return current_gfx_; }
auto GetCurrentPalette() const { return current_palette_; }
auto GetBitmapData() const { return bitmap_data_; }
auto Tile16Blockset() const { return current_blockset_; }
auto AreaGraphics() const { return current_gfx_; }
auto AreaPalette() const { return current_palette_; }
auto BitmapData() const { return bitmap_data_; }
auto SetLargeMap(bool is_set) { large_map_ = is_set; }
auto IsLargeMap() const { return large_map_; }
auto IsInitialized() const { return initialized_; }
auto IsBuilt() const { return built_; }
private:
void LoadAreaInfo();
@@ -52,8 +51,6 @@ class OverworldMap {
int message_id_ = 0;
int area_graphics_ = 0;
int area_palette_ = 0;
// TODO SET ME
int game_state_ = 0;
uchar sprite_graphics_[3];