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

fixes and readability

Browse Source
This commit is contained in:
scawful
2024-02-01 00:24:03 -05:00
parent d7b75fd7f6
commit 8d2cd60b5f
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -511,7 +511,7 @@ absl::Status Overworld::LoadSpritesFromMap(int sprite_start, int sprite_count,
int realX = ((b2 & 0x3F) * 16) + mapX * 512;
int realY = ((b1 & 0x3F) * 16) + mapY * 512;
all_sprites_[sprite_index].emplace_back(
overworld_maps_[i].AreaGraphics(), (uint8_t)i, b3,
overworld_maps_[i].current_graphics(), (uint8_t)i, b3,
(uint8_t)(b2 & 0x3F), (uint8_t)(b1 & 0x3F), realX, realY);
// all_sprites_[sprite_index][i].Draw();

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

@@ -517,21 +517,21 @@ class Overworld : public SharedROM, public core::ExperimentFlags {
auto Sprites(int state) const { return all_sprites_[state]; }
auto mutable_sprites(int state) { return &all_sprites_[state]; }
auto AreaGraphics() const {
return overworld_maps_[current_map_].AreaGraphics();
return overworld_maps_[current_map_].current_graphics();
}
auto &Entrances() { return all_entrances_; }
auto mutable_entrances() { return &all_entrances_; }
auto &holes() { return all_holes_; }
auto mutable_holes() { return &all_holes_; }
auto AreaPalette() const {
return overworld_maps_[current_map_].AreaPalette();
return overworld_maps_[current_map_].current_palette();
}
auto AreaPaletteById(int id) const {
return overworld_maps_[id].AreaPalette();
return overworld_maps_[id].current_palette();
}
auto BitmapData() const { return overworld_maps_[current_map_].BitmapData(); }
auto BitmapData() const { return overworld_maps_[current_map_].bitmap_data(); }
auto Tile16Blockset() const {
return overworld_maps_[current_map_].Tile16Blockset();
return overworld_maps_[current_map_].current_tile16_blockset();
}
auto is_loaded() const { return is_loaded_; }
void set_current_map(int i) { current_map_ = i; }

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

@@ -41,13 +41,12 @@ class OverworldMap : public GfxContext {
void DrawAnimatedTiles();
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 current_tile16_blockset() const { return current_blockset_; }
auto current_graphics() const { return current_gfx_; }
auto current_palette() const { return current_palette_; }
auto bitmap_data() const { return bitmap_data_; }
auto is_large_map() const { return large_map_; }
auto IsInitialized() const { return initialized_; }
auto is_initialized() const { return initialized_; }
auto parent() const { return parent_; }
auto mutable_current_palette() { return &current_palette_; }
@@ -59,6 +58,7 @@ class OverworldMap : public GfxContext {
auto message_id() const { return message_id_; }
auto area_music(int i) const { return area_music_[i]; }
auto static_graphics(int i) const { return static_graphics_[i]; }
auto large_index() const { return large_index_; }
auto mutable_area_graphics() { return &area_graphics_; }
auto mutable_area_palette() { return &area_palette_; }
@@ -76,8 +76,6 @@ class OverworldMap : public GfxContext {
auto set_sprite_palette(int i, uint8_t value) { sprite_palette_[i] = value; }
auto set_message_id(uint16_t value) { message_id_ = value; }
auto large_index() const { return large_index_; }
void SetAsLargeMap(int parent_index, int quadrant) {
parent_ = parent_index;
large_index_ = quadrant;