diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index 00c6d4352..c9be8ec6a 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,11 +660,6 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
Player::currentRank
s16 currentRank
Definition common_structs.h:272
Player::pos
Vec3f pos
Definition common_structs.h:279
ShellActor
Definition actor_types.h:302
-
ShellActor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:315
-
ShellActor::velocity
Vec3f velocity
Definition actor_types.h:324
-
ShellActor::pos
Vec3f pos
Definition actor_types.h:323
-
ShellActor::unk30
Collision unk30
Definition actor_types.h:325
-
ShellActor::pathIndex
u16 pathIndex
Definition actor_types.h:319
TrackWaypoint::posZ
s16 posZ
Definition waypoints.h:9
TrackWaypoint::posY
s16 posY
Definition waypoints.h:8
TrackWaypoint::posX
s16 posX
Definition waypoints.h:7
diff --git a/camera_8h.html b/camera_8h.html index 2767a9855..82697c381 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 514e6fb31..7a09e364e 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 d0c3d4e03..305cb43f9 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 160921635..627cb3a2f 100644 --- a/choco__mountain_2course__offsets_8c.html +++ b/choco__mountain_2course__offsets_8c.html @@ -195,7 +195,7 @@ Variables
{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},
@@ -219,6 +219,7 @@ Variables
gTexture64647C
u8 gTexture64647C[]
gTextureSignLuigis0
u8 gTextureSignLuigis0[]
gTexture652B54
u8 gTexture652B54[]
+
gTexture6684F8
u8 gTexture6684F8[]
gTextureSignYoshi
u8 gTextureSignYoshi[]
gTextureSignNintendoRed1
u8 gTextureSignNintendoRed1[]
gTextureSignLuigis1
u8 gTextureSignLuigis1[]
@@ -229,7 +230,6 @@ Variables
gTextureSignFallingRocks
u8 gTextureSignFallingRocks[]
gTexture647F4C
u8 gTexture647F4C[]
gTexture67DC20
u8 gTexture67DC20[]
-
gTexture6684F8
u8 gTexture6684F8[]
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index 3c1897241..f0cf6df42 100644 --- a/code__80281780_8c.html +++ b/code__80281780_8c.html @@ -164,7 +164,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/code__80281780_8h.html b/code__80281780_8h.html index affe4d396..437cb98ec 100644 --- a/code__80281780_8h.html +++ b/code__80281780_8h.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/data_8c.html b/data_8c.html index 6680f22a5..5ea61773d 100644 --- a/data_8c.html +++ b/data_8c.html @@ -258,7 +258,7 @@ Variables
-
Todo
file boundary?
+
Todo
file boundary?
@@ -273,7 +273,7 @@ Variables
-
Todo
0x00000000800f624c fill2
+
Todo
0x00000000800f624c fill2
diff --git a/data_8h.html b/data_8h.html index 831502fc7..497e326cd 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/dks__jungle__parkway_2course__offsets_8c.html b/dks__jungle__parkway_2course__offsets_8c.html index 8494c3999..844b4647d 100644 --- a/dks__jungle__parkway_2course__offsets_8c.html +++ b/dks__jungle__parkway_2course__offsets_8c.html @@ -180,7 +180,7 @@ Variables
Initial value:
= {
{gTexture648508, 0x01FE, 0x1000, 0x0},
-
{gTexture6684F8, 0x010D, 0x0800, 0x0},
+
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0},
{gTexture654460, 0x0B12, 0x1000, 0x0},
{gTexture654F74, 0x0A24, 0x1000, 0x0},
@@ -205,6 +205,7 @@ Variables
{gTexture683844, 0x0655, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
}
+
gTexture6684F8
u8 gTexture6684F8[]
gTexture65E2EC
u8 gTexture65E2EC[]
gTexture655998
u8 gTexture655998[]
gTexture65E59C
u8 gTexture65E59C[]
@@ -219,7 +220,6 @@ Variables
gTexture65C8DC
u8 gTexture65C8DC[]
gTexture65BB3C
u8 gTexture65BB3C[]
gTexture65FB18
u8 gTexture65FB18[]
-
gTexture6684F8
u8 gTexture6684F8[]
gTexture654460
u8 gTexture654460[]
gTexture65ADE0
u8 gTexture65ADE0[]
gTexture658370
u8 gTexture658370[]
diff --git a/doxygen_crawl.html b/doxygen_crawl.html index ef2f17203..62a6ef4ec 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -9,11 +9,11 @@ + - - + @@ -79,10 +79,10 @@ - + @@ -137,8 +137,8 @@ - + @@ -242,10 +242,10 @@ - - + + @@ -354,8 +354,8 @@ - + @@ -380,13 +380,13 @@ - + - + @@ -404,8 +404,9 @@ - + + @@ -420,8 +421,8 @@ - + @@ -434,7 +435,6 @@ - @@ -452,8 +452,8 @@ - + @@ -496,13 +496,13 @@ - + + - @@ -517,16 +517,16 @@ - + - + @@ -610,9 +610,9 @@ - + @@ -632,14 +632,14 @@ - + + - @@ -687,8 +687,8 @@ - + @@ -703,8 +703,8 @@ - + @@ -737,10 +737,10 @@ + - @@ -796,12 +796,12 @@ - + - + @@ -832,8 +832,8 @@ - + @@ -842,14 +842,14 @@ - + - + @@ -878,12 +878,13 @@ + - + @@ -892,7 +893,6 @@ - @@ -909,9 +909,9 @@ + - @@ -961,14 +961,15 @@ - + + @@ -1000,9 +1001,8 @@ - - + @@ -1015,8 +1015,8 @@ - + @@ -1024,8 +1024,8 @@ - + diff --git a/frappe__snowland_2course__offsets_8c.html b/frappe__snowland_2course__offsets_8c.html index 0fc3bd865..2e13172a4 100644 --- a/frappe__snowland_2course__offsets_8c.html +++ b/frappe__snowland_2course__offsets_8c.html @@ -147,7 +147,7 @@ Variables
Initial value:
= {
-
{gTexture6684F8, 0x010D, 0x0800, 0x0},
+
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTexture66CA98, 0x02C9, 0x0800, 0x0},
{gTexture66EBF0, 0x0146, 0x0800, 0x0},
{gTexture675434, 0x0245, 0x0800, 0x0},
@@ -159,7 +159,7 @@ Variables
}
gTexture66CA98
u8 gTexture66CA98[]
gTexture66EBF0
u8 gTexture66EBF0[]
-
gTexture6684F8
u8 gTexture6684F8[]
+
gTexture6684F8
u8 gTexture6684F8[]
gTexture67973C
u8 gTexture67973C[]
gTexture675434
u8 gTexture675434[]
gTexture678118
u8 gTexture678118[]
diff --git a/internal_8h.html b/internal_8h.html index baf829f6e..875ab9b69 100644 --- a/internal_8h.html +++ b/internal_8h.html @@ -720,7 +720,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/kalimari__desert_2course__offsets_8c.html b/kalimari__desert_2course__offsets_8c.html index e00c8dccc..dcfdf001f 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,18 +779,16 @@ 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[]
@@ -800,6 +798,8 @@ Variables
gTexture647994
u8 gTexture647994[]
gTextureFenceBarbedWire
u8 gTextureFenceBarbedWire[]
gTextureSignMarioStar1
u8 gTextureSignMarioStar1[]
+
gTextureSignShellShot1
u8 gTextureSignShellShot1[]
+
gTextureSignShellShot0
u8 gTextureSignShellShot0[]
diff --git a/menus_8h_source.html b/menus_8h_source.html index 8938ba1e0..7c36616e6 100644 --- a/menus_8h_source.html +++ b/menus_8h_source.html @@ -229,11 +229,11 @@ $(function(){initNavTree('menus_8h_source.html',''); initResizable(); });
player_select_menu_act
void player_select_menu_act(struct Controller *, u16)
gCupCourseSelection
s8 gCupCourseSelection
Definition menus.c:56
D_8018EDDC
f32 D_8018EDDC
Definition menus.c:30
-
func_800B4520
s32 func_800B4520(void)
Definition menus.c:1990
+
func_800B4520
s32 func_800B4520(void)
Definition menus.c:2004
gTimeTrialDataCourseIndex
s8 gTimeTrialDataCourseIndex
Definition menus.c:45
D_800F2BE4
const union GameModePack D_800F2BE4
Definition menus.c:145
rmonPrintf
void rmonPrintf(const char *,...)
Definition is_debug.c:95
-
func_800B44AC
void func_800B44AC(void)
Definition menus.c:1975
+
func_800B44AC
void func_800B44AC(void)
Definition menus.c:1989
options_menu_act
void options_menu_act(struct Controller *, u16)
Definition menus.c:220
main_menu_act
void main_menu_act(struct Controller *, u16)
is_character_spot_free
s32 is_character_spot_free(s32)
Definition menus.c:1499
@@ -260,7 +260,7 @@ $(function(){initNavTree('menus_8h_source.html',''); initResizable(); });
unref_800E86E0
s8 unref_800E86E0[]
Definition menus.c:85
update_menus
void update_menus(void)
Definition menus.c:152
gPlayerCount
s8 gPlayerCount
Definition menus.c:41
-
func_800B44BC
void func_800B44BC(void)
Definition menus.c:1979
+
func_800B44BC
void func_800B44BC(void)
Definition menus.c:1993
gCupSelection
s8 gCupSelection
Definition menus.c:54
gMenuSelection
s32 gMenuSelection
Definition menus.c:61
D_8018EE08
s8 D_8018EE08
Definition menus.c:53
@@ -275,7 +275,7 @@ $(function(){initNavTree('menus_8h_source.html',''); initResizable(); });
course_data_menu_act
void course_data_menu_act(struct Controller *, u16)
D_8018EDC4
f32 D_8018EDC4
Definition menus.c:24
D_8018EDE0
s32 D_8018EDE0
Definition menus.c:31
-
func_800B3F74
void func_800B3F74(s32)
Definition menus.c:1791
+
func_800B3F74
void func_800B3F74(s32)
Definition menus.c:1805
gDebugMenuSelection
s8 gDebugMenuSelection
Definition menus.c:37
func_800B28C8
void func_800B28C8(void)
Definition menus.c:1223
D_800E86A4
s32 D_800E86A4
Definition menus.c:62
@@ -290,7 +290,7 @@ $(function(){initNavTree('menus_8h_source.html',''); initResizable(); });
D_8018EDF9
s8 D_8018EDF9
Definition menus.c:47
D_800E86AC
s8 D_800E86AC[]
Definition menus.c:70
D_800F2B58
const s8 D_800F2B58[5]
Definition menus.c:94
-
course_select_menu_act
void course_select_menu_act(struct Controller *, u16)
Definition menus.c:1683
+
course_select_menu_act
void course_select_menu_act(struct Controller *, u16)
Definition menus.c:1697
sVIGammaOffDitherOn
u32 sVIGammaOffDitherOn
Definition menus.c:87
D_8018EDE8
s8 D_8018EDE8[]
Definition menus.c:33
D_8018EDD8
f32 D_8018EDD8
Definition menus.c:29
diff --git a/navtreedata.js b/navtreedata.js index 3172d4aaa..f3996602c 100644 --- a/navtreedata.js +++ b/navtreedata.js @@ -32,8 +32,8 @@ var NAVTREE = [ "Memory Addresses", "md_docs_2doxygen__syms.html#memory-addresses-1", null ] ] ], [ "Tutorials", "tutorials.html", "tutorials" ], - [ "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/navtreeindex131.js b/navtreeindex131.js index b96336a89..e9b5fb0e6 100644 --- a/navtreeindex131.js +++ b/navtreeindex131.js @@ -27,7 +27,7 @@ var NAVTREEINDEX131 = "toads__turnpike_2course__textures_8linkonly_8h_source.html":[8,0,0,17,6], "toads__turnpike_2course__vertices_8inc_8c.html":[8,0,0,17,7], "toads__turnpike_2course__vertices_8inc_8c.html#a2a5944c29529784be834890ccab0f3a1":[8,0,0,17,7,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/navtreeindex42.js b/navtreeindex42.js index 832e75e53..571b815ee 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], "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 0d67e8842..26cae644e 100644 --- a/navtreeindex9.js +++ b/navtreeindex9.js @@ -199,7 +199,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/pages.html b/pages.html index 51fb42489..4f57019f4 100644 --- a/pages.html +++ b/pages.html @@ -123,8 +123,8 @@ $(function(){initNavTree('pages.html',''); initResizable(); });  Boost Ramps  Paths  Audio - Todo List - Bug List + Bug List + Todo List diff --git a/port__eu_8c.html b/port__eu_8c.html index d90406516..bb7c45418 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 9706c92d5..f251dadc3 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 4d1b251c2..20527536c 100644 --- a/race__logic_8c.html +++ b/race__logic_8c.html @@ -703,7 +703,7 @@ Here is the caller graph for this function:
-
Todo
increasing players past four would require increase this loop iterator.
+
Todo
increasing players past four would require increase this loop iterator.
Here is the call graph for this function:
diff --git a/race__logic_8h.html b/race__logic_8h.html index 44e87ce0a..2a55911f9 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/render__courses_8c.html b/render__courses_8c.html index 71f5d4f37..88c7fb19d 100644 --- a/render__courses_8c.html +++ b/render__courses_8c.html @@ -541,7 +541,7 @@ Here is the caller graph for this function:
-
Todo
Should be Gfx*
+
Todo
Should be Gfx*
Here is the call graph for this function:
diff --git a/render__courses_8h.html b/render__courses_8h.html index cd28a3d44..b6281acd9 100644 --- a/render__courses_8h.html +++ b/render__courses_8h.html @@ -519,7 +519,7 @@ Here is the caller graph for this function:
-
Todo
Should be Gfx*
+
Todo
Should be Gfx*
Here is the call graph for this function:
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/toads__turnpike_2course__data_8c.html b/toads__turnpike_2course__data_8c.html index 1b978096a..0c0810c53 100644 --- a/toads__turnpike_2course__data_8c.html +++ b/toads__turnpike_2course__data_8c.html @@ -3026,7 +3026,7 @@ Variables
G_IM_FMT_RGBA
#define G_IM_FMT_RGBA
Definition gbi.h:396
G_IM_SIZ_16b
#define G_IM_SIZ_16b
Definition gbi.h:407
G_CC_DECALRGBA
#define G_CC_DECALRGBA
Definition gbi.h:512
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/toads__turnpike_2course__data_8h.html b/toads__turnpike_2course__data_8h.html index 840c1177b..8649ed263 100644 --- a/toads__turnpike_2course__data_8h.html +++ b/toads__turnpike_2course__data_8h.html @@ -2812,7 +2812,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/todo.html b/todo.html index 811801fc9..2db485148 100644 --- a/todo.html +++ b/todo.html @@ -105,8 +105,8 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
Global __osGetId (OSPfs *pfs)
-

remove magic constant

-

loads of magic constants..

+

loads of magic constants..

+

remove magic constant

Global __osPfsReleasePages (OSPfs *pfs, __OSInode *inode, u8 start_page, u16 *sum, u8 bank, __OSInodeUnit *last_page, int flag)
magic number
@@ -115,15 +115,15 @@ $(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.
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 []
@@ -157,21 +157,21 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
Global d_course_sherbet_land_dl_0 []
Replace addresses with variables
Global d_course_toads_turnpike_dl_0 []
-
Replace addresses with variables
-
Global d_course_wario_stadium_dl_0 []
Replace addresses with variables
+
Global d_course_wario_stadium_dl_0 []
+
Replace addresses with variables
Global d_course_yoshi_valley_dl_0 []
Replace addresses with variables
Global debug_switch_character_ceremony_cutscene (void)
-
confirm this.
+
confirm this.
Union du
-

is it possible to remove them somehow?

-

is it possible to remove them somehow?

+

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
Global func_80028864 (Player *, Camera *, s8, s8)
@@ -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
@@ -211,7 +211,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
Global LEO_CMD_TYPE_2
name
Global load_surface_map (uintptr_t, struct UnkStruct_800DC5EC *)
-
Should be Gfx*
+
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
@@ -221,7 +221,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
Global new_actor (ActorInitParams *)
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)
@@ -243,7 +243,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 d2f14caee..1a9c5cfac 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -139,169 +139,169 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
36
37 } else if (distance < 640000.0f) {
38
-
39 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D670);
-
40 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D160);
+
39 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D670);
+
40 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D160);
41 } else {
-
42 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E910);
-
43 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E480);
+
42 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E910);
+
43 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E480);
44 }
45 if (1440000.0f < distance) { return; }
46
-
47 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-
48 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
+
47 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
+
48 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
49
-
50 mtxf_rotate_x(sp120, actor->wheelRot);
-
51 vec3f_set(sp160, 17.0f, 6.0f, 32.0f);
-
52 mtxf_translate(spE0, sp160);
-
53 mtxf_multiplication(spA0, sp120, spE0);
+
50 mtxf_rotate_x(sp120, actor->wheelRot);
+
51 vec3f_set(sp160, 17.0f, 6.0f, 32.0f);
+
52 mtxf_translate(spE0, sp160);
+
53 mtxf_multiplication(spA0, sp120, spE0);
54
-
55 maxObjectsReached = render_set_position(spA0, 3) == 0;
-
56 if (maxObjectsReached) { return; }
+
55 maxObjectsReached = render_set_position(spA0, 3) == 0;
+
56 if (maxObjectsReached) { return; }
57
-
58 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
-
59 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
+
58 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
+
59 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
60
-
61 mtxf_rotate_x(sp120, actor->wheelRot);
-
62 vec3f_set(sp160, -17.0, 6.0f, 32.0f);
-
63 mtxf_translate(spE0, sp160);
-
64 mtxf_multiplication(spA0, sp120, spE0);
+
61 mtxf_rotate_x(sp120, actor->wheelRot);
+
62 vec3f_set(sp160, -17.0, 6.0f, 32.0f);
+
63 mtxf_translate(spE0, sp160);
+
64 mtxf_multiplication(spA0, sp120, spE0);
65
-
66 maxObjectsReached = render_set_position(spA0, 3) == 0;
-
67 if (maxObjectsReached) { return; }
+
66 maxObjectsReached = render_set_position(spA0, 3) == 0;
+
67 if (maxObjectsReached) { return; }
68
-
69 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
-
70 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
+
69 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
+
70 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
71
-
72 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
-
73 vec3f_set(sp160, 17.0f, 6.0f, 16.0f);
-
74 mtxf_translate(spE0, sp160);
-
75 mtxf_multiplication(spA0, sp120, spE0);
+
72 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
+
73 vec3f_set(sp160, 17.0f, 6.0f, 16.0f);
+
74 mtxf_translate(spE0, sp160);
+
75 mtxf_multiplication(spA0, sp120, spE0);
76
-
77 maxObjectsReached = render_set_position(spA0, 3) == 0;
-
78 if (maxObjectsReached) { return; }
+
77 maxObjectsReached = render_set_position(spA0, 3) == 0;
+
78 if (maxObjectsReached) { return; }
79
-
80 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
-
81 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
+
80 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
+
81 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
82
-
83 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
-
84 vec3f_set(sp160, -17.0f, 6.0f, 16.0f);
-
85 mtxf_translate(spE0, sp160);
-
86 mtxf_multiplication(spA0, sp120, spE0);
+
83 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
+
84 vec3f_set(sp160, -17.0f, 6.0f, 16.0f);
+
85 mtxf_translate(spE0, sp160);
+
86 mtxf_multiplication(spA0, sp120, spE0);
87
-
88 maxObjectsReached = render_set_position(spA0, 3) == 0;
-
89 if (maxObjectsReached) { return; }
+
88 maxObjectsReached = render_set_position(spA0, 3) == 0;
+
89 if (maxObjectsReached) { return; }
90
-
91 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
-
92 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
+
91 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
+
92 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
93
-
94 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
-
95 vec3f_set(sp160, 17.0f, 12.0f, -12.0f);
-
96 mtxf_translate(spE0, sp160);
-
97 mtxf_multiplication(spA0, sp120, spE0);
+
94 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
+
95 vec3f_set(sp160, 17.0f, 12.0f, -12.0f);
+
96 mtxf_translate(spE0, sp160);
+
97 mtxf_multiplication(spA0, sp120, spE0);
98
-
99 maxObjectsReached = render_set_position(spA0, 3) == 0;
-
100 if (maxObjectsReached) { return; }
+
99 maxObjectsReached = render_set_position(spA0, 3) == 0;
+
100 if (maxObjectsReached) { return; }
101
-
102 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
-
103 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
+
102 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
+
103 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
104
-
105 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
-
106 vec3f_set(sp160, -17.0f, 12.0f, -12.0f);
-
107 mtxf_translate(spE0, sp160);
-
108 mtxf_multiplication(spA0, sp120, spE0);
+
105 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
+
106 vec3f_set(sp160, -17.0f, 12.0f, -12.0f);
+
107 mtxf_translate(spE0, sp160);
+
108 mtxf_multiplication(spA0, sp120, spE0);
109
-
110 maxObjectsReached = render_set_position(spA0, 3) == 0;
-
111 if (maxObjectsReached) { return; }
+
110 maxObjectsReached = render_set_position(spA0, 3) == 0;
+
111 if (maxObjectsReached) { return; }
112
-
113 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
-
114 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
+
113 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
+
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);
+
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);
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));
+
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);
@@ -473,7 +473,6 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
Camera::rot
Vec3s rot
Definition camera.h:33
Camera::pos
Vec3f pos
Definition camera.h:27
TrainCar
Definition actor_types.h:144
-
TrainCar::wheelRot
s16 wheelRot
Definition actor_types.h:148
TrainCar::pos
Vec3f pos
Definition actor_types.h:153
TrainCar::rot
Vec3s rot
Definition actor_types.h:151
render_actor_train_engine
void render_actor_train_engine(Camera *camera, struct TrainCar *actor)
Renders the train engine actor. Actor used in Kalimari Desert. His update position are made in vehicl...
Definition render.inc.c:14
diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index e15049f43..79b2f839c 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -288,48 +288,48 @@ $(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; }
+
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];
diff --git a/wario__stadium_2course__data_8c.html b/wario__stadium_2course__data_8c.html index 387a9844b..258a5dd03 100644 --- a/wario__stadium_2course__data_8c.html +++ b/wario__stadium_2course__data_8c.html @@ -450,7 +450,7 @@ Variables
d_course_wario_stadium_packed_dl_4218
Gfx d_course_wario_stadium_packed_dl_4218[]
Definition course_displaylists.inc.c:2649
d_course_wario_stadium_packed_dl_5888
Gfx d_course_wario_stadium_packed_dl_5888[]
Definition course_displaylists.inc.c:3475
d_course_wario_stadium_packed_dl_4BA8
Gfx d_course_wario_stadium_packed_dl_4BA8[]
Definition course_displaylists.inc.c:3007
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/wario__stadium_2course__data_8h.html b/wario__stadium_2course__data_8h.html index fa6f8f05b..5b98ef9fd 100644 --- a/wario__stadium_2course__data_8h.html +++ b/wario__stadium_2course__data_8h.html @@ -418,7 +418,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/yoshi__egg_2render_8inc_8c_source.html b/yoshi__egg_2render_8inc_8c_source.html index 35814cf9a..11161eab8 100644 --- a/yoshi__egg_2render_8inc_8c_source.html +++ b/yoshi__egg_2render_8inc_8c_source.html @@ -149,13 +149,13 @@ $(function(){initNavTree('yoshi__egg_2render_8inc_8c_source.html',''); initResiz
47 gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING);
48 gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_16D70);
49 } else {
-
50 arg1[3][0] = egg->pos[0];
-
51 arg1[3][1] = egg->pos[1];
-
52 arg1[3][2] = egg->pos[2];
+
50 arg1[3][0] = egg->pos[0];
+
51 arg1[3][1] = egg->pos[1];
+
52 arg1[3][2] = egg->pos[2];
53
-
54 if (render_set_position(arg1, 0) != 0) {
-
55 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
-
56 gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_egg_lod0);
+
54 if (render_set_position(arg1, 0) != 0) {
+
55 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
+
56 gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_egg_lod0);
57 }
58 }
59}
@@ -165,6 +165,7 @@ $(function(){initNavTree('yoshi__egg_2render_8inc_8c_source.html',''); initResiz
actors.h
camera1
Camera * camera1
Definition camera.c:23
camera.h
+
gCourseMaxZ
s16 gCourseMaxZ
Definition code_800029B0.c:92
Vec3f
f32 Vec3f[3]
Definition common_structs.h:6
Vec3s
s16 Vec3s[3]
Definition common_structs.h:11
Mat4
f32 Mat4[4][4]
Definition common_structs.h:16