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

Refactor music tracker structs for better code organization

Browse Source
This commit is contained in:
scawful
2024-08-21 00:53:05 -04:00
parent 478ef0d0d2
commit 590c7ffb22
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@
#include <vector> #include <vector>
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"
@@ -45,7 +44,7 @@ constexpr int kDungeonMusicBank = 0x0D8000;
using text_buf_ty = char[512]; using text_buf_ty = char[512];
// ============================================================================ // ============================================================================
using SongSPCBlock = struct { struct SongSPCBlock {
unsigned short start; unsigned short start;
unsigned short len; unsigned short len;
unsigned short relnum; unsigned short relnum;
@@ -59,7 +58,7 @@ using SongSPCBlock = struct {
// ============================================================================= // =============================================================================
using SongRange = struct { struct SongRange {
unsigned short start; unsigned short start;
unsigned short end; unsigned short end;
@@ -75,7 +74,7 @@ using SongRange = struct {
// ============================================================================= // =============================================================================
using SongPart = struct { struct SongPart {
uchar flag; uchar flag;
uchar inst; uchar inst;
short tbl[8]; short tbl[8];
@@ -84,7 +83,7 @@ using SongPart = struct {
// ============================================================================= // =============================================================================
using Song = struct { struct Song {
unsigned char flag; unsigned char flag;
unsigned char inst; unsigned char inst;
SongPart **tbl; SongPart **tbl;
@@ -95,7 +94,7 @@ using Song = struct {
}; };
// ============================================================================= // =============================================================================
using ZeldaWave = struct { struct ZeldaWave {
int lopst; int lopst;
int end; int end;
short lflag; short lflag;
@@ -105,7 +104,7 @@ using ZeldaWave = struct {
// ============================================================================ // ============================================================================
using SampleEdit = struct { struct SampleEdit {
unsigned short flag; unsigned short flag;
unsigned short init; unsigned short init;
unsigned short editsamp; unsigned short editsamp;
@@ -130,7 +129,7 @@ using SampleEdit = struct {
// ============================================================================= // =============================================================================
using ZeldaInstrument = struct { struct ZeldaInstrument {
unsigned char samp; unsigned char samp;
unsigned char ad; unsigned char ad;
unsigned char sr; unsigned char sr;
@@ -141,7 +140,7 @@ using ZeldaInstrument = struct {
// ============================================================================= // =============================================================================
using ZeldaSfxInstrument = struct { struct ZeldaSfxInstrument {
unsigned char voll; unsigned char voll;
unsigned char volr; unsigned char volr;
short freq; short freq;
@@ -154,7 +153,7 @@ using ZeldaSfxInstrument = struct {
// ============================================================================= // =============================================================================
using SPCCommand = struct { struct SPCCommand {
unsigned short addr; unsigned short addr;
short next; short next;
short prev; short prev;