From 9c7c3d0ad148f7bb996b4c6e34cf49f9174cd5c8 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Wed, 1 May 2024 17:43:04 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20n64decom?= =?UTF-8?q?p/mk64@a66a6fd0091161bd4864f25ce4794397058eefcb=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basics.js | 2 +- ...d__red__shells_2update_8inc_8c_source.html | 239 +++++++++--------- ceremony__and__credits_8c.html | 6 +- ceremony__and__credits_8h.html | 4 +- choco__mountain_2course__offsets_8c.html | 4 +- code__80281780_8c.html | 2 +- code__80281780_8h.html | 2 +- controlflow.html | 6 +- courses.html | 2 +- coursesmenu.html | 2 +- coursesmenu.js | 2 +- doxygen_crawl.html | 78 +++--- functions_vars_w.html | 2 +- functions_w.html | 2 +- globals_func_s.html | 2 +- globals_s.html | 2 +- m2c_funcs.svg | 2 +- main_8c.html | 2 +- ...7e6cb53d677ce7a809303aa122cb4cf_cgraph.map | 2 +- ...7e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 | 2 +- ...7e6cb53d677ce7a809303aa122cb4cf_cgraph.svg | 2 +- ...b53d677ce7a809303aa122cb4cf_cgraph_org.svg | 2 +- main_8h.html | 6 +- md_docs_2doxygen__syms.html | 2 +- navtreeindex118.js | 2 +- navtreeindex131.js | 4 +- navtreeindex28.js | 2 +- navtreeindex29.js | 2 +- navtreeindex39.js | 2 +- navtreeindex42.js | 6 +- nonmatching_funcs.svg | 2 +- osPiStartDma_8c.html | 2 +- osViBlack_8c.html | 2 +- osViSwapBuffer_8c.html | 2 +- os__pi_8h.html | 2 +- os__vi_8h.html | 4 +- player__controller_8c.html | 2 +- player__controller_8h.html | 2 +- podium__ceremony__actors_8c.html | 2 +- podium__ceremony__actors_8h.html | 2 +- ...7e6cb53d677ce7a809303aa122cb4cf_cgraph.map | 2 +- ...7e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 | 2 +- ...7e6cb53d677ce7a809303aa122cb4cf_cgraph.svg | 2 +- ...b53d677ce7a809303aa122cb4cf_cgraph_org.svg | 2 +- race__logic_8c.html | 2 +- race__logic_8h.html | 2 +- search/all_15.js | 2 +- search/all_19.js | 2 +- search/all_5.js | 2 +- search/functions_12.js | 2 +- search/variables_17.js | 2 +- ...994f1f3d3603607ed9bca3243c1d5cf_cgraph.map | 2 +- ...994f1f3d3603607ed9bca3243c1d5cf_cgraph.md5 | 2 +- ...994f1f3d3603607ed9bca3243c1d5cf_cgraph.svg | 2 +- ...1f3d3603607ed9bca3243c1d5cf_cgraph_org.svg | 2 +- ...c35bddc85303be6c4d1c22e44a77b06_cgraph.map | 2 +- ...c35bddc85303be6c4d1c22e44a77b06_cgraph.md5 | 2 +- ...c35bddc85303be6c4d1c22e44a77b06_cgraph.svg | 2 +- ...ddc85303be6c4d1c22e44a77b06_cgraph_org.svg | 2 +- synthesis_8h.html | 26 +- synthesis_8h.js | 2 +- ...ced286cad738cbc3b205b3d763002d6_cgraph.map | 2 +- ...ced286cad738cbc3b205b3d763002d6_cgraph.md5 | 2 +- ...ced286cad738cbc3b205b3d763002d6_cgraph.svg | 2 +- ...86cad738cbc3b205b3d763002d6_cgraph_org.svg | 2 +- ...0ec5e7a8c01fff5649d490397cbc64_icgraph.map | 0 ...0ec5e7a8c01fff5649d490397cbc64_icgraph.md5 | 0 ...0ec5e7a8c01fff5649d490397cbc64_icgraph.svg | 2 +- ...e7a8c01fff5649d490397cbc64_icgraph_org.svg | 0 ...62830b08cf19a15a6543ae6c94b219d_cgraph.map | 2 +- ...62830b08cf19a15a6543ae6c94b219d_cgraph.md5 | 2 +- ...62830b08cf19a15a6543ae6c94b219d_cgraph.svg | 2 +- ...0b08cf19a15a6543ae6c94b219d_cgraph_org.svg | 2 +- synthesis_8h_source.html | 11 +- toads__turnpike_2course__data_8c.html | 2 +- toads__turnpike_2course__data_8h.html | 2 +- toads__turnpike_2course__offsets_8c.html | 4 +- todo.html | 38 +-- train_2render_8inc_8c_source.html | 30 +-- trees_2render_8inc_8c_source.html | 171 +++++++------ uniondu.html | 28 +- uniondu.js | 4 +- wario__sign_2render_8inc_8c_source.html | 21 +- wario__stadium_2course__data_8c.html | 2 +- wario__stadium_2course__data_8h.html | 2 +- wario__stadium_2course__offsets_8c.html | 4 +- 86 files changed, 406 insertions(+), 414 deletions(-) rename synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.map => synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.map (100%) rename synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.md5 => synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.md5 (100%) rename synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.svg => synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.svg (99%) rename synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph_org.svg => synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph_org.svg (100%) diff --git a/basics.js b/basics.js index 8888e6745..2a25d6dbd 100644 --- a/basics.js +++ b/basics.js @@ -26,7 +26,7 @@ var basics = [ "Players", "controlflow.html#players", null ], [ "Actors", "controlflow.html#actors-1", null ], [ "Objects", "controlflow.html#objects-1", null ], - [ "Courses", "controlflow.html#courses", [ + [ "Courses", "controlflow.html#courses-1", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], [ "UI & Other 2D Screen data", "controlflow.html#ui--other-2d-screen-data", null ], diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index f0eb760cc..c9be8ec6a 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -116,161 +116,161 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
6#include <code_800029B0.h>
7
-
8void func_802B3B44(struct ShellActor *shell) {
-
9 u16 currentWaypoint;
-
10 u16 nextWaypoint;
-
11 f32 temp_f0;
-
12 f32 temp_f0_2;
-
13 f32 temp_f0_3;
-
14 f32 temp_f12_3;
-
15 f32 temp_f14_2;
-
16 f32 temp_f16_2;
-
17 f32 temp_f2;
-
18 f32 temp_f12;
-
19 f32 temp_f28;
-
20 f32 temp_f20;
-
21 f32 temp_f22;
-
22 f32 temp_f24;
-
23 f32 temp_f12_0;
-
24 f32 temp_f12_1;
-
25 f32 temp_f12_2;
-
26 f32 temp_f18_3;
-
27 f32 temp_f16_3;
-
28 f32 temp_f26;
-
29 Vec3f origPos;
+
8void func_802B3B44(struct ShellActor *shell) {
+
9 u16 currentWaypoint;
+
10 u16 nextWaypoint;
+
11 f32 temp_f0;
+
12 f32 temp_f0_2;
+
13 f32 temp_f0_3;
+
14 f32 temp_f12_3;
+
15 f32 temp_f14_2;
+
16 f32 temp_f16_2;
+
17 f32 temp_f2;
+
18 f32 temp_f12;
+
19 f32 temp_f28;
+
20 f32 temp_f20;
+
21 f32 temp_f22;
+
22 f32 temp_f24;
+
23 f32 temp_f12_0;
+
24 f32 temp_f12_1;
+
25 f32 temp_f12_2;
+
26 f32 temp_f18_3;
+
27 f32 temp_f16_3;
+
28 f32 temp_f26;
+
29 Vec3f origPos;
30
-
31 currentWaypoint = shell->pathIndex;
-
32 temp_f2 = D_80164490[currentWaypoint].posX;
-
33 temp_f12 = D_80164490[currentWaypoint].posY;
-
34 temp_f28 = D_80164490[currentWaypoint].posZ;
-
35 nextWaypoint = currentWaypoint + 1;
+
31 currentWaypoint = shell->pathIndex;
+
32 temp_f2 = D_80164490[currentWaypoint].posX;
+
33 temp_f12 = D_80164490[currentWaypoint].posY;
+
34 temp_f28 = D_80164490[currentWaypoint].posZ;
+
35 nextWaypoint = currentWaypoint + 1;
36
-
37 if (nextWaypoint >= D_80164430) {
-
38 nextWaypoint -= D_80164430;
+
37 if (nextWaypoint >= D_80164430) {
+
38 nextWaypoint -= D_80164430;
39 }
40
-
41 temp_f20 = temp_f2 - shell->pos[0];
-
42 temp_f22 = temp_f12 - shell->pos[1];
-
43 temp_f24 = temp_f28 - shell->pos[2];
-
44 temp_f0 = (temp_f20 * temp_f20) + (temp_f22 * temp_f22) + (temp_f24 * temp_f24);
-
45 if (temp_f0 > 400.0f) {
-
46 temp_f18_3 = D_80164490[nextWaypoint].posX;
-
47 temp_f16_3 = D_80164490[nextWaypoint].posY;
-
48 temp_f26 = D_80164490[nextWaypoint].posZ;
+
41 temp_f20 = temp_f2 - shell->pos[0];
+
42 temp_f22 = temp_f12 - shell->pos[1];
+
43 temp_f24 = temp_f28 - shell->pos[2];
+
44 temp_f0 = (temp_f20 * temp_f20) + (temp_f22 * temp_f22) + (temp_f24 * temp_f24);
+
45 if (temp_f0 > 400.0f) {
+
46 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
47 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
48 temp_f26 = D_80164490[nextWaypoint].posZ;
49
-
50 temp_f12_0 = temp_f18_3 - shell->pos[0];
-
51 temp_f12_1 = temp_f16_3 - shell->pos[1];
-
52 temp_f12_2 = temp_f26 - shell->pos[2];
+
50 temp_f12_0 = temp_f18_3 - shell->pos[0];
+
51 temp_f12_1 = temp_f16_3 - shell->pos[1];
+
52 temp_f12_2 = temp_f26 - shell->pos[2];
53
-
54 temp_f0_3 = (temp_f12_0 * temp_f12_0) + (temp_f12_1 * temp_f12_1) + (temp_f12_2 * temp_f12_2);
-
55 if (temp_f0_3 < temp_f0) {
-
56 shell->pathIndex = nextWaypoint;
+
54 temp_f0_3 = (temp_f12_0 * temp_f12_0) + (temp_f12_1 * temp_f12_1) + (temp_f12_2 * temp_f12_2);
+
55 if (temp_f0_3 < temp_f0) {
+
56 shell->pathIndex = nextWaypoint;
57 } else {
-
58 temp_f0_2 = sqrtf(temp_f0) * 4.0f;
-
59 temp_f20 /= temp_f0_2;
-
60 temp_f22 /= temp_f0_2;
-
61 temp_f24 /= temp_f0_2;
+
58 temp_f0_2 = sqrtf(temp_f0) * 4.0f;
+
59 temp_f20 /= temp_f0_2;
+
60 temp_f22 /= temp_f0_2;
+
61 temp_f24 /= temp_f0_2;
62
-
63 temp_f12_3 = shell->velocity[0];
-
64 temp_f14_2 = shell->velocity[1];
-
65 temp_f16_2 = shell->velocity[2];
+
63 temp_f12_3 = shell->velocity[0];
+
64 temp_f14_2 = shell->velocity[1];
+
65 temp_f16_2 = shell->velocity[2];
66
-
67 temp_f12_3 += temp_f20;
-
68 temp_f14_2 += temp_f22;
-
69 temp_f16_2 += temp_f24;
-
70 temp_f0 = sqrtf((temp_f12_3 * temp_f12_3) + (temp_f14_2 * temp_f14_2) + (temp_f16_2 * temp_f16_2));
-
71 if (temp_f0 > 6.0f) {
-
72 temp_f0 /= 6.0f;
-
73 temp_f12_3 /= temp_f0;
-
74 temp_f14_2 /= temp_f0;
-
75 temp_f16_2 /= temp_f0;
+
67 temp_f12_3 += temp_f20;
+
68 temp_f14_2 += temp_f22;
+
69 temp_f16_2 += temp_f24;
+
70 temp_f0 = sqrtf((temp_f12_3 * temp_f12_3) + (temp_f14_2 * temp_f14_2) + (temp_f16_2 * temp_f16_2));
+
71 if (temp_f0 > 6.0f) {
+
72 temp_f0 /= 6.0f;
+
73 temp_f12_3 /= temp_f0;
+
74 temp_f14_2 /= temp_f0;
+
75 temp_f16_2 /= temp_f0;
76 }
-
77 shell->velocity[0] = temp_f12_3;
-
78 shell->velocity[1] = temp_f14_2;
-
79 shell->velocity[2] = temp_f16_2;
+
77 shell->velocity[0] = temp_f12_3;
+
78 shell->velocity[1] = temp_f14_2;
+
79 shell->velocity[2] = temp_f16_2;
80
-
81 origPos[0] = shell->pos[0];
-
82 origPos[1] = shell->pos[1];
-
83 origPos[2] = shell->pos[2];
+
81 origPos[0] = shell->pos[0];
+
82 origPos[1] = shell->pos[1];
+
83 origPos[2] = shell->pos[2];
84
-
85 shell->pos[0] += temp_f12_3;
-
86 shell->pos[1] += temp_f14_2;
-
87 shell->pos[2] += temp_f16_2;
-
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
-
89 func_802B4E30((struct Actor *) shell);
+
85 shell->pos[0] += temp_f12_3;
+
86 shell->pos[1] += temp_f14_2;
+
87 shell->pos[2] += temp_f16_2;
+
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
+
89 func_802B4E30((struct Actor *) shell);
90 }
91 } else {
-
92 if (temp_f0 > 5.0f) {
-
93 shell->pos[0] = temp_f2;
-
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
-
95 shell->pos[2] = temp_f28;
-
96 shell->pathIndex = nextWaypoint;
+
92 if (temp_f0 > 5.0f) {
+
93 shell->pos[0] = temp_f2;
+
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
+
95 shell->pos[2] = temp_f28;
+
96 shell->pathIndex = nextWaypoint;
97 } else {
-
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
-
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
-
100 temp_f26 = D_80164490[nextWaypoint].posZ;
+
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
100 temp_f26 = D_80164490[nextWaypoint].posZ;
101
-
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
-
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
-
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
+
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
+
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
+
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
105
-
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
-
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
-
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
+
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
+
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
+
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
109 }
110 }
111}
112
-
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
-
114 f32 x_velocity;
-
115 f32 z_velocity;
-
116 f32 xz_dist;
-
117 Vec3f newPosition;
+
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
+
114 f32 x_velocity;
+
115 f32 z_velocity;
+
116 f32 xz_dist;
+
117 Vec3f newPosition;
118
-
119 x_velocity = player->pos[0];
-
120 x_velocity -= shell->pos[0];
-
121 z_velocity = player->pos[2];
-
122 z_velocity -= shell->pos[2];
-
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
-
124 if (xz_dist == 0.0f) {
-
125 x_velocity = 0.0f;
-
126 z_velocity = 0.0f;
+
119 x_velocity = player->pos[0];
+
120 x_velocity -= shell->pos[0];
+
121 z_velocity = player->pos[2];
+
122 z_velocity -= shell->pos[2];
+
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
+
124 if (xz_dist == 0.0f) {
+
125 x_velocity = 0.0f;
+
126 z_velocity = 0.0f;
127 } else {
-
128 x_velocity /= xz_dist;
-
129 z_velocity /= xz_dist;
+
128 x_velocity /= xz_dist;
+
129 z_velocity /= xz_dist;
130 }
131
-
132 newPosition[0] = shell->pos[0];
-
133 newPosition[1] = shell->pos[1];
-
134 newPosition[2] = shell->pos[2];
-
135 shell->pos[0] += x_velocity;
-
136 shell->pos[1] -= 2.0f;
-
137 shell->pos[2] += z_velocity;
-
138 shell->velocity[0] = x_velocity;
-
139 shell->velocity[1] = -2.0f;
-
140 shell->velocity[2] = z_velocity;
+
132 newPosition[0] = shell->pos[0];
+
133 newPosition[1] = shell->pos[1];
+
134 newPosition[2] = shell->pos[2];
+
135 shell->pos[0] += x_velocity;
+
136 shell->pos[1] -= 2.0f;
+
137 shell->pos[2] += z_velocity;
+
138 shell->velocity[0] = x_velocity;
+
139 shell->velocity[1] = -2.0f;
+
140 shell->velocity[2] = z_velocity;
141
142 if (player->effects & BOO_EFFECT) {
-
143 destroy_destructable_actor((struct Actor *) shell);
+
143 destroy_destructable_actor((struct Actor *) shell);
144 } else {
-
145 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], newPosition[0], newPosition[1], newPosition[2]);
-
146 func_802B4E30((struct Actor *) shell);
-
147 func_802B4104(shell);
+
145 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], newPosition[0], newPosition[1], newPosition[2]);
+
146 func_802B4E30((struct Actor *) shell);
+
147 func_802B4104(shell);
148 }
149}
150
-
155s16 func_802B3FD0(Player *owner, struct ShellActor *shell) {
+
155s16 func_802B3FD0(Player *owner, struct ShellActor *shell) {
156 Player *player;
-
157 s32 playerIndex;
-
158 f32 playerToShellDistance;
+
157 s32 playerIndex;
+
158 f32 playerToShellDistance;
159 s16 playerId = -1;
-
160 f32 smallestDistance = 25000000.0f;
+
160 f32 smallestDistance = 25000000.0f;
161
-
162 for (playerIndex = 0; playerIndex < 4; playerIndex++) {
+
162 for (playerIndex = 0; playerIndex < 4; playerIndex++) {
163 player = &gPlayers[playerIndex];
164 if ((player->type & PLAYER_EXISTS) == 0) {continue;}
165 if (player == owner) {continue; }
@@ -660,11 +660,6 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
Player::currentRank
s16 currentRank
Definition common_structs.h:272
Player::pos
Vec3f pos
Definition common_structs.h:279
ShellActor
Definition actor_types.h:302
-
ShellActor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:315
-
ShellActor::velocity
Vec3f velocity
Definition actor_types.h:324
-
ShellActor::pos
Vec3f pos
Definition actor_types.h:323
-
ShellActor::unk30
Collision unk30
Definition actor_types.h:325
-
ShellActor::pathIndex
u16 pathIndex
Definition actor_types.h:319
TrackWaypoint::posZ
s16 posZ
Definition waypoints.h:9
TrackWaypoint::posY
s16 posY
Definition waypoints.h:8
TrackWaypoint::posX
s16 posX
Definition waypoints.h:7
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 37d0513c4..7a09e364e 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -1007,7 +1007,7 @@ Here is the caller graph for this function:
-
Todo
Cast to normal Camera? Or from CinematicCamera?
+
Todo
Cast to normal Camera? Or from CinematicCamera?
Here is the call graph for this function:
@@ -1294,7 +1294,7 @@ Here is the caller graph for this function:
-
Todo
Does this match as a return of s8?
+
Todo
Does this match as a return of s8?
Here is the call graph for this function:
@@ -2366,7 +2366,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index b7553c0c9..305cb43f9 100644 --- a/ceremony__and__credits_8h.html +++ b/ceremony__and__credits_8h.html @@ -960,7 +960,7 @@ Here is the caller graph for this function:
-
Todo
Cast to normal Camera? Or from CinematicCamera?
+
Todo
Cast to normal Camera? Or from CinematicCamera?
Here is the call graph for this function:
@@ -2202,7 +2202,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/choco__mountain_2course__offsets_8c.html b/choco__mountain_2course__offsets_8c.html index 01c9eead1..627cb3a2f 100644 --- a/choco__mountain_2course__offsets_8c.html +++ b/choco__mountain_2course__offsets_8c.html @@ -192,7 +192,7 @@ Variables
{gTexture64647C, 0x0829, 0x1000, 0x0},
{gTexture647F4C, 0x05BC, 0x1000, 0x0},
{gTexture64FBF4, 0x0274, 0x0800, 0x0},
-
{gTexture653DB0, 0x06AE, 0x0800, 0x0},
+
{gTexture653DB0, 0x06AE, 0x0800, 0x0},
{gTexture652B54, 0x0606, 0x0800, 0x0},
{gTexture65315C, 0x04A9, 0x0800, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
@@ -211,7 +211,6 @@ Variables
{0x00000000, 0x0000, 0x0000, 0x0},
}
gTexture64FBF4
u8 gTexture64FBF4[]
-
gTexture653DB0
u8 gTexture653DB0[]
gTexture67B864
u8 gTexture67B864[]
gTexture65315C
u8 gTexture65315C[]
gTexture679C04
u8 gTexture679C04[]
@@ -227,6 +226,7 @@ Variables
gTexture64619C
u8 gTexture64619C[]
gTextureSignBackside
u8 gTextureSignBackside[]
gTexture6774D8
u8 gTexture6774D8[]
+
gTexture653DB0
u8 gTexture653DB0[]
gTextureSignFallingRocks
u8 gTextureSignFallingRocks[]
gTexture647F4C
u8 gTexture647F4C[]
gTexture67DC20
u8 gTexture67DC20[]
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index 30c4c24c3..f0cf6df42 100644 --- a/code__80281780_8c.html +++ b/code__80281780_8c.html @@ -164,7 +164,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/code__80281780_8h.html b/code__80281780_8h.html index 3b18f8e1b..437cb98ec 100644 --- a/code__80281780_8h.html +++ b/code__80281780_8h.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/controlflow.html b/controlflow.html index bb49c133d..a76321aa4 100644 --- a/controlflow.html +++ b/controlflow.html @@ -112,7 +112,7 @@ $(function(){initNavTree('controlflow.html',''); initResizable(); });
  • Players
  • Actors
  • Objects
    • -
  • Courses
    • -
    Todo
    Why did void* work for matching
    +
    Todo
    Why did void* work for matching
    Here is the caller graph for this function:
    diff --git a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map index aaaa3ce71..8fca6d64f 100644 --- a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map +++ b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map @@ -115,7 +115,7 @@ - + diff --git a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 index fa9097239..24ffbdf5c 100644 --- a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 +++ b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 @@ -1 +1 @@ -84c2541c5165ec10bd3305f9e00733ee \ No newline at end of file +92144ebe7d845283398e330e29c04db9 \ No newline at end of file diff --git a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg index aeafbd3ee..52f1671f9 100644 --- a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg +++ b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg @@ -1110,7 +1110,7 @@ var sectionId = 'dynsection-9'; Node127 - + synthesis_process_note diff --git a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg index fe050d6c4..fc4482392 100644 --- a/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg +++ b/main_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg @@ -1064,7 +1064,7 @@ Node127 - + synthesis_process_note diff --git a/main_8h.html b/main_8h.html index f7e5c3f59..60b54537b 100644 --- a/main_8h.html +++ b/main_8h.html @@ -605,7 +605,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -634,7 +634,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -653,7 +653,7 @@ Variables
    -
    Todo
    Why did void* work for matching
    +
    Todo
    Why did void* work for matching
    Here is the caller graph for this function:
    diff --git a/md_docs_2doxygen__syms.html b/md_docs_2doxygen__syms.html index 4c1297080..43d3c3b6c 100644 --- a/md_docs_2doxygen__syms.html +++ b/md_docs_2doxygen__syms.html @@ -4578,7 +4578,7 @@ Memory Addresses synthesis_do_one_audio_update 0x800B775C -synthesis_process_note 0x800B7C30 +synthesis_process_note 0x800B7C30 load_wave_samples 0x800B85B4 diff --git a/navtreeindex118.js b/navtreeindex118.js index 91f42ca11..ea68d72a9 100644 --- a/navtreeindex118.js +++ b/navtreeindex118.js @@ -90,9 +90,9 @@ var NAVTREEINDEX118 = "synthesis_8h.html#a1ced286cad738cbc3b205b3d763002d6":[8,0,3,1,19,25], "synthesis_8h.html#a2ca711eab9b187c85af2cdaf8655790e":[8,0,3,1,19,13], "synthesis_8h.html#a36b3e5489ff9e278ed7903a91fc4e4dc":[8,0,3,1,19,12], -"synthesis_8h.html#a415dae6c7fca2d4899ad184cc2ec0fc9":[8,0,3,1,19,28], "synthesis_8h.html#a4335280b9164016034f7e52d4f2ccef9":[8,0,3,1,19,30], "synthesis_8h.html#a46dbb82b200402601c2819f7deab8c04":[8,0,3,1,19,32], +"synthesis_8h.html#a4d0ec5e7a8c01fff5649d490397cbc64":[8,0,3,1,19,28], "synthesis_8h.html#a595997d04904dfb0bf3bcef45336e373":[8,0,3,1,19,3], "synthesis_8h.html#a5cf7d7e6f1edba2df6f57b911e8b1d24":[8,0,3,1,19,8], "synthesis_8h.html#a5fcd886099877cac6ca75cefff4ca346":[8,0,3,1,19,7], diff --git a/navtreeindex131.js b/navtreeindex131.js index 08a6c5fdb..b96336a89 100644 --- a/navtreeindex131.js +++ b/navtreeindex131.js @@ -141,10 +141,10 @@ var NAVTREEINDEX131 = "union____OSfp.html#aa1b92e78cc62bfa671d55b4f08a42f52":[7,0,8,1], "union____OSfp.html#aad7ba28b3e6aa7495eb9f9e73f5bd064":[7,0,8,0], "uniondu.html":[7,0,75], -"uniondu.html#a06928fe4577a2d3ae425f6df73fbef26":[7,0,75,4], +"uniondu.html#a06928fe4577a2d3ae425f6df73fbef26":[7,0,75,3], "uniondu.html#a1350494c6a09b425b926250e9b10b5c9":[7,0,75,2], "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0":[7,0,75,0], -"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,3], +"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,4], "uniondu.html#ac24ce7d9a78b6632965424039e4362c3":[7,0,75,1], "unionfu.html":[7,0,81], "unionfu.html#a6aed0becf5f2fa3047085638c8516b26":[7,0,81,2], diff --git a/navtreeindex28.js b/navtreeindex28.js index 1e57ac2c3..f83f3ba77 100644 --- a/navtreeindex28.js +++ b/navtreeindex28.js @@ -196,7 +196,7 @@ var NAVTREEINDEX28 = "controlflow.html#actors-1":[1,2,4,2], "controlflow.html#code-breakdown":[1,2,4], "controlflow.html#course-folder":[1,2,4,4,0], -"controlflow.html#courses":[1,2,4,4], +"controlflow.html#courses-1":[1,2,4,4], "controlflow.html#ending":[1,2,4,8], "controlflow.html#engine":[1,2,4,6], "controlflow.html#math":[1,2,4,7], diff --git a/navtreeindex29.js b/navtreeindex29.js index 66c2fda09..0fa8c472e 100644 --- a/navtreeindex29.js +++ b/navtreeindex29.js @@ -201,7 +201,7 @@ var NAVTREEINDEX29 = "course__offsets_8h.html":[8,0,2,7], "course__offsets_8h_source.html":[8,0,2,7], "courses.html":[2,0], -"courses.html#courses-1":[2,0,0], +"courses.html#courses":[2,0,0], "coursesmenu.html":[2], "cow_2render_8inc_8c.html":[8,0,3,0,4,0], "cow_2render_8inc_8c.html#a3032e5759fffafb766e96e1991ab0350":[8,0,3,0,4,0,0], diff --git a/navtreeindex39.js b/navtreeindex39.js index e68ce021d..5c3fb77b3 100644 --- a/navtreeindex39.js +++ b/navtreeindex39.js @@ -228,8 +228,8 @@ var NAVTREEINDEX39 = "frappe__snowland_2course__textures_8linkonly_8h_source.html":[8,0,0,7,6], "frappe__snowland_2course__vertices_8inc_8c.html":[8,0,0,7,7], "frappe__snowland_2course__vertices_8inc_8c.html#a1ec683eb9d6c6022a1131cd35cf8d7e8":[8,0,0,7,7,0], -"functions.html":[7,2,0,0], "functions.html":[7,2,0], +"functions.html":[7,2,0,0], "functions_b.html":[7,2,0,1], "functions_c.html":[7,2,0,2], "functions_d.html":[7,2,0,3], diff --git a/navtreeindex42.js b/navtreeindex42.js index d7a5e7eb7..832e75e53 100644 --- a/navtreeindex42.js +++ b/navtreeindex42.js @@ -15,8 +15,8 @@ var NAVTREEINDEX42 = "gfx__output__buffer_8h.html#aa6e89ad26a571573a3618e8bd57f2fcd":[8,0,3,2,2,1], "gfx__output__buffer_8h.html#acd645401a3e14e342cad25f6471ef97a":[8,0,3,2,2,0], "gfx__output__buffer_8h_source.html":[8,0,3,2,2], -"globals.html":[8,1,0,0], "globals.html":[8,1,0], +"globals.html":[8,1,0,0], "globals_a.html":[8,1,0,1], "globals_b.html":[8,1,0,2], "globals_c.html":[8,1,0,3], @@ -52,8 +52,8 @@ var NAVTREEINDEX42 = "globals_enum.html":[8,1,4], "globals_eval.html":[8,1,5], "globals_f.html":[8,1,0,6], -"globals_func.html":[8,1,1,0], "globals_func.html":[8,1,1], +"globals_func.html":[8,1,1,0], "globals_func_a.html":[8,1,1,1], "globals_func_b.html":[8,1,1,2], "globals_func_c.html":[8,1,1,3], @@ -93,8 +93,8 @@ var NAVTREEINDEX42 = "globals_type.html":[8,1,3], "globals_u.html":[8,1,0,21], "globals_v.html":[8,1,0,22], -"globals_vars.html":[8,1,2], "globals_vars.html":[8,1,2,0], +"globals_vars.html":[8,1,2], "globals_vars_b.html":[8,1,2,1], "globals_vars_c.html":[8,1,2,2], "globals_vars_d.html":[8,1,2,3], diff --git a/nonmatching_funcs.svg b/nonmatching_funcs.svg index c238def04..20edb9f2e 100644 --- a/nonmatching_funcs.svg +++ b/nonmatching_funcs.svg @@ -1 +1 @@ -NON_MATCHING functionsNON_MATCHING functions5252 \ No newline at end of file +NON_MATCHING functionsNON_MATCHING functions5353 \ No newline at end of file diff --git a/osPiStartDma_8c.html b/osPiStartDma_8c.html index 90bb16405..9de6d0159 100644 --- a/osPiStartDma_8c.html +++ b/osPiStartDma_8c.html @@ -167,7 +167,7 @@ Variables
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/osViBlack_8c.html b/osViBlack_8c.html index 97773127e..7b262f0f7 100644 --- a/osViBlack_8c.html +++ b/osViBlack_8c.html @@ -138,7 +138,7 @@ Variables
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/osViSwapBuffer_8c.html b/osViSwapBuffer_8c.html index 83e1e5f06..71496921e 100644 --- a/osViSwapBuffer_8c.html +++ b/osViSwapBuffer_8c.html @@ -138,7 +138,7 @@ Variables
    -
    Todo
    figure out what this flag means
    +
    Todo
    figure out what this flag means
    Here is the call graph for this function:
    diff --git a/os__pi_8h.html b/os__pi_8h.html index 86b5884ac..6e2c0bcb1 100644 --- a/os__pi_8h.html +++ b/os__pi_8h.html @@ -441,7 +441,7 @@ Here is the caller graph for this function:
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/os__vi_8h.html b/os__vi_8h.html index 430115be3..6e0309a0c 100644 --- a/os__vi_8h.html +++ b/os__vi_8h.html @@ -872,7 +872,7 @@ Here is the caller graph for this function:
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    @@ -990,7 +990,7 @@ Here is the caller graph for this function:
    -
    Todo
    figure out what this flag means
    +
    Todo
    figure out what this flag means
    Here is the call graph for this function:
    diff --git a/player__controller_8c.html b/player__controller_8c.html index 603a9641d..ad9e2cf8c 100644 --- a/player__controller_8c.html +++ b/player__controller_8c.html @@ -763,7 +763,7 @@ Here is the caller graph for this function:
    -
    Todo
    make a proper match
    +
    Todo
    make a proper match
    Here is the call graph for this function:
    diff --git a/player__controller_8h.html b/player__controller_8h.html index 73b2a7f0f..1633e0985 100644 --- a/player__controller_8h.html +++ b/player__controller_8h.html @@ -729,7 +729,7 @@ Here is the caller graph for this function:
    -
    Todo
    make a proper match
    +
    Todo
    make a proper match
    Here is the call graph for this function:
    diff --git a/podium__ceremony__actors_8c.html b/podium__ceremony__actors_8c.html index f1b45189b..b0983765b 100644 --- a/podium__ceremony__actors_8c.html +++ b/podium__ceremony__actors_8c.html @@ -595,7 +595,7 @@ Here is the caller graph for this function:
    Bug
    No null check.
    Bug
    -
    Todo
    More indepth error checking/return value
    +
    Todo
    More indepth error checking/return value
    Here is the call graph for this function:
    diff --git a/podium__ceremony__actors_8h.html b/podium__ceremony__actors_8h.html index 59a0378d8..68ed10cc8 100644 --- a/podium__ceremony__actors_8h.html +++ b/podium__ceremony__actors_8h.html @@ -555,7 +555,7 @@ Here is the caller graph for this function:
    Bug
    No null check.
    Bug
    -
    Todo
    More indepth error checking/return value
    +
    Todo
    More indepth error checking/return value
    Here is the call graph for this function:
    diff --git a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map index aaaa3ce71..8fca6d64f 100644 --- a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map +++ b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.map @@ -115,7 +115,7 @@ - + diff --git a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 index fa9097239..24ffbdf5c 100644 --- a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 +++ b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.md5 @@ -1 +1 @@ -84c2541c5165ec10bd3305f9e00733ee \ No newline at end of file +92144ebe7d845283398e330e29c04db9 \ No newline at end of file diff --git a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg index cb71b101e..753cd5303 100644 --- a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg +++ b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph.svg @@ -1110,7 +1110,7 @@ var sectionId = 'dynsection-1'; Node127 - + synthesis_process_note diff --git a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg index fe050d6c4..fc4482392 100644 --- a/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg +++ b/port__eu_8c_a17e6cb53d677ce7a809303aa122cb4cf_cgraph_org.svg @@ -1064,7 +1064,7 @@ Node127 - + synthesis_process_note diff --git a/race__logic_8c.html b/race__logic_8c.html index 4d1b251c2..6e79ad3fd 100644 --- a/race__logic_8c.html +++ b/race__logic_8c.html @@ -703,7 +703,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/race__logic_8h.html b/race__logic_8h.html index 44e87ce0a..a98eacff5 100644 --- a/race__logic_8h.html +++ b/race__logic_8h.html @@ -643,7 +643,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/search/all_15.js b/search/all_15.js index 72991314f..28d172cd4 100644 --- a/search/all_15.js +++ b/search/all_15.js @@ -852,7 +852,7 @@ var searchData= ['synthesis_5fexecute_849',['synthesis_execute',['../synthesis_8c.html#a2994f1f3d3603607ed9bca3243c1d5cf',1,'synthesis_execute(Acmd *acmd, s32 *writtenCmds, s16 *aiBuf, s32 bufLen): synthesis.c'],['../synthesis_8h.html#a1ced286cad738cbc3b205b3d763002d6',1,'synthesis_execute(Acmd *, s32 *, s16 *, s32): synthesis.c']]], ['synthesis_5fload_5fnote_5fsubs_5feu_850',['synthesis_load_note_subs_eu',['../synthesis_8c.html#ab469a6d9522ccd7bdcef898769a46a7a',1,'synthesis_load_note_subs_eu(s32 updateIndex): synthesis.c'],['../synthesis_8h.html#ab469a6d9522ccd7bdcef898769a46a7a',1,'synthesis_load_note_subs_eu(s32 updateIndex): synthesis.c']]], ['synthesis_5fload_5freverb_5fring_5fbuffer_851',['synthesis_load_reverb_ring_buffer',['../synthesis_8c.html#a56c377279f4c167258dd3b24d90cd107',1,'synthesis_load_reverb_ring_buffer(Acmd *acmd, u16 addr, u16 srcOffset, s32 len, s32 reverbIndex): synthesis.c'],['../synthesis_8h.html#a98b5785b65674a669175487b708d1fac',1,'synthesis_load_reverb_ring_buffer(Acmd *, u16, u16, s32, s32): synthesis.c']]], - ['synthesis_5fprocess_5fnote_852',['synthesis_process_note',['../synthesis_8h.html#a415dae6c7fca2d4899ad184cc2ec0fc9',1,'synthesis.h']]], + ['synthesis_5fprocess_5fnote_852',['synthesis_process_note',['../synthesis_8h.html#a4d0ec5e7a8c01fff5649d490397cbc64',1,'synthesis.h']]], ['synthesis_5fresample_5fand_5fmix_5freverb_853',['synthesis_resample_and_mix_reverb',['../synthesis_8c.html#aaf9767ca9ae81766b960502e1161e025',1,'synthesis_resample_and_mix_reverb(Acmd *acmd, s32 bufLen, s16 reverbIndex, s16 updateIndex): synthesis.c'],['../synthesis_8h.html#a6d3021a3852efebf658d4c1a1f741a5c',1,'synthesis_resample_and_mix_reverb(Acmd *, s32, s16, s16): synthesis.c']]], ['synthesis_5fsave_5freverb_5fring_5fbuffer_854',['synthesis_save_reverb_ring_buffer',['../synthesis_8c.html#a96e7d7b7eac8a9748d790519ae8151f9',1,'synthesis_save_reverb_ring_buffer(Acmd *acmd, u16 addr, u16 destOffset, s32 len, s32 reverbIndex): synthesis.c'],['../synthesis_8h.html#a4335280b9164016034f7e52d4f2ccef9',1,'synthesis_save_reverb_ring_buffer(Acmd *, u16, u16, s32, s32): synthesis.c']]], ['synthesis_5fsave_5freverb_5fsamples_855',['synthesis_save_reverb_samples',['../synthesis_8c.html#a1ed91750a5ecb20a5a76d4742c39311d',1,'synthesis_save_reverb_samples(Acmd *acmd, s16 reverbIndex, s16 updateIndex): synthesis.c'],['../synthesis_8h.html#aebc1a42723ab6d4ef65df99740d35318',1,'synthesis_save_reverb_samples(Acmd *, s16, s16): synthesis.c']]], diff --git a/search/all_19.js b/search/all_19.js index 10a5de2d1..08df9ff20 100644 --- a/search/all_19.js +++ b/search/all_19.js @@ -38,7 +38,7 @@ var searchData= ['windows_35',['Windows',['../compiling.html#windows',1,'']]], ['windowsize_36',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], ['wood_5fbridge_37',['WOOD_BRIDGE',['../mk64_8h.html#a5344f2bdca4f9506c40f044e08ea8c98a42cbce75b358c45ca5ca25e555dddc6c',1,'mk64.h']]], - ['word_38',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], + ['word_38',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], ['work_39',['How Actors Work',['../actors.html',1,'actorsmenu']]], ['wrapper_5fupdate_5fboos_40',['wrapper_update_boos',['../update__objects_8c.html#a33a1f1842134707236eefdf272dfdbae',1,'update_objects.c']]], ['write_5fdashes_41',['write_dashes',['../code__80091750_8c.html#a0a91d136dd3ef72cd4a4e1d1fed063f7',1,'write_dashes(char *buffer): code_80091750.c'],['../code__80091750_8h.html#af1655d98268206eb3b2490eb837deba5',1,'write_dashes(char *): code_80091750.c']]], diff --git a/search/all_5.js b/search/all_5.js index 09f29981c..713b9486c 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -594,7 +594,7 @@ var searchData= ['courseindex_591',['courseIndex',['../structstruct__8018EE10__entry.html#acee952c37d3917fd90809e58c6401e65',1,'struct_8018EE10_entry']]], ['courserecords_592',['courseRecords',['../structCupTimeTrialRecords.html#acf18ab0e69f90a2eefe248ef7090bd1c',1,'CupTimeTrialRecords']]], ['courses_593',['COURSES',['../mk64_8h.html#acf250ad4ca05ca435a61203c41d4ca88',1,'mk64.h']]], - ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses-1',1,'Courses'],['../controlflow.html#courses',1,'Courses']]], + ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses',1,'Courses'],['../controlflow.html#courses-1',1,'Courses']]], ['courses_2emd_595',['courses.md',['../courses_8md.html',1,'']]], ['coursesmenu_2emd_596',['coursesmenu.md',['../coursesmenu_8md.html',1,'']]], ['coursetable_597',['CourseTable',['../structCourseTable.html',1,'']]], diff --git a/search/functions_12.js b/search/functions_12.js index f061cb505..2825fb530 100644 --- a/search/functions_12.js +++ b/search/functions_12.js @@ -115,7 +115,7 @@ var searchData= ['synthesis_5fexecute_112',['synthesis_execute',['../synthesis_8c.html#a2994f1f3d3603607ed9bca3243c1d5cf',1,'synthesis_execute(Acmd *acmd, s32 *writtenCmds, s16 *aiBuf, s32 bufLen): synthesis.c'],['../synthesis_8h.html#a1ced286cad738cbc3b205b3d763002d6',1,'synthesis_execute(Acmd *, s32 *, s16 *, s32): synthesis.c']]], ['synthesis_5fload_5fnote_5fsubs_5feu_113',['synthesis_load_note_subs_eu',['../synthesis_8c.html#ab469a6d9522ccd7bdcef898769a46a7a',1,'synthesis_load_note_subs_eu(s32 updateIndex): synthesis.c'],['../synthesis_8h.html#ab469a6d9522ccd7bdcef898769a46a7a',1,'synthesis_load_note_subs_eu(s32 updateIndex): synthesis.c']]], ['synthesis_5fload_5freverb_5fring_5fbuffer_114',['synthesis_load_reverb_ring_buffer',['../synthesis_8c.html#a56c377279f4c167258dd3b24d90cd107',1,'synthesis_load_reverb_ring_buffer(Acmd *acmd, u16 addr, u16 srcOffset, s32 len, s32 reverbIndex): synthesis.c'],['../synthesis_8h.html#a98b5785b65674a669175487b708d1fac',1,'synthesis_load_reverb_ring_buffer(Acmd *, u16, u16, s32, s32): synthesis.c']]], - ['synthesis_5fprocess_5fnote_115',['synthesis_process_note',['../synthesis_8h.html#a415dae6c7fca2d4899ad184cc2ec0fc9',1,'synthesis.h']]], + ['synthesis_5fprocess_5fnote_115',['synthesis_process_note',['../synthesis_8h.html#a4d0ec5e7a8c01fff5649d490397cbc64',1,'synthesis.h']]], ['synthesis_5fresample_5fand_5fmix_5freverb_116',['synthesis_resample_and_mix_reverb',['../synthesis_8c.html#aaf9767ca9ae81766b960502e1161e025',1,'synthesis_resample_and_mix_reverb(Acmd *acmd, s32 bufLen, s16 reverbIndex, s16 updateIndex): synthesis.c'],['../synthesis_8h.html#a6d3021a3852efebf658d4c1a1f741a5c',1,'synthesis_resample_and_mix_reverb(Acmd *, s32, s16, s16): synthesis.c']]], ['synthesis_5fsave_5freverb_5fring_5fbuffer_117',['synthesis_save_reverb_ring_buffer',['../synthesis_8c.html#a96e7d7b7eac8a9748d790519ae8151f9',1,'synthesis_save_reverb_ring_buffer(Acmd *acmd, u16 addr, u16 destOffset, s32 len, s32 reverbIndex): synthesis.c'],['../synthesis_8h.html#a4335280b9164016034f7e52d4f2ccef9',1,'synthesis_save_reverb_ring_buffer(Acmd *, u16, u16, s32, s32): synthesis.c']]], ['synthesis_5fsave_5freverb_5fsamples_118',['synthesis_save_reverb_samples',['../synthesis_8c.html#a1ed91750a5ecb20a5a76d4742c39311d',1,'synthesis_save_reverb_samples(Acmd *acmd, s16 reverbIndex, s16 updateIndex): synthesis.c'],['../synthesis_8h.html#aebc1a42723ab6d4ef65df99740d35318',1,'synthesis_save_reverb_samples(Acmd *, s16, s16): synthesis.c']]] diff --git a/search/variables_17.js b/search/variables_17.js index 05e5d32ae..4c70cb05d 100644 --- a/search/variables_17.js +++ b/search/variables_17.js @@ -25,6 +25,6 @@ var searchData= ['wheelrot_22',['wheelRot',['../structTrainCar.html#a3e4c6d1091b4cf5a1683496409bda622',1,'TrainCar::wheelRot'],['../structPaddleWheelBoat.html#a500f0d5169fa8601aaba11cf13514b28',1,'PaddleWheelBoat::wheelRot']]], ['width_23',['width',['../structprintf__struct.html#ad8c9b5c908f18b8933081ae4b8f19b3a',1,'printf_struct::width'],['../structMkTexture.html#a6064846bc000f2003938cd14d4e62ff6',1,'MkTexture::width'],['../structOSViCommonRegs.html#a36050d774fce0c7479165a54e61296aa',1,'OSViCommonRegs::width']]], ['windowsize_24',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], - ['word_25',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], + ['word_25',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], ['wut_26',['wut',['../sherbet__land_2course__data_8c.html#a9eeed027c0accdad88ef82b59706956f',1,'wut: course_data.c'],['../sherbet__land_2course__data_8h.html#a9eeed027c0accdad88ef82b59706956f',1,'wut: course_data.c']]] ]; diff --git a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.map b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.map index 91bbf9200..c8688c485 100644 --- a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.map +++ b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.map @@ -111,7 +111,7 @@ - + diff --git a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.md5 b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.md5 index 063a73359..7cc9e4ec1 100644 --- a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.md5 +++ b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.md5 @@ -1 +1 @@ -4547e956c183e0963c422c2c3c3ac8ac \ No newline at end of file +e7d7151fbe3a45674d0a00ca1c9b0cd3 \ No newline at end of file diff --git a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.svg b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.svg index dcb612812..5cfe0a871 100644 --- a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.svg +++ b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph.svg @@ -1078,7 +1078,7 @@ var sectionId = 'dynsection-4'; Node83 - + synthesis_process_note diff --git a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph_org.svg b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph_org.svg index 357f5bb75..3c834a7c1 100644 --- a/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph_org.svg +++ b/synthesis_8c_a2994f1f3d3603607ed9bca3243c1d5cf_cgraph_org.svg @@ -1032,7 +1032,7 @@ Node83 - + synthesis_process_note diff --git a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.map b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.map index 036ec0fea..bf4e6a9af 100644 --- a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.map +++ b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.map @@ -1,6 +1,6 @@ - + diff --git a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.md5 b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.md5 index e962d0b58..adef1145c 100644 --- a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.md5 +++ b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.md5 @@ -1 +1 @@ -342f8ddf6af918f36504b888c6acb72d \ No newline at end of file +6755921bddb4cc43d36776cea005e15d \ No newline at end of file diff --git a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.svg b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.svg index d41899f8d..6b5b3a2e0 100644 --- a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.svg +++ b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph.svg @@ -31,7 +31,7 @@ Node2 - + synthesis_process_note diff --git a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph_org.svg b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph_org.svg index d67a209cf..7c6211e1e 100644 --- a/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph_org.svg +++ b/synthesis_8c_aec35bddc85303be6c4d1c22e44a77b06_cgraph_org.svg @@ -21,7 +21,7 @@ Node2 - + synthesis_process_note diff --git a/synthesis_8h.html b/synthesis_8h.html index 8986ec2c4..5d84351cc 100644 --- a/synthesis_8h.html +++ b/synthesis_8h.html @@ -185,8 +185,8 @@ Functions   Acmd * synthesis_do_one_audio_update (s16 *, s32, Acmd *, s32)   -Acmd * synthesis_process_note (s32, struct NoteSubEu *, struct NoteSynthesisState *, s16 *, s32, Acmd *, s32) -  +u64 * synthesis_process_note (s32 noteIndex, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s16 *aiBuf, s32 inBuf, u64 *cmd, s32 updateIndex) +  Acmd * load_wave_samples (Acmd *acmd, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s32 nSamplesToLoad)   Acmd * final_resample (Acmd *acmd, struct NoteSynthesisState *synthesisState, s32 count, u16 pitch, u16 dmemIn, u32 flags) @@ -790,53 +790,53 @@ Here is the caller graph for this function:
    - -

    ◆ synthesis_process_note()

    + +

    ◆ synthesis_process_note()

    - + - + - + - + - + - + - + - +
    Acmd * synthesis_process_note u64 * synthesis_process_note (s32 , s32 noteIndex,
    struct NoteSubEu * , struct NoteSubEu * noteSubEu,
    struct NoteSynthesisState * , struct NoteSynthesisState * synthesisState,
    s16 * , s16 * aiBuf,
    s32 , s32 inBuf,
    Acmd * , u64 * cmd,
    s32  )s32 updateIndex )
    Here is the caller graph for this function:
    -
    +
    diff --git a/synthesis_8h.js b/synthesis_8h.js index 94679d12d..e7182fbde 100644 --- a/synthesis_8h.js +++ b/synthesis_8h.js @@ -28,7 +28,7 @@ var synthesis_8h = [ "synthesis_execute", "synthesis_8h.html#a1ced286cad738cbc3b205b3d763002d6", null ], [ "synthesis_load_note_subs_eu", "synthesis_8h.html#ab469a6d9522ccd7bdcef898769a46a7a", null ], [ "synthesis_load_reverb_ring_buffer", "synthesis_8h.html#a98b5785b65674a669175487b708d1fac", null ], - [ "synthesis_process_note", "synthesis_8h.html#a415dae6c7fca2d4899ad184cc2ec0fc9", null ], + [ "synthesis_process_note", "synthesis_8h.html#a4d0ec5e7a8c01fff5649d490397cbc64", null ], [ "synthesis_resample_and_mix_reverb", "synthesis_8h.html#a6d3021a3852efebf658d4c1a1f741a5c", null ], [ "synthesis_save_reverb_ring_buffer", "synthesis_8h.html#a4335280b9164016034f7e52d4f2ccef9", null ], [ "synthesis_save_reverb_samples", "synthesis_8h.html#aebc1a42723ab6d4ef65df99740d35318", null ], diff --git a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.map b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.map index 91bbf9200..c8688c485 100644 --- a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.map +++ b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.map @@ -111,7 +111,7 @@ - + diff --git a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.md5 b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.md5 index 063a73359..7cc9e4ec1 100644 --- a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.md5 +++ b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.md5 @@ -1 +1 @@ -4547e956c183e0963c422c2c3c3ac8ac \ No newline at end of file +e7d7151fbe3a45674d0a00ca1c9b0cd3 \ No newline at end of file diff --git a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.svg b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.svg index 0b3fbefc2..c0fdc3b7c 100644 --- a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.svg +++ b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph.svg @@ -1078,7 +1078,7 @@ var sectionId = 'dynsection-5'; Node83 - + synthesis_process_note diff --git a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph_org.svg b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph_org.svg index 357f5bb75..3c834a7c1 100644 --- a/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph_org.svg +++ b/synthesis_8h_a1ced286cad738cbc3b205b3d763002d6_cgraph_org.svg @@ -1032,7 +1032,7 @@ Node83 - + synthesis_process_note diff --git a/synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.map b/synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.map similarity index 100% rename from synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.map rename to synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.map diff --git a/synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.md5 b/synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.md5 similarity index 100% rename from synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.md5 rename to synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.md5 diff --git a/synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.svg b/synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.svg similarity index 99% rename from synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.svg rename to synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.svg index 1541b2af1..f898b8b46 100644 --- a/synthesis_8h_a415dae6c7fca2d4899ad184cc2ec0fc9_icgraph.svg +++ b/synthesis_8h_a4d0ec5e7a8c01fff5649d490397cbc64_icgraph.svg @@ -205,7 +205,7 @@ var sectionId = 'dynsection-9'; - + - + diff --git a/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.md5 b/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.md5 index e962d0b58..adef1145c 100644 --- a/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.md5 +++ b/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.md5 @@ -1 +1 @@ -342f8ddf6af918f36504b888c6acb72d \ No newline at end of file +6755921bddb4cc43d36776cea005e15d \ No newline at end of file diff --git a/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.svg b/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.svg index d41899f8d..6b5b3a2e0 100644 --- a/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.svg +++ b/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph.svg @@ -31,7 +31,7 @@ Node2 - + synthesis_process_note diff --git a/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph_org.svg b/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph_org.svg index d67a209cf..7c6211e1e 100644 --- a/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph_org.svg +++ b/synthesis_8h_ac62830b08cf19a15a6543ae6c94b219d_cgraph_org.svg @@ -21,7 +21,7 @@ Node2 - + synthesis_process_note diff --git a/synthesis_8h_source.html b/synthesis_8h_source.html index cda690e73..5835f8f40 100644 --- a/synthesis_8h_source.html +++ b/synthesis_8h_source.html @@ -217,7 +217,7 @@ $(function(){initNavTree('synthesis_8h_source.html',''); initResizable(); });
    103Acmd *synthesis_resample_and_mix_reverb(Acmd*, s32, s16, s16);
    104Acmd *synthesis_save_reverb_samples(Acmd*, s16, s16);
    105Acmd *synthesis_do_one_audio_update(s16*, s32, Acmd*, s32);
    -
    106Acmd *synthesis_process_note(s32, struct NoteSubEu*, struct NoteSynthesisState*, s16*, s32, Acmd*, s32);
    +
    106u64 *synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s16 *aiBuf, s32 inBuf, u64 *cmd, s32 updateIndex);
    107Acmd *load_wave_samples(Acmd *acmd, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s32 nSamplesToLoad);
    108Acmd *final_resample(Acmd *acmd, struct NoteSynthesisState *synthesisState, s32 count, u16 pitch, u16 dmemIn, u32 flags);
    109Acmd *func_800B86A0(Acmd *cmd, struct NoteSubEu *note, struct NoteSynthesisState *synthesisState, s32 nSamples, u16 inBuf, s32 headsetPanSettings, u32 flags);
    @@ -240,6 +240,7 @@ $(function(){initNavTree('synthesis_8h_source.html',''); initResizable(); });
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    +
    u64
    unsigned long long int u64
    Definition llconv.c:2
    NoteSubEu
    Definition internal.h:409
    NoteSynthesisState
    Definition internal.h:382
    ReverbRingBufferItem
    Definition synthesis.h:57
    @@ -275,21 +276,21 @@ $(function(){initNavTree('synthesis_8h_source.html',''); initResizable(); });
    SynthesisReverb::nextRingBufferPos
    s32 nextRingBufferPos
    Definition synthesis.h:77
    SynthesisReverb::unk104
    s16 * unk104
    Definition synthesis.h:92
    synthesis_execute
    Acmd * synthesis_execute(Acmd *, s32 *, s16 *, s32)
    Definition synthesis.c:154
    -
    synthesis_process_note
    Acmd * synthesis_process_note(s32, struct NoteSubEu *, struct NoteSynthesisState *, s16 *, s32, Acmd *, s32)
    synthesis_save_reverb_ring_buffer
    Acmd * synthesis_save_reverb_ring_buffer(Acmd *, u16, u16, s32, s32)
    Definition synthesis.c:119
    gSynthesisReverbs
    struct SynthesisReverb gSynthesisReverbs[4]
    Definition synthesis.c:33
    +
    synthesis_process_note
    u64 * synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s16 *aiBuf, s32 inBuf, u64 *cmd, s32 updateIndex)
    synthesis_resample_and_mix_reverb
    Acmd * synthesis_resample_and_mix_reverb(Acmd *, s32, s16, s16)
    Definition synthesis.c:198
    func_800B6FB4
    void func_800B6FB4(s32 updateIndexStart, s32 noteIndex)
    Definition synthesis.c:125
    synthesis_load_reverb_ring_buffer
    Acmd * synthesis_load_reverb_ring_buffer(Acmd *, u16, u16, s32, s32)
    Definition synthesis.c:113
    prepare_reverb_ring_buffer
    void prepare_reverb_ring_buffer(s32 chunkLen, u32 updateIndex, s32 reverbIndex)
    Definition synthesis.c:60
    synthesis_load_note_subs_eu
    void synthesis_load_note_subs_eu(s32 updateIndex)
    Definition synthesis.c:137
    -
    note_apply_headset_pan_effects
    Acmd * note_apply_headset_pan_effects(Acmd *acmd, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *note, s32 bufLen, s32 flags, s32 leftRight)
    Definition synthesis.c:779
    +
    note_apply_headset_pan_effects
    Acmd * note_apply_headset_pan_effects(Acmd *acmd, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *note, s32 bufLen, s32 flags, s32 leftRight)
    Definition synthesis.c:812
    synthesis_do_one_audio_update
    Acmd * synthesis_do_one_audio_update(s16 *, s32, Acmd *, s32)
    Definition synthesis.c:254
    func_800B86A0
    Acmd * func_800B86A0(Acmd *cmd, struct NoteSubEu *note, struct NoteSynthesisState *synthesisState, s32 nSamples, u16 inBuf, s32 headsetPanSettings, u32 flags)
    MAX_UPDATES_PER_FRAME
    #define MAX_UPDATES_PER_FRAME
    Definition synthesis.h:55
    synthesis_save_reverb_samples
    Acmd * synthesis_save_reverb_samples(Acmd *, s16, s16)
    Definition synthesis.c:233
    -
    load_wave_samples
    Acmd * load_wave_samples(Acmd *acmd, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s32 nSamplesToLoad)
    Definition synthesis.c:672
    -
    final_resample
    Acmd * final_resample(Acmd *acmd, struct NoteSynthesisState *synthesisState, s32 count, u16 pitch, u16 dmemIn, u32 flags)
    Definition synthesis.c:688
    +
    load_wave_samples
    Acmd * load_wave_samples(Acmd *acmd, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s32 nSamplesToLoad)
    Definition synthesis.c:705
    +
    final_resample
    Acmd * final_resample(Acmd *acmd, struct NoteSynthesisState *synthesisState, s32 count, u16 pitch, u16 dmemIn, u32 flags)
    Definition synthesis.c:721
    s32
    signed int s32
    Definition ultratypes.h:15
    u32
    unsigned int u32
    Definition ultratypes.h:16
    s16
    signed short int s16
    Definition ultratypes.h:13
    diff --git a/toads__turnpike_2course__data_8c.html b/toads__turnpike_2course__data_8c.html index 1b978096a..0c0810c53 100644 --- a/toads__turnpike_2course__data_8c.html +++ b/toads__turnpike_2course__data_8c.html @@ -3026,7 +3026,7 @@ Variables
    G_IM_FMT_RGBA
    #define G_IM_FMT_RGBA
    Definition gbi.h:396
    G_IM_SIZ_16b
    #define G_IM_SIZ_16b
    Definition gbi.h:407
    G_CC_DECALRGBA
    #define G_CC_DECALRGBA
    Definition gbi.h:512
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/toads__turnpike_2course__data_8h.html b/toads__turnpike_2course__data_8h.html index 840c1177b..8649ed263 100644 --- a/toads__turnpike_2course__data_8h.html +++ b/toads__turnpike_2course__data_8h.html @@ -2812,7 +2812,7 @@ Variables
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/toads__turnpike_2course__offsets_8c.html b/toads__turnpike_2course__offsets_8c.html index af6acbc59..f9ca57c39 100644 --- a/toads__turnpike_2course__offsets_8c.html +++ b/toads__turnpike_2course__offsets_8c.html @@ -943,7 +943,7 @@ Variables
    {gTexture65127C, 0x01AB, 0x0800, 0x0},
    {gTextureRoad5, 0x02B9, 0x1000, 0x0},
    {gTextureSignToadRed, 0x0610, 0x1000, 0x0},
    -
    {gTexture668228, 0x0130, 0x0800, 0x0},
    +
    {gTexture668228, 0x0130, 0x0800, 0x0},
    {0x00000000, 0x0000, 0x0000, 0x0},
    }
    gTextureSignNintendoRed0
    u8 gTextureSignNintendoRed0[]
    @@ -963,8 +963,8 @@ Variables
    gTexture6608C8
    u8 gTexture6608C8[]
    gTextureRoad3
    u8 gTextureRoad3[]
    gTextureSignToadRed
    u8 gTextureSignToadRed[]
    +
    gTexture668228
    u8 gTexture668228[]
    gTextureRoad5
    u8 gTextureRoad5[]
    -
    gTexture668228
    u8 gTexture668228[]
    diff --git a/todo.html b/todo.html index 91a1645d0..d3c8aef30 100644 --- a/todo.html +++ b/todo.html @@ -105,8 +105,8 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global __osGetId (OSPfs *pfs)
    -

    loads of magic constants..

    -

    remove magic constant

    +

    remove magic constant

    +

    loads of magic constants..

    Global __osPfsReleasePages (OSPfs *pfs, __OSInode *inode, u8 start_page, u16 *sum, u8 bank, __OSInodeUnit *last_page, int flag)
    magic number
    @@ -115,8 +115,8 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global __osPiDevMgr
    In libreultra this is in an include
    Global __osRepairPackId (OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
    -

    remove magic constant

    -

    fix magic number

    +

    fix magic number

    +

    remove magic constant

    Global _course_mario_raceway_dl_mio0SegmentRomStart []
    These should probably be ptr's instead of array's?
    @@ -125,7 +125,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global BAD_RETURN (cmd)
    put this define in types.h or similar. Certain functions are marked as having return values, but do not actually return a value. This causes undefined behavior, which we'd rather avoid on modern GCC. This only impacts -O2 and can matter for both the function itself and functions that call it.
    Global clear_framebuffer (s32)
    -
    Why did void* work for matching
    +
    Why did void* work for matching
    Global D_800E43B0 []
    unused?
    Global D_8018D9B0
    @@ -157,13 +157,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global d_course_sherbet_land_dl_0 []
    Replace addresses with variables
    Global d_course_toads_turnpike_dl_0 []
    -
    Replace addresses with variables
    -
    Global d_course_wario_stadium_dl_0 []
    Replace addresses with variables
    +
    Global d_course_wario_stadium_dl_0 []
    +
    Replace addresses with variables
    Global d_course_yoshi_valley_dl_0 []
    Replace addresses with variables
    Global debug_switch_character_ceremony_cutscene (void)
    -
    confirm this.
    +
    confirm this.
    Union du

    is it possible to remove them somehow?

    is it possible to remove them somehow?

    @@ -175,7 +175,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800100F0 (s32)
    Confirm this comment
    Global func_80028864 (Player *, Camera *, s8, s8)
    -
    make a proper match
    +
    make a proper match
    Global func_80046030 (u8 *tlut, u8 *texture, Vtx *arg2, s32 width, s32 arg4, s32 height)
    tlut/texture unconfirmed. This could be texture1 and texture2
    Global func_8004B7DC (s32 x, s32 y, s32 width, s32 height, s32 arg4, s32 arg5, s32 arg6)
    @@ -189,13 +189,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800CBC24 (void)
    clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100
    Global func_80282D90 (struct CinematicCamera *, struct struct_80286A04 *, struct struct_80286A04 *, s32)
    -
    Cast to normal Camera? Or from CinematicCamera?
    +
    Cast to normal Camera? Or from CinematicCamera?
    Global func_8028336C (UNUSED struct CinematicCamera *arg0, UNUSED Camera *camera)
    -
    Does this match as a return of s8?
    +
    Does this match as a return of s8?
    Global func_802846E4 (struct CinematicCamera *)
    -
    What does this even do?
    +
    What does this even do?
    Global func_8028F970 (void)
    -
    increasing players past four would require increase this loop iterator.
    +
    increasing players past four would require increase this loop iterator.
    Global gen_random_item (s16 rank, s16 isCpu)
    Cleanup this function to use array access and struct if possible.
    Global gPlayerWinningIndex
    @@ -215,11 +215,11 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global M_TASK_FLAG0
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    Global MTX_KART_POOL_SIZE
    -
    Verify with proper documentation
    +
    Verify with proper documentation
    Global MTX_SHADOW_POOL_SIZE
    -
    Verify with proper documentation
    +
    Verify with proper documentation
    Global new_actor (ActorInitParams *)
    -
    More indepth error checking/return value
    +
    More indepth error checking/return value
    Global Note::priority
    use macros or something instead.
    Global osContInit (OSMesgQueue *mq, u8 *bitpattern, OSContStatus *status)
    @@ -227,13 +227,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global osPfsDeleteFile (OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name)
    magic constant
    Global osPiStartDma (OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq)
    -
    name magic constants
    +
    name magic constants
    Global osRomBase
    figure out why this is like this
    Global osViBlack (u8 active)
    -
    name magic constants
    +
    name magic constants
    Global osViSwapBuffer (void *vaddr)
    -
    figure out what this flag means
    +
    figure out what this flag means
    Global PI_DOMAIN1
    This define is from os.h, but including that causes problems...
    Global render_actor_shell (Camera *camera, Mat4 matrix, struct ShellActor *shell)
    diff --git a/train_2render_8inc_8c_source.html b/train_2render_8inc_8c_source.html index ecc1b405d..9997641fe 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -400,27 +400,27 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    293
    294 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    295 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    -
    296 mtxf_translate(spE0, sp160);
    -
    297 mtxf_multiplication(spA0, sp120, spE0);
    +
    296 mtxf_translate(spE0, sp160);
    +
    297 mtxf_multiplication(spA0, sp120, spE0);
    298
    -
    299 if (render_set_position(spA0, 3) == 0) { return; }
    +
    299 if (render_set_position(spA0, 3) == 0) { return; }
    300
    -
    301 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    302 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    301 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    302 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    303
    -
    304 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    -
    305 vec3f_set(sp160, 17.0f, 6.0f, -24.0f);
    -
    306 mtxf_translate(spE0, sp160);
    -
    307 mtxf_multiplication(spA0, sp120, spE0);
    +
    304 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    +
    305 vec3f_set(sp160, 17.0f, 6.0f, -24.0f);
    +
    306 mtxf_translate(spE0, sp160);
    +
    307 mtxf_multiplication(spA0, sp120, spE0);
    308
    -
    309 if (render_set_position(spA0, 3) == 0) { return; }
    +
    309 if (render_set_position(spA0, 3) == 0) { return; }
    310
    -
    311 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    312 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    311 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    312 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    313
    -
    314 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    -
    315 vec3f_set(sp160, -17.0f, 6.0f, -24.0f);
    -
    316 mtxf_translate(spE0, sp160);
    +
    314 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    +
    315 vec3f_set(sp160, -17.0f, 6.0f, -24.0f);
    +
    316 mtxf_translate(spE0, sp160);
    317 mtxf_multiplication(spA0, sp120, spE0);
    318
    319 if (render_set_position(spA0, 3) == 0) { return; }
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index beb6fc9c1..33fb991ac 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -218,174 +218,174 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    128void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    129 f32 temp_f0;
    -
    130 s16 temp_v0 = arg2->flags;
    +
    130 s16 temp_v0 = arg2->flags;
    131
    -
    132 if ((temp_v0 & 0x800) != 0) { return; }
    +
    132 if ((temp_v0 & 0x800) != 0) { return; }
    133
    -
    134 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    134 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    135
    -
    136 if (temp_f0 < 0.0f) { return; }
    +
    136 if (temp_f0 < 0.0f) { return; }
    137
    -
    138 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    138 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    139 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    140 }
    -
    141 arg1[3][0] = arg2->pos[0];
    -
    142 arg1[3][1] = arg2->pos[1];
    -
    143 arg1[3][2] = arg2->pos[2];
    +
    141 arg1[3][0] = arg2->pos[0];
    +
    142 arg1[3][1] = arg2->pos[1];
    +
    143 arg1[3][2] = arg2->pos[2];
    144
    -
    145 if (render_set_position(arg1, 0) != 0) {
    -
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    145 if (render_set_position(arg1, 0) != 0) {
    +
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    147 // Why is a TLUT being used a DL here? That makes no sense
    148 // Based on the TLUT being loaded above, this ought to be be another
    149 // tree related DL, presumably one found in a course other than Moo Moo farm
    150 // 0x0600FC70
    -
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    +
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    152 }
    153}
    154
    -
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    163 f32 temp_f0;
    -
    164 s16 temp_v0 = arg2->flags;
    +
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    163 f32 temp_f0;
    +
    164 s16 temp_v0 = arg2->flags;
    165
    -
    166 if ((temp_v0 & 0x800) != 0) { return; }
    +
    166 if ((temp_v0 & 0x800) != 0) { return; }
    167
    -
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    169
    -
    170 if (temp_f0 < 0.0f) { return; }
    +
    170 if (temp_f0 < 0.0f) { return; }
    171
    -
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    173 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    174 }
    -
    175 arg1[3][0] = arg2->pos[0];
    -
    176 arg1[3][1] = arg2->pos[1];
    -
    177 arg1[3][2] = arg2->pos[2];
    +
    175 arg1[3][0] = arg2->pos[0];
    +
    176 arg1[3][1] = arg2->pos[1];
    +
    177 arg1[3][2] = arg2->pos[2];
    178
    -
    179 if (render_set_position(arg1, 0) != 0) {
    -
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    +
    179 if (render_set_position(arg1, 0) != 0) {
    +
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    182 }
    183}
    184
    -
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    193 f32 temp_f0;
    -
    194 s16 temp_v0 = arg2->flags;
    +
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    193 f32 temp_f0;
    +
    194 s16 temp_v0 = arg2->flags;
    195
    -
    196 if ((temp_v0 & 0x800) != 0) { return; }
    +
    196 if ((temp_v0 & 0x800) != 0) { return; }
    197
    -
    198 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f);
    +
    198 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f);
    199
    -
    200 if (temp_f0 < 0.0f) { return; }
    +
    200 if (temp_f0 < 0.0f) { return; }
    201
    -
    202 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    202 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    203 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    204 }
    -
    205 arg1[3][0] = arg2->pos[0];
    -
    206 arg1[3][1] = arg2->pos[1];
    -
    207 arg1[3][2] = arg2->pos[2];
    +
    205 arg1[3][0] = arg2->pos[0];
    +
    206 arg1[3][1] = arg2->pos[1];
    +
    207 arg1[3][2] = arg2->pos[2];
    208
    -
    209 if (render_set_position(arg1, 0) != 0) {
    -
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    211 gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
    +
    209 if (render_set_position(arg1, 0) != 0) {
    +
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    211 gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
    212 }
    213}
    214
    -
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    223 f32 temp_f0;
    -
    224 s16 temp_v0 = arg2->flags;
    +
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    223 f32 temp_f0;
    +
    224 s16 temp_v0 = arg2->flags;
    225
    -
    226 if ((temp_v0 & 0x800) != 0) { return; }
    +
    226 if ((temp_v0 & 0x800) != 0) { return; }
    227
    -
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    229
    -
    230 if (temp_f0 < 0.0f) { return; }
    +
    230 if (temp_f0 < 0.0f) { return; }
    231
    -
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    233 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    234 }
    -
    235 arg1[3][0] = arg2->pos[0];
    -
    236 arg1[3][1] = arg2->pos[1];
    -
    237 arg1[3][2] = arg2->pos[2];
    +
    235 arg1[3][0] = arg2->pos[0];
    +
    236 arg1[3][1] = arg2->pos[1];
    +
    237 arg1[3][2] = arg2->pos[2];
    238
    -
    239 if (render_set_position(arg1, 0) != 0) {
    -
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    +
    239 if (render_set_position(arg1, 0) != 0) {
    +
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    241 }
    242}
    243
    -
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    252 f32 temp_f0;
    -
    253 s16 temp_v0 = arg2->flags;
    +
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    252 f32 temp_f0;
    +
    253 s16 temp_v0 = arg2->flags;
    254
    -
    255 if ((temp_v0 & 0x800) != 0) { return; }
    +
    255 if ((temp_v0 & 0x800) != 0) { return; }
    256
    -
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    258
    -
    259 if (temp_f0 < 0.0f) { return; }
    +
    259 if (temp_f0 < 0.0f) { return; }
    260
    -
    261 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    261 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    262 func_8029794C(arg2->pos, arg2->rot, 1.0f);
    263 }
    -
    264 arg1[3][0] = arg2->pos[0];
    -
    265 arg1[3][1] = arg2->pos[1];
    -
    266 arg1[3][2] = arg2->pos[2];
    +
    264 arg1[3][0] = arg2->pos[0];
    +
    265 arg1[3][1] = arg2->pos[1];
    +
    266 arg1[3][2] = arg2->pos[2];
    267
    -
    268 if (render_set_position(arg1, 0) != 0) {
    -
    269 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
    +
    268 if (render_set_position(arg1, 0) != 0) {
    +
    269 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
    270 }
    271}
    272
    -
    280void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    281 f32 temp_f0;
    -
    282 s16 temp_v0 = arg2->flags;
    +
    280void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    281 f32 temp_f0;
    +
    282 s16 temp_v0 = arg2->flags;
    283
    -
    284 if ((temp_v0 & 0x800) != 0) { return; }
    +
    284 if ((temp_v0 & 0x800) != 0) { return; }
    285
    -
    286 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    286 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    287
    -
    288 if (temp_f0 < 0.0f) { return; }
    +
    288 if (temp_f0 < 0.0f) { return; }
    289
    -
    290 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    290 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    291 func_8029794C(arg2->pos, arg2->rot, 1.0f);
    292 }
    -
    293 arg1[3][0] = arg2->pos[0];
    -
    294 arg1[3][1] = arg2->pos[1];
    -
    295 arg1[3][2] = arg2->pos[2];
    +
    293 arg1[3][0] = arg2->pos[0];
    +
    294 arg1[3][1] = arg2->pos[1];
    +
    295 arg1[3][2] = arg2->pos[2];
    296
    -
    297 if (render_set_position(arg1, 0) != 0) {
    -
    298 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
    +
    297 if (render_set_position(arg1, 0) != 0) {
    +
    298 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
    299 }
    300}
    301
    -
    309void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    310 f32 temp_f0;
    -
    311 s16 temp_v0 = arg2->flags;
    +
    309void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    310 f32 temp_f0;
    +
    311 s16 temp_v0 = arg2->flags;
    312
    -
    313 if ((temp_v0 & 0x800) != 0) { return; }
    +
    313 if ((temp_v0 & 0x800) != 0) { return; }
    314
    -
    315 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    315 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    316
    -
    317 if (temp_f0 < 0.0f) { return; }
    +
    317 if (temp_f0 < 0.0f) { return; }
    318
    -
    319 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    319 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    320 func_8029794C(arg2->pos, arg2->rot, 0.80000001f);
    321 }
    -
    322 arg1[3][0] = arg2->pos[0];
    -
    323 arg1[3][1] = arg2->pos[1];
    -
    324 arg1[3][2] = arg2->pos[2];
    +
    322 arg1[3][0] = arg2->pos[0];
    +
    323 arg1[3][1] = arg2->pos[1];
    +
    324 arg1[3][2] = arg2->pos[2];
    325
    -
    326 if (render_set_position(arg1, 0) != 0) {
    -
    327 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
    +
    326 if (render_set_position(arg1, 0) != 0) {
    +
    327 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
    328 }
    329}
    @@ -394,7 +394,6 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    all_course_data.h
    d_course_bowsers_castle_dl_bush
    Gfx d_course_bowsers_castle_dl_bush[]
    Definition course_data.c:3957
    camera1
    Camera * camera1
    Definition camera.c:23
    -
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    common_data.h
    common_tlut_trees_import
    u16 common_tlut_trees_import[]
    Mat4
    f32 Mat4[4][4]
    Definition common_structs.h:16
    diff --git a/uniondu.html b/uniondu.html index f586e1b61..d79bfaf46 100644 --- a/uniondu.html +++ b/uniondu.html @@ -115,14 +115,6 @@ Collaboration diagram for du:
    Data Fields double d   -struct {  -  -   unsigned int   hi  -  -   unsigned int   lo  -  -} word  -  struct {       unsigned int   hi  @@ -131,10 +123,18 @@ Data Fields   } word    +struct {  +  +   unsigned int   hi  +  +   unsigned int   lo  +  +} word  + 

    Detailed Description

    -
    Todo
    is it possible to remove them somehow?
    -
    Todo
    is it possible to remove them somehow?
    +
    Todo
    is it possible to remove them somehow?
    +
    Todo
    is it possible to remove them somehow?

    Field Documentation

    ◆ d

    @@ -178,8 +178,8 @@ Data Fields
    - -

    ◆ [struct] [1/2]

    + +

    ◆ [struct] [1/2]

    @@ -192,8 +192,8 @@ Data Fields
    - -

    ◆ [struct] [2/2]

    + +

    ◆ [struct] [2/2]

    diff --git a/uniondu.js b/uniondu.js index 04b625419..990f69433 100644 --- a/uniondu.js +++ b/uniondu.js @@ -3,6 +3,6 @@ var uniondu = [ "d", "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0", null ], [ "hi", "uniondu.html#ac24ce7d9a78b6632965424039e4362c3", null ], [ "lo", "uniondu.html#a1350494c6a09b425b926250e9b10b5c9", null ], - [ "word", "uniondu.html#a490dba023fb0b686d9a03b51508bcfad", null ], - [ "word", "uniondu.html#a06928fe4577a2d3ae425f6df73fbef26", null ] + [ "word", "uniondu.html#a06928fe4577a2d3ae425f6df73fbef26", null ], + [ "word", "uniondu.html#a490dba023fb0b686d9a03b51508bcfad", null ] ]; \ No newline at end of file diff --git a/wario__sign_2render_8inc_8c_source.html b/wario__sign_2render_8inc_8c_source.html index 58d6266aa..0956cb2a4 100644 --- a/wario__sign_2render_8inc_8c_source.html +++ b/wario__sign_2render_8inc_8c_source.html @@ -114,24 +114,25 @@ $(function(){initNavTree('wario__sign_2render_8inc_8c_source.html',''); initResi
    4#include "courses/wario_stadium/course_data.h"
    5
    -
    13void render_actor_wario_sign(Camera *arg0, struct Actor *arg1) {
    -
    14 Mat4 sp38;
    -
    15 f32 unk = is_within_render_distance(arg0->pos, arg1->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f);
    +
    13void render_actor_wario_sign(Camera *arg0, struct Actor *arg1) {
    +
    14 Mat4 sp38;
    +
    15 f32 unk = is_within_render_distance(arg0->pos, arg1->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f);
    16
    17 if (!(unk < 0.0f)) {
    -
    18 gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
    -
    19 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    +
    18 gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
    +
    19 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    20
    -
    21 mtxf_pos_rotation_xyz(sp38, arg1->pos, arg1->rot);
    -
    22 if (render_set_position(sp38, 0) != 0) {
    +
    21 mtxf_pos_rotation_xyz(sp38, arg1->pos, arg1->rot);
    +
    22 if (render_set_position(sp38, 0) != 0) {
    23
    -
    24 gSPDisplayList(gDisplayListHead++, d_course_wario_stadium_dl_sign);
    +
    24 gSPDisplayList(gDisplayListHead++, d_course_wario_stadium_dl_sign);
    25 }
    26 }
    27}
    camera1
    Camera * camera1
    Definition camera.c:23
    +
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    Mat4
    f32 Mat4[4][4]
    Definition common_structs.h:16
    G_SHADING_SMOOTH
    #define G_SHADING_SMOOTH
    Definition gbi.h:353
    @@ -143,11 +144,7 @@ $(function(){initNavTree('wario__sign_2render_8inc_8c_source.html',''); initResi
    mtxf_pos_rotation_xyz
    void mtxf_pos_rotation_xyz(Mat4 out, Vec3f pos, Vec3s orientation)
    Definition math_util.c:466
    render_set_position
    s32 render_set_position(Mat4 arg0, s32 arg1)
    Definition math_util.c:49
    Actor
    Definition actor_types.h:120
    -
    Actor::rot
    Vec3s rot
    Definition actor_types.h:127
    -
    Actor::pos
    Vec3f pos
    Definition actor_types.h:129
    Camera
    Definition camera.h:26
    -
    Camera::rot
    Vec3s rot
    Definition camera.h:33
    -
    Camera::pos
    Vec3f pos
    Definition camera.h:27
    f32
    float f32
    Definition ultratypes.h:33
    render_actor_wario_sign
    void render_actor_wario_sign(Camera *arg0, struct Actor *arg1)
    Renders the Wario sign actor. Used in Wario Stadium.
    Definition render.inc.c:13
    d_course_wario_stadium_dl_sign
    Gfx d_course_wario_stadium_dl_sign[]
    Definition course_data.c:4859
    diff --git a/wario__stadium_2course__data_8c.html b/wario__stadium_2course__data_8c.html index 387a9844b..258a5dd03 100644 --- a/wario__stadium_2course__data_8c.html +++ b/wario__stadium_2course__data_8c.html @@ -450,7 +450,7 @@ Variables
    d_course_wario_stadium_packed_dl_4218
    Gfx d_course_wario_stadium_packed_dl_4218[]
    Definition course_displaylists.inc.c:2649
    d_course_wario_stadium_packed_dl_5888
    Gfx d_course_wario_stadium_packed_dl_5888[]
    Definition course_displaylists.inc.c:3475
    d_course_wario_stadium_packed_dl_4BA8
    Gfx d_course_wario_stadium_packed_dl_4BA8[]
    Definition course_displaylists.inc.c:3007
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/wario__stadium_2course__data_8h.html b/wario__stadium_2course__data_8h.html index fa6f8f05b..5b98ef9fd 100644 --- a/wario__stadium_2course__data_8h.html +++ b/wario__stadium_2course__data_8h.html @@ -418,7 +418,7 @@ Variables
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/wario__stadium_2course__offsets_8c.html b/wario__stadium_2course__offsets_8c.html index 844180e31..041a0af3f 100644 --- a/wario__stadium_2course__offsets_8c.html +++ b/wario__stadium_2course__offsets_8c.html @@ -635,7 +635,7 @@ Variables
    {gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0},
    {gTexture64C11C, 0x0695, 0x0800, 0x0},
    {gTexture64C7B4, 0x046C, 0x0800, 0x0},
    -
    {gTexture668228, 0x0130, 0x0800, 0x0},
    +
    {gTexture668228, 0x0130, 0x0800, 0x0},
    {gTexture668358, 0x01A0, 0x0800, 0x0},
    {gTexture66AEB8, 0x0201, 0x0800, 0x0},
    {gTexture677A40, 0x0275, 0x0800, 0x0},
    @@ -659,13 +659,13 @@ Variables
    gTexture682F1C
    u8 gTexture682F1C[]
    gTexture682B24
    u8 gTexture682B24[]
    gTextureCheckerboardBlackWhite
    u8 gTextureCheckerboardBlackWhite[]
    +
    gTexture668228
    u8 gTexture668228[]
    gTexture677A40
    u8 gTexture677A40[]
    gTexture67E428
    u8 gTexture67E428[]
    gTextureSignWarioFace
    u8 gTextureSignWarioFace[]
    gTexture64C7B4
    u8 gTexture64C7B4[]
    gTexture643A34
    u8 gTexture643A34[]
    gTexture67F15C
    u8 gTexture67F15C[]
    -
    gTexture668228
    u8 gTexture668228[]
    gTexture64C11C
    u8 gTexture64C11C[]
    gTexture66AEB8
    u8 gTexture66AEB8[]
    gTexture67F450
    u8 gTexture67F450[]