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

housekeeping

Browse Source
This commit is contained in:
Justin Scofield
2022-07-19 19:49:42 +00:00
parent 099a209739
commit 0ee3778537
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,8 +309,8 @@ void OverworldMap::CopyTileToMap(int x, int y, int xx, int yy, int offset,
} }
void OverworldMap::CopyTile8bpp16(int x, int y, int tile, uchar* destbmpPtr) { void OverworldMap::CopyTile8bpp16(int x, int y, int tile, uchar* destbmpPtr) {
int source_ptr_pos = ((tile - ((tile / 8) * 8)) * 16) + // (sourceX * 16) + (sourceY * 128)
((tile / 8) * 2048); // (sourceX * 16) + (sourceY * 128) int source_ptr_pos = ((tile - ((tile / 8) * 8)) * 16) + ((tile / 8) * 2048);
auto source_ptr = tile16_blockset_bmp_.GetData(); auto source_ptr = tile16_blockset_bmp_.GetData();
int dest_ptr_pos = (x + (y * 512)); int dest_ptr_pos = (x + (y * 512));
@@ -329,13 +329,11 @@ void OverworldMap::CopyTile8bpp16From8(int xP, int yP, int tileID,
auto gfx_tile16_data = destbmpPtr; auto gfx_tile16_data = destbmpPtr;
auto gfx_tile8_data = rom_.GetVRAM().GetGraphicsData(); auto gfx_tile8_data = rom_.GetVRAM().GetGraphicsData();
int offsets[] = {0, 8, 4096, 4104};
auto tiles = tiles16_[tileID]; auto tiles = tiles16_[tileID];
for (auto tile = 0; tile < 4; tile++) { for (auto tile = 0; tile < 4; tile++) {
gfx::TileInfo info = tiles.tiles_info[tile]; gfx::TileInfo info = tiles.tiles_info[tile];
int offset = offsets[tile]; int offset = kTileOffsets[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 < 4; x++) {

2
src/app/zelda3/overworld_map.h
View File

@@ -14,6 +14,8 @@ namespace yaze {
namespace app { namespace app {
namespace zelda3 { namespace zelda3 {
static constexpr int kTileOffsets = {0, 8, 4096, 4104};
class OverworldMap { class OverworldMap {
public: public:
OverworldMap(int index, ROM& rom, const std::vector<gfx::Tile16>& tiles16); OverworldMap(int index, ROM& rom, const std::vector<gfx::Tile16>& tiles16);