pal: all core2/bs matched

include/bs_funcs.h

@@ -173,13 +173,13 @@ void func_802A7738(void);
 void func_802A7838(void);
 void func_802A7A2C(void);
 //BS_2D_SWIM_IDLE,  
-void func_802B5774(void);
-void func_802B5950(void);
-void func_802B5AF8(void);
+void bsswim_idle_init(void);
+void bsswim_idle_update(void);
+void bsswim_idle_end(void);
 //BS_2E_SWIM(void);
-void func_802B5B18(void);
-void func_802B5C40(void);
-void func_802B5E10(void);
+void bsswim_swim_init(void);
+void bsswim_swim_update(void);
+void bsswim_swim_end(void);
 //BS_2F_FALL(void);
 void bsjump_fall_init(void);
 void bsjump_fall_update(void);
@@ -479,14 +479,14 @@ void func_802A4FC8(void);
 void func_802A503C(void);
 
 //0x00000077
-void func_802B5E8C(void);
-void func_802B5EFC(void);
-void func_802B5F38(void);
+void bsswim_lookat_init(void);
+void bsswim_lookat_update(void);
+void bsswim_lookat_end(void);
 
 //0x00000078
-void func_802A83C0(void);
-void func_802A8410(void);
-void func_802A844C(void);
+void bsbswim_lookat_init(void);
+void bsbswim_lookat_update(void);
+void bsbswim_lookat_end(void);
 
 //0x00000079
 void bsbtrot_unk79_init(void);
@@ -617,14 +617,14 @@ void bswalrus_drone_update(void);
 void bswalrus_drone_end(void);
 void bsdrone_interrupt(void);
 //0x00000096
-void func_802B5F58(void);
-void func_802B5F80(void);
-void func_802B5FA0(void);
+void bsswim_drone_init(void);
+void bsswim_drone_update(void);
+void bsswim_drone_end(void);
 void bsdrone_interrupt(void);
 //0x00000097
-void func_802A874C(void);
-void func_802A8774(void);
-void func_802A8794(void);
+void bsbswim_drone_init(void);
+void bsbswim_drone_update(void);
+void bsbswim_drone_end(void);
 void bsdrone_interrupt(void);
 //0x00000098
 void bswalk_drone_init(void);

include/core2/lighting.h

@@ -5,12 +5,12 @@
 typedef struct { 
     f32 position[3];
     f32 positionCopy[3];
-    f32 unk18; // unk
-    f32 unk1C; // unk
-    f32 unk20; // result of unk18 / actor scale, some sort of distance
-    f32 unk24; // result of unk1C / actor scale, some sort of distance (determines whether to modify rgb of vertex)
+    f32 fade_radius_min_unscaled; // unk
+    f32 fade_radius_max_unscaled; // unk
+    f32 fade_radius_min; // result of unk18 / actor scale, some sort of distance
+    f32 fade_radius_max; // result of unk1C / actor scale, some sort of distance (determines whether to modify rgb of vertex)
     s32 rgb[3];  // rgb
-    u8 unk34; // some sort of flag
+    u8 active; // some sort of flag
     u8 pad35[0x3];
 } Lighting; //size 0x38
 

include/enums.h

@@ -2411,8 +2411,8 @@ enum bs_e {
     BS_74_UNKNOWN = 0x74, // locked jiggypad, xform, bottles
     BS_75_UNKNOWN = 0x75, // locked bottles
     BS_76_BFLY_LOCKED = 0x76,
-    BS_77_SWIM_LOCKED = 0x77,
-    BS_78_DIVE_LOCKED = 0x78,
+    BS_77_SWIM_LOOKAT_DRONE = 0x77,
+    BS_78_DIVE_LOOKAT_DRONE = 0x78,
     BS_79_BTROT_LOCKED = 0x79,
     BS_WALK_MUD = 0x7A,
     BS_BTROT_OW = 0x7B,
@@ -2442,8 +2442,8 @@ enum bs_e {
     BS_93_PUMPKIN_DRONE = 0x93,
     BS_94_CROC_DRONE = 0x94,
     BS_95_WALRUS_DRONE = 0x95,
-    BS_96_SWIM_LOCKED = 0x96,
-    BS_97_DIVE_LOCKED = 0x97,
+    BS_96_SWIM_DRONE = 0x96,
+    BS_97_DIVE_DRONE = 0x97,
     BS_98_WALK_DRONE = 0x98,
     BS_99_BFLY_DRONE = 0x99,
     BS_9A_BTROT_DRONE = 0x9A,
@@ -5485,4 +5485,24 @@ enum ba_timer_id {
     BA_TIMER_HAZARDS = 4
 };
 
+enum ba_rebound_id{
+    BA_REBOUND_0_NONE,
+    BA_REBOUND_1_UNK,
+    BA_REBOUND_2_UNK,
+    BA_REBOUND_3_UNK,
+    BA_REBOUND_4_UNK,
+    BA_REBOUND_5_UNK,
+    BA_REBOUND_6_UNK,
+    BA_REBOUND_7_UNK,
+    BA_REBOUND_8_UNK,
+    BA_REBOUND_9_UNK,
+    BA_REBOUND_A_UNK,
+    BA_REBOUND_B_UNK,
+    BA_REBOUND_C_UNK,
+    BA_REBOUND_D_UNK,
+    BA_REBOUND_E_UNK,
+    BA_REBOUND_F_UNK,
+    BA_REBOUND_10_UNK
+};
+
 #endif

include/functions.h

@@ -261,9 +261,9 @@ void baiFrame_startWithValue(f32);
 f32  pitch_getIdeal(void);
 void pitch_setAngVel(f32, f32);
 void func_80298528(f32);
-f32  func_802987C4(void);
-f32  func_802987D4(void);
-f32  func_802987E4(void);
+f32  barebound_get_vertical_velocity(void);
+f32  barebound_get_horizontal_velocity(void);
+f32  barebound_get_gravity(void);
 void roll_setIdeal(f32);
 void roll_setAngularVelocity(f32, f32);
 void yaw_set(f32);
@@ -303,7 +303,7 @@ void func_802BD8A4(f32, f32, f32);
 f32  func_802BD8D4(void);
 void func_802BE244(f32, f32);
 void func_802BE230(f32, f32);
-void ncDynamicCamD_func_802BF2C0(f32);
+void ncbadie_func_802BF2C0(f32);
 f32  func_802B6F9C(void);
 
 void func_802C1B20(f32);

include/model.h

@@ -200,5 +200,5 @@ typedef struct{
 
 BKVertexList *model_getVtxList(BKModelBin *arg0);
 Vtx *vtxList_getVertices(BKVertexList *vtxList);
-void codeAC520_func_80333D48(BKVertexList *arg0, f32 position[3], f32 rotation[3], f32 scale, f32 arg4[3], BKVertexList *arg5);
+void gclights_recolor_vertices(BKVertexList *arg0, f32 position[3], f32 rotation[3], f32 scale, f32 arg4[3], BKVertexList *arg5);
 #endif

include/structs.h

@@ -472,11 +472,6 @@ typedef struct{
     u8 unk3F;
 }struct4Es;
 
-typedef struct{
-    u8 unk0;
-    u8 unk1;
-    f32 unk4[3];
-}struct50s;
 
 typedef struct{
     s16 unk0;