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

ow map draw continue

Browse Source
This commit is contained in:
scawful
2022-09-04 15:49:55 -05:00
parent 521b9a1b1c
commit 2f12ff8f57
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/zelda3/overworld_map.cc
View File

@@ -50,18 +50,17 @@ void CopyTile8bpp8(int x, int y, int xx, int yy, int offset, gfx::TileInfo tile,
int my = y; int my = y;
if (tile.horizontal_mirror_ != 0) { if (tile.horizontal_mirror_ != 0) {
mx = 3 - x; mx = 7 - x;
} }
if (tile.vertical_mirror_ != 0) { if (tile.vertical_mirror_ != 0) {
my = 7 - y; my = 7 - y;
} }
int tx = ((tile.id_ / 16) * 512) + ((tile.id_ - ((tile.id_ / 16) * 16)) * 4); int tx = ((tile.id_ / 32) * 1024) + ((tile.id_ - ((tile.id_ / 32) * 32)) * 8);
auto index = xx + yy + offset + (mx * 2) + (my * 0x80); auto pixel = current_gfx[tx + x + (y * 0x80)];
auto pixel = current_gfx[tx + (y * 128) + x]; auto index = xx + yy + offset + mx + (my * 0x80);
ow_blockset[index] = (uchar)(pixel + (tile.palette_ * 16));
ow_blockset[index] = (pixel + (tile.palette_ * 16));
} }
void CopyTile8bpp16(int x, int y, int tile, Bytes& dest, Bytes& src) { void CopyTile8bpp16(int x, int y, int tile, Bytes& dest, Bytes& src) {
@@ -269,8 +268,8 @@ absl::Status OverworldMap::BuildTileset() {
} }
absl::Status OverworldMap::BuildTiles16Gfx(int count) { absl::Status OverworldMap::BuildTiles16Gfx(int count) {
current_blockset_.reserve(1048576); current_blockset_.reserve(1048576 * 2);
for (int i = 0; i < 1048576; i++) { for (int i = 0; i < 1048576 * 2; i++) {
current_blockset_.push_back(0x00); current_blockset_.push_back(0x00);
} }
int offsets[] = {0, 8, 1024, 1032}; int offsets[] = {0, 8, 1024, 1032};
@@ -283,7 +282,7 @@ absl::Status OverworldMap::BuildTiles16Gfx(int count) {
int offset = offsets[tile]; int offset = offsets[tile];
for (auto y = 0; y < 8; y++) { for (auto y = 0; y < 8; y++) {
for (auto x = 0; x < 4; x++) { for (auto x = 0; x < 8; x++) {
CopyTile8bpp8(x, y, xx, yy, offset, info, current_blockset_, CopyTile8bpp8(x, y, xx, yy, offset, info, current_blockset_,
current_gfx_); current_gfx_);
} }