diff --git a/actors.html b/actors.html index a0d5282dc..45c9f94a7 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/actorsmenu.html b/actorsmenu.html index 8ccc5e3e5..94bcb85a7 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 2ddbcc61b..03d6a6bce 100644 --- a/actorsmenu.js +++ b/actorsmenu.js @@ -1,10 +1,10 @@ var actorsmenu = [ [ "How Actors Work", "actors.html", [ - [ "Actors", "actors.html#actors-1", null ] + [ "Actors", "actors.html#actors", null ] ] ], [ "Objects", "objects.html", [ - [ "Objects", "objects.html#objects-1", null ] + [ "Objects", "objects.html#objects", null ] ] ], [ "Vehicles", "vehicles.html", [ [ "Trains", "vehicles.html#trains", null ], diff --git a/banshee__boardwalk_2course__data_8c.html b/banshee__boardwalk_2course__data_8c.html index 30d3da56f..d5a1540af 100644 --- a/banshee__boardwalk_2course__data_8c.html +++ b/banshee__boardwalk_2course__data_8c.html @@ -665,7 +665,7 @@ Variables
gsSPEndDisplayList(),
}
gCourseMaxZ
s16 gCourseMaxZ
Definition code_800029B0.c:92
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/banshee__boardwalk_2course__data_8h.html b/banshee__boardwalk_2course__data_8h.html index 3beca2c5d..9112f3c77 100644 --- a/banshee__boardwalk_2course__data_8h.html +++ b/banshee__boardwalk_2course__data_8h.html @@ -716,7 +716,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/basics.js b/basics.js index cf1503e8f..8888e6745 100644 --- a/basics.js +++ b/basics.js @@ -24,8 +24,8 @@ var basics = [ "Code Breakdown", "controlflow.html#code-breakdown", [ [ "Menus", "controlflow.html#menus", null ], [ "Players", "controlflow.html#players", null ], - [ "Actors", "controlflow.html#actors", null ], - [ "Objects", "controlflow.html#objects", null ], + [ "Actors", "controlflow.html#actors-1", null ], + [ "Objects", "controlflow.html#objects-1", null ], [ "Courses", "controlflow.html#courses", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], diff --git a/big__donut_2course__data_8c.html b/big__donut_2course__data_8c.html index d3db75387..ffa832861 100644 --- a/big__donut_2course__data_8c.html +++ b/big__donut_2course__data_8c.html @@ -160,7 +160,7 @@ Variables
G_RM_AA_ZB_OPA_SURF2
#define G_RM_AA_ZB_OPA_SURF2
Definition gbi.h:942
G_CC_MODULATEIA
#define G_CC_MODULATEIA
Definition gbi.h:492
G_RM_AA_ZB_TEX_EDGE
#define G_RM_AA_ZB_TEX_EDGE
Definition gbi.h:957
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/big__donut_2course__data_8h.html b/big__donut_2course__data_8h.html index be566b323..64eebcad5 100644 --- a/big__donut_2course__data_8h.html +++ b/big__donut_2course__data_8h.html @@ -148,7 +148,7 @@ Variables
-
Todo
Replace addresses with variables
+
Todo
Replace addresses with variables
diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index c08016314..8d5710146 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -155,95 +155,95 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
44 temp_f0 = (temp_f20 * temp_f20) + (temp_f22 * temp_f22) + (temp_f24 * temp_f24);
45 if (temp_f0 > 400.0f) {
46 temp_f18_3 = D_80164490[nextWaypoint].posX;
-
47 temp_f16_3 = D_80164490[nextWaypoint].posY;
-
48 temp_f26 = D_80164490[nextWaypoint].posZ;
+
47 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
48 temp_f26 = D_80164490[nextWaypoint].posZ;
49
-
50 temp_f12_0 = temp_f18_3 - shell->pos[0];
-
51 temp_f12_1 = temp_f16_3 - shell->pos[1];
-
52 temp_f12_2 = temp_f26 - shell->pos[2];
+
50 temp_f12_0 = temp_f18_3 - shell->pos[0];
+
51 temp_f12_1 = temp_f16_3 - shell->pos[1];
+
52 temp_f12_2 = temp_f26 - shell->pos[2];
53
-
54 temp_f0_3 = (temp_f12_0 * temp_f12_0) + (temp_f12_1 * temp_f12_1) + (temp_f12_2 * temp_f12_2);
-
55 if (temp_f0_3 < temp_f0) {
-
56 shell->pathIndex = nextWaypoint;
+
54 temp_f0_3 = (temp_f12_0 * temp_f12_0) + (temp_f12_1 * temp_f12_1) + (temp_f12_2 * temp_f12_2);
+
55 if (temp_f0_3 < temp_f0) {
+
56 shell->pathIndex = nextWaypoint;
57 } else {
-
58 temp_f0_2 = sqrtf(temp_f0) * 4.0f;
-
59 temp_f20 /= temp_f0_2;
-
60 temp_f22 /= temp_f0_2;
-
61 temp_f24 /= temp_f0_2;
+
58 temp_f0_2 = sqrtf(temp_f0) * 4.0f;
+
59 temp_f20 /= temp_f0_2;
+
60 temp_f22 /= temp_f0_2;
+
61 temp_f24 /= temp_f0_2;
62
-
63 temp_f12_3 = shell->velocity[0];
-
64 temp_f14_2 = shell->velocity[1];
-
65 temp_f16_2 = shell->velocity[2];
+
63 temp_f12_3 = shell->velocity[0];
+
64 temp_f14_2 = shell->velocity[1];
+
65 temp_f16_2 = shell->velocity[2];
66
-
67 temp_f12_3 += temp_f20;
-
68 temp_f14_2 += temp_f22;
-
69 temp_f16_2 += temp_f24;
-
70 temp_f0 = sqrtf((temp_f12_3 * temp_f12_3) + (temp_f14_2 * temp_f14_2) + (temp_f16_2 * temp_f16_2));
-
71 if (temp_f0 > 6.0f) {
-
72 temp_f0 /= 6.0f;
-
73 temp_f12_3 /= temp_f0;
-
74 temp_f14_2 /= temp_f0;
-
75 temp_f16_2 /= temp_f0;
+
67 temp_f12_3 += temp_f20;
+
68 temp_f14_2 += temp_f22;
+
69 temp_f16_2 += temp_f24;
+
70 temp_f0 = sqrtf((temp_f12_3 * temp_f12_3) + (temp_f14_2 * temp_f14_2) + (temp_f16_2 * temp_f16_2));
+
71 if (temp_f0 > 6.0f) {
+
72 temp_f0 /= 6.0f;
+
73 temp_f12_3 /= temp_f0;
+
74 temp_f14_2 /= temp_f0;
+
75 temp_f16_2 /= temp_f0;
76 }
-
77 shell->velocity[0] = temp_f12_3;
-
78 shell->velocity[1] = temp_f14_2;
-
79 shell->velocity[2] = temp_f16_2;
+
77 shell->velocity[0] = temp_f12_3;
+
78 shell->velocity[1] = temp_f14_2;
+
79 shell->velocity[2] = temp_f16_2;
80
-
81 origPos[0] = shell->pos[0];
-
82 origPos[1] = shell->pos[1];
-
83 origPos[2] = shell->pos[2];
+
81 origPos[0] = shell->pos[0];
+
82 origPos[1] = shell->pos[1];
+
83 origPos[2] = shell->pos[2];
84
-
85 shell->pos[0] += temp_f12_3;
-
86 shell->pos[1] += temp_f14_2;
-
87 shell->pos[2] += temp_f16_2;
-
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
-
89 func_802B4E30((struct Actor *) shell);
+
85 shell->pos[0] += temp_f12_3;
+
86 shell->pos[1] += temp_f14_2;
+
87 shell->pos[2] += temp_f16_2;
+
88 func_802AD950(&shell->unk30, 4.0f, shell->pos[0], shell->pos[1], shell->pos[2], origPos[0], origPos[1], origPos[2]);
+
89 func_802B4E30((struct Actor *) shell);
90 }
91 } else {
-
92 if (temp_f0 > 5.0f) {
-
93 shell->pos[0] = temp_f2;
-
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
-
95 shell->pos[2] = temp_f28;
-
96 shell->pathIndex = nextWaypoint;
+
92 if (temp_f0 > 5.0f) {
+
93 shell->pos[0] = temp_f2;
+
94 shell->pos[1] = shell->boundingBoxSize + temp_f12;
+
95 shell->pos[2] = temp_f28;
+
96 shell->pathIndex = nextWaypoint;
97 } else {
-
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
-
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
-
100 temp_f26 = D_80164490[nextWaypoint].posZ;
+
98 temp_f18_3 = D_80164490[nextWaypoint].posX;
+
99 temp_f16_3 = D_80164490[nextWaypoint].posY;
+
100 temp_f26 = D_80164490[nextWaypoint].posZ;
101
-
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
-
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
-
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
+
102 shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
+
103 shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
+
104 shell->pos[2] = (temp_f28 + temp_f26) * 0.5f;
105
-
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
-
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
-
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
+
106 shell->velocity[0] = (temp_f18_3 - temp_f2) * 0.5f;
+
107 shell->velocity[1] = (temp_f16_3 - temp_f12) * 0.5f;
+
108 shell->velocity[2] = (temp_f26 - temp_f28) * 0.5f;
109 }
110 }
111}
112
-
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
-
114 f32 x_velocity;
-
115 f32 z_velocity;
-
116 f32 xz_dist;
-
117 Vec3f newPosition;
+
113void func_802B3E7C(struct ShellActor *shell, Player *player) {
+
114 f32 x_velocity;
+
115 f32 z_velocity;
+
116 f32 xz_dist;
+
117 Vec3f newPosition;
118
-
119 x_velocity = player->pos[0];
-
120 x_velocity -= shell->pos[0];
-
121 z_velocity = player->pos[2];
-
122 z_velocity -= shell->pos[2];
-
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
-
124 if (xz_dist == 0.0f) {
-
125 x_velocity = 0.0f;
-
126 z_velocity = 0.0f;
+
119 x_velocity = player->pos[0];
+
120 x_velocity -= shell->pos[0];
+
121 z_velocity = player->pos[2];
+
122 z_velocity -= shell->pos[2];
+
123 xz_dist = sqrtf((x_velocity * x_velocity) + (z_velocity * z_velocity)) / 8;
+
124 if (xz_dist == 0.0f) {
+
125 x_velocity = 0.0f;
+
126 z_velocity = 0.0f;
127 } else {
-
128 x_velocity /= xz_dist;
-
129 z_velocity /= xz_dist;
+
128 x_velocity /= xz_dist;
+
129 z_velocity /= xz_dist;
130 }
131
-
132 newPosition[0] = shell->pos[0];
-
133 newPosition[1] = shell->pos[1];
+
132 newPosition[0] = shell->pos[0];
+
133 newPosition[1] = shell->pos[1];
134 newPosition[2] = shell->pos[2];
135 shell->pos[0] += x_velocity;
136 shell->pos[1] -= 2.0f;
@@ -660,10 +660,7 @@ $(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 2f27f0944..2b09f90c6 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)
@@ -121,15 +121,15 @@ $(function(){initNavTree('bug.html',''); initResizable(); });
Global load_ceremony_cutscene (void)
these segmented addresses need to be symbols for mobility
Global load_sequence_internal (u32, u32, s32)
-
This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
+
This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
Global new_actor (ActorInitParams *)

No null check.

Global note_set_vel_pan_reverb (struct Note *note, f32 velocity, u8 pan, u8 reverbVol)
-
for the change to UQ0.7, the if statement should also have been changed accordingly
+
for the change to UQ0.7, the if statement should also have been changed accordingly
Global preload_sequence (u32, u8)
-
should be IS_SEQ_LOAD_COMPLETE
+
should be IS_SEQ_LOAD_COMPLETE
Global update_gamestate (void)
Reloading this segment makes random_u16() deterministic for player spawn order. In laymens terms, random_u16() outputs the same value every time.
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index 37d0513c4..7a09e364e 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 b7553c0c9..305cb43f9 100644 --- a/ceremony__and__credits_8h.html +++ b/ceremony__and__credits_8h.html @@ -960,7 +960,7 @@ Here is the caller graph for this function:
-
Todo
Cast to normal Camera? Or from CinematicCamera?
+
Todo
Cast to normal Camera? Or from CinematicCamera?
Here is the call graph for this function:
@@ -2202,7 +2202,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/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__80005FD0_8c.html b/code__80005FD0_8c.html index b7983e9e3..87a7e4446 100644 --- a/code__80005FD0_8c.html +++ b/code__80005FD0_8c.html @@ -5145,7 +5145,7 @@ Here is the caller graph for this function:
-
Bug
Adding an (f32) cast changes asm, why?
+
Bug
Adding an (f32) cast changes asm, why?
Here is the caller graph for this function:
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index 30c4c24c3..f0cf6df42 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..437cb98ec 100644 --- a/code__80281780_8h.html +++ b/code__80281780_8h.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/contpfs_8c.html b/contpfs_8c.html index d291e4760..1703a39ef 100644 --- a/contpfs_8c.html +++ b/contpfs_8c.html @@ -205,8 +205,8 @@ Here is the caller graph for this function:
-
Todo
remove magic constant
-
Todo
loads of magic constants..
+
Todo
remove magic constant
+
Todo
loads of magic constants..
Here is the call graph for this function:
@@ -279,7 +279,7 @@ Here is the caller graph for this function:
-
Todo
don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
+
Todo
don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
Here is the call graph for this function:
@@ -343,8 +343,8 @@ Here is the caller graph for this function:
-
Todo
fix magic number
-
Todo
remove magic constant
+
Todo
fix magic number
+
Todo
remove magic constant
Here is the call graph for this function:
diff --git a/controlflow.html b/controlflow.html index 1a8d070f7..bb49c133d 100644 --- a/controlflow.html +++ b/controlflow.html @@ -110,8 +110,8 @@ $(function(){initNavTree('controlflow.html',''); initResizable(); });
  • Segments
  • Code Breakdown
    • Menus
    • Players
      • -
    • Actors
      • -
    • Objects
      • +
    • Actors
      • +
    • Objects
    • Courses
      • @@ -220,7 +220,7 @@ Players camera Player cameras -

      +

      Actors

      Actor related code resides in

      @@ -232,7 +232,7 @@ Actors
      code_80005FD0 Vehicles; trains, cars, trucks, boats
      -

      +

      Objects

      Object related code resides in

      diff --git a/controller_8h.html b/controller_8h.html index 24ae9fb83..5a06aa43e 100644 --- a/controller_8h.html +++ b/controller_8h.html @@ -1100,8 +1100,8 @@ Here is the call graph for this function:
    • -
    Todo
    remove magic constant
    -
    Todo
    loads of magic constants..
    +
    Todo
    remove magic constant
    +
    Todo
    loads of magic constants..
    Here is the call graph for this function:
    @@ -1324,7 +1324,7 @@ Here is the caller graph for this function:
    -
    Todo
    magic number
    +
    Todo
    magic number
    Here is the call graph for this function:
    @@ -1388,7 +1388,7 @@ Here is the caller graph for this function:
    -
    Todo
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    +
    Todo
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    Here is the call graph for this function:
    @@ -1452,8 +1452,8 @@ Here is the caller graph for this function:
    -
    Todo
    fix magic number
    -
    Todo
    remove magic constant
    +
    Todo
    fix magic number
    +
    Todo
    remove magic constant
    Here is the call graph for this function:
    diff --git a/crash__screen_8c.html b/crash__screen_8c.html index ddf57f289..3f599f17d 100644 --- a/crash__screen_8c.html +++ b/crash__screen_8c.html @@ -284,7 +284,7 @@ Here is the caller graph for this function:
    -
    Bug
    if this check fails, the ra register is printed a second time.
    +
    Bug
    if this check fails, the ra register is printed a second time.
    Here is the call graph for this function:
    diff --git a/doxygen_crawl.html b/doxygen_crawl.html index cccdc3f33..9c0d3b8b6 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -87,8 +87,8 @@ - + @@ -134,8 +134,8 @@ - + @@ -243,9 +243,9 @@ + - @@ -423,8 +423,8 @@ - + @@ -432,8 +432,8 @@ - + @@ -503,13 +503,13 @@ - - - + + + @@ -521,10 +521,10 @@ - - + + @@ -555,14 +555,14 @@ - + - + @@ -651,9 +651,9 @@ + - @@ -682,11 +682,11 @@ + - @@ -716,19 +716,19 @@ - + + - - + @@ -740,9 +740,9 @@ + - @@ -798,10 +798,10 @@ - - - + + + @@ -820,8 +820,8 @@ - + @@ -861,8 +861,8 @@ - + @@ -880,6 +880,7 @@ + @@ -891,7 +892,6 @@ - @@ -901,8 +901,8 @@ - + @@ -918,8 +918,8 @@ - + @@ -973,7 +973,6 @@ - @@ -981,12 +980,13 @@ + + - @@ -1009,9 +1009,9 @@ - + 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/load_8c.html b/load_8c.html index 9027472ee..b97626ff5 100644 --- a/load_8c.html +++ b/load_8c.html @@ -1024,7 +1024,7 @@ Here is the caller graph for this function:
    -
    Bug
    This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
    +
    Bug
    This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
    Here is the call graph for this function:
    @@ -1135,7 +1135,7 @@ Here is the caller graph for this function:
    -
    Bug
    should be IS_SEQ_LOAD_COMPLETE
    +
    Bug
    should be IS_SEQ_LOAD_COMPLETE
    Here is the call graph for this function:
    diff --git a/load_8h.html b/load_8h.html index 01655fed7..35a8465f0 100644 --- a/load_8h.html +++ b/load_8h.html @@ -833,7 +833,7 @@ Here is the caller graph for this function:
    -
    Bug
    This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
    +
    Bug
    This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
    Here is the call graph for this function:
    @@ -944,7 +944,7 @@ Here is the caller graph for this function:
    -
    Bug
    should be IS_SEQ_LOAD_COMPLETE
    +
    Bug
    should be IS_SEQ_LOAD_COMPLETE
    Here is the call graph for this function:
    diff --git a/main_8c.html b/main_8c.html index e74eb1cd8..98545213c 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 fa9923c92..60b54537b 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 014dcc6bf..6907ca66d 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-1":[0,0,0], +"actors.html#actors":[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 f54b8202e..8d28c285e 100644 --- a/navtreeindex28.js +++ b/navtreeindex28.js @@ -191,7 +191,7 @@ 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,2,4,2], +"controlflow.html#actors-1":[1,2,4,2], "controlflow.html#code-breakdown":[1,2,4], "controlflow.html#course-folder":[1,2,4,4,0], "controlflow.html#courses":[1,2,4,4], @@ -199,7 +199,7 @@ var NAVTREEINDEX28 = "controlflow.html#engine":[1,2,4,6], "controlflow.html#math":[1,2,4,7], "controlflow.html#menus":[1,2,4,0], -"controlflow.html#objects":[1,2,4,3], +"controlflow.html#objects-1":[1,2,4,3], "controlflow.html#overall-control-flow":[1,2,2], "controlflow.html#paradigm":[1,2,0], "controlflow.html#players":[1,2,4,1], diff --git a/navtreeindex39.js b/navtreeindex39.js index 153afa799..1c685eb00 100644 --- a/navtreeindex39.js +++ b/navtreeindex39.js @@ -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 507261b69..4b0a803ff 100644 --- a/navtreeindex42.js +++ b/navtreeindex42.js @@ -50,8 +50,8 @@ var NAVTREEINDEX42 = "globals_enum.html":[8,1,4], "globals_eval.html":[8,1,5], "globals_f.html":[8,1,0,6], -"globals_func.html":[8,1,1], "globals_func.html":[8,1,1,0], +"globals_func.html":[8,1,1], "globals_func_a.html":[8,1,1,1], "globals_func_b.html":[8,1,1,2], "globals_func_c.html":[8,1,1,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/navtreeindex83.js b/navtreeindex83.js index 7513b8f64..4a223cf30 100644 --- a/navtreeindex83.js +++ b/navtreeindex83.js @@ -183,7 +183,7 @@ var NAVTREEINDEX83 = "new__func_8h.html#ac8095e2ec1adbd7e74e655c578968a36":[8,0,3,6,56,0], "new__func_8h_source.html":[8,0,3,6,56], "objects.html":[0,1], -"objects.html#objects-1":[0,1,0], +"objects.html#objects":[0,1,0], "objects_8h.html":[8,0,2,15], "objects_8h.html#a015cc1fa03690348fb398b9be74ecc15":[8,0,2,15,35], "objects_8h.html#a02bd29e49d2089bb6bd1bfe33e360584":[8,0,2,15,87], diff --git a/objects.html b/objects.html index e964e8aa9..96643dff2 100644 --- a/objects.html +++ b/objects.html @@ -103,7 +103,7 @@ $(function(){initNavTree('objects.html',''); initResizable(); });
    Objects
    -

    +

    Objects

    diff --git a/osPfsDeleteFile_8c.html b/osPfsDeleteFile_8c.html index 5b9d4c0f7..dca17ec11 100644 --- a/osPfsDeleteFile_8c.html +++ b/osPfsDeleteFile_8c.html @@ -207,7 +207,7 @@ Here is the caller graph for this function:
    -
    Todo
    magic number
    +
    Todo
    magic number
    Here is the call graph for this function:
    @@ -254,7 +254,7 @@ Here is the caller graph for this function:
    -
    Todo
    magic constant
    +
    Todo
    magic constant
    Here is the call graph for this function:
    diff --git a/osPiRawStartDma_8c.html b/osPiRawStartDma_8c.html index bb1ea09b7..59e8acd63 100644 --- a/osPiRawStartDma_8c.html +++ b/osPiRawStartDma_8c.html @@ -186,7 +186,7 @@ Here is the caller graph for this function:
    -
    Todo
    figure out why this is like this
    +
    Todo
    figure out why this is like this
    diff --git a/osPiStartDma_8c.html b/osPiStartDma_8c.html index d3b787a55..9de6d0159 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 89a9b0f54..7b262f0f7 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 551f2e4f3..71496921e 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 84e25e78b..6e2c0bcb1 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 fed9cfa3a..6e0309a0c 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/piint_8h.html b/piint_8h.html index 04b2f0421..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/playback_8c.html b/playback_8c.html index cbad5ee0b..3eefc2511 100644 --- a/playback_8c.html +++ b/playback_8c.html @@ -854,7 +854,7 @@ Here is the caller graph for this function:
    -
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    +
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    Here is the caller graph for this function:
    diff --git a/playback_8h.html b/playback_8h.html index 2937232bd..699793e8b 100644 --- a/playback_8h.html +++ b/playback_8h.html @@ -916,7 +916,7 @@ Here is the caller graph for this function:
    -
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    +
    Bug
    for the change to UQ0.7, the if statement should also have been changed accordingly
    Here is the caller graph for this function:
    diff --git a/player__controller_8c.html b/player__controller_8c.html index 603a9641d..ad9e2cf8c 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..1633e0985 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 f1b45189b..b0983765b 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 59a0378d8..68ed10cc8 100644 --- a/podium__ceremony__actors_8h.html +++ b/podium__ceremony__actors_8h.html @@ -555,7 +555,7 @@ Here is the caller graph for this function:
    Bug
    No null check.
    Bug
    -
    Todo
    More indepth error checking/return value
    +
    Todo
    More indepth error checking/return value
    Here is the call graph for this function:
    diff --git a/race__logic_8c.html b/race__logic_8c.html index 4d1b251c2..6e79ad3fd 100644 --- a/race__logic_8c.html +++ b/race__logic_8c.html @@ -703,7 +703,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/race__logic_8h.html b/race__logic_8h.html index 44e87ce0a..a98eacff5 100644 --- a/race__logic_8h.html +++ b/race__logic_8h.html @@ -643,7 +643,7 @@ Here is the caller graph for this function:
    -
    Todo
    increasing players past four would require increase this loop iterator.
    +
    Todo
    increasing players past four would require increase this loop iterator.
    Here is the call graph for this function:
    diff --git a/search/all_11.js b/search/all_11.js index 1f03a9ccd..8dee28034 100644 --- a/search/all_11.js +++ b/search/all_11.js @@ -17,7 +17,7 @@ var searchData= ['object_5forigin_5fpos_5frandomize_5faround_5fz_14',['object_origin_pos_randomize_around_z',['../code__80086E70_8c.html#ac6428c27f0022ef2f12b28a39c386945',1,'object_origin_pos_randomize_around_z(s32 objectIndex, s16 z, u16 arg2): code_80086E70.c'],['../code__80086E70_8h.html#af49d1527179dc119222464883ebe5174',1,'object_origin_pos_randomize_around_z(s32, s16, u16): code_80086E70.c']]], ['objectindex_15',['objectIndex',['../structstruct__D__8018CE10.html#a127e1b12aed47ab382b129edabb71d52',1,'struct_D_8018CE10']]], ['objectlistsize_16',['objectListSize',['../code__80057C60_8c.html#a619a9cb4ca05d69a44a5928af9e499ad',1,'code_80057C60.c']]], - ['objects_17',['Objects',['../structObjects.html',1,'Objects'],['../objects.html',1,'Objects'],['../controlflow.html#objects',1,'Objects'],['../objects.html#objects-1',1,'Objects']]], + ['objects_17',['Objects',['../structObjects.html',1,'Objects'],['../objects.html',1,'Objects'],['../objects.html#objects',1,'Objects'],['../controlflow.html#objects-1',1,'Objects']]], ['objects_2eh_18',['objects.h',['../objects_8h.html',1,'']]], ['objects_2emd_19',['objects.md',['../objects_8md.html',1,'']]], ['objx_20',['objX',['../structuObjSprite__t.html#aa56aa472d1ac710dd829e6f1cd9f7ad0',1,'uObjSprite_t']]], diff --git a/search/all_3.js b/search/all_3.js index f1fbd7998..caabfdbb3 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'],['../controlflow.html#actors',1,'Actors'],['../actors.html#actors-1',1,'Actors']]], + ['actors_96',['Actors',['../actorsmenu.html',1,'Actors'],['../actors.html#actors',1,'Actors'],['../controlflow.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 89b871ec6..09f29981c 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -594,7 +594,7 @@ var searchData= ['courseindex_591',['courseIndex',['../structstruct__8018EE10__entry.html#acee952c37d3917fd90809e58c6401e65',1,'struct_8018EE10_entry']]], ['courserecords_592',['courseRecords',['../structCupTimeTrialRecords.html#acf18ab0e69f90a2eefe248ef7090bd1c',1,'CupTimeTrialRecords']]], ['courses_593',['COURSES',['../mk64_8h.html#acf250ad4ca05ca435a61203c41d4ca88',1,'mk64.h']]], - ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../controlflow.html#courses',1,'Courses'],['../courses.html#courses-1',1,'Courses']]], + ['courses_594',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses-1',1,'Courses'],['../controlflow.html#courses',1,'Courses']]], ['courses_2emd_595',['courses.md',['../courses_8md.html',1,'']]], ['coursesmenu_2emd_596',['coursesmenu.md',['../coursesmenu_8md.html',1,'']]], ['coursetable_597',['CourseTable',['../structCourseTable.html',1,'']]], diff --git a/toads__turnpike_2course__data_8c.html b/toads__turnpike_2course__data_8c.html index 1b978096a..0c0810c53 100644 --- a/toads__turnpike_2course__data_8c.html +++ b/toads__turnpike_2course__data_8c.html @@ -3026,7 +3026,7 @@ Variables
    G_IM_FMT_RGBA
    #define G_IM_FMT_RGBA
    Definition gbi.h:396
    G_IM_SIZ_16b
    #define G_IM_SIZ_16b
    Definition gbi.h:407
    G_CC_DECALRGBA
    #define G_CC_DECALRGBA
    Definition gbi.h:512
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/toads__turnpike_2course__data_8h.html b/toads__turnpike_2course__data_8h.html index 840c1177b..8649ed263 100644 --- a/toads__turnpike_2course__data_8h.html +++ b/toads__turnpike_2course__data_8h.html @@ -2812,7 +2812,7 @@ Variables
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/toads__turnpike_2course__offsets_8c.html b/toads__turnpike_2course__offsets_8c.html index af6acbc59..f9ca57c39 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 55d4dbb3e..bc8e3cd1a 100644 --- a/todo.html +++ b/todo.html @@ -105,18 +105,18 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global __osGetId (OSPfs *pfs)
    -

    loads of magic constants..

    -

    remove magic constant

    +

    remove magic constant

    +

    loads of magic constants..

    Global __osPfsReleasePages (OSPfs *pfs, __OSInode *inode, u8 start_page, u16 *sum, u8 bank, __OSInodeUnit *last_page, int flag)
    -
    magic number
    +
    magic number
    Global __osPfsRWInode (OSPfs *pfs, __OSInode *inode, u8 flag, u8 bank)
    -
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    +
    don't like this =/ //maybe &inode->inode_table[j*PFS_ONE_PAGE].ipage or something
    Global __osPiDevMgr
    In libreultra this is in an include
    Global __osRepairPackId (OSPfs *pfs, __OSPackId *badid, __OSPackId *newid)
    -

    fix magic number

    -

    remove magic constant

    +

    fix magic number

    +

    remove magic constant

    Global _course_mario_raceway_dl_mio0SegmentRomStart []
    These should probably be ptr's instead of array's?
    @@ -125,15 +125,15 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global BAD_RETURN (cmd)
    put this define in types.h or similar. Certain functions are marked as having return values, but do not actually return a value. This causes undefined behavior, which we'd rather avoid on modern GCC. This only impacts -O2 and can matter for both the function itself and functions that call it.
    Global clear_framebuffer (s32)
    -
    Why did void* work for matching
    +
    Why did void* work for matching
    Global D_800E43B0 []
    unused?
    Global D_8018D9B0
    Move gGfxPool out of main.h
    Global d_course_banshee_boardwalk_dl_0 []
    -
    Replace addresses with variables
    -
    Global d_course_big_donut_dl []
    Replace addresses with variables
    +
    Global d_course_big_donut_dl []
    +
    Replace addresses with variables
    Global d_course_bowsers_castle_dl_0 []
    Replace addresses with variables
    Global d_course_dks_jungle_parkway_dl_0 []
    @@ -157,16 +157,16 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global d_course_sherbet_land_dl_0 []
    Replace addresses with variables
    Global d_course_toads_turnpike_dl_0 []
    -
    Replace addresses with variables
    -
    Global d_course_wario_stadium_dl_0 []
    Replace addresses with variables
    +
    Global d_course_wario_stadium_dl_0 []
    +
    Replace addresses with variables
    Global d_course_yoshi_valley_dl_0 []
    Replace addresses with variables
    Global debug_switch_character_ceremony_cutscene (void)
    -
    confirm this.
    +
    confirm this.
    Union du
    -

    is it possible to remove them somehow?

    -

    is it possible to remove them somehow?

    +

    is it possible to remove them somehow?

    +

    is it possible to remove them somehow?

    Global fill [2]
    file boundary?
    @@ -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,13 +189,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800CBC24 (void)
    clenanup, something's weird with the variables. D_800EA4A4 is probably EuAudioCmd bc of the + 0x100
    Global func_80282D90 (struct CinematicCamera *, struct struct_80286A04 *, struct struct_80286A04 *, s32)
    -
    Cast to normal Camera? Or from CinematicCamera?
    +
    Cast to normal Camera? Or from CinematicCamera?
    Global func_8028336C (UNUSED struct CinematicCamera *arg0, UNUSED Camera *camera)
    -
    Does this match as a return of s8?
    +
    Does this match as a return of s8?
    Global func_802846E4 (struct CinematicCamera *)
    -
    What does this even do?
    +
    What does this even do?
    Global func_8028F970 (void)
    -
    increasing players past four would require increase this loop iterator.
    +
    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.
    Global gPlayerWinningIndex
    @@ -205,35 +205,35 @@ $(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
    -
    Global LEO_CMD_TYPE_1
    -
    name
    -
    Global LEO_CMD_TYPE_2
    name
    +
    Global LEO_CMD_TYPE_1
    +
    name
    +
    Global LEO_CMD_TYPE_2
    +
    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
    +
    Verify with proper documentation
    Global MTX_SHADOW_POOL_SIZE
    -
    Verify with proper documentation
    +
    Verify with proper documentation
    Global new_actor (ActorInitParams *)
    -
    More indepth error checking/return value
    +
    More indepth error checking/return value
    Global Note::priority
    use macros or something instead.
    Global osContInit (OSMesgQueue *mq, u8 *bitpattern, OSContStatus *status)
    figure out what it means
    Global osPfsDeleteFile (OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name)
    -
    magic constant
    +
    magic constant
    Global osPiStartDma (OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq)
    -
    name magic constants
    +
    name magic constants
    Global osRomBase
    -
    figure out why this is like this
    +
    figure out why this is like this
    Global osViBlack (u8 active)
    -
    name magic constants
    +
    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)
    diff --git a/train_2render_8inc_8c_source.html b/train_2render_8inc_8c_source.html index 2e9d84bac..9f0e9a564 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -266,73 +266,73 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    161 } else {
    162 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1FAF8);
    163 }
    -
    164 if (1440000.0f < temp_f0) { return; }
    +
    164 if (1440000.0f < temp_f0) { return; }
    165
    -
    166 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    -
    167 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
    +
    166 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    167 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
    168
    -
    169 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    170 vec3f_set(sp160, 17.0f, 6.0f, 8.0f);
    -
    171 mtxf_translate(spE0, sp160);
    -
    172 mtxf_multiplication(spA0, sp120, spE0);
    +
    169 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    170 vec3f_set(sp160, 17.0f, 6.0f, 8.0f);
    +
    171 mtxf_translate(spE0, sp160);
    +
    172 mtxf_multiplication(spA0, sp120, spE0);
    173
    -
    174 if (render_set_position(spA0, 3) == 0) { return; }
    +
    174 if (render_set_position(spA0, 3) == 0) { return; }
    175
    -
    176 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    177 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    176 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    177 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    178
    -
    179 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    180 vec3f_set(sp160, -17.0, 6.0f, 8.0f);
    -
    181 mtxf_translate(spE0, sp160);
    -
    182 mtxf_multiplication(spA0, sp120, spE0);
    +
    179 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    180 vec3f_set(sp160, -17.0, 6.0f, 8.0f);
    +
    181 mtxf_translate(spE0, sp160);
    +
    182 mtxf_multiplication(spA0, sp120, spE0);
    183
    -
    184 if (render_set_position(spA0, 3) == 0) { return; }
    +
    184 if (render_set_position(spA0, 3) == 0) { return; }
    185
    -
    186 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    -
    187 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    +
    186 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
    +
    187 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    188
    -
    189 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    -
    190 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    -
    191 mtxf_translate(spE0, sp160);
    -
    192 mtxf_multiplication(spA0, sp120, spE0);
    +
    189 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
    +
    190 vec3f_set(sp160, 17.0f, 6.0f, -8.0f);
    +
    191 mtxf_translate(spE0, sp160);
    +
    192 mtxf_multiplication(spA0, sp120, spE0);
    193
    -
    194 if (render_set_position(spA0, 3) == 0) { return; }
    +
    194 if (render_set_position(spA0, 3) == 0) { return; }
    195
    -
    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; }
    +
    218 if (temp_f0 < 0.0f) { return; }
    219
    -
    220 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    +
    220 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    221
    -
    222 mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
    +
    222 mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
    223
    -
    224 if (render_set_position(sp120, 0) == 0) { return; }
    +
    224 if (render_set_position(sp120, 0) == 0) { return; }
    225
    -
    226 if (temp_f0 < 250000.0f) {
    +
    226 if (temp_f0 < 250000.0f) {
    227
    -
    228 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A20);
    +
    228 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A20);
    229 gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A08);
    230
    231 } else if (temp_f0 < 1000000.0f) {
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index 2ff04c3af..2c1419dbb 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -128,151 +128,151 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    24 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    25 func_8029794C(arg2->pos, arg2->rot, 3.0f);
    26 }
    -
    27 arg1[3][0] = arg2->pos[0];
    -
    28 arg1[3][1] = arg2->pos[1];
    -
    29 arg1[3][2] = arg2->pos[2];
    +
    27 arg1[3][0] = arg2->pos[0];
    +
    28 arg1[3][1] = arg2->pos[1];
    +
    29 arg1[3][2] = arg2->pos[2];
    30
    -
    31 if (render_set_position(arg1, 0) != 0) {
    -
    32 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    33 gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_tree);
    +
    31 if (render_set_position(arg1, 0) != 0) {
    +
    32 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    33 gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_tree);
    34 }
    35}
    36
    -
    44void render_actor_tree_yoshi_valley(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    45 f32 temp_f0;
    -
    46 s16 temp_v0 = arg2->flags;
    +
    44void render_actor_tree_yoshi_valley(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    45 f32 temp_f0;
    +
    46 s16 temp_v0 = arg2->flags;
    47
    -
    48 if ((temp_v0 & 0x800) != 0) { return; }
    +
    48 if ((temp_v0 & 0x800) != 0) { return; }
    49
    -
    50 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    50 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    51
    -
    52 if (temp_f0 < 0.0f) { return; }
    +
    52 if (temp_f0 < 0.0f) { return; }
    53
    -
    54 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    54 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    55 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    56 }
    -
    57 arg1[3][0] = arg2->pos[0];
    -
    58 arg1[3][1] = arg2->pos[1];
    -
    59 arg1[3][2] = arg2->pos[2];
    +
    57 arg1[3][0] = arg2->pos[0];
    +
    58 arg1[3][1] = arg2->pos[1];
    +
    59 arg1[3][2] = arg2->pos[2];
    60
    -
    61 if (render_set_position(arg1, 0) != 0) {
    -
    62 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    63 gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_tree);
    +
    61 if (render_set_position(arg1, 0) != 0) {
    +
    62 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    63 gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_tree);
    64 }
    65}
    66
    -
    74void render_actor_tree_royal_raceway(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    75 f32 temp_f0;
    -
    76 s16 temp_v0 = arg2->flags;
    +
    74void render_actor_tree_royal_raceway(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    75 f32 temp_f0;
    +
    76 s16 temp_v0 = arg2->flags;
    77
    -
    78 if ((temp_v0 & 0x800) != 0) { return; }
    +
    78 if ((temp_v0 & 0x800) != 0) { return; }
    79
    -
    80 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    80 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    81
    -
    82 if (temp_f0 < 0.0f) { return; }
    +
    82 if (temp_f0 < 0.0f) { return; }
    83
    -
    84 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    84 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    85 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    86 }
    -
    87 arg1[3][0] = arg2->pos[0];
    -
    88 arg1[3][1] = arg2->pos[1];
    -
    89 arg1[3][2] = arg2->pos[2];
    +
    87 arg1[3][0] = arg2->pos[0];
    +
    88 arg1[3][1] = arg2->pos[1];
    +
    89 arg1[3][2] = arg2->pos[2];
    90
    -
    91 if (render_set_position(arg1, 0) != 0) {
    -
    92 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    93 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_tree);
    +
    91 if (render_set_position(arg1, 0) != 0) {
    +
    92 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    93 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_tree);
    94 }
    95}
    96
    -
    104void render_actor_tree_moo_moo_farm(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    105 f32 temp_f0;
    -
    106 s16 temp_v0 = arg2->flags;
    +
    104void render_actor_tree_moo_moo_farm(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    105 f32 temp_f0;
    +
    106 s16 temp_v0 = arg2->flags;
    107
    -
    108 if ((temp_v0 & 0x800) != 0) { return; }
    +
    108 if ((temp_v0 & 0x800) != 0) { return; }
    109
    -
    110 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 6250000.0f);
    +
    110 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 6250000.0f);
    111
    -
    112 if (temp_f0 < 0.0f) { return; }
    +
    112 if (temp_f0 < 0.0f) { return; }
    113
    -
    114 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 600.0f)) {
    +
    114 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 600.0f)) {
    115 func_8029794C(arg2->pos, arg2->rot, 5.0f);
    116 }
    -
    117 arg1[3][0] = arg2->pos[0];
    -
    118 arg1[3][1] = arg2->pos[1];
    -
    119 arg1[3][2] = arg2->pos[2];
    +
    117 arg1[3][0] = arg2->pos[0];
    +
    118 arg1[3][1] = arg2->pos[1];
    +
    119 arg1[3][2] = arg2->pos[2];
    120
    -
    121 if (render_set_position(arg1, 0) != 0) {
    -
    122 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    123 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree);
    +
    121 if (render_set_position(arg1, 0) != 0) {
    +
    122 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    123 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree);
    124 }
    125}
    126
    127// have all the properties of the tree
    -
    128void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    129 f32 temp_f0;
    -
    130 s16 temp_v0 = arg2->flags;
    +
    128void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    129 f32 temp_f0;
    +
    130 s16 temp_v0 = arg2->flags;
    131
    -
    132 if ((temp_v0 & 0x800) != 0) { return; }
    +
    132 if ((temp_v0 & 0x800) != 0) { return; }
    133
    -
    134 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    134 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    135
    -
    136 if (temp_f0 < 0.0f) { return; }
    +
    136 if (temp_f0 < 0.0f) { return; }
    137
    -
    138 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    138 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    139 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    140 }
    -
    141 arg1[3][0] = arg2->pos[0];
    -
    142 arg1[3][1] = arg2->pos[1];
    -
    143 arg1[3][2] = arg2->pos[2];
    +
    141 arg1[3][0] = arg2->pos[0];
    +
    142 arg1[3][1] = arg2->pos[1];
    +
    143 arg1[3][2] = arg2->pos[2];
    144
    -
    145 if (render_set_position(arg1, 0) != 0) {
    -
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    145 if (render_set_position(arg1, 0) != 0) {
    +
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    147 // Why is a TLUT being used a DL here? That makes no sense
    148 // Based on the TLUT being loaded above, this ought to be be another
    149 // tree related DL, presumably one found in a course other than Moo Moo farm
    150 // 0x0600FC70
    -
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    +
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    152 }
    153}
    154
    -
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    163 f32 temp_f0;
    -
    164 s16 temp_v0 = arg2->flags;
    +
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    163 f32 temp_f0;
    +
    164 s16 temp_v0 = arg2->flags;
    165
    -
    166 if ((temp_v0 & 0x800) != 0) { return; }
    +
    166 if ((temp_v0 & 0x800) != 0) { return; }
    167
    -
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    169
    -
    170 if (temp_f0 < 0.0f) { return; }
    +
    170 if (temp_f0 < 0.0f) { return; }
    171
    -
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    173 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    174 }
    -
    175 arg1[3][0] = arg2->pos[0];
    -
    176 arg1[3][1] = arg2->pos[1];
    -
    177 arg1[3][2] = arg2->pos[2];
    +
    175 arg1[3][0] = arg2->pos[0];
    +
    176 arg1[3][1] = arg2->pos[1];
    +
    177 arg1[3][2] = arg2->pos[2];
    178
    -
    179 if (render_set_position(arg1, 0) != 0) {
    -
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    +
    179 if (render_set_position(arg1, 0) != 0) {
    +
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    182 }
    183}
    184
    -
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    193 f32 temp_f0;
    -
    194 s16 temp_v0 = arg2->flags;
    +
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    193 f32 temp_f0;
    +
    194 s16 temp_v0 = arg2->flags;
    195
    196 if ((temp_v0 & 0x800) != 0) { return; }
    197
    diff --git a/wario__stadium_2course__data_8c.html b/wario__stadium_2course__data_8c.html index 387a9844b..258a5dd03 100644 --- a/wario__stadium_2course__data_8c.html +++ b/wario__stadium_2course__data_8c.html @@ -450,7 +450,7 @@ Variables
    d_course_wario_stadium_packed_dl_4218
    Gfx d_course_wario_stadium_packed_dl_4218[]
    Definition course_displaylists.inc.c:2649
    d_course_wario_stadium_packed_dl_5888
    Gfx d_course_wario_stadium_packed_dl_5888[]
    Definition course_displaylists.inc.c:3475
    d_course_wario_stadium_packed_dl_4BA8
    Gfx d_course_wario_stadium_packed_dl_4BA8[]
    Definition course_displaylists.inc.c:3007
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/wario__stadium_2course__data_8h.html b/wario__stadium_2course__data_8h.html index fa6f8f05b..5b98ef9fd 100644 --- a/wario__stadium_2course__data_8h.html +++ b/wario__stadium_2course__data_8h.html @@ -418,7 +418,7 @@ Variables
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/wario__stadium_2course__offsets_8c.html b/wario__stadium_2course__offsets_8c.html index 844180e31..041a0af3f 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[]