diff --git a/actorsmenu.html b/actorsmenu.html index 94bcb85a7..a78d56ddd 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..a1f7e0e44 100644 --- a/actorsmenu.js +++ b/actorsmenu.js @@ -4,7 +4,7 @@ var actorsmenu = [ "Actors", "actors.html#actors", null ] ] ], [ "Objects", "objects.html", [ - [ "Objects", "objects.html#objects", null ] + [ "Objects", "objects.html#objects-1", null ] ] ], [ "Vehicles", "vehicles.html", [ [ "Trains", "vehicles.html#trains", null ], diff --git a/asm_funcs.svg b/asm_funcs.svg index 5d1911858..94f66d898 100644 --- a/asm_funcs.svg +++ b/asm_funcs.svg @@ -1 +1 @@ -WIP functionsWIP functions6363 \ No newline at end of file +WIP functionsWIP functions6161 \ No newline at end of file diff --git a/basics.js b/basics.js index 8888e6745..924c30ef2 100644 --- a/basics.js +++ b/basics.js @@ -25,8 +25,8 @@ var basics = [ "Menus", "controlflow.html#menus", null ], [ "Players", "controlflow.html#players", null ], [ "Actors", "controlflow.html#actors-1", null ], - [ "Objects", "controlflow.html#objects-1", null ], - [ "Courses", "controlflow.html#courses", [ + [ "Objects", "controlflow.html#objects", null ], + [ "Courses", "controlflow.html#courses-1", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], [ "UI & Other 2D Screen data", "controlflow.html#ui--other-2d-screen-data", null ], diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index 21dbc3a58..febbcc8d0 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -193,41 +193,41 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
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];
@@ -660,10 +660,8 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
Player::currentRank
s16 currentRank
Definition common_structs.h:272
Player::pos
Vec3f pos
Definition common_structs.h:279
ShellActor
Definition actor_types.h:302
-
ShellActor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:315
ShellActor::velocity
Vec3f velocity
Definition actor_types.h:324
ShellActor::pos
Vec3f pos
Definition actor_types.h:323
-
ShellActor::unk30
Collision unk30
Definition actor_types.h:325
ShellActor::pathIndex
u16 pathIndex
Definition actor_types.h:319
TrackWaypoint::posZ
s16 posZ
Definition waypoints.h:9
TrackWaypoint::posY
s16 posY
Definition waypoints.h:8
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 7a09e364e..859ad43a0 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:
@@ -1294,7 +1294,7 @@ Here is the caller graph for this function:
-
Todo
Does this match as a return of s8?
+
Todo
Does this match as a return of s8?
Here is the call graph for this function:
@@ -2366,7 +2366,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index 305cb43f9..4c4413038 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 87a7e4446..b7983e9e3 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__80091750_8c.html b/code__80091750_8c.html index 8d5c1548e..7fc254092 100644 --- a/code__80091750_8c.html +++ b/code__80091750_8c.html @@ -303,6 +303,10 @@ Functions   Gfx * func_80095BD0 (Gfx *displayListHead, u8 *arg1, f32 arg2, f32 arg3, u32 arg4, u32 arg5, f32 arg6, f32 arg7)   +Gfx * func_80095E10 (Gfx *displayListHead, s8 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, u8 *argA, u32 argB, u32 argC) +  +Gfx * func_800963F0 (Gfx *displayListHead, s8 arg1, s32 arg2, s32 arg3, f32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 argA, s32 argB, u8 *argC, u32 argD, u32 argE) +  Gfx * func_80097A14 (Gfx *displayListHead, s8 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, u8 *arg8, u32 arg9, u32 argA)   Gfx * func_80098558 (Gfx *displayListHead, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5, u32 arg6, UNUSED s32 arg7, s32 arg8) @@ -311,8 +315,8 @@ Functions   Gfx * draw_box_fill (Gfx *displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 red, s32 green, s32 blue, s32 alpha)   -Gfx * draw_box (Gfx *displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 red, s32 green, s32 blue, s32 alpha) -  +Gfx * draw_box (Gfx *displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry, u32 red, u32 green, u32 blue, u32 alpha) +  Gfx * func_80098FC8 (Gfx *displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry)   void dma_copy_base_729a30 (u64 *arg0, size_t nbytes, void *vaddr) @@ -1148,6 +1152,8 @@ Variables   Unk_D_800E70A0 D_800E8600 []   +u8 D_0B002A00 [] +  const s8 D_800F0CA0 []   @@ -1292,8 +1298,8 @@ Here is the caller graph for this function:
- -

◆ draw_box()

+ +

◆ draw_box()

@@ -1326,34 +1332,34 @@ Here is the caller graph for this function:
- s32 red, + u32 red, - s32 green, + u32 green, - s32 blue, + u32 blue, - s32 alpha ) + u32 alpha )
Here is the call graph for this function:
-
+
Here is the caller graph for this function:
-
+
@@ -3198,6 +3204,178 @@ Here is the caller graph for this function:
+ + + +

◆ func_80095E10()

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Gfx * func_80095E10 (Gfx * displayListHead,
s8 arg1,
s32 arg2,
s32 arg3,
s32 arg4,
s32 arg5,
s32 arg6,
s32 arg7,
s32 arg8,
s32 arg9,
u8 * argA,
u32 argB,
u32 argC )
+
+
+Here is the caller graph for this function:
+
+
+
+ +
+
+ +

◆ func_800963F0()

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Gfx * func_800963F0 (Gfx * displayListHead,
s8 arg1,
s32 arg2,
s32 arg3,
f32 arg4,
f32 arg5,
s32 arg6,
s32 arg7,
s32 arg8,
s32 arg9,
s32 argA,
s32 argB,
u8 * argC,
u32 argD,
u32 argE )
+
+
+Here is the caller graph for this function:
+
+
+
+
@@ -9411,6 +9589,28 @@ Here is the caller graph for this function:
+
+ + +

◆ D_0B002A00

+ +
+
+ + + + + +
+ + + + +
u8 D_0B002A00[]
+ 		+extern
+
+
diff --git a/code__80091750_8c.js b/code__80091750_8c.js index 783bc2388..07ca143e8 100644 --- a/code__80091750_8c.js +++ b/code__80091750_8c.js @@ -8,7 +8,7 @@ var code__80091750_8c = [ "convert_number_to_ascii", "code__80091750_8c.html#a87ff828f0134d42058cf8be2e012a8a3", null ], [ "dma_copy_base_729a30", "code__80091750_8c.html#a52ee4b4555f295e2e45eaa852db8ece7", null ], [ "dma_copy_base_7fa3c0", "code__80091750_8c.html#a8ed2c8990531f256c23e002e63f07265", null ], - [ "draw_box", "code__80091750_8c.html#a69d3c27f64f73ce88101239bfdd0d901", null ], + [ "draw_box", "code__80091750_8c.html#a4a3e73dfeae9dc0d77f213e77791181c", null ], [ "draw_box_fill", "code__80091750_8c.html#ada97fbf304c29275c91520ae4e904504", null ], [ "draw_flash_select_case", "code__80091750_8c.html#a780c45c1d76dfbecd6464fbc545a9936", null ], [ "draw_flash_select_case_fast", "code__80091750_8c.html#a28efc1e5b84f5ec2006cd7ff5fd6adec", null ], @@ -68,6 +68,8 @@ var code__80091750_8c = [ "func_800959F8", "code__80091750_8c.html#ae0fd5923ba70cf6939cd3fa8d09c1191", null ], [ "func_80095AE0", "code__80091750_8c.html#abc50baad10f275ad1d77cdec8c8eb549", null ], [ "func_80095BD0", "code__80091750_8c.html#a37eb021a953285ba504198ac6ca73a9a", null ], + [ "func_80095E10", "code__80091750_8c.html#aa921d52fc86ddeea7c16d5814fa2378e", null ], + [ "func_800963F0", "code__80091750_8c.html#af8fc2e6a847cf4b9d516729cc0a2e375", null ], [ "func_80097A14", "code__80091750_8c.html#a6aa04c603cd7b877a5009a97a0b41ed3", null ], [ "func_80098558", "code__80091750_8c.html#ab5c3c6089972f58c5616ea260b8b6831", null ], [ "func_800987D0", "code__80091750_8c.html#aef2b6b221f29f2caa6f68e11b3e7df34", null ], @@ -292,6 +294,7 @@ var code__80091750_8c = [ "write_dashes", "code__80091750_8c.html#a0a91d136dd3ef72cd4a4e1d1fed063f7", null ], [ "code_80091750_bss_pad2", "code__80091750_8c.html#a6b2e0b2bf020a4e729e881c1ee69dcd8", null ], [ "code_80091750_bss_padding0", "code__80091750_8c.html#ac47ba3cd851b5cb7781b241640a012c7", null ], + [ "D_0B002A00", "code__80091750_8c.html#a56eb5acdead82fb1152096626723229c", null ], [ "D_800E70A0", "code__80091750_8c.html#a23c443145e1ff12d71d7998c6fec8625", null ], [ "D_800E70E8", "code__80091750_8c.html#aa7df10ba8ef3f35523f9983bf20679ec", null ], [ "D_800E7108", "code__80091750_8c.html#a02725eac97d0c70af5637b7d0752b51d", null ], diff --git a/code__80091750_8c_a03380c2117a86e09d085765ed0022f68_cgraph.svg b/code__80091750_8c_a03380c2117a86e09d085765ed0022f68_cgraph.svg index 637c625c5..d7ce76f0b 100644 --- a/code__80091750_8c_a03380c2117a86e09d085765ed0022f68_cgraph.svg +++ b/code__80091750_8c_a03380c2117a86e09d085765ed0022f68_cgraph.svg @@ -48,7 +48,7 @@ + + diff --git a/code__80091750_8c_aa921d52fc86ddeea7c16d5814fa2378e_icgraph_org.svg b/code__80091750_8c_aa921d52fc86ddeea7c16d5814fa2378e_icgraph_org.svg new file mode 100644 index 000000000..8a70c2890 --- /dev/null +++ b/code__80091750_8c_aa921d52fc86ddeea7c16d5814fa2378e_icgraph_org.svg @@ -0,0 +1,444 @@ + + + + + + +func_80095E10 + + +Node1 + + +func_80095E10 + + + + + +Node2 + + +func_80097A14 + + + + + +Node1->Node2 + + + + + + + + +Node7 + + +func_8009BA74 + + + + + +Node1->Node7 + + + + + + + + +Node18 + + +func_8009C434 + + + + + +Node1->Node18 + + + + + + + + +Node3 + + +func_8009BC9C + + + + + +Node2->Node3 + + + + + + + + +Node4 + + +func_800A0FA4 + + + + + +Node3->Node4 + + + + + + + + +Node5 + + +func_800A12BC + + + + + +Node3->Node5 + + + + + + + + +Node6 + + +func_800A143C + + + + + +Node3->Node6 + + + + + + + + +Node7->Node4 + + + + + + + + +Node7->Node5 + + + + + + + + +Node7->Node6 + + + + + + + + +Node8 + + +func_800A08D8 + + + + + +Node7->Node8 + + + + + + + + +Node11 + + +func_800A0AD0 + + + + + +Node7->Node11 + + + + + + + + +Node12 + + +func_800A0DFC + + + + + +Node7->Node12 + + + + + + + + +Node13 + + +func_800A0EB8 + + + + + +Node7->Node13 + + + + + + + + +Node14 + + +func_800A11D0 + + + + + +Node7->Node14 + + + + + + + + +Node15 + + +func_800A1780 + + + + + +Node7->Node15 + + + + + + + + +Node16 + + +func_800A1924 + + + + + +Node7->Node16 + + + + + + + + +Node17 + + +func_800A8F48 + + + + + +Node7->Node17 + + + + + + + + +Node9 + + +func_800A095C + + + + + +Node8->Node9 + + + + + + + + +Node10 + + +func_800A0B80 + + + + + +Node8->Node10 + + + + + + + + +Node9->Node10 + + + + + + + + +Node19 + + +func_8009A6D4 + + + + + +Node18->Node19 + + + + + + + + +Node20 + + +func_8009A76C + + + + + +Node18->Node20 + + + + + + + + +Node20->Node16 + + + + + + + + +Node21 + + +func_800A1500 + + + + + +Node20->Node21 + + + + + + + + +Node22 + + +func_800A8EC0 + + + + + +Node20->Node22 + + + + + + + + diff --git a/code__80091750_8c_aad6e2045a5bc7182b7476c364f152717_cgraph.svg b/code__80091750_8c_aad6e2045a5bc7182b7476c364f152717_cgraph.svg index f0345f4b4..c7c0841b0 100644 --- a/code__80091750_8c_aad6e2045a5bc7182b7476c364f152717_cgraph.svg +++ b/code__80091750_8c_aad6e2045a5bc7182b7476c364f152717_cgraph.svg @@ -48,7 +48,7 @@ + diff --git a/code__80091750_8c_af8fc2e6a847cf4b9d516729cc0a2e375_icgraph_org.svg b/code__80091750_8c_af8fc2e6a847cf4b9d516729cc0a2e375_icgraph_org.svg new file mode 100644 index 000000000..25f9cc064 --- /dev/null +++ b/code__80091750_8c_af8fc2e6a847cf4b9d516729cc0a2e375_icgraph_org.svg @@ -0,0 +1,183 @@ + + + + + + +func_800963F0 + + +Node1 + + +func_800963F0 + + + + + +Node2 + + +func_8009C204 + + + + + +Node1->Node2 + + + + + + + + +Node5 + + +func_8009C434 + + + + + +Node1->Node5 + + + + + + + + +Node3 + + +func_800A15EC + + + + + +Node2->Node3 + + + + + + + + +Node4 + + +func_800A8F48 + + + + + +Node2->Node4 + + + + + + + + +Node6 + + +func_8009A6D4 + + + + + +Node5->Node6 + + + + + + + + +Node7 + + +func_8009A76C + + + + + +Node5->Node7 + + + + + + + + +Node8 + + +func_800A1500 + + + + + +Node7->Node8 + + + + + + + + +Node9 + + +func_800A1924 + + + + + +Node7->Node9 + + + + + + + + +Node10 + + +func_800A8EC0 + + + + + +Node7->Node10 + + + + + + + + diff --git a/code__80091750_8c_afa1d2583978658f8524340b7b94544b1_cgraph.svg b/code__80091750_8c_afa1d2583978658f8524340b7b94544b1_cgraph.svg index a14b75a54..548efe42d 100644 --- a/code__80091750_8c_afa1d2583978658f8524340b7b94544b1_cgraph.svg +++ b/code__80091750_8c_afa1d2583978658f8524340b7b94544b1_cgraph.svg @@ -48,7 +48,7 @@