Decompile func0f0c07c8

src/game/game_006bd0.c

@@ -4205,7 +4205,7 @@ glabel func0f00a490
 );
 
 GLOBAL_ASM(
-glabel func0f00a940
+glabel hudRenderGasIfEnabled
 /*  f00a940:	27bdfef0 */ 	addiu	$sp,$sp,-272
 /*  f00a944:	3c013f80 */ 	lui	$at,0x3f80
 /*  f00a948:	44810000 */ 	mtc1	$at,$f0

src/game/game_097ba0.c

@@ -22523,7 +22523,7 @@ glabel func0f0a9fc0
 );
 
 GLOBAL_ASM(
-glabel func0f0aa86c
+glabel hudRenderAmmo
 /*  f0aa86c:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
 /*  f0aa870:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
 /*  f0aa874:	27bdfed0 */ 	addiu	$sp,$sp,-304

src/game/game_0dcdb0.c

@@ -100,7 +100,7 @@ s32 func0f0dcdbc(void)
 		&& var80075d60 == 2
 		&& currentPlayerGetSight() == SIGHT_ZOOM
 		&& g_Vars.currentplayer->cameramode != CAMERAMODE_2
-		&& g_Vars.currentplayer->cameramode != CAMERAMODE_1;
+		&& g_Vars.currentplayer->cameramode != CAMERAMODE_CUTSCENE;
 }
 
 GLOBAL_ASM(

src/game/game_0f09f0.c

@@ -14761,9 +14761,9 @@ glabel func0f0fd570
 /*  f0fd64c:	27bd0008 */ 	addiu	$sp,$sp,0x8
 );
 
-bool currentPlayerIsInTraining(void)
+bool currentPlayerGetUnk1c04(void)
 {
-	return g_Vars.currentplayer->training;
+	return g_Vars.currentplayer->unk1c04;
 }
 
 struct menu_item menuitems_damagedcontrollerpak[] = {

src/game/game_141820.c

@@ -1586,7 +1586,7 @@ glabel func0f142d74
 );
 
 GLOBAL_ASM(
-glabel func0f142e00
+glabel hudRenderEyespyView
 /*  f142e00:	27bdfed0 */ 	addiu	$sp,$sp,-304
 /*  f142e04:	afbf007c */ 	sw	$ra,0x7c($sp)
 /*  f142e08:	afb70074 */ 	sw	$s7,0x74($sp)
@@ -2298,7 +2298,7 @@ glabel func0f143678
 );
 
 GLOBAL_ASM(
-glabel func0f143888
+glabel hudRenderEyespyUi
 /*  f143888:	27bdfbf8 */ 	addiu	$sp,$sp,-1032
 /*  f14388c:	afbf0054 */ 	sw	$ra,0x54($sp)
 /*  f143890:	afb5004c */ 	sw	$s5,0x4c($sp)
@@ -6396,9 +6396,9 @@ glabel func0f1472fc
 /*  f14756c:	27bd0060 */ 	addiu	$sp,$sp,0x60
 );
 
-u32 func0f147570(u32 arg)
+Gfx *func0f147570(Gfx *gdl)
 {
-	return arg;
+	return gdl;
 }
 
 GLOBAL_ASM(
@@ -6999,7 +6999,7 @@ glabel func0f147cf8
 );
 
 GLOBAL_ASM(
-glabel func0f147e24
+glabel hudRenderHorizonScanner
 /*  f147e24:	27bdfe68 */ 	addiu	$sp,$sp,-408
 /*  f147e28:	afbf0054 */ 	sw	$ra,0x54($sp)
 /*  f147e2c:	afb20050 */ 	sw	$s2,0x50($sp)

src/game/game_167ae0.c

@@ -2819,7 +2819,7 @@ glabel var7f1b7868
 /*  f16a608:	28610583 */ 	slti	$at,$v1,0x583
 /*  f16a60c:	1020005e */ 	beqz	$at,.L0f16a788
 /*  f16a610:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f16a614:	0fc51f89 */ 	jal	func0f147e24
+/*  f16a614:	0fc51f89 */ 	jal	hudRenderHorizonScanner
 /*  f16a618:	02402025 */ 	or	$a0,$s2,$zero
 /*  f16a61c:	1000005a */ 	beqz	$zero,.L0f16a788
 /*  f16a620:	00409025 */ 	or	$s2,$v0,$zero

src/game/game_17f930.c

@@ -6206,7 +6206,7 @@ glabel var7f1b89b8
 /*  f185f90:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f185f94:	afa50034 */ 	sw	$a1,0x34($sp)
 /*  f185f98:	afa00028 */ 	sw	$zero,0x28($sp)
-/*  f185f9c:	0fc3f594 */ 	jal	currentPlayerIsInTraining
+/*  f185f9c:	0fc3f594 */ 	jal	currentPlayerGetUnk1c04
 /*  f185fa0:	afa00020 */ 	sw	$zero,0x20($sp)
 /*  f185fa4:	3c07800b */ 	lui	$a3,%hi(g_MpSetup)
 /*  f185fa8:	24e7cb88 */ 	addiu	$a3,$a3,%lo(g_MpSetup)

src/game/game_19c990.c

@@ -4993,7 +4993,7 @@ void dtBegin(void)
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_SUCCESS);
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE);
 	chrSetStageFlag(NULL, ciGetStageFlagByDeviceIndex(func0f1a1d68(var80088ad8)));
-	g_Vars.currentplayer->deadtimer = 1;
+	g_Vars.currentplayer->training = true;
 	playersSetPassiveMode(false);
 	chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
 }
@@ -5006,7 +5006,7 @@ void dtEnd(void)
 	chrSetStageFlag(NULL, STAGEFLAG_CI_DEVICE_ABORTING);
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE);
 	chrUnsetStageFlag(NULL, ciGetStageFlagByDeviceIndex(func0f1a1d68(var80088ad8)));
-	g_Vars.currentplayer->deadtimer = 0;
+	g_Vars.currentplayer->training = false;
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
 	func0f0bb69c();
 	g_Vars.currentplayer->bondhealth = 1;
@@ -5242,7 +5242,7 @@ void htBegin(void)
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE);
 	chrSetStageFlag(NULL, func0f1a25c0(htGetIndexBySlot(var80088bb4)));
 	func0f115a48(&setup00->unk200, &setup00->unk310);
-	g_Vars.currentplayer->deadtimer = 1;
+	g_Vars.currentplayer->training = true;
 	playersSetPassiveMode(false);
 	chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
 }
@@ -5260,7 +5260,7 @@ void htEnd(void)
 	chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE);
 	chrUnsetStageFlag(NULL, func0f1a25c0(htGetIndexBySlot(var80088bb4)));
 	func0f115a78(&setup00->unk200, &setup00->unk310);
-	g_Vars.currentplayer->deadtimer = 0;
+	g_Vars.currentplayer->training = false;
 	roomGetProps(rooms, propnums, 256);
 	propnum = &propnums[0];
 

src/include/constants.h

@@ -190,9 +190,9 @@
 #define BANK_2 2
 #define BANK_3 3
 
-#define CAMERAMODE_0 0
-#define CAMERAMODE_1 1
-#define CAMERAMODE_2 2
+#define CAMERAMODE_0        0
+#define CAMERAMODE_CUTSCENE 1
+#define CAMERAMODE_2        2
 
 #define CASING_NONE     -1
 #define CASING_STANDARD 0

src/include/game/game_006bd0.h

@@ -17,8 +17,8 @@ void func0f009eac(void);
 u32 func0f00a168(void);
 u32 func0f00a1f8(void);
 u32 func0f00a444(void);
-u32 func0f00a490(void);
-u32 func0f00a940(void);
+Gfx *func0f00a490(Gfx *gdl);
+Gfx *hudRenderGasIfEnabled(Gfx *gdl);
 u32 func0f00b180(void);
 
 #endif

src/include/game/game_095320.h

@@ -14,7 +14,7 @@ u32 objectiveGetStatus(u32 arg0);
 u32 objectiveIsAllComplete(void);
 u32 func0f095bf4(void);
 u32 func0f095c04(void);
-u32 func0f095d64(void);
+void func0f095d64(void);
 void objectiveCheckRoomEntered(s32 currentroom);
 void objectiveCheckMultiroomEntered(s32 arg0, s16 *requiredrooms);
 void objectiveCheckHolograph(s32 arg0);

src/include/game/game_097ba0.h

@@ -134,7 +134,7 @@ u32 func0f0a5550(void);
 u32 func0f0a695c(void);
 u32 func0f0a6c30(void);
 u32 func0f0a70f8(void);
-u32 func0f0a7138(void);
+void func0f0a7138(Gfx **gdl);
 u32 func0f0a7d5c(void);
 u32 func0f0a7d98(void);
 u32 func0f0a8404(void);
@@ -166,14 +166,14 @@ u32 func0f0a9d2c(void);
 u32 func0f0a9d94(void);
 u32 func0f0a9da8(void);
 u32 func0f0a9fc0(void);
-u32 func0f0aa86c(void);
+Gfx *hudRenderAmmo(Gfx *gdl);
 u32 func0f0abad0(void);
 u32 func0f0abb80(void);
 u32 func0f0abba8(void);
 u32 func0f0abbe8(void);
 void func0f0abc28(void);
 void func0f0abc74(u32 arg0, u32 arg1);
-u32 func0f0abcb0(void);
+Gfx *func0f0abcb0(Gfx *gdl);
 u32 func0f0abd30(void);
 u32 getCurrentPlayerWeaponIdWrapper(u32 arg0);
 s8 freeFireslotWrapper(s32 fireslot);

src/include/game/game_0abe70.h

@@ -18,10 +18,10 @@ u32 func0f0aed3c(void);
 u32 func0f0aed70(void);
 u32 func0f0aeda4(void);
 u32 func0f0aeea8(void);
-u32 func0f0aeed8(void);
+Gfx *func0f0aeed8(Gfx *gdl);
 void func0f0aefb8(void);
 u32 func0f0af0d4(void);
-u32 func0f0af158(void);
+Gfx *func0f0af158(Gfx *gdl);
 u32 func0f0afa4c(void);
 u32 func0f0b0268(void);
 void func0f0b0340(s32 arg0);

src/include/game/game_0b63b0.h

@@ -36,15 +36,15 @@ u32 func0f0bace0(void);
 u32 func0f0bad6c(void);
 void currentPlayerPause(u32 mode);
 void func0f0baf38(void);
-u32 func0f0baf84(void);
-void fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac);
-void currentPlayerDrawFade(Gfx *gdl);
+Gfx *func0f0baf84(Gfx *gdl);
+Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac);
+Gfx *currentPlayerDrawFade(Gfx *gdl);
 u32 func0f0bb42c(void);
 u32 func0f0bb5ec(void);
 void func0f0bb69c(void);
 u32 func0f0bb814(void);
 u32 func0f0bbf14(void);
-u32 func0f0bbf78(void);
+Gfx *func0f0bbf78(Gfx *gdl);
 void currentPlayerSurroundWithExplosions(s32 arg0);
 u32 func0f0bc120(void);
 void func0f0bc3f0(void);
@@ -63,8 +63,8 @@ void func0f0bd904(bool arg0);
 u32 func0f0bfc7c(void);
 u32 func0f0bffcc(void);
 u32 func0f0c00cc(void);
-u32 func0f0c0190(void);
-u32 func0f0c07c8(void);
+Gfx *func0f0c0190(Gfx *gdl);
+Gfx *func0f0c07c8(Gfx *gdl);
 void currentPlayerDie(bool force);
 void currentPlayerDieByShooter(u32 shooter, bool force);
 u32 func0f0c160c(void);

src/include/game/game_0dcdb0.h

@@ -27,7 +27,7 @@ void func0f0df364(void);
 void currentPlayerUnsetFlag(u32 flag);
 void currentPlayerSetFlag(u32 flag);
 void hudmsgRemoveForDeadPlayer(s32 playernum);
-u32 func0f0dfad0(void);
+Gfx *func0f0dfad0(Gfx *gdl);
 void hudmsgsReset(void);
 
 #endif

src/include/game/game_0f09f0.h

@@ -78,7 +78,7 @@ u32 func0f0fd320(void);
 void func0f0fd494(struct coord *pos);
 void func0f0fd548(s32 arg0);
 u32 func0f0fd570(void);
-bool currentPlayerIsInTraining(void);
+bool currentPlayerGetUnk1c04(void);
 
 extern const char var7f1b2658[];
 extern const char var7f1b265c[];

src/include/game/game_141820.h

@@ -14,16 +14,16 @@ u32 func0f142774(void);
 u32 func0f14298c(void);
 u32 func0f142bf0(void);
 u32 func0f142d74(void);
-u32 func0f142e00(void);
+Gfx *hudRenderEyespyView(Gfx *gdl, s32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
 u32 func0f143678(void);
-u32 func0f143888(void);
-u32 func0f1472fc(void);
-u32 func0f147578(void);
+Gfx *hudRenderEyespyUi(Gfx *gdl);
+Gfx *func0f1472fc(Gfx *gdl);
+Gfx *func0f147578(Gfx *gdl);
 u32 func0f147cf8(void);
-u32 func0f147e24(void);
-u32 func0f14886c(void);
+Gfx *hudRenderHorizonScanner(Gfx *gdl);
+Gfx *func0f14886c(Gfx *gdl);
 u32 func0f148b40(void);
 u32 func0f148b6c(void);
-u32 func0f147570(u32 arg);
+Gfx *func0f147570(Gfx *gdl);
 
 #endif

src/include/game/game_1531a0.h

@@ -8,14 +8,14 @@ u32 func0f1531b8(void);
 u32 func0f1531dc(void);
 u32 func0f153204(void);
 void func0f1532ec(void);
-u32 func0f153628(void);
+Gfx *func0f153628(Gfx *gdl);
 Gfx *func0f153780(Gfx *gdl);
 Gfx *func0f1537dc(Gfx *gdl, u32 colour);
 u32 func0f153838(void);
 u32 func0f153858(void);
 u32 func0f1538e4(void);
 u32 func0f153990(void);
-u32 func0f153a34(void);
+Gfx *func0f153a34(Gfx *gdl, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
 u32 func0f153ab0(void);
 u32 func0f153b40(void);
 u32 func0f153b6c(void);

src/include/game/game_157db0.h

@@ -16,7 +16,7 @@ u32 func0f159f1c(void);
 u32 func0f15a0fc(void);
 u32 func0f15a2c4(void);
 u32 func0f15a6f4(void);
-u32 func0f15b114(void);
+Gfx *func0f15b114(Gfx *gdl);
 u32 func0f15b1c4(void);
 s32 stageGetIndex2(s32 stagenum);
 f32 func0f15b274(s32 portal);

src/include/game/game_16cfa0.h

@@ -26,9 +26,9 @@ u32 func0f16da2c(void);
 u32 func0f16daa4(void);
 void func0f16db14(void);
 void func0f16db3c(void);
-u32 func0f16dba4(void);
+void func0f16dba4(void);
 u32 func0f16dc78(void);
-u32 func0f16dd14(void);
+void func0f16dd14(void);
 u32 func0f16ddb0(void);
 u32 audioPlayTrack(u32 arg0);
 u32 audioRestartTrack(void);

src/include/game/game_18e5a0.h

@@ -6,7 +6,7 @@
 u32 func0f18e5ac(void);
 s32 teamGetIndex(s32 team);
 Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour, s32 arg4, s32 arg5);
-u32 func0f18f874(void);
+Gfx *func0f18f874(Gfx *gdl);
 Gfx *radarDrawProps(Gfx *gdl);
 
 #endif

src/include/game/pak/pak.h

@@ -113,7 +113,7 @@ u32 func0f11d8b4(void);
 u32 func0f11d9c4(void);
 u32 func0f11dc04(void);
 void func0f11dcb0(s32 arg0);
-u32 func0f11dd58(void);
+void func0f11dd58(s8 playernum);
 u32 func0f11de20(void);
 void func0f11deb8(void);
 void func0f11df38(void);

src/include/lib/lib_09660.h

@@ -42,11 +42,11 @@ u32 func0000bbe4(void);
 s32 func0000bc08(void);
 s32 func0000bc18(void);
 u32 func0000bc28(void);
-u32 func0000bc88(void);
-u32 func0000bc98(void);
+s16 func0000bc88(void);
+s16 func0000bc98(void);
 u32 func0000bca8(void);
-u32 func0000bd00(void);
-u32 func0000bd10(void);
+s16 func0000bd00(void);
+s16 func0000bd10(void);
 void func0000bd20(bool arg0);
 void func0000bd30(f32 fovy);
 u32 func0000bd7c(void);

src/include/lib/lib_13900.h

@@ -34,7 +34,7 @@ u32 func00014b50(void);
 u32 func00014c98(void);
 s32 func00014e10(u32 arg0);
 s32 func00014eb8(u32 arg0);
-s32 func00014f60(u32 arg0, u16 arg1);
+s32 func00014f60(s8 arg0, u16 arg1);
 s32 func00015020(u32 arg0, u16 arg1);
 u32 func000150c4(void);
 u32 func000150e8(void);

src/include/types.h

@@ -1108,7 +1108,7 @@ struct eyespy {
 	/*0x30*/ f32 sinverta;
 	/*0x34*/ u8 init;
 	/*0x35*/ u8 initialised;
-	/*0x36*/ u8 startuptimer60;
+	/*0x36*/ s8 startuptimer60;
 	/*0x37*/ s8 active;
 	/*0x38*/ u8 buttonheld;
 	/*0x39*/ u8 camerabuttonheld;
@@ -1121,7 +1121,7 @@ struct eyespy {
 	/*0x5c*/ f32 oldground;
 	/*0x60*/ f32 height; // height above ground - 80 to 160
 	/*0x64*/ f32 gravity;
-	/*0x68*/ u8 camerashuttertime;
+	/*0x68*/ s8 camerashuttertime;
 	/*0x69*/ u8 hit;
 	/*0x6a*/ u8 opendoor;
 	/*0x6b*/ u8 mode;
@@ -1698,10 +1698,10 @@ struct player {
 	/*0x00d8*/ bool isdead;
 	/*0x00dc*/ f32 bondhealth;
 	/*0x00e0*/ u32 unk00e0;
-	/*0x00e4*/ u32 unk00e4;
-	/*0x00e8*/ u32 unk00e8;
-	/*0x00ec*/ u32 unk00ec;
-	/*0x00f0*/ u32 unk00f0;
+	/*0x00e4*/ f32 unk00e4;
+	/*0x00e8*/ f32 unk00e8;
+	/*0x00ec*/ f32 unk00ec;
+	/*0x00f0*/ f32 unk00f0;
 	/*0x00f4*/ u32 unk00f4;
 	/*0x00f8*/ u32 unk00f8;
 	/*0x00fc*/ u32 unk00fc;
@@ -1797,8 +1797,8 @@ struct player {
 	/*0x025c*/ u32 unk025c;
 	/*0x0260*/ u32 unk0260;
 	/*0x0264*/ u32 unk0264;
-	/*0x0268*/ u32 unk0268;
-	/*0x026c*/ u32 unk026c;
+	/*0x0268*/ bool eyesshut;
+	/*0x026c*/ f32 eyesshutfrac;
 	/*0x0270*/ u32 unk0270;
 	/*0x0274*/ u32 unk0274;
 	/*0x0278*/ u32 unk0278;
@@ -2169,7 +2169,7 @@ struct player {
 	/*0x1922*/ u8 invincible;
 	/*0x1924*/ u32 healthdamagetype;
 	/*0x1928*/ f32 bondleandown;
-	/*0x192c*/ u32 mpmenuon;
+	/*0x192c*/ bool mpmenuon;
 	/*0x1930*/ u32 mpmenumode;
 	/*0x1934*/ u32 mpquitconfirm;
 	/*0x1938*/ u32 mpjoywascentre;
@@ -2202,6 +2202,8 @@ struct player {
 	/*0x19a8*/ u32 unk19a8;
 	/*0x19ac*/ s32 crouchoffsetreal;
 	/*0x19b0*/ s16 floorroom;
+	/*0x19b2*/ u8 unk19b2;
+	/*0x19b3*/ u8 dostartnewlife;
 	/*0x19b4*/ f32 crouchoffsetsmall;
 	/*0x19b8*/ s32 crouchoffsetrealsmall; // 0 = standing, -90 = squatting, can be between during transition
 	/*0x19bc*/ f32 vv_height;
@@ -2301,10 +2303,10 @@ struct player {
 	/*0x1bfd*/ u8 teleporttime;
 	/*0x1bfe*/ s16 teleportpad;
 	/*0x1c00*/ u16 teleportcamerapad;
-	/*0x1c04*/ u32 training;
-	/*0x1c08*/ u32 deadtimer;
-	/*0x1c0c*/ u32 coopcanrestart;
-	/*0x1c10*/ u32 unk1c10;
+	/*0x1c04*/ u32 unk1c04;
+	/*0x1c08*/ u32 training;
+	/*0x1c0c*/ s32 deadtimer;
+	/*0x1c10*/ bool coopcanrestart;
 	/*0x1c14*/ s32 foot;
 	/*0x1c18*/ f32 footstepdist;
 	/*0x1c1c*/ u32 unk1c1c;
@@ -2323,6 +2325,7 @@ struct player {
 	/*0x1c50*/ u32 unk1c50;
 	/*0x1c54*/ u32 unk1c54;
 	/*0x1c58*/ f32 unk1c58;
+	/*0x1c5c*/ f32 stealhealth;
 };
 
 struct stagesetup00 {