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

more hex nums

Browse Source
This commit is contained in:
Justin Scofield
2022-09-05 13:03:25 -05:00
parent 7daeeea14e
commit 49cc4e939a
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ void CopyTile8bpp8(int x, int y, int xx, int yy, int offset, gfx::TileInfo tile,
Bytes& ow_blockset, Bytes& current_gfx) { Bytes& ow_blockset, Bytes& current_gfx) {
int mx = x; int mx = x;
int my = y; int my = y;
uchar r = 0x00; uchar r = 0;
if (tile.horizontal_mirror_ != 0) { if (tile.horizontal_mirror_ != 0) {
mx = 0x07 - x; mx = 0x07 - x;
@@ -60,12 +60,13 @@ void CopyTile8bpp8(int x, int y, int xx, int yy, int offset, gfx::TileInfo tile,
my = 0x07 - y; my = 0x07 - y;
} }
int tx = ((tile.id_ / 0x20) * 0x800) + // TILE ID ONLY
((tile.id_ - ((tile.id_ / 0x20) * 0x20)) * 0x08); int tx = ((tile.id_ - ((tile.id_ / 0x20) * 0x20)) * 0x08) +
((tile.id_ / 0x20) * 0x800);
auto pixel = current_gfx[tx + x + (y * 0x80)]; auto pixel = current_gfx[tx + x + (y * 0x80)];
auto index = xx + yy + offset + mx + (my * 0x80); auto index = xx + yy + offset + mx + (my * 0x80);
ow_blockset[index] = (uchar)(pixel + (tile.palette_ * 0x10)); ow_blockset[index + r] = (uchar)(pixel + (tile.palette_ * 0x10));
} }
void CopyTile8bpp16(int x, int y, int tile, Bytes& bitmap, Bytes& blockset) { void CopyTile8bpp16(int x, int y, int tile, Bytes& bitmap, Bytes& blockset) {
@@ -307,20 +308,20 @@ absl::Status OverworldMap::BuildTiles16Gfx(int count) {
} }
absl::Status OverworldMap::BuildBitmap(OWBlockset& world_blockset) { absl::Status OverworldMap::BuildBitmap(OWBlockset& world_blockset) {
bitmap_data_.reserve(262144); bitmap_data_.reserve(0x40000);
for (int i = 0; i < 262144; i++) { for (int i = 0; i < 0x40000; i++) {
bitmap_data_.push_back(0x00); bitmap_data_.push_back(0x00);
} }
int superY = ((index_ - (world_ * 64)) / 8); int superY = ((index_ - (world_ * 0x40)) / 0x08);
int superX = index_ - (world_ * 64) - (superY * 8); int superX = index_ - (world_ * 0x40) - (superY * 0x08);
for (int y = 0; y < 32; y++) { for (int y = 0; y < 0x20; y++) {
for (int x = 0; x < 32; x++) { for (int x = 0; x < 0x20; x++) {
auto xt = x + (superX * 32); auto xt = x + (superX * 0x20);
auto yt = y + (superY * 32); auto yt = y + (superY * 0x20);
CopyTile8bpp16((x * 16), (y * 16), world_blockset[xt][yt], bitmap_data_, CopyTile8bpp16((x * 0x10), (y * 0x10), world_blockset[xt][yt],
current_blockset_); bitmap_data_, current_blockset_);
} }
} }
return absl::OkStatus(); return absl::OkStatus();