diff --git a/actors_8c.html b/actors_8c.html index 42fb1bf67..1c2973d3e 100644 --- a/actors_8c.html +++ b/actors_8c.html @@ -1565,7 +1565,7 @@ Here is the caller graph for this function:
-
Todo
Is this making the shell spin?
+
Todo
Is this making the shell spin?
Here is the call graph for this function:
diff --git a/banshee__boardwalk_2course__data_8c.html b/banshee__boardwalk_2course__data_8c.html index 939d19723..2f0a917b8 100644 --- a/banshee__boardwalk_2course__data_8c.html +++ b/banshee__boardwalk_2course__data_8c.html @@ -671,7 +671,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 8888e6745..2a25d6dbd 100644 --- a/basics.js +++ b/basics.js @@ -26,7 +26,7 @@ var basics = [ "Players", "controlflow.html#players", null ], [ "Actors", "controlflow.html#actors-1", null ], [ "Objects", "controlflow.html#objects-1", null ], - [ "Courses", "controlflow.html#courses", [ + [ "Courses", "controlflow.html#courses-1", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], [ "UI & Other 2D Screen data", "controlflow.html#ui--other-2d-screen-data", null ], diff --git a/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 5724ed8bb..0d28ed1f5 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -178,107 +178,107 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
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;
+
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,62 +289,62 @@ $(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);
+
231 destroy_destructable_actor((struct Actor *) shell);
232 }
233
-
234 shell->rotVelocity += 0x71C;
-
235 switch (shell->state) {
+
234 shell->rotVelocity += 0x71C;
+
235 switch (shell->state) {
236 case HELD_SHELL:
-
237 player = &gPlayers[shell->playerId];
+
237 player = &gPlayers[shell->playerId];
238 copy_collision(&player->unk_110, &shell->unk30);
239 somePosVel[0] = 0.0f;
240 somePosVel[1] = player->boundingBoxSize;
@@ -643,8 +643,14 @@ $(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
@@ -660,14 +666,19 @@ $(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::rotVelocity
s16 rotVelocity
Definition actor_types.h:316
+
ShellActor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:315
+
ShellActor::state
s16 state
Definition actor_types.h:313
+
ShellActor::type
s16 type
Definition actor_types.h:303
+
ShellActor::playerId
s16 playerId
Definition actor_types.h:321
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/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 0a565babd..509f3098a 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 94e0dbd4c..79f3264da 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/code__80005FD0_8c.html b/code__80005FD0_8c.html index e54339bd6..970b61b5c 100644 --- a/code__80005FD0_8c.html +++ b/code__80005FD0_8c.html @@ -2947,7 +2947,7 @@ Here is the caller graph for this function:
-
Todo
Confirm this comment
+
Todo
Confirm this comment
Here is the call graph for this function:
diff --git a/code__80005FD0_8h.html b/code__80005FD0_8h.html index 4c69d0db4..24e211cdd 100644 --- a/code__80005FD0_8h.html +++ b/code__80005FD0_8h.html @@ -2690,7 +2690,7 @@ Here is the caller graph for this function:
-
Todo
Confirm this comment
+
Todo
Confirm this comment
Here is the call graph for this function:
diff --git a/code__80091750_8c.html b/code__80091750_8c.html index 526f12541..8fb1d33b9 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 8e550ef62..2f760eb51 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/controlflow.html b/controlflow.html index bb49c133d..a76321aa4 100644 --- a/controlflow.html +++ b/controlflow.html @@ -112,7 +112,7 @@ $(function(){initNavTree('controlflow.html',''); initResizable(); });
  • Players
  • Actors
  • Objects
    • -
  • Courses
    • Course Folder
      • +
    • Courses
    • UI & Other 2D Screen data
      • @@ -245,7 +245,7 @@ Objects code_80086E70 Objects

      Documentation of the specifics still in-progress. See actors for more information.

      -

      +

      Courses

      Course related code resides in

      @@ -259,7 +259,7 @@ Courses

      Course Folder

      -

      [course folder link][Courses]

      +

      [course folder link][Courses]

      diff --git a/courses.html b/courses.html index 7bd189aa9..06287e688 100644 --- a/courses.html +++ b/courses.html @@ -103,7 +103,7 @@ $(function(){initNavTree('courses.html',''); initResizable(); });
      Courses
      -

      +

      Courses

      diff --git a/coursesmenu.html b/coursesmenu.html index ff157f6f1..7d6b054b0 100644 --- a/coursesmenu.html +++ b/coursesmenu.html @@ -138,7 +138,7 @@ How courses work in mk64

      -

      Courses Surface Types

      +

      Courses Surface Types

      diff --git a/coursesmenu.js b/coursesmenu.js index 13346ac5f..b3a26cdcc 100644 --- a/coursesmenu.js +++ b/coursesmenu.js @@ -1,7 +1,7 @@ var coursesmenu = [ [ "Courses", "courses.html", [ - [ "Courses", "courses.html#courses-1", null ] + [ "Courses", "courses.html#courses", null ] ] ], [ "Surface Types", "surfacetypes.html", null ] ]; \ No newline at end of file diff --git a/data_8c.html b/data_8c.html index 0795315b7..9b85e6e32 100644 --- a/data_8c.html +++ b/data_8c.html @@ -257,7 +257,7 @@ Variables
      file desc
    • -
    Todo
    file boundary?
    +
    Todo
    file boundary?
    @@ -272,7 +272,7 @@ Variables
    -
    Todo
    0x00000000800f624c fill2
    +
    Todo
    0x00000000800f624c fill2
    diff --git a/data_8h.html b/data_8h.html index 4e0e94867..07a18c09e 100644 --- a/data_8h.html +++ b/data_8h.html @@ -427,7 +427,7 @@ Variables
    -
    Todo
    file boundary?
    +
    Todo
    file boundary?
    @@ -450,7 +450,7 @@ Variables
    -
    Todo
    0x00000000800f624c fill2
    +
    Todo
    0x00000000800f624c fill2
    diff --git a/doxygen_crawl.html b/doxygen_crawl.html index af22951ec..54aa18ed1 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -9,11 +9,11 @@ - - + + @@ -116,8 +116,8 @@ - + @@ -196,8 +196,8 @@ - + @@ -260,10 +260,10 @@ - + @@ -359,17 +359,17 @@ - + - + @@ -447,19 +447,19 @@ - + - + + - @@ -492,8 +492,8 @@ - + @@ -566,9 +566,9 @@ - + @@ -638,8 +638,8 @@ - + @@ -658,14 +658,14 @@ + - + - - + @@ -729,12 +729,12 @@ - - - + + + @@ -772,6 +772,7 @@ + @@ -781,7 +782,6 @@ - @@ -796,19 +796,19 @@ - + - + - + @@ -829,8 +829,8 @@ - + diff --git a/functions_vars_w.html b/functions_vars_w.html index 775c576ff..c2dee11a3 100644 --- a/functions_vars_w.html +++ b/functions_vars_w.html @@ -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 cab919293..0fcf6fa77 100644 --- a/functions_w.html +++ b/functions_w.html @@ -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/internal_8h.html b/internal_8h.html index 4ecb6a93a..78bbd54bc 100644 --- a/internal_8h.html +++ b/internal_8h.html @@ -721,7 +721,7 @@ Macros
    -
    Todo
    US_FLOAT should probably be renamed to JP_DOUBLE since eu seems to use floats too
    +
    Todo
    US_FLOAT should probably be renamed to JP_DOUBLE since eu seems to use floats too
    diff --git a/main_8c.html b/main_8c.html index 2a18568c1..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 22bd553ec..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/navtreedata.js b/navtreedata.js index f09581e7d..2e70892c9 100644 --- a/navtreedata.js +++ b/navtreedata.js @@ -32,8 +32,8 @@ var NAVTREE = [ "Memory Addresses", "md_tools_2doxygen__syms.html", [ [ "Memory Addresses", "md_tools_2doxygen__syms.html#memory-addresses-1", null ] ] ], - [ "Todo List", "todo.html", null ], [ "Bug List", "bug.html", null ], + [ "Todo List", "todo.html", null ], [ "Data Structures", "annotated.html", [ [ "Data Structures", "annotated.html", "annotated_dup" ], [ "Data Structure Index", "classes.html", null ], diff --git a/navtreeindex1.js b/navtreeindex1.js index 6247ed57b..85f73ae0e 100644 --- a/navtreeindex1.js +++ b/navtreeindex1.js @@ -167,8 +167,8 @@ var NAVTREEINDEX1 = "abi_8h.html":[8,0,2,1,0], "abi_8h.html#a0fa85b4a63cdef587611a5cfc518b029":[8,0,2,1,0,1], "abi_8h.html#a14d6d1a5fe10cc2b775388380a8d75f6":[8,0,2,1,0,28], -"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,1,0,20], "abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,1,0,19], +"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,1,0,20], "abi_8h.html#a18fb2ca6586420606f75125ebc7e4d0f":[8,0,2,1,0,12], "abi_8h.html#a2259f4cc6cd203ea6ef6d598674a48e6":[8,0,2,1,0,14], "abi_8h.html#a2b203222776ef9b58154e173b768b21c":[8,0,2,1,0,7], diff --git a/navtreeindex113.js b/navtreeindex113.js index 0c43e84fe..6db8b13d1 100644 --- a/navtreeindex113.js +++ b/navtreeindex113.js @@ -31,8 +31,8 @@ var NAVTREEINDEX113 = "structunexpiredActors.html#ac078e39059e87df951857931426d370a":[7,0,213,1], "structunkStruct.html":[7,0,227], "structunkStruct.html#a396a48d87f773dfd1879879953ea4944":[7,0,227,0], -"structunkStruct.html#a42c72afe2bb11fb995032210f3fd870a":[7,0,227,1], "structunkStruct.html#a42c72afe2bb11fb995032210f3fd870a":[7,0,227,2], +"structunkStruct.html#a42c72afe2bb11fb995032210f3fd870a":[7,0,227,1], "structunkStruct.html#a73560f27f24832f5216166ac22e5f607":[7,0,227,6], "structunkStruct.html#a74daa572feb494ae94f9bce49bb8a2cd":[7,0,227,3], "structunkStruct.html#a9405c1027e1922776b95b7a71d6ad6bf":[7,0,227,4], diff --git a/navtreeindex125.js b/navtreeindex125.js index e647c3086..5632e6ba6 100644 --- a/navtreeindex125.js +++ b/navtreeindex125.js @@ -228,7 +228,7 @@ var NAVTREEINDEX125 = "toads__turnpike_2course__offsets_8c.html#aeeb891bbe4108d042e19cbff79071421":[8,0,0,17,4,31], "toads__turnpike_2course__vertices_8inc_8c.html":[8,0,0,17,5], "toads__turnpike_2course__vertices_8inc_8c.html#a2a5944c29529784be834890ccab0f3a1":[8,0,0,17,5,0], -"todo.html":[5], +"todo.html":[6], "train_2render_8inc_8c.html":[8,0,3,0,17,0], "train_2render_8inc_8c.html#a3732523ca7fda5d43b6df198fc1fccf8":[8,0,3,0,17,0,0], "train_2render_8inc_8c.html#a4366f819eb3527ec4d2665639adfee85":[8,0,3,0,17,0,2], diff --git a/navtreeindex126.js b/navtreeindex126.js index 7bc70b1ff..040c1c26e 100644 --- a/navtreeindex126.js +++ b/navtreeindex126.js @@ -95,10 +95,10 @@ var NAVTREEINDEX126 = "union____OSfp.html#aa1b92e78cc62bfa671d55b4f08a42f52":[7,0,8,1], "union____OSfp.html#aad7ba28b3e6aa7495eb9f9e73f5bd064":[7,0,8,0], "uniondu.html":[7,0,75], -"uniondu.html#a06928fe4577a2d3ae425f6df73fbef26":[7,0,75,4], +"uniondu.html#a06928fe4577a2d3ae425f6df73fbef26":[7,0,75,3], "uniondu.html#a1350494c6a09b425b926250e9b10b5c9":[7,0,75,2], "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0":[7,0,75,0], -"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,3], +"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,4], "uniondu.html#ac24ce7d9a78b6632965424039e4362c3":[7,0,75,1], "unionfu.html":[7,0,81], "unionfu.html#a6aed0becf5f2fa3047085638c8516b26":[7,0,81,2], diff --git a/navtreeindex26.js b/navtreeindex26.js index cf0318588..fd14121de 100644 --- a/navtreeindex26.js +++ b/navtreeindex26.js @@ -144,7 +144,7 @@ var NAVTREEINDEX26 = "controlflow.html#actors-1":[1,2,4,2], "controlflow.html#code-breakdown":[1,2,4], "controlflow.html#course-folder":[1,2,4,4,0], -"controlflow.html#courses":[1,2,4,4], +"controlflow.html#courses-1":[1,2,4,4], "controlflow.html#ending":[1,2,4,8], "controlflow.html#engine":[1,2,4,6], "controlflow.html#math":[1,2,4,7], diff --git a/navtreeindex27.js b/navtreeindex27.js index 735dfeae6..c2fd941bd 100644 --- a/navtreeindex27.js +++ b/navtreeindex27.js @@ -152,7 +152,7 @@ var NAVTREEINDEX27 = "course__offsets_8h.html":[8,0,2,7], "course__offsets_8h_source.html":[8,0,2,7], "courses.html":[2,0], -"courses.html#courses-1":[2,0,0], +"courses.html#courses":[2,0,0], "coursesmenu.html":[2], "cow_2render_8inc_8c.html":[8,0,3,0,4,0], "cow_2render_8inc_8c.html#a3032e5759fffafb766e96e1991ab0350":[8,0,3,0,4,0,0], diff --git a/navtreeindex37.js b/navtreeindex37.js index 1f6008a9c..165450525 100644 --- a/navtreeindex37.js +++ b/navtreeindex37.js @@ -82,8 +82,8 @@ var NAVTREEINDEX37 = "functions_t.html":[7,2,0,18], "functions_u.html":[7,2,0,19], "functions_v.html":[7,2,0,20], -"functions_vars.html":[7,2,1,0], "functions_vars.html":[7,2,1], +"functions_vars.html":[7,2,1,0], "functions_vars_b.html":[7,2,1,1], "functions_vars_c.html":[7,2,1,2], "functions_vars_d.html":[7,2,1,3], diff --git a/navtreeindex39.js b/navtreeindex39.js index ca689f90c..b8e7798f7 100644 --- a/navtreeindex39.js +++ b/navtreeindex39.js @@ -134,8 +134,8 @@ var NAVTREEINDEX39 = "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], "globals_func.html":[8,1,1,0], +"globals_func.html":[8,1,1], "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/navtreeindex9.js b/navtreeindex9.js index 4fd6bef5b..b7958fbe8 100644 --- a/navtreeindex9.js +++ b/navtreeindex9.js @@ -62,7 +62,7 @@ var NAVTREEINDEX9 = "buffers_8h.html#ad69c72ff050917ed80fee1f0a4b6e373":[8,0,3,8,13], "buffers_8h.html#ad9140e069d65bc5b5da75424d09e9e57":[8,0,3,8,14], "buffers_8h_source.html":[8,0,3,8], -"bug.html":[6], +"bug.html":[5], "camera_8c.html":[8,0,3,9], "camera_8c.html#a0044cd79d56fa26de4dfd49bc77e3471":[8,0,3,9,13], "camera_8c.html#a005d75adccaa470b61adba174ce1a631":[8,0,3,9,33], diff --git a/objects_8h.html b/objects_8h.html index c252417ed..0580074d2 100644 --- a/objects_8h.html +++ b/objects_8h.html @@ -1964,7 +1964,7 @@ Variables
    -
    Todo
    fix this extern
    +
    Todo
    fix this extern
    diff --git a/osPiRawStartDma_8c.html b/osPiRawStartDma_8c.html index f43ee41df..63716b4b1 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/osViBlack_8c.html b/osViBlack_8c.html index 65d4a9c3d..4fdaa40bd 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 80c1aa8b5..fae10b5d2 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__vi_8h.html b/os__vi_8h.html index 44c259252..9840232db 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/pages.html b/pages.html index acf2a7db3..4c0ff352e 100644 --- a/pages.html +++ b/pages.html @@ -123,8 +123,8 @@ $(function(){initNavTree('pages.html',''); initResizable(); });  Paths  Audio  Memory Addresses - Todo List - Bug List + Bug List + Todo List
    diff --git a/piint_8h.html b/piint_8h.html index ed2283d8f..2d2be9622 100644 --- a/piint_8h.html +++ b/piint_8h.html @@ -786,7 +786,7 @@ Variables
    -
    Todo
    name
    +
    Todo
    name
    @@ -801,7 +801,7 @@ Variables
    -
    Todo
    name
    +
    Todo
    name
    @@ -816,7 +816,7 @@ Variables
    -
    Todo
    name
    +
    Todo
    name
    diff --git a/podium__ceremony__actors_8c.html b/podium__ceremony__actors_8c.html index a1c313b5c..c5ee0a82a 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 34f52a4ed..68ed10cc8 100644 --- a/podium__ceremony__actors_8h.html +++ b/podium__ceremony__actors_8h.html @@ -555,7 +555,7 @@ Here is the caller graph for this function:
    Bug
    No null check.
    Bug
    -
    Todo
    More indepth error checking/return value
    +
    Todo
    More indepth error checking/return value
    Here is the call graph for this function:
    diff --git a/search/all_19.js b/search/all_19.js index 1d47e0097..81107dc99 100644 --- a/search/all_19.js +++ b/search/all_19.js @@ -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#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], + ['word_37',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',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_5.js b/search/all_5.js index 57854c07f..5a119a7a7 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -406,7 +406,7 @@ var searchData= ['courseindex_403',['courseIndex',['../structstruct__8018EE10__entry.html#acee952c37d3917fd90809e58c6401e65',1,'struct_8018EE10_entry']]], ['courserecords_404',['courseRecords',['../structCupTimeTrialRecords.html#acf18ab0e69f90a2eefe248ef7090bd1c',1,'CupTimeTrialRecords']]], ['courses_405',['COURSES',['../common__structs_8h.html#acf250ad4ca05ca435a61203c41d4ca88',1,'common_structs.h']]], - ['courses_406',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses-1',1,'Courses'],['../controlflow.html#courses',1,'Courses']]], + ['courses_406',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses',1,'Courses'],['../controlflow.html#courses-1',1,'Courses']]], ['courses_2emd_407',['courses.md',['../courses_8md.html',1,'']]], ['coursesmenu_2emd_408',['coursesmenu.md',['../coursesmenu_8md.html',1,'']]], ['coursetable_409',['CourseTable',['../structCourseTable.html',1,'']]], diff --git a/search/variables_17.js b/search/variables_17.js index a391c16f0..0fd9c8265 100644 --- a/search/variables_17.js +++ b/search/variables_17.js @@ -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#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], + ['word_24',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',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/some__data_8c.html b/some__data_8c.html index b1598cc91..5fc0d3568 100644 --- a/some__data_8c.html +++ b/some__data_8c.html @@ -2354,7 +2354,7 @@ Variables
    0xff25, 0xffed, 0x0320,
    0xffca, 0xfff8, 0x0270,
    }
    -
    Todo
    fix this extern
    +
    Todo
    fix this extern
    diff --git a/structNote.html b/structNote.html index 2ee56a481..13861e57a 100644 --- a/structNote.html +++ b/structNote.html @@ -302,7 +302,7 @@ Data Fields
    -
    Todo
    use macros or something instead.
    +
    Todo
    use macros or something instead.
    diff --git a/todo.html b/todo.html index c976b6fd7..2c5e27df0 100644 --- a/todo.html +++ b/todo.html @@ -115,27 +115,27 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global __osPiDevMgr
    In libreultra this is in an include
    Global __osRepairPackId (OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
    -

    fix magic number

    -

    remove magic constant

    +

    remove magic constant

    +

    fix magic number

    Global _course_mario_raceway_dl_mio0SegmentRomStart []
    These should probably be ptr's instead of array's?
    Global add_unused_obj_index (s32 *listIdx, s32 *nextFree, s32 size)
    -
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    +
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    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?
    +
    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,17 +165,17 @@ $(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?

    +

    is it possible to remove them somehow?

    Global fill [2]
    -
    file boundary?
    +
    file boundary?
    Global fill2
    -
    0x00000000800f624c fill2
    +
    0x00000000800f624c fill2
    Global func_800100F0 (s32)
    -
    Confirm this comment
    +
    Confirm this comment
    Global func_80028864 (Player *, Camera *, s8, s8)
    make a proper match
    Global func_80046030 (u8 *tlut, u8 *texture, Vtx *arg2, s32 width, s32 arg4, s32 height)
    @@ -187,15 +187,15 @@ $(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.
    Global gen_random_item (s16 rank, s16 isCpu)
    @@ -203,27 +203,27 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global gPlayerWinningIndex
    gPlayerWinningIndex (D_800DC5E8) accessed as word, D_800DC5EB as u8
    Global gTorchSpawns []
    -
    fix this extern
    +
    fix this extern
    Global IO_WRITE (addr, data)
    These defines are from PR/rcp.h, but including that causes problems...
    Global LEO_CMD_TYPE_0
    -
    name
    -
    Global LEO_CMD_TYPE_1
    -
    name
    -
    Global LEO_CMD_TYPE_2
    name
    +
    Global LEO_CMD_TYPE_1
    +
    name
    +
    Global LEO_CMD_TYPE_2
    +
    name
    Global load_surface_map (uintptr_t, struct UnkStruct_800DC5EC *)
    Should be Gfx*
    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.
    +
    use macros or something instead.
    Global osContInit (OSMesgQueue *mq, u8 *bitpattern, OSContStatus *status)
    figure out what it means
    Global osPfsDeleteFile (OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name)
    @@ -231,15 +231,15 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global osPiStartDma (OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq)
    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)
    -
    Is this making the shell spin?
    +
    Is this making the shell spin?
    Global SOUND_ARG_LOAD (sound_bank, byte2, byte3, sound_id)
    format like sm64 sounds.h
    Struct unkStruct
    @@ -247,7 +247,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global UPDATE_REG (reg, var)
    This define is from piint.h, but including that causes problems...
    Global US_FLOAT (x)
    -
    US_FLOAT should probably be renamed to JP_DOUBLE since eu seems to use floats too
    +
    US_FLOAT should probably be renamed to JP_DOUBLE since eu seems to use floats too
    diff --git a/train_2render_8inc_8c_source.html b/train_2render_8inc_8c_source.html index 8d71360d0..de0de7f10 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -217,140 +217,140 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    114 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    115
    116 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
    -
    117 vec3f_set(sp160, 17.0f, 12.0f, -34.0f);
    -
    118 mtxf_translate(spE0, sp160);
    -
    119 mtxf_multiplication(spA0, sp120, spE0);
    +
    117 vec3f_set(sp160, 17.0f, 12.0f, -34.0f);
    +
    118 mtxf_translate(spE0, sp160);
    +
    119 mtxf_multiplication(spA0, sp120, spE0);
    120
    -
    121 maxObjectsReached = render_set_position(spA0, 3) == 0;
    -
    122 if (maxObjectsReached) { return; }
    +
    121 maxObjectsReached = render_set_position(spA0, 3) == 0;
    +
    122 if (maxObjectsReached) { return; }
    123
    -
    124 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
    -
    125 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    124 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
    +
    125 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    126
    -
    127 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
    -
    128 vec3f_set(sp160, -17.0f, 12.0f, -34.0f);
    -
    129 mtxf_translate(spE0, sp160);
    -
    130 mtxf_multiplication(spA0, sp120, spE0);
    +
    127 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
    +
    128 vec3f_set(sp160, -17.0f, 12.0f, -34.0f);
    +
    129 mtxf_translate(spE0, sp160);
    +
    130 mtxf_multiplication(spA0, sp120, spE0);
    131
    -
    132 maxObjectsReached = render_set_position(spA0, 3) == 0;
    -
    133 if (maxObjectsReached) { return; }
    +
    132 maxObjectsReached = render_set_position(spA0, 3) == 0;
    +
    133 if (maxObjectsReached) { return; }
    134
    -
    135 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
    -
    136 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    137 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    135 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
    +
    136 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    137 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    138}
    139
    -
    140void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
    -
    141 Mat4 sp120;
    -
    142 Vec3f sp160;
    -
    143 Mat4 spE0;
    -
    144 Mat4 spA0;
    +
    140void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
    +
    141 Mat4 sp120;
    +
    142 Vec3f sp160;
    +
    143 Mat4 spE0;
    +
    144 Mat4 spA0;
    145
    -
    146 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 625.0f, gCameraZoom[camera - camera1], 9000000.0f);
    +
    146 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 625.0f, gCameraZoom[camera - camera1], 9000000.0f);
    147
    -
    148 if (temp_f0 < 0.0f) { return; }
    +
    148 if (temp_f0 < 0.0f) { return; }
    149
    -
    150 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    +
    150 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    151
    -
    152 mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
    -
    153 if (render_set_position(sp120, 0) == 0) { return; }
    +
    152 mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
    +
    153 if (render_set_position(sp120, 0) == 0) { return; }
    154
    -
    155 if (temp_f0 < 250000.0f) {
    +
    155 if (temp_f0 < 250000.0f) {
    156
    -
    157 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1F228);
    +
    157 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1F228);
    158
    -
    159 } else if (temp_f0 < 1000000.0f) {
    -
    160 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1F708);
    +
    159 } else if (temp_f0 < 1000000.0f) {
    +
    160 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1F708);
    161 } else {
    -
    162 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1FAF8);
    +
    162 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1FAF8);
    163 }
    -
    164 if (1440000.0f < temp_f0) { return; }
    +
    164 if (1440000.0f < temp_f0) { return; }
    165
    -
    166 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    -
    167 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
    +
    166 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    167 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
    168
    -
    169 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    170 vec3f_set(sp160, 17.0f, 6.0f, 8.0f);
    -
    171 mtxf_translate(spE0, sp160);
    -
    172 mtxf_multiplication(spA0, sp120, spE0);
    +
    169 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    170 vec3f_set(sp160, 17.0f, 6.0f, 8.0f);
    +
    171 mtxf_translate(spE0, sp160);
    +
    172 mtxf_multiplication(spA0, sp120, spE0);
    173
    -
    174 if (render_set_position(spA0, 3) == 0) { return; }
    +
    174 if (render_set_position(spA0, 3) == 0) { return; }
    175
    -
    176 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    177 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    176 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    177 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    178
    -
    179 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    180 vec3f_set(sp160, -17.0, 6.0f, 8.0f);
    -
    181 mtxf_translate(spE0, sp160);
    -
    182 mtxf_multiplication(spA0, sp120, spE0);
    +
    179 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    180 vec3f_set(sp160, -17.0, 6.0f, 8.0f);
    +
    181 mtxf_translate(spE0, sp160);
    +
    182 mtxf_multiplication(spA0, sp120, spE0);
    183
    -
    184 if (render_set_position(spA0, 3) == 0) { return; }
    +
    184 if (render_set_position(spA0, 3) == 0) { return; }
    185
    -
    186 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    187 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    186 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    187 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    188
    -
    189 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    -
    190 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    -
    191 mtxf_translate(spE0, sp160);
    -
    192 mtxf_multiplication(spA0, sp120, spE0);
    +
    189 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    +
    190 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    +
    191 mtxf_translate(spE0, sp160);
    +
    192 mtxf_multiplication(spA0, sp120, spE0);
    193
    -
    194 if (render_set_position(spA0, 3) == 0) { return; }
    +
    194 if (render_set_position(spA0, 3) == 0) { return; }
    195
    -
    196 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    197 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    196 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    197 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    198
    -
    199 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    -
    200 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    -
    201 mtxf_translate(spE0, sp160);
    -
    202 mtxf_multiplication(spA0, sp120, spE0);
    +
    199 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    +
    200 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    +
    201 mtxf_translate(spE0, sp160);
    +
    202 mtxf_multiplication(spA0, sp120, spE0);
    203
    -
    204 if (render_set_position(spA0, 3) == 0) { return; }
    -
    205 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    206 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    207 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    204 if (render_set_position(spA0, 3) == 0) { return; }
    +
    205 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    206 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    207 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    208}
    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);
    +
    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; }
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index bf2c1f583..6477f2a46 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -299,93 +299,93 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    223 f32 temp_f0;
    224 s16 temp_v0 = arg2->flags;
    225
    -
    226 if ((temp_v0 & 0x800) != 0) { return; }
    +
    226 if ((temp_v0 & 0x800) != 0) { return; }
    227
    -
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    229
    -
    230 if (temp_f0 < 0.0f) { return; }
    +
    230 if (temp_f0 < 0.0f) { return; }
    231
    -
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    233 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    234 }
    -
    235 arg1[3][0] = arg2->pos[0];
    -
    236 arg1[3][1] = arg2->pos[1];
    -
    237 arg1[3][2] = arg2->pos[2];
    +
    235 arg1[3][0] = arg2->pos[0];
    +
    236 arg1[3][1] = arg2->pos[1];
    +
    237 arg1[3][2] = arg2->pos[2];
    238
    -
    239 if (render_set_position(arg1, 0) != 0) {
    -
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    +
    239 if (render_set_position(arg1, 0) != 0) {
    +
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    241 }
    242}
    243
    -
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    252 f32 temp_f0;
    -
    253 s16 temp_v0 = arg2->flags;
    +
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    252 f32 temp_f0;
    +
    253 s16 temp_v0 = arg2->flags;
    254
    -
    255 if ((temp_v0 & 0x800) != 0) { return; }
    +
    255 if ((temp_v0 & 0x800) != 0) { return; }
    256
    -
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    258
    -
    259 if (temp_f0 < 0.0f) { return; }
    +
    259 if (temp_f0 < 0.0f) { return; }
    260
    -
    261 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    261 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    262 func_8029794C(arg2->pos, arg2->rot, 1.0f);
    263 }
    -
    264 arg1[3][0] = arg2->pos[0];
    -
    265 arg1[3][1] = arg2->pos[1];
    -
    266 arg1[3][2] = arg2->pos[2];
    +
    264 arg1[3][0] = arg2->pos[0];
    +
    265 arg1[3][1] = arg2->pos[1];
    +
    266 arg1[3][2] = arg2->pos[2];
    267
    -
    268 if (render_set_position(arg1, 0) != 0) {
    -
    269 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
    +
    268 if (render_set_position(arg1, 0) != 0) {
    +
    269 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
    270 }
    271}
    272
    -
    280void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    281 f32 temp_f0;
    -
    282 s16 temp_v0 = arg2->flags;
    +
    280void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    281 f32 temp_f0;
    +
    282 s16 temp_v0 = arg2->flags;
    283
    -
    284 if ((temp_v0 & 0x800) != 0) { return; }
    +
    284 if ((temp_v0 & 0x800) != 0) { return; }
    285
    -
    286 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    286 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    287
    -
    288 if (temp_f0 < 0.0f) { return; }
    +
    288 if (temp_f0 < 0.0f) { return; }
    289
    -
    290 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    290 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    291 func_8029794C(arg2->pos, arg2->rot, 1.0f);
    292 }
    -
    293 arg1[3][0] = arg2->pos[0];
    -
    294 arg1[3][1] = arg2->pos[1];
    -
    295 arg1[3][2] = arg2->pos[2];
    +
    293 arg1[3][0] = arg2->pos[0];
    +
    294 arg1[3][1] = arg2->pos[1];
    +
    295 arg1[3][2] = arg2->pos[2];
    296
    -
    297 if (render_set_position(arg1, 0) != 0) {
    -
    298 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
    +
    297 if (render_set_position(arg1, 0) != 0) {
    +
    298 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
    299 }
    300}
    301
    -
    309void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    310 f32 temp_f0;
    -
    311 s16 temp_v0 = arg2->flags;
    +
    309void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    310 f32 temp_f0;
    +
    311 s16 temp_v0 = arg2->flags;
    312
    -
    313 if ((temp_v0 & 0x800) != 0) { return; }
    +
    313 if ((temp_v0 & 0x800) != 0) { return; }
    314
    -
    315 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    315 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    316
    -
    317 if (temp_f0 < 0.0f) { return; }
    +
    317 if (temp_f0 < 0.0f) { return; }
    318
    -
    319 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    319 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    320 func_8029794C(arg2->pos, arg2->rot, 0.80000001f);
    321 }
    -
    322 arg1[3][0] = arg2->pos[0];
    -
    323 arg1[3][1] = arg2->pos[1];
    -
    324 arg1[3][2] = arg2->pos[2];
    +
    322 arg1[3][0] = arg2->pos[0];
    +
    323 arg1[3][1] = arg2->pos[1];
    +
    324 arg1[3][2] = arg2->pos[2];
    325
    -
    326 if (render_set_position(arg1, 0) != 0) {
    -
    327 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
    +
    326 if (render_set_position(arg1, 0) != 0) {
    +
    327 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
    328 }
    329}
    @@ -394,7 +394,6 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    all_course_data.h
    d_course_bowsers_castle_dl_bush
    Gfx d_course_bowsers_castle_dl_bush[]
    Definition course_data.c:3957
    camera1
    Camera * camera1
    Definition camera.c:22
    -
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:93
    Mat4
    f32 Mat4[4][4]
    Definition common_structs.h:16
    d_course_frappe_snowland_dl_tree
    Gfx d_course_frappe_snowland_dl_tree[]
    Definition course_data.c:2734
    gbi.h
    diff --git a/uniondu.html b/uniondu.html index f21b48100..ecff778b7 100644 --- a/uniondu.html +++ b/uniondu.html @@ -115,14 +115,6 @@ Collaboration diagram for du: Data Fields double d   -struct {  -  -   unsigned int   hi  -  -   unsigned int   lo  -  -} word  -  struct {       unsigned int   hi  @@ -131,6 +123,14 @@ Data Fields   } word    +struct {  +  +   unsigned int   hi  +  +   unsigned int   lo  +  +} word  + 

    Detailed Description

    Todo
    is it possible to remove them somehow?
    @@ -178,8 +178,8 @@ Data Fields
    - -

    ◆ [struct] [1/2]

    + +

    ◆ [struct] [1/2]

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

    ◆ [struct] [2/2]

    + +

    ◆ [struct] [2/2]

    diff --git a/uniondu.js b/uniondu.js index 04b625419..990f69433 100644 --- a/uniondu.js +++ b/uniondu.js @@ -3,6 +3,6 @@ var uniondu = [ "d", "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0", null ], [ "hi", "uniondu.html#ac24ce7d9a78b6632965424039e4362c3", null ], [ "lo", "uniondu.html#a1350494c6a09b425b926250e9b10b5c9", null ], - [ "word", "uniondu.html#a490dba023fb0b686d9a03b51508bcfad", null ], - [ "word", "uniondu.html#a06928fe4577a2d3ae425f6df73fbef26", null ] + [ "word", "uniondu.html#a06928fe4577a2d3ae425f6df73fbef26", null ], + [ "word", "uniondu.html#a490dba023fb0b686d9a03b51508bcfad", null ] ]; \ No newline at end of file diff --git a/update__objects_8c.html b/update__objects_8c.html index 726b995af..e9e837983 100644 --- a/update__objects_8c.html +++ b/update__objects_8c.html @@ -946,7 +946,7 @@ Variables
    -
    Todo
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    +
    Todo
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    Here is the call graph for this function:
    @@ -12157,7 +12157,7 @@ Here is the caller graph for this function:
    0.0, 0.0, 0.0, 0.0,
    0.0, 0.0, 0.0, 0.0
    }
    -
    Todo
    unused?
    +
    Todo
    unused?