mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-31 09:10:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name all env symbols

Browse Source
This commit is contained in:
Ryan Dwyer
2023-05-24 21:54:47 +10:00
parent 740be5e96b
commit 5cc44be4da
19 changed files with 313 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/bss.h
+4 -4
View File
@@ -228,9 +228,9 @@ extern struct screenbox g_PortalScreenBbox;
extern u32 g_BgCmdThrowing;
extern s32 g_BgNumLightsChecksum;
extern s32 g_BgLightsOffsetChecksum;
extern u32 g_FogEnabled;
extern u32 var800a65e4;
extern struct coord *var800a65e8;
extern bool g_FogEnabled;
extern bool g_EnvHasTransparency;
extern struct distfadesettings *g_EnvDistFadeSettingsPtr;
extern u8 *g_RoomMtxAges;
extern s16 *g_RoomMtxLinkedRooms;
extern s16 *g_RoomMtxBaseRooms;
@@ -270,7 +270,7 @@ extern struct textureconfig *g_TexShadowConfigs;
extern struct textureconfig *g_TexShieldConfigs;
extern struct textureconfig *g_TexShardConfigs;
extern struct textureconfig *g_TexScreenConfigs;
extern struct textureconfig *g_TexWaterConfigs;
extern struct textureconfig *g_TexSkyWaterConfigs;
extern struct textureconfig *g_TexLightGlareConfigs;
extern struct textureconfig *g_TexSparkConfigs;
extern struct textureconfig *g_TexGeneralConfigs;
src/include/commands.h
+1 -1
View File
@@ -2218,7 +2218,7 @@
/**
* Switch to the stage's alternative sky/fog settings. The switch is instant.
*
* The stage must use a type 1 sky (in the g_EnvironmentsType1 table) and the
* The stage must use a type 1 sky (in the g_FogEnvironments table) and the
* alternative sky must be placed immediately after it.
*/
#define switch_to_alt_sky \
src/include/constants.h
+4
View File
@@ -3555,6 +3555,10 @@
#define SCREENSPLIT_HORIZONTAL 0
#define SCREENSPLIT_VERTICAL 1
#define SHADEMODE_XLU 0
#define SHADEMODE_FRAC 1
#define SHADEMODE_OPA 2
#define SHARDTYPE_GLASS 0
#define SHARDTYPE_BOTTLE 1
#define SHARDTYPE_WOOD 2
src/include/game/env.h
+13 -7
View File
@@ -4,18 +4,24 @@
#include "data.h"
#include "types.h"
struct distfadesettings {
f32 opaperc;
f32 xluperc;
f32 refdist;
};
struct environment *envGetCurrent(void);
f32 env0f1657e4(void);
void env0f1657f8(void);
void envApplyType1(struct envtype1 *sky);
void envApplyType2(struct envtype2 *sky);
f32 envGetSquaredFogMax(void);
void envTick(void);
void envApplyFogEnvironment(struct fogenvironment *sky);
void envApplyNoFogEnvironment(struct nofogenvironment *sky);
void envSetStageNum(s32 stagenum);
void envChooseAndApply(s32 stagenum, bool allowoverride);
void envApplyTransitionFrac(f32 arg0);
Gfx *envStartFog(Gfx *gdl, bool xlupass);
Gfx *envStopFog(Gfx *gdl);
bool env0f1666f8(struct coord *pos, f32 arg1);
struct coord *env0f1667e8(void);
s32 env0f1667f4(struct prop *prop, f32 arg1[4]);
bool envIsPosInFogMaxDistance(struct coord *pos, f32 tolerance);
struct distfadesettings *envGetDistFadeSettings(void);
s32 envGetObjShadeMode(struct prop *prop, f32 arg1[4]);
#endif
src/include/game/propobj.h
+3 -3
View File
@@ -88,7 +88,7 @@ s32 func0f068fc8(struct prop *prop, bool arg1);
void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol);
void propCalculateShadeInfo(struct prop *prop, u8 *nextcol, u16 floorcol);
void colourTween(u8 *col, u8 *nextcol);
void func0f069750(s32 *arg0, s32 arg1, f32 arg2[4]);
void objMergeColourFracs(s32 *colour, s32 shademode, f32 fracs[4]);
void func0f069850(struct defaultobj *obj, struct coord *pos, f32 rot[3][3], struct geocyl *cyl);
void func0f069b4c(struct defaultobj *obj);
void func0f069c1c(struct defaultobj *obj);
@@ -322,8 +322,8 @@ void doorsRequestMode(struct doorobj *door, s32 newmode);
s32 doorIsClosed(struct doorobj *door);
s32 doorIsOpen(struct doorobj *door);
s32 func0f08e5a8(s16 *rooms, struct screenbox *box);
f32 func0f08e6bc(struct prop *prop, f32 arg1);
bool func0f08e794(struct coord *coord, f32 arg1);
f32 objCalculateFadeDistOpacityFrac(struct prop *prop, f32 modelscale);
bool posIsInObjFadeDistance(struct coord *coord, f32 modelscale);
bool func0f08e8ac(struct prop *prop, struct coord *pos, f32 arg2, bool arg3);
bool posIsInDrawDistance(struct coord *arg);
void doorCreateSparks(struct doorobj *door);
src/include/textureconfig.h
+3 -3
View File
@@ -12,12 +12,12 @@ extern struct textureconfig g_TcLaserConfigs[1];
extern struct textureconfig g_TcGroup03Configs[1];
extern struct textureconfig g_TcGeCrosshairConfigs[1];
extern struct textureconfig g_TcRedLineConfigs[1];
extern struct textureconfig g_TcGroup06Configs[1];
extern struct textureconfig g_TcShadowConfigs[1];
extern struct textureconfig g_TcShieldConfigs[1];
extern struct textureconfig g_TcShardConfigs[2];
extern struct textureconfig g_TcScreenConfigs[96];
extern struct textureconfig g_TcWaterConfigs[3];
extern struct textureconfig g_TcSkyConfigs[6];
extern struct textureconfig g_TcSkyWaterConfigs[3];
extern struct textureconfig g_TcGroup11Configs[6];
extern struct textureconfig g_TcLightGlareConfigs[10];
extern struct textureconfig g_TcSparkConfigs[1];
extern struct textureconfig g_TcGeneralConfigs[56];
src/include/types.h
+18 -19
View File
@@ -3156,13 +3156,13 @@ struct stagemusic {
s16 xtrack;
};
struct var800a6600 {
struct shadesettings {
f32 znear;
f32 zfar;
u32 unk08;
u32 unk0c;
f32 unk10;
f32 unk14;
f32 alphafar;
f32 alphanear;
};
struct environment {
@@ -3175,7 +3175,7 @@ struct environment {
/*0x0c*/ struct sun *suns;
/*0x10*/ u8 clouds_enabled;
/*0x14*/ f32 clouds_scale;
/*0x18*/ s16 unk18;
/*0x18*/ s16 clouds_type;
/*0x1c*/ f32 clouds_r;
/*0x20*/ f32 clouds_g;
/*0x24*/ f32 clouds_b;
@@ -3185,7 +3185,7 @@ struct environment {
/*0x34*/ f32 water_r;
/*0x38*/ f32 water_g;
/*0x3c*/ f32 water_b;
/*0x40*/ f32 unk40;
/*0x40*/ f32 clouds_height;
/*0x44*/ f32 skyredfrac;
/*0x48*/ f32 skygreenfrac;
/*0x4c*/ f32 skybluefrac;
@@ -3201,13 +3201,13 @@ struct sun {
/*0x12*/ s16 orb_size;
};
struct envtype1 {
struct fogenvironment {
/*0x00*/ s16 stage;
/*0x02*/ s16 near;
/*0x04*/ s16 far;
/*0x06*/ s16 unk06;
/*0x08*/ s16 unk08;
/*0x0a*/ s16 unk0a;
/*0x06*/ s16 opaperc;
/*0x08*/ s16 xluperc;
/*0x0a*/ s16 refdist;
/*0x0c*/ s16 fogmin;
/*0x0e*/ s16 fogmax;
/*0x10*/ u8 sky_r;
@@ -3217,27 +3217,26 @@ struct envtype1 {
/*0x14*/ struct sun *suns;
/*0x18*/ u8 clouds_enabled;
/*0x1a*/ s16 clouds_scale;
/*0x1c*/ u8 unk1c;
/*0x1c*/ u8 clouds_type;
/*0x1d*/ u8 clouds_r;
/*0x1e*/ u8 clouds_g;
/*0x1f*/ u8 clouds_b;
/*0x20*/ u8 water_enabled;
/*0x21*/ u8 unk21;
/*0x22*/ s16 water_scale;
/*0x24*/ u8 water_type;
/*0x25*/ u8 water_r;
/*0x26*/ u8 water_g;
/*0x27*/ u8 water_b;
/*0x28*/ u8 unk28;
/*0x28*/ u8 clouds_height;
};
struct envtype2 {
struct nofogenvironment {
/*0x00*/ s32 stage;
/*0x04*/ s16 near;
/*0x06*/ s16 far;
/*0x08*/ s16 unk08;
/*0x0a*/ s16 unk0a;
/*0x0c*/ s16 unk0c;
/*0x08*/ s16 opaperc;
/*0x0a*/ s16 xluperc;
/*0x0c*/ s16 refdist;
/*0x0e*/ u8 sky_r;
/*0x0f*/ u8 sky_g;
/*0x10*/ u8 sky_b;
@@ -3248,15 +3247,15 @@ struct envtype2 {
/*0x1a*/ u8 clouds_g;
/*0x1b*/ u8 clouds_b;
/*0x1c*/ f32 clouds_scale;
/*0x20*/ s16 unk20;
/*0x20*/ s16 clouds_type;
/*0x22*/ u8 water_enabled;
/*0x23*/ u8 water_r;
/*0x24*/ u8 water_g;
/*0x25*/ u8 water_b;
/*0x28*/ f32 water_scale;
/*0x2c*/ s16 water_type;
/*0x30*/ f32 unk30;
/*0x34*/ u32 unk34;
/*0x30*/ f32 clouds_height;
/*0x34*/ bool transparency;
};
struct menuitemdata_controller {