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

src/include/game/camera.h

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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,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