Decomp LinkStateDamage (#133)

* match first functions

* add more functions

* match more functions

* match last function

* fix EUR relocs file

* match some data

* fix PR comments

* match vfunc_24

* fixed most of .data

* match symbol names

---------

Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>

3 files changed, 42 insertions, 49 deletions

diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt
index cfd76b1a..3268527c 100644
--- a/config/eur/arm9/overlays/ov000/relocs.txt
+++ b/config/eur/arm9/overlays/ov000/relocs.txt
@@ -5221,21 +5221,21 @@ from:0x020ac16a kind:thumb_call_arm to:0x020a8dec module:overlay(0)
 from:0x020ac170 kind:thumb_call_arm to:0x020a8df8 module:overlay(0)
 from:0x020ac178 kind:load to:0x020e5aac module:overlay(0)
 from:0x020ac17c kind:load to:0x020e5bac module:overlay(0)
-from:0x020ac184 kind:load to:0x020e5af4 module:overlay(0)
-from:0x020ac188 kind:load to:0x020e5af8 module:overlay(0)
+from:0x020ac184 kind:load to:0x020e5af0 add:0x4 module:overlay(0)
+from:0x020ac188 kind:load to:0x020e5af0 add:0x8 module:overlay(0)
 from:0x020ac18c kind:load to:0x020e5bc0 module:overlay(0)
-from:0x020ac190 kind:load to:0x020e5afc module:overlay(0)
+from:0x020ac190 kind:load to:0x020e5af0 add:0xc module:overlay(0)
 from:0x020ac194 kind:load to:0x020e5bd8 module:overlay(0)
 from:0x020ac198 kind:load to:0x020e5bf0 module:overlay(0)
-from:0x020ac19c kind:load to:0x020e5b04 module:overlay(0)
-from:0x020ac1a0 kind:load to:0x020e5b08 module:overlay(0)
+from:0x020ac19c kind:load to:0x020e5b00 add:0x4 module:overlay(0)
+from:0x020ac1a0 kind:load to:0x020e5b00 add:0x8 module:overlay(0)
 from:0x020ac1a4 kind:load to:0x020e5c04 module:overlay(0)
-from:0x020ac1a8 kind:load to:0x020e5b0c module:overlay(0)
+from:0x020ac1a8 kind:load to:0x020e5b00 add:0xc module:overlay(0)
 from:0x020ac1ac kind:load to:0x020e5c1c module:overlay(0)
 from:0x020ac1b0 kind:load to:0x020e5c34 module:overlay(0)
 from:0x020ac1b4 kind:load to:0x020e5aec module:overlay(0)
 from:0x020ac1b8 kind:load to:0x020e5c44 module:overlay(0)
-from:0x020ac1bc kind:load to:0x020e5ae0 module:overlay(0)
+from:0x020ac1bc kind:load to:0x020e5adc add:0x4 module:overlay(0)
 from:0x020ac1d4 kind:arm_call to:0x020a8d40 module:overlay(0)
 from:0x020ac1e0 kind:arm_call to:0x020a81dc module:overlay(0)
 from:0x020ac1f0 kind:arm_call to:0x020a81dc module:overlay(0)
diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 0f389d0e..3227b3c6 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -2087,11 +2087,11 @@ _ZN15LinkStateDamage20CreateDebugHierarchyEv kind:function(thumb,size=0x218) add
 _ZN15LinkStateDamage12OnStateEnterEv kind:function(arm,size=0x630) addr:0x020ac1c0
 _ZN15LinkStateDamage12OnStateLeaveEi kind:function(arm,size=0x1f4) addr:0x020ac7f0
 _ZN15LinkStateDamage18func_ov00_020ac9e4Ei kind:function(arm,size=0x6c) addr:0x020ac9e4
-_ZN15LinkStateDamage18func_ov00_020aca50Ev kind:function(arm,size=0x44) addr:0x020aca50
-_ZN15LinkStateDamage18func_ov00_020aca94Ev kind:function(arm,size=0x68) addr:0x020aca94
+_Z11RespawnLinkP15LinkStateDamage kind:function(arm,size=0x44) addr:0x020aca50
+_ZN15LinkStateDamage21SetLinkFrozenMaterialEv kind:function(arm,size=0x68) addr:0x020aca94
 _ZN15LinkStateDamage8vfunc_30Ei kind:function(arm,size=0x70) addr:0x020acafc
 _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi kind:function(arm,size=0x324) addr:0x020acb6c
-_ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi kind:function(arm,size=0x68) addr:0x020ace90
+_ZN15LinkStateDamage9KnockbackEP5Vec3pi kind:function(arm,size=0x68) addr:0x020ace90
 _ZN15LinkStateDamage8vfunc_24Ei kind:function(arm,size=0x30) addr:0x020acef8
 _ZN15LinkStateDamage8vfunc_20Ei kind:function(arm,size=0xc0) addr:0x020acf28
 _ZN15LinkStateDamage18func_ov00_020acfe8Eb kind:function(arm,size=0x30) addr:0x020acfe8
@@ -3718,7 +3718,7 @@ data_ov000_020dc550 kind:data(any) addr:0x020dc550
 data_ov000_020dc554 kind:data(any) addr:0x020dc554
 data_ov000_020dc558 kind:data(any) addr:0x020dc558
 data_ov000_020dc55c kind:data(any) addr:0x020dc55c
-data_ov000_020dc560 kind:data(any) addr:0x020dc560
+@1244 kind:data(any) addr:0x020dc560
 data_ov000_020dc574 kind:data(any) addr:0x020dc574
 data_ov000_020dc674 kind:data(any) addr:0x020dc674
 sQuiverSizes kind:data(any) addr:0x020dc6c4 local
@@ -4829,41 +4829,34 @@ data_ov000_020e5a0c kind:data(any) addr:0x020e5a0c
 data_ov000_020e5a20 kind:data(any) addr:0x020e5a20
 data_ov000_020e5a34 kind:data(any) addr:0x020e5a34
 _ZTV13LinkStateItem kind:data(any) addr:0x020e5a40
-data_ov000_020e5a8c kind:data(any) addr:0x020e5a8c
-data_ov000_020e5a90 kind:data(any) addr:0x020e5a90
-data_ov000_020e5a94 kind:data(any) addr:0x020e5a94
-data_ov000_020e5a98 kind:data(any) addr:0x020e5a98
-data_ov000_020e5a9c kind:data(any) addr:0x020e5a9c
-data_ov000_020e5aa0 kind:data(any) addr:0x020e5aa0
-data_ov000_020e5aa4 kind:data(any) addr:0x020e5aa4
-data_ov000_020e5aa8 kind:data(any) addr:0x020e5aa8
-data_ov000_020e5aac kind:data(any) addr:0x020e5aac
-data_ov000_020e5acc kind:data(any) addr:0x020e5acc
-data_ov000_020e5adc kind:data(any) addr:0x020e5adc
-data_ov000_020e5ae0 kind:data(any) addr:0x020e5ae0
-data_ov000_020e5aec kind:data(any) addr:0x020e5aec
-data_ov000_020e5af0 kind:data(any) addr:0x020e5af0
-data_ov000_020e5af4 kind:data(any) addr:0x020e5af4
-data_ov000_020e5af8 kind:data(any) addr:0x020e5af8
-data_ov000_020e5afc kind:data(any) addr:0x020e5afc
-data_ov000_020e5b00 kind:data(any) addr:0x020e5b00
-data_ov000_020e5b04 kind:data(any) addr:0x020e5b04
-data_ov000_020e5b08 kind:data(any) addr:0x020e5b08
-data_ov000_020e5b0c kind:data(any) addr:0x020e5b0c
-data_ov000_020e5b10 kind:data(any) addr:0x020e5b10
-data_ov000_020e5b20 kind:data(any) addr:0x020e5b20
-data_ov000_020e5b30 kind:data(any) addr:0x020e5b30
-data_ov000_020e5b40 kind:data(any) addr:0x020e5b40
-data_ov000_020e5b50 kind:data(any) addr:0x020e5b50
-_ZTV15LinkStateDamage kind:data(any) addr:0x020e5b68
-data_ov000_020e5bac kind:data(any) addr:0x020e5bac
-data_ov000_020e5bc0 kind:data(any) addr:0x020e5bc0
-data_ov000_020e5bd8 kind:data(any) addr:0x020e5bd8
-data_ov000_020e5bf0 kind:data(any) addr:0x020e5bf0
-data_ov000_020e5c04 kind:data(any) addr:0x020e5c04
-data_ov000_020e5c1c kind:data(any) addr:0x020e5c1c
-data_ov000_020e5c34 kind:data(any) addr:0x020e5c34
-data_ov000_020e5c44 kind:data(any) addr:0x020e5c44
+@1126 kind:data(any) addr:0x020e5a8c
+@1125 kind:data(any) addr:0x020e5a90
+@1124 kind:data(any) addr:0x020e5a94
+@1123 kind:data(any) addr:0x020e5a98
+@1122 kind:data(any) addr:0x020e5a9c
+@1121 kind:data(any) addr:0x020e5aa0
+@1120 kind:data(any) addr:0x020e5aa4
+@1119 kind:data(any) addr:0x020e5aa8
+gShipParts kind:data(any) addr:0x020e5aac
+_ZN15LinkStateDamage19data_ov000_020e5accE kind:data(any) addr:0x020e5acc
+_ZN15LinkStateDamage19data_ov000_020e5adcE kind:data(any) addr:0x020e5adc
+_ZN15LinkStateDamage19data_ov000_020e5aecE kind:data(any) addr:0x020e5aec
+_ZN15LinkStateDamage19data_ov000_020e5af0E kind:data(any) addr:0x020e5af0
+_ZN15LinkStateDamage19data_ov000_020e5b00E kind:data(any) addr:0x020e5b00
+_ZN15LinkStateDamage19data_ov000_020e5b10E kind:data(any) addr:0x020e5b10
+_ZN15LinkStateDamage19data_ov000_020e5b20E kind:data(any) addr:0x020e5b20
+_ZN15LinkStateDamage19data_ov000_020e5b30E kind:data(any) addr:0x020e5b30
+_ZN15LinkStateDamage19data_ov000_020e5b40E kind:data(any) addr:0x020e5b40
+_ZN15LinkStateDamage19data_ov000_020e5b50E kind:data(any) addr:0x020e5b50
+_ZTV15LinkStateDamage kind:data(any) addr:0x020e5b60
+@1178 kind:data(any) addr:0x020e5bac local
+@1179 kind:data(any) addr:0x020e5bc0 local
+@1180 kind:data(any) addr:0x020e5bd8 local
+@1181 kind:data(any) addr:0x020e5bf0 local
+@1182 kind:data(any) addr:0x020e5c04 local
+@1183 kind:data(any) addr:0x020e5c1c local
+@1184 kind:data(any) addr:0x020e5c34 local
+@1185 kind:data(any) addr:0x020e5c44 local
 @1542 kind:data(any) addr:0x020e5c58 local
 @1541 kind:data(any) addr:0x020e5c5c local
 @1540 kind:data(any) addr:0x020e5c60 local
diff --git a/config/eur/arm9/overlays/ov004/relocs.txt b/config/eur/arm9/overlays/ov004/relocs.txt
index c61e5fee..f056478a 100644
--- a/config/eur/arm9/overlays/ov004/relocs.txt
+++ b/config/eur/arm9/overlays/ov004/relocs.txt
@@ -1709,7 +1709,7 @@ from:0x0210836e kind:thumb_call to:0x020bb3f4 module:overlay(0)
 from:0x02108386 kind:thumb_call_arm to:0x0202e9dc module:main
 from:0x02108394 kind:thumb_call to:0x020bb42c module:overlay(0)
 from:0x021083ac kind:thumb_call to:0x021083f4 module:overlay(4)
-from:0x021083d0 kind:load to:0x020e5b68 module:overlay(0)
+from:0x021083d0 kind:load to:0x020e5b60 add:8 module:overlay(0)
 from:0x021083d4 kind:load to:0x027e0d0c module:dtcm
 from:0x021083d8 kind:load to:0x020b7d74 module:overlay(0)
 from:0x021083dc kind:load to:0x021079d5 module:overlay(4)
@@ -1728,7 +1728,7 @@ from:0x02108454 kind:thumb_call_arm to:0x020b7d74 module:overlay(0)
 from:0x0210845c kind:thumb_call to:0x020a95a4 module:overlay(0)
 from:0x0210846a kind:thumb_call_arm to:0x0204f754 module:main
 from:0x02108470 kind:thumb_call to:0x0210adf4 module:overlay(4)
-from:0x02108478 kind:load to:0x020e5b68 module:overlay(0)
+from:0x02108478 kind:load to:0x020e5b60 add:8 module:overlay(0)
 from:0x0210847c kind:load to:0x020b7d74 module:overlay(0)
 from:0x0210849e kind:thumb_call_arm to:0x020b7d74 module:overlay(0)
 from:0x021084ac kind:thumb_call_arm to:0x0204f754 module:main
@@ -1737,7 +1737,7 @@ from:0x021084bc kind:thumb_call to:0x020a95a4 module:overlay(0)
 from:0x021084ca kind:thumb_call_arm to:0x0204f754 module:main
 from:0x021084d0 kind:thumb_call to:0x0210adf4 module:overlay(4)
 from:0x021084d6 kind:thumb_call_arm to:0x0202ea0c module:main
-from:0x021084e0 kind:load to:0x020e5b68 module:overlay(0)
+from:0x021084e0 kind:load to:0x020e5b60 add:8 module:overlay(0)
 from:0x021084e4 kind:load to:0x020b7d74 module:overlay(0)
 from:0x021084f2 kind:thumb_call_arm to:0x020a5e9c module:overlay(0)
 from:0x021084fc kind:thumb_call_arm to:0x02078b40 module:overlay(0)