mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-28 00:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename and document room mtx functions

Browse Source
This commit is contained in:
Ryan Dwyer
2022-11-28 17:48:59 +10:00
parent 2b661d2bb4
commit 3248fa9849
28 changed files with 181 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/bss.h
+5 -5
View File
@@ -231,11 +231,11 @@ extern s32 g_BgLightsOffsetChecksum;
extern u32 g_FogEnabled;
extern u32 var800a65e4;
extern struct coord *var800a65e8;
extern u8 *var800a6660;
extern s16 *var800a6664;
extern s16 *var800a6668;
extern f32 *var800a666c;
extern Mtxf *var800a6670;
extern u8 *g_RoomMtxAges;
extern s16 *g_RoomMtxLinkedRooms;
extern s16 *g_RoomMtxBaseRooms;
extern f32 *g_RoomMtxScales;
extern Mtxf *g_RoomMtxMatrices;
extern struct fileinfo g_FileInfo[NUM_FILES];
extern u8 *g_VtxBuffers[3];
extern u8 *g_GfxMemPos;
src/include/data.h
+1 -1
View File
@@ -440,7 +440,7 @@ extern u16 var8007fc3c;
extern s32 g_NumPortalThings;
extern f32 var8007fcb4;
extern struct stagetableentry g_Stages[61];
extern s32 var80082050;
extern s32 g_RoomMtxNumSlots;
extern u32 g_GfxNumSwaps;
extern s32 g_NumReasonsToEndMpMatch;
extern s32 g_MusicEventQueueLength;
src/include/game/room.h
+9 -9
View File
@@ -9,14 +9,14 @@ void roomsReset(void);
void roomsTick(void);
void roomSetLastForOffset(s32 room);
void room0f1668f0(s32 index, s32 roomnum);
void room0f16692c(s32 index, s32 roomnum);
void room0f16696c(s32 index);
s32 room0f1669fc(void);
void room0f166a6c(Mtxf *matrix, s32 roomnum);
s32 room0f166c20(s32 roomnum);
Gfx *roomPushMtx(Gfx *gdl, s32 roomnum);
struct coord *roomGetPos(s32 room);
void room0f166df0(s32 room, struct coord *globaldrawworldoffset);
void roomLinkMtx(s32 index, s32 roomnum);
void roomUnlinkMtx(s32 index, s32 roomnum);
void roomFreeMtx(s32 index);
s32 roomAllocateMtx(void);
void roomPopulateMtx(Mtxf *matrix, s32 roomnum);
s32 roomTouchMtx(s32 roomnum);
Gfx *roomApplyMtx(Gfx *gdl, s32 roomnum);
struct coord *roomGetPosPtr(s32 room);
void roomGetPos(s32 room, struct coord *pos);
#endif
src/include/lib/mtx.h
+1 -1
View File
@@ -28,7 +28,7 @@ void mtx00015f04(f32 scale, Mtxf *arg1);
void mtx00015f4c(f32 scale, Mtxf *arg1);
void mtx00015f88(f32 arg0, Mtxf *arg1);
u32 mtxGetObfuscatedRomBase(void);
void mtx00016054(Mtxf *mtx, Mtxf *arg1);
void mtxF2L(Mtxf *src, Mtxf *dst);
void mtx00016110(f32 mtx1[3][3], f32 mtx2[3][3]);
void mtx00016140(f32 mtx1[3][3], f32 mtx2[3][3], f32 dst[3][3]);
void mtx000161b0(f32 arg0[3][3], f32 src[3], f32 dest[3]);
src/include/types.h
+1 -1
View File
@@ -3597,7 +3597,7 @@ struct room {
/*0x0a*/ u16 lightindex; // index of start of this room's lights in data file
/*0x0c*/ u16 firstwaypoint; // offset into g_Vars.waypoints
/*0x0e*/ s16 roomportallistoffset;
/*0x10*/ s16 unk10;
/*0x10*/ s16 roommtxindex;
/*0x14*/ struct roomgfxdata *gfxdata;
/*0x18*/ f32 bbmin[3];
/*0x24*/ f32 bbmax[3];