From 494841c25a8f357a664c396801c92805bbb5ad82 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 29 Sep 2024 09:06:03 +0200 Subject: [PATCH] Disambiguate function calls to incorrect instruction set --- config/eur/arm9/overlays/ov000/relocs.txt | 10 ++++----- config/eur/arm9/overlays/ov002/relocs.txt | 2 +- config/eur/arm9/overlays/ov003/relocs.txt | 4 ++-- config/eur/arm9/overlays/ov004/relocs.txt | 6 +++--- config/eur/arm9/overlays/ov009/relocs.txt | 10 ++++----- config/eur/arm9/overlays/ov012/relocs.txt | 2 +- config/eur/arm9/overlays/ov013/relocs.txt | 2 +- config/eur/arm9/overlays/ov014/relocs.txt | 8 +++---- config/eur/arm9/overlays/ov015/relocs.txt | 26 +++++++++++------------ config/eur/arm9/overlays/ov018/relocs.txt | 10 ++++----- config/eur/arm9/overlays/ov022/relocs.txt | 2 +- config/eur/arm9/overlays/ov025/relocs.txt | 2 +- config/eur/arm9/overlays/ov027/relocs.txt | 2 +- config/eur/arm9/overlays/ov041/relocs.txt | 2 +- config/eur/arm9/overlays/ov045/relocs.txt | 2 +- config/eur/arm9/overlays/ov046/relocs.txt | 2 +- config/eur/arm9/overlays/ov053/relocs.txt | 2 +- config/eur/arm9/overlays/ov060/relocs.txt | 2 +- config/eur/arm9/overlays/ov061/relocs.txt | 4 ++-- config/eur/arm9/relocs.txt | 8 +++---- config/usa/arm9/overlays/ov000/relocs.txt | 10 ++++----- config/usa/arm9/overlays/ov002/relocs.txt | 2 +- config/usa/arm9/overlays/ov003/relocs.txt | 4 ++-- config/usa/arm9/overlays/ov004/relocs.txt | 16 +++++++------- config/usa/arm9/overlays/ov009/relocs.txt | 10 ++++----- config/usa/arm9/overlays/ov012/relocs.txt | 2 +- config/usa/arm9/overlays/ov013/relocs.txt | 2 +- config/usa/arm9/overlays/ov014/relocs.txt | 8 +++---- config/usa/arm9/overlays/ov015/relocs.txt | 26 +++++++++++------------ config/usa/arm9/overlays/ov018/relocs.txt | 12 +++++------ config/usa/arm9/overlays/ov022/relocs.txt | 2 +- config/usa/arm9/overlays/ov025/relocs.txt | 2 +- config/usa/arm9/overlays/ov026/relocs.txt | 2 +- config/usa/arm9/overlays/ov027/relocs.txt | 2 +- config/usa/arm9/overlays/ov041/relocs.txt | 2 +- config/usa/arm9/overlays/ov045/relocs.txt | 2 +- config/usa/arm9/overlays/ov053/relocs.txt | 2 +- config/usa/arm9/overlays/ov060/relocs.txt | 2 +- config/usa/arm9/overlays/ov061/relocs.txt | 4 ++-- config/usa/arm9/relocs.txt | 8 +++---- 40 files changed, 114 insertions(+), 114 deletions(-) diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index ec900df3..2555d42c 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -249,7 +249,7 @@ from:0x02078a84 kind:load to:0x0200e8f8 module:main from:0x02078a9c kind:thumb_call to:0x02077af8 module:overlay(0) from:0x02078ada kind:thumb_call to:0x02077af8 module:overlay(0) from:0x02078b14 kind:thumb_call to:0x0202ff64 module:main -from:0x02078b22 kind:thumb_call to:0x02100b6c module:overlays(4,6) +from:0x02078b22 kind:thumb_call to:0x02100b6c module:overlay(4) from:0x02078b28 kind:thumb_call_arm to:0x0202ea0c module:main from:0x02078b34 kind:load to:0x027e0900 module:dtcm from:0x02078b3c kind:load to:0x027e0d38 module:dtcm @@ -3185,7 +3185,7 @@ from:0x020983a0 kind:arm_call_thumb to:0x0207b334 module:overlay(0) from:0x020983ac kind:arm_call to:0x02098694 module:overlay(0) from:0x0209852c kind:arm_call to:0x020838e8 module:overlay(0) from:0x02098550 kind:arm_call_thumb to:0x0207b5bc module:overlay(0) -from:0x02098558 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02098558 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02098598 kind:arm_call to:0x0209a508 module:overlay(0) from:0x020985a8 kind:load to:0x027e0f64 module:dtcm from:0x020985ac kind:load to:0x027e0f90 module:dtcm @@ -3253,7 +3253,7 @@ from:0x0209944c kind:arm_call to:0x020c3894 module:overlay(0) from:0x0209946c kind:arm_call to:0x020c3674 module:overlay(0) from:0x0209947c kind:arm_call to:0x0215df1c module:overlay(18) from:0x02099490 kind:arm_call_thumb to:0x0207b5bc module:overlay(0) -from:0x020994a0 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x020994a0 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x020994a8 kind:arm_call to:0x02098b40 module:overlay(0) from:0x020994b4 kind:load to:0x027e0f90 module:dtcm from:0x020994b8 kind:load to:0x027e0fe4 module:dtcm @@ -6024,11 +6024,11 @@ from:0x020b2600 kind:arm_call to:0x020838e8 module:overlay(0) from:0x020b265c kind:arm_call to:0x021343bc module:overlay(12) from:0x020b2664 kind:arm_call to:0x020385b8 module:main from:0x020b266c kind:arm_call to:0x020ab614 module:overlay(0) -from:0x020b2680 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x020b2680 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x020b268c kind:arm_call to:0x020a5e9c module:overlay(0) from:0x020b2698 kind:arm_call to:0x020385b8 module:main from:0x020b26a0 kind:arm_call to:0x020ab680 module:overlay(0) -from:0x020b26b4 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x020b26b4 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x020b2700 kind:arm_call to:0x021099dc module:overlay(5) from:0x020b2710 kind:arm_call to:0x020a8d40 module:overlay(0) from:0x020b2720 kind:arm_call to:0x020a8ca4 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov002/relocs.txt b/config/eur/arm9/overlays/ov002/relocs.txt index 01adbe47..cf2eb50e 100644 --- a/config/eur/arm9/overlays/ov002/relocs.txt +++ b/config/eur/arm9/overlays/ov002/relocs.txt @@ -316,7 +316,7 @@ from:0x020f1294 kind:arm_call_thumb to:0x0211be48 module:overlay(9) from:0x020f1298 kind:arm_call to:0x020329b0 module:main from:0x020f12b8 kind:arm_call to:0x02032a74 module:main from:0x020f12dc kind:arm_call to:0x02032714 module:main -from:0x020f12e4 kind:arm_call_thumb to:0x02116b00 module:overlays(9,10) +from:0x020f12e4 kind:arm_call_thumb to:0x02116b00 module:overlay(9) from:0x020f1320 kind:arm_call_thumb to:0x02113c20 module:overlay(9) from:0x020f1338 kind:arm_call_thumb to:0x02113f40 module:overlay(9) from:0x020f1340 kind:arm_call_thumb to:0x02116b24 module:overlay(9) diff --git a/config/eur/arm9/overlays/ov003/relocs.txt b/config/eur/arm9/overlays/ov003/relocs.txt index a75629a4..8377cf63 100644 --- a/config/eur/arm9/overlays/ov003/relocs.txt +++ b/config/eur/arm9/overlays/ov003/relocs.txt @@ -36,11 +36,11 @@ from:0x020efe3a kind:thumb_call to:0x020efa88 module:overlay(3) from:0x020f0108 kind:thumb_call to:0x02105ff0 module:overlay(4) from:0x020f0114 kind:thumb_call_arm to:0x020a5e9c module:overlay(0) from:0x020f0124 kind:thumb_call_arm to:0x0202e9dc module:main -from:0x020f0130 kind:thumb_call to:0x021761b4 module:overlays(20,26) +from:0x020f0130 kind:thumb_call to:0x021761b4 module:overlay(26) from:0x020f0148 kind:load to:0x02100050 module:overlay(3) from:0x020f014c kind:load to:0x027e0d38 module:dtcm from:0x020f0150 kind:load to:0x027e0ce0 module:dtcm -from:0x020f0164 kind:thumb_call to:0x021761dc module:overlays(26,27) +from:0x020f0164 kind:thumb_call to:0x021761dc module:overlay(26) from:0x020f016a kind:thumb_call_arm to:0x0202ea0c module:main from:0x020f0170 kind:thumb_call to:0x02106054 module:overlay(4) from:0x020f0186 kind:thumb_call_arm to:0x02007a44 module:main diff --git a/config/eur/arm9/overlays/ov004/relocs.txt b/config/eur/arm9/overlays/ov004/relocs.txt index 21526085..67796568 100644 --- a/config/eur/arm9/overlays/ov004/relocs.txt +++ b/config/eur/arm9/overlays/ov004/relocs.txt @@ -828,7 +828,7 @@ from:0x021048e2 kind:thumb_call to:0x0210bd04 module:overlay(4) from:0x021048fa kind:thumb_call to:0x021044f8 module:overlay(4) from:0x02104902 kind:thumb_call to:0x0210372c module:overlay(4) from:0x02104914 kind:thumb_call to:0x020f3e04 module:overlay(3) -from:0x0210491c kind:thumb_call to:0x02118ca4 module:overlays(9,12) +from:0x0210491c kind:thumb_call to:0x02118ca4 module:overlay(9) from:0x02104924 kind:thumb_call to:0x02102e3c module:overlay(4) from:0x0210492c kind:thumb_call to:0x02102260 module:overlay(4) from:0x02104934 kind:thumb_call to:0x02102af8 module:overlay(4) @@ -1088,7 +1088,7 @@ from:0x02105544 kind:load to:0x027e0d38 module:dtcm from:0x02105548 kind:load to:0x027e0ce0 module:dtcm from:0x02105584 kind:thumb_call to:0x021058cc module:overlay(4) from:0x02105594 kind:thumb_call_arm to:0x020a5e9c module:overlay(0) -from:0x021055bc kind:thumb_call to:0x02184554 module:overlays(30,32) +from:0x021055bc kind:thumb_call to:0x02184554 module:overlay(30) from:0x021055c6 kind:thumb_call to:0x021843c4 module:overlay(30) from:0x021055ce kind:thumb_call to:0x02184640 module:overlay(30) from:0x021055dc kind:thumb_call_arm to:0x0216daa4 module:overlays(19,25) @@ -1910,7 +1910,7 @@ from:0x0210934e kind:thumb_call_arm to:0x0209c474 module:overlay(0) from:0x0210935c kind:thumb_call_arm to:0x0209c474 module:overlay(0) from:0x02109366 kind:thumb_call_arm to:0x0200388c module:main from:0x02109444 kind:thumb_call_arm to:0x02078b40 module:overlay(0) -from:0x02109460 kind:thumb_call to:0x02118d30 module:overlays(9,12) +from:0x02109460 kind:thumb_call to:0x02118d30 module:overlay(9) from:0x02109468 kind:thumb_call to:0x0211a444 module:overlay(9) from:0x02109470 kind:thumb_call to:0x02109e10 module:overlay(4) from:0x02109480 kind:load to:0x027e0e60 module:dtcm diff --git a/config/eur/arm9/overlays/ov009/relocs.txt b/config/eur/arm9/overlays/ov009/relocs.txt index 9ec898db..7b2a0b0b 100644 --- a/config/eur/arm9/overlays/ov009/relocs.txt +++ b/config/eur/arm9/overlays/ov009/relocs.txt @@ -16,7 +16,7 @@ from:0x02112cee kind:thumb_call_arm to:0x02097d10 module:overlay(0) from:0x02112d00 kind:thumb_call_arm to:0x02097d10 module:overlay(0) from:0x02112d06 kind:thumb_call_arm to:0x02097ecc module:overlay(0) from:0x02112d10 kind:thumb_call_arm to:0x02097d10 module:overlay(0) -from:0x02112d26 kind:thumb_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02112d26 kind:thumb_call to:0x02100ae0 module:overlay(4) from:0x02112d2e kind:thumb_call to:0x02100bcc module:overlay(4) from:0x02112d38 kind:thumb_call to:0x0202ff64 module:main from:0x02112d44 kind:load to:0x0211e6c8 module:overlay(9) @@ -64,7 +64,7 @@ from:0x02112ebc kind:arm_call to:0x0217707c module:overlay(15) from:0x02112ecc kind:arm_call to:0x02100b7c module:overlay(5) from:0x02112edc kind:arm_call to:0x0211370c module:overlay(9) from:0x02112eec kind:arm_call to:0x021136c4 module:overlay(9) -from:0x02112f00 kind:arm_call to:0x020f50c0 module:overlays(2,3) +from:0x02112f00 kind:arm_call to:0x020f50c0 module:overlay(2) from:0x02112f0c kind:arm_call to:0x021136e8 module:overlay(9) from:0x02112f1c kind:arm_call to:0x0211370c module:overlay(9) from:0x02112f2c kind:arm_call to:0x021136c4 module:overlay(9) @@ -93,7 +93,7 @@ from:0x0211305c kind:arm_call to:0x021136e8 module:overlay(9) from:0x0211306c kind:arm_call to:0x021136e8 module:overlay(9) from:0x0211308c kind:arm_call to:0x021026f8 module:overlay(5) from:0x02113098 kind:arm_call to:0x020f40c0 module:overlay(3) -from:0x021130a4 kind:arm_call to:0x020f4a5c module:overlays(1,3) +from:0x021130a4 kind:arm_call to:0x020f4a5c module:overlay(3) from:0x021130ac kind:load to:0x027e0d38 module:dtcm from:0x021130b0 kind:load to:0x0211f5dc module:overlay(9) from:0x021130b4 kind:load to:0x0211f5b4 module:overlay(9) @@ -1559,7 +1559,7 @@ from:0x0211bf38 kind:load to:0x0211f59c module:overlay(9) from:0x0211bf44 kind:load to:0x0211f59c module:overlay(9) from:0x0211bf50 kind:load to:0x0211f59c module:overlay(9) from:0x0211bf78 kind:arm_call to:0x0211366c module:overlay(9) -from:0x0211bf80 kind:arm_call_thumb to:0x020f50c0 module:overlays(2,3) +from:0x0211bf80 kind:arm_call_thumb to:0x020f50c0 module:overlay(3) from:0x0211bf8c kind:arm_call to:0x02113698 module:overlay(9) from:0x0211bfb8 kind:arm_call to:0x0200c8d0 module:main from:0x0211bfcc kind:arm_call to:0x0200c8d0 module:main @@ -1741,7 +1741,7 @@ from:0x0211cb8c kind:thumb_call to:0x0210f4f8 module:overlay(4) from:0x0211cb9c kind:thumb_call_arm to:0x0202e9dc module:main from:0x0211cba4 kind:thumb_call to:0x020f74e8 module:overlay(3) from:0x0211cbb2 kind:thumb_call_arm to:0x0202e9dc module:main -from:0x0211cbbc kind:thumb_call to:0x020f00f0 module:overlays(1,3) +from:0x0211cbbc kind:thumb_call to:0x020f00f0 module:overlay(3) from:0x0211cbc8 kind:load to:0x0211f458 module:overlay(9) from:0x0211cbcc kind:load to:0x027e0ce0 module:dtcm from:0x0211cbe0 kind:thumb_call to:0x020f0158 module:overlay(3) diff --git a/config/eur/arm9/overlays/ov012/relocs.txt b/config/eur/arm9/overlays/ov012/relocs.txt index 910c6fd9..a53ce659 100644 --- a/config/eur/arm9/overlays/ov012/relocs.txt +++ b/config/eur/arm9/overlays/ov012/relocs.txt @@ -1704,7 +1704,7 @@ from:0x0211f5a8 kind:arm_call to:0x0212dd3c module:overlay(12) from:0x0211f5f8 kind:arm_call to:0x0211ce60 module:overlay(12) from:0x0211f5fc kind:arm_call to:0x0211ce50 module:overlay(12) from:0x0211f600 kind:arm_call to:0x0211cf08 module:overlay(12) -from:0x0211f608 kind:arm_call_thumb to:0x02100ae0 module:overlays(4,5,6,7) +from:0x0211f608 kind:arm_call_thumb to:0x02100ae0 module:overlay(4) from:0x0211f614 kind:arm_call_thumb to:0x02100bcc module:overlay(4) from:0x0211f624 kind:arm_call_thumb to:0x0202ff64 module:main from:0x0211f628 kind:arm_call to:0x0212e274 module:overlay(12) diff --git a/config/eur/arm9/overlays/ov013/relocs.txt b/config/eur/arm9/overlays/ov013/relocs.txt index 5e7cf847..2a23fd31 100644 --- a/config/eur/arm9/overlays/ov013/relocs.txt +++ b/config/eur/arm9/overlays/ov013/relocs.txt @@ -34,7 +34,7 @@ from:0x021133e8 kind:load to:0x02116204 module:overlay(13) from:0x02113408 kind:arm_call to:0x021130b0 module:overlay(13) from:0x021134f8 kind:load to:0x02116204 module:overlay(13) from:0x02113518 kind:arm_call to:0x021130b0 module:overlay(13) -from:0x02113544 kind:arm_call to:0x020eed40 module:overlays(1,2,3) +from:0x02113544 kind:arm_call to:0x020eed40 module:overlays(1,2) from:0x02113554 kind:arm_call to:0x02113074 module:overlay(13) from:0x0211355c kind:arm_call to:0x020efe20 module:overlay(1) from:0x0211356c kind:arm_call to:0x02113074 module:overlay(13) diff --git a/config/eur/arm9/overlays/ov014/relocs.txt b/config/eur/arm9/overlays/ov014/relocs.txt index 36d08bf6..da73ca04 100644 --- a/config/eur/arm9/overlays/ov014/relocs.txt +++ b/config/eur/arm9/overlays/ov014/relocs.txt @@ -3539,7 +3539,7 @@ from:0x0213d6dc kind:load to:0x027e0e60 module:dtcm from:0x0213d6f8 kind:arm_call to:0x0213d684 module:overlay(14) from:0x0213d738 kind:arm_call to:0x020c3674 module:overlay(0) from:0x0213d76c kind:arm_call to:0x02198e80 module:overlay(57) -from:0x0213d778 kind:arm_call to:0x02198fc0 module:overlays(57,58) +from:0x0213d778 kind:arm_call to:0x02198fc0 module:overlay(57) from:0x0213d784 kind:load to:0x027e0fe4 module:dtcm from:0x0213d7c4 kind:arm_call to:0x0213d4ec module:overlay(14) from:0x0213d85c kind:arm_call to:0x0213d4ec module:overlay(14) @@ -3582,7 +3582,7 @@ from:0x0213de10 kind:arm_call to:0x0213d420 module:overlay(14) from:0x0213de30 kind:arm_call to:0x020c2a0c module:overlay(0) from:0x0213de44 kind:arm_call to:0x0212384c module:overlay(14) from:0x0213deb0 kind:arm_call to:0x02198e80 module:overlay(57) -from:0x0213debc kind:arm_call to:0x02198fc0 module:overlays(57,58) +from:0x0213debc kind:arm_call to:0x02198fc0 module:overlay(57) from:0x0213dec8 kind:arm_call to:0x02199104 module:overlay(57) from:0x0213dee4 kind:arm_call to:0x0213d480 module:overlay(14) from:0x0213e030 kind:arm_call to:0x0202b0f4 module:main @@ -4486,7 +4486,7 @@ from:0x02144510 kind:load to:0x027e103c module:dtcm from:0x02144524 kind:arm_call to:0x0211b50c module:overlay(9) from:0x02144534 kind:arm_call to:0x0213cdfc module:overlay(14) from:0x0214454c kind:arm_call to:0x021512f0 module:overlay(14) -from:0x02144560 kind:arm_call to:0x0211b554 module:overlays(9,11) +from:0x02144560 kind:arm_call to:0x0211b554 module:overlay(9) from:0x0214457c kind:arm_call to:0x020f4b7c module:overlay(3) from:0x02144628 kind:arm_call to:0x0211fc8c module:overlay(14) from:0x02144630 kind:arm_call to:0x02079b34 module:overlay(0) @@ -4898,7 +4898,7 @@ from:0x02147ef0 kind:arm_call to:0x02145318 module:overlay(14) from:0x02147f14 kind:arm_call to:0x0214610c module:overlay(14) from:0x02147f28 kind:arm_call to:0x02144e3c module:overlay(14) from:0x02147f84 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02147f98 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02147f98 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02147fa8 kind:arm_call to:0x02147d44 module:overlay(14) from:0x02147fb4 kind:load to:0x027e0e60 module:dtcm from:0x02147fb8 kind:load to:0x027e0d38 module:dtcm diff --git a/config/eur/arm9/overlays/ov015/relocs.txt b/config/eur/arm9/overlays/ov015/relocs.txt index 3c2497bb..ef684898 100644 --- a/config/eur/arm9/overlays/ov015/relocs.txt +++ b/config/eur/arm9/overlays/ov015/relocs.txt @@ -2977,10 +2977,10 @@ from:0x02138fc4 kind:load to:0x0218eeb4 module:overlay(15) from:0x02138fc8 kind:load to:0x027e0d0c module:dtcm from:0x02138fe8 kind:arm_call to:0x0213a538 module:overlay(15) from:0x02139014 kind:arm_call to:0x02139164 module:overlay(15) -from:0x021390d0 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x021390d0 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02139108 kind:arm_call to:0x02139164 module:overlay(15) from:0x02139124 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02139140 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02139140 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02139154 kind:load to:0x0218eec0 module:overlay(15) from:0x02139158 kind:load to:0x027e0d38 module:dtcm from:0x0213915c kind:load to:0x027e0e2c module:dtcm @@ -4153,7 +4153,7 @@ from:0x02142b58 kind:load to:0x027e1094 module:dtcm from:0x02142b78 kind:arm_call to:0x020c3894 module:overlay(0) from:0x02142b98 kind:load to:0x027e0fe4 module:dtcm from:0x02142c08 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02142c1c kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02142c1c kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02142c5c kind:load to:0x027e0e60 module:dtcm from:0x02142c60 kind:load to:0x027e0d38 module:dtcm from:0x02142c64 kind:load to:0x027e1094 module:dtcm @@ -4306,7 +4306,7 @@ from:0x021443a0 kind:arm_call to:0x0209a508 module:overlay(0) from:0x021443e8 kind:arm_call to:0x020cec08 module:overlay(0) from:0x02144418 kind:arm_call to:0x02149950 module:overlay(15) from:0x021444f0 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02144504 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02144504 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02144514 kind:arm_call to:0x021465e8 module:overlay(15) from:0x0214452c kind:load to:0x020eec9c module:overlay(0) from:0x02144530 kind:load to:0x027e0f74 module:dtcm @@ -4328,7 +4328,7 @@ from:0x0214464c kind:arm_call to:0x0211555c module:overlay(9) from:0x02144674 kind:arm_call to:0x020ceacc module:overlay(0) from:0x02144684 kind:arm_call to:0x02149b54 module:overlay(15) from:0x0214473c kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02144750 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02144750 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x0214475c kind:load to:0x027e0f74 module:dtcm from:0x02144760 kind:load to:0x027e0fa0 module:dtcm from:0x02144764 kind:load to:0x027e0ffc module:dtcm @@ -5363,7 +5363,7 @@ from:0x0214d03c kind:arm_call to:0x0214caf0 module:overlay(15) from:0x0214d054 kind:load to:0x027e103c module:dtcm from:0x0214d068 kind:arm_call to:0x0211b50c module:overlay(9) from:0x0214d078 kind:arm_call to:0x02121738 module:overlay(15) -from:0x0214d088 kind:arm_call to:0x0211b554 module:overlays(9,11) +from:0x0214d088 kind:arm_call to:0x0211b554 module:overlay(9) from:0x0214d0a4 kind:arm_call to:0x020f4b7c module:overlay(3) from:0x0214d190 kind:arm_call to:0x0211fc80 module:overlay(15) from:0x0214d198 kind:load to:0x027e1054 module:dtcm @@ -5894,7 +5894,7 @@ from:0x02152594 kind:arm_call to:0x0209a4f4 module:overlay(0) from:0x021525c4 kind:arm_call to:0x02097810 module:overlay(0) from:0x021525f0 kind:arm_call to:0x0209a508 module:overlay(0) from:0x02152638 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x0215264c kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x0215264c kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02152660 kind:arm_call to:0x021368b4 module:overlay(15) from:0x02152678 kind:arm_call to:0x02137138 module:overlay(15) from:0x02152684 kind:load to:0x027e0f74 module:dtcm @@ -6064,7 +6064,7 @@ from:0x02153ca0 kind:arm_call to:0x020888e8 module:overlay(0) from:0x02153cb8 kind:arm_call to:0x021429d0 module:overlay(15) from:0x02153cc8 kind:arm_call to:0x020370d0 module:main from:0x02153d50 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02153d64 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02153d64 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02153d78 kind:arm_call to:0x01ff80d4 module:itcm from:0x02153da8 kind:arm_call_thumb to:0x01ff8214 module:itcm from:0x02153db8 kind:arm_call to:0x01ff8690 module:itcm @@ -6104,7 +6104,7 @@ from:0x02154234 kind:arm_call to:0x0217705c module:overlay(15) from:0x02154264 kind:arm_call to:0x02153938 module:overlay(15) from:0x02154270 kind:arm_call_thumb to:0x020ae648 module:overlay(0) from:0x021542e0 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x021542f4 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x021542f4 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02154308 kind:arm_call to:0x02153f94 module:overlay(15) from:0x02154314 kind:load to:0x027e0fe4 module:dtcm from:0x02154318 kind:load to:0x027e1060 module:dtcm @@ -6119,7 +6119,7 @@ from:0x021543c0 kind:arm_call to:0x02175d14 module:overlay(15) from:0x021543cc kind:arm_call to:0x020d716c module:overlay(0) from:0x021543d8 kind:arm_call to:0x020d73bc module:overlay(0) from:0x0215446c kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02154480 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02154480 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x021544b8 kind:arm_call to:0x0202b4e4 module:main from:0x021544e4 kind:arm_call to:0x0202b154 module:main from:0x02154558 kind:arm_call to:0x020a6250 module:overlay(0) @@ -6137,7 +6137,7 @@ from:0x02154624 kind:load to:0x027e0e60 module:dtcm from:0x02154628 kind:load to:0x027e0d38 module:dtcm from:0x0215462c kind:load to:0x02050f54 module:main from:0x02154698 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x021546ac kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x021546ac kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x021546c0 kind:arm_call to:0x020d77e4 module:overlay(0) from:0x021546ec kind:arm_call to:0x021548c4 module:overlay(15) from:0x021546f8 kind:load to:0x027e0e60 module:dtcm @@ -9032,7 +9032,7 @@ from:0x0216d89c kind:arm_call_thumb to:0x0211c450 module:overlay(9) from:0x0216d8c0 kind:load to:0x0211f5ca module:overlay(9) from:0x0216d8c4 kind:load to:0x027e0fb8 module:dtcm from:0x0216d91c kind:arm_call to:0x020838e8 module:overlay(0) -from:0x0216d930 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x0216d930 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x0216d950 kind:arm_call to:0x0209779c module:overlay(0) from:0x0216d95c kind:load to:0x027e0e60 module:dtcm from:0x0216d960 kind:load to:0x027e0d38 module:dtcm @@ -9042,7 +9042,7 @@ from:0x0216d994 kind:arm_call to:0x021429d0 module:overlay(15) from:0x0216d9a4 kind:arm_call to:0x020370d0 module:main from:0x0216d9b4 kind:arm_call to:0x0216dd8c module:overlay(15) from:0x0216da04 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x0216da18 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x0216da18 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x0216da34 kind:arm_call to:0x0209779c module:overlay(0) from:0x0216da40 kind:arm_call to:0x02036770 module:main from:0x0216da74 kind:arm_call to:0x020c3674 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov018/relocs.txt b/config/eur/arm9/overlays/ov018/relocs.txt index 8110bb62..2a6ff2f0 100644 --- a/config/eur/arm9/overlays/ov018/relocs.txt +++ b/config/eur/arm9/overlays/ov018/relocs.txt @@ -330,8 +330,8 @@ from:0x0215de10 kind:arm_call to:0x02097bcc module:overlay(0) from:0x0215de2c kind:arm_call to:0x0215e24c module:overlay(18) from:0x0215de3c kind:arm_call to:0x020d7f9c module:overlay(0) from:0x0215de70 kind:arm_call to:0x020d7470 module:overlay(0) -from:0x0215de84 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) -from:0x0215de90 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x0215de84 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) +from:0x0215de90 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x0215dea0 kind:load to:0x020eec68 module:overlay(0) from:0x0215dea4 kind:load to:0x027e0f74 module:dtcm from:0x0215dea8 kind:load to:0x02050f54 module:main @@ -540,13 +540,13 @@ from:0x0215fd30 kind:arm_call to:0x0202e9dc module:main from:0x0215fd3c kind:arm_call_thumb to:0x02175fa8 module:overlay(26) from:0x0215fd58 kind:arm_call to:0x020a5e9c module:overlay(0) from:0x0215fd74 kind:arm_call to:0x0202e9dc module:main -from:0x0215fd80 kind:arm_call_thumb to:0x0217752c module:overlays(25,26) +from:0x0215fd80 kind:arm_call_thumb to:0x0217752c module:overlay(26) from:0x0215fd98 kind:load to:0x0216c69c module:overlay(18) from:0x0215fd9c kind:load to:0x027e0d38 module:dtcm from:0x0215fda0 kind:load to:0x027e0ce0 module:dtcm from:0x0215fdc8 kind:arm_call_thumb to:0x021775b0 module:overlay(26) from:0x0215fdd0 kind:arm_call to:0x0202ea0c module:main -from:0x0215fde4 kind:arm_call_thumb to:0x02175fb4 module:overlays(22,26) +from:0x0215fde4 kind:arm_call_thumb to:0x02175fb4 module:overlay(26) from:0x0215fdec kind:arm_call to:0x0202ea0c module:main from:0x0215fe00 kind:arm_call to:0x0217d884 module:overlays(33,35) from:0x0215fe08 kind:arm_call to:0x0202ea0c module:main @@ -562,7 +562,7 @@ from:0x0215fe88 kind:load to:0x0216c69c module:overlay(18) from:0x0215fe8c kind:load to:0x0215fda4 module:overlay(18) from:0x0215feb0 kind:arm_call_thumb to:0x021775b0 module:overlay(26) from:0x0215feb8 kind:arm_call to:0x0202ea0c module:main -from:0x0215fecc kind:arm_call_thumb to:0x02175fb4 module:overlays(22,26) +from:0x0215fecc kind:arm_call_thumb to:0x02175fb4 module:overlay(26) from:0x0215fed4 kind:arm_call to:0x0202ea0c module:main from:0x0215fee8 kind:arm_call to:0x0217d884 module:overlays(33,35) from:0x0215fef0 kind:arm_call to:0x0202ea0c module:main diff --git a/config/eur/arm9/overlays/ov022/relocs.txt b/config/eur/arm9/overlays/ov022/relocs.txt index 3c85e699..c2e13705 100644 --- a/config/eur/arm9/overlays/ov022/relocs.txt +++ b/config/eur/arm9/overlays/ov022/relocs.txt @@ -269,7 +269,7 @@ from:0x0216ff00 kind:arm_call to:0x020ceacc module:overlay(0) from:0x0216ff64 kind:arm_call to:0x021701fc module:overlay(22) from:0x0216ff68 kind:arm_call to:0x02175958 module:overlay(22) from:0x0216ffc4 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x0216ffd8 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x0216ffd8 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02170024 kind:arm_call to:0x020a61ac module:overlay(0) from:0x021700bc kind:arm_call to:0x020b7ea4 module:overlay(0) from:0x021700d8 kind:arm_call to:0x0207c1f8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov025/relocs.txt b/config/eur/arm9/overlays/ov025/relocs.txt index 51db3d7a..057f9bc2 100644 --- a/config/eur/arm9/overlays/ov025/relocs.txt +++ b/config/eur/arm9/overlays/ov025/relocs.txt @@ -845,7 +845,7 @@ from:0x02174ed4 kind:arm_call to:0x0209779c module:overlay(0) from:0x02174ee0 kind:arm_call to:0x02173ab4 module:overlay(25) from:0x02174eec kind:arm_call to:0x02145318 module:overlay(14) from:0x02174f5c kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02174f78 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02174f78 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x02174f88 kind:arm_call to:0x02173ab4 module:overlay(25) from:0x02174fb8 kind:arm_call to:0x0214a92c module:overlay(14) from:0x02174fcc kind:arm_call to:0x021732fc module:overlay(25) diff --git a/config/eur/arm9/overlays/ov027/relocs.txt b/config/eur/arm9/overlays/ov027/relocs.txt index 86791ba6..5f242d46 100644 --- a/config/eur/arm9/overlays/ov027/relocs.txt +++ b/config/eur/arm9/overlays/ov027/relocs.txt @@ -705,7 +705,7 @@ from:0x02173828 kind:load to:0x0217970c module:overlay(27) from:0x0217382c kind:load to:0x02145f0c module:overlay(14) from:0x0217383c kind:arm_call to:0x02145318 module:overlay(14) from:0x021738a0 kind:arm_call to:0x020838e8 module:overlay(0) -from:0x021738b4 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x021738b4 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x021738c4 kind:arm_call to:0x020c1908 module:overlay(0) from:0x021738d8 kind:load to:0x027e0e60 module:dtcm from:0x021738dc kind:load to:0x027e0d38 module:dtcm diff --git a/config/eur/arm9/overlays/ov041/relocs.txt b/config/eur/arm9/overlays/ov041/relocs.txt index 3c166a6a..058777d2 100644 --- a/config/eur/arm9/overlays/ov041/relocs.txt +++ b/config/eur/arm9/overlays/ov041/relocs.txt @@ -28,7 +28,7 @@ from:0x02189910 kind:arm_call to:0x020d7f18 module:overlay(0) from:0x02189948 kind:arm_call to:0x02037628 module:main from:0x02189960 kind:arm_call to:0x02036f68 module:main from:0x02189984 kind:arm_call to:0x02036700 module:main -from:0x021899a0 kind:arm_call_thumb to:0x02175f68 module:overlays(20,26) +from:0x021899a0 kind:arm_call_thumb to:0x02175f68 module:overlay(26) from:0x021899f8 kind:load to:0x027e077c module:dtcm from:0x021899fc kind:load to:0x027e1054 module:dtcm from:0x02189a00 kind:load to:0x027e103c module:dtcm diff --git a/config/eur/arm9/overlays/ov045/relocs.txt b/config/eur/arm9/overlays/ov045/relocs.txt index 07e02d81..4e366992 100644 --- a/config/eur/arm9/overlays/ov045/relocs.txt +++ b/config/eur/arm9/overlays/ov045/relocs.txt @@ -705,7 +705,7 @@ from:0x0218dcb0 kind:arm_call_thumb to:0x0211be48 module:overlay(9) from:0x0218dcb4 kind:arm_call to:0x020329b0 module:main from:0x0218dcd4 kind:arm_call to:0x02032a74 module:main from:0x0218dcf8 kind:arm_call to:0x02032714 module:main -from:0x0218dd00 kind:arm_call_thumb to:0x02116b00 module:overlays(9,10) +from:0x0218dd00 kind:arm_call_thumb to:0x02116b00 module:overlay(9) from:0x0218dd40 kind:arm_call_thumb to:0x02113c34 module:overlay(9) from:0x0218dd58 kind:arm_call_thumb to:0x02113f40 module:overlay(9) from:0x0218dd80 kind:arm_call_thumb to:0x02113c34 module:overlay(9) diff --git a/config/eur/arm9/overlays/ov046/relocs.txt b/config/eur/arm9/overlays/ov046/relocs.txt index cec976a0..9027144f 100644 --- a/config/eur/arm9/overlays/ov046/relocs.txt +++ b/config/eur/arm9/overlays/ov046/relocs.txt @@ -156,7 +156,7 @@ from:0x021914b4 kind:arm_call to:0x020d7f18 module:overlay(0) from:0x021914ec kind:arm_call to:0x02037628 module:main from:0x02191504 kind:arm_call to:0x02036f68 module:main from:0x02191528 kind:arm_call to:0x02036700 module:main -from:0x02191544 kind:arm_call_thumb to:0x02175f78 module:overlays(26,61) +from:0x02191544 kind:arm_call_thumb to:0x02175f78 module:overlay(26) from:0x02191568 kind:load to:0x027e077c module:dtcm from:0x0219156c kind:load to:0x027e103c module:dtcm from:0x02191570 kind:load to:0x027e1054 module:dtcm diff --git a/config/eur/arm9/overlays/ov053/relocs.txt b/config/eur/arm9/overlays/ov053/relocs.txt index e864f1ee..2f548c80 100644 --- a/config/eur/arm9/overlays/ov053/relocs.txt +++ b/config/eur/arm9/overlays/ov053/relocs.txt @@ -139,7 +139,7 @@ from:0x02199de4 kind:arm_call to:0x02199a10 module:overlay(53) from:0x02199de8 kind:arm_call to:0x02199038 module:overlay(53) from:0x02199df4 kind:arm_call to:0x021230a8 module:overlay(14) from:0x02199e00 kind:arm_call to:0x0212357c module:overlay(14) -from:0x02199e18 kind:arm_call to:0x0212322c module:overlays(11,14) +from:0x02199e18 kind:arm_call to:0x0212322c module:overlay(14) from:0x02199e2c kind:arm_call to:0x02199a10 module:overlay(53) from:0x02199e44 kind:arm_call to:0x0212357c module:overlay(14) from:0x02199e60 kind:arm_call to:0x02199a10 module:overlay(53) diff --git a/config/eur/arm9/overlays/ov060/relocs.txt b/config/eur/arm9/overlays/ov060/relocs.txt index ccf5a417..57e46a3e 100644 --- a/config/eur/arm9/overlays/ov060/relocs.txt +++ b/config/eur/arm9/overlays/ov060/relocs.txt @@ -399,7 +399,7 @@ from:0x02141374 kind:load to:0x021480a0 module:overlay(60) from:0x02141378 kind:load to:0x0214808c module:overlay(60) from:0x02141398 kind:arm_call to:0x02144c60 module:overlay(60) from:0x021413ac kind:arm_call to:0x02144c60 module:overlay(60) -from:0x021413d0 kind:arm_call to:0x020eed40 module:overlays(1,2,3) +from:0x021413d0 kind:arm_call to:0x020eed40 module:overlays(1,2) from:0x021413dc kind:arm_call to:0x021411d8 module:overlay(60) from:0x021413f0 kind:arm_call to:0x02144c94 module:overlay(60) from:0x021413f8 kind:load to:0x02148088 module:overlay(60) diff --git a/config/eur/arm9/overlays/ov061/relocs.txt b/config/eur/arm9/overlays/ov061/relocs.txt index 4e2ef779..b958baee 100644 --- a/config/eur/arm9/overlays/ov061/relocs.txt +++ b/config/eur/arm9/overlays/ov061/relocs.txt @@ -4831,7 +4831,7 @@ from:0x0215eb64 kind:arm_call to:0x0215f644 module:overlay(61) from:0x0215eb6c kind:arm_call to:0x0200ee60 module:main from:0x0215eb78 kind:arm_call to:0x0200ee60 module:main from:0x0215eb84 kind:arm_call to:0x0200ee60 module:main -from:0x0215eba8 kind:arm_call to:0x020eed40 module:overlays(1,2,3) +from:0x0215eba8 kind:arm_call to:0x020eed40 module:overlays(1,2) from:0x0215ebd8 kind:arm_call to:0x0215fa44 module:overlay(61) from:0x0215ebe0 kind:arm_call to:0x0200ee60 module:main from:0x0215ebf0 kind:arm_call to:0x0200ee60 module:main @@ -8767,7 +8767,7 @@ from:0x02179f98 kind:arm_call to:0x0213dec0 module:overlay(61) from:0x02179fb8 kind:arm_call to:0x0213e570 module:overlay(61) from:0x02179ff4 kind:arm_call_thumb to:0x020779d8 module:overlay(0) from:0x0217a008 kind:arm_call to:0x02007a44 module:main -from:0x0217a058 kind:arm_call to:0x020eed40 module:overlays(1,2,3) +from:0x0217a058 kind:arm_call to:0x020eed40 module:overlays(1,2) from:0x0217a068 kind:arm_call to:0x020efe20 module:overlay(1) from:0x0217a074 kind:arm_call to:0x0200e8f8 module:main from:0x0217a094 kind:arm_call to:0x0200e8f8 module:main diff --git a/config/eur/arm9/relocs.txt b/config/eur/arm9/relocs.txt index 1cf1dd8f..fcee0b60 100644 --- a/config/eur/arm9/relocs.txt +++ b/config/eur/arm9/relocs.txt @@ -3790,14 +3790,14 @@ from:0x0202fbcc kind:load to:0x020ee734 module:overlay(0) from:0x0202fbd0 kind:load to:0x027e0618 module:dtcm from:0x0202fbd4 kind:load to:0x020561f4 module:main from:0x0202fbe0 kind:load to:0x020ee820 module:overlay(0) -from:0x0202fc50 kind:arm_call to:0x021157b0 module:overlays(11,13) +from:0x0202fc50 kind:arm_call to:0x021157b0 module:overlay(13) from:0x0202fc64 kind:arm_call_thumb to:0x0202fa28 module:main from:0x0202fc70 kind:arm_call_thumb to:0x0202fa28 module:main from:0x0202fc80 kind:arm_call_thumb to:0x0202fa28 module:main from:0x0202fcb0 kind:arm_call_thumb to:0x0202fa28 module:main from:0x0202fcbc kind:arm_call_thumb to:0x0202fa28 module:main from:0x0202fcd4 kind:arm_call to:0x0200b7a4 module:main -from:0x0202fd14 kind:arm_call to:0x021157b0 module:overlays(11,13) +from:0x0202fd14 kind:arm_call to:0x021157b0 module:overlay(13) from:0x0202fd28 kind:arm_call_thumb to:0x0202fa28 module:main from:0x0202fd38 kind:arm_call_thumb to:0x0202fa28 module:main from:0x0202fd48 kind:arm_call_thumb to:0x0202fa28 module:main @@ -4679,7 +4679,7 @@ from:0x0203827c kind:arm_call to:0x020ae2e0 module:overlay(0) from:0x0203829c kind:arm_call_thumb to:0x0207b2f0 module:overlay(0) from:0x020382cc kind:arm_call_thumb to:0x0207b334 module:overlay(0) from:0x0203832c kind:arm_call to:0x020838e8 module:overlay(0) -from:0x02038358 kind:arm_call to:0x02100ae0 module:overlays(4,5,6,7) +from:0x02038358 kind:arm_call to:0x02100ae0 module:overlays(5,6,7) from:0x020383ac kind:arm_call to:0x020385b8 module:main from:0x020383b0 kind:arm_call to:0x020ab6c8 module:overlay(0) from:0x020383d8 kind:arm_call_thumb to:0x020ae368 module:overlay(0) @@ -6950,7 +6950,7 @@ from:0x02050e1c kind:load to:0x0211fec8 module:overlay(16) from:0x02050e20 kind:load to:0x02068e64 module:main from:0x02050e30 kind:load to:0x0203600d module:main from:0x02050e34 kind:load to:0x027e0c54 module:dtcm -from:0x02050e40 kind:arm_call to:0x0211f640 module:overlays(14,15,16) +from:0x02050e40 kind:arm_call to:0x0211f640 module:overlays(15,16) from:0x02050e50 kind:arm_call to:0x0204f8d4 module:main from:0x02050e58 kind:load to:0x027e0c68 module:dtcm from:0x02050e5c kind:load to:0x020371b0 module:main diff --git a/config/usa/arm9/overlays/ov000/relocs.txt b/config/usa/arm9/overlays/ov000/relocs.txt index bc1e3350..041cde4f 100644 --- a/config/usa/arm9/overlays/ov000/relocs.txt +++ b/config/usa/arm9/overlays/ov000/relocs.txt @@ -249,7 +249,7 @@ from:0x02078a24 kind:load to:0x0200e8f8 module:main from:0x02078a3c kind:thumb_call to:0x02077a98 module:overlay(0) from:0x02078a7a kind:thumb_call to:0x02077a98 module:overlay(0) from:0x02078ab4 kind:thumb_call to:0x0202ff60 module:main -from:0x02078ac2 kind:thumb_call to:0x02100aec module:overlays(4,6) +from:0x02078ac2 kind:thumb_call to:0x02100aec module:overlay(4) from:0x02078ac8 kind:thumb_call_arm to:0x0202ea08 module:main from:0x02078ad4 kind:load to:0x027e0900 module:dtcm from:0x02078adc kind:load to:0x027e0d38 module:dtcm @@ -3185,7 +3185,7 @@ from:0x02098340 kind:arm_call_thumb to:0x0207b2d4 module:overlay(0) from:0x0209834c kind:arm_call to:0x02098634 module:overlay(0) from:0x020984cc kind:arm_call to:0x02083888 module:overlay(0) from:0x020984f0 kind:arm_call_thumb to:0x0207b55c module:overlay(0) -from:0x020984f8 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x020984f8 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02098538 kind:arm_call to:0x0209a4a8 module:overlay(0) from:0x02098548 kind:load to:0x027e0f64 module:dtcm from:0x0209854c kind:load to:0x027e0f90 module:dtcm @@ -3253,7 +3253,7 @@ from:0x020993ec kind:arm_call to:0x020c3834 module:overlay(0) from:0x0209940c kind:arm_call to:0x020c3614 module:overlay(0) from:0x0209941c kind:arm_call to:0x0215de7c module:overlay(18) from:0x02099430 kind:arm_call_thumb to:0x0207b55c module:overlay(0) -from:0x02099440 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02099440 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02099448 kind:arm_call to:0x02098ae0 module:overlay(0) from:0x02099454 kind:load to:0x027e0f90 module:dtcm from:0x02099458 kind:load to:0x027e0fe4 module:dtcm @@ -6024,11 +6024,11 @@ from:0x020b25a0 kind:arm_call to:0x02083888 module:overlay(0) from:0x020b25fc kind:arm_call to:0x0213433c module:overlay(12) from:0x020b2604 kind:arm_call to:0x02038574 module:main from:0x020b260c kind:arm_call to:0x020ab5b4 module:overlay(0) -from:0x020b2620 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x020b2620 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x020b262c kind:arm_call to:0x020a5e3c module:overlay(0) from:0x020b2638 kind:arm_call to:0x02038574 module:main from:0x020b2640 kind:arm_call to:0x020ab620 module:overlay(0) -from:0x020b2654 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x020b2654 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x020b26a0 kind:arm_call to:0x0210995c module:overlay(5) from:0x020b26b0 kind:arm_call to:0x020a8ce0 module:overlay(0) from:0x020b26c0 kind:arm_call to:0x020a8c44 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov002/relocs.txt b/config/usa/arm9/overlays/ov002/relocs.txt index 18116257..f2becbc5 100644 --- a/config/usa/arm9/overlays/ov002/relocs.txt +++ b/config/usa/arm9/overlays/ov002/relocs.txt @@ -316,7 +316,7 @@ from:0x020f1234 kind:arm_call_thumb to:0x0211bdc8 module:overlay(9) from:0x020f1238 kind:arm_call to:0x020329ac module:main from:0x020f1258 kind:arm_call to:0x02032a70 module:main from:0x020f127c kind:arm_call to:0x02032710 module:main -from:0x020f1284 kind:arm_call_thumb to:0x02116a80 module:overlays(9,10) +from:0x020f1284 kind:arm_call_thumb to:0x02116a80 module:overlay(9) from:0x020f12c0 kind:arm_call_thumb to:0x02113ba0 module:overlay(9) from:0x020f12d8 kind:arm_call_thumb to:0x02113ec0 module:overlay(9) from:0x020f12e0 kind:arm_call_thumb to:0x02116aa4 module:overlay(9) diff --git a/config/usa/arm9/overlays/ov003/relocs.txt b/config/usa/arm9/overlays/ov003/relocs.txt index af122556..77209696 100644 --- a/config/usa/arm9/overlays/ov003/relocs.txt +++ b/config/usa/arm9/overlays/ov003/relocs.txt @@ -36,11 +36,11 @@ from:0x020efdda kind:thumb_call to:0x020efa28 module:overlay(3) from:0x020f00a8 kind:thumb_call to:0x02105f70 module:overlay(4) from:0x020f00b4 kind:thumb_call_arm to:0x020a5e3c module:overlay(0) from:0x020f00c4 kind:thumb_call_arm to:0x0202e9d8 module:main -from:0x020f00d0 kind:thumb_call to:0x02176114 module:overlays(20,26) +from:0x020f00d0 kind:thumb_call to:0x02176114 module:overlay(26) from:0x020f00e8 kind:load to:0x020fffd0 module:overlay(3) from:0x020f00ec kind:load to:0x027e0d38 module:dtcm from:0x020f00f0 kind:load to:0x027e0ce0 module:dtcm -from:0x020f0104 kind:thumb_call to:0x0217613c module:overlays(26,27) +from:0x020f0104 kind:thumb_call to:0x0217613c module:overlay(26) from:0x020f010a kind:thumb_call_arm to:0x0202ea08 module:main from:0x020f0110 kind:thumb_call to:0x02105fd4 module:overlay(4) from:0x020f0126 kind:thumb_call_arm to:0x02007a44 module:main diff --git a/config/usa/arm9/overlays/ov004/relocs.txt b/config/usa/arm9/overlays/ov004/relocs.txt index 4063457d..06567899 100644 --- a/config/usa/arm9/overlays/ov004/relocs.txt +++ b/config/usa/arm9/overlays/ov004/relocs.txt @@ -828,7 +828,7 @@ from:0x02104862 kind:thumb_call to:0x0210bc84 module:overlay(4) from:0x0210487a kind:thumb_call to:0x02104478 module:overlay(4) from:0x02104882 kind:thumb_call to:0x021036ac module:overlay(4) from:0x02104894 kind:thumb_call to:0x020f3da4 module:overlay(3) -from:0x0210489c kind:thumb_call to:0x02118c24 module:overlays(9,12) +from:0x0210489c kind:thumb_call to:0x02118c24 module:overlay(9) from:0x021048a4 kind:thumb_call to:0x02102dbc module:overlay(4) from:0x021048ac kind:thumb_call to:0x021021e0 module:overlay(4) from:0x021048b4 kind:thumb_call to:0x02102a78 module:overlay(4) @@ -984,7 +984,7 @@ from:0x02104e4a kind:thumb_call_arm to:0x0215fc40 module:overlay(18) from:0x02104e62 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x02104e6c kind:thumb_call to:0x0216e44c module:overlay(26) from:0x02104e84 kind:thumb_call_arm to:0x0202e9d8 module:main -from:0x02104e8e kind:thumb_call to:0x02143ad4 module:overlays(14,60) +from:0x02104e8e kind:thumb_call to:0x02143ad4 module:overlay(14) from:0x02104eb2 kind:thumb_call to:0x02107128 module:overlay(4) from:0x02104ec0 kind:thumb_call_arm to:0x020cf788 module:overlay(0) from:0x02104ec8 kind:load to:0x027e0618 module:dtcm @@ -1088,7 +1088,7 @@ from:0x021054c4 kind:load to:0x027e0d38 module:dtcm from:0x021054c8 kind:load to:0x027e0ce0 module:dtcm from:0x02105504 kind:thumb_call to:0x0210584c module:overlay(4) from:0x02105514 kind:thumb_call_arm to:0x020a5e3c module:overlay(0) -from:0x0210553c kind:thumb_call to:0x021844b4 module:overlays(30,32) +from:0x0210553c kind:thumb_call to:0x021844b4 module:overlay(30) from:0x02105546 kind:thumb_call to:0x02184324 module:overlay(30) from:0x0210554e kind:thumb_call to:0x021845a0 module:overlay(30) from:0x0210555c kind:thumb_call_arm to:0x0216da04 module:overlays(19,25) @@ -1485,7 +1485,7 @@ from:0x02107508 kind:thumb_call to:0x0213ea14 module:overlay(14) from:0x0210751c kind:thumb_call_arm to:0x0202e9d8 module:main from:0x02107524 kind:thumb_call to:0x0213cf20 module:overlay(14) from:0x02107538 kind:thumb_call_arm to:0x0202e9d8 module:main -from:0x02107540 kind:thumb_call to:0x0213ea58 module:overlays(14,61) +from:0x02107540 kind:thumb_call to:0x0213ea58 module:overlay(14) from:0x02107554 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x0210755c kind:thumb_call to:0x0213d1b8 module:overlay(14) from:0x02107570 kind:thumb_call_arm to:0x0202e9d8 module:main @@ -1641,8 +1641,8 @@ from:0x02107f24 kind:thumb_call_arm to:0x0213ceb0 module:overlay(15) from:0x02107f28 kind:thumb_call_arm to:0x02139490 module:overlay(15) from:0x02107f34 kind:thumb_call_arm to:0x020a5e3c module:overlay(0) from:0x02107f3e kind:thumb_call_arm to:0x0209d6f8 module:overlay(0) -from:0x02107f50 kind:thumb_call to:0x0213ee10 module:overlays(14,61) -from:0x02107f56 kind:thumb_call to:0x0213ee10 module:overlays(14,61) +from:0x02107f50 kind:thumb_call to:0x0213ee10 module:overlay(14) +from:0x02107f56 kind:thumb_call to:0x0213ee10 module:overlay(14) from:0x02107f5e kind:thumb_call to:0x02107294 module:overlay(4) from:0x02107f66 kind:thumb_call to:0x0210b104 module:overlay(4) from:0x02107f6c kind:load to:0x020dc76a module:overlay(0) @@ -1660,7 +1660,7 @@ from:0x02107faa kind:thumb_call to:0x0211bf84 module:overlay(9) from:0x02107fb0 kind:thumb_call to:0x02115ff0 module:overlay(9) from:0x02107fb4 kind:thumb_call to:0x0210aeb8 module:overlay(4) from:0x02107fbc kind:thumb_call_arm to:0x02078ae0 module:overlay(0) -from:0x02107fc4 kind:thumb_call_arm to:0x0213cef8 module:overlays(14,15) +from:0x02107fc4 kind:thumb_call_arm to:0x0213cef8 module:overlay(15) from:0x02107fcc kind:load to:0x027e0fb8 module:dtcm from:0x02107fd0 kind:load to:0x027e0fb4 module:dtcm from:0x02107fd4 kind:load to:0x027e0618 module:dtcm @@ -1908,7 +1908,7 @@ from:0x021092ce kind:thumb_call_arm to:0x0209c414 module:overlay(0) from:0x021092dc kind:thumb_call_arm to:0x0209c414 module:overlay(0) from:0x021092e6 kind:thumb_call_arm to:0x0200388c module:main from:0x021093c4 kind:thumb_call_arm to:0x02078ae0 module:overlay(0) -from:0x021093e0 kind:thumb_call to:0x02118cb0 module:overlays(9,12) +from:0x021093e0 kind:thumb_call to:0x02118cb0 module:overlay(9) from:0x021093e8 kind:thumb_call to:0x0211a3c4 module:overlay(9) from:0x021093f0 kind:thumb_call to:0x02109d90 module:overlay(4) from:0x02109400 kind:load to:0x027e0e60 module:dtcm diff --git a/config/usa/arm9/overlays/ov009/relocs.txt b/config/usa/arm9/overlays/ov009/relocs.txt index 8044d60f..5801bad3 100644 --- a/config/usa/arm9/overlays/ov009/relocs.txt +++ b/config/usa/arm9/overlays/ov009/relocs.txt @@ -16,7 +16,7 @@ from:0x02112c6e kind:thumb_call_arm to:0x02097cb0 module:overlay(0) from:0x02112c80 kind:thumb_call_arm to:0x02097cb0 module:overlay(0) from:0x02112c86 kind:thumb_call_arm to:0x02097e6c module:overlay(0) from:0x02112c90 kind:thumb_call_arm to:0x02097cb0 module:overlay(0) -from:0x02112ca6 kind:thumb_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02112ca6 kind:thumb_call to:0x02100a60 module:overlay(4) from:0x02112cae kind:thumb_call to:0x02100b4c module:overlay(4) from:0x02112cb8 kind:thumb_call to:0x0202ff60 module:main from:0x02112cc4 kind:load to:0x0211e648 module:overlay(9) @@ -64,7 +64,7 @@ from:0x02112e3c kind:arm_call to:0x02176ffc module:overlay(15) from:0x02112e4c kind:arm_call to:0x02100afc module:overlay(5) from:0x02112e5c kind:arm_call to:0x0211368c module:overlay(9) from:0x02112e6c kind:arm_call to:0x02113644 module:overlay(9) -from:0x02112e80 kind:arm_call to:0x020f5060 module:overlays(2,3) +from:0x02112e80 kind:arm_call to:0x020f5060 module:overlay(2) from:0x02112e8c kind:arm_call to:0x02113668 module:overlay(9) from:0x02112e9c kind:arm_call to:0x0211368c module:overlay(9) from:0x02112eac kind:arm_call to:0x02113644 module:overlay(9) @@ -93,7 +93,7 @@ from:0x02112fdc kind:arm_call to:0x02113668 module:overlay(9) from:0x02112fec kind:arm_call to:0x02113668 module:overlay(9) from:0x0211300c kind:arm_call to:0x02102678 module:overlay(5) from:0x02113018 kind:arm_call to:0x020f4060 module:overlay(3) -from:0x02113024 kind:arm_call to:0x020f49fc module:overlays(1,3) +from:0x02113024 kind:arm_call to:0x020f49fc module:overlay(3) from:0x0211302c kind:load to:0x027e0d38 module:dtcm from:0x02113030 kind:load to:0x0211f55c module:overlay(9) from:0x02113034 kind:load to:0x0211f534 module:overlay(9) @@ -1559,7 +1559,7 @@ from:0x0211beb8 kind:load to:0x0211f51c module:overlay(9) from:0x0211bec4 kind:load to:0x0211f51c module:overlay(9) from:0x0211bed0 kind:load to:0x0211f51c module:overlay(9) from:0x0211bef8 kind:arm_call to:0x021135ec module:overlay(9) -from:0x0211bf00 kind:arm_call_thumb to:0x020f5060 module:overlays(2,3) +from:0x0211bf00 kind:arm_call_thumb to:0x020f5060 module:overlay(3) from:0x0211bf0c kind:arm_call to:0x02113618 module:overlay(9) from:0x0211bf38 kind:arm_call to:0x0200c8d0 module:main from:0x0211bf4c kind:arm_call to:0x0200c8d0 module:main @@ -1741,7 +1741,7 @@ from:0x0211cb0c kind:thumb_call to:0x0210f478 module:overlay(4) from:0x0211cb1c kind:thumb_call_arm to:0x0202e9d8 module:main from:0x0211cb24 kind:thumb_call to:0x020f7488 module:overlay(3) from:0x0211cb32 kind:thumb_call_arm to:0x0202e9d8 module:main -from:0x0211cb3c kind:thumb_call to:0x020f0090 module:overlays(1,3) +from:0x0211cb3c kind:thumb_call to:0x020f0090 module:overlay(3) from:0x0211cb48 kind:load to:0x0211f3d8 module:overlay(9) from:0x0211cb4c kind:load to:0x027e0ce0 module:dtcm from:0x0211cb60 kind:thumb_call to:0x020f00f8 module:overlay(3) diff --git a/config/usa/arm9/overlays/ov012/relocs.txt b/config/usa/arm9/overlays/ov012/relocs.txt index 12ccc730..2206f2d4 100644 --- a/config/usa/arm9/overlays/ov012/relocs.txt +++ b/config/usa/arm9/overlays/ov012/relocs.txt @@ -1704,7 +1704,7 @@ from:0x0211f528 kind:arm_call to:0x0212dcbc module:overlay(12) from:0x0211f578 kind:arm_call to:0x0211cde0 module:overlay(12) from:0x0211f57c kind:arm_call to:0x0211cdd0 module:overlay(12) from:0x0211f580 kind:arm_call to:0x0211ce88 module:overlay(12) -from:0x0211f588 kind:arm_call_thumb to:0x02100a60 module:overlays(4,5,6,7) +from:0x0211f588 kind:arm_call_thumb to:0x02100a60 module:overlay(4) from:0x0211f594 kind:arm_call_thumb to:0x02100b4c module:overlay(4) from:0x0211f5a4 kind:arm_call_thumb to:0x0202ff60 module:main from:0x0211f5a8 kind:arm_call to:0x0212e1f4 module:overlay(12) diff --git a/config/usa/arm9/overlays/ov013/relocs.txt b/config/usa/arm9/overlays/ov013/relocs.txt index afa683d1..5be88d46 100644 --- a/config/usa/arm9/overlays/ov013/relocs.txt +++ b/config/usa/arm9/overlays/ov013/relocs.txt @@ -34,7 +34,7 @@ from:0x02113368 kind:load to:0x02116184 module:overlay(13) from:0x02113388 kind:arm_call to:0x02113030 module:overlay(13) from:0x02113478 kind:load to:0x02116184 module:overlay(13) from:0x02113498 kind:arm_call to:0x02113030 module:overlay(13) -from:0x021134c4 kind:arm_call to:0x020eece0 module:overlays(1,2,3) +from:0x021134c4 kind:arm_call to:0x020eece0 module:overlays(1,2) from:0x021134d4 kind:arm_call to:0x02112ff4 module:overlay(13) from:0x021134dc kind:arm_call to:0x020efdc0 module:overlay(1) from:0x021134ec kind:arm_call to:0x02112ff4 module:overlay(13) diff --git a/config/usa/arm9/overlays/ov014/relocs.txt b/config/usa/arm9/overlays/ov014/relocs.txt index 54704256..40bc44bd 100644 --- a/config/usa/arm9/overlays/ov014/relocs.txt +++ b/config/usa/arm9/overlays/ov014/relocs.txt @@ -3539,7 +3539,7 @@ from:0x0213d638 kind:load to:0x027e0e60 module:dtcm from:0x0213d654 kind:arm_call to:0x0213d5e0 module:overlay(14) from:0x0213d694 kind:arm_call to:0x020c3614 module:overlay(0) from:0x0213d6c8 kind:arm_call to:0x02198de0 module:overlay(57) -from:0x0213d6d4 kind:arm_call to:0x02198f20 module:overlays(57,58) +from:0x0213d6d4 kind:arm_call to:0x02198f20 module:overlay(57) from:0x0213d6e0 kind:load to:0x027e0fe4 module:dtcm from:0x0213d720 kind:arm_call to:0x0213d448 module:overlay(14) from:0x0213d7b8 kind:arm_call to:0x0213d448 module:overlay(14) @@ -3582,7 +3582,7 @@ from:0x0213dd6c kind:arm_call to:0x0213d37c module:overlay(14) from:0x0213dd8c kind:arm_call to:0x020c29ac module:overlay(0) from:0x0213dda0 kind:arm_call to:0x021237cc module:overlay(14) from:0x0213de0c kind:arm_call to:0x02198de0 module:overlay(57) -from:0x0213de18 kind:arm_call to:0x02198f20 module:overlays(57,58) +from:0x0213de18 kind:arm_call to:0x02198f20 module:overlay(57) from:0x0213de24 kind:arm_call to:0x02199064 module:overlay(57) from:0x0213de40 kind:arm_call to:0x0213d3dc module:overlay(14) from:0x0213df8c kind:arm_call to:0x0202b0dc module:main @@ -4486,7 +4486,7 @@ from:0x0214446c kind:load to:0x027e103c module:dtcm from:0x02144480 kind:arm_call to:0x0211b48c module:overlay(9) from:0x02144490 kind:arm_call to:0x0213cd58 module:overlay(14) from:0x021444a8 kind:arm_call to:0x0215124c module:overlay(14) -from:0x021444bc kind:arm_call to:0x0211b4d4 module:overlays(9,11) +from:0x021444bc kind:arm_call to:0x0211b4d4 module:overlay(9) from:0x021444d8 kind:arm_call to:0x020f4b1c module:overlay(3) from:0x02144584 kind:arm_call to:0x0211fc0c module:overlay(14) from:0x0214458c kind:arm_call to:0x02079ad4 module:overlay(0) @@ -4898,7 +4898,7 @@ from:0x02147e4c kind:arm_call to:0x02145274 module:overlay(14) from:0x02147e70 kind:arm_call to:0x02146068 module:overlay(14) from:0x02147e84 kind:arm_call to:0x02144d98 module:overlay(14) from:0x02147ee0 kind:arm_call to:0x02083888 module:overlay(0) -from:0x02147ef4 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02147ef4 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02147f04 kind:arm_call to:0x02147ca0 module:overlay(14) from:0x02147f10 kind:load to:0x027e0e60 module:dtcm from:0x02147f14 kind:load to:0x027e0d38 module:dtcm diff --git a/config/usa/arm9/overlays/ov015/relocs.txt b/config/usa/arm9/overlays/ov015/relocs.txt index 9fd99ad7..0246462a 100644 --- a/config/usa/arm9/overlays/ov015/relocs.txt +++ b/config/usa/arm9/overlays/ov015/relocs.txt @@ -2977,10 +2977,10 @@ from:0x02138f44 kind:load to:0x0218ee34 module:overlay(15) from:0x02138f48 kind:load to:0x027e0d0c module:dtcm from:0x02138f68 kind:arm_call to:0x0213a4b8 module:overlay(15) from:0x02138f94 kind:arm_call to:0x021390e4 module:overlay(15) -from:0x02139050 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02139050 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02139088 kind:arm_call to:0x021390e4 module:overlay(15) from:0x021390a4 kind:arm_call to:0x02083888 module:overlay(0) -from:0x021390c0 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x021390c0 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x021390d4 kind:load to:0x0218ee40 module:overlay(15) from:0x021390d8 kind:load to:0x027e0d38 module:dtcm from:0x021390dc kind:load to:0x027e0e2c module:dtcm @@ -4153,7 +4153,7 @@ from:0x02142ad8 kind:load to:0x027e1094 module:dtcm from:0x02142af8 kind:arm_call to:0x020c3834 module:overlay(0) from:0x02142b18 kind:load to:0x027e0fe4 module:dtcm from:0x02142b88 kind:arm_call to:0x02083888 module:overlay(0) -from:0x02142b9c kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02142b9c kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02142bdc kind:load to:0x027e0e60 module:dtcm from:0x02142be0 kind:load to:0x027e0d38 module:dtcm from:0x02142be4 kind:load to:0x027e1094 module:dtcm @@ -4306,7 +4306,7 @@ from:0x02144320 kind:arm_call to:0x0209a4a8 module:overlay(0) from:0x02144368 kind:arm_call to:0x020ceba8 module:overlay(0) from:0x02144398 kind:arm_call to:0x021498d0 module:overlay(15) from:0x02144470 kind:arm_call to:0x02083888 module:overlay(0) -from:0x02144484 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02144484 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02144494 kind:arm_call to:0x02146568 module:overlay(15) from:0x021444ac kind:load to:0x020eec3c module:overlay(0) from:0x021444b0 kind:load to:0x027e0f74 module:dtcm @@ -4328,7 +4328,7 @@ from:0x021445cc kind:arm_call to:0x021154dc module:overlay(9) from:0x021445f4 kind:arm_call to:0x020cea6c module:overlay(0) from:0x02144604 kind:arm_call to:0x02149ad4 module:overlay(15) from:0x021446bc kind:arm_call to:0x02083888 module:overlay(0) -from:0x021446d0 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x021446d0 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x021446dc kind:load to:0x027e0f74 module:dtcm from:0x021446e0 kind:load to:0x027e0fa0 module:dtcm from:0x021446e4 kind:load to:0x027e0ffc module:dtcm @@ -5363,7 +5363,7 @@ from:0x0214cfbc kind:arm_call to:0x0214ca70 module:overlay(15) from:0x0214cfd4 kind:load to:0x027e103c module:dtcm from:0x0214cfe8 kind:arm_call to:0x0211b48c module:overlay(9) from:0x0214cff8 kind:arm_call to:0x021216b8 module:overlay(15) -from:0x0214d008 kind:arm_call to:0x0211b4d4 module:overlays(9,11) +from:0x0214d008 kind:arm_call to:0x0211b4d4 module:overlay(9) from:0x0214d024 kind:arm_call to:0x020f4b1c module:overlay(3) from:0x0214d110 kind:arm_call to:0x0211fc00 module:overlay(15) from:0x0214d118 kind:load to:0x027e1054 module:dtcm @@ -5894,7 +5894,7 @@ from:0x02152514 kind:arm_call to:0x0209a494 module:overlay(0) from:0x02152544 kind:arm_call to:0x020977b0 module:overlay(0) from:0x02152570 kind:arm_call to:0x0209a4a8 module:overlay(0) from:0x021525b8 kind:arm_call to:0x02083888 module:overlay(0) -from:0x021525cc kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x021525cc kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x021525e0 kind:arm_call to:0x02136834 module:overlay(15) from:0x021525f8 kind:arm_call to:0x021370b8 module:overlay(15) from:0x02152604 kind:load to:0x027e0f74 module:dtcm @@ -6064,7 +6064,7 @@ from:0x02153c20 kind:arm_call to:0x02088888 module:overlay(0) from:0x02153c38 kind:arm_call to:0x02142950 module:overlay(15) from:0x02153c48 kind:arm_call to:0x0203708c module:main from:0x02153cd0 kind:arm_call to:0x02083888 module:overlay(0) -from:0x02153ce4 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02153ce4 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02153cf8 kind:arm_call to:0x01ff80d4 module:itcm from:0x02153d28 kind:arm_call_thumb to:0x01ff8214 module:itcm from:0x02153d38 kind:arm_call to:0x01ff8690 module:itcm @@ -6104,7 +6104,7 @@ from:0x021541b4 kind:arm_call to:0x02176fdc module:overlay(15) from:0x021541e4 kind:arm_call to:0x021538b8 module:overlay(15) from:0x021541f0 kind:arm_call_thumb to:0x020ae5e8 module:overlay(0) from:0x02154260 kind:arm_call to:0x02083888 module:overlay(0) -from:0x02154274 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02154274 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02154288 kind:arm_call to:0x02153f14 module:overlay(15) from:0x02154294 kind:load to:0x027e0fe4 module:dtcm from:0x02154298 kind:load to:0x027e1060 module:dtcm @@ -6119,7 +6119,7 @@ from:0x02154340 kind:arm_call to:0x02175c94 module:overlay(15) from:0x0215434c kind:arm_call to:0x020d710c module:overlay(0) from:0x02154358 kind:arm_call to:0x020d735c module:overlay(0) from:0x021543ec kind:arm_call to:0x02083888 module:overlay(0) -from:0x02154400 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02154400 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02154438 kind:arm_call to:0x0202b4cc module:main from:0x02154464 kind:arm_call to:0x0202b13c module:main from:0x021544d8 kind:arm_call to:0x020a61f0 module:overlay(0) @@ -6137,7 +6137,7 @@ from:0x021545a4 kind:load to:0x027e0e60 module:dtcm from:0x021545a8 kind:load to:0x027e0d38 module:dtcm from:0x021545ac kind:load to:0x02050f10 module:main from:0x02154618 kind:arm_call to:0x02083888 module:overlay(0) -from:0x0215462c kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x0215462c kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02154640 kind:arm_call to:0x020d7784 module:overlay(0) from:0x0215466c kind:arm_call to:0x02154844 module:overlay(15) from:0x02154678 kind:load to:0x027e0e60 module:dtcm @@ -9032,7 +9032,7 @@ from:0x0216d81c kind:arm_call_thumb to:0x0211c3d0 module:overlay(9) from:0x0216d840 kind:load to:0x0211f54a module:overlay(9) from:0x0216d844 kind:load to:0x027e0fb8 module:dtcm from:0x0216d89c kind:arm_call to:0x02083888 module:overlay(0) -from:0x0216d8b0 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x0216d8b0 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x0216d8d0 kind:arm_call to:0x0209773c module:overlay(0) from:0x0216d8dc kind:load to:0x027e0e60 module:dtcm from:0x0216d8e0 kind:load to:0x027e0d38 module:dtcm @@ -9042,7 +9042,7 @@ from:0x0216d914 kind:arm_call to:0x02142950 module:overlay(15) from:0x0216d924 kind:arm_call to:0x0203708c module:main from:0x0216d934 kind:arm_call to:0x0216dd0c module:overlay(15) from:0x0216d984 kind:arm_call to:0x02083888 module:overlay(0) -from:0x0216d998 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x0216d998 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x0216d9b4 kind:arm_call to:0x0209773c module:overlay(0) from:0x0216d9c0 kind:arm_call to:0x0203672c module:main from:0x0216d9f4 kind:arm_call to:0x020c3614 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov018/relocs.txt b/config/usa/arm9/overlays/ov018/relocs.txt index 3e1796c5..ce95c10e 100644 --- a/config/usa/arm9/overlays/ov018/relocs.txt +++ b/config/usa/arm9/overlays/ov018/relocs.txt @@ -322,8 +322,8 @@ from:0x0215dd70 kind:arm_call to:0x02097b6c module:overlay(0) from:0x0215dd8c kind:arm_call to:0x0215e1ac module:overlay(18) from:0x0215dd9c kind:arm_call to:0x020d7f3c module:overlay(0) from:0x0215ddd0 kind:arm_call to:0x020d7410 module:overlay(0) -from:0x0215dde4 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) -from:0x0215ddf0 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x0215dde4 kind:arm_call to:0x02100a60 module:overlays(5,6,7) +from:0x0215ddf0 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x0215de00 kind:load to:0x020eec08 module:overlay(0) from:0x0215de04 kind:load to:0x027e0f74 module:dtcm from:0x0215de08 kind:load to:0x02050f10 module:main @@ -525,19 +525,19 @@ from:0x0215fb18 kind:arm_call to:0x01ff9bc4 module:itcm from:0x0215fb20 kind:arm_call to:0x0215fc2c module:overlay(18) from:0x0215fb7c kind:arm_call to:0x01ff9bf8 module:itcm from:0x0215fba0 kind:arm_call to:0x01ff9bc4 module:itcm -from:0x0215fc48 kind:arm_call_thumb to:0x0214393c module:overlays(14,60) +from:0x0215fc48 kind:arm_call_thumb to:0x0214393c module:overlay(14) from:0x0215fc74 kind:arm_call to:0x020a5e3c module:overlay(0) from:0x0215fc90 kind:arm_call to:0x0202e9d8 module:main from:0x0215fc9c kind:arm_call_thumb to:0x02175f08 module:overlay(26) from:0x0215fcb8 kind:arm_call to:0x020a5e3c module:overlay(0) from:0x0215fcd4 kind:arm_call to:0x0202e9d8 module:main -from:0x0215fce0 kind:arm_call_thumb to:0x0217748c module:overlays(25,26) +from:0x0215fce0 kind:arm_call_thumb to:0x0217748c module:overlay(26) from:0x0215fcf8 kind:load to:0x0216c5fc module:overlay(18) from:0x0215fcfc kind:load to:0x027e0d38 module:dtcm from:0x0215fd00 kind:load to:0x027e0ce0 module:dtcm from:0x0215fd28 kind:arm_call_thumb to:0x02177510 module:overlay(26) from:0x0215fd30 kind:arm_call to:0x0202ea08 module:main -from:0x0215fd44 kind:arm_call_thumb to:0x02175f14 module:overlays(22,26) +from:0x0215fd44 kind:arm_call_thumb to:0x02175f14 module:overlay(26) from:0x0215fd4c kind:arm_call to:0x0202ea08 module:main from:0x0215fd60 kind:arm_call to:0x0217d7e4 module:overlays(33,35) from:0x0215fd68 kind:arm_call to:0x0202ea08 module:main @@ -553,7 +553,7 @@ from:0x0215fde8 kind:load to:0x0216c5fc module:overlay(18) from:0x0215fdec kind:load to:0x0215fd04 module:overlay(18) from:0x0215fe10 kind:arm_call_thumb to:0x02177510 module:overlay(26) from:0x0215fe18 kind:arm_call to:0x0202ea08 module:main -from:0x0215fe2c kind:arm_call_thumb to:0x02175f14 module:overlays(22,26) +from:0x0215fe2c kind:arm_call_thumb to:0x02175f14 module:overlay(26) from:0x0215fe34 kind:arm_call to:0x0202ea08 module:main from:0x0215fe48 kind:arm_call to:0x0217d7e4 module:overlays(33,35) from:0x0215fe50 kind:arm_call to:0x0202ea08 module:main diff --git a/config/usa/arm9/overlays/ov022/relocs.txt b/config/usa/arm9/overlays/ov022/relocs.txt index 19657eec..a3eee3d5 100644 --- a/config/usa/arm9/overlays/ov022/relocs.txt +++ b/config/usa/arm9/overlays/ov022/relocs.txt @@ -269,7 +269,7 @@ from:0x0216fe60 kind:arm_call to:0x020cea6c module:overlay(0) from:0x0216fec4 kind:arm_call to:0x0217015c module:overlay(22) from:0x0216fec8 kind:arm_call to:0x021758b8 module:overlay(22) from:0x0216ff24 kind:arm_call to:0x02083888 module:overlay(0) -from:0x0216ff38 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x0216ff38 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x0216ff84 kind:arm_call to:0x020a614c module:overlay(0) from:0x0217001c kind:arm_call to:0x020b7e44 module:overlay(0) from:0x02170038 kind:arm_call to:0x0207c198 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov025/relocs.txt b/config/usa/arm9/overlays/ov025/relocs.txt index 3ad51f08..755aabed 100644 --- a/config/usa/arm9/overlays/ov025/relocs.txt +++ b/config/usa/arm9/overlays/ov025/relocs.txt @@ -845,7 +845,7 @@ from:0x02174e34 kind:arm_call to:0x0209773c module:overlay(0) from:0x02174e40 kind:arm_call to:0x02173a14 module:overlay(25) from:0x02174e4c kind:arm_call to:0x02145274 module:overlay(14) from:0x02174ebc kind:arm_call to:0x02083888 module:overlay(0) -from:0x02174ed8 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02174ed8 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02174ee8 kind:arm_call to:0x02173a14 module:overlay(25) from:0x02174f18 kind:arm_call to:0x0214a888 module:overlay(14) from:0x02174f2c kind:arm_call to:0x0217325c module:overlay(25) diff --git a/config/usa/arm9/overlays/ov026/relocs.txt b/config/usa/arm9/overlays/ov026/relocs.txt index 8d59c49b..5bb93616 100644 --- a/config/usa/arm9/overlays/ov026/relocs.txt +++ b/config/usa/arm9/overlays/ov026/relocs.txt @@ -146,7 +146,7 @@ from:0x0216e3d4 kind:load to:0x0217927c module:overlay(26) from:0x0216e3d8 kind:load to:0x0217928c module:overlay(26) from:0x0216e444 kind:load to:0x027e0f74 module:dtcm from:0x0216e448 kind:load to:0x02097700 module:overlay(0) -from:0x0216e450 kind:thumb_call to:0x0214393c module:overlays(14,60) +from:0x0216e450 kind:thumb_call to:0x0214393c module:overlay(14) from:0x0216e460 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x0216e468 kind:thumb_call to:0x0216e818 module:overlay(26) from:0x0216e474 kind:load to:0x0217a46c module:overlay(26) diff --git a/config/usa/arm9/overlays/ov027/relocs.txt b/config/usa/arm9/overlays/ov027/relocs.txt index 0cd85a16..9a932ed3 100644 --- a/config/usa/arm9/overlays/ov027/relocs.txt +++ b/config/usa/arm9/overlays/ov027/relocs.txt @@ -705,7 +705,7 @@ from:0x02173788 kind:load to:0x0217966c module:overlay(27) from:0x0217378c kind:load to:0x02145e68 module:overlay(14) from:0x0217379c kind:arm_call to:0x02145274 module:overlay(14) from:0x02173800 kind:arm_call to:0x02083888 module:overlay(0) -from:0x02173814 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02173814 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02173824 kind:arm_call to:0x020c18a8 module:overlay(0) from:0x02173838 kind:load to:0x027e0e60 module:dtcm from:0x0217383c kind:load to:0x027e0d38 module:dtcm diff --git a/config/usa/arm9/overlays/ov041/relocs.txt b/config/usa/arm9/overlays/ov041/relocs.txt index 82e03d43..588e2da3 100644 --- a/config/usa/arm9/overlays/ov041/relocs.txt +++ b/config/usa/arm9/overlays/ov041/relocs.txt @@ -28,7 +28,7 @@ from:0x02189870 kind:arm_call to:0x020d7eb8 module:overlay(0) from:0x021898a8 kind:arm_call to:0x020375e4 module:main from:0x021898c0 kind:arm_call to:0x02036f24 module:main from:0x021898e4 kind:arm_call to:0x020366bc module:main -from:0x02189900 kind:arm_call_thumb to:0x02175ec8 module:overlays(20,26) +from:0x02189900 kind:arm_call_thumb to:0x02175ec8 module:overlay(26) from:0x02189958 kind:load to:0x027e077c module:dtcm from:0x0218995c kind:load to:0x027e1054 module:dtcm from:0x02189960 kind:load to:0x027e103c module:dtcm diff --git a/config/usa/arm9/overlays/ov045/relocs.txt b/config/usa/arm9/overlays/ov045/relocs.txt index 281d1e94..219b3c0c 100644 --- a/config/usa/arm9/overlays/ov045/relocs.txt +++ b/config/usa/arm9/overlays/ov045/relocs.txt @@ -705,7 +705,7 @@ from:0x0218dc10 kind:arm_call_thumb to:0x0211bdc8 module:overlay(9) from:0x0218dc14 kind:arm_call to:0x020329ac module:main from:0x0218dc34 kind:arm_call to:0x02032a70 module:main from:0x0218dc58 kind:arm_call to:0x02032710 module:main -from:0x0218dc60 kind:arm_call_thumb to:0x02116a80 module:overlays(9,10) +from:0x0218dc60 kind:arm_call_thumb to:0x02116a80 module:overlay(9) from:0x0218dca0 kind:arm_call_thumb to:0x02113bb4 module:overlay(9) from:0x0218dcb8 kind:arm_call_thumb to:0x02113ec0 module:overlay(9) from:0x0218dce0 kind:arm_call_thumb to:0x02113bb4 module:overlay(9) diff --git a/config/usa/arm9/overlays/ov053/relocs.txt b/config/usa/arm9/overlays/ov053/relocs.txt index 5ac4095b..0527e31e 100644 --- a/config/usa/arm9/overlays/ov053/relocs.txt +++ b/config/usa/arm9/overlays/ov053/relocs.txt @@ -139,7 +139,7 @@ from:0x02199d44 kind:arm_call to:0x02199970 module:overlay(53) from:0x02199d48 kind:arm_call to:0x02198f98 module:overlay(53) from:0x02199d54 kind:arm_call to:0x02123028 module:overlay(14) from:0x02199d60 kind:arm_call to:0x021234fc module:overlay(14) -from:0x02199d78 kind:arm_call to:0x021231ac module:overlays(11,14) +from:0x02199d78 kind:arm_call to:0x021231ac module:overlay(14) from:0x02199d8c kind:arm_call to:0x02199970 module:overlay(53) from:0x02199da4 kind:arm_call to:0x021234fc module:overlay(14) from:0x02199dc0 kind:arm_call to:0x02199970 module:overlay(53) diff --git a/config/usa/arm9/overlays/ov060/relocs.txt b/config/usa/arm9/overlays/ov060/relocs.txt index bd03f861..e0a0a9a0 100644 --- a/config/usa/arm9/overlays/ov060/relocs.txt +++ b/config/usa/arm9/overlays/ov060/relocs.txt @@ -399,7 +399,7 @@ from:0x021412f4 kind:load to:0x02148020 module:overlay(60) from:0x021412f8 kind:load to:0x0214800c module:overlay(60) from:0x02141318 kind:arm_call to:0x02144be0 module:overlay(60) from:0x0214132c kind:arm_call to:0x02144be0 module:overlay(60) -from:0x02141350 kind:arm_call to:0x020eece0 module:overlays(1,2,3) +from:0x02141350 kind:arm_call to:0x020eece0 module:overlays(1,2) from:0x0214135c kind:arm_call to:0x02141158 module:overlay(60) from:0x02141370 kind:arm_call to:0x02144c14 module:overlay(60) from:0x02141378 kind:load to:0x02148008 module:overlay(60) diff --git a/config/usa/arm9/overlays/ov061/relocs.txt b/config/usa/arm9/overlays/ov061/relocs.txt index 6fca285e..4adf8f17 100644 --- a/config/usa/arm9/overlays/ov061/relocs.txt +++ b/config/usa/arm9/overlays/ov061/relocs.txt @@ -4831,7 +4831,7 @@ from:0x0215eae4 kind:arm_call to:0x0215f5c4 module:overlay(61) from:0x0215eaec kind:arm_call to:0x0200ee60 module:main from:0x0215eaf8 kind:arm_call to:0x0200ee60 module:main from:0x0215eb04 kind:arm_call to:0x0200ee60 module:main -from:0x0215eb28 kind:arm_call to:0x020eece0 module:overlays(1,2,3) +from:0x0215eb28 kind:arm_call to:0x020eece0 module:overlays(1,2) from:0x0215eb58 kind:arm_call to:0x0215f9c4 module:overlay(61) from:0x0215eb60 kind:arm_call to:0x0200ee60 module:main from:0x0215eb70 kind:arm_call to:0x0200ee60 module:main @@ -8767,7 +8767,7 @@ from:0x02179f18 kind:arm_call to:0x0213de40 module:overlay(61) from:0x02179f38 kind:arm_call to:0x0213e4f0 module:overlay(61) from:0x02179f74 kind:arm_call_thumb to:0x02077978 module:overlay(0) from:0x02179f88 kind:arm_call to:0x02007a44 module:main -from:0x02179fd8 kind:arm_call to:0x020eece0 module:overlays(1,2,3) +from:0x02179fd8 kind:arm_call to:0x020eece0 module:overlays(1,2) from:0x02179fe8 kind:arm_call to:0x020efdc0 module:overlay(1) from:0x02179ff4 kind:arm_call to:0x0200e8f8 module:main from:0x0217a014 kind:arm_call to:0x0200e8f8 module:main diff --git a/config/usa/arm9/relocs.txt b/config/usa/arm9/relocs.txt index 85b5e5ec..c68c2917 100644 --- a/config/usa/arm9/relocs.txt +++ b/config/usa/arm9/relocs.txt @@ -3792,14 +3792,14 @@ from:0x0202fbc8 kind:load to:0x020ee6d4 module:overlay(0) from:0x0202fbcc kind:load to:0x027e0618 module:dtcm from:0x0202fbd0 kind:load to:0x020561b0 module:main from:0x0202fbdc kind:load to:0x020ee7c0 module:overlay(0) -from:0x0202fc4c kind:arm_call to:0x02115730 module:overlays(11,13) +from:0x0202fc4c kind:arm_call to:0x02115730 module:overlay(13) from:0x0202fc60 kind:arm_call_thumb to:0x0202fa24 module:main from:0x0202fc6c kind:arm_call_thumb to:0x0202fa24 module:main from:0x0202fc7c kind:arm_call_thumb to:0x0202fa24 module:main from:0x0202fcac kind:arm_call_thumb to:0x0202fa24 module:main from:0x0202fcb8 kind:arm_call_thumb to:0x0202fa24 module:main from:0x0202fcd0 kind:arm_call to:0x0200b7a4 module:main -from:0x0202fd10 kind:arm_call to:0x02115730 module:overlays(11,13) +from:0x0202fd10 kind:arm_call to:0x02115730 module:overlay(13) from:0x0202fd24 kind:arm_call_thumb to:0x0202fa24 module:main from:0x0202fd34 kind:arm_call_thumb to:0x0202fa24 module:main from:0x0202fd44 kind:arm_call_thumb to:0x0202fa24 module:main @@ -4680,7 +4680,7 @@ from:0x02038238 kind:arm_call to:0x020ae280 module:overlay(0) from:0x02038258 kind:arm_call_thumb to:0x0207b290 module:overlay(0) from:0x02038288 kind:arm_call_thumb to:0x0207b2d4 module:overlay(0) from:0x020382e8 kind:arm_call to:0x02083888 module:overlay(0) -from:0x02038314 kind:arm_call to:0x02100a60 module:overlays(4,5,6,7) +from:0x02038314 kind:arm_call to:0x02100a60 module:overlays(5,6,7) from:0x02038368 kind:arm_call to:0x02038574 module:main from:0x0203836c kind:arm_call to:0x020ab668 module:overlay(0) from:0x02038394 kind:arm_call_thumb to:0x020ae308 module:overlay(0) @@ -6951,7 +6951,7 @@ from:0x02050dd8 kind:load to:0x0211fe48 module:overlay(16) from:0x02050ddc kind:load to:0x02068e04 module:main from:0x02050dec kind:load to:0x02035fc9 module:main from:0x02050df0 kind:load to:0x027e0c54 module:dtcm -from:0x02050dfc kind:arm_call to:0x0211f5c0 module:overlays(14,15,16) +from:0x02050dfc kind:arm_call to:0x0211f5c0 module:overlays(15,16) from:0x02050e0c kind:arm_call to:0x0204f890 module:main from:0x02050e14 kind:load to:0x027e0c68 module:dtcm from:0x02050e18 kind:load to:0x0203716c module:main