From 34abc6af6c9c3a32fa046ec20b7b2bca31602fd2 Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Sun, 3 May 2026 00:17:30 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20HarbourM?= =?UTF-8?q?asters/SpaghettiKart@e2cf6ecbb44489fd4cebdc6cdf95430338c5df15?= =?UTF-8?q?=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Game_8cpp.html | 2 +- Game_8h.html | 2 +- Game_8h_source.html | 2 +- Track_8h_source.html | 642 ++++++------- actor__types_8h_source.html | 892 +++++++++--------- actors_8h_source.html | 20 +- actors__extended_8h_source.html | 8 +- animation_8h.html | 5 +- animation_8h_source.html | 21 +- banana_2render_8inc_8c_source.html | 8 +- banana_2update_8inc_8c_source.html | 12 +- ...d__red__shells_2render_8inc_8c_source.html | 2 +- ...d__red__shells_2update_8inc_8c_source.html | 36 +- code__80005FD0_8c.html | 8 +- contpfs_8c.html | 10 +- controller_8h.html | 12 +- courses_2test__track_2data_8c.html | 2 +- doxygen_crawl.html | 19 +- fake__item__box_2render_8inc_8c_source.html | 12 +- fake__item__box_2update_8inc_8c_source.html | 16 +- falling__rock_2render_8inc_8c_source.html | 10 +- falling__rock_2update_8inc_8c_source.html | 14 +- functions_a.html | 2 +- functions_b.html | 2 +- functions_m.html | 2 +- functions_p.html | 2 +- functions_s.html | 2 +- functions_t.html | 2 +- functions_u.html | 2 +- functions_vars_a.html | 2 +- functions_vars_b.html | 2 +- functions_vars_m.html | 2 +- functions_vars_p.html | 2 +- functions_vars_s.html | 2 +- functions_vars_t.html | 2 +- functions_vars_u.html | 2 +- green__shell_2render_8inc_8c_source.html | 2 +- green__shell_2update_8inc_8c_source.html | 30 +- item__box_2render_8inc_8c_source.html | 12 +- item__box_2update_8inc_8c_source.html | 16 +- kiwano__fruit_2update_8inc_8c_source.html | 16 +- md_docs_2custom-audio.html | 2 +- md_docs_2custom-characters.html | 2 +- md_docs_2migrations.html | 2 +- md_docs_2mods-toml.html | 2 +- menu__items_8c.html | 4 +- menu__items_8h.html | 2 +- menus_8c.html | 2 +- navtreedata.js | 52 +- navtreeindex42.js | 8 +- navtreeindex73.js | 8 +- navtreeindex77.js | 28 +- navtreeindex78.js | 6 +- navtreeindex79.js | 6 +- navtreeindex80.js | 12 +- navtreeindex81.js | 8 +- navtreeindex82.js | 8 +- navtreeindex83.js | 8 +- navtreeindex84.js | 8 +- navtreeindex85.js | 8 +- navtreeindex86.js | 8 +- navtreeindex87.js | 8 +- navtreeindex88.js | 8 +- navtreeindex89.js | 8 +- navtreeindex90.js | 8 +- navtreeindex91.js | 8 +- navtreeindex92.js | 8 +- navtreeindex93.js | 8 +- navtreeindex94.js | 8 +- navtreeindex95.js | 8 +- navtreeindex96.js | 8 +- navtreeindex97.js | 8 +- navtreeindex98.js | 8 +- navtreeindex99.js | 3 + osContInit_8c.html | 2 +- osCreatePiManager_8c.html | 2 +- osEPiRawStartDma_8c.html | 6 +- osPfsDeleteFile_8c.html | 4 +- osPiGetCmdQueue_8c.html | 2 +- osPiRawStartDma_8c.html | 2 +- osPiStartDma_8c.html | 4 +- paddle__boat_2render_8inc_8c_source.html | 8 +- paddle__boat_2update_8inc_8c_source.html | 4 +- pak_8cpp.html | 2 +- palm__tree_2render_8inc_8c_source.html | 10 +- piint_8h.html | 2 +- piranha__plant_2render_8inc_8c_source.html | 10 +- piranha__plant_2update_8inc_8c_source.html | 10 +- ...road__crossing_2render_8inc_8c_source.html | 6 +- ...road__crossing_2update_8inc_8c_source.html | 6 +- search/all_10.js | 2 +- search/all_12.js | 2 +- search/all_13.js | 4 +- search/all_16.js | 4 +- search/all_17.js | 4 +- search/all_18.js | 2 +- search/all_4.js | 4 +- search/all_5.js | 2 +- search/all_9.js | 2 +- search/variables_1.js | 2 +- search/variables_10.js | 2 +- search/variables_13.js | 2 +- search/variables_14.js | 2 +- search/variables_15.js | 2 +- search/variables_2.js | 2 +- search/variables_d.js | 2 +- structActorSpawnData.html | 18 +- structActorSpawnData__coll__graph.md5 | 2 +- structActorSpawnData__coll__graph.svg | 4 +- structActorSpawnData__coll__graph_org.svg | 4 +- structArmature.html | 42 +- structArmature.js | 8 +- structArmature__coll__graph.map | 10 +- structArmature__coll__graph.md5 | 2 +- structArmature__coll__graph.svg | 34 +- structArmature__coll__graph_org.svg | 34 +- structBananaActor.html | 32 +- structBananaActor__coll__graph.md5 | 2 +- structBananaActor__coll__graph.svg | 4 +- structBananaActor__coll__graph_org.svg | 4 +- structRailroadCrossing.html | 64 +- structRailroadCrossing.js | 2 + structRailroadCrossing__coll__graph.map | 30 +- structRailroadCrossing__coll__graph.md5 | 2 +- structRailroadCrossing__coll__graph.svg | 232 +++-- structRailroadCrossing__coll__graph_org.svg | 173 ++-- structShellActor.html | 40 +- structShellActor__coll__graph.md5 | 2 +- structShellActor__coll__graph.svg | 8 +- structShellActor__coll__graph_org.svg | 8 +- structTrackSections.html | 40 +- structTrackSections.js | 1 + structTrackSections__coll__graph.map | 22 +- structTrackSections__coll__graph.md5 | 2 +- structTrackSections__coll__graph.svg | 151 ++- structTrackSections__coll__graph_org.svg | 92 +- stubs_8h.html | 2 +- todo.html | 38 +- uniondu.html | 4 +- yoshi__egg_2render_8inc_8c_source.html | 6 +- yoshi__egg_2update_8inc_8c_source.html | 14 +- 141 files changed, 1873 insertions(+), 1522 deletions(-) diff --git a/Game_8cpp.html b/Game_8cpp.html index 9aef8784d..ca5f6839a 100644 --- a/Game_8cpp.html +++ b/Game_8cpp.html @@ -2632,7 +2632,7 @@ Here is the caller graph for this function:
-
Todo
Move gGfxPool out of main.h
+
Todo
Move gGfxPool out of main.h
Here is the call graph for this function:
diff --git a/Game_8h.html b/Game_8h.html index e4bbb8c80..ac753f8ae 100644 --- a/Game_8h.html +++ b/Game_8h.html @@ -2545,7 +2545,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/Game_8h_source.html b/Game_8h_source.html index 4304f8681..c29455365 100644 --- a/Game_8h_source.html +++ b/Game_8h_source.html @@ -518,7 +518,7 @@ $(function(){initNavTree('Game_8h_source.html',''); initResizable(true); });
Camera
Definition camera.h:35
Collision
Definition common_structs.h:147
Player
Definition common_structs.h:264
-
Properties
Definition Track.h:90
+
Properties
Definition Track.h:93
ScreenContext
Definition code_800029B0.h:14
diff --git a/Track_8h_source.html b/Track_8h_source.html index 3fca26f16..d94ef7495 100644 --- a/Track_8h_source.html +++ b/Track_8h_source.html @@ -190,309 +190,312 @@ $(function(){initNavTree('Track_8h_source.html',''); initResizable(true); });
74
81typedef struct {
-
82 uint64_t crc;
-
83 u8 surfaceType; // Determines what kind of surface the player drives on (ex. dirt, asphalt, etc.)
-
84 u8 sectionId;
-
85 u16 clip; // enum in CustomTrack.h
-
86 u16 layer; // enum in CustomTrack.h
-
87 Vec3f location;
-
88} TrackSections;
+
82 union {
+
83 uint64_t crc;
+
84 void* model;
+
85 };
+
86 u8 surfaceType; // Determines what kind of surface the player drives on (ex. dirt, asphalt, etc.)
+
87 u8 sectionId;
+
88 u16 clip; // enum in CustomTrack.h
+
89 u16 layer; // enum in CustomTrack.h
+
90 Vec3f location;
+
91} TrackSections;
-
89
-
-
90typedef struct Properties {
-
91 char Name[128];
-
92 char DebugName[128];
-
93 char TrackLength[128];
-
94 int32_t LakituTowType;
-
95 MinimapProps Minimap;
-
96 const char* AIBehaviour;
-
97 float AIMaximumSeparation;
-
98 float AIMinimumSeparation;
-
99 float NearPersp;
-
100 float FarPersp;
-
101 int16_t* AIDistance;
-
102 uint32_t AISteeringSensitivity;
-
103 TrackPathSizes PathSizes;
-
104 Vec4f CurveTargetSpeed;
-
105 Vec4f NormalTargetSpeed;
-
106 Vec4f D_0D0096B8;
-
107 Vec4f OffTrackTargetSpeed;
-
108 TrackPathPoint* PathTable[4]; // Only used for podium ceremony
-
109 TrackPathPoint* PathTable2[5]; // The fifth entry is for vehicles
-
110 uint8_t* CloudTexture;
-
111 CloudData *Clouds;
-
112 CloudData *CloudList;
-
113 SkyboxColours Skybox;
-
114 enum MusicSeq Sequence;
-
115 float WaterLevel; // Used for effects, and Lakitu pick up height. Not necessarily the visual water model height.
-
116
-
117#ifdef __cplusplus
-
118 nlohmann::json to_json() const {
-
119 nlohmann::json j;
-
120 j["Name"] = Name ? Name : "";
-
121 j["DebugName"] = DebugName ? DebugName : "";
-
122 j["TrackLength"] = TrackLength ? TrackLength : "";
-
123 //j["AIBehaviour"] = AIBehaviour ? AIBehaviour : "";
-
124 j["LakituTowType"] = LakituTowType;
-
125 j["AIMaximumSeparation"] = AIMaximumSeparation;
-
126 j["AIMinimumSeparation"] = AIMinimumSeparation;
-
127 j["NearPersp"] = NearPersp;
-
128 j["FarPersp"] = FarPersp;
-
129
-
130 // AIDistance as a JSON array
-
131 j["AIDistance"] = std::vector<int16_t>(AIDistance, AIDistance + 32); // gAIDistances array size of 32
+
92
+
+
93typedef struct Properties {
+
94 char Name[128];
+
95 char DebugName[128];
+
96 char TrackLength[128];
+ + +
99 const char* AIBehaviour;
+ + + +
103 float FarPersp;
+
104 int16_t* AIDistance;
+ + + + + + +
111 TrackPathPoint* PathTable[4]; // Only used for podium ceremony
+
112 TrackPathPoint* PathTable2[5]; // The fifth entry is for vehicles
+
113 uint8_t* CloudTexture;
+ + + + +
118 float WaterLevel; // Used for effects, and Lakitu pick up height. Not necessarily the visual water model height.
+
119
+
120#ifdef __cplusplus
+
121 nlohmann::json to_json() const {
+
122 nlohmann::json j;
+
123 j["Name"] = Name ? Name : "";
+
124 j["DebugName"] = DebugName ? DebugName : "";
+
125 j["TrackLength"] = TrackLength ? TrackLength : "";
+
126 //j["AIBehaviour"] = AIBehaviour ? AIBehaviour : "";
+
127 j["LakituTowType"] = LakituTowType;
+
128 j["AIMaximumSeparation"] = AIMaximumSeparation;
+
129 j["AIMinimumSeparation"] = AIMinimumSeparation;
+
130 j["NearPersp"] = NearPersp;
+
131 j["FarPersp"] = FarPersp;
132
-
133 j["AISteeringSensitivity"] = AISteeringSensitivity;
-
134
-
135 // PathSizes - Assuming TrackPathSizes can be serialized similarly
-
136 // j["PathSizes"] = PathSizes; // Implement your serialization logic here
+
133 // AIDistance as a JSON array
+
134 j["AIDistance"] = std::vector<int16_t>(AIDistance, AIDistance + 32); // gAIDistances array size of 32
+
135
+
136 j["AISteeringSensitivity"] = AISteeringSensitivity;
137
-
138 j["CurveTargetSpeed"] = { CurveTargetSpeed[0], CurveTargetSpeed[1], CurveTargetSpeed[2], CurveTargetSpeed[3] };
-
139 j["NormalTargetSpeed"] = { NormalTargetSpeed[0], NormalTargetSpeed[1], NormalTargetSpeed[2], NormalTargetSpeed[3] };
-
140 j["D_0D0096B8"] = { D_0D0096B8[0], D_0D0096B8[1], D_0D0096B8[2], D_0D0096B8[3] };
-
141 j["OffTrackTargetSpeed"] = { OffTrackTargetSpeed[0], OffTrackTargetSpeed[1], OffTrackTargetSpeed[2], OffTrackTargetSpeed[3] };
-
142
-
143 // Serialize arrays PathTable and PathTable2 (convert pointers into a JSON array if possible)
-
144 //j["PathTable"] = {{}};
-
145 //j["PathTable2"] = {{}};
-
146 // Populate PathTable and PathTable2
-
147
-
148 //j["Clouds"] = Clouds ? nlohmann::json{{"x", Clouds->x, "y", Clouds->y, "z", Clouds->z}} : nullptr;
-
149 //j["CloudList"] = CloudList ? nlohmann::json{{"x", CloudList->x, "y", CloudList->y, "z", CloudList->z}} : nullptr;
-
150
-
151 j["MinimapPosition"] = {Minimap.Pos[0].X, Minimap.Pos[0].Y};
-
152 j["MinimapPosition2P"] = {Minimap.Pos[1].X, Minimap.Pos[1].Y};
-
153 j["MinimapPlayerX"] = Minimap.PlayerX;
-
154 j["MinimapPlayerY"] = Minimap.PlayerY;
-
155 j["MinimapPlayerScaleFactor"] = Minimap.PlayerScaleFactor;
-
156 j["MinimapFinishlineX"] = Minimap.FinishlineX;
-
157 j["MinimapFinishlineY"] = Minimap.FinishlineY;
-
158 j["MinimapColour"] = {static_cast<int>(Minimap.Colour.r), static_cast<int>(Minimap.Colour.g), static_cast<int>(Minimap.Colour.b)};
-
159 // SkyboxColors - assuming SkyboxColors can be serialized similarly
-
160
-
161 #define TO_INT(value) static_cast<int>(value)
-
162 j["Skybox"] = {
-
163 TO_INT(Skybox.TopRight.r), TO_INT(Skybox.TopRight.g), TO_INT(Skybox.TopRight.b),
-
164 TO_INT(Skybox.BottomRight.r), TO_INT(Skybox.BottomRight.g), TO_INT(Skybox.BottomRight.b),
-
165 TO_INT(Skybox.BottomLeft.r), TO_INT(Skybox.BottomLeft.g), TO_INT(Skybox.BottomLeft.b),
-
166 TO_INT(Skybox.TopLeft.r), TO_INT(Skybox.TopLeft.g), TO_INT(Skybox.TopLeft.b),
-
167 TO_INT(Skybox.FloorTopRight.r), TO_INT(Skybox.FloorTopRight.g), TO_INT(Skybox.FloorTopRight.b),
-
168 TO_INT(Skybox.FloorBottomRight.r), TO_INT(Skybox.FloorBottomRight.g), TO_INT(Skybox.FloorBottomRight.b),
-
169 TO_INT(Skybox.FloorBottomLeft.r), TO_INT(Skybox.FloorBottomLeft.g), TO_INT(Skybox.FloorBottomLeft.b),
-
170 TO_INT(Skybox.FloorTopLeft.r), TO_INT(Skybox.FloorTopLeft.g), TO_INT(Skybox.FloorTopLeft.b)
-
171 };
-
172 j["Sequence"] = static_cast<int>(Sequence);
-
173
-
174 j["WaterLevel"] = static_cast<float>(WaterLevel);
-
175 #undef CAST_TO_INT
+
138 // PathSizes - Assuming TrackPathSizes can be serialized similarly
+
139 // j["PathSizes"] = PathSizes; // Implement your serialization logic here
+
140
+
141 j["CurveTargetSpeed"] = { CurveTargetSpeed[0], CurveTargetSpeed[1], CurveTargetSpeed[2], CurveTargetSpeed[3] };
+
142 j["NormalTargetSpeed"] = { NormalTargetSpeed[0], NormalTargetSpeed[1], NormalTargetSpeed[2], NormalTargetSpeed[3] };
+
143 j["D_0D0096B8"] = { D_0D0096B8[0], D_0D0096B8[1], D_0D0096B8[2], D_0D0096B8[3] };
+
144 j["OffTrackTargetSpeed"] = { OffTrackTargetSpeed[0], OffTrackTargetSpeed[1], OffTrackTargetSpeed[2], OffTrackTargetSpeed[3] };
+
145
+
146 // Serialize arrays PathTable and PathTable2 (convert pointers into a JSON array if possible)
+
147 //j["PathTable"] = {{}};
+
148 //j["PathTable2"] = {{}};
+
149 // Populate PathTable and PathTable2
+
150
+
151 //j["Clouds"] = Clouds ? nlohmann::json{{"x", Clouds->x, "y", Clouds->y, "z", Clouds->z}} : nullptr;
+
152 //j["CloudList"] = CloudList ? nlohmann::json{{"x", CloudList->x, "y", CloudList->y, "z", CloudList->z}} : nullptr;
+
153
+
154 j["MinimapPosition"] = {Minimap.Pos[0].X, Minimap.Pos[0].Y};
+
155 j["MinimapPosition2P"] = {Minimap.Pos[1].X, Minimap.Pos[1].Y};
+
156 j["MinimapPlayerX"] = Minimap.PlayerX;
+
157 j["MinimapPlayerY"] = Minimap.PlayerY;
+
158 j["MinimapPlayerScaleFactor"] = Minimap.PlayerScaleFactor;
+
159 j["MinimapFinishlineX"] = Minimap.FinishlineX;
+
160 j["MinimapFinishlineY"] = Minimap.FinishlineY;
+
161 j["MinimapColour"] = {static_cast<int>(Minimap.Colour.r), static_cast<int>(Minimap.Colour.g), static_cast<int>(Minimap.Colour.b)};
+
162 // SkyboxColors - assuming SkyboxColors can be serialized similarly
+
163
+
164 #define TO_INT(value) static_cast<int>(value)
+
165 j["Skybox"] = {
+
166 TO_INT(Skybox.TopRight.r), TO_INT(Skybox.TopRight.g), TO_INT(Skybox.TopRight.b),
+
167 TO_INT(Skybox.BottomRight.r), TO_INT(Skybox.BottomRight.g), TO_INT(Skybox.BottomRight.b),
+
168 TO_INT(Skybox.BottomLeft.r), TO_INT(Skybox.BottomLeft.g), TO_INT(Skybox.BottomLeft.b),
+
169 TO_INT(Skybox.TopLeft.r), TO_INT(Skybox.TopLeft.g), TO_INT(Skybox.TopLeft.b),
+
170 TO_INT(Skybox.FloorTopRight.r), TO_INT(Skybox.FloorTopRight.g), TO_INT(Skybox.FloorTopRight.b),
+
171 TO_INT(Skybox.FloorBottomRight.r), TO_INT(Skybox.FloorBottomRight.g), TO_INT(Skybox.FloorBottomRight.b),
+
172 TO_INT(Skybox.FloorBottomLeft.r), TO_INT(Skybox.FloorBottomLeft.g), TO_INT(Skybox.FloorBottomLeft.b),
+
173 TO_INT(Skybox.FloorTopLeft.r), TO_INT(Skybox.FloorTopLeft.g), TO_INT(Skybox.FloorTopLeft.b)
+
174 };
+
175 j["Sequence"] = static_cast<int>(Sequence);
176
-
177 return j;
-
178 }
+
177 j["WaterLevel"] = static_cast<float>(WaterLevel);
+
178 #undef CAST_TO_INT
179
-
180 // Function to load struct from JSON
-
181 void from_json(const nlohmann::json& j) {
-
182 strncpy(Name, j.at("Name").get<std::string>().c_str(), sizeof(Name) - 1);
-
183 Name[sizeof(Name) - 1] = '\0'; // Ensure null termination
-
184
-
185 strncpy(DebugName, j.at("DebugName").get<std::string>().c_str(), sizeof(DebugName) - 1);
-
186 DebugName[sizeof(DebugName) - 1] = '\0'; // Ensure null termination
+
180 return j;
+
181 }
+
182
+
183 // Function to load struct from JSON
+
184 void from_json(const nlohmann::json& j) {
+
185 strncpy(Name, j.at("Name").get<std::string>().c_str(), sizeof(Name) - 1);
+
186 Name[sizeof(Name) - 1] = '\0'; // Ensure null termination
187
-
188 strncpy(TrackLength, j.at("TrackLength").get<std::string>().c_str(), sizeof(TrackLength) - 1);
-
189 TrackLength[sizeof(TrackLength) - 1] = '\0'; // Ensure null termination
+
188 strncpy(DebugName, j.at("DebugName").get<std::string>().c_str(), sizeof(DebugName) - 1);
+
189 DebugName[sizeof(DebugName) - 1] = '\0'; // Ensure null termination
190
-
191 //AIBehaviour = j.at("AIBehaviour").get<std::string>().c_str();
-
192 LakituTowType = j.at("LakituTowType").get<int>();
+
191 strncpy(TrackLength, j.at("TrackLength").get<std::string>().c_str(), sizeof(TrackLength) - 1);
+
192 TrackLength[sizeof(TrackLength) - 1] = '\0'; // Ensure null termination
193
-
194 AIMaximumSeparation = j.at("AIMaximumSeparation").get<float>();
-
195 AIMinimumSeparation = j.at("AIMinimumSeparation").get<float>();
-
196 NearPersp = j.at("NearPersp").get<float>();
-
197 FarPersp = j.at("FarPersp").get<float>();
-
198
-
199 const auto temp = j.at("AIDistance").get<std::vector<int16_t>>();
-
200
-
201 // Ensure the vector has 32 entries
-
202 if (temp.size() == 32) {
-
203 // Copy the data into the existing AIDistances array
-
204 std::copy(temp.begin(), temp.end(), AIDistance);
-
205 } else {
-
206 printf("[Track.h] [from_json()] AIDistance array not size of 32\n");
-
207 }
-
208
-
209 AISteeringSensitivity = j.at("AISteeringSensitivity").get<uint32_t>();
-
210
-
211 // Deserialize PathSizes and other custom structs if needed
-
212
-
213 CurveTargetSpeed[0] = j.at("CurveTargetSpeed")[0].get<float>();
-
214 CurveTargetSpeed[1] = j.at("CurveTargetSpeed")[1].get<float>();
-
215 CurveTargetSpeed[2] = j.at("CurveTargetSpeed")[2].get<float>();
-
216 CurveTargetSpeed[3] = j.at("CurveTargetSpeed")[3].get<float>();
-
217
-
218 NormalTargetSpeed[0] = j.at("NormalTargetSpeed")[0].get<float>();
-
219 NormalTargetSpeed[1] = j.at("NormalTargetSpeed")[1].get<float>();
-
220 NormalTargetSpeed[2] = j.at("NormalTargetSpeed")[2].get<float>();
-
221 NormalTargetSpeed[3] = j.at("NormalTargetSpeed")[3].get<float>();
-
222
-
223 D_0D0096B8[0] = j.at("D_0D0096B8")[0].get<float>();
-
224 D_0D0096B8[1] = j.at("D_0D0096B8")[1].get<float>();
-
225 D_0D0096B8[2] = j.at("D_0D0096B8")[2].get<float>();
-
226 D_0D0096B8[3] = j.at("D_0D0096B8")[3].get<float>();
-
227
-
228 OffTrackTargetSpeed[0] = j.at("OffTrackTargetSpeed")[0].get<float>();
-
229 OffTrackTargetSpeed[1] = j.at("OffTrackTargetSpeed")[1].get<float>();
-
230 OffTrackTargetSpeed[2] = j.at("OffTrackTargetSpeed")[2].get<float>();
-
231 OffTrackTargetSpeed[3] = j.at("OffTrackTargetSpeed")[3].get<float>();
-
232
-
233 // Deserialize arrays PathTable and PathTable2 similarly
-
234
-
235 //Clouds = nullptr; // Deserialize if data is present
-
236 //CloudList = nullptr; // Deserialize if data is present
-
237 Minimap.Pos[0].X = j.at("MinimapPosition")[0].get<int32_t>();
-
238 Minimap.Pos[0].Y = j.at("MinimapPosition")[1].get<int32_t>();
-
239 Minimap.Pos[1].X = j.at("MinimapPosition2P")[0].get<int32_t>();
-
240 Minimap.Pos[1].Y = j.at("MinimapPosition2P")[1].get<int32_t>();
-
241 Minimap.PlayerX = j.at("MinimapPlayerX").get<int32_t>();
-
242 Minimap.PlayerY = j.at("MinimapPlayerY").get<int32_t>();
-
243 Minimap.PlayerScaleFactor = j.at("MinimapPlayerScaleFactor").get<float>();
-
244 Minimap.FinishlineX = j.at("MinimapFinishlineX").get<float>();
-
245 Minimap.FinishlineY = j.at("MinimapFinishlineY").get<float>();
-
246 Minimap.Colour.r = j.at("MinimapColour")[0].get<uint8_t>();
-
247 Minimap.Colour.g = j.at("MinimapColour")[1].get<uint8_t>();
-
248 Minimap.Colour.b = j.at("MinimapColour")[2].get<uint8_t>();
-
249 //textures = nullptr; // Deserialize textures if present
-
250
-
251 Skybox.TopRight.r = j.at("Skybox")[0].get<uint8_t>();
-
252 Skybox.TopRight.g = j.at("Skybox")[1].get<uint8_t>();
-
253 Skybox.TopRight.b = j.at("Skybox")[2].get<uint8_t>();
-
254
-
255 Skybox.BottomRight.r = j.at("Skybox")[3].get<uint8_t>();
-
256 Skybox.BottomRight.g = j.at("Skybox")[4].get<uint8_t>();
-
257 Skybox.BottomRight.b = j.at("Skybox")[5].get<uint8_t>();
-
258
-
259 Skybox.BottomLeft.r = j.at("Skybox")[6].get<uint8_t>();
-
260 Skybox.BottomLeft.g = j.at("Skybox")[7].get<uint8_t>();
-
261 Skybox.BottomLeft.b = j.at("Skybox")[8].get<uint8_t>();
-
262
-
263 Skybox.TopLeft.r = j.at("Skybox")[9].get<uint8_t>();
-
264 Skybox.TopLeft.g = j.at("Skybox")[10].get<uint8_t>();
-
265 Skybox.TopLeft.b = j.at("Skybox")[11].get<uint8_t>();
-
266
-
267 Skybox.FloorTopRight.r = j.at("Skybox")[12].get<uint8_t>();
-
268 Skybox.FloorTopRight.g = j.at("Skybox")[13].get<uint8_t>();
-
269 Skybox.FloorTopRight.b = j.at("Skybox")[14].get<uint8_t>();
-
270
-
271 Skybox.FloorBottomRight.r = j.at("Skybox")[15].get<uint8_t>();
-
272 Skybox.FloorBottomRight.g = j.at("Skybox")[16].get<uint8_t>();
-
273 Skybox.FloorBottomRight.b = j.at("Skybox")[17].get<uint8_t>();
-
274
-
275 Skybox.FloorBottomLeft.r = j.at("Skybox")[18].get<uint8_t>();
-
276 Skybox.FloorBottomLeft.g = j.at("Skybox")[19].get<uint8_t>();
-
277 Skybox.FloorBottomLeft.b = j.at("Skybox")[20].get<uint8_t>();
-
278
-
279 Skybox.FloorTopLeft.r = j.at("Skybox")[21].get<uint8_t>();
-
280 Skybox.FloorTopLeft.g = j.at("Skybox")[22].get<uint8_t>();
-
281 Skybox.FloorTopLeft.b = j.at("Skybox")[23].get<uint8_t>();
-
282
-
283 Sequence = static_cast<MusicSeq>(j.at("Sequence").get<int>());
-
284 WaterLevel = j.at("WaterLevel").get<float>();
-
285 }
-
286 void SetText(char* name, const char* title, size_t bufferSize) {
-
287 // Copy the title into the name buffer, ensuring it's null-terminated and within bounds
-
288 std::strncpy(name, title, bufferSize - 1);
-
289 name[bufferSize - 1] = '\0'; // Ensure the string is null-terminated
-
290 }
-
291
-
292 const char* GetName() {
-
293 return Name;
-
294 }
-
295
-
296 void New() {
-
297 SetText(Name, "", sizeof(Name));
-
298 SetText(DebugName, "", sizeof(DebugName));
-
299 SetText(TrackLength, "", sizeof(TrackLength));
-
300 }
-
301#endif
-
302
- +
194 //AIBehaviour = j.at("AIBehaviour").get<std::string>().c_str();
+
195 LakituTowType = j.at("LakituTowType").get<int>();
+
196
+
197 AIMaximumSeparation = j.at("AIMaximumSeparation").get<float>();
+
198 AIMinimumSeparation = j.at("AIMinimumSeparation").get<float>();
+
199 NearPersp = j.at("NearPersp").get<float>();
+
200 FarPersp = j.at("FarPersp").get<float>();
+
201
+
202 const auto temp = j.at("AIDistance").get<std::vector<int16_t>>();
+
203
+
204 // Ensure the vector has 32 entries
+
205 if (temp.size() == 32) {
+
206 // Copy the data into the existing AIDistances array
+
207 std::copy(temp.begin(), temp.end(), AIDistance);
+
208 } else {
+
209 printf("[Track.h] [from_json()] AIDistance array not size of 32\n");
+
210 }
+
211
+
212 AISteeringSensitivity = j.at("AISteeringSensitivity").get<uint32_t>();
+
213
+
214 // Deserialize PathSizes and other custom structs if needed
+
215
+
216 CurveTargetSpeed[0] = j.at("CurveTargetSpeed")[0].get<float>();
+
217 CurveTargetSpeed[1] = j.at("CurveTargetSpeed")[1].get<float>();
+
218 CurveTargetSpeed[2] = j.at("CurveTargetSpeed")[2].get<float>();
+
219 CurveTargetSpeed[3] = j.at("CurveTargetSpeed")[3].get<float>();
+
220
+
221 NormalTargetSpeed[0] = j.at("NormalTargetSpeed")[0].get<float>();
+
222 NormalTargetSpeed[1] = j.at("NormalTargetSpeed")[1].get<float>();
+
223 NormalTargetSpeed[2] = j.at("NormalTargetSpeed")[2].get<float>();
+
224 NormalTargetSpeed[3] = j.at("NormalTargetSpeed")[3].get<float>();
+
225
+
226 D_0D0096B8[0] = j.at("D_0D0096B8")[0].get<float>();
+
227 D_0D0096B8[1] = j.at("D_0D0096B8")[1].get<float>();
+
228 D_0D0096B8[2] = j.at("D_0D0096B8")[2].get<float>();
+
229 D_0D0096B8[3] = j.at("D_0D0096B8")[3].get<float>();
+
230
+
231 OffTrackTargetSpeed[0] = j.at("OffTrackTargetSpeed")[0].get<float>();
+
232 OffTrackTargetSpeed[1] = j.at("OffTrackTargetSpeed")[1].get<float>();
+
233 OffTrackTargetSpeed[2] = j.at("OffTrackTargetSpeed")[2].get<float>();
+
234 OffTrackTargetSpeed[3] = j.at("OffTrackTargetSpeed")[3].get<float>();
+
235
+
236 // Deserialize arrays PathTable and PathTable2 similarly
+
237
+
238 //Clouds = nullptr; // Deserialize if data is present
+
239 //CloudList = nullptr; // Deserialize if data is present
+
240 Minimap.Pos[0].X = j.at("MinimapPosition")[0].get<int32_t>();
+
241 Minimap.Pos[0].Y = j.at("MinimapPosition")[1].get<int32_t>();
+
242 Minimap.Pos[1].X = j.at("MinimapPosition2P")[0].get<int32_t>();
+
243 Minimap.Pos[1].Y = j.at("MinimapPosition2P")[1].get<int32_t>();
+
244 Minimap.PlayerX = j.at("MinimapPlayerX").get<int32_t>();
+
245 Minimap.PlayerY = j.at("MinimapPlayerY").get<int32_t>();
+
246 Minimap.PlayerScaleFactor = j.at("MinimapPlayerScaleFactor").get<float>();
+
247 Minimap.FinishlineX = j.at("MinimapFinishlineX").get<float>();
+
248 Minimap.FinishlineY = j.at("MinimapFinishlineY").get<float>();
+
249 Minimap.Colour.r = j.at("MinimapColour")[0].get<uint8_t>();
+
250 Minimap.Colour.g = j.at("MinimapColour")[1].get<uint8_t>();
+
251 Minimap.Colour.b = j.at("MinimapColour")[2].get<uint8_t>();
+
252 //textures = nullptr; // Deserialize textures if present
+
253
+
254 Skybox.TopRight.r = j.at("Skybox")[0].get<uint8_t>();
+
255 Skybox.TopRight.g = j.at("Skybox")[1].get<uint8_t>();
+
256 Skybox.TopRight.b = j.at("Skybox")[2].get<uint8_t>();
+
257
+
258 Skybox.BottomRight.r = j.at("Skybox")[3].get<uint8_t>();
+
259 Skybox.BottomRight.g = j.at("Skybox")[4].get<uint8_t>();
+
260 Skybox.BottomRight.b = j.at("Skybox")[5].get<uint8_t>();
+
261
+
262 Skybox.BottomLeft.r = j.at("Skybox")[6].get<uint8_t>();
+
263 Skybox.BottomLeft.g = j.at("Skybox")[7].get<uint8_t>();
+
264 Skybox.BottomLeft.b = j.at("Skybox")[8].get<uint8_t>();
+
265
+
266 Skybox.TopLeft.r = j.at("Skybox")[9].get<uint8_t>();
+
267 Skybox.TopLeft.g = j.at("Skybox")[10].get<uint8_t>();
+
268 Skybox.TopLeft.b = j.at("Skybox")[11].get<uint8_t>();
+
269
+
270 Skybox.FloorTopRight.r = j.at("Skybox")[12].get<uint8_t>();
+
271 Skybox.FloorTopRight.g = j.at("Skybox")[13].get<uint8_t>();
+
272 Skybox.FloorTopRight.b = j.at("Skybox")[14].get<uint8_t>();
+
273
+
274 Skybox.FloorBottomRight.r = j.at("Skybox")[15].get<uint8_t>();
+
275 Skybox.FloorBottomRight.g = j.at("Skybox")[16].get<uint8_t>();
+
276 Skybox.FloorBottomRight.b = j.at("Skybox")[17].get<uint8_t>();
+
277
+
278 Skybox.FloorBottomLeft.r = j.at("Skybox")[18].get<uint8_t>();
+
279 Skybox.FloorBottomLeft.g = j.at("Skybox")[19].get<uint8_t>();
+
280 Skybox.FloorBottomLeft.b = j.at("Skybox")[20].get<uint8_t>();
+
281
+
282 Skybox.FloorTopLeft.r = j.at("Skybox")[21].get<uint8_t>();
+
283 Skybox.FloorTopLeft.g = j.at("Skybox")[22].get<uint8_t>();
+
284 Skybox.FloorTopLeft.b = j.at("Skybox")[23].get<uint8_t>();
+
285
+
286 Sequence = static_cast<MusicSeq>(j.at("Sequence").get<int>());
+
287 WaterLevel = j.at("WaterLevel").get<float>();
+
288 }
+
289 void SetText(char* name, const char* title, size_t bufferSize) {
+
290 // Copy the title into the name buffer, ensuring it's null-terminated and within bounds
+
291 std::strncpy(name, title, bufferSize - 1);
+
292 name[bufferSize - 1] = '\0'; // Ensure the string is null-terminated
+
293 }
+
294
+
295 const char* GetName() {
+
296 return Name;
+
297 }
+
298
+
299 void New() {
+
300 SetText(Name, "", sizeof(Name));
+
301 SetText(DebugName, "", sizeof(DebugName));
+
302 SetText(TrackLength, "", sizeof(TrackLength));
+
303 }
+
304#endif
+
305
+
-
304
-
305#ifdef __cplusplus
-
306
307
-
308class World; // <-- Forward declare
+
308#ifdef __cplusplus
309
310
-
311class Track {
-
312public:
-
313 enum class CloudType {
-
314 NONE,
-
315 CLOUDS,
-
316 SNOW,
-
317 STARS
-
318 };
-
319 // Required to save scenefile data
-
320 std::shared_ptr<Ship::Archive> Archive;
-
321 std::string ResourceName;
-
322
-
323 Properties Props;
-
324 enum CloudType mCloudType;
+
311class World; // <-- Forward declare
+
312
+
313
+
314class Track {
+
315public:
+
316 enum class CloudType {
+
317 NONE,
+
318 CLOUDS,
+
319 SNOW,
+
320 STARS
+
321 };
+
322 // Required to save scenefile data
+
323 std::shared_ptr<Ship::Archive> Archive;
+
324 std::string ResourceName;
325
-
326 // This allows multiple water levels in a map.
-
327 // Ex. DK Jungle where there's a waterfall and you can drive above and below it.
-
328 std::vector<WaterVolume> WaterVolumes;
-
329
-
330 bool bSpawnFinishline = true;
-
331 std::optional<FVector> FinishlineSpawnPoint;
+
326 Properties Props;
+
327 enum CloudType mCloudType;
+
328
+
329 // This allows multiple water levels in a map.
+
330 // Ex. DK Jungle where there's a waterfall and you can drive above and below it.
+
331 std::vector<WaterVolume> WaterVolumes;
332
-
333
-
334 std::vector<SpawnParams> SpawnList;
+
333 bool bSpawnFinishline = true;
+
334 std::optional<FVector> FinishlineSpawnPoint;
335
-
336 bool bTourEnabled = false;
-
337 std::vector<TourCamera::CameraShot> TourShots;
+
336
+
337 std::vector<SpawnParams> SpawnList;
338
-
339 explicit Track();
-
340
-
341 virtual ~Track() {
-
342 RestoreTriangleWinding();
-
343 };
-
344
-
345 virtual void Load(); // Decompress and load stock tracks or from o2r but TrackSectionsPtr must be set.
-
346 virtual void Load(Vtx* vtx, Gfx *gfx); // Load custom track from code. Load must be overridden and then call to this base class method impl.
-
347
-
352 virtual void BeginPlay();
-
353 void SpawnActors();
-
354 virtual void SomeCollisionThing(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4, f32* arg5, f32* arg6, f32* arg7);
-
355 virtual void InitTrackObjects();
-
356 virtual void TickTrackObjects();
-
357 virtual void DrawTrackObjects(s32 cameraId);
-
358 virtual void SomeSounds();
-
359 virtual void CreditsSpawnActors();
-
360 virtual void WhatDoesThisDo(Player*, int8_t);
-
361 virtual void WhatDoesThisDoAI(Player*, int8_t);
-
362 virtual void SetStaffGhost();
-
363 virtual void Draw(ScreenContext*);
-
364 virtual void DrawCredits();
-
365 virtual void Waypoints(Player* player, int8_t playerId);
-
366 virtual f32 GetWaterLevel(FVector pos, Collision* collision);
-
367 virtual void Tick();
-
368 // Draw transparent models (water, signs, arrows, etc.)
-
369 virtual void DrawTransparency(ScreenContext* screen, uint16_t pathCounter, uint16_t cameraRot,
-
370 uint16_t playerDirection);
-
371 virtual void Destroy();
-
372 // Note that this will be false for custom tracks made using code
-
373 // Probably ok
-
374 virtual bool IsMod() { return false; };
-
375
-
376
-
377 protected:
-
378 void Init();
-
379};
-
380
-
381void InvertTriangleWindingModdedInternal(Gfx* gfx, const char* gfxName);
-
382
-
383#endif
-
384
-
385#endif // ENGINE_TRACK_H
+
339 bool bTourEnabled = false;
+
340 std::vector<TourCamera::CameraShot> TourShots;
+
341
+
342 explicit Track();
+
343
+
344 virtual ~Track() {
+
345 RestoreTriangleWinding();
+
346 };
+
347
+
348 virtual void Load(); // Decompress and load stock tracks or from o2r but TrackSectionsPtr must be set.
+
349 virtual void Load(Vtx* vtx, Gfx *gfx); // Load custom track from code. Load must be overridden and then call to this base class method impl.
+
350
+
355 virtual void BeginPlay();
+
356 void SpawnActors();
+
357 virtual void SomeCollisionThing(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4, f32* arg5, f32* arg6, f32* arg7);
+
358 virtual void InitTrackObjects();
+
359 virtual void TickTrackObjects();
+
360 virtual void DrawTrackObjects(s32 cameraId);
+
361 virtual void SomeSounds();
+
362 virtual void CreditsSpawnActors();
+
363 virtual void WhatDoesThisDo(Player*, int8_t);
+
364 virtual void WhatDoesThisDoAI(Player*, int8_t);
+
365 virtual void SetStaffGhost();
+
366 virtual void Draw(ScreenContext*);
+
367 virtual void DrawCredits();
+
368 virtual void Waypoints(Player* player, int8_t playerId);
+
369 virtual f32 GetWaterLevel(FVector pos, Collision* collision);
+
370 virtual void Tick();
+
371 // Draw transparent models (water, signs, arrows, etc.)
+
372 virtual void DrawTransparency(ScreenContext* screen, uint16_t pathCounter, uint16_t cameraRot,
+
373 uint16_t playerDirection);
+
374 virtual void Destroy();
+
375 // Note that this will be false for custom tracks made using code
+
376 // Probably ok
+
377 virtual bool IsMod() { return false; };
+
378
+
379
+
380 protected:
+
381 void Init();
+
382};
+
383
+
384void InvertTriangleWindingModdedInternal(Gfx* gfx, const char* gfxName);
+
385
+
386#endif
+
387
+
388#endif // ENGINE_TRACK_H
@@ -537,32 +540,32 @@ $(function(){initNavTree('Track_8h_source.html',''); initResizable(true); });
float FinishlineX
Definition Track.h:62
int32_t PlayerX
Definition Track.h:59
int16_t Height
Definition Track.h:57
-
Definition Track.h:90
-
char Name[128]
Definition Track.h:91
-
uint8_t * CloudTexture
Definition Track.h:110
-
TrackPathPoint * PathTable2[5]
Definition Track.h:109
-
CloudData * Clouds
Definition Track.h:111
-
Vec4f D_0D0096B8
Definition Track.h:106
-
Vec4f CurveTargetSpeed
Definition Track.h:104
-
float AIMaximumSeparation
Definition Track.h:97
-
float WaterLevel
Definition Track.h:115
-
int32_t LakituTowType
Definition Track.h:94
-
Vec4f OffTrackTargetSpeed
Definition Track.h:107
-
uint32_t AISteeringSensitivity
Definition Track.h:102
-
TrackPathPoint * PathTable[4]
Definition Track.h:108
-
const char * AIBehaviour
Definition Track.h:96
-
TrackPathSizes PathSizes
Definition Track.h:103
-
float NearPersp
Definition Track.h:99
-
SkyboxColours Skybox
Definition Track.h:113
-
float AIMinimumSeparation
Definition Track.h:98
-
char TrackLength[128]
Definition Track.h:93
-
enum MusicSeq Sequence
Definition Track.h:114
-
int16_t * AIDistance
Definition Track.h:101
-
char DebugName[128]
Definition Track.h:92
-
CloudData * CloudList
Definition Track.h:112
-
float FarPersp
Definition Track.h:100
-
MinimapProps Minimap
Definition Track.h:95
-
Vec4f NormalTargetSpeed
Definition Track.h:105
+
Definition Track.h:93
+
char Name[128]
Definition Track.h:94
+
uint8_t * CloudTexture
Definition Track.h:113
+
TrackPathPoint * PathTable2[5]
Definition Track.h:112
+
CloudData * Clouds
Definition Track.h:114
+
Vec4f D_0D0096B8
Definition Track.h:109
+
Vec4f CurveTargetSpeed
Definition Track.h:107
+
float AIMaximumSeparation
Definition Track.h:100
+
float WaterLevel
Definition Track.h:118
+
int32_t LakituTowType
Definition Track.h:97
+
Vec4f OffTrackTargetSpeed
Definition Track.h:110
+
uint32_t AISteeringSensitivity
Definition Track.h:105
+
TrackPathPoint * PathTable[4]
Definition Track.h:111
+
const char * AIBehaviour
Definition Track.h:99
+
TrackPathSizes PathSizes
Definition Track.h:106
+
float NearPersp
Definition Track.h:102
+
SkyboxColours Skybox
Definition Track.h:116
+
float AIMinimumSeparation
Definition Track.h:101
+
char TrackLength[128]
Definition Track.h:96
+
enum MusicSeq Sequence
Definition Track.h:117
+
int16_t * AIDistance
Definition Track.h:104
+
char DebugName[128]
Definition Track.h:95
+
CloudData * CloudList
Definition Track.h:115
+
float FarPersp
Definition Track.h:103
+
MinimapProps Minimap
Definition Track.h:98
+
Vec4f NormalTargetSpeed
Definition Track.h:108
Definition common_structs.h:427
Definition Track.h:30
RGB8 BottomLeft
Definition Track.h:33
@@ -576,12 +579,13 @@ $(function(){initNavTree('Track_8h_source.html',''); initResizable(true); });
Definition waypoints.h:14
Definition path_spawn_metadata.h:9
Definition Track.h:81
-
uint64_t crc
Definition Track.h:82
-
u8 sectionId
Definition Track.h:84
-
u16 layer
Definition Track.h:86
-
u8 surfaceType
Definition Track.h:83
-
u16 clip
Definition Track.h:85
-
Vec3f location
Definition Track.h:87
+
uint64_t crc
Definition Track.h:83
+
void * model
Definition Track.h:84
+
u8 sectionId
Definition Track.h:87
+
u16 layer
Definition Track.h:89
+
u8 surfaceType
Definition Track.h:86
+
u16 clip
Definition Track.h:88
+
Vec3f location
Definition Track.h:90
Definition Track.h:46
float Height
Definition Track.h:47
float MaxX
Definition Track.h:49
diff --git a/actor__types_8h_source.html b/actor__types_8h_source.html index fd75feea8..fe06162ba 100644 --- a/actor__types_8h_source.html +++ b/actor__types_8h_source.html @@ -261,280 +261,288 @@ $(function(){initNavTree('actor__types_8h_source.html',''); initResizable(true);
166 /* 0x02 */ s16 flags;
167 /* 0x04 */ s16 someTimer;
168 /* 0x06 */ s16 crossingId; // unused now
-
169 /* 0x08 */ void* crossingTrigger; // Crossing Trigger Class
-
170 /* 0x10 */ Vec3s rot;
-
171 /* 0x16 */ s16 unk_16;
-
172 /* 0x18 */ Vec3f pos;
-
173 /* 0x24 */ Vec3f velocity;
-
174 /* 0x30 */ Collision unk30;
-
175 const char* model;
-
176}; // size = 0x70
+
169 union {
+
170 struct {
+
171 /* 0x08 */ void* crossingTrigger; // Crossing Trigger Class
+
172 };
+
173 struct { // original field in actors
+
174 /* 0x08 */ f32 unk_08;
+
175 /* 0x0C */ f32 boundingBoxSize;
+
176 };
+
177 };
+
178 /* 0x10 */ Vec3s rot;
+
179 /* 0x16 */ s16 unk_16;
+
180 /* 0x18 */ Vec3f pos;
+
181 /* 0x24 */ Vec3f velocity;
+
182 /* 0x30 */ Collision unk30;
+
183 const char* model;
+
184}; // size = 0x70
-
177
-
178// crossingTrigger might ruin struct size when compiled on 32 bit
-
179static_assert(sizeof(struct RailroadCrossing) == sizeof(struct Actor), "RailroadCrossing struct size does not match base struct size");
-
180
-
-
181struct FallingRock {
-
182 /* 0x00 */ s16 type;
-
183 /* 0x02 */ s16 flags;
-
184 /* 0x04 */ s16 respawnTimer;
-
185 /* 0x06 */ s16 unk_06;
-
186 /* 0x08 */ f32 unk_08;
-
187 /* 0x0C */ f32 boundingBoxSize;
-
188 /* 0x10 */ Vec3s rot;
-
189 /* 0x16 */ s16 unk_16;
-
190 /* 0x18 */ Vec3f pos;
-
191 /* 0x24 */ Vec3f velocity;
-
192 /* 0x30 */ Collision unk30;
-
193 const char* model;
-
194}; // size = 0x70
+
185
+
186// crossingTrigger might ruin struct size when compiled on 32 bit
+
187static_assert(sizeof(struct RailroadCrossing) == sizeof(struct Actor), "RailroadCrossing struct size does not match base struct size");
+
188
+
+ +
190 /* 0x00 */ s16 type;
+
191 /* 0x02 */ s16 flags;
+
192 /* 0x04 */ s16 respawnTimer;
+
193 /* 0x06 */ s16 unk_06;
+
194 /* 0x08 */ f32 unk_08;
+
195 /* 0x0C */ f32 boundingBoxSize;
+
196 /* 0x10 */ Vec3s rot;
+
197 /* 0x16 */ s16 unk_16;
+
198 /* 0x18 */ Vec3f pos;
+
199 /* 0x24 */ Vec3f velocity;
+
200 /* 0x30 */ Collision unk30;
+
201 const char* model;
+
202}; // size = 0x70
-
195
-
196struct ActorSpawnData {
-
197 /* 0x00 */ Vec3s pos;
-
198 union {
-
199 /* 0x06 */ u16 someId; // Usually populated, but not necessarily used by all actors types
-
200 /* 0x06 */ s16 signedSomeId;
-
201 };
-
202};
203
-
204// Required for evaluate_collision_player_palm_trees due to diff size.
-
205// members unverified. data located at d_course_dks_jungle_parkway_tree_spawn
-
214struct UnkActorSpawnData {
-
215 /* 0x00 */ Vec3s pos;
-
216 // Techinically only the bottom byte of someId is the "id". The top byte is used for flags.
-
217 /* 0x06 */ s16 someId;
-
218 // Stores the tree's original Y position.
-
219 /* 0x08 */ s16 unk8;
-
220};
-
221
-
- -
223 /* 0x00 */ s16 type;
-
224 /* 0x02 */ s16 flags;
-
225 /* 0x04 */ s16 unk_04;
-
226 /* 0x06 */ s16 unk_06;
-
227 /* 0x08 */ f32 pathRadius;
-
228 /* 0x0C */ f32 boundingBoxSize;
-
229 /* 0x10 */ s16 pathRot;
-
230 /* 0x12 */ s16 eggRot;
-
231 /* 0x14 */ s16 unk_14;
-
232 /* 0x16 */ s16 unk_16;
-
233 /* 0x18 */ Vec3f pos;
-
234 // Note, pathCenter[1] should be understood to be the Y velocity of the egg
-
235 // pathCenter[0] and pathCenter[2] are the X,Z coordinates of the center of the path
-
236 /* 0x24 */ Vec3f pathCenter;
-
237 /* 0x30 */ Collision unk30;
-
238 const char* model;
-
239}; // size = 0x70
+
204struct ActorSpawnData {
+
205 /* 0x00 */ Vec3s pos;
+
206 union {
+
207 /* 0x06 */ u16 someId; // Usually populated, but not necessarily used by all actors types
+
208 /* 0x06 */ s16 signedSomeId;
+
209 };
+
210};
+
211
+
212// Required for evaluate_collision_player_palm_trees due to diff size.
+
213// members unverified. data located at d_course_dks_jungle_parkway_tree_spawn
+
222struct UnkActorSpawnData {
+
223 /* 0x00 */ Vec3s pos;
+
224 // Techinically only the bottom byte of someId is the "id". The top byte is used for flags.
+
225 /* 0x06 */ s16 someId;
+
226 // Stores the tree's original Y position.
+
227 /* 0x08 */ s16 unk8;
+
228};
+
229
+
+ +
231 /* 0x00 */ s16 type;
+
232 /* 0x02 */ s16 flags;
+
233 /* 0x04 */ s16 unk_04;
+
234 /* 0x06 */ s16 unk_06;
+
235 /* 0x08 */ f32 pathRadius;
+
236 /* 0x0C */ f32 boundingBoxSize;
+
237 /* 0x10 */ s16 pathRot;
+
238 /* 0x12 */ s16 eggRot;
+
239 /* 0x14 */ s16 unk_14;
+
240 /* 0x16 */ s16 unk_16;
+
241 /* 0x18 */ Vec3f pos;
+
242 // Note, pathCenter[1] should be understood to be the Y velocity of the egg
+
243 // pathCenter[0] and pathCenter[2] are the X,Z coordinates of the center of the path
+
244 /* 0x24 */ Vec3f pathCenter;
+
245 /* 0x30 */ Collision unk30;
+
246 const char* model;
+
247}; // size = 0x70
-
240
-
- -
242 /* 0x00 */ s16 type;
-
243 /* 0x02 */ s16 flags;
-
244 /* 0x04 */ s16
-
245 targetPlayer; // Id of the player this actor tracks. Each player has their own kiwano actor just for them
-
246 /* 0x06 */ s16 state;
-
247 /* 0x08 */ f32 bonkTimer; // bonkState? Not sure what this is tracking, but its some form of count down that starts
-
248 // after the fruit hits you
-
249 /* 0x0C */ f32 boundingBoxSize;
-
250 /* 0x10 */ s16 animState;
-
251 /* 0x12 */ s16 animTimer;
-
252 /* 0x14 */ s16 unk_14;
-
253 /* 0x16 */ s16 unk_16;
-
254 /* 0x18 */ Vec3f pos;
-
255 /* 0x24 */ Vec3f velocity;
-
256 /* 0x30 */ Collision unk30;
-
257 const char* model;
-
258}; // size = 0x70
+
248
+
+ +
250 /* 0x00 */ s16 type;
+
251 /* 0x02 */ s16 flags;
+
252 /* 0x04 */ s16
+
253 targetPlayer; // Id of the player this actor tracks. Each player has their own kiwano actor just for them
+
254 /* 0x06 */ s16 state;
+
255 /* 0x08 */ f32 bonkTimer; // bonkState? Not sure what this is tracking, but its some form of count down that starts
+
256 // after the fruit hits you
+
257 /* 0x0C */ f32 boundingBoxSize;
+
258 /* 0x10 */ s16 animState;
+
259 /* 0x12 */ s16 animTimer;
+
260 /* 0x14 */ s16 unk_14;
+
261 /* 0x16 */ s16 unk_16;
+
262 /* 0x18 */ Vec3f pos;
+
263 /* 0x24 */ Vec3f velocity;
+
264 /* 0x30 */ Collision unk30;
+
265 const char* model;
+
266}; // size = 0x70
-
259
-
- -
261 /* 0x00 */ s16 type;
-
262 /* 0x02 */ s16 flags;
-
263 /* 0x04 */ s16 unk_04;
-
264 /* 0x06 */ s16 wheelRot;
-
265 /* 0x08 */ f32 unk_08;
-
266 /* 0x0C */ f32 unk_0C;
-
267 /* 0x10 */ Vec3s boatRot;
-
268 /* 0x16 */ s16 unk_16;
-
269 /* 0x18 */ Vec3f pos;
-
270 /* 0x24 */ Vec3f velocity;
-
271 /* 0x30 */ Collision unk30;
-
272 const char* model;
-
273}; // size = 0x70
+
267
+
+ +
269 /* 0x00 */ s16 type;
+
270 /* 0x02 */ s16 flags;
+
271 /* 0x04 */ s16 unk_04;
+
272 /* 0x06 */ s16 wheelRot;
+
273 /* 0x08 */ f32 unk_08;
+
274 /* 0x0C */ f32 unk_0C;
+
275 /* 0x10 */ Vec3s boatRot;
+
276 /* 0x16 */ s16 unk_16;
+
277 /* 0x18 */ Vec3f pos;
+
278 /* 0x24 */ Vec3f velocity;
+
279 /* 0x30 */ Collision unk30;
+
280 const char* model;
+
281}; // size = 0x70
-
274
-
- -
276 /* 0x00 */ s16 type;
-
277 /* 0x02 */ s16 flags;
-
278 /* 0x04 */ Vec4s visibilityStates; // A per-camera visibilty state tracker
-
279 /* 0x0C */ f32 boundingBoxSize;
-
280 /* 0x10 */ Vec4s unk10;
-
281 /* 0x18 */ Vec3f pos;
-
282 /* 0x24 */ Vec4s timers; // A per-camera timer. Might be more appropriate to call this state
-
283 /* 0x2C */ f32 unk_02C;
-
284 /* 0x30 */ Collision unk30;
-
285 const char* model;
-
286}; // size = 0x70
+
282
+
+ +
284 /* 0x00 */ s16 type;
+
285 /* 0x02 */ s16 flags;
+
286 /* 0x04 */ Vec4s visibilityStates; // A per-camera visibilty state tracker
+
287 /* 0x0C */ f32 boundingBoxSize;
+
288 /* 0x10 */ Vec4s unk10;
+
289 /* 0x18 */ Vec3f pos;
+
290 /* 0x24 */ Vec4s timers; // A per-camera timer. Might be more appropriate to call this state
+
291 /* 0x2C */ f32 unk_02C;
+
292 /* 0x30 */ Collision unk30;
+
293 const char* model;
+
294}; // size = 0x70
-
287
-
-
288struct PalmTree {
-
289 /* 0x00 */ s16 type;
-
290 /* 0x02 */ s16 flags;
-
291 /* 0x04 */ s16 variant; // four different types of palm trees
-
292 /* 0x06 */ s16 state;
-
293 /* 0x08 */ f32 unk_08;
-
294 /* 0x0C */ f32 boundingBoxSize;
-
295 /* 0x10 */ Vec3s rot;
-
296 /* 0x16 */ s16 unk_16;
-
297 /* 0x18 */ Vec3f pos;
-
298 /* 0x24 */ Vec3f velocity;
-
299 /* 0x30 */ Collision unk30;
-
300 const char* model;
-
301}; // size = 0x70
+
295
+
+
296struct PalmTree {
+
297 /* 0x00 */ s16 type;
+
298 /* 0x02 */ s16 flags;
+
299 /* 0x04 */ s16 variant; // four different types of palm trees
+
300 /* 0x06 */ s16 state;
+
301 /* 0x08 */ f32 unk_08;
+
302 /* 0x0C */ f32 boundingBoxSize;
+
303 /* 0x10 */ Vec3s rot;
+
304 /* 0x16 */ s16 unk_16;
+
305 /* 0x18 */ Vec3f pos;
+
306 /* 0x24 */ Vec3f velocity;
+
307 /* 0x30 */ Collision unk30;
+
308 const char* model;
+
309}; // size = 0x70
-
302
-
-
303typedef struct {
-
304 /* 0x00 */ s16 type;
-
305 /* 0x02 */ s16 flags;
-
306 /* 0x04 */ s16 shellsAvailable;
-
307 /* 0x06 */ s16 state;
-
308 /* 0x08 */ f32 firePressed; // Set to 1.0 when Z is pressed. Triggers if value higher than 0.0, acts like a boolean
-
309 /* 0x0C */ f32 unk_0C;
-
310 /* 0x10 */ s16 rotVelocity;
-
311 /* 0x12 */ s16 rotAngle;
-
312 /* 0x14 */ s16 playerId; // Id of the player that "owns" the shells
-
313 /* 0x16 */ s16 unk_16;
-
314 /* 0x18 */ Vec3f unk_18;
-
315 /* 0x24 */ Vec3f shellIndices; // Indices in gActorList for the shells "owned" by this parent
-
316 /* 0x30 */ Collision unk30;
-
317 const char* model;
-
318} TripleShellParent; // size = 0x70
+
310
+
+
311typedef struct {
+
312 /* 0x00 */ s16 type;
+
313 /* 0x02 */ s16 flags;
+
314 /* 0x04 */ s16 shellsAvailable;
+
315 /* 0x06 */ s16 state;
+
316 /* 0x08 */ f32 firePressed; // Set to 1.0 when Z is pressed. Triggers if value higher than 0.0, acts like a boolean
+
317 /* 0x0C */ f32 unk_0C;
+
318 /* 0x10 */ s16 rotVelocity;
+
319 /* 0x12 */ s16 rotAngle;
+
320 /* 0x14 */ s16 playerId; // Id of the player that "owns" the shells
+
321 /* 0x16 */ s16 unk_16;
+
322 /* 0x18 */ Vec3f unk_18;
+
323 /* 0x24 */ Vec3f shellIndices; // Indices in gActorList for the shells "owned" by this parent
+
324 /* 0x30 */ Collision unk30;
+
325 const char* model;
+
326} TripleShellParent; // size = 0x70
-
319
-
- -
321 /* 0x00 */ s16 type;
-
322 /* 0x02 */ s16 flags;
-
323 // Index in gActorList for the parent actor of this shell
-
324 // Seems to pull double duty as a timer
-
325 union {
-
326 /* 0x04 */ s16 parentIndex;
-
327 /* 0x04 */ s16 someTimer;
-
328 // Red Shells only (maybe blue shells?)
-
329 /* 0x04 */ s16 targetPlayer; // Player the shell is after
-
330 };
-
331 /* 0x06 */ s16 state;
-
332 /* 0x08 */ f32 shellId; // 0, 1, or 2. Indicates which shell in the triplet this one is
-
333 /* 0x0C */ f32 boundingBoxSize;
-
334 /* 0x10 */ s16 rotVelocity; // Change in rotAngle on a per-update basis
-
335 union {
-
336 /* 0x12 */ s16 rotAngle; // Angle of rotation around player (or parent?), not the rotation of the shell itself
-
337 /* 0x12 */ u16 pathIndex; // Index in the set of points that make up the "path" the red/blue shell follows (may
-
338 // be GP mode exclusive)
-
339 };
-
340 /* 0x14 */ s16 playerId; // Id of the player that "owns" the shell
-
341 /* 0x16 */ s16 unk_16;
-
342 /* 0x18 */ Vec3f pos;
-
343 /* 0x24 */ Vec3f velocity; // All 0 until the shell is fired
-
344 /* 0x30 */ Collision unk30;
-
345 const char* model;
-
346}; // size = 0x70
+
327
+
+ +
329 /* 0x00 */ s16 type;
+
330 /* 0x02 */ s16 flags;
+
331 // Index in gActorList for the parent actor of this shell
+
332 // Seems to pull double duty as a timer
+
333 union {
+
334 /* 0x04 */ s16 parentIndex;
+
335 /* 0x04 */ s16 someTimer;
+
336 // Red Shells only (maybe blue shells?)
+
337 /* 0x04 */ s16 targetPlayer; // Player the shell is after
+
338 };
+
339 /* 0x06 */ s16 state;
+
340 /* 0x08 */ f32 shellId; // 0, 1, or 2. Indicates which shell in the triplet this one is
+
341 /* 0x0C */ f32 boundingBoxSize;
+
342 /* 0x10 */ s16 rotVelocity; // Change in rotAngle on a per-update basis
+
343 union {
+
344 /* 0x12 */ s16 rotAngle; // Angle of rotation around player (or parent?), not the rotation of the shell itself
+
345 /* 0x12 */ u16 pathIndex; // Index in the set of points that make up the "path" the red/blue shell follows (may
+
346 // be GP mode exclusive)
+
347 };
+
348 /* 0x14 */ s16 playerId; // Id of the player that "owns" the shell
+
349 /* 0x16 */ s16 unk_16;
+
350 /* 0x18 */ Vec3f pos;
+
351 /* 0x24 */ Vec3f velocity; // All 0 until the shell is fired
+
352 /* 0x30 */ Collision unk30;
+
353 const char* model;
+
354}; // size = 0x70
-
347
-
-
348struct ItemBox {
-
349 /* 0x00 */ s16 type;
-
350 /* 0x02 */ s16 flags;
-
351 /* 0x04 */ s16 someTimer;
-
352 /* 0x06 */ s16 state;
-
353 /* 0x08 */ f32 resetDistance; // Value added to the Y position when box is touched. Expected to be negative
-
354 // Distance at which a player can activate the item box
-
355 // Named "bounding box" to match the name used for the "size" of a kart
-
356 /* 0x0C */ f32 boundingBoxSize;
-
357 /* 0x10 */ Vec3s rot;
-
358 /* 0x16 */ s16 unk_16;
-
359 /* 0x18 */ Vec3f pos;
-
360 /* 0x24 */ f32 origY; // Original Y position. Basically the Y position the box will reset to after being touched
-
361 /* 0x28 */ f32 unk_028;
-
362 /* 0x2C */ f32 unk_02C;
-
363 /* 0x30 */ Collision unk30;
-
364 const char* model;
-
365}; // size = 0x70
+
355
+
+
356struct ItemBox {
+
357 /* 0x00 */ s16 type;
+
358 /* 0x02 */ s16 flags;
+
359 /* 0x04 */ s16 someTimer;
+
360 /* 0x06 */ s16 state;
+
361 /* 0x08 */ f32 resetDistance; // Value added to the Y position when box is touched. Expected to be negative
+
362 // Distance at which a player can activate the item box
+
363 // Named "bounding box" to match the name used for the "size" of a kart
+
364 /* 0x0C */ f32 boundingBoxSize;
+
365 /* 0x10 */ Vec3s rot;
+
366 /* 0x16 */ s16 unk_16;
+
367 /* 0x18 */ Vec3f pos;
+
368 /* 0x24 */ f32 origY; // Original Y position. Basically the Y position the box will reset to after being touched
+
369 /* 0x28 */ f32 unk_028;
+
370 /* 0x2C */ f32 unk_02C;
+
371 /* 0x30 */ Collision unk30;
+
372 const char* model;
+
373}; // size = 0x70
-
366
-
- -
368 /* 0x00 */ s16 type;
-
369 /* 0x02 */ s16 flags;
-
370 /* 0x04 */ s16 someTimer;
-
371 /* 0x06 */ s16 state;
-
372 /* 0x08 */ f32 sizeScaling; // Controls the size of the box
-
373 /* 0x0C */ f32 boundingBoxSize;
-
374 /* 0x10 */ Vec3s rot;
-
375 /* 0x16 */ s16 unk_16;
-
376 /* 0x18 */ Vec3f pos;
-
377 /* 0x24 */ f32 playerId;
-
378 /* 0x28 */ f32 targetY;
-
379 /* 0x2C */ f32 unk_02C;
-
380 /* 0x30 */ Collision unk30;
-
381 const char* model;
-
382}; // size = 0x70
+
374
+
+ +
376 /* 0x00 */ s16 type;
+
377 /* 0x02 */ s16 flags;
+
378 /* 0x04 */ s16 someTimer;
+
379 /* 0x06 */ s16 state;
+
380 /* 0x08 */ f32 sizeScaling; // Controls the size of the box
+
381 /* 0x0C */ f32 boundingBoxSize;
+
382 /* 0x10 */ Vec3s rot;
+
383 /* 0x16 */ s16 unk_16;
+
384 /* 0x18 */ Vec3f pos;
+
385 /* 0x24 */ f32 playerId;
+
386 /* 0x28 */ f32 targetY;
+
387 /* 0x2C */ f32 unk_02C;
+
388 /* 0x30 */ Collision unk30;
+
389 const char* model;
+
390}; // size = 0x70
-
383
-
- -
385 /* 0x00 */ s16 type;
-
386 /* 0x02 */ s16 flags;
-
387 /* 0x04 */ s16 unk_04;
-
388 /* 0x06 */ s16 state;
-
389 /* 0x08 */ f32 unk_08;
-
390 /* 0x0C */ f32 unk_0C;
-
391 /* 0x10 */ s16 playerId; // Player that own the bananas
-
392 /* 0x12 */ s16 bananaIndices[5]; // Indices in gActorList for the bananas owned by this parent
-
393 /* 0x1C */ s16 bananasAvailable;
-
394 /* 0x1E */ s16 unk_1E;
-
395 /* 0x20 */ f32 unk_20[4];
-
396 /* 0x30 */ Collision unk30;
-
397 const char* model;
-
398}; // size = 0x70
+
391
+
+ +
393 /* 0x00 */ s16 type;
+
394 /* 0x02 */ s16 flags;
+
395 /* 0x04 */ s16 unk_04;
+
396 /* 0x06 */ s16 state;
+
397 /* 0x08 */ f32 unk_08;
+
398 /* 0x0C */ f32 unk_0C;
+
399 /* 0x10 */ s16 playerId; // Player that own the bananas
+
400 /* 0x12 */ s16 bananaIndices[5]; // Indices in gActorList for the bananas owned by this parent
+
401 /* 0x1C */ s16 bananasAvailable;
+
402 /* 0x1E */ s16 unk_1E;
+
403 /* 0x20 */ f32 unk_20[4];
+
404 /* 0x30 */ Collision unk30;
+
405 const char* model;
+
406}; // size = 0x70
-
399
-
- -
401 /* 0x00 */ s16 type;
-
402 /* 0x02 */ s16 flags;
-
403 /* 0x04 */ s16 unk_04;
-
404 /* 0x06 */ s16 state;
-
405 /* 0x08 */ s16 parentIndex;
-
406 /* 0x0A */ s16 bananaId; // ? Appears to indiciate which banana of the bunch this one is
-
407 /* 0x0C */ f32 boundingBoxSize;
-
408 union {
-
409 /* 0x10 */ Vec3s rot;
-
410 struct {
-
411 /* 0x10 */ s16 playerId; // Id of the player that owns this banana
-
412 /* 0x12 */ s16 elderIndex; // Index in gActorList of the next-oldest banana in the bunch
-
413 /* 0x14 */ s16 youngerIndex; // Index in gActorList of the next-youngest banana in the bunch
-
414 };
-
415 };
-
416 /* 0x16 */ s16 unk_16;
-
417 /* 0x18 */ Vec3f pos;
-
418 /* 0x24 */ Vec3f velocity;
-
419 /* 0x30 */ Collision unk30;
-
420 const char* model;
-
421}; // size = 0x70
+
407
+
+ +
409 /* 0x00 */ s16 type;
+
410 /* 0x02 */ s16 flags;
+
411 /* 0x04 */ s16 unk_04;
+
412 /* 0x06 */ s16 state;
+
413 /* 0x08 */ s16 parentIndex;
+
414 /* 0x0A */ s16 bananaId; // ? Appears to indiciate which banana of the bunch this one is
+
415 /* 0x0C */ f32 boundingBoxSize;
+
416 union {
+
417 /* 0x10 */ Vec3s rot;
+
418 struct {
+
419 /* 0x10 */ s16 playerId; // Id of the player that owns this banana
+
420 /* 0x12 */ s16 elderIndex; // Index in gActorList of the next-oldest banana in the bunch
+
421 /* 0x14 */ s16 youngerIndex; // Index in gActorList of the next-youngest banana in the bunch
+
422 };
+
423 };
+
424 /* 0x16 */ s16 unk_16;
+
425 /* 0x18 */ Vec3f pos;
+
426 /* 0x24 */ Vec3f velocity;
+
427 /* 0x30 */ Collision unk30;
+
428 const char* model;
+
429}; // size = 0x70
-
422
-
423// #pragma GCC diagnostic pop
-
424
-
425#endif // ACTOR_TYPES_H
+
430
+
431// #pragma GCC diagnostic pop
+
432
+
433#endif // ACTOR_TYPES_H
ActorType
Definition actor_types.h:39
@ ACTOR_UNKNOWN_0x14
Definition actor_types.h:59
@ ACTOR_BANANA_BUNCH
Definition actor_types.h:53
@@ -623,163 +631,165 @@ $(function(){initNavTree('actor__types_8h_source.html',''); initResizable(true);
s16 flags
Definition actor_types.h:126
Vec3f pos
Definition actor_types.h:133
f32 boundingBoxSize
Definition actor_types.h:130
-
Definition actor_types.h:400
-
Vec3f velocity
Definition actor_types.h:418
-
Vec3s rot
Definition actor_types.h:409
-
Collision unk30
Definition actor_types.h:419
-
f32 boundingBoxSize
Definition actor_types.h:407
-
s16 unk_16
Definition actor_types.h:416
-
s16 playerId
Definition actor_types.h:411
-
s16 elderIndex
Definition actor_types.h:412
-
s16 type
Definition actor_types.h:401
-
Vec3f pos
Definition actor_types.h:417
-
s16 bananaId
Definition actor_types.h:406
-
s16 unk_04
Definition actor_types.h:403
-
s16 flags
Definition actor_types.h:402
-
const char * model
Definition actor_types.h:420
-
s16 youngerIndex
Definition actor_types.h:413
-
s16 parentIndex
Definition actor_types.h:405
-
s16 state
Definition actor_types.h:404
-
Definition actor_types.h:384
-
s16 playerId
Definition actor_types.h:391
-
s16 bananasAvailable
Definition actor_types.h:393
-
s16 state
Definition actor_types.h:388
-
s16 unk_04
Definition actor_types.h:387
-
f32 unk_08
Definition actor_types.h:389
-
s16 unk_1E
Definition actor_types.h:394
-
s16 flags
Definition actor_types.h:386
-
s16 bananaIndices[5]
Definition actor_types.h:392
-
f32 unk_0C
Definition actor_types.h:390
-
f32 unk_20[4]
Definition actor_types.h:395
-
Collision unk30
Definition actor_types.h:396
-
const char * model
Definition actor_types.h:397
-
s16 type
Definition actor_types.h:385
+
Definition actor_types.h:408
+
Vec3f velocity
Definition actor_types.h:426
+
Vec3s rot
Definition actor_types.h:417
+
Collision unk30
Definition actor_types.h:427
+
f32 boundingBoxSize
Definition actor_types.h:415
+
s16 unk_16
Definition actor_types.h:424
+
s16 playerId
Definition actor_types.h:419
+
s16 elderIndex
Definition actor_types.h:420
+
s16 type
Definition actor_types.h:409
+
Vec3f pos
Definition actor_types.h:425
+
s16 bananaId
Definition actor_types.h:414
+
s16 unk_04
Definition actor_types.h:411
+
s16 flags
Definition actor_types.h:410
+
const char * model
Definition actor_types.h:428
+
s16 youngerIndex
Definition actor_types.h:421
+
s16 parentIndex
Definition actor_types.h:413
+
s16 state
Definition actor_types.h:412
+
Definition actor_types.h:392
+
s16 playerId
Definition actor_types.h:399
+
s16 bananasAvailable
Definition actor_types.h:401
+
s16 state
Definition actor_types.h:396
+
s16 unk_04
Definition actor_types.h:395
+
f32 unk_08
Definition actor_types.h:397
+
s16 unk_1E
Definition actor_types.h:402
+
s16 flags
Definition actor_types.h:394
+
s16 bananaIndices[5]
Definition actor_types.h:400
+
f32 unk_0C
Definition actor_types.h:398
+
f32 unk_20[4]
Definition actor_types.h:403
+
Collision unk30
Definition actor_types.h:404
+
const char * model
Definition actor_types.h:405
+
s16 type
Definition actor_types.h:393
Definition common_structs.h:147
-
Definition actor_types.h:367
-
Vec3s rot
Definition actor_types.h:374
-
const char * model
Definition actor_types.h:381
-
s16 someTimer
Definition actor_types.h:370
-
f32 targetY
Definition actor_types.h:378
-
s16 flags
Definition actor_types.h:369
-
f32 boundingBoxSize
Definition actor_types.h:373
-
f32 sizeScaling
Definition actor_types.h:372
-
Collision unk30
Definition actor_types.h:380
-
f32 playerId
Definition actor_types.h:377
-
s16 state
Definition actor_types.h:371
-
s16 unk_16
Definition actor_types.h:375
-
s16 type
Definition actor_types.h:368
-
Vec3f pos
Definition actor_types.h:376
-
f32 unk_02C
Definition actor_types.h:379
-
Definition actor_types.h:181
-
Collision unk30
Definition actor_types.h:192
-
s16 respawnTimer
Definition actor_types.h:184
-
f32 unk_08
Definition actor_types.h:186
-
Vec3s rot
Definition actor_types.h:188
-
s16 unk_06
Definition actor_types.h:185
-
Vec3f pos
Definition actor_types.h:190
-
f32 boundingBoxSize
Definition actor_types.h:187
-
s16 unk_16
Definition actor_types.h:189
-
Vec3f velocity
Definition actor_types.h:191
-
s16 type
Definition actor_types.h:182
-
s16 flags
Definition actor_types.h:183
-
const char * model
Definition actor_types.h:193
-
Definition actor_types.h:348
-
s16 someTimer
Definition actor_types.h:351
-
s16 flags
Definition actor_types.h:350
-
f32 unk_028
Definition actor_types.h:361
-
f32 origY
Definition actor_types.h:360
-
f32 boundingBoxSize
Definition actor_types.h:356
-
s16 type
Definition actor_types.h:349
-
Vec3f pos
Definition actor_types.h:359
-
s16 state
Definition actor_types.h:352
-
f32 resetDistance
Definition actor_types.h:353
-
const char * model
Definition actor_types.h:364
-
Vec3s rot
Definition actor_types.h:357
-
f32 unk_02C
Definition actor_types.h:362
-
Collision unk30
Definition actor_types.h:363
-
s16 unk_16
Definition actor_types.h:358
-
Definition actor_types.h:241
-
f32 boundingBoxSize
Definition actor_types.h:249
-
Collision unk30
Definition actor_types.h:256
-
f32 bonkTimer
Definition actor_types.h:247
-
Vec3f velocity
Definition actor_types.h:255
-
s16 animState
Definition actor_types.h:250
-
s16 animTimer
Definition actor_types.h:251
-
s16 type
Definition actor_types.h:242
-
s16 unk_16
Definition actor_types.h:253
-
s16 unk_14
Definition actor_types.h:252
-
s16 flags
Definition actor_types.h:243
-
s16 targetPlayer
Definition actor_types.h:245
-
Vec3f pos
Definition actor_types.h:254
-
s16 state
Definition actor_types.h:246
-
const char * model
Definition actor_types.h:257
-
Definition actor_types.h:260
-
Vec3f pos
Definition actor_types.h:269
-
Vec3s boatRot
Definition actor_types.h:267
-
s16 unk_04
Definition actor_types.h:263
-
Vec3f velocity
Definition actor_types.h:270
-
f32 unk_0C
Definition actor_types.h:266
-
s16 wheelRot
Definition actor_types.h:264
-
s16 unk_16
Definition actor_types.h:268
-
f32 unk_08
Definition actor_types.h:265
-
s16 flags
Definition actor_types.h:262
-
s16 type
Definition actor_types.h:261
-
const char * model
Definition actor_types.h:272
-
Collision unk30
Definition actor_types.h:271
-
Definition actor_types.h:288
-
Vec3s rot
Definition actor_types.h:295
-
s16 state
Definition actor_types.h:292
-
s16 type
Definition actor_types.h:289
-
s16 unk_16
Definition actor_types.h:296
-
f32 unk_08
Definition actor_types.h:293
-
s16 variant
Definition actor_types.h:291
-
s16 flags
Definition actor_types.h:290
-
Vec3f velocity
Definition actor_types.h:298
-
Vec3f pos
Definition actor_types.h:297
-
const char * model
Definition actor_types.h:300
-
f32 boundingBoxSize
Definition actor_types.h:294
-
Collision unk30
Definition actor_types.h:299
-
Definition actor_types.h:275
-
Vec4s visibilityStates
Definition actor_types.h:278
-
s16 type
Definition actor_types.h:276
-
Collision unk30
Definition actor_types.h:284
-
Vec4s timers
Definition actor_types.h:282
-
f32 unk_02C
Definition actor_types.h:283
-
Vec4s unk10
Definition actor_types.h:280
-
const char * model
Definition actor_types.h:285
-
s16 flags
Definition actor_types.h:277
-
Vec3f pos
Definition actor_types.h:281
-
f32 boundingBoxSize
Definition actor_types.h:279
+
Definition actor_types.h:375
+
Vec3s rot
Definition actor_types.h:382
+
const char * model
Definition actor_types.h:389
+
s16 someTimer
Definition actor_types.h:378
+
f32 targetY
Definition actor_types.h:386
+
s16 flags
Definition actor_types.h:377
+
f32 boundingBoxSize
Definition actor_types.h:381
+
f32 sizeScaling
Definition actor_types.h:380
+
Collision unk30
Definition actor_types.h:388
+
f32 playerId
Definition actor_types.h:385
+
s16 state
Definition actor_types.h:379
+
s16 unk_16
Definition actor_types.h:383
+
s16 type
Definition actor_types.h:376
+
Vec3f pos
Definition actor_types.h:384
+
f32 unk_02C
Definition actor_types.h:387
+
Definition actor_types.h:189
+
Collision unk30
Definition actor_types.h:200
+
s16 respawnTimer
Definition actor_types.h:192
+
f32 unk_08
Definition actor_types.h:194
+
Vec3s rot
Definition actor_types.h:196
+
s16 unk_06
Definition actor_types.h:193
+
Vec3f pos
Definition actor_types.h:198
+
f32 boundingBoxSize
Definition actor_types.h:195
+
s16 unk_16
Definition actor_types.h:197
+
Vec3f velocity
Definition actor_types.h:199
+
s16 type
Definition actor_types.h:190
+
s16 flags
Definition actor_types.h:191
+
const char * model
Definition actor_types.h:201
+
Definition actor_types.h:356
+
s16 someTimer
Definition actor_types.h:359
+
s16 flags
Definition actor_types.h:358
+
f32 unk_028
Definition actor_types.h:369
+
f32 origY
Definition actor_types.h:368
+
f32 boundingBoxSize
Definition actor_types.h:364
+
s16 type
Definition actor_types.h:357
+
Vec3f pos
Definition actor_types.h:367
+
s16 state
Definition actor_types.h:360
+
f32 resetDistance
Definition actor_types.h:361
+
const char * model
Definition actor_types.h:372
+
Vec3s rot
Definition actor_types.h:365
+
f32 unk_02C
Definition actor_types.h:370
+
Collision unk30
Definition actor_types.h:371
+
s16 unk_16
Definition actor_types.h:366
+
Definition actor_types.h:249
+
f32 boundingBoxSize
Definition actor_types.h:257
+
Collision unk30
Definition actor_types.h:264
+
f32 bonkTimer
Definition actor_types.h:255
+
Vec3f velocity
Definition actor_types.h:263
+
s16 animState
Definition actor_types.h:258
+
s16 animTimer
Definition actor_types.h:259
+
s16 type
Definition actor_types.h:250
+
s16 unk_16
Definition actor_types.h:261
+
s16 unk_14
Definition actor_types.h:260
+
s16 flags
Definition actor_types.h:251
+
s16 targetPlayer
Definition actor_types.h:253
+
Vec3f pos
Definition actor_types.h:262
+
s16 state
Definition actor_types.h:254
+
const char * model
Definition actor_types.h:265
+
Definition actor_types.h:268
+
Vec3f pos
Definition actor_types.h:277
+
Vec3s boatRot
Definition actor_types.h:275
+
s16 unk_04
Definition actor_types.h:271
+
Vec3f velocity
Definition actor_types.h:278
+
f32 unk_0C
Definition actor_types.h:274
+
s16 wheelRot
Definition actor_types.h:272
+
s16 unk_16
Definition actor_types.h:276
+
f32 unk_08
Definition actor_types.h:273
+
s16 flags
Definition actor_types.h:270
+
s16 type
Definition actor_types.h:269
+
const char * model
Definition actor_types.h:280
+
Collision unk30
Definition actor_types.h:279
+
Definition actor_types.h:296
+
Vec3s rot
Definition actor_types.h:303
+
s16 state
Definition actor_types.h:300
+
s16 type
Definition actor_types.h:297
+
s16 unk_16
Definition actor_types.h:304
+
f32 unk_08
Definition actor_types.h:301
+
s16 variant
Definition actor_types.h:299
+
s16 flags
Definition actor_types.h:298
+
Vec3f velocity
Definition actor_types.h:306
+
Vec3f pos
Definition actor_types.h:305
+
const char * model
Definition actor_types.h:308
+
f32 boundingBoxSize
Definition actor_types.h:302
+
Collision unk30
Definition actor_types.h:307
+
Definition actor_types.h:283
+
Vec4s visibilityStates
Definition actor_types.h:286
+
s16 type
Definition actor_types.h:284
+
Collision unk30
Definition actor_types.h:292
+
Vec4s timers
Definition actor_types.h:290
+
f32 unk_02C
Definition actor_types.h:291
+
Vec4s unk10
Definition actor_types.h:288
+
const char * model
Definition actor_types.h:293
+
s16 flags
Definition actor_types.h:285
+
Vec3f pos
Definition actor_types.h:289
+
f32 boundingBoxSize
Definition actor_types.h:287
Definition actor_types.h:164
-
Vec3f velocity
Definition actor_types.h:173
-
s16 unk_16
Definition actor_types.h:171
+
Vec3f velocity
Definition actor_types.h:181
+
s16 unk_16
Definition actor_types.h:179
s16 type
Definition actor_types.h:165
s16 flags
Definition actor_types.h:166
-
void * crossingTrigger
Definition actor_types.h:169
+
void * crossingTrigger
Definition actor_types.h:171
s16 crossingId
Definition actor_types.h:168
-
Vec3s rot
Definition actor_types.h:170
-
Collision unk30
Definition actor_types.h:174
-
Vec3f pos
Definition actor_types.h:172
+
f32 unk_08
Definition actor_types.h:174
+
f32 boundingBoxSize
Definition actor_types.h:175
+
Vec3s rot
Definition actor_types.h:178
+
Collision unk30
Definition actor_types.h:182
+
Vec3f pos
Definition actor_types.h:180
s16 someTimer
Definition actor_types.h:167
-
const char * model
Definition actor_types.h:175
-
Definition actor_types.h:320
-
s16 rotAngle
Definition actor_types.h:336
-
s16 rotVelocity
Definition actor_types.h:334
-
s16 unk_16
Definition actor_types.h:341
-
s16 flags
Definition actor_types.h:322
-
f32 boundingBoxSize
Definition actor_types.h:333
-
s16 state
Definition actor_types.h:331
-
f32 shellId
Definition actor_types.h:332
-
s16 type
Definition actor_types.h:321
-
s16 playerId
Definition actor_types.h:340
-
Vec3f velocity
Definition actor_types.h:343
-
const char * model
Definition actor_types.h:345
-
s16 parentIndex
Definition actor_types.h:326
-
Vec3f pos
Definition actor_types.h:342
-
Collision unk30
Definition actor_types.h:344
-
s16 targetPlayer
Definition actor_types.h:329
-
s16 someTimer
Definition actor_types.h:327
-
u16 pathIndex
Definition actor_types.h:337
+
const char * model
Definition actor_types.h:183
+
Definition actor_types.h:328
+
s16 rotAngle
Definition actor_types.h:344
+
s16 rotVelocity
Definition actor_types.h:342
+
s16 unk_16
Definition actor_types.h:349
+
s16 flags
Definition actor_types.h:330
+
f32 boundingBoxSize
Definition actor_types.h:341
+
s16 state
Definition actor_types.h:339
+
f32 shellId
Definition actor_types.h:340
+
s16 type
Definition actor_types.h:329
+
s16 playerId
Definition actor_types.h:348
+
Vec3f velocity
Definition actor_types.h:351
+
const char * model
Definition actor_types.h:353
+
s16 parentIndex
Definition actor_types.h:334
+
Vec3f pos
Definition actor_types.h:350
+
Collision unk30
Definition actor_types.h:352
+
s16 targetPlayer
Definition actor_types.h:337
+
s16 someTimer
Definition actor_types.h:335
+
u16 pathIndex
Definition actor_types.h:345
Definition actor_types.h:149
s16 flags
Definition actor_types.h:151
s16 unk_04
Definition actor_types.h:152
@@ -793,40 +803,40 @@ $(function(){initNavTree('actor__types_8h_source.html',''); initResizable(true);
const char * model
Definition actor_types.h:161
Vec3s rot
Definition actor_types.h:156
Collision unk30
Definition actor_types.h:160
-
Definition actor_types.h:303
-
Collision unk30
Definition actor_types.h:316
-
s16 playerId
Definition actor_types.h:312
-
s16 state
Definition actor_types.h:307
-
s16 shellsAvailable
Definition actor_types.h:306
-
s16 rotVelocity
Definition actor_types.h:310
-
Vec3f unk_18
Definition actor_types.h:314
-
s16 type
Definition actor_types.h:304
-
s16 rotAngle
Definition actor_types.h:311
-
s16 unk_16
Definition actor_types.h:313
-
f32 firePressed
Definition actor_types.h:308
-
s16 flags
Definition actor_types.h:305
-
f32 unk_0C
Definition actor_types.h:309
-
const char * model
Definition actor_types.h:317
-
Vec3f shellIndices
Definition actor_types.h:315
+
Definition actor_types.h:311
+
Collision unk30
Definition actor_types.h:324
+
s16 playerId
Definition actor_types.h:320
+
s16 state
Definition actor_types.h:315
+
s16 shellsAvailable
Definition actor_types.h:314
+
s16 rotVelocity
Definition actor_types.h:318
+
Vec3f unk_18
Definition actor_types.h:322
+
s16 type
Definition actor_types.h:312
+
s16 rotAngle
Definition actor_types.h:319
+
s16 unk_16
Definition actor_types.h:321
+
f32 firePressed
Definition actor_types.h:316
+
s16 flags
Definition actor_types.h:313
+
f32 unk_0C
Definition actor_types.h:317
+
const char * model
Definition actor_types.h:325
+
Vec3f shellIndices
Definition actor_types.h:323
Definition UnkSpawnData.h:8
Vec3s pos
Definition UnkSpawnData.h:9
s16 someId
Definition UnkSpawnData.h:11
s16 unk8
Definition UnkSpawnData.h:13
-
Definition actor_types.h:222
-
s16 unk_14
Definition actor_types.h:231
-
Collision unk30
Definition actor_types.h:237
-
s16 eggRot
Definition actor_types.h:230
-
const char * model
Definition actor_types.h:238
-
s16 type
Definition actor_types.h:223
-
s16 flags
Definition actor_types.h:224
-
Vec3f pos
Definition actor_types.h:233
-
f32 pathRadius
Definition actor_types.h:227
-
s16 unk_16
Definition actor_types.h:232
-
s16 unk_06
Definition actor_types.h:226
-
s16 unk_04
Definition actor_types.h:225
-
f32 boundingBoxSize
Definition actor_types.h:228
-
Vec3f pathCenter
Definition actor_types.h:236
-
s16 pathRot
Definition actor_types.h:229
+
Definition actor_types.h:230
+
s16 unk_14
Definition actor_types.h:239
+
Collision unk30
Definition actor_types.h:245
+
s16 eggRot
Definition actor_types.h:238
+
const char * model
Definition actor_types.h:246
+
s16 type
Definition actor_types.h:231
+
s16 flags
Definition actor_types.h:232
+
Vec3f pos
Definition actor_types.h:241
+
f32 pathRadius
Definition actor_types.h:235
+
s16 unk_16
Definition actor_types.h:240
+
s16 unk_06
Definition actor_types.h:234
+
s16 unk_04
Definition actor_types.h:233
+
f32 boundingBoxSize
Definition actor_types.h:236
+
Vec3f pathCenter
Definition actor_types.h:244
+
s16 pathRot
Definition actor_types.h:237
diff --git a/actors_8h_source.html b/actors_8h_source.html index 6bd09f629..bbfe86f22 100644 --- a/actors_8h_source.html +++ b/actors_8h_source.html @@ -346,22 +346,22 @@ $(function(){initNavTree('actors_8h_source.html',''); initResizable(true); });
void render_actor_school_bus(Camera *camera, struct Actor *arg1)
Renders the school bus actor. Actor used in Toad's Turnpike. His update are made in vehicle.
Definition render.inc.c:14
Definition SpawnData.h:8
Definition actor_types.h:124
-
Definition actor_types.h:400
+
Definition actor_types.h:408
Definition camera.h:35
Definition common_structs.h:147
-
Definition actor_types.h:367
-
Definition actor_types.h:181
-
Definition actor_types.h:348
-
Definition actor_types.h:241
-
Definition actor_types.h:260
-
Definition actor_types.h:288
-
Definition actor_types.h:275
+
Definition actor_types.h:375
+
Definition actor_types.h:189
+
Definition actor_types.h:356
+
Definition actor_types.h:249
+
Definition actor_types.h:268
+
Definition actor_types.h:296
+
Definition actor_types.h:283
Definition common_structs.h:264
Definition actor_types.h:164
Definition code_800029B0.h:14
-
Definition actor_types.h:320
+
Definition actor_types.h:328
Definition actor_types.h:149
-
Definition actor_types.h:222
+
Definition actor_types.h:230
void render_actor_tanker_truck(Camera *camera, struct Actor *arg1)
Renders the tanker truck actor. Actor used in Toad's Turnpike. His update are made in vehicle.
Definition render.inc.c:13
void render_actor_train_engine(Camera *camera, struct TrainCar *actor)
Renders the train engine actor. Actor used in Kalimari Desert. His update position are made in vehicl...
Definition render.inc.c:14
void render_actor_train_tender(Camera *camera, struct TrainCar *actor)
Definition render.inc.c:171
diff --git a/actors__extended_8h_source.html b/actors__extended_8h_source.html index 26ceb0af3..4fd41f04c 100644 --- a/actors__extended_8h_source.html +++ b/actors__extended_8h_source.html @@ -194,12 +194,12 @@ $(function(){initNavTree('actors__extended_8h_source.html',''); initResizable(tr
void func_800CAB4C(u8 arg0)
Definition external.c:3506
void update_actor_green_shell(struct ShellActor *shell)
Updates the green shell actor.
Definition update.inc.c:13
Definition actor_types.h:124
-
Definition actor_types.h:400
-
Definition actor_types.h:384
+
Definition actor_types.h:408
+
Definition actor_types.h:392
Definition common_structs.h:147
Definition common_structs.h:264
-
Definition actor_types.h:320
-
Definition actor_types.h:303
+
Definition actor_types.h:328
+
Definition actor_types.h:311
diff --git a/animation_8h.html b/animation_8h.html index 375794bd5..d7a8eab60 100644 --- a/animation_8h.html +++ b/animation_8h.html @@ -211,9 +211,8 @@ Functions
-Value:
+Value:
ANIMATION_RENDER_MODEL_AT((uintptr_t) NULL, x, y, z)
#define ANIMATION_RENDER_MODEL_AT(model, x, y, z)
the pos is relative to the previous RENDER_MODEL_OR_ADD_POS if ANIMATION_DISABLE_AUTOMATIC_POP is use...
Definition animation.h:171
-
signed long long int s64
Definition llconv.c:1
#define NULL
Definition miniaudio.h:3851

use RENDER_MODEL_OR_ADD_POS

@@ -296,7 +295,7 @@ Functions
-Value:
RENDER_MODEL_OR_ADD_POS, 0x00000007, 0x00000000, (s64) model, x, y, z
+Value:
RENDER_MODEL_OR_ADD_POS, 0x00000007, 0x00000000, (uintptr_t) model, x, y, z
@ RENDER_MODEL_OR_ADD_POS
Definition animation.h:177

the pos is relative to the previous RENDER_MODEL_OR_ADD_POS if ANIMATION_DISABLE_AUTOMATIC_POP is used

diff --git a/animation_8h_source.html b/animation_8h_source.html index 825360ac5..a616e9bbf 100644 --- a/animation_8h_source.html +++ b/animation_8h_source.html @@ -277,19 +277,19 @@ $(function(){initNavTree('animation_8h_source.html',''); initResizable(true); })
167#define ANIMATION_DISABLE_AUTOMATIC_POP SIMPLE_ANIMATION_INSTRUCTION(DISABLE_AUTOMATIC_POP_MATRIX)
168#define ANIMATION_POP_MATRIX SIMPLE_ANIMATION_INSTRUCTION(POP_MATRIX)
169#define ANIMATION_STOP SIMPLE_ANIMATION_INSTRUCTION(STOP_ANIMATION)
-
171#define ANIMATION_RENDER_MODEL_AT(model, x, y, z) RENDER_MODEL_OR_ADD_POS, 0x00000007, 0x00000000, (s64) model, x, y, z
+
171#define ANIMATION_RENDER_MODEL_AT(model, x, y, z) RENDER_MODEL_OR_ADD_POS, 0x00000007, 0x00000000, (uintptr_t) model, x, y, z
173#define ANIMATION_RENDER_MODEL(model) ANIMATION_RENDER_MODEL_AT(model, 0x00000000, 0x00000000, 0x00000000)
-
175#define ANIMATION_ADD_POS(x, y, z) ANIMATION_RENDER_MODEL_AT((s64) NULL, x, y, z)
+
175#define ANIMATION_ADD_POS(x, y, z) ANIMATION_RENDER_MODEL_AT((uintptr_t) NULL, x, y, z)
176
178
183typedef struct {
-
184 /* 0x00 */ s64 type;
-
185 /* 0x04 */ s64 size;
- +
184 /* 0x00 */ intptr_t type;
+
185 /* 0x04 */ intptr_t size;
+
186 /* 0x08 */ intptr_t always_zero_never_used;
187 /* 0x0C */ Gfx* model;
-
188 /* 0x10 */ s64 pos[3];
+
188 /* 0x10 */ intptr_t pos[3];
189} Armature;
190
@@ -339,7 +339,6 @@ $(function(){initNavTree('animation_8h_source.html',''); initResizable(true); })
f32 Vec3f[3]
Definition common_structs.h:10
s16 Vec3s[3]
Definition common_structs.h:15
f32 Mat4[4][4]
Definition common_structs.h:20
-
signed long long int s64
Definition llconv.c:1
Definition animation.h:191
u16 animation_length
Definition animation.h:192
u16 indexCycle
Definition animation.h:193
@@ -351,11 +350,11 @@ $(function(){initNavTree('animation_8h_source.html',''); initResizable(true); })
s32 always_set_to_something_but_never_used
Definition animation.h:201
s32 always_zero_never_used
Definition animation.h:202
The armature is associated with an AnimationLimbVector which is equal to the number of RENDER_MODEL_O...
Definition animation.h:183
-
s64 always_zero_never_used
Definition animation.h:186
-
s64 pos[3]
Definition animation.h:188
-
s64 type
Definition animation.h:184
+
intptr_t pos[3]
Definition animation.h:188
+
intptr_t size
Definition animation.h:185
+
intptr_t always_zero_never_used
Definition animation.h:186
Gfx * model
Definition animation.h:187
-
s64 size
Definition animation.h:185
+
intptr_t type
Definition animation.h:184
diff --git a/banana_2render_8inc_8c_source.html b/banana_2render_8inc_8c_source.html index 50adaf634..f21aceaa5 100644 --- a/banana_2render_8inc_8c_source.html +++ b/banana_2render_8inc_8c_source.html @@ -178,10 +178,10 @@ $(function(){initNavTree('banana_2render_8inc_8c_source.html',''); initResizable
f32 is_within_render_distance(Vec3f cameraPos, Vec3f objectPos, u16 orientationY, f32 minDistance, f32 fov, f32 maxDistance)
Definition math_util.c:1099
void mtxf_pos_rotation_xyz(Mat4 out, Vec3f pos, Vec3s orientation)
Definition math_util.c:449
Definition actor_types.h:124
-
Definition actor_types.h:400
-
Vec3s rot
Definition actor_types.h:409
-
Vec3f pos
Definition actor_types.h:417
-
s16 state
Definition actor_types.h:404
+
Definition actor_types.h:408
+
Vec3s rot
Definition actor_types.h:417
+
Vec3f pos
Definition actor_types.h:425
+
s16 state
Definition actor_types.h:412
Definition camera.h:35
Vec3s rot
Definition camera.h:42
f32 fieldOfView
Definition camera.h:43
diff --git a/banana_2update_8inc_8c_source.html b/banana_2update_8inc_8c_source.html index 39169af39..1fdf8113f 100644 --- a/banana_2update_8inc_8c_source.html +++ b/banana_2update_8inc_8c_source.html @@ -341,12 +341,12 @@ $(function(){initNavTree('banana_2update_8inc_8c_source.html',''); initResizable
s16 flags
Definition actor_types.h:126
Vec3f pos
Definition actor_types.h:133
f32 boundingBoxSize
Definition actor_types.h:130
-
Definition actor_types.h:400
-
Collision unk30
Definition actor_types.h:419
-
f32 boundingBoxSize
Definition actor_types.h:407
-
s16 playerId
Definition actor_types.h:411
-
Vec3f pos
Definition actor_types.h:417
-
s16 state
Definition actor_types.h:404
+
Definition actor_types.h:408
+
Collision unk30
Definition actor_types.h:427
+
f32 boundingBoxSize
Definition actor_types.h:415
+
s16 playerId
Definition actor_types.h:419
+
Vec3f pos
Definition actor_types.h:425
+
s16 state
Definition actor_types.h:412
Vec3f surfaceDistance
Definition common_structs.h:155
Vec3f orientationVector
Definition common_structs.h:158
u16 unk34
Definition common_structs.h:150
diff --git a/blue__and__red__shells_2render_8inc_8c_source.html b/blue__and__red__shells_2render_8inc_8c_source.html index 5fbd5378f..59646a653 100644 --- a/blue__and__red__shells_2render_8inc_8c_source.html +++ b/blue__and__red__shells_2render_8inc_8c_source.html @@ -133,7 +133,7 @@ $(function(){initNavTree('blue__and__red__shells_2render_8inc_8c_source.html',''
f32 Mat4[4][4]
Definition common_structs.h:20
Gfx * gDisplayListHead
Definition main.c:129
Definition camera.h:35
-
Definition actor_types.h:320
+
Definition actor_types.h:328
diff --git a/blue__and__red__shells_2update_8inc_8c_source.html b/blue__and__red__shells_2update_8inc_8c_source.html index 3ade915e1..c59b8cd67 100644 --- a/blue__and__red__shells_2update_8inc_8c_source.html +++ b/blue__and__red__shells_2update_8inc_8c_source.html @@ -692,24 +692,24 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
u16 type
Definition common_structs.h:265
s16 currentRank
Definition common_structs.h:267
Vec3f pos
Definition common_structs.h:274
-
Definition actor_types.h:320
-
s16 rotAngle
Definition actor_types.h:336
-
s16 rotVelocity
Definition actor_types.h:334
-
s16 flags
Definition actor_types.h:322
-
f32 boundingBoxSize
Definition actor_types.h:333
-
s16 state
Definition actor_types.h:331
-
f32 shellId
Definition actor_types.h:332
-
s16 type
Definition actor_types.h:321
-
s16 playerId
Definition actor_types.h:340
-
Vec3f velocity
Definition actor_types.h:343
-
Vec3f pos
Definition actor_types.h:342
-
Collision unk30
Definition actor_types.h:344
-
s16 targetPlayer
Definition actor_types.h:329
-
s16 someTimer
Definition actor_types.h:327
-
u16 pathIndex
Definition actor_types.h:337
-
Definition actor_types.h:303
-
s16 rotVelocity
Definition actor_types.h:310
-
s16 type
Definition actor_types.h:304
+
Definition actor_types.h:328
+
s16 rotAngle
Definition actor_types.h:344
+
s16 rotVelocity
Definition actor_types.h:342
+
s16 flags
Definition actor_types.h:330
+
f32 boundingBoxSize
Definition actor_types.h:341
+
s16 state
Definition actor_types.h:339
+
f32 shellId
Definition actor_types.h:340
+
s16 type
Definition actor_types.h:329
+
s16 playerId
Definition actor_types.h:348
+
Vec3f velocity
Definition actor_types.h:351
+
Vec3f pos
Definition actor_types.h:350
+
Collision unk30
Definition actor_types.h:352
+
s16 targetPlayer
Definition actor_types.h:337
+
s16 someTimer
Definition actor_types.h:335
+
u16 pathIndex
Definition actor_types.h:345
+
Definition actor_types.h:311
+
s16 rotVelocity
Definition actor_types.h:318
+
s16 type
Definition actor_types.h:312
diff --git a/code__80005FD0_8c.html b/code__80005FD0_8c.html index e9b2fd633..18441cf8d 100644 --- a/code__80005FD0_8c.html +++ b/code__80005FD0_8c.html @@ -1259,7 +1259,7 @@ Variables
Value:
((struct BananaActor*) (actor))
-
Definition actor_types.h:400
+
Definition actor_types.h:408
@@ -1278,7 +1278,7 @@ Variables
Value:
((struct BananaBunchParent*) (actor))
-
Definition actor_types.h:384
+
Definition actor_types.h:392
@@ -1381,7 +1381,7 @@ Variables
Value:
((struct FakeItemBox*) (actor))
-
Definition actor_types.h:367
+
Definition actor_types.h:375
@@ -1422,7 +1422,7 @@ Variables
Value:
((struct ShellActor*) (actor))
-
Definition actor_types.h:320
+
Definition actor_types.h:328
diff --git a/contpfs_8c.html b/contpfs_8c.html index 1a2cb0334..d5670d7e7 100644 --- a/contpfs_8c.html +++ b/contpfs_8c.html @@ -210,8 +210,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:
@@ -284,7 +284,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:
@@ -348,8 +348,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/controller_8h.html b/controller_8h.html index a633c6c30..4395f09fe 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/courses_2test__track_2data_8c.html b/courses_2test__track_2data_8c.html index 23a4c5f30..7fddcba8d 100644 --- a/courses_2test__track_2data_8c.html +++ b/courses_2test__track_2data_8c.html @@ -186,7 +186,7 @@ Variables
Initial value:
= {
-
{ mario_Plane_001_mesh, 255, 255, 0x0000 },
+
{ .model = mario_Plane_001_mesh, 255, 255, 0x0000 },
{ 0x00000000, 0, 0, 0x00000 },
}
diff --git a/doxygen_crawl.html b/doxygen_crawl.html index 0fcd36fd9..28e449586 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -10445,12 +10445,12 @@ - + - + @@ -10466,7 +10466,7 @@ - + @@ -10488,7 +10488,7 @@ - + @@ -18135,11 +18135,11 @@ - - - + + + - + @@ -19230,6 +19230,8 @@ + + @@ -19749,6 +19751,7 @@ + diff --git a/fake__item__box_2render_8inc_8c_source.html b/fake__item__box_2render_8inc_8c_source.html index cdddd602b..166fb26f0 100644 --- a/fake__item__box_2render_8inc_8c_source.html +++ b/fake__item__box_2render_8inc_8c_source.html @@ -348,12 +348,12 @@ $(function(){initNavTree('fake__item__box_2render_8inc_8c_source.html',''); init
Vec3s rot
Definition camera.h:42
f32 fieldOfView
Definition camera.h:43
Vec3f pos
Definition camera.h:36
-
Definition actor_types.h:367
-
Vec3s rot
Definition actor_types.h:374
-
s16 someTimer
Definition actor_types.h:370
-
f32 sizeScaling
Definition actor_types.h:372
-
s16 state
Definition actor_types.h:371
-
Vec3f pos
Definition actor_types.h:376
+
Definition actor_types.h:375
+
Vec3s rot
Definition actor_types.h:382
+
s16 someTimer
Definition actor_types.h:378
+
f32 sizeScaling
Definition actor_types.h:380
+
s16 state
Definition actor_types.h:379
+
Vec3f pos
Definition actor_types.h:384
diff --git a/fake__item__box_2update_8inc_8c_source.html b/fake__item__box_2update_8inc_8c_source.html index 00ffb5f35..6e58eeddc 100644 --- a/fake__item__box_2update_8inc_8c_source.html +++ b/fake__item__box_2update_8inc_8c_source.html @@ -230,14 +230,14 @@ $(function(){initNavTree('fake__item__box_2update_8inc_8c_source.html',''); init
Actor::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:130
Controller
Definition common_structs.h:66
Controller::buttonDepressed
u16 buttonDepressed
Definition common_structs.h:73
-
FakeItemBox
Definition actor_types.h:367
-
FakeItemBox::rot
Vec3s rot
Definition actor_types.h:374
-
FakeItemBox::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:373
-
FakeItemBox::sizeScaling
f32 sizeScaling
Definition actor_types.h:372
-
FakeItemBox::unk30
Collision unk30
Definition actor_types.h:380
-
FakeItemBox::playerId
f32 playerId
Definition actor_types.h:377
-
FakeItemBox::state
s16 state
Definition actor_types.h:371
-
FakeItemBox::pos
Vec3f pos
Definition actor_types.h:376
+
FakeItemBox
Definition actor_types.h:375
+
FakeItemBox::rot
Vec3s rot
Definition actor_types.h:382
+
FakeItemBox::boundingBoxSize
f32 boundingBoxSize
Definition actor_types.h:381
+
FakeItemBox::sizeScaling
f32 sizeScaling
Definition actor_types.h:380
+
FakeItemBox::unk30
Collision unk30
Definition actor_types.h:388
+
FakeItemBox::playerId
f32 playerId
Definition actor_types.h:385
+
FakeItemBox::state
s16 state
Definition actor_types.h:379
+
FakeItemBox::pos
Vec3f pos
Definition actor_types.h:384
Player
Definition common_structs.h:264
Player::triggers
s32 triggers
Definition common_structs.h:271
Player::type
u16 type
Definition common_structs.h:265
diff --git a/falling__rock_2render_8inc_8c_source.html b/falling__rock_2render_8inc_8c_source.html index a372d1044..4a5449550 100644 --- a/falling__rock_2render_8inc_8c_source.html +++ b/falling__rock_2render_8inc_8c_source.html @@ -199,11 +199,11 @@ $(function(){initNavTree('falling__rock_2render_8inc_8c_source.html',''); initRe
Camera::pos
Vec3f pos
Definition camera.h:36
Collision::unk34
u16 unk34
Definition common_structs.h:150
Collision::meshIndexZX
u16 meshIndexZX
Definition common_structs.h:154
-
FallingRock
Definition actor_types.h:181
-
FallingRock::unk30
Collision unk30
Definition actor_types.h:192
-
FallingRock::respawnTimer
s16 respawnTimer
Definition actor_types.h:184
-
FallingRock::rot
Vec3s rot
Definition actor_types.h:188
-
FallingRock::pos
Vec3f pos
Definition actor_types.h:190
+
FallingRock
Definition actor_types.h:189
+
FallingRock::unk30
Collision unk30
Definition actor_types.h:200
+
FallingRock::respawnTimer
s16 respawnTimer
Definition actor_types.h:192
+
FallingRock::rot
Vec3s rot
Definition actor_types.h:196
+
FallingRock::pos
Vec3f pos
Definition actor_types.h:198
diff --git a/falling__rock_2update_8inc_8c_source.html b/falling__rock_2update_8inc_8c_source.html index 534a37f59..1cc86a2ad 100644 --- a/falling__rock_2update_8inc_8c_source.html +++ b/falling__rock_2update_8inc_8c_source.html @@ -261,13 +261,13 @@ $(function(){initNavTree('falling__rock_2update_8inc_8c_source.html',''); initRe
Collision::orientationVector
Vec3f orientationVector
Definition common_structs.h:158
Collision::unk54
Vec3f unk54
Definition common_structs.h:157
Collision::unk48
Vec3f unk48
Definition common_structs.h:156
-
FallingRock
Definition actor_types.h:181
-
FallingRock::unk30
Collision unk30
Definition actor_types.h:192
-
FallingRock::respawnTimer
s16 respawnTimer
Definition actor_types.h:184
-
FallingRock::rot
Vec3s rot
Definition actor_types.h:188
-
FallingRock::unk_06
s16 unk_06
Definition actor_types.h:185
-
FallingRock::pos
Vec3f pos
Definition actor_types.h:190
-
FallingRock::velocity
Vec3f velocity
Definition actor_types.h:191
+
FallingRock
Definition actor_types.h:189
+
FallingRock::unk30
Collision unk30
Definition actor_types.h:200
+
FallingRock::respawnTimer
s16 respawnTimer
Definition actor_types.h:192
+
FallingRock::rot
Vec3s rot
Definition actor_types.h:196
+
FallingRock::unk_06
s16 unk_06
Definition actor_types.h:193
+
FallingRock::pos
Vec3f pos
Definition actor_types.h:198
+
FallingRock::velocity
Vec3f velocity
Definition actor_types.h:199
diff --git a/functions_a.html b/functions_a.html index 4ec0e0d1f..05cd05cc1 100644 --- a/functions_a.html +++ b/functions_a.html @@ -197,7 +197,7 @@ $(function(){initNavTree('functions_a.html',''); initResizable(true); });
  • alsa : ma_context_config, ma_device_config, ma_device_id
  • alsoLapCount : hud_player
  • always_set_to_something_but_never_used : Animation
  • -
  • always_zero_never_used : Animation, Armature
  • +
  • always_zero_never_used : Animation, Armature
  • AMarioSign() : AMarioSign
  • ambB : SF64::EnvSettingsData
  • ambG : SF64::EnvSettingsData
  • diff --git a/functions_b.html b/functions_b.html index 90da2b694..328aa2eaa 100644 --- a/functions_b.html +++ b/functions_b.html @@ -178,7 +178,7 @@ $(function(){initNavTree('functions_b.html',''); initResizable(true); });
  • BounceTimer : OBombKart
  • bounceTimer : BombKart
  • BoundingBoxSize : AActor, ATree, OThwomp, SpawnParams, TrackEditor::GameObject
  • -
  • boundingBoxSize : Actor, BananaActor, FakeItemBox, FallingRock, ItemBox, KiwanoFruit, Object, PalmTree, PiranhaPlant, Player, ShellActor, YoshiValleyEgg
  • +
  • boundingBoxSize : Actor, BananaActor, FakeItemBox, FallingRock, ItemBox, KiwanoFruit, Object, PalmTree, PiranhaPlant, Player, RailroadCrossing, ShellActor, YoshiValleyEgg
  • BowsersCastle() : BowsersCastle
  • bPendingDestroy : AActor, OObject, StaticMeshActor
  • bpf : ma_bpf_node, ma_bpf_node_config
  • diff --git a/functions_m.html b/functions_m.html index 7c7dbeebd..1286ff33f 100644 --- a/functions_m.html +++ b/functions_m.html @@ -200,7 +200,7 @@ $(function(){initNavTree('functions_m.html',''); initResizable(true); });
  • Mode : AText
  • mode : AText::CharacterList, Camera, ma_panner, ma_panner_config, Portamento
  • Model : AActor, OObject, StaticMeshActor, TrackEditor::GameObject
  • -
  • model : Actor, Armature, BananaActor, BananaBunchParent, FakeItemBox, FallingRock, ItemBox, ItemWindowObjects, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, RailroadCrossing, ShellActor, TrainCar, TripleShellParent, YoshiValleyEgg
  • +
  • model : Actor, Armature, BananaActor, BananaBunchParent, FakeItemBox, FallingRock, ItemBox, ItemWindowObjects, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, RailroadCrossing, ShellActor, TrackSections, TrainCar, TripleShellParent, YoshiValleyEgg
  • modes : GameModePack
  • mOffset : SkySnow
  • mOldX : SkyActor
  • diff --git a/functions_p.html b/functions_p.html index fc8e1f600..23821d957 100644 --- a/functions_p.html +++ b/functions_p.html @@ -278,7 +278,7 @@ $(function(){initNavTree('functions_p.html',''); initResizable(true); });
  • portamentoTime : SequenceChannelLayer
  • PortMenu() : GameUI::PortMenu
  • Pos : AActor, MinimapProps, OBombKart, OGrandPrixBalloons, OHotAirBalloon, OMoleGroup::MoleEntry, OSnowman, StaticMeshActor, TourCamera::CameraShot, TourCamera::KeyFrame, TrackEditor::GameObject, TrackEditor::Gizmo
  • -
  • pos : Actor, ActorSpawnData, Armature, BananaActor, Camera, CeremonyActor, CinematicCamera, FakeItemBox, FallingRock, Firework, freecamSaveState, HegdehogSpawn, ItemBox, ItemWindowObjects, KartTyre, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, Player, PlayerBombKart, RailroadCrossing, ShellActor, SnowmanSpawn, SplineControlPoint, TrainCar, Unk_800E9F7C, UnkActorSpawnData, UnkPlayerStruct258, YoshiValleyEgg, YVFlagPoleSpawn
  • +
  • pos : Actor, ActorSpawnData, Armature, BananaActor, Camera, CeremonyActor, CinematicCamera, FakeItemBox, FallingRock, Firework, freecamSaveState, HegdehogSpawn, ItemBox, ItemWindowObjects, KartTyre, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, Player, PlayerBombKart, RailroadCrossing, ShellActor, SnowmanSpawn, SplineControlPoint, TrainCar, Unk_800E9F7C, UnkActorSpawnData, UnkPlayerStruct258, YoshiValleyEgg, YVFlagPoleSpawn
  • Position : ABoat, ABus, ACar, ATankerTruck, ATruck, TrainCrossing
  • position : ma_spatializer, ma_spatializer_listener, PaddleBoatStuff, Sound, TrainCarStuff, VehicleStuff
  • positioning : ma_spatializer, ma_spatializer_config
  • diff --git a/functions_s.html b/functions_s.html index efba549d8..7d5071572 100644 --- a/functions_s.html +++ b/functions_s.html @@ -237,7 +237,7 @@ $(function(){initNavTree('functions_s.html',''); initResizable(true); });
  • SILVER_150 : OTrophy
  • SingleColour : AText
  • Size() : DataRegistry< TObject >, MK64::MinimapTexture, Registry< TInfo, TArgs >, UIWidgets::ButtonOptions
  • -
  • size : Armature, MenuTexture, Player, printf_struct, SeqOrBankEntry, SoundAllocPool, UIWidgets::ButtonOptions, UnkEntry
  • +
  • size : Armature, MenuTexture, Player, printf_struct, SeqOrBankEntry, SoundAllocPool, UIWidgets::ButtonOptions, UnkEntry
  • sizeInBytes : ma_file_info, ma_resource_manager_data_supply, ma_stack
  • sizeInFrames : ma_audio_buffer_config, ma_audio_buffer_ref, ma_paged_audio_buffer_page
  • sizeScaling : FakeItemBox, ItemWindowObjects, Object
  • diff --git a/functions_t.html b/functions_t.html index 20a3cc87a..050cc9654 100644 --- a/functions_t.html +++ b/functions_t.html @@ -240,7 +240,7 @@ $(function(){initNavTree('functions_t.html',''); initResizable(true); });
  • tuning : AudioBankSound
  • txsize : __OSContEepromFormat, __OSContRamReadFormat, __OSContReadFormat, __OSContRequesFormat, __OSContRequesFormatShort
  • Type : AActor, ABoat, ABus, ACar, ATankerTruck, ATruck, OBombKart, OPenguin, SpawnParams, TourCamera
  • -
  • type : Actor, ActorInitParams, ALWaveTable_s, Armature, BananaActor, BananaBunchParent, CeremonyActor, CPUBehaviour, FakeItemBox, FallingRock, Firework, ItemBox, KiwanoFruit, ma_device, ma_device_notification, ma_engine_node_config, ma_noise_config, ma_waveform_config, MenuItem, MenuTexture, Object, PaddleWheelBoat, PalmTree, pfd::internal::file_dialog, PiranhaPlant, Player, RailroadCrossing, SF64::EnvSettingsData, ShellActor, TrainCar, TripleShellParent, UnkPlayerStruct258, WidgetInfo, YoshiValleyEgg
  • +
  • type : Actor, ActorInitParams, ALWaveTable_s, Armature, BananaActor, BananaBunchParent, CeremonyActor, CPUBehaviour, FakeItemBox, FallingRock, Firework, ItemBox, KiwanoFruit, ma_device, ma_device_notification, ma_engine_node_config, ma_noise_config, ma_waveform_config, MenuItem, MenuTexture, Object, PaddleWheelBoat, PalmTree, pfd::internal::file_dialog, PiranhaPlant, Player, RailroadCrossing, SF64::EnvSettingsData, ShellActor, TrainCar, TripleShellParent, UnkPlayerStruct258, WidgetInfo, YoshiValleyEgg
  • typeh : __OSContRequesFormat, __OSContRequesFormatShort
  • typel : __OSContRequesFormat, __OSContRequesFormatShort
  • tyres : Player
  • diff --git a/functions_u.html b/functions_u.html index 7b3093eec..7e4572b0d 100644 --- a/functions_u.html +++ b/functions_u.html @@ -222,7 +222,7 @@ $(function(){initNavTree('functions_u.html',''); initResizable(true); });
  • unk_078 : ItemWindowObjects, Object, Player
  • unk_07C : ItemWindowObjects, Player
  • Unk_08 : AActor, ATree
  • -
  • unk_08 : Actor, BananaBunchParent, FallingRock, ISVDbg, PaddleWheelBoat, PalmTree, struct_D_801930D0_inner, TrainCar
  • +
  • unk_08 : Actor, BananaBunchParent, FallingRock, ISVDbg, PaddleWheelBoat, PalmTree, RailroadCrossing, struct_D_801930D0_inner, TrainCar
  • unk_080 : ItemWindowObjects
  • unk_084 : ItemWindowObjects, Object, Player
  • unk_088 : Player
  • diff --git a/functions_vars_a.html b/functions_vars_a.html index 1174c1aa7..8aab033f6 100644 --- a/functions_vars_a.html +++ b/functions_vars_a.html @@ -161,7 +161,7 @@ $(function(){initNavTree('functions_vars_a.html',''); initResizable(true); });
  • alsa : ma_context_config, ma_device_config, ma_device_id
  • alsoLapCount : hud_player
  • always_set_to_something_but_never_used : Animation
  • -
  • always_zero_never_used : Animation, Armature
  • +
  • always_zero_never_used : Animation, Armature
  • ambB : SF64::EnvSettingsData
  • ambG : SF64::EnvSettingsData
  • ambR : SF64::EnvSettingsData
  • diff --git a/functions_vars_b.html b/functions_vars_b.html index 5eb5655cc..5570d4e68 100644 --- a/functions_vars_b.html +++ b/functions_vars_b.html @@ -170,7 +170,7 @@ $(function(){initNavTree('functions_vars_b.html',''); initResizable(true); });
  • BounceTimer : OBombKart
  • bounceTimer : BombKart
  • BoundingBoxSize : AActor, ATree, OThwomp, SpawnParams, TrackEditor::GameObject
  • -
  • boundingBoxSize : Actor, BananaActor, FakeItemBox, FallingRock, ItemBox, KiwanoFruit, Object, PalmTree, PiranhaPlant, Player, ShellActor, YoshiValleyEgg
  • +
  • boundingBoxSize : Actor, BananaActor, FakeItemBox, FallingRock, ItemBox, KiwanoFruit, Object, PalmTree, PiranhaPlant, Player, RailroadCrossing, ShellActor, YoshiValleyEgg
  • bPendingDestroy : AActor, OObject, StaticMeshActor
  • bpf : ma_bpf_node, ma_bpf_node_config
  • bpf2Count : ma_bpf
  • diff --git a/functions_vars_m.html b/functions_vars_m.html index d48aabccd..1bb0737d3 100644 --- a/functions_vars_m.html +++ b/functions_vars_m.html @@ -192,7 +192,7 @@ $(function(){initNavTree('functions_vars_m.html',''); initResizable(true); });
  • Mode : AText
  • mode : AText::CharacterList, Camera, ma_panner, ma_panner_config, Portamento
  • Model : AActor, OObject, StaticMeshActor, TrackEditor::GameObject
  • -
  • model : Actor, Armature, BananaActor, BananaBunchParent, FakeItemBox, FallingRock, ItemBox, ItemWindowObjects, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, RailroadCrossing, ShellActor, TrainCar, TripleShellParent, YoshiValleyEgg
  • +
  • model : Actor, Armature, BananaActor, BananaBunchParent, FakeItemBox, FallingRock, ItemBox, ItemWindowObjects, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, RailroadCrossing, ShellActor, TrackSections, TrainCar, TripleShellParent, YoshiValleyEgg
  • modes : GameModePack
  • mOffset : SkySnow
  • mOldX : SkyActor
  • diff --git a/functions_vars_p.html b/functions_vars_p.html index 4933ac01e..63ba9704d 100644 --- a/functions_vars_p.html +++ b/functions_vars_p.html @@ -268,7 +268,7 @@ $(function(){initNavTree('functions_vars_p.html',''); initResizable(true); });
  • portamentoTargetNote : SequenceChannelLayer
  • portamentoTime : SequenceChannelLayer
  • Pos : AActor, MinimapProps, OBombKart, OGrandPrixBalloons, OHotAirBalloon, OMoleGroup::MoleEntry, OSnowman, StaticMeshActor, TourCamera::CameraShot, TourCamera::KeyFrame, TrackEditor::GameObject, TrackEditor::Gizmo
  • -
  • pos : Actor, ActorSpawnData, Armature, BananaActor, Camera, CeremonyActor, CinematicCamera, FakeItemBox, FallingRock, Firework, freecamSaveState, HegdehogSpawn, ItemBox, ItemWindowObjects, KartTyre, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, Player, PlayerBombKart, RailroadCrossing, ShellActor, SnowmanSpawn, SplineControlPoint, TrainCar, Unk_800E9F7C, UnkActorSpawnData, UnkPlayerStruct258, YoshiValleyEgg, YVFlagPoleSpawn
  • +
  • pos : Actor, ActorSpawnData, Armature, BananaActor, Camera, CeremonyActor, CinematicCamera, FakeItemBox, FallingRock, Firework, freecamSaveState, HegdehogSpawn, ItemBox, ItemWindowObjects, KartTyre, KiwanoFruit, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, Player, PlayerBombKart, RailroadCrossing, ShellActor, SnowmanSpawn, SplineControlPoint, TrainCar, Unk_800E9F7C, UnkActorSpawnData, UnkPlayerStruct258, YoshiValleyEgg, YVFlagPoleSpawn
  • Position : ABoat, ABus, ACar, ATankerTruck, ATruck, TrainCrossing
  • position : ma_spatializer, ma_spatializer_listener, PaddleBoatStuff, Sound, TrainCarStuff, VehicleStuff
  • positioning : ma_spatializer, ma_spatializer_config
  • diff --git a/functions_vars_s.html b/functions_vars_s.html index 4c1e792a7..bde5a3191 100644 --- a/functions_vars_s.html +++ b/functions_vars_s.html @@ -202,7 +202,7 @@ $(function(){initNavTree('functions_vars_s.html',''); initResizable(true); });
  • signedSomeId : ActorSpawnData
  • SingleColour : AText
  • Size : MK64::MinimapTexture
  • -
  • size : Armature, MenuTexture, Player, printf_struct, SeqOrBankEntry, SoundAllocPool, UIWidgets::ButtonOptions, UnkEntry
  • +
  • size : Armature, MenuTexture, Player, printf_struct, SeqOrBankEntry, SoundAllocPool, UIWidgets::ButtonOptions, UnkEntry
  • sizeInBytes : ma_file_info, ma_resource_manager_data_supply, ma_stack
  • sizeInFrames : ma_audio_buffer_config, ma_audio_buffer_ref, ma_paged_audio_buffer_page
  • sizeScaling : FakeItemBox, ItemWindowObjects, Object
  • diff --git a/functions_vars_t.html b/functions_vars_t.html index c4aa64d79..06cec88c7 100644 --- a/functions_vars_t.html +++ b/functions_vars_t.html @@ -208,7 +208,7 @@ $(function(){initNavTree('functions_vars_t.html',''); initResizable(true); });
  • tuning : AudioBankSound
  • txsize : __OSContEepromFormat, __OSContRamReadFormat, __OSContReadFormat, __OSContRequesFormat, __OSContRequesFormatShort
  • Type : AActor, ABoat, ABus, ACar, ATankerTruck, ATruck, OBombKart, OPenguin, SpawnParams, TourCamera
  • -
  • type : Actor, ActorInitParams, ALWaveTable_s, Armature, BananaActor, BananaBunchParent, CeremonyActor, CPUBehaviour, FakeItemBox, FallingRock, Firework, ItemBox, KiwanoFruit, ma_device, ma_device_notification, ma_engine_node_config, ma_noise_config, ma_waveform_config, MenuItem, MenuTexture, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, Player, RailroadCrossing, SF64::EnvSettingsData, ShellActor, TrainCar, TripleShellParent, UnkPlayerStruct258, WidgetInfo, YoshiValleyEgg
  • +
  • type : Actor, ActorInitParams, ALWaveTable_s, Armature, BananaActor, BananaBunchParent, CeremonyActor, CPUBehaviour, FakeItemBox, FallingRock, Firework, ItemBox, KiwanoFruit, ma_device, ma_device_notification, ma_engine_node_config, ma_noise_config, ma_waveform_config, MenuItem, MenuTexture, Object, PaddleWheelBoat, PalmTree, PiranhaPlant, Player, RailroadCrossing, SF64::EnvSettingsData, ShellActor, TrainCar, TripleShellParent, UnkPlayerStruct258, WidgetInfo, YoshiValleyEgg
  • typeh : __OSContRequesFormat, __OSContRequesFormatShort
  • typel : __OSContRequesFormat, __OSContRequesFormatShort
  • tyres : Player
  • diff --git a/functions_vars_u.html b/functions_vars_u.html index dbf6dab60..d25d3de7d 100644 --- a/functions_vars_u.html +++ b/functions_vars_u.html @@ -221,7 +221,7 @@ $(function(){initNavTree('functions_vars_u.html',''); initResizable(true); });
  • unk_078 : ItemWindowObjects, Object, Player
  • unk_07C : ItemWindowObjects, Player
  • Unk_08 : AActor, ATree
  • -
  • unk_08 : Actor, BananaBunchParent, FallingRock, ISVDbg, PaddleWheelBoat, PalmTree, struct_D_801930D0_inner, TrainCar
  • +
  • unk_08 : Actor, BananaBunchParent, FallingRock, ISVDbg, PaddleWheelBoat, PalmTree, RailroadCrossing, struct_D_801930D0_inner, TrainCar
  • unk_080 : ItemWindowObjects
  • unk_084 : ItemWindowObjects, Object, Player
  • unk_088 : Player
  • diff --git a/green__shell_2render_8inc_8c_source.html b/green__shell_2render_8inc_8c_source.html index 4913695a7..2c51b3a53 100644 --- a/green__shell_2render_8inc_8c_source.html +++ b/green__shell_2render_8inc_8c_source.html @@ -126,7 +126,7 @@ $(function(){initNavTree('green__shell_2render_8inc_8c_source.html',''); initRes
    gDisplayListHead
    Gfx * gDisplayListHead
    Definition main.c:129
    main.h
    Camera
    Definition camera.h:35
    -
    ShellActor
    Definition actor_types.h:320
    +
    ShellActor
    Definition actor_types.h:328
    common_data.h
    diff --git a/green__shell_2update_8inc_8c_source.html b/green__shell_2update_8inc_8c_source.html index 9bb4b2b83..05962dcc0 100644 --- a/green__shell_2update_8inc_8c_source.html +++ b/green__shell_2update_8inc_8c_source.html @@ -368,21 +368,21 @@ $(function(){initNavTree('green__shell_2update_8inc_8c_source.html',''); initRes
    Player::boundingBoxSize
    f32 boundingBoxSize
    Definition common_structs.h:289
    Player::type
    u16 type
    Definition common_structs.h:265
    Player::pos
    Vec3f pos
    Definition common_structs.h:274
    -
    ShellActor
    Definition actor_types.h:320
    -
    ShellActor::rotAngle
    s16 rotAngle
    Definition actor_types.h:336
    -
    ShellActor::rotVelocity
    s16 rotVelocity
    Definition actor_types.h:334
    -
    ShellActor::flags
    s16 flags
    Definition actor_types.h:322
    -
    ShellActor::boundingBoxSize
    f32 boundingBoxSize
    Definition actor_types.h:333
    -
    ShellActor::state
    s16 state
    Definition actor_types.h:331
    -
    ShellActor::playerId
    s16 playerId
    Definition actor_types.h:340
    -
    ShellActor::velocity
    Vec3f velocity
    Definition actor_types.h:343
    -
    ShellActor::parentIndex
    s16 parentIndex
    Definition actor_types.h:326
    -
    ShellActor::pos
    Vec3f pos
    Definition actor_types.h:342
    -
    ShellActor::unk30
    Collision unk30
    Definition actor_types.h:344
    -
    ShellActor::someTimer
    s16 someTimer
    Definition actor_types.h:327
    -
    TripleShellParent
    Definition actor_types.h:303
    -
    TripleShellParent::rotVelocity
    s16 rotVelocity
    Definition actor_types.h:310
    -
    TripleShellParent::type
    s16 type
    Definition actor_types.h:304
    +
    ShellActor
    Definition actor_types.h:328
    +
    ShellActor::rotAngle
    s16 rotAngle
    Definition actor_types.h:344
    +
    ShellActor::rotVelocity
    s16 rotVelocity
    Definition actor_types.h:342
    +
    ShellActor::flags
    s16 flags
    Definition actor_types.h:330
    +
    ShellActor::boundingBoxSize
    f32 boundingBoxSize
    Definition actor_types.h:341
    +
    ShellActor::state
    s16 state
    Definition actor_types.h:339
    +
    ShellActor::playerId
    s16 playerId
    Definition actor_types.h:348
    +
    ShellActor::velocity
    Vec3f velocity
    Definition actor_types.h:351
    +
    ShellActor::parentIndex
    s16 parentIndex
    Definition actor_types.h:334
    +
    ShellActor::pos
    Vec3f pos
    Definition actor_types.h:350
    +
    ShellActor::unk30
    Collision unk30
    Definition actor_types.h:352
    +
    ShellActor::someTimer
    s16 someTimer
    Definition actor_types.h:335
    +
    TripleShellParent
    Definition actor_types.h:311
    +
    TripleShellParent::rotVelocity
    s16 rotVelocity
    Definition actor_types.h:318
    +
    TripleShellParent::type
    s16 type
    Definition actor_types.h:312
    diff --git a/item__box_2render_8inc_8c_source.html b/item__box_2render_8inc_8c_source.html index 58f53cf72..fc9f32899 100644 --- a/item__box_2render_8inc_8c_source.html +++ b/item__box_2render_8inc_8c_source.html @@ -378,12 +378,12 @@ $(function(){initNavTree('item__box_2render_8inc_8c_source.html',''); initResiza
    Camera::rot
    Vec3s rot
    Definition camera.h:42
    Camera::fieldOfView
    f32 fieldOfView
    Definition camera.h:43
    Camera::pos
    Vec3f pos
    Definition camera.h:36
    -
    ItemBox
    Definition actor_types.h:348
    -
    ItemBox::someTimer
    s16 someTimer
    Definition actor_types.h:351
    -
    ItemBox::pos
    Vec3f pos
    Definition actor_types.h:359
    -
    ItemBox::state
    s16 state
    Definition actor_types.h:352
    -
    ItemBox::resetDistance
    f32 resetDistance
    Definition actor_types.h:353
    -
    ItemBox::rot
    Vec3s rot
    Definition actor_types.h:357
    +
    ItemBox
    Definition actor_types.h:356
    +
    ItemBox::someTimer
    s16 someTimer
    Definition actor_types.h:359
    +
    ItemBox::pos
    Vec3f pos
    Definition actor_types.h:367
    +
    ItemBox::state
    s16 state
    Definition actor_types.h:360
    +
    ItemBox::resetDistance
    f32 resetDistance
    Definition actor_types.h:361
    +
    ItemBox::rot
    Vec3s rot
    Definition actor_types.h:365
    diff --git a/item__box_2update_8inc_8c_source.html b/item__box_2update_8inc_8c_source.html index dea6aecd6..959e22a33 100644 --- a/item__box_2update_8inc_8c_source.html +++ b/item__box_2update_8inc_8c_source.html @@ -171,14 +171,14 @@ $(function(){initNavTree('item__box_2update_8inc_8c_source.html',''); initResiza
    actors.h
    update_actor_item_box_hot_air_balloon
    void update_actor_item_box_hot_air_balloon(struct ItemBox *itemBox)
    Updates the item box under the hot air balloon object. It used in Luigi Raceway. (here it's just upda...
    Definition update.inc.c:10
    update_actor_item_box
    void update_actor_item_box(struct ItemBox *itemBox)
    Updates the item box actor.
    Definition update.inc.c:36
    -
    ItemBox
    Definition actor_types.h:348
    -
    ItemBox::someTimer
    s16 someTimer
    Definition actor_types.h:351
    -
    ItemBox::flags
    s16 flags
    Definition actor_types.h:350
    -
    ItemBox::origY
    f32 origY
    Definition actor_types.h:360
    -
    ItemBox::pos
    Vec3f pos
    Definition actor_types.h:359
    -
    ItemBox::state
    s16 state
    Definition actor_types.h:352
    -
    ItemBox::resetDistance
    f32 resetDistance
    Definition actor_types.h:353
    -
    ItemBox::rot
    Vec3s rot
    Definition actor_types.h:357
    +
    ItemBox
    Definition actor_types.h:356
    +
    ItemBox::someTimer
    s16 someTimer
    Definition actor_types.h:359
    +
    ItemBox::flags
    s16 flags
    Definition actor_types.h:358
    +
    ItemBox::origY
    f32 origY
    Definition actor_types.h:368
    +
    ItemBox::pos
    Vec3f pos
    Definition actor_types.h:367
    +
    ItemBox::state
    s16 state
    Definition actor_types.h:360
    +
    ItemBox::resetDistance
    f32 resetDistance
    Definition actor_types.h:361
    +
    ItemBox::rot
    Vec3s rot
    Definition actor_types.h:365
    diff --git a/kiwano__fruit_2update_8inc_8c_source.html b/kiwano__fruit_2update_8inc_8c_source.html index 6840fa4eb..32e7e6b87 100644 --- a/kiwano__fruit_2update_8inc_8c_source.html +++ b/kiwano__fruit_2update_8inc_8c_source.html @@ -213,14 +213,14 @@ $(function(){initNavTree('kiwano__fruit_2update_8inc_8c_source.html',''); initRe
    SOUND_ARG_LOAD
    #define SOUND_ARG_LOAD(sound_bank, byte2, byte3, sound_id)
    Definition sounds.h:14
    Collision::unk34
    u16 unk34
    Definition common_structs.h:150
    Collision::meshIndexZX
    u16 meshIndexZX
    Definition common_structs.h:154
    -
    KiwanoFruit
    Definition actor_types.h:241
    -
    KiwanoFruit::bonkTimer
    f32 bonkTimer
    Definition actor_types.h:247
    -
    KiwanoFruit::velocity
    Vec3f velocity
    Definition actor_types.h:255
    -
    KiwanoFruit::animState
    s16 animState
    Definition actor_types.h:250
    -
    KiwanoFruit::animTimer
    s16 animTimer
    Definition actor_types.h:251
    -
    KiwanoFruit::targetPlayer
    s16 targetPlayer
    Definition actor_types.h:245
    -
    KiwanoFruit::pos
    Vec3f pos
    Definition actor_types.h:254
    -
    KiwanoFruit::state
    s16 state
    Definition actor_types.h:246
    +
    KiwanoFruit
    Definition actor_types.h:249
    +
    KiwanoFruit::bonkTimer
    f32 bonkTimer
    Definition actor_types.h:255
    +
    KiwanoFruit::velocity
    Vec3f velocity
    Definition actor_types.h:263
    +
    KiwanoFruit::animState
    s16 animState
    Definition actor_types.h:258
    +
    KiwanoFruit::animTimer
    s16 animTimer
    Definition actor_types.h:259
    +
    KiwanoFruit::targetPlayer
    s16 targetPlayer
    Definition actor_types.h:253
    +
    KiwanoFruit::pos
    Vec3f pos
    Definition actor_types.h:262
    +
    KiwanoFruit::state
    s16 state
    Definition actor_types.h:254
    Player
    Definition common_structs.h:264
    Player::effects
    u32 effects
    Definition common_structs.h:313
    Player::collision
    Collision collision
    Definition common_structs.h:339
    diff --git a/md_docs_2custom-audio.html b/md_docs_2custom-audio.html index 54ad4d60e..849c9d79c 100644 --- a/md_docs_2custom-audio.html +++ b/md_docs_2custom-audio.html @@ -132,7 +132,7 @@ Example:
    └── sequences
    └── main_menu.mp3
    └── main_menu.json
    -

    +

    Future plans