diff --git a/config/RSBE01_02/rels/sora_melee/symbols.txt b/config/RSBE01_02/rels/sora_melee/symbols.txt
index 403a927..376d302 100644
--- a/config/RSBE01_02/rels/sora_melee/symbols.txt
+++ b/config/RSBE01_02/rels/sora_melee/symbols.txt
@@ -5091,7 +5091,7 @@ fn_27_84398 = .text:0x00084398; // type:function size:0x40
 fn_27_843D8 = .text:0x000843D8; // type:function size:0x40
 fn_27_84418 = .text:0x00084418; // type:function size:0x40
 fn_27_84458 = .text:0x00084458; // type:function size:0x40
-fn_27_84498 = .text:0x00084498; // type:function size:0x40
+__dt__50soInstanceUnitFullProperty<P19soLinkEventObserver>Fv = .text:0x00084498; // type:function size:0x40
 fn_27_844D8 = .text:0x000844D8; // type:function size:0x40
 fn_27_84518 = .text:0x00084518; // type:function size:0x40
 fn_27_84558 = .text:0x00084558; // type:function size:0x40
@@ -5645,7 +5645,7 @@ fn_27_87230 = .text:0x00087230; // type:function size:0x14
 fn_27_87244 = .text:0x00087244; // type:function size:0x168
 fn_27_873AC = .text:0x000873AC; // type:function size:0x190
 fn_27_8753C = .text:0x0008753C; // type:function size:0x10
-fn_27_8754C = .text:0x0008754C; // type:function size:0xC
+getAttribute__46soInstanceUnitFullProperty<P15soKineticEnergy>CFv = .text:0x0008754C; // type:function size:0xC
 fn_27_87558 = .text:0x00087558; // type:function size:0x188
 fn_27_876E0 = .text:0x000876E0; // type:function size:0x188
 fn_27_87868 = .text:0x00087868; // type:function size:0xD8
@@ -6167,18 +6167,18 @@ fn_27_A1224 = .text:0x000A1224; // type:function size:0xA4
 fn_27_A12C8 = .text:0x000A12C8; // type:function size:0x48
 fn_27_A1310 = .text:0x000A1310; // type:function size:0x8
 fn_27_A1318 = .text:0x000A1318; // type:function size:0x70
-fn_27_A1388 = .text:0x000A1388; // type:function size:0x10
-fn_27_A1398 = .text:0x000A1398; // type:function size:0x10
-fn_27_A13A8 = .text:0x000A13A8; // type:function size:0x114
-fn_27_A14BC = .text:0x000A14BC; // type:function size:0xBC
-fn_27_A1578 = .text:0x000A1578; // type:function size:0x114
-fn_27_A168C = .text:0x000A168C; // type:function size:0xBC
-fn_27_A1748 = .text:0x000A1748; // type:function size:0x138
-fn_27_A1880 = .text:0x000A1880; // type:function size:0xD8
-fn_27_A1958 = .text:0x000A1958; // type:function size:0xC4
-fn_27_A1A1C = .text:0x000A1A1C; // type:function size:0x48
-fn_27_A1A64 = .text:0x000A1A64; // type:function size:0x8
-fn_27_A1A6C = .text:0x000A1A6C; // type:function size:0x90
+at__50soArrayVectorAbstract<25acCmdInterpreterStackData>Fl = .text:0x000A1388; // type:function size:0x10
+at__50soArrayVectorAbstract<25acCmdInterpreterStackData>CFl = .text:0x000A1398; // type:function size:0x10
+unshift__50soArrayVectorAbstract<25acCmdInterpreterStackData>FRC25acCmdInterpreterStackData = .text:0x000A13A8; // type:function size:0x114
+shift__50soArrayVectorAbstract<25acCmdInterpreterStackData>Fv = .text:0x000A14BC; // type:function size:0xBC
+push__50soArrayVectorAbstract<25acCmdInterpreterStackData>FRC25acCmdInterpreterStackData = .text:0x000A1578; // type:function size:0x114
+pop__50soArrayVectorAbstract<25acCmdInterpreterStackData>Fv = .text:0x000A168C; // type:function size:0xBC
+insert__50soArrayVectorAbstract<25acCmdInterpreterStackData>FlRC25acCmdInterpreterStackData = .text:0x000A1748; // type:function size:0x138
+erase__50soArrayVectorAbstract<25acCmdInterpreterStackData>Fl = .text:0x000A1880; // type:function size:0xD8
+set__50soArrayVectorAbstract<25acCmdInterpreterStackData>FlRC25acCmdInterpreterStackDatal = .text:0x000A1958; // type:function size:0xC4
+clear__50soArrayVectorAbstract<25acCmdInterpreterStackData>Fv = .text:0x000A1A1C; // type:function size:0x48
+isNull__50soArrayVectorAbstract<25acCmdInterpreterStackData>CFv = .text:0x000A1A64; // type:function size:0x8
+substitution__50soArrayVectorAbstract<25acCmdInterpreterStackData>Fll = .text:0x000A1A6C; // type:function size:0x90
 fn_27_A1AFC = .text:0x000A1AFC; // type:function size:0xC
 fn_27_A1B08 = .text:0x000A1B08; // type:function size:0x10
 fn_27_A1B18 = .text:0x000A1B18; // type:function size:0x10
@@ -6209,7 +6209,7 @@ fn_27_A1CC0 = .text:0x000A1CC0; // type:function size:0x8
 fn_27_A1CC8 = .text:0x000A1CC8; // type:function size:0x8
 fn_27_A1CD0 = .text:0x000A1CD0; // type:function size:0x8
 fn_27_A1CD8 = .text:0x000A1CD8; // type:function size:0x8
-fn_27_A1CE0 = .text:0x000A1CE0; // type:function size:0x8
+@4@substitution__50soArrayVectorAbstract<25acCmdInterpreterStackData>Fll = .text:0x000A1CE0; // type:function size:0x8
 fn_27_A1CE8 = .text:0x000A1CE8; // type:function size:0x8
 fn_27_A1CF0 = .text:0x000A1CF0; // type:function size:0x8
 fn_27_A1CF8 = .text:0x000A1CF8; // type:function size:0x8
@@ -7047,16 +7047,16 @@ fn_27_C25FC = .text:0x000C25FC; // type:function size:0x8
 fn_27_C2604 = .text:0x000C2604; // type:function size:0x8
 fn_27_C260C = .text:0x000C260C; // type:function size:0x8
 fn_27_C2614 = .text:0x000C2614; // type:function size:0x8
-insert__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfaceUlbUlUlUlUl = .text:0x000C261C; // type:function size:0x140
-erase__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfaceUlUlUlUlUl = .text:0x000C275C; // type:function size:0x100
-unshift__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfacebUlUlUl = .text:0x000C285C; // type:function size:0x90
-shift__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfacebUlUl = .text:0x000C28EC; // type:function size:0x68
-push__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfacebUlUlUl = .text:0x000C2954; // type:function size:0xA0
-pop__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfacebUlUl = .text:0x000C29F4; // type:function size:0x64
+insert__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfacelbllll = .text:0x000C261C; // type:function size:0x140
+erase__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfacelllll = .text:0x000C275C; // type:function size:0x100
+unshift__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfaceblll = .text:0x000C285C; // type:function size:0x90
+shift__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfacebll = .text:0x000C28EC; // type:function size:0x68
+push__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfaceblll = .text:0x000C2954; // type:function size:0xA0
+pop__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfacebll = .text:0x000C29F4; // type:function size:0x64
 fn_27_C2A58 = .text:0x000C2A58; // type:function size:0x30
-clear__23soArrayVectorCalculatorFP26soArrayVectorCalcInterface = .text:0x000C2A88; // type:function size:0x68
-postInitialize__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfaceUlUl = .text:0x000C2AF0; // type:function size:0x6C
-resize__23soArrayVectorCalculatorFP26soArrayVectorCalcInterfaceUlbbUlUlUl = .text:0x000C2B5C; // type:function size:0xBC
+clear__23soArrayVectorCalculatorFR26soArrayVectorCalcInterface = .text:0x000C2A88; // type:function size:0x68
+postInitialize__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfacell = .text:0x000C2AF0; // type:function size:0x6C
+resize__23soArrayVectorCalculatorFR26soArrayVectorCalcInterfacelbblll = .text:0x000C2B5C; // type:function size:0xBC
 fn_27_C2C18 = .text:0x000C2C18; // type:function size:0x90
 fn_27_C2CA8 = .text:0x000C2CA8; // type:function size:0xFC
 fn_27_C2DA4 = .text:0x000C2DA4; // type:function size:0x20
@@ -7378,7 +7378,7 @@ fn_27_C8388 = .text:0x000C8388; // type:function size:0x118
 fn_27_C84A0 = .text:0x000C84A0; // type:function size:0x1B0
 fn_27_C8650 = .text:0x000C8650; // type:function size:0x34
 fn_27_C8684 = .text:0x000C8684; // type:function size:0x2C
-fn_27_C86B0 = .text:0x000C86B0; // type:function size:0x40
+__dt__46soInstanceUnitFullProperty<P15soKineticEnergy>Fv = .text:0x000C86B0; // type:function size:0x40
 fn_27_C86F0 = .text:0x000C86F0; // type:function size:0x40
 fn_27_C8730 = .text:0x000C8730; // type:function size:0x78
 fn_27_C87A8 = .text:0x000C87A8; // type:function size:0x68
@@ -8734,7 +8734,7 @@ fn_27_D8DB4 = .text:0x000D8DB4; // type:function size:0x30
 fn_27_D8DE4 = .text:0x000D8DE4; // type:function size:0x10
 fn_27_D8DF4 = .text:0x000D8DF4; // type:function size:0x10
 fn_27_D8E04 = .text:0x000D8E04; // type:function size:0x8
-fn_27_D8E0C = .text:0x000D8E0C; // type:function size:0x1C
+__ct__46soInstanceUnitFullProperty<P15soKineticEnergy>FRP15soKineticEnergylRCss = .text:0x000D8E0C; // type:function size:0x1C
 fn_27_D8E28 = .text:0x000D8E28; // type:function size:0x98
 fn_27_D8EC0 = .text:0x000D8EC0; // type:function size:0x70
 fn_27_D8F30 = .text:0x000D8F30; // type:function size:0x28
@@ -9399,7 +9399,7 @@ fn_27_EEED0 = .text:0x000EEED0; // type:function size:0xE4
 fn_27_EEFB4 = .text:0x000EEFB4; // type:function size:0x48
 fn_27_EEFFC = .text:0x000EEFFC; // type:function size:0x8
 fn_27_EF004 = .text:0x000EF004; // type:function size:0xB0
-fn_27_EF0B4 = .text:0x000EF0B4; // type:function size:0x18
+__ct__50soInstanceUnitFullProperty<P19soLinkEventObserver>Fv = .text:0x000EF0B4; // type:function size:0x18
 fn_27_EF0CC = .text:0x000EF0CC; // type:function size:0x18
 fn_27_EF0E4 = .text:0x000EF0E4; // type:function size:0x18
 fn_27_EF0FC = .text:0x000EF0FC; // type:function size:0x18
@@ -13867,13 +13867,13 @@ fn_27_19741C = .text:0x0019741C; // type:function size:0x104
 fn_27_197520 = .text:0x00197520; // type:function size:0x8
 fn_27_197528 = .text:0x00197528; // type:function size:0x30
 fn_27_197558 = .text:0x00197558; // type:function size:0x8
-fn_27_197560 = .text:0x00197560; // type:function size:0x1AC
-fn_27_19770C = .text:0x0019770C; // type:function size:0x194
-fn_27_1978A0 = .text:0x001978A0; // type:function size:0x118
-fn_27_1979B8 = .text:0x001979B8; // type:function size:0x1B0
+shiftFreeArrayIndex__33soArrayList<P14wnPikminPikmin,10>Fl = .text:0x00197560; // type:function size:0x1AC
+getArrayIndex__33soArrayList<P14wnPikminPikmin,10>CFl = .text:0x0019770C; // type:function size:0x194
+insertSub__33soArrayList<P14wnPikminPikmin,10>Fll = .text:0x001978A0; // type:function size:0x118
+eraseSub__33soArrayList<P14wnPikminPikmin,10>Fl = .text:0x001979B8; // type:function size:0x1B0
 fn_27_197B68 = .text:0x00197B68; // type:function size:0x34
-fn_27_197B9C = .text:0x00197B9C; // type:function size:0x1C
-fn_27_197BB8 = .text:0x00197BB8; // type:function size:0x40
+__ct__37soArrayListUnit<P14wnPikminPikmin,Sc>Fv = .text:0x00197B9C; // type:function size:0x1C
+__dt__37soArrayListUnit<P14wnPikminPikmin,Sc>Fv = .text:0x00197BB8; // type:function size:0x40
 fn_27_197BF8 = .text:0x00197BF8; // type:function size:0x10
 fn_27_197C08 = .text:0x00197C08; // type:function size:0x10
 fn_27_197C18 = .text:0x00197C18; // type:function size:0x10
@@ -13886,22 +13886,22 @@ fn_27_197C78 = .text:0x00197C78; // type:function size:0x10
 fn_27_197C88 = .text:0x00197C88; // type:function size:0x4
 fn_27_197C8C = .text:0x00197C8C; // type:function size:0x10
 fn_27_197C9C = .text:0x00197C9C; // type:function size:0x10
-fn_27_197CAC = .text:0x00197CAC; // type:function size:0x50
-fn_27_197CFC = .text:0x00197CFC; // type:function size:0x50
-fn_27_197D4C = .text:0x00197D4C; // type:function size:0x8
-fn_27_197D54 = .text:0x00197D54; // type:function size:0x4
-fn_27_197D58 = .text:0x00197D58; // type:function size:0x4
-fn_27_197D5C = .text:0x00197D5C; // type:function size:0x4
-fn_27_197D60 = .text:0x00197D60; // type:function size:0x4
-fn_27_197D64 = .text:0x00197D64; // type:function size:0x4
-fn_27_197D68 = .text:0x00197D68; // type:function size:0x4
-fn_27_197D6C = .text:0x00197D6C; // type:function size:0x4
-fn_27_197D70 = .text:0x00197D70; // type:function size:0x8
-fn_27_197D78 = .text:0x00197D78; // type:function size:0x8
-fn_27_197D80 = .text:0x00197D80; // type:function size:0x4
-fn_27_197D84 = .text:0x00197D84; // type:function size:0x8
-fn_27_197D8C = .text:0x00197D8C; // type:function size:0x10
-fn_27_197D9C = .text:0x00197D9C; // type:function size:0x40
+at__40soArrayNull<25acCmdInterpreterStackData>Fl = .text:0x00197CAC; // type:function size:0x50
+at__40soArrayNull<25acCmdInterpreterStackData>CFl = .text:0x00197CFC; // type:function size:0x50
+size__40soArrayNull<25acCmdInterpreterStackData>CFv = .text:0x00197D4C; // type:function size:0x8
+shift__40soArrayNull<25acCmdInterpreterStackData>Fv = .text:0x00197D54; // type:function size:0x4
+pop__40soArrayNull<25acCmdInterpreterStackData>Fv = .text:0x00197D58; // type:function size:0x4
+clear__40soArrayNull<25acCmdInterpreterStackData>Fv = .text:0x00197D5C; // type:function size:0x4
+unshift__40soArrayNull<25acCmdInterpreterStackData>FRC25acCmdInterpreterStackData = .text:0x00197D60; // type:function size:0x4
+push__40soArrayNull<25acCmdInterpreterStackData>FRC25acCmdInterpreterStackData = .text:0x00197D64; // type:function size:0x4
+insert__40soArrayNull<25acCmdInterpreterStackData>FlRC25acCmdInterpreterStackData = .text:0x00197D68; // type:function size:0x4
+erase__40soArrayNull<25acCmdInterpreterStackData>Fl = .text:0x00197D6C; // type:function size:0x4
+capacity__40soArrayNull<25acCmdInterpreterStackData>CFv = .text:0x00197D70; // type:function size:0x8
+isFull__40soArrayNull<25acCmdInterpreterStackData>CFv = .text:0x00197D78; // type:function size:0x8
+set__40soArrayNull<25acCmdInterpreterStackData>FlRC25acCmdInterpreterStackDatal = .text:0x00197D80; // type:function size:0x4
+isNull__40soArrayNull<25acCmdInterpreterStackData>CFv = .text:0x00197D84; // type:function size:0x8
+__ct__40soArrayNull<25acCmdInterpreterStackData>Fv = .text:0x00197D8C; // type:function size:0x10
+__dt__40soArrayNull<25acCmdInterpreterStackData>Fv = .text:0x00197D9C; // type:function size:0x40
 fn_27_197DDC = .text:0x00197DDC; // type:function size:0x10
 fn_27_197DEC = .text:0x00197DEC; // type:function size:0xC
 fn_27_197DF8 = .text:0x00197DF8; // type:function size:0xC
@@ -14937,19 +14937,19 @@ fn_27_1A044C = .text:0x001A044C; // type:function size:0x8
 fn_27_1A0454 = .text:0x001A0454; // type:function size:0x10
 fn_27_1A0464 = .text:0x001A0464; // type:function size:0x10
 fn_27_1A0474 = .text:0x001A0474; // type:function size:0x34
-fn_27_1A04A8 = .text:0x001A04A8; // type:function size:0x214
-fn_27_1A06BC = .text:0x001A06BC; // type:function size:0x40
-fn_27_1A06FC = .text:0x001A06FC; // type:function size:0xC
-fn_27_1A0708 = .text:0x001A0708; // type:function size:0x10
-fn_27_1A0718 = .text:0x001A0718; // type:function size:0x10
-fn_27_1A0728 = .text:0x001A0728; // type:function size:0x10
-fn_27_1A0738 = .text:0x001A0738; // type:function size:0x10
-fn_27_1A0748 = .text:0x001A0748; // type:function size:0x10
-fn_27_1A0758 = .text:0x001A0758; // type:function size:0x10
-fn_27_1A0768 = .text:0x001A0768; // type:function size:0xC
-fn_27_1A0774 = .text:0x001A0774; // type:function size:0x8
-fn_27_1A077C = .text:0x001A077C; // type:function size:0x10
-fn_27_1A078C = .text:0x001A078C; // type:function size:0x10
+__ct__44soArrayVector<25acCmdInterpreterStackData,1>Fv = .text:0x001A04A8; // type:function size:0x214
+__dt__44soArrayVector<25acCmdInterpreterStackData,1>Fv = .text:0x001A06BC; // type:function size:0x40
+getTopIndex__44soArrayVector<25acCmdInterpreterStackData,1>CFv = .text:0x001A06FC; // type:function size:0xC
+setTopIndex__44soArrayVector<25acCmdInterpreterStackData,1>Fl = .text:0x001A0708; // type:function size:0x10
+getLastIndex__44soArrayVector<25acCmdInterpreterStackData,1>CFv = .text:0x001A0718; // type:function size:0x10
+setLastIndex__44soArrayVector<25acCmdInterpreterStackData,1>Fl = .text:0x001A0728; // type:function size:0x10
+getArrayValueConst__44soArrayVector<25acCmdInterpreterStackData,1>Fl = .text:0x001A0738; // type:function size:0x10
+onFull__44soArrayVector<25acCmdInterpreterStackData,1>Fv = .text:0x001A0748; // type:function size:0x10
+offFull__44soArrayVector<25acCmdInterpreterStackData,1>Fv = .text:0x001A0758; // type:function size:0x10
+isFull__44soArrayVector<25acCmdInterpreterStackData,1>CFv = .text:0x001A0768; // type:function size:0xC
+capacity__44soArrayVector<25acCmdInterpreterStackData,1>CFv = .text:0x001A0774; // type:function size:0x8
+size__44soArrayVector<25acCmdInterpreterStackData,1>CFv = .text:0x001A077C; // type:function size:0x10
+setSize__44soArrayVector<25acCmdInterpreterStackData,1>Fl = .text:0x001A078C; // type:function size:0x10
 fn_27_1A079C = .text:0x001A079C; // type:function size:0x218
 fn_27_1A09B4 = .text:0x001A09B4; // type:function size:0x40
 fn_27_1A09F4 = .text:0x001A09F4; // type:function size:0xC
@@ -15144,7 +15144,7 @@ fn_27_1A21C0 = .text:0x001A21C0; // type:function size:0xC
 fn_27_1A21CC = .text:0x001A21CC; // type:function size:0x8
 fn_27_1A21D4 = .text:0x001A21D4; // type:function size:0x10
 fn_27_1A21E4 = .text:0x001A21E4; // type:function size:0x10
-fn_27_1A21F4 = .text:0x001A21F4; // type:function size:0x18
+__ct__46soInstanceUnitFullProperty<P15soKineticEnergy>Fv = .text:0x001A21F4; // type:function size:0x18
 fn_27_1A220C = .text:0x001A220C; // type:function size:0x68
 fn_27_1A2274 = .text:0x001A2274; // type:function size:0xC
 fn_27_1A2280 = .text:0x001A2280; // type:function size:0x10
@@ -15231,19 +15231,19 @@ fn_27_1A2BB4 = .text:0x001A2BB4; // type:function size:0xC
 fn_27_1A2BC0 = .text:0x001A2BC0; // type:function size:0x8
 fn_27_1A2BC8 = .text:0x001A2BC8; // type:function size:0x10
 fn_27_1A2BD8 = .text:0x001A2BD8; // type:function size:0x10
-fn_27_1A2BE8 = .text:0x001A2BE8; // type:function size:0x24
-fn_27_1A2C0C = .text:0x001A2C0C; // type:function size:0x40
-fn_27_1A2C4C = .text:0x001A2C4C; // type:function size:0xC
-fn_27_1A2C58 = .text:0x001A2C58; // type:function size:0x10
-fn_27_1A2C68 = .text:0x001A2C68; // type:function size:0x10
-fn_27_1A2C78 = .text:0x001A2C78; // type:function size:0x10
-fn_27_1A2C88 = .text:0x001A2C88; // type:function size:0x10
-fn_27_1A2C98 = .text:0x001A2C98; // type:function size:0x10
-fn_27_1A2CA8 = .text:0x001A2CA8; // type:function size:0x10
-fn_27_1A2CB8 = .text:0x001A2CB8; // type:function size:0xC
-fn_27_1A2CC4 = .text:0x001A2CC4; // type:function size:0x8
-fn_27_1A2CCC = .text:0x001A2CCC; // type:function size:0x10
-fn_27_1A2CDC = .text:0x001A2CDC; // type:function size:0x10
+__ct__35soArrayVector<P14wnPikminPikmin,10>Fv = .text:0x001A2BE8; // type:function size:0x24
+__dt__35soArrayVector<P14wnPikminPikmin,10>Fv = .text:0x001A2C0C; // type:function size:0x40
+getTopIndex__35soArrayVector<P14wnPikminPikmin,10>CFv = .text:0x001A2C4C; // type:function size:0xC
+setTopIndex__35soArrayVector<P14wnPikminPikmin,10>Fl = .text:0x001A2C58; // type:function size:0x10
+getLastIndex__35soArrayVector<P14wnPikminPikmin,10>CFv = .text:0x001A2C68; // type:function size:0x10
+setLastIndex__35soArrayVector<P14wnPikminPikmin,10>Fl = .text:0x001A2C78; // type:function size:0x10
+getArrayValueConst__35soArrayVector<P14wnPikminPikmin,10>Fl = .text:0x001A2C88; // type:function size:0x10
+onFull__35soArrayVector<P14wnPikminPikmin,10>Fv = .text:0x001A2C98; // type:function size:0x10
+offFull__35soArrayVector<P14wnPikminPikmin,10>Fv = .text:0x001A2CA8; // type:function size:0x10
+isFull__35soArrayVector<P14wnPikminPikmin,10>CFv = .text:0x001A2CB8; // type:function size:0xC
+capacity__35soArrayVector<P14wnPikminPikmin,10>CFv = .text:0x001A2CC4; // type:function size:0x8
+size__35soArrayVector<P14wnPikminPikmin,10>CFv = .text:0x001A2CCC; // type:function size:0x10
+setSize__35soArrayVector<P14wnPikminPikmin,10>Fl = .text:0x001A2CDC; // type:function size:0x10
 fn_27_1A2CEC = .text:0x001A2CEC; // type:function size:0x24
 fn_27_1A2D10 = .text:0x001A2D10; // type:function size:0x40
 fn_27_1A2D50 = .text:0x001A2D50; // type:function size:0xC
@@ -16166,9 +16166,9 @@ fn_27_1A7DB8 = .text:0x001A7DB8; // type:function size:0x18
 fn_27_1A7DD0 = .text:0x001A7DD0; // type:function size:0x244
 fn_27_1A8014 = .text:0x001A8014; // type:function size:0x244
 fn_27_1A8258 = .text:0x001A8258; // type:function size:0x244
-fn_27_1A849C = .text:0x001A849C; // type:function size:0x104
-fn_27_1A85A0 = .text:0x001A85A0; // type:function size:0xBC
-fn_27_1A865C = .text:0x001A865C; // type:function size:0x10
+__ct__48soEventUnitWithWorkArea<19soLinkEventObserver,4>Fls = .text:0x001A849C; // type:function size:0x104
+__dt__48soEventUnitWithWorkArea<19soLinkEventObserver,4>Fv = .text:0x001A85A0; // type:function size:0xBC
+getObserverNum__48soEventUnitWithWorkArea<19soLinkEventObserver,4>CFv = .text:0x001A865C; // type:function size:0x10
 fn_27_1A866C = .text:0x001A866C; // type:function size:0x104
 fn_27_1A8770 = .text:0x001A8770; // type:function size:0xBC
 fn_27_1A882C = .text:0x001A882C; // type:function size:0x10
@@ -16335,14 +16335,14 @@ fn_27_1AE5A4 = .text:0x001AE5A4; // type:function size:0x10
 fn_27_1AE5B4 = .text:0x001AE5B4; // type:function size:0x44
 fn_27_1AE5F8 = .text:0x001AE5F8; // type:function size:0x10
 fn_27_1AE608 = .text:0x001AE608; // type:function size:0xB0
-fn_27_1AE6B8 = .text:0x001AE6B8; // type:function size:0xCC
-fn_27_1AE784 = .text:0x001AE784; // type:function size:0xD8
-fn_27_1AE85C = .text:0x001AE85C; // type:function size:0xA4
+getAttributeArray__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FRC19soInstanceAttributeR28soArray<PP15soKineticEnergy> = .text:0x001AE6B8; // type:function size:0xCC
+getAttribute__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFl = .text:0x001AE784; // type:function size:0xD8
+getPriorityArray__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FR28soArray<PP15soKineticEnergy> = .text:0x001AE85C; // type:function size:0xA4
 fn_27_1AE900 = .text:0x001AE900; // type:function size:0x30
 fn_27_1AE930 = .text:0x001AE930; // type:function size:0x10
 fn_27_1AE940 = .text:0x001AE940; // type:function size:0x28
 fn_27_1AE968 = .text:0x001AE968; // type:function size:0x28
-fn_27_1AE990 = .text:0x001AE990; // type:function size:0x1DC
+getFreeId__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFv = .text:0x001AE990; // type:function size:0x1DC
 fn_27_1AEB6C = .text:0x001AEB6C; // type:function size:0xA0
 fn_27_1AEC0C = .text:0x001AEC0C; // type:function size:0x1A8
 fn_27_1AEDB4 = .text:0x001AEDB4; // type:function size:0xC8
@@ -16418,7 +16418,7 @@ fn_27_1AFECC = .text:0x001AFECC; // type:function size:0x28
 fn_27_1AFEF4 = .text:0x001AFEF4; // type:function size:0x28
 fn_27_1AFF1C = .text:0x001AFF1C; // type:function size:0x28
 fn_27_1AFF44 = .text:0x001AFF44; // type:function size:0x28
-fn_27_1AFF6C = .text:0x001AFF6C; // type:function size:0x28
+atFastAbstractSub__35soArrayVector<P14wnPikminPikmin,10>CFl = .text:0x001AFF6C; // type:function size:0x28
 fn_27_1AFF94 = .text:0x001AFF94; // type:function size:0x28
 fn_27_1AFFBC = .text:0x001AFFBC; // type:function size:0x28
 fn_27_1AFFE4 = .text:0x001AFFE4; // type:function size:0x28
@@ -16427,7 +16427,7 @@ fn_27_1B0034 = .text:0x001B0034; // type:function size:0x28
 fn_27_1B005C = .text:0x001B005C; // type:function size:0x28
 fn_27_1B0084 = .text:0x001B0084; // type:function size:0x28
 fn_27_1B00AC = .text:0x001B00AC; // type:function size:0x28
-fn_27_1B00D4 = .text:0x001B00D4; // type:function size:0x28
+atFastAbstractSub__44soArrayVector<25acCmdInterpreterStackData,1>CFl = .text:0x001B00D4; // type:function size:0x28
 fn_27_1B00FC = .text:0x001B00FC; // type:function size:0x28
 fn_27_1B0124 = .text:0x001B0124; // type:function size:0x28
 fn_27_1B014C = .text:0x001B014C; // type:function size:0x28
@@ -16668,18 +16668,18 @@ fn_27_1B2988 = .text:0x001B2988; // type:function size:0x68
 fn_27_1B29F0 = .text:0x001B29F0; // type:function size:0x10
 fn_27_1B2A00 = .text:0x001B2A00; // type:function size:0x68
 fn_27_1B2A68 = .text:0x001B2A68; // type:function size:0x10
-fn_27_1B2A78 = .text:0x001B2A78; // type:function size:0x10
-fn_27_1B2A88 = .text:0x001B2A88; // type:function size:0x10
-fn_27_1B2A98 = .text:0x001B2A98; // type:function size:0xF4
-fn_27_1B2B8C = .text:0x001B2B8C; // type:function size:0xBC
-fn_27_1B2C48 = .text:0x001B2C48; // type:function size:0xF4
-fn_27_1B2D3C = .text:0x001B2D3C; // type:function size:0xBC
-fn_27_1B2DF8 = .text:0x001B2DF8; // type:function size:0x118
-fn_27_1B2F10 = .text:0x001B2F10; // type:function size:0xD8
-fn_27_1B2FE8 = .text:0x001B2FE8; // type:function size:0xA4
-fn_27_1B308C = .text:0x001B308C; // type:function size:0x48
-fn_27_1B30D4 = .text:0x001B30D4; // type:function size:0x8
-fn_27_1B30DC = .text:0x001B30DC; // type:function size:0x70
+at__40soArrayVectorAbstract<P14wnPikminPikmin>Fl = .text:0x001B2A78; // type:function size:0x10
+at__40soArrayVectorAbstract<P14wnPikminPikmin>CFl = .text:0x001B2A88; // type:function size:0x10
+unshift__40soArrayVectorAbstract<P14wnPikminPikmin>FRCP14wnPikminPikmin = .text:0x001B2A98; // type:function size:0xF4
+shift__40soArrayVectorAbstract<P14wnPikminPikmin>Fv = .text:0x001B2B8C; // type:function size:0xBC
+push__40soArrayVectorAbstract<P14wnPikminPikmin>FRCP14wnPikminPikmin = .text:0x001B2C48; // type:function size:0xF4
+pop__40soArrayVectorAbstract<P14wnPikminPikmin>Fv = .text:0x001B2D3C; // type:function size:0xBC
+insert__40soArrayVectorAbstract<P14wnPikminPikmin>FlRCP14wnPikminPikmin = .text:0x001B2DF8; // type:function size:0x118
+erase__40soArrayVectorAbstract<P14wnPikminPikmin>Fl = .text:0x001B2F10; // type:function size:0xD8
+set__40soArrayVectorAbstract<P14wnPikminPikmin>FlRCP14wnPikminPikminl = .text:0x001B2FE8; // type:function size:0xA4
+clear__40soArrayVectorAbstract<P14wnPikminPikmin>Fv = .text:0x001B308C; // type:function size:0x48
+isNull__40soArrayVectorAbstract<P14wnPikminPikmin>CFv = .text:0x001B30D4; // type:function size:0x8
+substitution__40soArrayVectorAbstract<P14wnPikminPikmin>Fll = .text:0x001B30DC; // type:function size:0x70
 fn_27_1B314C = .text:0x001B314C; // type:function size:0x10
 fn_27_1B315C = .text:0x001B315C; // type:function size:0x10
 fn_27_1B316C = .text:0x001B316C; // type:function size:0x114
@@ -16784,7 +16784,7 @@ fn_27_1B6EE0 = .text:0x001B6EE0; // type:function size:0x140
 fn_27_1B7020 = .text:0x001B7020; // type:function size:0xBC
 fn_27_1B70DC = .text:0x001B70DC; // type:function size:0x164
 fn_27_1B7240 = .text:0x001B7240; // type:function size:0xD8
-fn_27_1B7318 = .text:0x001B7318; // type:function size:0xF0
+set__45soArrayVectorAbstract<20soTransitionTermPack>FlRC20soTransitionTermPackl = .text:0x001B7318; // type:function size:0xF0
 fn_27_1B7408 = .text:0x001B7408; // type:function size:0x48
 fn_27_1B7450 = .text:0x001B7450; // type:function size:0x8
 fn_27_1B7458 = .text:0x001B7458; // type:function size:0xBC
@@ -17784,7 +17784,7 @@ fn_27_1D0FA8 = .text:0x001D0FA8; // type:function size:0x10C
 fn_27_1D10B4 = .text:0x001D10B4; // type:function size:0xBC
 fn_27_1D1170 = .text:0x001D1170; // type:function size:0x130
 fn_27_1D12A0 = .text:0x001D12A0; // type:function size:0xD8
-fn_27_1D1378 = .text:0x001D1378; // type:function size:0xBC
+set__78soArrayVectorAbstract<53soInstanceUnitFullProperty<P22soGimmickEventObserver>>FlRC53soInstanceUnitFullProperty<P22soGimmickEventObserver>l = .text:0x001D1378; // type:function size:0xBC
 fn_27_1D1434 = .text:0x001D1434; // type:function size:0x48
 fn_27_1D147C = .text:0x001D147C; // type:function size:0x8
 fn_27_1D1484 = .text:0x001D1484; // type:function size:0x88
@@ -18643,11 +18643,11 @@ fn_27_1D3E00 = .text:0x001D3E00; // type:function size:0x8
 fn_27_1D3E08 = .text:0x001D3E08; // type:function size:0x8
 fn_27_1D3E10 = .text:0x001D3E10; // type:function size:0x8
 fn_27_1D3E18 = .text:0x001D3E18; // type:function size:0x8
-fn_27_1D3E20 = .text:0x001D3E20; // type:function size:0x8
-fn_27_1D3E28 = .text:0x001D3E28; // type:function size:0x8
-fn_27_1D3E30 = .text:0x001D3E30; // type:function size:0x8
-fn_27_1D3E38 = .text:0x001D3E38; // type:function size:0x8
-fn_27_1D3E40 = .text:0x001D3E40; // type:function size:0x8
+@4@__dt__44soArrayVector<25acCmdInterpreterStackData,1>Fv = .text:0x001D3E20; // type:function size:0x8
+@4@setLastIndex__44soArrayVector<25acCmdInterpreterStackData,1>Fl = .text:0x001D3E28; // type:function size:0x8
+@4@setTopIndex__44soArrayVector<25acCmdInterpreterStackData,1>Fl = .text:0x001D3E30; // type:function size:0x8
+@4@offFull__44soArrayVector<25acCmdInterpreterStackData,1>Fv = .text:0x001D3E38; // type:function size:0x8
+@4@onFull__44soArrayVector<25acCmdInterpreterStackData,1>Fv = .text:0x001D3E40; // type:function size:0x8
 fn_27_1D3E48 = .text:0x001D3E48; // type:function size:0x8
 fn_27_1D3E50 = .text:0x001D3E50; // type:function size:0x8
 fn_27_1D3E58 = .text:0x001D3E58; // type:function size:0x8
@@ -18689,12 +18689,12 @@ fn_27_1D3F70 = .text:0x001D3F70; // type:function size:0x8
 fn_27_1D3F78 = .text:0x001D3F78; // type:function size:0x8
 fn_27_1D3F80 = .text:0x001D3F80; // type:function size:0x8
 fn_27_1D3F88 = .text:0x001D3F88; // type:function size:0x8
-fn_27_1D3F90 = .text:0x001D3F90; // type:function size:0x8
-fn_27_1D3F98 = .text:0x001D3F98; // type:function size:0x8
-fn_27_1D3FA0 = .text:0x001D3FA0; // type:function size:0x8
-fn_27_1D3FA8 = .text:0x001D3FA8; // type:function size:0x8
-fn_27_1D3FB0 = .text:0x001D3FB0; // type:function size:0x8
-fn_27_1D3FB8 = .text:0x001D3FB8; // type:function size:0x8
+@4@__dt__44soArrayVector<P14wnPikminPikmin,10>Fv = .text:0x001D3F90; // type:function size:0x8
+@4@setLastIndex__35soArrayVector<P14wnPikminPikmin,10>Fl = .text:0x001D3F98; // type:function size:0x8
+@4@setTopIndex__35soArrayVector<P14wnPikminPikmin,10>Fl = .text:0x001D3FA0; // type:function size:0x8
+@4@offFull__35soArrayVector<P14wnPikminPikmin,10>Fv = .text:0x001D3FA8; // type:function size:0x8
+@4@onFull__35soArrayVector<P14wnPikminPikmin,10>Fv = .text:0x001D3FB0; // type:function size:0x8
+@4@substitution__40soArrayVectorAbstract<P14wnPikminPikmin>Fll = .text:0x001D3FB8; // type:function size:0x8
 fn_27_1D3FC0 = .text:0x001D3FC0; // type:function size:0x8
 fn_27_1D3FC8 = .text:0x001D3FC8; // type:function size:0x8
 fn_27_1D3FD0 = .text:0x001D3FD0; // type:function size:0x8
@@ -31711,7 +31711,7 @@ lbl_27_data_26000 = .data:0x00026000; // type:object size:0x28
 lbl_27_data_26028 = .data:0x00026028; // type:object size:0x28
 lbl_27_data_26050 = .data:0x00026050; // type:object size:0x28
 lbl_27_data_26078 = .data:0x00026078; // type:object size:0x28
-lbl_27_data_260A0 = .data:0x000260A0; // type:object size:0x28
+__vt__41soEventUnitWrapper<19soLinkEventObserver> = .data:0x000260A0; // type:object size:0x28
 lbl_27_data_260C8 = .data:0x000260C8; // type:object size:0x28
 lbl_27_data_260F0 = .data:0x000260F0; // type:object size:0x10
 lbl_27_data_26100 = .data:0x00026100; // type:object size:0x28 data:string
@@ -32981,7 +32981,7 @@ lbl_27_data_32C10 = .data:0x00032C10; // type:object size:0x18
 lbl_27_data_32C28 = .data:0x00032C28; // type:object size:0x8
 jumptable_27_data_32C30 = .data:0x00032C30; // type:object size:0x64 scope:local
 lbl_27_data_32C98 = .data:0x00032C98; // type:object size:0x38 data:4byte
-lbl_27_data_32CD0 = .data:0x00032CD0; // type:object size:0x70
+__vt__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4> = .data:0x00032CD0; // type:object size:0x70
 lbl_27_data_32D40 = .data:0x00032D40; // type:object size:0x3A data:string
 lbl_27_data_32D7C = .data:0x00032D7C; // type:object size:0x34
 lbl_27_data_32DB0 = .data:0x00032DB0; // type:object size:0x8
@@ -33276,14 +33276,14 @@ lbl_27_data_36C68 = .data:0x00036C68; // type:object size:0x90
 lbl_27_data_36CF8 = .data:0x00036CF8; // type:object size:0x29 data:string
 lbl_27_data_36D24 = .data:0x00036D24; // type:object size:0x34
 lbl_27_data_36D58 = .data:0x00036D58; // type:object size:0x8
-lbl_27_data_36D60 = .data:0x00036D60; // type:object size:0x90
+__vt__35soArrayVector<P14wnPikminPikmin,10> = .data:0x00036D60; // type:object size:0x90
 lbl_27_data_36DF0 = .data:0x00036DF0; // type:object size:0x24 data:string
 lbl_27_data_36E14 = .data:0x00036E14; // type:object size:0x34
 lbl_27_data_36E48 = .data:0x00036E48; // type:object size:0x8
 lbl_27_data_36E50 = .data:0x00036E50; // type:object size:0x28 data:string
 lbl_27_data_36E78 = .data:0x00036E78; // type:object size:0x30
 lbl_27_data_36EA8 = .data:0x00036EA8; // type:object size:0x8
-lbl_27_data_36EB0 = .data:0x00036EB0; // type:object size:0x90
+__vt__65soArrayVector<46soInstanceUnitFullProperty<P15soKineticEnergy>,4> = .data:0x00036EB0; // type:object size:0x90
 lbl_27_data_36F40 = .data:0x00036F40; // type:object size:0x40 data:string
 lbl_27_data_36F80 = .data:0x00036F80; // type:object size:0x38
 lbl_27_data_36FB8 = .data:0x00036FB8; // type:object size:0x8
@@ -33315,7 +33315,7 @@ lbl_27_data_375E0 = .data:0x000375E0; // type:object size:0x90
 lbl_27_data_37670 = .data:0x00037670; // type:object size:0x2C data:string
 lbl_27_data_3769C = .data:0x0003769C; // type:object size:0x34
 lbl_27_data_376D0 = .data:0x000376D0; // type:object size:0x8
-lbl_27_data_376D8 = .data:0x000376D8; // type:object size:0x90
+__vt__44soArrayVector<25acCmdInterpreterStackData,1> = .data:0x000376D8; // type:object size:0x90
 lbl_27_data_37768 = .data:0x00037768; // type:object size:0x2C data:string
 lbl_27_data_37794 = .data:0x00037794; // type:object size:0x34
 lbl_27_data_377C8 = .data:0x000377C8; // type:object size:0x8
@@ -33535,18 +33535,18 @@ lbl_27_data_3A8D8 = .data:0x0003A8D8; // type:object size:0x48
 lbl_27_data_3A920 = .data:0x0003A920; // type:object size:0x23 data:string
 lbl_27_data_3A944 = .data:0x0003A944; // type:object size:0x24
 lbl_27_data_3A968 = .data:0x0003A968; // type:object size:0x8
-lbl_27_data_3A970 = .data:0x0003A970; // type:object size:0x48
+__vt__40soArrayNull<25acCmdInterpreterStackData> = .data:0x0003A970; // type:object size:0x48
 lbl_27_data_3A9B8 = .data:0x0003A9B8; // type:object size:0x27 data:string
 lbl_27_data_3A9E0 = .data:0x0003A9E0; // type:object size:0x28
 lbl_27_data_3AA08 = .data:0x0003AA08; // type:object size:0x8
-lbl_27_data_3AA10 = .data:0x0003AA10; // type:object size:0x20
+__vt__43soArrayListEnumerator<P14wnPikminPikmin,Sc> = .data:0x0003AA10; // type:object size:0x20
 lbl_27_data_3AA30 = .data:0x0003AA30; // type:object size:0x35 data:string
 lbl_27_data_3AA68 = .data:0x0003AA68; // type:object size:0x18
 lbl_27_data_3AA80 = .data:0x0003AA80; // type:object size:0x8
 lbl_27_data_3AA88 = .data:0x0003AA88; // type:object size:0x1F data:string
 lbl_27_data_3AAA8 = .data:0x0003AAA8; // type:object size:0x10
 lbl_27_data_3AAB8 = .data:0x0003AAB8; // type:object size:0x8
-lbl_27_data_3AAC0 = .data:0x0003AAC0; // type:object size:0x48
+__vt__33soArrayList<P14wnPikminPikmin,10> = .data:0x0003AAC0; // type:object size:0x48
 lbl_27_data_3AB08 = .data:0x0003AB08; // type:object size:0x22 data:string
 lbl_27_data_3AB2C = .data:0x0003AB2C; // type:object size:0x24
 lbl_27_data_3AB50 = .data:0x0003AB50; // type:object size:0x8
@@ -33789,7 +33789,7 @@ lbl_27_data_3D9C8 = .data:0x0003D9C8; // type:object size:0x2C
 lbl_27_data_3D9F4 = .data:0x0003D9F4; // type:object size:0x33 data:string
 lbl_27_data_3DA28 = .data:0x0003DA28; // type:object size:0x28
 lbl_27_data_3DA50 = .data:0x0003DA50; // type:object size:0x8
-lbl_27_data_3DA58 = .data:0x0003DA58; // type:object size:0x30
+__vt__48soEventUnitWithWorkArea<19soLinkEventObserver,4> = .data:0x0003DA58; // type:object size:0x30
 lbl_27_data_3DA88 = .data:0x0003DA88; // type:object size:0x30 data:string
 lbl_27_data_3DAB8 = .data:0x0003DAB8; // type:object size:0x28
 lbl_27_data_3DAE0 = .data:0x0003DAE0; // type:object size:0x8
@@ -34158,7 +34158,7 @@ lbl_27_data_42348 = .data:0x00042348; // type:object size:0x8
 lbl_27_data_42350 = .data:0x00042350; // type:object size:0x40 data:string
 lbl_27_data_42390 = .data:0x00042390; // type:object size:0x10
 lbl_27_data_423A0 = .data:0x000423A0; // type:object size:0x8
-lbl_27_data_423A8 = .data:0x000423A8; // type:object size:0x28
+__vt__41soEventUnitWrapper<19soTurnEventObserver> = .data:0x000423A8; // type:object size:0x28
 lbl_27_data_423D0 = .data:0x000423D0; // type:object size:0x70
 lbl_27_data_42440 = .data:0x00042440; // type:object size:0x41 data:string
 lbl_27_data_42484 = .data:0x00042484; // type:object size:0x34
@@ -34167,11 +34167,11 @@ lbl_27_data_424C0 = .data:0x000424C0; // type:object size:0x90
 lbl_27_data_42550 = .data:0x00042550; // type:object size:0x47 data:string
 lbl_27_data_42598 = .data:0x00042598; // type:object size:0x38
 lbl_27_data_425D0 = .data:0x000425D0; // type:object size:0x8
-lbl_27_data_425D8 = .data:0x000425D8; // type:object size:0x70
+__vt__61soInstanceManagerFullPropertyVector<P19soLinkEventObserver,4> = .data:0x000425D8; // type:object size:0x70
 lbl_27_data_42648 = .data:0x00042648; // type:object size:0x3E data:string
 lbl_27_data_42688 = .data:0x00042688; // type:object size:0x38
 lbl_27_data_426C0 = .data:0x000426C0; // type:object size:0x8
-lbl_27_data_426C8 = .data:0x000426C8; // type:object size:0x90
+__vt__69soArrayVector<50soInstanceUnitFullProperty<P19soLinkEventObserver>,4> = .data:0x000426C8; // type:object size:0x90
 lbl_27_data_42758 = .data:0x00042758; // type:object size:0x44 data:string
 lbl_27_data_4279C = .data:0x0004279C; // type:object size:0x34
 lbl_27_data_427D0 = .data:0x000427D0; // type:object size:0x8
diff --git a/include/lib/BrawlHeaders b/include/lib/BrawlHeaders
index c520c0d..c56875a 160000
--- a/include/lib/BrawlHeaders
+++ b/include/lib/BrawlHeaders
@@ -1 +1 @@
-Subproject commit c520c0d4242458627dccba7fbbd6298b443ad590
+Subproject commit c56875ac45d756deab9605c794bc3b37fee512cd
diff --git a/src/mo_melee/sora_melee/so/so_resource_module_impl.cpp b/src/mo_melee/sora_melee/so/so_resource_module_impl.cpp
index f044ab1..8f81c77 100644
--- a/src/mo_melee/sora_melee/so/so_resource_module_impl.cpp
+++ b/src/mo_melee/sora_melee/so/so_resource_module_impl.cpp
@@ -88,12 +88,12 @@ nw4r::g3d::ResFile soResourceModuleImpl::getBinFile(u32 binResId, u16 fileIndex,
     return nw4r::g3d::ResFile();
 }
 
-nw4r::g3d::ResFile soResourceModuleImpl::getFile(u32 resId, ARCNodeType nodeType, u16 fileIndex) {
+void* soResourceModuleImpl::getFile(u32 resId, ARCNodeType nodeType, u16 fileIndex) {
     if (resId != 0xFFFF) {
         u32 arcId = m_resourceIdAccesser->getBinArchiveId();
         u32 grpNo = getGroupNo(0);
         utArchiveManager* arcManager = soArchiveDb::getManager(m_managerID);
         return arcManager->getResFileFromId(resId, nodeType, fileIndex, (u8)grpNo, arcId);
     }
-    return nw4r::g3d::ResFile();
+    return nullptr;
 }
diff --git a/src/sora/mv/mv_THPAudioDecode.cpp b/src/sora/mv/mv_THPAudioDecode.cpp
index c116a46..839b11e 100644
--- a/src/sora/mv/mv_THPAudioDecode.cpp
+++ b/src/sora/mv/mv_THPAudioDecode.cpp
@@ -7,7 +7,7 @@
 #include <revolution/OS/OSThread.h>
 #include <types.h>
 
-// UBFIX: Several files should be revisited to fix types and casting
+// UBFIX: Several functions should be revisited to fix types and casting
 
 static THPAudioDecWork* g_audioDecWork;
 
@@ -96,9 +96,8 @@ void* AudioDecoderForOnMemory(void* p1) {
                 r29 = *static_cast<u32*>(msg.unk0);
                 msg.unk0 = r30->unkB4;
             } else {
-                if (r31 < 2) {
+                if (r31 < 2)
                     PrepareReady(true);
-                }
                 OSSuspendThread(&g_audioDecWork->m_thread);
             }
         } else {
@@ -106,9 +105,8 @@ void* AudioDecoderForOnMemory(void* p1) {
             msg.unk0 = static_cast<char*>(msg.unk0) + r29;
             r29 = r4;
         }
-        if (r31 == 2) {
+        if (r31 == 2)
             PrepareReady(true);
-        }
         r31++;
     }
 }