diff --git a/actors.html b/actors.html index fb1e8f1af..ccd072f80 100644 --- a/actors.html +++ b/actors.html @@ -103,7 +103,7 @@ $(function(){initNavTree('actors.html',''); initResizable(); });
How Actors Work
-

+

Actors

If you are familiar with oot or sm64 prepare to be very disappointed. Both games split actors into separate files. In an unorderly fashion, mk64 appears to place all actors in the same file save for the odd exception.

Example actor setup based on update_course_actors

// Loop through the actor list and run that particular actors behaviour.
diff --git a/actorsmenu.html b/actorsmenu.html index f8807dd58..94bcb85a7 100644 --- a/actorsmenu.html +++ b/actorsmenu.html @@ -172,7 +172,7 @@ $(function(){initNavTree('actorsmenu.html',''); initResizable(); });

-

Actors Objects Vehicles Items

+

Actors Objects Vehicles Items

diff --git a/actorsmenu.js b/actorsmenu.js index fdd93972e..03d6a6bce 100644 --- a/actorsmenu.js +++ b/actorsmenu.js @@ -1,7 +1,7 @@ var actorsmenu = [ [ "How Actors Work", "actors.html", [ - [ "Actors", "actors.html#actors-1", null ] + [ "Actors", "actors.html#actors", null ] ] ], [ "Objects", "objects.html", [ [ "Objects", "objects.html#objects", null ] diff --git a/banshee__boardwalk_2course__data_8c.html b/banshee__boardwalk_2course__data_8c.html index f9b828631..3ed43b002 100644 --- a/banshee__boardwalk_2course__data_8c.html +++ b/banshee__boardwalk_2course__data_8c.html @@ -665,7 +665,7 @@ Variables
gsSPEndDisplayList(),
}
gCourseMaxZ
s16 gCourseMaxZ
Definition code_800029B0.c:93
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/banshee__boardwalk_2course__data_8h.html b/banshee__boardwalk_2course__data_8h.html index 72b9788aa..f60e8596f 100644 --- a/banshee__boardwalk_2course__data_8h.html +++ b/banshee__boardwalk_2course__data_8h.html @@ -716,7 +716,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/basics.js b/basics.js index 50263aa6b..8888e6745 100644 --- a/basics.js +++ b/basics.js @@ -24,7 +24,7 @@ var basics = [ "Code Breakdown", "controlflow.html#code-breakdown", [ [ "Menus", "controlflow.html#menus", null ], [ "Players", "controlflow.html#players", null ], - [ "Actors", "controlflow.html#actors", null ], + [ "Actors", "controlflow.html#actors-1", null ], [ "Objects", "controlflow.html#objects-1", null ], [ "Courses", "controlflow.html#courses", [ [ "Course Folder", "controlflow.html#course-folder", null ] diff --git a/big__donut_2course__data_8c.html b/big__donut_2course__data_8c.html index d9f52a6ed..64397fc44 100644 --- a/big__donut_2course__data_8c.html +++ b/big__donut_2course__data_8c.html @@ -160,7 +160,7 @@ Variables
G_RM_AA_ZB_OPA_SURF2
#define G_RM_AA_ZB_OPA_SURF2
Definition gbi.h:942
G_CC_MODULATEIA
#define G_CC_MODULATEIA
Definition gbi.h:492
G_RM_AA_ZB_TEX_EDGE
#define G_RM_AA_ZB_TEX_EDGE
Definition gbi.h:957
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/big__donut_2course__data_8h.html b/big__donut_2course__data_8h.html index 9283306e6..a0ac9a8a0 100644 --- a/big__donut_2course__data_8h.html +++ b/big__donut_2course__data_8h.html @@ -148,7 +148,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index 7cdae473f..51bd66cbd 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -149,136 +149,136 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
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++) {
-
163 player = &gPlayers[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; }
-
166 if (gPlayerBalloonCount[playerIndex] < 0) { continue; }
+
165 if (player == owner) {continue; }
+
166 if (gPlayerBalloonCount[playerIndex] < 0) { continue; }
167 // func_802B51E8 is not quite a 3D distance function, it doubles (rather than squares) the Z difference of the positions
-
168 playerToShellDistance = func_802B51E8(player->pos, shell->pos);
-
169 if (playerToShellDistance < smallestDistance) {
-
170 smallestDistance = playerToShellDistance;
+
168 playerToShellDistance = func_802B51E8(player->pos, shell->pos);
+
169 if (playerToShellDistance < smallestDistance) {
+
170 smallestDistance = playerToShellDistance;
171 playerId = player - gPlayerOne;
172 }
173
@@ -289,54 +289,54 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
178
-
179void func_802B4104(struct ShellActor *shell) {
-
180 if ((shell->unk30.unk3C[0] < 0.0f) && ((shell->unk30.unk48[1] < 0.25f) || (shell->unk30.unk48[1] > -0.25f))) {
-
181 destroy_destructable_actor((struct Actor *) shell);
-
182 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
-
183 shell->flags |= 0x80;
-
184 } else if ((shell->unk30.unk3C[1] < 0.0f) && ((shell->unk30.unk54[1] < 0.25f) || (shell->unk30.unk54[1] < -0.25f))) {
-
185 destroy_destructable_actor((struct Actor *) shell);
-
186 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
-
187 shell->flags |= 0x80;
+
179void func_802B4104(struct ShellActor *shell) {
+
180 if ((shell->unk30.unk3C[0] < 0.0f) && ((shell->unk30.unk48[1] < 0.25f) || (shell->unk30.unk48[1] > -0.25f))) {
+
181 destroy_destructable_actor((struct Actor *) shell);
+
182 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
+
183 shell->flags |= 0x80;
+
184 } else if ((shell->unk30.unk3C[1] < 0.0f) && ((shell->unk30.unk54[1] < 0.25f) || (shell->unk30.unk54[1] < -0.25f))) {
+
185 destroy_destructable_actor((struct Actor *) shell);
+
186 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
+
187 shell->flags |= 0x80;
188 }
189}
190
-
196void update_actor_red_blue_shell(struct ShellActor *shell) {
-
197 UNUSED f32 pad9;
+
196void update_actor_red_blue_shell(struct ShellActor *shell) {
+
197 UNUSED f32 pad9;
198 Player *player;
-
199 f32 temp_f0;
-
200 UNUSED f32 temp_f14;
-
201 f32 temp_f2;
-
202 s16 temp_v0;
+
199 f32 temp_f0;
+
200 UNUSED f32 temp_f14;
+
201 f32 temp_f2;
+
202 s16 temp_v0;
203 UNUSED s16 pad3;
-
204 Vec3f somePosVel;
-
205 struct Controller *controller;
-
206 TripleShellParent *parent;
+
204 Vec3f somePosVel;
+
205 struct Controller *controller;
+
206 TripleShellParent *parent;
207 UNUSED f32 pad0;
208 UNUSED f32 pad1;
209 UNUSED f32 pad2;
-
210 UNUSED f32 pad4;
-
211 UNUSED f32 pad5;
-
212 UNUSED f32 pad6;
-
213 UNUSED f32 pad7;
-
214 UNUSED f32 pad8;
-
215 UNUSED f32 pad10;
-
216 UNUSED f32 pad11;
-
217 UNUSED f32 pad12;
-
218 UNUSED s16 pad13;
-
219 UNUSED s16 pad13_2;
-
220 UNUSED f32 pad14;
-
221 UNUSED f32 pad15;
-
222 UNUSED f32 pad16;
-
223 UNUSED f32 pad17;
-
224 Vec3f origPos;
+
210 UNUSED f32 pad4;
+
211 UNUSED f32 pad5;
+
212 UNUSED f32 pad6;
+
213 UNUSED f32 pad7;
+
214 UNUSED f32 pad8;
+
215 UNUSED f32 pad10;
+
216 UNUSED f32 pad11;
+
217 UNUSED f32 pad12;
+
218 UNUSED s16 pad13;
+
219 UNUSED s16 pad13_2;
+
220 UNUSED f32 pad14;
+
221 UNUSED f32 pad15;
+
222 UNUSED f32 pad16;
+
223 UNUSED f32 pad17;
+
224 Vec3f origPos;
225
-
226 pad1 = shell->pos[0];
-
227 pad0 = shell->pos[2];
-
228 pad2 = shell->pos[1];
-
229 pad13 = shell->type;
+
226 pad1 = shell->pos[0];
+
227 pad0 = shell->pos[2];
+
228 pad2 = shell->pos[1];
+
229 pad13 = shell->type;
230 if ((pad0 < (f32) gCourseMinZ) || ((f32) gCourseMaxZ < pad0) || (pad1 < (f32) gCourseMinX) || ((f32) gCourseMaxX < pad1) || (pad2 < (f32) gCourseMinY)) {
231 destroy_destructable_actor((struct Actor *) shell);
232 }
@@ -643,14 +643,8 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
Z_TRIG
#define Z_TRIG
Definition os.h:398
SOUND_ARG_LOAD
#define SOUND_ARG_LOAD(sound_bank, byte2, byte3, sound_id)
Definition sounds.h:14
Actor
Definition actor_types.h:120
-
Actor::velocity
Vec3f velocity
Definition actor_types.h:130
-
Actor::flags
s16 flags
Definition actor_types.h:122
-
Actor::pos
Vec3f pos
Definition actor_types.h:129
-
Collision::unk3C
Vec3f unk3C
Definition common_structs.h:125
Collision::unk30
u16 unk30
Definition common_structs.h:118
Collision::unk3A
u16 unk3A
Definition common_structs.h:124
-
Collision::unk54
Vec3f unk54
Definition common_structs.h:127
-
Collision::unk48
Vec3f unk48
Definition common_structs.h:126
Controller
Definition types.h:43
Controller::buttonDepressed
u16 buttonDepressed
Definition types.h:48
Player
Definition common_structs.h:248
@@ -666,16 +660,12 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
Player::currentRank
s16 currentRank
Definition common_structs.h:251
Player::pos
Vec3f pos
Definition common_structs.h:258
ShellActor
Definition actor_types.h:302
-
ShellActor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:315
-
ShellActor::type
s16 type
Definition actor_types.h:303
-
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
TripleShellParent
Definition actor_types.h:286
+
TripleShellParent::type
s16 type
Definition actor_types.h:287
s32
signed int s32
Definition ultratypes.h:15
s16
signed short int s16
Definition ultratypes.h:13
f32
float f32
Definition ultratypes.h:33
diff --git a/bug.html b/bug.html index 3bbf85e12..720ad827a 100644 --- a/bug.html +++ b/bug.html @@ -117,7 +117,7 @@ $(function(){initNavTree('bug.html',''); initResizable(); });
Global func_802AF314 (void)
possibly bug. Allocate memory but not increment the pointer. This is bad, dumb code, and more importantly it's bad dumb code that doesn't make any sense here. It is incremented after this function completes using a different variable. Not good.
Global init_sequence_players (void)
-
Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
+
Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
Global load_ceremony_cutscene (void)
these segmented addresses need to be symbols for mobility
Global load_sequence_internal (u32, u32, s32)
@@ -127,7 +127,7 @@ $(function(){initNavTree('bug.html',''); initResizable(); });

Global note_set_vel_pan_reverb (struct Note *note, f32 velocity, u8 pan, u8 reverbVol)
-
for the change to UQ0.7, the if statement should also have been changed accordingly
+
for the change to UQ0.7, the if statement should also have been changed accordingly
Global preload_sequence (u32, u8)
should be IS_SEQ_LOAD_COMPLETE
Global update_gamestate (void)
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 957409a15..b68eb5aab 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -1008,7 +1008,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:
@@ -1295,7 +1295,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:
@@ -2367,7 +2367,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 a7448a0bf..137e34dda 100644 --- a/ceremony__and__credits_8h.html +++ b/ceremony__and__credits_8h.html @@ -955,7 +955,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:
@@ -2197,7 +2197,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 627cb3a2f..b4b08db26 100644 --- a/choco__mountain_2course__offsets_8c.html +++ b/choco__mountain_2course__offsets_8c.html @@ -192,10 +192,10 @@ 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},
+
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
{gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
{gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0},
@@ -211,6 +211,7 @@ Variables
{0x00000000, 0x0000, 0x0000, 0x0},
}
gTexture64FBF4
u8 gTexture64FBF4[]
+
gTexture653DB0
u8 gTexture653DB0[]
gTexture67B864
u8 gTexture67B864[]
gTexture65315C
u8 gTexture65315C[]
gTexture679C04
u8 gTexture679C04[]
@@ -219,17 +220,16 @@ Variables
gTexture64647C
u8 gTexture64647C[]
gTextureSignLuigis0
u8 gTextureSignLuigis0[]
gTexture652B54
u8 gTexture652B54[]
-
gTexture6684F8
u8 gTexture6684F8[]
gTextureSignYoshi
u8 gTextureSignYoshi[]
gTextureSignNintendoRed1
u8 gTextureSignNintendoRed1[]
gTextureSignLuigis1
u8 gTextureSignLuigis1[]
gTexture64619C
u8 gTexture64619C[]
gTextureSignBackside
u8 gTextureSignBackside[]
gTexture6774D8
u8 gTexture6774D8[]
-
gTexture653DB0
u8 gTexture653DB0[]
gTextureSignFallingRocks
u8 gTextureSignFallingRocks[]
gTexture647F4C
u8 gTexture647F4C[]
gTexture67DC20
u8 gTexture67DC20[]
+
gTexture6684F8
u8 gTexture6684F8[]
diff --git a/code__80091750_8c.html b/code__80091750_8c.html index e1f869167..ca437d8ca 100644 --- a/code__80091750_8c.html +++ b/code__80091750_8c.html @@ -1879,7 +1879,7 @@ Here is the caller graph for this function:
-
Todo
These sizes need to be sizeof() for shiftability if possible
+
Todo
These sizes need to be sizeof() for shiftability if possible
Here is the call graph for this function:
@@ -12162,7 +12162,7 @@ Here is the caller graph for this function:
-
Todo
Move gGfxPool out of main.h
+
Todo
Move gGfxPool out of main.h
diff --git a/code__80091750_8h.html b/code__80091750_8h.html index 16047a98d..19cbdb429 100644 --- a/code__80091750_8h.html +++ b/code__80091750_8h.html @@ -2057,7 +2057,7 @@ Here is the caller graph for this function:
-
Todo
These sizes need to be sizeof() for shiftability if possible
+
Todo
These sizes need to be sizeof() for shiftability if possible
Here is the call graph for this function:
@@ -13150,7 +13150,7 @@ Here is the caller graph for this function:
-
Todo
Move gGfxPool out of main.h
+
Todo
Move gGfxPool out of main.h
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index 427df7a0b..2aa52b199 100644 --- a/code__80281780_8c.html +++ b/code__80281780_8c.html @@ -165,7 +165,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 affe4d396..72e5eb8c6 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/contpfs_8c.html b/contpfs_8c.html index 1703a39ef..ec5c98925 100644 --- a/contpfs_8c.html +++ b/contpfs_8c.html @@ -205,8 +205,8 @@ Here is the caller graph for this function:
-
Todo
remove magic constant
-
Todo
loads of magic constants..
+
Todo
remove magic constant
+
Todo
loads of magic constants..
Here is the call graph for this function:
@@ -279,7 +279,7 @@ Here is the caller graph for this function:
-
Todo
don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
+
Todo
don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
Here is the call graph for this function:
@@ -343,8 +343,8 @@ Here is the caller graph for this function:
-
Todo
fix magic number
-
Todo
remove magic constant
+
Todo
fix magic number
+
Todo
remove magic constant
Here is the call graph for this function:
diff --git a/controlflow.html b/controlflow.html index 3f27da4de..bb49c133d 100644 --- a/controlflow.html +++ b/controlflow.html @@ -110,7 +110,7 @@ $(function(){initNavTree('controlflow.html',''); initResizable(); });
  • Segments
  • Code Breakdown
    • Menus
    • Players
      • -
    • Actors
      • +
    • Actors
    • Objects
    • Courses @@ -220,7 +220,7 @@ Players camera Player cameras -

      +

      Actors

      Actor related code resides in

      diff --git a/controller_8h.html b/controller_8h.html index 0db747f41..57432f08a 100644 --- a/controller_8h.html +++ b/controller_8h.html @@ -1095,8 +1095,8 @@ Here is the caller graph for this function:
    • -
    Todo
    remove magic constant
    -
    Todo
    loads of magic constants..
    +
    Todo
    remove magic constant
    +
    Todo
    loads of magic constants..
    Here is the call graph for this function:
    @@ -1383,7 +1383,7 @@ Here is the caller graph for this function:
    -
    Todo
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    +
    Todo
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    Here is the call graph for this function:
    @@ -1447,8 +1447,8 @@ Here is the caller graph for this function:
    -
    Todo
    fix magic number
    -
    Todo
    remove magic constant
    +
    Todo
    fix magic number
    +
    Todo
    remove magic constant
    Here is the call graph for this function:
    diff --git a/controller_8h_source.html b/controller_8h_source.html index 4e6a830bd..b404a8a3f 100644 --- a/controller_8h_source.html +++ b/controller_8h_source.html @@ -184,7 +184,7 @@ $(function(){initNavTree('controller_8h_source.html',''); initResizable(); });
    63 {
    64 /* 0x0 */ u8 bank;
    65 /* 0x1 */ u8 page;
    -
    66 } inode_t;
    +
    66 } inode_t;
    67 /* 0x0 */ u16 ipage;
    68} __OSInodeUnit;
    diff --git a/dks__jungle__parkway_2course__offsets_8c.html b/dks__jungle__parkway_2course__offsets_8c.html index 844b4647d..8494c3999 100644 --- a/dks__jungle__parkway_2course__offsets_8c.html +++ b/dks__jungle__parkway_2course__offsets_8c.html @@ -180,7 +180,7 @@ Variables
    Initial value:
    = {
    {gTexture648508, 0x01FE, 0x1000, 0x0},
    -
    {gTexture6684F8, 0x010D, 0x0800, 0x0},
    +
    {gTexture6684F8, 0x010D, 0x0800, 0x0},
    {gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0},
    {gTexture654460, 0x0B12, 0x1000, 0x0},
    {gTexture654F74, 0x0A24, 0x1000, 0x0},
    @@ -205,7 +205,6 @@ Variables
    {gTexture683844, 0x0655, 0x0800, 0x0},
    {0x00000000, 0x0000, 0x0000, 0x0},
    }
    -
    gTexture6684F8
    u8 gTexture6684F8[]
    gTexture65E2EC
    u8 gTexture65E2EC[]
    gTexture655998
    u8 gTexture655998[]
    gTexture65E59C
    u8 gTexture65E59C[]
    @@ -220,6 +219,7 @@ Variables
    gTexture65C8DC
    u8 gTexture65C8DC[]
    gTexture65BB3C
    u8 gTexture65BB3C[]
    gTexture65FB18
    u8 gTexture65FB18[]
    +
    gTexture6684F8
    u8 gTexture6684F8[]
    gTexture654460
    u8 gTexture654460[]
    gTexture65ADE0
    u8 gTexture65ADE0[]
    gTexture658370
    u8 gTexture658370[]
    diff --git a/doxygen_crawl.html b/doxygen_crawl.html index 688725f88..7f4616376 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -27,8 +27,8 @@ - + @@ -58,8 +58,8 @@ - + @@ -124,8 +124,8 @@ - + @@ -154,10 +154,10 @@ - - + + @@ -290,10 +290,10 @@ - + @@ -357,16 +357,16 @@ - + - + @@ -375,9 +375,9 @@ - + @@ -409,16 +409,15 @@ + - - - + @@ -427,8 +426,8 @@ - + @@ -440,6 +439,7 @@ + @@ -466,8 +466,8 @@ - + @@ -521,13 +521,13 @@ - + - + @@ -554,21 +554,21 @@ - + - + - + @@ -650,14 +650,14 @@ - - - + + + + - @@ -681,11 +681,11 @@ - + - + @@ -708,13 +708,13 @@ - + + - @@ -738,12 +738,12 @@ - + - + @@ -805,10 +805,10 @@ + + - - @@ -850,13 +850,13 @@ - + - + @@ -874,8 +874,8 @@ - + @@ -931,17 +931,17 @@ - + + - @@ -952,8 +952,8 @@ - + @@ -966,11 +966,11 @@ + + - - @@ -1027,21 +1027,21 @@ - - + - + + + - @@ -1051,11 +1051,11 @@ + - @@ -1064,9 +1064,9 @@ - + diff --git a/fake__item__box_2update_8inc_8c_source.html b/fake__item__box_2update_8inc_8c_source.html index 29b44bcae..2238ed9fd 100644 --- a/fake__item__box_2update_8inc_8c_source.html +++ b/fake__item__box_2update_8inc_8c_source.html @@ -112,19 +112,19 @@ $(function(){initNavTree('fake__item__box_2update_8inc_8c_source.html',''); init
    2#include <main.h>
    3
    -
    9void update_actor_fake_item_box(struct FakeItemBox *fake_item_box) {
    -
    10 u32 temp_v1 = fake_item_box->playerId;
    -
    11 Player *temp_v0_4 = &gPlayers[temp_v1];
    -
    12 struct Controller *temp_v1_3;
    +
    9void update_actor_fake_item_box(struct FakeItemBox *fake_item_box) {
    +
    10 u32 temp_v1 = fake_item_box->playerId;
    +
    11 Player *temp_v0_4 = &gPlayers[temp_v1];
    +
    12 struct Controller *temp_v1_3;
    13
    14 UNUSED s32 pad[7];
    -
    15 f32 temp_f2_2;
    -
    16 f32 temp_f14;
    -
    17 f32 temp_f16;
    -
    18 f32 temp_f18;
    +
    15 f32 temp_f2_2;
    +
    16 f32 temp_f14;
    +
    17 f32 temp_f16;
    +
    18 f32 temp_f18;
    19 UNUSED s32 pad2[3];
    20
    -
    21 switch(fake_item_box->state) {
    +
    21 switch(fake_item_box->state) {
    22 case 0:
    23 fake_item_box->boundingBoxSize = fake_item_box->sizeScaling * 5.5f;
    24 fake_item_box->rot[0] -= 0xB6;
    @@ -217,8 +217,6 @@ $(function(){initNavTree('fake__item__box_2update_8inc_8c_source.html',''); init
    Controller
    Definition types.h:43
    Controller::buttonDepressed
    u16 buttonDepressed
    Definition types.h:48
    FakeItemBox
    Definition actor_types.h:346
    -
    FakeItemBox::playerId
    f32 playerId
    Definition actor_types.h:356
    -
    FakeItemBox::state
    s16 state
    Definition actor_types.h:350
    Player
    Definition common_structs.h:248
    s32
    signed int s32
    Definition ultratypes.h:15
    u32
    unsigned int u32
    Definition ultratypes.h:16
    diff --git a/frappe__snowland_2course__offsets_8c.html b/frappe__snowland_2course__offsets_8c.html index 2e13172a4..0fc3bd865 100644 --- a/frappe__snowland_2course__offsets_8c.html +++ b/frappe__snowland_2course__offsets_8c.html @@ -147,7 +147,7 @@ Variables
    Initial value:
    = {
    -
    {gTexture6684F8, 0x010D, 0x0800, 0x0},
    +
    {gTexture6684F8, 0x010D, 0x0800, 0x0},
    {gTexture66CA98, 0x02C9, 0x0800, 0x0},
    {gTexture66EBF0, 0x0146, 0x0800, 0x0},
    {gTexture675434, 0x0245, 0x0800, 0x0},
    @@ -159,7 +159,7 @@ Variables
    }
    gTexture66CA98
    u8 gTexture66CA98[]
    gTexture66EBF0
    u8 gTexture66EBF0[]
    -
    gTexture6684F8
    u8 gTexture6684F8[]
    +
    gTexture6684F8
    u8 gTexture6684F8[]
    gTexture67973C
    u8 gTexture67973C[]
    gTexture675434
    u8 gTexture675434[]
    gTexture678118
    u8 gTexture678118[]
    diff --git a/functions_i.html b/functions_i.html index 717f8e03c..ba6966db2 100644 --- a/functions_i.html +++ b/functions_i.html @@ -126,7 +126,7 @@ $(function(){initNavTree('functions_i.html',''); initResizable(); });
  • initParams : CeremonyActor, Firework
  • inode : __OSInodeCache
  • inode_page : __OSInode
    • -
  • inode_t : __OSInodeUnit
    • +
  • inode_t : __OSInodeUnit
  • instArray : ALBank_s
  • instCount : ALBank_s
  • instOrWave : SequenceChannel, SequenceChannelLayer
    • diff --git a/functions_vars_i.html b/functions_vars_i.html index 96bc8f9da..547b9dafb 100644 --- a/functions_vars_i.html +++ b/functions_vars_i.html @@ -126,7 +126,7 @@ $(function(){initNavTree('functions_vars_i.html',''); initResizable(); });
  • initParams : CeremonyActor, Firework
  • inode : __OSInodeCache
  • inode_page : __OSInode
    • -
  • inode_t : __OSInodeUnit
    • +
  • inode_t : __OSInodeUnit
  • instArray : ALBank_s
  • instCount : ALBank_s
  • instOrWave : SequenceChannel, SequenceChannelLayer
    • diff --git a/functions_vars_w.html b/functions_vars_w.html index c2dee11a3..3bfa6a2a8 100644 --- a/functions_vars_w.html +++ b/functions_vars_w.html @@ -111,7 +111,7 @@ $(function(){initNavTree('functions_vars_w.html',''); initResizable(); });
  • wantTemporary : PoolSplit2
  • wantUnused : PoolSplit
  • waveId : Note, NotePlaybackState
    • -
  • waveInfo : ALWaveTable_s
    • +
  • waveInfo : ALWaveTable_s
  • wavetable : ALSound_s
  • waypointEnd : KartAIBehaviour
  • waypointIndex : BombKart, BombKartSpawn, PaddleBoatStuff, TrainCarStuff, VehicleStuff
    • @@ -124,7 +124,7 @@ $(function(){initNavTree('functions_vars_w.html',''); initResizable(); });
  • wheelRot : PaddleWheelBoat, TrainCar
  • width : MkTexture, OSViCommonRegs, printf_struct
  • windowSize : ReverbSettingsEU, SynthesisReverb
    • -
  • word : du, GameModePack
    • +
  • word : du, GameModePack
    • diff --git a/functions_w.html b/functions_w.html index 0fcf6fa77..37766c989 100644 --- a/functions_w.html +++ b/functions_w.html @@ -111,7 +111,7 @@ $(function(){initNavTree('functions_w.html',''); initResizable(); });
  • wantTemporary : PoolSplit2
  • wantUnused : PoolSplit
  • waveId : Note, NotePlaybackState
    • -
  • waveInfo : ALWaveTable_s
    • +
  • waveInfo : ALWaveTable_s
  • wavetable : ALSound_s
  • waypointEnd : KartAIBehaviour
  • waypointIndex : BombKart, BombKartSpawn, PaddleBoatStuff, TrainCarStuff, VehicleStuff
    • @@ -124,7 +124,7 @@ $(function(){initNavTree('functions_w.html',''); initResizable(); });
  • wheelRot : PaddleWheelBoat, TrainCar
  • width : MkTexture, OSViCommonRegs, printf_struct
  • windowSize : ReverbSettingsEU, SynthesisReverb
    • -
  • word : du, GameModePack
    • +
  • word : du, GameModePack
    • diff --git a/globals_a.html b/globals_a.html index 0e61c800c..b96529a6d 100644 --- a/globals_a.html +++ b/globals_a.html @@ -240,9 +240,9 @@ $(function(){initNavTree('globals_a.html',''); initResizable(); });
  • AI_STATUS_REG : hardware.h, rcp.h
  • AIBUFFER_LEN : data.h
  • AIRBORNE : common_structs.h
    • -
  • AL_ADPCM_WAVE : libaudio_internal.h
    • +
  • AL_ADPCM_WAVE : libaudio_internal.h
  • AL_BANK_VERSION : libaudio_internal.h
    • -
  • AL_RAW16_WAVE : libaudio_internal.h
    • +
  • AL_RAW16_WAVE : libaudio_internal.h
  • ALBank : libaudio_internal.h
  • alBnkfNew() : alBnkfNew.c, libaudio_internal.h
  • ALIGN : synthesis.h
    • diff --git a/globals_eval.html b/globals_eval.html index 968f70370..861da1f91 100644 --- a/globals_eval.html +++ b/globals_eval.html @@ -151,8 +151,8 @@ $(function(){initNavTree('globals_eval.html',''); initResizable(); });
  • ACTOR_YOSHI_EGG : actor_types.h
  • AFTER_DISPLAY_LISTS : profiler.h
  • AIRBORNE : common_structs.h
    • -
  • AL_ADPCM_WAVE : libaudio_internal.h
    • -
  • AL_RAW16_WAVE : libaudio_internal.h
    • +
  • AL_ADPCM_WAVE : libaudio_internal.h
    • +
  • AL_RAW16_WAVE : libaudio_internal.h
  • ASPHALT : common_structs.h
    • diff --git a/kalimari__desert_2course__offsets_8c.html b/kalimari__desert_2course__offsets_8c.html index fb444c4b7..c4780451e 100644 --- a/kalimari__desert_2course__offsets_8c.html +++ b/kalimari__desert_2course__offsets_8c.html @@ -748,7 +748,7 @@ Variables
    Initial value:
    = {
    -
    {gTexture6684F8, 0x010D, 0x0800, 0x0},
    +
    {gTexture6684F8, 0x010D, 0x0800, 0x0},
    {gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
    {gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
    {gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0},
    @@ -769,8 +769,8 @@ Variables
    {gTexture67D304, 0x091C, 0x1000, 0x0},
    {gTexture67E010, 0x0415, 0x0800, 0x0},
    {gTexture67EEAC, 0x0140, 0x0800, 0x0},
    -
    {gTextureSignShellShot0, 0x038C, 0x1000, 0x0},
    -
    {gTextureSignShellShot1, 0x0247, 0x1000, 0x0},
    +
    {gTextureSignShellShot0, 0x038C, 0x1000, 0x0},
    +
    {gTextureSignShellShot1, 0x0247, 0x1000, 0x0},
    {gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0},
    {gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0},
    {0x00000000, 0x0000, 0x0000, 0x0},
    @@ -779,16 +779,18 @@ Variables
    gTextureCheckerboardBlueGray
    u8 gTextureCheckerboardBlueGray[]
    gTextureSignNintendoRed0
    u8 gTextureSignNintendoRed0[]
    gTextureSignLuigis0
    u8 gTextureSignLuigis0[]
    -
    gTexture6684F8
    u8 gTexture6684F8[]
    gTextureSignYoshi
    u8 gTextureSignYoshi[]
    gTextureSignNintendoRed1
    u8 gTextureSignNintendoRed1[]
    gTextureSignLuigis1
    u8 gTextureSignLuigis1[]
    +
    gTexture6684F8
    u8 gTexture6684F8[]
    gTexture67E010
    u8 gTexture67E010[]
    gTextureRailroadTrack
    u8 gTextureRailroadTrack[]
    gTextureRailroadCrossingTrack
    u8 gTextureRailroadCrossingTrack[]
    gTextureSignKoopaAir0
    u8 gTextureSignKoopaAir0[]
    gTexture6473E4
    u8 gTexture6473E4[]
    +
    gTextureSignShellShot1
    u8 gTextureSignShellShot1[]
    gTexture67D304
    u8 gTexture67D304[]
    +
    gTextureSignShellShot0
    u8 gTextureSignShellShot0[]
    gTextureSignMarioStar0
    u8 gTextureSignMarioStar0[]
    gTexture668920
    u8 gTexture668920[]
    gTexture67291C
    u8 gTexture67291C[]
    @@ -798,8 +800,6 @@ Variables
    gTexture647994
    u8 gTexture647994[]
    gTextureFenceBarbedWire
    u8 gTextureFenceBarbedWire[]
    gTextureSignMarioStar1
    u8 gTextureSignMarioStar1[]
    -
    gTextureSignShellShot1
    u8 gTextureSignShellShot1[]
    -
    gTextureSignShellShot0
    u8 gTextureSignShellShot0[]
    diff --git a/libaudio__internal_8h.html b/libaudio__internal_8h.html index fd09ce353..e7af0bef1 100644 --- a/libaudio__internal_8h.html +++ b/libaudio__internal_8h.html @@ -170,10 +170,10 @@ Typedefs - - +

    Enumerations

    enum  { AL_ADPCM_WAVE = 0 -, AL_RAW16_WAVE +
    enum  { AL_ADPCM_WAVE = 0 +, AL_RAW16_WAVE }
     
     
    @@ -267,8 +267,8 @@ Functions

    Enumeration Type Documentation

    - -

    ◆ anonymous enum

    + +

    ◆ anonymous enum

    @@ -279,8 +279,8 @@ Functions

    Functions

    - - + +
    Enumerator
    AL_ADPCM_WAVE 
    AL_RAW16_WAVE 
    Enumerator
    AL_ADPCM_WAVE 
    AL_RAW16_WAVE 
    diff --git a/libaudio__internal_8h_source.html b/libaudio__internal_8h_source.html index bdc583b5e..2b0346271 100644 --- a/libaudio__internal_8h_source.html +++ b/libaudio__internal_8h_source.html @@ -119,9 +119,9 @@ $(function(){initNavTree('libaudio__internal_8h_source.html',''); initResizable(
    9/* Possible wavetable types */
    10enum
    11{
    -
    12 AL_ADPCM_WAVE = 0,
    -
    13 AL_RAW16_WAVE
    -
    14};
    +
    12 AL_ADPCM_WAVE = 0,
    +
    13 AL_RAW16_WAVE
    +
    14};
    15
    16typedef struct
    @@ -199,7 +199,7 @@ $(function(){initNavTree('libaudio__internal_8h_source.html',''); initResizable(
    74 union {
    75 ALADPCMWaveInfo adpcmWave;
    76 ALRAWWaveInfo rawWave;
    -
    77 } waveInfo;
    +
    77 } waveInfo;
    78} ALWaveTable;
    79
    @@ -260,10 +260,10 @@ $(function(){initNavTree('libaudio__internal_8h_source.html',''); initResizable(
    126void alBnkfNew(ALBankFile *f, u8 *table);
    127#endif
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:93
    +
    AL_ADPCM_WAVE
    @ AL_ADPCM_WAVE
    Definition libaudio_internal.h:12
    +
    AL_RAW16_WAVE
    @ AL_RAW16_WAVE
    Definition libaudio_internal.h:13
    ALMicroTime
    s32 ALMicroTime
    Definition libaudio_internal.h:7
    ALPan
    u8 ALPan
    Definition libaudio_internal.h:6
    -
    AL_ADPCM_WAVE
    @ AL_ADPCM_WAVE
    Definition libaudio_internal.h:12
    -
    AL_RAW16_WAVE
    @ AL_RAW16_WAVE
    Definition libaudio_internal.h:13
    ALWaveTable
    struct ALWaveTable_s ALWaveTable
    alBnkfNew
    void alBnkfNew(ALBankFile *f, u8 *table)
    Definition alBnkfNew.c:63
    ALSound
    struct ALSound_s ALSound
    @@ -333,8 +333,8 @@ $(function(){initNavTree('libaudio__internal_8h_source.html',''); initResizable(
    ALWaveTable_s
    Definition libaudio_internal.h:69
    ALWaveTable_s::rawWave
    ALRAWWaveInfo rawWave
    Definition libaudio_internal.h:76
    ALWaveTable_s::len
    s32 len
    Definition libaudio_internal.h:71
    +
    ALWaveTable_s::waveInfo
    union ALWaveTable_s::@11 waveInfo
    ALWaveTable_s::base
    u8 * base
    Definition libaudio_internal.h:70
    -
    ALWaveTable_s::waveInfo
    union ALWaveTable_s::@12 waveInfo
    ALWaveTable_s::adpcmWave
    ALADPCMWaveInfo adpcmWave
    Definition libaudio_internal.h:75
    ALWaveTable_s::flags
    u8 flags
    Definition libaudio_internal.h:73
    ALWaveTable_s::type
    u8 type
    Definition libaudio_internal.h:72
    diff --git a/main_8c.html b/main_8c.html index f89bc8d64..4f4955624 100644 --- a/main_8c.html +++ b/main_8c.html @@ -573,7 +573,7 @@ Here is the caller graph for this function:
    -
    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_8h.html b/main_8h.html index 7db00ef8a..f88e923e3 100644 --- a/main_8h.html +++ b/main_8h.html @@ -613,7 +613,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -642,7 +642,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -661,7 +661,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/navtreeindex1.js b/navtreeindex1.js index 0f3eae9a3..236cdaf4f 100644 --- a/navtreeindex1.js +++ b/navtreeindex1.js @@ -167,8 +167,8 @@ var NAVTREEINDEX1 = "abi_8h.html":[8,0,2,2,0], "abi_8h.html#a0fa85b4a63cdef587611a5cfc518b029":[8,0,2,2,0,1], "abi_8h.html#a14d6d1a5fe10cc2b775388380a8d75f6":[8,0,2,2,0,28], -"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,20], "abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,19], +"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,20], "abi_8h.html#a18fb2ca6586420606f75125ebc7e4d0f":[8,0,2,2,0,12], "abi_8h.html#a2259f4cc6cd203ea6ef6d598674a48e6":[8,0,2,2,0,14], "abi_8h.html#a2b203222776ef9b58154e173b768b21c":[8,0,2,2,0,7], diff --git a/navtreeindex109.js b/navtreeindex109.js index 368fe55f5..5f483e138 100644 --- a/navtreeindex109.js +++ b/navtreeindex109.js @@ -183,8 +183,8 @@ var NAVTREEINDEX109 = "structALWaveTable__s.html":[7,0,41], "structALWaveTable__s.html#a0e0fc820a7b7c2c8dcdfe38e60c0fa25":[7,0,41,4], "structALWaveTable__s.html#a42402da278ae304efe7ff64ce3d1983f":[7,0,41,3], +"structALWaveTable__s.html#a85b362aa52c9213e918b655fc4604187":[7,0,41,6], "structALWaveTable__s.html#a8b00d48faf540e97599e88086d7c9ba5":[7,0,41,1], -"structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4":[7,0,41,6], "structALWaveTable__s.html#aa9aafaec1f56b5cb5a16e7bfde1c3bd9":[7,0,41,0], "structALWaveTable__s.html#acc769d06bf577d20eeb968567b0e905e":[7,0,41,2], "structALWaveTable__s.html#aebc02789aef2309a8a3d1dce0975b043":[7,0,41,5], diff --git a/navtreeindex132.js b/navtreeindex132.js index bfc703099..cf33d325f 100644 --- a/navtreeindex132.js +++ b/navtreeindex132.js @@ -2,7 +2,7 @@ var NAVTREEINDEX132 = { "union____OSInodeUnit.html":[7,0,11], "union____OSInodeUnit.html#a36b21e4f1af2f41f94d17213ca36bf03":[7,0,11,0], -"union____OSInodeUnit.html#a37d1ea1ca6343bea9b704017f5c4fd54":[7,0,11,1], +"union____OSInodeUnit.html#a43b04dbd3e28b4c20bcd5fe2abe879bf":[7,0,11,1], "union____OSInodeUnit.html#a5de34afed8d3f09cda8eb504c655f416":[7,0,11,3], "union____OSInodeUnit.html#afb1a4073f3b025f6c6fc25e8ede9208e":[7,0,11,2], "union____OSfp.html":[7,0,8], @@ -10,10 +10,10 @@ var NAVTREEINDEX132 = "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,3], +"uniondu.html#a06928fe4577a2d3ae425f6df73fbef26":[7,0,75,4], "uniondu.html#a1350494c6a09b425b926250e9b10b5c9":[7,0,75,2], "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0":[7,0,75,0], -"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,4], +"uniondu.html#a9e9d23cf0353aa7609b667deb1530e03":[7,0,75,3], "uniondu.html#ac24ce7d9a78b6632965424039e4362c3":[7,0,75,1], "unionfu.html":[7,0,81], "unionfu.html#a6aed0becf5f2fa3047085638c8516b26":[7,0,81,2], diff --git a/navtreeindex2.js b/navtreeindex2.js index df557ca3f..201808caa 100644 --- a/navtreeindex2.js +++ b/navtreeindex2.js @@ -19,7 +19,7 @@ var NAVTREEINDEX2 = "actor__types_8h.html#affb5ffde510634c5c1e09a5b934d29c3":[8,0,2,3,20], "actor__types_8h_source.html":[8,0,2,3], "actors.html":[0,0], -"actors.html#actors-1":[0,0,0], +"actors.html#actors":[0,0,0], "actors_8c.html":[8,0,3,7,0], "actors_8c.html#a0239c06a587826a0319fce63214d3ae7":[8,0,3,7,0,25], "actors_8c.html#a047d32425b6ea73e667cb31548bdc8dd":[8,0,3,7,0,51], diff --git a/navtreeindex29.js b/navtreeindex29.js index 84c84b97d..fbe125683 100644 --- a/navtreeindex29.js +++ b/navtreeindex29.js @@ -18,7 +18,7 @@ var NAVTREEINDEX29 = "contramwrite_8c.html#a5a8e6638b28caf3b5faba67df76d099c":[8,0,3,6,34,1], "contramwrite_8c.html#ac0f1bb81601cedc5fc5868fc7e500b88":[8,0,3,6,34,0], "controlflow.html":[1,2], -"controlflow.html#actors":[1,2,4,2], +"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], diff --git a/navtreeindex42.js b/navtreeindex42.js index e30a717bc..4db2e85c5 100644 --- a/navtreeindex42.js +++ b/navtreeindex42.js @@ -21,8 +21,8 @@ var NAVTREEINDEX42 = "globals_b.html":[8,1,0,2], "globals_c.html":[8,1,0,3], "globals_d.html":[8,1,0,4], -"globals_defs.html":[8,1,6], "globals_defs.html":[8,1,6,0], +"globals_defs.html":[8,1,6], "globals_defs_a.html":[8,1,6,1], "globals_defs_b.html":[8,1,6,2], "globals_defs_c.html":[8,1,6,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], diff --git a/navtreeindex69.js b/navtreeindex69.js index 6b958ce2b..50560a676 100644 --- a/navtreeindex69.js +++ b/navtreeindex69.js @@ -16,8 +16,8 @@ var NAVTREEINDEX69 = "load_8c.html#ae413774208e1213a9146b077715c7787":[8,0,3,1,10,45], "load_8c.html#ae4a9b501905301177af6c476cff02f7f":[8,0,3,1,10,40], "load_8c.html#ae61d39b44029939585c581369dc5a050":[8,0,3,1,10,2], -"load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,5], "load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,6], +"load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,5], "load_8c.html#aea5e1113ed6186106c99f9d146e80e75":[8,0,3,1,10,33], "load_8c.html#aeead683cd086cc979e2e7e94d8b4e7b9":[8,0,3,1,10,66], "load_8c.html#aef4659733b428e6fcae0c19331e720cf":[8,0,3,1,10,35], diff --git a/osPiRawStartDma_8c.html b/osPiRawStartDma_8c.html index 434040118..f2beb4803 100644 --- a/osPiRawStartDma_8c.html +++ b/osPiRawStartDma_8c.html @@ -186,7 +186,7 @@ Here is the caller graph for this function:
    -
    Todo
    figure out why this is like this
    +
    Todo
    figure out why this is like this
    diff --git a/osPiStartDma_8c.html b/osPiStartDma_8c.html index 3509a0d13..9628404cc 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 4fdaa40bd..65d4a9c3d 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 fae10b5d2..80c1aa8b5 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..ca6c516ec 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 9840232db..44c259252 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/playback_8c.html b/playback_8c.html index 3eefc2511..bbde74e2e 100644 --- a/playback_8c.html +++ b/playback_8c.html @@ -854,7 +854,7 @@ Here is the caller graph for this function:
    -
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    +
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    Here is the caller graph for this function:
    diff --git a/playback_8h.html b/playback_8h.html index 699793e8b..730f9100d 100644 --- a/playback_8h.html +++ b/playback_8h.html @@ -916,7 +916,7 @@ Here is the caller graph for this function:
    -
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    +
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    Here is the caller graph for this function:
    diff --git a/player__controller_8c.html b/player__controller_8c.html index 888e04c2c..53bb78565 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 2664727cb..af4c96382 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 ae2168bd8..dd0d4767b 100644 --- a/podium__ceremony__actors_8c.html +++ b/podium__ceremony__actors_8c.html @@ -596,7 +596,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 bfcf0234c..34f52a4ed 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/race__logic_8c.html b/race__logic_8c.html index 5f80dc606..f34163dfc 100644 --- a/race__logic_8c.html +++ b/race__logic_8c.html @@ -704,7 +704,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 2a55911f9..cbd039b5e 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_19.js b/search/all_19.js index 81107dc99..dfc57249b 100644 --- a/search/all_19.js +++ b/search/all_19.js @@ -20,7 +20,7 @@ var searchData= ['watchlo_5fvalidmask_17',['WATCHLO_VALIDMASK',['../R4300_8h.html#a55fdad7366f8ba76401505cac62053ce',1,'R4300.h']]], ['watchlo_5fwtrap_18',['WATCHLO_WTRAP',['../R4300_8h.html#a0a8e20512cbeb46cf186698b59425afd',1,'R4300.h']]], ['waveid_19',['waveId',['../structNotePlaybackState.html#a42402672c3ba2a53b238c7adb4897d59',1,'NotePlaybackState::waveId'],['../structNote.html#a735fb38930defbb072e29145b7cddebb',1,'Note::waveId']]], - ['waveinfo_20',['waveInfo',['../structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4',1,'ALWaveTable_s']]], + ['waveinfo_20',['waveInfo',['../structALWaveTable__s.html#a85b362aa52c9213e918b655fc4604187',1,'ALWaveTable_s']]], ['wavetable_21',['wavetable',['../structALSound__s.html#a8bb355521feffe02dfa992b5fd23ae87',1,'ALSound_s']]], ['waypointend_22',['waypointEnd',['../structKartAIBehaviour.html#a49ef05db0dffad276cacd95c1add1cff',1,'KartAIBehaviour']]], ['waypointindex_23',['waypointIndex',['../structBombKartSpawn.html#a2433b7d49cd9dbe30178490a1c5996a0',1,'BombKartSpawn::waypointIndex'],['../structBombKart.html#a525c7c5d643f877e4ad83c936813af2b',1,'BombKart::waypointIndex'],['../structTrainCarStuff.html#ad30b566d920820973b38f352776fba66',1,'TrainCarStuff::waypointIndex'],['../structPaddleBoatStuff.html#afbb8a16053d3ce4f36a7e71b8606c0f6',1,'PaddleBoatStuff::waypointIndex'],['../structVehicleStuff.html#abf63879b2d12bc756cc5d0e7f2509040',1,'VehicleStuff::waypointIndex']]], @@ -37,7 +37,7 @@ var searchData= ['windows_34',['Windows',['../compiling.html#windows',1,'']]], ['windowsize_35',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], ['wood_5fbridge_36',['WOOD_BRIDGE',['../common__structs_8h.html#a5344f2bdca4f9506c40f044e08ea8c98a42cbce75b358c45ca5ca25e555dddc6c',1,'common_structs.h']]], - ['word_37',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], + ['word_37',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a9e9d23cf0353aa7609b667deb1530e03',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], ['work_38',['How Actors Work',['../actors.html',1,'actorsmenu']]], ['wrapper_5fupdate_5fboos_39',['wrapper_update_boos',['../update__objects_8c.html#a33a1f1842134707236eefdf272dfdbae',1,'update_objects.c']]], ['write_5fdashes_40',['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_3.js b/search/all_3.js index ea1d9bbdf..f9ec1532d 100644 --- a/search/all_3.js +++ b/search/all_3.js @@ -96,7 +96,7 @@ var searchData= ['actor_5fyoshi_5fegg_93',['ACTOR_YOSHI_EGG',['../actor__types_8h.html#a06ad3f803827afd107e7682c8c22d990a9a5b90d71f1d6c4a72fafd72661e0660',1,'actor_types.h']]], ['actorindex_94',['actorIndex',['../structunexpiredActors.html#a1e1419ce2f7577336dd49e2bd062ce17',1,'unexpiredActors::actorIndex'],['../structD__801642D8__entry.html#a0fbf587266ea6cf89ce5d066e14a0caa',1,'D_801642D8_entry::actorIndex'],['../structTrainCarStuff.html#a534b8b495eec302fd11a493758be8a80',1,'TrainCarStuff::actorIndex'],['../structPaddleBoatStuff.html#ad9b828347dae9adcc6c5d8a301faad06',1,'PaddleBoatStuff::actorIndex'],['../structVehicleStuff.html#aa2cb9651e75a3ddf588ecda2135ed1b8',1,'VehicleStuff::actorIndex']]], ['actorinitparams_95',['ActorInitParams',['../structActorInitParams.html',1,'']]], - ['actors_96',['Actors',['../actorsmenu.html',1,'Actors'],['../actors.html#actors-1',1,'Actors'],['../controlflow.html#actors',1,'Actors']]], + ['actors_96',['Actors',['../actorsmenu.html',1,'Actors'],['../actors.html#actors',1,'Actors'],['../controlflow.html#actors-1',1,'Actors']]], ['actors_20work_97',['How Actors Work',['../actors.html',1,'actorsmenu']]], ['actors_2ec_98',['actors.c',['../actors_8c.html',1,'']]], ['actors_2eh_99',['actors.h',['../actors_8h.html',1,'']]], @@ -174,9 +174,9 @@ var searchData= ['aibuffer_5flen_171',['AIBUFFER_LEN',['../data_8h.html#ad5c4274341788878d2b3b767c6c9b16c',1,'data.h']]], ['aifrequency_172',['aiFrequency',['../structAudioBufferParametersEU.html#a675f5849a446429e68e7c03f89be6841',1,'AudioBufferParametersEU']]], ['airborne_173',['AIRBORNE',['../common__structs_8h.html#a5344f2bdca4f9506c40f044e08ea8c98aae231593748597efa2fddd103805f4f0',1,'common_structs.h']]], - ['al_5fadpcm_5fwave_174',['AL_ADPCM_WAVE',['../libaudio__internal_8h.html#abc5c98fcc1211af2b80116dd6e0a035da7f18be1646f533e496b1228ee0df8435',1,'libaudio_internal.h']]], + ['al_5fadpcm_5fwave_174',['AL_ADPCM_WAVE',['../libaudio__internal_8h.html#a385c44f6fb256e5716a2302a5b940388a7f18be1646f533e496b1228ee0df8435',1,'libaudio_internal.h']]], ['al_5fbank_5fversion_175',['AL_BANK_VERSION',['../libaudio__internal_8h.html#a1f91ffdb03b8bc2abbf56646ef20a3c5',1,'libaudio_internal.h']]], - ['al_5fraw16_5fwave_176',['AL_RAW16_WAVE',['../libaudio__internal_8h.html#abc5c98fcc1211af2b80116dd6e0a035da9f7c04ebfd0910e043023fd2c5a09d9d',1,'libaudio_internal.h']]], + ['al_5fraw16_5fwave_176',['AL_RAW16_WAVE',['../libaudio__internal_8h.html#a385c44f6fb256e5716a2302a5b940388a9f7c04ebfd0910e043023fd2c5a09d9d',1,'libaudio_internal.h']]], ['aladpcmbook_177',['ALADPCMBook',['../structALADPCMBook.html',1,'']]], ['aladpcmloop_178',['ALADPCMloop',['../structALADPCMloop.html',1,'']]], ['aladpcmwaveinfo_179',['ALADPCMWaveInfo',['../structALADPCMWaveInfo.html',1,'']]], diff --git a/search/all_b.js b/search/all_b.js index 1dd43090f..a7e239672 100644 --- a/search/all_b.js +++ b/search/all_b.js @@ -89,7 +89,7 @@ var searchData= ['initparams_86',['initParams',['../structCeremonyActor.html#a277ad2eda07a8de516f07337576809dd',1,'CeremonyActor::initParams'],['../structFirework.html#a1cbb7f2b612146c27cb394c724994c1a',1,'Firework::initParams']]], ['inode_87',['inode',['../struct____OSInodeCache.html#a3733820db9596ac6724b29785d78d7f4',1,'__OSInodeCache']]], ['inode_5fpage_88',['inode_page',['../struct____OSInode.html#ab913e55c3af6099c919ece81349eb21f',1,'__OSInode']]], - ['inode_5ft_89',['inode_t',['../union____OSInodeUnit.html#a37d1ea1ca6343bea9b704017f5c4fd54',1,'__OSInodeUnit']]], + ['inode_5ft_89',['inode_t',['../union____OSInodeUnit.html#a43b04dbd3e28b4c20bcd5fe2abe879bf',1,'__OSInodeUnit']]], ['installing_20mk64_20decomp_90',['Installing mk64 Decomp',['../compiling.html',1,'basics']]], ['instarray_91',['instArray',['../structALBank__s.html#a51e528879a570e855363b7a47d00acaf',1,'ALBank_s']]], ['instcount_92',['instCount',['../structALBank__s.html#a09c8b064e5f89189e117b0927941b2a0',1,'ALBank_s']]], diff --git a/search/enumvalues_0.js b/search/enumvalues_0.js index c13a64d13..01da4dbf3 100644 --- a/search/enumvalues_0.js +++ b/search/enumvalues_0.js @@ -48,7 +48,7 @@ var searchData= ['actor_5fyoshi_5fegg_45',['ACTOR_YOSHI_EGG',['../actor__types_8h.html#a06ad3f803827afd107e7682c8c22d990a9a5b90d71f1d6c4a72fafd72661e0660',1,'actor_types.h']]], ['after_5fdisplay_5flists_46',['AFTER_DISPLAY_LISTS',['../profiler_8h.html#a464075ec8b898dea3a20b3166dd123bfa3cb3edb479d6c28d023c9c0c5d15e02b',1,'profiler.h']]], ['airborne_47',['AIRBORNE',['../common__structs_8h.html#a5344f2bdca4f9506c40f044e08ea8c98aae231593748597efa2fddd103805f4f0',1,'common_structs.h']]], - ['al_5fadpcm_5fwave_48',['AL_ADPCM_WAVE',['../libaudio__internal_8h.html#abc5c98fcc1211af2b80116dd6e0a035da7f18be1646f533e496b1228ee0df8435',1,'libaudio_internal.h']]], - ['al_5fraw16_5fwave_49',['AL_RAW16_WAVE',['../libaudio__internal_8h.html#abc5c98fcc1211af2b80116dd6e0a035da9f7c04ebfd0910e043023fd2c5a09d9d',1,'libaudio_internal.h']]], + ['al_5fadpcm_5fwave_48',['AL_ADPCM_WAVE',['../libaudio__internal_8h.html#a385c44f6fb256e5716a2302a5b940388a7f18be1646f533e496b1228ee0df8435',1,'libaudio_internal.h']]], + ['al_5fraw16_5fwave_49',['AL_RAW16_WAVE',['../libaudio__internal_8h.html#a385c44f6fb256e5716a2302a5b940388a9f7c04ebfd0910e043023fd2c5a09d9d',1,'libaudio_internal.h']]], ['asphalt_50',['ASPHALT',['../common__structs_8h.html#a5344f2bdca4f9506c40f044e08ea8c98a7d9c1ec99eb702ae443b230bee117deb',1,'common_structs.h']]] ]; diff --git a/search/variables_17.js b/search/variables_17.js index 0fd9c8265..bc4a49ef9 100644 --- a/search/variables_17.js +++ b/search/variables_17.js @@ -11,7 +11,7 @@ var searchData= ['wario_5fstadium_5ftextures_8',['wario_stadium_textures',['../all__course__offsets_8h.html#afb2d218c3ac46e16ee4d7938502db297',1,'wario_stadium_textures: course_offsets.c'],['../courseTable_8h.html#a31c7877a7347c7a71f52aa41b1f16803',1,'wario_stadium_textures: course_offsets.c'],['../wario__stadium_2course__offsets_8c.html#a377ad398269c408a9628e432c39dbe05',1,'wario_stadium_textures: course_offsets.c']]], ['wassoftreset_9',['wasSoftReset',['../main_8c.html#a2fa45adadd9db50419593273a86d5875',1,'wasSoftReset: main.c'],['../main_8h.html#a2fa45adadd9db50419593273a86d5875',1,'wasSoftReset: main.c']]], ['waveid_10',['waveId',['../structNotePlaybackState.html#a42402672c3ba2a53b238c7adb4897d59',1,'NotePlaybackState::waveId'],['../structNote.html#a735fb38930defbb072e29145b7cddebb',1,'Note::waveId']]], - ['waveinfo_11',['waveInfo',['../structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4',1,'ALWaveTable_s']]], + ['waveinfo_11',['waveInfo',['../structALWaveTable__s.html#a85b362aa52c9213e918b655fc4604187',1,'ALWaveTable_s']]], ['wavetable_12',['wavetable',['../structALSound__s.html#a8bb355521feffe02dfa992b5fd23ae87',1,'ALSound_s']]], ['waypointend_13',['waypointEnd',['../structKartAIBehaviour.html#a49ef05db0dffad276cacd95c1add1cff',1,'KartAIBehaviour']]], ['waypointindex_14',['waypointIndex',['../structBombKartSpawn.html#a2433b7d49cd9dbe30178490a1c5996a0',1,'BombKartSpawn::waypointIndex'],['../structBombKart.html#a525c7c5d643f877e4ad83c936813af2b',1,'BombKart::waypointIndex'],['../structTrainCarStuff.html#ad30b566d920820973b38f352776fba66',1,'TrainCarStuff::waypointIndex'],['../structPaddleBoatStuff.html#afbb8a16053d3ce4f36a7e71b8606c0f6',1,'PaddleBoatStuff::waypointIndex'],['../structVehicleStuff.html#abf63879b2d12bc756cc5d0e7f2509040',1,'VehicleStuff::waypointIndex']]], @@ -24,6 +24,6 @@ var searchData= ['wheelrot_21',['wheelRot',['../structTrainCar.html#a3e4c6d1091b4cf5a1683496409bda622',1,'TrainCar::wheelRot'],['../structPaddleWheelBoat.html#a500f0d5169fa8601aaba11cf13514b28',1,'PaddleWheelBoat::wheelRot']]], ['width_22',['width',['../structprintf__struct.html#ad8c9b5c908f18b8933081ae4b8f19b3a',1,'printf_struct::width'],['../structMkTexture.html#a6064846bc000f2003938cd14d4e62ff6',1,'MkTexture::width'],['../structOSViCommonRegs.html#a36050d774fce0c7479165a54e61296aa',1,'OSViCommonRegs::width']]], ['windowsize_23',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], - ['word_24',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], + ['word_24',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a9e9d23cf0353aa7609b667deb1530e03',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], ['wut_25',['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/search/variables_9.js b/search/variables_9.js index 0d97657dc..09da7329a 100644 --- a/search/variables_9.js +++ b/search/variables_9.js @@ -32,7 +32,7 @@ var searchData= ['initparams_29',['initParams',['../structCeremonyActor.html#a277ad2eda07a8de516f07337576809dd',1,'CeremonyActor::initParams'],['../structFirework.html#a1cbb7f2b612146c27cb394c724994c1a',1,'Firework::initParams']]], ['inode_30',['inode',['../struct____OSInodeCache.html#a3733820db9596ac6724b29785d78d7f4',1,'__OSInodeCache']]], ['inode_5fpage_31',['inode_page',['../struct____OSInode.html#ab913e55c3af6099c919ece81349eb21f',1,'__OSInode']]], - ['inode_5ft_32',['inode_t',['../union____OSInodeUnit.html#a37d1ea1ca6343bea9b704017f5c4fd54',1,'__OSInodeUnit']]], + ['inode_5ft_32',['inode_t',['../union____OSInodeUnit.html#a43b04dbd3e28b4c20bcd5fe2abe879bf',1,'__OSInodeUnit']]], ['instarray_33',['instArray',['../structALBank__s.html#a51e528879a570e855363b7a47d00acaf',1,'ALBank_s']]], ['instcount_34',['instCount',['../structALBank__s.html#a09c8b064e5f89189e117b0927941b2a0',1,'ALBank_s']]], ['instorwave_35',['instOrWave',['../structSequenceChannel.html#a466eb1ccc073069c700d46f829b16b54',1,'SequenceChannel::instOrWave'],['../structSequenceChannelLayer.html#a86bc9dd7a08b9cbae7a936c25bd86caa',1,'SequenceChannelLayer::instOrWave']]], diff --git a/seqplayer_8c.html b/seqplayer_8c.html index 42e09fb6f..619e4ac87 100644 --- a/seqplayer_8c.html +++ b/seqplayer_8c.html @@ -431,7 +431,7 @@ Here is the caller graph for this function:
    -
    Bug
    Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
    +
    Bug
    Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
    Here is the call graph for this function:
    diff --git a/seqplayer_8h.html b/seqplayer_8h.html index cb0d697f2..0bfd1f449 100644 --- a/seqplayer_8h.html +++ b/seqplayer_8h.html @@ -495,7 +495,7 @@ Here is the caller graph for this function:
    -
    Bug
    Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
    +
    Bug
    Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
    Here is the call graph for this function:
    diff --git a/structALWaveTable__s.html b/structALWaveTable__s.html index e80a29691..6d077269a 100644 --- a/structALWaveTable__s.html +++ b/structALWaveTable__s.html @@ -123,14 +123,14 @@ Data Fields   u8 flags   -union {  +union {    -   ALADPCMWaveInfo   adpcmWave  -  -   ALRAWWaveInfo   rawWave  -  -} waveInfo  -  +   ALADPCMWaveInfo   adpcmWave  +  +   ALRAWWaveInfo   rawWave  +  +} waveInfo  + 

    Field Documentation

    @@ -217,8 +217,8 @@ Data Fields
    - -

    ◆ [union]

    + +

    ◆ [union]

    diff --git a/structALWaveTable__s.js b/structALWaveTable__s.js index d7e8e274b..6129f7406 100644 --- a/structALWaveTable__s.js +++ b/structALWaveTable__s.js @@ -6,5 +6,5 @@ var structALWaveTable__s = [ "len", "structALWaveTable__s.html#a42402da278ae304efe7ff64ce3d1983f", null ], [ "rawWave", "structALWaveTable__s.html#a0e0fc820a7b7c2c8dcdfe38e60c0fa25", null ], [ "type", "structALWaveTable__s.html#aebc02789aef2309a8a3d1dce0975b043", null ], - [ "waveInfo", "structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4", null ] + [ "waveInfo", "structALWaveTable__s.html#a85b362aa52c9213e918b655fc4604187", null ] ]; \ No newline at end of file diff --git a/todo.html b/todo.html index 6747980ed..47cf131db 100644 --- a/todo.html +++ b/todo.html @@ -105,18 +105,18 @@ $(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
    Global __osPfsRWInode (OSPfs *pfs, __OSInode *inode, u8 flag, u8 bank)
    -
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    +
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    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,17 +125,17 @@ $(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_02007BB8 []
    Place all these vertices in a single array
    Global D_800E43B0 []
    unused?
    Global D_8018D9B0
    -
    Move gGfxPool out of main.h
    +
    Move gGfxPool out of main.h
    Global d_course_banshee_boardwalk_dl_0 []
    -
    Replace addresses with variables
    -
    Global d_course_big_donut_dl []
    Replace addresses with variables
    +
    Global d_course_big_donut_dl []
    +
    Replace addresses with variables
    Global d_course_bowsers_castle_dl_0 []
    Replace addresses with variables
    Global d_course_dks_jungle_parkway_dl_0 []
    @@ -165,10 +165,10 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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?

    +

    is it possible to remove them somehow?

    Global fill [2]
    file boundary?
    @@ -177,7 +177,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)
    @@ -187,17 +187,17 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800745C8 (s32 objectIndex, s32 arg1)
    arg1 should likely be a u8 *
    Global func_80091FA4 (void)
    -
    These sizes need to be sizeof() for shiftability if possible
    +
    These sizes need to be sizeof() for shiftability if possible
    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
    @@ -217,11 +217,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)
    @@ -229,13 +229,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
    +
    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 fadd6588f..801239d61 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -314,124 +314,125 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    209
    -
    210void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
    -
    211 Mat4 sp120;
    -
    212 Vec3f sp160;
    -
    213 Mat4 spE0;
    -
    214 Mat4 spA0;
    +
    210void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
    +
    211 Mat4 sp120;
    +
    212 Vec3f sp160;
    +
    213 Mat4 spE0;
    +
    214 Mat4 spA0;
    215
    -
    216 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 2025.0f, gCameraZoom[camera - camera1], 9000000.0f);
    +
    216 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 2025.0f, gCameraZoom[camera - camera1], 9000000.0f);
    217
    -
    218 if (temp_f0 < 0.0f) { return; }
    +
    218 if (temp_f0 < 0.0f) { return; }
    219
    -
    220 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    +
    220 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    221
    -
    222 mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
    +
    222 mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
    223
    -
    224 if (render_set_position(sp120, 0) == 0) { return; }
    +
    224 if (render_set_position(sp120, 0) == 0) { return; }
    225
    -
    226 if (temp_f0 < 250000.0f) {
    +
    226 if (temp_f0 < 250000.0f) {
    227
    -
    228 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A20);
    -
    229 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A08);
    +
    228 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A20);
    +
    229 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A08);
    230
    -
    231 } else if (temp_f0 < 1000000.0f) {
    +
    231 } else if (temp_f0 < 1000000.0f) {
    232
    -
    233 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21550);
    -
    234 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21220);
    +
    233 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21550);
    +
    234 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21220);
    235 } else {
    -
    236 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21C90);
    -
    237 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21A80);
    +
    236 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21C90);
    +
    237 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21A80);
    238 }
    -
    239 if (1440000.0f < temp_f0) { return; }
    +
    239 if (1440000.0f < temp_f0) { return; }
    240
    -
    241 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    -
    242 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
    +
    241 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    242 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
    243
    -
    244 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    245 vec3f_set(sp160, 17.0f, 6.0f, 28.0f);
    -
    246 mtxf_translate(spE0, sp160);
    -
    247 mtxf_multiplication(spA0, sp120, spE0);
    +
    244 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    245 vec3f_set(sp160, 17.0f, 6.0f, 28.0f);
    +
    246 mtxf_translate(spE0, sp160);
    +
    247 mtxf_multiplication(spA0, sp120, spE0);
    248
    -
    249 if (render_set_position(spA0, 3) == 0) { return; }
    +
    249 if (render_set_position(spA0, 3) == 0) { return; }
    250
    -
    251 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    252 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    251 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    252 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    253
    -
    254 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    255 vec3f_set(sp160, -17.0, 6.0f, 28.0f);
    -
    256 mtxf_translate(spE0, sp160);
    -
    257 mtxf_multiplication(spA0, sp120, spE0);
    +
    254 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    255 vec3f_set(sp160, -17.0, 6.0f, 28.0f);
    +
    256 mtxf_translate(spE0, sp160);
    +
    257 mtxf_multiplication(spA0, sp120, spE0);
    258
    -
    259 if (render_set_position(spA0, 3) == 0) { return; }
    +
    259 if (render_set_position(spA0, 3) == 0) { return; }
    260
    -
    261 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    262 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    261 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    262 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    263
    -
    264 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    -
    265 vec3f_set(sp160, 17.0f, 6.0f, 12.0f);
    -
    266 mtxf_translate(spE0, sp160);
    -
    267 mtxf_multiplication(spA0, sp120, spE0);
    +
    264 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    +
    265 vec3f_set(sp160, 17.0f, 6.0f, 12.0f);
    +
    266 mtxf_translate(spE0, sp160);
    +
    267 mtxf_multiplication(spA0, sp120, spE0);
    268
    -
    269 if (render_set_position(spA0, 3) == 0) { return; }
    +
    269 if (render_set_position(spA0, 3) == 0) { return; }
    270
    -
    271 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    272 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    271 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    272 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    273
    -
    274 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    -
    275 vec3f_set(sp160, -17.0f, 6.0f, 12.0f);
    -
    276 mtxf_translate(spE0, sp160);
    -
    277 mtxf_multiplication(spA0, sp120, spE0);
    +
    274 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    +
    275 vec3f_set(sp160, -17.0f, 6.0f, 12.0f);
    +
    276 mtxf_translate(spE0, sp160);
    +
    277 mtxf_multiplication(spA0, sp120, spE0);
    278
    -
    279 if (render_set_position(spA0, 3) == 0) { return; }
    +
    279 if (render_set_position(spA0, 3) == 0) { return; }
    280
    -
    281 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    282 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    281 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    282 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    283
    -
    284 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    -
    285 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    -
    286 mtxf_translate(spE0, sp160);
    -
    287 mtxf_multiplication(spA0, sp120, spE0);
    +
    284 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    +
    285 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    +
    286 mtxf_translate(spE0, sp160);
    +
    287 mtxf_multiplication(spA0, sp120, spE0);
    288
    -
    289 if (render_set_position(spA0, 3) == 0) { return; }
    +
    289 if (render_set_position(spA0, 3) == 0) { return; }
    290
    -
    291 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    292 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    291 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    292 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    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);
    +
    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);
    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);
    -
    317 mtxf_multiplication(spA0, sp120, spE0);
    +
    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; }
    +
    319 if (render_set_position(spA0, 3) == 0) { return; }
    320
    -
    321 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    322 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    323 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    321 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    322 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    323 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    324}
    camera1
    Camera * camera1
    Definition camera.c:22
    +
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:93
    Vec3f
    f32 Vec3f[3]
    Definition common_structs.h:6
    Mat4
    f32 Mat4[4][4]
    Definition common_structs.h:16
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index 63a9078e0..f3cb0fc2e 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -231,77 +231,77 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    140 }
    141 arg1[3][0] = arg2->pos[0];
    142 arg1[3][1] = arg2->pos[1];
    -
    143 arg1[3][2] = arg2->pos[2];
    +
    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; }
    231
    diff --git a/union____OSInodeUnit.html b/union____OSInodeUnit.html index e2bc80015..f0e51dd85 100644 --- a/union____OSInodeUnit.html +++ b/union____OSInodeUnit.html @@ -115,14 +115,14 @@ Collaboration diagram for __OSInodeUnit:
    - + - - - - - - + + + + + +

    Data Fields

    struct { 
    struct { 
     
       u8   bank 
     
       u8   page 
     
    } inode_t 
     
       u8   bank 
     
       u8   page 
     
    } inode_t 
     
    u16 ipage
     
    @@ -141,8 +141,8 @@ Data Fields
    - -

    ◆ [struct]

    + +

    ◆ [struct]

    diff --git a/union____OSInodeUnit.js b/union____OSInodeUnit.js index fb9f0fb98..bdf8ac60d 100644 --- a/union____OSInodeUnit.js +++ b/union____OSInodeUnit.js @@ -1,7 +1,7 @@ var union____OSInodeUnit = [ [ "bank", "union____OSInodeUnit.html#a36b21e4f1af2f41f94d17213ca36bf03", null ], - [ "inode_t", "union____OSInodeUnit.html#a37d1ea1ca6343bea9b704017f5c4fd54", null ], + [ "inode_t", "union____OSInodeUnit.html#a43b04dbd3e28b4c20bcd5fe2abe879bf", null ], [ "ipage", "union____OSInodeUnit.html#afb1a4073f3b025f6c6fc25e8ede9208e", null ], [ "page", "union____OSInodeUnit.html#a5de34afed8d3f09cda8eb504c655f416", null ] ]; \ No newline at end of file diff --git a/uniondu.html b/uniondu.html index d79bfaf46..d35e077c7 100644 --- a/uniondu.html +++ b/uniondu.html @@ -115,6 +115,14 @@ Collaboration diagram for du:
    Data Fields double d   +struct {  +  +   unsigned int   hi  +  +   unsigned int   lo  +  +} word  +  struct {       unsigned int   hi  @@ -123,18 +131,10 @@ 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 990f69433..8a63266cd 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#a06928fe4577a2d3ae425f6df73fbef26", null ], - [ "word", "uniondu.html#a490dba023fb0b686d9a03b51508bcfad", null ] + [ "word", "uniondu.html#a9e9d23cf0353aa7609b667deb1530e03", null ], + [ "word", "uniondu.html#a06928fe4577a2d3ae425f6df73fbef26", null ] ]; \ No newline at end of file