From ea4c9b3ef3f6fdc06dc27282583277949dc9469f Mon Sep 17 00:00:00 2001 From: MegaMech Date: Fri, 19 Apr 2024 16:43:12 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20n64decom?= =?UTF-8?q?p/mk64@3f9d1137221a4fb536a858dffe173d2dea56d21e=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- banshee__boardwalk_2course__data_8c.html | 2 +- banshee__boardwalk_2course__data_8h.html | 2 +- big__donut_2course__data_8c.html | 2 +- big__donut_2course__data_8h.html | 2 +- ...d__red__shells_2update_8inc_8c_source.html | 207 +++++++++--------- bug.html | 4 +- ceremony__and__credits_8c.html | 6 +- ceremony__and__credits_8h.html | 4 +- code__80005FD0_8c.html | 2 +- code__80281780_8c.html | 2 +- code__80281780_8h.html | 2 +- crash__screen_8c.html | 2 +- doxygen_crawl.html | 56 ++--- globals_d.html | 2 +- globals_vars_d.html | 2 +- item__box_2render_8inc_8c_source.html | 110 +++++----- kalimari__desert_2course__offsets_8c.html | 8 +- main_8c.html | 2 +- main_8h.html | 6 +- md_docs_2doxygen__syms.html | 2 +- navtreeindex1.js | 2 +- navtreeindex106.js | 2 +- navtreeindex69.js | 2 +- osPiRawStartDma_8c.html | 2 +- osPiStartDma_8c.html | 2 +- os__pi_8h.html | 2 +- podium__ceremony__actors_8c.html | 2 +- podium__ceremony__actors_8h.html | 2 +- search/all_6.js | 2 +- search/variables_4.js | 2 +- skybox__and__splitscreen_8c.html | 27 ++- skybox__and__splitscreen_8c.js | 2 +- skybox__and__splitscreen_8h_source.html | 50 ++--- toads__turnpike_2course__data_8c.html | 2 +- toads__turnpike_2course__data_8h.html | 2 +- todo.html | 36 +-- train_2render_8inc_8c_source.html | 37 ++-- trees_2render_8inc_8c_source.html | 181 +++++++-------- wario__stadium_2course__data_8c.html | 2 +- wario__stadium_2course__data_8h.html | 2 +- 40 files changed, 401 insertions(+), 385 deletions(-) diff --git a/banshee__boardwalk_2course__data_8c.html b/banshee__boardwalk_2course__data_8c.html index 30d3da56f..d5a1540af 100644 --- a/banshee__boardwalk_2course__data_8c.html +++ b/banshee__boardwalk_2course__data_8c.html @@ -665,7 +665,7 @@ Variables
gsSPEndDisplayList(),
}
gCourseMaxZ
s16 gCourseMaxZ
Definition code_800029B0.c:92
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/banshee__boardwalk_2course__data_8h.html b/banshee__boardwalk_2course__data_8h.html index 3beca2c5d..9112f3c77 100644 --- a/banshee__boardwalk_2course__data_8h.html +++ b/banshee__boardwalk_2course__data_8h.html @@ -716,7 +716,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/big__donut_2course__data_8c.html b/big__donut_2course__data_8c.html index 53b135b13..b643a3ce7 100644 --- a/big__donut_2course__data_8c.html +++ b/big__donut_2course__data_8c.html @@ -160,7 +160,7 @@ Variables
G_RM_AA_ZB_OPA_SURF2
#define G_RM_AA_ZB_OPA_SURF2
Definition gbi.h:942
G_CC_MODULATEIA
#define G_CC_MODULATEIA
Definition gbi.h:492
G_RM_AA_ZB_TEX_EDGE
#define G_RM_AA_ZB_TEX_EDGE
Definition gbi.h:957
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/big__donut_2course__data_8h.html b/big__donut_2course__data_8h.html index be566b323..64eebcad5 100644 --- a/big__donut_2course__data_8h.html +++ b/big__donut_2course__data_8h.html @@ -148,7 +148,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index d6cfe95a5..cd4ac0aae 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;
+
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;
-
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
-
100 temp_f26 = D_80164490[nextWaypoint].posZ;
+
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
100 temp_f26 = D_80164490[nextWaypoint].posZ;
101
-
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
-
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
-
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
+
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
+
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
+
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
105
-
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
-
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
-
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
+
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
+
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
+
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
109 }
110 }
111}
112
-
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
-
114 f32 x_velocity;
-
115 f32 z_velocity;
-
116 f32 xz_dist;
-
117 Vec3f newPosition;
+
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
+
114 f32 x_velocity;
+
115 f32 z_velocity;
+
116 f32 xz_dist;
+
117 Vec3f newPosition;
118
-
119 x_velocity = player->pos[0];
-
120 x_velocity -= shell->pos[0];
-
121 z_velocity = player->pos[2];
-
122 z_velocity -= shell->pos[2];
-
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
-
124 if (xz_dist == 0.0f) {
-
125 x_velocity = 0.0f;
-
126 z_velocity = 0.0f;
+
119 x_velocity = player->pos[0];
+
120 x_velocity -= shell->pos[0];
+
121 z_velocity = player->pos[2];
+
122 z_velocity -= shell->pos[2];
+
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
+
124 if (xz_dist == 0.0f) {
+
125 x_velocity = 0.0f;
+
126 z_velocity = 0.0f;
127 } else {
-
128 x_velocity /= xz_dist;
-
129 z_velocity /= xz_dist;
+
128 x_velocity /= xz_dist;
+
129 z_velocity /= xz_dist;
130 }
131
-
132 newPosition[0] = shell->pos[0];
-
133 newPosition[1] = shell->pos[1];
+
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',''
Player::currentRank
s16 currentRank
Definition common_structs.h:251
Player::pos
Vec3f pos
Definition common_structs.h:258
ShellActor
Definition actor_types.h:302
+
ShellActor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:315
+
ShellActor::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/bug.html b/bug.html index 2b09f90c6..cb0bbc309 100644 --- a/bug.html +++ b/bug.html @@ -105,11 +105,11 @@ $(function(){initNavTree('bug.html',''); initResizable(); });
Global crash_screen_draw_info (u16 *framebuffer, OSThread *thread)
-
if this check fails, the ra register is printed a second time.
+
if this check fails, the ra register is printed a second time.
Global DEBUG_MODE
This looks like it should work at any point in the race.
Global func_8001969C (UNUSED s32 playerId, UNUSED f32 arg1, s32 cameraId, UNUSED s16 pathIndex)
-
Adding an (f32) cast changes asm, why?
+
Adding an (f32) cast changes asm, why?
Global func_800B9BE4 (f32, f32, u16 *)
they probably meant to store the value to tmp[i] and tmp[8 + i]
Global func_800BB388 (s32 bankId, s32 instId, s32 arg2)
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 56759505e..e12614db6 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -1008,7 +1008,7 @@ Here is the caller graph for this function:
-
Todo
Cast to normal Camera? Or from CinematicCamera?
+
Todo
Cast to normal Camera? Or from CinematicCamera?
Here is the call graph for this function:
@@ -1295,7 +1295,7 @@ Here is the caller graph for this function:
-
Todo
Does this match as a return of s8?
+
Todo
Does this match as a return of s8?
Here is the call graph for this function:
@@ -2367,7 +2367,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index b7553c0c9..305cb43f9 100644 --- a/ceremony__and__credits_8h.html +++ b/ceremony__and__credits_8h.html @@ -960,7 +960,7 @@ Here is the caller graph for this function:
-
Todo
Cast to normal Camera? Or from CinematicCamera?
+
Todo
Cast to normal Camera? Or from CinematicCamera?
Here is the call graph for this function:
@@ -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/code__80005FD0_8c.html b/code__80005FD0_8c.html index 4ddbd0de1..82ccdf60c 100644 --- a/code__80005FD0_8c.html +++ b/code__80005FD0_8c.html @@ -5145,7 +5145,7 @@ Here is the caller graph for this function:
-
Bug
Adding an (f32) cast changes asm, why?
+
Bug
Adding an (f32) cast changes asm, why?
Here is the caller graph for this function:
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index de7285953..71db83e0d 100644 --- a/code__80281780_8c.html +++ b/code__80281780_8c.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/code__80281780_8h.html b/code__80281780_8h.html index 3b18f8e1b..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/crash__screen_8c.html b/crash__screen_8c.html index bf373671f..75b43ae9f 100644 --- a/crash__screen_8c.html +++ b/crash__screen_8c.html @@ -285,7 +285,7 @@ Here is the caller graph for this function:
-
Bug
if this check fails, the ra register is printed a second time.
+
Bug
if this check fails, the ra register is printed a second time.
Here is the call graph for this function:
diff --git a/doxygen_crawl.html b/doxygen_crawl.html index 467025eb3..f4fa82055 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -150,8 +150,8 @@ - + @@ -245,9 +245,9 @@ + - @@ -400,10 +400,11 @@ - + + @@ -415,7 +416,6 @@ - @@ -424,20 +424,20 @@ - + - + - + - + @@ -530,16 +530,16 @@ - - + + - + @@ -636,8 +636,8 @@ - + @@ -686,20 +686,20 @@ - + + - + - @@ -711,8 +711,8 @@ - + @@ -720,9 +720,9 @@ + - @@ -733,8 +733,8 @@ - + @@ -744,8 +744,8 @@ - + @@ -805,8 +805,8 @@ - + @@ -870,8 +870,8 @@ - + @@ -922,8 +922,8 @@ - + @@ -961,8 +961,8 @@ - + @@ -1007,19 +1007,19 @@ - + - - + + @@ -1029,8 +1029,8 @@ - + @@ -1046,8 +1046,8 @@ - + diff --git a/globals_d.html b/globals_d.html index 70619717c..80d2202ba 100644 --- a/globals_d.html +++ b/globals_d.html @@ -2663,7 +2663,7 @@ $(function(){initNavTree('globals_d.html',''); initResizable(); });
  • D_802B8910 : skybox_and_splitscreen.c
  • D_802B8990 : skybox_and_splitscreen.c
  • D_802B8A10 : skybox_and_splitscreen.c
    • -
  • D_802B8A90 : skybox_and_splitscreen.c
    • +
  • D_802B8A90 : skybox_and_splitscreen.c
  • D_802B8CD4 : memory.c
  • D_802B8CE4 : memory.c
  • D_802B91C0 : math_util.h, math_util.c
    • diff --git a/globals_vars_d.html b/globals_vars_d.html index 506aaf60c..7489d1808 100644 --- a/globals_vars_d.html +++ b/globals_vars_d.html @@ -2653,7 +2653,7 @@ $(function(){initNavTree('globals_vars_d.html',''); initResizable(); });
  • D_802B8910 : skybox_and_splitscreen.c
  • D_802B8990 : skybox_and_splitscreen.c
  • D_802B8A10 : skybox_and_splitscreen.c
    • -
  • D_802B8A90 : skybox_and_splitscreen.c
    • +
  • D_802B8A90 : skybox_and_splitscreen.c
  • D_802B8CD4 : memory.c
  • D_802B8CE4 : memory.c
  • D_802B91C0 : math_util.c, math_util.h
    • diff --git a/item__box_2render_8inc_8c_source.html b/item__box_2render_8inc_8c_source.html index 72bb26fb1..c9b7810d6 100644 --- a/item__box_2render_8inc_8c_source.html +++ b/item__box_2render_8inc_8c_source.html @@ -183,88 +183,87 @@ $(function(){initNavTree('item__box_2render_8inc_8c_source.html',''); initResiza
    78 gSPDisplayList(gDisplayListHead++, D_0D003090);
    79 } else {
    80 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    -
    81 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    -
    82 gDPSetBlendMask(gDisplayListHead++, 0xFF);
    -
    83 thing = item_box->someTimer;
    -
    84 mtxf_pos_rotation_xyz(someMatrix1, item_box->pos, item_box->rot);
    +
    81 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    82 gDPSetBlendMask(gDisplayListHead++, 0xFF);
    +
    83 thing = item_box->someTimer;
    +
    84 mtxf_pos_rotation_xyz(someMatrix1, item_box->pos, item_box->rot);
    85 if (thing < 10.0f) {
    86 someMultiplier = 1.0f;
    87 } else {
    88 someMultiplier = 1.0f - ((thing - 10.0f) * 0.1f);
    89 }
    -
    90 mtxf_scale(someMatrix1, someMultiplier);
    -
    91 if (item_box->someTimer & 1) {
    -
    92 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
    +
    90 mtxf_scale(someMatrix1, someMultiplier);
    +
    91 if (item_box->someTimer & 1) {
    +
    92 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
    93 } else {
    -
    94 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
    +
    94 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
    95 }
    -
    96 temp_f2 = 2.0f * thing;
    -
    97 someVec1[0] = 0.0f;
    -
    98 someVec1[1] = temp_f2;
    -
    99 someVec1[2] = thing;
    -
    100 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    +
    96 temp_f2 = 2.0f * thing;
    +
    97 someVec1[0] = 0.0f;
    +
    98 someVec1[1] = temp_f2;
    +
    99 someVec1[2] = thing;
    +
    100 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    101
    -
    102 if (!render_set_position(someMatrix2, 0)) { return; }
    +
    102 if (!render_set_position(someMatrix2, 0)) { return; }
    103
    -
    104 gSPDisplayList(gDisplayListHead++, D_0D003158);
    -
    105 temp_f2_2 = 0.8f * thing;
    -
    106 temp_f12 = 0.5f * thing;
    -
    107 someVec1[0] = temp_f2_2;
    -
    108 someVec1[1] = 2.3f * thing;
    -
    109 someVec1[2] = temp_f12;
    -
    110 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    +
    104 gSPDisplayList(gDisplayListHead++, D_0D003158);
    +
    105 temp_f2_2 = 0.8f * thing;
    +
    106 temp_f12 = 0.5f * thing;
    +
    107 someVec1[0] = temp_f2_2;
    +
    108 someVec1[1] = 2.3f * thing;
    +
    109 someVec1[2] = temp_f12;
    +
    110 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    111
    -
    112 if (!render_set_position(someMatrix2, 0)) { return; }
    +
    112 if (!render_set_position(someMatrix2, 0)) { return; }
    113
    -
    114 gSPDisplayList(gDisplayListHead++, D_0D0031B8);
    -
    115 temp_f0_2 = -0.5f * thing;
    -
    116 someVec1[0] = temp_f2_2;
    -
    117 someVec1[1] = 1.2f * thing;
    -
    118 someVec1[2] = temp_f0_2;
    -
    119 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    +
    114 gSPDisplayList(gDisplayListHead++, D_0D0031B8);
    +
    115 temp_f0_2 = -0.5f * thing;
    +
    116 someVec1[0] = temp_f2_2;
    +
    117 someVec1[1] = 1.2f * thing;
    +
    118 someVec1[2] = temp_f0_2;
    +
    119 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    120
    -
    121 if (!render_set_position(someMatrix2, 0)) { return; }
    +
    121 if (!render_set_position(someMatrix2, 0)) { return; }
    122
    -
    123 gSPDisplayList(gDisplayListHead++, D_0D003128);
    -
    124 if (!(item_box->someTimer & 1)) {
    -
    125 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
    +
    123 gSPDisplayList(gDisplayListHead++, D_0D003128);
    +
    124 if (!(item_box->someTimer & 1)) {
    +
    125 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
    126 } else {
    -
    127 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
    +
    127 gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_XLU_INTER, G_RM_NOOP2);
    128 }
    -
    129 someVec1[0] = 0.0f;
    -
    130 someVec1[1] = 1.8f * thing;
    -
    131 someVec1[2] = -1.0f * thing;
    -
    132 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    +
    129 someVec1[0] = 0.0f;
    +
    130 someVec1[1] = 1.8f * thing;
    +
    131 someVec1[2] = -1.0f * thing;
    +
    132 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    133
    -
    134 if (!render_set_position(someMatrix2, 0)) { return; }
    +
    134 if (!render_set_position(someMatrix2, 0)) { return; }
    135
    -
    136 gSPDisplayList(gDisplayListHead++, D_0D0031E8);
    -
    137 temp_f0_3 = -0.8f * thing;
    -
    138 someVec1[0] = temp_f0_3;
    -
    139 someVec1[1] = 0.6f * thing;
    -
    140 someVec1[2] = temp_f0_2;
    -
    141 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    +
    136 gSPDisplayList(gDisplayListHead++, D_0D0031E8);
    +
    137 temp_f0_3 = -0.8f * thing;
    +
    138 someVec1[0] = temp_f0_3;
    +
    139 someVec1[1] = 0.6f * thing;
    +
    140 someVec1[2] = temp_f0_2;
    +
    141 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    142
    -
    143 if (!render_set_position(someMatrix2, 0)) { return; }
    +
    143 if (!render_set_position(someMatrix2, 0)) { return; }
    144
    -
    145 gSPDisplayList(gDisplayListHead++, D_0D003188);
    -
    146 someVec1[0] = temp_f0_3;
    -
    147 someVec1[1] = temp_f2;
    -
    148 someVec1[2] = temp_f12;
    -
    149 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    +
    145 gSPDisplayList(gDisplayListHead++, D_0D003188);
    +
    146 someVec1[0] = temp_f0_3;
    +
    147 someVec1[1] = temp_f2;
    +
    148 someVec1[2] = temp_f12;
    +
    149 add_translate_mat4_vec3f(someMatrix1, someMatrix2, someVec1);
    150
    -
    151 if (!render_set_position(someMatrix2, 0)) { return; }
    +
    151 if (!render_set_position(someMatrix2, 0)) { return; }
    152
    -
    153 gSPDisplayList(gDisplayListHead++, D_0D0030F8);
    -
    154 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    153 gSPDisplayList(gDisplayListHead++, D_0D0030F8);
    +
    154 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    155 }
    -
    156 gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
    +
    156 gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
    157 }
    158}
    camera1
    Camera * camera1
    Definition camera.c:22
    -
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    D_0D003090
    Gfx D_0D003090[]
    itemBoxQuestionMarkModel
    Gfx itemBoxQuestionMarkModel[]
    D_0D003188
    Gfx D_0D003188[]
    @@ -303,6 +302,7 @@ $(function(){initNavTree('item__box_2render_8inc_8c_source.html',''); initResiza
    Camera::rot
    Vec3s rot
    Definition camera.h:33
    Camera::pos
    Vec3f pos
    Definition camera.h:27
    ItemBox
    Definition actor_types.h:328
    +
    ItemBox::someTimer
    s16 someTimer
    Definition actor_types.h:331
    ItemBox::pos
    Vec3f pos
    Definition actor_types.h:339
    ItemBox::state
    s16 state
    Definition actor_types.h:332
    ItemBox::resetDistance
    f32 resetDistance
    Definition actor_types.h:333
    diff --git a/kalimari__desert_2course__offsets_8c.html b/kalimari__desert_2course__offsets_8c.html index f9b6699ff..dcfdf001f 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,9 +788,7 @@ Variables
    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/main_8c.html b/main_8c.html index 04266ca95..38408a38a 100644 --- a/main_8c.html +++ b/main_8c.html @@ -573,7 +573,7 @@ Here is the caller graph for this function:
    -
    Todo
    Why did void* work for matching
    +
    Todo
    Why did void* work for matching
    Here is the caller graph for this function:
    diff --git a/main_8h.html b/main_8h.html index aed101a92..7c156017d 100644 --- a/main_8h.html +++ b/main_8h.html @@ -611,7 +611,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -640,7 +640,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -659,7 +659,7 @@ Variables
    -
    Todo
    Why did void* work for matching
    +
    Todo
    Why did void* work for matching
    Here is the caller graph for this function:
    diff --git a/md_docs_2doxygen__syms.html b/md_docs_2doxygen__syms.html index a8eeee1bd..b32f24b25 100644 --- a/md_docs_2doxygen__syms.html +++ b/md_docs_2doxygen__syms.html @@ -10490,7 +10490,7 @@ Memory Addresses D_802B8A10 0x802B8A10 -D_802B8A90 0x802B8A90 +D_802B8A90 0x802B8A90 sSkyColors 0x802B8AD0 diff --git a/navtreeindex1.js b/navtreeindex1.js index 248d9708c..9800bed39 100644 --- a/navtreeindex1.js +++ b/navtreeindex1.js @@ -168,8 +168,8 @@ var NAVTREEINDEX1 = "abi_8h.html":[8,0,2,2,0], "abi_8h.html#a0fa85b4a63cdef587611a5cfc518b029":[8,0,2,2,0,1], "abi_8h.html#a14d6d1a5fe10cc2b775388380a8d75f6":[8,0,2,2,0,28], -"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,19], "abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,20], +"abi_8h.html#a16f303da41012b9a13d7c5cd5a47d64a":[8,0,2,2,0,19], "abi_8h.html#a18fb2ca6586420606f75125ebc7e4d0f":[8,0,2,2,0,12], "abi_8h.html#a2259f4cc6cd203ea6ef6d598674a48e6":[8,0,2,2,0,14], "abi_8h.html#a2b203222776ef9b58154e173b768b21c":[8,0,2,2,0,7], diff --git a/navtreeindex106.js b/navtreeindex106.js index e622b0aac..c0f70e23c 100644 --- a/navtreeindex106.js +++ b/navtreeindex106.js @@ -7,7 +7,6 @@ var NAVTREEINDEX106 = "skybox__and__splitscreen_8c.html#a1ff551b00275f32a4c52eb741006cbc2":[8,0,3,7,14,32], "skybox__and__splitscreen_8c.html#a248dc83fd4a3f414744f72faf84b1904":[8,0,3,7,14,27], "skybox__and__splitscreen_8c.html#a24d921b7aaa7cdc7a3f32e4e45b01405":[8,0,3,7,14,53], -"skybox__and__splitscreen_8c.html#a24ee540b69e252035f5aec2a8432ffe3":[8,0,3,7,14,51], "skybox__and__splitscreen_8c.html#a39b8efa56ec9ff632a99e6363225e9d0":[8,0,3,7,14,34], "skybox__and__splitscreen_8c.html#a3cae4ed02b4f4ac73f8e0092f0599bd0":[8,0,3,7,14,42], "skybox__and__splitscreen_8c.html#a3ccbc877132c17e7864318f295367fb7":[8,0,3,7,14,29], @@ -25,6 +24,7 @@ var NAVTREEINDEX106 = "skybox__and__splitscreen_8c.html#a82f11207fd1d7e8cd80ae6769db6d746":[8,0,3,7,14,10], "skybox__and__splitscreen_8c.html#a82f24f7e2e98540d8ea10579ee3b6315":[8,0,3,7,14,49], "skybox__and__splitscreen_8c.html#a862515e1d473f5fbbe04543cddfc4fa4":[8,0,3,7,14,31], +"skybox__and__splitscreen_8c.html#a9119e27ac748939929d0b105173cdb43":[8,0,3,7,14,51], "skybox__and__splitscreen_8c.html#a97049ca439feed0c004c1d41f302189e":[8,0,3,7,14,1], "skybox__and__splitscreen_8c.html#a98eb0076207c048df9f97a720ca5f872":[8,0,3,7,14,39], "skybox__and__splitscreen_8c.html#a9a7113658a35b34e9332a4968906e701":[8,0,3,7,14,9], diff --git a/navtreeindex69.js b/navtreeindex69.js index b099413c0..ec404128f 100644 --- a/navtreeindex69.js +++ b/navtreeindex69.js @@ -8,8 +8,8 @@ var NAVTREEINDEX69 = "load_8c.html#ae413774208e1213a9146b077715c7787":[8,0,3,1,10,45], "load_8c.html#ae4a9b501905301177af6c476cff02f7f":[8,0,3,1,10,40], "load_8c.html#ae61d39b44029939585c581369dc5a050":[8,0,3,1,10,2], -"load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,6], "load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,5], +"load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,6], "load_8c.html#aea5e1113ed6186106c99f9d146e80e75":[8,0,3,1,10,33], "load_8c.html#aeead683cd086cc979e2e7e94d8b4e7b9":[8,0,3,1,10,66], "load_8c.html#aef4659733b428e6fcae0c19331e720cf":[8,0,3,1,10,35], diff --git a/osPiRawStartDma_8c.html b/osPiRawStartDma_8c.html index 59e8acd63..b4feeebe7 100644 --- a/osPiRawStartDma_8c.html +++ b/osPiRawStartDma_8c.html @@ -186,7 +186,7 @@ Here is the caller graph for this function:
    -
    Todo
    figure out why this is like this
    +
    Todo
    figure out why this is like this
    diff --git a/osPiStartDma_8c.html b/osPiStartDma_8c.html index 9de6d0159..661858b66 100644 --- a/osPiStartDma_8c.html +++ b/osPiStartDma_8c.html @@ -167,7 +167,7 @@ Variables
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/os__pi_8h.html b/os__pi_8h.html index 6e2c0bcb1..b6b02c130 100644 --- a/os__pi_8h.html +++ b/os__pi_8h.html @@ -441,7 +441,7 @@ Here is the caller graph for this function:
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/podium__ceremony__actors_8c.html b/podium__ceremony__actors_8c.html index 5a67d4360..b07e35f7a 100644 --- a/podium__ceremony__actors_8c.html +++ b/podium__ceremony__actors_8c.html @@ -596,7 +596,7 @@ Here is the caller graph for this function:
    Bug
    No null check.
    Bug
    -
    Todo
    More indepth error checking/return value
    +
    Todo
    More indepth error checking/return value
    Here is the call graph for this function:
    diff --git a/podium__ceremony__actors_8h.html b/podium__ceremony__actors_8h.html index 59a0378d8..68ed10cc8 100644 --- a/podium__ceremony__actors_8h.html +++ b/podium__ceremony__actors_8h.html @@ -555,7 +555,7 @@ Here is the caller graph for this function:
    Bug
    No null check.
    Bug
    -
    Todo
    More indepth error checking/return value
    +
    Todo
    More indepth error checking/return value
    Here is the call graph for this function:
    diff --git a/search/all_6.js b/search/all_6.js index 0b4dda541..c1d0f6ca6 100644 --- a/search/all_6.js +++ b/search/all_6.js @@ -2574,7 +2574,7 @@ var searchData= ['d_5f802b8910_2571',['D_802B8910',['../skybox__and__splitscreen_8c.html#aad2cc417d607992cfe201e81e1cf0921',1,'skybox_and_splitscreen.c']]], ['d_5f802b8990_2572',['D_802B8990',['../skybox__and__splitscreen_8c.html#a82f24f7e2e98540d8ea10579ee3b6315',1,'skybox_and_splitscreen.c']]], ['d_5f802b8a10_2573',['D_802B8A10',['../skybox__and__splitscreen_8c.html#a48751c54a38756b9474b566084b5e56a',1,'skybox_and_splitscreen.c']]], - ['d_5f802b8a90_2574',['D_802B8A90',['../skybox__and__splitscreen_8c.html#a24ee540b69e252035f5aec2a8432ffe3',1,'skybox_and_splitscreen.c']]], + ['d_5f802b8a90_2574',['D_802B8A90',['../skybox__and__splitscreen_8c.html#a9119e27ac748939929d0b105173cdb43',1,'skybox_and_splitscreen.c']]], ['d_5f802b8cd4_2575',['D_802B8CD4',['../memory_8c.html#a20247197aa5ae9f963a5c2b6d923a37e',1,'memory.c']]], ['d_5f802b8ce4_2576',['D_802B8CE4',['../memory_8c.html#af0191ff11f34cb788fc0f78fcc869ea0',1,'memory.c']]], ['d_5f802b91c0_2577',['D_802B91C0',['../math__util_8c.html#a6ecb143724b00642b0cca4273509a5b0',1,'D_802B91C0: math_util.c'],['../math__util_8h.html#a51e5931330fce8c5cd15ff0c32cf7d24',1,'D_802B91C0: math_util.c']]], diff --git a/search/variables_4.js b/search/variables_4.js index a797e44a3..5c6da5eb2 100644 --- a/search/variables_4.js +++ b/search/variables_4.js @@ -2562,7 +2562,7 @@ var searchData= ['d_5f802b8910_2559',['D_802B8910',['../skybox__and__splitscreen_8c.html#aad2cc417d607992cfe201e81e1cf0921',1,'skybox_and_splitscreen.c']]], ['d_5f802b8990_2560',['D_802B8990',['../skybox__and__splitscreen_8c.html#a82f24f7e2e98540d8ea10579ee3b6315',1,'skybox_and_splitscreen.c']]], ['d_5f802b8a10_2561',['D_802B8A10',['../skybox__and__splitscreen_8c.html#a48751c54a38756b9474b566084b5e56a',1,'skybox_and_splitscreen.c']]], - ['d_5f802b8a90_2562',['D_802B8A90',['../skybox__and__splitscreen_8c.html#a24ee540b69e252035f5aec2a8432ffe3',1,'skybox_and_splitscreen.c']]], + ['d_5f802b8a90_2562',['D_802B8A90',['../skybox__and__splitscreen_8c.html#a9119e27ac748939929d0b105173cdb43',1,'skybox_and_splitscreen.c']]], ['d_5f802b8cd4_2563',['D_802B8CD4',['../memory_8c.html#a20247197aa5ae9f963a5c2b6d923a37e',1,'memory.c']]], ['d_5f802b8ce4_2564',['D_802B8CE4',['../memory_8c.html#af0191ff11f34cb788fc0f78fcc869ea0',1,'memory.c']]], ['d_5f802b91c0_2565',['D_802B91C0',['../math__util_8c.html#a6ecb143724b00642b0cca4273509a5b0',1,'D_802B91C0: math_util.c'],['../math__util_8h.html#a51e5931330fce8c5cd15ff0c32cf7d24',1,'D_802B91C0: math_util.c']]], diff --git a/skybox__and__splitscreen_8c.html b/skybox__and__splitscreen_8c.html index becc6ca8d..4762c715f 100644 --- a/skybox__and__splitscreen_8c.html +++ b/skybox__and__splitscreen_8c.html @@ -244,8 +244,8 @@ Variables   Vtx D_802B8A10 []   -s32 D_802B8A90 [] -  +UNUSED Gfx D_802B8A90 [] +  struct Skybox sSkyColors []   struct Skybox sSkyColors2 [] @@ -1493,23 +1493,32 @@ Here is the caller graph for this function:
    - -

    ◆ D_802B8A90

    + +

    ◆ D_802B8A90

    - +
    s32 D_802B8A90[]UNUSED Gfx D_802B8A90[]
    Initial value:
    = {
    -
    0xe7000000, 0x00000000, 0xb900031d, 0x0f0a4000,
    -
    0xba001402, 0x00300000, 0xf7000000, 0x00000000,
    -
    0xf64fc3bc, 0x00000000, 0xe7000000, 0x00000000,
    -
    0xba001402, 0x00000000, 0xb8000000, 0x00000000,
    +
    gsDPPipeSync(),
    +
    gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2),
    +
    gsDPSetCycleType(G_CYC_FILL),
    +
    gsDPSetFillColor(0x00000000),
    +
    gsDPFillRectangle(0, 0, 319, 239),
    +
    gsDPPipeSync(),
    +
    gsDPSetCycleType(G_CYC_1CYCLE),
    +
    gsSPEndDisplayList(),
    }
    +
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    +
    G_RM_OPA_SURF2
    #define G_RM_OPA_SURF2
    Definition gbi.h:1019
    +
    G_CYC_FILL
    #define G_CYC_FILL
    Definition gbi.h:622
    +
    G_CYC_1CYCLE
    #define G_CYC_1CYCLE
    Definition gbi.h:619
    +
    G_RM_OPA_SURF
    #define G_RM_OPA_SURF
    Definition gbi.h:1018
    diff --git a/skybox__and__splitscreen_8c.js b/skybox__and__splitscreen_8c.js index d897ba927..2f5e31d48 100644 --- a/skybox__and__splitscreen_8c.js +++ b/skybox__and__splitscreen_8c.js @@ -51,7 +51,7 @@ var skybox__and__splitscreen_8c = [ "D_802B8910", "skybox__and__splitscreen_8c.html#aad2cc417d607992cfe201e81e1cf0921", null ], [ "D_802B8990", "skybox__and__splitscreen_8c.html#a82f24f7e2e98540d8ea10579ee3b6315", null ], [ "D_802B8A10", "skybox__and__splitscreen_8c.html#a48751c54a38756b9474b566084b5e56a", null ], - [ "D_802B8A90", "skybox__and__splitscreen_8c.html#a24ee540b69e252035f5aec2a8432ffe3", null ], + [ "D_802B8A90", "skybox__and__splitscreen_8c.html#a9119e27ac748939929d0b105173cdb43", null ], [ "sSkyColors", "skybox__and__splitscreen_8c.html#a5a62561f3fe644aa6a2db4ef3a8f4254", null ], [ "sSkyColors2", "skybox__and__splitscreen_8c.html#a24d921b7aaa7cdc7a3f32e4e45b01405", null ] ]; \ No newline at end of file diff --git a/skybox__and__splitscreen_8h_source.html b/skybox__and__splitscreen_8h_source.html index a2ba461d6..3d1f3c334 100644 --- a/skybox__and__splitscreen_8h_source.html +++ b/skybox__and__splitscreen_8h_source.html @@ -169,52 +169,52 @@ $(function(){initNavTree('skybox__and__splitscreen_8h_source.html',''); initResi
    59#endif
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    gbi.h
    -
    render_player_one_1p_screen
    void render_player_one_1p_screen(void)
    Definition skybox_and_splitscreen.c:754
    -
    func_802A53A4
    void func_802A53A4(void)
    Definition skybox_and_splitscreen.c:645
    -
    func_802A5004
    void func_802A5004(void)
    Definition skybox_and_splitscreen.c:576
    +
    render_player_one_1p_screen
    void render_player_one_1p_screen(void)
    Definition skybox_and_splitscreen.c:757
    +
    func_802A53A4
    void func_802A53A4(void)
    Definition skybox_and_splitscreen.c:648
    +
    func_802A5004
    void func_802A5004(void)
    Definition skybox_and_splitscreen.c:579
    func_802A487C
    void func_802A487C(Vtx *, struct UnkStruct_800DC5EC *, s32, s32, f32 *)
    -
    func_802A4D18
    void func_802A4D18(void)
    Definition skybox_and_splitscreen.c:488
    -
    func_802A4EF4
    void func_802A4EF4(void)
    Definition skybox_and_splitscreen.c:553
    -
    func_802A450C
    void func_802A450C(Vtx *)
    Definition skybox_and_splitscreen.c:354
    +
    func_802A4D18
    void func_802A4D18(void)
    Definition skybox_and_splitscreen.c:491
    +
    func_802A4EF4
    void func_802A4EF4(void)
    Definition skybox_and_splitscreen.c:556
    +
    func_802A450C
    void func_802A450C(Vtx *)
    Definition skybox_and_splitscreen.c:357
    func_802A39E0
    void func_802A39E0(struct UnkStruct_800DC5EC *)
    Definition skybox_and_splitscreen.c:153
    init_rdp
    void init_rdp(void)
    Definition skybox_and_splitscreen.c:215
    func_802A40D4
    void func_802A40D4(void)
    Definition skybox_and_splitscreen.c:241
    -
    func_802A5678
    void func_802A5678(void)
    Definition skybox_and_splitscreen.c:700
    -
    copy_framebuffer
    void copy_framebuffer(s32, s32, s32, s32, u16 *, u16 *)
    Definition skybox_and_splitscreen.c:1342
    +
    func_802A5678
    void func_802A5678(void)
    Definition skybox_and_splitscreen.c:703
    +
    copy_framebuffer
    void copy_framebuffer(s32, s32, s32, s32, u16 *, u16 *)
    Definition skybox_and_splitscreen.c:1345
    func_802A4A0C
    void func_802A4A0C(Vtx *, struct UnkStruct_800DC5EC *, s32, s32, f32 *)
    func_802A40CC
    void func_802A40CC(void)
    Definition skybox_and_splitscreen.c:240
    -
    render_player_four_3p_4p_screen
    void render_player_four_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1211
    -
    render_player_two_3p_4p_screen
    void render_player_two_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1102
    -
    func_802A74BC
    void func_802A74BC(void)
    Definition skybox_and_splitscreen.c:1274
    +
    render_player_four_3p_4p_screen
    void render_player_four_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1214
    +
    render_player_two_3p_4p_screen
    void render_player_two_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1105
    +
    func_802A74BC
    void func_802A74BC(void)
    Definition skybox_and_splitscreen.c:1277
    set_viewport2
    s32 set_viewport2(void)
    Definition skybox_and_splitscreen.c:244
    func_802A38B4
    void func_802A38B4(void)
    Definition skybox_and_splitscreen.c:118
    -
    func_802A51D4
    void func_802A51D4(void)
    Definition skybox_and_splitscreen.c:611
    -
    func_802A54A8
    void func_802A54A8(void)
    Definition skybox_and_splitscreen.c:666
    +
    func_802A51D4
    void func_802A51D4(void)
    Definition skybox_and_splitscreen.c:614
    +
    func_802A54A8
    void func_802A54A8(void)
    Definition skybox_and_splitscreen.c:669
    func_802A40DC
    void func_802A40DC(void)
    Definition skybox_and_splitscreen.c:242
    func_802A40BC
    void func_802A40BC(void)
    Definition skybox_and_splitscreen.c:238
    func_802A4300
    void func_802A4300(void)
    Definition skybox_and_splitscreen.c:270
    func_802A40AC
    void func_802A40AC(void)
    Definition skybox_and_splitscreen.c:236
    func_802A40B4
    void func_802A40B4(void)
    Definition skybox_and_splitscreen.c:237
    -
    func_802A7940
    void func_802A7940(void)
    Definition skybox_and_splitscreen.c:1380
    +
    func_802A7940
    void func_802A7940(void)
    Definition skybox_and_splitscreen.c:1383
    func_802A3730
    void func_802A3730(struct UnkStruct_800DC5EC *)
    Definition skybox_and_splitscreen.c:71
    -
    render_player_three_3p_4p_screen
    void render_player_three_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1156
    -
    func_802A52BC
    void func_802A52BC(void)
    Definition skybox_and_splitscreen.c:628
    +
    render_player_three_3p_4p_screen
    void render_player_three_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1159
    +
    func_802A52BC
    void func_802A52BC(void)
    Definition skybox_and_splitscreen.c:631
    set_viewport
    void set_viewport(void)
    Definition skybox_and_splitscreen.c:251
    -
    render_player_two_2p_screen_vertical
    void render_player_two_2p_screen_vertical(void)
    Definition skybox_and_splitscreen.c:875
    +
    render_player_two_2p_screen_vertical
    void render_player_two_2p_screen_vertical(void)
    Definition skybox_and_splitscreen.c:878
    D_802B8880
    Vp D_802B8880[]
    Definition skybox_and_splitscreen.c:23
    -
    render_player_one_2p_screen_vertical
    void render_player_one_2p_screen_vertical(void)
    Definition skybox_and_splitscreen.c:814
    -
    func_802A50EC
    void func_802A50EC(void)
    Definition skybox_and_splitscreen.c:594
    +
    render_player_one_2p_screen_vertical
    void render_player_one_2p_screen_vertical(void)
    Definition skybox_and_splitscreen.c:817
    +
    func_802A50EC
    void func_802A50EC(void)
    Definition skybox_and_splitscreen.c:597
    select_framebuffer
    void select_framebuffer(void)
    Definition skybox_and_splitscreen.c:260
    func_802A40C4
    void func_802A40C4(void)
    Definition skybox_and_splitscreen.c:239
    func_802A38AC
    void func_802A38AC(void)
    Definition skybox_and_splitscreen.c:114
    -
    render_player_one_2p_screen_horizontal
    void render_player_one_2p_screen_horizontal(void)
    Definition skybox_and_splitscreen.c:933
    +
    render_player_one_2p_screen_horizontal
    void render_player_one_2p_screen_horizontal(void)
    Definition skybox_and_splitscreen.c:936
    func_802A40A4
    void func_802A40A4(void)
    Definition skybox_and_splitscreen.c:235
    -
    render_player_one_3p_4p_screen
    void render_player_one_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1048
    -
    func_802A5760
    void func_802A5760(void)
    Definition skybox_and_splitscreen.c:719
    -
    func_802A5590
    void func_802A5590(void)
    Definition skybox_and_splitscreen.c:683
    -
    render_player_two_2p_screen_horizontal
    void render_player_two_2p_screen_horizontal(void)
    Definition skybox_and_splitscreen.c:991
    +
    render_player_one_3p_4p_screen
    void render_player_one_3p_4p_screen(void)
    Definition skybox_and_splitscreen.c:1051
    +
    func_802A5760
    void func_802A5760(void)
    Definition skybox_and_splitscreen.c:722
    +
    func_802A5590
    void func_802A5590(void)
    Definition skybox_and_splitscreen.c:686
    +
    render_player_two_2p_screen_horizontal
    void render_player_two_2p_screen_horizontal(void)
    Definition skybox_and_splitscreen.c:994
    init_z_buffer
    void init_z_buffer(void)
    Definition skybox_and_splitscreen.c:197
    -
    func_802A7728
    void func_802A7728(void)
    Definition skybox_and_splitscreen.c:1357
    +
    func_802A7728
    void func_802A7728(void)
    Definition skybox_and_splitscreen.c:1360
    UnkStruct_800DC5EC
    Definition types.h:54
    s32
    signed int s32
    Definition ultratypes.h:15
    f32
    float f32
    Definition ultratypes.h:33
    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 083e4d355..d6ee3f831 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,8 +115,8 @@ $(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?
    @@ -125,15 +125,15 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global BAD_RETURN (cmd)
    put this define in types.h or similar. Certain functions are marked as having return values, but do not actually return a value. This causes undefined behavior, which we'd rather avoid on modern GCC. This only impacts -O2 and can matter for both the function itself and functions that call it.
    Global clear_framebuffer (s32)
    -
    Why did void* work for matching
    +
    Why did void* work for matching
    Global D_800E43B0 []
    unused?
    Global D_8018D9B0
    Move gGfxPool out of main.h
    Global d_course_banshee_boardwalk_dl_0 []
    -
    Replace addresses with variables
    -
    Global d_course_big_donut_dl []
    Replace addresses with variables
    +
    Global d_course_big_donut_dl []
    +
    Replace addresses with variables
    Global d_course_bowsers_castle_dl_0 []
    Replace addresses with variables
    Global d_course_dks_jungle_parkway_dl_0 []
    @@ -157,13 +157,13 @@ $(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?

    @@ -189,11 +189,11 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800CBC24 (void)
    clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100
    Global func_80282D90 (struct CinematicCamera *, struct struct_80286A04 *, struct struct_80286A04 *, s32)
    -
    Cast to normal Camera? Or from CinematicCamera?
    +
    Cast to normal Camera? Or from CinematicCamera?
    Global func_8028336C (UNUSED struct CinematicCamera *arg0, UNUSED Camera *camera)
    -
    Does this match as a return of s8?
    +
    Does this match as a return of s8?
    Global func_802846E4 (struct CinematicCamera *)
    -
    What does this even do?
    +
    What does this even do?
    Global func_8028F970 (void)
    increasing players past four would require increase this loop iterator.
    Global gen_random_item (s16 rank, s16 isCpu)
    @@ -215,11 +215,11 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global M_TASK_FLAG0
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    Global MTX_KART_POOL_SIZE
    -
    Verify with proper documentation
    +
    Verify with proper documentation
    Global MTX_SHADOW_POOL_SIZE
    -
    Verify with proper documentation
    +
    Verify with proper documentation
    Global new_actor (ActorInitParams *)
    -
    More indepth error checking/return value
    +
    More indepth error checking/return value
    Global Note::priority
    use macros or something instead.
    Global osContInit (OSMesgQueue *mq, u8 *bitpattern, OSContStatus *status)
    @@ -227,9 +227,9 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global osPfsDeleteFile (OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name)
    magic constant
    Global osPiStartDma (OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq)
    -
    name magic constants
    +
    name magic constants
    Global osRomBase
    -
    figure out why this is like this
    +
    figure out why this is like this
    Global osViBlack (u8 active)
    name magic constants
    Global osViSwapBuffer (void *vaddr)
    diff --git a/train_2render_8inc_8c_source.html b/train_2render_8inc_8c_source.html index e2f528a87..d30a9b772 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -403,35 +403,36 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    296 mtxf_translate(spE0, sp160);
    297 mtxf_multiplication(spA0, sp120, spE0);
    298
    -
    299 if (render_set_position(spA0, 3) == 0) { return; }
    +
    299 if (render_set_position(spA0, 3) == 0) { return; }
    300
    -
    301 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    302 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    301 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    302 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    303
    -
    304 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    -
    305 vec3f_set(sp160, 17.0f, 6.0f, -24.0f);
    -
    306 mtxf_translate(spE0, sp160);
    -
    307 mtxf_multiplication(spA0, sp120, spE0);
    +
    304 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    +
    305 vec3f_set(sp160, 17.0f, 6.0f, -24.0f);
    +
    306 mtxf_translate(spE0, sp160);
    +
    307 mtxf_multiplication(spA0, sp120, spE0);
    308
    -
    309 if (render_set_position(spA0, 3) == 0) { return; }
    +
    309 if (render_set_position(spA0, 3) == 0) { return; }
    310
    -
    311 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    312 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    311 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    312 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    313
    -
    314 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    -
    315 vec3f_set(sp160, -17.0f, 6.0f, -24.0f);
    -
    316 mtxf_translate(spE0, sp160);
    -
    317 mtxf_multiplication(spA0, sp120, spE0);
    +
    314 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    +
    315 vec3f_set(sp160, -17.0f, 6.0f, -24.0f);
    +
    316 mtxf_translate(spE0, sp160);
    +
    317 mtxf_multiplication(spA0, sp120, spE0);
    318
    -
    319 if (render_set_position(spA0, 3) == 0) { return; }
    +
    319 if (render_set_position(spA0, 3) == 0) { return; }
    320
    -
    321 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    322 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    323 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    321 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    322 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    323 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    324}
    camera1
    Camera * camera1
    Definition camera.c:22
    +
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    Vec3f
    f32 Vec3f[3]
    Definition common_structs.h:6
    Mat4
    f32 Mat4[4][4]
    Definition common_structs.h:16
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index 5cd934338..3641d3291 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -207,185 +207,185 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    118 arg1[3][1] = arg2->pos[1];
    119 arg1[3][2] = arg2->pos[2];
    120
    -
    121 if (render_set_position(arg1, 0) != 0) {
    -
    122 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    123 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree);
    +
    121 if (render_set_position(arg1, 0) != 0) {
    +
    122 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    123 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree);
    124 }
    125}
    126
    127// have all the properties of the tree
    -
    128void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    129 f32 temp_f0;
    -
    130 s16 temp_v0 = arg2->flags;
    +
    128void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    129 f32 temp_f0;
    +
    130 s16 temp_v0 = arg2->flags;
    131
    -
    132 if ((temp_v0 & 0x800) != 0) { return; }
    +
    132 if ((temp_v0 & 0x800) != 0) { return; }
    133
    -
    134 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    134 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    135
    -
    136 if (temp_f0 < 0.0f) { return; }
    +
    136 if (temp_f0 < 0.0f) { return; }
    137
    -
    138 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    138 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    139 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    140 }
    -
    141 arg1[3][0] = arg2->pos[0];
    -
    142 arg1[3][1] = arg2->pos[1];
    -
    143 arg1[3][2] = arg2->pos[2];
    +
    141 arg1[3][0] = arg2->pos[0];
    +
    142 arg1[3][1] = arg2->pos[1];
    +
    143 arg1[3][2] = arg2->pos[2];
    144
    -
    145 if (render_set_position(arg1, 0) != 0) {
    -
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    145 if (render_set_position(arg1, 0) != 0) {
    +
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    147 // Why is a TLUT being used a DL here? That makes no sense
    148 // Based on the TLUT being loaded above, this ought to be be another
    149 // tree related DL, presumably one found in a course other than Moo Moo farm
    150 // 0x0600FC70
    -
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    +
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    152 }
    153}
    154
    -
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    163 f32 temp_f0;
    -
    164 s16 temp_v0 = arg2->flags;
    +
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    163 f32 temp_f0;
    +
    164 s16 temp_v0 = arg2->flags;
    165
    -
    166 if ((temp_v0 & 0x800) != 0) { return; }
    +
    166 if ((temp_v0 & 0x800) != 0) { return; }
    167
    -
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    169
    -
    170 if (temp_f0 < 0.0f) { return; }
    +
    170 if (temp_f0 < 0.0f) { return; }
    171
    -
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    173 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    174 }
    -
    175 arg1[3][0] = arg2->pos[0];
    -
    176 arg1[3][1] = arg2->pos[1];
    -
    177 arg1[3][2] = arg2->pos[2];
    +
    175 arg1[3][0] = arg2->pos[0];
    +
    176 arg1[3][1] = arg2->pos[1];
    +
    177 arg1[3][2] = arg2->pos[2];
    178
    -
    179 if (render_set_position(arg1, 0) != 0) {
    -
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    +
    179 if (render_set_position(arg1, 0) != 0) {
    +
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    182 }
    183}
    184
    -
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    193 f32 temp_f0;
    -
    194 s16 temp_v0 = arg2->flags;
    +
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    193 f32 temp_f0;
    +
    194 s16 temp_v0 = arg2->flags;
    195
    -
    196 if ((temp_v0 & 0x800) != 0) { return; }
    +
    196 if ((temp_v0 & 0x800) != 0) { return; }
    197
    -
    198 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f);
    +
    198 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f);
    199
    -
    200 if (temp_f0 < 0.0f) { return; }
    +
    200 if (temp_f0 < 0.0f) { return; }
    201
    -
    202 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    202 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    203 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    204 }
    -
    205 arg1[3][0] = arg2->pos[0];
    -
    206 arg1[3][1] = arg2->pos[1];
    -
    207 arg1[3][2] = arg2->pos[2];
    +
    205 arg1[3][0] = arg2->pos[0];
    +
    206 arg1[3][1] = arg2->pos[1];
    +
    207 arg1[3][2] = arg2->pos[2];
    208
    -
    209 if (render_set_position(arg1, 0) != 0) {
    -
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    211 gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
    +
    209 if (render_set_position(arg1, 0) != 0) {
    +
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    211 gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
    212 }
    213}
    214
    -
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    223 f32 temp_f0;
    -
    224 s16 temp_v0 = arg2->flags;
    +
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    223 f32 temp_f0;
    +
    224 s16 temp_v0 = arg2->flags;
    225
    -
    226 if ((temp_v0 & 0x800) != 0) { return; }
    +
    226 if ((temp_v0 & 0x800) != 0) { return; }
    227
    -
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    228 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    229
    -
    230 if (temp_f0 < 0.0f) { return; }
    +
    230 if (temp_f0 < 0.0f) { return; }
    231
    -
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    232 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    233 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    234 }
    -
    235 arg1[3][0] = arg2->pos[0];
    -
    236 arg1[3][1] = arg2->pos[1];
    -
    237 arg1[3][2] = arg2->pos[2];
    +
    235 arg1[3][0] = arg2->pos[0];
    +
    236 arg1[3][1] = arg2->pos[1];
    +
    237 arg1[3][2] = arg2->pos[2];
    238
    -
    239 if (render_set_position(arg1, 0) != 0) {
    -
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    +
    239 if (render_set_position(arg1, 0) != 0) {
    +
    240 gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
    241 }
    242}
    243
    -
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    252 f32 temp_f0;
    -
    253 s16 temp_v0 = arg2->flags;
    +
    251void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    252 f32 temp_f0;
    +
    253 s16 temp_v0 = arg2->flags;
    254
    -
    255 if ((temp_v0 & 0x800) != 0) { return; }
    +
    255 if ((temp_v0 & 0x800) != 0) { return; }
    256
    -
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    257 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    258
    -
    259 if (temp_f0 < 0.0f) { return; }
    +
    259 if (temp_f0 < 0.0f) { return; }
    260
    -
    261 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    261 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    262 func_8029794C(arg2->pos, arg2->rot, 1.0f);
    263 }
    -
    264 arg1[3][0] = arg2->pos[0];
    -
    265 arg1[3][1] = arg2->pos[1];
    -
    266 arg1[3][2] = arg2->pos[2];
    +
    264 arg1[3][0] = arg2->pos[0];
    +
    265 arg1[3][1] = arg2->pos[1];
    +
    266 arg1[3][2] = arg2->pos[2];
    267
    -
    268 if (render_set_position(arg1, 0) != 0) {
    -
    269 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
    +
    268 if (render_set_position(arg1, 0) != 0) {
    +
    269 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
    270 }
    271}
    272
    -
    280void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    281 f32 temp_f0;
    -
    282 s16 temp_v0 = arg2->flags;
    +
    280void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    281 f32 temp_f0;
    +
    282 s16 temp_v0 = arg2->flags;
    283
    -
    284 if ((temp_v0 & 0x800) != 0) { return; }
    +
    284 if ((temp_v0 & 0x800) != 0) { return; }
    285
    -
    286 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    286 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    287
    -
    288 if (temp_f0 < 0.0f) { return; }
    +
    288 if (temp_f0 < 0.0f) { return; }
    289
    -
    290 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    290 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    291 func_8029794C(arg2->pos, arg2->rot, 1.0f);
    292 }
    -
    293 arg1[3][0] = arg2->pos[0];
    -
    294 arg1[3][1] = arg2->pos[1];
    -
    295 arg1[3][2] = arg2->pos[2];
    +
    293 arg1[3][0] = arg2->pos[0];
    +
    294 arg1[3][1] = arg2->pos[1];
    +
    295 arg1[3][2] = arg2->pos[2];
    296
    -
    297 if (render_set_position(arg1, 0) != 0) {
    -
    298 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
    +
    297 if (render_set_position(arg1, 0) != 0) {
    +
    298 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
    299 }
    300}
    301
    -
    309void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    310 f32 temp_f0;
    -
    311 s16 temp_v0 = arg2->flags;
    +
    309void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    310 f32 temp_f0;
    +
    311 s16 temp_v0 = arg2->flags;
    312
    -
    313 if ((temp_v0 & 0x800) != 0) { return; }
    +
    313 if ((temp_v0 & 0x800) != 0) { return; }
    314
    -
    315 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    315 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    316
    -
    317 if (temp_f0 < 0.0f) { return; }
    +
    317 if (temp_f0 < 0.0f) { return; }
    318
    -
    319 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    +
    319 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 40000.0f)) {
    320 func_8029794C(arg2->pos, arg2->rot, 0.80000001f);
    321 }
    -
    322 arg1[3][0] = arg2->pos[0];
    -
    323 arg1[3][1] = arg2->pos[1];
    -
    324 arg1[3][2] = arg2->pos[2];
    +
    322 arg1[3][0] = arg2->pos[0];
    +
    323 arg1[3][1] = arg2->pos[1];
    +
    324 arg1[3][2] = arg2->pos[2];
    325
    -
    326 if (render_set_position(arg1, 0) != 0) {
    -
    327 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
    +
    326 if (render_set_position(arg1, 0) != 0) {
    +
    327 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
    328 }
    329}
    @@ -394,6 +394,7 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    all_course_data.h
    d_course_bowsers_castle_dl_bush
    Gfx d_course_bowsers_castle_dl_bush[]
    Definition course_data.c:3957
    camera1
    Camera * camera1
    Definition camera.c:22
    +
    gCourseMaxZ
    s16 gCourseMaxZ
    Definition code_800029B0.c:92
    common_data.h
    common_tlut_trees_import
    u16 common_tlut_trees_import[]
    Mat4
    f32 Mat4[4][4]
    Definition common_structs.h:16
    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