Many core2 warning fixes

include/core2/dustemitter.h

@@ -6,5 +6,5 @@ enum dust_emitter_type_e {
     DUST_EMITTER_TYPE_BREAK_DUST = 1
 };
 
-extern void dustEmitter_empty(ParticleEmitter *);
+extern void dustEmitter_empty(s32);
 extern void dustEmitter_emit(f32[3], f32[3], s32[4], bool, f32, f32, s32, s32, enum dust_emitter_type_e);

include/enums.h

@@ -3693,6 +3693,9 @@ enum asset_e
     // Unused
     // Unused
     // Unused
+
+    ASSET_SPRITE_START = 0x572,
+
     // 572 Palm Tree (2D)
     // Unused
     // Unused
@@ -4040,7 +4043,8 @@ enum asset_e
 
     ASSET_6D1_SPRITE_GOLDFEATHTER = 0x6d1,
 
-    ASSET_6D6_MODEL_MUSIC_NOTE = 0x6d6,
+    ASSET_6D6_SPRITE_MUSIC_NOTE = 0x6d6,
+    ASSET_6D7_SPRITE_EGG,
 
     ASSET_6D9_SPRITE_PROPELLOR_TIMER = 0x6d9,
     ASSET_6DA_SPRITE_HOURGLASS,

include/prop.h

@@ -147,6 +147,26 @@ typedef struct ch_sm_4070{
     s32 dialog_id;
 }ActorLocal_SM_4070;
 
+typedef struct struct_24_s{
+    s32 unk0;
+    BKModelBin *model_bin;
+    f32 unk8[3];
+    f32 unk14[3];
+    f32 unk20[3];
+    f32 unk2C;
+    f32 unk30[3];
+    s32 unk3C;
+    s32 unk40[4];
+    f32 unk50;
+} Struct24s;
+
+typedef struct struct_25_s{
+    Struct24s *begin;
+    Struct24s *current;
+    Struct24s *end;
+    Struct24s data[];
+} Struct25s;
+
 typedef struct actor_s{
     ActorMarker* marker;
     TUPLE(f32,position);

include/structs.h

@@ -565,12 +565,7 @@ typedef struct struct_63_s{
     void (*unk4)(vector(AnSeqElement) **, struct actorMarker_s *);
 } Struct63s;
 
-typedef struct struct_64_s{
-    struct struct_65_s *unk0;
-    s32 unk4;
-} Struct64s;
-
-typedef struct struct_65_s{
+typedef struct {
     f32 unk0[3];
     struct actorMarker_s *unkC;
     s32 (*unk10)(f32[3], f32, struct actorMarker_s *);
@@ -584,12 +579,19 @@ typedef struct struct_65_s{
     u8 unk25;
     u8 unk26;
     u8 unk27;
-}Struct65s;
+} Struct65s;
 
+typedef struct {
+    Struct65s *unk0;
+    s32 unk4;
+} Struct64s;
 
+struct struct_68_s;
 typedef void  (*Struct68DrawMethod)(void *, struct struct_68_s *, f32[3], f32[3], f32, BKModelBin*, Gfx**, Mtx**, Vtx**);
 
-typedef struct struct_68_s{
+struct actor_s;
+struct actorMarker_s;
+typedef struct struct_68_s {
     u8 unk0; // sfxsource index
     // u8 pad1[0x3];
     struct actorMarker_s *unk4;
@@ -617,7 +619,7 @@ typedef struct {
 typedef struct{
     BKCollisionTri * (* unk0)(struct actorMarker_s *, f32[3], f32[3], f32[3], s32);
     BKCollisionTri *(* unk4)(struct actorMarker_s *, f32[3], f32[3], f32, f32[3], s32, u32);
-    BKCollisionTri *(* unk8)(struct actorMarker_s *, f32[3], f32, f32[3], s32);
+    BKCollisionTri *(* unk8)(struct actorMarker_s *, f32[3], f32, f32[3], u32);
     s32 (* unkC)(struct actorMarker_s *, f32[3], f32, f32[3], s32);
 } Struct6Cs;
 

include/variables.h

@@ -16,4 +16,8 @@ extern struct Overlay gOverlayTable[];
 
 extern f32  climbPoleBottom[3];
 extern f32  climbPoleTop[3];
+
+#define offsetof(st, m) \
+    ((u32)&(((st *)0)->m))
+
 #endif