A few matches across a couple files, although mostly code_80005FD0 (#460)

Signed-off-by: Taggerung <tyler.taggerung@email.com>

1 files changed, 92 insertions, 11 deletions

diff --git a/src/code_80005FD0.h b/src/code_80005FD0.h
index a8bad64d3..4e96ee64d 100644
--- a/src/code_80005FD0.h
+++ b/src/code_80005FD0.h
@@ -3,6 +3,7 @@
 
 #include "vehicles.h"
 #include "camera.h"
+#include "waypoints.h"
 
 struct struct_801642D8 {
     /* 0x0 */ u16 unk0;
@@ -34,6 +35,20 @@ typedef struct {
 
 extern Test D_801634F8[];
 
+// Something related to CPU item usage
+typedef struct {
+    /* 0x00 */ s16 unk_00;
+    /* 0x02 */ s16 actorIndex;
+    /* 0x04 */ s16 unk_04;
+    /* 0x06 */ s16 unk_06;
+    /* 0x08 */ s16 unk_08;
+    /* 0x0A */ s16 unk_0A;
+    /* 0x0C */ s16 unk_0C;
+    /* 0x0E */ s16 unk_0E;
+} D_801642D8_entry; // size = 0x10
+
+extern D_801642D8_entry D_801642D8[];
+
 /* Function Prototypes */
 void func_80012190(void);
 void func_8000BA14(u16, f32, f32, s16);
@@ -44,7 +59,9 @@ void func_800147E0(void);
 void func_800132F4(void);
 s16  func_80005FD0(Vec3f, Vec3f);
 void func_800100F0(s32);
+void func_80011E38(s32);
 void func_800120C8(void);
+void func_80012780(TrainCarStuff*, s16*, u16);
 void func_800127E0(void);
 s32  func_80006018(f32, f32, f32, f32, f32, f32, f32, f32);
 void func_80006114(Vec3f, Vec3f, s16);
@@ -61,6 +78,7 @@ void func_80008F38(s32);
 
 void func_80009000(s32);
 void func_800090F0(s32, Player*);
+f32  func_80009258(s32, f32, f32);
 void func_800097E0(void);
 void func_80009B60(s32);
 
@@ -68,6 +86,7 @@ s32  func_8000B7E4(s32, u16);
 s32  func_8000B820(s32);
 f32  func_8000B874(f32, f32, u16, s32);
 void func_8000B95C(s32, u16, s32);
+void func_8000BBD8(u16, f32, s16);
 s16  func_8000BD94(f32, f32, f32, s32);
 
 s16  func_8000C0BC(f32, f32, f32, u16, s32*);
@@ -81,8 +100,9 @@ s16  func_8000CD24(f32, f32, f32, s16, Player*, s32, s32);
 s16  func_8000D24C(f32, f32, f32, s32*);
 s16  func_8000D2B4(f32, f32, f32, s16, s32);
 s16  func_8000D33C(f32, f32, f32, s16, s32);
-s16  func_8000D6D0(Vec3f, s16*, f32, f32, s32, s32);
-s16  func_8000D940(Vec3f, s16*, f32, f32, s32);
+f32  func_8000D3B8(s32);
+s16  func_8000D6D0(Vec3f, s16*, f32, f32, s16, s16);
+s16  func_8000D940(Vec3f, s16*, f32, f32, s16);
 s16  func_8000DBAC(Vec3f, s16*, f32);
 void func_8000DD78(void);
 void func_8000DF8C(s32);
@@ -94,19 +114,25 @@ s32  func_8000EE10(s32);
 void func_8000EE58(s32);
 void func_8000EEDC(void);
 void func_8000EF20(void);
-void func_8000EF20(void);
 
 void func_8000F0E0(void);
 void func_8000F124(void);
+void func_8000F2BC(TrackWaypoint*, size_t);
+void func_8000F2DC(void);
 
 void func_80010218(s32);
 f32  func_80010480(s32, u16);
 void func_800107C4(s32);
 s16  func_80010CB0(s32, s32);
 void func_80010DBC(s32);
+void func_80010E6C(s32);
 f32  func_80010F40(f32, f32, f32, s32);
 f32  func_80010FA0(f32, f32, f32, s32);
 
+u16 func_80011014(TrackWaypoint *, TrackWaypoint *, s32, s32);
+s32  process_path_data(TrackWaypoint*, TrackWaypoint*);
+s32  func_8001168C(void*, void*, s32);
+void func_80011A5C(void);
 void func_80011AB8(s32);
 void func_80011AE4(s32);
 
@@ -116,8 +142,11 @@ void func_80012A48(TrainCarStuff*, s16);
 void func_80012AC0(void);
 void func_80012DC0(s32, Player*);
 
+void func_80013054(void);
+void func_800131DC(s32);
 void func_800133C4(void);
 void func_80013854(Player*);
+void func_800139E4(f32, f32, s32, s32, VehicleStuff*, TrackWaypoint*);
 f32  func_80013C74(s16, s16);
 void func_80013D20(VehicleStuff*);
 void func_80013F7C(s32, Player*, VehicleStuff*, f32, f32, s32, u32);
@@ -137,13 +166,31 @@ void func_80014C78(void);
 void func_80014CC0(s32, Player*);
 void func_80014D08(s32);
 void func_80014D30(s32, s32);
-f32  func_80014EE4(f32 arg0, s32 arg1);
+f32  func_80014EE4(f32, s32);
 
+void func_800151A4(Camera*, s32);
 void func_8001530C(void);
 void func_80015314(s32, f32, s32);
 void func_80015390(Camera*, Player*, s32);
+void func_80015544(s32, f32, s32, s32);
+void func_8001577C(Camera*, s32, s32, s32);
+void func_80015A9C(s32, f32, s32, s16);
+
+void func_800162CC(s32, f32, s32, s16);
+void func_80016C3C(s32, f32, s32);
 
+void func_80017720(s32, f32, s32, s16);
+void func_80017F10(s32, f32, s32, s16);
+
+void func_80018718(s32, f32, s32, s16);
+
+void func_80019118(s32, f32, s32, s16);
+void func_8001933C(Camera*, s32, s32, s32);
 void func_8001968C(void);
+void func_8001969C(s32, f32, s32, s16);
+void func_80019760(Camera*, s32, s32, s32);
+void func_80019890(s32, s32);
+void func_80019B50(s32, u16);
 void func_80019C50(s32);
 void func_80019D2C(Camera*, Player*, s32);
 void func_80019DE4(void);
@@ -154,10 +201,20 @@ void func_80019FB4(s32);
 
 void func_8001A0A4(u16*, Camera*, Player*, s8, s32);
 void func_8001A0DC(u16*, Camera*, Player*, s8, s32);
+void func_8001A124(s32, s32);
 s32  func_8001A310(s32, s32);
+void func_8001A348(s32, f32, s32);
+void func_8001A3D8(s32, f32, s32);
+void func_8001A450(s32, s32, s32);
+void func_8001A518(s32, s32, s32);
 void func_8001A588(u16*, Camera*, Player*, s8, s32);
-void func_8001ABE0(s32, s32);
+void func_8001AB00(void);
+void func_8001AB74(s32, s16*, s32);
+void func_8001ABE0(s32, D_801642D8_entry*);
 void func_8001ABEC(struct struct_801642D8*);
+void func_8001AC10(s32);
+
+void func_8001BE78(void);
 
 void func_8001C05C(void);
 void func_8001C14C(void);
@@ -174,17 +231,22 @@ extern f32 D_800DCA4C[];
 // See bss_80005FD0.s
 extern Collision D_80162E70;
 extern s16 D_80162EB0;
-extern u16 D_801631E0[8];
-extern s32 D_80163488;
+extern s16 D_80162FCC;
+extern f32 D_80162FA0[];
 
-
-extern s32 D_8016337C;
 extern s16 D_80164378[];
 extern s32 D_801643E0[];
 extern struct unexpiredActors gUnexpiredActorsList[];
-extern s16 D_8016348C;
 extern s32 D_801643E0[];
 extern s32 D_80164408[];
+extern s32 D_8016448C;
+extern f32 D_80164498[];
+extern f32 D_801645F8[];
+extern s32 D_80164608[];
+extern f32 D_80164618[];
+extern f32 D_80164638[];
+extern f32 D_80164648[];
+extern f32 D_80164658[];
 extern s16 D_80164670[];
 extern s16 D_80164672;
 extern s16 D_80164674;
@@ -193,11 +255,30 @@ extern s16 D_80164678[]; // Size 4? Is the three below this fake?
 extern s16 D_8016467A;
 extern s16 D_8016467C;
 extern s16 D_8016467E;
+extern s16 D_80164680[];
+extern s16 D_80164682;
+extern f32 D_80164688[];
+extern s16 D_801646C0[];
+extern s16 D_801646CC;
+extern s16 D_801630FC;
+extern s16 D_801631C8;
+extern u16 D_801631E0[8];
+extern s32 D_80163238;
 extern s16 D_801632B8[];
 extern s16 D_801632D0[];
 extern u16 D_801632E8[];
-extern s16 D_801646CC;
+extern s32 D_8016337C;
+extern u16 D_80163410[]; // One per player?
+extern s16 D_80163478;
+extern s32 D_80163488;
+extern s16 D_8016348C;
+extern s16 D_801634D8[8];
+extern s32 D_8016359C;
+extern u16 D_801637BC[2];
+extern u16 D_801637BE;
+extern s32 D_80163DD8[];
 extern u16 D_80163E2A;
+
 extern Gfx D_0D0076F8[];
 
 extern s32 D_800DDB20;