diff --git a/actors_8c.html b/actors_8c.html index 6ec3f290c..bcdbbfb8d 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/basics.js b/basics.js index 8888e6745..2a25d6dbd 100644 --- a/basics.js +++ b/basics.js @@ -26,7 +26,7 @@ var basics = [ "Players", "controlflow.html#players", null ], [ "Actors", "controlflow.html#actors-1", null ], [ "Objects", "controlflow.html#objects-1", null ], - [ "Courses", "controlflow.html#courses", [ + [ "Courses", "controlflow.html#courses-1", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], [ "UI & Other 2D Screen data", "controlflow.html#ui--other-2d-screen-data", null ], diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index c9be8ec6a..00c6d4352 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -116,97 +116,97 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
6#include <code_800029B0.h>
7
-
8void func_802B3B44(struct ShellActor *shell) {
-
9 u16 currentWaypoint;
-
10 u16 nextWaypoint;
-
11 f32 temp_f0;
-
12 f32 temp_f0_2;
-
13 f32 temp_f0_3;
-
14 f32 temp_f12_3;
-
15 f32 temp_f14_2;
-
16 f32 temp_f16_2;
-
17 f32 temp_f2;
-
18 f32 temp_f12;
-
19 f32 temp_f28;
-
20 f32 temp_f20;
-
21 f32 temp_f22;
-
22 f32 temp_f24;
-
23 f32 temp_f12_0;
-
24 f32 temp_f12_1;
-
25 f32 temp_f12_2;
-
26 f32 temp_f18_3;
-
27 f32 temp_f16_3;
-
28 f32 temp_f26;
-
29 Vec3f origPos;
+
8void func_802B3B44(struct ShellActor *shell) {
+
9 u16 currentWaypoint;
+
10 u16 nextWaypoint;
+
11 f32 temp_f0;
+
12 f32 temp_f0_2;
+
13 f32 temp_f0_3;
+
14 f32 temp_f12_3;
+
15 f32 temp_f14_2;
+
16 f32 temp_f16_2;
+
17 f32 temp_f2;
+
18 f32 temp_f12;
+
19 f32 temp_f28;
+
20 f32 temp_f20;
+
21 f32 temp_f22;
+
22 f32 temp_f24;
+
23 f32 temp_f12_0;
+
24 f32 temp_f12_1;
+
25 f32 temp_f12_2;
+
26 f32 temp_f18_3;
+
27 f32 temp_f16_3;
+
28 f32 temp_f26;
+
29 Vec3f origPos;
30
-
31 currentWaypoint = shell->pathIndex;
-
32 temp_f2 = D_80164490[currentWaypoint].posX;
-
33 temp_f12 = D_80164490[currentWaypoint].posY;
-
34 temp_f28 = D_80164490[currentWaypoint].posZ;
-
35 nextWaypoint = currentWaypoint + 1;
+
31 currentWaypoint = shell->pathIndex;
+
32 temp_f2 = D_80164490[currentWaypoint].posX;
+
33 temp_f12 = D_80164490[currentWaypoint].posY;
+
34 temp_f28 = D_80164490[currentWaypoint].posZ;
+
35 nextWaypoint = currentWaypoint + 1;
36
-
37 if (nextWaypoint >= D_80164430) {
-
38 nextWaypoint -= D_80164430;
+
37 if (nextWaypoint >= D_80164430) {
+
38 nextWaypoint -= D_80164430;
39 }
40
-
41 temp_f20 = temp_f2 - shell->pos[0];
-
42 temp_f22 = temp_f12 - shell->pos[1];
-
43 temp_f24 = temp_f28 - shell->pos[2];
-
44 temp_f0 = (temp_f20 * temp_f20) + (temp_f22 * temp_f22) + (temp_f24 * temp_f24);
-
45 if (temp_f0 > 400.0f) {
-
46 temp_f18_3 = D_80164490[nextWaypoint].posX;
-
47 temp_f16_3 = D_80164490[nextWaypoint].posY;
-
48 temp_f26 = D_80164490[nextWaypoint].posZ;
+
41 temp_f20 = temp_f2 - shell->pos[0];
+
42 temp_f22 = temp_f12 - shell->pos[1];
+
43 temp_f24 = temp_f28 - shell->pos[2];
+
44 temp_f0 = (temp_f20 * temp_f20) + (temp_f22 * temp_f22) + (temp_f24 * temp_f24);
+
45 if (temp_f0 > 400.0f) {
+
46 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
47 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
48 temp_f26 = D_80164490[nextWaypoint].posZ;
49
-
50 temp_f12_0 = temp_f18_3 - shell->pos[0];
-
51 temp_f12_1 = temp_f16_3 - shell->pos[1];
-
52 temp_f12_2 = temp_f26 - shell->pos[2];
+
50 temp_f12_0 = temp_f18_3 - shell->pos[0];
+
51 temp_f12_1 = temp_f16_3 - shell->pos[1];
+
52 temp_f12_2 = temp_f26 - shell->pos[2];
53
-
54 temp_f0_3 = (temp_f12_0 * temp_f12_0) + (temp_f12_1 * temp_f12_1) + (temp_f12_2 * temp_f12_2);
-
55 if (temp_f0_3 < temp_f0) {
-
56 shell->pathIndex = nextWaypoint;
+
54 temp_f0_3 = (temp_f12_0 * temp_f12_0) + (temp_f12_1 * temp_f12_1) + (temp_f12_2 * temp_f12_2);
+
55 if (temp_f0_3 < temp_f0) {
+
56 shell->pathIndex = nextWaypoint;
57 } else {
-
58 temp_f0_2 = sqrtf(temp_f0) * 4.0f;
-
59 temp_f20 /= temp_f0_2;
-
60 temp_f22 /= temp_f0_2;
-
61 temp_f24 /= temp_f0_2;
+
58 temp_f0_2 = sqrtf(temp_f0) * 4.0f;
+
59 temp_f20 /= temp_f0_2;
+
60 temp_f22 /= temp_f0_2;
+
61 temp_f24 /= temp_f0_2;
62
-
63 temp_f12_3 = shell->velocity[0];
-
64 temp_f14_2 = shell->velocity[1];
-
65 temp_f16_2 = shell->velocity[2];
+
63 temp_f12_3 = shell->velocity[0];
+
64 temp_f14_2 = shell->velocity[1];
+
65 temp_f16_2 = shell->velocity[2];
66
-
67 temp_f12_3 += temp_f20;
-
68 temp_f14_2 += temp_f22;
-
69 temp_f16_2 += temp_f24;
-
70 temp_f0 = sqrtf((temp_f12_3 * temp_f12_3) + (temp_f14_2 * temp_f14_2) + (temp_f16_2 * temp_f16_2));
-
71 if (temp_f0 > 6.0f) {
-
72 temp_f0 /= 6.0f;
-
73 temp_f12_3 /= temp_f0;
-
74 temp_f14_2 /= temp_f0;
-
75 temp_f16_2 /= temp_f0;
+
67 temp_f12_3 += temp_f20;
+
68 temp_f14_2 += temp_f22;
+
69 temp_f16_2 += temp_f24;
+
70 temp_f0 = sqrtf((temp_f12_3 * temp_f12_3) + (temp_f14_2 * temp_f14_2) + (temp_f16_2 * temp_f16_2));
+
71 if (temp_f0 > 6.0f) {
+
72 temp_f0 /= 6.0f;
+
73 temp_f12_3 /= temp_f0;
+
74 temp_f14_2 /= temp_f0;
+
75 temp_f16_2 /= temp_f0;
76 }
-
77 shell->velocity[0] = temp_f12_3;
-
78 shell->velocity[1] = temp_f14_2;
-
79 shell->velocity[2] = temp_f16_2;
+
77 shell->velocity[0] = temp_f12_3;
+
78 shell->velocity[1] = temp_f14_2;
+
79 shell->velocity[2] = temp_f16_2;
80
-
81 origPos[0] = shell->pos[0];
-
82 origPos[1] = shell->pos[1];
-
83 origPos[2] = shell->pos[2];
+
81 origPos[0] = shell->pos[0];
+
82 origPos[1] = shell->pos[1];
+
83 origPos[2] = shell->pos[2];
84
-
85 shell->pos[0] += temp_f12_3;
-
86 shell->pos[1] += temp_f14_2;
-
87 shell->pos[2] += temp_f16_2;
-
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
-
89 func_802B4E30((struct Actor *) shell);
+
85 shell->pos[0] += temp_f12_3;
+
86 shell->pos[1] += temp_f14_2;
+
87 shell->pos[2] += temp_f16_2;
+
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
+
89 func_802B4E30((struct Actor *) shell);
90 }
91 } else {
-
92 if (temp_f0 > 5.0f) {
-
93 shell->pos[0] = temp_f2;
-
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
-
95 shell->pos[2] = temp_f28;
-
96 shell->pathIndex = nextWaypoint;
+
92 if (temp_f0 > 5.0f) {
+
93 shell->pos[0] = temp_f2;
+
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
+
95 shell->pos[2] = temp_f28;
+
96 shell->pathIndex = nextWaypoint;
97 } else {
-
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
100 temp_f26 = D_80164490[nextWaypoint].posZ;
101
@@ -660,6 +660,11 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
Player::currentRank
s16 currentRank
Definition common_structs.h:272
Player::pos
Vec3f pos
Definition common_structs.h:279
ShellActor
Definition actor_types.h:302
+
ShellActor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:315
+
ShellActor::velocity
Vec3f velocity
Definition actor_types.h:324
+
ShellActor::pos
Vec3f pos
Definition actor_types.h:323
+
ShellActor::unk30
Collision unk30
Definition actor_types.h:325
+
ShellActor::pathIndex
u16 pathIndex
Definition actor_types.h:319
TrackWaypoint::posZ
s16 posZ
Definition waypoints.h:9
TrackWaypoint::posY
s16 posY
Definition waypoints.h:8
TrackWaypoint::posX
s16 posX
Definition waypoints.h:7
diff --git a/camera_8h.html b/camera_8h.html index 82697c381..2767a9855 100644 --- a/camera_8h.html +++ b/camera_8h.html @@ -219,7 +219,7 @@ Variables
-
Todo
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.
+
Todo
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.
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 7a09e364e..514e6fb31 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -2366,7 +2366,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index 305cb43f9..d0c3d4e03 100644 --- a/ceremony__and__credits_8h.html +++ b/ceremony__and__credits_8h.html @@ -2202,7 +2202,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/choco__mountain_2course__offsets_8c.html b/choco__mountain_2course__offsets_8c.html index 01c9eead1..160921635 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,7 +211,6 @@ Variables
{0x00000000, 0x0000, 0x0000, 0x0},
}
gTexture64FBF4
u8 gTexture64FBF4[]
-
gTexture653DB0
u8 gTexture653DB0[]
gTexture67B864
u8 gTexture67B864[]
gTexture65315C
u8 gTexture65315C[]
gTexture679C04
u8 gTexture679C04[]
@@ -220,16 +219,17 @@ 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__80057C60_8h_source.html b/code__80057C60_8h_source.html index 05ae324bc..97d2ae424 100644 --- a/code__80057C60_8h_source.html +++ b/code__80057C60_8h_source.html @@ -761,7 +761,7 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
camera.h
gCourseMaxZ
s16 gCourseMaxZ
Definition code_800029B0.c:92
render_object_p3
void render_object_p3(void)
Definition code_80057C60.c:609
-
func_8006A7C0
void func_8006A7C0(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5640
+
func_8006A7C0
void func_8006A7C0(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5641
func_800591B4
void func_800591B4(void)
Definition code_80057C60.c:1039
D_801657C8
s8 D_801657C8
Definition code_80057C60.c:144
D_80165638
u32 D_80165638
Definition code_80057C60.c:74
@@ -771,27 +771,27 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_800590D4
void func_800590D4(void)
Definition code_80057C60.c:1009
D_801658A8
s8 D_801658A8
Definition code_80057C60.c:195
func_8005D290
void func_8005D290(void)
Definition code_80057C60.c:2745
-
func_80066BAC
void func_80066BAC(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5102
+
func_80066BAC
void func_80066BAC(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5103
func_8005AA94
void func_8005AA94(s32 arg0)
Definition code_80057C60.c:1699
D_8018CFAC
s8 D_8018CFAC[4]
Definition code_80057C60.c:361
-
func_8006B8B4
void func_8006B8B4(Player *player, s8 playerIndex)
Definition code_80057C60.c:5817
-
func_8006E848
void func_8006E848(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6630
+
func_8006B8B4
void func_8006B8B4(Player *player, s8 playerIndex)
Definition code_80057C60.c:5818
+
func_8006E848
void func_8006E848(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6631
D_8018CFD0
s16 D_8018CFD0
Definition code_80057C60.c:370
D_801655AC
s32 D_801655AC
Definition code_80057C60.c:50
-
func_8006E634
void func_8006E634(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6579
+
func_8006E634
void func_8006E634(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6580
func_80064F88
void func_80064F88(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4735
func_8005AB20
void func_8005AB20(void)
Definition code_80057C60.c:1718
-
func_8006801C
void func_8006801C(Player *player, s8 arg1, u8 *texture, s8 arg3, f32 arg4, s32 arg5)
Definition code_80057C60.c:5267
+
func_8006801C
void func_8006801C(Player *player, s8 arg1, u8 *texture, s8 arg3, f32 arg4, s32 arg5)
Definition code_80057C60.c:5268
D_801655BC
s32 D_801655BC
Definition code_80057C60.c:54
D_801657FC
s32 D_801657FC
Definition code_80057C60.c:161
func_80060B14
void func_80060B14(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:3592
func_80062B18
void func_80062B18(f32 *arg0, f32 *arg1, f32 *arg2, f32 arg3, f32 arg4, f32 arg5, u16 arg6, u16 arg7)
Definition code_80057C60.c:4108
D_8018CFC4
s8 D_8018CFC4[4]
Definition code_80057C60.c:367
D_801657AE
s8 D_801657AE
Definition code_80057C60.c:135
-
func_8006E6BC
void func_8006E6BC(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6592
+
func_8006E6BC
void func_8006E6BC(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6593
D_80165908
s8 D_80165908
Definition code_80057C60.c:222
func_80062F98
void func_80062F98(Player *player, s16 arg1, s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4198
-
func_80069BA8
void func_80069BA8(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5511
+
func_80069BA8
void func_80069BA8(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5512
D_80183E70
Vec3f D_80183E70
Definition code_80057C60.c:254
func_80064664
void func_80064664(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4552
render_object
void render_object(u32 arg0)
Definition code_80057C60.c:523
@@ -801,28 +801,28 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_80165754
s32 D_80165754
Definition code_80057C60.c:112
func_8005D794
void func_8005D794(Player *player, UnkPlayerStruct258 *arg1, f32 arg2, f32 arg3, f32 arg4, s8 surfaceType, s8 arg6)
Definition code_80057C60.c:2814
D_80165810
bool8 D_80165810
Definition code_80057C60.c:166
-
func_8006A50C
void func_8006A50C(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg5)
Definition code_80057C60.c:5616
+
func_8006A50C
void func_8006A50C(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg5)
Definition code_80057C60.c:5617
update_object
void update_object(void)
Definition code_80057C60.c:1582
func_80057CE4
void func_80057CE4(void)
Definition code_80057C60.c:440
render_object_p1
void render_object_p1(void)
Definition code_80057C60.c:577
D_8018CF50
s16 D_8018CF50[8]
Definition code_80057C60.c:348
func_80062484
void func_80062484(Player *player, UnkPlayerStruct258 *arg1, s32 arg2)
Definition code_80057C60.c:3955
-
func_8006DD3C
void func_8006DD3C(Player *arg0, s8 arg1, s8 arg2)
Definition code_80057C60.c:6404
+
func_8006DD3C
void func_8006DD3C(Player *arg0, s8 arg1, s8 arg2)
Definition code_80057C60.c:6405
func_800658A0
void func_800658A0(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:4868
D_8018CF78
s16 D_8018CF78
Definition code_80057C60.c:352
func_8005B7A0
void func_8005B7A0(void)
Definition code_80057C60.c:2082
D_8016576A
s8 D_8016576A
Definition code_80057C60.c:117
D_801657B4
s8 D_801657B4
Definition code_80057C60.c:142
-
func_8006B87C
void func_8006B87C(UNUSED Player *player, s8 playerIndex)
Definition code_80057C60.c:5811
+
func_8006B87C
void func_8006B87C(UNUSED Player *player, s8 playerIndex)
Definition code_80057C60.c:5812
D_800E4730
s16 D_800E4730[]
Definition code_80057C60.c:374
-
func_80067964
void func_80067964(Player *player, UNUSED s8 arg1, f32 arg2, UNUSED s8 arg3, s8 arg4)
Definition code_80057C60.c:5213
+
func_80067964
void func_80067964(Player *player, UNUSED s8 arg1, f32 arg2, UNUSED s8 arg3, s8 arg4)
Definition code_80057C60.c:5214
D_8018CE10
struct_D_8018CE10 D_8018CE10[8]
Definition code_80057C60.c:337
-
func_800696CC
void func_800696CC(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3, f32 arg4)
Definition code_80057C60.c:5461
+
func_800696CC
void func_800696CC(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3, f32 arg4)
Definition code_80057C60.c:5462
func_8005A3C0
void func_8005A3C0(void)
Definition code_80057C60.c:1499
D_80165718
s16 D_80165718
Definition code_80057C60.c:95
func_8005C65C
void func_8005C65C(s32 arg0)
Definition code_80057C60.c:2437
func_800648E4
void func_800648E4(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4596
-
func_80067280
void func_80067280(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5148
+
func_80067280
void func_80067280(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5149
render_hud_2p_horizontal_player_two_horizontal_player_one
void render_hud_2p_horizontal_player_two_horizontal_player_one(void)
Definition code_80057C60.c:1082
func_800597B8
void func_800597B8(void)
Definition code_80057C60.c:1188
D_80165898
s8 D_80165898
Definition code_80057C60.c:192
@@ -831,16 +831,16 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_8005A99C
void func_8005A99C(void)
Definition code_80057C60.c:1660
D_8016586C
s32 D_8016586C
Definition code_80057C60.c:182
D_80165760
Vec4s D_80165760
Definition code_80057C60.c:115
-
func_8006E8C4
void func_8006E8C4(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6642
+
func_8006E8C4
void func_8006E8C4(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6643
D_80165800
s8 D_80165800[2]
Definition code_80057C60.c:162
-
render_battle_balloon
void render_battle_balloon(Player *player, s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5726
-
func_80067604
void func_80067604(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5185
-
func_80068310
void func_80068310(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5294
+
render_battle_balloon
void render_battle_balloon(Player *player, s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5727
+
func_80067604
void func_80067604(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5186
+
func_80068310
void func_80068310(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5295
D_80165860
s32 D_80165860
Definition code_80057C60.c:179
func_80062968
void func_80062968(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4071
func_80059820
void func_80059820(s32 playerId)
Definition code_80057C60.c:1201
D_801657D8
s8 D_801657D8
Definition code_80057C60.c:146
-
func_80066998
void func_80066998(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5074
+
func_80066998
void func_80066998(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5075
func_80059358
void func_80059358(void)
Definition code_80057C60.c:1078
D_80165900
s16 D_80165900
Definition code_80057C60.c:220
func_80057DD0
void func_80057DD0(void)
Definition code_80057C60.c:472
@@ -863,7 +863,7 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_80057FC4
void func_80057FC4(u32 arg0)
Definition code_80057C60.c:489
func_800650FC
void func_800650FC(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4767
D_801655A4
s32 D_801655A4
Definition code_80057C60.c:48
-
func_8006C0C8
void func_8006C0C8(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha)
Definition code_80057C60.c:5917
+
func_8006C0C8
void func_8006C0C8(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha)
Definition code_80057C60.c:5918
func_800630C0
void func_800630C0(Player *player, s16 arg1, s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4218
func_80059C50
void func_80059C50(void)
Definition code_80057C60.c:1298
D_801658D6
s8 D_801658D6
Definition code_80057C60.c:206
@@ -875,7 +875,7 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_80063FBC
void func_80063FBC(Player *player, s16 arg1, UNUSED s32 arg2, UNUSED s32 arg3)
Definition code_80057C60.c:4452
func_800629BC
void func_800629BC(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4079
func_80061EF4
void func_80061EF4(Player *player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4)
Definition code_80057C60.c:3845
-
func_8006B9CC
void func_8006B9CC(Player *player, s8 arg1)
Definition code_80057C60.c:5835
+
func_8006B9CC
void func_8006B9CC(Player *player, s8 arg1)
Definition code_80057C60.c:5836
D_801657E3
s8 D_801657E3
Definition code_80057C60.c:151
D_8018CF1C
Player * D_8018CF1C
Definition code_80057C60.c:342
func_80063D58
void func_80063D58(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4423
@@ -886,7 +886,7 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_80183E98
Vec3su D_80183E98
Definition code_80057C60.c:260
D_801656C0
u16 D_801656C0
Definition code_80057C60.c:83
func_800628C0
void func_800628C0(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4055
-
func_80069938
void func_80069938(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5486
+
func_80069938
void func_80069938(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5487
D_8018CFD8
s16 D_8018CFD8
Definition code_80057C60.c:372
sRandomItemIndex
u8 sRandomItemIndex
Definition code_80057C60.c:217
func_80063408
void func_80063408(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4280
@@ -901,16 +901,16 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_800644E8
void func_800644E8(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4524
D_80165770
Vec4s D_80165770
Definition code_80057C60.c:118
D_8018CFCC
f32 D_8018CFCC
Definition code_80057C60.c:369
-
func_8006E5AC
void func_8006E5AC(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6566
+
func_8006E5AC
void func_8006E5AC(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6567
D_80165598
s32 D_80165598
Definition code_80057C60.c:45
func_8005D1F4
void func_8005D1F4(s32 arg0)
Definition code_80057C60.c:2724
func_8005994C
void func_8005994C(void)
Definition code_80057C60.c:1226
func_8005995C
void func_8005995C(void)
Definition code_80057C60.c:1230
D_80165820
s8 D_80165820
Definition code_80057C60.c:170
-
func_8006C6AC
void func_8006C6AC(Player *player, s16 arg1, s8 arg2, s8 arg3)
Definition code_80057C60.c:5993
+
func_8006C6AC
void func_8006C6AC(Player *player, s16 arg1, s8 arg2, s8 arg3)
Definition code_80057C60.c:5994
D_80165888
s8 D_80165888
Definition code_80057C60.c:188
D_80183E40
Vec3f D_80183E40
Definition code_80057C60.c:245
-
render_balloon
void render_balloon(Vec3f arg0, f32 arg1, s16 arg2, s16 arg3)
Definition code_80057C60.c:5865
+
render_balloon
void render_balloon(Vec3f arg0, f32 arg1, s16 arg2, s16 arg3)
Definition code_80057C60.c:5866
func_8005CB60
void func_8005CB60(s32 playerId, s32 lapCount)
Definition code_80057C60.c:2553
D_800E47A0
u8 ** D_800E47A0[]
Definition code_80057C60.c:396
D_8016579E
u16 D_8016579E
Definition code_80057C60.c:129
@@ -921,21 +921,21 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_80165878
s32 D_80165878
Definition code_80057C60.c:184
func_80061A34
void func_80061A34(Player *player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4)
Definition code_80057C60.c:3792
func_80062914
void func_80062914(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4063
-
func_8006C294
void func_8006C294(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha)
Definition code_80057C60.c:5944
+
func_8006C294
void func_8006C294(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha)
Definition code_80057C60.c:5945
D_801655B4
s32 D_801655B4
Definition code_80057C60.c:52
func_8006538C
void func_8006538C(Player *player, s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:4816
func_8005AA34
void func_8005AA34(void)
Definition code_80057C60.c:1679
-
func_8006BA94
void func_8006BA94(Player *player, s8 playerIndex, s8 arg2)
Definition code_80057C60.c:5850
+
func_8006BA94
void func_8006BA94(Player *player, s8 playerIndex, s8 arg2)
Definition code_80057C60.c:5851
D_8016578C
s16 D_8016578C
Definition code_80057C60.c:122
D_8018CF48
s16 D_8018CF48
Definition code_80057C60.c:347
D_801655D8
s32 D_801655D8
Definition code_80057C60.c:60
-
func_80069444
void func_80069444(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5420
+
func_80069444
void func_80069444(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5421
func_8005DAD8
void func_8005DAD8(UnkPlayerStruct258 *arg0, s16 arg1, s16 arg2, s16 arg3)
Definition code_80057C60.c:2894
-
func_80068724
void func_80068724(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5320
+
func_80068724
void func_80068724(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5321
render_player_snow_effect
void render_player_snow_effect(u32 arg0)
Definition code_80057C60.c:632
func_8005A070
void func_8005A070(void)
Definition code_80057C60.c:1418
func_800651F4
void func_800651F4(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4789
-
func_800664E0
void func_800664E0(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5014
+
func_800664E0
void func_800664E0(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5015
D_80165658
u32 D_80165658[8]
Definition code_80057C60.c:78
D_800E4770
u8 ** D_800E4770[]
Definition code_80057C60.c:390
func_8005A71C
void func_8005A71C(void)
Definition code_80057C60.c:1576
@@ -946,14 +946,14 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_80183E80
Vec3su D_80183E80
Definition code_80057C60.c:257
D_801658DC
s8 D_801658DC
Definition code_80057C60.c:208
func_80061224
void func_80061224(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:3677
-
func_8006D474
void func_8006D474(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6259
+
func_8006D474
void func_8006D474(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6260
D_80165808
s8 D_80165808
Definition code_80057C60.c:164
D_8018CF68
s16 D_8018CF68[8]
This may be a list of tilemap flags on a per-camera basis.
Definition code_80057C60.c:351
D_8018C830
Collision D_8018C830
Definition code_80057C60.c:319
D_8018CF90
s16 D_8018CF90
Definition code_80057C60.c:358
-
func_80069DB8
void func_80069DB8(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5539
+
func_80069DB8
void func_80069DB8(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5540
D_8018CF28
Player * D_8018CF28[4]
Definition code_80057C60.c:345
-
func_8006D194
void func_8006D194(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6214
+
func_8006D194
void func_8006D194(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6215
D_801657B8
s8 D_801657B8[16]
Definition code_80057C60.c:143
D_80165720
s16 D_80165720
Definition code_80057C60.c:97
func_80062A18
void func_80062A18(Player *player, s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4088
@@ -962,13 +962,13 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_8005C6B4
void func_8005C6B4(s8 arg0, s16 *arg1, s16 *arg2, s16 *arg3)
Definition code_80057C60.c:2448
func_800643A8
void func_800643A8(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4505
render_object_for_player
void render_object_for_player(s32 cameraId)
Definition code_80057C60.c:705
-
func_8006E7CC
void func_8006E7CC(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6618
+
func_8006E7CC
void func_8006E7CC(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6619
func_8005C674
void func_8005C674(s8 index, s16 *x, s16 *y, s16 *z)
Definition code_80057C60.c:2441
D_801655C0
s32 D_801655C0
Definition code_80057C60.c:55
func_8005DAD0
UNUSED void func_8005DAD0(void)
Definition code_80057C60.c:2890
render_hud_2p_vertical_player_one
void render_hud_2p_vertical_player_one(void)
Definition code_80057C60.c:1120
D_801657F8
bool8 D_801657F8
Definition code_80057C60.c:160
-
func_8006A01C
void func_8006A01C(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5563
+
func_8006A01C
void func_8006A01C(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5564
render_object_p2
void render_object_p2(void)
Definition code_80057C60.c:597
D_80165710
s16 D_80165710
Definition code_80057C60.c:93
func_800594F0
void func_800594F0(void)
Definition code_80057C60.c:1116
@@ -989,15 +989,15 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_800624D8
void func_800624D8(Player *player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4)
Definition code_80057C60.c:3965
D_801658EC
s8 D_801658EC
Definition code_80057C60.c:212
D_80165740
s16 D_80165740
Definition code_80057C60.c:106
-
func_8006E744
void func_8006E744(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6605
+
func_8006E744
void func_8006E744(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6606
D_801657E7
u8 D_801657E7
Definition code_80057C60.c:155
D_80165A90
s8 D_80165A90
Definition code_80057C60.c:224
-
func_8006DC54
void func_8006DC54(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6390
+
func_8006DC54
void func_8006DC54(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6391
D_800E47DC
s32 D_800E47DC[]
Definition code_80057C60.c:403
-
func_800691B8
void func_800691B8(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5394
+
func_800691B8
void func_800691B8(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5395
D_8016582C
Vec3su D_8016582C
Definition code_80057C60.c:173
func_8005DAF4
void func_8005DAF4(Player *player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4)
Definition code_80057C60.c:2900
-
func_80068AA4
void func_80068AA4(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5346
+
func_80068AA4
void func_80068AA4(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5347
D_801656D0
u16 D_801656D0
Definition code_80057C60.c:85
D_80165790
s16 D_80165790
Definition code_80057C60.c:124
D_80165628
s32 D_80165628
Definition code_80057C60.c:72
@@ -1016,7 +1016,7 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_8018CFC8
s16 D_8018CFC8
Definition code_80057C60.c:368
D_801657E1
s8 D_801657E1
Definition code_80057C60.c:149
D_8018CF20
s16 D_8018CF20
Definition code_80057C60.c:343
-
func_8006C9B8
void func_8006C9B8(Player *player, s16 arg1, s8 arg2, s8 arg3)
Definition code_80057C60.c:6046
+
func_8006C9B8
void func_8006C9B8(Player *player, s16 arg1, s8 arg2, s8 arg3)
Definition code_80057C60.c:6047
D_801657F0
bool8 D_801657F0
Definition code_80057C60.c:158
func_8005C728
void func_8005C728(void)
Definition code_80057C60.c:2468
func_8005DA30
void func_8005DA30(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:2882
@@ -1027,21 +1027,21 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_80165648
u32 D_80165648
Definition code_80057C60.c:76
D_8016587C
s32 D_8016587C
Definition code_80057C60.c:185
func_8005D898
void func_8005D898(Player *player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4)
Definition code_80057C60.c:2847
-
func_80067D3C
void func_80067D3C(Player *player, s8 arg1, u8 *texture, s8 arg3, f32 arg4, s32 arg5)
Definition code_80057C60.c:5240
+
func_80067D3C
void func_80067D3C(Player *player, s8 arg1, u8 *texture, s8 arg3, f32 arg4, s32 arg5)
Definition code_80057C60.c:5241
D_80165748
s16 D_80165748
Definition code_80057C60.c:108
D_80165590
s32 D_80165590
Definition code_80057C60.c:43
func_8005C64C
void func_8005C64C(UNUSED s32 *arg0)
Definition code_80057C60.c:2429
D_801656E0
u16 D_801656E0
Definition code_80057C60.c:87
func_8005902C
void func_8005902C(void)
Definition code_80057C60.c:986
func_80060504
void func_80060504(Player *player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4)
Definition code_80057C60.c:3497
-
func_80068DA0
void func_80068DA0(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5369
+
func_80068DA0
void func_80068DA0(Player *player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8 arg4)
Definition code_80057C60.c:5370
render_hud_3p_multi
void render_hud_3p_multi(void)
Definition code_80057C60.c:1181
D_80183DC8
f32 D_80183DC8[4]
Definition code_80057C60.c:239
D_8018CFB8
s16 D_8018CFB8
Definition code_80057C60.c:364
-
func_8006E940
void func_8006E940(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6654
+
func_8006E940
void func_8006E940(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6655
D_8018CFB4
s8 D_8018CFB4[4]
Definition code_80057C60.c:363
func_80059750
void func_80059750(void)
Definition code_80057C60.c:1175
-
func_8006E420
void func_8006E420(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6544
+
func_8006E420
void func_8006E420(Player *player, s8 arg1, s8 arg2)
Definition code_80057C60.c:6545
D_801656B0
u16 D_801656B0
Definition code_80057C60.c:81
func_8005C360
void func_8005C360(f32 arg0)
Definition code_80057C60.c:2405
D_8018CFC0
s16 D_8018CFC0
Definition code_80057C60.c:366
@@ -1057,7 +1057,7 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_801657E2
s8 D_801657E2
Definition code_80057C60.c:150
func_800621BC
void func_800621BC(Player *player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4)
Definition code_80057C60.c:3894
func_80063BD4
void func_80063BD4(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4402
-
func_8006E058
void func_8006E058(void)
Definition code_80057C60.c:6451
+
func_8006E058
void func_8006E058(void)
Definition code_80057C60.c:6452
func_80059710
void func_80059710(void)
Definition code_80057C60.c:1164
D_80165828
s8 D_80165828
Definition code_80057C60.c:172
render_hud_2p_horizontal_player_two
void render_hud_2p_horizontal_player_two(void)
Definition code_80057C60.c:1097
@@ -1069,9 +1069,9 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
func_80062AA8
void func_80062AA8(Player *player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3)
Definition code_80057C60.c:4100
gControllerRandom
u8 gControllerRandom
Definition code_80057C60.c:219
func_8005A380
void func_8005A380(void)
Definition code_80057C60.c:1492
-
func_8006CEC0
void func_8006CEC0(Player *arg0, s16 arg1, s8 arg2, s8 arg3)
Definition code_80057C60.c:6146
+
func_8006CEC0
void func_8006CEC0(Player *arg0, s16 arg1, s8 arg2, s8 arg3)
Definition code_80057C60.c:6147
func_8005D82C
s32 func_8005D82C(UnkPlayerStruct258 *arg0, s32 arg1, s16 arg2)
Definition code_80057C60.c:2837
-
func_8006B7E4
void func_8006B7E4(Player *player, s8 arg1)
Definition code_80057C60.c:5804
+
func_8006B7E4
void func_8006B7E4(Player *player, s8 arg1)
Definition code_80057C60.c:5805
func_80059AC8
void func_80059AC8(void)
Definition code_80057C60.c:1258
func_8005A14C
void func_8005A14C(s32 playerId)
Definition code_80057C60.c:1442
func_80064184
void func_80064184(Player *player, s16 arg1, s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4473
@@ -1080,17 +1080,17 @@ $(function(){initNavTree('code__80057C60_8h_source.html',''); initResizable(); }
D_8018CFD4
f32 D_8018CFD4
Definition code_80057C60.c:371
D_801655F8
s32 D_801655F8
Definition code_80057C60.c:66
D_801656F0
s16 D_801656F0
Definition code_80057C60.c:89
-
func_8006B974
void func_8006B974(UNUSED s32 arg0, s8 playerIndex, s8 balloonIndex)
Definition code_80057C60.c:5829
+
func_8006B974
void func_8006B974(UNUSED s32 arg0, s8 playerIndex, s8 balloonIndex)
Definition code_80057C60.c:5830
D_80165794
s16 D_80165794
Definition code_80057C60.c:126
func_800647C8
void func_800647C8(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4577
func_800593F0
void func_800593F0(void)
Definition code_80057C60.c:1093
D_801657D0
s8 D_801657D0[8]
Definition code_80057C60.c:145
D_801655F0
s32 D_801655F0
Definition code_80057C60.c:64
-
func_8006A280
void func_8006A280(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5587
+
func_8006A280
void func_8006A280(Player *player, UNUSED s8 arg1, s16 arg2, s8 arg3)
Definition code_80057C60.c:5588
func_80064988
void func_80064988(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4613
D_80165818
bool8 D_80165818
Definition code_80057C60.c:168
D_80165728
s16 D_80165728
Definition code_80057C60.c:99
-
func_8006C4D4
void func_8006C4D4(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha, s16 arg4)
Definition code_80057C60.c:5970
+
func_8006C4D4
void func_8006C4D4(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha, s16 arg4)
Definition code_80057C60.c:5971
func_800649F4
void func_800649F4(Player *player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3)
Definition code_80057C60.c:4624
D_8016581C
s32 D_8016581C
Definition code_80057C60.c:169
D_80165678
s32 D_80165678
Definition code_80057C60.c:79
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index f0cf6df42..3c1897241 100644 --- a/code__80281780_8c.html +++ b/code__80281780_8c.html @@ -164,7 +164,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/code__80281780_8h.html b/code__80281780_8h.html index 437cb98ec..affe4d396 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
    • 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/kalimari__desert_2course__offsets_8c.html b/kalimari__desert_2course__offsets_8c.html index dcfdf001f..e00c8dccc 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/navtreeindex1.js b/navtreeindex1.js index 248d9708c..9800bed39 100644 --- a/navtreeindex1.js +++ b/navtreeindex1.js @@ -168,8 +168,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,19], "abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,20], +"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,19], "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/navtreeindex28.js b/navtreeindex28.js index 1e57ac2c3..f83f3ba77 100644 --- a/navtreeindex28.js +++ b/navtreeindex28.js @@ -196,7 +196,7 @@ var NAVTREEINDEX28 = "controlflow.html#actors-1":[1,2,4,2], "controlflow.html#code-breakdown":[1,2,4], "controlflow.html#course-folder":[1,2,4,4,0], -"controlflow.html#courses":[1,2,4,4], +"controlflow.html#courses-1":[1,2,4,4], "controlflow.html#ending":[1,2,4,8], "controlflow.html#engine":[1,2,4,6], "controlflow.html#math":[1,2,4,7], diff --git a/navtreeindex29.js b/navtreeindex29.js index 66c2fda09..0fa8c472e 100644 --- a/navtreeindex29.js +++ b/navtreeindex29.js @@ -201,7 +201,7 @@ var NAVTREEINDEX29 = "course__offsets_8h.html":[8,0,2,7], "course__offsets_8h_source.html":[8,0,2,7], "courses.html":[2,0], -"courses.html#courses-1":[2,0,0], +"courses.html#courses":[2,0,0], "coursesmenu.html":[2], "cow_2render_8inc_8c.html":[8,0,3,0,4,0], "cow_2render_8inc_8c.html#a3032e5759fffafb766e96e1991ab0350":[8,0,3,0,4,0,0], diff --git a/navtreeindex40.js b/navtreeindex40.js index e56424873..eebc321c9 100644 --- a/navtreeindex40.js +++ b/navtreeindex40.js @@ -1,7 +1,7 @@ var NAVTREEINDEX40 = { -"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/navtreeindex42.js b/navtreeindex42.js index 506b413a3..832e75e53 100644 --- a/navtreeindex42.js +++ b/navtreeindex42.js @@ -52,8 +52,8 @@ var NAVTREEINDEX42 = "globals_enum.html":[8,1,4], "globals_eval.html":[8,1,5], "globals_f.html":[8,1,0,6], -"globals_func.html":[8,1,1,0], "globals_func.html":[8,1,1], +"globals_func.html":[8,1,1,0], "globals_func_a.html":[8,1,1,1], "globals_func_b.html":[8,1,1,2], "globals_func_c.html":[8,1,1,3], @@ -93,8 +93,8 @@ var NAVTREEINDEX42 = "globals_type.html":[8,1,3], "globals_u.html":[8,1,0,21], "globals_v.html":[8,1,0,22], -"globals_vars.html":[8,1,2], "globals_vars.html":[8,1,2,0], +"globals_vars.html":[8,1,2], "globals_vars_b.html":[8,1,2,1], "globals_vars_c.html":[8,1,2,2], "globals_vars_d.html":[8,1,2,3], diff --git a/navtreeindex68.js b/navtreeindex68.js index 89ca5829a..50aa19ce0 100644 --- a/navtreeindex68.js +++ b/navtreeindex68.js @@ -196,8 +196,8 @@ var NAVTREEINDEX68 = "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,6], "load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,5], +"load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,6], "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 b4feeebe7..59e8acd63 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 661858b66..9de6d0159 100644 --- a/osPiStartDma_8c.html +++ b/osPiStartDma_8c.html @@ -167,7 +167,7 @@ Variables
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/osViSwapBuffer_8c.html b/osViSwapBuffer_8c.html index baec66b79..71496921e 100644 --- a/osViSwapBuffer_8c.html +++ b/osViSwapBuffer_8c.html @@ -138,7 +138,7 @@ Variables
    -
    Todo
    figure out what this flag means
    +
    Todo
    figure out what this flag means
    Here is the call graph for this function:
    diff --git a/os__pi_8h.html b/os__pi_8h.html index b6b02c130..6e2c0bcb1 100644 --- a/os__pi_8h.html +++ b/os__pi_8h.html @@ -441,7 +441,7 @@ Here is the caller graph for this function:
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/os__vi_8h.html b/os__vi_8h.html index 849a08b12..6e0309a0c 100644 --- a/os__vi_8h.html +++ b/os__vi_8h.html @@ -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/piint_8h.html b/piint_8h.html index 4105e2c66..863e77753 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/player__controller_8c.html b/player__controller_8c.html index ad9e2cf8c..834d4f48e 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 1633e0985..6de169cd6 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/port__eu_8c.html b/port__eu_8c.html index bb7c45418..d90406516 100644 --- a/port__eu_8c.html +++ b/port__eu_8c.html @@ -415,7 +415,7 @@ Here is the caller graph for this function:
    -
    Todo
    clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100
    +
    Todo
    clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100
    Here is the call graph for this function:
    diff --git a/port__eu_8h.html b/port__eu_8h.html index f251dadc3..9706c92d5 100644 --- a/port__eu_8h.html +++ b/port__eu_8h.html @@ -402,7 +402,7 @@ Here is the caller graph for this function:
    -
    Todo
    clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100
    +
    Todo
    clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100
    Here is the call graph for this function:
    diff --git a/race__logic_8c.html b/race__logic_8c.html index 6e79ad3fd..4d1b251c2 100644 --- a/race__logic_8c.html +++ b/race__logic_8c.html @@ -703,7 +703,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/race__logic_8h.html b/race__logic_8h.html index a98eacff5..44e87ce0a 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_5.js b/search/all_5.js index 09f29981c..713b9486c 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -594,7 +594,7 @@ var searchData= ['courseindex_591',['courseIndex',['../structstruct__8018EE10__entry.html#acee952c37d3917fd90809e58c6401e65',1,'struct_8018EE10_entry']]], ['courserecords_592',['courseRecords',['../structCupTimeTrialRecords.html#acf18ab0e69f90a2eefe248ef7090bd1c',1,'CupTimeTrialRecords']]], ['courses_593',['COURSES',['../mk64_8h.html#acf250ad4ca05ca435a61203c41d4ca88',1,'mk64.h']]], - ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses-1',1,'Courses'],['../controlflow.html#courses',1,'Courses']]], + ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses',1,'Courses'],['../controlflow.html#courses-1',1,'Courses']]], ['courses_2emd_595',['courses.md',['../courses_8md.html',1,'']]], ['coursesmenu_2emd_596',['coursesmenu.md',['../coursesmenu_8md.html',1,'']]], ['coursetable_597',['CourseTable',['../structCourseTable.html',1,'']]], diff --git a/structActorSpawnData.html b/structActorSpawnData.html index 0c4602e99..8aaedaca1 100644 --- a/structActorSpawnData.html +++ b/structActorSpawnData.html @@ -117,18 +117,18 @@ Collaboration diagram for ActorSpawnData:
    Data Fields Vec3s pos   -union {  +union {    -   u16   someId  -  -   s16   signedSomeId  -  -};   -  +   u16   someId  +  +   s16   signedSomeId  +  +};   + 

    Field Documentation

    - -

    ◆ [union]

    + +

    ◆ [union]

    diff --git a/structActorSpawnData__coll__graph.md5 b/structActorSpawnData__coll__graph.md5 index a87a116c2..abafd4437 100644 --- a/structActorSpawnData__coll__graph.md5 +++ b/structActorSpawnData__coll__graph.md5 @@ -1 +1 @@ -cc5b731707b0281ff99dca81244fe78f \ No newline at end of file +537e3458a7a1098bb8d17e74c8c9de91 \ No newline at end of file diff --git a/structActorSpawnData__coll__graph.svg b/structActorSpawnData__coll__graph.svg index 42a767630..7ba1daec3 100644 --- a/structActorSpawnData__coll__graph.svg +++ b/structActorSpawnData__coll__graph.svg @@ -71,7 +71,7 @@ Node4 -anonymous:@29 +anonymous:@17 @@ -83,7 +83,7 @@ - @29 + @17 diff --git a/structActorSpawnData__coll__graph_org.svg b/structActorSpawnData__coll__graph_org.svg index 3b04c8cf4..eb5f05cb2 100644 --- a/structActorSpawnData__coll__graph_org.svg +++ b/structActorSpawnData__coll__graph_org.svg @@ -61,7 +61,7 @@ Node4 -anonymous:@29 +anonymous:@17 @@ -73,7 +73,7 @@ - @29 + @17 diff --git a/structBananaActor.html b/structBananaActor.html index 74eff06c5..d6a1e6676 100644 --- a/structBananaActor.html +++ b/structBananaActor.html @@ -129,22 +129,22 @@ Data Fields   f32 boundingBoxSize   -union {  +union {    -   Vec3s   rot  -  -   struct {  +   Vec3s   rot  +  +   struct {    -      s16   playerId  -  -      s16   elderIndex  -  -      s16   youngerIndex  -  -   }   -  -};   -  +      s16   playerId  +  +      s16   elderIndex  +  +      s16   youngerIndex  +  +   }   +  +};   +  s16 unk_16   Vec3f pos @@ -155,8 +155,8 @@ Data Fields  

    Field Documentation

    - -

    ◆ [union]

    + +

    ◆ [union]

    diff --git a/structBananaActor__coll__graph.md5 b/structBananaActor__coll__graph.md5 index 8492c77fe..b62e39519 100644 --- a/structBananaActor__coll__graph.md5 +++ b/structBananaActor__coll__graph.md5 @@ -1 +1 @@ -947b1d57f9c8e70839f3b75070bba263 \ No newline at end of file +1146ac77685bdc9e13f05d3c71269ba1 \ No newline at end of file diff --git a/structBananaActor__coll__graph.svg b/structBananaActor__coll__graph.svg index 76d2e0df8..6fce517d4 100644 --- a/structBananaActor__coll__graph.svg +++ b/structBananaActor__coll__graph.svg @@ -105,7 +105,7 @@ Node4 -anonymous:@35 +anonymous:@23 @@ -117,7 +117,7 @@ - @35 + @23 diff --git a/structBananaActor__coll__graph_org.svg b/structBananaActor__coll__graph_org.svg index 7a33db6d8..502dc9338 100644 --- a/structBananaActor__coll__graph_org.svg +++ b/structBananaActor__coll__graph_org.svg @@ -95,7 +95,7 @@ Node4 -anonymous:@35 +anonymous:@23 @@ -107,7 +107,7 @@ - @35 + @23 diff --git a/structShellActor.html b/structShellActor.html index 124eaf599..f7fd69260 100644 --- a/structShellActor.html +++ b/structShellActor.html @@ -119,16 +119,16 @@ Data Fields   s16 flags   -union {  +union {    -   s16   parentIndex  -  -   s16   someTimer  -  -   s16   targetPlayer  -  -};   -  +   s16   parentIndex  +  +   s16   someTimer  +  +   s16   targetPlayer  +  +};   +  s16 state   f32 shellId @@ -137,14 +137,14 @@ Data Fields   s16 rotVelocity   -union {  +union {    -   s16   rotAngle  -  -   u16   pathIndex  -  -};   -  +   s16   rotAngle  +  +   u16   pathIndex  +  +};   +  s16 playerId   s16 unk_16 @@ -157,8 +157,8 @@ Data Fields  

    Field Documentation

    - -

    ◆ [union]

    + +

    ◆ [union]

    @@ -171,8 +171,8 @@ Data Fields
    - -

    ◆ [union]

    + +

    ◆ [union]

    diff --git a/structShellActor__coll__graph.md5 b/structShellActor__coll__graph.md5 index 8a7809512..8e9cdef7a 100644 --- a/structShellActor__coll__graph.md5 +++ b/structShellActor__coll__graph.md5 @@ -1 +1 @@ -90e2a0f9eccbb652f47890205166e286 \ No newline at end of file +98c0169ca5f4f1d95b8ccd99226bdcb8 \ No newline at end of file diff --git a/structShellActor__coll__graph.svg b/structShellActor__coll__graph.svg index d2118551d..33161da03 100644 --- a/structShellActor__coll__graph.svg +++ b/structShellActor__coll__graph.svg @@ -61,7 +61,7 @@ Node3 -anonymous:@31 +anonymous:@19 @@ -73,7 +73,7 @@ - @31 + @19 @@ -125,7 +125,7 @@ Node5 -anonymous:@33 +anonymous:@21 @@ -137,7 +137,7 @@ - @33 + @21 diff --git a/structShellActor__coll__graph_org.svg b/structShellActor__coll__graph_org.svg index edf70ca08..a9524f01e 100644 --- a/structShellActor__coll__graph_org.svg +++ b/structShellActor__coll__graph_org.svg @@ -51,7 +51,7 @@ Node3 -anonymous:@31 +anonymous:@19 @@ -63,7 +63,7 @@ - @31 + @19 @@ -115,7 +115,7 @@ Node5 -anonymous:@33 +anonymous:@21 @@ -127,7 +127,7 @@ - @33 + @21 diff --git a/structhud__player.html b/structhud__player.html index 32cf087f0..4914985db 100644 --- a/structhud__player.html +++ b/structhud__player.html @@ -125,38 +125,38 @@ Data Fields   u32 timeLastTouchedFinishLine   -union {  +union {    -   struct {  +   struct {    -      u32   lap1CompletionTime  -  -      u32   lap2CompletionTime  -  -      u32   lap3CompletionTime  -  -   }   -  -   u32   lapCompletionTimes [3]  -  -};   -  -union {  +      u32   lap1CompletionTime  +  +      u32   lap2CompletionTime  +  +      u32   lap3CompletionTime  +  +   }   +  +   u32   lapCompletionTimes [3]  +  +};   +  +union {    -   struct {  +   struct {    -      u32   lap1Duration  -  -      u32   lap2Duration  -  -      u32   lap3Duration  -  -   }   -  -   u32   lapDurations [3]  -  -};   -  +      u32   lap1Duration  +  +      u32   lap2Duration  +  +      u32   lap3Duration  +  +   }   +  +   u32   lapDurations [3]  +  +};   +  s32 posXInt   s32 posYInt @@ -185,22 +185,22 @@ Data Fields   s16 timerX   -union {  +union {    -   struct {  +   struct {    -      s16   lap1CompletionTimeX  -  -      s16   lap2CompletionTimeX  -  -      s16   lap3CompletionTimeX  -  -   }   -  -   s16   lapCompletionTimeXs [3]  -  -};   -  +      s16   lap1CompletionTimeX  +  +      s16   lap2CompletionTimeX  +  +      s16   lap3CompletionTimeX  +  +   }   +  +   s16   lapCompletionTimeXs [3]  +  +};   +  s16 totalTimeX   s16 timerY @@ -269,8 +269,8 @@ Data Fields  

    Field Documentation

    - -

    ◆ [union]

    + +

    ◆ [union]

    @@ -283,8 +283,8 @@ Data Fields
    - -

    ◆ [union]

    + +

    ◆ [union]

    @@ -297,8 +297,8 @@ Data Fields
    - -

    ◆ [union]

    + +

    ◆ [union]

    diff --git a/structhud__player__coll__graph.md5 b/structhud__player__coll__graph.md5 index 65a7238bc..5e374746f 100644 --- a/structhud__player__coll__graph.md5 +++ b/structhud__player__coll__graph.md5 @@ -1 +1 @@ -be4ed22785cc90d2302fb4b799bdc204 \ No newline at end of file +baa568c18b297d224413a7eecd0f8b1e \ No newline at end of file diff --git a/structhud__player__coll__graph.svg b/structhud__player__coll__graph.svg index 804ab790b..d58bb199e 100644 --- a/structhud__player__coll__graph.svg +++ b/structhud__player__coll__graph.svg @@ -117,7 +117,7 @@ var sectionId = 'dynsection-0'; Node4 -anonymous:@17 +anonymous:@27 @@ -129,14 +129,14 @@ var sectionId = 'dynsection-0'; - @17 + @27 Node5 -anonymous:@19 +anonymous:@29 @@ -148,14 +148,14 @@ var sectionId = 'dynsection-0'; - @19 + @29 Node6 -anonymous:@21 +anonymous:@31 @@ -167,7 +167,7 @@ var sectionId = 'dynsection-0'; - @21 + @31 diff --git a/structhud__player__coll__graph_org.svg b/structhud__player__coll__graph_org.svg index e105565b8..91f39d9fe 100644 --- a/structhud__player__coll__graph_org.svg +++ b/structhud__player__coll__graph_org.svg @@ -71,7 +71,7 @@ Node4 -anonymous:@17 +anonymous:@27 @@ -83,14 +83,14 @@ - @17 + @27 Node5 -anonymous:@19 +anonymous:@29 @@ -102,14 +102,14 @@ - @19 + @29 Node6 -anonymous:@21 +anonymous:@31 @@ -121,7 +121,7 @@ - @21 + @31 diff --git a/todo.html b/todo.html index a09c37819..811801fc9 100644 --- a/todo.html +++ b/todo.html @@ -123,7 +123,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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.
    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.
    +
    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
    Global D_800E43B0 []
    @@ -163,7 +163,7 @@ $(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?

    @@ -175,7 +175,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800100F0 (s32)
    Confirm this comment
    Global func_80028864 (Player *, Camera *, s8, s8)
    -
    make a proper match
    +
    make a proper match
    Global func_80046030 (u8 *tlut, u8 *texture, Vtx *arg2, s32 width, s32 arg4, s32 height)
    tlut/texture unconfirmed. This could be texture1 and texture2
    Global func_8004B7DC (s32 x, s32 y, s32 width, s32 height, s32 arg4, s32 arg5, s32 arg6)
    @@ -187,15 +187,15 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_80091FA4 (void)
    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
    +
    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?
    Global func_8028336C (UNUSED struct CinematicCamera *arg0, UNUSED Camera *camera)
    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
    @@ -205,11 +205,11 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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
    +
    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
    @@ -227,17 +227,17 @@ $(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
    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
    Global UPDATE_REG (reg, var)
    diff --git a/train_2render_8inc_8c_source.html b/train_2render_8inc_8c_source.html index bb94a6e00..d2f14caee 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -301,46 +301,46 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    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);
    +
    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; }
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index 1ff252677..e15049f43 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -288,44 +288,44 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    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);
    +
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    211 gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
    212 }
    213}
    214
    -
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    223 f32 temp_f0;
    -
    224 s16 temp_v0 = arg2->flags;
    +
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    223 f32 temp_f0;
    +
    224 s16 temp_v0 = arg2->flags;
    225
    -
    226 if ((temp_v0 & 0x800) != 0) { return; }
    +
    226 if ((temp_v0 & 0x800) != 0) { return; }
    227
    -
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    229
    -
    230 if (temp_f0 < 0.0f) { return; }
    +
    230 if (temp_f0 < 0.0f) { return; }
    231
    -
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    233 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    234 }
    -
    235 arg1[3][0] = arg2->pos[0];
    -
    236 arg1[3][1] = arg2->pos[1];
    -
    237 arg1[3][2] = arg2->pos[2];
    +
    235 arg1[3][0] = arg2->pos[0];
    +
    236 arg1[3][1] = arg2->pos[1];
    +
    237 arg1[3][2] = arg2->pos[2];
    238
    -
    239 if (render_set_position(arg1, 0) != 0) {
    -
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    +
    239 if (render_set_position(arg1, 0) != 0) {
    +
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    241 }
    242}
    243
    -
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    252 f32 temp_f0;
    -
    253 s16 temp_v0 = arg2->flags;
    +
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    252 f32 temp_f0;
    +
    253 s16 temp_v0 = arg2->flags;
    254
    -
    255 if ((temp_v0 & 0x800) != 0) { return; }
    +
    255 if ((temp_v0 & 0x800) != 0) { return; }
    256
    -
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    258
    259 if (temp_f0 < 0.0f) { return; }
    260
    diff --git a/wario__sign_2render_8inc_8c_source.html b/wario__sign_2render_8inc_8c_source.html index 0956cb2a4..58d6266aa 100644 --- a/wario__sign_2render_8inc_8c_source.html +++ b/wario__sign_2render_8inc_8c_source.html @@ -114,25 +114,24 @@ $(function(){initNavTree('wario__sign_2render_8inc_8c_source.html',''); initResi
    4#include "courses/wario_stadium/course_data.h"
    5
    -
    13void render_actor_wario_sign(Camera *arg0, struct Actor *arg1) {
    -
    14 Mat4 sp38;
    -
    15 f32 unk = is_within_render_distance(arg0->pos, arg1->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f);
    +
    13void render_actor_wario_sign(Camera *arg0, struct Actor *arg1) {
    +
    14 Mat4 sp38;
    +
    15 f32 unk = is_within_render_distance(arg0->pos, arg1->pos, arg0->rot[1], 0, gCameraZoom[arg0 - camera1], 16000000.0f);
    16
    17 if (!(unk < 0.0f)) {
    -
    18 gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
    -
    19 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    +
    18 gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
    +
    19 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    20
    -
    21 mtxf_pos_rotation_xyz(sp38, arg1->pos, arg1->rot);
    -
    22 if (render_set_position(sp38, 0) != 0) {
    +
    21 mtxf_pos_rotation_xyz(sp38, arg1->pos, arg1->rot);
    +
    22 if (render_set_position(sp38, 0) != 0) {
    23
    -
    24 gSPDisplayList(gDisplayListHead++, d_course_wario_stadium_dl_sign);
    +
    24 gSPDisplayList(gDisplayListHead++, d_course_wario_stadium_dl_sign);
    25 }
    26 }
    27}
    camera1
    Camera * camera1
    Definition camera.c:23
    -
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    Mat4
    f32 Mat4[4][4]
    Definition common_structs.h:16
    G_SHADING_SMOOTH
    #define G_SHADING_SMOOTH
    Definition gbi.h:353
    @@ -144,7 +143,11 @@ $(function(){initNavTree('wario__sign_2render_8inc_8c_source.html',''); initResi
    mtxf_pos_rotation_xyz
    void mtxf_pos_rotation_xyz(Mat4 out, Vec3f pos, Vec3s orientation)
    Definition math_util.c:466
    render_set_position
    s32 render_set_position(Mat4 arg0, s32 arg1)
    Definition math_util.c:49
    Actor
    Definition actor_types.h:120
    +
    Actor::rot
    Vec3s rot
    Definition actor_types.h:127
    +
    Actor::pos
    Vec3f pos
    Definition actor_types.h:129
    Camera
    Definition camera.h:26
    +
    Camera::rot
    Vec3s rot
    Definition camera.h:33
    +
    Camera::pos
    Vec3f pos
    Definition camera.h:27
    f32
    float f32
    Definition ultratypes.h:33
    render_actor_wario_sign
    void render_actor_wario_sign(Camera *arg0, struct Actor *arg1)
    Renders the Wario sign actor. Used in Wario Stadium.
    Definition render.inc.c:13
    d_course_wario_stadium_dl_sign
    Gfx d_course_wario_stadium_dl_sign[]
    Definition course_data.c:4859