falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile func0f0037ac

This commit is contained in:
Ryan Dwyer 2022-06-12 18:14:28 +10:00
parent 4ddbe78731
commit 2fd2b77d0d
6 changed files with 305 additions and 1675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/bg.c
View File

@ -7347,8 +7347,8 @@ glabel var7f1b75d0
// g_Rooms[s4].lightindex = 0;
// g_Rooms[s4].flags = 0;
// g_Rooms[s4].unk4d = 0;
// g_Rooms[s4].bitfield.prevop = 0;
// g_Rooms[s4].bitfield.b = 0;
// g_Rooms[s4].prevop = 0;
// g_Rooms[s4].b = 0;
// }
//
// // ae4
@ -9748,7 +9748,7 @@ const char var7f1b1a60nb[] = "bg.c";
//
// g_Rooms[roomnum].flags |= ROOMFLAG_DIRTY;
// g_Rooms[roomnum].flags |= ROOMFLAG_0200;
// g_Rooms[roomnum].unk58 = 0;
// g_Rooms[roomnum].colours = NULL;
//
// func0f13c370(-1);
// }
@ -9930,7 +9930,7 @@ Gfx *room0f15e85c(Gfx *gdl, s32 roomnum, struct roomgfxdata18 *arg2, bool arg3)
roomHighlight(roomnum);
v0 = g_Rooms[roomnum].unk58;
v0 = (u32)g_Rooms[roomnum].colours;
if (v0 != NULL) {
s32 addr = ALIGN8((u32)&g_Rooms[roomnum].gfxdata->vertices[g_Rooms[roomnum].gfxdata->numvertices]);

2
src/game/chraicommands.c
View File

@ -12747,7 +12747,7 @@ bool aiConfigureEnvironment(void)
}
break;
case AIENVCMD_07:
g_Rooms[room_id].bitfield.b = value;
g_Rooms[room_id].unk4e_04 = value;
break;
case AIENVCMD_08:
g_Rooms[room_id].unk4d = value;

1951
src/game/dlights.c
View File

File diff suppressed because it is too large Load Diff

1
src/include/constants.h
View File

@ -3463,6 +3463,7 @@
#define ROOMFLAG_RENDERALWAYS 0x0080
#define ROOMFLAG_DIRTY 0x0100
#define ROOMFLAG_0200 0x0200
#define ROOMFLAG_0400 0x0400
#define ROOMFLAG_0800 0x0800
#define ROOMFLAG_1000 0x1000
#define ROOMFLAG_LIGHTSOFF 0x2000

2
src/include/game/utils.h
View File

@ -18,6 +18,6 @@ bool func0f17776c(struct coord *a, struct coord *b, f32 mult, struct coord *out)
void utilsReset(void);
s32 func0f177a54(void *arg0, s32 arg1, void *arg2, s32 arg3);
u32 func0f177bb4(void);
s32 func0f177c8c(u8 *arg0, s32 *arg1, s32 *arg2);
s32 func0f177c8c(u8 *arg0, s32 *arg1, s32 *roomnum);
#endif

16
src/include/types.h
View File

@ -3517,11 +3517,6 @@ struct spark {
s32 ttl; // time to live (number of ticks remaining)
};
struct roombitfield {
u8 prevop : 4;
u8 b : 4;
};
struct screenbox {
union {
struct {
@ -3599,10 +3594,11 @@ struct room {
/*0x4b*/ u8 unk4b;
/*0x4c*/ u8 unk4c;
/*0x4d*/ u8 unk4d;
/*0x4e*/ struct roombitfield bitfield;
/*0x4e*/ u8 lightop : 4;
/*0x4e*/ u8 unk4e_04 : 4;
/*0x50*/ s16 brightness;
/*0x52*/ s16 unk52;
/*0x54*/ u16 unk54;
/*0x54*/ s16 unk54;
/*0x56*/ u16 unk56;
/*0x58*/ struct colour *colours;
/*0x5c*/ f32 unk5c;
@ -3611,9 +3607,9 @@ struct room {
/*0x68*/ f32 unk68;
/*0x6c*/ f32 unk6c;
/*0x70*/ f32 unk70;
/*0x74*/ u32 unk74;
/*0x78*/ u32 unk78;
/*0x7c*/ u32 unk7c;
/*0x74*/ f32 unk74;
/*0x78*/ f32 unk78;
/*0x7c*/ f32 unk7c;
/*0x80*/ s32 gfxdatalen; // when inflated
/*0x84*/ struct wallhit *wallhits1;
/*0x88*/ struct wallhit *wallhits2;