Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl

1 files changed, 128 insertions, 128 deletions

diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt
index b19d655b..ce2d0904 100644
--- a/config/eur/arm9/symbols.txt
+++ b/config/eur/arm9/symbols.txt
@@ -9,7 +9,7 @@ IsDebugger kind:function(thumb,size=0x4) addr:0x200038c
 LZ77UnCompReadNormalWrite8bit kind:function(thumb,size=0x4) addr:0x2000402
 RLUnCompReadByCallbackWrite16bit kind:function(thumb,size=0x4) addr:0x2000472
 Halt kind:function(thumb,size=0x4) addr:0x20004de
-VBlankIntrWait kind:function(thumb,size=0x4) addr:0x200054e
+VBlankIntrWait kind:function(thumb,size=0x4) addr:0x200054c
 Div kind:function(thumb,size=0x4) addr:0x20005ae
 GetCRC16 kind:function(thumb,size=0x4) addr:0x2000610
 SoftReset kind:function(thumb,size=0x4) addr:0x2000684
@@ -45,7 +45,7 @@ func_02001fb0 kind:function(arm,size=0x5c) addr:0x2001fb0
 func_0200200c kind:function(arm,size=0x5c) addr:0x200200c
 func_02002068 kind:function(arm,size=0x5c) addr:0x2002068
 func_020020d0 kind:function(arm,size=0x3b8) addr:0x20020d0
-_02002184 kind:data(byte[256]) addr:0x2002184
+.L_02002184 kind:data(byte[256]) addr:0x2002184
 func_02002488 kind:function(arm,size=0x84) addr:0x2002488
 func_0200250c kind:function(arm,size=0x34) addr:0x200250c
 func_02002540 kind:function(arm,size=0x48) addr:0x2002540
@@ -58,9 +58,9 @@ func_02002bb8 kind:function(arm,size=0x3c) addr:0x2002bb8
 func_02002bf4 kind:function(arm,size=0x20) addr:0x2002bf4
 _s32_div_f kind:function(arm,size=0x20c) addr:0x2002c14
 SoftDivide kind:function(arm,size=0x1e4) addr:0x2002e20
-_02002e28 kind:label(arm) addr:0x2002e28
+.L_02002e28 kind:label(arm) addr:0x2002e28
 func_0200301c kind:function(arm,size=0x544) addr:0x200301c
-_02003154 kind:data(byte[256]) addr:0x2003154
+.L_02003154 kind:data(byte[256]) addr:0x2003154
 func_02003560 kind:function(arm,size=0x4) addr:0x2003560
 func_02003564 kind:function(arm,size=0x40) addr:0x2003564
 func_020035a4 kind:function(arm,size=0x3c) addr:0x20035a4
@@ -266,7 +266,7 @@ CopySingle384 kind:function(arm,size=0x24) addr:0x20079f4
 CopySingle512 kind:function(arm,size=0x2c) addr:0x2007a18
 Fill kind:function(arm,size=0x94) addr:0x2007a44
 Copy kind:function(arm,size=0x130) addr:0x2007ad8
-Zero288 kind:function(thumb,size=0x10) addr:0x2007c08
+Zero288 kind:function(thumb,size=0xe) addr:0x2007c08
 Swap32 kind:function(arm,size=0x8) addr:0x2007c18
 func_02007c20 kind:function(arm,size=0x94) addr:0x2007c20
 func_02007cb4 kind:function(arm,size=0xd8) addr:0x2007cb4
@@ -414,8 +414,8 @@ func_0200b828 kind:function(arm,size=0x28) addr:0x200b828
 func_0200b850 kind:function(arm,size=0x48) addr:0x200b850
 func_0200b898 kind:function(arm,size=0x28) addr:0x200b898
 func_0200b8c0 kind:function(thumb,size=0xc) addr:0x200b8c0
-func_0200b8cc kind:function(thumb,size=0x28) addr:0x200b8cc
-func_0200b8f4 kind:function(thumb,size=0x2c) addr:0x200b8f4
+func_0200b8cc kind:function(thumb,size=0x26) addr:0x200b8cc
+func_0200b8f4 kind:function(thumb,size=0x2a) addr:0x200b8f4
 func_0200b920 kind:function(thumb,size=0x14) addr:0x200b920
 func_0200b934 kind:function(thumb,size=0x10) addr:0x200b934
 func_0200b944 kind:function(thumb,size=0x10) addr:0x200b944
@@ -640,7 +640,7 @@ func_020123ec kind:function(thumb,size=0x11c) addr:0x20123ec
 func_02012508 kind:function(thumb,size=0x208) addr:0x2012508
 func_02012710 kind:function(thumb,size=0xc) addr:0x2012710
 func_0201271c kind:function(thumb,size=0xc) addr:0x201271c
-func_02012728 kind:function(thumb,size=0x7c) addr:0x2012728
+func_02012728 kind:function(thumb,size=0x7a) addr:0x2012728
 func_020127a4 kind:function(thumb,size=0x6c) addr:0x20127a4
 func_02012810 kind:function(thumb,size=0x10) addr:0x2012810
 func_02012820 kind:function(thumb,size=0x10) addr:0x2012820
@@ -674,13 +674,13 @@ func_02016e38 kind:function(arm,size=0x48) addr:0x2016e38
 func_02016e80 kind:function(arm,size=0x48) addr:0x2016e80
 func_02016ec8 kind:function(thumb,size=0x34) addr:0x2016ec8
 func_02016efc kind:function(thumb,size=0xd0) addr:0x2016efc
-func_02016fcc kind:function(thumb,size=0x1c) addr:0x2016fcc
-func_02016fe8 kind:function(thumb,size=0x30) addr:0x2016fe8
+func_02016fcc kind:function(thumb,size=0x1a) addr:0x2016fcc
+func_02016fe8 kind:function(thumb,size=0x2e) addr:0x2016fe8
 func_02017018 kind:function(thumb,size=0x1c) addr:0x2017018
-func_02017034 kind:function(thumb,size=0x1c) addr:0x2017034
+func_02017034 kind:function(thumb,size=0x1a) addr:0x2017034
 func_02017050 kind:function(thumb,size=0x1c) addr:0x2017050
 func_0201706c kind:function(thumb,size=0x20) addr:0x201706c
-func_0201708c kind:function(thumb,size=0x1c) addr:0x201708c
+func_0201708c kind:function(thumb,size=0x1a) addr:0x201708c
 func_020170a8 kind:function(thumb,size=0x50) addr:0x20170a8
 func_020170f8 kind:function(thumb,size=0x100) addr:0x20170f8
 func_020171f8 kind:function(thumb,size=0x7c) addr:0x20171f8
@@ -690,35 +690,35 @@ func_02017374 kind:function(thumb,size=0x20) addr:0x2017374
 func_02017394 kind:function(thumb,size=0x8) addr:0x2017394
 NewEXPH kind:function(thumb,size=0x20) addr:0x201739c
 func_020173bc kind:function(thumb,size=0xe8) addr:0x20173bc
-func_020174a4 kind:function(thumb,size=0x2c) addr:0x20174a4
-func_020174d0 kind:function(thumb,size=0x18) addr:0x20174d0
-func_020174e8 kind:function(thumb,size=0x48) addr:0x20174e8
+func_020174a4 kind:function(thumb,size=0x2a) addr:0x20174a4
+func_020174d0 kind:function(thumb,size=0x16) addr:0x20174d0
+func_020174e8 kind:function(thumb,size=0x46) addr:0x20174e8
 func_02017530 kind:function(thumb,size=0x2c) addr:0x2017530
-func_0201755c kind:function(thumb,size=0x40) addr:0x201755c
+func_0201755c kind:function(thumb,size=0x3e) addr:0x201755c
 func_0201759c kind:function(thumb,size=0x3c) addr:0x201759c
-func_020175d8 kind:function(thumb,size=0x10) addr:0x20175d8
-func_020175e8 kind:function(thumb,size=0x1c) addr:0x20175e8
+func_020175d8 kind:function(thumb,size=0xe) addr:0x20175d8
+func_020175e8 kind:function(thumb,size=0x1a) addr:0x20175e8
 func_02017604 kind:function(thumb,size=0x20) addr:0x2017604
 func_02017624 kind:function(thumb,size=0x8) addr:0x2017624
-NewFRMH kind:function(thumb,size=0x24) addr:0x201762c
-func_02017650 kind:function(thumb,size=0x20) addr:0x2017650
+NewFRMH kind:function(thumb,size=0x22) addr:0x201762c
+func_02017650 kind:function(thumb,size=0x1e) addr:0x2017650
 func_02017670 kind:function(thumb,size=0x24) addr:0x2017670
-func_02017694 kind:function(thumb,size=0x30) addr:0x2017694
+func_02017694 kind:function(thumb,size=0x2e) addr:0x2017694
 func_020176c4 kind:function(thumb,size=0x30) addr:0x20176c4
 func_020176f4 kind:function(thumb,size=0x1c) addr:0x20176f4
-func_02017710 kind:function(thumb,size=0x40) addr:0x2017710
+func_02017710 kind:function(thumb,size=0x3e) addr:0x2017710
 func_02017750 kind:function(thumb,size=0x1c) addr:0x2017750
 func_0201776c kind:function(thumb,size=0x5c) addr:0x201776c
 func_020177c8 kind:function(thumb,size=0x10) addr:0x20177c8
 func_020177d8 kind:function(thumb,size=0x10) addr:0x20177d8
 func_020177e8 kind:function(thumb,size=0xc) addr:0x20177e8
-func_020177f4 kind:function(thumb,size=0x1c) addr:0x20177f4
+func_020177f4 kind:function(thumb,size=0x1a) addr:0x20177f4
 func_02017810 kind:function(thumb,size=0x2c) addr:0x2017810
-func_0201783c kind:function(thumb,size=0x2c) addr:0x201783c
-func_02017868 kind:function(thumb,size=0x38) addr:0x2017868
-func_020178a0 kind:function(thumb,size=0x3c) addr:0x20178a0
+func_0201783c kind:function(thumb,size=0x2a) addr:0x201783c
+func_02017868 kind:function(thumb,size=0x36) addr:0x2017868
+func_020178a0 kind:function(thumb,size=0x3a) addr:0x20178a0
 func_020178dc kind:function(thumb,size=0x10) addr:0x20178dc
-func_020178ec kind:function(thumb,size=0x10) addr:0x20178ec
+func_020178ec kind:function(thumb,size=0xe) addr:0x20178ec
 func_020178fc kind:function(thumb,size=0x98) addr:0x20178fc
 func_02017994 kind:function(thumb,size=0x8) addr:0x2017994
 func_0201799c kind:function(thumb,size=0x10) addr:0x201799c
@@ -1117,12 +1117,12 @@ func_02023754 kind:function(arm,size=0x98) addr:0x2023754
 func_020237ec kind:function(arm,size=0x60) addr:0x20237ec
 func_0202384c kind:function(arm,size=0x124) addr:0x202384c
 func_02023970 kind:function(arm,size=0x14) addr:0x2023970
-func_02023984 kind:function(thumb,size=0x30) addr:0x2023984
-func_020239b4 kind:function(thumb,size=0x2c) addr:0x20239b4
+func_02023984 kind:function(thumb,size=0x2e) addr:0x2023984
+func_020239b4 kind:function(thumb,size=0x2a) addr:0x20239b4
 func_020239e0 kind:function(thumb,size=0x28) addr:0x20239e0
 func_02023a08 kind:function(thumb,size=0x8) addr:0x2023a08
-func_02023a10 kind:function(thumb,size=0xb8) addr:0x2023a10
-func_02023ac8 kind:function(thumb,size=0x14) addr:0x2023ac8
+func_02023a10 kind:function(thumb,size=0xb6) addr:0x2023a10
+func_02023ac8 kind:function(thumb,size=0x12) addr:0x2023ac8
 func_02023adc kind:function(thumb,size=0x28) addr:0x2023adc
 func_02023b04 kind:function(thumb,size=0x8) addr:0x2023b04
 func_02023b0c kind:function(thumb,size=0x28) addr:0x2023b0c
@@ -1131,7 +1131,7 @@ func_02023b3c kind:function(thumb,size=0x28) addr:0x2023b3c
 func_02023b64 kind:function(thumb,size=0x8) addr:0x2023b64
 func_02023b6c kind:function(thumb,size=0xd4) addr:0x2023b6c
 func_02023c40 kind:function(thumb,size=0x94) addr:0x2023c40
-func_02023cd4 kind:function(thumb,size=0x1c) addr:0x2023cd4
+func_02023cd4 kind:function(thumb,size=0x1a) addr:0x2023cd4
 func_02023cf0 kind:function(thumb,size=0xc) addr:0x2023cf0
 func_02023cfc kind:function(thumb,size=0x28) addr:0x2023cfc
 func_02023d24 kind:function(thumb,size=0x20) addr:0x2023d24
@@ -1207,7 +1207,7 @@ func_02026f1c kind:function(arm,size=0x10c) addr:0x2026f1c
 func_02027028 kind:function(arm,size=0x64) addr:0x2027028
 func_0202708c kind:function(arm,size=0xb4) addr:0x202708c
 func_02027140 kind:function(arm,size=0xe8) addr:0x2027140
-func_02027228 kind:function(thumb,size=0x2c) addr:0x2027228
+func_02027228 kind:function(thumb,size=0x2a) addr:0x2027228
 func_02027254 kind:function(thumb,size=0x34) addr:0x2027254
 func_02027288 kind:function(thumb,size=0x1c) addr:0x2027288
 func_020272a4 kind:function(thumb,size=0xd8) addr:0x20272a4
@@ -1219,17 +1219,17 @@ func_02027538 kind:function(thumb,size=0x58) addr:0x2027538
 func_02027590 kind:function(thumb,size=0x28) addr:0x2027590
 func_020275b8 kind:function(thumb,size=0x2c) addr:0x20275b8
 func_020275e4 kind:function(thumb,size=0x2c) addr:0x20275e4
-func_02027610 kind:function(thumb,size=0x24) addr:0x2027610
+func_02027610 kind:function(thumb,size=0x22) addr:0x2027610
 func_02027634 kind:function(thumb,size=0x5c) addr:0x2027634
 func_02027690 kind:function(thumb,size=0x8c) addr:0x2027690
 func_0202771c kind:function(thumb,size=0x8c) addr:0x202771c
-func_020277a8 kind:function(thumb,size=0x50) addr:0x20277a8
+func_020277a8 kind:function(thumb,size=0x4e) addr:0x20277a8
 func_020277f8 kind:function(thumb,size=0x1d8) addr:0x20277f8
-func_020279d0 kind:function(thumb,size=0x50) addr:0x20279d0
+func_020279d0 kind:function(thumb,size=0x4e) addr:0x20279d0
 func_02027a20 kind:function(thumb,size=0x5c) addr:0x2027a20
-func_02027a7c kind:function(thumb,size=0x38) addr:0x2027a7c
-func_02027ab4 kind:function(thumb,size=0x48) addr:0x2027ab4
-func_02027afc kind:function(thumb,size=0x108) addr:0x2027afc
+func_02027a7c kind:function(thumb,size=0x36) addr:0x2027a7c
+func_02027ab4 kind:function(thumb,size=0x46) addr:0x2027ab4
+func_02027afc kind:function(thumb,size=0x106) addr:0x2027afc
 func_02027c04 kind:function(arm,size=0x24) addr:0x2027c04
 func_02027c28 kind:function(arm,size=0x20) addr:0x2027c28
 func_02027c48 kind:function(arm,size=0x20) addr:0x2027c48
@@ -1302,7 +1302,7 @@ func_0202a750 kind:function(arm,size=0x4) addr:0x202a750
 func_0202a754 kind:function(arm,size=0x188) addr:0x202a754
 func_0202a8dc kind:function(arm,size=0x1cc) addr:0x202a8dc
 func_0202aaa8 kind:function(arm,size=0x40) addr:0x202aaa8
-func_0202aae8 kind:function(thumb,size=0x10) addr:0x202aae8
+func_0202aae8 kind:function(thumb,size=0xe) addr:0x202aae8
 func_0202aaf8 kind:function(thumb,size=0x40) addr:0x202aaf8
 func_0202ab38 kind:function(thumb,size=0x10) addr:0x202ab38
 func_0202ab48 kind:function(thumb,size=0x4) addr:0x202ab48
@@ -1311,8 +1311,8 @@ _ZN11FadeControl8RegisterEv kind:function(thumb,size=0x10) addr:0x202ab54
 _ZN11FadeControl10UnregisterEv kind:function(thumb,size=0x14) addr:0x202ab64
 _ZN11FadeControlC2Ev kind:function(thumb,size=0x30) addr:0x202ab78
 _ZN11FadeControl13func_0202aba8Eiii kind:function(thumb,size=0x34) addr:0x202aba8
-_ZN11FadeControl13func_0202abdcEii kind:function(thumb,size=0x18) addr:0x202abdc
-_ZN11FadeControl13func_0202abf4Eii kind:function(thumb,size=0x18) addr:0x202abf4
+_ZN11FadeControl13func_0202abdcEii kind:function(thumb,size=0x16) addr:0x202abdc
+_ZN11FadeControl13func_0202abf4Eii kind:function(thumb,size=0x16) addr:0x202abf4
 _ZN11FadeControl13func_0202ac0cEitii kind:function(thumb,size=0x54) addr:0x202ac0c
 _ZN11FadeControl10UpdateFadeEi kind:function(arm,size=0x194) addr:0x202ac60
 _ZN18UnkStruct_027e05f813func_0202adf4Eii kind:function(arm,size=0x74) addr:0x202adf4
@@ -1331,7 +1331,7 @@ func_0202b2e8 kind:function(arm,size=0x10) addr:0x202b2e8
 func_0202b2f8 kind:function(arm,size=0x10) addr:0x202b2f8
 Vec3p_Lerp kind:function(arm,size=0xb4) addr:0x202b308
 func_0202b3bc kind:function(arm,size=0x5c) addr:0x202b3bc
-func_0202b418 kind:function(arm,size=0xcc) addr:0x202b418
+Lerp kind:function(arm,size=0xcc) addr:0x202b418
 func_0202b4e4 kind:function(arm,size=0x188) addr:0x202b4e4
 func_0202b66c kind:function(arm,size=0xc8) addr:0x202b66c
 func_0202b734 kind:function(arm,size=0xb0) addr:0x202b734
@@ -1353,13 +1353,13 @@ func_0202bc10 kind:function(arm,size=0x28) addr:0x202bc10
 func_0202bc38 kind:function(arm,size=0x320) addr:0x202bc38
 func_0202bf58 kind:function(arm,size=0x68) addr:0x202bf58
 func_0202bfc0 kind:function(arm,size=0xe8) addr:0x202bfc0
-func_0202c0a8 kind:function(thumb,size=0x4) addr:0x202c0a8
+func_0202c0a8 kind:function(thumb,size=0x2) addr:0x202c0a8
 func_0202c0ac kind:function(thumb,size=0xc) addr:0x202c0ac
-func_0202c0b8 kind:function(thumb,size=0x4) addr:0x202c0b8
-func_0202c0bc kind:function(thumb,size=0x4) addr:0x202c0bc
-func_0202c0c0 kind:function(thumb,size=0x4) addr:0x202c0c0
-func_0202c0c4 kind:function(thumb,size=0x4) addr:0x202c0c4
-func_0202c0c8 kind:function(thumb,size=0x4) addr:0x202c0c8
+func_0202c0b8 kind:function(thumb,size=0x2) addr:0x202c0b8
+func_0202c0bc kind:function(thumb,size=0x2) addr:0x202c0bc
+func_0202c0c0 kind:function(thumb,size=0x2) addr:0x202c0c0
+func_0202c0c4 kind:function(thumb,size=0x2) addr:0x202c0c4
+func_0202c0c8 kind:function(thumb,size=0x2) addr:0x202c0c8
 func_0202c0cc kind:function(thumb,size=0x5c) addr:0x202c0cc
 func_0202c128 kind:function(thumb,size=0x27c) addr:0x202c128
 func_0202c3a4 kind:function(arm,size=0x34) addr:0x202c3a4
@@ -1388,7 +1388,7 @@ func_0202cec8 kind:function(thumb,size=0x6c) addr:0x202cec8
 func_0202cf34 kind:function(thumb,size=0x10) addr:0x202cf34
 func_0202cf44 kind:function(arm,size=0x170) addr:0x202cf44
 func_0202d0b4 kind:function(arm,size=0x18) addr:0x202d0b4
-func_0202d0cc kind:function(thumb,size=0x3c) addr:0x202d0cc
+func_0202d0cc kind:function(thumb,size=0x3a) addr:0x202d0cc
 func_0202d108 kind:function(thumb,size=0x38) addr:0x202d108
 func_0202d140 kind:function(thumb,size=0x24) addr:0x202d140
 func_0202d164 kind:function(thumb,size=0x60) addr:0x202d164
@@ -1398,10 +1398,10 @@ func_0202d23c kind:function(thumb,size=0x180) addr:0x202d23c
 func_0202d3bc kind:function(thumb,size=0xb8) addr:0x202d3bc
 func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d474
 func_0202d550 kind:function(thumb,size=0x1c) addr:0x202d550
-LoadFile kind:function(thumb,size=0x24) addr:0x202d56c
+LoadFile kind:function(thumb,size=0x22) addr:0x202d56c
 func_0202d590 kind:function(thumb,size=0x8) addr:0x202d590
 func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d598
-MountCompressedNarc kind:function(thumb,size=0x28) addr:0x202d5b4
+MountCompressedNarc kind:function(thumb,size=0x26) addr:0x202d5b4
 func_0202d5dc kind:function(thumb,size=0x10) addr:0x202d5dc
 LoadFileFromRom kind:function(thumb,size=0x3c) addr:0x202d5ec
 func_0202d628 kind:function(thumb,size=0x1c) addr:0x202d628
@@ -1435,7 +1435,7 @@ _ZN18UnkStruct_027e077cC2Ei kind:function(thumb,size=0x10) addr:0x202e730
 _ZN18UnkStruct_027e077c13func_0202e740Ei kind:function(arm,size=0x34) addr:0x202e740
 func_0202e774 kind:function(thumb,size=0x30) addr:0x202e774
 func_0202e7a4 kind:function(thumb,size=0x18) addr:0x202e7a4
-func_0202e7bc kind:function(thumb,size=0x40) addr:0x202e7bc
+func_0202e7bc kind:function(thumb,size=0x3e) addr:0x202e7bc
 func_0202e7fc kind:function(thumb,size=0x14) addr:0x202e7fc
 func_0202e810 kind:function(arm,size=0x84) addr:0x202e810
 _Z6SysNewP18UnkStruct_0202e894ii kind:function(arm,size=0xb4) addr:0x202e894
@@ -1447,7 +1447,7 @@ _ZN9SysObjectnaEmPjj kind:function(arm,size=0x18) addr:0x202e9f4
 _ZN9SysObjectdlEPv kind:function(arm,size=0xc) addr:0x202ea0c
 _ZN9SysObjectdaEPv kind:function(arm,size=0xc) addr:0x202ea18
 _ZN18UnkStruct_027e0fe04InitEv kind:function(thumb,size=0x10) addr:0x202ea24
-_ZN18UnkStruct_027e0fe07DisposeEv kind:function(thumb,size=0x1c) addr:0x202ea34
+_ZN18UnkStruct_027e0fe07DisposeEv kind:function(thumb,size=0x1a) addr:0x202ea34
 _ZN18UnkStruct_027e0fe013func_0202ea50Eiii kind:function(thumb,size=0x48) addr:0x202ea50
 _ZN18UnkStruct_027e0fe013func_0202ea98Ev kind:function(thumb,size=0x24) addr:0x202ea98
 func_0202eabc kind:function(arm,size=0x80) addr:0x202eabc
@@ -1455,7 +1455,7 @@ func_0202eb3c kind:function(arm,size=0x58) addr:0x202eb3c
 func_0202eb94 kind:function(arm,size=0x28) addr:0x202eb94
 func_0202ebbc kind:function(thumb,size=0x5c) addr:0x202ebbc
 func_0202ec18 kind:function(thumb,size=0x24) addr:0x202ec18
-func_0202ec3c kind:function(thumb,size=0x20) addr:0x202ec3c
+func_0202ec3c kind:function(thumb,size=0x1e) addr:0x202ec3c
 func_0202ec5c kind:function(thumb,size=0x14) addr:0x202ec5c
 func_0202ec70 kind:function(arm,size=0x70) addr:0x202ec70
 func_0202ece0 kind:function(thumb,size=0x34) addr:0x202ece0
@@ -1464,7 +1464,7 @@ func_0202ed58 kind:function(arm,size=0x164) addr:0x202ed58
 func_0202eebc kind:function(arm,size=0x3c) addr:0x202eebc
 func_0202eef8 kind:function(arm,size=0x23c) addr:0x202eef8
 func_0202f134 kind:function(thumb,size=0x20) addr:0x202f134
-func_0202f154 kind:function(thumb,size=0x40) addr:0x202f154
+func_0202f154 kind:function(thumb,size=0x3e) addr:0x202f154
 func_0202f194 kind:function(thumb,size=0x5c) addr:0x202f194
 func_0202f1f0 kind:function(thumb,size=0x6c) addr:0x202f1f0
 func_0202f25c kind:function(thumb,size=0x2c) addr:0x202f25c
@@ -1475,7 +1475,7 @@ func_0202f328 kind:function(arm,size=0x38) addr:0x202f328
 func_0202f360 kind:function(thumb,size=0x14) addr:0x202f360
 func_0202f374 kind:function(thumb,size=0x7c) addr:0x202f374
 func_0202f3f0 kind:function(thumb,size=0x10) addr:0x202f3f0
-func_0202f400 kind:function(thumb,size=0x18) addr:0x202f400
+func_0202f400 kind:function(thumb,size=0x16) addr:0x202f400
 DisplayAssertError kind:function(thumb,size=0x9c) addr:0x202f418
 func_0202f4b4 kind:function(thumb,size=0x4c) addr:0x202f4b4
 func_0202f500 kind:function(thumb,size=0x2c) addr:0x202f500
@@ -1490,14 +1490,14 @@ func_0202fd9c kind:function(thumb,size=0x40) addr:0x202fd9c
 func_0202fddc kind:function(thumb,size=0x150) addr:0x202fddc
 func_0202ff2c kind:function(arm,size=0x4) addr:0x202ff2c
 func_0202ff30 kind:function(arm,size=0x14) addr:0x202ff30
-_ZN14OverlayManager4LoadEjj kind:function(thumb,size=0x20) addr:0x202ff44
+_ZN14OverlayManager4LoadEjj kind:function(thumb,size=0x1e) addr:0x202ff44
 _ZN14OverlayManager15LoadIfNotLoadedEjj kind:function(thumb,size=0x20) addr:0x202ff64
-_ZN14OverlayManager6UnloadEj kind:function(thumb,size=0x20) addr:0x202ff84
+_ZN14OverlayManager6UnloadEj kind:function(thumb,size=0x1e) addr:0x202ff84
 _ZN14OverlayManager16LoadOverlaySetupEi kind:function(thumb,size=0x64) addr:0x202ffa4
 _ZN14OverlayManager18UnloadOverlaySetupEv kind:function(thumb,size=0x34) addr:0x2030008
-func_0203003c kind:function(thumb,size=0x4) addr:0x203003c
+func_0203003c kind:function(thumb,size=0x2) addr:0x203003c
 func_02030040 kind:function(thumb,size=0xc) addr:0x2030040
-func_0203004c kind:function(thumb,size=0x4) addr:0x203004c
+func_0203004c kind:function(thumb,size=0x2) addr:0x203004c
 func_02030050 kind:function(thumb,size=0x8) addr:0x2030050
 func_02030058 kind:function(thumb,size=0x4) addr:0x2030058
 func_0203005c kind:function(thumb,size=0x1c) addr:0x203005c
@@ -1507,12 +1507,12 @@ func_020300cc kind:function(thumb,size=0x18) addr:0x20300cc
 func_020300e4 kind:function(thumb,size=0x28) addr:0x20300e4
 func_0203010c kind:function(thumb,size=0x1c) addr:0x203010c
 func_02030128 kind:function(thumb,size=0x24) addr:0x2030128
-func_0203014c kind:function(thumb,size=0x1c) addr:0x203014c
+func_0203014c kind:function(thumb,size=0x1a) addr:0x203014c
 func_02030168 kind:function(thumb,size=0x30) addr:0x2030168
-func_02030198 kind:function(thumb,size=0x4) addr:0x2030198
+func_02030198 kind:function(thumb,size=0x2) addr:0x2030198
 func_0203019c kind:function(thumb,size=0x4) addr:0x203019c
 func_020301a0 kind:function(thumb,size=0x2c) addr:0x20301a0
-func_020301cc kind:function(thumb,size=0x4) addr:0x20301cc
+func_020301cc kind:function(thumb,size=0x2) addr:0x20301cc
 func_020301d0 kind:function(thumb,size=0x4) addr:0x20301d0
 func_020301d4 kind:function(arm,size=0x1c) addr:0x20301d4
 func_020301f0 kind:function(arm,size=0x14) addr:0x20301f0
@@ -1521,34 +1521,34 @@ func_02030220 kind:function(arm,size=0x14) addr:0x2030220
 CopyDebugNodeDescription kind:function(arm,size=0x10) addr:0x2030234
 DebugNodeDescriptionEquals kind:function(arm,size=0x30) addr:0x2030244
 _ZN18DebugHierarchyBaseC2Ev kind:function(thumb,size=0x10) addr:0x2030274
-_ZN18DebugHierarchyBaseD1Ev kind:function(thumb,size=0x4) addr:0x2030284
+_ZN18DebugHierarchyBaseD1Ev kind:function(thumb,size=0x2) addr:0x2030284
 _ZN18DebugHierarchyBaseD0Ev kind:function(thumb,size=0xc) addr:0x2030288
-_ZN18DebugHierarchyBaseD2Ev kind:function(thumb,size=0x4) addr:0x2030294
+_ZN18DebugHierarchyBaseD2Ev kind:function(thumb,size=0x2) addr:0x2030294
 _ZN18DebugHierarchyBase8FindNodeEj kind:function(thumb,size=0x3c) addr:0x2030298
 _ZN18DebugHierarchyBase12GetChildNodeEiPKcjPi kind:function(thumb,size=0x4c) addr:0x20302d4
-_ZN18DebugHierarchyBase8vfunc_08Ev kind:function(thumb,size=0x4) addr:0x2030320
-_ZN18DebugHierarchyBase8vfunc_0cEv kind:function(thumb,size=0x4) addr:0x2030324
-_ZN18DebugHierarchyBase8vfunc_10Ev kind:function(thumb,size=0x4) addr:0x2030328
-_ZN18DebugHierarchyBase8vfunc_14Ev kind:function(thumb,size=0x4) addr:0x203032c
-_ZN18DebugHierarchyBase8vfunc_18Ev kind:function(thumb,size=0x4) addr:0x2030330
-_ZN18DebugHierarchyBase8vfunc_1cEv kind:function(thumb,size=0x4) addr:0x2030334
+_ZN18DebugHierarchyBase8vfunc_08Ev kind:function(thumb,size=0x2) addr:0x2030320
+_ZN18DebugHierarchyBase8vfunc_0cEv kind:function(thumb,size=0x2) addr:0x2030324
+_ZN18DebugHierarchyBase8vfunc_10Ev kind:function(thumb,size=0x2) addr:0x2030328
+_ZN18DebugHierarchyBase8vfunc_14Ev kind:function(thumb,size=0x2) addr:0x203032c
+_ZN18DebugHierarchyBase8vfunc_18Ev kind:function(thumb,size=0x2) addr:0x2030330
+_ZN18DebugHierarchyBase8vfunc_1cEv kind:function(thumb,size=0x2) addr:0x2030334
 _ZN18DebugHierarchyBase8vfunc_20Ev kind:function(thumb,size=0x4) addr:0x2030338
-_ZN18DebugHierarchyBase8vfunc_24Ev kind:function(thumb,size=0x4) addr:0x203033c
-_ZN18DebugHierarchyBase8vfunc_28Ev kind:function(thumb,size=0x4) addr:0x2030340
-_ZN18DebugHierarchyBase8vfunc_2cEv kind:function(thumb,size=0x4) addr:0x2030344
-_ZN18DebugHierarchyBase8vfunc_30Ev kind:function(thumb,size=0x4) addr:0x2030348
-_ZN18DebugHierarchyBase8vfunc_38Ev kind:function(thumb,size=0x4) addr:0x203034c
-_ZN18DebugHierarchyBase8vfunc_3cEv kind:function(thumb,size=0x4) addr:0x2030350
+_ZN18DebugHierarchyBase8vfunc_24Ev kind:function(thumb,size=0x2) addr:0x203033c
+_ZN18DebugHierarchyBase8vfunc_28Ev kind:function(thumb,size=0x2) addr:0x2030340
+_ZN18DebugHierarchyBase8vfunc_2cEv kind:function(thumb,size=0x2) addr:0x2030344
+_ZN18DebugHierarchyBase8vfunc_30Ev kind:function(thumb,size=0x2) addr:0x2030348
+_ZN18DebugHierarchyBase8vfunc_38Ev kind:function(thumb,size=0x2) addr:0x203034c
+_ZN18DebugHierarchyBase8vfunc_3cEv kind:function(thumb,size=0x2) addr:0x2030350
 func_02030354 kind:function(thumb,size=0xb4) addr:0x2030354
-func_02030408 kind:function(thumb,size=0x18) addr:0x2030408
+func_02030408 kind:function(thumb,size=0x16) addr:0x2030408
 func_02030420 kind:function(thumb,size=0x44) addr:0x2030420
-func_02030464 kind:function(thumb,size=0x44) addr:0x2030464
+func_02030464 kind:function(thumb,size=0x42) addr:0x2030464
 func_020304a8 kind:function(thumb,size=0x2c) addr:0x20304a8
 DisplayDebugText kind:function(thumb,size=0xd8) addr:0x20304d4
 func_020305ac kind:function(thumb,size=0x88) addr:0x20305ac
 DisplayDebugTextFormat kind:function(thumb,size=0x30) addr:0x2030634
-DisplayDebugTextFormat_thunk kind:function(thumb,size=0x28) addr:0x2030664
-DisplayDebugTextF kind:function(thumb,size=0x34) addr:0x203068c
+DisplayDebugTextFormat_thunk kind:function(thumb,size=0x26) addr:0x2030664
+DisplayDebugTextF kind:function(thumb,size=0x32) addr:0x203068c
 func_020306c0 kind:function(thumb,size=0x70) addr:0x20306c0
 func_02030730 kind:function(thumb,size=0x28) addr:0x2030730
 func_02030758 kind:function(thumb,size=0x84) addr:0x2030758
@@ -1605,12 +1605,12 @@ func_020320c0 kind:function(arm,size=0x2c) addr:0x20320c0
 func_020320ec kind:function(arm,size=0xec) addr:0x20320ec
 func_020321d8 kind:function(arm,size=0xec) addr:0x20321d8
 func_020322c4 kind:function(arm,size=0x40) addr:0x20322c4
-func_02032304 kind:function(thumb,size=0x58) addr:0x2032304
+func_02032304 kind:function(thumb,size=0x56) addr:0x2032304
 func_0203235c kind:function(arm,size=0x8c) addr:0x203235c
 func_020323e8 kind:function(thumb,size=0x48) addr:0x20323e8
-func_02032430 kind:function(thumb,size=0x1c) addr:0x2032430
+func_02032430 kind:function(thumb,size=0x1a) addr:0x2032430
 func_0203244c kind:function(thumb,size=0x3c) addr:0x203244c
-func_02032488 kind:function(thumb,size=0x1c) addr:0x2032488
+func_02032488 kind:function(thumb,size=0x1a) addr:0x2032488
 func_020324a4 kind:function(thumb,size=0x28) addr:0x20324a4
 func_020324cc kind:function(arm,size=0x7c) addr:0x20324cc
 func_02032548 kind:function(arm,size=0x54) addr:0x2032548
@@ -1648,9 +1648,9 @@ func_02032e60 kind:function(arm,size=0x1c) addr:0x2032e60
 _ZN18UnkStruct_02032e7cC2Ev kind:function(arm,size=0x48) addr:0x2032e7c
 _ZN18UnkStruct_02032e7cC1Ev kind:function(arm,size=0x48) addr:0x2032ec4
 _ZN18UnkStruct_02032f0cC2Ev kind:function(thumb,size=0x78) addr:0x2032f0c
-_ZN18UnkStruct_02032f0cD1Ev kind:function(thumb,size=0x4) addr:0x2032f84
+_ZN18UnkStruct_02032f0cD1Ev kind:function(thumb,size=0x2) addr:0x2032f84
 _ZN18UnkStruct_02032f0cD0Ev kind:function(thumb,size=0xc) addr:0x2032f88
-_ZN18UnkStruct_02032f0c13func_02032f94Ev kind:function(thumb,size=0x4) addr:0x2032f94
+_ZN18UnkStruct_02032f0c13func_02032f94Ev kind:function(thumb,size=0x2) addr:0x2032f94
 _ZN18UnkStruct_02032f0c9SetUnk_0cEPt kind:function(arm,size=0xc) addr:0x2032f98
 _ZN18UnkStruct_02032f0c13func_02032fa4Ev kind:function(arm,size=0x10) addr:0x2032fa4
 _ZN18UnkStruct_02032f0c13func_02032fb4Ev kind:function(arm,size=0x18) addr:0x2032fb4
@@ -1749,8 +1749,8 @@ func_02035428 kind:function(arm,size=0x18) addr:0x2035428
 func_02035440 kind:function(arm,size=0x140) addr:0x2035440
 func_02035580 kind:function(thumb,size=0x14) addr:0x2035580
 func_02035594 kind:function(thumb,size=0x3c) addr:0x2035594
-func_020355d0 kind:function(thumb,size=0x14) addr:0x20355d0
-func_020355e4 kind:function(thumb,size=0x20) addr:0x20355e4
+func_020355d0 kind:function(thumb,size=0x12) addr:0x20355d0
+func_020355e4 kind:function(thumb,size=0x1e) addr:0x20355e4
 func_02035604 kind:function(thumb,size=0x2c) addr:0x2035604
 func_02035630 kind:function(arm,size=0x18) addr:0x2035630
 func_02035648 kind:function(arm,size=0x58) addr:0x2035648
@@ -1777,7 +1777,7 @@ func_02035f3c kind:function(arm,size=0x20) addr:0x2035f3c
 func_02035f5c kind:function(arm,size=0xb0) addr:0x2035f5c
 func_0203600c kind:function(thumb,size=0x8) addr:0x203600c
 func_02036014 kind:function(thumb,size=0x3c) addr:0x2036014
-func_02036050 kind:function(thumb,size=0x24) addr:0x2036050
+func_02036050 kind:function(thumb,size=0x22) addr:0x2036050
 func_02036074 kind:function(arm,size=0x18) addr:0x2036074
 func_0203608c kind:function(arm,size=0x1c) addr:0x203608c
 func_020360a8 kind:function(arm,size=0x28) addr:0x20360a8
@@ -1791,7 +1791,7 @@ func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0
 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8
 func_0203643c kind:function(arm,size=0x54) addr:0x203643c
 func_02036490 kind:function(thumb,size=0x1cc) addr:0x2036490
-func_0203665c kind:function(thumb,size=0x4c) addr:0x203665c
+func_0203665c kind:function(thumb,size=0x4a) addr:0x203665c
 func_020366a8 kind:function(arm,size=0x1c) addr:0x20366a8
 func_020366c4 kind:function(arm,size=0x3c) addr:0x20366c4
 func_02036700 kind:function(arm,size=0x3c) addr:0x2036700
@@ -1821,14 +1821,14 @@ func_020370e8 kind:function(arm,size=0x70) addr:0x20370e8
 func_02037158 kind:function(arm,size=0x20) addr:0x2037158
 func_02037178 kind:function(arm,size=0x38) addr:0x2037178
 func_020371b0 kind:function(arm,size=0x4) addr:0x20371b0
-func_020371b4 kind:function(thumb,size=0x14) addr:0x20371b4
+func_020371b4 kind:function(thumb,size=0x12) addr:0x20371b4
 func_020371c8 kind:function(thumb,size=0x90) addr:0x20371c8
 func_02037258 kind:function(arm,size=0x34) addr:0x2037258
 func_0203728c kind:function(arm,size=0x64) addr:0x203728c
 func_020372f0 kind:function(thumb,size=0xc4) addr:0x20372f0
-func_020373b4 kind:function(thumb,size=0x38) addr:0x20373b4
+func_020373b4 kind:function(thumb,size=0x36) addr:0x20373b4
 func_020373ec kind:function(arm,size=0x60) addr:0x20373ec
-_ZN18UnkStruct_027e05f8C2Ev kind:function(thumb,size=0xc) addr:0x203744c
+_ZN18UnkStruct_027e05f8C2Ev kind:function(thumb,size=0xa) addr:0x203744c
 _ZN18UnkStruct_027e05f813func_02037458Et kind:function(arm,size=0x28) addr:0x2037458
 _ZN18UnkStruct_027e05f813func_02037480Ev kind:function(arm,size=0x10) addr:0x2037480
 _ZN18UnkStruct_027e05f813func_02037490Ei kind:function(arm,size=0x24) addr:0x2037490
@@ -1871,10 +1871,10 @@ _ZN18UnkStruct_0203881c13func_02038858Ei kind:function(arm,size=0x30) addr:0x203
 _ZN18UnkStruct_0203881c13func_02038888Ev kind:function(arm,size=0xc8) addr:0x2038888
 _ZN18UnkStruct_0203881c13func_02038950EP18UnkStruct_02038aa0i kind:function(arm,size=0x130) addr:0x2038950
 _ZN18UnkStruct_0203881c13func_02038a80Ei kind:function(arm,size=0x1c) addr:0x2038a80
-_ZN18UnkStruct_0203881cD1Ev kind:function(thumb,size=0x4) addr:0x2038a9c
+_ZN18UnkStruct_0203881cD1Ev kind:function(thumb,size=0x2) addr:0x2038a9c
 _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038aa0
 _ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038afc
-_ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038b08
+_ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x12) addr:0x2038b08
 _ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038b1c
 _ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(thumb,size=0xc) addr:0x2038b28
 _ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0xc) addr:0x2038b34
@@ -2006,14 +2006,14 @@ func_0203d464 kind:function(arm,size=0x4c) addr:0x203d464
 func_0203d4b0 kind:function(arm,size=0x88) addr:0x203d4b0
 func_0203d538 kind:function(arm,size=0x44) addr:0x203d538
 func_0203d57c kind:function(thumb,size=0x44) addr:0x203d57c
-func_0203d5c0 kind:function(thumb,size=0x1c) addr:0x203d5c0
+func_0203d5c0 kind:function(thumb,size=0x1a) addr:0x203d5c0
 func_0203d5dc kind:function(thumb,size=0x24) addr:0x203d5dc
 func_0203d600 kind:function(arm,size=0x4c) addr:0x203d600
 func_0203d64c kind:function(arm,size=0x18) addr:0x203d64c
 func_0203d664 kind:function(arm,size=0x18) addr:0x203d664
 func_0203d67c kind:function(arm,size=0x1c) addr:0x203d67c
 func_0203d698 kind:function(thumb,size=0x38) addr:0x203d698
-func_0203d6d0 kind:function(thumb,size=0x8) addr:0x203d6d0
+func_0203d6d0 kind:function(thumb,size=0x6) addr:0x203d6d0
 func_0203d6d8 kind:function(thumb,size=0x58) addr:0x203d6d8
 func_0203d730 kind:function(thumb,size=0x4c) addr:0x203d730
 func_0203d77c kind:function(arm,size=0x3c) addr:0x203d77c
@@ -2067,7 +2067,7 @@ func_0203eaac kind:function(arm,size=0x24) addr:0x203eaac
 func_0203ead0 kind:function(arm,size=0xc) addr:0x203ead0
 func_0203eadc kind:function(arm,size=0x30) addr:0x203eadc
 func_0203eb0c kind:function(arm,size=0x80) addr:0x203eb0c
-func_0203eb8c kind:function(thumb,size=0x1c) addr:0x203eb8c
+func_0203eb8c kind:function(thumb,size=0x1a) addr:0x203eb8c
 func_0203eba8 kind:function(arm,size=0x20) addr:0x203eba8
 func_0203ebc8 kind:function(arm,size=0x18) addr:0x203ebc8
 func_0203ebe0 kind:function(arm,size=0x18) addr:0x203ebe0
@@ -2120,8 +2120,8 @@ func_02040068 kind:function(thumb,size=0x10) addr:0x2040068
 func_02040078 kind:function(thumb,size=0xc) addr:0x2040078
 func_02040084 kind:function(thumb,size=0x3c) addr:0x2040084
 func_020400c0 kind:function(thumb,size=0xc) addr:0x20400c0
-func_020400cc kind:function(thumb,size=0x14) addr:0x20400cc
-func_020400e0 kind:function(thumb,size=0x14) addr:0x20400e0
+func_020400cc kind:function(thumb,size=0x12) addr:0x20400cc
+func_020400e0 kind:function(thumb,size=0x12) addr:0x20400e0
 func_020400f4 kind:function(thumb,size=0xc) addr:0x20400f4
 func_02040100 kind:function(thumb,size=0xc) addr:0x2040100
 func_0204010c kind:function(thumb,size=0x8) addr:0x204010c
@@ -2150,14 +2150,14 @@ func_02040c84 kind:function(thumb,size=0x34) addr:0x2040c84
 func_02040cb8 kind:function(thumb,size=0xc) addr:0x2040cb8
 func_02040cc4 kind:function(thumb,size=0x60) addr:0x2040cc4
 func_02040d24 kind:function(thumb,size=0x40) addr:0x2040d24
-func_02040d64 kind:function(thumb,size=0x30) addr:0x2040d64
+func_02040d64 kind:function(thumb,size=0x2e) addr:0x2040d64
 func_02040d94 kind:function(thumb,size=0x3c) addr:0x2040d94
 func_02040dd0 kind:function(thumb,size=0x118) addr:0x2040dd0
-func_02040ee8 kind:function(thumb,size=0x34) addr:0x2040ee8
+func_02040ee8 kind:function(thumb,size=0x32) addr:0x2040ee8
 func_02040f1c kind:function(thumb,size=0x88) addr:0x2040f1c
 func_02040fa4 kind:function(thumb,size=0x20) addr:0x2040fa4
-func_02040fc4 kind:function(thumb,size=0x18) addr:0x2040fc4
-func_02040fdc kind:function(thumb,size=0x18) addr:0x2040fdc
+func_02040fc4 kind:function(thumb,size=0x16) addr:0x2040fc4
+func_02040fdc kind:function(thumb,size=0x16) addr:0x2040fdc
 func_02040ff4 kind:function(thumb,size=0x64) addr:0x2040ff4
 func_02041058 kind:function(thumb,size=0xa8) addr:0x2041058
 func_02041100 kind:function(thumb,size=0x130) addr:0x2041100
@@ -2168,10 +2168,10 @@ func_0204150c kind:function(thumb,size=0x4) addr:0x204150c
 ReadArchiveId kind:function(thumb,size=0x34) addr:0x2041510
 func_02041544 kind:function(thumb,size=0x10) addr:0x2041544
 func_02041554 kind:function(thumb,size=0x14) addr:0x2041554
-func_02041568 kind:function(thumb,size=0x10) addr:0x2041568
+func_02041568 kind:function(thumb,size=0xe) addr:0x2041568
 func_02041578 kind:function(thumb,size=0x16c) addr:0x2041578
-func_020416e4 kind:function(thumb,size=0x60) addr:0x20416e4
-func_02041744 kind:function(thumb,size=0x30) addr:0x2041744
+func_020416e4 kind:function(thumb,size=0x5e) addr:0x20416e4
+func_02041744 kind:function(thumb,size=0x2e) addr:0x2041744
 func_02041774 kind:function(thumb,size=0x120) addr:0x2041774
 func_02041894 kind:function(thumb,size=0x18) addr:0x2041894
 FindArchive kind:function(thumb,size=0x2c) addr:0x20418ac
@@ -2181,7 +2181,7 @@ func_0204198c kind:function(thumb,size=0x44) addr:0x204198c
 func_020419d0 kind:function(thumb,size=0x74) addr:0x20419d0
 func_02041a44 kind:function(thumb,size=0xb4) addr:0x2041a44
 func_02041af8 kind:function(thumb,size=0x58) addr:0x2041af8
-func_02041b50 kind:function(thumb,size=0x7c) addr:0x2041b50
+func_02041b50 kind:function(thumb,size=0x7a) addr:0x2041b50
 func_02041bcc kind:function(thumb,size=0x4c) addr:0x2041bcc
 func_02041c18 kind:function(thumb,size=0x14) addr:0x2041c18
 func_02041c2c kind:function(thumb,size=0x64) addr:0x2041c2c
@@ -2189,18 +2189,18 @@ func_02041c90 kind:function(thumb,size=0x18) addr:0x2041c90
 func_02041ca8 kind:function(thumb,size=0x14) addr:0x2041ca8
 func_02041cbc kind:function(thumb,size=0xd0) addr:0x2041cbc
 func_02041d8c kind:function(thumb,size=0x50) addr:0x2041d8c
-func_02041ddc kind:function(thumb,size=0x2c) addr:0x2041ddc
+func_02041ddc kind:function(thumb,size=0x2a) addr:0x2041ddc
 func_02041e08 kind:function(thumb,size=0x2c) addr:0x2041e08
 func_02041e34 kind:function(thumb,size=0x48) addr:0x2041e34
-func_02041e7c kind:function(thumb,size=0x2c) addr:0x2041e7c
-func_02041ea8 kind:function(thumb,size=0x28) addr:0x2041ea8
+func_02041e7c kind:function(thumb,size=0x2a) addr:0x2041e7c
+func_02041ea8 kind:function(thumb,size=0x26) addr:0x2041ea8
 func_02041ed0 kind:function(thumb,size=0x98) addr:0x2041ed0
-func_02041f68 kind:function(thumb,size=0x30) addr:0x2041f68
-func_02041f98 kind:function(thumb,size=0xc) addr:0x2041f98
-func_02041fa4 kind:function(thumb,size=0xc) addr:0x2041fa4
-func_02041fb0 kind:function(thumb,size=0x3c) addr:0x2041fb0
+func_02041f68 kind:function(thumb,size=0x2e) addr:0x2041f68
+func_02041f98 kind:function(thumb,size=0xa) addr:0x2041f98
+func_02041fa4 kind:function(thumb,size=0xa) addr:0x2041fa4
+func_02041fb0 kind:function(thumb,size=0x3a) addr:0x2041fb0
 func_02041fec kind:function(thumb,size=0x38) addr:0x2041fec
-func_02042024 kind:function(thumb,size=0x1c) addr:0x2042024
+func_02042024 kind:function(thumb,size=0x1a) addr:0x2042024
 func_02042040 kind:function(thumb,size=0x2c) addr:0x2042040
 func_0204206c kind:function(thumb,size=0x4) addr:0x204206c
 func_02042070 kind:function(thumb,size=0x3c) addr:0x2042070
@@ -2211,17 +2211,17 @@ func_02042190 kind:function(thumb,size=0x34) addr:0x2042190
 func_020421c4 kind:function(thumb,size=0x14) addr:0x20421c4
 func_020421d8 kind:function(thumb,size=0x24) addr:0x20421d8
 Overlay_FileSize kind:function(thumb,size=0x14) addr:0x20421fc
-Overlay_ClearCacheAndBss kind:function(thumb,size=0x28) addr:0x2042210
+Overlay_ClearCacheAndBss kind:function(thumb,size=0x26) addr:0x2042210
 Overlay_func_02042238 kind:function(thumb,size=0x18) addr:0x2042238
 Overlay_func_02042250 kind:function(thumb,size=0x9c) addr:0x2042250
 Overlay_func_020422ec kind:function(thumb,size=0xa0) addr:0x20422ec
-Overlay_func_0204238c kind:function(thumb,size=0x5c) addr:0x204238c
+Overlay_func_0204238c kind:function(thumb,size=0x5a) addr:0x204238c
 Overlay_func_020423e8 kind:function(thumb,size=0x58) addr:0x20423e8
 Overlay_Init kind:function(thumb,size=0x94) addr:0x2042440
 Overlay_RunGlobalDestructors kind:function(thumb,size=0xa4) addr:0x20424d4
-Overlay_Destroy kind:function(thumb,size=0xc) addr:0x2042578
+Overlay_Destroy kind:function(thumb,size=0xa) addr:0x2042578
 Overlay_Load kind:function(thumb,size=0x30) addr:0x2042584
-Overlay_Unload kind:function(thumb,size=0x2c) addr:0x20425b4
+Overlay_Unload kind:function(thumb,size=0x2a) addr:0x20425b4
 func_020425e0 kind:function(thumb,size=0x40) addr:0x20425e0
 func_02042620 kind:function(thumb,size=0x48) addr:0x2042620
 func_02042668 kind:function(thumb,size=0x24) addr:0x2042668
@@ -2230,7 +2230,7 @@ func_020426d4 kind:function(thumb,size=0x24) addr:0x20426d4
 func_020426f8 kind:function(thumb,size=0x4c) addr:0x20426f8
 func_02042744 kind:function(thumb,size=0x24) addr:0x2042744
 func_02042768 kind:function(thumb,size=0x31c) addr:0x2042768
-func_02042a84 kind:function(thumb,size=0x48) addr:0x2042a84
+func_02042a84 kind:function(thumb,size=0x46) addr:0x2042a84
 func_02042acc kind:function(thumb,size=0xc) addr:0x2042acc
 func_02042ad8 kind:function(arm,size=0x18) addr:0x2042ad8
 func_02042af0 kind:function(thumb,size=0xc) addr:0x2042af0
@@ -2243,7 +2243,7 @@ func_02042ba0 kind:function(thumb,size=0x18) addr:0x2042ba0
 func_02042bb8 kind:function(thumb,size=0x44) addr:0x2042bb8
 func_02042bfc kind:function(thumb,size=0xa0) addr:0x2042bfc
 func_02042c9c kind:function(thumb,size=0x60) addr:0x2042c9c
-func_02042cfc kind:function(thumb,size=0x40) addr:0x2042cfc
+func_02042cfc kind:function(thumb,size=0x3e) addr:0x2042cfc
 func_02042d3c kind:function(thumb,size=0x14) addr:0x2042d3c
 func_02042d50 kind:function(arm,size=0x24) addr:0x2042d50
 func_02042d74 kind:function(arm,size=0x4c) addr:0x2042d74
@@ -2425,20 +2425,20 @@ func_0204fc20 kind:function(arm,size=0x48) addr:0x204fc20
 func_0204fc68 kind:function(arm,size=0x4c) addr:0x204fc68
 func_0204fcb4 kind:function(arm,size=0xc) addr:0x204fcb4
 func_0204fcc0 kind:function(thumb,size=0x28) addr:0x204fcc0
-func_0204fce8 kind:function(thumb,size=0x1c) addr:0x204fce8
+func_0204fce8 kind:function(thumb,size=0x1a) addr:0x204fce8
 func_0204fd04 kind:function(thumb,size=0x10) addr:0x204fd04
 func_0204fd14 kind:function(thumb,size=0xac) addr:0x204fd14
 func_0204fdc0 kind:function(thumb,size=0x34) addr:0x204fdc0
 func_0204fdf4 kind:function(thumb,size=0x28) addr:0x204fdf4
 func_0204fe1c kind:function(thumb,size=0x3c) addr:0x204fe1c
-func_0204fe58 kind:function(thumb,size=0x18) addr:0x204fe58
-func_0204fe70 kind:function(thumb,size=0x30) addr:0x204fe70
+func_0204fe58 kind:function(thumb,size=0x16) addr:0x204fe58
+func_0204fe70 kind:function(thumb,size=0x2e) addr:0x204fe70
 func_0204fea0 kind:function(thumb,size=0x38) addr:0x204fea0
 func_0204fed8 kind:function(thumb,size=0x78) addr:0x204fed8
 func_0204ff50 kind:function(thumb,size=0x150) addr:0x204ff50
 func_020500a0 kind:function(thumb,size=0x1c) addr:0x20500a0
 func_020500bc kind:function(thumb,size=0x38) addr:0x20500bc
-func_020500f4 kind:function(thumb,size=0x10) addr:0x20500f4
+func_020500f4 kind:function(thumb,size=0xe) addr:0x20500f4
 func_02050104 kind:function(thumb,size=0xc) addr:0x2050104
 func_02050110 kind:function(thumb,size=0x64) addr:0x2050110
 func_02050174 kind:function(thumb,size=0xc) addr:0x2050174
@@ -2451,7 +2451,7 @@ func_02050684 kind:function(thumb,size=0x34) addr:0x2050684
 func_020506b8 kind:function(thumb,size=0xd4) addr:0x20506b8
 func_0205078c kind:function(thumb,size=0x138) addr:0x205078c
 func_020508c4 kind:function(thumb,size=0x54) addr:0x20508c4
-func_02050918 kind:function(thumb,size=0xf4) addr:0x2050918
+func_02050918 kind:function(thumb,size=0xf2) addr:0x2050918
 __sinit_02050ca0 kind:function(arm,size=0x14) addr:0x2050ca0
 __sinit_02050cb4 kind:function(arm,size=0x2c) addr:0x2050cb4
 __sinit_02050ce0 kind:function(arm,size=0x2c) addr:0x2050ce0