fox_hud & fox_me Decompiled (#95)

* func_80092D48

* func_800927A0

* TempComp.bin.mio0 git ignored

* func_800924E0

* func_80094D20

* func_80096A74

* func_80095604

* all functions done

* symbols for segmented addresses

* move symbols to c file for now

* failed attempt to import data

* fix

* Import data

* move data below

* ready for BSS attempt

* fix warnings

* ordering

* symbols for some segmented addresses

* rename to fox_hud

* clear mess

* .

* .

* space

* .

* func_i2_80187530

* func_i2_8018756C

* func_i2_80187650

* func_i2_801877C4

* func_i2_8018795C

* func_i2_80187B08

* func_i2_80187C68

* bss again (#98)

* func_i2_80187D08

* func_i2_80187D98

* func_i2_80187FF8

* func_i2_801881A8

* func_i2_80188228

* func_i2_80188298

* ARRAY_COUNT

* func_i2_80188344

* func_i2_80188B84

* func_i2_80188C2C

* func_i2_80188E8C

* func_i2_80188F2C

* func_i2_80188CAC

* func_i2_80189114

* func_i2_8018B7C4

* func_i2_8018C77C

* func_i2_8018C8F4

* func_i2_8018CA10

* func_i2_8018CB50

* func_i2_8018BACC co-authored-by: @inspectredc

* func_i2_8018CCF8

* func_i2_8018CB50

* func_i2_8018CD8C co-authored-by: @inspectredc & @petrie911

* func_i2_8018D9EC

* func_i2_8018DA6C

* func_i2_8018DAEC

* func_i2_8018DB6C

* func_i2_8018DBEC

* func_i2_8018DCE4

* func_i2_8018DE14

* func_i2_8018DF08 co-authored-by @inspectredc & @petrie911

* func_i2_8018E084

* func_i2_8018ED9C

* func_i2_80188088

* func_i2_801892F0

* func_i2_8018978C co-authored-by @KiritoDv & inspectredc

* fox_me DATA IMPORTED

* resolve conflicts

* func_i6_80197B30

* func_i6_80197CC4

* func_i6_80197F84

* func_i6_80198244

* merge and solve bss

* func_i6_801983E4

* PR review

---------

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

7 files changed, 31 insertions, 80 deletions

diff --git a/include/functions.h b/include/functions.h
index 036586a2..3f6ee859 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -39,6 +39,7 @@ void func_8001CA24(u8);
 void func_8001CB80(u8, u8);
 void func_8001CCDC(u8, Vec3f *);
 void func_8001CE28(u8, Vec3f *);
+void func_8001D034(Vec3f*, s32, u8);
 void func_8001D10C(Vec3f*, u32);
 void func_8001D15C(u8);
 void func_8001D1C8(u8, s32);
@@ -302,6 +303,8 @@ void func_8006BB78(Actor*);
 void func_8006C008(Actor*);
 void func_8006D350(Object_80*);
 void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
+void func_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot,
+                   f32 zRot);
 void func_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3);
 void func_80072594(Actor*);
 s32 func_80074F90(Object_80*);
@@ -492,6 +495,9 @@ void func_80092D48(Actor *);
 void func_80092EC0(Actor* actor);
 void func_80093164(Actor*);
 void func_800935E8(Player*);
+void func_800953A0(Actor*, s32);
+void func_8009546C(Actor*, s32);
+void func_80095538(Actor*, s32);
 void func_80095604(Player*);
 void func_80094954(Effect*);
 void func_80094BBC(Effect*);
diff --git a/include/hud.h b/include/hud.h
index 7ddc03aa..68615254 100644
--- a/include/hud.h
+++ b/include/hud.h
@@ -3,14 +3,18 @@
 
 #include "global.h"
 
-typedef struct UnkStruct_func_80095350 {
-    /* 0x00 */ s8 unk0;
-    /* 0x01 */ char pad_1[0x1];
-    /* 0x02 */ s16 unk2;
-    /* 0x04 */ char pad_4[0xB2];
-    /* 0xB6 */ s16 unkB6;
-} UnkStruct_func_80095350;
+typedef struct {
+    /* 0x00 */ u8* unk_00;
+    /* 0x04 */ s32 width;
+    /* 0x08 */ s32 height;
+    /* 0x0C */ u8* unk_0C;
+    /* 0x10 */ s32 unk_10;
+    /* 0x14 */ s32 unk_14;
+} UnkStruct_D_800D1AEC;
 
+void func_80084930(f32, f32, s32);
+void func_80086444(void);
+void func_80087788(void);
 void func_80084E78(Gfx** gfxP, void* arg1, void* arg2, u32 arg3, u32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
                    f32 arg9, f32 argA);
 void func_80085944(void);
@@ -36,44 +40,4 @@ void func_8008E5E8(void);
 s32 func_80090E8C(Actor*);
 s32 func_800910C0(Actor*);
 
-// Weird addresses, assets maybe?
-extern u16 D_1000E80[];
-extern u16 D_1002280[];
-extern u16 D_10030D0[];
-extern s32 D_1011280[];
-extern s32 D_10116A0[];
-extern s32 D_10116B0[];
-extern s32 D_1011730[];
-extern s32 D_1011AC0[];
-extern s32 D_1011B90[];
-extern s32 D_1011BB0[];
-extern s32 D_1011C80[];
-extern s32 D_1011CA0[];
-extern s32 D_1011D70[];
-extern s32 D_1011D90[];
-extern s32 D_1011E60[];
-extern s32 D_1013580[];
-extern s32 D_1013700[];
-extern Gfx D_20031B0[];
-extern Gfx D_2010A30[];
-extern u16 D_3000B20[];
-extern u8 D_30013E0[];
-
-extern s32 D_80161690;
-extern s32 D_80161718;
-extern s32 D_8016171C;
-extern s32 D_801617E8[];
-extern s32 D_801617FC;
-extern s32 gHitCount;
-extern s32 D_80177838;
-extern s32 D_80177854;
-extern s32 gTeamShields[];
-extern s32 D_801778BC;
-extern s32 gVersusMode;
-extern s32 D_80177B50[];
-extern s32 D_80177B70[];
-extern s32 D_80177E7C;
-extern LevelId gCurrentLevel;
-extern s32 D_80178750;
-
 #endif
diff --git a/include/i3.h b/include/i3.h
index a404bf83..36982576 100644
--- a/include/i3.h
+++ b/include/i3.h
@@ -10,6 +10,8 @@
 
 // extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering
 
+void func_i3_801BE034(Actor*, Player*);
+
 void func_i3_8018DA58(Actor*);
 void func_i3_8019E5F0(Actor*);
 void func_i3_801A8BE8(Actor*);
@@ -94,7 +96,6 @@ void func_i3_801AACF8(Player*);
 void func_i3_801ABA40(PlayerShot*);
 void func_i3_801AC274(Player*);
 void func_i3_801AC8A8(f32, f32, f32, f32, s32);
-void func_i3_801AC8A8(f32, f32, f32, f32, s32);
 void func_i3_801AC918(Effect*);
 void func_i3_801ACBB4(void);
 void func_i3_801ACE50(Player*);
@@ -140,6 +141,7 @@ void func_i3_801BC9A0(Actor*);
 void func_i3_801BD264(Actor*);
 void func_i3_801BD54C(Actor*);
 void func_i3_801BDE6C(Actor*);
+void func_i3_801BDF14(void);
 void func_i3_801BE1FC(Object_80*);
 void func_i3_801BE3F8(Actor*);
 void func_i3_801BEB1C(Actor*);
diff --git a/include/sf64math.h b/include/sf64math.h
index e8877e6b..f68c02a1 100644
--- a/include/sf64math.h
+++ b/include/sf64math.h
@@ -1,7 +1,7 @@
 #ifndef SF64_MATH_H
 #define SF64_MATH_H
 
-#include "PR/ultratypes.h"
+#include "libultra/ultra64.h"
 
 typedef struct {
     /* 0x0 */ f32 x;
diff --git a/include/sf64object.h b/include/sf64object.h
index 689b43c7..8208de75 100644
--- a/include/sf64object.h
+++ b/include/sf64object.h
@@ -206,7 +206,9 @@ typedef struct {
     /* 0x01C */ ObjectInfo info;
     /* 0x040 */ s32 index;
     /* 0x044 */ s16 unk_044;
-    /* 0x046 */ char unk_46[6];
+    /* 0x046 */ s16 unk_046; 
+    /* 0x048 */ s16 unk_048; 
+    /* 0x04A */ s16 unk_04A; 
     /* 0x04C */ s16 unk_04C;
     /* 0x04E */ s16 actionState;
     /* 0x050 */ s16 timer_050;
diff --git a/include/sf64player.h b/include/sf64player.h
index c17b0401..139faa1e 100644
--- a/include/sf64player.h
+++ b/include/sf64player.h
@@ -212,7 +212,7 @@ typedef struct Player {
     /* 0x1CC */ PlayerForm form;
     /* 0x1D0 */ s32 unk_1D0;
     /* 0x1D4 */ s32 unk_1D4;
-    /* 0x1D8 */ char pad1D8[4];
+    /* 0x1D8 */ s32 unk_1D8;
     /* 0x1DC */ s32 unk_1DC;
     /* 0x1E0 */ s32 timer_1E0;
     /* 0x1E4 */ s32 timer_1E4;
@@ -224,7 +224,7 @@ typedef struct Player {
     /* 0x1FC */ s32 timer_1FC;
     /* 0x200 */ s32 unk_200;
     /* 0x204 */ s32 unk_204;
-    /* 0x208 */ char pad208[4];
+    /* 0x208 */ s32 unk_208;
     /* 0x20C */ s32 unk_20C; 
     /* 0x210 */ s32 timer_210;
     /* 0x214 */ s32 timer_214;
diff --git a/include/variables.h b/include/variables.h
index c9bc74dd..37651739 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -209,7 +209,7 @@ extern f32 D_800CFFC4[];
 
 // fox_effect
 
-// sf_hud
+// fox_hud
 extern s16 D_800D1970;
 extern f32 D_800D19AC[];
 extern f32 D_800D19E0[];
@@ -308,38 +308,15 @@ extern u8 D_80161684;
 // fox_6B3B0
 extern s32 D_80161690;
 
-// sf_hud?
-extern f32 D_801616A0;
-extern f32 D_801616BC;
-extern f32 D_801616C0;
-extern f32 D_801616C4;
-extern f32 D_801616C8;
+// fox_hud
 extern s32 D_80161704;
 extern s32 D_80161708;
 extern s32 D_8016170C;
-extern s32 gTotalHits; // gTotalGameScore
-extern f32 D_80161720;
-extern f32 D_80161724;
-extern f32 D_80161728;
+extern s32 gTotalHits; // 0x80161714 gTotalGameScore
+extern f32 D_80161720[3];
 extern s32 D_8016172C;
 extern s32 D_80161730;
-extern s32 gShowBossHealth;
-extern s32 D_80161788;
-extern s32 D_8016178C;
-extern s32 D_80161790;
-extern s32 D_80161794;
-extern s32 D_80161798;
-extern f32 D_8016179C;
-extern f32 D_801617A0;
-extern f32 D_801617A4;
-extern f32 D_801617A8;
-extern f32 D_801617AC;
-extern s32 D_801617B0;
-extern s32 gMedalStatus;
-extern s32 gMedalFlashTimer;
-extern s32 D_80161810[];
-extern s32 D_80161900[];
-extern s32 D_80161910[0x10]; // could be in fox_97F80
+extern s32 gShowBossHealth; // 0x80161734
 
 // fox_game
 extern f32 D_80161A10;