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

big cleanup, replace Bytes alias with std::vector<uint8_t> to reduce ambiguity

Browse Source
This commit is contained in:
scawful
2024-08-20 12:02:47 -04:00
parent 2443336f9d
commit 49611d4944
33 changed files with 141 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/zelda3/screen/inventory.cc
View File

@@ -76,7 +76,7 @@ absl::Status Inventory::BuildTileset() {
tilesheets_.reserve(6 * 0x2000);
for (int i = 0; i < 6 * 0x2000; i++) tilesheets_.push_back(0xFF);
ASSIGN_OR_RETURN(tilesheets_, rom()->Load2BppGraphics())
Bytes test;
std::vector<uint8_t> test;
for (int i = 0; i < 0x4000; i++) {
test_.push_back(tilesheets_[i]);
}

6
src/app/zelda3/screen/inventory.h
View File

@@ -26,11 +26,11 @@ class Inventory : public SharedRom {
private:
absl::Status BuildTileset();
Bytes data_;
std::vector<uint8_t> data_;
gfx::Bitmap bitmap_;
Bytes tilesheets_;
Bytes test_;
std::vector<uint8_t> tilesheets_;
std::vector<uint8_t> test_;
gfx::Bitmap tilesheets_bmp_;
gfx::SnesPalette palette_;

8
src/app/zelda3/screen/title_screen.cc
View File

@@ -13,10 +13,10 @@ namespace zelda3 {
namespace screen {
void TitleScreen::Create() {
tiles8Bitmap.Create(128, 512, 8, Bytes(0, 0x20000));
tilesBG1Bitmap.Create(256, 256, 8, Bytes(0, 0x80000));
tilesBG2Bitmap.Create(256, 256, 8, Bytes(0, 0x80000));
oamBGBitmap.Create(256, 256, 8, Bytes(0, 0x80000));
tiles8Bitmap.Create(128, 512, 8, std::vector<uint8_t>(0, 0x20000));
tilesBG1Bitmap.Create(256, 256, 8, std::vector<uint8_t>(0, 0x80000));
tilesBG2Bitmap.Create(256, 256, 8, std::vector<uint8_t>(0, 0x80000));
oamBGBitmap.Create(256, 256, 8, std::vector<uint8_t>(0, 0x80000));
BuildTileset();
LoadTitleScreen();
}