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

houskeeping

Browse Source
This commit is contained in:
scawful
2023-10-20 02:18:35 -04:00
parent fb398351d8
commit 7c598b9fa0
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/zelda3/music/tracker.h
View File

@@ -21,16 +21,16 @@ namespace zelda3 {
// bank 19, 1A, 1B
// iirc 1A is OW, 1B is dungeon
// 19 is general spc stuff like samples, ects
static char op_len[32] = {1, 1, 2, 3, 0, 1, 2, 1, 2, 1, 1, 3, 0, 1, 2, 3,
1, 3, 3, 0, 1, 3, 0, 3, 3, 3, 1, 2, 0, 0, 0, 0};
constexpr char op_len[32] = {1, 1, 2, 3, 0, 1, 2, 1, 2, 1, 1, 3, 0, 1, 2, 3,
1, 3, 3, 0, 1, 3, 0, 3, 3, 3, 1, 2, 0, 0, 0, 0};
// =============================================================================
static int sbank_ofs[] = {0xc8000, 0, 0xd8000, 0};
static char fil1[4] = {0, 15, 61, 115};
static char fil2[4] = {0, 4, 5, 6};
static char fil3[4] = {0, 0, 15, 13};
constexpr char fil1[4] = {0, 15, 61, 115};
constexpr char fil2[4] = {0, 4, 5, 6};
constexpr char fil3[4] = {0, 0, 15, 13};
constexpr int kOverworldMusicBank = 0x0D0000;
constexpr int kDungeonMusicBank = 0x0D8000;
@@ -84,7 +84,7 @@ using Song = struct {
short numparts;
short lopst;
unsigned short addr;
bool in_use = true;
bool in_use; // true
};
// =============================================================================
@@ -99,8 +99,6 @@ using ZeldaWave = struct {
// ============================================================================
using SampleEdit = struct {
// EDITWIN ew;
// HWND dlg;
unsigned short flag;
unsigned short init;
unsigned short editsamp;

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

@@ -70,7 +70,7 @@ void Inventory::Create() {
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())
ASSIGN_OR_RETURN(tilesheets_, rom()->Load2BppGraphics())
Bytes test;
for (int i = 0; i < 0x4000; i++) {
test_.push_back(tilesheets_[i]);