Decompile roomGetProps and rename functions/symbols relating to room registration

This commit is contained in:
Ryan Dwyer
2021-06-02 23:37:57 +10:00
parent 124bf97b76
commit d6b4e4b23f
20 changed files with 251 additions and 232 deletions
+2 -2
View File
@@ -103,8 +103,8 @@ extern s16 *g_ChrIndexes;
extern s32 g_NumActiveHeadsPerGender;
extern u32 g_ActiveMaleHeads[8];
extern u32 g_ActiveFemaleHeads[8];
extern s16 *var8009cda0;
extern struct var8009cda4 *var8009cda4;
extern s16 *g_RoomPropListChunkIndexes;
extern struct roomproplistchunk *g_RoomPropListChunks;
extern struct prop *var8009cda8;
extern u32 var8009cdac;
extern u32 var8009cdb0;
+1 -1
View File
@@ -5,6 +5,6 @@
#include "types.h"
void gvarsInitProps(void);
void func0f00c390(void);
void gvarsInitRoomProps(void);
#endif
+7 -7
View File
@@ -45,18 +45,18 @@ bool propIsOfCdType(struct prop *prop, u32 types);
void roomsCopy(s16 *srcrooms, s16 *dstrooms);
void roomsAppend(s16 *newrooms, s16 *rooms, u32 arg2);
bool arrayIntersects(s16 *a, s16 *b);
bool func0f0658e8(s16 propnum, s32 arg1);
s32 func0f06593c(s32 room, s32 arg1);
void func0f0659e4(struct prop *prop, s16 room);
void func0f065ae0(struct prop *prop, s16 room);
void func0f065c44(struct prop *prop);
void func0f065cb0(struct prop *prop);
bool propTryAddToChunk(s16 propnum, s32 chunkindex);
s32 roomAllocatePropListChunk(s32 room, s32 arg1);
void propRegisterRoom(struct prop *prop, s16 room);
void propDeregisterRoom(struct prop *prop, s16 room);
void propDeregisterRooms(struct prop *prop);
void propRegisterRooms(struct prop *prop);
void func0f065d1c(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, s16 *morerooms, u32 arg5);
void func0f065dd8(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms);
void func0f065dfc(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms, s16 *morerooms, u32 arg5);
void func0f065e74(struct coord *pos, s16 *rooms, struct coord *newpos, s16 *newrooms);
void func0f065e98(struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2);
void roomGetProps(s16 *room, s16 *propnums, u32 size);
void roomGetProps(s16 *room, s16 *propnums, s32 len);
u32 func0f066054(void);
void propGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);
bool propUpdateGeometry(struct prop *prop, u8 **start, u8 **end);
+9 -1
View File
@@ -6797,7 +6797,15 @@ struct var800a41b0 {
/*0x78*/ u32 unk78;
};
struct var8009cda4 {
/**
* This struct is used as a pretend linked list.
*
* The final item in the propnums array is not a propnum; it's the index of the
* next chunk in the chunks array.
*
* The first item in the propnums array is -2 if this chunk is unallocated.
*/
struct roomproplistchunk {
s16 propnums[8];
};