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

Dungeon Room load current graphics experiment

Browse Source
This commit is contained in:
Justin Scofield
2023-11-21 23:44:05 -05:00
parent 59e7dcc7f0
commit 7a842d4669
9 changed files with 249 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ void Room::LoadRoomGraphics(uchar entrance_blockset) {
current_gfx16_.reserve(0x4000);
for (int i = 0; i < 8; i++) {
blocks[i] = mainGfx[BackgroundTileset][i];
blocks_[i] = mainGfx[BackgroundTileset][i];
if (i >= 6 && i <= 6) {
// 3-6
if (entrance_blockset != 0xFF) {
@@ -151,27 +151,29 @@ void Room::LoadRoomGraphics(uchar entrance_blockset) {
// TODO: Find why this is wrong - Thats because of the stairs need to
// find a workaround
if (roomGfx[entrance_blockset][i - 3] != 0) {
blocks[i] = roomGfx[entrance_blockset][i - 3];
blocks_[i] = roomGfx[entrance_blockset][i - 3];
}
}
}
}
blocks[8] = 115 + 0; // Static Sprites Blocksets (fairy,pot,ect...)
blocks[9] = 115 + 10;
blocks[10] = 115 + 6;
blocks[11] = 115 + 7;
blocks_[8] = 115 + 0; // Static Sprites Blocksets (fairy,pot,ect...)
blocks_[9] = 115 + 10;
blocks_[10] = 115 + 6;
blocks_[11] = 115 + 7;
for (int i = 0; i < 4; i++) {
blocks[12 + i] = (uchar)(spriteGfx[SpriteTileset + 64][i] + 115);
blocks_[12 + i] = (uchar)(spriteGfx[SpriteTileset + 64][i] + 115);
} // 12-16 sprites
}
void Room::CopyRoomGraphicsToBuffer() {
auto gfx_buffer_data = rom()->graphics_buffer();
// Into "room gfx16" 16 of them
int sheetPos = 0;
for (int i = 0; i < 16; i++) {
int d = 0;
int ioff = blocks[i] * 2048;
int ioff = blocks_[i] * 2048;
while (d < 2048) {
uchar mapByte = gfx_buffer_data[d + ioff];
if (i < 4) {
@@ -189,8 +191,7 @@ void Room::LoadRoomGraphics(uchar entrance_blockset) {
}
void Room::LoadAnimatedGraphics() {
int gfx_ptr =
core::SnesToPc(rom()->version_constants().kGfxAnimatedPointer);
int gfx_ptr = core::SnesToPc(rom()->version_constants().kGfxAnimatedPointer);
auto gfx_buffer_data = rom()->graphics_buffer();
auto rom_data = rom()->vector();

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

@@ -117,6 +117,7 @@ class Room : public SharedROM {
~Room() = default;
void LoadHeader();
void LoadRoomGraphics(uchar entrance_blockset = 0xFF);
void CopyRoomGraphicsToBuffer();
void LoadAnimatedGraphics();
void LoadSprites();
@@ -125,6 +126,8 @@ class Room : public SharedROM {
void LoadRoomFromROM();
auto blocks() const { return blocks_; }
RoomObject AddObject(short oid, uint8_t x, uint8_t y, uint8_t size,
uint8_t layer) {
return RoomObject(oid, x, y, size, layer);
@@ -164,7 +167,7 @@ class Room : public SharedROM {
uchar Floor1Graphics;
uchar Floor2Graphics;
uchar Layer2Mode;
std::array<uchar, 16> blocks;
std::array<uchar, 16> blocks_;
std::array<uchar, 16> ChestList;
std::vector<zelda3::Sprite> sprites_;