popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

Merge branch 'master' of https://github.com/n64decomp/perfect_dark into port

Browse Source
This commit is contained in:
fgsfds committed 2023-08-28 15:55:54 +02:00
2 parents 916d147619 4f56cd4c09
commit 0e5b4bde62
37 files changed
+1684 -1654
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/include/bss.h
+5 -5
View File
@@ -167,8 +167,8 @@ extern s16 g_SpawnPoints[];
extern s32 g_NumSpawnPoints;
extern s32 var8009de90;
extern s32 var8009de94;
extern s32 var8009de98;
extern s32 var8009de9c;
extern s32 g_MenuProjectFromX;
extern s32 g_MenuProjectFromY;
extern u8 g_MpSelectedPlayersForStats[MAX_PLAYERS];
extern char g_CheatMarqueeString[];
extern u8 *g_BlurBuffer;
@@ -257,9 +257,9 @@ extern struct texture *g_Textures;
extern struct texpool g_TexSharedPool;
extern struct texcacheitem g_TexCacheItems[150];
extern s32 g_TexCacheCount;
extern u8 *var800ab540;
extern u32 var800ab544;
extern s32 var800ab548;
extern u8 *g_TexBitstring;
extern u32 g_TexAccumValue;
extern s32 g_TexAccumNumBits;
extern s32 g_TexNumConfigs;
extern struct tex **g_TexWords;
extern struct textureconfig *g_TexWallhitConfigs;
src/include/constants.h
+22
View File
@@ -947,6 +947,9 @@
#define FILETYPE_MPPLAYER 2
#define FILETYPE_CAMERA 3
#define FINDPROPCONTEXT_QUERY 0
#define FINDPROPCONTEXT_SHOOT 2
#define FLOORTYPE_DEFAULT 0
#define FLOORTYPE_WOOD 1
#define FLOORTYPE_STONE 2
@@ -1683,6 +1686,25 @@
#define MENUITEMTYPE_CONTROLLER 0x19
#define MENUITEMTYPE_END 0x1a
#define MENUMODELFLAG_HASSCALE 0x01
#define MENUMODELFLAG_HASPOSITION 0x02
#define MENUMODELFLAG_HASROTATION 0x04
#define MENUMODELPARAMS_HAS_MASTER_HEADBODY(params) (((params) & 0x80000000) != 0)
#define MENUMODELPARAMS_GET_MASTER_HEADNUM(params) ((params) & 0x3ff)
#define MENUMODELPARAMS_GET_MASTER_BODYNUM(params) (((params) & 0xffc00) >> 10)
#define MENUMODELPARAMS_GET_MP_HEADNUM(params) (((params) >> 16) & 0xff)
#define MENUMODELPARAMS_GET_MP_BODYNUM(params) (((params) >> 24) & 0xff)
#define MENUMODELPARAMS_GET_FILENUM(params) ((params) & 0xffff)
#define MENUMODELPARAMS_SET_FILENUM(filenum) (filenum)
#define MENUMODELPARAMS_SET_MP_HEADBODY(mpheadnum, mpbodynum) (0xffff | ((mpheadnum) << 16) | ((mpbodynum) << 24))
#define MENUMODELTYPE_DEFAULT 0
#define MENUMODELTYPE_HUDPIECE 1
#define MENUMODELTYPE_2 2
#define MENUMODELTYPE_3 3
#define MENUMODELTYPE_CREDITSLOGO 4
#define MENUOP_GETOPTIONCOUNT 1
#define MENUOP_GETOPTGROUPCOUNT 2
#define MENUOP_GETOPTIONTEXT 3
src/include/game/camera.h
+1 -1
View File
@@ -9,7 +9,7 @@ void camSetScreenPosition(f32 left, f32 top);
void camSetPerspective(f32 near, f32 fovy, f32 aspect);
f32 cam0f0b49b8(f32 arg0);
void camSetScale(void);
void cam0f0b4c3c(f32 *crosspos, struct coord *dst, f32 arg2);
void cam0f0b4c3c(f32 pos2d[2], struct coord *dir2d, f32 arg2);
void cam0f0b4d04(struct coord *in, f32 *out);
void cam0f0b4d68(struct coord *in, f32 out[2]);
void cam0f0b4dec(struct coord *in, f32 out[2]);
src/include/game/chr.h
+2 -2
View File
@@ -45,8 +45,8 @@ void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct c
void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3);
void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3);
void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius);
f32 chr0f0278a4(struct chrdata *chr);
void chr0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool arg3);
f32 chrGetHitRadius(struct chrdata *chr);
void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, bool cheap);
void chrHit(struct shotdata *shotdata, struct hit *hit);
void chr0f028498(bool value);
void chrsCheckForNoise(f32 noiseradius);
src/include/game/endscreen.h
+1 -1
View File
@@ -28,7 +28,7 @@ char *endscreenMenuTextCurrentStageName3(struct menuitem *item);
char *endscreenMenuTitleStageFailed(struct menuitem *item);
char *endscreenMenuTextMissionTime(struct menuitem *item);
struct menudialogdef *endscreenAdvance(void);
void endscreen0f10d770(void);
void endscreenResetModels(void);
void endscreenContinue(s32 context);
char *endscreenMenuTextTimedCheatName(struct menuitem *item);
char *endscreenMenuTextCompletionCheatName(struct menuitem *item);
src/include/game/menu.h
+4 -4
View File
@@ -60,9 +60,9 @@ void menuCloseDialog(void);
void menuUpdateCurFrame(void);
void menuPopDialog(void);
void func0f0f3704(struct menudialogdef *dialogdef);
void func0f0f372c(struct menu840 *arg0, f32 x, f32 y, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, u8 flags);
void func0f0f37a4(struct menu840 *arg0);
Gfx *menuRenderModels(Gfx *gdl, struct menu840 *arg1, s32 arg2);
void menuConfigureModel(struct menumodel *menumodel, f32 x, f32 y, f32 z, f32 rotx, f32 roty, f32 rotz, f32 scale, u8 flags);
void menuUnsetModel(struct menumodel *menumodel);
Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype);
void menuGetTeamTitlebarColours(u32 *top, u32 *middle, u32 *bottom);
Gfx *menuApplyScissor(Gfx *gdl);
Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight);
@@ -85,7 +85,7 @@ void menuPushRootDialog(struct menudialogdef *dialogdef, s32 arg1);
void func0f0f85e0(struct menudialogdef *dialogdef, s32 root);
Gfx *menuRenderDialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight);
Gfx *menuRenderDialogs(Gfx *gdl);
void func0f0f8bb4(struct menu840 *arg0, u32 arg1, u32 arg2);
void menuResetModel(struct menumodel *menumodel, u32 allocationlen, bool allocate);
void menuReset(void);
void menuSwipe(s32 direction);
void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags);
src/include/game/mplayer/setup.h
+1 -1
View File
@@ -9,7 +9,7 @@ s16 mpChooseRandomStage(void);
MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTextWeaponNameForSlot(struct menuitem *item);
char *mpMenuTextSetupName(struct menuitem *item);
MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, bool isplayer);
MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpbodynum, s32 mpheadnum, bool isplayer);
MenuDialogHandlerResult menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data);
MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data);
char *mpMenuTextKills(struct menuitem *item);
src/include/game/prop.h
+4 -4
View File
@@ -24,10 +24,10 @@ Gfx *propRender(Gfx *gdl, struct prop *prop, bool xlupass);
Gfx *propsRender(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomnumsbyprop);
void weaponPlayWhooshSound(s32 weaponnum, struct prop *prop);
void func0f060bac(s32 weaponnum, struct prop *prop);
struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struct coord *arg3, struct coord *gunpos, struct coord *dir, u32 arg6, f32 arg7, bool arg8);
struct prop *func0f061d54(s32 handnum, u32 arg1, u32 arg2);
void shotCreate(s32 handnum, bool arg1, bool dorandom, s32 arg3, bool arg4);
void func0f061fa8(struct shotdata *shotdata, struct prop *prop, f32 arg2, s32 hitpart, struct modelnode *node, struct hitthing *hitthing, s32 arg6, struct modelnode *arg7, struct model *model, bool arg9, s32 arg10, struct coord *arg11, struct coord *arg12);
struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpos2d, struct coord *gundir2d, struct coord *gunpos3d, struct coord *gundir3d, u32 arg6, f32 distance, bool arg8);
struct prop *propFindAimingAt(s32 handnum, bool isshooting, u32 context);
void shotCreate(s32 handnum, bool arg1, bool dorandom, s32 numshots, bool arg4);
void hitCreate(struct shotdata *shotdata, struct prop *prop, f32 hitdistance, s32 hitpart, struct modelnode *bboxnode, struct hitthing *hitthing, s32 arg6, struct modelnode *dlnode, struct model *model, bool slowsbullet, bool bulletproof, struct coord *arg11, struct coord *arg12);
void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2);
void handTickAttack(s32 handnum);
void handsTickAttack(void);
src/include/game/propobj.h
+2 -2
View File
@@ -211,7 +211,7 @@ Gfx *objRenderShadow(struct defaultobj *obj, Gfx *gdl);
Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass);
bool modelIsNodeNotTvscreen(struct modeldef *modeldef, struct modelnode *node);
void objDeform(struct defaultobj *obj, s32 level);
void objBounce(struct defaultobj *obj, struct coord *arg1);
void objBounce(struct defaultobj *obj, struct coord *gundir2d);
void objSetDropped(struct prop *prop, u32 droptype);
void objApplyMomentum(struct defaultobj *obj, struct coord *speed, f32 rotation, bool addspeed, bool addrotation);
void piracyRestore(void);
@@ -233,7 +233,7 @@ bool objIsMortal(struct defaultobj *obj);
void objTakeGunfire(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum);
void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum);
void func0f0859a0(struct prop *prop, struct shotdata *shotdata);
void func0f085e00(struct prop *prop, struct shotdata *shotdata);
void objTestHit(struct prop *prop, struct shotdata *shotdata);
void objHit(struct shotdata *shotdata, struct hit *hit);
u32 propobjGetCiTagId(struct prop *prop);
bool objIsHealthy(struct defaultobj *obj);
src/include/game/tex.h
+2 -19
View File
@@ -21,29 +21,12 @@ void texSetRenderMode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3);
void texLoadFromConfig(struct textureconfig *config);
void texSelect(Gfx **gdl, struct textureconfig *tconfig, u32 arg2, s32 arg3, u32 ulst, bool arg5, struct texpool *pool);
void tex0f173a08(void);
bool texSetLutMode(u32 value);
bool tex0f173a70(s32 index, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 shifts, s32 shiftt);
bool tex0f173b8c(s32 index, s32 uls, s32 ult, s32 lrs, s32 lrt);
s32 texGetWidthAtLod(struct tex *tex, s32 lod);
s32 texGetHeightAtLod(struct tex *tex, s32 lod);
s32 texGetLineSizeInBytes(struct tex *tex, s32 lod);
s32 texGetSizeInBytes(struct tex *tex, s32 lod);
void tex0f173e50(struct tex *tex, s32 *arg1, s32 *arg2);
s32 tex0f173f18(s32 arg0);
s32 tex0f173f48(s32 arg0);
Gfx *tex0f173f78(Gfx *gdl, struct tex *tex, s32 arg2, s32 shifts, s32 shiftt, s32 arg5);
Gfx *tex0f1742e4(Gfx *arg0, Gfx *arg1, struct tex *tex, bool arg3);
Gfx *tex0f1743a0(Gfx *gdl, struct tex *tex, s32 arg2);
Gfx *tex0f1747a4(Gfx *gdl, struct tex *tex, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, u32 size);
Gfx *tex0f174b54(Gfx *gdl, struct tex *tex);
Gfx *tex0f174f30(Gfx *gdl, struct tex *tex, s32 arg2, s32 arg3, s32 arg4, s32 tile);
Gfx *tex0f1751e4(Gfx *gdl, struct tex *tex, s32 arg2, s32 arg3, s32 arg4, bool arg5);
Gfx *tex0f175308(Gfx *gdl, struct tex *tex, s32 arg2, s32 arg3, s32 arg4, struct tex *arg5, s32 arg6, s32 arg7, s32 arg8, bool arg9);
Gfx *tex0f175490(Gfx *gdl, struct tex *tex, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, bool arg8);
Gfx *tex0f1755dc(Gfx *gdl, struct tex *tex, s32 arg2, s32 arg3, s32 arg4);
Gfx *tex0f17563c(Gfx *gdl, struct tex *tex, s32 arg2, s32 arg3, s32 arg4);
s32 texLoadFromGdl(Gfx *arg0, s32 gdlsizeinbytes, Gfx *arg2, struct texpool *pool, u8 *arg4);
void texGetDepthAndSize(struct tex *tex, s32 *arg1, s32 *arg2);
s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpool *pool, u8 *vtxstart);
void texCopyGdls(Gfx *src, Gfx *dst, s32 numbytes);
#endif
src/include/game/texdecompress.h
+5 -5
View File
@@ -5,7 +5,7 @@
#include "types.h"
void func0f16e810(u32 arg0);
s32 texInflateZlib(u8 *src, u8 *dst, s32 arg2, s32 forcenumimages, struct texpool *pool, s32 arg5);
s32 texInflateZlib(u8 *src, u8 *dst, bool arg2, s32 forcenumimages, struct texpool *pool, s32 unusedarg);
s32 texAlignIndices(u8 *arg0, s32 width, s32 height, s32 format, u8 *dst);
s32 texGetAverageRed(u16 colour1, u16 colour2, u16 colour3, u16 colour4);
s32 texGetAverageGreen(u16 colour1, u16 colour2, u16 colour3, u16 colour4);
@@ -14,7 +14,7 @@ s32 texGetAverageAlpha(u16 colour1, u16 colour2, u16 colour3, u16 colour4);
s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, u16 *palette, s32 numcolours);
s32 texFindClosestColourIndexRGBA(u8 *palette, s32 numcolours, s32 r, s32 g, s32 b, s32 a);
s32 texFindClosestColourIndexIA(u16 *palette, s32 numcolours, s32 intensity, s32 alpha);
s32 texInflateNonZlib(u8 *src, u8 *dst, s32 arg2, s32 forcenumimages, struct texpool *pool, s32 arg5);
s32 texInflateNonZlib(u8 *src, u8 *dst, s32 arg2, s32 forcenumimages, struct texpool *pool, s32 unusedarg);
s32 texShrinkNonPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format);
void texInflateHuffman(u8 *dst, s32 numiterations, s32 chansize);
void texInflateRle(u8 *arg0, s32 arg1);
@@ -25,18 +25,18 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format);
s32 texChannelsToPixels(u8 *src, s32 width, s32 height, u8 *dst, s32 format);
s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format);
s32 texInflateLookupFromBuffer(u8 *src, s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format);
void texSwapAltRowBytes(u8 *arg0, s32 width, s32 height, s32 format);
void texSwizzle(u8 *arg0, s32 width, s32 height, s32 format);
void texBlur(u8 *pixels, s32 width, s32 height, s32 method, s32 chansize);
void texInitPool(struct texpool *pool, u8 *start, s32 len);
struct tex *texFindInPool(s32 texturenum, struct texpool *pool);
s32 texGetPoolFreeBytes(struct texpool *pool);
u8 *texGetPoolLeftPos(struct texpool *pool);
void texLoadFromDisplayList(Gfx *gdl, struct texpool *pool, s32 arg2);
void texLoad(texnum_t *updateword, struct texpool *pool, bool arg2);
void texLoad(texnum_t *updateword, struct texpool *pool, bool unusedarg);
void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, s32 arg3);
void texLoadFromTextureNum(u32 arg0, struct texpool *pool);
#ifndef PLATFORM_N64
void texSwapAltRowBytesInternal(u8 *dst, s32 width, s32 height, s32 format, u32 dstlen);
void texSwizzleInternal(u8 *dst, s32 width, s32 height, s32 format, u32 dstlen);
s32 texConfigToFormat(const struct textureconfig *tex);
#endif
src/include/types.h
+73 -97
View File
@@ -3854,71 +3854,70 @@ struct perfectheadtexturelist {
struct textureconfig selectedtexture;
};
struct menu840 {
/*0x000*/ u8 unk000;
/*0x001*/ u8 unk001;
struct menumodel {
/*0x000*/ u8 loaddelay;
/*0x002*/ s16 headnum;
/*0x004*/ u8 *unk004;
/*0x008*/ u32 unk008;
/*0x00c*/ u32 unk00c;
/*0x010*/ s32 unk010;
/*0x014*/ Mtxf unk014;
/*0x004*/ u8 *allocstart;
/*0x008*/ u32 alloclen;
/*0x00c*/ u32 newparams;
/*0x010*/ u32 curparams;
/*0x014*/ Mtxf mtx;
/*0x054*/ struct modeldef *bodymodeldef;
/*0x058*/ struct modeldef *headmodeldef;
/*0x05c*/ s16 unk05c;
/*0x05e*/ s16 unk05e;
/*0x05c*/ s16 newanimnum;
/*0x05e*/ s16 curanimnum;
/*0x060*/ struct model bodymodel;
/*0x084*/ struct anim bodyanim;
/*0x110*/ u32 unk110[256];
/*0x510*/ f32 unk510;
/*0x514*/ f32 unk514;
/*0x518*/ f32 unk518;
/*0x51c*/ f32 unk51c;
/*0x520*/ f32 unk520;
/*0x524*/ f32 unk524;
/*0x528*/ f32 unk528;
/*0x52c*/ f32 unk52c;
/*0x530*/ f32 unk530;
/*0x534*/ f32 unk534;
/*0x538*/ f32 unk538;
/*0x53c*/ f32 unk53c;
/*0x540*/ f32 unk540;
/*0x544*/ f32 unk544;
/*0x548*/ f32 unk548;
/*0x54c*/ f32 unk54c;
/*0x550*/ f32 unk550;
/*0x554*/ f32 unk554;
/*0x558*/ f32 unk558;
/*0x55c*/ f32 unk55c;
/*0x560*/ s16 unk560;
/*0x564*/ f32 unk564;
/*0x568*/ u8 unk568;
/*0x110*/ u32 rwdata[256];
/*0x510*/ f32 curposx;
/*0x514*/ f32 curposy;
/*0x518*/ f32 curposz;
/*0x51c*/ f32 curscale;
/*0x520*/ f32 currotx;
/*0x524*/ f32 curroty;
/*0x528*/ f32 currotz;
/*0x52c*/ f32 displacex;
/*0x530*/ f32 displacey;
/*0x534*/ f32 displacez;
/*0x538*/ f32 newposx;
/*0x53c*/ f32 newposy;
/*0x540*/ f32 newposz;
/*0x544*/ f32 newscale;
/*0x548*/ f32 newrotx;
/*0x54c*/ f32 newroty;
/*0x550*/ f32 newrotz;
/*0x554*/ f32 zoom; // character selection: far = 100, near = 370
/*0x558*/ f32 unk558; // unused
/*0x55c*/ f32 unk55c; // unused
/*0x560*/ s16 unk560; // unused
/*0x564*/ f32 configurefrac;
/*0x568*/ u8 flags;
/*0x56a*/ s16 bodynum;
/*0x56c*/ u32 unk56c;
/*0x570*/ u32 unk570;
/*0x574*/ s32 unk574;
/*0x578*/ s32 unk578;
/*0x57c*/ u32 unk57c;
/*0x580*/ u32 unk580;
/*0x584*/ u32 unk584;
/*0x588*/ u32 unk588;
/*0x58c*/ u32 unk58c;
/*0x590*/ u32 unk590;
/*0x594*/ u32 unk594;
/*0x598*/ u32 unk598;
/*0x59c*/ u32 unk59c;
/*0x5a0*/ u32 unk5a0;
/*0x5a4*/ u32 unk5a4;
/*0x5a8*/ u32 unk5a8;
/*0x5ac*/ u32 unk5ac;
/*0x5b0*/ u8 unk5b0;
/*0x5b1*/ u8 unk5b1_01 : 1;
/*0x5b1*/ u8 unk5b1_02 : 1;
/*0x5b1*/ u8 unk5b1_03 : 1;
/*0x5b1*/ u8 unk5b1_04 : 1;
/*0x5b1*/ u8 unk5b1_05 : 1;
/*0x5b1*/ u8 unk5b1_06 : 1;
/*0x5b1*/ u8 unk5b1_07 : 1;
/*0x56c*/ s32 unk56c; // unused
/*0x570*/ s32 unk570; // unused
/*0x574*/ s32 zoomtimer60;
/*0x578*/ s32 rottimer60;
/*0x57c*/ s32 unk57c; // unused
/*0x580*/ bool removingpiece;
/*0x584*/ s32 unk584; // unused
/*0x588*/ s32 unk588; // unused
/*0x58c*/ s32 unk58c; // unused
/*0x590*/ s32 unk590; // unused
/*0x594*/ s32 unk594; // unused
/*0x598*/ s32 unk598; // unused
/*0x59c*/ s32 unk59c; // unused
/*0x5a0*/ s32 unk5a0; // unused
/*0x5a4*/ s32 unk5a4; // unused
/*0x5a8*/ s32 unk5a8; // unused
/*0x5ac*/ s32 unk5ac; // unused
/*0x5b0*/ u8 perfectheadnum;
/*0x5b1*/ u8 isperfecthead : 1;
/*0x5b1*/ u8 unk5b1_02 : 1; // unused
/*0x5b1*/ u8 unk5b1_03 : 1; // unused
/*0x5b1*/ u8 reverseanim : 1;
/*0x5b1*/ u8 configuring : 1;
/*0x5b1*/ u8 unk5b1_06 : 1; // unused
/*0x5b1*/ u8 drawbehinddialog : 1;
/*0x5b4*/ struct modelpartvisibility *partvisibility;
};
@@ -3963,7 +3962,7 @@ struct menu {
/*0x83d*/ u8 unk83d;
/*0x83e*/ u8 unk83e;
/*0x83f*/ u8 unk83f;
/*0x840*/ struct menu840 unk840;
/*0x840*/ struct menumodel menumodel;
/*0xdf8*/ s8 bannernum;
/*0xdfc*/ struct menudfc unkdfc[4];
@@ -4777,11 +4776,11 @@ struct menudata {
/*0x016*/ u8 screenshottimer;
/*0x017*/ u8 playerjoinalpha[MAX_PLAYERS];
/*0x01b*/ s8 bannernum;
/*0x01c*/ struct menu840 unk01c;
/*0x01c*/ struct menumodel hudpiece;
/*0x5d4*/ u8 unk5d4;
/*0x5d5*/ u8 unk5d5_01 : 1;
/*0x5d5*/ u8 unk5d5_02 : 1;
/*0x5d5*/ u8 unk5d5_03 : 1;
/*0x5d5*/ u8 usezbuf : 1;
/*0x5d5*/ u8 unk5d5_04 : 1;
/*0x5d5*/ u8 unk5d5_05 : 1;
/*0x5d5*/ u8 unk5d5_06 : 1;
@@ -5273,28 +5272,6 @@ struct var80061420 {
u8 *unk04;
};
struct var800ab5b8 {
u32 unk00;
u32 unk04;
u32 unk08;
u32 unk0c;
u32 unk10;
u32 unk14;
u32 unk18;
u32 unk1c;
u32 unk20;
u32 unk24;
u32 unk28;
};
struct var800ab718 {
bool inuse;
s32 uls;
s32 ult;
s32 lrs;
s32 lrt;
};
struct menurendercontext {
s16 x;
s16 y;
@@ -5714,7 +5691,7 @@ struct warpparams {
};
struct hitthing {
struct coord unk00;
struct coord pos; // world pos
struct coord unk0c;
Vtx *unk18;
Vtx *unk1c;
@@ -5729,24 +5706,24 @@ struct hit {
/*0x00*/ f32 distance;
/*0x04*/ struct prop *prop;
/*0x08*/ s32 hitpart;
/*0x0c*/ struct modelnode *node;
/*0x0c*/ struct modelnode *bboxnode;
/*0x10*/ struct hitthing hitthing;
/*0x40*/ s32 mtxindex;
/*0x44*/ struct modelnode *unk44;
/*0x44*/ struct modelnode *dlnode;
/*0x48*/ struct model *model;
/*0x4c*/ s8 unk4c;
/*0x4d*/ s8 unk4d;
/*0x4c*/ s8 slowsbullet;
/*0x4d*/ s8 bulletproof;
/*0x50*/ struct coord pos;
/*0x5c*/ struct coord dir;
};
struct shotdata {
/*0x00*/ struct coord unk00;
/*0x0c*/ struct coord unk0c;
/*0x00*/ struct coord gunpos2d;
/*0x0c*/ struct coord gundir2d;
/*0x18*/ struct gset gset;
/*0x1c*/ struct coord gunpos;
/*0x28*/ struct coord dir;
/*0x34*/ f32 unk34;
/*0x1c*/ struct coord gunpos3d;
/*0x28*/ struct coord gundir3d;
/*0x34*/ f32 distance;
/*0x38*/ s32 penetration;
/*0x3c*/ struct hit hits[10];
};
@@ -6004,16 +5981,15 @@ struct awardmetrics {
struct tex {
/*0x00*/ u16 texturenum : 12;
/*0x00*/ u16 unk00_0c : 4;
/*0x04*/ u8 *data;
/*0x08*/ u8 width;
/*0x09*/ u8 height;
/*0x0a*/ u8 unk0a;
/*0x0b*/ u8 maxlod : 3;
/*0x0b*/ u8 numlods : 3;
/*0x0b*/ u8 gbiformat : 3;
/*0x0b*/ u8 depth : 2;
/*0x0c*/ u32 lutmodeindex : 2;
/*0x0c*/ u32 unk0c_02 : 1;
/*0x0c*/ u32 hasloddata : 1;
/*0x0c*/ u32 unk0c_03 : 1;
#ifdef PLATFORM_N64
/*0x0c*/ u32 next : 24;