From 22a21c4fa629f968b35eb822267d6e47b81409f4 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Tue, 23 Apr 2024 20:14:13 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20n64decom?= =?UTF-8?q?p/mk64@49625d397795441b8d81b9bf2f5e517094c273f2=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- actors_8c.html | 2 +- basics.js | 2 +- ...d__red__shells_2update_8inc_8c_source.html | 207 ++++++------ ceremony__and__credits_8c.html | 4 +- ceremony__and__credits_8h.html | 2 +- choco__mountain_2course__offsets_8c.html | 4 +- code__80005FD0_8h_source.html | 50 +-- code__80281780_8c.html | 2 +- code__80281780_8h.html | 2 +- controlflow.html | 6 +- courses.html | 2 +- coursesmenu.html | 2 +- coursesmenu.js | 2 +- data_8c.html | 4 +- data_8h.html | 4 +- doxygen_crawl.html | 66 ++-- internal_8h.html | 2 +- kalimari__desert_2course__offsets_8c.html | 8 +- navtreedata.js | 2 +- navtreeindex1.js | 2 +- navtreeindex131.js | 2 +- navtreeindex28.js | 2 +- navtreeindex29.js | 2 +- navtreeindex42.js | 4 +- navtreeindex9.js | 2 +- objects_8h.html | 2 +- pages.html | 4 +- race__logic_8c.html | 2 +- race__logic_8h.html | 2 +- render__courses_8c.html | 2 +- render__courses_8h.html | 2 +- search/all_5.js | 2 +- some__data_8c.html | 2 +- sounds_8h.html | 2 +- sptask_8h.html | 2 +- structNote.html | 2 +- toads__turnpike_2course__data_8c.html | 2 +- toads__turnpike_2course__data_8h.html | 2 +- todo.html | 50 +-- train_2render_8inc_8c_source.html | 303 +++++++++--------- trees_2render_8inc_8c_source.html | 48 +-- update__objects_8c.html | 8 +- wario__stadium_2course__data_8c.html | 2 +- wario__stadium_2course__data_8h.html | 2 +- yoshi__egg_2render_8inc_8c_source.html | 13 +- 45 files changed, 423 insertions(+), 418 deletions(-) diff --git a/actors_8c.html b/actors_8c.html index bcdbbfb8d..057eb9ec7 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 2a25d6dbd..8888e6745 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-1", [ + [ "Courses", "controlflow.html#courses", [ [ "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..c08016314 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -116,134 +116,134 @@ $(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;
30
-
31 currentWaypoint = shell->pathIndex;
- - - - +
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) {
- +
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];
- -
45 if (temp_f0 > 400.0f) {
- - - +
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
- -
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;
- - - +
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
- - - - -
71 if (temp_f0 > 6.0f) {
-
72 temp_f0 /= 6.0f;
- - - +
67 temp_f12_3 += temp_f20;
+
68 temp_f14_2 += temp_f22;
+
69 temp_f16_2 += temp_f24;
+
70 temp_f0 = sqrtf((temp_f12_3 * temp_f12_3) + (temp_f14_2 * temp_f14_2) + (temp_f16_2 * temp_f16_2));
+
71 if (temp_f0 > 6.0f) {
+
72 temp_f0 /= 6.0f;
+
73 temp_f12_3 /= temp_f0;
+
74 temp_f14_2 /= temp_f0;
+
75 temp_f16_2 /= temp_f0;
76 }
-
77 shell->velocity[0] = temp_f12_3;
-
78 shell->velocity[1] = temp_f14_2;
-
79 shell->velocity[2] = temp_f16_2;
+
77 shell->velocity[0] = temp_f12_3;
+
78 shell->velocity[1] = temp_f14_2;
+
79 shell->velocity[2] = temp_f16_2;
80
-
81 origPos[0] = shell->pos[0];
-
82 origPos[1] = shell->pos[1];
-
83 origPos[2] = shell->pos[2];
+
81 origPos[0] = shell->pos[0];
+
82 origPos[1] = shell->pos[1];
+
83 origPos[2] = shell->pos[2];
84
-
85 shell->pos[0] += temp_f12_3;
-
86 shell->pos[1] += temp_f14_2;
-
87 shell->pos[2] += temp_f16_2;
-
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
-
89 func_802B4E30((struct Actor *) shell);
+
85 shell->pos[0] += temp_f12_3;
+
86 shell->pos[1] += temp_f14_2;
+
87 shell->pos[2] += temp_f16_2;
+
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
+
89 func_802B4E30((struct Actor *) shell);
90 }
91 } else {
-
92 if (temp_f0 > 5.0f) {
-
93 shell->pos[0] = temp_f2;
-
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
-
95 shell->pos[2] = temp_f28;
-
96 shell->pathIndex = nextWaypoint;
+
92 if (temp_f0 > 5.0f) {
+
93 shell->pos[0] = temp_f2;
+
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
+
95 shell->pos[2] = temp_f28;
+
96 shell->pathIndex = nextWaypoint;
97 } else {
- - - +
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
100 temp_f26 = D_80164490[nextWaypoint].posZ;
101
-
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
-
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
-
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
+
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
+
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
+
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
105
-
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
-
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
-
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
+
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
+
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
+
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
109 }
110 }
111}
112
-
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
- - -
116 f32 xz_dist;
- +
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
+
114 f32 x_velocity;
+
115 f32 z_velocity;
+
116 f32 xz_dist;
+
117 Vec3f newPosition;
118
-
119 x_velocity = player->pos[0];
-
120 x_velocity -= shell->pos[0];
-
121 z_velocity = player->pos[2];
-
122 z_velocity -= shell->pos[2];
- -
124 if (xz_dist == 0.0f) {
-
125 x_velocity = 0.0f;
-
126 z_velocity = 0.0f;
+
119 x_velocity = player->pos[0];
+
120 x_velocity -= shell->pos[0];
+
121 z_velocity = player->pos[2];
+
122 z_velocity -= shell->pos[2];
+
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
+
124 if (xz_dist == 0.0f) {
+
125 x_velocity = 0.0f;
+
126 z_velocity = 0.0f;
127 } else {
- - +
128 x_velocity /= xz_dist;
+
129 z_velocity /= xz_dist;
130 }
131
-
132 newPosition[0] = shell->pos[0];
-
133 newPosition[1] = shell->pos[1];
+
132 newPosition[0] = shell->pos[0];
+
133 newPosition[1] = shell->pos[1];
134 newPosition[2] = shell->pos[2];
135 shell->pos[0] += x_velocity;
136 shell->pos[1] -= 2.0f;
@@ -660,6 +660,11 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
s16 currentRank
Definition common_structs.h:272
Vec3f pos
Definition common_structs.h:279
Definition actor_types.h:302
+
f32 boundingBoxSize
Definition actor_types.h:315
+
Vec3f velocity
Definition actor_types.h:324
+
Vec3f pos
Definition actor_types.h:323
+
Collision unk30
Definition actor_types.h:325
+
u16 pathIndex
Definition actor_types.h:319
s16 posZ
Definition waypoints.h:9
s16 posY
Definition waypoints.h:8
s16 posX
Definition waypoints.h:7
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 7a09e364e..8763d0b10 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -1294,7 +1294,7 @@ Here is the caller graph for this function:
-
Todo
Does this match as a return of s8?
+
Todo
Does this match as a return of s8?
Here is the call graph for this function:
@@ -2366,7 +2366,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index 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 627cb3a2f..01c9eead1 100644 --- a/choco__mountain_2course__offsets_8c.html +++ b/choco__mountain_2course__offsets_8c.html @@ -192,7 +192,7 @@ Variables
{gTexture64647C, 0x0829, 0x1000, 0x0},
{gTexture647F4C, 0x05BC, 0x1000, 0x0},
{gTexture64FBF4, 0x0274, 0x0800, 0x0},
-
{gTexture653DB0, 0x06AE, 0x0800, 0x0},
+
{gTexture653DB0, 0x06AE, 0x0800, 0x0},
{gTexture652B54, 0x0606, 0x0800, 0x0},
{gTexture65315C, 0x04A9, 0x0800, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
@@ -211,6 +211,7 @@ Variables
{0x00000000, 0x0000, 0x0000, 0x0},
}
u8 gTexture64FBF4[]
+
u8 gTexture653DB0[]
u8 gTexture67B864[]
u8 gTexture65315C[]
u8 gTexture679C04[]
@@ -226,7 +227,6 @@ Variables
u8 gTexture64619C[]
u8 gTextureSignBackside[]
u8 gTexture6774D8[]
-
u8 gTexture653DB0[]
u8 gTextureSignFallingRocks[]
u8 gTexture647F4C[]
u8 gTexture67DC20[]
diff --git a/code__80005FD0_8h_source.html b/code__80005FD0_8h_source.html index 62afa7c2a..2f395a6c8 100644 --- a/code__80005FD0_8h_source.html +++ b/code__80005FD0_8h_source.html @@ -541,7 +541,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
void func_80012190(void)
Definition code_80005FD0.c:4322
void func_800188F4(Camera *, Player *, s32, s32)
-
void func_8001C14C(void)
Definition code_80005FD0.c:7531
+
void func_8001C14C(void)
Definition code_80005FD0.c:7529
s16 D_80163490[]
Definition code_80005FD0.c:129
f32 D_80163438[]
Definition code_80005FD0.c:117
void func_8000EEDC(void)
Definition code_80005FD0.c:3290
@@ -562,7 +562,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
s16 D_801633C8[]
Definition code_80005FD0.c:111
void func_80017720(s32, f32, s32, s16)
Collision D_80162E70
Definition code_80005FD0.c:35
-
void func_8001ABEC(struct struct_801642D8 *)
Definition code_80005FD0.c:7005
+
void func_8001ABEC(struct struct_801642D8 *)
Definition code_80005FD0.c:7003
s16 D_80164680[]
Definition code_80005FD0.c:194
s16 func_8000D2B4(f32, f32, f32, s16, s32)
Definition code_80005FD0.c:2606
void func_800148C4(s32, Player *)
Definition code_80005FD0.c:5243
@@ -577,18 +577,18 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
void func_8000F2DC(void)
Definition code_80005FD0.c:3398
void generate_player_smoke(void)
Definition code_80005FD0.c:3301
TrackWaypoint * D_801631D4
Definition code_80005FD0.c:82
-
s32 func_8001A310(s32, s32)
Definition code_80005FD0.c:6762
+
s32 func_8001A310(s32, s32)
Definition code_80005FD0.c:6760
s16 D_80163398[]
Definition code_80005FD0.c:109
void func_8001A0A4(u16 *, Camera *, Player *, s8, s32)
s32 add_red_shell_in_unexpired_actor_list(s32)
Definition code_80005FD0.c:3253
PathNoY * D_80163598
Definition code_80005FD0.c:137
void func_8000F0E0(void)
Definition code_80005FD0.c:3345
void kart_ai_behaviour_end(s32, Player *)
Definition code_80005FD0.c:4219
-
void func_8001A124(s32, s32)
Definition code_80005FD0.c:6711
+
void func_8001A124(s32, s32)
Definition code_80005FD0.c:6709
s16 D_80164478[]
Definition code_80005FD0.c:164
void kart_ai_behaviour(s32)
Definition code_80005FD0.c:4256
f32 D_80164658[]
Definition code_80005FD0.c:190
-
void func_8001C3C4(s32)
Definition code_80005FD0.c:7580
+
void func_8001C3C4(s32)
Definition code_80005FD0.c:7578
s32 D_8016359C
Definition code_80005FD0.c:138
u16 D_80163348[]
Definition code_80005FD0.c:102
f32 func_800145A8(s16, f32, s16)
Definition code_80005FD0.c:5165
@@ -602,7 +602,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
s16 func_8000CD24(f32, f32, f32, s16, Player *, s32, s32)
Definition code_80005FD0.c:2502
void func_8000BBD8(u16, f32, s16)
Definition code_80005FD0.c:2204
void func_80014B6C(s32, Player *)
Definition code_80005FD0.c:5297
-
void func_8001C05C(void)
Definition code_80005FD0.c:7507
+
void func_8001C05C(void)
Definition code_80005FD0.c:7505
void func_80017F10(s32, f32, s32, s16)
void func_80010DBC(s32)
Definition code_80005FD0.c:3853
void func_800162CC(s32, f32, s32, s16)
Definition code_80005FD0.c:5731
@@ -618,19 +618,19 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
u16 gNearestWaypointByPlayerId[]
Definition code_80005FD0.c:162
s32 D_80163448
Definition code_80005FD0.c:118
f32 D_80164688[]
Definition code_80005FD0.c:195
-
void func_8001A348(s32, f32, s32)
Definition code_80005FD0.c:6769
+
void func_8001A348(s32, f32, s32)
Definition code_80005FD0.c:6767
f32 func_80009258(s32, f32, f32)
void func_8000BA14(u16, f32, f32, s16)
Definition code_80005FD0.c:2169
u16 D_801630E0
Definition code_80005FD0.c:70
Vec3f D_80162FB0
Definition code_80005FD0.c:51
void func_8001530C(void)
Definition code_80005FD0.c:5475
f32 D_80164618[]
Definition code_80005FD0.c:186
-
void func_8001A518(s32, s32, s32)
Definition code_80005FD0.c:6806
+
void func_8001A518(s32, s32, s32)
Definition code_80005FD0.c:6804
void func_8001577C(Camera *, UNUSED Player *, s32, s32)
s16 D_80163300[]
Definition code_80005FD0.c:98
void func_8000CBA4(f32, f32, f32, s16 *, s32)
s16 func_8000C884(f32, f32, f32, s16, s32, u16)
Definition code_80005FD0.c:2375
-
void func_8001A0DC(u16 *, Camera *, Player *, s8, s32)
Definition code_80005FD0.c:6706
+
void func_8001A0DC(u16 *, Camera *, Player *, s8, s32)
Definition code_80005FD0.c:6704
void func_80014A60(s32)
Definition code_80005FD0.c:5274
f32 D_80164648[]
Definition code_80005FD0.c:189
KartAIBehaviour * gCoursesKartAIBehaviour[]
Definition code_80005FD0.c:39
@@ -641,7 +641,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
s16 D_80164538[]
Definition code_80005FD0.c:172
void func_800074D4(void)
f32 D_801631A0[]
Definition code_80005FD0.c:78
-
void func_8001968C(void)
Definition code_80005FD0.c:6456
+
void func_8001968C(void)
Definition code_80005FD0.c:6454
void func_800090F0(s32, Player *)
Definition code_80005FD0.c:1383
f32 D_80163028[]
Definition code_80005FD0.c:65
s32 D_80163238
Definition code_80005FD0.c:89
@@ -651,7 +651,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
void func_8000F628(void)
Definition code_80005FD0.c:3471
s32 add_actor_in_unexpired_actor_list(s32, s16)
Definition code_80005FD0.c:3232
f32 func_8000B874(f32, f32, u16, s32)
Definition code_80005FD0.c:2133
-
void func_80019FB4(s32)
Definition code_80005FD0.c:6675
+
void func_80019FB4(s32)
Definition code_80005FD0.c:6673
s16 D_8016435A
Definition code_80005FD0.c:153
s16 D_80162F10[]
Definition code_80005FD0.c:44
void reset_kart_ai_behaviour(s32)
Definition code_80005FD0.c:4147
@@ -680,7 +680,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
void func_80015C94(Camera *, Player *, s32, s32)
s16 func_80005FD0(Vec3f, Vec3f)
Definition code_80005FD0.c:550
f32 D_80163450[]
Definition code_80005FD0.c:120
-
void func_8001BE78(void)
Definition code_80005FD0.c:7469
+
void func_8001BE78(void)
Definition code_80005FD0.c:7467
void func_80015A9C(s32, f32, s32, s16)
Definition code_80005FD0.c:5624
void func_80016C3C(s32, f32, s32)
f32 func_8000D3B8(s32)
Definition code_80005FD0.c:2627
@@ -688,7 +688,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
f32 func_80013C74(s16, s16)
Definition code_80005FD0.c:4933
s16 D_80163010[]
Definition code_80005FD0.c:64
s32 process_path_data(TrackWaypoint *, TrackWaypoint *)
Definition code_80005FD0.c:4030
-
void func_80019E58(void)
Definition code_80005FD0.c:6646
+
void func_80019E58(void)
Definition code_80005FD0.c:6644
s32 D_801634F0
Definition code_80005FD0.c:134
void func_8000F124(void)
Definition code_80005FD0.c:3353
s32 func_8000B7E4(s32, u16)
@@ -697,13 +697,13 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
s32 func_8001168C(PathNoY *, TrackWaypoint *, s32)
Definition code_80005FD0.c:4060
s32 D_80164628[]
Definition code_80005FD0.c:187
s16 func_80010CB0(s32, s32)
Definition code_80005FD0.c:3834
-
void func_8001AAAC(s16, s16, s16)
Definition code_80005FD0.c:6948
+
void func_8001AAAC(s16, s16, s16)
Definition code_80005FD0.c:6946
s32 D_80163128[]
Definition code_80005FD0.c:75
f32 D_80163418[]
Definition code_80005FD0.c:115
s32 add_blue_shell_in_unexpired_actor_list(s32)
Definition code_80005FD0.c:3269
void func_800070F4(void)
Definition code_80005FD0.c:781
f32 D_8016469C
Definition code_80005FD0.c:197
-
void func_80019D2C(Camera *, Player *, s32)
Definition code_80005FD0.c:6615
+
void func_80019D2C(Camera *, Player *, s32)
Definition code_80005FD0.c:6613
s16 D_801630E2
Definition code_80005FD0.c:71
s32 D_801631CC
Definition code_80005FD0.c:80
s16 D_80162FD0
Definition code_80005FD0.c:55
@@ -711,14 +711,14 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
void func_80012220(VehicleStuff *)
Definition code_80005FD0.c:4337
f32 D_80163178[]
Definition code_80005FD0.c:77
s16 D_801646C0[]
Definition code_80005FD0.c:208
-
void func_80019B50(s32, u16)
Definition code_80005FD0.c:6563
+
void func_80019B50(s32, u16)
Definition code_80005FD0.c:6561
void copy_courses_kart_ai_behaviour(void)
Definition code_80005FD0.c:4134
s32 D_80163DD8[]
Definition code_80005FD0.c:147
s32 func_8000B820(s32)
Definition code_80005FD0.c:2125
void func_800065D0(s32, Player *)
Definition code_80005FD0.c:658
s32 D_801634F4
Definition code_80005FD0.c:135
-
void func_80019DE4(void)
Definition code_80005FD0.c:6632
-
void func_80019ED0(void)
Definition code_80005FD0.c:6657
+
void func_80019DE4(void)
Definition code_80005FD0.c:6630
+
void func_80019ED0(void)
Definition code_80005FD0.c:6655
void func_80014B24(void)
Definition code_80005FD0.c:5290
u16 D_80163E2A
s32 add_green_shell_in_unexpired_actor_list(s32)
Definition code_80005FD0.c:3261
@@ -734,7 +734,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
void update_vehicle_trains(void)
Definition code_80005FD0.c:4550
s16 func_8000C9DC(f32, f32, f32, s16, s32)
Definition code_80005FD0.c:2416
s32 D_801645E8[]
Definition code_80005FD0.c:183
-
void func_80019DF4(void)
Definition code_80005FD0.c:6636
+
void func_80019DF4(void)
Definition code_80005FD0.c:6634
s16 D_801633F8[]
Definition code_80005FD0.c:113
f32 D_80164638[]
Definition code_80005FD0.c:188
f32 D_80164498[]
Definition code_80005FD0.c:167
@@ -782,7 +782,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
f32 gCourseCompletionPercentByRank[]
Definition code_80005FD0.h:410
s32 D_80164408[]
Definition code_80005FD0.c:160
void func_80012A48(TrainCarStuff *, s16)
Definition code_80005FD0.c:4534
-
void func_8001A450(s32, s32, s32)
Definition code_80005FD0.c:6790
+
void func_8001A450(s32, s32, s32)
Definition code_80005FD0.c:6788
f32 D_80163428[]
Definition code_80005FD0.c:116
void func_80015390(Camera *, Player *, s32)
f32 D_80163210[]
Definition code_80005FD0.c:88
@@ -790,15 +790,15 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
void func_8001ABE0(s32, D_801642D8_entry *)
s16 D_801630E8[]
Definition code_80005FD0.c:72
void func_80014DE4(s32)
Definition code_80005FD0.c:5341
-
void func_8001A3D8(s32, f32, s32)
Definition code_80005FD0.c:6779
-
void func_80019C50(s32)
Definition code_80005FD0.c:6596
+
void func_8001A3D8(s32, f32, s32)
Definition code_80005FD0.c:6777
+
void func_80019C50(s32)
Definition code_80005FD0.c:6594
void func_80007D04(s32, Player *)
void func_80016494(Camera *, Player *, s32, s32)
u16 gKartAIBehaviourState[]
Definition code_80005FD0.c:97
s32 func_80008E58(s32, s32)
Definition code_80005FD0.c:1312
f32 D_80164510[]
Definition code_80005FD0.c:171
s16 func_8000BD94(f32, f32, f32, s32)
Definition code_80005FD0.c:2246
-
void func_8001C42C(void)
Definition code_80005FD0.c:7592
+
void func_8001C42C(void)
Definition code_80005FD0.c:7590
s16 D_801630FC
Definition code_80005FD0.c:73
void func_80014934(void)
Definition code_80005FD0.c:5251
f32 D_80164698
Definition code_80005FD0.c:196
@@ -829,7 +829,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
Gfx D_0D0076F8[]
s32 D_80163378
Definition code_80005FD0.c:106
void func_800131DC(s32)
Definition code_80005FD0.c:4707
-
void func_80019890(s32, s32)
Definition code_80005FD0.c:6498
+
void func_80019890(s32, s32)
Definition code_80005FD0.c:6496
s16 D_80162EB0
Definition code_80005FD0.c:36
f32 gCourseCompletionPercentByPlayerId[]
Definition code_80005FD0.c:169
void func_800098FC(s32, Player *)
Definition code_80005FD0.c:1562
@@ -848,7 +848,7 @@ $(function(){initNavTree('code__80005FD0_8h_source.html',''); initResizable(); }
u16 D_80163344[]
Definition code_80005FD0.c:101
f32 D_80163090[]
Definition code_80005FD0.c:68
void func_80014D08(s32)
Definition code_80005FD0.c:5328
-
void func_8001AB00(void)
Definition code_80005FD0.c:6956
+
void func_8001AB00(void)
Definition code_80005FD0.c:6954
void func_8000CBF8(f32, f32, f32, s16 *, s32)
void init_course_vehicles(void)
Definition code_80005FD0.c:4359
f32 func_80010480(s32, u16)
Definition code_80005FD0.c:3727
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index f0cf6df42..fa78335a5 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..72e5eb8c6 100644 --- a/code__80281780_8h.html +++ b/code__80281780_8h.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/controlflow.html b/controlflow.html index a76321aa4..bb49c133d 100644 --- a/controlflow.html +++ b/controlflow.html @@ -112,7 +112,7 @@ $(function(){initNavTree('controlflow.html',''); initResizable(); });
  • Players
  • Actors
  • Objects
  • -
  • Courses
    • Course Folder
    • +
    • Courses
    • UI & Other 2D Screen data
    • @@ -245,7 +245,7 @@ Objects code_80086E70 Objects

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

      -

      +

      Courses

      Course related code resides in

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

      Course Folder

      -

      [course folder link][Courses]

      +

      [course folder link][Courses]

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

      +

      Courses

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

      -

      Courses Surface Types

      +

      Courses Surface Types

      diff --git a/coursesmenu.js b/coursesmenu.js index b3a26cdcc..13346ac5f 100644 --- a/coursesmenu.js +++ b/coursesmenu.js @@ -1,7 +1,7 @@ var coursesmenu = [ [ "Courses", "courses.html", [ - [ "Courses", "courses.html#courses", null ] + [ "Courses", "courses.html#courses-1", null ] ] ], [ "Surface Types", "surfacetypes.html", null ] ]; \ No newline at end of file diff --git a/data_8c.html b/data_8c.html index 5ea61773d..6680f22a5 100644 --- a/data_8c.html +++ b/data_8c.html @@ -258,7 +258,7 @@ Variables
      file desc
  • -
    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 497e326cd..831502fc7 100644 --- a/data_8h.html +++ b/data_8h.html @@ -427,7 +427,7 @@ Variables
    -
    Todo
    file boundary?
    +
    Todo
    file boundary?
    @@ -450,7 +450,7 @@ Variables
    -
    Todo
    0x00000000800f624c fill2
    +
    Todo
    0x00000000800f624c fill2
    diff --git a/doxygen_crawl.html b/doxygen_crawl.html index 62a6ef4ec..9c3785dfa 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -9,11 +9,11 @@ - - - + + + @@ -79,10 +79,10 @@ + - @@ -96,11 +96,11 @@ - + - + @@ -137,8 +137,8 @@ - + @@ -219,8 +219,8 @@ - + @@ -242,9 +242,9 @@ - - + + @@ -354,8 +354,8 @@ - + @@ -380,13 +380,13 @@ - + - + @@ -405,7 +405,6 @@ - @@ -421,8 +420,8 @@ - + @@ -435,6 +434,7 @@ + @@ -496,9 +496,9 @@ + - @@ -524,9 +524,9 @@ - + @@ -556,8 +556,8 @@ - + @@ -610,9 +610,9 @@ + - @@ -626,15 +626,15 @@ - + - + @@ -687,8 +687,8 @@ - + @@ -796,12 +796,12 @@ - - + - + + @@ -832,8 +832,8 @@ - + @@ -856,8 +856,8 @@ - + @@ -883,8 +883,8 @@ - + @@ -910,8 +910,8 @@ - + @@ -961,8 +961,8 @@ - + @@ -973,10 +973,10 @@ - + @@ -1022,10 +1022,10 @@ - - + + diff --git a/internal_8h.html b/internal_8h.html index 875ab9b69..baf829f6e 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 dcfdf001f..f9b6699ff 100644 --- a/kalimari__desert_2course__offsets_8c.html +++ b/kalimari__desert_2course__offsets_8c.html @@ -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},
    @@ -788,7 +788,9 @@ Variables
    u8 gTextureRailroadCrossingTrack[]
    u8 gTextureSignKoopaAir0[]
    u8 gTexture6473E4[]
    +
    u8 gTextureSignShellShot1[]
    u8 gTexture67D304[]
    +
    u8 gTextureSignShellShot0[]
    u8 gTextureSignMarioStar0[]
    u8 gTexture668920[]
    u8 gTexture67291C[]
    @@ -798,8 +800,6 @@ Variables
    u8 gTexture647994[]
    u8 gTextureFenceBarbedWire[]
    u8 gTextureSignMarioStar1[]
    -
    u8 gTextureSignShellShot1[]
    -
    u8 gTextureSignShellShot0[]
    diff --git a/navtreedata.js b/navtreedata.js index f3996602c..3172d4aaa 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" ], - [ "Bug List", "bug.html", null ], [ "Todo List", "todo.html", null ], + [ "Bug List", "bug.html", null ], [ "Data Structures", "annotated.html", [ [ "Data Structures", "annotated.html", "annotated_dup" ], [ "Data Structure Index", "classes.html", null ], diff --git a/navtreeindex1.js b/navtreeindex1.js index 9800bed39..248d9708c 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,20], "abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,19], +"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,20], "abi_8h.html#a18fb2ca6586420606f75125ebc7e4d0f":[8,0,2,2,0,12], "abi_8h.html#a2259f4cc6cd203ea6ef6d598674a48e6":[8,0,2,2,0,14], "abi_8h.html#a2b203222776ef9b58154e173b768b21c":[8,0,2,2,0,7], diff --git a/navtreeindex131.js b/navtreeindex131.js index e9b5fb0e6..b96336a89 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":[6], +"todo.html":[5], "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/navtreeindex28.js b/navtreeindex28.js index f83f3ba77..1e57ac2c3 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":[1,2,4,4], +"controlflow.html#courses":[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 0fa8c472e..66c2fda09 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":[2,0,0], +"courses.html#courses-1":[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/navtreeindex42.js b/navtreeindex42.js index 571b815ee..d7a5e7eb7 100644 --- a/navtreeindex42.js +++ b/navtreeindex42.js @@ -15,8 +15,8 @@ var NAVTREEINDEX42 = "gfx__output__buffer_8h.html#aa6e89ad26a571573a3618e8bd57f2fcd":[8,0,3,2,2,1], "gfx__output__buffer_8h.html#acd645401a3e14e342cad25f6471ef97a":[8,0,3,2,2,0], "gfx__output__buffer_8h_source.html":[8,0,3,2,2], -"globals.html":[8,1,0], "globals.html":[8,1,0,0], +"globals.html":[8,1,0], "globals_a.html":[8,1,0,1], "globals_b.html":[8,1,0,2], "globals_c.html":[8,1,0,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,0], "globals_vars.html":[8,1,2], +"globals_vars.html":[8,1,2,0], "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/navtreeindex9.js b/navtreeindex9.js index 26cae644e..0d67e8842 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":[5], +"bug.html":[6], "camera_8c.html":[8,0,3,9], "camera_8c.html#a0044cd79d56fa26de4dfd49bc77e3471":[8,0,3,9,13], "camera_8c.html#a005d75adccaa470b61adba174ce1a631":[8,0,3,9,33], diff --git a/objects_8h.html b/objects_8h.html index c252417ed..b1d25ca81 100644 --- a/objects_8h.html +++ b/objects_8h.html @@ -1964,7 +1964,7 @@ Variables
    -
    Todo
    fix this extern
    +
    Todo
    fix this extern
    diff --git a/pages.html b/pages.html index 4f57019f4..51fb42489 100644 --- a/pages.html +++ b/pages.html @@ -123,8 +123,8 @@ $(function(){initNavTree('pages.html',''); initResizable(); });  Boost Ramps  Paths  Audio - Bug List - Todo List + Todo List + Bug List diff --git a/race__logic_8c.html b/race__logic_8c.html index 20527536c..6e79ad3fd 100644 --- a/race__logic_8c.html +++ b/race__logic_8c.html @@ -703,7 +703,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/race__logic_8h.html b/race__logic_8h.html index 2a55911f9..a98eacff5 100644 --- a/race__logic_8h.html +++ b/race__logic_8h.html @@ -643,7 +643,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/render__courses_8c.html b/render__courses_8c.html index 88c7fb19d..71f5d4f37 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 b6281acd9..cd28a3d44 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/search/all_5.js b/search/all_5.js index 713b9486c..09f29981c 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,'Courses'],['../controlflow.html#courses-1',1,'Courses']]], + ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses-1',1,'Courses'],['../controlflow.html#courses',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/some__data_8c.html b/some__data_8c.html index fdbe0375a..127be255e 100644 --- a/some__data_8c.html +++ b/some__data_8c.html @@ -2371,7 +2371,7 @@ Variables
    0xff25, 0xffed, 0x0320,
    0xffca, 0xfff8, 0x0270,
    }
    -
    Todo
    fix this extern
    +
    Todo
    fix this extern
    diff --git a/sounds_8h.html b/sounds_8h.html index d0d331ec9..8a221b45d 100644 --- a/sounds_8h.html +++ b/sounds_8h.html @@ -419,7 +419,7 @@ Macros
    -
    Todo
    format like sm64 sounds.h
    +
    Todo
    format like sm64 sounds.h
    diff --git a/sptask_8h.html b/sptask_8h.html index 53b6368e2..ad064a3a7 100644 --- a/sptask_8h.html +++ b/sptask_8h.html @@ -236,7 +236,7 @@ Macros
    -
    Todo
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    +
    Todo
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    diff --git a/structNote.html b/structNote.html index 13861e57a..2ee56a481 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 0c0810c53..1b978096a 100644 --- a/toads__turnpike_2course__data_8c.html +++ b/toads__turnpike_2course__data_8c.html @@ -3026,7 +3026,7 @@ Variables
    #define G_IM_FMT_RGBA
    Definition gbi.h:396
    #define G_IM_SIZ_16b
    Definition gbi.h:407
    #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 8649ed263..840c1177b 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 2db485148..faf61a66d 100644 --- a/todo.html +++ b/todo.html @@ -105,8 +105,8 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global __osGetId (OSPfs *pfs)
    -

    loads of magic constants..

    -

    remove magic constant

    +

    remove magic constant

    +

    loads of magic constants..

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

    remove magic constant

    -

    fix magic number

    +

    fix magic number

    +

    remove magic constant

    Global _course_mario_raceway_dl_mio0SegmentRomStart []
    These should probably be ptr's instead of array's?
    Global add_unused_obj_index (s32 *listIdx, s32 *nextFree, s32 size)
    -
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    +
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    Global BAD_RETURN (cmd)
    put this define in types.h or similar. Certain functions are marked as having return values, but do not actually return a value. This causes undefined behavior, which we'd rather avoid on modern GCC. This only impacts -O2 and can matter for both the function itself and functions that call it.
    Global clear_framebuffer (s32)
    Why did void* work for matching
    Global D_800E43B0 []
    -
    unused?
    +
    unused?
    Global D_8018D9B0
    Move gGfxPool out of main.h
    Global d_course_banshee_boardwalk_dl_0 []
    @@ -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)
    @@ -183,7 +183,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_8004C268 (u32 arg0, u32 arg1, u8 *texture, u32 width, u32 arg4, u32 height, s32 arg6)
    fakematch?
    Global func_800745C8 (s32 objectIndex, s32 arg1)
    -
    arg1 should likely be a u8 *
    +
    arg1 should likely be a u8 *
    Global func_80091FA4 (void)
    These sizes need to be sizeof() for shiftability if possible
    Global func_800CBC24 (void)
    @@ -191,17 +191,17 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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?
    +
    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.
    +
    Cleanup this function to use array access and struct if possible.
    Global gPlayerWinningIndex
    gPlayerWinningIndex (D_800DC5E8) accessed as word, D_800DC5EB as u8
    Global gTorchSpawns []
    -
    fix this extern
    +
    fix this extern
    Global IO_WRITE (addr, data)
    These defines are from PR/rcp.h, but including that causes problems...
    Global LEO_CMD_TYPE_0
    @@ -211,9 +211,9 @@ $(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)
    +
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    Global MTX_KART_POOL_SIZE
    Verify with proper documentation
    Global MTX_SHADOW_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)
    @@ -237,13 +237,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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
    +
    format like sm64 sounds.h
    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 1a9c5cfac..d0c5e037a 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -139,231 +139,231 @@ $(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
    - -
    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);
    151
    - -
    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
    - +
    158
    -
    159 } else if (temp_f0 < 1000000.0f) {
    - +
    159 } else if (temp_f0 < 1000000.0f) {
    +
    161 } else {
    - +
    163 }
    -
    164 if (1440000.0f < temp_f0) { return; }
    +
    164 if (1440000.0f < temp_f0) { return; }
    165
    - - +
    166 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    168
    -
    169 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    170 vec3f_set(sp160, 17.0f, 6.0f, 8.0f);
    - - +
    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
    - - + +
    177 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    178
    -
    179 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    180 vec3f_set(sp160, -17.0, 6.0f, 8.0f);
    - - +
    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
    - - + +
    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);
    - - +
    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
    - - + +
    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);
    - - +
    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; }
    - - - +
    204 if (render_set_position(spA0, 3) == 0) { return; }
    + +
    206 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    207 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    208}
    209
    - -
    211 Mat4 sp120;
    -
    212 Vec3f sp160;
    -
    213 Mat4 spE0;
    -
    214 Mat4 spA0;
    + +
    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);
    221
    - +
    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
    - - + +
    230
    -
    231 } else if (temp_f0 < 1000000.0f) {
    +
    231 } else if (temp_f0 < 1000000.0f) {
    232
    - - + +
    235 } else {
    - - + +
    238 }
    -
    239 if (1440000.0f < temp_f0) { return; }
    +
    239 if (1440000.0f < temp_f0) { return; }
    240
    - - +
    241 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    243
    -
    244 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    245 vec3f_set(sp160, 17.0f, 6.0f, 28.0f);
    - - +
    244 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    245 vec3f_set(sp160, 17.0f, 6.0f, 28.0f);
    +
    246 mtxf_translate(spE0, sp160);
    +
    247 mtxf_multiplication(spA0, sp120, spE0);
    248
    -
    249 if (render_set_position(spA0, 3) == 0) { return; }
    +
    249 if (render_set_position(spA0, 3) == 0) { return; }
    250
    - - + +
    252 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    253
    -
    254 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    255 vec3f_set(sp160, -17.0, 6.0f, 28.0f);
    - - +
    254 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    255 vec3f_set(sp160, -17.0, 6.0f, 28.0f);
    +
    256 mtxf_translate(spE0, sp160);
    +
    257 mtxf_multiplication(spA0, sp120, spE0);
    258
    -
    259 if (render_set_position(spA0, 3) == 0) { return; }
    +
    259 if (render_set_position(spA0, 3) == 0) { return; }
    260
    @@ -473,6 +473,7 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    Vec3s rot
    Definition camera.h:33
    Vec3f pos
    Definition camera.h:27
    Definition actor_types.h:144
    +
    s16 wheelRot
    Definition actor_types.h:148
    Vec3f pos
    Definition actor_types.h:153
    Vec3s rot
    Definition actor_types.h:151
    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 79b2f839c..e737957ee 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -284,52 +284,52 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    203 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    204 }
    205 arg1[3][0] = arg2->pos[0];
    -
    206 arg1[3][1] = arg2->pos[1];
    -
    207 arg1[3][2] = arg2->pos[2];
    +
    206 arg1[3][1] = arg2->pos[1];
    +
    207 arg1[3][2] = arg2->pos[2];
    208
    -
    209 if (render_set_position(arg1, 0) != 0) {
    -
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    - +
    209 if (render_set_position(arg1, 0) != 0) {
    + +
    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;
    + +
    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) {
    - +
    239 if (render_set_position(arg1, 0) != 0) {
    +
    241 }
    242}
    243
    - -
    252 f32 temp_f0;
    -
    253 s16 temp_v0 = arg2->flags;
    + +
    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/update__objects_8c.html b/update__objects_8c.html index 49213acfd..72b7015a3 100644 --- a/update__objects_8c.html +++ b/update__objects_8c.html @@ -951,7 +951,7 @@ Variables
    -
    Todo
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    +
    Todo
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    Here is the call graph for this function:
    @@ -3939,7 +3939,7 @@ Here is the caller graph for this function:
    -
    Todo
    arg1 should likely be a u8 *
    +
    Todo
    arg1 should likely be a u8 *
    Here is the call graph for this function:
    @@ -10526,7 +10526,7 @@ Here is the caller graph for this function:
    -
    Todo
    Cleanup this function to use array access and struct if possible.
    +
    Todo
    Cleanup this function to use array access and struct if possible.
    Here is the call graph for this function:
    @@ -12220,7 +12220,7 @@ Here is the caller graph for this function:
    0.0, 0.0, 0.0, 0.0,
    0.0, 0.0, 0.0, 0.0
    }
    -
    Todo
    unused?
    +
    Todo
    unused?
    diff --git a/wario__stadium_2course__data_8c.html b/wario__stadium_2course__data_8c.html index 258a5dd03..387a9844b 100644 --- a/wario__stadium_2course__data_8c.html +++ b/wario__stadium_2course__data_8c.html @@ -450,7 +450,7 @@ Variables
    Gfx d_course_wario_stadium_packed_dl_4218[]
    Definition course_displaylists.inc.c:2649
    Gfx d_course_wario_stadium_packed_dl_5888[]
    Definition course_displaylists.inc.c:3475
    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 5b98ef9fd..fa6f8f05b 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 11161eab8..35814cf9a 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,7 +165,6 @@ $(function(){initNavTree('yoshi__egg_2render_8inc_8c_source.html',''); initResiz
    Camera * camera1
    Definition camera.c:23
    -
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    f32 Vec3f[3]
    Definition common_structs.h:6
    s16 Vec3s[3]
    Definition common_structs.h:11
    f32 Mat4[4][4]
    Definition common_structs.h:16