fox_ma decompiled (#111)

* progress 1

* match functions

* data

* add brackets

* bss

* cleanup

* format

* post merge fixing

* cleanup 2

* suggestions

include/functions.h

@@ -37,8 +37,9 @@ u8* func_8001C3EC(void);
 void func_8001C8B8(u8);
 void func_8001CA24(u8);
 void func_8001CB80(u8, u8);
-void func_8001CCDC(u8, f32*);
-void func_8001CE28(u8, f32*);
+void func_8001CCDC(u8, f32 *);
+void func_8001CE28(u8, f32 *);
+void func_8001CFA8(f32);
 void func_8001D034(f32*, s32, u8);
 void func_8001D10C(f32*, u32);
 void func_8001D15C(u8);

include/i5.h

@@ -45,7 +45,7 @@ void func_i5_801A5E2C(Actor *);
 void func_i5_801A6134(Actor *);
 void func_i5_801A65E0(Object_80 *);
 void func_i5_801A7D98(Actor *);
-void func_i5_801ACFBC(ObjectInit*);
+void func_i5_801ACFBC();
 void func_i5_801AD080(void);
 void func_i5_801B5110(f32, f32, f32);
 void func_i5_801B58AC(Gfx **, f32);

include/structs.h

@@ -98,6 +98,22 @@ typedef struct {
     /* 0x14 */ f32 unk_14;
 } UnkStruct_D_menu_801B8294; // size = 0x18
 
+typedef struct {
+    /* 0x00 */ f32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ s16 unk_10;
+} UnkStruct_D_i5_801B8E50; //size = 0x14
+
+typedef struct {
+    /* 0x00 */ f32 unk_00;
+    /* 0x04 */ s16 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ s16 unk_10;
+} UnkStruct_D_i5_801BA1EC; //size = 0x14
+
 typedef enum OptionState {
     OPTION_WAIT,
     OPTION_SETUP,

linker_scripts/us/symbol_addrs_overlays.txt

@@ -119,11 +119,12 @@ func_i5_801A6134 = 0x801A6134;
 func_i5_801A65E0 = 0x801A65E0;
 func_i5_801A7D98 = 0x801A7D98;
 func_i5_801B6E20 = 0x801B6E20;
-D_i5_801BBEE0 = 0x801BBEE0;
-D_i5_801BA1E8 = 0x801BA1E8;
 D_i5_801B7584 = 0x801B7584;
 D_i5_801B7608 = 0x801B7608;
 D_i5_801B769C = 0x801B769C;
+D_i5_801BA1E8 = 0x801BA1E8;
+D_i5_801BA708 = 0x801BA708;//size:0xC type:Vec3f segment:ovl_i5
+D_i5_801BBEE0 = 0x801BBEE0;
 D_i5_801BE250 = 0x801BE250;
 D_i5_801BE258 = 0x801BE258;
 D_i5_801BE25C = 0x801BE25C;
@@ -145,5 +146,6 @@ D_i6_801A7F60 = 0x801A7F60;
 D_i6_801A7F68 = 0x801A7F68;
 D_i6_801A7F70 = 0x801A7F70;
 D_i6_801A7F78 = 0x801A7F78;
+D_i5_801BE308 = 0x801BE308;
 
 D_unused_801875C0 = 0x801875C0;

src/main/fox_play.c

@@ -4262,7 +4262,7 @@ void func_800B0F50(Player* playerx) {
             for (sp34 = D_80178310, i = 0; i < D_80177DC8; i++, sp34++) {
                 Object_Load(sp34, 4000.0f, -4000.0f, 4000.0f, -4000.0f);
             }
-            func_i5_801ACFBC(sp34);
+            func_i5_801ACFBC();
         }
     }
     if (player->state_1C8 == PLAYERSTATE_1C8_2) {

yamls/us/overlays.yaml

@@ -119,6 +119,7 @@
     - [0xE9A580, .data, fox_i5]
     - [0xE9A590, .data, fox_ti_cs]
     - [0xE9A650, data, fox_ti]
+    - [0xE9C140, .data, fox_ma]
     - [0xE9DC00, data, sf_i5_4]
     - [0xE9DCD0, .rodata, fox_i5]
     - [0xE9DCE0, .rodata, fox_ti_cs]
@@ -127,7 +128,7 @@
     - [0xE9F0E0, .rodata, sf_i5_4]
     - { start: 0xE9F1D0, type: .bss, vram: 0x801BBEE0, name: fox_i5 }
     - { type: bss, vram: 0x801BBEF0, name: fox_ti }
-    - { type: bss, vram: 0x801BE240, name: fox_ma }
+    - { type: .bss, vram: 0x801BE240, name: fox_ma }
     - { type: bss, vram: 0x801BE740, name: sf_i5_4 }
 
   - name: ovl_i6