Finish bss (#527)

* Finish importing bss

1 files changed, 217 insertions, 28 deletions

diff --git a/src/code_80057C60.h b/src/code_80057C60.h
index 16b1c2701..9d58dd5bc 100644
--- a/src/code_80057C60.h
+++ b/src/code_80057C60.h
@@ -2,9 +2,19 @@
 #define CODE_80057C60_H
 
 #include "common_structs.h"
+#include "objects.h"
+#include "camera.h"
 
 // code_80057C60
 
+typedef struct {
+    char unk_00[0x4];
+    Vec3f unk_04;
+    char unk_10[0x4];
+    s32 objectIndex;
+    char unk_18[0x8];
+} struct_D_8018CE10; // size = 0x20
+
 void func_8005C674(s8 arg0, s16 *arg1, s16 *arg2, s16 *arg3);
 void func_80057C60(void);
 void func_80057CE4(void);
@@ -233,6 +243,7 @@ void func_8006E8C4(Player*, s8, s8);
 void func_8006E940(Player*, s8, s8);
 
 // data/data_code_80071F00_2.s
+
 extern Vtx gBalloonVertexPlane1[];
 extern Vtx gBalloonVertexPlane2[];
 
@@ -258,10 +269,6 @@ extern u16 D_800E69F4[][4];
 extern u8 D_800E6F30[][3];
 extern u8 D_800E6F48[][3];
 
-
-
-// BSS, presumably
-
 extern f32 D_801652A0[];
 
 extern s32 D_80165590;
@@ -286,22 +293,47 @@ extern s32 D_80165618;
 extern s32 D_80165628;
 extern s32 D_80165638;
 extern u32 D_80165648;
-extern u32 D_80165654[];
 extern u32 D_80165658[];
 extern s32 D_80165678;
+extern u16 D_801656B0;
+extern u16 D_801656C0;
+extern u16 D_801656D0;
+extern u16 D_801656E0;
 extern s16 D_801656F0;
+extern s16 D_80165708;
+extern s16 D_80165710;
+// extern s16 D_80165730; -> objects.h
+// extern s16 D_80165738; -> objects.h
 
+extern s16 D_80165740;
+extern s16 D_80165748;
 extern s16 D_80165718;
 extern s16 D_80165720;
 extern s16 D_80165728;
+
+// extern s16 gNumActiveThwomps; -> objects.h
+
+extern s32 D_80165754;
+// extern ThwompSpawn *gThowmpSpawnList; -> objects.h
+
+extern Vec4s D_80165760;
+extern s8 D_8016576A;
+extern Vec4s D_80165770;
 extern s16 D_8016578C;
+extern Vec4s D_80165780;
+
 extern s16 D_80165790;
 extern s16 D_80165794;
+extern s8 D_8016579C;
 extern u16 D_8016579E;
+extern u16 D_801657A2;
+extern s8 D_801657AE;
 extern s8 D_801657B0;
 extern s8 D_801657B2;
-extern s8 D_801657AE;
+extern s8 D_801657B4;
+extern s8 D_801657B8[];
 extern s8 D_801657C8;
+extern s8 D_801657D0[];
 extern s8 D_801657D8;
 extern s8 D_801657E2;
 extern s8 D_801657E3;
@@ -311,60 +343,193 @@ extern bool8 D_801657E6;
 extern u8 D_801657E7;
 extern bool8 D_801657E8;
 extern bool8 D_801657F0;
-extern s8 D_801657F8;
+extern bool8 D_801657F8;
+extern s32 D_801657FC;
 
 extern s8 D_80165800[2];
+extern s32 D_80165804;
+extern s8 D_80165808;
+extern s32 D_8016580C;
+extern bool8 D_80165810;
+extern s32 D_80165814;
+extern bool8 D_80165818;
+extern s32 D_8016581C;
+extern s8 D_80165820;
+extern s8 D_80165828;
+extern Vec3su D_8016582C;
+extern s8 D_80165832[2];
+extern Vec3su D_80165834;
+extern s8 D_80165840[];
+extern s32 D_80165860;
+extern s32 D_8016586C;
+extern s32 D_80165878;
 extern s32 D_8016587C;
 extern u8 *D_80165880;
+extern s8 D_80165888;
 extern s8 D_80165890;
 extern s8 D_80165898;
+extern s32 D_8016589C;
 extern s8 D_801658A8;
+extern s8 D_801658BC;
+extern s8 D_801658C6;
+extern s8 D_801658CE;
 extern s8 D_801658D6;
-extern u8 sRandomItemIndex; // 801658fd
-extern u8 gControllerRandom; // 801658ff
+extern s8 D_801658DC;
+extern s8 D_801658E4;
+extern s8 D_801658EC;
+extern s8 D_801658F4;
+extern u8 sRandomItemIndex;
+extern s8 D_801658FE;
+extern u8 gControllerRandom;
 
 extern s16 D_80165900;
 extern s8  D_80165908;
 
 extern s8 D_80165A90;
+// extern Objects gObjectList[]; -> objects.h
+
+extern s32 objectListSize;
+extern Mtx D_80183D60;
+// extern s32 D_80183DA0; -> objects.h
+
+extern f32 D_80183DA8[];
+// extern s32 D_80183DB8[]; -> objects.h
+
+extern f32 D_80183DC8[];
+// extern s32 D_80183DD8[]; -> bomb_kart.h
+// extern s32 D_80183E38; -> objects.h
+
+extern Vec3f D_80183E40;
+// extern s32 D_80183E4C; -> objects.h
+
+extern Vec3f D_80183E50;
+// extern s32 D_80183E5C; -> objects.h
+// extern s32 D_80183E6C; -> objects.h
+
+extern Vec3f D_80183E70;
+// extern s32 D_80183E7C; -> objects.h
+
+extern Vec3su D_80183E80;
+// extern s32 gItemWindowObjectByPlayerId[]; -> objects.h
+
+extern Vec3su D_80183E98;
+// extern s32 indexObjectList1[]; -> objects.h
+// extern s32 indexObjectList2[]; -> objects.h
+
+extern u8 D_80183FA8[4][0x2000];
+// extern s32 indexObjectList3[]; -> objects.h
+
+extern u8 *D_8018C028;
+// extern s32 indexObjectList4[]; -> objects.h
+// extern Collision D_8018C0B0[]; -> objects.h
+// extern s32 D_8018C1B0[]; -> objects.h
+
+extern Collision D_8018C3B0;
+// extern s32 D_8018C3F0[]; -> objects.h
+// extern s32 D_8018C630[]; -> objects.h
+
+extern Collision D_8018C830;
+// extern s32 D_8018C870[]; -> objects.h
+// extern s32 D_8018C970[]; -> objects.h
 
-extern s8 D_8018CAE0;
+extern hud_player playerHUD[];
+// extern s32 D_8018CC80[]; -> objects.h
 
+extern struct_D_8018CE10 D_8018CE10[];
+// extern s32 D_8018CF10; -> objects.h
+
+extern Camera *D_8018CF14;
+extern s16 D_8018CF18;
 extern Player *D_8018CF1C;
+extern s16 D_8018CF20;
 extern Player *D_8018CF28[];
+extern s16 D_8018CF48;
 extern s16 D_8018CF50[];
-extern s16 gGPCurrentRaceCharacterIdByRank[]; // 8018cf80
+extern s16 D_8018CF60;
+extern s16 D_8018CF68[];
+extern s16 D_8018CF78;
+extern s16 gGPCurrentRaceCharacterIdByRank[];
+extern s16 D_8018CF90;
 extern s16 D_8018CF98[];
+extern s16 D_8018CFA8;
+extern s16 D_8018CFB0;
+extern s16 D_8018CFB8;
+extern s16 D_8018CFC0;
+extern s16 D_8018CFC8;
 extern f32 D_8018CFCC;
+extern s16 D_8018CFD0;
 extern f32 D_8018CFD4;
+extern s16 D_8018CFD8;
+extern s16 D_8018CFE0;
 extern f32 D_8018CFE4;
+extern s16 D_8018CFE8;
 extern f32 D_8018CFEC;
+extern s16 D_8018CFF0;
 extern f32 D_8018CFF4;
-
-extern f32 D_8018D028[8];
-extern f32 D_8018D050[8];
-extern f32 D_8018D078[8];
+extern s16 D_8018CFF8;
+extern s16 D_8018D000;
+extern s16 D_8018D008;
+extern f32 D_8018D00C;
+extern s16 D_8018D010;
+extern s16 D_8018D018;
+extern f32 xOrientation;
+extern s16 D_8018D020;
+extern f32 D_8018D028[];
+extern s16 D_8018D048;
+extern f32 D_8018D050[];
+extern s16 D_8018D070;
+extern f32 D_8018D078[];
+extern s16 D_8018D098;
 extern f32 D_8018D0A0[];
-extern f32 D_8018D0C8[8];
+extern s16 D_8018D0C0;
+extern f32 D_8018D0C8[];
+extern s16 D_8018D0E8;
 extern f32 D_8018D0F0[];
-
-extern s32 gMatrixHudCount; // 8018d120
+extern s16 D_8018D110;
 extern s32 D_8018D114;
+extern s32 gMatrixHudCount;
+extern s32 D_8018D140;
 extern s32 D_8018D150;
+extern s32 D_8018D158;
 extern s32 D_8018D160;
 extern s32 D_8018D168;
+extern s16 D_8018D16C;
 extern s32 D_8018D170;
+// extern s16 D_8018D174; -> objects.h
+
 extern s32 D_8018D178;
+// extern s16 D_8018D17C; -> objects.h
+
 extern s32 D_8018D180;
-extern s32 gIsHUDVisible; // 8018d188
+extern s16 D_8018D184;
+extern s32 gIsHUDVisible;
+extern s16 D_8018D18C;
 extern s32 D_8018D190;
+// extern s8 D_8018D198[]; -> objects.h
+
 extern s32 D_8018D1A0;
+// extern s8 D_8018D1A8[]; -> objects.h
+
 extern s32 D_8018D1B4;
-extern s32 D_8018D1D4;
+// extern s8 D_8018D1B8[]; -> objects.h
+
+extern s32 D_8018D1C4;
+// extern s32 D_8018D1C8; -> objects.h
+
 extern s32 D_8018D1CC;
+// extern s32 D_8018D1D0; -> objects.h
+
+extern s32 D_8018D1D4;
+// extern s32 D_8018D1D8; -> objects.h
+
+extern s32 D_8018D1DC;
+extern u8 *D_8018D1E0;
 extern f32 D_8018D1E8;
-extern s32 D_8018D1FC;
+extern s32 D_8018D1EC;
+// extern s32 D_8018D1F0; -> objects.h
+// extern s32 D_8018D1F8; -> objects.h
 
+extern s32 D_8018D1FC;
 extern s16 D_8018D200;
 extern s32 D_8018D204;
 extern s16 D_8018D208;
@@ -373,28 +538,52 @@ extern s16 D_8018D210;
 extern bool D_8018D214;
 extern s16 D_8018D218;
 extern s32 D_8018D21C;
+extern u8 (*D_8018D220)[1024];
+extern s32 D_8018D224;
+extern u8  D_8018D228;
 extern s32 D_8018D22C;
+// extern s8 D_8018D230; -> objects.h
+
+extern s32 D_8018D240;
+extern u8 *D_8018D248[];
 extern f32 D_8018D2A0;
 extern s32 D_8018D2A4;
 extern s32 D_8018D2AC;
+extern s16 D_8018D2B0;
+extern s32 D_8018D2B4;
+extern s16 D_8018D2B8;
 extern s32 D_8018D2BC;
+extern s16 D_8018D2C0[];
 extern s32 D_8018D2C8[];
+extern s16 D_8018D2D8[];
 extern s16 D_8018D2E0;
 extern s16 D_8018D2E8;
-
+extern s16 D_8018D2F0;
+extern s16 D_8018D2F8;
+extern u16 D_8018D300;
+extern u16 D_8018D308;
+extern u16 D_8018D310;
 extern s32 D_8018D314;
+extern u16 D_8018D318;
 extern s32 D_8018D320;
 extern s32 D_8018D380;
 extern s32 D_8018D384;
 extern s32 D_8018D388;
+// extern s32 D_8018D3BC; -> objects.h
+// extern s32 D_8018D3C0; -> objects.h
+// extern s32 D_8018D3C4; -> objects.h
+
 extern s32 D_8018D3D4;
 extern s32 D_8018D3D8;
 extern s32 D_8018D3DC;
+extern s32 D_8018D3E0;
+extern s32 D_8018D3E4;
+extern s32 D_8018D3E8;
+extern s32 D_8018D3EC;
 extern s32 D_8018D3F0;
 extern s32 D_8018D3F4;
 extern s32 D_8018D3F8;
-extern s32 gRaceFrameCounter; // 8018d3fc
-
+extern s32 gRaceFrameCounter;
 extern s32 D_8018D400;
 extern s32 D_8018D40C;
 extern s32 D_8018D410;
@@ -419,11 +608,13 @@ extern u8 *D_8018D464;
 extern u8 *D_8018D468;
 extern u8 *D_8018D46C;
 extern u8 *D_8018D470;
+extern u8 *D_8018D474;
 extern u8 *D_8018D478;
 extern u8 *D_8018D480;
 extern u8 *D_8018D484;
 extern u8 *D_8018D488;
 extern u8 *D_8018D48C;
+extern u8* D_8018D490;
 extern u8 *D_8018D494;
 extern u8 *D_8018D498;
 extern u8 *D_8018D49C;
@@ -439,11 +630,9 @@ extern u8 *D_8018D4C0;
 extern u8 *D_8018D4C4;
 extern u8 *D_8018D4C8;
 extern Vec3f D_8018D4D0[];
-
 extern Vec3f D_8018D530[];
 extern Vec3f D_8018D590[];
-extern u16 gPlayerBalloonStatus[8][3]; // D_8018D5F0
-
+extern u16 gPlayerBalloonStatus[8][3];
 extern Vec3s D_8018D620[];
 extern Vec3f D_8018D650[];
 extern Vec3f D_8018D6B0[];
@@ -457,7 +646,7 @@ extern Vec3s D_8018D800[];
 extern Vec3s D_8018D830[];
 extern Vec3s D_8018D860[];
 extern Vec3s D_8018D890[];
-extern Vec3s D_8018D8D0[];
 extern s16 gPlayerBalloonCount[];      // D_8018D8C0
+extern Vec3s D_8018D8D0[];
 
 #endif