diff --git a/actors.html b/actors.html index 45c9f94a7..a0d5282dc 100644 --- a/actors.html +++ b/actors.html @@ -103,7 +103,7 @@ $(function(){initNavTree('actors.html',''); initResizable(); });
How Actors Work
-

+

Actors

If you are familiar with oot or sm64 prepare to be very disappointed. Both games split actors into separate files. In an unorderly fashion, mk64 appears to place all actors in the same file save for the odd exception.

Example actor setup based on update_course_actors

// Loop through the actor list and run that particular actors behaviour.
diff --git a/actors_8c.html b/actors_8c.html index ba1a113d2..bcdbbfb8d 100644 --- a/actors_8c.html +++ b/actors_8c.html @@ -1565,7 +1565,7 @@ Here is the caller graph for this function:
-
Todo
Is this making the shell spin?
+
Todo
Is this making the shell spin?
Here is the call graph for this function:
diff --git a/actorsmenu.html b/actorsmenu.html index 94bcb85a7..f8807dd58 100644 --- a/actorsmenu.html +++ b/actorsmenu.html @@ -172,7 +172,7 @@ $(function(){initNavTree('actorsmenu.html',''); initResizable(); });

-

Actors Objects Vehicles Items

+

Actors Objects Vehicles Items

diff --git a/actorsmenu.js b/actorsmenu.js index 03d6a6bce..fdd93972e 100644 --- a/actorsmenu.js +++ b/actorsmenu.js @@ -1,7 +1,7 @@ var actorsmenu = [ [ "How Actors Work", "actors.html", [ - [ "Actors", "actors.html#actors", null ] + [ "Actors", "actors.html#actors-1", null ] ] ], [ "Objects", "objects.html", [ [ "Objects", "objects.html#objects", null ] diff --git a/banshee__boardwalk_2course__data_8c.html b/banshee__boardwalk_2course__data_8c.html index d5a1540af..30d3da56f 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 9112f3c77..3beca2c5d 100644 --- a/banshee__boardwalk_2course__data_8h.html +++ b/banshee__boardwalk_2course__data_8h.html @@ -716,7 +716,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/basics.js b/basics.js index 8888e6745..a784896a6 100644 --- a/basics.js +++ b/basics.js @@ -24,9 +24,9 @@ var basics = [ "Code Breakdown", "controlflow.html#code-breakdown", [ [ "Menus", "controlflow.html#menus", null ], [ "Players", "controlflow.html#players", null ], - [ "Actors", "controlflow.html#actors-1", null ], + [ "Actors", "controlflow.html#actors", null ], [ "Objects", "controlflow.html#objects-1", null ], - [ "Courses", "controlflow.html#courses", [ + [ "Courses", "controlflow.html#courses-1", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], [ "UI & Other 2D Screen data", "controlflow.html#ui--other-2d-screen-data", null ], diff --git a/big__donut_2course__data_8c.html b/big__donut_2course__data_8c.html index ffa832861..d3db75387 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 64eebcad5..be566b323 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 1be9027cb..f1354fbdc 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -202,83 +202,83 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
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;
+
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
+
95 shell->pos[2] = temp_f28;
+
96 shell->pathIndex = nextWaypoint;
97 } else {
-
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
-
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
-
100 temp_f26 = D_80164490[nextWaypoint].posZ;
+
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
100 temp_f26 = D_80164490[nextWaypoint].posZ;
101
-
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
-
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
-
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
+
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
+
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
+
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
105
-
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
-
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
-
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
+
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
+
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
+
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
109 }
110 }
111}
112
-
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
-
114 f32 x_velocity;
-
115 f32 z_velocity;
-
116 f32 xz_dist;
-
117 Vec3f newPosition;
+
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
+
114 f32 x_velocity;
+
115 f32 z_velocity;
+
116 f32 xz_dist;
+
117 Vec3f newPosition;
118
-
119 x_velocity = player->pos[0];
-
120 x_velocity -= shell->pos[0];
-
121 z_velocity = player->pos[2];
-
122 z_velocity -= shell->pos[2];
-
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
-
124 if (xz_dist == 0.0f) {
-
125 x_velocity = 0.0f;
-
126 z_velocity = 0.0f;
+
119 x_velocity = player->pos[0];
+
120 x_velocity -= shell->pos[0];
+
121 z_velocity = player->pos[2];
+
122 z_velocity -= shell->pos[2];
+
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
+
124 if (xz_dist == 0.0f) {
+
125 x_velocity = 0.0f;
+
126 z_velocity = 0.0f;
127 } else {
-
128 x_velocity /= xz_dist;
-
129 z_velocity /= xz_dist;
+
128 x_velocity /= xz_dist;
+
129 z_velocity /= xz_dist;
130 }
131
-
132 newPosition[0] = shell->pos[0];
-
133 newPosition[1] = shell->pos[1];
-
134 newPosition[2] = shell->pos[2];
-
135 shell->pos[0] += x_velocity;
-
136 shell->pos[1] -= 2.0f;
-
137 shell->pos[2] += z_velocity;
-
138 shell->velocity[0] = x_velocity;
-
139 shell->velocity[1] = -2.0f;
-
140 shell->velocity[2] = z_velocity;
+
132 newPosition[0] = shell->pos[0];
+
133 newPosition[1] = shell->pos[1];
+
134 newPosition[2] = shell->pos[2];
+
135 shell->pos[0] += x_velocity;
+
136 shell->pos[1] -= 2.0f;
+
137 shell->pos[2] += z_velocity;
+
138 shell->velocity[0] = x_velocity;
+
139 shell->velocity[1] = -2.0f;
+
140 shell->velocity[2] = z_velocity;
141
142 if (player->effects & BOO_EFFECT) {
-
143 destroy_destructable_actor((struct Actor *) shell);
+
143 destroy_destructable_actor((struct Actor *) shell);
144 } else {
-
145 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], newPosition[0], newPosition[1], newPosition[2]);
-
146 func_802B4E30((struct Actor *) shell);
-
147 func_802B4104(shell);
+
145 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], newPosition[0], newPosition[1], newPosition[2]);
+
146 func_802B4E30((struct Actor *) shell);
+
147 func_802B4104(shell);
148 }
149}
150
-
155s16 func_802B3FD0(Player *owner, struct ShellActor *shell) {
+
155s16 func_802B3FD0(Player *owner, struct ShellActor *shell) {
156 Player *player;
-
157 s32 playerIndex;
-
158 f32 playerToShellDistance;
+
157 s32 playerIndex;
+
158 f32 playerToShellDistance;
159 s16 playerId = -1;
-
160 f32 smallestDistance = 25000000.0f;
+
160 f32 smallestDistance = 25000000.0f;
161
-
162 for (playerIndex = 0; playerIndex < 4; playerIndex++) {
-
163 player = &gPlayers[playerIndex];
+
162 for (playerIndex = 0; playerIndex < 4; playerIndex++) {
+
163 player = &gPlayers[playerIndex];
164 if ((player->type & PLAYER_EXISTS) == 0) {continue;}
-
165 if (player == owner) {continue; }
-
166 if (gPlayerBalloonCount[playerIndex] < 0) { continue; }
+
165 if (player == owner) {continue; }
+
166 if (gPlayerBalloonCount[playerIndex] < 0) { continue; }
167 // func_802B51E8 is not quite a 3D distance function, it doubles (rather than squares) the Z difference of the positions
-
168 playerToShellDistance = func_802B51E8(player->pos, shell->pos);
-
169 if (playerToShellDistance < smallestDistance) {
-
170 smallestDistance = playerToShellDistance;
+
168 playerToShellDistance = func_802B51E8(player->pos, shell->pos);
+
169 if (playerToShellDistance < smallestDistance) {
+
170 smallestDistance = playerToShellDistance;
171 playerId = player - gPlayerOne;
172 }
173
@@ -289,24 +289,24 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
178
-
179void func_802B4104(struct ShellActor *shell) {
-
180 if ((shell->unk30.unk3C[0] < 0.0f) && ((shell->unk30.unk48[1] < 0.25f) || (shell->unk30.unk48[1] > -0.25f))) {
-
181 destroy_destructable_actor((struct Actor *) shell);
-
182 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
-
183 shell->flags |= 0x80;
-
184 } else if ((shell->unk30.unk3C[1] < 0.0f) && ((shell->unk30.unk54[1] < 0.25f) || (shell->unk30.unk54[1] < -0.25f))) {
-
185 destroy_destructable_actor((struct Actor *) shell);
-
186 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
-
187 shell->flags |= 0x80;
+
179void func_802B4104(struct ShellActor *shell) {
+
180 if ((shell->unk30.unk3C[0] < 0.0f) && ((shell->unk30.unk48[1] < 0.25f) || (shell->unk30.unk48[1] > -0.25f))) {
+
181 destroy_destructable_actor((struct Actor *) shell);
+
182 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
+
183 shell->flags |= 0x80;
+
184 } else if ((shell->unk30.unk3C[1] < 0.0f) && ((shell->unk30.unk54[1] < 0.25f) || (shell->unk30.unk54[1] < -0.25f))) {
+
185 destroy_destructable_actor((struct Actor *) shell);
+
186 func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
+
187 shell->flags |= 0x80;
188 }
189}
190
-
196void update_actor_red_blue_shell(struct ShellActor *shell) {
-
197 UNUSED f32 pad9;
+
196void update_actor_red_blue_shell(struct ShellActor *shell) {
+
197 UNUSED f32 pad9;
198 Player *player;
-
199 f32 temp_f0;
+
199 f32 temp_f0;
200 UNUSED f32 temp_f14;
201 f32 temp_f2;
202 s16 temp_v0;
@@ -643,14 +643,8 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
Z_TRIG
#define Z_TRIG
Definition os.h:398
SOUND_ARG_LOAD
#define SOUND_ARG_LOAD(sound_bank, byte2, byte3, sound_id)
Definition sounds.h:14
Actor
Definition actor_types.h:120
-
Actor::velocity
Vec3f velocity
Definition actor_types.h:130
-
Actor::flags
s16 flags
Definition actor_types.h:122
-
Actor::pos
Vec3f pos
Definition actor_types.h:129
-
Collision::unk3C
Vec3f unk3C
Definition common_structs.h:146
Collision::unk30
u16 unk30
Definition common_structs.h:139
Collision::unk3A
u16 unk3A
Definition common_structs.h:145
-
Collision::unk54
Vec3f unk54
Definition common_structs.h:148
-
Collision::unk48
Vec3f unk48
Definition common_structs.h:147
Controller
Definition common_structs.h:71
Controller::buttonDepressed
u16 buttonDepressed
Definition common_structs.h:76
Player
Definition common_structs.h:269
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 859ad43a0..8763d0b10 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -1007,7 +1007,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:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index 4c4413038..d0c3d4e03 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:
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},
}
gTexture64FBF4
u8 gTexture64FBF4[]
+
gTexture653DB0
u8 gTexture653DB0[]
gTexture67B864
u8 gTexture67B864[]
gTexture65315C
u8 gTexture65315C[]
gTexture679C04
u8 gTexture679C04[]
@@ -226,7 +227,6 @@ Variables
gTexture64619C
u8 gTexture64619C[]
gTextureSignBackside
u8 gTextureSignBackside[]
gTexture6774D8
u8 gTexture6774D8[]
-
gTexture653DB0
u8 gTexture653DB0[]
gTextureSignFallingRocks
u8 gTextureSignFallingRocks[]
gTexture647F4C
u8 gTexture647F4C[]
gTexture67DC20
u8 gTexture67DC20[]
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index 30c4c24c3..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 3b18f8e1b..72e5eb8c6 100644 --- a/code__80281780_8h.html +++ b/code__80281780_8h.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/controlflow.html b/controlflow.html index bb49c133d..1ccb95ce1 100644 --- a/controlflow.html +++ b/controlflow.html @@ -110,9 +110,9 @@ $(function(){initNavTree('controlflow.html',''); initResizable(); });
  • Segments
  • Code Breakdown
    • -
    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 60b54537b..f7e5c3f59 100644 --- a/main_8h.html +++ b/main_8h.html @@ -605,7 +605,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -634,7 +634,7 @@ Variables
    -
    Todo
    Verify with proper documentation
    +
    Todo
    Verify with proper documentation
    @@ -653,7 +653,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/navtreeindex2.js b/navtreeindex2.js index 6907ca66d..014dcc6bf 100644 --- a/navtreeindex2.js +++ b/navtreeindex2.js @@ -20,7 +20,7 @@ var NAVTREEINDEX2 = "actor__types_8h.html#affb5ffde510634c5c1e09a5b934d29c3":[8,0,2,3,20], "actor__types_8h_source.html":[8,0,2,3], "actors.html":[0,0], -"actors.html#actors":[0,0,0], +"actors.html#actors-1":[0,0,0], "actors_8c.html":[8,0,3,7,0], "actors_8c.html#a0239c06a587826a0319fce63214d3ae7":[8,0,3,7,0,25], "actors_8c.html#a047d32425b6ea73e667cb31548bdc8dd":[8,0,3,7,0,51], diff --git a/navtreeindex28.js b/navtreeindex28.js index 8d28c285e..e18832b52 100644 --- a/navtreeindex28.js +++ b/navtreeindex28.js @@ -191,10 +191,10 @@ var NAVTREEINDEX28 = "contramwrite_8c.html#a5a8e6638b28caf3b5faba67df76d099c":[8,0,3,6,34,1], "contramwrite_8c.html#ac0f1bb81601cedc5fc5868fc7e500b88":[8,0,3,6,34,0], "controlflow.html":[1,2], -"controlflow.html#actors-1":[1,2,4,2], +"controlflow.html#actors":[1,2,4,2], "controlflow.html#code-breakdown":[1,2,4], "controlflow.html#course-folder":[1,2,4,4,0], -"controlflow.html#courses":[1,2,4,4], +"controlflow.html#courses-1":[1,2,4,4], "controlflow.html#ending":[1,2,4,8], "controlflow.html#engine":[1,2,4,6], "controlflow.html#math":[1,2,4,7], diff --git a/navtreeindex29.js b/navtreeindex29.js index 3b9de3fe3..43b9454b5 100644 --- a/navtreeindex29.js +++ b/navtreeindex29.js @@ -199,7 +199,7 @@ var NAVTREEINDEX29 = "course__offsets_8h.html":[8,0,2,7], "course__offsets_8h_source.html":[8,0,2,7], "courses.html":[2,0], -"courses.html#courses-1":[2,0,0], +"courses.html#courses":[2,0,0], "coursesmenu.html":[2], "cow_2render_8inc_8c.html":[8,0,3,0,4,0], "cow_2render_8inc_8c.html#a3032e5759fffafb766e96e1991ab0350":[8,0,3,0,4,0,0], diff --git a/navtreeindex39.js b/navtreeindex39.js index f5530da32..1c685eb00 100644 --- a/navtreeindex39.js +++ b/navtreeindex39.js @@ -226,8 +226,8 @@ var NAVTREEINDEX39 = "frappe__snowland_2course__textures_8linkonly_8h_source.html":[8,0,0,7,6], "frappe__snowland_2course__vertices_8inc_8c.html":[8,0,0,7,7], "frappe__snowland_2course__vertices_8inc_8c.html#a1ec683eb9d6c6022a1131cd35cf8d7e8":[8,0,0,7,7,0], -"functions.html":[7,2,0], "functions.html":[7,2,0,0], +"functions.html":[7,2,0], "functions_b.html":[7,2,0,1], "functions_c.html":[7,2,0,2], "functions_d.html":[7,2,0,3], @@ -248,6 +248,6 @@ var NAVTREEINDEX39 = "functions_t.html":[7,2,0,18], "functions_u.html":[7,2,0,19], "functions_v.html":[7,2,0,20], -"functions_vars.html":[7,2,1,0], -"functions_vars.html":[7,2,1] +"functions_vars.html":[7,2,1], +"functions_vars.html":[7,2,1,0] }; diff --git a/navtreeindex42.js b/navtreeindex42.js index d1548aef4..7609350e9 100644 --- a/navtreeindex42.js +++ b/navtreeindex42.js @@ -13,14 +13,14 @@ 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], "globals_d.html":[8,1,0,4], -"globals_defs.html":[8,1,6], "globals_defs.html":[8,1,6,0], +"globals_defs.html":[8,1,6], "globals_defs_a.html":[8,1,6,1], "globals_defs_b.html":[8,1,6,2], "globals_defs_c.html":[8,1,6,3], diff --git a/navtreeindex68.js b/navtreeindex68.js index 2f953d1fe..0f3bfab6f 100644 --- a/navtreeindex68.js +++ b/navtreeindex68.js @@ -194,8 +194,8 @@ var NAVTREEINDEX68 = "load_8c.html#ae413774208e1213a9146b077715c7787":[8,0,3,1,10,45], "load_8c.html#ae4a9b501905301177af6c476cff02f7f":[8,0,3,1,10,40], "load_8c.html#ae61d39b44029939585c581369dc5a050":[8,0,3,1,10,2], -"load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,5], "load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,6], +"load_8c.html#ae6f2c925e86efb824ed050683f9b5113":[8,0,3,1,10,5], "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/piint_8h.html b/piint_8h.html index 2fad4b432..863e77753 100644 --- a/piint_8h.html +++ b/piint_8h.html @@ -786,7 +786,7 @@ Variables
    -
    Todo
    name
    +
    Todo
    name
    @@ -801,7 +801,7 @@ Variables
    -
    Todo
    name
    +
    Todo
    name
    @@ -816,7 +816,7 @@ Variables
    -
    Todo
    name
    +
    Todo
    name
    diff --git a/player__controller_8c.html b/player__controller_8c.html index 603a9641d..834d4f48e 100644 --- a/player__controller_8c.html +++ b/player__controller_8c.html @@ -763,7 +763,7 @@ Here is the caller graph for this function:
    -
    Todo
    make a proper match
    +
    Todo
    make a proper match
    Here is the call graph for this function:
    diff --git a/player__controller_8h.html b/player__controller_8h.html index 73b2a7f0f..6de169cd6 100644 --- a/player__controller_8h.html +++ b/player__controller_8h.html @@ -729,7 +729,7 @@ Here is the caller graph for this function:
    -
    Todo
    make a proper match
    +
    Todo
    make a proper match
    Here is the call graph for this function:
    diff --git a/search/all_3.js b/search/all_3.js index caabfdbb3..f1fbd7998 100644 --- a/search/all_3.js +++ b/search/all_3.js @@ -96,7 +96,7 @@ var searchData= ['actor_5fyoshi_5fegg_93',['ACTOR_YOSHI_EGG',['../actor__types_8h.html#a06ad3f803827afd107e7682c8c22d990a9a5b90d71f1d6c4a72fafd72661e0660',1,'actor_types.h']]], ['actorindex_94',['actorIndex',['../structunexpiredActors.html#a1e1419ce2f7577336dd49e2bd062ce17',1,'unexpiredActors::actorIndex'],['../structD__801642D8__entry.html#a0fbf587266ea6cf89ce5d066e14a0caa',1,'D_801642D8_entry::actorIndex'],['../structTrainCarStuff.html#a534b8b495eec302fd11a493758be8a80',1,'TrainCarStuff::actorIndex'],['../structPaddleBoatStuff.html#ad9b828347dae9adcc6c5d8a301faad06',1,'PaddleBoatStuff::actorIndex'],['../structVehicleStuff.html#aa2cb9651e75a3ddf588ecda2135ed1b8',1,'VehicleStuff::actorIndex']]], ['actorinitparams_95',['ActorInitParams',['../structActorInitParams.html',1,'']]], - ['actors_96',['Actors',['../actorsmenu.html',1,'Actors'],['../actors.html#actors',1,'Actors'],['../controlflow.html#actors-1',1,'Actors']]], + ['actors_96',['Actors',['../actorsmenu.html',1,'Actors'],['../controlflow.html#actors',1,'Actors'],['../actors.html#actors-1',1,'Actors']]], ['actors_20work_97',['How Actors Work',['../actors.html',1,'actorsmenu']]], ['actors_2ec_98',['actors.c',['../actors_8c.html',1,'']]], ['actors_2eh_99',['actors.h',['../actors_8h.html',1,'']]], diff --git a/search/all_5.js b/search/all_5.js index 09f29981c..713b9486c 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -594,7 +594,7 @@ var searchData= ['courseindex_591',['courseIndex',['../structstruct__8018EE10__entry.html#acee952c37d3917fd90809e58c6401e65',1,'struct_8018EE10_entry']]], ['courserecords_592',['courseRecords',['../structCupTimeTrialRecords.html#acf18ab0e69f90a2eefe248ef7090bd1c',1,'CupTimeTrialRecords']]], ['courses_593',['COURSES',['../mk64_8h.html#acf250ad4ca05ca435a61203c41d4ca88',1,'mk64.h']]], - ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses-1',1,'Courses'],['../controlflow.html#courses',1,'Courses']]], + ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses',1,'Courses'],['../controlflow.html#courses-1',1,'Courses']]], ['courses_2emd_595',['courses.md',['../courses_8md.html',1,'']]], ['coursesmenu_2emd_596',['coursesmenu.md',['../coursesmenu_8md.html',1,'']]], ['coursetable_597',['CourseTable',['../structCourseTable.html',1,'']]], diff --git a/todo.html b/todo.html index de35b670f..8edf69bd0 100644 --- a/todo.html +++ b/todo.html @@ -105,8 +105,8 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global __osGetId (OSPfs *pfs)
    -

    remove magic constant

    -

    loads of magic constants..

    +

    loads of magic constants..

    +

    remove magic constant

    Global __osPfsReleasePages (OSPfs *pfs, __OSInode *inode, u8 start_page, u16 *sum, u8 bank, __OSInodeUnit *last_page, int flag)
    magic number
    @@ -115,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)
    -

    fix magic number

    -

    remove magic constant

    +

    remove magic constant

    +

    fix magic number

    Global _course_mario_raceway_dl_mio0SegmentRomStart []
    These should probably be ptr's instead of array's?
    @@ -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 []
    @@ -163,7 +163,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global d_course_yoshi_valley_dl_0 []
    Replace addresses with variables
    Global debug_switch_character_ceremony_cutscene (void)
    -
    confirm this.
    +
    confirm this.
    Union du

    is it possible to remove them somehow?

    is it possible to remove them somehow?

    @@ -175,7 +175,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800100F0 (s32)
    Confirm this comment
    Global func_80028864 (Player *, Camera *, s8, s8)
    -
    make a proper match
    +
    make a proper match
    Global func_80046030 (u8 *tlut, u8 *texture, Vtx *arg2, s32 width, s32 arg4, s32 height)
    tlut/texture unconfirmed. This could be texture1 and texture2
    Global func_8004B7DC (s32 x, s32 y, s32 width, s32 height, s32 arg4, s32 arg5, s32 arg6)
    @@ -189,7 +189,7 @@ $(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?
    Global func_802846E4 (struct CinematicCamera *)
    @@ -205,19 +205,19 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global IO_WRITE (addr, data)
    These defines are from PR/rcp.h, but including that causes problems...
    Global LEO_CMD_TYPE_0
    -
    name
    +
    name
    Global LEO_CMD_TYPE_1
    -
    name
    +
    name
    Global LEO_CMD_TYPE_2
    -
    name
    +
    name
    Global load_surface_map (uintptr_t, struct UnkStruct_800DC5EC *)
    Should be Gfx*
    Global M_TASK_FLAG0
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    Global MTX_KART_POOL_SIZE
    -
    Verify with proper documentation
    -
    Global MTX_SHADOW_POOL_SIZE
    Verify with proper documentation
    +
    Global MTX_SHADOW_POOL_SIZE
    +
    Verify with proper documentation
    Global new_actor (ActorInitParams *)
    More indepth error checking/return value
    Global Note::priority
    @@ -237,7 +237,7 @@ $(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
    Global UPDATE_REG (reg, var)
    diff --git a/train_2render_8inc_8c_source.html b/train_2render_8inc_8c_source.html index 627ebebcb..55369cfb6 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -293,34 +293,34 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    188
    189 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    190 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    -
    191 mtxf_translate(spE0, sp160);
    -
    192 mtxf_multiplication(spA0, sp120, spE0);
    +
    191 mtxf_translate(spE0, sp160);
    +
    192 mtxf_multiplication(spA0, sp120, spE0);
    193
    -
    194 if (render_set_position(spA0, 3) == 0) { return; }
    +
    194 if (render_set_position(spA0, 3) == 0) { return; }
    195
    -
    196 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    197 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    196 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    197 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    198
    -
    199 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    -
    200 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    -
    201 mtxf_translate(spE0, sp160);
    -
    202 mtxf_multiplication(spA0, sp120, spE0);
    +
    199 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    +
    200 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    +
    201 mtxf_translate(spE0, sp160);
    +
    202 mtxf_multiplication(spA0, sp120, spE0);
    203
    -
    204 if (render_set_position(spA0, 3) == 0) { return; }
    -
    205 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    206 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    207 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    204 if (render_set_position(spA0, 3) == 0) { return; }
    +
    205 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    206 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    207 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    208}
    209
    -
    210void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
    -
    211 Mat4 sp120;
    -
    212 Vec3f sp160;
    -
    213 Mat4 spE0;
    -
    214 Mat4 spA0;
    +
    210void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
    +
    211 Mat4 sp120;
    +
    212 Vec3f sp160;
    +
    213 Mat4 spE0;
    +
    214 Mat4 spA0;
    215
    -
    216 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 2025.0f, gCameraZoom[camera - camera1], 9000000.0f);
    +
    216 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 2025.0f, gCameraZoom[camera - camera1], 9000000.0f);
    217
    218 if (temp_f0 < 0.0f) { return; }
    219
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index 33fb991ac..a720ca493 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -295,97 +295,97 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    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:23
    +
    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