Titania decomp - 4 non-matching, 2 non-equiv (possibly equivalent) (#129)

* progress

* progress2

* more matches and remove warnings

* add non matching/equivs and move assets to top

* update post merge

* data

* bss

* clean up

* correct numbers

* address review

include/i5.h

@@ -52,7 +52,7 @@ void func_i5_801B58AC(Gfx **, f32);
 bool func_i5_801B6AEC(f32, f32, f32);
 s32 func_i5_801B6E20(f32, f32, f32 *, f32 *, f32 *);
 void func_i5_801AD144(PlayerShot*);
-void func_i5_80189120(f32 x, f32 y, f32 z, f32, f32);
+void func_i5_80189120(f32, f32, f32, f32, f32);
 bool func_i5_801A3C20(f32);
 s32 func_i5_801A3300(Player*, f32, f32);
 s32 func_i5_801A3790(Player*, f32, f32);
@@ -128,4 +128,25 @@ void func_i5_801AEC04(Actor*);
 void func_i5_801AEEFC(Actor*);
 s32 func_i5_801A55D4(s32 , Vec3f* , Vec3f* , s32 );
 
+typedef struct {
+    /* 0x00 */ PosRot unk_00;
+    /* 0x18 */ u16 unk_18;
+} UnkStruct_i5_801BD738; // size = 0x1C
+
+typedef struct {
+    /* 0x00 */ PosRot unk_00;
+    /* 0x18 */ f32 unk_18;
+    /* 0x1C */ f32 unk_1C;
+    /* 0x20 */ f32 unk_20;
+    /* 0x24 */ s16 unk_24;
+    /* 0x26 */ u16 unk_26;
+} UnkStruct_i5_801BBF00; // size = 0x28
+
+typedef struct {
+    s32 unk_00;
+    s32 unk_04;
+    Actor* actor;
+    s32 unk_0C;
+} UnkStruct_i5_801B8198; // size = 0x10
+
 #endif

linker_scripts/us/symbol_addrs_overlays.txt

@@ -145,9 +145,13 @@ func_i5_801B6E20 = 0x801B6E20;
 D_i5_801B7584 = 0x801B7584;
 D_i5_801B7608 = 0x801B7608;
 D_i5_801B769C = 0x801B769C;
+D_i5_801B8198 = 0x801B8198;//size:0x210 segment:ovl_i5
+D_i5_801B83A8 = 0x801B83A8;//size:0x814 type:f32 segment:ovl_i5
 D_i5_801BA1E8 = 0x801BA1E8;
 D_i5_801BA708 = 0x801BA708;//size:0xC type:Vec3f segment:ovl_i5
+D_i5_801BAA50 = 0x801BAA50;//size:0x26 type:s16 segment:ovl_i5
 D_i5_801BBEE0 = 0x801BBEE0;
+D_i5_801BBF00 = 0x801BBF00;//size:0xA78 segment:ovl_i5
 D_i5_801BE250 = 0x801BE250;
 D_i5_801BE258 = 0x801BE258;
 D_i5_801BE25C = 0x801BE25C;

linker_scripts/us/undefined_syms.ld

@@ -1217,3 +1217,61 @@ D_7002730 = 0x07002730;
 D_7002990 = 0x07002990;
 D_7002BF0 = 0x07002BF0;
 D_7002E50 = 0x07002E50;
+
+// fox_ti
+D_700DDF0 = 0x0700DDF0;
+D_700D9B0 = 0x0700D9B0;
+D_700DF70 = 0x0700DF70;
+D_700DC50 = 0x0700DC50;
+D_700DED0 = 0x0700DED0;
+D_700DAD0 = 0x0700DAD0;
+D_700DBB0 = 0x0700DBB0;
+D_700E030 = 0x0700E030;
+D_700D880 = 0x0700D880;
+D_700D740 = 0x0700D740;
+D_7005280 = 0x07005280;
+D_7003C50 = 0x07003C50;
+D_7003E30 = 0x07003E30;
+D_7004370 = 0x07004370;
+D_7004560 = 0x07004560;
+D_7003A90 = 0x07003A90;
+D_7005420 = 0x07005420;
+D_7003FC0 = 0x07003FC0;
+D_7002930 = 0x07002930;
+D_7009700 = 0x07009700;
+D_7004E80 = 0x07004E80;
+D_70049C0 = 0x070049C0;
+D_70045D0 = 0x070045D0;
+D_A001FA0 = 0x0A001FA0;
+D_900FE80 = 0x0900FE80;
+D_80018D0 = 0x080018D0;
+D_9005450 = 0x09005450;
+D_8009000 = 0x08009000;
+D_A002170 = 0x0A002170;
+D_8001FB0 = 0x08001FB0;
+D_90058A0 = 0x090058A0;
+D_90042A0 = 0x090042A0;
+D_90043D0 = 0x090043D0;
+D_90044E0 = 0x090044E0;
+D_90045F0 = 0x090045F0;
+D_80020D0 = 0x080020D0;
+D_7003F00 = 0x07003F00;
+D_8001D20 = 0x08001D20;
+D_8001E20 = 0x08001E20;
+D_80011C0 = 0x080011C0;
+D_8002360 = 0x08002360;
+D_90051C0 = 0x090051C0;
+D_8003640 = 0x08003640;
+D_900FC60 = 0x0900FC60;
+D_900FD70 = 0x0900FD70;
+D_9005600 = 0x09005600;
+D_8001630 = 0x08001630;
+D_80014A0 = 0x080014A0;
+D_9005040 = 0x09005040;
+D_7004400 = 0x07004400;
+D_7009890 = 0x07009890;
+D_8001A80 = 0x08001A80;
+D_A001DB0 = 0x0A001DB0;
+D_A001EC0 = 0x0A001EC0;
+D_A001BE0 = 0x0A001BE0;
+D_7004270 = 0x07004270;

yamls/us/overlays.yaml

@@ -118,7 +118,7 @@
     - [0xE97CC0, c, fox_ground]
     - [0xE9A580, .data, fox_i5]
     - [0xE9A590, .data, fox_ti_cs]
-    - [0xE9A650, data, fox_ti]
+    - [0xE9A650, .data, fox_ti]
     - [0xE9C140, .data, fox_ma]
     - [0xE9DC00, .data, fox_ground]
     - [0xE9DCD0, .rodata, fox_i5]
@@ -127,7 +127,7 @@
     - [0xE9E5A0, .rodata, fox_ma]
     - [0xE9F0E0, .rodata, fox_ground]
     - { start: 0xE9F1D0, type: .bss, vram: 0x801BBEE0, name: fox_i5 }
-    - { type: bss, vram: 0x801BBEF0, name: fox_ti }
+    - { type: .bss, vram: 0x801BBEF0, name: fox_ti }
     - { type: .bss, vram: 0x801BE240, name: fox_ma }
     - { type: .bss, vram: 0x801BE740, name: fox_ground }