diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2024-08-28 02:09:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 21:09:59 -0400 |
| commit | aa97586659dbd24174258e0437ab9411a9747d3d (patch) | |
| tree | 1927736915f7b6707bacdd70527b19899c05f637 /src/code | |
| parent | 17debe86206e8194b36cb5838cf6e9dc7f3a968b (diff) | |
[Audio 6/?] Build Soundfonts and the Soundfont Table (#2056)
* [Audio 6/?] Build Soundfonts and the Soundfont Table
* Improve lots of error messages
* First suggested changes
* Make audio build debugging more friendly
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Some fixes from MM review
* Make soundfont_table.h generation depend on the samplebank xmls since they are read, report from which soundfont the invalid pointer indirect warning originates from
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/graph.c | 2 | ||||
| -rw-r--r-- | src/code/speed_meter.c | 2 | ||||
| -rw-r--r-- | src/code/z_collision_check.c | 2 | ||||
| -rw-r--r-- | src/code/z_play.c | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index 747416399..f6cf66b12 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -4,7 +4,7 @@ #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" /** * The time at which the previous `Graph_Update` ended. diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 13e2622c6..903cd0fc7 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -1,4 +1,4 @@ -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" #include "global.h" #include "terminal.h" diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index a475a0912..1680d9066 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -12,8 +12,6 @@ typedef s32 (*ColChkLineFunc)(PlayState*, CollisionCheckContext*, Collider*, Vec #define SAC_ENABLE (1 << 0) -#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64" - #if OOT_DEBUG /** * Draws a red triangle with vertices vA, vB, and vC. diff --git a/src/code/z_play.c b/src/code/z_play.c index d9b89db12..ee39e07b7 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1,3 +1,4 @@ + #include "global.h" #include "quake.h" #include "terminal.h" @@ -5,8 +6,6 @@ #include "z64frame_advance.h" -#pragma increment_block_number "gc-eu:252 gc-eu-mq:252 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0" - TransitionTile gTransitionTile; s32 gTransitionTileState; VisMono gPlayVisMono; |