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

Update Overworld save function class visibility for MasterEditor

Browse Source
This commit is contained in:
scawful
2024-01-26 21:52:01 -05:00
parent cb1bca5f64
commit 28f6056b2f
5 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,14 +130,14 @@ class OverworldExit {
}
// Overworld overworld
void UpdateMapProperties(uchar map_id) {
void UpdateMapProperties(uchar map_id, bool large_map = false) {
map_id_ = map_id;
int large = 256;
int mapid = map_id;
if (map_id < 128) {
// large = overworld.overworld_map(map_id)->IsLargeMap() ? 768 : 256;
large = large_map ? 768 : 256;
// if (overworld.overworld_map(map_id)->Parent() != map_id) {
// mapid = overworld.overworld_map(map_id)->Parent();
// }
@@ -365,6 +365,7 @@ class Overworld : public SharedROM, public core::ExperimentFlags {
auto mutable_overworld_map(int i) { return &overworld_maps_[i]; }
auto exits() const { return &all_exits_; }
auto mutable_exits() { return &all_exits_; }
std::vector<gfx::Tile16> tiles16() const { return tiles16_; }
auto Sprites(int state) const { return all_sprites_[state]; }
auto AreaGraphics() const {
@@ -421,7 +422,7 @@ class Overworld : public SharedROM, public core::ExperimentFlags {
ROM rom_;
OWMapTiles map_tiles_;
std::vector<gfx::Tile16> tiles16;
std::vector<gfx::Tile16> tiles16_;
std::vector<gfx::Tile32> tiles32;
std::vector<gfx::Tile32> tiles32_unique_;
std::vector<OverworldMap> overworld_maps_;