diff --git a/banshee__boardwalk_2course__data_8c.html b/banshee__boardwalk_2course__data_8c.html index 2f0a917b8..939d19723 100644 --- a/banshee__boardwalk_2course__data_8c.html +++ b/banshee__boardwalk_2course__data_8c.html @@ -671,7 +671,7 @@ Variables
gsSPEndDisplayList(),
}
gCourseMaxZ
s16 gCourseMaxZ
Definition code_800029B0.c:93
-
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 f60e8596f..72b9788aa 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 2a25d6dbd..8888e6745 100644 --- a/basics.js +++ b/basics.js @@ -26,7 +26,7 @@ var basics = [ "Players", "controlflow.html#players", null ], [ "Actors", "controlflow.html#actors-1", null ], [ "Objects", "controlflow.html#objects-1", null ], - [ "Courses", "controlflow.html#courses-1", [ + [ "Courses", "controlflow.html#courses", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], [ "UI & Other 2D Screen data", "controlflow.html#ui--other-2d-screen-data", null ], diff --git a/big__donut_2course__data_8c.html b/big__donut_2course__data_8c.html index 64397fc44..d9f52a6ed 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 a0ac9a8a0..9283306e6 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 5783b365a..5724ed8bb 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -178,7 +178,7 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
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));
+
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;
diff --git a/ceremony__and__credits_8c.html b/ceremony__and__credits_8c.html index b68eb5aab..0a565babd 100644 --- a/ceremony__and__credits_8c.html +++ b/ceremony__and__credits_8c.html @@ -1008,7 +1008,7 @@ Here is the caller graph for this function:
-
Todo
Cast to normal Camera? Or from CinematicCamera?
+
Todo
Cast to normal Camera? Or from CinematicCamera?
Here is the call graph for this function:
@@ -1295,7 +1295,7 @@ Here is the caller graph for this function:
-
Todo
Does this match as a return of s8?
+
Todo
Does this match as a return of s8?
Here is the call graph for this function:
@@ -2367,7 +2367,7 @@ Here is the call graph for this function:
-
Todo
What does this even do?
+
Todo
What does this even do?
Here is the call graph for this function:
diff --git a/ceremony__and__credits_8h.html b/ceremony__and__credits_8h.html index 137e34dda..94e0dbd4c 100644 --- a/ceremony__and__credits_8h.html +++ b/ceremony__and__credits_8h.html @@ -955,7 +955,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:
@@ -2197,7 +2197,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 01c9eead1..627cb3a2f 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,7 +211,6 @@ Variables
{0x00000000, 0x0000, 0x0000, 0x0},
}
u8 gTexture64FBF4[]
-
u8 gTexture653DB0[]
u8 gTexture67B864[]
u8 gTexture65315C[]
u8 gTexture679C04[]
@@ -227,6 +226,7 @@ Variables
u8 gTexture64619C[]
u8 gTextureSignBackside[]
u8 gTexture6774D8[]
+
u8 gTexture653DB0[]
u8 gTextureSignFallingRocks[]
u8 gTexture647F4C[]
u8 gTexture67DC20[]
diff --git a/code__80005FD0_8c.html b/code__80005FD0_8c.html index 970b61b5c..e54339bd6 100644 --- a/code__80005FD0_8c.html +++ b/code__80005FD0_8c.html @@ -2947,7 +2947,7 @@ Here is the caller graph for this function:
-
Todo
Confirm this comment
+
Todo
Confirm this comment
Here is the call graph for this function:
diff --git a/code__80005FD0_8h.html b/code__80005FD0_8h.html index 24e211cdd..4c69d0db4 100644 --- a/code__80005FD0_8h.html +++ b/code__80005FD0_8h.html @@ -2690,7 +2690,7 @@ Here is the caller graph for this function:
-
Todo
Confirm this comment
+
Todo
Confirm this comment
Here is the call graph for this function:
diff --git a/code__80091750_8c.html b/code__80091750_8c.html index 8fb1d33b9..526f12541 100644 --- a/code__80091750_8c.html +++ b/code__80091750_8c.html @@ -1879,7 +1879,7 @@ Here is the caller graph for this function:
-
Todo
These sizes need to be sizeof() for shiftability if possible
+
Todo
These sizes need to be sizeof() for shiftability if possible
Here is the call graph for this function:
@@ -12162,7 +12162,7 @@ Here is the caller graph for this function:
-
Todo
Move gGfxPool out of main.h
+
Todo
Move gGfxPool out of main.h
diff --git a/code__80091750_8h.html b/code__80091750_8h.html index 2f760eb51..8e550ef62 100644 --- a/code__80091750_8h.html +++ b/code__80091750_8h.html @@ -2057,7 +2057,7 @@ Here is the caller graph for this function:
-
Todo
These sizes need to be sizeof() for shiftability if possible
+
Todo
These sizes need to be sizeof() for shiftability if possible
Here is the call graph for this function:
@@ -13150,7 +13150,7 @@ Here is the caller graph for this function:
-
Todo
Move gGfxPool out of main.h
+
Todo
Move gGfxPool out of main.h
diff --git a/code__80281780_8c.html b/code__80281780_8c.html index 2aa52b199..427df7a0b 100644 --- a/code__80281780_8c.html +++ b/code__80281780_8c.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/code__80281780_8h.html b/code__80281780_8h.html index 72e5eb8c6..affe4d396 100644 --- a/code__80281780_8h.html +++ b/code__80281780_8h.html @@ -165,7 +165,7 @@ Variables
-
Todo
confirm this.
+
Todo
confirm this.
Here is the call graph for this function:
diff --git a/controlflow.html b/controlflow.html index a76321aa4..bb49c133d 100644 --- a/controlflow.html +++ b/controlflow.html @@ -112,7 +112,7 @@ $(function(){initNavTree('controlflow.html',''); initResizable(); });
  • Players
  • Actors
  • Objects
  • -
  • Courses
  • -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/navtreeindex104.js b/navtreeindex104.js index 470e55321..642b1d14b 100644 --- a/navtreeindex104.js +++ b/navtreeindex104.js @@ -57,10 +57,10 @@ var NAVTREEINDEX104 = "structALSound__s.html#ae6cc6bf2664502a9c86ed4531391fd7f":[7,0,40,0], "structALSound__s.html#aff53a80677e56bccd8a77015b3fa8c47":[7,0,40,2], "structALWaveTable__s.html":[7,0,41], -"structALWaveTable__s.html#a0ae684e1bea66ae6e0ac6c26112a4e0e":[7,0,41,6], "structALWaveTable__s.html#a0e0fc820a7b7c2c8dcdfe38e60c0fa25":[7,0,41,4], "structALWaveTable__s.html#a42402da278ae304efe7ff64ce3d1983f":[7,0,41,3], "structALWaveTable__s.html#a8b00d48faf540e97599e88086d7c9ba5":[7,0,41,1], +"structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4":[7,0,41,6], "structALWaveTable__s.html#aa9aafaec1f56b5cb5a16e7bfde1c3bd9":[7,0,41,0], "structALWaveTable__s.html#acc769d06bf577d20eeb968567b0e905e":[7,0,41,2], "structALWaveTable__s.html#aebc02789aef2309a8a3d1dce0975b043":[7,0,41,5], diff --git a/navtreeindex113.js b/navtreeindex113.js index 6db8b13d1..0c43e84fe 100644 --- a/navtreeindex113.js +++ b/navtreeindex113.js @@ -31,8 +31,8 @@ var NAVTREEINDEX113 = "structunexpiredActors.html#ac078e39059e87df951857931426d370a":[7,0,213,1], "structunkStruct.html":[7,0,227], "structunkStruct.html#a396a48d87f773dfd1879879953ea4944":[7,0,227,0], -"structunkStruct.html#a42c72afe2bb11fb995032210f3fd870a":[7,0,227,2], "structunkStruct.html#a42c72afe2bb11fb995032210f3fd870a":[7,0,227,1], +"structunkStruct.html#a42c72afe2bb11fb995032210f3fd870a":[7,0,227,2], "structunkStruct.html#a73560f27f24832f5216166ac22e5f607":[7,0,227,6], "structunkStruct.html#a74daa572feb494ae94f9bce49bb8a2cd":[7,0,227,3], "structunkStruct.html#a9405c1027e1922776b95b7a71d6ad6bf":[7,0,227,4], diff --git a/navtreeindex126.js b/navtreeindex126.js index 97f16fff1..7bc70b1ff 100644 --- a/navtreeindex126.js +++ b/navtreeindex126.js @@ -95,10 +95,10 @@ var NAVTREEINDEX126 = "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,4], "uniondu.html#a1350494c6a09b425b926250e9b10b5c9":[7,0,75,2], "uniondu.html#a258273f21784ceba6533c8bd20bc8bc0":[7,0,75,0], -"uniondu.html#a490dba023fb0b686d9a03b51508bcfad":[7,0,75,4], -"uniondu.html#a9e9d23cf0353aa7609b667deb1530e03":[7,0,75,3], +"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 fd14121de..cf0318588 100644 --- a/navtreeindex26.js +++ b/navtreeindex26.js @@ -144,7 +144,7 @@ var NAVTREEINDEX26 = "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":[1,2,4,4], +"controlflow.html#courses":[1,2,4,4], "controlflow.html#ending":[1,2,4,8], "controlflow.html#engine":[1,2,4,6], "controlflow.html#math":[1,2,4,7], diff --git a/navtreeindex27.js b/navtreeindex27.js index c2fd941bd..735dfeae6 100644 --- a/navtreeindex27.js +++ b/navtreeindex27.js @@ -152,7 +152,7 @@ var NAVTREEINDEX27 = "course__offsets_8h.html":[8,0,2,7], "course__offsets_8h_source.html":[8,0,2,7], "courses.html":[2,0], -"courses.html#courses":[2,0,0], +"courses.html#courses-1":[2,0,0], "coursesmenu.html":[2], "cow_2render_8inc_8c.html":[8,0,3,0,4,0], "cow_2render_8inc_8c.html#a3032e5759fffafb766e96e1991ab0350":[8,0,3,0,4,0,0], diff --git a/navtreeindex39.js b/navtreeindex39.js index 46e77484e..ca689f90c 100644 --- a/navtreeindex39.js +++ b/navtreeindex39.js @@ -97,14 +97,14 @@ var NAVTREEINDEX39 = "gfx__output__buffer_8h.html#aa6e89ad26a571573a3618e8bd57f2fcd":[8,0,3,2,2,1], "gfx__output__buffer_8h.html#acd645401a3e14e342cad25f6471ef97a":[8,0,3,2,2,0], "gfx__output__buffer_8h_source.html":[8,0,3,2,2], -"globals.html":[8,1,0], "globals.html":[8,1,0,0], +"globals.html":[8,1,0], "globals_a.html":[8,1,0,1], "globals_b.html":[8,1,0,2], "globals_c.html":[8,1,0,3], "globals_d.html":[8,1,0,4], -"globals_defs.html":[8,1,6], "globals_defs.html":[8,1,6,0], +"globals_defs.html":[8,1,6], "globals_defs_a.html":[8,1,6,1], "globals_defs_b.html":[8,1,6,2], "globals_defs_c.html":[8,1,6,3], @@ -134,8 +134,8 @@ var NAVTREEINDEX39 = "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,0], "globals_func.html":[8,1,1], +"globals_func.html":[8,1,1,0], "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/navtreeindex65.js b/navtreeindex65.js index bbe7f3df6..55601bea1 100644 --- a/navtreeindex65.js +++ b/navtreeindex65.js @@ -187,8 +187,8 @@ var NAVTREEINDEX65 = "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/objects_8h.html b/objects_8h.html index 0580074d2..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/osPiRawStartDma_8c.html b/osPiRawStartDma_8c.html index 434040118..f43ee41df 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 3509a0d13..9628404cc 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 4fdaa40bd..65d4a9c3d 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 fae10b5d2..80c1aa8b5 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 86b5884ac..ca6c516ec 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 9840232db..44c259252 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 f705c6ebb..ed2283d8f 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/rainbow__road_2course__data_8c.html b/rainbow__road_2course__data_8c.html index 2244fcff4..d8b86b6df 100644 --- a/rainbow__road_2course__data_8c.html +++ b/rainbow__road_2course__data_8c.html @@ -695,7 +695,7 @@ Variables
    G_IM_FMT_IA
    #define G_IM_FMT_IA
    Definition gbi.h:399
    G_RM_AA_ZB_XLU_SURF2
    #define G_RM_AA_ZB_XLU_SURF2
    Definition gbi.h:944
    G_ON
    #define G_ON
    Definition mbi.h:54
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/rainbow__road_2course__data_8h.html b/rainbow__road_2course__data_8h.html index caab1e004..f97d29a0e 100644 --- a/rainbow__road_2course__data_8h.html +++ b/rainbow__road_2course__data_8h.html @@ -595,7 +595,7 @@ Variables
    -
    Todo
    Replace addresses with variables
    +
    Todo
    Replace addresses with variables
    diff --git a/search/all_19.js b/search/all_19.js index 32e73d790..1d47e0097 100644 --- a/search/all_19.js +++ b/search/all_19.js @@ -20,7 +20,7 @@ var searchData= ['watchlo_5fvalidmask_17',['WATCHLO_VALIDMASK',['../R4300_8h.html#a55fdad7366f8ba76401505cac62053ce',1,'R4300.h']]], ['watchlo_5fwtrap_18',['WATCHLO_WTRAP',['../R4300_8h.html#a0a8e20512cbeb46cf186698b59425afd',1,'R4300.h']]], ['waveid_19',['waveId',['../structNotePlaybackState.html#a42402672c3ba2a53b238c7adb4897d59',1,'NotePlaybackState::waveId'],['../structNote.html#a735fb38930defbb072e29145b7cddebb',1,'Note::waveId']]], - ['waveinfo_20',['waveInfo',['../structALWaveTable__s.html#a0ae684e1bea66ae6e0ac6c26112a4e0e',1,'ALWaveTable_s']]], + ['waveinfo_20',['waveInfo',['../structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4',1,'ALWaveTable_s']]], ['wavetable_21',['wavetable',['../structALSound__s.html#a8bb355521feffe02dfa992b5fd23ae87',1,'ALSound_s']]], ['waypointend_22',['waypointEnd',['../structKartAIBehaviour.html#a49ef05db0dffad276cacd95c1add1cff',1,'KartAIBehaviour']]], ['waypointindex_23',['waypointIndex',['../structBombKartSpawn.html#a2433b7d49cd9dbe30178490a1c5996a0',1,'BombKartSpawn::waypointIndex'],['../structBombKart.html#a525c7c5d643f877e4ad83c936813af2b',1,'BombKart::waypointIndex'],['../structTrainCarStuff.html#ad30b566d920820973b38f352776fba66',1,'TrainCarStuff::waypointIndex'],['../structPaddleBoatStuff.html#afbb8a16053d3ce4f36a7e71b8606c0f6',1,'PaddleBoatStuff::waypointIndex'],['../structVehicleStuff.html#abf63879b2d12bc756cc5d0e7f2509040',1,'VehicleStuff::waypointIndex']]], @@ -37,7 +37,7 @@ var searchData= ['windows_34',['Windows',['../compiling.html#windows',1,'']]], ['windowsize_35',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], ['wood_5fbridge_36',['WOOD_BRIDGE',['../common__structs_8h.html#a5344f2bdca4f9506c40f044e08ea8c98a42cbce75b358c45ca5ca25e555dddc6c',1,'common_structs.h']]], - ['word_37',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a9e9d23cf0353aa7609b667deb1530e03',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], + ['word_37',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], ['work_38',['How Actors Work',['../actors.html',1,'actorsmenu']]], ['wrapper_5fupdate_5fboos_39',['wrapper_update_boos',['../update__objects_8c.html#a33a1f1842134707236eefdf272dfdbae',1,'update_objects.c']]], ['write_5fdashes_40',['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_5.js b/search/all_5.js index 5a119a7a7..57854c07f 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -406,7 +406,7 @@ var searchData= ['courseindex_403',['courseIndex',['../structstruct__8018EE10__entry.html#acee952c37d3917fd90809e58c6401e65',1,'struct_8018EE10_entry']]], ['courserecords_404',['courseRecords',['../structCupTimeTrialRecords.html#acf18ab0e69f90a2eefe248ef7090bd1c',1,'CupTimeTrialRecords']]], ['courses_405',['COURSES',['../common__structs_8h.html#acf250ad4ca05ca435a61203c41d4ca88',1,'common_structs.h']]], - ['courses_406',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses',1,'Courses'],['../controlflow.html#courses-1',1,'Courses']]], + ['courses_406',['Courses',['../courses.html',1,'Courses'],['../coursesmenu.html',1,'Courses'],['../courses.html#courses-1',1,'Courses'],['../controlflow.html#courses',1,'Courses']]], ['courses_2emd_407',['courses.md',['../courses_8md.html',1,'']]], ['coursesmenu_2emd_408',['coursesmenu.md',['../coursesmenu_8md.html',1,'']]], ['coursetable_409',['CourseTable',['../structCourseTable.html',1,'']]], diff --git a/search/variables_17.js b/search/variables_17.js index be2c8d2be..a391c16f0 100644 --- a/search/variables_17.js +++ b/search/variables_17.js @@ -11,7 +11,7 @@ var searchData= ['wario_5fstadium_5ftextures_8',['wario_stadium_textures',['../all__course__offsets_8h.html#afb2d218c3ac46e16ee4d7938502db297',1,'wario_stadium_textures: course_offsets.c'],['../courseTable_8h.html#a31c7877a7347c7a71f52aa41b1f16803',1,'wario_stadium_textures: course_offsets.c'],['../wario__stadium_2course__offsets_8c.html#a377ad398269c408a9628e432c39dbe05',1,'wario_stadium_textures: course_offsets.c']]], ['wassoftreset_9',['wasSoftReset',['../main_8c.html#a2fa45adadd9db50419593273a86d5875',1,'wasSoftReset: main.c'],['../main_8h.html#a2fa45adadd9db50419593273a86d5875',1,'wasSoftReset: main.c']]], ['waveid_10',['waveId',['../structNotePlaybackState.html#a42402672c3ba2a53b238c7adb4897d59',1,'NotePlaybackState::waveId'],['../structNote.html#a735fb38930defbb072e29145b7cddebb',1,'Note::waveId']]], - ['waveinfo_11',['waveInfo',['../structALWaveTable__s.html#a0ae684e1bea66ae6e0ac6c26112a4e0e',1,'ALWaveTable_s']]], + ['waveinfo_11',['waveInfo',['../structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4',1,'ALWaveTable_s']]], ['wavetable_12',['wavetable',['../structALSound__s.html#a8bb355521feffe02dfa992b5fd23ae87',1,'ALSound_s']]], ['waypointend_13',['waypointEnd',['../structKartAIBehaviour.html#a49ef05db0dffad276cacd95c1add1cff',1,'KartAIBehaviour']]], ['waypointindex_14',['waypointIndex',['../structBombKartSpawn.html#a2433b7d49cd9dbe30178490a1c5996a0',1,'BombKartSpawn::waypointIndex'],['../structBombKart.html#a525c7c5d643f877e4ad83c936813af2b',1,'BombKart::waypointIndex'],['../structTrainCarStuff.html#ad30b566d920820973b38f352776fba66',1,'TrainCarStuff::waypointIndex'],['../structPaddleBoatStuff.html#afbb8a16053d3ce4f36a7e71b8606c0f6',1,'PaddleBoatStuff::waypointIndex'],['../structVehicleStuff.html#abf63879b2d12bc756cc5d0e7f2509040',1,'VehicleStuff::waypointIndex']]], @@ -24,6 +24,6 @@ var searchData= ['wheelrot_21',['wheelRot',['../structTrainCar.html#a3e4c6d1091b4cf5a1683496409bda622',1,'TrainCar::wheelRot'],['../structPaddleWheelBoat.html#a500f0d5169fa8601aaba11cf13514b28',1,'PaddleWheelBoat::wheelRot']]], ['width_22',['width',['../structprintf__struct.html#ad8c9b5c908f18b8933081ae4b8f19b3a',1,'printf_struct::width'],['../structMkTexture.html#a6064846bc000f2003938cd14d4e62ff6',1,'MkTexture::width'],['../structOSViCommonRegs.html#a36050d774fce0c7479165a54e61296aa',1,'OSViCommonRegs::width']]], ['windowsize_23',['windowSize',['../structReverbSettingsEU.html#a5cb7d8eaeef42b0369bd170bca7ed72f',1,'ReverbSettingsEU::windowSize'],['../structSynthesisReverb.html#ac33541fe1dc1f814a10cbc97b86b8d4d',1,'SynthesisReverb::windowSize']]], - ['word_24',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a9e9d23cf0353aa7609b667deb1530e03',1,'du::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word']]], + ['word_24',['word',['../unionGameModePack.html#a070413d3976e79c9be223f8ab02369b7',1,'GameModePack::word'],['../uniondu.html#a490dba023fb0b686d9a03b51508bcfad',1,'du::word'],['../uniondu.html#a06928fe4577a2d3ae425f6df73fbef26',1,'du::word']]], ['wut_25',['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/some__data_8c.html b/some__data_8c.html index 5fc0d3568..b1598cc91 100644 --- a/some__data_8c.html +++ b/some__data_8c.html @@ -2354,7 +2354,7 @@ Variables
    0xff25, 0xffed, 0x0320,
    0xffca, 0xfff8, 0x0270,
    }
    -
    Todo
    fix this extern
    +
    Todo
    fix this extern
    diff --git a/structALWaveTable__s.html b/structALWaveTable__s.html index ac02f1f28..e80a29691 100644 --- a/structALWaveTable__s.html +++ b/structALWaveTable__s.html @@ -123,14 +123,14 @@ Data Fields   u8 flags   -union {  +union {    -   ALADPCMWaveInfo   adpcmWave  -  -   ALRAWWaveInfo   rawWave  -  -} waveInfo  -  +   ALADPCMWaveInfo   adpcmWave  +  +   ALRAWWaveInfo   rawWave  +  +} waveInfo  + 

    Field Documentation

    @@ -217,8 +217,8 @@ Data Fields - -

    ◆ [union]

    + +

    ◆ [union]

    diff --git a/structALWaveTable__s.js b/structALWaveTable__s.js index 892032e7b..d7e8e274b 100644 --- a/structALWaveTable__s.js +++ b/structALWaveTable__s.js @@ -6,5 +6,5 @@ var structALWaveTable__s = [ "len", "structALWaveTable__s.html#a42402da278ae304efe7ff64ce3d1983f", null ], [ "rawWave", "structALWaveTable__s.html#a0e0fc820a7b7c2c8dcdfe38e60c0fa25", null ], [ "type", "structALWaveTable__s.html#aebc02789aef2309a8a3d1dce0975b043", null ], - [ "waveInfo", "structALWaveTable__s.html#a0ae684e1bea66ae6e0ac6c26112a4e0e", null ] + [ "waveInfo", "structALWaveTable__s.html#a9c57eb36c46ed8f511614226ee96e4f4", null ] ]; \ No newline at end of file diff --git a/todo.html b/todo.html index 1a854a7ff..c976b6fd7 100644 --- a/todo.html +++ b/todo.html @@ -121,7 +121,7 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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)
    @@ -129,13 +129,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global D_02007BB8 []
    Place all these vertices in a single array
    Global D_800E43B0 []
    -
    unused?
    +
    unused?
    Global D_8018D9B0
    -
    Move gGfxPool out of main.h
    +
    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 []
    @@ -151,9 +151,9 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global d_course_mario_raceway_dl_0 []
    Replace addresses with variables
    Global d_course_moo_moo_farm_dl_0 []
    -
    Replace addresses with variables
    -
    Global d_course_rainbow_road_dl_0 []
    Replace addresses with variables
    +
    Global d_course_rainbow_road_dl_0 []
    +
    Replace addresses with variables
    Global d_course_royal_raceway_dl_0 []
    Replace addresses with variables
    Global d_course_sherbet_land_dl_0 []
    @@ -165,7 +165,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 fill2
    0x00000000800f624c fill2
    Global func_800100F0 (s32)
    -
    Confirm this comment
    +
    Confirm this comment
    Global func_80028864 (Player *, Camera *, s8, s8)
    make a proper match
    Global func_80046030 (u8 *tlut, u8 *texture, Vtx *arg2, s32 width, s32 arg4, s32 height)
    @@ -187,15 +187,15 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global func_800745C8 (s32 objectIndex, s32 arg1)
    arg1 should likely be a u8 *
    Global func_80091FA4 (void)
    -
    These sizes need to be sizeof() for shiftability if possible
    +
    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.
    Global gen_random_item (s16 rank, s16 isCpu)
    @@ -203,15 +203,15 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    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
    -
    name
    +
    name
    Global LEO_CMD_TYPE_1
    -
    name
    +
    name
    Global LEO_CMD_TYPE_2
    -
    name
    +
    name
    Global load_surface_map (uintptr_t, struct UnkStruct_800DC5EC *)
    Should be Gfx*
    Global M_TASK_FLAG0
    @@ -229,13 +229,13 @@ $(function(){initNavTree('todo.html',''); initResizable(); });
    Global osPfsDeleteFile (OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name)
    magic constant
    Global osPiStartDma (OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq)
    -
    name magic constants
    +
    name magic constants
    Global osRomBase
    -
    figure out why this is like this
    +
    figure out why this is like this
    Global osViBlack (u8 active)
    -
    name magic constants
    +
    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 fadd6588f..8d71360d0 100644 --- a/train_2render_8inc_8c_source.html +++ b/train_2render_8inc_8c_source.html @@ -217,221 +217,222 @@ $(function(){initNavTree('train_2render_8inc_8c_source.html',''); initResizable(
    114 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    115
    116 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
    -
    117 vec3f_set(sp160, 17.0f, 12.0f, -34.0f);
    -
    118 mtxf_translate(spE0, sp160);
    -
    119 mtxf_multiplication(spA0, sp120, spE0);
    +
    117 vec3f_set(sp160, 17.0f, 12.0f, -34.0f);
    + +
    120
    -
    121 maxObjectsReached = render_set_position(spA0, 3) == 0;
    -
    122 if (maxObjectsReached) { return; }
    + +
    122 if (maxObjectsReached) { return; }
    123
    - -
    125 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    + +
    126
    -
    127 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
    -
    128 vec3f_set(sp160, -17.0f, 12.0f, -34.0f);
    -
    129 mtxf_translate(spE0, sp160);
    -
    130 mtxf_multiplication(spA0, sp120, spE0);
    +
    127 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
    +
    128 vec3f_set(sp160, -17.0f, 12.0f, -34.0f);
    + +
    131
    -
    132 maxObjectsReached = render_set_position(spA0, 3) == 0;
    -
    133 if (maxObjectsReached) { return; }
    + +
    133 if (maxObjectsReached) { return; }
    134
    - -
    136 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    137 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    + + +
    138}
    139
    -
    140void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
    -
    141 Mat4 sp120;
    -
    142 Vec3f sp160;
    -
    143 Mat4 spE0;
    -
    144 Mat4 spA0;
    + +
    141 Mat4 sp120;
    +
    142 Vec3f sp160;
    +
    143 Mat4 spE0;
    +
    144 Mat4 spA0;
    145
    -
    146 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 625.0f, gCameraZoom[camera - camera1], 9000000.0f);
    +
    146 f32 temp_f0 = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 625.0f, gCameraZoom[camera - camera1], 9000000.0f);
    147
    -
    148 if (temp_f0 < 0.0f) { return; }
    +
    148 if (temp_f0 < 0.0f) { return; }
    149
    -
    150 gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
    +
    151
    -
    152 mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
    -
    153 if (render_set_position(sp120, 0) == 0) { return; }
    + +
    153 if (render_set_position(sp120, 0) == 0) { return; }
    154
    -
    155 if (temp_f0 < 250000.0f) {
    +
    155 if (temp_f0 < 250000.0f) {
    156
    - +
    158
    -
    159 } else if (temp_f0 < 1000000.0f) {
    - +
    159 } else if (temp_f0 < 1000000.0f) {
    +
    161 } else {
    - +
    163 }
    -
    164 if (1440000.0f < temp_f0) { return; }
    +
    164 if (1440000.0f < temp_f0) { return; }
    165
    -
    166 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    - + +
    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);
    + +
    173
    -
    174 if (render_set_position(spA0, 3) == 0) { return; }
    +
    174 if (render_set_position(spA0, 3) == 0) { return; }
    175
    - -
    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);
    + +
    183
    -
    184 if (render_set_position(spA0, 3) == 0) { return; }
    +
    184 if (render_set_position(spA0, 3) == 0) { return; }
    185
    - -
    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);
    + +
    193
    -
    194 if (render_set_position(spA0, 3) == 0) { return; }
    +
    194 if (render_set_position(spA0, 3) == 0) { return; }
    195
    - -
    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);
    + +
    203
    -
    204 if (render_set_position(spA0, 3) == 0) { return; }
    - -
    206 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    207 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    +
    204 if (render_set_position(spA0, 3) == 0) { return; }
    + + +
    208}
    209
    - -
    211 Mat4 sp120;
    -
    212 Vec3f sp160;
    -
    213 Mat4 spE0;
    -
    214 Mat4 spA0;
    + +
    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);
    +
    221
    -
    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
    - - + +
    230
    -
    231 } else if (temp_f0 < 1000000.0f) {
    +
    231 } else if (temp_f0 < 1000000.0f) {
    232
    - - + +
    235 } else {
    - - + +
    238 }
    -
    239 if (1440000.0f < temp_f0) { return; }
    +
    239 if (1440000.0f < temp_f0) { return; }
    240
    -
    241 gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
    - + +
    243
    -
    244 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    245 vec3f_set(sp160, 17.0f, 6.0f, 28.0f);
    -
    246 mtxf_translate(spE0, sp160);
    -
    247 mtxf_multiplication(spA0, sp120, spE0);
    +
    244 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    245 vec3f_set(sp160, 17.0f, 6.0f, 28.0f);
    + +
    248
    -
    249 if (render_set_position(spA0, 3) == 0) { return; }
    +
    249 if (render_set_position(spA0, 3) == 0) { return; }
    250
    - -
    252 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    + +
    253
    -
    254 mtxf_rotate_x(sp120, actor->wheelRot);
    -
    255 vec3f_set(sp160, -17.0, 6.0f, 28.0f);
    -
    256 mtxf_translate(spE0, sp160);
    -
    257 mtxf_multiplication(spA0, sp120, spE0);
    +
    254 mtxf_rotate_x(sp120, actor->wheelRot);
    +
    255 vec3f_set(sp160, -17.0, 6.0f, 28.0f);
    + +
    258
    -
    259 if (render_set_position(spA0, 3) == 0) { return; }
    +
    259 if (render_set_position(spA0, 3) == 0) { return; }
    260
    - -
    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);
    + +
    268
    -
    269 if (render_set_position(spA0, 3) == 0) { return; }
    +
    269 if (render_set_position(spA0, 3) == 0) { return; }
    270
    - -
    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);
    + +
    278
    -
    279 if (render_set_position(spA0, 3) == 0) { return; }
    +
    279 if (render_set_position(spA0, 3) == 0) { return; }
    280
    - -
    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);
    + +
    288
    -
    289 if (render_set_position(spA0, 3) == 0) { return; }
    +
    289 if (render_set_position(spA0, 3) == 0) { return; }
    290
    - -
    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);
    -
    296 mtxf_translate(spE0, sp160);
    -
    297 mtxf_multiplication(spA0, sp120, spE0);
    +
    294 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
    +
    295 vec3f_set(sp160, -17.0f, 6.0f, -8.0f);
    + +
    298
    -
    299 if (render_set_position(spA0, 3) == 0) { return; }
    +
    299 if (render_set_position(spA0, 3) == 0) { return; }
    300
    - -
    302 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    + +
    303
    -
    304 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    -
    305 vec3f_set(sp160, 17.0f, 6.0f, -24.0f);
    -
    306 mtxf_translate(spE0, sp160);
    -
    307 mtxf_multiplication(spA0, sp120, spE0);
    +
    304 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    +
    305 vec3f_set(sp160, 17.0f, 6.0f, -24.0f);
    + +
    308
    -
    309 if (render_set_position(spA0, 3) == 0) { return; }
    +
    309 if (render_set_position(spA0, 3) == 0) { return; }
    310
    - -
    312 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    + +
    313
    -
    314 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    -
    315 vec3f_set(sp160, -17.0f, 6.0f, -24.0f);
    -
    316 mtxf_translate(spE0, sp160);
    -
    317 mtxf_multiplication(spA0, sp120, spE0);
    +
    314 mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
    +
    315 vec3f_set(sp160, -17.0f, 6.0f, -24.0f);
    + +
    318
    -
    319 if (render_set_position(spA0, 3) == 0) { return; }
    +
    319 if (render_set_position(spA0, 3) == 0) { return; }
    320
    - -
    322 gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
    -
    323 gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
    + + +
    324}
    Camera * camera1
    Definition camera.c:22
    +
    s16 gCourseMaxZ
    Definition code_800029B0.c:93
    f32 Vec3f[3]
    Definition common_structs.h:6
    f32 Mat4[4][4]
    Definition common_structs.h:16
    diff --git a/trees_2render_8inc_8c_source.html b/trees_2render_8inc_8c_source.html index aa60a57b9..bf2c1f583 100644 --- a/trees_2render_8inc_8c_source.html +++ b/trees_2render_8inc_8c_source.html @@ -231,73 +231,73 @@ $(function(){initNavTree('trees_2render_8inc_8c_source.html',''); initResizable(
    140 }
    141 arg1[3][0] = arg2->pos[0];
    142 arg1[3][1] = arg2->pos[1];
    -
    143 arg1[3][2] = arg2->pos[2];
    +
    143 arg1[3][2] = arg2->pos[2];
    144
    -
    145 if (render_set_position(arg1, 0) != 0) {
    -
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    145 if (render_set_position(arg1, 0) != 0) {
    +
    146 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    147 // Why is a TLUT being used a DL here? That makes no sense
    148 // Based on the TLUT being loaded above, this ought to be be another
    149 // tree related DL, presumably one found in a course other than Moo Moo farm
    150 // 0x0600FC70
    -
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    +
    151 gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
    152 }
    153}
    154
    -
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    163 f32 temp_f0;
    -
    164 s16 temp_v0 = arg2->flags;
    +
    162void render_actor_tree_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    163 f32 temp_f0;
    +
    164 s16 temp_v0 = arg2->flags;
    165
    -
    166 if ((temp_v0 & 0x800) != 0) { return; }
    +
    166 if ((temp_v0 & 0x800) != 0) { return; }
    167
    -
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    +
    168 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f);
    169
    -
    170 if (temp_f0 < 0.0f) { return; }
    +
    170 if (temp_f0 < 0.0f) { return; }
    171
    -
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    172 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    173 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    174 }
    -
    175 arg1[3][0] = arg2->pos[0];
    -
    176 arg1[3][1] = arg2->pos[1];
    -
    177 arg1[3][2] = arg2->pos[2];
    +
    175 arg1[3][0] = arg2->pos[0];
    +
    176 arg1[3][1] = arg2->pos[1];
    +
    177 arg1[3][2] = arg2->pos[2];
    178
    -
    179 if (render_set_position(arg1, 0) != 0) {
    -
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    +
    179 if (render_set_position(arg1, 0) != 0) {
    +
    180 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    181 gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
    182 }
    183}
    184
    -
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    193 f32 temp_f0;
    -
    194 s16 temp_v0 = arg2->flags;
    +
    192void render_actor_bush_bowser_castle(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    193 f32 temp_f0;
    +
    194 s16 temp_v0 = arg2->flags;
    195
    -
    196 if ((temp_v0 & 0x800) != 0) { return; }
    +
    196 if ((temp_v0 & 0x800) != 0) { return; }
    197
    -
    198 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f);
    +
    198 temp_f0 = is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 640000.0f);
    199
    -
    200 if (temp_f0 < 0.0f) { return; }
    +
    200 if (temp_f0 < 0.0f) { return; }
    201
    -
    202 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    +
    202 if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
    203 func_8029794C(arg2->pos, arg2->rot, 2.79999995f);
    204 }
    -
    205 arg1[3][0] = arg2->pos[0];
    -
    206 arg1[3][1] = arg2->pos[1];
    -
    207 arg1[3][2] = arg2->pos[2];
    +
    205 arg1[3][0] = arg2->pos[0];
    +
    206 arg1[3][1] = arg2->pos[1];
    +
    207 arg1[3][2] = arg2->pos[2];
    208
    -
    209 if (render_set_position(arg1, 0) != 0) {
    -
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    -
    211 gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
    +
    209 if (render_set_position(arg1, 0) != 0) {
    +
    210 gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_trees_import);
    +
    211 gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
    212 }
    213}
    214
    -
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    -
    223 f32 temp_f0;
    -
    224 s16 temp_v0 = arg2->flags;
    +
    222void render_actor_tree_frappe_snowland(Camera *camera, Mat4 arg1, struct Actor *arg2) {
    +
    223 f32 temp_f0;
    +
    224 s16 temp_v0 = arg2->flags;
    225
    226 if ((temp_v0 & 0x800) != 0) { return; }
    227
    diff --git a/uniondu.html b/uniondu.html index 8e81cb271..f21b48100 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,6 +123,14 @@ Data Fields   } word    +struct {  +  +   unsigned int   hi  +  +   unsigned int   lo  +  +} word  + 

    Detailed Description

    Todo
    is it possible to remove them somehow?
    @@ -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 d009dfebe..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#a9e9d23cf0353aa7609b667deb1530e03", 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 e9e837983..726b995af 100644 --- a/update__objects_8c.html +++ b/update__objects_8c.html @@ -946,7 +946,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:
    @@ -12157,7 +12157,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?