housekeeping
This commit is contained in:
@@ -495,8 +495,6 @@ absl::Status Overworld::LoadSpritesFromMap(int sprites_per_gamestate_ptr,
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
absl::Status Overworld::Save(Rom &rom) {
|
||||
rom_ = rom;
|
||||
if (expanded_tile16_) RETURN_IF_ERROR(SaveMap16Expanded())
|
||||
|
||||
@@ -256,7 +256,6 @@ class Overworld : public SharedRom {
|
||||
std::vector<OverworldItem> all_items_;
|
||||
std::vector<std::vector<Sprite>> all_sprites_;
|
||||
std::vector<uint64_t> deleted_entrances_;
|
||||
|
||||
std::vector<std::vector<uint8_t>> map_data_p1 =
|
||||
std::vector<std::vector<uint8_t>>(kNumOverworldMaps);
|
||||
std::vector<std::vector<uint8_t>> map_data_p2 =
|
||||
@@ -264,7 +263,6 @@ class Overworld : public SharedRom {
|
||||
|
||||
std::vector<int> map_pointers1_id = std::vector<int>(kNumOverworldMaps);
|
||||
std::vector<int> map_pointers2_id = std::vector<int>(kNumOverworldMaps);
|
||||
|
||||
std::vector<int> map_pointers1 = std::vector<int>(kNumOverworldMaps);
|
||||
std::vector<int> map_pointers2 = std::vector<int>(kNumOverworldMaps);
|
||||
|
||||
|
||||
@@ -336,8 +336,6 @@ void OverworldMap::SetupCustomTileset(uint8_t asm_version) {
|
||||
rom_[OverworldCustomSubscreenOverlayArray + (index_ * 2)];
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
|
||||
void OverworldMap::LoadMainBlocksetId() {
|
||||
if (parent_ < 0x40) {
|
||||
main_gfx_id_ = 0x20;
|
||||
|
||||
@@ -168,7 +168,6 @@ class OverworldMap : public gfx::GfxContext {
|
||||
bool built_ = false;
|
||||
bool large_map_ = false;
|
||||
bool initialized_ = false;
|
||||
|
||||
bool mosaic_ = false;
|
||||
|
||||
int index_ = 0; // Map index
|
||||
|
||||
@@ -36,7 +36,6 @@ static const std::string kOverlordNames[] = {
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
} // namespace yaze
|
||||
|
||||
#endif // YAZE_APP_ZELDA3_SPRITE_OVERLORD_H
|
||||
|
||||
@@ -912,5 +912,4 @@ void Sprite::DrawSpriteTile(int x, int y, int srcx, int srcy, int pal,
|
||||
}
|
||||
|
||||
} // namespace zelda3
|
||||
|
||||
} // namespace yaze
|
||||
|
||||
@@ -390,7 +390,6 @@ class Sprite : public GameEntity {
|
||||
};
|
||||
|
||||
} // namespace zelda3
|
||||
|
||||
} // namespace yaze
|
||||
|
||||
#endif
|
||||
|
||||
@@ -148,5 +148,4 @@ SpriteInstruction SpriteInstruction::JumpToFunction(
|
||||
}
|
||||
|
||||
} // namespace zelda3
|
||||
|
||||
} // namespace yaze
|
||||
|
||||
@@ -124,7 +124,6 @@ class SpriteBuilder {
|
||||
};
|
||||
|
||||
} // namespace zelda3
|
||||
|
||||
} // namespace yaze
|
||||
|
||||
#endif // YAZE_APP_ZELDA3_SPRITE_SPRITE_BUILDER_H_
|
||||
Reference in New Issue
Block a user