enemy drawing routines decomped (#28)

* graphics? * more stuff * missed one
2026-07-05 15:19:42 -07:00 · 2023-11-22 11:56:29 -03:00
parent 4cfdc163e9
commit c2a2b60871
12 changed files with 2171 additions and 314 deletions
@@ -16,7 +16,8 @@ void func_800033E0(void* var_s2, void* var_s1, s32 var_s0);
 void func_800034E8(u8 arg0);

 void func_8000372C(Gfx** dList, s32 dirX, s32 dirY, s32 dirZ, s32 colR, s32 colG, s32 colB, s32 ambR, s32 ambG, s32 ambB);
-
+void func_800038AC(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x, s32 dir2y, s32 dir2z, s32 col1r, s32 col1g,
+                   s32 col1b, s32 col2r, s32 col2g, s32 col2b, s32 ambR, s32 ambG, s32 ambB);  
 f32 Math_ModF(f32 value, f32 mod);
 void Rand_Init(void);
 f32 Rand_ZeroOne(void);
@@ -66,8 +67,8 @@ void Fault_Init(void);

 void func_80016A50(void);
 void func_800182F4(s32);
-void func_80019218(u32, f32*, u8, f32*, f32*, s8*);
-void func_8001A500(f32*); // might be Vec3f*
+void func_80019218(u32, Vec3f*, u8, f32*, f32*, s8*);
+void func_8001A500(Vec3f*);
 void func_8001A838(u32 arg0);
 void func_8001ACDC(s32);
 void func_8001AE58(void);
@@ -139,13 +140,21 @@ void func_8003DAF0(void);
 void func_8003DE68(s32, s32);
 void func_80040CDC(void);
 void func_80042FAC(Object_408 *);       
-void func_80042FD0(Object_408 *);  
+void func_80042FD0(Object_408 *);
+void func_80053658(UnkStruct_D_80161630 *, UnkStruct_D_80178280 *);
+void func_8005465C(s32);
 u8 func_80058F14(u8 arg0, u8 arg1);
 void func_80059498(void);
 void func_8005980C(f32 arg0);
 void func_80057D00(void);
-
-void func_80060FBC(Object*, f32*);
+void func_8005F030(Vec3f*);
+void func_8005F0E8(Vec3f*, Vec3f*);
+void func_8005F1EC(Vec3f*);
+void func_8005F290(Vec3f*, Vec3f*);
+void func_8005F670(Vec3f*);
+s32 func_8005F9DC(Vec3f*);
+void func_80060FBC(Object*, Vec3f*);
+s32 func_80060FE4(Vec3f* arg0, f32 arg1);
 void func_800612B8(ObjectStruct_1C*, u32);
 void func_800613C4(Object_2F4*);
 void func_80061474(Object_8C* arg0);
@@ -199,6 +208,7 @@ void func_80069FD4(Object_8C *);
 void func_8006A06C(UnkStruct_D_80174750*);
 void func_8006A38C(void);
 void func_8006B0A0(Object_2F4 *, s32);
+void func_8006B74C(Object_2F4 *);
 void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);


@@ -247,6 +257,8 @@ s32 func_800915FC(Object_2F4*);
 void func_80092D48(Object_2F4 *);  
 void func_80094D20(f32, f32);
 s32 func_800998FC(Vec3f*, Vec3f*, s32, s32, Vec3f*, Vec3f*);
+void func_8009A72C(s32, void*, Vec3f*, OverrideLimbDraw, PostLimbDraw, s32*, Matrix*);
+void func_8009AA20(void*, s32, Vec3f*);
 s16 func_8009ACDC(s16 *);
 f32 func_8009BC2C(f32*, f32, f32, f32, f32);
 f32 func_8009BD38(f32*, f32, f32, f32, f32);
@@ -281,9 +293,7 @@ void func_800A5D6C(void);
 void func_800A6148(void);
 void func_800A6CD0(UnkStruct_D_80178280 *, s32, s32);
 void func_800B86CC(void);
-void func_800B8DD0(Gfx**, s16);
-void func_800BA490(void);
-void func_800BA4F0(void);
+
 s32 func_800BA7BC(u16*, s32);
 void func_800BA808(u16*, s32);
 void func_800BB5D0(void);
@@ -300,6 +310,7 @@ s32 func_800C3194(void);

 void func_EFFA40_80187520(s32, void*);

+void func_DF4260_80198310(Object_408 *);
 void func_DF4260_801878D8(Object_408 *);
 void func_DF4260_801988E0(void);
 void func_DF4260_8018B0B4(Object_2F4 *);
@@ -312,6 +323,7 @@ void func_DF4260_801935CC(Object_408 *);

 void func_E08400_80188A40(Object_408 *);

+void func_E16C50_80190F08(Object_2F4 *);
 void func_E16C50_80187754(Object_408 *);
 void func_E16C50_801932AC(Object_408 *);
 void func_E16C50_8019B1F0(Object_2F4 *);
@@ -98,4 +98,59 @@ typedef enum SetupDL {

 extern Gfx gSetupDLs[SETUPDL_MAX][9]; // 0x800D31B0

+void func_800B8DD0(Gfx** gfxP, s16 i);
+void func_800B8E14(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B8F18(void);
+void func_800B8F48(void);
+void func_800B8F78(void);
+void func_800B8FA8(void);
+void func_800B8FD8(void);
+void func_800B9008(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9120(void);
+void func_800B9150(void);
+void func_800B9180(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9298(void);
+void func_800B92C8(void);
+void func_800B92F8(void);
+void func_800B9328(void);
+void func_800B9358(void);
+void func_800B9388(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B94A0(void);
+void func_800B94D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B95E8(void);
+void func_800B9618(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9730(void);
+void func_800B9760(void);
+void func_800B9790(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B98A8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B99C0(void);
+void func_800B99F0(void);
+void func_800B9A20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9B38(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9C50(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9D68(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9E80(void);
+void func_800B9EB0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800B9FC8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800BA0E0(void);
+void func_800BA110(void);
+void func_800BA140(void);
+void func_800BA170(void);
+void func_800BA1A0(void);
+void func_800BA1D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800BA2E8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+void func_800BA400(void);
+void func_800BA430(void);
+void func_800BA460(void);
+void func_800BA490(void);
+void func_800BA4C0(void);
+void func_800BA4F0(void);
+void func_800BA520(void);
+void func_800BA550(void);
+void func_800BA580(void);
+void func_800BA5B0(void);
+void func_800BA5E0(void);
+void func_800BA610(void);
+void func_800BA640(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+
 #endif
@@ -4,6 +4,11 @@
 #include "global.h"
 #include "sf64math.h"

+#define UNK_TYPE s32
+
+typedef s32 (*OverrideLimbDraw)(s32, Gfx**, Vec3f*, Vec3f*, s32*);
+typedef void (*PostLimbDraw)(s32, Vec3f*, s32*);
+
 typedef struct {
    s32 unk0;
    u16* unk4;
@@ -148,12 +153,33 @@ typedef struct {
    /* 0x14 */ char pad14[0x14];
 } UnkStruct_D_80175A10; // size = 0x28

+typedef struct {
+    /* 0x00 */ u8 unk_00;
+    /* 0x01 */ u8 unk_01;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ f32 unk_14;
+    /* 0x18 */ f32 unk_18;
+    /* 0x1C */ f32 unk_1C;
+    /* 0x20 */ f32 unk_20;
+    /* 0x24 */ f32 unk_24;
+    /* 0x28 */ f32 unk_28;
+    /* 0x2C */ s8 unk_2C;
+    /* 0x30 */ f32 unk_30;
+    /* 0x34 */ f32 unk_34;
+    /* 0x38 */ f32 unk_38;
+} UnkStruct_D_80161630; // size = 0x3C
+
 typedef struct UnkStruct_D_80178280 {
    /* 0x000 */ char pad0[0xC];
    /* 0x00C */ f32 unk_00C;
-    /* 0x010 */ char pad10[0x30];
-    /* 0x040 */ Vec3f unk_40;
-    /* 0x04C */ char pad4C[0xC];
+    /* 0x010 */  char pad10[0x24];
+    /* 0x034 */ f32 unk_034; 
+    /* 0x038 */ char pad38[8];
+    /* 0x040 */ Vec3f unk_040;
+    /* 0x04C */ Vec3f unk_04C;
    /* 0x058 */ f32 unk_058;
    /* 0x05C */ f32 unk_05C;
    /* 0x060 */ char pad060[0x14];
@@ -174,17 +200,24 @@ typedef struct UnkStruct_D_80178280 {
    /* 0x110 */ f32 unk_110;
    /* 0x114 */ f32 unk_114;
    /* 0x118 */ f32 unk_118;
-    /* 0x11C */ char pad11C[8];
+    /* 0x11C */ char pad11C[4];
+    /* 0x120 */ f32 unk_120;
    /* 0x124 */ f32 unk_124;
    /* 0x128 */ char pad128[0x10];
    /* 0x138 */ f32 unk_138;
-    /* 0x13C */ char pad13C[0x8C];
+    /* 0x13C */ char pad13C[8];
+    /* 0x144 */ f32 unk_144;
+    /* 0x148 */ char pad148[0x54];
+    /* 0x19C */ s32 unk_19C;
+    /* 0x1A0 */ char pad1A0[0x28];
    /* 0x1C8 */ s32 unk_1C8;
    /* 0x1CC */ s32 unk_1CC;
    /* 0x1D0 */ s32 unk_1D0;
    /* 0x1D4 */  char pad1D4[0x20];
    /* 0x1F4 */ s32 unk_1F4;
-    /* 0x1F8 */ char pad1F8[0x18];
+    /* 0x1F8 */ char pad1F8[0xC];
+    /* 0x204 */ s32 unk_204;
+    /* 0x208 */ char pad208[8];
    /* 0x210 */ s32 unk_210;
    /* 0x214 */ char pad214[0x10];
    /* 0x224 */ s32 unk_224;
@@ -202,10 +235,10 @@ typedef struct UnkStruct_D_80178280 {
    /* 0x2B8 */ char pad2B8[0x4];
    /* 0x2BC */ f32 unk_2BC;
    /* 0x2C0 */ char pad2C0[0x1A0];
-    /* 0x460 */ f32 unk_460[1]; // might be Vec3f
-    /* 0x464 */ char pad464[0x38];
-    /* 0x49C */ u8 unk_49C;
-    /* 0x49D */ u8 unk_49D;
+    /* 0x460 */ Vec3f unk_460[1];
+    /* 0x46C */ char pad46C[0x30];
+    /* 0x49C */ u8 unk_49C; // could be array
+    /* 0x49C */ u8 unk_49D;
    /* 0x49E */ char pad49E[0x42];
 } UnkStruct_D_80178280; // size = 0x4E0 Might be Player

@@ -228,20 +261,25 @@ typedef struct {
 } Object; // size = 0x1C

 typedef struct {
-    /* 0x00 */ char unk0[0x8];
-    /* 0x08 */ void (*unk_8)(Object*);
-    /* 0x0C */ void* unk_C;
+    /* 0x00 */ void (*unk_00)(Object*);
+    /* 0x00 */ u8 unk_04;
+    /* 0x08 */ void (*unk_08)(Object*);
+    /* 0x0C */ void* unk_0C;
    /* 0x10 */ f32 unk_10;
-    /* 0x14 */ char unk14[0x2];
+    /* 0x14 */ s16 unk_14;
    /* 0x16 */ s16 unk_16;
-    /* 0x18 */ char unk18[0x8];
+    /* 0x18 */ u8 unk_18;
+    /* 0x19 */ u8 unk_19;
+    /* 0x1C */ f32 unk_1C;
    /* 0x20 */ u8 unk_20;
 } ObjectStruct_1C; // size = 0x24

 typedef struct {
    /* 0x00 */ Object obj;
    /* 0x1C */ ObjectStruct_1C unk_1C;
-    /* 0x40 */ char unk40[0x18];
+    /* 0x40 */ char unk40[0x8];
+    /* 0x48 */ Vec3f unk_48;
+    /* 0x54 */ f32 unk_54;
 } Object_58; // size = 0x58

 typedef struct {
@@ -256,8 +294,12 @@ typedef struct {
    /* 0x1C */ f32 unk_1C;
    /* 0x20 */ f32 unk_20;
    /* 0x24 */ f32 unk_24;
-    /* 0x28 */ char pad28[8];
-} UnkStruct_D_80174750;
+    /* 0x28 */ f32 unk_28;
+    /* 0x2C */ u8 unk_2C; // possibly a color struct
+    /* 0x2D */ u8 unk_2D;
+    /* 0x2E */ u8 unk_2E;
+    /* 0x2F */ u8 unk_2F;
+} UnkStruct_D_80174750; // size = 0x30

 typedef struct {
    /* 0x00 */ Object obj;
@@ -270,8 +312,8 @@ typedef struct {
    /* 0x60 */ f32 unk_60;
    /* 0x64 */ f32 unk_64;
    /* 0x68 */ char pad68[8];
-    /* 0x70 */ f32 unk_70;
-    /* 0x74 */ char pad74[0xC];
+    /* 0x70 */ Vec3f unk_70;
+    /* 0x7C */ char pad7C[4];
 } Object_80; // size = 0x80

 typedef struct {
@@ -281,7 +323,7 @@ typedef struct {
    /* 0x44 */ char pad44[1];
    /* 0x45 */ u8 unk_45; // could be short loaded as u8
    /* 0x46 */ s8 unk_46;
-    /* 0x47 */ char pad47[5];
+    /* 0x48 */ s32 unk_48;
 } Object_4C; // size = 0x4C

 typedef struct {
@@ -297,7 +339,7 @@ typedef struct {
    /* 0x50 */ f32 unk_50;
    /* 0x54 */ f32 unk_54;
    /* 0x58 */ f32 unk_58;
-    /* 0x5C */ f32 unk_5C[3]; // could be Vec3f
+    /* 0x5C */ Vec3f unk_5C;
    /* 0x68 */ f32 unk_68;
 } Object_6C; // size 0x6C

@@ -316,18 +358,17 @@ typedef struct {
    /* 0x54 */ f32 unk_54;
    /* 0x58 */ f32 unk_58;
    /* 0x5C */ f32 unk_5C;
-    /* 0x60 */ char pad60[0xC];
+    /* 0x60 */ Vec3f unk_60;
    /* 0x6C */ f32 unk_6C;
    /* 0x70 */ f32 unk_70;
    /* 0x74 */ char pad74[0xC];
-    /* 0x80 */ f32 unk_80[1]; // unknown size. Could be Vec3f
-    /* 0x84 */ char pad84[0x8];
+    /* 0x80 */ Vec3f unk_80;
 } Object_8C; // size 0x8C

 typedef struct {
    /* 0x000 */ Object obj;
    /* 0x01C */ ObjectStruct_1C unk_01C;
-    /* 0x040 */ s32 unk_40;
+    /* 0x040 */ s32 unk_040;
    /* 0x044 */ char unk_44[0xA];
    /* 0x04E */ s16 unk_04E;
    /* 0x050 */ s16 unk_050;
@@ -337,31 +378,43 @@ typedef struct {
    /* 0x058 */ s16 unk_058;
    /* 0x05A */ s16 unk_05A;
    /* 0x05C */ s16 unk_05C;
-    /* 0x05E */ char pad5E[4];
+    /* 0x05E */ u8 unk_05E;
+    /* 0x05F */ char pad5F[3];
    /* 0x062 */ s8 unk_062;
-    /* 0x063 */ char pad63[9];   
-    /* 0x06C */ f32 unk_6C;       
-    /* 0x070 */ f32 unk_70;       
-    /* 0x074 */ f32 unk_74;       
+    /* 0x063 */ char pad63[5];
+    /* 0x068 */ f32 unk_068;
+    /* 0x06C */ f32 unk_06C;
+    /* 0x070 */ f32 unk_070;       
+    /* 0x074 */ f32 unk_074;       
    /* 0x078 */ char pad78[0xC]; 
-    /* 0x084 */ f32 unk_84;       
-    /* 0x088 */ char pad88[0x54];
+    /* 0x084 */ f32 unk_084;       
+    /* 0x088 */  char pad88[0x3E];
+    /* 0x0C6 */ u16 unk_0C6;
+    /* 0x0C8 */ char padC8[1];
+    /* 0x0C9 */ u8 unk_0C9;
+    /* 0x0CA */ char padCA[0x12];
    /* 0x0DC */ f32 unk_0DC;
    /* 0x0E0 */ f32 unk_0E0;
-    /* 0x0E4 */ char padE4[0x314];
+    /* 0x0E4 */ f32 unk_0E4;
+    /* 0x0E8 */ char padE8[0x28];
+    /* 0x110 */ f32 unk_110;
+    /* 0x114 */ char pad114[0x1F4];
+    /* 0x308 */ Vec3f unk_308;
+    /* 0x314 */ char pad314[0xE4];
    /* 0x3F8 */ f32 unk_3F8;
-    /* 0x3FC */ f32 unk_3FC;
-    /* 0x400 */ char pad400[8];
+    /* 0x3FC */ Vec3f unk_3FC;
 } Object_408; // size = 0x408

 typedef struct {
    /* 0x000 */ Object obj;
    /* 0x01C */ ObjectStruct_1C unk_01C;
    /* 0x040 */ s32 unk_040;
-    /* 0x044 */ u8 unk_44;
-    /* 0x046 */ s16 unk_46;
-    /* 0x048 */ s16 unk_48;
-    /* 0x04A */ char pad4A[6];
+    /* 0x044 */ u8 unk_044;
+    /* 0x046 */ s16 unk_046;
+    /* 0x048 */ s16 unk_048;
+    /* 0x04A */ s16 unk_04A;
+    /* 0x04C */ char pad4C[2];
+    /* 0x04E */ s16 unk_04E;
    /* 0x050 */ s32 unk_050;
    /* 0x054 */ s32 unk_054;
    /* 0x058 */ s32 unk_058;
@@ -375,9 +428,11 @@ typedef struct {
    /* 0x078 */ s32 unk_078;
    /* 0x07C */ s32 unk_07C;
    /* 0x080 */ s32 unk_080;
-    /* 0x084 */ char pad84[8];
+    /* 0x084 */  char pad84[4];
+    /* 0x088 */ s32 unk_88;
    /* 0x08C */ s32 unk_8C;
-    /* 0x090 */ char pad90[0x24];
+    /* 0x090 */  char pad90[0x20];
+    /* 0x0B0 */ s32 unk_0B0;
    /* 0x0B4 */ s16 unk_0B4;
    /* 0x0B6 */ s16 unk_0B6;
    /* 0x0B8 */ s16 unk_0B8;
@@ -405,7 +460,7 @@ typedef struct {
    /* 0x0F4 */ f32 unk_0F4;
    /* 0x0F8 */ f32 unk_0F8; // angle
    /* 0x0FC */ f32 unk_0FC;
-    /* 0x100 */ f32 unk_100[3]; // may be Vec3f
+    /* 0x100 */ Vec3f unk_100; // may be Vec3f
    /* 0x10C */ f32 unk_10C;
    /* 0x110 */ f32 unk_110;
    /* 0x114 */ f32 unk_114;
@@ -423,7 +478,11 @@ typedef struct {
    /* 0x14C */ f32 unk_14C;
    /* 0x150 */ f32 unk_150;
    /* 0x154 */ f32 unk_154;
-    /* 0x158 */ char pad158[0x14];
+    /* 0x158 */ f32 unk_158;
+    /* 0x15C */ char pad15C[4];
+    /* 0x160 */ f32 unk_160;
+    /* 0x164 */ f32 unk_164;
+    /* 0x168 */ f32 unk_168;
    /* 0x16C */ f32 unk_16C;
    /* 0x170 */ char pad170[8];
    /* 0x178 */ f32 unk_178;
@@ -431,7 +490,8 @@ typedef struct {
    /* 0x180 */ f32 unk_180;
    /* 0x184 */ f32 unk_184;
    /* 0x188 */ f32 unk_188;
-    /* 0x18C */ char pad18C[0x150];
+    /* 0x18C */ Vec3f unk_18C; // could be joint table
+    /* 0x198 */ char pad198[0x144];
    /* 0x2DC */ Vec3f unk_2DC;
    /* 0x2E8 */ Vec3f unk_2E8;
 } Object_2F4; // size = 0x2F4
@@ -21,7 +21,7 @@ extern s32 sFaultCharPixelFlags[];
 extern const char* D_800C4870[];
 extern const char* D_800C48B8[];

-extern f32 D_800C5D28[];
+extern Vec3f D_800C5D28;
 extern f32 D_800C5D34;
 extern s8 D_800C5D3C;
 extern s8 D_800C7C50;
@@ -103,7 +103,7 @@ extern Lightsn* gLight;
 extern FrameBuffer *gFrameBuffer;
 extern s32* D_80137E74;

-// some sort of struct I think
+// some sort of struct?
 extern u8 D_80137E78;
 extern u32 D_80137E7C;
 extern u8 D_80137E80;
@@ -163,13 +163,44 @@ extern OverlayInit D_800CBC0C[1]; // E08400
 extern OverlayInit D_800CBD3C[1]; // EFFA40
 extern f32 D_800CBF18[];
 extern ObjectStruct_1C D_800CC124[400];
+extern f32 D_800CF9B0[];
+extern Gfx* D_800CFA54[];
+extern Gfx* D_800CFAC4[];
+extern Gfx* D_800CFADC[];
+extern Gfx* D_800CFB08[];
+extern Gfx* D_800CFB14[];
+extern Gfx* D_800CFB28[];
+extern Gfx* D_800CFB40[];
+extern Gfx* D_800CFB64[];
+extern Gfx* D_800CFB88[];
+extern Gfx* D_800CFBA8[];
+extern Gfx* D_800CFBE4[];
+extern Gfx* D_800CFC0C[];
+extern Gfx* D_800CFC40[];
+extern Gfx* D_800CFC50[];
+extern Gfx* D_800CFC64[];
+extern Gfx* D_800CFC7C[];
+extern f32 D_800CFC98[];
+extern Vec3f D_800CFCC0; // initializer in sf_5A240
+extern f32 D_800CFCCC[];
+extern Vec3f D_800CFCEC;
+extern Vec3f D_800CFCF8;
+extern Vec3f D_800CFD04;
+extern Vec3f D_800CFD10;
+extern Vec3f D_800CFD1C;
+extern Vec3f D_800CFD28;
+extern Vec3f D_800CFD34;
 extern ObjectInit* D_800CFDA0[];
+extern Gfx D_800CFD80[];
 extern s32 D_800CFDF4[];
 extern f32 D_800CFE5C[];
 extern Vec3f D_800CFEC4[6];
 extern Vec3f D_800CFF0C[6];
 extern u32 D_800CFF54[9];
 extern s32 D_800CFF90;
+extern s16 D_800CFF94[];
+extern u8 D_800CFFB4[];
+extern f32 D_800CFFC4[];
 extern f32 D_800D19AC[];
 extern f32 D_800D19E0[];
 extern Gfx D_800D1A40[];
@@ -202,6 +233,13 @@ extern s32 D_8015F930[3];
 extern s32 D_8015F93C;
 extern s32 D_8015F940;
 extern f32 D_8015F944;
+extern s16 D_80161410;
+extern Vec3f D_80161578[];
+extern Vec3f D_801615D0;
+extern Vec3f D_801615E0;
+extern s32 D_801615EC;
+extern Matrix D_801615F0;
+extern UnkStruct_D_80161630 D_80161630;
 extern s32 D_80161670[4];
 extern s32 D_80161680;
 extern u8 D_80161684;
@@ -272,6 +310,7 @@ extern f32 D_80176B98[2][100];
 extern f32 D_801771D8[2][100];
 extern f32 D_80176EB8[2][100];
 extern s32 D_801774F8;
+extern f32 D_80177500[2][100];
 extern s32 D_80177820;
 extern s32 D_80177824;
 extern s32 D_8017782C;
@@ -304,6 +343,7 @@ extern s8 D_80177930;
 extern u16 D_80177938[];
 extern f32 D_80177940;
 extern u16 D_80177948[];
+extern f32 D_80177950;
 extern f32 D_80177958[];
 extern f32 D_80177978;
 extern UnkStruct_D_8017797C* D_8017797C;
@@ -315,10 +355,11 @@ extern f32 D_801779A8[];
 extern f32 D_801779B8;
 extern f32 D_801779C0;
 extern s32 D_801779C8[];
+extern Vec3f D_801779D8;
 extern s32 D_801779F8;
 extern s32 D_80177A80;
 extern s8 D_80177A98;
-extern s8 D_80177AB0;
+extern u8 D_80177AB0;
 extern s32 D_80177AE0;
 extern s32 D_80177AF8;
 extern s32 D_80177B40;
@@ -354,6 +395,7 @@ extern s32 D_80177E70;
 extern s32 D_80177E78;
 extern s32 D_80177E80;
 extern Vec3f D_80177E88;
+extern Vec3f D_80177E98[];
 extern Vec3f D_80177F10;
 extern s32 D_8017812C;
 extern s32 D_80178234;
@@ -373,20 +415,30 @@ extern ObjectInit* D_80178310;
 extern s32 D_80178320;
 extern s32 D_80178328;
 extern s32 D_80178330;
+extern s32 D_80178338;
 extern s32 D_80178340;
 extern s32 D_80178348;
 extern s32 D_80178350;
 extern s32 D_80178354;
+extern s32 D_80178360;
+extern s32 D_80178364;
+extern s32 D_80178368;
+extern f32 D_8017836C;
+extern f32 D_80178370;
+extern f32 D_80178374;
+extern f32 D_80178378;
 extern s32 D_80178380[];
 extern s32 D_80178390[];
 extern s32 D_801783A0[];
 extern s32 D_801783B0[];
 extern s32 D_801783D8;
+extern s32 D_801783DC;
 extern s32 D_80178410;
 extern f32 D_80178420;
 extern f32 D_80178424;
 extern f32 D_80178428;
 extern f32 D_8017842C;
+extern f32 D_8017847C;
 extern s32 D_80178480;
 extern s32 D_80178488;
 extern s32 D_801784A4;
@@ -417,6 +469,7 @@ extern SaveFile D_80178870;
 extern u16 D_Tex_800D99F8[];
 extern u16 D_Tex_800DBA20[];
 extern Gfx D_Gfx_800DBAA0[];
+extern Gfx D_Gfx_800DAC20[];

 extern DmaEntry gDmaTable[]; // 178A70
 extern u8 D_80179010[][16 * 13 / 2];
@@ -438,6 +491,11 @@ extern u16 D_80183A08[];
 extern u16 D_80183A64[];
 extern UnkStruct_D_80185CBC D_80185CBC[];

+extern Gfx* D_DF4260_8019A008[];
+extern Matrix D_E51970_8019EE80;
+extern Gfx* D_E6A810_801B769C[];
+extern Gfx* D_E6A810_801B7584[];
+extern Gfx* D_E6A810_801B7608[];
 extern f32 D_E9F1D0_801A7F60;
 extern f32 D_E9F1D0_801A7F78;
 extern f32 D_EBFBE0_801B7BC8;
@@ -484,6 +542,8 @@ extern f32 D_EBFBE0_801B9060;
 extern f32 D_EBFBE0_801B9064;
 extern s8 D_E6A810_801BA1E8;

+
+
 extern char D_EBFBE0_801ADA44[];
 extern s32 D_EBFBE0_801ADA84[];
 extern s32 D_EBFEB0_801ADA94;
@@ -503,7 +563,8 @@ extern u16 D_10050E0[];
 extern u16 D_100BAC0[];
 extern u16 D_100D900[];
 extern u16 D_10032A0[];
-
+extern Gfx D_10194C0[];
+extern Gfx D_1024290[];
 extern u8 D_1011A40[];
 extern u16 D_1011AB0[];
 extern u8 D_1011E80[];
@@ -524,6 +585,19 @@ extern Gfx D_1024830[];
 extern u8 D_1024A58[];
 extern Gfx D_102A8A0[];
 extern Gfx D_1024AC0[];
+extern Gfx D_1028230[];
+extern Gfx D_101CAE0[];
+extern Gfx D_1023C80[];
+extern Gfx D_101A570[];
+extern Gfx D_1019CA0[];
+extern Gfx D_1016870[];
+extern Gfx D_1022E80[];
+extern Gfx D_102A010[];
+extern Gfx D_1032780[];
+extern Gfx D_1019820[];
+extern Gfx D_101A8E0[];
+extern Gfx D_102FE80[];
+extern Gfx D_10231A0[];

 extern Gfx D_2000000[];
 extern Gfx D_2000890[];
@@ -563,6 +637,17 @@ extern u8 D_300D3C0[];
 extern u16 D_300D408[];
 extern u8 D_300D440[];
 extern u16 D_300D500[];
+extern Gfx D_30155E0[];
+extern Gfx D_3015D80[];
+extern Gfx D_3016660[];
+extern Gfx D_3011720[];
+extern Gfx D_3005980[];
+
+extern Gfx D_40018A0[];
+extern Gfx D_4003BD0[];
+extern Gfx D_4007870[];
+extern Gfx D_4007AF0[];
+extern Gfx D_400B390[];

 extern u8 D_5000000[];
 extern u8 D_5000080[];
@@ -596,18 +681,48 @@ extern f32 D_60069CC[];
 extern f32 D_60069E8[];
 extern f32 D_6006A04[];
 extern f32 D_6006A20[];
+extern Gfx D_6007650[];
+extern Gfx D_60148B0[];
+extern Gfx D_601AE40[];
+extern Gfx D_6023AC0[];
+extern s16 D_6029528[];
+extern Gfx D_602DA20[];
+extern Gfx D_6032BC0[];
+extern Gfx D_6034B90[];
+extern Gfx D_6035DA0[];
+extern Gfx D_60361F0[];
+extern Gfx D_60119A0[];
+extern Gfx D_6012C00[];
+extern Gfx D_6009F90[];
+extern Gfx D_600D730[];
+extern Gfx D_600DBC0[];
+extern Gfx D_60363B0[];
+extern Gfx D_6036840[];
+extern Gfx D_6036CD0[];
+extern Gfx D_6022920[];
+extern Gfx D_6020B40[];
+extern UNK_TYPE D_6029674;
 extern ObjectInit* D_6010088[];
 extern u16 D_601B4B0[];
 extern Gfx D_601D1F0[];
 extern s16 D_6029528[];
 extern ObjectInit* D_602B148[];
 extern ObjectInit* D_602F18C[];
+extern UNK_TYPE D_601E8C4;
+extern UNK_TYPE D_601E9D0;
+extern Gfx D_6018C00[];
+extern Gfx D_6024B60[];
+extern Gfx D_6025B50[];
+extern Gfx D_6007CF0[];
+extern Gfx D_6007D90[];
 extern u16 D_60447A0[];
 extern u16 D_6047550[];
 extern Gfx D_6004570[];
 extern u8 D_6001B80[];
 extern u8 D_60020D0[];

+extern Gfx D_7007350[];
+extern Gfx D_700BB10[];
 extern u8 D_7004010[];

 extern u8 D_80038E0[];
@@ -622,16 +737,26 @@ extern u8 D_8003B28[];
 extern u8 D_800D070[];
 extern u8 D_800D170[];

-extern Gfx D_D0098B0[];
-extern Gfx D_F014180[];
+extern Gfx D_900D180[];
+extern Gfx D_9010FD0[];
+extern Gfx D_9023290[];
+extern Gfx D_90234D0[];

+extern ObjectInit* D_C0356A4[];
+extern ObjectInit* D_C0356A4[];
+extern Gfx D_C017440[];
+
+extern Gfx D_D0098B0[];
+
+extern Gfx D_F014310[];
+extern Gfx D_F014180[];
 extern u16 D_F000000[];
 extern u16 D_F000800[];
 extern u16 D_F001000[];
 extern u16 D_F001800[];
 extern u16 D_F002000[];

-extern ObjectInit* D_C0356A4[];
+

 #endif // VARIABLES_H

@@ -149,6 +149,8 @@ D_80177E88 = 0x80177E88; // size:0xC
 Mio0_Decompress = 0x8001EE70;
 RdRam_CheckIPL3 = 0x8001EF10;

+D_800CFA54 = 0x800CFA54;
+
 D_800D934C = 0x800D934C; // force_migration:True
 D_800D503C = 0x800D503C; // force_migration:True
 D_800D5248 = 0x800D5248; // force_migration:True
@@ -21,7 +21,6 @@ Matrix* D_8013BBC8;
 Matrix D_8013BBD0[0x20];
 #endif

-// Matrix_Copy
 void Matrix_Copy(Matrix* dst, Matrix* src) {
    dst->m[0][0] = src->m[0][0];
    dst->m[0][1] = src->m[0][1];
@@ -57,18 +56,15 @@ void Matrix_Copy(Matrix* dst, Matrix* src) {
    // dst->ww = src->ww;
 }

-// Matrix_Push
 void Matrix_Push(Matrix** mtxStack) {
    Matrix_Copy(*mtxStack + 1, *mtxStack);
    *mtxStack += 1;
 }

-// Matrix_Pop
 void Matrix_Pop(Matrix** mtxStack) {
    *mtxStack -= 1;
 }

-// Matrix_Mult
 void Matrix_Mult(Matrix* mtx, Matrix* tf, u8 mode) {
    f32 rx;
    f32 ry;
@@ -120,7 +116,6 @@ void Matrix_Mult(Matrix* mtx, Matrix* tf, u8 mode) {
    }
 }

-// Matrix_Translate
 void Matrix_Translate(Matrix* mtx, f32 x, f32 y, f32 z, u8 mode) {
    f32 rx;
    f32 ry;
@@ -186,7 +181,6 @@ void Matrix_Scale(Matrix* mtx, f32 xScale, f32 yScale, f32 zScale, u8 mode);
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/matrix/Matrix_Scale.s")
 #endif

-// Matrix_RotateX
 void Matrix_RotateX(Matrix* mtx, f32 angle, u8 mode) {
    f32 cs;
    f32 sn;
@@ -225,7 +219,6 @@ void Matrix_RotateX(Matrix* mtx, f32 angle, u8 mode) {
    }
 }

-// Matrix_RotateY
 void Matrix_RotateY(Matrix* mtx, f32 angle, u8 mode) {
    f32 cs;
    f32 sn;
@@ -264,7 +257,6 @@ void Matrix_RotateY(Matrix* mtx, f32 angle, u8 mode) {
    }
 }

-// Matrix_RotateZ
 void Matrix_RotateZ(Matrix* mtx, f32 angle, u8 mode) {
    f32 cs;
    f32 sn;
@@ -303,7 +295,6 @@ void Matrix_RotateZ(Matrix* mtx, f32 angle, u8 mode) {
    }
 }

-// Matrix_RotateAxis
 void Matrix_RotateAxis(Matrix* mtx, f32 angle, f32 axisX, f32 axisY, f32 axisZ, u8 mode) {
    f32 rx;
    f32 ry;
@@ -505,7 +496,6 @@ void Matrix_MultVec3fNoTranslate(Matrix* mtx, Vec3f* src, Vec3f* dest) {
    dest->z = (mtx->m[0][2] * src->x) + (mtx->m[1][2] * src->y) + (mtx->m[2][2] * src->z);
 }

-// Matrix_GetYPRAngles
 void Matrix_GetYRPAngles(Matrix* mtx, Vec3f* rot) {
    Matrix invYP;
    Vec3f origin = { 0.0f, 0.0f, 0.0f };
@@ -525,16 +515,15 @@ void Matrix_GetYRPAngles(Matrix* mtx, Vec3f* rot) {
    xHatP.y -= originP.y;
    xHatP.z -= originP.z;
    rot->y = Math_Atan2F(zHatP.x, zHatP.z);
-    rot->x = -Math_Atan2F(zHatP.y, sqrtf((zHatP.x * zHatP.x) + (zHatP.z * zHatP.z)));
+    rot->x = -Math_Atan2F(zHatP.y, sqrtf(SQ(zHatP.x) + SQ(zHatP.z)));
    Matrix_RotateX(&invYP, -rot->x, 0);
    Matrix_RotateY(&invYP, -rot->y, 1);
    Matrix_MultVec3fNoTranslate(&invYP, &xHatP, &xHat);
-    rot->x *= 57.295776f;
-    rot->y *= 57.295776f;
-    rot->z = Math_Atan2F(xHat.y, xHat.x) * 57.295776f;
+    rot->x *= M_RTOD;
+    rot->y *= M_RTOD;
+    rot->z = Math_Atan2F(xHat.y, xHat.x) * M_RTOD;
 }

-// Matrix_GetXYZAngles
 void Matrix_GetXYZAngles(Matrix* mtx, Vec3f* rot) {
    Matrix invYZ;
    Vec3f origin = { 0.0f, 0.0f, 0.0f };
@@ -554,7 +543,7 @@ void Matrix_GetXYZAngles(Matrix* mtx, Vec3f* rot) {
    yHatP.y -= originP.y;
    yHatP.z -= originP.z;
    rot->z = Math_Atan2F(xHatP.y, xHatP.x);
-    rot->y = -Math_Atan2F(xHatP.z, sqrtf((xHatP.x * xHatP.x) + (xHatP.y * xHatP.y)));
+    rot->y = -Math_Atan2F(xHatP.z, sqrtf(SQ(xHatP.x) + SQ(xHatP.y)));
    Matrix_RotateY(&invYZ, -rot->y, 0);
    Matrix_RotateZ(&invYZ, -rot->z, 1);
    Matrix_MultVec3fNoTranslate(&invYZ, &yHatP, &yHat);
@@ -563,7 +552,6 @@ void Matrix_GetXYZAngles(Matrix* mtx, Vec3f* rot) {
    rot->z *= M_RTOD;
 }

-// Matrix_LookAt
 void Matrix_LookAt(Matrix* mtx, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp,
                   u8 mode) {
    Matrix lookAt;
@@ -572,7 +560,6 @@ void Matrix_LookAt(Matrix* mtx, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt,
    Matrix_Mult(mtx, &lookAt, mode);
 }

-// Matrix_SetMtx ?
 void Matrix_SetGfxMtx(Gfx** gfx) {
    Matrix_ToMtx(gGfxMtx);
    gSPMatrix((*gfx)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -46,7 +46,7 @@ void func_8002E548(void) {

        func_8008E51C(D_8015F930, D_8015F944);
        if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) {
-            func_80019218(0x4900C02A, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x4900C02A, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        }
    }
 }
@@ -1,7 +1,20 @@
-#include "common.h"
+#include "global.h"

-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A0F0/func_800594F0.s")
+void func_800594F0(Object_80* arg0) {
+    func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
+    Matrix_RotateY(D_8013B3C0, M_PI, 1);
+    Matrix_SetGfxMtx(&gMasterDisp);
+    gSPDisplayList(gMasterDisp++, D_6007D90);
+    func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
+}

-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A0F0/func_800595D0.s")
+void func_800595D0(Object_80* arg0) {
+    func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
+    Matrix_RotateY(D_8013B3C0, M_PI, 1);
+    Matrix_SetGfxMtx(&gMasterDisp);
+    gSPDisplayList(gMasterDisp++, D_6007CF0);
+    func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
+}

-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A0F0/func_800596B0.s")
+void func_800596B0(Object_2F4* arg0) {
+}
@@ -83,10 +83,10 @@ void func_80084B94(s32 arg0) {
                Matrix_Push(&D_8013B3C0);
                Matrix_Translate(D_8013B3C0, D_800D1A70[i - 1].x, D_800D1A70[i - 1].y, D_800D1A70[i - 1].z, 1);
                Matrix_Scale(D_8013B3C0, 0.68f, 0.68f, 1.0f, 1);
-                Matrix_RotateZ(D_8013B3C0, 0.7853982f, 1);
+                Matrix_RotateZ(D_8013B3C0, M_PI / 4.0f, 1);
                Matrix_SetGfxMtx(&gMasterDisp);
                gSPDisplayList(gMasterDisp++, D_500B600);
-                Matrix_RotateZ(D_8013B3C0, 4.712389f, 1);
+                Matrix_RotateZ(D_8013B3C0, 3.0f * M_PI / 2.0f, 1);
                Matrix_SetGfxMtx(&gMasterDisp);
                gSPDisplayList(gMasterDisp++, D_500B600);
                Matrix_Pop(&D_8013B3C0);
@@ -95,11 +95,11 @@ void func_80084B94(s32 arg0) {
    } else {
        Matrix_Push(&D_8013B3C0);
        Matrix_Translate(D_8013B3C0, -234.0f, -167.0f, -600.0f, 1);
-        Matrix_RotateZ(D_8013B3C0, 0.7853982f, 1);
+        Matrix_RotateZ(D_8013B3C0, M_PI / 4.0f, 1);
        Matrix_Scale(D_8013B3C0, 0.68f, 0.68f, 1.0f, 1);
        Matrix_SetGfxMtx(&gMasterDisp);
        gSPDisplayList(gMasterDisp++, D_500B600);
-        Matrix_RotateZ(D_8013B3C0, 4.712389f, 1);
+        Matrix_RotateZ(D_8013B3C0, 3.0f * M_PI / 2.0f, 1);
        Matrix_SetGfxMtx(&gMasterDisp);
        gSPDisplayList(gMasterDisp++, D_500B600);
        Matrix_Pop(&D_8013B3C0);
@@ -610,7 +610,7 @@ void func_80089D28(void) {
    if ((gb == 10) || (gb == 0)) {
        // clang-format off
        //! FAKE: Probably a MACRO
-        if (1) {func_80019218(0x4900001c, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);}
+        if (1) {func_80019218(0x4900001c, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);}
        // clang-format on
    }

@@ -792,7 +792,7 @@ void func_8008B044(void) {
                return;
            }

-            func_80019218(0x49002018, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);

            if (D_800CFF90 != 0) {
                func_8001AF40(1);
@@ -805,7 +805,7 @@ void func_8008B044(void) {
                D_80161790++;
                if (D_80161790 >= 7) {
                    if (D_80161794 & 1) {
-                        func_80019218(0x49002018, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                        func_80019218(0x49002018, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                    }
                    D_80161790 = 0;
                    D_80161794++;
@@ -1320,7 +1320,7 @@ void func_8008DE68(void) {

    if ((D_80161734 == 1) && (D_801778B0[2] > 0)) {
        if ((D_80177848 >= 0) && (D_801616BC == -1.0f)) {
-            func_80019218(0x4900C028, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x4900C028, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            D_801616BC = 255.0f;
        }

@@ -1712,7 +1712,7 @@ s32 func_80090A00(Object_2F4* arg0) {
            arg0->unk_124.x = D_80178280[0].unk_074 - 1000.0f;
            arg0->unk_058++;
            if (arg0->unk_05C == arg0->unk_058) {
-                func_80060FBC(&arg0->obj, arg0->unk_100);
+                func_80060FBC(&arg0->obj, &arg0->unk_100);
            }
            break;
    }
@@ -1893,7 +1893,7 @@ s32 func_80091368(Object_2F4* arg0) {
            }

            if (arg0->obj.pos.y > 3000.0f) {
-                func_80060FBC(&arg0->obj, arg0->unk_100);
+                func_80060FBC(&arg0->obj, &arg0->unk_100);
            }
            break;
    }
@@ -2029,7 +2029,7 @@ s32 func_80091CF8(Object_2F4* arg0) {
    if (arg0->unk_054 != 0) {
        if (arg0->unk_13C < 0.1f) {
            arg0->unk_13C = 20.0f;
-            func_80019218(0x09000002, arg0->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x09000002, &arg0->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            arg0->unk_188 = 5.0f;
        }
        arg0->unk_054 = 0;
@@ -2078,9 +2078,9 @@ s32 func_80091F00(Object_2F4* arg0) {
    }
    arg0->unk_0C6 = 20;

-    func_80019218(0x2903300E, arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    func_80019218(0x2903300E, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
    func_8007D10C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1.5f);
-    Matrix_RotateY(D_8013BBC8, arg0->unk_0F8 * (M_PI / 180), 0);
+    Matrix_RotateY(D_8013BBC8, arg0->unk_0F8 * M_DTOR, 0);

    if (Rand_ZeroOne() < 0.5f) {
        sp40.x = -20.0f;
@@ -2212,7 +2212,7 @@ void func_80093310(void) {
    if (1) {}
    this->obj.id = 195;
    func_800612B8(&this->unk_01C, this->obj.id);
-    func_80019218(0x11030010, this->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+    func_80019218(0x11030010, &this->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
 }

 void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) {
@@ -2289,7 +2289,7 @@ void func_80094954(Object_8C* arg0) {
        }

        if ((arg0->unk_4E == 1) && (arg0->unk_4A <= 0)) {
-            func_80060FBC(&arg0->obj, arg0->unk_80);
+            func_80060FBC(&arg0->obj, &arg0->unk_80);
        }

        arg0->unk_58 += arg0->unk_6C;
@@ -2318,7 +2318,7 @@ void func_80094954(Object_8C* arg0) {
    arg0->unk_4A -= arg0->unk_46;

    if ((arg0->unk_4A < 0) || ((temp->unk_1C8 == 2) && (D_80178234 == 13) && (temp->unk_1D0 == 5))) {
-        func_80060FBC(&arg0->obj, arg0->unk_80);
+        func_80060FBC(&arg0->obj, &arg0->unk_80);
    }
    arg0->obj.rot.z += arg0->unk_48;
 }
@@ -724,7 +724,7 @@ void func_EBFBE0_801948A8(void) {
    temp = func_EBFBE0_8019C418(&D_EBFBE0_801B9288, 3, 1, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9250);
    if (temp != 0) {
        D_EBFBE0_801B9270[sp34] = 255.0f;
-        func_80019218(0x49000002U, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000002U, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
    }

    if (D_EBFBE0_801B9288 == 0) {
@@ -740,12 +740,12 @@ void func_EBFBE0_801948A8(void) {
    }

    if (D_800DD898[D_80177AF8].button & A_BUTTON) {
-        func_80019218(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        D_EBFBE0_801B9288 = (D_EBFBE0_801B9288 + 1) & 3;
    }

    if (D_800DD898[D_80177AF8].button & B_BUTTON) {
-        func_80019218(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        if (D_EBFBE0_801B9284 == 1) {
            D_EBFBE0_801B9284 = 0;
            func_8001D8F4(D_EBFBE0_801B9284);
@@ -763,7 +763,7 @@ void func_EBFBE0_80194AEC(void) {
    s32 pad;

    if (func_EBFBE0_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9260) != 0) {
-        func_80019218(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        D_80177C74 = sp3C;
        if (D_80177C74 >= 3) {
            D_80177C74 = 0;
@@ -831,7 +831,7 @@ void func_EBFBE0_80195944(void) {
    f32 sp28 = D_EBFBE0_801B931C;

    if (func_EBFBE0_8019C66C(&sp28, 0.0f, 49.0f, &D_EBFBE0_801B9290) != 0) {
-        func_80019218(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        D_EBFBE0_801B931C = sp28;
    }

@@ -842,14 +842,14 @@ void func_EBFBE0_80195944(void) {

    if (D_800DD898[D_80177AF8].button & B_BUTTON) {
        if (!D_EBFBE0_801B9320) {
-            func_80019218(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            func_8001D444(0, 0x24, 0, 0xFF);
            D_80177898 = 0;
            D_EBFBE0_801B9124 = 1000;
            D_EBFBE0_801B912C = 0;
            D_EBFBE0_801B9244 = 1;
        } else {
-            func_80019218(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            func_800182F4(0x100100FF);
            func_800182F4(0x110100FF);
            D_EBFBE0_801B9320 = false;
@@ -918,7 +918,7 @@ void func_EBFBE0_801962A4(void) {

                case 1:
                    D_EBFBE0_801B91CC = 2;
-                    func_80019218(0x0940A00B, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    func_80019218(0x0940A00B, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                    D_801779A8[D_80177AF8] = 50.0f;
                    D_80177990[D_80177AF8] = 0;
                    break;
@@ -971,36 +971,36 @@ void func_EBFBE0_801962A4(void) {
 void func_EBFBE0_8019669C(void) {
    if ((D_EBFBE0_801B91CC == 0) || (D_EBFBE0_801B91CC == 1)) {
        if (func_EBFBE0_8019C5A0(&D_EBFBE0_801B91C0) != 0) {
-            func_80019218(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        }
        if (1) {}
    }

    if (D_800DD898[D_80177AF8].button & 0x8000) {
        if (D_EBFBE0_801B91CC == 3) {
-            func_80019218(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            D_EBFBE0_801B912C = 3;
        } else {
            D_EBFBE0_801B9330[D_EBFBE0_801B91C0] = 10;
            if (D_EBFBE0_801B91C0 == 0) {
                if (D_EBFBE0_801B91CC == 1) {
-                    func_80019218(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                    D_EBFBE0_801B912C = 2;
                } else {
-                    func_80019218(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                    D_EBFBE0_801B912C = 3;
                }
            } else {
-                func_80019218(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                D_EBFBE0_801B912C = 4;
            }
        }
    } else if (D_800DD898[D_80177AF8].button & 0x4000) {
        if (D_EBFBE0_801B91CC == 1) {
-            func_80019218(0x4900101D, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            D_EBFBE0_801B912C = 2;
        } else {
-            func_80019218(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            D_EBFBE0_801B912C = 3;
        }
    }
@@ -1037,7 +1037,7 @@ void func_EBFBE0_80196EFC(void) {
    func_EBFBE0_80196FC4();

    if (D_800DD898[D_80177AF8].button & B_BUTTON) {
-        func_80019218(0x49000021, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        D_80177898 = 0;
        D_EBFBE0_801B9124 = 1000;
        D_EBFBE0_801B912C = 0;
@@ -1052,7 +1052,7 @@ void func_EBFBE0_80196F9C(void) {

 void func_EBFBE0_80196FC4(void) {
    if (D_800DD898[D_80177AF8].button & A_BUTTON) {
-        func_80019218(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        D_EBFBE0_801B93E0 ^= 1;
    }

@@ -1066,7 +1066,7 @@ void func_EBFBE0_80196FC4(void) {

 void func_EBFBE0_80197074(void) {
    if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9400) != 0) {
-        func_80019218(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
        D_EBFBE0_801B91D4 = 114.0f - D_EBFBE0_801B93E4 * 130.0f;
        D_EBFBE0_801B91DC = 114.0f - D_EBFBE0_801B93E4 * 130.0f;
        D_EBFBE0_801B91D8 = -6.0f + D_EBFBE0_801B93E4 * 130.0f;
@@ -1083,7 +1083,7 @@ void func_EBFBE0_8019715C(void) {

    if (D_EBFBE0_801B91D0 != 0) {
        if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 1, 20, 2, 9, D_80177AF8, &D_EBFBE0_801B9408) != 0.00f) {
-            func_80019218(0x49000002, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+            func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
            D_EBFBE0_801B91DC = 114.0f - D_EBFBE0_801B93E4 * 130.0f;
            D_EBFBE0_801B91E0 = -6.0f + D_EBFBE0_801B93E4 * 130.0f;
            D_EBFBE0_801B91D0 = 0;
@@ -1765,7 +1765,7 @@ void func_EBFBE0_8019DE74(void) {
    func_EBFBE0_8019715C();

    if (D_800DD898[D_80177AF8].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN
-        func_80019218(0x49000003, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+        func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);

        D_80177898 = 0;
        D_EBFBE0_801B912C = 0;
@@ -1808,10 +1808,10 @@ void func_EBFBE0_8019E030(void) {
        case 1:
            if (D_EBFBE0_801B9178 == 0) {
                if (((D_80161714 * 64) >= 50000) && ((D_80161714 * 64) < 70000)) {
-                    func_80019218(0x49000032, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    func_80019218(0x49000032, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                }
                if ((D_80161714 * 64) >= 70000) {
-                    func_80019218(0x49000033, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                    func_80019218(0x49000033, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                }
                D_EBFBE0_801B9178 = 20;
                D_EBFBE0_801B912C++;
@@ -1820,7 +1820,7 @@ void func_EBFBE0_8019E030(void) {

        case 2:
            if ((D_EBFBE0_801B9178 == 0) && (D_800DD898[D_80177AF8].button & 0xD00E)) {
-                func_80019218(0x19031083, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
+                func_80019218(0x19031083, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
                D_EBFBE0_801B9090 = 1;
                D_EBFBE0_801B9178 = 60;
                D_EBFBE0_801B912C++;