diff --git a/actors_8c.html b/actors_8c.html index 057eb9ec7..6ec3f290c 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/asm_funcs.svg b/asm_funcs.svg index 8259ad04c..eb9569ed8 100644 --- a/asm_funcs.svg +++ b/asm_funcs.svg @@ -1 +1 @@ -WIP functionsWIP functions5757 \ No newline at end of file +WIP functionsWIP functions5656 \ No newline at end of file diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index c08016314..f0eb760cc 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -244,33 +244,33 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
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;
+
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++) {
+
162 for (playerIndex = 0; playerIndex < 4; playerIndex++) {
163 player = &gPlayers[playerIndex];
164 if ((player->type & PLAYER_EXISTS) == 0) {continue;}
165 if (player == owner) {continue; }
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 8763d0b10..37d0513c4 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 d0c3d4e03..b7553c0c9 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__800AF9B0_8c.html b/code__800AF9B0_8c.html index 51196f120..e28e3ccaf 100644 --- a/code__800AF9B0_8c.html +++ b/code__800AF9B0_8c.html @@ -134,8 +134,8 @@ Functions   void func_800AFC54 (Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4[3])   -void func_800AFE00 (Vtx *arg0, s16(*arg1)[3], s32 arg2, s32 arg3) -  +void func_800AFE00 (Vtx *arg0, Vec3s *arg1, s32 arg2, s32 arg3) +  void func_800AFF58 (Vtx *arg0)   @@ -294,8 +294,8 @@ Here is the caller graph for this function: - -

◆ func_800AFE00()

+ +

◆ func_800AFE00()

@@ -308,7 +308,7 @@ Here is the caller graph for this function:
- + @@ -325,7 +325,7 @@ Here is the caller graph for this function:
Here is the caller graph for this function:
-
+
diff --git a/code__800AF9B0_8c.js b/code__800AF9B0_8c.js index b838f0da2..9647dc6fe 100644 --- a/code__800AF9B0_8c.js +++ b/code__800AF9B0_8c.js @@ -4,7 +4,7 @@ var code__800AF9B0_8c = [ "func_800AF9B0", "code__800AF9B0_8c.html#aa14849d67fb7d26d11f85ac19898ac7f", null ], [ "func_800AF9E4", "code__800AF9B0_8c.html#ac03dc0f456a95cb26416c3763db6d0a3", null ], [ "func_800AFC54", "code__800AF9B0_8c.html#a28d3cfdd64233bb30c065e9d09b111c2", null ], - [ "func_800AFE00", "code__800AF9B0_8c.html#a2b03d1d2abc04cfb07a59e5b6f7cd80f", null ], + [ "func_800AFE00", "code__800AF9B0_8c.html#aac80dfeddfe200249e714e7d0fd88b00", null ], [ "func_800AFF58", "code__800AF9B0_8c.html#adfa304c28966a1ad52f7f7ec580d5498", null ], [ "D_800E8680", "code__800AF9B0_8c.html#ad6253d3309d61356d38a9edcdc25ceda", null ], [ "D_800E8688", "code__800AF9B0_8c.html#a7145a2f34fdb6fdd911f0ec64f24ff86", null ], diff --git a/code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph.map b/code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph.map similarity index 100% rename from code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph.map rename to code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph.map diff --git a/code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph.md5 b/code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph.md5 similarity index 100% rename from code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph.md5 rename to code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph.md5 diff --git a/code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph.svg b/code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph.svg similarity index 100% rename from code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph.svg rename to code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph.svg diff --git a/code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph_org.svg b/code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph_org.svg similarity index 100% rename from code__800AF9B0_8c_a2b03d1d2abc04cfb07a59e5b6f7cd80f_icgraph_org.svg rename to code__800AF9B0_8c_aac80dfeddfe200249e714e7d0fd88b00_icgraph_org.svg diff --git a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.map b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.map index 3138f15ca..ca470fa0d 100644 --- a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.map +++ b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.map @@ -2,6 +2,6 @@ - + diff --git a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.md5 b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.md5 index a3d962587..b30c0f537 100644 --- a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.md5 +++ b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.md5 @@ -1 +1 @@ -b05049e07fcd984f96e7b0c550243dbc \ No newline at end of file +36813538c925345857798264c695c00b \ No newline at end of file diff --git a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.svg b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.svg index 99b8073c0..d0d14966c 100644 --- a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.svg +++ b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph.svg @@ -48,7 +48,7 @@ Node3 - + func_800AFE00 diff --git a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph_org.svg b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph_org.svg index 2e4965ae0..0d9e4f30d 100644 --- a/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph_org.svg +++ b/code__800AF9B0_8c_adfa304c28966a1ad52f7f7ec580d5498_cgraph_org.svg @@ -38,7 +38,7 @@ Node3 - + func_800AFE00 diff --git a/code__80281780_8c.html b/code__80281780_8c.html index fa78335a5..30c4c24c3 100644 --- a/code__80281780_8c.html +++ b/code__80281780_8c.html @@ -164,7 +164,7 @@ Variables
s16(*) arg1[3], Vec3s * arg1,
-
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 72e5eb8c6..3b18f8e1b 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/doxygen_crawl.html b/doxygen_crawl.html index 9c3785dfa..5600c63cf 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -11,8 +11,8 @@ - + @@ -96,11 +96,11 @@ - + - + @@ -129,8 +129,8 @@ - + @@ -219,8 +219,8 @@ - + @@ -242,8 +242,8 @@ - + @@ -361,10 +361,10 @@ - + @@ -406,6 +406,7 @@ + @@ -431,10 +432,9 @@ - + - @@ -497,8 +497,8 @@ - + @@ -521,12 +521,12 @@ - + + - @@ -556,8 +556,8 @@ - + @@ -626,10 +626,10 @@ + - @@ -682,11 +682,11 @@ - - + + @@ -719,13 +719,13 @@ - + - + @@ -735,8 +735,8 @@ - + @@ -798,11 +798,11 @@ + - - + @@ -856,8 +856,8 @@ - + @@ -878,7 +878,6 @@ - @@ -893,6 +892,7 @@ + @@ -973,15 +973,15 @@ - - - + + + - + @@ -992,9 +992,9 @@ - + diff --git a/functions_vars_w.html b/functions_vars_w.html index b01d4347d..40f1108dd 100644 --- a/functions_vars_w.html +++ b/functions_vars_w.html @@ -125,7 +125,7 @@ $(function(){initNavTree('functions_vars_w.html',''); initResizable(); });
  • wheelRot : PaddleWheelBoat, TrainCar
  • width : MkTexture, OSViCommonRegs, printf_struct
  • windowSize : ReverbSettingsEU, SynthesisReverb
    • -
  • word : du, GameModePack
    • +
  • word : du, GameModePack
    • diff --git a/functions_w.html b/functions_w.html index 145a2994e..ef0d2168c 100644 --- a/functions_w.html +++ b/functions_w.html @@ -125,7 +125,7 @@ $(function(){initNavTree('functions_w.html',''); initResizable(); });
  • wheelRot : PaddleWheelBoat, TrainCar
  • width : MkTexture, OSViCommonRegs, printf_struct
  • windowSize : ReverbSettingsEU, SynthesisReverb
    • -
  • word : du, GameModePack
    • +
  • word : du, GameModePack
    • diff --git a/game_progress.svg b/game_progress.svg index a8c5b2eef..3f3a83b69 100644 --- a/game_progress.svg +++ b/game_progress.svg @@ -1 +1 @@ -Game progressGame progress93.42%93.42% \ No newline at end of file +Game progressGame progress93.45%93.45% \ No newline at end of file diff --git a/globals_f.html b/globals_f.html index 5b97e6da9..241403771 100644 --- a/globals_f.html +++ b/globals_f.html @@ -1830,7 +1830,7 @@ $(function(){initNavTree('globals_f.html',''); initResizable(); });
  • func_800AF9B0() : code_800AF9B0.c, code_800AF9B0.h
  • func_800AF9E4() : code_800AF9B0.c
  • func_800AFC54() : code_800AF9B0.c
    • -
  • func_800AFE00() : code_800AF9B0.c
    • +
  • func_800AFE00() : code_800AF9B0.c
  • func_800AFF58() : code_800AF9B0.c
  • func_800B0004() : code_800AF9B0.h
  • func_800B28C8() : menus.c, menus.h
    • diff --git a/globals_func_f.html b/globals_func_f.html index a2f2916e1..318da95c2 100644 --- a/globals_func_f.html +++ b/globals_func_f.html @@ -1776,7 +1776,7 @@ $(function(){initNavTree('globals_func_f.html',''); initResizable(); });
  • func_800AF9B0() : code_800AF9B0.c, code_800AF9B0.h
  • func_800AF9E4() : code_800AF9B0.c
  • func_800AFC54() : code_800AF9B0.c
    • -
  • func_800AFE00() : code_800AF9B0.c
    • +
  • func_800AFE00() : code_800AF9B0.c
  • func_800AFF58() : code_800AF9B0.c
  • func_800B0004() : code_800AF9B0.h
  • func_800B28C8() : menus.c, menus.h
    • 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 98545213c..ee77f5fcc 100644 --- a/main_8c.html +++ b/main_8c.html @@ -572,7 +572,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 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/md_docs_2doxygen__syms.html b/md_docs_2doxygen__syms.html index 2fac4c9fd..4c1297080 100644 --- a/md_docs_2doxygen__syms.html +++ b/md_docs_2doxygen__syms.html @@ -4410,7 +4410,7 @@ Memory Addresses func_800AFC54 0x800AFC54 -func_800AFE00 0x800AFE00 +func_800AFE00 0x800AFE00 func_800AFF58 0x800AFF58 diff --git a/navtreeindex131.js b/navtreeindex131.js index b96336a89..08a6c5fdb 100644 --- a/navtreeindex131.js +++ b/navtreeindex131.js @@ -141,10 +141,10 @@ var NAVTREEINDEX131 = "union____OSfp.html#aa1b92e78cc62bfa671d55b4f08a42f52":[7,0,8,1], "union____OSfp.html#aad7ba28b3e6aa7495eb9f9e73f5bd064":[7,0,8,0], "uniondu.html":[7,0,75], -"uniondu.html#a06928fe4577a2d3ae425f6df73fbef26":[7,0,75,3], +"uniondu.html#a06928fe4577a2d3ae425f6df73fbef26":[7,0,75,4], "uniondu.html#a1350494c6a09b425b926250e9b10b5c9":[7,0,75,2], "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0":[7,0,75,0], -"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,4], +"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,3], "uniondu.html#ac24ce7d9a78b6632965424039e4362c3":[7,0,75,1], "unionfu.html":[7,0,81], "unionfu.html#a6aed0becf5f2fa3047085638c8516b26":[7,0,81,2], diff --git a/navtreeindex26.js b/navtreeindex26.js index 02d8b96e2..e2983812e 100644 --- a/navtreeindex26.js +++ b/navtreeindex26.js @@ -135,11 +135,11 @@ var NAVTREEINDEX26 = "code__80091750_8h_source.html":[8,0,3,30], "code__800AF9B0_8c.html":[8,0,3,31], "code__800AF9B0_8c.html#a28d3cfdd64233bb30c065e9d09b111c2":[8,0,3,31,3], -"code__800AF9B0_8c.html#a2b03d1d2abc04cfb07a59e5b6f7cd80f":[8,0,3,31,4], "code__800AF9B0_8c.html#a3a42b5abffe2c80f954e0efe13d436c6":[8,0,3,31,10], "code__800AF9B0_8c.html#a7145a2f34fdb6fdd911f0ec64f24ff86":[8,0,3,31,7], "code__800AF9B0_8c.html#a9ada41ff378d23569643b242db363489":[8,0,3,31,9], "code__800AF9B0_8c.html#aa14849d67fb7d26d11f85ac19898ac7f":[8,0,3,31,1], +"code__800AF9B0_8c.html#aac80dfeddfe200249e714e7d0fd88b00":[8,0,3,31,4], "code__800AF9B0_8c.html#ab763bfc357b753a48dd90dcd65b692d6":[8,0,3,31,12], "code__800AF9B0_8c.html#ac03dc0f456a95cb26416c3763db6d0a3":[8,0,3,31,2], "code__800AF9B0_8c.html#ac3644f84794a8bfdacf39c4b2c2495fc":[8,0,3,31,0], diff --git a/navtreeindex40.js b/navtreeindex40.js index eebc321c9..e56424873 100644 --- a/navtreeindex40.js +++ b/navtreeindex40.js @@ -1,7 +1,7 @@ var NAVTREEINDEX40 = { -"functions_vars.html":[7,2,1], "functions_vars.html":[7,2,1,0], +"functions_vars.html":[7,2,1], "functions_vars_b.html":[7,2,1,1], "functions_vars_c.html":[7,2,1,2], "functions_vars_d.html":[7,2,1,3], diff --git a/navtreeindex68.js b/navtreeindex68.js index 50aa19ce0..89ca5829a 100644 --- a/navtreeindex68.js +++ b/navtreeindex68.js @@ -196,8 +196,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/nonmatching_funcs.svg b/nonmatching_funcs.svg index 20edb9f2e..c238def04 100644 --- a/nonmatching_funcs.svg +++ b/nonmatching_funcs.svg @@ -1 +1 @@ -NON_MATCHING functionsNON_MATCHING functions5353 \ No newline at end of file +NON_MATCHING functionsNON_MATCHING functions5252 \ No newline at end of file diff --git a/objects_8h.html b/objects_8h.html index b1d25ca81..c252417ed 100644 --- a/objects_8h.html +++ b/objects_8h.html @@ -1964,7 +1964,7 @@ Variables
    -
    Todo
    fix this extern
    +
    Todo
    fix this extern
    diff --git a/osPiStartDma_8c.html b/osPiStartDma_8c.html index 9de6d0159..90bb16405 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/osViBlack_8c.html b/osViBlack_8c.html index 7b262f0f7..97773127e 100644 --- a/osViBlack_8c.html +++ b/osViBlack_8c.html @@ -138,7 +138,7 @@ Variables
    -
    Todo
    name magic constants
    +
    Todo
    name magic constants
    Here is the call graph for this function:
    diff --git a/osViSwapBuffer_8c.html b/osViSwapBuffer_8c.html index 71496921e..83e1e5f06 100644 --- a/osViSwapBuffer_8c.html +++ b/osViSwapBuffer_8c.html @@ -138,7 +138,7 @@ Variables
    -
    Todo
    figure out what this flag means
    +
    Todo
    figure out what this flag means
    Here is the call graph for this function:
    diff --git a/os__pi_8h.html b/os__pi_8h.html index 6e2c0bcb1..86b5884ac 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/os__vi_8h.html b/os__vi_8h.html index 6e0309a0c..430115be3 100644 --- a/os__vi_8h.html +++ b/os__vi_8h.html @@ -872,7 +872,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:
    @@ -990,7 +990,7 @@ Here is the caller graph for this function:
    -
    Todo
    figure out what this flag means
    +
    Todo
    figure out what this flag means
    Here is the call graph for this function:
    diff --git a/player__controller_8c.html b/player__controller_8c.html index 834d4f48e..603a9641d 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 6de169cd6..73b2a7f0f 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/podium__ceremony__actors_8c.html b/podium__ceremony__actors_8c.html index b0983765b..f1b45189b 100644 --- a/podium__ceremony__actors_8c.html +++ b/podium__ceremony__actors_8c.html @@ -595,7 +595,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 68ed10cc8..59a0378d8 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/race__logic_8c.html b/race__logic_8c.html index 6e79ad3fd..4d1b251c2 100644 --- a/race__logic_8c.html +++ b/race__logic_8c.html @@ -703,7 +703,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/race__logic_8h.html b/race__logic_8h.html index a98eacff5..44e87ce0a 100644 --- a/race__logic_8h.html +++ b/race__logic_8h.html @@ -643,7 +643,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/search/all_19.js b/search/all_19.js index 08df9ff20..10a5de2d1 100644 --- a/search/all_19.js +++ b/search/all_19.js @@ -38,7 +38,7 @@ var searchData= ['windows_35',['Windows',['../compiling.html#windows',1,'']]], ['windowsize_36',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], ['wood_5fbridge_37',['WOOD_BRIDGE',['../mk64_8h.html#a5344f2bdca4f9506c40f044e08ea8c98a42cbce75b358c45ca5ca25e555dddc6c',1,'mk64.h']]], - ['word_38',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], + ['word_38',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], ['work_39',['How Actors Work',['../actors.html',1,'actorsmenu']]], ['wrapper_5fupdate_5fboos_40',['wrapper_update_boos',['../update__objects_8c.html#a33a1f1842134707236eefdf272dfdbae',1,'update_objects.c']]], ['write_5fdashes_41',['write_dashes',['../code__80091750_8c.html#a0a91d136dd3ef72cd4a4e1d1fed063f7',1,'write_dashes(char *buffer): code_80091750.c'],['../code__80091750_8h.html#af1655d98268206eb3b2490eb837deba5',1,'write_dashes(char *): code_80091750.c']]], diff --git a/search/all_8.js b/search/all_8.js index 5b3107fab..b75d60b83 100644 --- a/search/all_8.js +++ b/search/all_8.js @@ -1785,7 +1785,7 @@ var searchData= ['func_5f800af9b0_1782',['func_800AF9B0',['../code__800AF9B0_8c.html#aa14849d67fb7d26d11f85ac19898ac7f',1,'func_800AF9B0(void): code_800AF9B0.c'],['../code__800AF9B0_8h.html#aa14849d67fb7d26d11f85ac19898ac7f',1,'func_800AF9B0(void): code_800AF9B0.c']]], ['func_5f800af9e4_1783',['func_800AF9E4',['../code__800AF9B0_8c.html#ac03dc0f456a95cb26416c3763db6d0a3',1,'code_800AF9B0.c']]], ['func_5f800afc54_1784',['func_800AFC54',['../code__800AF9B0_8c.html#a28d3cfdd64233bb30c065e9d09b111c2',1,'code_800AF9B0.c']]], - ['func_5f800afe00_1785',['func_800AFE00',['../code__800AF9B0_8c.html#a2b03d1d2abc04cfb07a59e5b6f7cd80f',1,'code_800AF9B0.c']]], + ['func_5f800afe00_1785',['func_800AFE00',['../code__800AF9B0_8c.html#aac80dfeddfe200249e714e7d0fd88b00',1,'code_800AF9B0.c']]], ['func_5f800aff58_1786',['func_800AFF58',['../code__800AF9B0_8c.html#adfa304c28966a1ad52f7f7ec580d5498',1,'code_800AF9B0.c']]], ['func_5f800b0004_1787',['func_800B0004',['../code__800AF9B0_8h.html#a7963c15bc1960ff122a3f86b9e114872',1,'code_800AF9B0.h']]], ['func_5f800b28c8_1788',['func_800B28C8',['../menus_8c.html#ab5fff14dc492768fd5c750535597cae0',1,'func_800B28C8(void): menus.c'],['../menus_8h.html#ab5fff14dc492768fd5c750535597cae0',1,'func_800B28C8(void): menus.c']]], diff --git a/search/functions_6.js b/search/functions_6.js index c63a1ba0a..cb94800cf 100644 --- a/search/functions_6.js +++ b/search/functions_6.js @@ -1673,7 +1673,7 @@ var searchData= ['func_5f800af9b0_1670',['func_800AF9B0',['../code__800AF9B0_8c.html#aa14849d67fb7d26d11f85ac19898ac7f',1,'func_800AF9B0(void): code_800AF9B0.c'],['../code__800AF9B0_8h.html#aa14849d67fb7d26d11f85ac19898ac7f',1,'func_800AF9B0(void): code_800AF9B0.c']]], ['func_5f800af9e4_1671',['func_800AF9E4',['../code__800AF9B0_8c.html#ac03dc0f456a95cb26416c3763db6d0a3',1,'code_800AF9B0.c']]], ['func_5f800afc54_1672',['func_800AFC54',['../code__800AF9B0_8c.html#a28d3cfdd64233bb30c065e9d09b111c2',1,'code_800AF9B0.c']]], - ['func_5f800afe00_1673',['func_800AFE00',['../code__800AF9B0_8c.html#a2b03d1d2abc04cfb07a59e5b6f7cd80f',1,'code_800AF9B0.c']]], + ['func_5f800afe00_1673',['func_800AFE00',['../code__800AF9B0_8c.html#aac80dfeddfe200249e714e7d0fd88b00',1,'code_800AF9B0.c']]], ['func_5f800aff58_1674',['func_800AFF58',['../code__800AF9B0_8c.html#adfa304c28966a1ad52f7f7ec580d5498',1,'code_800AF9B0.c']]], ['func_5f800b0004_1675',['func_800B0004',['../code__800AF9B0_8h.html#a7963c15bc1960ff122a3f86b9e114872',1,'code_800AF9B0.h']]], ['func_5f800b28c8_1676',['func_800B28C8',['../menus_8c.html#ab5fff14dc492768fd5c750535597cae0',1,'func_800B28C8(void): menus.c'],['../menus_8h.html#ab5fff14dc492768fd5c750535597cae0',1,'func_800B28C8(void): menus.c']]], diff --git a/search/variables_17.js b/search/variables_17.js index 4c70cb05d..05e5d32ae 100644 --- a/search/variables_17.js +++ b/search/variables_17.js @@ -25,6 +25,6 @@ var searchData= ['wheelrot_22',['wheelRot',['../structTrainCar.html#a3e4c6d1091b4cf5a1683496409bda622',1,'TrainCar::wheelRot'],['../structPaddleWheelBoat.html#a500f0d5169fa8601aaba11cf13514b28',1,'PaddleWheelBoat::wheelRot']]], ['width_23',['width',['../structprintf__struct.html#ad8c9b5c908f18b8933081ae4b8f19b3a',1,'printf_struct::width'],['../structMkTexture.html#a6064846bc000f2003938cd14d4e62ff6',1,'MkTexture::width'],['../structOSViCommonRegs.html#a36050d774fce0c7479165a54e61296aa',1,'OSViCommonRegs::width']]], ['windowsize_24',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], - ['word_25',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], + ['word_25',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], ['wut_26',['wut',['../sherbet__land_2course__data_8c.html#a9eeed027c0accdad88ef82b59706956f',1,'wut: course_data.c'],['../sherbet__land_2course__data_8h.html#a9eeed027c0accdad88ef82b59706956f',1,'wut: course_data.c']]] ]; diff --git a/seg_main_progress.svg b/seg_main_progress.svg index 9b5df9d41..fb08426b2 100644 --- a/seg_main_progress.svg +++ b/seg_main_progress.svg @@ -1 +1 @@ -Main progressMain progress91.75%91.75% \ No newline at end of file +Main progressMain progress91.79%91.79% \ No newline at end of file diff --git a/size_left.svg b/size_left.svg index 3a9a16295..91040de87 100644 --- a/size_left.svg +++ b/size_left.svg @@ -1 +1 @@ -Size leftSize left7552875528 \ No newline at end of file +Size leftSize left7518475184 \ No newline at end of file diff --git a/some__data_8c.html b/some__data_8c.html index 127be255e..fdbe0375a 100644 --- a/some__data_8c.html +++ b/some__data_8c.html @@ -2371,7 +2371,7 @@ Variables
    0xff25, 0xffed, 0x0320,
    0xffca, 0xfff8, 0x0270,
    }
    -
    Todo
    fix this extern
    +
    Todo
    fix this extern
    diff --git a/sounds_8h.html b/sounds_8h.html index 8a221b45d..d0d331ec9 100644 --- a/sounds_8h.html +++ b/sounds_8h.html @@ -419,7 +419,7 @@ Macros
    -
    Todo
    format like sm64 sounds.h
    +
    Todo
    format like sm64 sounds.h
    diff --git a/sptask_8h.html b/sptask_8h.html index ad064a3a7..53b6368e2 100644 --- a/sptask_8h.html +++ b/sptask_8h.html @@ -236,7 +236,7 @@ Macros
    -
    Todo
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    +
    Todo
    These defines shouldn't exist - PR/rcp.h has them properly defined (ultralib)
    diff --git a/toads__turnpike_2course__offsets_8c.html b/toads__turnpike_2course__offsets_8c.html index f9ca57c39..af6acbc59 100644 --- a/toads__turnpike_2course__offsets_8c.html +++ b/toads__turnpike_2course__offsets_8c.html @@ -943,7 +943,7 @@ Variables
    {gTexture65127C, 0x01AB, 0x0800, 0x0},
    {gTextureRoad5, 0x02B9, 0x1000, 0x0},
    {gTextureSignToadRed, 0x0610, 0x1000, 0x0},
    -
    {gTexture668228, 0x0130, 0x0800, 0x0},
    +
    {gTexture668228, 0x0130, 0x0800, 0x0},
    {0x00000000, 0x0000, 0x0000, 0x0},
    }
    gTextureSignNintendoRed0
    u8 gTextureSignNintendoRed0[]
    @@ -963,8 +963,8 @@ Variables
    gTexture6608C8
    u8 gTexture6608C8[]
    gTextureRoad3
    u8 gTextureRoad3[]
    gTextureSignToadRed
    u8 gTextureSignToadRed[]
    -
    gTexture668228
    u8 gTexture668228[]
    gTextureRoad5
    u8 gTextureRoad5[]
    +
    gTexture668228
    u8 gTexture668228[]
    diff --git a/todo.html b/todo.html index faf61a66d..91a1645d0 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,19 +115,19 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global __osPiDevMgr
    In libreultra this is in an include
    Global __osRepairPackId (OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
    -

    fix magic number

    -

    remove magic constant

    +

    remove magic constant

    +

    fix magic number

    Global _course_mario_raceway_dl_mio0SegmentRomStart []
    These should probably be ptr's instead of array's?
    Global add_unused_obj_index (s32 *listIdx, s32 *nextFree, s32 size)
    -
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    +
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    Global BAD_RETURN (cmd)
    put this define in types.h or similar. Certain functions are marked as having return values, but do not actually return a value. This causes undefined behavior, which we'd rather avoid on modern GCC. This only impacts -O2 and can matter for both the function itself and functions that call it.
    Global clear_framebuffer (s32)
    -
    Why did void* work for matching
    +
    Why did void* work for matching
    Global D_800E43B0 []
    -
    unused?
    +
    unused?
    Global D_8018D9B0
    Move gGfxPool out of main.h
    Global d_course_banshee_boardwalk_dl_0 []
    @@ -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)
    @@ -183,25 +183,25 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_8004C268 (u32 arg0, u32 arg1, u8 *texture, u32 width, u32 arg4, u32 height, s32 arg6)
    fakematch?
    Global func_800745C8 (s32 objectIndex, s32 arg1)
    -
    arg1 should likely be a u8 *
    +
    arg1 should likely be a u8 *
    Global func_80091FA4 (void)
    These sizes need to be sizeof() for shiftability if possible
    Global func_800CBC24 (void)
    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.
    +
    increasing players past four would require increase this loop iterator.
    Global gen_random_item (s16 rank, s16 isCpu)
    -
    Cleanup this function to use array access and struct if possible.
    +
    Cleanup this function to use array access and struct if possible.
    Global gPlayerWinningIndex
    gPlayerWinningIndex (D_800DC5E8) accessed as word, D_800DC5EB as u8
    Global gTorchSpawns []
    -
    fix this extern
    +
    fix this extern
    Global IO_WRITE (addr, data)
    These defines are from PR/rcp.h, but including that causes problems...
    Global LEO_CMD_TYPE_0
    @@ -213,13 +213,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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)
    +
    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
    +
    More indepth error checking/return value
    Global Note::priority
    use macros or something instead.
    Global osContInit (OSMesgQueue *mq, u8 *bitpattern, OSContStatus *status)
    @@ -227,19 +227,19 @@ $(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
    Global osViBlack (u8 active)
    -
    name magic constants
    +
    name magic constants
    Global osViSwapBuffer (void *vaddr)
    -
    figure out what this flag means
    +
    figure out what this flag means
    Global PI_DOMAIN1
    This define is from os.h, but including that causes problems...
    Global render_actor_shell (Camera *camera, Mat4 matrix, struct ShellActor *shell)
    -
    Is this making the shell spin?
    +
    Is this making the shell spin?
    Global SOUND_ARG_LOAD (sound_bank, byte2, byte3, sound_id)
    -
    format like sm64 sounds.h
    +
    format like sm64 sounds.h
    Global UPDATE_REG (reg, var)
    This define is from piint.h, but including that causes problems...
    Global US_FLOAT (x)
    diff --git a/total_progress.svg b/total_progress.svg index b1c492ec0..300f9c026 100644 --- a/total_progress.svg +++ b/total_progress.svg @@ -1 +1 @@ -Total progressTotal progress92.97%92.97% \ No newline at end of file +Total progressTotal progress93.0%93.0% \ No newline at end of file diff --git a/train_2render_8inc_8c_source.html b/train_2render_8inc_8c_source.html index d0c5e037a..ecc1b405d 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -365,41 +365,41 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    258
    259 if (render_set_position(spA0, 3) == 0) { return; }
    260
    -
    261 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    262 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    261 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    262 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    263
    -
    264 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    -
    265 vec3f_set(sp160, 17.0f, 6.0f, 12.0f);
    -
    266 mtxf_translate(spE0, sp160);
    -
    267 mtxf_multiplication(spA0, sp120, spE0);
    +
    264 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    +
    265 vec3f_set(sp160, 17.0f, 6.0f, 12.0f);
    +
    266 mtxf_translate(spE0, sp160);
    +
    267 mtxf_multiplication(spA0, sp120, spE0);
    268
    -
    269 if (render_set_position(spA0, 3) == 0) { return; }
    +
    269 if (render_set_position(spA0, 3) == 0) { return; }
    270
    -
    271 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    272 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    271 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    272 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    273
    -
    274 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    -
    275 vec3f_set(sp160, -17.0f, 6.0f, 12.0f);
    -
    276 mtxf_translate(spE0, sp160);
    -
    277 mtxf_multiplication(spA0, sp120, spE0);
    +
    274 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
    +
    275 vec3f_set(sp160, -17.0f, 6.0f, 12.0f);
    +
    276 mtxf_translate(spE0, sp160);
    +
    277 mtxf_multiplication(spA0, sp120, spE0);
    278
    -
    279 if (render_set_position(spA0, 3) == 0) { return; }
    +
    279 if (render_set_position(spA0, 3) == 0) { return; }
    280
    -
    281 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    282 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    281 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    282 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    283
    -
    284 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    -
    285 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    -
    286 mtxf_translate(spE0, sp160);
    -
    287 mtxf_multiplication(spA0, sp120, spE0);
    +
    284 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    +
    285 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    +
    286 mtxf_translate(spE0, sp160);
    +
    287 mtxf_multiplication(spA0, sp120, spE0);
    288
    -
    289 if (render_set_position(spA0, 3) == 0) { return; }
    +
    289 if (render_set_position(spA0, 3) == 0) { return; }
    290
    -
    291 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    292 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    291 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    292 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    293
    -
    294 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    -
    295 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    +
    294 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    +
    295 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    296 mtxf_translate(spE0, sp160);
    297 mtxf_multiplication(spA0, sp120, spE0);
    298
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index e737957ee..beb6fc9c1 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -218,72 +218,72 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    128void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    129 f32 temp_f0;
    -
    130 s16 temp_v0 = arg2->flags;
    +
    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];
    +
    205 arg1[3][0] = arg2->pos[0];
    206 arg1[3][1] = arg2->pos[1];
    207 arg1[3][2] = arg2->pos[2];
    208
    diff --git a/uniondu.html b/uniondu.html index d79bfaf46..f586e1b61 100644 --- a/uniondu.html +++ b/uniondu.html @@ -115,14 +115,6 @@ Collaboration diagram for du:
    Data Fields double d   -struct {  -  -   unsigned int   hi  -  -   unsigned int   lo  -  -} word  -  struct {       unsigned int   hi  @@ -131,10 +123,18 @@ Data Fields   } word    +struct {  +  +   unsigned int   hi  +  +   unsigned int   lo  +  +} word  + 

    Detailed Description

    -
    Todo
    is it possible to remove them somehow?
    -
    Todo
    is it possible to remove them somehow?
    +
    Todo
    is it possible to remove them somehow?
    +
    Todo
    is it possible to remove them somehow?

    Field Documentation

    ◆ d

    @@ -178,8 +178,8 @@ Data Fields
    - -

    ◆ [struct] [1/2]

    + +

    ◆ [struct] [1/2]

    @@ -192,8 +192,8 @@ Data Fields
    - -

    ◆ [struct] [2/2]

    + +

    ◆ [struct] [2/2]

    diff --git a/uniondu.js b/uniondu.js index 990f69433..04b625419 100644 --- a/uniondu.js +++ b/uniondu.js @@ -3,6 +3,6 @@ var uniondu = [ "d", "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0", null ], [ "hi", "uniondu.html#ac24ce7d9a78b6632965424039e4362c3", null ], [ "lo", "uniondu.html#a1350494c6a09b425b926250e9b10b5c9", null ], - [ "word", "uniondu.html#a06928fe4577a2d3ae425f6df73fbef26", null ], - [ "word", "uniondu.html#a490dba023fb0b686d9a03b51508bcfad", null ] + [ "word", "uniondu.html#a490dba023fb0b686d9a03b51508bcfad", null ], + [ "word", "uniondu.html#a06928fe4577a2d3ae425f6df73fbef26", null ] ]; \ No newline at end of file diff --git a/update__objects_8c.html b/update__objects_8c.html index 72b7015a3..49213acfd 100644 --- a/update__objects_8c.html +++ b/update__objects_8c.html @@ -951,7 +951,7 @@ Variables
    -
    Todo
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    +
    Todo
    This HAS to be a for-loop of some variety, but I can't make a for-loop to match. If you replace this with for(var_v1 = 0; var_v1 < size; var_v1++) The diff gets massive.
    Here is the call graph for this function:
    @@ -3939,7 +3939,7 @@ Here is the caller graph for this function:
    -
    Todo
    arg1 should likely be a u8 *
    +
    Todo
    arg1 should likely be a u8 *
    Here is the call graph for this function:
    @@ -10526,7 +10526,7 @@ Here is the caller graph for this function:
    -
    Todo
    Cleanup this function to use array access and struct if possible.
    +
    Todo
    Cleanup this function to use array access and struct if possible.
    Here is the call graph for this function:
    @@ -12220,7 +12220,7 @@ Here is the caller graph for this function:
    0.0, 0.0, 0.0, 0.0,
    0.0, 0.0, 0.0, 0.0
    }
    -
    Todo
    unused?
    +
    Todo
    unused?
    diff --git a/wario__stadium_2course__offsets_8c.html b/wario__stadium_2course__offsets_8c.html index 041a0af3f..844180e31 100644 --- a/wario__stadium_2course__offsets_8c.html +++ b/wario__stadium_2course__offsets_8c.html @@ -635,7 +635,7 @@ Variables
    {gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0},
    {gTexture64C11C, 0x0695, 0x0800, 0x0},
    {gTexture64C7B4, 0x046C, 0x0800, 0x0},
    -
    {gTexture668228, 0x0130, 0x0800, 0x0},
    +
    {gTexture668228, 0x0130, 0x0800, 0x0},
    {gTexture668358, 0x01A0, 0x0800, 0x0},
    {gTexture66AEB8, 0x0201, 0x0800, 0x0},
    {gTexture677A40, 0x0275, 0x0800, 0x0},
    @@ -659,13 +659,13 @@ Variables
    gTexture682F1C
    u8 gTexture682F1C[]
    gTexture682B24
    u8 gTexture682B24[]
    gTextureCheckerboardBlackWhite
    u8 gTextureCheckerboardBlackWhite[]
    -
    gTexture668228
    u8 gTexture668228[]
    gTexture677A40
    u8 gTexture677A40[]
    gTexture67E428
    u8 gTexture67E428[]
    gTextureSignWarioFace
    u8 gTextureSignWarioFace[]
    gTexture64C7B4
    u8 gTexture64C7B4[]
    gTexture643A34
    u8 gTexture643A34[]
    gTexture67F15C
    u8 gTexture67F15C[]
    +
    gTexture668228
    u8 gTexture668228[]
    gTexture64C11C
    u8 gTexture64C11C[]
    gTexture66AEB8
    u8 gTexture66AEB8[]
    gTexture67F450
    u8 gTexture67F450[]