sf_61B30 decomped (#25)

* my god it's done

* save for later

diff.py

@@ -0,0 +1 @@
+tools/asm-differ/diff.py

include/functions.h

@@ -14,6 +14,8 @@ void func_800032B4(Gfx** dList);
 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);
+
 f32 Math_ModF(f32 value, f32 mod);
 void Rand_Init(void);
 f32 Rand_ZeroOne(void);
@@ -61,10 +63,10 @@ void Fault_ThreadEntry(void*);
 void func_80007FE4(FrameBuffer*, u16, u16);
 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_8001A838(u32 arg0);
 void func_8001ACDC(s32);
 void func_8001AE58(void);
@@ -79,12 +81,6 @@ void func_8001DCE0(void);
 void func_8001DECC(void);
 SPTask* func_8001DF50(void);
 
-void RdRam_CheckIPL3(void);
-
-void Mio0_Decompress(void* header, u8* dst);
-
-s32 vsprintf(char* dst, char* fmt, va_list args);
-
 f32 func_8001FE60(f32);
 f64 func_8001FE6C(f64);
 s32 func_8001FE78(f32);
@@ -113,6 +109,11 @@ f32 func_8001FB58(f32);
 f32 func_8001FB88(f32);
 f32 func_8001FBA8(f32);
 f32 func_8001FBC8(f32);
+
+void RdRam_CheckIPL3(void);
+void Mio0_Decompress(void* header, u8* dst);
+s32 vsprintf(char* dst, char* fmt, va_list args);
+
 f32 Math_FAtanF(f32);
 f32 Math_FAtan2F(f32, f32);
 f32 Math_FAsinF(f32);
@@ -132,7 +133,8 @@ void func_8002E3E0(Object_2F4 *arg0);
 void func_8002E548(void);
 void func_8003DAF0(void);
 void func_80040CDC(void);
-
+void func_80042FAC(Object_408 *);       
+void func_80042FD0(Object_408 *);  
 u8 func_80058F14(u8 arg0, u8 arg1);
 void func_80059498(void);
 void func_8005980C(f32 arg0);
@@ -142,12 +144,72 @@ void func_80060FBC(Object*, f32*);
 void func_800612B8(ObjectStruct_1C*, u32);
 void func_800613C4(Object_2F4*);
 void func_80061474(Object_8C* arg0);
+void func_80061B68(void);
+void func_80061CD0(void);
+void func_80061E48(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3);
+void func_80061F0C(Object_2F4* arg0, ObjectInit* arg1, s32 arg2);
+void func_80062180(ObjectInit* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
+s32 func_800631A8(Vec3f*, f32*, Vec3f*);
+s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3);
+void func_800652CC(Object_80*);
+void func_800654E4(Object *);
+void func_800656D4(Object_2F4*);
 void func_800660F0(Object_2F4*);
+void func_80066254(Object_2F4*);
+void func_8006654C(Object_2F4*);
+void func_8006684C(Object_2F4*);
+void func_800669A0(Object_2F4*);
+void func_80066A80(Object_2F4*);
+void func_80066C00(Object_80*);
+void func_80066EF0(Object_6C *);                       /* extern */
+void func_800671D0(Object_6C *);
+void func_800674B4(f32, f32, f32, f32, f32, f32, f32, f32);
+void func_8006753C(Object_2F4*);
+void func_80067874(Object_2F4*);
+void func_80067B1C(Object_6C*);
+void func_80067BEC(Object_6C*);
+void func_80067F6C(Object_6C*);
+void func_80068020(Object_6C*);
+void func_800685D8(Object_6C*);
+void func_800685F8(Object_6C*);
+void func_80068618(Object_6C*);
+void func_80068688(Object_6C*);
+void func_80068914(Object_6C*);
+void func_80068C48(Object_6C*);
+void func_80068C88(Object_6C*);
+void func_80068FE0(Object_4C*);
+void func_800690D0(s32, s32);
+void func_80069924(Object_8C *);
+void func_800693E8(Object_2F4 *);
+void func_80069658(Object_408 *);
+void func_800696F8(Object_80 *);
+void func_80069858(Object_4C *);
+void func_80069A10(Object_6C *);
+void func_80069AAC(Object_2F4*);
+void func_80069CBC(Object_408 *);
+void func_80069DF4(Object_80 *);
+void func_80069E88(Object_4C *);
+void func_80069F30(Object_6C *);
+void func_80069FD4(Object_8C *);
+void func_8006A06C(UnkStruct_D_80174750*);
+void func_8006A38C(void);
+void func_8006B0A0(Object_2F4 *, s32);
 void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
 
+
+void func_800763A4(Object_2F4 *, s32);
+void func_8007717C(Object_2F4 *, s32);
 void func_80077240(f32, f32, f32, s32);
+void func_80078E50(f32, f32, f32, f32);
+void func_800794CC(f32, f32, f32, f32);
+void func_8007A6F0(Vec3f *, u32);
+void func_8007BFFC(f32, f32, f32, f32, f32, f32, f32, s32);
 void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32);
+void func_8007D074(f32, f32, f32, f32);
+void func_8007D0E0(f32, f32, f32, f32);
 void func_8007D10C(f32, f32, f32, f32);
+void func_8007D2C8(f32, f32, f32, f32);
+void func_8007F04C(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32); // Object_Spawn?
 
 void func_80084370(s32);
 void func_800843FC(s32);
@@ -177,15 +239,18 @@ void func_8008FA84(void);
 void func_8008FFF0(Object_408* arg0, s32);
 s32 func_8009092C(Object_2F4*);
 s32 func_800915FC(Object_2F4*);
+void func_80092D48(Object_2F4 *);  
 void func_80094D20(f32, f32);
-void func_8009F574(Gfx **, s32, s32, s32, s32, u8, u8, u8, u8);
+s32 func_800998FC(Vec3f*, Vec3f*, s32, s32, Vec3f*, Vec3f*);
+s16 func_8009ACDC(s16 *);
 f32 func_8009BC2C(f32*, f32, f32, f32, f32);
 f32 func_8009BD38(f32*, f32, f32, f32, f32);
 void func_8009D418(Gfx**, u16*, u32, u32, f32, f32, f32, f32);
 void func_8009D994(Gfx**, u16*, u32, u32, f32, f32, f32, f32);
+void func_8009F574(Gfx **, s32, s32, s32, s32, u8, u8, u8, u8);
 void func_8009F6CC(Vec3f*, f32, f32, f32);
-void func_8009FC0C(s32, s32, s32);
 f32 func_8009F768(f32);
+void func_8009FC0C(s32, s32, s32);
 void func_8009FEA0(s32, s32, s32);
 void func_800A1200(s32, s32, f32, f32, char*);
 void func_800A18B0(void);
@@ -199,11 +264,13 @@ void func_800A24DC(s32);
 void func_800A26C0(void);
 void func_800A25DC(void);
 Object_2F4 *func_800A3608(s32 arg0);
+s32 func_800A3690(Vec3f*, Vec3f*, s32, Vec3f*);
 void func_800A3CA0(void);
 s32 func_800A3F50(s32);
 void func_800A5844(void);
 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);
@@ -220,14 +287,64 @@ void func_800C2190(void);
 u16 func_800C2890(u16*);
 s32 func_800C2F30(u16*, s32);
 s32 func_800C3084(void);
-s32 func_800C3194(void);
+s32 func_800C3194(void); 
 
 void func_EFFA40_80187520(s32, void*);
-void func_EF0260_8018A96C(void);
-void func_EF0260_8018AAC4(void);
-void func_DF4260_801988E0(void);
-void func_EBFBE0_8019E8D0(void);
 
+void func_DF4260_801878D8(Object_408 *);
+void func_DF4260_801988E0(void);
+void func_DF4260_8018B0B4(Object_2F4 *);
+void func_DF4260_8018BE7C(Object_408 *);    
+void func_DF4260_8019250C(Object_2F4 *);    
+void func_DF4260_80192CB0(Object_2F4 *);    
+void func_DF4260_80192EA4(Object_2F4 *);
+void func_DF4260_801933B4(Object_2F4 *);    
+void func_DF4260_801935CC(Object_408 *);
+
+void func_E08400_80188A40(Object_408 *);
+
+void func_E16C50_80187754(Object_408 *);
+void func_E16C50_801932AC(Object_408 *);
+void func_E16C50_8019B1F0(Object_2F4 *);
+void func_E16C50_8019B810(Object_2F4 *);
+void func_E16C50_8019C200(Object_2F4 *);
+void func_E16C50_8019D060(Object_2F4 *);
+void func_E16C50_801AD688(Object_2F4 *);
+void func_E16C50_801AE3AC(Object_2F4 *);
+void func_E16C50_801AF9FC(Object_2F4 *);
+void func_E16C50_801B10F8(Object_408 *);
+void func_E16C50_801B6344(Object_2F4 *);
+void func_E16C50_801B6E54(Object_2F4 *);
+void func_E16C50_801B7AF0(Object_2F4 *);
+void func_E16C50_801BA57C(Object_2F4 *);
+void func_E16C50_801BB26C(Object_2F4 *);
+void func_E16C50_801915A4(Object_2F4 *);
+void func_E16C50_80191BB8(Object_2F4 *);
+
+void func_E51970_80193CA4(Object_408 *);
+
+void func_E6A810_80189B80(Object_2F4 *);
+void func_E6A810_8018ADC4(Object_2F4 *);
+void func_E6A810_8018B96C(Object_2F4 *);
+void func_E6A810_8018BFB0(Object_2F4 *);
+void func_E6A810_8018E3CC(Object_2F4 *);
+void func_E6A810_8018E5E8(Object_2F4 *);
+void func_E6A810_8018EFF0(Object_4C *); 
+void func_E6A810_8018F0D8(Object_80 *); 
+void func_E6A810_8018FA48(Object_408 *);
+void func_E6A810_80199F8C(Object_2F4 *);
+void func_E6A810_801A3E70(Object_2F4 *);
+void func_E6A810_801A4660(Object_2F4 *);
+void func_E6A810_801A4AF8(Object_2F4 *);
+void func_E6A810_801A5E2C(Object_2F4 *);
+void func_E6A810_801A6134(Object_2F4 *);
+void func_E6A810_801A65E0(Object_80 *); 
+void func_E6A810_801A7D98(Object_2F4 *);
+s32 func_E6A810_801B6AEC(f32, f32, f32);
+void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *); 
+
+void func_E9F1D0_80197CC4(Object_408 *);    
+void func_E9F1D0_8018D16C(Object_408 *); 
 
 void func_EBFBE0_801877F0(void);
  s32 func_EBFBE0_80187ABC(void);
@@ -262,5 +379,15 @@ void func_EBFBE0_801918FC(void);
 void func_EBFBE0_8018D2B8(s32);
 void func_EBFBE0_8018EA78(s32);
 void func_EBFBE0_80191674(f32, f32, f32, f32*, f32*, f32*);
+void func_EBFBE0_8019E8D0(void);
 
+void func_EF0260_8018A96C(void);
+void func_EF0260_8018AAC4(void);
+
+void func_E08400_80187B08(Object_2F4 *, s32);
+void func_E9F1D0_801888F4(Object_2F4 *, s32);
+void func_E6A810_8018B720(Object_2F4 *, s32);
+void func_E51970_80198594(Object_408 *, s32);
+void func_E6A810_801990DC(Object_408 *, s32);
+void func_E6A810_8018E3B0(Object_2F4 *);
 #endif

include/structs.h

@@ -124,33 +124,50 @@ typedef struct UnkStruct_D_80178280 {
     /* 0x080 */ char pad80[0x2C];
     /* 0x0AC */ f32 unk_0AC;
     /* 0x0B0 */ f32 unk_0B0;
-    /* 0x0B4 */ char padB4[0xC];
+    /* 0x0B4 */ f32 unk_0B4;
+    /* 0x0B8 */ f32 unk_0B8;
+    /* 0x0BC */ f32 unk_0BC;
     /* 0x0C0 */ f32 unk_0C0;
     /* 0x0C4 */ f32 unk_0C4;
     /* 0x0C8 */ char padC8[8];
     /* 0x0D0 */ f32 unk_0D0;
-    /* 0x0D4 */ char padD4[0x44];
+    /* 0x0D4 */ char padD4[0x3C];
+    /* 0x110 */ f32 unk_110;
+    /* 0x114 */ f32 unk_114;
     /* 0x118 */ f32 unk_118;
-    /* 0x11C */ char pad11C[0x1C];
+    /* 0x11C */ char pad11C[8];
+    /* 0x124 */ f32 unk_124;
+    /* 0x128 */ char pad128[0x10];
     /* 0x138 */ f32 unk_138;
     /* 0x13C */ char pad13C[0x8C];
     /* 0x1C8 */ s32 unk_1C8;
     /* 0x1CC */ s32 unk_1CC;
     /* 0x1D0 */ s32 unk_1D0;
-    /* 0x1D4 */ char pad1D4[0x3C];
+    /* 0x1D4 */  char pad1D4[0x20];
+    /* 0x1F4 */ s32 unk_1F4;
+    /* 0x1F8 */ char pad1F8[0x18];
     /* 0x210 */ s32 unk_210;
     /* 0x214 */ char pad214[0x10];
     /* 0x224 */ s32 unk_224;
     /* 0x228 */ s32 unk_228;
-    /* 0x22C */ char pad22C[0x38];
+    /* 0x22C */ char pad22C[0xC];
+    /* 0x238 */ s32 unk_238;
+    /* 0x23C */ char pad23C[0x28];
     /* 0x264 */ s32 unk_264;
     /* 0x268 */ char pad268[0x4];
     /* 0x26C */ s32 unk_26C;
-    /* 0x270 */ char pad270[0x44];
+    /* 0x270 */ char pad270[0xC];
+    /* 0x27C */ s32 unk_27C;
+    /* 0x280 */ char pad280[0x34];
     /* 0x2B4 */ s32 unk_2B4;
     /* 0x2B8 */ char pad2B8[0x4];
     /* 0x2BC */ f32 unk_2BC;
-    /* 0x2C0 */ char pad2C0[0x220];
+    /* 0x2C0 */ char pad2C0[0x1A0];
+    /* 0x460 */ f32 unk_460[1]; // might be Vec3f
+    /* 0x464 */ char pad464[0x38];
+    /* 0x49C */ u8 unk_49C;
+    /* 0x49D */ u8 unk_49D;
+    /* 0x49E */ char pad49E[0x42];
 } UnkStruct_D_80178280; // size = 0x4E0 Might be Player
 
 typedef struct {
@@ -172,12 +189,14 @@ typedef struct {
 } Object; // size = 0x1C
 
 typedef struct {
-    /* 0x00 */ char unk0[0xC];
+    /* 0x00 */ char unk0[0x8];
+    /* 0x08 */ void (*unk_8)(Object*);
     /* 0x0C */ void* unk_C;
     /* 0x10 */ f32 unk_10;
     /* 0x14 */ char unk14[0x2];
     /* 0x16 */ s16 unk_16;
-    /* 0x18 */ char unk18[0xC];
+    /* 0x18 */ char unk18[0x8];
+    /* 0x20 */ u8 unk_20;
 } ObjectStruct_1C; // size = 0x24
 
 typedef struct {
@@ -186,17 +205,42 @@ typedef struct {
     /* 0x40 */ char unk40[0x18];
 } Object_58; // size = 0x58
 
+typedef struct {
+    /* 0x00 */ u8 unk_00;
+    /* 0x02 */ u16 unk_02;
+    /* 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 */ char pad28[8];
+} UnkStruct_D_80174750;
+
 typedef struct {
     /* 0x00 */ Object obj;
     /* 0x1C */ ObjectStruct_1C unk_1C;
-    /* 0x40 */ char unk_40[0x40];
+    /* 0x40 */ s32 unk_40;
+    /* 0x44 */ s32 unk_44;
+    /* 0x48 */ s32 unk_48;
+    /* 0x4C */ s32 unk_4C;
+    /* 0x50 */ char pad50[0x10];
+    /* 0x60 */ f32 unk_60;
+    /* 0x64 */ f32 unk_64;
+    /* 0x68 */ char pad68[8];
+    /* 0x70 */ f32 unk_70;
+    /* 0x74 */ char pad74[0xC];
 } Object_80; // size = 0x80
 
 typedef struct {
     /* 0x00 */ Object obj;
     /* 0x1C */ ObjectStruct_1C unk_1C;
-    /* 0x40 */ char pad40[5];
+    /* 0x40 */ s32 unk_40;
-    /* 0x45 */ s8 unk_45;
+    /* 0x44 */ char pad44[1];
+    /* 0x45 */ u8 unk_45; // could be short loaded as u8
     /* 0x46 */ s8 unk_46;
     /* 0x47 */ char pad47[5];
 } Object_4C; // size = 0x4C
@@ -204,21 +248,31 @@ typedef struct {
 typedef struct {
     /* 0x00 */ Object obj;
     /* 0x1C */ ObjectStruct_1C unk_1C;
-    /* 0x40 */ char unk40[0x28];
+    /* 0x40 */ s32 unk_40;
+    /* 0x44 */ s16 unk_44;
+    /* 0x46 */ u8 unk_46;
+    /* 0x48 */ u16 unk_48;
+    /* 0x4A */ u16 unk_4A;
+    /* 0x4C */ s8 unk_4C;
+    /* 0x4E */ s16 unk_4E;
+    /* 0x50 */ f32 unk_50;
+    /* 0x54 */ f32 unk_54;
+    /* 0x58 */ f32 unk_58;
+    /* 0x5C */ f32 unk_5C[3]; // could be Vec3f
     /* 0x68 */ f32 unk_68;
 } Object_6C; // size 0x6C
 
 typedef struct {
     /* 0x00 */ Object obj;
     /* 0x1C */ ObjectStruct_1C unk_1C;
-    /* 0x40 */ char pad40[0x4];
+    /* 0x40 */ s32 unk_40;
     /* 0x44 */ s16 unk_44;
     /* 0x46 */ s16 unk_46;
     /* 0x48 */ s16 unk_48;
     /* 0x4A */ s16 unk_4A;
     /* 0x4C */ char pad4C[0x2];
     /* 0x4E */ s16 unk_4E;
-    /* 0x50 */ s16  unk_50;
+    /* 0x50 */ u16 unk_50;
     /* 0x50 */ char pad50[0x2];
     /* 0x54 */ f32 unk_54;
     /* 0x58 */ f32 unk_58;
@@ -234,23 +288,41 @@ typedef struct {
 typedef struct {
     /* 0x000 */ Object obj;
     /* 0x01C */ ObjectStruct_1C unk_01C;
-    /* 0x040 */ char pad40[0xE];
+    /* 0x040 */ s32 unk_40;
+    /* 0x044 */ char unk_44[0xA];
     /* 0x04E */ s16 unk_04E;
-    /* 0x050 */ char pad50[0x12];
+    /* 0x050 */ s16 unk_050;
+    /* 0x052 */ s16 unk_052;
+    /* 0x054 */ s16 unk_054;
+    /* 0x056 */ s16 unk_056;
+    /* 0x058 */ s16 unk_058;
+    /* 0x05A */ s16 unk_05A;
+    /* 0x05C */ s16 unk_05C;
+    /* 0x05E */ char pad5E[4];
     /* 0x062 */ s8 unk_062;
-    /* 0x063 */ char pad63[0x79];
+    /* 0x063 */ char pad63[9];   
+    /* 0x06C */ f32 unk_6C;       
+    /* 0x070 */ f32 unk_70;       
+    /* 0x074 */ f32 unk_74;       
+    /* 0x078 */ char pad78[0xC]; 
+    /* 0x084 */ f32 unk_84;       
+    /* 0x088 */ char pad88[0x54];
     /* 0x0DC */ f32 unk_0DC;
     /* 0x0E0 */ f32 unk_0E0;
     /* 0x0E4 */ char padE4[0x314];
     /* 0x3F8 */ f32 unk_3F8;
-    /* 0x3FC */ char pad3FC[0xC];
+    /* 0x3FC */ f32 unk_3FC;
+    /* 0x400 */ char pad400[8];
 } Object_408; // size = 0x408
 
 typedef struct {
     /* 0x000 */ Object obj;
     /* 0x01C */ ObjectStruct_1C unk_01C;
     /* 0x040 */ s32 unk_040;
-    /* 0x044 */ char pad044[0xC];
+    /* 0x044 */ u8 unk_44;
+    /* 0x046 */ s16 unk_46;
+    /* 0x048 */ s16 unk_48;
+    /* 0x04A */ char pad4A[6];
     /* 0x050 */ s32 unk_050;
     /* 0x054 */ s32 unk_054;
     /* 0x058 */ s32 unk_058;
@@ -264,18 +336,22 @@ typedef struct {
     /* 0x078 */ s32 unk_078;
     /* 0x07C */ s32 unk_07C;
     /* 0x080 */ s32 unk_080;
-    /* 0x084 */ char pad84[0x30];
+    /* 0x084 */ char pad84[8];
+    /* 0x08C */ s32 unk_8C;
+    /* 0x090 */ char pad90[0x24];
     /* 0x0B4 */ s16 unk_0B4;
     /* 0x0B6 */ s16 unk_0B6;
     /* 0x0B8 */ s16 unk_0B8;
     /* 0x0BA */ char pad0BA[0x2];
     /* 0x0BC */ u16 unk_0BC;
     /* 0x0BC */ u16 unk_0BE;
-    /* 0x0C0 */ char padC0[2];
+    /* 0x0C0 */ u16 unk_0C0;
     /* 0x0C2 */ u16 unk_0C2;
-    /* 0x0C4 */ char padC4[2];
+    /* 0x0C4 */ u16 unk_0C4;
     /* 0x0C6 */ u16 unk_0C6;
-    /* 0x0C8 */ char pad0C8[0x6];
+    /* 0x0C8 */ char padC8[1]; // could be u16 loaded as u8
+    /* 0x0C9 */ u8 unk_0C9;
+    /* 0x0C9 */ u8 unk_0CA[4];
     /* 0x0CE */ s16 unk_0CE;
     /* 0x0D0 */ s8 unk_0D0;
     /* 0x0D1 */ s16 unk_0D2;
@@ -291,7 +367,7 @@ typedef struct {
     /* 0x0F8 */ f32 unk_0F8; // angle
     /* 0x0FC */ f32 unk_0FC;
     /* 0x100 */ f32 unk_100[3]; // may be Vec3f
-    /* 0x10C */ char pad10C[0x4];
+    /* 0x10C */ f32 unk_10C;
     /* 0x110 */ f32 unk_110;
     /* 0x114 */ f32 unk_114;
     /* 0x118 */ f32 unk_118;
@@ -314,7 +390,7 @@ typedef struct {
     /* 0x178 */ f32 unk_178;
     /* 0x17C */ f32 unk_17C;
     /* 0x180 */ f32 unk_180;
-    /* 0x184 */ char pad184[4];
+    /* 0x184 */ f32 unk_184;
     /* 0x188 */ f32 unk_188;
     /* 0x18C */ char pad18C[0x150];
     /* 0x2DC */ Vec3f unk_2DC;

include/variables.h

@@ -159,9 +159,14 @@ extern OverlayInit D_800CBA44[2]; // E6A810
 extern OverlayInit D_800CBB74[1]; // DF4260
 extern OverlayInit D_800CBC0C[1]; // E08400
 extern OverlayInit D_800CBD3C[1]; // EFFA40
+extern f32 D_800CBF18[];
 extern ObjectStruct_1C D_800CC124[400];
 extern ObjectInit* D_800CFDA0[];
+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 f32 D_800D19AC[];
 extern f32 D_800D19E0[];
@@ -195,7 +200,9 @@ extern s32 D_8015F930[3];
 extern s32 D_8015F93C;
 extern s32 D_8015F940;
 extern f32 D_8015F944;
+extern s32 D_80161670[4];
 extern s32 D_80161680;
+extern u8 D_80161684;
 extern s32 D_80161690;
 extern f32 D_801616BC;
 extern f32 D_801616C0;
@@ -232,12 +239,18 @@ extern u8 D_80161A39;
 extern f32 D_80161A3C;
 extern f32 D_80161A40;
 extern f32 D_80161A44;
+extern u8 D_80161A50;
 extern f32 D_80161A54;
 extern s32 D_80161A5C;
 extern u16 D_80161A62;
+extern s32 D_80161A88;
+extern s32 D_80161A8C;
 extern u8 D_80161A90[];
 extern s32 D_80161A98;
+extern s32 D_80161A9C;
 extern s16 D_80161AA0[];
+extern s32 D_80161AA8[];
+extern s32 D_80161AB8;
 extern Object_80 D_80161B00[50];
 extern Object_4C D_80163400[40];
 extern Object_2F4 D_80163FE0[60];
@@ -245,7 +258,7 @@ extern Object_408 D_8016F110[4];
 extern Object_8C D_80170130[100];
 extern Object_6C D_801737E0[20];
 // extern size_70 D_80174050[16]
-// extern size_30 D_80174750[100]
+extern UnkStruct_D_80174750 D_80174750[100];
 extern UnkStruct_D_80175A10 D_80175A10[64];
 extern UnkStruct_D_80175A10 D_80176410;
 // extern size_1C D_80176438[10]
@@ -277,12 +290,12 @@ extern s32 D_8017789C;
 extern s32 D_801778A0;
 extern s32 D_801778A4;
 extern s32 D_801778A8;
-extern u8 D_801778AB;
 extern s32 D_801778B0[];
-extern s32 D_801778B8;
+extern s32 D_801778D0[];
 extern s32 D_801778E8;
 extern u16 D_80177908[];
 extern u16 D_80177928[];
+extern s8 D_80177930;
 extern u16 D_80177938[];
 extern f32 D_80177940;
 extern u16 D_80177948[];
@@ -294,6 +307,7 @@ extern f32 D_80177988;
 extern f32 D_801779A0;
 extern f32 D_801779B8;
 extern f32 D_801779C0;
+extern s32 D_801779C8[];
 extern s32 D_801779F8;
 extern s32 D_80177A80;
 extern s8 D_80177A98;
@@ -311,28 +325,36 @@ extern s32 D_80177C9C;
 extern s32 D_80177CA0;
 extern s32 D_80177CA4;
 extern s32 D_80177CAC;
+extern f32 D_80177CB0;
 extern s32 D_80177CB4;
 extern s32 D_80177CBC;
 extern s32 D_80177CC4;
 extern f32 D_80177D08;
+extern s32 D_80177D10[];
 extern f32 D_80177D20;
+extern s32 D_80177D28[];
+extern s32 D_80177D40[];
 extern f32 D_80177D50;
+extern s32 D_80177D58[];
 extern f32 D_80177D68;
 extern s32 D_80177DA0[];
 extern s32 D_80177DB0;
 extern s32 D_80177DC8;
 extern s32 D_80177E70;
 extern s32 D_80177E78;
+extern s32 D_80177E80;
 extern Vec3f D_80177E88;
 extern Vec3f D_80177F10;
 extern s32 D_8017812C;
 extern s32 D_80178234;
 extern s32 D_8017827C;
 extern UnkStruct_D_80178280* D_80178280;
+extern s32 D_80178284;
 extern s32 D_8017829C;
 extern s32 D_801782A4;
 extern Object_58 *D_801782A8;
 extern s32 D_801782B8;
+extern f32 *D_801782C4;
 extern s32 D_801782D8;
 extern s32 D_801782E8;
 extern s32 D_801782F8;
@@ -349,11 +371,19 @@ extern s32 D_80178380[];
 extern s32 D_80178390[];
 extern s32 D_801783A0[];
 extern s32 D_801783B0[];
+extern s32 D_801783D8;
 extern s32 D_80178410;
 extern f32 D_80178420;
 extern f32 D_80178424;
 extern f32 D_80178428;
 extern f32 D_8017842C;
+extern s32 D_80178480;
+extern s32 D_80178488;
+extern s32 D_801784A4;
+extern s32 D_801784AC;
+extern s32 D_801784DC;
+extern s32 D_801784E0;
+extern s32 D_801784E4;
 extern s32 D_80178548;
 extern s32 D_8017854C;
 extern s32 D_80178550;
@@ -477,6 +507,7 @@ extern u16 D_1012988[];
 extern u8 D_10129C0[];
 extern u16 D_1013090[];
 extern Gfx D_1015510[];
+extern Gfx D_10177C0[];
 extern Gfx D_1023750[];
 extern Gfx D_1024230[];
 extern Gfx D_1024830[];
@@ -546,6 +577,17 @@ extern u8 D_500A6E0[];
 extern u8 D_500A7D0[];
 extern Gfx D_500B600[];
 
+extern f32 D_6006940[];
+extern f32 D_600695C[];
+extern f32 D_6006978[];
+extern f32 D_6006994[];
+extern f32 D_60069B0[];
+extern f32 D_60069CC[];
+extern f32 D_60069E8[];
+extern f32 D_6006A04[];
+extern f32 D_6006A20[];
+extern s16 D_6029528[];
+
 extern ObjectInit* D_6010088[];
 extern ObjectInit* D_602B148[];
 extern ObjectInit* D_602F18C[];

linker_scripts/us/symbol_addrs_overlays.txt

@@ -1,30 +1,73 @@
+func_DF4260_8018ED78 = 0x8018ED78;
+func_DF4260_8018EE84 = 0x8018EE84;
+func_DF4260_8018B0B4 = 0x8018B0B4;
+func_DF4260_801878D8 = 0x801878D8;
+func_DF4260_8018BE7C = 0x8018BE7C;
+func_DF4260_8019250C = 0x8019250C;
+func_DF4260_80192CB0 = 0x80192CB0;
+func_DF4260_80192EA4 = 0x80192EA4;
+func_DF4260_801933B4 = 0x801933B4;
+func_DF4260_801935CC = 0x801935CC;
 D_DF4260_8019B6C0 = 0x8019B6C0;
-D_E08400_80195D70 = 0x80195D70;
-D_E16C50_801C2240 = 0x801C2240;
-D_E51970_801A03C0 = 0x801A03C0;
-D_E6A810_801BBEE0 = 0x801BBEE0;
-D_E9F1D0_801A7F30 = 0x801A7F30;
-D_EFFA40_801875C0 = 0x801875C0;
-
-D_E6A810_801BA1E8 = 0x801BA1E8;
-D_E51970_8019EE80 = 0x8019EE80;
-
-D_E51970_801A03DC = 0x801A03DC;
-
-D_E16C50_801C4188 = 0x801C4188;
-
-D_E9F1D0_801A7F58 = 0x801A7F58;
-D_E9F1D0_801A7F60 = 0x801A7F60;
-D_E9F1D0_801A7F68 = 0x801A7F68;
-D_E9F1D0_801A7F70 = 0x801A7F70;
-D_E9F1D0_801A7F78 = 0x801A7F78;
-
 D_DF4260_8019A008 = 0x8019A008;
 
+func_E08400_80187B08 = 0x80187B08;
+func_E08400_80188A40 = 0x80188A40;
+D_E08400_80195D70 = 0x80195D70;
+
+func_E16C50_80187754 = 0x80187754;
+func_E16C50_801932AC = 0x801932AC;
+func_E16C50_8019B1F0 = 0x8019B1F0;
+func_E16C50_8019B810 = 0x8019B810;
+func_E16C50_8019C200 = 0x8019C200;
+func_E16C50_8019D060 = 0x8019D060;
+func_E16C50_801AD688 = 0x801AD688;
+func_E16C50_801AE3AC = 0x801AE3AC;
+func_E16C50_801AF9FC = 0x801AF9FC;
+func_E16C50_801B10F8 = 0x801B10F8;
+func_E16C50_801B6344 = 0x801B6344;
+func_E16C50_801B6E54 = 0x801B6E54;
+func_E16C50_801B7AF0 = 0x801B7AF0;
+func_E16C50_801BA57C = 0x801BA57C;
+func_E16C50_801BB26C = 0x801BB26C;
+func_E16C50_801915A4 = 0x801915A4;
+func_E16C50_80191BB8 = 0x80191BB8;
+D_E16C50_801C2240 = 0x801C2240;
+D_E16C50_801C4188 = 0x801C4188;
+
+func_E51970_80198594 = 0x80198594;
+func_E51970_80193CA4 = 0x80193CA4;
+D_E51970_801A03C0 = 0x801A03C0;
+D_E51970_8019EE80 = 0x8019EE80;
+D_E51970_801A03DC = 0x801A03DC;
+
+func_E6A810_8018E3B0 = 0x8018E3B0;
+func_E6A810_8018B720 = 0x8018B720;
+func_E6A810_801990DC = 0x801990DC;
+func_E6A810_801B6AEC = 0x801B6AEC;
+func_E6A810_80189B80 = 0x80189B80;
+func_E6A810_8018ADC4 = 0x8018ADC4;
+func_E6A810_8018B96C = 0x8018B96C;
+func_E6A810_8018BFB0 = 0x8018BFB0;
+func_E6A810_8018E3CC = 0x8018E3CC;
+func_E6A810_8018E5E8 = 0x8018E5E8;
+func_E6A810_8018EFF0 = 0x8018EFF0;
+func_E6A810_8018F0D8 = 0x8018F0D8;
+func_E6A810_8018FA48 = 0x8018FA48;
+func_E6A810_80199F8C = 0x80199F8C;
+func_E6A810_801A3E70 = 0x801A3E70;
+func_E6A810_801A4660 = 0x801A4660;
+func_E6A810_801A4AF8 = 0x801A4AF8;
+func_E6A810_801A5E2C = 0x801A5E2C;
+func_E6A810_801A6134 = 0x801A6134;
+func_E6A810_801A65E0 = 0x801A65E0;
+func_E6A810_801A7D98 = 0x801A7D98;
+func_E6A810_801B6E20 = 0x801B6E20;
+D_E6A810_801BBEE0 = 0x801BBEE0;
+D_E6A810_801BA1E8 = 0x801BA1E8;
 D_E6A810_801B7584 = 0x801B7584;
 D_E6A810_801B7608 = 0x801B7608;
 D_E6A810_801B769C = 0x801B769C;
-
 D_E6A810_801BE250 = 0x801BE250;
 D_E6A810_801BE258 = 0x801BE258;
 D_E6A810_801BE25C = 0x801BE25C;
@@ -34,3 +77,16 @@ D_E6A810_801BE284 = 0x801BE284;
 D_E6A810_801BE29C = 0x801BE29C;
 D_E6A810_801BE2FA = 0x801BE2FA;
 D_E6A810_801BE2A4 = 0x801BE2A4;
+
+func_E9F1D0_801888F4 = 0x801888F4;
+func_E9F1D0_80197CC4 = 0x80197CC4;
+func_E9F1D0_8018D16C = 0x8018D16C;
+D_E9F1D0_801A7F30 = 0x801A7F30;
+D_E9F1D0_801A7F58 = 0x801A7F58;
+D_E9F1D0_801A7F60 = 0x801A7F60;
+D_E9F1D0_801A7F68 = 0x801A7F68;
+D_E9F1D0_801A7F70 = 0x801A7F70;
+D_E9F1D0_801A7F78 = 0x801A7F78;
+
+D_EFFA40_801875C0 = 0x801875C0;
+

src/main/sf_A24B0.c

@@ -9,7 +9,7 @@ void func_800A18B0(void) {
     func_80006F20();
     Rand_Init();
     Rand_SetSeed(1, 29000, 9876);
-    D_80177834 = 0x64;
+    D_80177834 = 100;
     D_8017783C = 0;
     D_80161A36 = 0;
     D_80161A38 = 0xFF;
@@ -17,7 +17,7 @@ void func_800A18B0(void) {
     D_80161A40 = 10.0f;
     D_80161A44 = 12800.0f;
     D_80161A10 = D_80161A14 = 0.0f;
-    D_801774F8 = 0x63;
+    D_801774F8 = 99;
     D_80177820 = 0;
     func_80059498();
     D_80161A39 = 1;
@@ -289,7 +289,7 @@ void func_800A26C0(void) {
     func_800A25DC();
     if (func_800A1B6C() != 1) {
         func_8000316C(&gUnkDisp1);
-        func_800A1FB0(&gUnkDisp1, D_801778AB, 0);
+        func_800A1FB0(&gUnkDisp1, D_801778A8, 0);
         if (D_8017783C != 0) {
             D_8017783C--;
         }
@@ -435,9 +435,9 @@ void func_800A26C0(void) {
         } else if ((D_801778A8 == 4) && (D_80177898 != 0)) {
             func_800A1FB0(&gMasterDisp, D_801778A8, 3);
             func_800A24DC(3);
-            func_800A1FB0(&gMasterDisp, D_801778AB, 2);
+            func_800A1FB0(&gMasterDisp, D_801778A8, 2);
             func_800A24DC(2);
-            func_800A1FB0(&gMasterDisp, D_801778AB, 1);
+            func_800A1FB0(&gMasterDisp, D_801778A8, 1);
             func_800A24DC(1);
             gDPPipeSync(gMasterDisp++);
             gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, 312, 232);

src/main/sf_hud.c

@@ -1318,7 +1318,7 @@ void func_8008DE68(void) {
     f32 temp7;
     f32 var_fv0;
 
-    if ((D_80161734 == 1) && (D_801778B8 > 0)) {
+    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);
             D_801616BC = 255.0f;

src/overlays/ovl_DF4260/DFEE30.c

@@ -31,9 +31,9 @@ void func_DF4260_801924A8(UnkStruct_func_DF4260_801924A8* arg0) {
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192AA4.s")
 
-void func_DF4260_80192CB0(UnkStruct_func_DF4260_80192CB0* arg0) {
+void func_DF4260_80192CB0(Object_2F4* arg0) {
-    arg0->unk50 = arg0->unk10;
+    arg0->unk_050 = arg0->obj.rot.x;
-    arg0->unk10 = 0.0f;
+    arg0->obj.rot.x = 0.0f;
 }
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192CD4.s")