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

Enhance Overworld Editor and Map Properties System

Browse Source 
- Updated the DrawOverworldEntrancePopup to include new options for deleting entrances and improved UI labels for better clarity.
- Integrated new UI constants for consistent styling across the editor.
- Refactored MapPropertiesSystem to support additional toolset functionalities, including editing tools and view controls.
- Improved overlay handling in OverworldMap, consolidating vanilla and custom overlay loading logic.
- Enhanced user interaction with new buttons and streamlined layout for better usability in the editor.
This commit is contained in:
scawful
2025-09-24 21:10:37 -04:00
parent 8b669c4553
commit e8afc764a0
9 changed files with 567 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ absl::Status OverworldMap::BuildMap(int count, int game_state, int world,
RETURN_IF_ERROR(BuildTileset())
RETURN_IF_ERROR(BuildTiles16Gfx(tiles16, count))
RETURN_IF_ERROR(LoadPalette());
RETURN_IF_ERROR(LoadVanillaOverlay());
RETURN_IF_ERROR(LoadOverlay());
RETURN_IF_ERROR(BuildBitmap(world_blockset))
built_ = true;
return absl::OkStatus();
@@ -825,18 +825,25 @@ absl::Status OverworldMap::LoadPalette() {
return absl::OkStatus();
}
absl::Status OverworldMap::LoadVanillaOverlay() {
absl::Status OverworldMap::LoadOverlay() {
uint8_t asm_version = (*rom_)[OverworldCustomASMHasBeenApplied];
// Only load vanilla overlays if this is a vanilla ROM (asm_version == 0xFF)
if (asm_version != 0xFF) {
has_vanilla_overlay_ = false;
vanilla_overlay_id_ = 0;
vanilla_overlay_data_.clear();
// Load overlays based on ROM version
if (asm_version == 0xFF) {
// Vanilla ROM - load overlay from overlay pointers
return LoadVanillaOverlayData();
} else {
// Custom overworld ROM - use overlay from custom data
overlay_id_ = subscreen_overlay_;
has_overlay_ = (overlay_id_ != 0x00FF);
overlay_data_.clear();
return absl::OkStatus();
}
}
absl::Status OverworldMap::LoadVanillaOverlayData() {
// Load vanilla overlay for this map
// Load vanilla overlay for this map (interactive overlays for revealing holes/changing elements)
int address = (kOverlayPointersBank << 16) +
((*rom_)[kOverlayPointers + (index_ * 2) + 1] << 8) +
(*rom_)[kOverlayPointers + (index_ * 2)];
@@ -855,26 +862,26 @@ absl::Status OverworldMap::LoadVanillaOverlay() {
// Validate address
if (address >= rom_->size()) {
has_vanilla_overlay_ = false;
vanilla_overlay_id_ = 0;
vanilla_overlay_data_.clear();
has_overlay_ = false;
overlay_id_ = 0;
overlay_data_.clear();
return absl::OkStatus();
}
// Parse overlay data
vanilla_overlay_data_.clear();
// Parse overlay data (interactive overlays)
overlay_data_.clear();
uint8_t b = (*rom_)[address];
// Parse overlay commands until we hit END (0x60)
while (b != 0x60 && address < rom_->size()) {
vanilla_overlay_data_.push_back(b);
overlay_data_.push_back(b);
// Handle different overlay commands
switch (b) {
case 0xA9: // LDA #$
if (address + 2 < rom_->size()) {
vanilla_overlay_data_.push_back((*rom_)[address + 1]);
vanilla_overlay_data_.push_back((*rom_)[address + 2]);
overlay_data_.push_back((*rom_)[address + 1]);
overlay_data_.push_back((*rom_)[address + 2]);
address += 3;
} else {
address++;
@@ -882,8 +889,8 @@ absl::Status OverworldMap::LoadVanillaOverlay() {
break;
case 0xA2: // LDX #$
if (address + 2 < rom_->size()) {
vanilla_overlay_data_.push_back((*rom_)[address + 1]);
vanilla_overlay_data_.push_back((*rom_)[address + 2]);
overlay_data_.push_back((*rom_)[address + 1]);
overlay_data_.push_back((*rom_)[address + 2]);
address += 3;
} else {
address++;
@@ -891,9 +898,9 @@ absl::Status OverworldMap::LoadVanillaOverlay() {
break;
case 0x8D: // STA $xxxx
if (address + 3 < rom_->size()) {
vanilla_overlay_data_.push_back((*rom_)[address + 1]);
vanilla_overlay_data_.push_back((*rom_)[address + 2]);
vanilla_overlay_data_.push_back((*rom_)[address + 3]);
overlay_data_.push_back((*rom_)[address + 1]);
overlay_data_.push_back((*rom_)[address + 2]);
overlay_data_.push_back((*rom_)[address + 3]);
address += 4;
} else {
address++;
@@ -901,9 +908,9 @@ absl::Status OverworldMap::LoadVanillaOverlay() {
break;
case 0x9D: // STA $xxxx,x
if (address + 3 < rom_->size()) {
vanilla_overlay_data_.push_back((*rom_)[address + 1]);
vanilla_overlay_data_.push_back((*rom_)[address + 2]);
vanilla_overlay_data_.push_back((*rom_)[address + 3]);
overlay_data_.push_back((*rom_)[address + 1]);
overlay_data_.push_back((*rom_)[address + 2]);
overlay_data_.push_back((*rom_)[address + 3]);
address += 4;
} else {
address++;
@@ -911,10 +918,10 @@ absl::Status OverworldMap::LoadVanillaOverlay() {
break;
case 0x8F: // STA $xxxxxx
if (address + 4 < rom_->size()) {
vanilla_overlay_data_.push_back((*rom_)[address + 1]);
vanilla_overlay_data_.push_back((*rom_)[address + 2]);
vanilla_overlay_data_.push_back((*rom_)[address + 3]);
vanilla_overlay_data_.push_back((*rom_)[address + 4]);
overlay_data_.push_back((*rom_)[address + 1]);
overlay_data_.push_back((*rom_)[address + 2]);
overlay_data_.push_back((*rom_)[address + 3]);
overlay_data_.push_back((*rom_)[address + 4]);
address += 5;
} else {
address++;
@@ -925,9 +932,9 @@ absl::Status OverworldMap::LoadVanillaOverlay() {
break;
case 0x4C: // JMP
if (address + 3 < rom_->size()) {
vanilla_overlay_data_.push_back((*rom_)[address + 1]);
vanilla_overlay_data_.push_back((*rom_)[address + 2]);
vanilla_overlay_data_.push_back((*rom_)[address + 3]);
overlay_data_.push_back((*rom_)[address + 1]);
overlay_data_.push_back((*rom_)[address + 2]);
overlay_data_.push_back((*rom_)[address + 3]);
address += 4;
} else {
address++;
@@ -947,12 +954,12 @@ absl::Status OverworldMap::LoadVanillaOverlay() {
// Add the END command if we found it
if (b == 0x60) {
vanilla_overlay_data_.push_back(0x60);
overlay_data_.push_back(0x60);
}
// Set overlay ID based on map index (simplified)
vanilla_overlay_id_ = index_;
has_vanilla_overlay_ = !vanilla_overlay_data_.empty();
overlay_id_ = index_;
has_overlay_ = !overlay_data_.empty();
return absl::OkStatus();
}

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

@@ -105,7 +105,8 @@ class OverworldMap : public gfx::GfxContext {
void LoadAreaGraphics();
absl::Status LoadPalette();
absl::Status LoadVanillaOverlay();
absl::Status LoadOverlay();
absl::Status LoadVanillaOverlayData();
absl::Status BuildTileset();
absl::Status BuildTiles16Gfx(std::vector<gfx::Tile16>& tiles16, int count);
absl::Status BuildBitmap(OverworldBlockset& world_blockset);
@@ -148,10 +149,10 @@ class OverworldMap : public gfx::GfxContext {
auto custom_tileset(int index) const { return custom_gfx_ids_[index]; }
// Vanilla overlay accessors
auto vanilla_overlay_id() const { return vanilla_overlay_id_; }
auto has_vanilla_overlay() const { return has_vanilla_overlay_; }
const auto& vanilla_overlay_data() const { return vanilla_overlay_data_; }
// Overlay accessors (interactive overlays)
auto overlay_id() const { return overlay_id_; }
auto has_overlay() const { return has_overlay_; }
const auto& overlay_data() const { return overlay_data_; }
// Mosaic expanded accessors
const std::array<bool, 4>& mosaic_expanded() const { return mosaic_expanded_; }
@@ -233,9 +234,9 @@ class OverworldMap : public gfx::GfxContext {
static_graphics_.fill(0);
mosaic_expanded_.fill(false);
area_size_ = AreaSizeEnum::SmallArea;
vanilla_overlay_id_ = 0;
has_vanilla_overlay_ = false;
vanilla_overlay_data_.clear();
overlay_id_ = 0;
has_overlay_ = false;
overlay_data_.clear();
}
private:
@@ -287,10 +288,10 @@ class OverworldMap : public gfx::GfxContext {
std::array<bool, 4> mosaic_expanded_;
// Vanilla overlay support
uint16_t vanilla_overlay_id_ = 0;
bool has_vanilla_overlay_ = false;
std::vector<uint8_t> vanilla_overlay_data_;
// Overlay support (interactive overlays that reveal holes/change elements)
uint16_t overlay_id_ = 0;
bool has_overlay_ = false;
std::vector<uint8_t> overlay_data_;
std::vector<uint8_t> current_blockset_;
std::vector<uint8_t> current_gfx_;