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

update dungeon header

Browse Source
This commit is contained in:
scawful
2025-01-06 15:55:44 -05:00
parent 9c7f78a228
commit 4c39f02224
3 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/zelda3/dungeon/room.cc
View File

@@ -27,13 +27,13 @@ void Room::LoadHeader() {
auto header_location = core::SnesToPc(address);
bg2_ = (z3_dungeon_room::background2)((rom()->data()[header_location] >> 5) &
bg2_ = (background2)((rom()->data()[header_location] >> 5) &
0x07);
collision_ = (CollisionKey)((rom()->data()[header_location] >> 2) & 0x07);
is_light_ = ((rom()->data()[header_location]) & 0x01) == 1;
if (is_light_) {
bg2_ = z3_dungeon_room::background2::DarkRoom;
bg2_ = background2::DarkRoom;
}
palette = ((rom()->data()[header_location + 1] & 0x3F));
@@ -374,7 +374,7 @@ void Room::LoadObjects() {
if (nbr_of_staircase < 4) {
tile_objects_.back().set_options(ObjectOption::Stairs |
tile_objects_.back().options());
z3_staircases_.push_back(z3_dungeon_room::staircase(
z3_staircases_.push_back(staircase(
posX, posY,
absl::StrCat("To ", staircase_rooms_[nbr_of_staircase])
.data()));
@@ -383,7 +383,7 @@ void Room::LoadObjects() {
tile_objects_.back().set_options(ObjectOption::Stairs |
tile_objects_.back().options());
z3_staircases_.push_back(
z3_dungeon_room::staircase(posX, posY, "To ???"));
staircase(posX, posY, "To ???"));
}
}
}
@@ -479,7 +479,7 @@ void Room::LoadChests() {
}
chests_in_room_.emplace_back(
z3_dungeon_room::chest_data(rom_data[cpos + (i * 3) + 2], big));
chest_data(rom_data[cpos + (i * 3) + 2], big));
}
}
}

18
src/app/zelda3/dungeon/room.h
View File

@@ -177,13 +177,13 @@ class Room : public SharedRom {
int64_t room_size_pointer_;
std::array<uint8_t, 16> blocks_;
std::array<z3_chest, 16> chest_list_;
std::array<chest, 16> chest_list_;
std::array<gfx::Bitmap, 3> background_bmps_;
std::vector<RoomObject> tile_objects_;
std::vector<zelda3::Sprite> sprites_;
std::vector<z3_dungeon_room::staircase> z3_staircases_;
std::vector<z3_dungeon_room::chest_data> chests_in_room_;
std::vector<staircase> z3_staircases_;
std::vector<chest_data> chests_in_room_;
LayerMergeType layer_merging_;
CollisionKey collision_;
@@ -191,12 +191,12 @@ class Room : public SharedRom {
TagKey tag1_;
TagKey tag2_;
z3_dungeon_room::background2 bg2_;
z3_dungeon_room::destination pits_;
z3_dungeon_room::destination stair1_;
z3_dungeon_room::destination stair2_;
z3_dungeon_room::destination stair3_;
z3_dungeon_room::destination stair4_;
background2 bg2_;
destination pits_;
destination stair1_;
destination stair2_;
destination stair3_;
destination stair4_;
};
constexpr std::string_view kRoomNames[] = {