diff --git a/actors_8c.html b/actors_8c.html
index 6ec3f290c..ba1a113d2 100644
--- a/actors_8c.html
+++ b/actors_8c.html
@@ -1565,7 +1565,7 @@ Here is the caller graph for this function:
-
- Todo
- Is this making the shell spin?
+
- Todo
- Is this making the shell spin?
diff --git a/actorsmenu.html b/actorsmenu.html
index a78d56ddd..94bcb85a7 100644
--- a/actorsmenu.html
+++ b/actorsmenu.html
@@ -172,7 +172,7 @@ $(function(){initNavTree('actorsmenu.html',''); initResizable(); });
-
Actors Objects Vehicles Items
+
Actors Objects Vehicles Items
diff --git a/actorsmenu.js b/actorsmenu.js
index a1f7e0e44..03d6a6bce 100644
--- a/actorsmenu.js
+++ b/actorsmenu.js
@@ -4,7 +4,7 @@ var actorsmenu =
[ "Actors", "actors.html#actors", null ]
] ],
[ "Objects", "objects.html", [
- [ "Objects", "objects.html#objects-1", null ]
+ [ "Objects", "objects.html#objects", null ]
] ],
[ "Vehicles", "vehicles.html", [
[ "Trains", "vehicles.html#trains", null ],
diff --git a/asm_funcs.svg b/asm_funcs.svg
index 94f66d898..8150166c4 100644
--- a/asm_funcs.svg
+++ b/asm_funcs.svg
@@ -1 +1 @@
-
-
+
-
-
+
+
158 f32 playerToShellDistance;
-
+
160 f32 smallestDistance = 25000000.0f;
-
-
+
162 for (playerIndex = 0; playerIndex < 4; playerIndex++) {
+
-
165 if (player ==
owner) {
continue; }
-
+
165 if (player == owner) {
continue; }
+
-
-
-
+
+
169 if (playerToShellDistance < smallestDistance) {
+
170 smallestDistance = playerToShellDistance;
@@ -289,24 +289,24 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
-
-
180 if ((
shell->unk30.unk3C[0] < 0.0f) && ((
shell->unk30.unk48[1] < 0.25f) || (
shell->unk30.unk48[1] > -0.25f))) {
-
-
-
183 shell->flags |= 0x80;
-
184 }
else if ((
shell->unk30.unk3C[1] < 0.0f) && ((
shell->unk30.unk54[1] < 0.25f) || (
shell->unk30.unk54[1] < -0.25f))) {
-
-
-
187 shell->flags |= 0x80;
+
+
+
+
+
183 shell->
flags |= 0x80;
+
+
+
+
187 shell->
flags |= 0x80;
-
-
+
+
-
+
@@ -643,8 +643,14 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
#define Z_TRIG
Definition os.h:398
#define SOUND_ARG_LOAD(sound_bank, byte2, byte3, sound_id)
Definition sounds.h:14
Definition actor_types.h:120
+
Vec3f velocity
Definition actor_types.h:130
+
s16 flags
Definition actor_types.h:122
+
Vec3f pos
Definition actor_types.h:129
+
Vec3f unk3C
Definition common_structs.h:146
u16 unk30
Definition common_structs.h:139
u16 unk3A
Definition common_structs.h:145
+
Vec3f unk54
Definition common_structs.h:148
+
Vec3f unk48
Definition common_structs.h:147
Definition common_structs.h:71
u16 buttonDepressed
Definition common_structs.h:76
Definition common_structs.h:269
@@ -660,8 +666,10 @@ $(function(){initNavTree('blue__and__red__shells_2update_8inc_8c_source.html',''
s16 currentRank
Definition common_structs.h:272
Vec3f pos
Definition common_structs.h:279
Definition actor_types.h:302
+
f32 boundingBoxSize
Definition actor_types.h:315
Vec3f velocity
Definition actor_types.h:324
Vec3f pos
Definition actor_types.h:323
+
Collision unk30
Definition actor_types.h:325
u16 pathIndex
Definition actor_types.h:319
s16 posZ
Definition waypoints.h:9
s16 posY
Definition waypoints.h:8
diff --git a/code__80091750_8c.html b/code__80091750_8c.html
index 7fc254092..936d360ba 100644
--- a/code__80091750_8c.html
+++ b/code__80091750_8c.html
@@ -201,6 +201,8 @@ Functions
| |
| void | func_80092258 (void) |
| |
+
| void | func_80092290 (s32 arg0, s32 *arg1, s32 *arg2) |
+
| |
| void | func_80092500 (void) |
| |
| void | func_80092564 (void) |
@@ -629,6 +631,8 @@ Functions
| |
| void | func_800A9710 (struct_8018D9E0_entry *arg0) |
| |
+
| void | func_800A97BC (struct_8018D9E0_entry *arg0) |
+
| |
| void | func_800A9A98 (struct_8018D9E0_entry *arg0) |
| |
| void | func_800A9B9C (struct_8018D9E0_entry *arg0) |
@@ -1976,6 +1980,42 @@ Here is the caller graph for this function: