Decompile renderFrame

src/game/data/data_003dc0.c

@@ -2439,7 +2439,7 @@ f32 var80061630 = 0;
 u32 var80061634 = 0x00000000;
 u32 var80061638 = 0x00000000;
 u32 var8006163c = 0x00000000;
-u32 var80061640 = 0x00000000;
+s32 var80061640 = 0x00000000;
 u32 var80061644 = 0x42c80000;
 u32 var80061648 = 0x00000000;
 u32 var8006164c = 0x00000000;

src/game/data/data_0160b0.c

@@ -115,7 +115,7 @@ bool g_PlayersWithControl[] = {
 };
 
 bool g_PlayerInvincible = false;
-u32 var80070764 = 0x00000000;
+s32 var80070764 = 0x00000000;
 
 s16 g_DeathAnimations[] = {
 	ANIM_DEATH_001A,

src/game/debug.c

@@ -17,7 +17,7 @@ u32 var80075d68 = 0x00000002;
 u32 var80075d6c = 0x00000002;
 u32 var80075d70 = 0x00000000;
 bool g_DebugTurboMode = false;
-u32 var80075d78 = 0x00000000;
+s32 var80075d78 = 0;
 u32 var80075d7c = 0x00000000;
 u32 var80075d80 = 0x00000000;
 u32 var80075d84 = 0x00000000;
@@ -319,9 +319,9 @@ bool debug0f11eed0(void)
 	return false;
 }
 
-bool debug0f11eed8(void)
+s32 debugGetMotionBlur(void)
 {
-	return false;
+	return 0;
 }
 
 bool debug0f11eee0(void)

src/game/game_006bd0.c

@@ -4327,10 +4327,10 @@ glabel hudRenderGasIfEnabled
 /*  f00ab00:	e7a60108 */ 	swc1	$f6,0x108($sp)
 /*  f00ab04:	8dada26c */ 	lw	$t5,%lo(g_Vars+0x2ac)($t5)
 /*  f00ab08:	24010006 */ 	addiu	$at,$zero,0x6
-/*  f00ab0c:	3c02800a */ 	lui	$v0,%hi(var8009de10)
+/*  f00ab0c:	3c02800a */ 	lui	$v0,%hi(g_CameraAnimCurFrame)
 /*  f00ab10:	15a10012 */ 	bne	$t5,$at,.L0f00ab5c
 /*  f00ab14:	00000000 */ 	nop
-/*  f00ab18:	8c42de10 */ 	lw	$v0,%lo(var8009de10)($v0)
+/*  f00ab18:	8c42de10 */ 	lw	$v0,%lo(g_CameraAnimCurFrame)($v0)
 /*  f00ab1c:	28410884 */ 	slti	$at,$v0,0x884
 /*  f00ab20:	50200004 */ 	beqzl	$at,.L0f00ab34
 /*  f00ab24:	28410a28 */ 	slti	$at,$v0,0xa28

src/game/game_0601b0.c

@@ -3250,24 +3250,24 @@ glabel func0f062dd0
 );
 
 GLOBAL_ASM(
-glabel func0f062e74
+glabel currentPlayerInterect
 .late_rodata
 glabel var7f1a9ef8
-.word func0f062e74+0x44 # f062eb8
+.word currentPlayerInterect+0x44 # f062eb8
 glabel var7f1a9efc
-.word func0f062e74+0x54 # f062ec8
+.word currentPlayerInterect+0x54 # f062ec8
 glabel var7f1a9f00
-.word func0f062e74+0x60 # f062ed4
+.word currentPlayerInterect+0x60 # f062ed4
 glabel var7f1a9f04
-.word func0f062e74+0x44 # f062eb8
+.word currentPlayerInterect+0x44 # f062eb8
 glabel var7f1a9f08
-.word func0f062e74+0x60 # f062ed4
+.word currentPlayerInterect+0x60 # f062ed4
 glabel var7f1a9f0c
-.word func0f062e74+0x60 # f062ed4
+.word currentPlayerInterect+0x60 # f062ed4
 glabel var7f1a9f10
-.word func0f062e74+0x60 # f062ed4
+.word currentPlayerInterect+0x60 # f062ed4
 glabel var7f1a9f14
-.word func0f062e74+0x60 # f062ed4
+.word currentPlayerInterect+0x60 # f062ed4
 .text
 /*  f062e74:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*  f062e78:	afbf0014 */ 	sw	$ra,0x14($sp)

src/game/game_097ba0.c

@@ -12631,7 +12631,7 @@ const char var7f1ac188[] = "%d\n";
 const char var7f1ac18c[] = "%02d:%02d:%02d\n";
 const char var7f1ac19c[] = "%02d:%02d\n";
 
-void func0f0a2218(s32 handnum)
+void currentPlayerReloadHandIfPossible(s32 handnum)
 {
 	struct player *player = g_Vars.currentplayer;
 

src/game/game_0b63b0.c

@@ -4082,12 +4082,12 @@ void func0f0ba010(void)
 	setMoveModeForAllPlayers(MOVEMODE_CUTSCENE);
 	allPlayersClearMemCamRoom();
 	var8009de14 = var8009de20;
-	var8009de10 = var8009de20 >> 2;
-	var8009de1c = 0;
+	g_CameraAnimCurFrame = var8009de20 >> 2;
+	g_CutsceneBlurFrac = 0;
 	var8009de2c = -1;
 	var80070764 = 1;
 	func0f11dcb0(1);
-	g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_CUTSCENE && var8009de10 < animGetNumFrames(g_CameraAnimNum) - 1;
+	g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_CUTSCENE && g_CameraAnimCurFrame < animGetNumFrames(g_CameraAnimNum) - 1;
 	g_Vars.unk0004e2 = 0;
 }
 
@@ -4182,8 +4182,8 @@ glabel var7f1ad5dc
 /*  f0ba314:	2444ffff */ 	addiu	$a0,$v0,-1
 /*  f0ba318:	00808825 */ 	or	$s1,$a0,$zero
 /*  f0ba31c:	17000040 */ 	bnez	$t8,.L0f0ba420
-/*  f0ba320:	3c10800a */ 	lui	$s0,%hi(var8009de10)
-/*  f0ba324:	2610de10 */ 	addiu	$s0,$s0,%lo(var8009de10)
+/*  f0ba320:	3c10800a */ 	lui	$s0,%hi(g_CameraAnimCurFrame)
+/*  f0ba324:	2610de10 */ 	addiu	$s0,$s0,%lo(g_CameraAnimCurFrame)
 /*  f0ba328:	8e190000 */ 	lw	$t9,0x0($s0)
 /*  f0ba32c:	3c03800a */ 	lui	$v1,%hi(var8009de14)
 /*  f0ba330:	a26004e2 */ 	sb	$zero,0x4e2($s3)
@@ -4253,8 +4253,8 @@ glabel var7f1ad5dc
 .L0f0ba420:
 /*  f0ba420:	8e6202ac */ 	lw	$v0,0x2ac($s3)
 .L0f0ba424:
-/*  f0ba424:	3c10800a */ 	lui	$s0,%hi(var8009de10)
-/*  f0ba428:	2610de10 */ 	addiu	$s0,$s0,%lo(var8009de10)
+/*  f0ba424:	3c10800a */ 	lui	$s0,%hi(g_CameraAnimCurFrame)
+/*  f0ba428:	2610de10 */ 	addiu	$s0,$s0,%lo(g_CameraAnimCurFrame)
 /*  f0ba42c:	38480006 */ 	xori	$t0,$v0,0x6
 /*  f0ba430:	2d020001 */ 	sltiu	$v0,$t0,0x1
 /*  f0ba434:	8e050000 */ 	lw	$a1,0x0($s0)
@@ -4323,8 +4323,8 @@ glabel var7f1ad5dc
 /*  f0ba52c:	93a6015f */ 	lbu	$a2,0x15f($sp)
 /*  f0ba530:	44805000 */ 	mtc1	$zero,$f10
 /*  f0ba534:	3c04800a */ 	lui	$a0,%hi(var8009de30)
-/*  f0ba538:	3c12800a */ 	lui	$s2,%hi(var8009de1c)
-/*  f0ba53c:	2652de1c */ 	addiu	$s2,$s2,%lo(var8009de1c)
+/*  f0ba538:	3c12800a */ 	lui	$s2,%hi(g_CutsceneBlurFrac)
+/*  f0ba53c:	2652de1c */ 	addiu	$s2,$s2,%lo(g_CutsceneBlurFrac)
 /*  f0ba540:	2484de30 */ 	addiu	$a0,$a0,%lo(var8009de30)
 /*  f0ba544:	e6400000 */ 	swc1	$f0,0x0($s2)
 /*  f0ba548:	3c02800a */ 	lui	$v0,%hi(var8009de2c)
@@ -4521,9 +4521,9 @@ glabel var7f1ad5dc
 /*  f0ba834:	27bd01a8 */ 	addiu	$sp,$sp,0x1a8
 );
 
-f32 getVar8009de1c(void)
+f32 cutsceneGetBlurFrac(void)
 {
-	return var8009de1c;
+	return g_CutsceneBlurFrac;
 }
 
 void currentPlayerSetZoomFovY(f32 fovy, f32 timemax)

src/game/game_127910.c

@@ -1139,7 +1139,7 @@ glabel currentPlayerCalculateAiBuddyNums
 /*  f128928:	00000000 */ 	nop
 );
 
-void setCurrentPlayerNum(u32 playernum)
+void setCurrentPlayerNum(s32 playernum)
 {
 	g_Vars.currentplayernum = playernum;
 	g_Vars.currentplayer = g_Vars.players[playernum];

src/game/game_141820.c

@@ -899,7 +899,7 @@ glabel func0f142274
 );
 
 GLOBAL_ASM(
-glabel func0f142438
+glabel hudRenderMotionBlur
 /*  f142438:	27bdff88 */ 	addiu	$sp,$sp,-120
 /*  f14243c:	afbf005c */ 	sw	$ra,0x5c($sp)
 /*  f142440:	afb20048 */ 	sw	$s2,0x48($sp)
@@ -1041,7 +1041,7 @@ glabel func0f142438
 );
 
 GLOBAL_ASM(
-glabel func0f142644
+glabel hudRenderStatic
 /*  f142644:	27bdffa0 */ 	addiu	$sp,$sp,-96
 /*  f142648:	afbf004c */ 	sw	$ra,0x4c($sp)
 /*  f14264c:	afb20038 */ 	sw	$s2,0x38($sp)
@@ -1124,7 +1124,7 @@ glabel func0f142644
 );
 
 GLOBAL_ASM(
-glabel func0f142774
+glabel hudRenderSlayerRocketLens
 /*  f142774:	27bdff80 */ 	addiu	$sp,$sp,-128
 /*  f142778:	afbf0064 */ 	sw	$ra,0x64($sp)
 /*  f14277c:	afb40050 */ 	sw	$s4,0x50($sp)
@@ -6312,7 +6312,7 @@ glabel func0f1472fc
 /*  f147438:	8f39e4f8 */ 	lw	$t9,%lo(g_Menus+0x4f8)($t9)
 /*  f14743c:	57200005 */ 	bnezl	$t9,.L0f147454
 /*  f147440:	02201025 */ 	or	$v0,$s1,$zero
-/*  f147444:	0fc5090e */ 	jal	func0f142438
+/*  f147444:	0fc5090e */ 	jal	hudRenderMotionBlur
 /*  f147448:	24060060 */ 	addiu	$a2,$zero,0x60
 /*  f14744c:	00408825 */ 	or	$s1,$v0,$zero
 /*  f147450:	02201025 */ 	or	$v0,$s1,$zero
@@ -6760,7 +6760,7 @@ glabel func0f147578
 /*  f147aa8:	8d6be4f8 */ 	lw	$t3,%lo(g_Menus+0x4f8)($t3)
 /*  f147aac:	55600005 */ 	bnezl	$t3,.L0f147ac4
 /*  f147ab0:	02801025 */ 	or	$v0,$s4,$zero
-/*  f147ab4:	0fc5090e */ 	jal	func0f142438
+/*  f147ab4:	0fc5090e */ 	jal	hudRenderMotionBlur
 /*  f147ab8:	24060040 */ 	addiu	$a2,$zero,0x40
 /*  f147abc:	0040a025 */ 	or	$s4,$v0,$zero
 /*  f147ac0:	02801025 */ 	or	$v0,$s4,$zero

src/gvars/gvars.c

@@ -14805,10 +14805,10 @@ f32 var8009de00 = 0;
 u32 var8009de04 = 0;
 u32 var8009de08 = 0;
 u32 var8009de0c = 0;
-s32 var8009de10 = 0;
+s32 g_CameraAnimCurFrame = 0;
 u32 var8009de14 = 0;
 s16 g_CameraAnimNum = 0;
-f32 var8009de1c = 0;
+f32 g_CutsceneBlurFrac = 0;
 s32 var8009de20 = 0;
 s32 var8009de24 = 0;
 f32 var8009de28 = 0;

src/include/constants.h

@@ -25,6 +25,7 @@
 #define SECSTOTIME60(secs)  (secs * 60)
 #define TEXT(bankid, index) ((bankid << 9) | index)
 #define VOLUME(volume)      (volume > 0x5000 ? 0x5000 : volume)
+#define EYESPYINACTIVE()    (!g_Vars.currentplayer->eyespy || (g_Vars.currentplayer->eyespy && !g_Vars.currentplayer->eyespy->active))
 
 // Macro to convert an ASCII character to N64 font code.
 // N64 font code uses 0x0f for space, 0x10-0x19 for 0-9 and 0x1a-0x33 for A-Z.
@@ -599,6 +600,7 @@
 #define EXPLOSIONTYPE_8  8
 #define EXPLOSIONTYPE_12 12
 #define EXPLOSIONTYPE_14 14
+#define EXPLOSIONTYPE_23 23
 #define EXPLOSIONTYPE_25 25
 
 #define EYESPYMODE_CAMSPY  0
@@ -754,6 +756,9 @@
 #define GUNSIGHTREASON_AIMING    2
 #define GUNSIGHTREASON_NOCONTROL 4
 
+#define HAND_RIGHT 0
+#define HAND_LEFT  1
+
 #define HANGARBIO_INSTITUTE      0
 #define HANGARBIO_DDTOWER        1
 #define HANGARBIO_LABBASEMENT    2

src/include/game/chr/chr.h

@@ -42,7 +42,7 @@ u32 func0f0270f4(void);
 f32 func0f0278a4(struct chrdata *chr);
 u32 func0f027994(void);
 u32 func0f027e1c(void);
-u32 func0f028498(void);
+void func0f028498(bool arg0);
 void func0f028590(f32 arg0);
 u32 func0f028a50(void);
 u32 func0f028d50(void);

src/include/game/chr/chraction.h

@@ -38,7 +38,7 @@ void func0f030ff8(struct chrdata *chr, u32 anim_id, f32 fstartframe, f32 fendfra
 void func0f031254(struct chrdata *chr);
 void func0f031384(struct chrdata *chr, struct var80065750 **arg1, bool arg2, s32 *firing, u32 entitytype, u32 entityid, u32 arg6);
 void chrAttackAmount(struct chrdata *chr, u32 entitytype, u32 entityid, u32 arg3);
-u32 func0f0319a8(void);
+void func0f0319a8(struct chrdata *chr, struct coord *arg1, f32 arg2, u32 arg3, s8 *arg4, u32 arg5, u32 arg6);
 u32 func0f032ac4(void);
 void func0f032fe4(struct chrdata *chr, struct coord *pos, f32 arg2, f32 arg3, u32 *arg4, u32 arg5);
 void func0f03323c(struct chrdata *chr, struct coord *pos, f32 arg2);

src/include/game/data/data_000000.h

@@ -151,6 +151,7 @@ extern u32 var8005f010;
 extern u32 var8005f014;
 extern u32 var8005f018;
 extern u32 var8005f01c;
+extern u32 var8005f020;
 extern u16 *var8005f040;
 extern u16 *var8005f044;
 extern u32 var8005f048;
@@ -208,7 +209,7 @@ extern s32 g_FootstepSounds[];
 extern u16 var800615a0[][2];
 extern f32 var80061630;
 extern u32 var80061634;
-extern u32 var80061640;
+extern s32 var80061640;
 extern u32 var80061644;
 extern u32 var80061648;
 extern u32 var8006164c;

src/include/game/data/data_0160b0.h

@@ -66,7 +66,7 @@ extern u32 var80070748;
 extern u32 var8007074c;
 extern bool g_PlayersWithControl[];
 extern bool g_PlayerInvincible;
-extern u32 var80070764;
+extern s32 var80070764;
 extern s16 g_DeathAnimations[];
 extern u32 g_NumDeathAnimations;
 extern u32 var80070780;

src/include/game/data/data_01a3a0.h

@@ -61,5 +61,6 @@ extern u32 g_PakDebugDumpEeprom;
 extern s32 var80075d60;
 extern u32 var80075d64;
 extern u32 var80075d68;
+extern s32 var80075d78;
 
 #endif

src/include/game/data/data_020df0.h

@@ -302,11 +302,13 @@ extern s32 g_NumReasonsToEndMpMatch;
 extern f32 g_StageTimeElapsed60f;
 extern bool var80084040;
 extern u32 g_BoostAndSlayerSounds[3];
-extern u32 var80084050;
+extern s32 var80084050;
 extern u32 var80084068;
 extern u32 var80084078;
 extern u32 var80084088;
-extern u32 var80084098;
+extern struct audiohandle *g_CutsceneStaticAudioHandle;
+extern s32 g_CutsceneStaticTimer;
+extern u8 g_CutsceneStaticActive;
 extern u32 g_CutsceneTime240_60;
 
 #endif

src/include/game/debug.h

@@ -19,7 +19,7 @@ bool debug0f11ee88(void);
 bool debug0f11ee90(void);
 bool debug0f11eea8(void);
 bool debug0f11eeb0(void);
-bool debug0f11eed8(void);
+s32 debugGetMotionBlur(void);
 bool debug0f11eef8(void);
 bool debugAllowEndLevel(void);
 bool debug0f11ef78(void);

src/include/game/game_006bd0.h

@@ -14,7 +14,7 @@ void func0f0099a4(void);
 u32 func0f0099e4(void);
 u32 func0f009d10(void);
 void func0f009eac(void);
-u32 func0f00a168(void);
+Gfx *func0f00a168(Gfx *gdl);
 u32 func0f00a1f8(void);
 u32 func0f00a444(void);
 Gfx *func0f00a490(Gfx *gdl);

src/include/game/game_0601b0.h

@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0f0601b0(void);
+void func0f0601b0(void);
 void propShow(struct prop *prop);
 void propHide(struct prop *prop);
 struct prop *propAllocate(void);
@@ -18,25 +18,25 @@ u32 func0f0607c8(void);
 u32 func0f060984(void);
 u32 func0f060bac(void);
 u32 func0f060db8(void);
-u32 func0f061d54(void);
+struct prop *func0f061d54(u32 arg0, u32 arg1, u32 arg2);
 u32 func0f061ed4(void);
 u32 func0f061fa8(void);
 u32 func0f062270(void);
 u32 func0f062794(void);
-u32 func0f062b2c(void);
+void func0f062b2c(void);
 void func0f062b64(struct prop *prop, s32 arg1);
 u32 func0f062cbc(void);
 u32 func0f062dd0(void);
-u32 func0f062e74(void);
+bool currentPlayerInterect(bool eyespy);
 u32 func0f062ef8(void);
 u32 func0f062fac(void);
-u32 func0f06302c(void);
+void func0f06302c(ubool arg0);
 void func0f063dcc(void);
 void func0f064178(struct prop *prop, s32 enable);
-u32 func0f0641f4(void);
+void func0f0641f4(void);
 u32 func0f06438c(void);
 u32 func0f064a24(void);
-u32 func0f064ce8(void);
+void func0f064ce8(void);
 u32 func0f0654e8(void);
 u32 func0f06554c(void);
 void roomsCopy(s16 *srcrooms, s16 *dstrooms);

src/include/game/game_097ba0.h

@@ -66,7 +66,7 @@ u32 func0f09e004(void);
 u32 func0f09e144(void);
 u32 func0f09e4e0(void);
 u32 func0f09ea90(void);
-u32 func0f09eae4(void);
+bool func0f09eae4(void);
 u32 func0f09ebbc(void);
 void func0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, f32 *matrix1, f32 *arg4, f32 *matrix2, struct prop *prop, struct coord *pos);
 u32 func0f09ed2c(void);
@@ -103,7 +103,7 @@ s32 func0f0a212c(s32 handnum);
 char *weaponGetName(s32 weaponnum);
 u16 weaponGetNameId(s32 weaponnum);
 char *weaponGetShortName(s32 arg0);
-void func0f0a2218(s32 handnum);
+void currentPlayerReloadHandIfPossible(s32 handnum);
 void func0f0a2290(f32 angle);
 void func0f0a2308(s32 handnum);
 u32 func0f0a233c(void);

src/include/game/game_0b0420.h

@@ -44,7 +44,7 @@ u32 func0f0b1ce8(void);
 f32 func0f0b1d28(u8 *weaponnum);
 u32 func0f0b1e28(void);
 u32 func0f0b1e68(void);
-u32 func0f0b1ea8(void);
+bool func0f0b1ea8(struct hand *hand, u32 arg1);
 s8 weaponGetMaxFireRatePerTick(u32 weaponnum, u32 funcindex);
 u32 currentPlayerGetSight(void);
 u32 func0f0b201c(void);

src/include/game/game_0b63b0.h

@@ -12,7 +12,7 @@ void func0f0b65f8(void);
 void func0f0b6764(void);
 f32 func0f0b69d0(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, s16 *spawnpads, s16 numspawnpads);
 f32 func0f0b72a8(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
-u32 func0f0b72dc(void);
+void func0f0b72dc(void);
 void func0f0b77cc(void);
 u32 func0f0b7c60(void);
 void func0f0b802c(void);
@@ -26,7 +26,7 @@ void func0f0b9cbc(void);
 void cameraDoAnimation(s16 anim_id);
 void func0f0ba190(u32 arg0);
 void func0f0ba29c(bool arg0);
-f32 getVar8009de1c(void);
+f32 cutsceneGetBlurFrac(void);
 void currentPlayerSetZoomFovY(f32 fovy, f32 timemax);
 f32 currentPlayerGetZoomFovY(void);
 void func0f0ba8b0(f32 value);
@@ -61,7 +61,7 @@ void currentPlayerTickTeleport(f32 *arg0);
 u32 func0f0bd764(void);
 void func0f0bd904(bool arg0);
 u32 func0f0bfc7c(void);
-u32 func0f0bffcc(void);
+Gfx *func0f0bffcc(Gfx *gdl);
 u32 func0f0c00cc(void);
 Gfx *func0f0c0190(Gfx *gdl);
 Gfx *func0f0c07c8(Gfx *gdl);

src/include/game/game_0d4690.h

@@ -23,6 +23,6 @@ void func0f0d5690(void *arg0, char *buffer);
 u32 func0f0d575c(void);
 u32 func0f0d579c(void);
 void formatTime(char *dst, s32 time, u32 arg2);
-u32 func0f0d5a7c(void);
+void func0f0d5a7c(void);
 
 #endif

src/include/game/game_0f09f0.h

@@ -71,7 +71,7 @@ void func0f0fa6ac(void);
 void func0f0fa704(void);
 u32 func0f0fb488(void);
 Gfx *func0f0fbba0(Gfx *gdl, u8 param_2, s32 arg2);
-u32 func0f0fbc30(void);
+Gfx *func0f0fbc30(Gfx *gdl);
 u32 menuChooseMusic(void);
 u32 menuGetRoot(void);
 u32 func0f0fce8c(void);

src/include/game/game_0fd660.h

@@ -20,7 +20,7 @@ u32 func0f0ff274(void);
 u32 func0f0ff6f4(void);
 u32 func0f0ff7bc(void);
 u32 func0f100128(void);
-u32 func0f100ad0(void);
+Gfx *func0f100ad0(Gfx *gdl);
 s32 menudialog000fcd48(u32 operation, struct menudialog *dialog, union handlerdata *data);
 s32 menudialogMpPickTarget(u32 operation, struct menudialog *dialog, union handlerdata *data);
 s32 menuhandler000fcc34(u32 operation, struct menuitem *item, union handlerdata *data);

src/include/game/game_11f000.h

@@ -11,7 +11,7 @@ u32 func0f11f3d0(void);
 u32 func0f11f410(void);
 u32 func0f11f438(void);
 u32 func0f11f6ec(void);
-u32 func0f11f984(void);
+Gfx *func0f11f984(Gfx *gdl);
 u32 func0f1228d0(void);
 u32 func0f122ce8(void);
 u32 func0f122d4c(void);
@@ -25,6 +25,6 @@ u32 func0f126de8(void);
 Gfx *func0f12715c(Gfx *gdl);
 u32 func0f127334(void);
 u32 func0f127490(void);
-u32 func0f1274d8(void);
+Gfx *func0f1274d8(Gfx *gdl);
 
 #endif

src/include/game/game_127910.h

@@ -18,7 +18,7 @@ void currentPlayerSetWeaponFlag4(s32 weaponslot);
 void func0f128d20(s32 slot);
 void randomisePlayerOrder(void);
 s32 getPlayerByOrderNum(s32 arg0);
-void setCurrentPlayerNum(u32 playernum);
+void setCurrentPlayerNum(s32 playernum);
 u32 calculatePlayerIndex(u32 playernum);
 
 #endif

src/include/game/game_12f6c0.h

@@ -6,6 +6,6 @@
 u32 func0f12f6c0(void);
 void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group);
 void func0f12f9f0(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, s32 arg4, s32 arg5);
-u32 func0f130044(void);
+Gfx *func0f130044(Gfx *gdl);
 
 #endif

src/include/game/game_1371b0.h

@@ -24,7 +24,7 @@ u32 func0f13a164(void);
 u32 func0f13a3ec(void);
 u32 func0f13ae04(void);
 u32 func0f13ae0c(void);
-u32 func0f13b064(void);
+Gfx *func0f13b064(Gfx *gdl);
 void func0f13b4c4(void);
 void func0f13b660(void);
 

src/include/game/game_13c510.h

@@ -3,8 +3,8 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0f13c510(void);
-u32 func0f13c54c(void);
+void func0f13c510(void);
+void func0f13c54c(void);
 u32 func0f13c574(void);
 u32 func0f13c710(void);
 u32 func0f13c780(void);

src/include/game/game_141820.h

@@ -8,11 +8,11 @@ u32 func0f141ab0(void);
 u32 func0f141ed4(void);
 u32 func0f1420b0(void);
 u32 func0f142274(void);
-u32 func0f142438(void);
-u32 func0f142644(void);
-u32 func0f142774(void);
-u32 func0f14298c(void);
-u32 func0f142bf0(void);
+Gfx *hudRenderMotionBlur(Gfx *gdl, u32 arg1, s32 arg2);
+Gfx *hudRenderStatic(Gfx *gdl, u32 arg1, s32 arg2);
+Gfx *hudRenderSlayerRocketLens(Gfx *gdl, u32 arg1, u32 arg2);
+Gfx *func0f14298c(Gfx *gdl, u32 arg1, u32 arg2);
+Gfx *func0f142bf0(Gfx *gdl, u32 arg1, s32 arg2, f32 arg3, f32 arg4);
 u32 func0f142d74(void);
 Gfx *hudRenderEyespyView(Gfx *gdl, s32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
 u32 func0f143678(void);
@@ -22,8 +22,8 @@ Gfx *func0f147578(Gfx *gdl);
 Gfx *func0f147cf8(Gfx *gdl);
 Gfx *hudRenderHorizonScanner(Gfx *gdl);
 Gfx *func0f14886c(Gfx *gdl);
-u32 func0f148b40(void);
-u32 func0f148b6c(void);
+void func0f148b40(u32 arg0);
+void func0f148b6c(void);
 Gfx *func0f147570(Gfx *gdl);
 
 #endif

src/include/game/game_150820.h

@@ -7,6 +7,6 @@ u16 func0f150820(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 arg4, f
 u32 func0f150d38(void);
 u32 func0f151780(void);
 u32 func0f151ed0(void);
-u32 func0f1526e4(void);
+Gfx *func0f1526e4(Gfx *gdl);
 
 #endif

src/include/game/game_157db0.h

@@ -31,8 +31,8 @@ f32 func0f15c888(void);
 f32 currentPlayerGetScaleBg2Gfx(void);
 void currentPlayerSetScaleBg2Gfx(f32 arg0);
 void func0f15c920(void);
-u32 func0f15ca00(void);
-u32 func0f15cae0(void);
+void func0f15ca00(void);
+Gfx *func0f15cae0(Gfx *gdl);
 Gfx *func0f15cb74(Gfx *gdl);
 u32 func0f15cbb4(void);
 Gfx *func0f15cc18(Gfx *gdl, s32 viewleft, s32 viewtop, s32 arg3, s32 arg4);

src/include/game/game_165670.h

@@ -7,7 +7,7 @@ u32 func0f165670(void);
 u32 func0f165728(void);
 u32 func0f1657cc(void);
 f32 func0f1657e4(void);
-u32 func0f1657f8(void);
+void func0f1657f8(void);
 u32 func0f16598c(void);
 u32 func0f165c4c(void);
 u32 func0f165ee4(void);

src/include/game/game_167ae0.h

@@ -16,7 +16,7 @@ bool threatCheckCmpFollow(struct threat *threat, s32 index);
 void propFindThreats(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5);
 void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances);
 void func0f1691c0(void);
-Gfx *func0f169374(Gfx *gdl);
+Gfx *renderFrame(Gfx *gdl);
 void func0f16b0c8(void);
 s32 sub54321(s32 value);
 void updateCutsceneTime(void);

src/include/game/game_179060.h

@@ -104,7 +104,7 @@ char *mpMenuTextScenarioShortName(struct menuitem *item);
 char *mpMenuTextScenarioName(struct menuitem *item);
 s32 menuhandler00185068(u32 operation, struct menuitem *item, union handlerdata *data);
 void func0f185568(void);
-u32 func0f185774(void);
+Gfx *func0f185774(Gfx *gdl);
 u32 func0f185c14(void);
 u32 func0f185e20(void);
 void func0f18620c(void);

src/include/game/mplayer.h

@@ -37,7 +37,7 @@ void func0f1895e8(void);
 s32 mpGetWeaponSet(void);
 bool mpIsPaused(void);
 void mpSetPaused(u8 mode);
-u32 func0f18973c(void);
+Gfx *func0f18973c(Gfx *gdl);
 u32 func0f189cc0(void);
 u32 func0f189dc8(void);
 u32 func0f189ed0(void);

src/include/game/propobj.h

@@ -190,7 +190,7 @@ void func0f07e2cc(struct prop *prop);
 bool propCanRegen(struct prop *prop);
 u32 func0f07e474(struct prop *prop);
 s32 objTick(struct prop *prop);
-u32 func0f07f6d0(void);
+Gfx *func0f07f6d0(Gfx *gdl);
 u32 func0f07f918(void);
 void imageSlotSetImage(struct monitorscreen *screen, u32 arg1);
 u32 func0f07fbf0(void);
@@ -337,7 +337,7 @@ void alarmTick(void);
 u32 func0f091030(void);
 void func0f0910ac(void);
 u32 func0f091250(void);
-u32 func0f0912dc(void);
+void func0f0912dc(struct prop *prop, u32 arg1, struct coord *source, struct coord *direction, u32 arg4, u32 arg5);
 void objSetModelPartVisible(struct defaultobj *obj, s32 partnum, bool visible);
 
 #endif

src/include/game/weather.h

@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 weatherRender(void);
+Gfx *weatherRender(Gfx *gdl);
 void weatherSetBoundaries(struct weatherparticledata *data, s32 index, f32 min, f32 max);
 struct weatherparticledata *weatherAllocateParticles(void);
 void func0f131610(struct weatherdata *weather);

src/include/gvars/gvars.h

@@ -45,7 +45,7 @@ struct g_vars {
 	/*000284*/ struct player *currentplayer;
 	/*000288*/ struct playerstats *currentplayerstats;
 	/*00028c*/ s32 currentplayernum; // 0-3 - controller numbers I think
-	/*000290*/ u32 currentplayerindex; // 0-3 - but 2 or 3 probably only used in combat simulator
+	/*000290*/ s32 currentplayerindex; // 0-3 - but 2 or 3 probably only used in combat simulator
 	/*000294*/ s32 bondplayernum;
 	/*000298*/ s32 coopplayernum;
 	/*00029c*/ s32 antiplayernum;
@@ -81,7 +81,7 @@ struct g_vars {
 	/*000314*/ bool mplayerisrunning;
 	/*000318*/ bool normmplayerisrunning;
 	/*00031c*/ s32 lvmpbotlevel;
-	/*000320*/ u32 unk000320;
+	/*000320*/ s32 unk000320;
 	/*000324*/ s32 unk000324;
 	/*000328*/ s32 unk000328;
 	/*00032c*/ u32 unk00032c;
@@ -149,7 +149,7 @@ struct g_vars {
 	/*000454*/ s32 coopfriendlyfire;
 	/*000458*/ u32 unk000458;
 	/*00045c*/ s32 speedpilltime;
-	/*000460*/ u32 speedpillchange;
+	/*000460*/ s32 speedpillchange;
 	/*000464*/ u32 speedpillwant;
 	/*000468*/ bool speedpillon;
 	/*00046c*/ s32 restartlevel;
@@ -182,12 +182,12 @@ struct g_vars {
 	/*0004cc*/ s32 in_cutscene;
 	/*0004d0*/ u8 paksconnected;
 	/*0004d1*/ u8 unk0004d1;
-	/*0004d2*/ s8 unk0004d2;
+	/*0004d2*/ s8 unk0004d2; // cutscene scene number (0, 1 or 2)
 	/*0004d3*/ s8 unk0004d3;
-	/*0004d4*/ s8 unk0004d4;
-	/*0004d5*/ u8 unk0004d5;
+	/*0004d4*/ s8 unk0004d4; // index into g_Cutscenes
+	/*0004d5*/ s8 unk0004d5;
 	/*0004d6*/ s8 unk0004d6;
-	/*0004d7*/ u8 unk0004d7;
+	/*0004d7*/ s8 unk0004d7;
 	/*0004d8*/ s32 unk0004d8;
 	/*0004dc*/ u8 playertojoymap[4];
 	/*0004e0*/ u8 unk0004e0;
@@ -622,10 +622,10 @@ extern f32 var8009de00;
 extern u32 var8009de04;
 extern u32 var8009de08;
 extern u32 var8009de0c;
-extern s32 var8009de10;
+extern s32 g_CameraAnimCurFrame;
 extern u32 var8009de14;
 extern s16 g_CameraAnimNum;
-extern f32 var8009de1c;
+extern f32 g_CutsceneBlurFrac;
 extern s32 var8009de20;
 extern s32 var8009de24;
 extern f32 var8009de28;

src/include/lib/lib_09660.h

@@ -30,11 +30,11 @@ u32 func0000aca4(void);
 u32 func0000ad5c(void);
 u32 func0000af00(void);
 u32 func0000b0e8(void);
-u32 func0000b1a8(void);
-u32 func0000b1d0(void);
-u32 func0000b280(void);
+Gfx *func0000b1a8(Gfx *gdl);
+Gfx *func0000b1d0(Gfx *gdl);
+Gfx *func0000b280(Gfx *gdl);
 u32 func0000b2c4(void);
-u32 func0000b330(void);
+Gfx *func0000b330(Gfx *gdl);
 void viSetBuf(s16 x, s16 y);
 s16 viGetBufX(void);
 s16 viGetBufY(void);

src/include/types.h

@@ -1619,7 +1619,7 @@ struct eyespy {
 	/*0x36*/ s8 startuptimer60;
 	/*0x37*/ s8 active;
 	/*0x38*/ u8 buttonheld;
-	/*0x39*/ u8 camerabuttonheld;
+	/*0x39*/ s8 camerabuttonheld;
 	/*0x3a*/ s16 bobdir;
 	/*0x3c*/ u8 bobtimer;
 	/*0x3d*/ u8 bobactive;
@@ -1704,7 +1704,7 @@ struct hand {
 	/*0x0650*/ u32 unk0650;
 	/*0x0654*/ u32 unk0654;
 	/*0x0658*/ u32 unk0658;
-	/*0x065c*/ u32 unk065c;
+	/*0x065c*/ u32 unk065c; // hand state? 0 = idle, 9 = reloading
 	/*0x0660*/ u32 unk0660;
 	/*0x0664*/ u32 unk0664;
 	/*0x0668*/ u32 unk0668;
@@ -2322,7 +2322,7 @@ struct player {
 	/*0x024c*/ s16 invdowntime;
 	/*0x024e*/ s16 usedowntime;
 	/*0x0250*/ u8 activemenumode;
-	/*0x0254*/ u32 erasertime; // related to FarSight's auto tracking
+	/*0x0254*/ s32 erasertime; // related to FarSight's auto tracking
 	/*0x0258*/ f32 autoeraserdist;
 	/*0x025c*/ struct prop *autoerasertarget;
 	/*0x0260*/ s32 aimtaptime;
@@ -2394,7 +2394,7 @@ struct player {
 	/*0x0484*/ u8 *unk0484; // pointer to vtx buffer?
 	/*0x0488*/ u8 *unk0488; // pointer to vtx buffer?
 	/*0x048c*/ bool aborted;
-	/*0x0490*/ u32 unk0490;
+	/*0x0490*/ s32 eyespydarts;
 	/*0x0494*/ u32 unk0494;
 	/*0x0498*/ u32 unk0498;
 	/*0x049c*/ u32 unk049c;
@@ -3023,8 +3023,8 @@ struct weapon {
 };
 
 struct cutscene {
-	u16 stage;
-	u16 mission;
+	s16 stage;
+	s16 mission;
 	u32 scene;
 	u16 name;
 };

src/lib/main.c

@@ -1119,7 +1119,7 @@ void mainTick(void)
 				}
 			}
 
-			gdl = func0f169374(gdl);
+			gdl = renderFrame(gdl);
 			func000034e0(&gdl);
 
 			if (debug0f11ed70() >= 2) {