From 099eb240be0afe13c83cfb8e97a4a716798ea97b Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 6 Oct 2024 09:03:59 +0200 Subject: [PATCH] Prune fake Thumb functions starting with invalid `str` bases --- config/usa/arm9/overlays/ov006/relocs.txt | 22 ++++----- config/usa/arm9/overlays/ov039/delinks.txt | 4 +- config/usa/arm9/overlays/ov039/relocs.txt | 53 ++++++++++++++++++++++ config/usa/arm9/overlays/ov039/symbols.txt | 17 ++++++- config/usa/arm9/overlays/ov046/relocs.txt | 2 +- 5 files changed, 83 insertions(+), 15 deletions(-) diff --git a/config/usa/arm9/overlays/ov006/relocs.txt b/config/usa/arm9/overlays/ov006/relocs.txt index 537dc8e4..81fe14cd 100644 --- a/config/usa/arm9/overlays/ov006/relocs.txt +++ b/config/usa/arm9/overlays/ov006/relocs.txt @@ -486,8 +486,8 @@ from:0x02103380 kind:load to:0x02180584 module:overlays(33,61) from:0x02103384 kind:load to:0x0218fec4 module:overlays(15,40,44) from:0x02103388 kind:load to:0x0218fefc module:overlays(15,40,44) from:0x0210338c kind:load to:0x0218ff30 module:overlays(15,40,44) -from:0x02103390 kind:load to:0x02186204 module:overlays(15,32,34,35) -from:0x02103394 kind:load to:0x02186230 module:overlays(15,32,34,35,37) +from:0x02103390 kind:load to:0x02186204 module:overlays(15,32,34,35,39) +from:0x02103394 kind:load to:0x02186230 module:overlays(15,32,34,35,37,39) from:0x02103398 kind:load to:0x0218ff5c module:overlays(15,40,44) from:0x0210339c kind:load to:0x0218fe78 module:overlays(15,40,44) from:0x021033a0 kind:load to:0x0218ff88 module:overlays(15,40,44) @@ -513,10 +513,10 @@ from:0x021033ec kind:load to:0x0217a81c module:overlays(23,24,25,26,29,61) from:0x021033f0 kind:load to:0x0217a87c module:overlays(23,24,25,26,29,61) from:0x021033f4 kind:load to:0x0217a85c module:overlays(23,24,25,26,29,61) from:0x021033f8 kind:load to:0x0217a83c module:overlays(23,24,25,26,29,61) -from:0x021033fc kind:load to:0x021861a4 module:overlays(15,32,34,35) -from:0x02103400 kind:load to:0x0218614c module:overlays(15,32,34,35) -from:0x02103404 kind:load to:0x02186178 module:overlays(15,32,34,35) -from:0x02103408 kind:load to:0x0218625c module:overlays(15,32,34,35) +from:0x021033fc kind:load to:0x021861a4 module:overlays(15,32,34,35,39) +from:0x02103400 kind:load to:0x0218614c module:overlays(15,32,34,35,39) +from:0x02103404 kind:load to:0x02186178 module:overlays(15,32,34,35,39) +from:0x02103408 kind:load to:0x0218625c module:overlays(15,32,34,35,39) from:0x0210340c kind:load to:0x0217ab8c module:overlays(23,24,26,29,61) from:0x02103410 kind:load to:0x02195398 module:overlays(40,48) from:0x02103414 kind:load to:0x02195444 module:overlays(40,48) @@ -559,11 +559,11 @@ from:0x021034a4 kind:load to:0x02186efc module:overlays(15,35,36) from:0x021034a8 kind:load to:0x02185e58 module:overlays(15,32,34,35) from:0x021034ac kind:load to:0x02185e2c module:overlays(15,32,34,35) from:0x021034b0 kind:load to:0x02186f58 module:overlays(15,35) -from:0x021034b4 kind:load to:0x0218610c module:overlays(15,32,34,35) -from:0x021034b8 kind:load to:0x021862d4 module:overlays(15,34,35) +from:0x021034b4 kind:load to:0x0218610c module:overlays(15,32,34,35,39) +from:0x021034b8 kind:load to:0x021862d4 module:overlays(15,34,35,39) from:0x021034bc kind:load to:0x0217a520 module:overlays(22,23,24,25,26,29,61) from:0x021034c0 kind:load to:0x02194bd4 module:overlays(40,46,48) -from:0x021034c4 kind:load to:0x0218630c module:overlays(15,34,35) +from:0x021034c4 kind:load to:0x0218630c module:overlays(15,34,35,39) from:0x021034c8 kind:load to:0x02186f0c module:overlays(15,35,36) from:0x021034cc kind:load to:0x02186f2c module:overlays(15,35,36) from:0x021034d0 kind:load to:0x0218ee88 module:overlays(15,40) @@ -798,8 +798,8 @@ from:0x02103860 kind:load to:0x0216cee8 module:overlays(17,18) from:0x02103864 kind:load to:0x02100a30 module:overlay(3) from:0x02103868 kind:load to:0x0216d454 module:overlay(18) from:0x0210386c kind:load to:0x0217af34 module:overlays(24,26,29,61) -from:0x02103870 kind:load to:0x021861c4 module:overlays(15,32,34,35) -from:0x02103874 kind:load to:0x021861e4 module:overlays(15,32,34,35) +from:0x02103870 kind:load to:0x021861c4 module:overlays(15,32,34,35,39) +from:0x02103874 kind:load to:0x021861e4 module:overlays(15,32,34,35,39) from:0x02103878 kind:load to:0x0217b04c module:overlays(24,26,29,61) from:0x0210387c kind:load to:0x0217b060 module:overlays(24,26,29,61) from:0x02103880 kind:load to:0x0215b384 module:overlay(14) diff --git a/config/usa/arm9/overlays/ov039/delinks.txt b/config/usa/arm9/overlays/ov039/delinks.txt index 1f2d4cc8..cb44cebd 100644 --- a/config/usa/arm9/overlays/ov039/delinks.txt +++ b/config/usa/arm9/overlays/ov039/delinks.txt @@ -1,5 +1,5 @@ - .text start:0x0217bce0 end:0x02186490 kind:code align:32 - .rodata start:0x02186490 end:0x021868c8 kind:data align:4 + .text start:0x0217bce0 end:0x02186084 kind:code align:32 + .rodata start:0x02186084 end:0x021868c8 kind:data align:4 .init start:0x021868c8 end:0x0218691c kind:code align:4 .ctor start:0x0218691c end:0x02186924 kind:data align:4 .data start:0x02186940 end:0x02186c20 kind:data align:32 diff --git a/config/usa/arm9/overlays/ov039/relocs.txt b/config/usa/arm9/overlays/ov039/relocs.txt index 2c9b3db8..ee5473ab 100644 --- a/config/usa/arm9/overlays/ov039/relocs.txt +++ b/config/usa/arm9/overlays/ov039/relocs.txt @@ -101,6 +101,7 @@ from:0x0217c6cc kind:arm_call to:0x0217c224 module:overlay(39) from:0x0217c6e8 kind:load to:0x02186084 module:overlay(39) from:0x0217c700 kind:arm_call to:0x020c5c84 module:overlay(0) from:0x0217c70c kind:arm_call to:0x0217c258 module:overlay(39) +from:0x0217c720 kind:load to:0x021862f0 module:overlay(39) from:0x0217c730 kind:arm_call to:0x020c5dc0 module:overlay(0) from:0x0217c750 kind:arm_call to:0x020c0da4 module:overlay(0) from:0x0217c758 kind:arm_call to:0x0217cc60 module:overlay(39) @@ -238,6 +239,7 @@ from:0x0217d52c kind:load to:0x027e0fe4 module:dtcm from:0x0217d54c kind:arm_call to:0x020b7e0c module:overlay(0) from:0x0217d554 kind:arm_call to:0x020b7e0c module:overlay(0) from:0x0217d55c kind:arm_call to:0x020b7e0c module:overlay(0) +from:0x0217d5e0 kind:load to:0x02186304 module:overlay(39) from:0x0217d610 kind:arm_call to:0x02036844 module:main from:0x0217d61c kind:arm_call to:0x020c30dc module:overlay(0) from:0x0217d638 kind:arm_call to:0x0217d6f0 module:overlay(39) @@ -293,6 +295,7 @@ from:0x0217dc28 kind:arm_call to:0x0217f770 module:overlay(39) from:0x0217dc30 kind:arm_call to:0x0217e394 module:overlay(39) from:0x0217dc4c kind:arm_call to:0x02185284 module:overlay(39) from:0x0217dc58 kind:load to:0x0217bc88 module:overlays(29,61) +from:0x0217dc5c kind:load to:0x021863cc module:overlay(39) from:0x0217dc60 kind:load to:0x020eec3c module:overlay(0) from:0x0217dc6c kind:load to:0x027e0f64 module:dtcm from:0x0217dc70 kind:load to:0x027e0fc8 module:dtcm @@ -1159,6 +1162,56 @@ from:0x02186060 kind:load to:0x020571b8 module:main from:0x02186064 kind:load to:0x027e0fb4 module:dtcm from:0x02186070 kind:arm_call_thumb to:0x020a958c module:overlay(0) from:0x02186078 kind:arm_call to:0x0202ea08 module:main +from:0x02186304 kind:load to:0x0217fd8c module:overlay(39) +from:0x0218630c kind:load to:0x0217fe7c module:overlay(39) +from:0x02186314 kind:load to:0x02180f38 module:overlay(39) +from:0x0218631c kind:load to:0x02181028 module:overlay(39) +from:0x02186324 kind:load to:0x02181124 module:overlay(39) +from:0x0218632c kind:load to:0x02181330 module:overlay(39) +from:0x02186334 kind:load to:0x02181524 module:overlay(39) +from:0x0218633c kind:load to:0x021818fc module:overlay(39) +from:0x02186344 kind:load to:0x02181d98 module:overlay(39) +from:0x0218634c kind:load to:0x02182058 module:overlay(39) +from:0x02186354 kind:load to:0x0218237c module:overlay(39) +from:0x0218635c kind:load to:0x021823c8 module:overlay(39) +from:0x02186364 kind:load to:0x02182414 module:overlay(39) +from:0x0218636c kind:load to:0x02182548 module:overlay(39) +from:0x02186374 kind:load to:0x02182710 module:overlay(39) +from:0x0218637c kind:load to:0x0218278c module:overlay(39) +from:0x02186384 kind:load to:0x021827e8 module:overlay(39) +from:0x0218638c kind:load to:0x02182eb8 module:overlay(39) +from:0x02186394 kind:load to:0x02183138 module:overlay(39) +from:0x0218639c kind:load to:0x02183304 module:overlay(39) +from:0x021863a4 kind:load to:0x021835fc module:overlay(39) +from:0x021863ac kind:load to:0x02183778 module:overlay(39) +from:0x021863b4 kind:load to:0x02183824 module:overlay(39) +from:0x021863bc kind:load to:0x02183c2c module:overlay(39) +from:0x021863c4 kind:load to:0x021846e8 module:overlay(39) +from:0x021863cc kind:load to:0x0217fdbc module:overlay(39) +from:0x021863d4 kind:load to:0x0217febc module:overlay(39) +from:0x021863dc kind:load to:0x02180f54 module:overlay(39) +from:0x021863e4 kind:load to:0x0218108c module:overlay(39) +from:0x021863ec kind:load to:0x02181188 module:overlay(39) +from:0x021863f4 kind:load to:0x021813fc module:overlay(39) +from:0x021863fc kind:load to:0x02181808 module:overlay(39) +from:0x02186404 kind:load to:0x02181c2c module:overlay(39) +from:0x0218640c kind:load to:0x02181df8 module:overlay(39) +from:0x02186414 kind:load to:0x021821e4 module:overlay(39) +from:0x0218641c kind:load to:0x02182398 module:overlay(39) +from:0x02186424 kind:load to:0x021823e4 module:overlay(39) +from:0x0218642c kind:load to:0x0218251c module:overlay(39) +from:0x02186434 kind:load to:0x021825d4 module:overlay(39) +from:0x0218643c kind:load to:0x02182718 module:overlay(39) +from:0x02186444 kind:load to:0x021827b8 module:overlay(39) +from:0x0218644c kind:load to:0x021828b4 module:overlay(39) +from:0x02186454 kind:load to:0x02182f5c module:overlay(39) +from:0x0218645c kind:load to:0x0218322c module:overlay(39) +from:0x02186464 kind:load to:0x02183488 module:overlay(39) +from:0x0218646c kind:load to:0x02183640 module:overlay(39) +from:0x02186474 kind:load to:0x021837dc module:overlay(39) +from:0x0218647c kind:load to:0x02183b8c module:overlay(39) +from:0x02186484 kind:load to:0x021842a8 module:overlay(39) +from:0x0218648c kind:load to:0x02184778 module:overlay(39) from:0x021867c4 kind:load to:0x02185a54 module:overlay(39) from:0x021867cc kind:load to:0x02185a70 module:overlay(39) from:0x021867d4 kind:load to:0x02185b30 module:overlay(39) diff --git a/config/usa/arm9/overlays/ov039/symbols.txt b/config/usa/arm9/overlays/ov039/symbols.txt index a1dd0176..05c98f00 100644 --- a/config/usa/arm9/overlays/ov039/symbols.txt +++ b/config/usa/arm9/overlays/ov039/symbols.txt @@ -194,7 +194,22 @@ func_ov039_02185fac kind:function(arm,size=0x2c) addr:0x2185fac func_ov039_02185fd8 kind:function(arm,size=0x24) addr:0x2185fd8 func_ov039_02185ffc kind:function(arm,size=0x6c) addr:0x2185ffc func_ov039_02186068 kind:function(arm,size=0x1c) addr:0x2186068 -func_ov039_02186084 kind:function(thumb,size=0x40c) addr:0x2186084 +data_ov039_02186084 kind:data(any) addr:0x2186084 +data_ov039_0218610c kind:data(any) addr:0x218610c ambiguous +data_ov039_02186148 kind:data(any) addr:0x2186148 ambiguous +data_ov039_0218614c kind:data(any) addr:0x218614c ambiguous +data_ov039_02186178 kind:data(any) addr:0x2186178 ambiguous +data_ov039_021861a4 kind:data(any) addr:0x21861a4 ambiguous +data_ov039_021861c4 kind:data(any) addr:0x21861c4 ambiguous +data_ov039_021861e4 kind:data(any) addr:0x21861e4 ambiguous +data_ov039_02186204 kind:data(any) addr:0x2186204 ambiguous +data_ov039_02186230 kind:data(any) addr:0x2186230 ambiguous +data_ov039_0218625c kind:data(any) addr:0x218625c ambiguous +data_ov039_021862d4 kind:data(any) addr:0x21862d4 ambiguous +data_ov039_021862f0 kind:data(any) addr:0x21862f0 +data_ov039_02186304 kind:data(any) addr:0x2186304 +data_ov039_0218630c kind:data(any) addr:0x218630c ambiguous +data_ov039_021863cc kind:data(any) addr:0x21863cc data_ov039_02186494 kind:data(any) addr:0x2186494 data_ov039_021864a8 kind:data(any) addr:0x21864a8 data_ov039_021864f0 kind:data(any) addr:0x21864f0 diff --git a/config/usa/arm9/overlays/ov046/relocs.txt b/config/usa/arm9/overlays/ov046/relocs.txt index 6a06f4e7..13c862da 100644 --- a/config/usa/arm9/overlays/ov046/relocs.txt +++ b/config/usa/arm9/overlays/ov046/relocs.txt @@ -369,7 +369,7 @@ from:0x02193a78 kind:load to:0x027e0e58 module:dtcm from:0x02193a7c kind:load to:0x0217a534 module:overlays(22,23,24,25,26,29,61) from:0x02193a80 kind:load to:0x027e0764 module:dtcm from:0x02193a88 kind:load to:0x02050f10 module:main -from:0x02193a8c kind:load to:0x02186148 module:overlays(15,32,34,35) +from:0x02193a8c kind:load to:0x02186148 module:overlays(15,32,34,35,39) from:0x02193ad0 kind:arm_call to:0x0207c150 module:overlay(0) from:0x02193af4 kind:arm_call to:0x0207c150 module:overlay(0) from:0x02193b08 kind:arm_call to:0x020cea6c module:overlay(0)