Attempt to decompile func0f09df9c

src/game/data/data_0160b0.c

@@ -25,7 +25,7 @@ u32 var80070514 = 0x00000000;
 u32 var80070518 = 0x00000000;
 u32 var8007051c = 0x00000000;
 u32 var80070520 = 0x00000000;
-u32 var80070524 = 0x00000000;
+s32 var80070524 = 0x00000000;
 u32 var80070528 = 0x00000000;
 u32 var8007052c = 0x00000000;
 u32 var80070530 = 0x00000000;

src/game/game_097ba0.c

@@ -8144,6 +8144,24 @@ glabel func0f09df9c
 /*  f09e000:	ac200524 */ 	sw	$zero,%lo(var80070524)($at)
 );
 
+//void func0f09df9c(void)
+//{
+//	s32 i;
+//
+//	g_Vars.currentplayer->unk159c = 0xffff;
+//	g_Vars.currentplayer->unk1594 = 0;
+//	g_Vars.currentplayer->unk15a0 = 0;
+//	g_Vars.currentplayer->unk15a4 = 0;
+//	g_Vars.currentplayer->unk15b0 = 0;
+//	g_Vars.currentplayer->unk15b1 = 0;
+//
+//	for (i = 0; i < 20; i++) {
+//		var8009d510[i].unk40 = 0;
+//	}
+//
+//	var80070524 = 0;
+//}
+
 GLOBAL_ASM(
 glabel func0f09e004
 .late_rodata

src/game/game_0abe70.c

@@ -2117,8 +2117,8 @@ void bullettailTick(struct bullettail *tail)
 
 GLOBAL_ASM(
 glabel func0f0adcc8
-/*  f0adcc8:	3c0e800a */ 	lui	$t6,%hi(var8009d550)
-/*  f0adccc:	8dced550 */ 	lw	$t6,%lo(var8009d550)($t6)
+/*  f0adcc8:	3c0e800a */ 	lui	$t6,%hi(var8009d510+0x40)
+/*  f0adccc:	8dced550 */ 	lw	$t6,%lo(var8009d510+0x40)($t6)
 /*  f0adcd0:	27bdffa0 */ 	addiu	$sp,$sp,-96
 /*  f0adcd4:	3c08800a */ 	lui	$t0,%hi(var8009d510)
 /*  f0adcd8:	afbf0014 */ 	sw	$ra,0x14($sp)

src/gvars/gvars.c

@@ -15463,346 +15463,7 @@ u32 var8009d144 = 0;
 u32 var8009d148 = 0;
 u32 var8009d14c = 0;
 struct fireslot g_Fireslots[NUM_FIRESLOTS] = {0};
-u32 var8009d510 = 0;
-u32 var8009d514 = 0;
-u32 var8009d518 = 0;
-u32 var8009d51c = 0;
-u32 var8009d520 = 0;
-u32 var8009d524 = 0;
-u32 var8009d528 = 0;
-u32 var8009d52c = 0;
-u32 var8009d530 = 0;
-u32 var8009d534 = 0;
-u32 var8009d538 = 0;
-u32 var8009d53c = 0;
-u32 var8009d540 = 0;
-u32 var8009d544 = 0;
-u32 var8009d548 = 0;
-u32 var8009d54c = 0;
-u32 var8009d550 = 0;
-u32 var8009d554 = 0;
-u32 var8009d558 = 0;
-u32 var8009d55c = 0;
-u32 var8009d560 = 0;
-u32 var8009d564 = 0;
-u32 var8009d568 = 0;
-u32 var8009d56c = 0;
-u32 var8009d570 = 0;
-u32 var8009d574 = 0;
-u32 var8009d578 = 0;
-u32 var8009d57c = 0;
-u32 var8009d580 = 0;
-u32 var8009d584 = 0;
-u32 var8009d588 = 0;
-u32 var8009d58c = 0;
-u32 var8009d590 = 0;
-u32 var8009d594 = 0;
-u32 var8009d598 = 0;
-u32 var8009d59c = 0;
-u32 var8009d5a0 = 0;
-u32 var8009d5a4 = 0;
-u32 var8009d5a8 = 0;
-u32 var8009d5ac = 0;
-u32 var8009d5b0 = 0;
-u32 var8009d5b4 = 0;
-u32 var8009d5b8 = 0;
-u32 var8009d5bc = 0;
-u32 var8009d5c0 = 0;
-u32 var8009d5c4 = 0;
-u32 var8009d5c8 = 0;
-u32 var8009d5cc = 0;
-u32 var8009d5d0 = 0;
-u32 var8009d5d4 = 0;
-u32 var8009d5d8 = 0;
-u32 var8009d5dc = 0;
-u32 var8009d5e0 = 0;
-u32 var8009d5e4 = 0;
-u32 var8009d5e8 = 0;
-u32 var8009d5ec = 0;
-u32 var8009d5f0 = 0;
-u32 var8009d5f4 = 0;
-u32 var8009d5f8 = 0;
-u32 var8009d5fc = 0;
-u32 var8009d600 = 0;
-u32 var8009d604 = 0;
-u32 var8009d608 = 0;
-u32 var8009d60c = 0;
-u32 var8009d610 = 0;
-u32 var8009d614 = 0;
-u32 var8009d618 = 0;
-u32 var8009d61c = 0;
-u32 var8009d620 = 0;
-u32 var8009d624 = 0;
-u32 var8009d628 = 0;
-u32 var8009d62c = 0;
-u32 var8009d630 = 0;
-u32 var8009d634 = 0;
-u32 var8009d638 = 0;
-u32 var8009d63c = 0;
-u32 var8009d640 = 0;
-u32 var8009d644 = 0;
-u32 var8009d648 = 0;
-u32 var8009d64c = 0;
-u32 var8009d650 = 0;
-u32 var8009d654 = 0;
-u32 var8009d658 = 0;
-u32 var8009d65c = 0;
-u32 var8009d660 = 0;
-u32 var8009d664 = 0;
-u32 var8009d668 = 0;
-u32 var8009d66c = 0;
-u32 var8009d670 = 0;
-u32 var8009d674 = 0;
-u32 var8009d678 = 0;
-u32 var8009d67c = 0;
-u32 var8009d680 = 0;
-u32 var8009d684 = 0;
-u32 var8009d688 = 0;
-u32 var8009d68c = 0;
-u32 var8009d690 = 0;
-u32 var8009d694 = 0;
-u32 var8009d698 = 0;
-u32 var8009d69c = 0;
-u32 var8009d6a0 = 0;
-u32 var8009d6a4 = 0;
-u32 var8009d6a8 = 0;
-u32 var8009d6ac = 0;
-u32 var8009d6b0 = 0;
-u32 var8009d6b4 = 0;
-u32 var8009d6b8 = 0;
-u32 var8009d6bc = 0;
-u32 var8009d6c0 = 0;
-u32 var8009d6c4 = 0;
-u32 var8009d6c8 = 0;
-u32 var8009d6cc = 0;
-u32 var8009d6d0 = 0;
-u32 var8009d6d4 = 0;
-u32 var8009d6d8 = 0;
-u32 var8009d6dc = 0;
-u32 var8009d6e0 = 0;
-u32 var8009d6e4 = 0;
-u32 var8009d6e8 = 0;
-u32 var8009d6ec = 0;
-u32 var8009d6f0 = 0;
-u32 var8009d6f4 = 0;
-u32 var8009d6f8 = 0;
-u32 var8009d6fc = 0;
-u32 var8009d700 = 0;
-u32 var8009d704 = 0;
-u32 var8009d708 = 0;
-u32 var8009d70c = 0;
-u32 var8009d710 = 0;
-u32 var8009d714 = 0;
-u32 var8009d718 = 0;
-u32 var8009d71c = 0;
-u32 var8009d720 = 0;
-u32 var8009d724 = 0;
-u32 var8009d728 = 0;
-u32 var8009d72c = 0;
-u32 var8009d730 = 0;
-u32 var8009d734 = 0;
-u32 var8009d738 = 0;
-u32 var8009d73c = 0;
-u32 var8009d740 = 0;
-u32 var8009d744 = 0;
-u32 var8009d748 = 0;
-u32 var8009d74c = 0;
-u32 var8009d750 = 0;
-u32 var8009d754 = 0;
-u32 var8009d758 = 0;
-u32 var8009d75c = 0;
-u32 var8009d760 = 0;
-u32 var8009d764 = 0;
-u32 var8009d768 = 0;
-u32 var8009d76c = 0;
-u32 var8009d770 = 0;
-u32 var8009d774 = 0;
-u32 var8009d778 = 0;
-u32 var8009d77c = 0;
-u32 var8009d780 = 0;
-u32 var8009d784 = 0;
-u32 var8009d788 = 0;
-u32 var8009d78c = 0;
-u32 var8009d790 = 0;
-u32 var8009d794 = 0;
-u32 var8009d798 = 0;
-u32 var8009d79c = 0;
-u32 var8009d7a0 = 0;
-u32 var8009d7a4 = 0;
-u32 var8009d7a8 = 0;
-u32 var8009d7ac = 0;
-u32 var8009d7b0 = 0;
-u32 var8009d7b4 = 0;
-u32 var8009d7b8 = 0;
-u32 var8009d7bc = 0;
-u32 var8009d7c0 = 0;
-u32 var8009d7c4 = 0;
-u32 var8009d7c8 = 0;
-u32 var8009d7cc = 0;
-u32 var8009d7d0 = 0;
-u32 var8009d7d4 = 0;
-u32 var8009d7d8 = 0;
-u32 var8009d7dc = 0;
-u32 var8009d7e0 = 0;
-u32 var8009d7e4 = 0;
-u32 var8009d7e8 = 0;
-u32 var8009d7ec = 0;
-u32 var8009d7f0 = 0;
-u32 var8009d7f4 = 0;
-u32 var8009d7f8 = 0;
-u32 var8009d7fc = 0;
-u32 var8009d800 = 0;
-u32 var8009d804 = 0;
-u32 var8009d808 = 0;
-u32 var8009d80c = 0;
-u32 var8009d810 = 0;
-u32 var8009d814 = 0;
-u32 var8009d818 = 0;
-u32 var8009d81c = 0;
-u32 var8009d820 = 0;
-u32 var8009d824 = 0;
-u32 var8009d828 = 0;
-u32 var8009d82c = 0;
-u32 var8009d830 = 0;
-u32 var8009d834 = 0;
-u32 var8009d838 = 0;
-u32 var8009d83c = 0;
-u32 var8009d840 = 0;
-u32 var8009d844 = 0;
-u32 var8009d848 = 0;
-u32 var8009d84c = 0;
-u32 var8009d850 = 0;
-u32 var8009d854 = 0;
-u32 var8009d858 = 0;
-u32 var8009d85c = 0;
-u32 var8009d860 = 0;
-u32 var8009d864 = 0;
-u32 var8009d868 = 0;
-u32 var8009d86c = 0;
-u32 var8009d870 = 0;
-u32 var8009d874 = 0;
-u32 var8009d878 = 0;
-u32 var8009d87c = 0;
-u32 var8009d880 = 0;
-u32 var8009d884 = 0;
-u32 var8009d888 = 0;
-u32 var8009d88c = 0;
-u32 var8009d890 = 0;
-u32 var8009d894 = 0;
-u32 var8009d898 = 0;
-u32 var8009d89c = 0;
-u32 var8009d8a0 = 0;
-u32 var8009d8a4 = 0;
-u32 var8009d8a8 = 0;
-u32 var8009d8ac = 0;
-u32 var8009d8b0 = 0;
-u32 var8009d8b4 = 0;
-u32 var8009d8b8 = 0;
-u32 var8009d8bc = 0;
-u32 var8009d8c0 = 0;
-u32 var8009d8c4 = 0;
-u32 var8009d8c8 = 0;
-u32 var8009d8cc = 0;
-u32 var8009d8d0 = 0;
-u32 var8009d8d4 = 0;
-u32 var8009d8d8 = 0;
-u32 var8009d8dc = 0;
-u32 var8009d8e0 = 0;
-u32 var8009d8e4 = 0;
-u32 var8009d8e8 = 0;
-u32 var8009d8ec = 0;
-u32 var8009d8f0 = 0;
-u32 var8009d8f4 = 0;
-u32 var8009d8f8 = 0;
-u32 var8009d8fc = 0;
-u32 var8009d900 = 0;
-u32 var8009d904 = 0;
-u32 var8009d908 = 0;
-u32 var8009d90c = 0;
-u32 var8009d910 = 0;
-u32 var8009d914 = 0;
-u32 var8009d918 = 0;
-u32 var8009d91c = 0;
-u32 var8009d920 = 0;
-u32 var8009d924 = 0;
-u32 var8009d928 = 0;
-u32 var8009d92c = 0;
-u32 var8009d930 = 0;
-u32 var8009d934 = 0;
-u32 var8009d938 = 0;
-u32 var8009d93c = 0;
-u32 var8009d940 = 0;
-u32 var8009d944 = 0;
-u32 var8009d948 = 0;
-u32 var8009d94c = 0;
-u32 var8009d950 = 0;
-u32 var8009d954 = 0;
-u32 var8009d958 = 0;
-u32 var8009d95c = 0;
-u32 var8009d960 = 0;
-u32 var8009d964 = 0;
-u32 var8009d968 = 0;
-u32 var8009d96c = 0;
-u32 var8009d970 = 0;
-u32 var8009d974 = 0;
-u32 var8009d978 = 0;
-u32 var8009d97c = 0;
-u32 var8009d980 = 0;
-u32 var8009d984 = 0;
-u32 var8009d988 = 0;
-u32 var8009d98c = 0;
-u32 var8009d990 = 0;
-u32 var8009d994 = 0;
-u32 var8009d998 = 0;
-u32 var8009d99c = 0;
-u32 var8009d9a0 = 0;
-u32 var8009d9a4 = 0;
-u32 var8009d9a8 = 0;
-u32 var8009d9ac = 0;
-u32 var8009d9b0 = 0;
-u32 var8009d9b4 = 0;
-u32 var8009d9b8 = 0;
-u32 var8009d9bc = 0;
-u32 var8009d9c0 = 0;
-u32 var8009d9c4 = 0;
-u32 var8009d9c8 = 0;
-u32 var8009d9cc = 0;
-u32 var8009d9d0 = 0;
-u32 var8009d9d4 = 0;
-u32 var8009d9d8 = 0;
-u32 var8009d9dc = 0;
-u32 var8009d9e0 = 0;
-u32 var8009d9e4 = 0;
-u32 var8009d9e8 = 0;
-u32 var8009d9ec = 0;
-u32 var8009d9f0 = 0;
-u32 var8009d9f4 = 0;
-u32 var8009d9f8 = 0;
-u32 var8009d9fc = 0;
-u32 var8009da00 = 0;
-u32 var8009da04 = 0;
-u32 var8009da08 = 0;
-u32 var8009da0c = 0;
-u32 var8009da10 = 0;
-u32 var8009da14 = 0;
-u32 var8009da18 = 0;
-u32 var8009da1c = 0;
-u32 var8009da20 = 0;
-u32 var8009da24 = 0;
-u32 var8009da28 = 0;
-u32 var8009da2c = 0;
-u32 var8009da30 = 0;
-u32 var8009da34 = 0;
-u32 var8009da38 = 0;
-u32 var8009da3c = 0;
-u32 var8009da40 = 0;
-u32 var8009da44 = 0;
-u32 var8009da48 = 0;
-u32 var8009da4c = 0;
-u32 var8009da50 = 0;
-u32 var8009da54 = 0;
-u32 var8009da58 = 0;
-u32 var8009da5c = 0;
+struct var8009d510 var8009d510[20] = {0};
 u32 var8009da60 = 0;
 u32 var8009da64 = 0;
 u32 var8009da68 = 0;

src/include/game/data/data_0160b0.h

@@ -38,7 +38,7 @@ extern struct ammotype g_AmmoTypes[33];
 extern u32 var80070500;
 extern u32 var8007050c;
 extern u32 var80070518;
-extern u32 var80070524;
+extern s32 var80070524;
 extern u32 var80070528;
 extern u32 var80070534;
 extern u32 var80070574;

src/include/game/game_097ba0.h

@@ -61,7 +61,7 @@ u32 func0f09ddec(void);
 u32 func0f09ddfc(void);
 void func0f09df50(void);
 void func0f09df64(s32 arg0);
-u32 func0f09df9c(void);
+void func0f09df9c(void);
 u32 func0f09e004(void);
 u32 func0f09e144(void);
 u32 func0f09e4e0(void);

src/include/gvars/gvars.h

@@ -583,7 +583,7 @@ extern u32 var8009d0e0;
 extern u32 var8009d0f0;
 extern u32 var8009d144;
 extern struct fireslot g_Fireslots[NUM_FIRESLOTS];
-extern u32 var8009d510;
+extern struct var8009d510 var8009d510[20];
 extern u32 var8009da60;
 extern u32 var8009dbe0;
 extern u32 var8009dd00;

src/include/types.h

@@ -2333,11 +2333,11 @@ struct player {
 	/*0x1588*/ u32 unk1588;
 	/*0x158c*/ u32 unk158c;
 	/*0x1590*/ u32 unk1590;
-	/*0x1594*/ u32 unk1594;
+	/*0x1594*/ s32 unk1594;
 	/*0x1598*/ u32 unk1598;
-	/*0x159c*/ u32 unk159c;
-	/*0x15a0*/ u32 unk15a0;
-	/*0x15a4*/ u32 unk15a4;
+	/*0x159c*/ u16 unk159c;
+	/*0x15a0*/ s32 unk15a0;
+	/*0x15a4*/ s32 unk15a4;
 	/*0x15a8*/ u32 unk15a8;
 	/*0x15ac*/ u32 unk15ac;
 	/*0x15b0*/ u8 unk15b0;
@@ -6378,4 +6378,24 @@ struct var800aa5d8 {
 	s16 unk18;
 };
 
+struct var8009d510 {
+	/*0x00*/ u32 unk00;
+	/*0x04*/ u32 unk04;
+	/*0x08*/ u32 unk08;
+	/*0x0c*/ u32 unk0c;
+	/*0x10*/ u32 unk10;
+	/*0x14*/ u32 unk14;
+	/*0x18*/ u32 unk18;
+	/*0x1c*/ u32 unk1c;
+	/*0x20*/ u32 unk20;
+	/*0x24*/ u32 unk24;
+	/*0x28*/ u32 unk28;
+	/*0x2c*/ u32 unk2c;
+	/*0x30*/ u32 unk30;
+	/*0x34*/ u32 unk34;
+	/*0x38*/ u32 unk38;
+	/*0x3c*/ u32 unk3c;
+	/*0x40*/ u32 unk40;
+};
+
 #endif