Partial Sector Y decomp (#103)

* allbut2

* quick naming cleanup

* post merge warning/error cleanup

* hex, enums, extern funcs

* data

* bss

* u

* format

* review stuff

* format review stuff

* reorder externs

* suggestions

include/functions.h

@@ -308,10 +308,12 @@ void func_8006B95C(Object_80*);
 void func_8006BB78(Actor*);
 void func_8006C008(Actor*);
 void func_8006D350(Object_80*);
+void func_8006ECBC(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
 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_8006F254(Actor*);
 void func_80072594(Actor*);
 s32 func_80074F90(Object_80*);
 void func_80074FF0(Actor*);

include/macros.h

@@ -12,6 +12,7 @@
 #define SQ(x) ((x) * (x))
 #define VEC3F_SQ(vec) (SQ((vec).x) + SQ((vec).y) + SQ((vec).z))
 #define DOT_XYZ(a, b) ((a).x * (b).x + (a).y * (b).y + (a).z * (b).z)
+#define ABS(x) ((x) >= 0 ? (x) : -(x))
 
 #define USEC_TO_CYCLES(n) (((u64)(n)*(osClockRate/15625LL))/(1000000LL/15625LL))
 #define MSEC_TO_CYCLES(n) (USEC_TO_CYCLES((n) * 1000LL))

include/sf64object.h

@@ -151,7 +151,8 @@ typedef struct {
     /* 0x50 */ s8 unk_50;
     /* 0x51 */ char pad51[3];
     /* 0x54 */ s32 unk_54;
-    /* 0x58 */ char pad58[8];
+    /* 0x58 */ f32 unk_58;
+    /* 0x5C */ f32 unk_5C;
     /* 0x60 */ f32 unk_60;
     /* 0x64 */ Vec3f vel;
     /* 0x70 */ f32 sfxPos[3];

yamls/us/overlays.yaml

@@ -147,7 +147,7 @@
     - [0xEBE400, .data, fox_i6]
     - [0xEBE410, .data, fox_andross]
     - [0xEBE560, .data, fox_ve2]
-    - [0xEBE5C0, data, fox_sy]
+    - [0xEBE5C0, .data, fox_sy]
     - [0xEBE830, data, sf_i6_4]
     - [0xEBE840, .rodata, fox_i6]
     - [0xEBE850, .rodata, fox_andross]
@@ -156,7 +156,7 @@
     - [0xEBFB80, .rodata, sf_i6_4]
     - { start: 0xEBFBE0, type: .bss, vram: 0x801A7F30, name: fox_i6 }
     - { type: .bss, vram: 0x801A7F40, name: fox_andross }
-    - { type: bss, vram: 0x801A8440, name: fox_sy }
+    - { type: .bss, vram: 0x801A8440, name: fox_sy }
 
   - name: ovl_menu
     type: code