code_83340 -> propModelList

include/core1/core1.h

@@ -100,7 +100,7 @@ extern u16 gFramebuffers[2][DEFAULT_FRAMEBUFFER_WIDTH * DEFAULT_FRAMEBUFFER_HEIG
 
 void func_80253550(void);
 void func_8025357C(void);
-void func_802535A8(Gfx **arg0, Gfx **arg1, UNK_TYPE(s32) arg2, UNK_TYPE(s32) arg3);
+void func_802535A8(Acmd *arg0, Acmd*arg1, OSMesgQueue *arg2, UNK_TYPE(s32) arg3);
 void func_80253640(Gfx ** gdl, void *arg1);
 void scissorBox_SetForGameMode(Gfx **gdl, s32 framebuffer_idx);
 void setupScissorBoxAndFramebuffer(Gfx **gfx, s32 framebuffer_address);

include/core2/file.h

@@ -43,7 +43,7 @@ void file_getShort(File *file, s16 *dst);
 void file_getNShorts(File *file, s16 *dst, s32 cnt);
 bool file_isNextByteExpected(File *file, s32 expected);
 bool file_getByte_ifExpected(File *file, s32 expected, u8 *dst);
-bool file_getNBytes_ifExpected(File *file, s32 expected, u8 *dst, s32 cnt);
+bool file_getNBytes_ifExpected(File *file, s32 expected, void *dst, s32 cnt);
 bool file_getFloat_ifExpected(File *file, s32 expected, f32 *dst);
 bool file_getNFloats_ifExpected(File *file, s32 expected, f32 *dst, s32 cnt);
 bool file_getWord_ifExpected(File *file, s32 expected, s32 *dst);

include/functions.h

@@ -326,7 +326,7 @@ extern s32 func_802F9AA8(enum sfx_e);
 Actor * func_803055E0(enum actor_e id, s32 pos[3], s32 arg2, s32 arg3, s32 arg4);
 Actor * __actor_spawnWithYaw_s32(enum actor_e id, s32 pos[3], s32 yaw);
 f32  mapModel_getFloorY(f32[3]);
-BKModelBin *func_8030A428(s32);
+BKModelBin *propModelList_getModel(s32);
 u8   sfxsource_createSfxsourceAndReturnIndex(void);
 void sfxsource_setSfxId(u8 indx, enum sfx_e uid);
 void sfxsource_playSfxAtVolume(u8, f32);

include/prop.h

@@ -9,44 +9,42 @@
 #include "core2/skeletalanim.h"
 
 typedef struct sprite_prop_s{
-    u32 unk0_31:0xC;
+    u32 sprite_index:0xC;
     u32 unk0_19:0x1;
-    u32 unk0_18:0x3;
-    u32 unk0_15:0x3;
-    u32 unk0_12:0x3;
-    u32 unk0_9:0x8;
-    u32 unk0_1:0x1;
-    u32 unk0_0:0x1;
+    u32 r:0x3;
+    u32 b:0x3;
+    u32 g:0x3;
+    u32 scale:0x8;
+    u32 mirrored:0x1;
     s16 unk4[3];
-    u16 unk8_15: 5;
+    u16 frame: 5;
     u16 unk8_10: 5;
     u16 unk8_5: 1;
     u16 unk8_4: 1;
     u16 unk8_3: 1;
     u16 unk8_2: 1;
-    u16 unk8_1:1;
-    u16 unk8_0:1;
+    u16 is_3d:1;
+    u16 is_actor:1;
 } SpriteProp;
 
 typedef struct model_prop_s{
     union{
         u16 unk0;
         struct{    
-            u16 unk0_31:12;
+            u16 model_index:12;
             u16 pad0_19:4;
         };
     };
-    u8 unk0_15;
-    u8 unk0_7;
-    s16 unk4[3];
-    u8 unkA;
+    u8 yaw;
+    u8 roll;
+    s16 position[3];
+    u8 scale;
     u8 padB_7 :2;
     u8 unkB_5 :1;
     u8 unkB_4 :1;
     u8 padB_3 :4;
 } ModelProp;
 
-
 typedef struct actor_prop_s{
     union {
         struct {
@@ -60,8 +58,8 @@ typedef struct actor_prop_s{
             u16 unk8_4:1;
             u16 unk8_3:1;
             u16 unk8_2:1;
-            u16 unk8_1:1;
-            u16 unk8_0:1;
+            u16 is_3d:1;
+            u16 is_actor:1;
         };
         s32 words[3];
     };
@@ -335,8 +333,8 @@ typedef union prop_s
         u16 unk8_4: 1;
         u16 unk8_3: 1;
         u16 unk8_2: 1;
-        u16 unk8_1: 1;
-        u16 markerFlag: 1;
+        u16 is_3d: 1;
+        u16 is_actor: 1;
     };
 } Prop;