diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index b07927d3..474ee686 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -3,7 +3,7 @@ .exceptix start:0x0203d5fc end:0x0203d824 kind:rodata align:4 .init start:0x0203d824 end:0x0203dc88 kind:code align:4 .rodata start:0x0203dc88 end:0x020431c0 kind:rodata align:4 - .ctor start:0x020431c0 end:0x02043218 kind:rodata align:4 + .ctor start:0x020431c0 end:0x02043214 kind:rodata align:4 .data start:0x02043220 end:0x02044dc0 kind:data align:32 .bss start:0x02044dc0 end:0x02051ae0 kind:bss align:32 diff --git a/config/eur/arm9/dtcm/delinks.txt b/config/eur/arm9/dtcm/delinks.txt index dfe0379e..06c2636a 100644 --- a/config/eur/arm9/dtcm/delinks.txt +++ b/config/eur/arm9/dtcm/delinks.txt @@ -1,3 +1,2 @@ .data start:0x027e0000 end:0x027e0200 kind:data align:32 .bss start:0x027e0200 end:0x027e0da0 kind:bss align:32 - diff --git a/config/eur/arm9/itcm/delinks.txt b/config/eur/arm9/itcm/delinks.txt index e2b7cf3f..e6ad4257 100644 --- a/config/eur/arm9/itcm/delinks.txt +++ b/config/eur/arm9/itcm/delinks.txt @@ -1,3 +1,2 @@ .text start:0x01ff8000 end:0x01fffe18 kind:code align:32 .bss start:0x01fffe20 end:0x01fffe20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 0f134475..01f7a2f2 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -1,7 +1,7 @@ .text start:0x02051ae0 end:0x020aa238 kind:code align:32 .rodata start:0x020aa238 end:0x020aff98 kind:rodata align:4 .init start:0x020aff98 end:0x020b18b4 kind:code align:4 - .ctor start:0x020b18b4 end:0x020b1944 kind:rodata align:4 + .ctor start:0x020b18b4 end:0x020b1940 kind:rodata align:4 .data start:0x020b1960 end:0x020b4ec0 kind:data align:32 .bss start:0x020b4ec0 end:0x020b6520 kind:bss align:32 diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index 3289b51c..b5d48c15 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -1378,25 +1378,25 @@ from:0x02061ab8 kind:arm_call to:0x02011ff4 module:main from:0x02061ad0 kind:arm_call to:0x02016694 module:main from:0x02061af0 kind:arm_call to:0x0201667c module:main from:0x02061b00 kind:arm_call to:0x0201667c module:main -from:0x02061b24 kind:load to:0x020b1e58 add:8 module:overlay(0) -from:0x02061b28 kind:load to:0x020b1e40 add:8 module:overlay(0) +from:0x02061b24 kind:load to:0x020b1e58 add:0x8 module:overlay(0) +from:0x02061b28 kind:load to:0x020b1e40 add:0x8 module:overlay(0) from:0x02061b38 kind:arm_call to:0x0201667c module:main from:0x02061b48 kind:arm_call to:0x0201667c module:main -from:0x02061b6c kind:load to:0x020b1e58 add:8 module:overlay(0) -from:0x02061b70 kind:load to:0x020b1e40 add:8 module:overlay(0) +from:0x02061b6c kind:load to:0x020b1e58 add:0x8 module:overlay(0) +from:0x02061b70 kind:load to:0x020b1e40 add:0x8 module:overlay(0) from:0x02061bcc kind:arm_call to:0x02061a8c module:overlay(0) from:0x02061bd4 kind:arm_call to:0x02016694 module:main -from:0x02061be0 kind:load to:0x020b1e58 add:8 module:overlay(0) +from:0x02061be0 kind:load to:0x020b1e58 add:0x8 module:overlay(0) from:0x02061c3c kind:arm_call to:0x02061a8c module:overlay(0) from:0x02061c44 kind:arm_call to:0x02016694 module:main from:0x02061c4c kind:arm_call to:0x02011ff4 module:main -from:0x02061c58 kind:load to:0x020b1e58 add:8 module:overlay(0) +from:0x02061c58 kind:load to:0x020b1e58 add:0x8 module:overlay(0) from:0x02061cb4 kind:arm_call to:0x02061a8c module:overlay(0) from:0x02061cbc kind:arm_call to:0x02016694 module:main -from:0x02061cc8 kind:load to:0x020b1e58 add:8 module:overlay(0) +from:0x02061cc8 kind:load to:0x020b1e58 add:0x8 module:overlay(0) from:0x02061d08 kind:arm_call to:0x02028c4c module:main from:0x02061d18 kind:arm_call to:0x02028c4c module:main -from:0x02061d34 kind:load to:0x020b1e7c add:8 module:overlay(0) +from:0x02061d34 kind:load to:0x020b1e7c add:0x8 module:overlay(0) from:0x02061d48 kind:arm_call to:0x020090d4 module:main from:0x02061d64 kind:arm_call to:0x0200911c module:main from:0x02061dfc kind:arm_call to:0x02008a0c module:main @@ -1761,7 +1761,7 @@ from:0x02066734 kind:arm_call to:0x0206665c module:overlay(0) from:0x02066768 kind:arm_call to:0x0203d210 module:main from:0x02066774 kind:load to:0x02066778 module:overlay(0) from:0x02066780 kind:arm_call_thumb to:0x0201556c module:main -from:0x020667d0 kind:load to:0x020b2070 add:8 module:overlay(0) +from:0x020667d0 kind:load to:0x020b2070 add:0x8 module:overlay(0) from:0x02066878 kind:arm_call to:0x02066a08 module:overlay(0) from:0x020669a4 kind:arm_call to:0x020669dc module:overlay(0) from:0x020669ac kind:load to:0x020b504c module:overlay(0) @@ -1801,21 +1801,21 @@ from:0x02067228 kind:load to:0x027e0d04 module:dtcm from:0x0206722c kind:load to:0x020b62a8 module:overlay(0) from:0x02067230 kind:load to:0x020d78c2 module:overlay(24) from:0x02067258 kind:arm_call to:0x020667b0 module:overlay(0) -from:0x02067274 kind:load to:0x020b209c add:8 module:overlay(0) +from:0x02067274 kind:load to:0x020b209c add:0x8 module:overlay(0) from:0x0206728c kind:arm_call to:0x020667b0 module:overlay(0) -from:0x020672a8 kind:load to:0x020b209c add:8 module:overlay(0) +from:0x020672a8 kind:load to:0x020b209c add:0x8 module:overlay(0) from:0x020672c4 kind:arm_call to:0x020669b4 module:overlay(0) from:0x020672dc kind:arm_call to:0x02067e60 module:overlay(0) -from:0x020672ec kind:load to:0x020b209c add:8 module:overlay(0) +from:0x020672ec kind:load to:0x020b209c add:0x8 module:overlay(0) from:0x020672f0 kind:load to:0x020b504c module:overlay(0) from:0x0206730c kind:arm_call to:0x020669b4 module:overlay(0) from:0x02067324 kind:arm_call to:0x02067e60 module:overlay(0) from:0x0206732c kind:arm_call to:0x02011ff4 module:main -from:0x0206733c kind:load to:0x020b209c add:8 module:overlay(0) +from:0x0206733c kind:load to:0x020b209c add:0x8 module:overlay(0) from:0x02067340 kind:load to:0x020b504c module:overlay(0) from:0x0206735c kind:arm_call to:0x020669b4 module:overlay(0) from:0x02067374 kind:arm_call to:0x02067e60 module:overlay(0) -from:0x02067384 kind:load to:0x020b209c add:8 module:overlay(0) +from:0x02067384 kind:load to:0x020b209c add:0x8 module:overlay(0) from:0x02067388 kind:load to:0x020b504c module:overlay(0) from:0x0206739c kind:arm_call to:0x020669b4 module:overlay(0) from:0x020673b8 kind:arm_call to:0x02067e60 module:overlay(0) @@ -1959,9 +1959,9 @@ from:0x020684c4 kind:load to:0x0204a120 module:main from:0x020684d8 kind:load to:0x0201c0c4 module:main from:0x02068500 kind:load to:0x0204a110 module:main from:0x02068548 kind:arm_call to:0x02068504 module:overlay(0) -from:0x020685c4 kind:load to:0x020b20f4 add:8 module:overlay(0) +from:0x020685c4 kind:load to:0x020b20f4 add:0x8 module:overlay(0) from:0x020685fc kind:arm_call to:0x02068504 module:overlay(0) -from:0x02068678 kind:load to:0x020b20f4 add:8 module:overlay(0) +from:0x02068678 kind:load to:0x020b20f4 add:0x8 module:overlay(0) from:0x0206868c kind:arm_call to:0x02011ff4 module:main from:0x020686e0 kind:arm_call to:0x0206981c module:overlay(0) from:0x02068780 kind:arm_call to:0x0206678c module:overlay(0) @@ -6679,7 +6679,7 @@ from:0x020983e4 kind:arm_call to:0x020975f8 module:overlay(0) from:0x02098400 kind:arm_call to:0x02028cdc module:main from:0x0209844c kind:arm_call to:0x0209862c module:overlay(0) from:0x02098458 kind:arm_call to:0x0209848c module:overlay(0) -from:0x02098464 kind:load to:0x020b30e4 add:8 module:overlay(0) +from:0x02098464 kind:load to:0x020b30e4 add:0x8 module:overlay(0) from:0x02098468 kind:load to:0x020b539c module:overlay(0) from:0x0209847c kind:arm_call to:0x02011ff4 module:main from:0x020984e8 kind:arm_call to:0x020984f0 module:overlay(0) @@ -7742,7 +7742,7 @@ from:0x020a1220 kind:arm_call to:0x02028cdc module:main from:0x020a1230 kind:arm_call to:0x02028cdc module:main from:0x020a1240 kind:arm_call to:0x02028cdc module:main from:0x020a1250 kind:arm_call to:0x02028cdc module:main -from:0x020a1258 kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020a1258 kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020a1270 kind:arm_call to:0x02028450 module:main from:0x020a1280 kind:arm_call to:0x0203284c module:main from:0x020a1290 kind:arm_call to:0x020328f4 module:main @@ -8394,7 +8394,7 @@ from:0x020a8bac kind:load to:0x020afd1c module:overlay(0) from:0x020a8bc0 kind:arm_call to:0x02098388 module:overlay(0) from:0x020a8bd0 kind:arm_call to:0x0207edac module:overlay(0) from:0x020a8c48 kind:arm_call_thumb to:0x020d6668 module:overlay(24) -from:0x020a8cb4 kind:load to:0x020b4d88 add:8 module:overlay(0) +from:0x020a8cb4 kind:load to:0x020b4d88 add:0x8 module:overlay(0) from:0x020a8ccc kind:arm_call to:0x0207ede8 module:overlay(0) from:0x020a8cd4 kind:arm_call to:0x02098488 module:overlay(0) from:0x020a8cec kind:arm_call to:0x0207ede8 module:overlay(0) @@ -10736,7 +10736,7 @@ from:0x020b4014 kind:load to:0x020b3be4 module:overlay(0) from:0x020b401c kind:load to:0x020b3c2c module:overlay(0) from:0x020b4024 kind:load to:0x020b3a24 module:overlay(0) from:0x020b402c kind:load to:0x020b38b4 module:overlay(0) -from:0x020b4034 kind:load to:0x020b389c add:8 module:overlay(0) +from:0x020b4034 kind:load to:0x020b389c add:0x8 module:overlay(0) from:0x020b403c kind:load to:0x020b38c4 module:overlay(0) from:0x020b4044 kind:load to:0x020b3a34 module:overlay(0) from:0x020b404c kind:load to:0x020b38f4 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov001/delinks.txt b/config/eur/arm9/overlays/ov001/delinks.txt index 725b860b..adf9d994 100644 --- a/config/eur/arm9/overlays/ov001/delinks.txt +++ b/config/eur/arm9/overlays/ov001/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020b6520 end:0x020c0a24 kind:code align:32 .rodata start:0x020c0a24 end:0x020c2814 kind:rodata align:4 .init start:0x020c2814 end:0x020c2900 kind:code align:4 - .ctor start:0x020c2900 end:0x020c2924 kind:rodata align:4 + .ctor start:0x020c2900 end:0x020c2920 kind:rodata align:4 .data start:0x020c2940 end:0x020c2fe0 kind:data align:32 .bss start:0x020c2fe0 end:0x020c4720 kind:bss align:32 diff --git a/config/eur/arm9/overlays/ov001/relocs.txt b/config/eur/arm9/overlays/ov001/relocs.txt index 476382d7..8fb0402f 100644 --- a/config/eur/arm9/overlays/ov001/relocs.txt +++ b/config/eur/arm9/overlays/ov001/relocs.txt @@ -2349,7 +2349,7 @@ from:0x020c1524 kind:load to:0x020c3508 module:overlay(1) from:0x020c1590 kind:load to:0x020c4701 module:overlay(1) from:0x020c159c kind:load to:0x020c2550 module:overlay(1) from:0x020c1608 kind:load to:0x020c4701 module:overlay(1) -from:0x020c1614 kind:load to:0x020c2624 add:4 module:overlay(1) +from:0x020c1614 kind:load to:0x020c2624 add:0x4 module:overlay(1) from:0x020c1680 kind:load to:0x020c4701 module:overlay(1) from:0x020c168c kind:load to:0x020c273c module:overlay(1) from:0x020c16f8 kind:load to:0x020c4701 module:overlay(1) diff --git a/config/eur/arm9/overlays/ov002/delinks.txt b/config/eur/arm9/overlays/ov002/delinks.txt index d834add3..a18f8289 100644 --- a/config/eur/arm9/overlays/ov002/delinks.txt +++ b/config/eur/arm9/overlays/ov002/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020bc974 kind:code align:32 .rodata start:0x020bc974 end:0x020bcc8c kind:rodata align:4 .init start:0x020bcc8c end:0x020bccac kind:code align:4 - .ctor start:0x020bccac end:0x020bccb4 kind:rodata align:4 + .ctor start:0x020bccac end:0x020bccb0 kind:rodata align:4 .data start:0x020bccc0 end:0x020bd060 kind:data align:32 .bss start:0x020bd060 end:0x020c3c00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov002/relocs.txt b/config/eur/arm9/overlays/ov002/relocs.txt index 1f892524..4c036048 100644 --- a/config/eur/arm9/overlays/ov002/relocs.txt +++ b/config/eur/arm9/overlays/ov002/relocs.txt @@ -304,7 +304,7 @@ from:0x020b7da6 kind:thumb_call to:0x0201568c module:main from:0x020b7dac kind:thumb_call to:0x020154c4 module:main from:0x020b7dd8 kind:load to:0x020bcdec module:overlay(2) from:0x020b7de0 kind:load to:0x020bce10 module:overlay(2) -from:0x020b7de4 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020b7de4 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020b7de8 kind:load to:0x020b8a7d module:overlay(2) from:0x020b7df0 kind:load to:0x020b79d5 module:overlay(2) from:0x020b7df4 kind:load to:0x020b8a89 module:overlay(2) diff --git a/config/eur/arm9/overlays/ov003/delinks.txt b/config/eur/arm9/overlays/ov003/delinks.txt index c8eb127e..b6118247 100644 --- a/config/eur/arm9/overlays/ov003/delinks.txt +++ b/config/eur/arm9/overlays/ov003/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b9d48 kind:code align:32 .rodata start:0x020b9d48 end:0x020b9eb4 kind:rodata align:4 .init start:0x020b9eb4 end:0x020b9f1c kind:code align:4 - .ctor start:0x020b9f1c end:0x020b9f28 kind:rodata align:4 + .ctor start:0x020b9f1c end:0x020b9f24 kind:rodata align:4 .data start:0x020b9f40 end:0x020ba740 kind:data align:32 .bss start:0x020ba740 end:0x020bb3a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov003/relocs.txt b/config/eur/arm9/overlays/ov003/relocs.txt index 01bc4ae5..58d8e9ea 100644 --- a/config/eur/arm9/overlays/ov003/relocs.txt +++ b/config/eur/arm9/overlays/ov003/relocs.txt @@ -82,7 +82,7 @@ from:0x020b6d3c kind:arm_call to:0x020166cc module:main from:0x020b6d4c kind:load to:0x020ba004 module:overlay(3) from:0x020b6d50 kind:load to:0x020b6d60 module:overlay(3) from:0x020b6d54 kind:load to:0x0206337c module:overlay(0) -from:0x020b6d5c kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020b6d5c kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020b6d68 kind:arm_call to:0x02062be0 module:overlay(0) from:0x020b6d88 kind:arm_call to:0x02011ff4 module:main from:0x020b6d90 kind:arm_call to:0x02011ff4 module:main diff --git a/config/eur/arm9/overlays/ov004/delinks.txt b/config/eur/arm9/overlays/ov004/delinks.txt index 7d3884bb..bdde983a 100644 --- a/config/eur/arm9/overlays/ov004/delinks.txt +++ b/config/eur/arm9/overlays/ov004/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b9a4c kind:code align:32 .rodata start:0x020b9a4c end:0x020b9e04 kind:rodata align:4 .init start:0x020b9e04 end:0x020b9e30 kind:code align:4 - .ctor start:0x020b9e30 end:0x020b9e38 kind:rodata align:4 + .ctor start:0x020b9e30 end:0x020b9e34 kind:rodata align:4 .data start:0x020b9e40 end:0x020b9f80 kind:data align:32 .bss start:0x020b9f80 end:0x020c2be0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov004/relocs.txt b/config/eur/arm9/overlays/ov004/relocs.txt index 06bbbd17..6d38f145 100644 --- a/config/eur/arm9/overlays/ov004/relocs.txt +++ b/config/eur/arm9/overlays/ov004/relocs.txt @@ -107,7 +107,7 @@ from:0x020b6ffc kind:arm_call to:0x02063f40 module:overlay(0) from:0x020b700c kind:arm_call to:0x0201e6d0 module:main from:0x020b7014 kind:arm_call to:0x02060804 module:overlay(0) from:0x020b7038 kind:load to:0x020b9e84 module:overlay(4) -from:0x020b703c kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020b703c kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020b7074 kind:arm_call to:0x0203d160 module:main from:0x020b707c kind:arm_call to:0x020b7fc0 module:overlay(4) from:0x020b7088 kind:arm_call to:0x02064664 module:overlay(0) @@ -234,7 +234,7 @@ from:0x020b8358 kind:arm_call to:0x0201fd38 module:main from:0x020b8364 kind:arm_call to:0x02063f40 module:overlay(0) from:0x020b8374 kind:arm_call to:0x0201e6d0 module:main from:0x020b837c kind:arm_call to:0x02062b3c module:overlay(0) -from:0x020b83a0 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020b83a0 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020b83b0 kind:arm_call to:0x02062bb0 module:overlay(0) from:0x020b83b8 kind:arm_call to:0x02061f60 module:overlay(0) from:0x020b83c0 kind:arm_call to:0x0201f2cc module:main @@ -320,7 +320,7 @@ from:0x020b8dc8 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020b8dfc kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020b8e54 kind:arm_call to:0x0201e874 module:main from:0x020b8e60 kind:arm_call to:0x020b6558 module:overlay(4) -from:0x020b8e70 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020b8e70 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020b8e74 kind:load to:0x0204a110 module:main from:0x020b8e78 kind:load to:0x020b9e94 module:overlay(4) from:0x020b8e7c kind:load to:0x020b9eac module:overlay(4) diff --git a/config/eur/arm9/overlays/ov005/delinks.txt b/config/eur/arm9/overlays/ov005/delinks.txt index 43e8d585..9159403e 100644 --- a/config/eur/arm9/overlays/ov005/delinks.txt +++ b/config/eur/arm9/overlays/ov005/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b8be8 kind:code align:32 .rodata start:0x020b8be8 end:0x020b8c14 kind:rodata align:4 .init start:0x020b8c14 end:0x020b8c84 kind:code align:4 - .ctor start:0x020b8c84 end:0x020b8c94 kind:rodata align:4 + .ctor start:0x020b8c84 end:0x020b8c90 kind:rodata align:4 .data start:0x020b8ca0 end:0x020b8e00 kind:data align:32 .bss start:0x020b8e00 end:0x020bb660 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov006/delinks.txt b/config/eur/arm9/overlays/ov006/delinks.txt index a2065ab0..70ee9df6 100644 --- a/config/eur/arm9/overlays/ov006/delinks.txt +++ b/config/eur/arm9/overlays/ov006/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b895c kind:code align:32 .rodata start:0x020b895c end:0x020b89ec kind:rodata align:4 .init start:0x020b89ec end:0x020b8a04 kind:code align:4 - .ctor start:0x020b8a04 end:0x020b8a0c kind:rodata align:4 + .ctor start:0x020b8a04 end:0x020b8a08 kind:rodata align:4 .data start:0x020b8a20 end:0x020b8ae0 kind:data align:32 .bss start:0x020b8ae0 end:0x020ba380 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov007/delinks.txt b/config/eur/arm9/overlays/ov007/delinks.txt index db657b4c..06724e5f 100644 --- a/config/eur/arm9/overlays/ov007/delinks.txt +++ b/config/eur/arm9/overlays/ov007/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b6520 end:0x020b8374 kind:code align:32 .init start:0x020b8374 end:0x020b83a0 kind:code align:4 - .ctor start:0x020b83a0 end:0x020b83a8 kind:rodata align:4 + .ctor start:0x020b83a0 end:0x020b83a4 kind:rodata align:4 .data start:0x020b83c0 end:0x020b84e0 kind:data align:32 .bss start:0x020b84e0 end:0x020b97a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov008/delinks.txt b/config/eur/arm9/overlays/ov008/delinks.txt index 47d7183b..84d74327 100644 --- a/config/eur/arm9/overlays/ov008/delinks.txt +++ b/config/eur/arm9/overlays/ov008/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b6520 end:0x020b6a54 kind:code align:32 .init start:0x020b6a54 end:0x020b6ad4 kind:code align:4 - .ctor start:0x020b6ad4 end:0x020b6ae0 kind:rodata align:4 + .ctor start:0x020b6ad4 end:0x020b6adc kind:rodata align:4 .data start:0x020b6ae0 end:0x020b6b40 kind:data align:32 .bss start:0x020b6b40 end:0x020b8b20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov009/delinks.txt b/config/eur/arm9/overlays/ov009/delinks.txt index 6f2d682d..0328e5ba 100644 --- a/config/eur/arm9/overlays/ov009/delinks.txt +++ b/config/eur/arm9/overlays/ov009/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b743c kind:code align:32 .rodata start:0x020b743c end:0x020b749c kind:rodata align:4 .init start:0x020b749c end:0x020b74c0 kind:code align:4 - .ctor start:0x020b74c0 end:0x020b74c8 kind:rodata align:4 + .ctor start:0x020b74c0 end:0x020b74c4 kind:rodata align:4 .data start:0x020b74e0 end:0x020b75a0 kind:data align:32 .bss start:0x020b75a0 end:0x020b8620 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov010/delinks.txt b/config/eur/arm9/overlays/ov010/delinks.txt index 64087ae6..297b5d00 100644 --- a/config/eur/arm9/overlays/ov010/delinks.txt +++ b/config/eur/arm9/overlays/ov010/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b8c4c kind:code align:32 .rodata start:0x020b8c4c end:0x020b8cf8 kind:rodata align:4 .init start:0x020b8cf8 end:0x020b8d28 kind:code align:4 - .ctor start:0x020b8d28 end:0x020b8d30 kind:rodata align:4 + .ctor start:0x020b8d28 end:0x020b8d2c kind:rodata align:4 .data start:0x020b8d40 end:0x020b8e60 kind:data align:32 .bss start:0x020b8e60 end:0x020bab80 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov011/delinks.txt b/config/eur/arm9/overlays/ov011/delinks.txt index 61c91b41..0c09a5e2 100644 --- a/config/eur/arm9/overlays/ov011/delinks.txt +++ b/config/eur/arm9/overlays/ov011/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b9094 kind:code align:32 .rodata start:0x020b9094 end:0x020b9358 kind:rodata align:4 .init start:0x020b9358 end:0x020b938c kind:code align:4 - .ctor start:0x020b938c end:0x020b9394 kind:rodata align:4 + .ctor start:0x020b938c end:0x020b9390 kind:rodata align:4 .data start:0x020b93a0 end:0x020b9560 kind:data align:32 .bss start:0x020b9560 end:0x020ba920 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov012/delinks.txt b/config/eur/arm9/overlays/ov012/delinks.txt index 929667ba..3329597d 100644 --- a/config/eur/arm9/overlays/ov012/delinks.txt +++ b/config/eur/arm9/overlays/ov012/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b8234 kind:code align:32 .rodata start:0x020b8234 end:0x020b82e8 kind:rodata align:4 .init start:0x020b82e8 end:0x020b835c kind:code align:4 - .ctor start:0x020b835c end:0x020b8364 kind:rodata align:4 + .ctor start:0x020b835c end:0x020b8360 kind:rodata align:4 .data start:0x020b8380 end:0x020b84c0 kind:data align:32 .bss start:0x020b84c0 end:0x020b9700 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov013/delinks.txt b/config/eur/arm9/overlays/ov013/delinks.txt index 66ce1d62..3a88b276 100644 --- a/config/eur/arm9/overlays/ov013/delinks.txt +++ b/config/eur/arm9/overlays/ov013/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b6520 end:0x020b6fd0 kind:code align:32 .init start:0x020b6fd0 end:0x020b7004 kind:code align:4 - .ctor start:0x020b7004 end:0x020b700c kind:rodata align:4 + .ctor start:0x020b7004 end:0x020b7008 kind:rodata align:4 .data start:0x020b7020 end:0x020b7080 kind:data align:32 .bss start:0x020b7080 end:0x020b9960 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov014/delinks.txt b/config/eur/arm9/overlays/ov014/delinks.txt index e53cd7cb..0e13bac1 100644 --- a/config/eur/arm9/overlays/ov014/delinks.txt +++ b/config/eur/arm9/overlays/ov014/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b8598 kind:code align:32 .rodata start:0x020b8598 end:0x020b8624 kind:rodata align:4 .init start:0x020b8624 end:0x020b8644 kind:code align:4 - .ctor start:0x020b8644 end:0x020b864c kind:rodata align:4 + .ctor start:0x020b8644 end:0x020b8648 kind:rodata align:4 .data start:0x020b8660 end:0x020b8780 kind:data align:32 .bss start:0x020b8780 end:0x020bad20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov015/delinks.txt b/config/eur/arm9/overlays/ov015/delinks.txt index 06957922..d504b5e3 100644 --- a/config/eur/arm9/overlays/ov015/delinks.txt +++ b/config/eur/arm9/overlays/ov015/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b6520 end:0x020b7410 kind:code align:32 .rodata start:0x020b7410 end:0x020b7424 kind:rodata align:4 - .ctor start:0x020b7424 end:0x020b7428 kind:rodata align:4 + .ctor start:0x020b7424 end:0x020b7424 kind:rodata align:4 .data start:0x020b7440 end:0x020b74a0 kind:data align:32 .bss start:0x020b74a0 end:0x020b8080 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov016/delinks.txt b/config/eur/arm9/overlays/ov016/delinks.txt index 36da7cea..825ca2e0 100644 --- a/config/eur/arm9/overlays/ov016/delinks.txt +++ b/config/eur/arm9/overlays/ov016/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b6520 end:0x020b8198 kind:code align:32 .rodata start:0x020b8198 end:0x020b81d4 kind:rodata align:4 .init start:0x020b81d4 end:0x020b8224 kind:code align:4 - .ctor start:0x020b8224 end:0x020b822c kind:rodata align:4 + .ctor start:0x020b8224 end:0x020b8228 kind:rodata align:4 .data start:0x020b8240 end:0x020b8300 kind:data align:32 .bss start:0x020b8300 end:0x020b86c0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov017/delinks.txt b/config/eur/arm9/overlays/ov017/delinks.txt index ef14b84e..6b60af88 100644 --- a/config/eur/arm9/overlays/ov017/delinks.txt +++ b/config/eur/arm9/overlays/ov017/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020bb660 end:0x020c3dc0 kind:code align:32 .rodata start:0x020c3dc0 end:0x020c3e24 kind:rodata align:4 .init start:0x020c3e24 end:0x020c3ee0 kind:code align:4 - .ctor start:0x020c3ee0 end:0x020c3ef0 kind:rodata align:4 + .ctor start:0x020c3ee0 end:0x020c3eec kind:rodata align:4 .data start:0x020c3f00 end:0x020c3f60 kind:data align:32 .bss start:0x020c3f60 end:0x020c4840 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov018/delinks.txt b/config/eur/arm9/overlays/ov018/delinks.txt index 043c31c7..5cd6c0df 100644 --- a/config/eur/arm9/overlays/ov018/delinks.txt +++ b/config/eur/arm9/overlays/ov018/delinks.txt @@ -1,5 +1,5 @@ .text start:0x020c4840 end:0x020c5b18 kind:code align:32 - .ctor start:0x020c5b18 end:0x020c5b1c kind:rodata align:4 + .ctor start:0x020c5b18 end:0x020c5b18 kind:rodata align:4 .data start:0x020c5b20 end:0x020c5bc0 kind:data align:32 .bss start:0x020c5bc0 end:0x020c5c20 kind:bss align:32 diff --git a/config/eur/arm9/overlays/ov018/relocs.txt b/config/eur/arm9/overlays/ov018/relocs.txt index 341f4a38..23d69ea1 100644 --- a/config/eur/arm9/overlays/ov018/relocs.txt +++ b/config/eur/arm9/overlays/ov018/relocs.txt @@ -42,7 +42,7 @@ from:0x020c4b18 kind:arm_call_thumb to:0x0202e820 module:main from:0x020c4b1c kind:arm_call to:0x020271b0 module:main from:0x020c4b38 kind:arm_call to:0x0202e864 module:main from:0x020c4b48 kind:arm_call to:0x0202e8f8 module:main -from:0x020c4b80 kind:load to:0x020443d0 add:8 module:main +from:0x020c4b80 kind:load to:0x020443d0 add:0x8 module:main from:0x020c4b8c kind:arm_call to:0x020c4b58 module:overlay(18) from:0x020c4b94 kind:arm_call to:0x02013b10 module:main from:0x020c4bc4 kind:arm_call to:0x020c4c1c module:overlay(18) @@ -73,7 +73,7 @@ from:0x020c4d44 kind:arm_call_thumb to:0x0201568c module:main from:0x020c4d4c kind:arm_call_thumb to:0x020154c4 module:main from:0x020c4d60 kind:arm_call to:0x0201bba4 module:main from:0x020c4d6c kind:arm_call to:0x0201b9a8 module:main -from:0x020c4d7c kind:load to:0x020c5b20 add:8 module:overlay(18) +from:0x020c4d7c kind:load to:0x020c5b20 add:0x8 module:overlay(18) from:0x020c4d80 kind:load to:0x0204a110 module:main from:0x020c4d84 kind:load to:0x020c5bc0 module:overlay(18) from:0x020c4d88 kind:load to:0x020c5b50 module:overlay(18) @@ -98,7 +98,7 @@ from:0x020c4eb0 kind:load to:0x02049be4 module:main from:0x020c4eb4 kind:load to:0x0204999c module:main from:0x020c4eb8 kind:load to:0x02049984 module:main from:0x020c4ec0 kind:thumb_call_arm to:0x0201baec module:main -from:0x020c4ed0 kind:load to:0x02044040 add:8 module:main +from:0x020c4ed0 kind:load to:0x02044040 add:0x8 module:main from:0x020c4eec kind:arm_call to:0x02028c4c module:main from:0x020c4f14 kind:arm_call to:0x0203d160 module:main from:0x020c4f30 kind:arm_call to:0x0206667c module:overlay(0) @@ -145,9 +145,9 @@ from:0x020c53cc kind:arm_call to:0x0201af10 module:main from:0x020c53e0 kind:arm_call to:0x0201a800 module:main from:0x020c53f8 kind:arm_call to:0x0201ba68 module:main from:0x020c5408 kind:arm_call to:0x0201667c module:main -from:0x020c5480 kind:load to:0x020440e0 add:8 module:main +from:0x020c5480 kind:load to:0x020440e0 add:0x8 module:main from:0x020c54b0 kind:arm_call to:0x02028c18 module:main -from:0x020c55a0 kind:load to:0x020442ac add:8 module:main +from:0x020c55a0 kind:load to:0x020442ac add:0x8 module:main from:0x020c55d4 kind:arm_call to:0x02011f3c module:main from:0x020c55e0 kind:arm_call to:0x0201e6d0 module:main from:0x020c55f4 kind:arm_call to:0x02011f3c module:main diff --git a/config/eur/arm9/overlays/ov019/delinks.txt b/config/eur/arm9/overlays/ov019/delinks.txt index fa5c119f..62746f43 100644 --- a/config/eur/arm9/overlays/ov019/delinks.txt +++ b/config/eur/arm9/overlays/ov019/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020c4840 end:0x020d1bb0 kind:code align:32 .rodata start:0x020d1bb0 end:0x020d1bfc kind:rodata align:4 .init start:0x020d1bfc end:0x020d1d64 kind:code align:4 - .ctor start:0x020d1d64 end:0x020d1d7c kind:rodata align:4 + .ctor start:0x020d1d64 end:0x020d1d78 kind:rodata align:4 .data start:0x020d1d80 end:0x020d24c0 kind:data align:32 .bss start:0x020d24c0 end:0x021170e0 kind:bss align:32 @@ -13,8 +13,8 @@ src/019_MainSelect/GameModeFileSelect.cpp: src/019_MainSelect/FileSelectManager.cpp: .text start:0x020c4b7c end:0x020c5200 - .init start:0x020d1c14 end:0x020d1c2c .rodata start:0x020d1bb0 end:0x020d1bbc + .init start:0x020d1c14 end:0x020d1c2c .ctor start:0x020d1d68 end:0x020d1d6c .data start:0x020d1db4 end:0x020d1df8 @@ -25,8 +25,8 @@ src/019_MainSelect/019_UnkSystem1_ov019_Derived1.cpp: src/019_MainSelect/FileSelectMain.cpp: .text start:0x020c5630 end:0x020cb768 - .init start:0x020d1c2c end:0x020d1cd4 .rodata start:0x020d1bbc end:0x020d1bcc + .init start:0x020d1c2c end:0x020d1cd4 .ctor start:0x020d1d6c end:0x020d1d70 .data start:0x020d1e4c end:0x020d215c .bss start:0x020d24c0 end:0x020d24c8 @@ -43,7 +43,7 @@ src/019_MainSelect/FileSelectOptions.cpp: src/019_MainSelect/FileSelectMicTest.cpp: .text start:0x020ce820 end:0x020cf28c .init start:0x020d1d3c end:0x020d1d64 - .ctor start:0x020d1d74 end:0x020d1d7c + .ctor start:0x020d1d74 end:0x020d1d78 .data start:0x020d2248 end:0x020d22a0 src/019_MainSelect/FileSelectSubScreen.cpp: diff --git a/config/eur/arm9/overlays/ov019/relocs.txt b/config/eur/arm9/overlays/ov019/relocs.txt index 1d2f8d9c..231d594b 100644 --- a/config/eur/arm9/overlays/ov019/relocs.txt +++ b/config/eur/arm9/overlays/ov019/relocs.txt @@ -6,7 +6,7 @@ from:0x020c4898 kind:arm_call to:0x02014cdc module:main from:0x020c48b8 kind:arm_call to:0x02013370 module:main from:0x020c48cc kind:arm_call_thumb to:0x020be668 module:overlay(1) from:0x020c48e4 kind:arm_call_thumb to:0x020bd514 module:overlay(1) -from:0x020c48f0 kind:load to:0x020d1d84 add:8 module:overlay(19) +from:0x020c48f0 kind:load to:0x020d1d84 add:0x8 module:overlay(19) from:0x020c48f4 kind:load to:0x02049bd4 module:main from:0x020c48fc kind:load to:0x02049a2c module:main from:0x020c4904 kind:load to:0x0204999c module:main @@ -22,7 +22,7 @@ from:0x020c496c kind:arm_call to:0x0206d0bc module:overlay(0) from:0x020c4974 kind:arm_call_thumb to:0x020bd8dc module:overlay(1) from:0x020c497c kind:arm_call to:0x02067344 module:overlay(0) from:0x020c4984 kind:arm_call to:0x0201834c module:main -from:0x020c4990 kind:load to:0x020d1d84 add:8 module:overlay(19) +from:0x020c4990 kind:load to:0x020d1d84 add:0x8 module:overlay(19) from:0x020c4994 kind:load to:0x0204a088 module:main from:0x020c4998 kind:load to:0x020b62a8 module:overlay(0) from:0x020c499c kind:load to:0x020b504c module:overlay(0) @@ -38,7 +38,7 @@ from:0x020c49f8 kind:arm_call_thumb to:0x020bd8dc module:overlay(1) from:0x020c4a00 kind:arm_call to:0x02067344 module:overlay(0) from:0x020c4a08 kind:arm_call to:0x0201834c module:main from:0x020c4a10 kind:arm_call to:0x02011ff4 module:main -from:0x020c4a1c kind:load to:0x020d1d84 add:8 module:overlay(19) +from:0x020c4a1c kind:load to:0x020d1d84 add:0x8 module:overlay(19) from:0x020c4a20 kind:load to:0x0204a088 module:main from:0x020c4a24 kind:load to:0x020b62a8 module:overlay(0) from:0x020c4a28 kind:load to:0x020b504c module:overlay(0) @@ -71,21 +71,21 @@ from:0x020c4bb0 kind:arm_call_thumb to:0x02018498 module:main from:0x020c4bdc kind:arm_call to:0x020d031c module:overlay(19) from:0x020c4c1c kind:arm_call_thumb to:0x020bd734 module:overlay(1) from:0x020c4c20 kind:arm_call_thumb to:0x020bd6a8 module:overlay(1) -from:0x020c4c2c kind:load to:0x020d1db8 add:8 module:overlay(19) +from:0x020c4c2c kind:load to:0x020d1db8 add:0x8 module:overlay(19) from:0x020c4c34 kind:load to:0x020d1bb0 module:overlay(19) from:0x020c4c40 kind:arm_call to:0x02067344 module:overlay(0) from:0x020c4c5c kind:arm_call to:0x020c51a8 module:overlay(19) from:0x020c4c70 kind:arm_call_thumb to:0x020bd784 module:overlay(1) from:0x020c4cf8 kind:arm_call to:0x02067344 module:overlay(0) from:0x020c4d00 kind:arm_call_thumb to:0x020185a8 module:main -from:0x020c4d0c kind:load to:0x020d1db8 add:8 module:overlay(19) +from:0x020c4d0c kind:load to:0x020d1db8 add:0x8 module:overlay(19) from:0x020c4d10 kind:load to:0x0204a110 module:main from:0x020c4d24 kind:arm_call to:0x020c51a8 module:overlay(19) from:0x020c4d38 kind:arm_call_thumb to:0x020bd784 module:overlay(1) from:0x020c4dc0 kind:arm_call to:0x02067344 module:overlay(0) from:0x020c4dc8 kind:arm_call_thumb to:0x020185a8 module:main from:0x020c4dd0 kind:arm_call to:0x02011ff4 module:main -from:0x020c4ddc kind:load to:0x020d1db8 add:8 module:overlay(19) +from:0x020c4ddc kind:load to:0x020d1db8 add:0x8 module:overlay(19) from:0x020c4de0 kind:load to:0x0204a110 module:main from:0x020c4df8 kind:arm_call_thumb to:0x0201568c module:main from:0x020c4e00 kind:arm_call_thumb to:0x0201568c module:main @@ -151,7 +151,7 @@ from:0x020c51e4 kind:load to:0x0204a088 module:main from:0x020c51e8 kind:load to:0x02061690 module:overlay(0) from:0x020c51fc kind:load to:0x0204a088 module:main from:0x020c5214 kind:arm_call to:0x02067244 module:overlay(0) -from:0x020c5238 kind:load to:0x020d1df8 add:8 module:overlay(19) +from:0x020c5238 kind:load to:0x020d1df8 add:0x8 module:overlay(19) from:0x020c5270 kind:arm_call to:0x02067cf8 module:overlay(0) from:0x020c5280 kind:load to:0x020b504c module:overlay(0) from:0x020c52b0 kind:arm_call to:0x020c5590 module:overlay(19) @@ -268,8 +268,8 @@ from:0x020c5f6c kind:arm_call to:0x020249d4 module:main from:0x020c5f78 kind:arm_call to:0x020166cc module:main from:0x020c5f80 kind:arm_call to:0x020c63dc module:overlay(19) from:0x020c5f88 kind:arm_call to:0x020c6d10 module:overlay(19) -from:0x020c5f98 kind:load to:0x020d1eb8 add:8 module:overlay(19) -from:0x020c5fa0 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020c5f98 kind:load to:0x020d1eb8 add:0x8 module:overlay(19) +from:0x020c5fa0 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020c5fa8 kind:load to:0x020d1bbc module:overlay(19) from:0x020c5fac kind:load to:0x020d1e4c module:overlay(19) from:0x020c5fb0 kind:load to:0x020d24c0 module:overlay(19) @@ -321,7 +321,7 @@ from:0x020c61b4 kind:arm_call to:0x0201f2cc module:main from:0x020c61bc kind:arm_call to:0x02062be0 module:overlay(0) from:0x020c61c4 kind:arm_call to:0x02062be0 module:overlay(0) from:0x020c61cc kind:arm_call to:0x02061c5c module:overlay(0) -from:0x020c61d8 kind:load to:0x020d1eb8 add:8 module:overlay(19) +from:0x020c61d8 kind:load to:0x020d1eb8 add:0x8 module:overlay(19) from:0x020c6204 kind:arm_call to:0x02061f60 module:overlay(0) from:0x020c620c kind:arm_call to:0x0201f2cc module:main from:0x020c6214 kind:arm_call to:0x02062be0 module:overlay(0) @@ -363,7 +363,7 @@ from:0x020c63b4 kind:arm_call to:0x02062be0 module:overlay(0) from:0x020c63bc kind:arm_call to:0x02062be0 module:overlay(0) from:0x020c63c4 kind:arm_call to:0x02061c5c module:overlay(0) from:0x020c63cc kind:arm_call to:0x02011ff4 module:main -from:0x020c63d8 kind:load to:0x020d1eb8 add:8 module:overlay(19) +from:0x020c63d8 kind:load to:0x020d1eb8 add:0x8 module:overlay(19) from:0x020c63f4 kind:arm_call to:0x02062e44 module:overlay(0) from:0x020c641c kind:arm_call to:0x02062e44 module:overlay(0) from:0x020c645c kind:arm_call to:0x0201e754 module:main @@ -718,7 +718,7 @@ from:0x020cba2c kind:arm_call to:0x020633c0 module:overlay(0) from:0x020cba50 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020cba7c kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020cbac8 kind:arm_call to:0x020166cc module:main -from:0x020cbae8 kind:load to:0x020d1e4c add:6 module:overlay(19) +from:0x020cbae8 kind:load to:0x020d1e4c add:0x6 module:overlay(19) from:0x020cbafc kind:arm_call to:0x0201f730 module:main from:0x020cbb04 kind:arm_call to:0x020cbb40 module:overlay(19) from:0x020cbb3c kind:load to:0x020b62a8 module:overlay(0) @@ -763,7 +763,7 @@ from:0x020cc500 kind:arm_call to:0x02062e44 module:overlay(0) from:0x020cc594 kind:arm_call to:0x0201aad0 module:main from:0x020cc5a0 kind:load to:0x020b62a8 module:overlay(0) from:0x020cc5a4 kind:load to:0x0204af1c module:main -from:0x020cc5a8 kind:load to:0x020d1e94 add:4 module:overlay(19) +from:0x020cc5a8 kind:load to:0x020d1e94 add:0x4 module:overlay(19) from:0x020cc5d8 kind:arm_call to:0x02011f3c module:main from:0x020cc5ec kind:arm_call to:0x020cc5f4 module:overlay(19) from:0x020cc604 kind:arm_call to:0x020ce820 module:overlay(19) @@ -773,14 +773,14 @@ from:0x020cc640 kind:arm_call to:0x020ce844 module:overlay(19) from:0x020cc654 kind:arm_call to:0x02011f3c module:main from:0x020cc664 kind:arm_call to:0x020cc880 module:overlay(19) from:0x020cc684 kind:arm_call to:0x020166cc module:main -from:0x020cc6a0 kind:load to:0x020d221c add:8 module:overlay(19) +from:0x020cc6a0 kind:load to:0x020d221c add:0x8 module:overlay(19) from:0x020cc700 kind:arm_call to:0x02061c5c module:overlay(0) from:0x020cc708 kind:arm_call to:0x020ce830 module:overlay(19) -from:0x020cc714 kind:load to:0x020d221c add:8 module:overlay(19) +from:0x020cc714 kind:load to:0x020d221c add:0x8 module:overlay(19) from:0x020cc76c kind:arm_call to:0x02061c5c module:overlay(0) from:0x020cc774 kind:arm_call to:0x020ce830 module:overlay(19) from:0x020cc77c kind:arm_call to:0x02011ff4 module:main -from:0x020cc788 kind:load to:0x020d221c add:8 module:overlay(19) +from:0x020cc788 kind:load to:0x020d221c add:0x8 module:overlay(19) from:0x020cc7e0 kind:arm_call to:0x020166cc module:main from:0x020cc7f8 kind:arm_call to:0x020cde9c module:overlay(19) from:0x020cc804 kind:arm_call to:0x020166ac module:main @@ -814,8 +814,8 @@ from:0x020ccad4 kind:arm_call to:0x020623d8 module:overlay(0) from:0x020ccae4 kind:arm_call to:0x020623d8 module:overlay(0) from:0x020ccaf4 kind:arm_call to:0x020623d8 module:overlay(0) from:0x020ccafc kind:arm_call to:0x020ccd40 module:overlay(19) -from:0x020ccb0c kind:load to:0x020d21f8 add:8 module:overlay(19) -from:0x020ccb14 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020ccb0c kind:load to:0x020d21f8 add:0x8 module:overlay(19) +from:0x020ccb14 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020ccb30 kind:arm_call to:0x0201f498 module:main from:0x020ccb3c kind:arm_call to:0x0201f498 module:main from:0x020ccb48 kind:arm_call to:0x0201f498 module:main @@ -837,7 +837,7 @@ from:0x020ccbfc kind:arm_call to:0x0201f2cc module:main from:0x020ccc08 kind:arm_call to:0x02062be0 module:overlay(0) from:0x020ccc10 kind:arm_call to:0x020ce314 module:overlay(19) from:0x020ccc18 kind:arm_call to:0x02061c5c module:overlay(0) -from:0x020ccc24 kind:load to:0x020d21f8 add:8 module:overlay(19) +from:0x020ccc24 kind:load to:0x020d21f8 add:0x8 module:overlay(19) from:0x020ccc40 kind:arm_call to:0x0201f498 module:main from:0x020ccc4c kind:arm_call to:0x0201f498 module:main from:0x020ccc58 kind:arm_call to:0x0201f498 module:main @@ -860,7 +860,7 @@ from:0x020ccd18 kind:arm_call to:0x02062be0 module:overlay(0) from:0x020ccd20 kind:arm_call to:0x020ce314 module:overlay(19) from:0x020ccd28 kind:arm_call to:0x02061c5c module:overlay(0) from:0x020ccd30 kind:arm_call to:0x02011ff4 module:main -from:0x020ccd3c kind:load to:0x020d21f8 add:8 module:overlay(19) +from:0x020ccd3c kind:load to:0x020d21f8 add:0x8 module:overlay(19) from:0x020ccd74 kind:load to:0x020d21c0 module:overlay(19) from:0x020ccdac kind:load to:0x020d2188 module:overlay(19) from:0x020ccdbc kind:arm_call to:0x020ce4dc module:overlay(19) @@ -1071,8 +1071,8 @@ from:0x020ce924 kind:arm_call to:0x0201f730 module:main from:0x020ce934 kind:arm_call to:0x0201f730 module:main from:0x020ce944 kind:arm_call to:0x02062e44 module:overlay(0) from:0x020ce984 kind:arm_call to:0x020cea74 module:overlay(19) -from:0x020ce994 kind:load to:0x020d227c add:8 module:overlay(19) -from:0x020ce998 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020ce994 kind:load to:0x020d227c add:0x8 module:overlay(19) +from:0x020ce998 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020ce9a0 kind:load to:0x020d2248 module:overlay(19) from:0x020ce9b8 kind:arm_call to:0x0201f498 module:main from:0x020ce9c0 kind:arm_call to:0x0201f498 module:main @@ -1082,7 +1082,7 @@ from:0x020ce9dc kind:arm_call to:0x02062be0 module:overlay(0) from:0x020ce9e4 kind:arm_call to:0x02061f60 module:overlay(0) from:0x020ce9ec kind:arm_call to:0x0201f2cc module:main from:0x020ce9f4 kind:arm_call to:0x02061c5c module:overlay(0) -from:0x020cea00 kind:load to:0x020d227c add:8 module:overlay(19) +from:0x020cea00 kind:load to:0x020d227c add:0x8 module:overlay(19) from:0x020cea18 kind:arm_call to:0x0201f498 module:main from:0x020cea20 kind:arm_call to:0x0201f498 module:main from:0x020cea2c kind:arm_call to:0x02061f60 module:overlay(0) @@ -1092,7 +1092,7 @@ from:0x020cea44 kind:arm_call to:0x02061f60 module:overlay(0) from:0x020cea4c kind:arm_call to:0x0201f2cc module:main from:0x020cea54 kind:arm_call to:0x02061c5c module:overlay(0) from:0x020cea5c kind:arm_call to:0x02011ff4 module:main -from:0x020cea68 kind:load to:0x020d227c add:8 module:overlay(19) +from:0x020cea68 kind:load to:0x020d227c add:0x8 module:overlay(19) from:0x020ceaa8 kind:load to:0x020d225c module:overlay(19) from:0x020ceaec kind:arm_call to:0x0201e874 module:main from:0x020ceb44 kind:arm_call to:0x0205fc20 module:overlay(0) @@ -1182,7 +1182,7 @@ from:0x020cf544 kind:arm_call_thumb to:0x0201568c module:main from:0x020cf54c kind:arm_call_thumb to:0x020154c4 module:main from:0x020cf55c kind:arm_call to:0x020cf73c module:overlay(19) from:0x020cf56c kind:arm_call to:0x020cf73c module:overlay(19) -from:0x020cf57c kind:load to:0x020d22b0 add:8 module:overlay(19) +from:0x020cf57c kind:load to:0x020d22b0 add:0x8 module:overlay(19) from:0x020cf580 kind:load to:0x020d22d4 module:overlay(19) from:0x020cf584 kind:load to:0x020d22ec module:overlay(19) from:0x020cf588 kind:load to:0x020d2304 module:overlay(19) @@ -1218,7 +1218,7 @@ from:0x020cf890 kind:arm_call to:0x02060804 module:overlay(0) from:0x020cf918 kind:arm_call to:0x0206082c module:overlay(0) from:0x020cf920 kind:arm_call to:0x02060c28 module:overlay(0) from:0x020cf958 kind:arm_call to:0x02060bd8 module:overlay(0) -from:0x020cf9f0 kind:load to:0x020d22a0 add:8 module:overlay(19) +from:0x020cf9f0 kind:load to:0x020d22a0 add:0x8 module:overlay(19) from:0x020cf9f4 kind:load to:0x02049be4 module:main from:0x020cf9f8 kind:load to:0x020d1bcc module:overlay(19) from:0x020cfa24 kind:arm_call to:0x020609c4 module:overlay(0) @@ -1250,7 +1250,7 @@ from:0x020cfc00 kind:arm_call_thumb to:0x0201547c module:main from:0x020cfc08 kind:arm_call to:0x02061c5c module:overlay(0) from:0x020cfc24 kind:arm_call to:0x02061648 module:overlay(0) from:0x020cfc54 kind:arm_call to:0x020611dc module:overlay(0) -from:0x020cfc60 kind:load to:0x020d23d8 add:8 module:overlay(19) +from:0x020cfc60 kind:load to:0x020d23d8 add:0x8 module:overlay(19) from:0x020cfc64 kind:load to:0x0204a088 module:main from:0x020cfc70 kind:arm_call to:0x020616c8 module:overlay(0) from:0x020cfc84 kind:arm_call to:0x020616c8 module:overlay(0) @@ -1290,16 +1290,16 @@ from:0x020cff20 kind:arm_call to:0x0201967c module:main from:0x020cff2c kind:load to:0x0204a110 module:main from:0x020cff40 kind:arm_call to:0x02061648 module:overlay(0) from:0x020cff68 kind:arm_call to:0x020611dc module:overlay(0) -from:0x020cff74 kind:load to:0x020d2408 add:8 module:overlay(19) +from:0x020cff74 kind:load to:0x020d2408 add:0x8 module:overlay(19) from:0x020cff78 kind:load to:0x0204a088 module:main from:0x020cff9c kind:arm_call to:0x020d02f4 module:overlay(19) from:0x020cffa4 kind:arm_call to:0x020616c8 module:overlay(0) -from:0x020cffb0 kind:load to:0x020d2408 add:8 module:overlay(19) +from:0x020cffb0 kind:load to:0x020d2408 add:0x8 module:overlay(19) from:0x020cffb4 kind:load to:0x020d24c8 module:overlay(19) from:0x020cffd8 kind:arm_call to:0x020d02f4 module:overlay(19) from:0x020cffe0 kind:arm_call to:0x020616c8 module:overlay(0) from:0x020cffe8 kind:arm_call to:0x02011ff4 module:main -from:0x020cfff4 kind:load to:0x020d2408 add:8 module:overlay(19) +from:0x020cfff4 kind:load to:0x020d2408 add:0x8 module:overlay(19) from:0x020cfff8 kind:load to:0x020d24c8 module:overlay(19) from:0x020d001c kind:arm_call to:0x020cb6e8 module:overlay(19) from:0x020d003c kind:arm_call to:0x0201967c module:main @@ -1345,7 +1345,7 @@ from:0x020d02ec kind:load to:0x0204a110 module:main from:0x020d02f0 kind:load to:0x020b50c0 module:overlay(0) from:0x020d0318 kind:load to:0x020d24c8 module:overlay(19) from:0x020d0330 kind:arm_call to:0x02067244 module:overlay(0) -from:0x020d0358 kind:load to:0x020d2438 add:8 module:overlay(19) +from:0x020d0358 kind:load to:0x020d2438 add:0x8 module:overlay(19) from:0x020d0390 kind:arm_call to:0x02067cf8 module:overlay(0) from:0x020d03a0 kind:load to:0x020b504c module:overlay(0) from:0x020d0424 kind:arm_call to:0x02067cf8 module:overlay(0) @@ -1370,7 +1370,7 @@ from:0x020d0590 kind:load to:0x020b5214 module:overlay(0) from:0x020d059c kind:arm_call to:0x02067344 module:overlay(0) from:0x020d05a4 kind:arm_call to:0x02011ff4 module:main from:0x020d05c4 kind:arm_call to:0x02067244 module:overlay(0) -from:0x020d05f8 kind:load to:0x020d246c add:8 module:overlay(19) +from:0x020d05f8 kind:load to:0x020d246c add:0x8 module:overlay(19) from:0x020d060c kind:load to:0x020667f4 module:overlay(0) from:0x020d0644 kind:arm_call to:0x02067cf8 module:overlay(0) from:0x020d0654 kind:load to:0x020b504c module:overlay(0) @@ -1465,17 +1465,17 @@ from:0x020d11c0 kind:arm_call to:0x020a12a0 module:overlay(0) from:0x020d11d0 kind:arm_call to:0x020328c8 module:main from:0x020d11ec kind:arm_call to:0x02028cdc module:main from:0x020d1234 kind:arm_call_thumb to:0x020a0a90 module:overlay(0) -from:0x020d1270 kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d1270 kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d132c kind:arm_call to:0x020a10f4 module:overlay(0) from:0x020d133c kind:arm_call to:0x020328c8 module:main from:0x020d1358 kind:arm_call to:0x02028cdc module:main from:0x020d1370 kind:arm_call_thumb to:0x020a0a90 module:overlay(0) -from:0x020d13b0 kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d13b0 kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d13d4 kind:arm_call to:0x020d1400 module:overlay(19) from:0x020d13f8 kind:arm_call_thumb to:0x020a0a90 module:overlay(0) from:0x020d1414 kind:arm_call to:0x020328c8 module:main from:0x020d1428 kind:arm_call to:0x02028cdc module:main -from:0x020d1430 kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d1430 kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d1454 kind:arm_call to:0x020d14fc module:overlay(19) from:0x020d146c kind:arm_call_thumb to:0x020a0a90 module:overlay(0) from:0x020d1488 kind:arm_call to:0x020d14c0 module:overlay(19) @@ -1483,10 +1483,10 @@ from:0x020d14a4 kind:arm_call_thumb to:0x020a0a90 module:overlay(0) from:0x020d14b4 kind:arm_call to:0x020d13b8 module:overlay(19) from:0x020d14d4 kind:arm_call to:0x020328c8 module:main from:0x020d14ec kind:arm_call to:0x02028cdc module:main -from:0x020d14f4 kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d14f4 kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d1510 kind:arm_call to:0x020328c8 module:main from:0x020d1528 kind:arm_call to:0x02028cdc module:main -from:0x020d1530 kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d1530 kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d155c kind:arm_call to:0x020d1600 module:overlay(19) from:0x020d1578 kind:arm_call_thumb to:0x020a0a90 module:overlay(0) from:0x020d1594 kind:arm_call to:0x020d15cc module:overlay(19) @@ -1494,10 +1494,10 @@ from:0x020d15b0 kind:arm_call_thumb to:0x020a0a90 module:overlay(0) from:0x020d15c0 kind:arm_call to:0x020d1434 module:overlay(19) from:0x020d15e0 kind:arm_call to:0x020328c8 module:main from:0x020d15f4 kind:arm_call to:0x02028cdc module:main -from:0x020d15fc kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d15fc kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d1614 kind:arm_call to:0x020328c8 module:main from:0x020d1628 kind:arm_call to:0x02028cdc module:main -from:0x020d1630 kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d1630 kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d16b8 kind:arm_call to:0x020312b8 module:main from:0x020d170c kind:arm_call to:0x02028cdc module:main from:0x020d1720 kind:arm_call to:0x02028cdc module:main @@ -1517,7 +1517,7 @@ from:0x020d1948 kind:arm_call to:0x020328c8 module:main from:0x020d1984 kind:arm_call to:0x020328c8 module:main from:0x020d1a34 kind:arm_call to:0x02028cdc module:main from:0x020d1a84 kind:arm_call to:0x02028cdc module:main -from:0x020d1a9c kind:load to:0x020b62a8 add:4 module:overlay(0) +from:0x020d1a9c kind:load to:0x020b62a8 add:0x4 module:overlay(0) from:0x020d1aa4 kind:load to:0x020d1bd4 module:overlay(19) from:0x020d1aa8 kind:load to:0x020d1be8 module:overlay(19) from:0x020d1ad4 kind:arm_call to:0x02036198 module:main diff --git a/config/eur/arm9/overlays/ov020/delinks.txt b/config/eur/arm9/overlays/ov020/delinks.txt index 010f9605..c5918fc6 100644 --- a/config/eur/arm9/overlays/ov020/delinks.txt +++ b/config/eur/arm9/overlays/ov020/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020c4840 end:0x020dad10 kind:code align:32 .rodata start:0x020dad10 end:0x020daeb0 kind:rodata align:4 .init start:0x020daeb0 end:0x020db00c kind:code align:4 - .ctor start:0x020db00c end:0x020db024 kind:rodata align:4 + .ctor start:0x020db00c end:0x020db020 kind:rodata align:4 .data start:0x020db040 end:0x020dbe80 kind:data align:32 .bss start:0x020dbe80 end:0x020e9a40 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov020/relocs.txt b/config/eur/arm9/overlays/ov020/relocs.txt index 4f2a23c6..8333560a 100644 --- a/config/eur/arm9/overlays/ov020/relocs.txt +++ b/config/eur/arm9/overlays/ov020/relocs.txt @@ -884,7 +884,7 @@ from:0x020ca5e4 kind:arm_call to:0x020cde10 module:overlay(20) from:0x020ca600 kind:load to:0x020dbca0 module:overlay(20) from:0x020ca604 kind:load to:0x020ca638 module:overlay(20) from:0x020ca608 kind:load to:0x020cddb4 module:overlay(20) -from:0x020ca60c kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020ca60c kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020ca610 kind:load to:0x020b1f2c module:overlay(0) from:0x020ca618 kind:load to:0x020431b8 module:main from:0x020ca61c kind:load to:0x020e8b20 module:overlay(20) @@ -1443,7 +1443,7 @@ from:0x020cddbc kind:arm_call to:0x02063338 module:overlay(0) from:0x020cddd4 kind:arm_call to:0x02063f40 module:overlay(0) from:0x020cdde4 kind:arm_call to:0x0201e6d0 module:main from:0x020cde08 kind:load to:0x020dbc88 module:overlay(20) -from:0x020cde0c kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020cde0c kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020cde64 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020cde88 kind:arm_call to:0x02064018 module:overlay(0) from:0x020cde9c kind:arm_call to:0x02064034 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov021/delinks.txt b/config/eur/arm9/overlays/ov021/delinks.txt index 0a143fff..9ac4ce0d 100644 --- a/config/eur/arm9/overlays/ov021/delinks.txt +++ b/config/eur/arm9/overlays/ov021/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020e9a40 end:0x02106c34 kind:code align:32 .rodata start:0x02106c34 end:0x02107938 kind:rodata align:4 .init start:0x02107938 end:0x02107e4c kind:code align:4 - .ctor start:0x02107e4c end:0x02107e88 kind:rodata align:4 + .ctor start:0x02107e4c end:0x02107e84 kind:rodata align:4 .data start:0x02107ea0 end:0x02109080 kind:data align:32 .bss start:0x02109080 end:0x02109ba0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov021/relocs.txt b/config/eur/arm9/overlays/ov021/relocs.txt index 6a4f0151..a6ab8cf8 100644 --- a/config/eur/arm9/overlays/ov021/relocs.txt +++ b/config/eur/arm9/overlays/ov021/relocs.txt @@ -2633,7 +2633,7 @@ from:0x02100d54 kind:arm_call to:0x0201f730 module:main from:0x02100d68 kind:arm_call to:0x0201f730 module:main from:0x02100dcc kind:arm_call to:0x020249d4 module:main from:0x02100ddc kind:load to:0x02108df0 module:overlay(21) -from:0x02100de0 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x02100de0 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x02100de4 kind:load to:0x02100e24 module:overlay(21) from:0x02100de8 kind:load to:0x0206337c module:overlay(0) from:0x02100dec kind:load to:0x020b1f2c module:overlay(0) @@ -2833,7 +2833,7 @@ from:0x02102948 kind:load to:0x02108e7c module:overlay(21) from:0x0210294c kind:load to:0x0210299c module:overlay(21) from:0x02102950 kind:load to:0x02101e3c module:overlay(21) from:0x02102954 kind:load to:0x020b1f2c module:overlay(0) -from:0x02102958 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x02102958 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x02102960 kind:load to:0x021098f8 module:overlay(21) from:0x02102964 kind:load to:0x020c3f70 module:overlays(1,17) from:0x02102968 kind:load to:0x02101d20 module:overlay(21) diff --git a/config/eur/arm9/overlays/ov022/delinks.txt b/config/eur/arm9/overlays/ov022/delinks.txt index 5f32543e..58f2f451 100644 --- a/config/eur/arm9/overlays/ov022/delinks.txt +++ b/config/eur/arm9/overlays/ov022/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020e9a40 end:0x020ee034 kind:code align:32 .rodata start:0x020ee034 end:0x020ee100 kind:rodata align:4 .init start:0x020ee100 end:0x020ee130 kind:code align:4 - .ctor start:0x020ee130 end:0x020ee13c kind:rodata align:4 + .ctor start:0x020ee130 end:0x020ee138 kind:rodata align:4 .data start:0x020ee140 end:0x020ee3a0 kind:data align:32 .bss start:0x020ee3a0 end:0x020f94e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov022/relocs.txt b/config/eur/arm9/overlays/ov022/relocs.txt index 67768755..9e73a3a8 100644 --- a/config/eur/arm9/overlays/ov022/relocs.txt +++ b/config/eur/arm9/overlays/ov022/relocs.txt @@ -316,7 +316,7 @@ from:0x020eb5e4 kind:load to:0x020ec51c module:overlay(22) from:0x020eb5e8 kind:load to:0x020eb628 module:overlay(22) from:0x020eb5ec kind:load to:0x020eb600 module:overlay(22) from:0x020eb5f0 kind:load to:0x020ee210 module:overlay(22) -from:0x020eb5f4 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020eb5f4 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020eb5fc kind:load to:0x020ee0d4 module:overlay(22) from:0x020eb608 kind:arm_call to:0x02062ac8 module:overlay(0) from:0x020eb618 kind:arm_call to:0x02060804 module:overlay(0) @@ -516,7 +516,7 @@ from:0x020ec620 kind:arm_call to:0x0201fe54 module:main from:0x020ec69c kind:arm_call to:0x02062c90 module:overlay(0) from:0x020ec6e8 kind:arm_call to:0x020ecd4c module:overlay(22) from:0x020ec744 kind:load to:0x020ee240 module:overlay(22) -from:0x020ec748 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020ec748 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020ec74c kind:load to:0x020ee228 module:overlay(22) from:0x020ec750 kind:load to:0x020ee2ec module:overlay(22) from:0x020ec754 kind:load to:0x020ee3a8 module:overlay(22) diff --git a/config/eur/arm9/overlays/ov023/delinks.txt b/config/eur/arm9/overlays/ov023/delinks.txt index 5a0b2b92..bdc991ba 100644 --- a/config/eur/arm9/overlays/ov023/delinks.txt +++ b/config/eur/arm9/overlays/ov023/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020e9a40 end:0x020f1854 kind:code align:32 .rodata start:0x020f1854 end:0x020f192c kind:rodata align:4 .init start:0x020f192c end:0x020f19ac kind:code align:4 - .ctor start:0x020f19ac end:0x020f19c0 kind:rodata align:4 + .ctor start:0x020f19ac end:0x020f19bc kind:rodata align:4 .data start:0x020f19c0 end:0x020f1bc0 kind:data align:32 .bss start:0x020f1bc0 end:0x020fbf40 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov023/relocs.txt b/config/eur/arm9/overlays/ov023/relocs.txt index bb52c3eb..f44a5bfa 100644 --- a/config/eur/arm9/overlays/ov023/relocs.txt +++ b/config/eur/arm9/overlays/ov023/relocs.txt @@ -291,7 +291,7 @@ from:0x020eb4b8 kind:load to:0x020ea920 module:overlay(23) from:0x020eb4bc kind:load to:0x020b1f2c module:overlay(0) from:0x020eb4c0 kind:load to:0x020eb51c module:overlay(23) from:0x020eb4c4 kind:load to:0x0201f678 module:main -from:0x020eb4c8 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020eb4c8 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020eb4cc kind:load to:0x020f1884 module:overlay(23) from:0x020eb4d0 kind:load to:0x020f1898 module:overlay(23) from:0x020eb4d4 kind:load to:0x020431b8 module:main diff --git a/config/eur/arm9/overlays/ov024/delinks.txt b/config/eur/arm9/overlays/ov024/delinks.txt index 6946e197..0d10a9d7 100644 --- a/config/eur/arm9/overlays/ov024/delinks.txt +++ b/config/eur/arm9/overlays/ov024/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020c4840 end:0x020d7318 kind:code align:32 .rodata start:0x020d7318 end:0x020d78e8 kind:rodata align:4 .init start:0x020d78e8 end:0x020d7b34 kind:code align:4 - .ctor start:0x020d7b34 end:0x020d7b54 kind:rodata align:4 + .ctor start:0x020d7b34 end:0x020d7b50 kind:rodata align:4 .data start:0x020d7b60 end:0x020d8660 kind:data align:32 .bss start:0x020d8660 end:0x020d8720 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov024/relocs.txt b/config/eur/arm9/overlays/ov024/relocs.txt index 31de8228..7cefabfe 100644 --- a/config/eur/arm9/overlays/ov024/relocs.txt +++ b/config/eur/arm9/overlays/ov024/relocs.txt @@ -1181,7 +1181,7 @@ from:0x020ca3d8 kind:arm_call to:0x02062ef8 module:overlay(0) from:0x020ca450 kind:arm_call to:0x020166cc module:main from:0x020ca464 kind:arm_call to:0x020166cc module:main from:0x020ca480 kind:load to:0x020d7f58 module:overlay(24) -from:0x020ca484 kind:load to:0x020b1f84 add:8 module:overlay(0) +from:0x020ca484 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x020ca488 kind:load to:0x020b1f2c module:overlay(0) from:0x020ca4cc kind:arm_call to:0x02063a3c module:overlay(0) from:0x020ca4e8 kind:arm_call to:0x02063a3c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov025/delinks.txt b/config/eur/arm9/overlays/ov025/delinks.txt index 72945015..6d5e3e4f 100644 --- a/config/eur/arm9/overlays/ov025/delinks.txt +++ b/config/eur/arm9/overlays/ov025/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020c4840 end:0x020c5a0c kind:code align:32 .rodata start:0x020c5a0c end:0x020c5a10 kind:rodata align:4 .init start:0x020c5a10 end:0x020c5a44 kind:code align:4 - .ctor start:0x020c5a44 end:0x020c5a4c kind:rodata align:4 + .ctor start:0x020c5a44 end:0x020c5a48 kind:rodata align:4 .data start:0x020c5a60 end:0x020c5b80 kind:data align:32 .bss start:0x020c5b80 end:0x020c5b80 kind:bss align:32 @@ -19,5 +19,5 @@ src/025_Title/TitleScreenManager.cpp: src/025_Title/TitleScreen.cpp: .text start:0x020c4c70 end:0x020c5a0c .init start:0x020c5a10 end:0x020c5a44 - .ctor start:0x020c5a44 end:0x020c5a4c + .ctor start:0x020c5a44 end:0x020c5a48 .data start:0x020c5ae0 end:0x020c5b80 diff --git a/config/eur/arm9/overlays/ov025/relocs.txt b/config/eur/arm9/overlays/ov025/relocs.txt index 58983d4c..c25c3f22 100644 --- a/config/eur/arm9/overlays/ov025/relocs.txt +++ b/config/eur/arm9/overlays/ov025/relocs.txt @@ -3,19 +3,19 @@ from:0x020c4854 kind:arm_call to:0x0201659c module:main from:0x020c4864 kind:arm_call to:0x02013370 module:main from:0x020c4880 kind:arm_call_thumb to:0x020bd514 module:overlay(1) from:0x020c4888 kind:arm_call_thumb to:0x020b6520 module:overlays(1,2,6,10,12,14) -from:0x020c4894 kind:load to:0x020c5a60 add:8 module:overlay(25) +from:0x020c4894 kind:load to:0x020c5a60 add:0x8 module:overlay(25) from:0x020c4898 kind:load to:0x02049a2c module:main from:0x020c489c kind:load to:0x0204a110 module:main from:0x020c48a0 kind:load to:0x020c4a8c module:overlay(25) from:0x020c48b4 kind:arm_call to:0x020c4a60 module:overlay(25) from:0x020c48b8 kind:arm_call to:0x0200e234 module:main from:0x020c48c0 kind:arm_call to:0x0201834c module:main -from:0x020c48cc kind:load to:0x020c5a60 add:8 module:overlay(25) +from:0x020c48cc kind:load to:0x020c5a60 add:0x8 module:overlay(25) from:0x020c48e0 kind:arm_call to:0x020c4a60 module:overlay(25) from:0x020c48e4 kind:arm_call to:0x0200e234 module:main from:0x020c48ec kind:arm_call to:0x0201834c module:main from:0x020c48f4 kind:arm_call to:0x02011ff4 module:main -from:0x020c4900 kind:load to:0x020c5a60 add:8 module:overlay(25) +from:0x020c4900 kind:load to:0x020c5a60 add:0x8 module:overlay(25) from:0x020c490c kind:arm_call to:0x02018374 module:main from:0x020c4918 kind:arm_call to:0x020a782c module:overlay(0) from:0x020c4964 kind:arm_call_thumb to:0x020707a8 module:overlay(0) @@ -47,7 +47,7 @@ from:0x020c4ab0 kind:arm_call to:0x020c4ab8 module:overlay(25) from:0x020c4ac0 kind:arm_call to:0x02060ee4 module:overlay(0) from:0x020c4adc kind:arm_call to:0x0202358c module:main from:0x020c4ae4 kind:arm_call to:0x020235f4 module:main -from:0x020c4b08 kind:load to:0x020c5a90 add:8 module:overlay(25) +from:0x020c4b08 kind:load to:0x020c5a90 add:0x8 module:overlay(25) from:0x020c4b20 kind:arm_call_thumb to:0x020bd734 module:overlay(1) from:0x020c4b34 kind:arm_call to:0x0201c00c module:main from:0x020c4b44 kind:arm_call to:0x02011f3c module:main @@ -85,8 +85,8 @@ from:0x020c4d70 kind:arm_call to:0x02059270 module:overlay(0) from:0x020c4d78 kind:arm_call to:0x02059240 module:overlay(0) from:0x020c4d84 kind:arm_call to:0x0201c494 module:main from:0x020c4d98 kind:arm_call to:0x0201effc module:main -from:0x020c4da8 kind:load to:0x020c5b28 add:8 module:overlay(25) -from:0x020c4dac kind:load to:0x020c5b1c add:8 module:overlay(25) +from:0x020c4da8 kind:load to:0x020c5b28 add:0x8 module:overlay(25) +from:0x020c4dac kind:load to:0x020c5b1c add:0x8 module:overlay(25) from:0x020c4db0 kind:load to:0x02049be0 module:main from:0x020c4db4 kind:load to:0x020c5b4c module:overlay(25) from:0x020c4db8 kind:load to:0x020c5b60 module:overlay(25) @@ -95,14 +95,14 @@ from:0x020c4ddc kind:arm_call to:0x0206d83c module:overlay(0) from:0x020c4de4 kind:arm_call to:0x020c5964 module:overlay(25) from:0x020c4dec kind:arm_call to:0x02016694 module:main from:0x020c4df4 kind:arm_call to:0x02061c5c module:overlay(0) -from:0x020c4e00 kind:load to:0x020c5b28 add:8 module:overlay(25) +from:0x020c4e00 kind:load to:0x020c5b28 add:0x8 module:overlay(25) from:0x020c4e04 kind:load to:0x020b5214 module:overlay(0) from:0x020c4e20 kind:arm_call to:0x0206d83c module:overlay(0) from:0x020c4e28 kind:arm_call to:0x020c5964 module:overlay(25) from:0x020c4e30 kind:arm_call to:0x02016694 module:main from:0x020c4e38 kind:arm_call to:0x02061c5c module:overlay(0) from:0x020c4e40 kind:arm_call to:0x02011ff4 module:main -from:0x020c4e4c kind:load to:0x020c5b28 add:8 module:overlay(25) +from:0x020c4e4c kind:load to:0x020c5b28 add:0x8 module:overlay(25) from:0x020c4e50 kind:load to:0x020b5214 module:overlay(0) from:0x020c4e68 kind:load to:0x020c4ea0 module:overlay(25) from:0x020c4e88 kind:arm_call to:0x020c4ea0 module:overlay(25) diff --git a/config/eur/arm9/overlays/ov026/delinks.txt b/config/eur/arm9/overlays/ov026/delinks.txt index 694c3f37..50c700e9 100644 --- a/config/eur/arm9/overlays/ov026/delinks.txt +++ b/config/eur/arm9/overlays/ov026/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020d8720 end:0x02132398 kind:code align:32 .rodata start:0x02132398 end:0x02133dcc kind:rodata align:4 .init start:0x02133dcc end:0x02135190 kind:code align:4 - .ctor start:0x02135190 end:0x02135278 kind:rodata align:4 + .ctor start:0x02135190 end:0x02135274 kind:rodata align:4 .data start:0x02135280 end:0x02138ce0 kind:data align:32 .bss start:0x02138ce0 end:0x021419e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov027/delinks.txt b/config/eur/arm9/overlays/ov027/delinks.txt index 1d83f7bc..79c87fcd 100644 --- a/config/eur/arm9/overlays/ov027/delinks.txt +++ b/config/eur/arm9/overlays/ov027/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021419e0 end:0x02147efc kind:code align:32 .rodata start:0x02147efc end:0x02147f38 kind:rodata align:4 .init start:0x02147f38 end:0x02148384 kind:code align:4 - .ctor start:0x02148384 end:0x021483bc kind:rodata align:4 + .ctor start:0x02148384 end:0x021483b8 kind:rodata align:4 .data start:0x021483c0 end:0x02148e00 kind:data align:32 .bss start:0x02148e00 end:0x02149a60 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov028/delinks.txt b/config/eur/arm9/overlays/ov028/delinks.txt index 133235e3..f51ecd17 100644 --- a/config/eur/arm9/overlays/ov028/delinks.txt +++ b/config/eur/arm9/overlays/ov028/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021419e0 end:0x021469b8 kind:code align:32 .rodata start:0x021469b8 end:0x02146a44 kind:rodata align:4 .init start:0x02146a44 end:0x02146fd0 kind:code align:4 - .ctor start:0x02146fd0 end:0x02147018 kind:rodata align:4 + .ctor start:0x02146fd0 end:0x02147014 kind:rodata align:4 .data start:0x02147020 end:0x02147c60 kind:data align:32 .bss start:0x02147c60 end:0x021489e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov029/delinks.txt b/config/eur/arm9/overlays/ov029/delinks.txt index d6e57dfb..0b1626fa 100644 --- a/config/eur/arm9/overlays/ov029/delinks.txt +++ b/config/eur/arm9/overlays/ov029/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021419e0 end:0x02150e90 kind:code align:32 .rodata start:0x02150e90 end:0x02150f84 kind:rodata align:4 .init start:0x02150f84 end:0x02151694 kind:code align:4 - .ctor start:0x02151694 end:0x021516e4 kind:rodata align:4 + .ctor start:0x02151694 end:0x021516e0 kind:rodata align:4 .data start:0x02151700 end:0x02152760 kind:data align:32 .bss start:0x02152760 end:0x02153920 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov030/delinks.txt b/config/eur/arm9/overlays/ov030/delinks.txt index 7653dc2a..71c1d975 100644 --- a/config/eur/arm9/overlays/ov030/delinks.txt +++ b/config/eur/arm9/overlays/ov030/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021419e0 end:0x02150894 kind:code align:32 .rodata start:0x02150894 end:0x02150994 kind:rodata align:4 .init start:0x02150994 end:0x02150f7c kind:code align:4 - .ctor start:0x02150f7c end:0x02150fb4 kind:rodata align:4 + .ctor start:0x02150f7c end:0x02150fb0 kind:rodata align:4 .data start:0x02150fc0 end:0x02151d80 kind:data align:32 .bss start:0x02151d80 end:0x02152d00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index e679206a..de578e1c 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020d8720 end:0x0210fd1c kind:code align:32 .rodata start:0x0210fd1c end:0x02110fd0 kind:rodata align:4 .init start:0x02110fd0 end:0x02112794 kind:code align:4 - .ctor start:0x02112794 end:0x02112898 kind:rodata align:4 + .ctor start:0x02112794 end:0x02112894 kind:rodata align:4 .data start:0x021128a0 end:0x02116380 kind:data align:32 .bss start:0x02116380 end:0x02118fc0 kind:bss align:32 diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 1e07dc38..c7acf530 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -1766,14 +1766,14 @@ from:0x020e8cc0 kind:load to:0x021166e8 module:overlay(31) from:0x020e8cd4 kind:arm_call to:0x02011f3c module:main from:0x020e8ce0 kind:arm_call to:0x020e8da8 module:overlay(31) from:0x020e8cf4 kind:arm_call to:0x0209767c module:overlay(0) -from:0x020e8d28 kind:load to:0x021134a0 add:8 module:overlay(31) +from:0x020e8d28 kind:load to:0x021134a0 add:0x8 module:overlay(31) from:0x020e8d54 kind:arm_call to:0x020975f8 module:overlay(0) from:0x020e8d94 kind:arm_call to:0x020973f4 module:overlay(0) from:0x020e8da0 kind:load to:0x020b539c module:overlay(0) from:0x020e8db0 kind:arm_call to:0x02098388 module:overlay(0) from:0x020e8dd8 kind:arm_call to:0x02097bb8 module:overlay(0) from:0x020e8dec kind:arm_call to:0x020e9ef0 module:overlay(31) -from:0x020e8e14 kind:load to:0x021134c4 add:8 module:overlay(31) +from:0x020e8e14 kind:load to:0x021134c4 add:0x8 module:overlay(31) from:0x020e8e28 kind:arm_call to:0x020e9d54 module:overlay(31) from:0x020e8e64 kind:arm_call to:0x02098a60 module:overlay(0) from:0x020e8e94 kind:arm_call to:0x020e9904 module:overlay(31) @@ -1872,7 +1872,7 @@ from:0x020e9d4c kind:load to:0x02113468 module:overlay(31) from:0x020e9d9c kind:arm_call to:0x020e9e5c module:overlay(31) from:0x020e9e54 kind:arm_call to:0x020984d0 module:overlay(0) from:0x020e9f04 kind:arm_call to:0x020f6284 module:overlay(31) -from:0x020e9f24 kind:load to:0x02113488 add:8 module:overlay(31) +from:0x020e9f24 kind:load to:0x02113488 add:0x8 module:overlay(31) from:0x020e9f4c kind:arm_call to:0x020e9904 module:overlay(31) from:0x020e9f5c kind:arm_call to:0x020f62e4 module:overlay(31) from:0x020e9f7c kind:arm_call to:0x020e9904 module:overlay(31) diff --git a/config/eur/arm9/overlays/ov032/delinks.txt b/config/eur/arm9/overlays/ov032/delinks.txt index 6f36b274..31334b43 100644 --- a/config/eur/arm9/overlays/ov032/delinks.txt +++ b/config/eur/arm9/overlays/ov032/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x02121ed0 kind:code align:32 .rodata start:0x02121ed0 end:0x02121f34 kind:rodata align:4 .init start:0x02121f34 end:0x0212212c kind:code align:4 - .ctor start:0x0212212c end:0x02122144 kind:rodata align:4 + .ctor start:0x0212212c end:0x02122140 kind:rodata align:4 .data start:0x02122160 end:0x02122820 kind:data align:32 .bss start:0x02122820 end:0x02122bc0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov033/delinks.txt b/config/eur/arm9/overlays/ov033/delinks.txt index c0a1cf95..d9721bcb 100644 --- a/config/eur/arm9/overlays/ov033/delinks.txt +++ b/config/eur/arm9/overlays/ov033/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x0211dba4 kind:code align:32 .rodata start:0x0211dba4 end:0x0212103c kind:rodata align:4 .init start:0x0212103c end:0x0212114c kind:code align:4 - .ctor start:0x0212114c end:0x0212115c kind:rodata align:4 + .ctor start:0x0212114c end:0x02121158 kind:rodata align:4 .data start:0x02121160 end:0x021218c0 kind:data align:32 .bss start:0x021218c0 end:0x02122760 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov034/delinks.txt b/config/eur/arm9/overlays/ov034/delinks.txt index 5b44599b..4875c54f 100644 --- a/config/eur/arm9/overlays/ov034/delinks.txt +++ b/config/eur/arm9/overlays/ov034/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x02122438 kind:code align:32 .rodata start:0x02122438 end:0x021224ec kind:rodata align:4 .init start:0x021224ec end:0x021227cc kind:code align:4 - .ctor start:0x021227cc end:0x021227f0 kind:rodata align:4 + .ctor start:0x021227cc end:0x021227ec kind:rodata align:4 .data start:0x02122800 end:0x02122e60 kind:data align:32 .bss start:0x02122e60 end:0x021234c0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov035/delinks.txt b/config/eur/arm9/overlays/ov035/delinks.txt index b0e2026b..d6345207 100644 --- a/config/eur/arm9/overlays/ov035/delinks.txt +++ b/config/eur/arm9/overlays/ov035/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x02120ec8 kind:code align:32 .rodata start:0x02120ec8 end:0x02120f9c kind:rodata align:4 .init start:0x02120f9c end:0x02121180 kind:code align:4 - .ctor start:0x02121180 end:0x02121194 kind:rodata align:4 + .ctor start:0x02121180 end:0x02121190 kind:rodata align:4 .data start:0x021211a0 end:0x02121b00 kind:data align:32 .bss start:0x02121b00 end:0x02121f00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov036/delinks.txt b/config/eur/arm9/overlays/ov036/delinks.txt index 3b65a61a..efe1d3de 100644 --- a/config/eur/arm9/overlays/ov036/delinks.txt +++ b/config/eur/arm9/overlays/ov036/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x02120c80 kind:code align:32 .rodata start:0x02120c80 end:0x02120e70 kind:rodata align:4 .init start:0x02120e70 end:0x02121140 kind:code align:4 - .ctor start:0x02121140 end:0x02121168 kind:rodata align:4 + .ctor start:0x02121140 end:0x02121164 kind:rodata align:4 .data start:0x02121180 end:0x02122760 kind:data align:32 .bss start:0x02122760 end:0x02122f00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov037/delinks.txt b/config/eur/arm9/overlays/ov037/delinks.txt index b4464f57..5d73b424 100644 --- a/config/eur/arm9/overlays/ov037/delinks.txt +++ b/config/eur/arm9/overlays/ov037/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x02121bb8 kind:code align:32 .rodata start:0x02121bb8 end:0x02121c48 kind:rodata align:4 .init start:0x02121c48 end:0x02121de8 kind:code align:4 - .ctor start:0x02121de8 end:0x02121dfc kind:rodata align:4 + .ctor start:0x02121de8 end:0x02121df8 kind:rodata align:4 .data start:0x02121e00 end:0x02122800 kind:data align:32 .bss start:0x02122800 end:0x02122b00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov037/relocs.txt b/config/eur/arm9/overlays/ov037/relocs.txt index 18065e11..cdbd7d66 100644 --- a/config/eur/arm9/overlays/ov037/relocs.txt +++ b/config/eur/arm9/overlays/ov037/relocs.txt @@ -194,7 +194,7 @@ from:0x0211ae64 kind:arm_call to:0x02061ae4 module:overlay(0) from:0x0211aeec kind:arm_call to:0x02060804 module:overlay(0) from:0x0211af00 kind:arm_call to:0x0201667c module:main from:0x0211af30 kind:load to:0x02121e44 module:overlay(37) -from:0x0211af34 kind:load to:0x020b1e40 add:8 module:overlay(0) +from:0x0211af34 kind:load to:0x020b1e40 add:0x8 module:overlay(0) from:0x0211af44 kind:arm_call to:0x02061a8c module:overlay(0) from:0x0211af4c kind:arm_call to:0x02061c5c module:overlay(0) from:0x0211af64 kind:arm_call to:0x02061a8c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov038/delinks.txt b/config/eur/arm9/overlays/ov038/delinks.txt index 35b7ee67..4c8a8e85 100644 --- a/config/eur/arm9/overlays/ov038/delinks.txt +++ b/config/eur/arm9/overlays/ov038/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x02120980 kind:code align:32 .rodata start:0x02120980 end:0x02120a74 kind:rodata align:4 .init start:0x02120a74 end:0x02120d34 kind:code align:4 - .ctor start:0x02120d34 end:0x02120d58 kind:rodata align:4 + .ctor start:0x02120d34 end:0x02120d54 kind:rodata align:4 .data start:0x02120d60 end:0x02121480 kind:data align:32 .bss start:0x02121480 end:0x02121b80 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov039/delinks.txt b/config/eur/arm9/overlays/ov039/delinks.txt index cf74e2c4..9875250b 100644 --- a/config/eur/arm9/overlays/ov039/delinks.txt +++ b/config/eur/arm9/overlays/ov039/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02118fc0 end:0x0211caac kind:code align:32 .rodata start:0x0211caac end:0x0211cb80 kind:rodata align:4 .init start:0x0211cb80 end:0x0211ce08 kind:code align:4 - .ctor start:0x0211ce08 end:0x0211ce20 kind:rodata align:4 + .ctor start:0x0211ce08 end:0x0211ce1c kind:rodata align:4 .data start:0x0211ce20 end:0x0211dd80 kind:data align:32 .bss start:0x0211dd80 end:0x0211e2e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov040/delinks.txt b/config/eur/arm9/overlays/ov040/delinks.txt index 5219100c..78137133 100644 --- a/config/eur/arm9/overlays/ov040/delinks.txt +++ b/config/eur/arm9/overlays/ov040/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021234c0 end:0x0212dbb8 kind:code align:32 .rodata start:0x0212dbb8 end:0x0212ddb8 kind:rodata align:4 .init start:0x0212ddb8 end:0x0212e490 kind:code align:4 - .ctor start:0x0212e490 end:0x0212e4b4 kind:rodata align:4 + .ctor start:0x0212e490 end:0x0212e4b0 kind:rodata align:4 .data start:0x0212e4c0 end:0x0212f3a0 kind:data align:32 .bss start:0x0212f3a0 end:0x021304a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov041/delinks.txt b/config/eur/arm9/overlays/ov041/delinks.txt index 63aba76f..6197fea5 100644 --- a/config/eur/arm9/overlays/ov041/delinks.txt +++ b/config/eur/arm9/overlays/ov041/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021234c0 end:0x0212d2c8 kind:code align:32 .rodata start:0x0212d2c8 end:0x0212d460 kind:rodata align:4 .init start:0x0212d460 end:0x0212d7cc kind:code align:4 - .ctor start:0x0212d7cc end:0x0212d7f8 kind:rodata align:4 + .ctor start:0x0212d7cc end:0x0212d7f4 kind:rodata align:4 .data start:0x0212d800 end:0x0212e180 kind:data align:32 .bss start:0x0212e180 end:0x0212e780 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov042/delinks.txt b/config/eur/arm9/overlays/ov042/delinks.txt index 1b13a4bc..746baaaf 100644 --- a/config/eur/arm9/overlays/ov042/delinks.txt +++ b/config/eur/arm9/overlays/ov042/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021234c0 end:0x0212ba74 kind:code align:32 .rodata start:0x0212ba74 end:0x0212bae4 kind:rodata align:4 .init start:0x0212bae4 end:0x0212bcc4 kind:code align:4 - .ctor start:0x0212bcc4 end:0x0212bce0 kind:rodata align:4 + .ctor start:0x0212bcc4 end:0x0212bcdc kind:rodata align:4 .data start:0x0212bce0 end:0x0212c660 kind:data align:32 .bss start:0x0212c660 end:0x0212cb20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov043/delinks.txt b/config/eur/arm9/overlays/ov043/delinks.txt index a1b1aea0..eb1c1829 100644 --- a/config/eur/arm9/overlays/ov043/delinks.txt +++ b/config/eur/arm9/overlays/ov043/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021234c0 end:0x0212ca04 kind:code align:32 .rodata start:0x0212ca04 end:0x0212cb48 kind:rodata align:4 .init start:0x0212cb48 end:0x0212cdf0 kind:code align:4 - .ctor start:0x0212cdf0 end:0x0212ce04 kind:rodata align:4 + .ctor start:0x0212cdf0 end:0x0212ce00 kind:rodata align:4 .data start:0x0212ce20 end:0x0212dba0 kind:data align:32 .bss start:0x0212dba0 end:0x0212dee0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov044/delinks.txt b/config/eur/arm9/overlays/ov044/delinks.txt index de8f7bd1..d77dd7c7 100644 --- a/config/eur/arm9/overlays/ov044/delinks.txt +++ b/config/eur/arm9/overlays/ov044/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021234c0 end:0x0212c9f4 kind:code align:32 .rodata start:0x0212c9f4 end:0x0212cafc kind:rodata align:4 .init start:0x0212cafc end:0x0212cd84 kind:code align:4 - .ctor start:0x0212cd84 end:0x0212cdac kind:rodata align:4 + .ctor start:0x0212cd84 end:0x0212cda8 kind:rodata align:4 .data start:0x0212cdc0 end:0x0212d580 kind:data align:32 .bss start:0x0212d580 end:0x0212dce0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov045/delinks.txt b/config/eur/arm9/overlays/ov045/delinks.txt index 7284acb2..f4009489 100644 --- a/config/eur/arm9/overlays/ov045/delinks.txt +++ b/config/eur/arm9/overlays/ov045/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021234c0 end:0x021294c0 kind:code align:32 .rodata start:0x021294c0 end:0x02129620 kind:rodata align:4 .init start:0x02129620 end:0x02129ad4 kind:code align:4 - .ctor start:0x02129ad4 end:0x02129af0 kind:rodata align:4 + .ctor start:0x02129ad4 end:0x02129aec kind:rodata align:4 .data start:0x02129b00 end:0x0212a240 kind:data align:32 .bss start:0x0212a240 end:0x0212a6c0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov046/delinks.txt b/config/eur/arm9/overlays/ov046/delinks.txt index e34d74b3..a8bd881e 100644 --- a/config/eur/arm9/overlays/ov046/delinks.txt +++ b/config/eur/arm9/overlays/ov046/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021234c0 end:0x02129a28 kind:code align:32 .rodata start:0x02129a28 end:0x02129cd0 kind:rodata align:4 .init start:0x02129cd0 end:0x02129f60 kind:code align:4 - .ctor start:0x02129f60 end:0x02129f78 kind:rodata align:4 + .ctor start:0x02129f60 end:0x02129f74 kind:rodata align:4 .data start:0x02129f80 end:0x0212a700 kind:data align:32 .bss start:0x0212a700 end:0x0212ab00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov047/delinks.txt b/config/eur/arm9/overlays/ov047/delinks.txt index c70d687c..64d68b67 100644 --- a/config/eur/arm9/overlays/ov047/delinks.txt +++ b/config/eur/arm9/overlays/ov047/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021304a0 end:0x02135cd8 kind:code align:32 .rodata start:0x02135cd8 end:0x02135d2c kind:rodata align:4 .init start:0x02135d2c end:0x02135e84 kind:code align:4 - .ctor start:0x02135e84 end:0x02135e9c kind:rodata align:4 + .ctor start:0x02135e84 end:0x02135e98 kind:rodata align:4 .data start:0x02135ea0 end:0x02136340 kind:data align:32 .bss start:0x02136340 end:0x02136520 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov048/delinks.txt b/config/eur/arm9/overlays/ov048/delinks.txt index 31d24542..8cec0498 100644 --- a/config/eur/arm9/overlays/ov048/delinks.txt +++ b/config/eur/arm9/overlays/ov048/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021304a0 end:0x02137458 kind:code align:32 .rodata start:0x02137458 end:0x02137474 kind:rodata align:4 .init start:0x02137474 end:0x0213759c kind:code align:4 - .ctor start:0x0213759c end:0x021375b0 kind:rodata align:4 + .ctor start:0x0213759c end:0x021375ac kind:rodata align:4 .data start:0x021375c0 end:0x02137a60 kind:data align:32 .bss start:0x02137a60 end:0x02137e60 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov049/delinks.txt b/config/eur/arm9/overlays/ov049/delinks.txt index f2e7bcbb..51b072ab 100644 --- a/config/eur/arm9/overlays/ov049/delinks.txt +++ b/config/eur/arm9/overlays/ov049/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021304a0 end:0x02136b40 kind:code align:32 .rodata start:0x02136b40 end:0x02136b70 kind:rodata align:4 .init start:0x02136b70 end:0x021372c8 kind:code align:4 - .ctor start:0x021372c8 end:0x021372e4 kind:rodata align:4 + .ctor start:0x021372c8 end:0x021372e0 kind:rodata align:4 .data start:0x02137300 end:0x02138000 kind:data align:32 .bss start:0x02138000 end:0x021384e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov050/delinks.txt b/config/eur/arm9/overlays/ov050/delinks.txt index 15bb32ed..34c3f285 100644 --- a/config/eur/arm9/overlays/ov050/delinks.txt +++ b/config/eur/arm9/overlays/ov050/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021304a0 end:0x021367c4 kind:code align:32 .rodata start:0x021367c4 end:0x021367e4 kind:rodata align:4 .init start:0x021367e4 end:0x02136958 kind:code align:4 - .ctor start:0x02136958 end:0x0213696c kind:rodata align:4 + .ctor start:0x02136958 end:0x02136968 kind:rodata align:4 .data start:0x02136980 end:0x02137020 kind:data align:32 .bss start:0x02137020 end:0x021373e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov051/delinks.txt b/config/eur/arm9/overlays/ov051/delinks.txt index c7afe324..0a3aa432 100644 --- a/config/eur/arm9/overlays/ov051/delinks.txt +++ b/config/eur/arm9/overlays/ov051/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021304a0 end:0x02136cd4 kind:code align:32 .rodata start:0x02136cd4 end:0x02136d08 kind:rodata align:4 .init start:0x02136d08 end:0x02136d94 kind:code align:4 - .ctor start:0x02136d94 end:0x02136d9c kind:rodata align:4 + .ctor start:0x02136d94 end:0x02136d98 kind:rodata align:4 .data start:0x02136da0 end:0x021371a0 kind:data align:32 .bss start:0x021371a0 end:0x021372a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov052/delinks.txt b/config/eur/arm9/overlays/ov052/delinks.txt index 7937eb03..04b5781f 100644 --- a/config/eur/arm9/overlays/ov052/delinks.txt +++ b/config/eur/arm9/overlays/ov052/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021304a0 end:0x02135b84 kind:code align:32 .rodata start:0x02135b84 end:0x02135bac kind:rodata align:4 .init start:0x02135bac end:0x02135e04 kind:code align:4 - .ctor start:0x02135e04 end:0x02135e14 kind:rodata align:4 + .ctor start:0x02135e04 end:0x02135e10 kind:rodata align:4 .data start:0x02135e20 end:0x02136740 kind:data align:32 .bss start:0x02136740 end:0x02136a00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov053/delinks.txt b/config/eur/arm9/overlays/ov053/delinks.txt index 5734b79c..0851ba4d 100644 --- a/config/eur/arm9/overlays/ov053/delinks.txt +++ b/config/eur/arm9/overlays/ov053/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021384e0 end:0x0213cd1c kind:code align:32 .rodata start:0x0213cd1c end:0x0213cd5c kind:rodata align:4 .init start:0x0213cd5c end:0x0213ce74 kind:code align:4 - .ctor start:0x0213ce74 end:0x0213ce84 kind:rodata align:4 + .ctor start:0x0213ce74 end:0x0213ce80 kind:rodata align:4 .data start:0x0213cea0 end:0x0213d3c0 kind:data align:32 .bss start:0x0213d3c0 end:0x0213d5a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov054/delinks.txt b/config/eur/arm9/overlays/ov054/delinks.txt index d527b517..2ccfc7eb 100644 --- a/config/eur/arm9/overlays/ov054/delinks.txt +++ b/config/eur/arm9/overlays/ov054/delinks.txt @@ -1,6 +1,5 @@ .text start:0x021384e0 end:0x0213da18 kind:code align:32 .init start:0x0213da18 end:0x0213dc70 kind:code align:4 - .ctor start:0x0213dc70 end:0x0213dc80 kind:rodata align:4 + .ctor start:0x0213dc70 end:0x0213dc7c kind:rodata align:4 .data start:0x0213dc80 end:0x0213e520 kind:data align:32 .bss start:0x0213e520 end:0x0213e7e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov055/delinks.txt b/config/eur/arm9/overlays/ov055/delinks.txt index b62b4bec..ad3c242e 100644 --- a/config/eur/arm9/overlays/ov055/delinks.txt +++ b/config/eur/arm9/overlays/ov055/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021384e0 end:0x0213d258 kind:code align:32 .rodata start:0x0213d258 end:0x0213d288 kind:rodata align:4 .init start:0x0213d288 end:0x0213d3f4 kind:code align:4 - .ctor start:0x0213d3f4 end:0x0213d404 kind:rodata align:4 + .ctor start:0x0213d3f4 end:0x0213d400 kind:rodata align:4 .data start:0x0213d420 end:0x0213dbe0 kind:data align:32 .bss start:0x0213dbe0 end:0x0213de20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov056/delinks.txt b/config/eur/arm9/overlays/ov056/delinks.txt index 159238a6..c0c38570 100644 --- a/config/eur/arm9/overlays/ov056/delinks.txt +++ b/config/eur/arm9/overlays/ov056/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021384e0 end:0x0213e28c kind:code align:32 .rodata start:0x0213e28c end:0x0213e3dc kind:rodata align:4 .init start:0x0213e3dc end:0x0213e4cc kind:code align:4 - .ctor start:0x0213e4cc end:0x0213e4dc kind:rodata align:4 + .ctor start:0x0213e4cc end:0x0213e4d8 kind:rodata align:4 .data start:0x0213e4e0 end:0x0213ee20 kind:data align:32 .bss start:0x0213ee20 end:0x0213efc0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov057/delinks.txt b/config/eur/arm9/overlays/ov057/delinks.txt index 761b1035..8f32fbec 100644 --- a/config/eur/arm9/overlays/ov057/delinks.txt +++ b/config/eur/arm9/overlays/ov057/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021384e0 end:0x0213b8dc kind:code align:32 .rodata start:0x0213b8dc end:0x0213b960 kind:rodata align:4 .init start:0x0213b960 end:0x0213bd64 kind:code align:4 - .ctor start:0x0213bd64 end:0x0213bd84 kind:rodata align:4 + .ctor start:0x0213bd64 end:0x0213bd80 kind:rodata align:4 .data start:0x0213bda0 end:0x0213c2c0 kind:data align:32 .bss start:0x0213c2c0 end:0x0213c760 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov058/delinks.txt b/config/eur/arm9/overlays/ov058/delinks.txt index bb46f201..ab56c942 100644 --- a/config/eur/arm9/overlays/ov058/delinks.txt +++ b/config/eur/arm9/overlays/ov058/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0213efc0 end:0x02152eb8 kind:code align:32 .rodata start:0x02152eb8 end:0x02153498 kind:rodata align:4 .init start:0x02153498 end:0x02154120 kind:code align:4 - .ctor start:0x02154120 end:0x02154188 kind:rodata align:4 + .ctor start:0x02154120 end:0x02154184 kind:rodata align:4 .data start:0x021541a0 end:0x02155ea0 kind:data align:32 .bss start:0x02155ea0 end:0x02157ea0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov059/delinks.txt b/config/eur/arm9/overlays/ov059/delinks.txt index 5b51f4e8..3da9e687 100644 --- a/config/eur/arm9/overlays/ov059/delinks.txt +++ b/config/eur/arm9/overlays/ov059/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x02162e48 kind:code align:32 .rodata start:0x02162e48 end:0x02162eac kind:rodata align:4 .init start:0x02162eac end:0x02163394 kind:code align:4 - .ctor start:0x02163394 end:0x021633d0 kind:rodata align:4 + .ctor start:0x02163394 end:0x021633cc kind:rodata align:4 .data start:0x021633e0 end:0x02164340 kind:data align:32 .bss start:0x02164340 end:0x02164ec0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov060/delinks.txt b/config/eur/arm9/overlays/ov060/delinks.txt index c02027f8..1d97473b 100644 --- a/config/eur/arm9/overlays/ov060/delinks.txt +++ b/config/eur/arm9/overlays/ov060/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x02160b94 kind:code align:32 .rodata start:0x02160b94 end:0x02160cdc kind:rodata align:4 .init start:0x02160cdc end:0x021613ec kind:code align:4 - .ctor start:0x021613ec end:0x02161438 kind:rodata align:4 + .ctor start:0x021613ec end:0x02161434 kind:rodata align:4 .data start:0x02161440 end:0x02162f00 kind:data align:32 .bss start:0x02162f00 end:0x02164140 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov061/delinks.txt b/config/eur/arm9/overlays/ov061/delinks.txt index a9b83b33..ae069a15 100644 --- a/config/eur/arm9/overlays/ov061/delinks.txt +++ b/config/eur/arm9/overlays/ov061/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x02159e1c kind:code align:32 .rodata start:0x02159e1c end:0x02159e98 kind:rodata align:4 .init start:0x02159e98 end:0x0215a2d8 kind:code align:4 - .ctor start:0x0215a2d8 end:0x0215a308 kind:rodata align:4 + .ctor start:0x0215a2d8 end:0x0215a304 kind:rodata align:4 .data start:0x0215a320 end:0x0215af80 kind:data align:32 .bss start:0x0215af80 end:0x0215bb40 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov062/delinks.txt b/config/eur/arm9/overlays/ov062/delinks.txt index 4291200e..29cff827 100644 --- a/config/eur/arm9/overlays/ov062/delinks.txt +++ b/config/eur/arm9/overlays/ov062/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x0215e788 kind:code align:32 .rodata start:0x0215e788 end:0x0215e8cc kind:rodata align:4 .init start:0x0215e8cc end:0x0215efb4 kind:code align:4 - .ctor start:0x0215efb4 end:0x0215f00c kind:rodata align:4 + .ctor start:0x0215efb4 end:0x0215f008 kind:rodata align:4 .data start:0x0215f020 end:0x02160980 kind:data align:32 .bss start:0x02160980 end:0x02161c60 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov063/delinks.txt b/config/eur/arm9/overlays/ov063/delinks.txt index 9ec5211f..6feba319 100644 --- a/config/eur/arm9/overlays/ov063/delinks.txt +++ b/config/eur/arm9/overlays/ov063/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x02162524 kind:code align:32 .rodata start:0x02162524 end:0x02162730 kind:rodata align:4 .init start:0x02162730 end:0x02162e40 kind:code align:4 - .ctor start:0x02162e40 end:0x02162e7c kind:rodata align:4 + .ctor start:0x02162e40 end:0x02162e78 kind:rodata align:4 .data start:0x02162e80 end:0x02163b60 kind:data align:32 .bss start:0x02163b60 end:0x02164a20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov064/delinks.txt b/config/eur/arm9/overlays/ov064/delinks.txt index 4d07fe5d..9725ab5e 100644 --- a/config/eur/arm9/overlays/ov064/delinks.txt +++ b/config/eur/arm9/overlays/ov064/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x0215a2d8 kind:code align:32 .rodata start:0x0215a2d8 end:0x0215a344 kind:rodata align:4 .init start:0x0215a344 end:0x0215a5ec kind:code align:4 - .ctor start:0x0215a5ec end:0x0215a610 kind:rodata align:4 + .ctor start:0x0215a5ec end:0x0215a60c kind:rodata align:4 .data start:0x0215a620 end:0x0215adc0 kind:data align:32 .bss start:0x0215adc0 end:0x0215b520 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov065/delinks.txt b/config/eur/arm9/overlays/ov065/delinks.txt index 6ed19471..8f4f666e 100644 --- a/config/eur/arm9/overlays/ov065/delinks.txt +++ b/config/eur/arm9/overlays/ov065/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x02159fd4 kind:code align:32 .rodata start:0x02159fd4 end:0x0215a064 kind:rodata align:4 .init start:0x0215a064 end:0x0215a4a8 kind:code align:4 - .ctor start:0x0215a4a8 end:0x0215a4dc kind:rodata align:4 + .ctor start:0x0215a4a8 end:0x0215a4d8 kind:rodata align:4 .data start:0x0215a4e0 end:0x0215afa0 kind:data align:32 .bss start:0x0215afa0 end:0x0215ba00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov066/delinks.txt b/config/eur/arm9/overlays/ov066/delinks.txt index 54f7ccc3..226c5121 100644 --- a/config/eur/arm9/overlays/ov066/delinks.txt +++ b/config/eur/arm9/overlays/ov066/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x0215d7a0 kind:code align:32 .rodata start:0x0215d7a0 end:0x0215d8c8 kind:rodata align:4 .init start:0x0215d8c8 end:0x0215dcc0 kind:code align:4 - .ctor start:0x0215dcc0 end:0x0215dcf0 kind:rodata align:4 + .ctor start:0x0215dcc0 end:0x0215dcec kind:rodata align:4 .data start:0x0215dd00 end:0x02162620 kind:data align:32 .bss start:0x02162620 end:0x02163160 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov067/delinks.txt b/config/eur/arm9/overlays/ov067/delinks.txt index 4d46d1bc..8584ae68 100644 --- a/config/eur/arm9/overlays/ov067/delinks.txt +++ b/config/eur/arm9/overlays/ov067/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x0215c4f4 kind:code align:32 .rodata start:0x0215c4f4 end:0x0215c600 kind:rodata align:4 .init start:0x0215c600 end:0x0215caa4 kind:code align:4 - .ctor start:0x0215caa4 end:0x0215cad8 kind:rodata align:4 + .ctor start:0x0215caa4 end:0x0215cad4 kind:rodata align:4 .data start:0x0215cae0 end:0x0215d860 kind:data align:32 .bss start:0x0215d860 end:0x0215e460 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov068/delinks.txt b/config/eur/arm9/overlays/ov068/delinks.txt index 95ab850d..c587d2c3 100644 --- a/config/eur/arm9/overlays/ov068/delinks.txt +++ b/config/eur/arm9/overlays/ov068/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x02161dfc kind:code align:32 .rodata start:0x02161dfc end:0x02161e6c kind:rodata align:4 .init start:0x02161e6c end:0x0216245c kind:code align:4 - .ctor start:0x0216245c end:0x021624ac kind:rodata align:4 + .ctor start:0x0216245c end:0x021624a8 kind:rodata align:4 .data start:0x021624c0 end:0x02163ac0 kind:data align:32 .bss start:0x02163ac0 end:0x02164aa0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov068/relocs.txt b/config/eur/arm9/overlays/ov068/relocs.txt index f92a798c..06fe77cf 100644 --- a/config/eur/arm9/overlays/ov068/relocs.txt +++ b/config/eur/arm9/overlays/ov068/relocs.txt @@ -1180,7 +1180,7 @@ from:0x0216173c kind:arm_call to:0x0209c9d8 module:overlay(0) from:0x02161750 kind:arm_call to:0x02061ae4 module:overlay(0) from:0x021617d4 kind:arm_call to:0x0201667c module:main from:0x021617fc kind:load to:0x02163aa4 module:overlay(68) -from:0x02161800 kind:load to:0x020b1e40 add:8 module:overlay(0) +from:0x02161800 kind:load to:0x020b1e40 add:0x8 module:overlay(0) from:0x02161810 kind:arm_call to:0x02061a8c module:overlay(0) from:0x02161818 kind:arm_call to:0x02061c5c module:overlay(0) from:0x02161830 kind:arm_call to:0x02061a8c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov069/delinks.txt b/config/eur/arm9/overlays/ov069/delinks.txt index 1743ac5a..1fc829af 100644 --- a/config/eur/arm9/overlays/ov069/delinks.txt +++ b/config/eur/arm9/overlays/ov069/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02157ea0 end:0x0215aa94 kind:code align:32 .rodata start:0x0215aa94 end:0x0215aaa8 kind:rodata align:4 .init start:0x0215aaa8 end:0x0215ac38 kind:code align:4 - .ctor start:0x0215ac38 end:0x0215ac50 kind:rodata align:4 + .ctor start:0x0215ac38 end:0x0215ac4c kind:rodata align:4 .data start:0x0215ac60 end:0x0215b400 kind:data align:32 .bss start:0x0215b400 end:0x0215b7e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov070/delinks.txt b/config/eur/arm9/overlays/ov070/delinks.txt index afcb234f..9bded774 100644 --- a/config/eur/arm9/overlays/ov070/delinks.txt +++ b/config/eur/arm9/overlays/ov070/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0213efc0 end:0x0214dbec kind:code align:32 .rodata start:0x0214dbec end:0x0214ddd8 kind:rodata align:4 .init start:0x0214ddd8 end:0x0214e75c kind:code align:4 - .ctor start:0x0214e75c end:0x0214e7c4 kind:rodata align:4 + .ctor start:0x0214e75c end:0x0214e7c0 kind:rodata align:4 .data start:0x0214e7e0 end:0x0214f860 kind:data align:32 .bss start:0x0214f860 end:0x02150c00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov071/delinks.txt b/config/eur/arm9/overlays/ov071/delinks.txt index 491a6147..d4cd3a81 100644 --- a/config/eur/arm9/overlays/ov071/delinks.txt +++ b/config/eur/arm9/overlays/ov071/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x02163984 kind:code align:32 .rodata start:0x02163984 end:0x02163d44 kind:rodata align:4 .init start:0x02163d44 end:0x021640ac kind:code align:4 - .ctor start:0x021640ac end:0x021640e4 kind:rodata align:4 + .ctor start:0x021640ac end:0x021640e0 kind:rodata align:4 .data start:0x02164100 end:0x02165100 kind:data align:32 .bss start:0x02165100 end:0x021658a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov072/delinks.txt b/config/eur/arm9/overlays/ov072/delinks.txt index b3913df2..bcd9c43c 100644 --- a/config/eur/arm9/overlays/ov072/delinks.txt +++ b/config/eur/arm9/overlays/ov072/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x021524ec kind:code align:32 .rodata start:0x021524ec end:0x021525a0 kind:rodata align:4 .init start:0x021525a0 end:0x02152640 kind:code align:4 - .ctor start:0x02152640 end:0x0215264c kind:rodata align:4 + .ctor start:0x02152640 end:0x02152648 kind:rodata align:4 .data start:0x02152660 end:0x02152880 kind:data align:32 .bss start:0x02152880 end:0x02152a60 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov073/delinks.txt b/config/eur/arm9/overlays/ov073/delinks.txt index 270d09a9..b7f9a324 100644 --- a/config/eur/arm9/overlays/ov073/delinks.txt +++ b/config/eur/arm9/overlays/ov073/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x02163c40 kind:code align:32 .rodata start:0x02163c40 end:0x02163d48 kind:rodata align:4 .init start:0x02163d48 end:0x02163ebc kind:code align:4 - .ctor start:0x02163ebc end:0x02163ec8 kind:rodata align:4 + .ctor start:0x02163ebc end:0x02163ec4 kind:rodata align:4 .data start:0x02163ee0 end:0x021647c0 kind:data align:32 .bss start:0x021647c0 end:0x021649a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov074/delinks.txt b/config/eur/arm9/overlays/ov074/delinks.txt index a6e2efd9..d2df0b8c 100644 --- a/config/eur/arm9/overlays/ov074/delinks.txt +++ b/config/eur/arm9/overlays/ov074/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x02161e34 kind:code align:32 .rodata start:0x02161e34 end:0x021621b0 kind:rodata align:4 .init start:0x021621b0 end:0x0216258c kind:code align:4 - .ctor start:0x0216258c end:0x021625b0 kind:rodata align:4 + .ctor start:0x0216258c end:0x021625ac kind:rodata align:4 .data start:0x021625c0 end:0x02163320 kind:data align:32 .bss start:0x02163320 end:0x021639e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov075/delinks.txt b/config/eur/arm9/overlays/ov075/delinks.txt index 631d8e46..aa35fe52 100644 --- a/config/eur/arm9/overlays/ov075/delinks.txt +++ b/config/eur/arm9/overlays/ov075/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x02161ff4 kind:code align:32 .rodata start:0x02161ff4 end:0x02162358 kind:rodata align:4 .init start:0x02162358 end:0x0216268c kind:code align:4 - .ctor start:0x0216268c end:0x021626a0 kind:rodata align:4 + .ctor start:0x0216268c end:0x0216269c kind:rodata align:4 .data start:0x021626a0 end:0x02163340 kind:data align:32 .bss start:0x02163340 end:0x021636e0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov076/delinks.txt b/config/eur/arm9/overlays/ov076/delinks.txt index ee0e5bba..9a2f7f55 100644 --- a/config/eur/arm9/overlays/ov076/delinks.txt +++ b/config/eur/arm9/overlays/ov076/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x02152ac0 kind:code align:32 .rodata start:0x02152ac0 end:0x02152ae0 kind:rodata align:4 .init start:0x02152ae0 end:0x02152b30 kind:code align:4 - .ctor start:0x02152b30 end:0x02152b38 kind:rodata align:4 + .ctor start:0x02152b30 end:0x02152b34 kind:rodata align:4 .data start:0x02152b40 end:0x02152da0 kind:data align:32 .bss start:0x02152da0 end:0x02152ea0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov077/delinks.txt b/config/eur/arm9/overlays/ov077/delinks.txt index 124735a7..f1ac7a9e 100644 --- a/config/eur/arm9/overlays/ov077/delinks.txt +++ b/config/eur/arm9/overlays/ov077/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152ea0 end:0x0215b0a4 kind:code align:32 .rodata start:0x0215b0a4 end:0x0215b120 kind:rodata align:4 .init start:0x0215b120 end:0x0215b404 kind:code align:4 - .ctor start:0x0215b404 end:0x0215b42c kind:rodata align:4 + .ctor start:0x0215b404 end:0x0215b428 kind:rodata align:4 .data start:0x0215b440 end:0x0215bd80 kind:data align:32 .bss start:0x0215bd80 end:0x0215c4a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov078/delinks.txt b/config/eur/arm9/overlays/ov078/delinks.txt index 404d66b8..badca902 100644 --- a/config/eur/arm9/overlays/ov078/delinks.txt +++ b/config/eur/arm9/overlays/ov078/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152ea0 end:0x0215d3a8 kind:code align:32 .rodata start:0x0215d3a8 end:0x0215d40c kind:rodata align:4 .init start:0x0215d40c end:0x0215d550 kind:code align:4 - .ctor start:0x0215d550 end:0x0215d560 kind:rodata align:4 + .ctor start:0x0215d550 end:0x0215d55c kind:rodata align:4 .data start:0x0215d560 end:0x0215dc80 kind:data align:32 .bss start:0x0215dc80 end:0x0215df20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov079/delinks.txt b/config/eur/arm9/overlays/ov079/delinks.txt index aba01079..347935d3 100644 --- a/config/eur/arm9/overlays/ov079/delinks.txt +++ b/config/eur/arm9/overlays/ov079/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x021571e4 kind:code align:32 .rodata start:0x021571e4 end:0x02157284 kind:rodata align:4 .init start:0x02157284 end:0x02157610 kind:code align:4 - .ctor start:0x02157610 end:0x0215763c kind:rodata align:4 + .ctor start:0x02157610 end:0x02157638 kind:rodata align:4 .data start:0x02157640 end:0x02157d80 kind:data align:32 .bss start:0x02157d80 end:0x02158640 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov080/delinks.txt b/config/eur/arm9/overlays/ov080/delinks.txt index f0de28be..e48daa23 100644 --- a/config/eur/arm9/overlays/ov080/delinks.txt +++ b/config/eur/arm9/overlays/ov080/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x0215ec94 kind:code align:32 .rodata start:0x0215ec94 end:0x0215ed48 kind:rodata align:4 .init start:0x0215ed48 end:0x0215f3c0 kind:code align:4 - .ctor start:0x0215f3c0 end:0x0215f3d4 kind:rodata align:4 + .ctor start:0x0215f3c0 end:0x0215f3d0 kind:rodata align:4 .data start:0x0215f3e0 end:0x0215fe20 kind:data align:32 .bss start:0x0215fe20 end:0x02160340 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov081/delinks.txt b/config/eur/arm9/overlays/ov081/delinks.txt index 5b81959d..08aaed92 100644 --- a/config/eur/arm9/overlays/ov081/delinks.txt +++ b/config/eur/arm9/overlays/ov081/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x021526cc kind:code align:32 .rodata start:0x021526cc end:0x0215271c kind:rodata align:4 .init start:0x0215271c end:0x02152838 kind:code align:4 - .ctor start:0x02152838 end:0x02152848 kind:rodata align:4 + .ctor start:0x02152838 end:0x02152844 kind:rodata align:4 .data start:0x02152860 end:0x02152b00 kind:data align:32 .bss start:0x02152b00 end:0x02152ca0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov082/delinks.txt b/config/eur/arm9/overlays/ov082/delinks.txt index a7b9b05c..78ef5457 100644 --- a/config/eur/arm9/overlays/ov082/delinks.txt +++ b/config/eur/arm9/overlays/ov082/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152ca0 end:0x02158844 kind:code align:32 .rodata start:0x02158844 end:0x02158858 kind:rodata align:4 .init start:0x02158858 end:0x02158948 kind:code align:4 - .ctor start:0x02158948 end:0x02158958 kind:rodata align:4 + .ctor start:0x02158948 end:0x02158954 kind:rodata align:4 .data start:0x02158960 end:0x02158e80 kind:data align:32 .bss start:0x02158e80 end:0x021590a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov083/delinks.txt b/config/eur/arm9/overlays/ov083/delinks.txt index 81293561..3d54c7e0 100644 --- a/config/eur/arm9/overlays/ov083/delinks.txt +++ b/config/eur/arm9/overlays/ov083/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152ca0 end:0x0215d154 kind:code align:32 .rodata start:0x0215d154 end:0x0215d354 kind:rodata align:4 .init start:0x0215d354 end:0x0215d79c kind:code align:4 - .ctor start:0x0215d79c end:0x0215d7c4 kind:rodata align:4 + .ctor start:0x0215d79c end:0x0215d7c0 kind:rodata align:4 .data start:0x0215d7e0 end:0x0215e360 kind:data align:32 .bss start:0x0215e360 end:0x0215eb20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov084/delinks.txt b/config/eur/arm9/overlays/ov084/delinks.txt index 97804069..f5ea0b9d 100644 --- a/config/eur/arm9/overlays/ov084/delinks.txt +++ b/config/eur/arm9/overlays/ov084/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x021617e8 kind:code align:32 .rodata start:0x021617e8 end:0x02161e60 kind:rodata align:4 .init start:0x02161e60 end:0x02162a38 kind:code align:4 - .ctor start:0x02162a38 end:0x02162a78 kind:rodata align:4 + .ctor start:0x02162a38 end:0x02162a74 kind:rodata align:4 .data start:0x02162a80 end:0x02163b00 kind:data align:32 .bss start:0x02163b00 end:0x021647a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov085/delinks.txt b/config/eur/arm9/overlays/ov085/delinks.txt index 2f30377e..fe5ec91d 100644 --- a/config/eur/arm9/overlays/ov085/delinks.txt +++ b/config/eur/arm9/overlays/ov085/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02150c00 end:0x02153e18 kind:code align:32 .rodata start:0x02153e18 end:0x02153ebc kind:rodata align:4 .init start:0x02153ebc end:0x02153fac kind:code align:4 - .ctor start:0x02153fac end:0x02153fbc kind:rodata align:4 + .ctor start:0x02153fac end:0x02153fb8 kind:rodata align:4 .data start:0x02153fc0 end:0x02154200 kind:data align:32 .bss start:0x02154200 end:0x02154440 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov086/delinks.txt b/config/eur/arm9/overlays/ov086/delinks.txt index a5ba7feb..2db2c4d8 100644 --- a/config/eur/arm9/overlays/ov086/delinks.txt +++ b/config/eur/arm9/overlays/ov086/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02154440 end:0x0215f100 kind:code align:32 .rodata start:0x0215f100 end:0x0215f188 kind:rodata align:4 .init start:0x0215f188 end:0x0215f5d4 kind:code align:4 - .ctor start:0x0215f5d4 end:0x0215f60c kind:rodata align:4 + .ctor start:0x0215f5d4 end:0x0215f608 kind:rodata align:4 .data start:0x0215f620 end:0x02160340 kind:data align:32 .bss start:0x02160340 end:0x02160e80 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov087/delinks.txt b/config/eur/arm9/overlays/ov087/delinks.txt index 8495adff..0867074b 100644 --- a/config/eur/arm9/overlays/ov087/delinks.txt +++ b/config/eur/arm9/overlays/ov087/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02154440 end:0x02161eb4 kind:code align:32 .rodata start:0x02161eb4 end:0x02161f70 kind:rodata align:4 .init start:0x02161f70 end:0x02162170 kind:code align:4 - .ctor start:0x02162170 end:0x0216218c kind:rodata align:4 + .ctor start:0x02162170 end:0x02162188 kind:rodata align:4 .data start:0x021621a0 end:0x02162b20 kind:data align:32 .bss start:0x02162b20 end:0x02163020 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov088/delinks.txt b/config/eur/arm9/overlays/ov088/delinks.txt index d5e8e5f0..04794472 100644 --- a/config/eur/arm9/overlays/ov088/delinks.txt +++ b/config/eur/arm9/overlays/ov088/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021658a0 end:0x02174210 kind:code align:32 .rodata start:0x02174210 end:0x021746ec kind:rodata align:4 .init start:0x021746ec end:0x02174d1c kind:code align:4 - .ctor start:0x02174d1c end:0x02174d70 kind:rodata align:4 + .ctor start:0x02174d1c end:0x02174d6c kind:rodata align:4 .data start:0x02174d80 end:0x021760c0 kind:data align:32 .bss start:0x021760c0 end:0x02177220 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov089/delinks.txt b/config/eur/arm9/overlays/ov089/delinks.txt index f3291f39..5d28fc34 100644 --- a/config/eur/arm9/overlays/ov089/delinks.txt +++ b/config/eur/arm9/overlays/ov089/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021658a0 end:0x02170628 kind:code align:32 .rodata start:0x02170628 end:0x02170d7c kind:rodata align:4 .init start:0x02170d7c end:0x02170de4 kind:code align:4 - .ctor start:0x02170de4 end:0x02170df0 kind:rodata align:4 + .ctor start:0x02170de4 end:0x02170dec kind:rodata align:4 .data start:0x02170e00 end:0x02171520 kind:data align:32 .bss start:0x02171520 end:0x02178760 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov090/delinks.txt b/config/eur/arm9/overlays/ov090/delinks.txt index 40c89d86..f0a3acf0 100644 --- a/config/eur/arm9/overlays/ov090/delinks.txt +++ b/config/eur/arm9/overlays/ov090/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021658a0 end:0x02175398 kind:code align:32 .rodata start:0x02175398 end:0x021754fc kind:rodata align:4 .init start:0x021754fc end:0x02175c5c kind:code align:4 - .ctor start:0x02175c5c end:0x02175cb0 kind:rodata align:4 + .ctor start:0x02175c5c end:0x02175cac kind:rodata align:4 .data start:0x02175cc0 end:0x02176f80 kind:data align:32 .bss start:0x02176f80 end:0x02177e40 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov091/delinks.txt b/config/eur/arm9/overlays/ov091/delinks.txt index 58af8cc9..7089b890 100644 --- a/config/eur/arm9/overlays/ov091/delinks.txt +++ b/config/eur/arm9/overlays/ov091/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021658a0 end:0x02176850 kind:code align:32 .rodata start:0x02176850 end:0x02176960 kind:rodata align:4 .init start:0x02176960 end:0x02176fe8 kind:code align:4 - .ctor start:0x02176fe8 end:0x0217703c kind:rodata align:4 + .ctor start:0x02176fe8 end:0x02177038 kind:rodata align:4 .data start:0x02177040 end:0x02178080 kind:data align:32 .bss start:0x02178080 end:0x02178fc0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov092/delinks.txt b/config/eur/arm9/overlays/ov092/delinks.txt index 5e2f947a..0fd5dccb 100644 --- a/config/eur/arm9/overlays/ov092/delinks.txt +++ b/config/eur/arm9/overlays/ov092/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021658a0 end:0x0217a910 kind:code align:32 .rodata start:0x0217a910 end:0x0217ad7c kind:rodata align:4 .init start:0x0217ad7c end:0x0217b994 kind:code align:4 - .ctor start:0x0217b994 end:0x0217b9f4 kind:rodata align:4 + .ctor start:0x0217b994 end:0x0217b9f0 kind:rodata align:4 .data start:0x0217ba00 end:0x0217d040 kind:data align:32 .bss start:0x0217d040 end:0x0217e120 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov093/delinks.txt b/config/eur/arm9/overlays/ov093/delinks.txt index cbe6e57b..9c0bc962 100644 --- a/config/eur/arm9/overlays/ov093/delinks.txt +++ b/config/eur/arm9/overlays/ov093/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021658a0 end:0x02177bf4 kind:code align:32 .rodata start:0x02177bf4 end:0x021781d4 kind:rodata align:4 .init start:0x021781d4 end:0x02178710 kind:code align:4 - .ctor start:0x02178710 end:0x02178740 kind:rodata align:4 + .ctor start:0x02178710 end:0x0217873c kind:rodata align:4 .data start:0x02178740 end:0x02178d60 kind:data align:32 .bss start:0x02178d60 end:0x02179240 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov094/delinks.txt b/config/eur/arm9/overlays/ov094/delinks.txt index 54002339..54fff52e 100644 --- a/config/eur/arm9/overlays/ov094/delinks.txt +++ b/config/eur/arm9/overlays/ov094/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021658a0 end:0x02175f40 kind:code align:32 .rodata start:0x02175f40 end:0x02176588 kind:rodata align:4 .init start:0x02176588 end:0x02176e74 kind:code align:4 - .ctor start:0x02176e74 end:0x02176edc kind:rodata align:4 + .ctor start:0x02176e74 end:0x02176ed8 kind:rodata align:4 .data start:0x02176ee0 end:0x02178520 kind:data align:32 .bss start:0x02178520 end:0x02179b20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov095/delinks.txt b/config/eur/arm9/overlays/ov095/delinks.txt index 7ea5864c..a8bb3c20 100644 --- a/config/eur/arm9/overlays/ov095/delinks.txt +++ b/config/eur/arm9/overlays/ov095/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02179b20 end:0x02180d14 kind:code align:32 .rodata start:0x02180d14 end:0x02180d94 kind:rodata align:4 - .ctor start:0x02180d94 end:0x02180d98 kind:rodata align:4 + .ctor start:0x02180d94 end:0x02180d94 kind:rodata align:4 .data start:0x02180da0 end:0x02181040 kind:data align:32 .bss start:0x02181040 end:0x02181040 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov096/delinks.txt b/config/eur/arm9/overlays/ov096/delinks.txt index d42f43ae..3d5a254f 100644 --- a/config/eur/arm9/overlays/ov096/delinks.txt +++ b/config/eur/arm9/overlays/ov096/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02179b20 end:0x0217db9c kind:code align:32 .rodata start:0x0217db9c end:0x0217dbc8 kind:rodata align:4 .init start:0x0217dbc8 end:0x0217dd58 kind:code align:4 - .ctor start:0x0217dd58 end:0x0217dd70 kind:rodata align:4 + .ctor start:0x0217dd58 end:0x0217dd6c kind:rodata align:4 .data start:0x0217dd80 end:0x0217e240 kind:data align:32 .bss start:0x0217e240 end:0x0217e5a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov097/delinks.txt b/config/eur/arm9/overlays/ov097/delinks.txt index 64e92e23..41915b03 100644 --- a/config/eur/arm9/overlays/ov097/delinks.txt +++ b/config/eur/arm9/overlays/ov097/delinks.txt @@ -1,3 +1,2 @@ - .ctor start:0x02181040 end:0x02181044 kind:rodata align:4 + .ctor start:0x02181040 end:0x02181040 kind:rodata align:4 .bss start:0x02181060 end:0x02189c60 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov098/delinks.txt b/config/eur/arm9/overlays/ov098/delinks.txt index 131d9fc6..bbab1889 100644 --- a/config/eur/arm9/overlays/ov098/delinks.txt +++ b/config/eur/arm9/overlays/ov098/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02181040 end:0x021821bc kind:code align:32 .rodata start:0x021821bc end:0x021821d0 kind:rodata align:4 .init start:0x021821d0 end:0x02182360 kind:code align:4 - .ctor start:0x02182360 end:0x02182378 kind:rodata align:4 + .ctor start:0x02182360 end:0x02182374 kind:rodata align:4 .data start:0x02182380 end:0x02182780 kind:data align:32 .bss start:0x02182780 end:0x02182c20 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov099/delinks.txt b/config/eur/arm9/overlays/ov099/delinks.txt index ae993274..347e786a 100644 --- a/config/eur/arm9/overlays/ov099/delinks.txt +++ b/config/eur/arm9/overlays/ov099/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02181040 end:0x021820d0 kind:code align:32 .init start:0x021820d0 end:0x02182210 kind:code align:4 - .ctor start:0x02182210 end:0x02182224 kind:rodata align:4 + .ctor start:0x02182210 end:0x02182220 kind:rodata align:4 .data start:0x02182240 end:0x021825a0 kind:data align:32 .bss start:0x021825a0 end:0x02182940 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov100/delinks.txt b/config/eur/arm9/overlays/ov100/delinks.txt index 28ebcde9..173ace91 100644 --- a/config/eur/arm9/overlays/ov100/delinks.txt +++ b/config/eur/arm9/overlays/ov100/delinks.txt @@ -1,3 +1,2 @@ - .ctor start:0x02182c20 end:0x02182c24 kind:rodata align:4 + .ctor start:0x02182c20 end:0x02182c20 kind:rodata align:4 .bss start:0x02182c40 end:0x02189c40 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov101/delinks.txt b/config/eur/arm9/overlays/ov101/delinks.txt index 7acdb48e..d221ed17 100644 --- a/config/eur/arm9/overlays/ov101/delinks.txt +++ b/config/eur/arm9/overlays/ov101/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02182c20 end:0x021838d0 kind:code align:32 .init start:0x021838d0 end:0x021838e8 kind:code align:4 - .ctor start:0x021838e8 end:0x021838f0 kind:rodata align:4 + .ctor start:0x021838e8 end:0x021838ec kind:rodata align:4 .data start:0x02183900 end:0x02183a00 kind:data align:32 .bss start:0x02183a00 end:0x02183a00 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov102/delinks.txt b/config/eur/arm9/overlays/ov102/delinks.txt index 3411a445..53ff4c88 100644 --- a/config/eur/arm9/overlays/ov102/delinks.txt +++ b/config/eur/arm9/overlays/ov102/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02182c20 end:0x021848b0 kind:code align:32 .rodata start:0x021848b0 end:0x02184950 kind:rodata align:4 .init start:0x02184950 end:0x02184974 kind:code align:4 - .ctor start:0x02184974 end:0x0218497c kind:rodata align:4 + .ctor start:0x02184974 end:0x02184978 kind:rodata align:4 .data start:0x02184980 end:0x02184a40 kind:data align:32 .bss start:0x02184a40 end:0x02184a40 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov103/delinks.txt b/config/eur/arm9/overlays/ov103/delinks.txt index 79f82a61..8c37c8eb 100644 --- a/config/eur/arm9/overlays/ov103/delinks.txt +++ b/config/eur/arm9/overlays/ov103/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02184a40 end:0x021860e8 kind:code align:32 .rodata start:0x021860e8 end:0x0218610c kind:rodata align:4 .init start:0x0218610c end:0x02186158 kind:code align:4 - .ctor start:0x02186158 end:0x02186160 kind:rodata align:4 + .ctor start:0x02186158 end:0x0218615c kind:rodata align:4 .data start:0x02186160 end:0x02186600 kind:data align:32 .bss start:0x02186600 end:0x02186600 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov104/delinks.txt b/config/eur/arm9/overlays/ov104/delinks.txt index 7dd0eb2b..27006703 100644 --- a/config/eur/arm9/overlays/ov104/delinks.txt +++ b/config/eur/arm9/overlays/ov104/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02184a40 end:0x02185108 kind:code align:32 .init start:0x02185108 end:0x0218512c kind:code align:4 - .ctor start:0x0218512c end:0x02185134 kind:rodata align:4 + .ctor start:0x0218512c end:0x02185130 kind:rodata align:4 .data start:0x02185140 end:0x021851a0 kind:data align:32 .bss start:0x021851a0 end:0x021851a0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov105/delinks.txt b/config/eur/arm9/overlays/ov105/delinks.txt index 6ef2740b..a8ca8105 100644 --- a/config/eur/arm9/overlays/ov105/delinks.txt +++ b/config/eur/arm9/overlays/ov105/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02184a40 end:0x0218a110 kind:code align:32 .rodata start:0x0218a110 end:0x0218a1cc kind:rodata align:4 .init start:0x0218a1cc end:0x0218a254 kind:code align:4 - .ctor start:0x0218a254 end:0x0218a25c kind:rodata align:4 + .ctor start:0x0218a254 end:0x0218a258 kind:rodata align:4 .data start:0x0218a260 end:0x0218a320 kind:data align:32 .bss start:0x0218a320 end:0x0218a380 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov106/delinks.txt b/config/eur/arm9/overlays/ov106/delinks.txt index 52b8897c..7dcdbcce 100644 --- a/config/eur/arm9/overlays/ov106/delinks.txt +++ b/config/eur/arm9/overlays/ov106/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02184a40 end:0x02185aa4 kind:code align:32 .rodata start:0x02185aa4 end:0x02185b20 kind:rodata align:4 .init start:0x02185b20 end:0x02185b44 kind:code align:4 - .ctor start:0x02185b44 end:0x02185b4c kind:rodata align:4 + .ctor start:0x02185b44 end:0x02185b48 kind:rodata align:4 .data start:0x02185b60 end:0x02185bc0 kind:data align:32 .bss start:0x02185bc0 end:0x02185bc0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov107/delinks.txt b/config/eur/arm9/overlays/ov107/delinks.txt index ef01cc56..a7eb72b5 100644 --- a/config/eur/arm9/overlays/ov107/delinks.txt +++ b/config/eur/arm9/overlays/ov107/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02184a40 end:0x02186614 kind:code align:32 .rodata start:0x02186614 end:0x0218663c kind:rodata align:4 .init start:0x0218663c end:0x0218664c kind:code align:4 - .ctor start:0x0218664c end:0x02186654 kind:rodata align:4 + .ctor start:0x0218664c end:0x02186650 kind:rodata align:4 .data start:0x02186660 end:0x021866a0 kind:data align:32 .bss start:0x021866a0 end:0x02186720 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov108/delinks.txt b/config/eur/arm9/overlays/ov108/delinks.txt index 40ab294d..958177e6 100644 --- a/config/eur/arm9/overlays/ov108/delinks.txt +++ b/config/eur/arm9/overlays/ov108/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02184a40 end:0x02185e6c kind:code align:32 .rodata start:0x02185e6c end:0x02185ed8 kind:rodata align:4 - .ctor start:0x02185ed8 end:0x02185edc kind:rodata align:4 + .ctor start:0x02185ed8 end:0x02185ed8 kind:rodata align:4 .data start:0x02185ee0 end:0x02186020 kind:data align:32 .bss start:0x02186020 end:0x02186840 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov109/delinks.txt b/config/eur/arm9/overlays/ov109/delinks.txt index b6de6b9b..66b0c161 100644 --- a/config/eur/arm9/overlays/ov109/delinks.txt +++ b/config/eur/arm9/overlays/ov109/delinks.txt @@ -1,5 +1,4 @@ .text start:0x02184a40 end:0x02184d60 kind:code align:32 - .ctor start:0x02184d60 end:0x02184d64 kind:rodata align:4 + .ctor start:0x02184d60 end:0x02184d60 kind:rodata align:4 .data start:0x02184d80 end:0x02184dc0 kind:data align:32 .bss start:0x02184dc0 end:0x02184dc0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov110/delinks.txt b/config/eur/arm9/overlays/ov110/delinks.txt index 9f65fbd0..de8d0937 100644 --- a/config/eur/arm9/overlays/ov110/delinks.txt +++ b/config/eur/arm9/overlays/ov110/delinks.txt @@ -1,14 +1,14 @@ .text start:0x02184a40 end:0x02185dc4 kind:code align:32 .rodata start:0x02185dc4 end:0x02186190 kind:rodata align:4 .init start:0x02186190 end:0x021861bc kind:code align:4 - .ctor start:0x021861bc end:0x021861c4 kind:rodata align:4 + .ctor start:0x021861bc end:0x021861c0 kind:rodata align:4 .data start:0x021861e0 end:0x02186240 kind:data align:32 .bss start:0x02186240 end:0x0218a1c0 kind:bss align:32 src/110_PlayerGet/PlayerGet.cpp: .text start:0x02184a40 end:0x02185dc4 - .init start:0x02186190 end:0x021861bc .rodata start:0x02185dc4 end:0x02186190 - .ctor start:0x021861bc end:0x021861c4 + .init start:0x02186190 end:0x021861bc + .ctor start:0x021861bc end:0x021861c0 .data start:0x021861e0 end:0x02186240 .bss start:0x02186240 end:0x0218a1c0 diff --git a/config/eur/arm9/overlays/ov110/relocs.txt b/config/eur/arm9/overlays/ov110/relocs.txt index 9f99c3a0..7eeffebc 100644 --- a/config/eur/arm9/overlays/ov110/relocs.txt +++ b/config/eur/arm9/overlays/ov110/relocs.txt @@ -19,7 +19,7 @@ from:0x02184d88 kind:load to:0x020afc43 module:overlay(0) from:0x02184d8c kind:load to:0x020afc40 module:overlay(0) from:0x02184d90 kind:load to:0x020d8698 module:overlay(24) from:0x02184d94 kind:load to:0x02185dc8 module:overlay(110) -from:0x02184d98 kind:load to:0x02185dc8 add:2 module:overlay(110) +from:0x02184d98 kind:load to:0x02185dc8 add:0x2 module:overlay(110) from:0x02184d9c kind:load to:0x027e09b8 module:dtcm from:0x02184da0 kind:load to:0x020b6510 module:overlay(0) from:0x02184da4 kind:load to:0x020d86b0 module:overlay(24) @@ -30,8 +30,8 @@ from:0x02184e10 kind:arm_call to:0x0208a0f0 module:overlay(0) from:0x02184e2c kind:arm_call to:0x020590e4 module:overlay(0) from:0x02184e44 kind:arm_call_thumb to:0x02057b70 module:overlay(0) from:0x02184e60 kind:arm_call to:0x0203d160 module:main -from:0x02184e6c kind:load to:0x02186204 add:8 module:overlay(110) -from:0x02184e70 kind:load to:0x021861f8 add:8 module:overlay(110) +from:0x02184e6c kind:load to:0x02186204 add:0x8 module:overlay(110) +from:0x02184e70 kind:load to:0x021861f8 add:0x8 module:overlay(110) from:0x02184e74 kind:load to:0x020a02d4 module:overlay(0) from:0x02184e78 kind:load to:0x02185d30 module:overlay(110) from:0x02184e90 kind:arm_call to:0x0205ca74 module:overlay(0) @@ -41,7 +41,7 @@ from:0x02184f0c kind:arm_call to:0x0203d210 module:main from:0x02184f14 kind:arm_call_thumb to:0x02057b8c module:overlay(0) from:0x02184f1c kind:arm_call to:0x0208a164 module:overlay(0) from:0x02184f24 kind:arm_call to:0x0208f8c4 module:overlay(0) -from:0x02184f30 kind:load to:0x02186204 add:8 module:overlay(110) +from:0x02184f30 kind:load to:0x02186204 add:0x8 module:overlay(110) from:0x02184f34 kind:load to:0x027e0cec module:dtcm from:0x02184f3c kind:load to:0x020a02d4 module:overlay(0) from:0x02184f54 kind:arm_call to:0x0205ca74 module:overlay(0) @@ -52,7 +52,7 @@ from:0x02184fd8 kind:arm_call_thumb to:0x02057b8c module:overlay(0) from:0x02184fe0 kind:arm_call to:0x0208a164 module:overlay(0) from:0x02184fe8 kind:arm_call to:0x0208f8c4 module:overlay(0) from:0x02184ff0 kind:arm_call to:0x02011ff4 module:main -from:0x02184ffc kind:load to:0x02186204 add:8 module:overlay(110) +from:0x02184ffc kind:load to:0x02186204 add:0x8 module:overlay(110) from:0x02185000 kind:load to:0x027e0cec module:dtcm from:0x02185008 kind:load to:0x020a02d4 module:overlay(0) from:0x0218511c kind:arm_call to:0x020aa02c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov111/delinks.txt b/config/eur/arm9/overlays/ov111/delinks.txt index 3bf3d4b5..da915283 100644 --- a/config/eur/arm9/overlays/ov111/delinks.txt +++ b/config/eur/arm9/overlays/ov111/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02184a40 end:0x02185d98 kind:code align:32 .rodata start:0x02185d98 end:0x02185e1c kind:rodata align:4 - .ctor start:0x02185e1c end:0x02185e20 kind:rodata align:4 + .ctor start:0x02185e1c end:0x02185e1c kind:rodata align:4 .data start:0x02185e20 end:0x02185ea0 kind:data align:32 .bss start:0x02185ea0 end:0x02185ea0 kind:bss align:32 - diff --git a/config/eur/arm9/overlays/ov112/delinks.txt b/config/eur/arm9/overlays/ov112/delinks.txt index 4f96a8c5..decde6ce 100644 --- a/config/eur/arm9/overlays/ov112/delinks.txt +++ b/config/eur/arm9/overlays/ov112/delinks.txt @@ -1,5 +1,5 @@ .text start:0x02184a40 end:0x021864e0 kind:code align:32 - .ctor start:0x021864e0 end:0x021864e4 kind:rodata align:4 + .ctor start:0x021864e0 end:0x021864e0 kind:rodata align:4 .data start:0x02186500 end:0x02186560 kind:data align:32 .bss start:0x02186560 end:0x02186560 kind:bss align:32 diff --git a/config/eur/arm9/overlays/ov112/relocs.txt b/config/eur/arm9/overlays/ov112/relocs.txt index bb46215b..68d3ec5f 100644 --- a/config/eur/arm9/overlays/ov112/relocs.txt +++ b/config/eur/arm9/overlays/ov112/relocs.txt @@ -1,14 +1,14 @@ from:0x02184a48 kind:arm_call to:0x0208f820 module:overlay(0) -from:0x02184b00 kind:load to:0x02186500 add:8 module:overlay(112) +from:0x02184b00 kind:load to:0x02186500 add:0x8 module:overlay(112) from:0x02184b38 kind:arm_call to:0x0208a164 module:overlay(0) from:0x02184b40 kind:arm_call to:0x0205ca74 module:overlay(0) from:0x02184b48 kind:arm_call to:0x0208f8c4 module:overlay(0) -from:0x02184b54 kind:load to:0x02186500 add:8 module:overlay(112) +from:0x02184b54 kind:load to:0x02186500 add:0x8 module:overlay(112) from:0x02184b90 kind:arm_call to:0x0208a164 module:overlay(0) from:0x02184b98 kind:arm_call to:0x0205ca74 module:overlay(0) from:0x02184ba0 kind:arm_call to:0x0208f8c4 module:overlay(0) from:0x02184ba8 kind:arm_call to:0x02011ff4 module:main -from:0x02184bb4 kind:load to:0x02186500 add:8 module:overlay(112) +from:0x02184bb4 kind:load to:0x02186500 add:0x8 module:overlay(112) from:0x02184be4 kind:arm_call to:0x01fff3b4 module:itcm from:0x02184c10 kind:load to:0x027e0ce4 module:dtcm from:0x02184c70 kind:arm_call to:0x02080658 module:overlay(0) @@ -72,7 +72,7 @@ from:0x02185fa4 kind:arm_call to:0x02082a28 module:overlay(0) from:0x02186000 kind:arm_call to:0x020907c4 module:overlay(0) from:0x02186008 kind:load to:0x027e0cdc module:dtcm from:0x02186014 kind:arm_call to:0x0208f820 module:overlay(0) -from:0x02186048 kind:load to:0x02186528 add:8 module:overlay(112) +from:0x02186048 kind:load to:0x02186528 add:0x8 module:overlay(112) from:0x02186088 kind:arm_call to:0x0208ba10 module:overlay(0) from:0x021860a8 kind:arm_call to:0x0208cf20 module:overlay(0) from:0x021860d0 kind:arm_call to:0x02087ee8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov113/delinks.txt b/config/eur/arm9/overlays/ov113/delinks.txt index 4a4ba5dc..4ee4e47e 100644 --- a/config/eur/arm9/overlays/ov113/delinks.txt +++ b/config/eur/arm9/overlays/ov113/delinks.txt @@ -1,5 +1,4 @@ .text start:0x02184a40 end:0x021855ec kind:code align:32 - .ctor start:0x021855ec end:0x021855f0 kind:rodata align:4 + .ctor start:0x021855ec end:0x021855ec kind:rodata align:4 .data start:0x02185600 end:0x021856a0 kind:data align:32 .bss start:0x021856a0 end:0x021856a0 kind:bss align:32 - diff --git a/config/eur/arm9/relocs.txt b/config/eur/arm9/relocs.txt index 80c8c40b..42a75ede 100644 --- a/config/eur/arm9/relocs.txt +++ b/config/eur/arm9/relocs.txt @@ -1942,19 +1942,19 @@ from:0x020154e4 kind:thumb_call_arm to:0x020153c4 module:main from:0x020154f4 kind:thumb_call_arm to:0x02015338 module:main from:0x0201550a kind:thumb_call to:0x02012f08 module:main from:0x02015520 kind:thumb_call_arm to:0x02011ff4 module:main -from:0x0201554c kind:load to:0x02043f00 add:8 module:main -from:0x02015568 kind:load to:0x02043f00 add:8 module:main +from:0x0201554c kind:load to:0x02043f00 add:0x8 module:main +from:0x02015568 kind:load to:0x02043f00 add:0x8 module:main from:0x0201557c kind:thumb_call to:0x02015528 module:main -from:0x02015584 kind:load to:0x02043f00 add:8 module:main +from:0x02015584 kind:load to:0x02043f00 add:0x8 module:main from:0x02015598 kind:thumb_call to:0x02015528 module:main from:0x0201559e kind:thumb_call_arm to:0x02011ff4 module:main -from:0x020155a8 kind:load to:0x02043f00 add:8 module:main +from:0x020155a8 kind:load to:0x02043f00 add:0x8 module:main from:0x020155ca kind:thumb_call to:0x02012ec8 module:main from:0x020155e4 kind:thumb_call_arm to:0x02011ff4 module:main from:0x020155ea kind:thumb_call to:0x0201552c module:main from:0x02015616 kind:thumb_call to:0x020010e0 module:main from:0x02015620 kind:load to:0x0204999c module:main -from:0x02015640 kind:load to:0x02043f1c add:8 module:main +from:0x02015640 kind:load to:0x02043f1c add:0x8 module:main from:0x02015648 kind:thumb_call to:0x02015528 module:main from:0x02015654 kind:thumb_call to:0x02015528 module:main from:0x0201565a kind:thumb_call_arm to:0x02011ff4 module:main @@ -2189,16 +2189,16 @@ from:0x02018274 kind:arm_call to:0x02019580 module:main from:0x020182a4 kind:arm_call to:0x02057688 module:overlay(0) from:0x020182c8 kind:arm_call to:0x02057640 module:overlay(0) from:0x020182e0 kind:load to:0x0204a110 module:main -from:0x020182f0 kind:load to:0x02044010 add:8 module:main +from:0x020182f0 kind:load to:0x02044010 add:0x8 module:main from:0x02018308 kind:arm_call_thumb to:0x020bd58c module:overlay(1) -from:0x02018314 kind:load to:0x02044010 add:8 module:main +from:0x02018314 kind:load to:0x02044010 add:0x8 module:main from:0x02018318 kind:load to:0x0204a110 module:main from:0x02018330 kind:arm_call_thumb to:0x020bd58c module:overlay(1) from:0x02018338 kind:arm_call to:0x02011ff4 module:main -from:0x02018344 kind:load to:0x02044010 add:8 module:main +from:0x02018344 kind:load to:0x02044010 add:0x8 module:main from:0x02018348 kind:load to:0x0204a110 module:main from:0x02018360 kind:arm_call_thumb to:0x020bd58c module:overlay(1) -from:0x0201836c kind:load to:0x02044010 add:8 module:main +from:0x0201836c kind:load to:0x02044010 add:0x8 module:main from:0x02018370 kind:load to:0x0204a110 module:main from:0x02018380 kind:load to:0x0204a110 module:main from:0x02018384 kind:load to:0x02018d34 module:main @@ -2225,27 +2225,27 @@ from:0x020184a4 kind:thumb_call_arm to:0x0201beb8 module:main from:0x020184b2 kind:thumb_call_arm to:0x02061b2c module:overlay(0) from:0x020184bc kind:thumb_call_arm to:0x02013b10 module:main from:0x020184c6 kind:thumb_call to:0x020141dc module:main -from:0x020184ec kind:load to:0x0204405c add:8 module:main +from:0x020184ec kind:load to:0x0204405c add:0x8 module:main from:0x020184f0 kind:load to:0x020b504c module:overlay(0) from:0x02018500 kind:thumb_call_arm to:0x0201beb8 module:main from:0x0201850e kind:thumb_call_arm to:0x02061b2c module:overlay(0) from:0x02018518 kind:thumb_call_arm to:0x02013b10 module:main from:0x02018522 kind:thumb_call to:0x020141dc module:main -from:0x02018548 kind:load to:0x0204405c add:8 module:main +from:0x02018548 kind:load to:0x0204405c add:0x8 module:main from:0x0201854c kind:load to:0x020b504c module:overlay(0) from:0x02018560 kind:thumb_call_arm to:0x02018a8c module:main from:0x0201856a kind:thumb_call_arm to:0x02061b74 module:overlay(0) from:0x02018570 kind:thumb_call_arm to:0x0201bee8 module:main -from:0x02018578 kind:load to:0x0204405c add:8 module:main +from:0x02018578 kind:load to:0x0204405c add:0x8 module:main from:0x02018584 kind:thumb_call_arm to:0x02018a8c module:main from:0x0201858e kind:thumb_call_arm to:0x02061b74 module:overlay(0) from:0x02018594 kind:thumb_call_arm to:0x0201bee8 module:main from:0x0201859a kind:thumb_call_arm to:0x02011ff4 module:main -from:0x020185a4 kind:load to:0x0204405c add:8 module:main +from:0x020185a4 kind:load to:0x0204405c add:0x8 module:main from:0x020185b0 kind:thumb_call_arm to:0x02018a8c module:main from:0x020185ba kind:thumb_call_arm to:0x02061b74 module:overlay(0) from:0x020185c0 kind:thumb_call_arm to:0x0201bee8 module:main -from:0x020185c8 kind:load to:0x0204405c add:8 module:main +from:0x020185c8 kind:load to:0x0204405c add:0x8 module:main from:0x020185f4 kind:arm_call to:0x02069d3c module:overlay(0) from:0x02018608 kind:load to:0x020b50c0 module:overlay(0) from:0x02018618 kind:arm_call to:0x02069d7c module:overlay(0) @@ -2640,19 +2640,19 @@ from:0x0201b9cc kind:arm_call to:0x020166cc module:main from:0x0201ba28 kind:arm_call to:0x02016694 module:main from:0x0201ba30 kind:arm_call to:0x0201ba94 module:main from:0x0201ba48 kind:arm_call to:0x0201667c module:main -from:0x0201ba64 kind:load to:0x020440ec add:8 module:main +from:0x0201ba64 kind:load to:0x020440ec add:0x8 module:main from:0x0201ba74 kind:arm_call to:0x0201667c module:main -from:0x0201ba90 kind:load to:0x020440ec add:8 module:main +from:0x0201ba90 kind:load to:0x020440ec add:0x8 module:main from:0x0201baa0 kind:arm_call to:0x02016694 module:main from:0x0201bab8 kind:arm_call to:0x02016694 module:main from:0x0201bac0 kind:arm_call to:0x02011ff4 module:main from:0x0201bad8 kind:arm_call to:0x02016694 module:main from:0x0201baf4 kind:arm_call to:0x0201ba3c module:main from:0x0201bb28 kind:arm_call to:0x0201bb84 module:main -from:0x0201bb34 kind:load to:0x02044100 add:8 module:main +from:0x0201bb34 kind:load to:0x02044100 add:0x8 module:main from:0x0201bb40 kind:arm_call to:0x0201ba3c module:main from:0x0201bb74 kind:arm_call to:0x0201bb84 module:main -from:0x0201bb80 kind:load to:0x02044100 add:8 module:main +from:0x0201bb80 kind:load to:0x02044100 add:0x8 module:main from:0x0201bba0 kind:load to:0x0201bbcc module:main from:0x0201bbc0 kind:arm_call to:0x0201bbcc module:main from:0x0201bc68 kind:arm_call to:0x01ffb66c module:itcm @@ -2924,19 +2924,19 @@ from:0x0201f634 kind:arm_call to:0x02062408 module:overlay(0) from:0x0201f63c kind:load to:0x0204a110 module:main from:0x0201f64c kind:arm_call to:0x0201f244 module:main from:0x0201f65c kind:arm_call to:0x02061f30 module:overlay(0) -from:0x0201f670 kind:load to:0x02044394 add:8 module:main +from:0x0201f670 kind:load to:0x02044394 add:0x8 module:main from:0x0201f674 kind:load to:0x020443a8 module:main from:0x0201f684 kind:arm_call to:0x0201f244 module:main from:0x0201f694 kind:arm_call to:0x02061f30 module:overlay(0) -from:0x0201f6a8 kind:load to:0x02044394 add:8 module:main +from:0x0201f6a8 kind:load to:0x02044394 add:0x8 module:main from:0x0201f6ac kind:load to:0x020443a8 module:main from:0x0201f6c4 kind:arm_call to:0x0201f288 module:main from:0x0201f6d4 kind:arm_call to:0x02061f30 module:overlay(0) -from:0x0201f6e8 kind:load to:0x02044394 add:8 module:main +from:0x0201f6e8 kind:load to:0x02044394 add:0x8 module:main from:0x0201f6ec kind:load to:0x020443a8 module:main from:0x0201f704 kind:arm_call to:0x0201f288 module:main from:0x0201f714 kind:arm_call to:0x02061f30 module:overlay(0) -from:0x0201f728 kind:load to:0x02044394 add:8 module:main +from:0x0201f728 kind:load to:0x02044394 add:0x8 module:main from:0x0201f72c kind:load to:0x020443a8 module:main from:0x0201f748 kind:arm_call to:0x02067a2c module:overlay(0) from:0x0201f780 kind:arm_call to:0x02019590 module:main @@ -5597,7 +5597,7 @@ from:0x0203cd4c kind:arm_call to:0x0203cc20 module:main from:0x0203cd64 kind:arm_call to:0x0203d458 module:main from:0x0203cda0 kind:arm_call to:0x02011ff4 module:main from:0x0203cdb4 kind:load to:0x02044ca0 module:main -from:0x0203cde4 kind:load to:0x020431c0 module:main +from:0x0203cde4 kind:link_time_const(ARM9_CTOR_START) from:0x0203ce28 kind:load to:0x02051ad4 module:main from:0x0203ce34 kind:load to:0x020336e8 module:main from:0x0203ce40 kind:load to:0x0203ce44 module:main diff --git a/config/jp/arm9/delinks.txt b/config/jp/arm9/delinks.txt index 1dd48f57..cc6d19f5 100644 --- a/config/jp/arm9/delinks.txt +++ b/config/jp/arm9/delinks.txt @@ -3,7 +3,7 @@ .exceptix start:0x0203eb2c end:0x0203ed54 kind:rodata align:4 .init start:0x0203ed54 end:0x0203f1d4 kind:code align:4 .rodata start:0x0203f1d4 end:0x0204470c kind:rodata align:4 - .ctor start:0x0204470c end:0x02044768 kind:rodata align:4 + .ctor start:0x0204470c end:0x02044764 kind:rodata align:4 .data start:0x02044780 end:0x02046340 kind:data align:32 .bss start:0x02046340 end:0x02053060 kind:bss align:32 diff --git a/config/jp/arm9/dtcm/delinks.txt b/config/jp/arm9/dtcm/delinks.txt index dfe0379e..06c2636a 100644 --- a/config/jp/arm9/dtcm/delinks.txt +++ b/config/jp/arm9/dtcm/delinks.txt @@ -1,3 +1,2 @@ .data start:0x027e0000 end:0x027e0200 kind:data align:32 .bss start:0x027e0200 end:0x027e0da0 kind:bss align:32 - diff --git a/config/jp/arm9/itcm/delinks.txt b/config/jp/arm9/itcm/delinks.txt index e2b7cf3f..e6ad4257 100644 --- a/config/jp/arm9/itcm/delinks.txt +++ b/config/jp/arm9/itcm/delinks.txt @@ -1,3 +1,2 @@ .text start:0x01ff8000 end:0x01fffe18 kind:code align:32 .bss start:0x01fffe20 end:0x01fffe20 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov000/delinks.txt b/config/jp/arm9/overlays/ov000/delinks.txt index 1c6f120d..08892387 100644 --- a/config/jp/arm9/overlays/ov000/delinks.txt +++ b/config/jp/arm9/overlays/ov000/delinks.txt @@ -1,7 +1,7 @@ .text start:0x02053060 end:0x020aba38 kind:code align:32 .rodata start:0x020aba38 end:0x020b17a8 kind:rodata align:4 .init start:0x020b17a8 end:0x020b30c4 kind:code align:4 - .ctor start:0x020b30c4 end:0x020b3154 kind:rodata align:4 + .ctor start:0x020b30c4 end:0x020b3150 kind:rodata align:4 .data start:0x020b3160 end:0x020b66c0 kind:data align:32 .bss start:0x020b66c0 end:0x020b7d40 kind:bss align:32 diff --git a/config/jp/arm9/overlays/ov000/relocs.txt b/config/jp/arm9/overlays/ov000/relocs.txt index 18e9d1bc..b63fd1ce 100644 --- a/config/jp/arm9/overlays/ov000/relocs.txt +++ b/config/jp/arm9/overlays/ov000/relocs.txt @@ -1378,25 +1378,25 @@ from:0x02063040 kind:arm_call to:0x02011ff4 module:main from:0x02063058 kind:arm_call to:0x0201662c module:main from:0x02063078 kind:arm_call to:0x02016614 module:main from:0x02063088 kind:arm_call to:0x02016614 module:main -from:0x020630ac kind:load to:0x020b3658 add:8 module:overlay(0) -from:0x020630b0 kind:load to:0x020b3640 add:8 module:overlay(0) +from:0x020630ac kind:load to:0x020b3658 add:0x8 module:overlay(0) +from:0x020630b0 kind:load to:0x020b3640 add:0x8 module:overlay(0) from:0x020630c0 kind:arm_call to:0x02016614 module:main from:0x020630d0 kind:arm_call to:0x02016614 module:main -from:0x020630f4 kind:load to:0x020b3658 add:8 module:overlay(0) -from:0x020630f8 kind:load to:0x020b3640 add:8 module:overlay(0) +from:0x020630f4 kind:load to:0x020b3658 add:0x8 module:overlay(0) +from:0x020630f8 kind:load to:0x020b3640 add:0x8 module:overlay(0) from:0x02063154 kind:arm_call to:0x02063014 module:overlay(0) from:0x0206315c kind:arm_call to:0x0201662c module:main -from:0x02063168 kind:load to:0x020b3658 add:8 module:overlay(0) +from:0x02063168 kind:load to:0x020b3658 add:0x8 module:overlay(0) from:0x020631c4 kind:arm_call to:0x02063014 module:overlay(0) from:0x020631cc kind:arm_call to:0x0201662c module:main from:0x020631d4 kind:arm_call to:0x02011ff4 module:main -from:0x020631e0 kind:load to:0x020b3658 add:8 module:overlay(0) +from:0x020631e0 kind:load to:0x020b3658 add:0x8 module:overlay(0) from:0x0206323c kind:arm_call to:0x02063014 module:overlay(0) from:0x02063244 kind:arm_call to:0x0201662c module:main -from:0x02063250 kind:load to:0x020b3658 add:8 module:overlay(0) +from:0x02063250 kind:load to:0x020b3658 add:0x8 module:overlay(0) from:0x02063290 kind:arm_call to:0x0202a17c module:main from:0x020632a0 kind:arm_call to:0x0202a17c module:main -from:0x020632bc kind:load to:0x020b367c add:8 module:overlay(0) +from:0x020632bc kind:load to:0x020b367c add:0x8 module:overlay(0) from:0x020632d0 kind:arm_call to:0x020090d4 module:main from:0x020632ec kind:arm_call to:0x0200911c module:main from:0x02063384 kind:arm_call to:0x02008a0c module:main @@ -1761,7 +1761,7 @@ from:0x02067cbc kind:arm_call to:0x02067be4 module:overlay(0) from:0x02067cf0 kind:arm_call to:0x0203e740 module:main from:0x02067cfc kind:load to:0x02067d00 module:overlay(0) from:0x02067d08 kind:arm_call_thumb to:0x02015504 module:main -from:0x02067d58 kind:load to:0x020b3870 add:8 module:overlay(0) +from:0x02067d58 kind:load to:0x020b3870 add:0x8 module:overlay(0) from:0x02067e00 kind:arm_call to:0x02067f90 module:overlay(0) from:0x02067f2c kind:arm_call to:0x02067f64 module:overlay(0) from:0x02067f34 kind:load to:0x020b684c module:overlay(0) @@ -1801,21 +1801,21 @@ from:0x020687c4 kind:load to:0x027e0d04 module:dtcm from:0x020687c8 kind:load to:0x020b7ab8 module:overlay(0) from:0x020687cc kind:load to:0x020d9266 module:overlay(24) from:0x020687f4 kind:arm_call to:0x02067d38 module:overlay(0) -from:0x02068810 kind:load to:0x020b389c add:8 module:overlay(0) +from:0x02068810 kind:load to:0x020b389c add:0x8 module:overlay(0) from:0x02068828 kind:arm_call to:0x02067d38 module:overlay(0) -from:0x02068844 kind:load to:0x020b389c add:8 module:overlay(0) +from:0x02068844 kind:load to:0x020b389c add:0x8 module:overlay(0) from:0x02068860 kind:arm_call to:0x02067f3c module:overlay(0) from:0x02068878 kind:arm_call to:0x02069404 module:overlay(0) -from:0x02068888 kind:load to:0x020b389c add:8 module:overlay(0) +from:0x02068888 kind:load to:0x020b389c add:0x8 module:overlay(0) from:0x0206888c kind:load to:0x020b684c module:overlay(0) from:0x020688a8 kind:arm_call to:0x02067f3c module:overlay(0) from:0x020688c0 kind:arm_call to:0x02069404 module:overlay(0) from:0x020688c8 kind:arm_call to:0x02011ff4 module:main -from:0x020688d8 kind:load to:0x020b389c add:8 module:overlay(0) +from:0x020688d8 kind:load to:0x020b389c add:0x8 module:overlay(0) from:0x020688dc kind:load to:0x020b684c module:overlay(0) from:0x020688f8 kind:arm_call to:0x02067f3c module:overlay(0) from:0x02068910 kind:arm_call to:0x02069404 module:overlay(0) -from:0x02068920 kind:load to:0x020b389c add:8 module:overlay(0) +from:0x02068920 kind:load to:0x020b389c add:0x8 module:overlay(0) from:0x02068924 kind:load to:0x020b684c module:overlay(0) from:0x02068938 kind:arm_call to:0x02067f3c module:overlay(0) from:0x02068954 kind:arm_call to:0x02069404 module:overlay(0) @@ -1959,9 +1959,9 @@ from:0x02069a68 kind:load to:0x0204b6a0 module:main from:0x02069a7c kind:load to:0x0201beb4 module:main from:0x02069aa4 kind:load to:0x0204b690 module:main from:0x02069aec kind:arm_call to:0x02069aa8 module:overlay(0) -from:0x02069b68 kind:load to:0x020b38f4 add:8 module:overlay(0) +from:0x02069b68 kind:load to:0x020b38f4 add:0x8 module:overlay(0) from:0x02069ba0 kind:arm_call to:0x02069aa8 module:overlay(0) -from:0x02069c1c kind:load to:0x020b38f4 add:8 module:overlay(0) +from:0x02069c1c kind:load to:0x020b38f4 add:0x8 module:overlay(0) from:0x02069c30 kind:arm_call to:0x02011ff4 module:main from:0x02069c84 kind:arm_call to:0x0206adc0 module:overlay(0) from:0x02069d24 kind:arm_call to:0x02067d14 module:overlay(0) @@ -6680,7 +6680,7 @@ from:0x02099b8c kind:arm_call to:0x02098dac module:overlay(0) from:0x02099ba8 kind:arm_call to:0x0202a20c module:main from:0x02099bf4 kind:arm_call to:0x02099dd4 module:overlay(0) from:0x02099c00 kind:arm_call to:0x02099c34 module:overlay(0) -from:0x02099c0c kind:load to:0x020b48e4 add:8 module:overlay(0) +from:0x02099c0c kind:load to:0x020b48e4 add:0x8 module:overlay(0) from:0x02099c10 kind:load to:0x020b6ba4 module:overlay(0) from:0x02099c24 kind:arm_call to:0x02011ff4 module:main from:0x02099c90 kind:arm_call to:0x02099c98 module:overlay(0) @@ -7743,7 +7743,7 @@ from:0x020a29f8 kind:arm_call to:0x0202a20c module:main from:0x020a2a08 kind:arm_call to:0x0202a20c module:main from:0x020a2a18 kind:arm_call to:0x0202a20c module:main from:0x020a2a28 kind:arm_call to:0x0202a20c module:main -from:0x020a2a30 kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020a2a30 kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020a2a48 kind:arm_call to:0x02029980 module:main from:0x020a2a58 kind:arm_call to:0x02033d7c module:main from:0x020a2a68 kind:arm_call to:0x02033e24 module:main @@ -8396,7 +8396,7 @@ from:0x020aa3ac kind:load to:0x020b152c module:overlay(0) from:0x020aa3c0 kind:arm_call to:0x02099b30 module:overlay(0) from:0x020aa3d0 kind:arm_call to:0x02080464 module:overlay(0) from:0x020aa448 kind:arm_call_thumb to:0x020d800c module:overlay(24) -from:0x020aa4b4 kind:load to:0x020b6588 add:8 module:overlay(0) +from:0x020aa4b4 kind:load to:0x020b6588 add:0x8 module:overlay(0) from:0x020aa4cc kind:arm_call to:0x020804a0 module:overlay(0) from:0x020aa4d4 kind:arm_call to:0x02099c30 module:overlay(0) from:0x020aa4ec kind:arm_call to:0x020804a0 module:overlay(0) @@ -9033,7 +9033,6 @@ from:0x020b04c8 kind:load to:0x0217ce4c module:overlay(92) from:0x020b04cc kind:load to:0x020e5ac4 module:overlays(20,31) from:0x020b04d0 kind:load to:0x0214f458 module:overlays(29,58) from:0x020b04d4 kind:load to:0x0214fa0c module:overlays(30,58) -from:0x020b04d8 kind:load to:0x0212eb89 module:overlays(40,44) from:0x020b04dc kind:load to:0x0216fc28 module:overlay(91) from:0x020b04e0 kind:load to:0x02149bd0 module:overlays(28,70) from:0x020b04e4 kind:load to:0x02111fe4 module:overlays(26,31) diff --git a/config/jp/arm9/overlays/ov001/delinks.txt b/config/jp/arm9/overlays/ov001/delinks.txt index ce92dac1..64f1ceaf 100644 --- a/config/jp/arm9/overlays/ov001/delinks.txt +++ b/config/jp/arm9/overlays/ov001/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020b7d40 end:0x020c2278 kind:code align:32 .rodata start:0x020c2278 end:0x020c4068 kind:rodata align:4 .init start:0x020c4068 end:0x020c4154 kind:code align:4 - .ctor start:0x020c4154 end:0x020c4178 kind:rodata align:4 + .ctor start:0x020c4154 end:0x020c4174 kind:rodata align:4 .data start:0x020c4180 end:0x020c4820 kind:data align:32 .bss start:0x020c4820 end:0x020c5f60 kind:bss align:32 diff --git a/config/jp/arm9/overlays/ov001/relocs.txt b/config/jp/arm9/overlays/ov001/relocs.txt index bf7c0223..b44f35de 100644 --- a/config/jp/arm9/overlays/ov001/relocs.txt +++ b/config/jp/arm9/overlays/ov001/relocs.txt @@ -2352,7 +2352,7 @@ from:0x020c2d78 kind:load to:0x020c4d5c module:overlay(1) from:0x020c2de4 kind:load to:0x020c5f41 module:overlay(1) from:0x020c2df0 kind:load to:0x020c3da4 module:overlay(1) from:0x020c2e5c kind:load to:0x020c5f41 module:overlay(1) -from:0x020c2e68 kind:load to:0x020c3e78 add:4 module:overlay(1) +from:0x020c2e68 kind:load to:0x020c3e78 add:0x4 module:overlay(1) from:0x020c2ed4 kind:load to:0x020c5f41 module:overlay(1) from:0x020c2ee0 kind:load to:0x020c3f90 module:overlay(1) from:0x020c2f4c kind:load to:0x020c5f41 module:overlay(1) diff --git a/config/jp/arm9/overlays/ov002/delinks.txt b/config/jp/arm9/overlays/ov002/delinks.txt index 16484fbf..4722f871 100644 --- a/config/jp/arm9/overlays/ov002/delinks.txt +++ b/config/jp/arm9/overlays/ov002/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020be198 kind:code align:32 .rodata start:0x020be198 end:0x020be4b0 kind:rodata align:4 .init start:0x020be4b0 end:0x020be4d0 kind:code align:4 - .ctor start:0x020be4d0 end:0x020be4d8 kind:rodata align:4 + .ctor start:0x020be4d0 end:0x020be4d4 kind:rodata align:4 .data start:0x020be4e0 end:0x020be880 kind:data align:32 .bss start:0x020be880 end:0x020c5420 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov003/delinks.txt b/config/jp/arm9/overlays/ov003/delinks.txt index 5a54f026..4c958ca6 100644 --- a/config/jp/arm9/overlays/ov003/delinks.txt +++ b/config/jp/arm9/overlays/ov003/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020bb568 kind:code align:32 .rodata start:0x020bb568 end:0x020bb6d4 kind:rodata align:4 .init start:0x020bb6d4 end:0x020bb73c kind:code align:4 - .ctor start:0x020bb73c end:0x020bb748 kind:rodata align:4 + .ctor start:0x020bb73c end:0x020bb744 kind:rodata align:4 .data start:0x020bb760 end:0x020bbf60 kind:data align:32 .bss start:0x020bbf60 end:0x020bcbc0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov004/delinks.txt b/config/jp/arm9/overlays/ov004/delinks.txt index 0d23ddcf..ee1c823b 100644 --- a/config/jp/arm9/overlays/ov004/delinks.txt +++ b/config/jp/arm9/overlays/ov004/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020bb26c kind:code align:32 .rodata start:0x020bb26c end:0x020bb624 kind:rodata align:4 .init start:0x020bb624 end:0x020bb650 kind:code align:4 - .ctor start:0x020bb650 end:0x020bb658 kind:rodata align:4 + .ctor start:0x020bb650 end:0x020bb654 kind:rodata align:4 .data start:0x020bb660 end:0x020bb7a0 kind:data align:32 .bss start:0x020bb7a0 end:0x020c4400 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov005/delinks.txt b/config/jp/arm9/overlays/ov005/delinks.txt index 1d70e075..07aee633 100644 --- a/config/jp/arm9/overlays/ov005/delinks.txt +++ b/config/jp/arm9/overlays/ov005/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020ba408 kind:code align:32 .rodata start:0x020ba408 end:0x020ba434 kind:rodata align:4 .init start:0x020ba434 end:0x020ba4a4 kind:code align:4 - .ctor start:0x020ba4a4 end:0x020ba4b4 kind:rodata align:4 + .ctor start:0x020ba4a4 end:0x020ba4b0 kind:rodata align:4 .data start:0x020ba4c0 end:0x020ba620 kind:data align:32 .bss start:0x020ba620 end:0x020bce80 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov006/delinks.txt b/config/jp/arm9/overlays/ov006/delinks.txt index 30b61a43..830da47a 100644 --- a/config/jp/arm9/overlays/ov006/delinks.txt +++ b/config/jp/arm9/overlays/ov006/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020ba1ac kind:code align:32 .rodata start:0x020ba1ac end:0x020ba23c kind:rodata align:4 .init start:0x020ba23c end:0x020ba254 kind:code align:4 - .ctor start:0x020ba254 end:0x020ba25c kind:rodata align:4 + .ctor start:0x020ba254 end:0x020ba258 kind:rodata align:4 .data start:0x020ba260 end:0x020ba320 kind:data align:32 .bss start:0x020ba320 end:0x020bbbc0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov007/delinks.txt b/config/jp/arm9/overlays/ov007/delinks.txt index c7105e1d..5670a240 100644 --- a/config/jp/arm9/overlays/ov007/delinks.txt +++ b/config/jp/arm9/overlays/ov007/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b7d40 end:0x020b9b94 kind:code align:32 .init start:0x020b9b94 end:0x020b9bc0 kind:code align:4 - .ctor start:0x020b9bc0 end:0x020b9bc8 kind:rodata align:4 + .ctor start:0x020b9bc0 end:0x020b9bc4 kind:rodata align:4 .data start:0x020b9be0 end:0x020b9d00 kind:data align:32 .bss start:0x020b9d00 end:0x020bafc0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov008/delinks.txt b/config/jp/arm9/overlays/ov008/delinks.txt index 0858e974..29241966 100644 --- a/config/jp/arm9/overlays/ov008/delinks.txt +++ b/config/jp/arm9/overlays/ov008/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b7d40 end:0x020b8274 kind:code align:32 .init start:0x020b8274 end:0x020b82f4 kind:code align:4 - .ctor start:0x020b82f4 end:0x020b8300 kind:rodata align:4 + .ctor start:0x020b82f4 end:0x020b82fc kind:rodata align:4 .data start:0x020b8300 end:0x020b8360 kind:data align:32 .bss start:0x020b8360 end:0x020ba340 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov009/delinks.txt b/config/jp/arm9/overlays/ov009/delinks.txt index 42e98354..ac923af1 100644 --- a/config/jp/arm9/overlays/ov009/delinks.txt +++ b/config/jp/arm9/overlays/ov009/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020b8cc0 kind:code align:32 .rodata start:0x020b8cc0 end:0x020b8d20 kind:rodata align:4 .init start:0x020b8d20 end:0x020b8d44 kind:code align:4 - .ctor start:0x020b8d44 end:0x020b8d4c kind:rodata align:4 + .ctor start:0x020b8d44 end:0x020b8d48 kind:rodata align:4 .data start:0x020b8d60 end:0x020b8e20 kind:data align:32 .bss start:0x020b8e20 end:0x020b9ea0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov010/delinks.txt b/config/jp/arm9/overlays/ov010/delinks.txt index e71f8478..896ec23f 100644 --- a/config/jp/arm9/overlays/ov010/delinks.txt +++ b/config/jp/arm9/overlays/ov010/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020ba4f0 kind:code align:32 .rodata start:0x020ba4f0 end:0x020ba59c kind:rodata align:4 .init start:0x020ba59c end:0x020ba5cc kind:code align:4 - .ctor start:0x020ba5cc end:0x020ba5d4 kind:rodata align:4 + .ctor start:0x020ba5cc end:0x020ba5d0 kind:rodata align:4 .data start:0x020ba5e0 end:0x020ba700 kind:data align:32 .bss start:0x020ba700 end:0x020bc420 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov011/delinks.txt b/config/jp/arm9/overlays/ov011/delinks.txt index 677d8040..0746eb0c 100644 --- a/config/jp/arm9/overlays/ov011/delinks.txt +++ b/config/jp/arm9/overlays/ov011/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020ba7f4 kind:code align:32 .rodata start:0x020ba7f4 end:0x020baab8 kind:rodata align:4 .init start:0x020baab8 end:0x020baaec kind:code align:4 - .ctor start:0x020baaec end:0x020baaf4 kind:rodata align:4 + .ctor start:0x020baaec end:0x020baaf0 kind:rodata align:4 .data start:0x020bab00 end:0x020bacc0 kind:data align:32 .bss start:0x020bacc0 end:0x020bc080 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov012/delinks.txt b/config/jp/arm9/overlays/ov012/delinks.txt index ea3f6d70..4e6e6140 100644 --- a/config/jp/arm9/overlays/ov012/delinks.txt +++ b/config/jp/arm9/overlays/ov012/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020b9a5c kind:code align:32 .rodata start:0x020b9a5c end:0x020b9b10 kind:rodata align:4 .init start:0x020b9b10 end:0x020b9b84 kind:code align:4 - .ctor start:0x020b9b84 end:0x020b9b8c kind:rodata align:4 + .ctor start:0x020b9b84 end:0x020b9b88 kind:rodata align:4 .data start:0x020b9ba0 end:0x020b9ce0 kind:data align:32 .bss start:0x020b9ce0 end:0x020baf20 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov013/delinks.txt b/config/jp/arm9/overlays/ov013/delinks.txt index 65403157..1023844d 100644 --- a/config/jp/arm9/overlays/ov013/delinks.txt +++ b/config/jp/arm9/overlays/ov013/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b7d40 end:0x020b87f0 kind:code align:32 .init start:0x020b87f0 end:0x020b8824 kind:code align:4 - .ctor start:0x020b8824 end:0x020b882c kind:rodata align:4 + .ctor start:0x020b8824 end:0x020b8828 kind:rodata align:4 .data start:0x020b8840 end:0x020b88a0 kind:data align:32 .bss start:0x020b88a0 end:0x020bb180 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov014/delinks.txt b/config/jp/arm9/overlays/ov014/delinks.txt index 5bb4dbe1..2d732554 100644 --- a/config/jp/arm9/overlays/ov014/delinks.txt +++ b/config/jp/arm9/overlays/ov014/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020b9db8 kind:code align:32 .rodata start:0x020b9db8 end:0x020b9e44 kind:rodata align:4 .init start:0x020b9e44 end:0x020b9e64 kind:code align:4 - .ctor start:0x020b9e64 end:0x020b9e6c kind:rodata align:4 + .ctor start:0x020b9e64 end:0x020b9e68 kind:rodata align:4 .data start:0x020b9e80 end:0x020b9fa0 kind:data align:32 .bss start:0x020b9fa0 end:0x020bc540 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov015/delinks.txt b/config/jp/arm9/overlays/ov015/delinks.txt index 6099fe9a..c6725d90 100644 --- a/config/jp/arm9/overlays/ov015/delinks.txt +++ b/config/jp/arm9/overlays/ov015/delinks.txt @@ -1,6 +1,5 @@ .text start:0x020b7d40 end:0x020b8c30 kind:code align:32 .rodata start:0x020b8c30 end:0x020b8c44 kind:rodata align:4 - .ctor start:0x020b8c44 end:0x020b8c48 kind:rodata align:4 + .ctor start:0x020b8c44 end:0x020b8c44 kind:rodata align:4 .data start:0x020b8c60 end:0x020b8cc0 kind:data align:32 .bss start:0x020b8cc0 end:0x020b98a0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov016/delinks.txt b/config/jp/arm9/overlays/ov016/delinks.txt index e5f489f5..8d77984f 100644 --- a/config/jp/arm9/overlays/ov016/delinks.txt +++ b/config/jp/arm9/overlays/ov016/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020b7d40 end:0x020b99c4 kind:code align:32 .rodata start:0x020b99c4 end:0x020b9a00 kind:rodata align:4 .init start:0x020b9a00 end:0x020b9a50 kind:code align:4 - .ctor start:0x020b9a50 end:0x020b9a58 kind:rodata align:4 + .ctor start:0x020b9a50 end:0x020b9a54 kind:rodata align:4 .data start:0x020b9a60 end:0x020b9b20 kind:data align:32 .bss start:0x020b9b20 end:0x020b9ee0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov017/delinks.txt b/config/jp/arm9/overlays/ov017/delinks.txt index 643108b5..04d66403 100644 --- a/config/jp/arm9/overlays/ov017/delinks.txt +++ b/config/jp/arm9/overlays/ov017/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020bce80 end:0x020c55ec kind:code align:32 .rodata start:0x020c55ec end:0x020c5650 kind:rodata align:4 .init start:0x020c5650 end:0x020c570c kind:code align:4 - .ctor start:0x020c570c end:0x020c571c kind:rodata align:4 + .ctor start:0x020c570c end:0x020c5718 kind:rodata align:4 .data start:0x020c5720 end:0x020c5780 kind:data align:32 .bss start:0x020c5780 end:0x020c6060 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov018/delinks.txt b/config/jp/arm9/overlays/ov018/delinks.txt index 9201597c..024062ba 100644 --- a/config/jp/arm9/overlays/ov018/delinks.txt +++ b/config/jp/arm9/overlays/ov018/delinks.txt @@ -1,5 +1,5 @@ .text start:0x020c6060 end:0x020c7340 kind:code align:32 - .ctor start:0x020c7340 end:0x020c7344 kind:rodata align:4 + .ctor start:0x020c7340 end:0x020c7340 kind:rodata align:4 .data start:0x020c7360 end:0x020c7400 kind:data align:32 .bss start:0x020c7400 end:0x020c7460 kind:bss align:32 diff --git a/config/jp/arm9/overlays/ov018/relocs.txt b/config/jp/arm9/overlays/ov018/relocs.txt index 1b882221..b3a32661 100644 --- a/config/jp/arm9/overlays/ov018/relocs.txt +++ b/config/jp/arm9/overlays/ov018/relocs.txt @@ -42,7 +42,7 @@ from:0x020c6338 kind:arm_call_thumb to:0x0202fd50 module:main from:0x020c633c kind:arm_call to:0x020286e0 module:main from:0x020c6358 kind:arm_call to:0x0202fd94 module:main from:0x020c6368 kind:arm_call to:0x0202fe28 module:main -from:0x020c63a0 kind:load to:0x02045914 add:8 module:main +from:0x020c63a0 kind:load to:0x02045914 add:0x8 module:main from:0x020c63ac kind:arm_call to:0x020c6378 module:overlay(18) from:0x020c63b4 kind:arm_call to:0x02013b14 module:main from:0x020c63e4 kind:arm_call to:0x020c643c module:overlay(18) @@ -73,7 +73,7 @@ from:0x020c6564 kind:arm_call_thumb to:0x02015624 module:main from:0x020c656c kind:arm_call_thumb to:0x0201545c module:main from:0x020c6580 kind:arm_call to:0x0201b994 module:main from:0x020c658c kind:arm_call to:0x0201b798 module:main -from:0x020c659c kind:load to:0x020c7360 add:8 module:overlay(18) +from:0x020c659c kind:load to:0x020c7360 add:0x8 module:overlay(18) from:0x020c65a0 kind:load to:0x0204b690 module:main from:0x020c65a4 kind:load to:0x020c7400 module:overlay(18) from:0x020c65a8 kind:load to:0x020c7390 module:overlay(18) @@ -98,7 +98,7 @@ from:0x020c66d0 kind:load to:0x0204b164 module:main from:0x020c66d4 kind:load to:0x0204af1c module:main from:0x020c66d8 kind:load to:0x0204af04 module:main from:0x020c66e0 kind:thumb_call_arm to:0x0201b8dc module:main -from:0x020c66f0 kind:load to:0x02045584 add:8 module:main +from:0x020c66f0 kind:load to:0x02045584 add:0x8 module:main from:0x020c670c kind:arm_call to:0x0202a17c module:main from:0x020c6734 kind:arm_call to:0x0203e690 module:main from:0x020c6750 kind:arm_call to:0x02067c04 module:overlay(0) @@ -145,9 +145,9 @@ from:0x020c6bec kind:arm_call to:0x0201aea8 module:main from:0x020c6c00 kind:arm_call to:0x0201a798 module:main from:0x020c6c18 kind:arm_call to:0x0201b858 module:main from:0x020c6c28 kind:arm_call to:0x02016614 module:main -from:0x020c6ca0 kind:load to:0x02045624 add:8 module:main +from:0x020c6ca0 kind:load to:0x02045624 add:0x8 module:main from:0x020c6cd0 kind:arm_call to:0x0202a148 module:main -from:0x020c6dc0 kind:load to:0x020457f0 add:8 module:main +from:0x020c6dc0 kind:load to:0x020457f0 add:0x8 module:main from:0x020c6df4 kind:arm_call to:0x02011f3c module:main from:0x020c6e00 kind:arm_call to:0x0201e4c0 module:main from:0x020c6e14 kind:arm_call to:0x02011f3c module:main diff --git a/config/jp/arm9/overlays/ov019/delinks.txt b/config/jp/arm9/overlays/ov019/delinks.txt index 8015db5b..ca190d30 100644 --- a/config/jp/arm9/overlays/ov019/delinks.txt +++ b/config/jp/arm9/overlays/ov019/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020c6060 end:0x020d33d0 kind:code align:32 .rodata start:0x020d33d0 end:0x020d341c kind:rodata align:4 .init start:0x020d341c end:0x020d3584 kind:code align:4 - .ctor start:0x020d3584 end:0x020d359c kind:rodata align:4 + .ctor start:0x020d3584 end:0x020d3598 kind:rodata align:4 .data start:0x020d35a0 end:0x020d3ce0 kind:data align:32 .bss start:0x020d3ce0 end:0x02118900 kind:bss align:32 @@ -13,8 +13,8 @@ src/019_MainSelect/GameModeFileSelect.cpp: src/019_MainSelect/FileSelectManager.cpp: .text start:0x020c639c end:0x020c6a20 - .init start:0x020d3434 end:0x020d344c .rodata start:0x020d33d0 end:0x020d33dc + .init start:0x020d3434 end:0x020d344c .ctor start:0x020d3588 end:0x020d358c .data start:0x020d35d4 end:0x020d3618 @@ -24,8 +24,8 @@ src/019_MainSelect/019_UnkSystem1_ov019_Derived1.cpp: src/019_MainSelect/FileSelectMain.cpp: .text start:0x020c6e50 end:0x020ccf88 - .init start:0x020d344c end:0x020d34f4 .rodata start:0x020d33dc end:0x020d33ec + .init start:0x020d344c end:0x020d34f4 .ctor start:0x020d358c end:0x020d3590 .data start:0x020d366c end:0x020d397c .bss start:0x020d3ce0 end:0x020d3ce8 @@ -42,7 +42,7 @@ src/019_MainSelect/FileSelectOptions.cpp: src/019_MainSelect/FileSelectMicTest.cpp: .text start:0x020d0040 end:0x020d0aac .init start:0x020d355c end:0x020d3584 - .ctor start:0x020d3594 end:0x020d359c + .ctor start:0x020d3594 end:0x020d3598 .data start:0x020d3a68 end:0x020d3ac0 src/019_MainSelect/FileSelectSubScreen.cpp: diff --git a/config/jp/arm9/overlays/ov019/relocs.txt b/config/jp/arm9/overlays/ov019/relocs.txt index 56dc5975..36772c89 100644 --- a/config/jp/arm9/overlays/ov019/relocs.txt +++ b/config/jp/arm9/overlays/ov019/relocs.txt @@ -6,7 +6,7 @@ from:0x020c60b8 kind:arm_call to:0x02014ce0 module:main from:0x020c60d8 kind:arm_call to:0x02013370 module:main from:0x020c60ec kind:arm_call_thumb to:0x020bfebc module:overlay(1) from:0x020c6104 kind:arm_call_thumb to:0x020bed5c module:overlay(1) -from:0x020c6110 kind:load to:0x020d35a4 add:8 module:overlay(19) +from:0x020c6110 kind:load to:0x020d35a4 add:0x8 module:overlay(19) from:0x020c6114 kind:load to:0x0204b154 module:main from:0x020c611c kind:load to:0x0204afac module:main from:0x020c6124 kind:load to:0x0204af1c module:main @@ -22,7 +22,7 @@ from:0x020c618c kind:arm_call to:0x0206e670 module:overlay(0) from:0x020c6194 kind:arm_call_thumb to:0x020bf124 module:overlay(1) from:0x020c619c kind:arm_call to:0x020688e0 module:overlay(0) from:0x020c61a4 kind:arm_call to:0x020182e4 module:main -from:0x020c61b0 kind:load to:0x020d35a4 add:8 module:overlay(19) +from:0x020c61b0 kind:load to:0x020d35a4 add:0x8 module:overlay(19) from:0x020c61b4 kind:load to:0x0204b608 module:main from:0x020c61b8 kind:load to:0x020b7ab8 module:overlay(0) from:0x020c61bc kind:load to:0x020b684c module:overlay(0) @@ -38,7 +38,7 @@ from:0x020c6218 kind:arm_call_thumb to:0x020bf124 module:overlay(1) from:0x020c6220 kind:arm_call to:0x020688e0 module:overlay(0) from:0x020c6228 kind:arm_call to:0x020182e4 module:main from:0x020c6230 kind:arm_call to:0x02011ff4 module:main -from:0x020c623c kind:load to:0x020d35a4 add:8 module:overlay(19) +from:0x020c623c kind:load to:0x020d35a4 add:0x8 module:overlay(19) from:0x020c6240 kind:load to:0x0204b608 module:main from:0x020c6244 kind:load to:0x020b7ab8 module:overlay(0) from:0x020c6248 kind:load to:0x020b684c module:overlay(0) @@ -71,21 +71,21 @@ from:0x020c63d0 kind:arm_call_thumb to:0x02018430 module:main from:0x020c63fc kind:arm_call to:0x020d1b3c module:overlay(19) from:0x020c643c kind:arm_call_thumb to:0x020bef7c module:overlay(1) from:0x020c6440 kind:arm_call_thumb to:0x020beef0 module:overlay(1) -from:0x020c644c kind:load to:0x020d35d8 add:8 module:overlay(19) +from:0x020c644c kind:load to:0x020d35d8 add:0x8 module:overlay(19) from:0x020c6454 kind:load to:0x020d33d0 module:overlay(19) from:0x020c6460 kind:arm_call to:0x020688e0 module:overlay(0) from:0x020c647c kind:arm_call to:0x020c69c8 module:overlay(19) from:0x020c6490 kind:arm_call_thumb to:0x020befcc module:overlay(1) from:0x020c6518 kind:arm_call to:0x020688e0 module:overlay(0) from:0x020c6520 kind:arm_call_thumb to:0x02018540 module:main -from:0x020c652c kind:load to:0x020d35d8 add:8 module:overlay(19) +from:0x020c652c kind:load to:0x020d35d8 add:0x8 module:overlay(19) from:0x020c6530 kind:load to:0x0204b690 module:main from:0x020c6544 kind:arm_call to:0x020c69c8 module:overlay(19) from:0x020c6558 kind:arm_call_thumb to:0x020befcc module:overlay(1) from:0x020c65e0 kind:arm_call to:0x020688e0 module:overlay(0) from:0x020c65e8 kind:arm_call_thumb to:0x02018540 module:main from:0x020c65f0 kind:arm_call to:0x02011ff4 module:main -from:0x020c65fc kind:load to:0x020d35d8 add:8 module:overlay(19) +from:0x020c65fc kind:load to:0x020d35d8 add:0x8 module:overlay(19) from:0x020c6600 kind:load to:0x0204b690 module:main from:0x020c6618 kind:arm_call_thumb to:0x02015624 module:main from:0x020c6620 kind:arm_call_thumb to:0x02015624 module:main @@ -151,7 +151,7 @@ from:0x020c6a04 kind:load to:0x0204b608 module:main from:0x020c6a08 kind:load to:0x02062c18 module:overlay(0) from:0x020c6a1c kind:load to:0x0204b608 module:main from:0x020c6a34 kind:arm_call to:0x020687e0 module:overlay(0) -from:0x020c6a58 kind:load to:0x020d3618 add:8 module:overlay(19) +from:0x020c6a58 kind:load to:0x020d3618 add:0x8 module:overlay(19) from:0x020c6a90 kind:arm_call to:0x0206929c module:overlay(0) from:0x020c6aa0 kind:load to:0x020b684c module:overlay(0) from:0x020c6ad0 kind:arm_call to:0x020c6db0 module:overlay(19) @@ -268,7 +268,7 @@ from:0x020c778c kind:arm_call to:0x02025f04 module:main from:0x020c7798 kind:arm_call to:0x02016664 module:main from:0x020c77a0 kind:arm_call to:0x020c7bfc module:overlay(19) from:0x020c77a8 kind:arm_call to:0x020c8530 module:overlay(19) -from:0x020c77b8 kind:load to:0x020d36d8 add:8 module:overlay(19) +from:0x020c77b8 kind:load to:0x020d36d8 add:0x8 module:overlay(19) from:0x020c77c0 kind:load to:0x020b378c module:overlay(0) from:0x020c77c8 kind:load to:0x020d33dc module:overlay(19) from:0x020c77cc kind:load to:0x020d366c module:overlay(19) @@ -321,7 +321,7 @@ from:0x020c79d4 kind:arm_call to:0x0201f0bc module:main from:0x020c79dc kind:arm_call to:0x02064168 module:overlay(0) from:0x020c79e4 kind:arm_call to:0x02064168 module:overlay(0) from:0x020c79ec kind:arm_call to:0x020631e4 module:overlay(0) -from:0x020c79f8 kind:load to:0x020d36d8 add:8 module:overlay(19) +from:0x020c79f8 kind:load to:0x020d36d8 add:0x8 module:overlay(19) from:0x020c7a24 kind:arm_call to:0x020634e8 module:overlay(0) from:0x020c7a2c kind:arm_call to:0x0201f0bc module:main from:0x020c7a34 kind:arm_call to:0x02064168 module:overlay(0) @@ -363,7 +363,7 @@ from:0x020c7bd4 kind:arm_call to:0x02064168 module:overlay(0) from:0x020c7bdc kind:arm_call to:0x02064168 module:overlay(0) from:0x020c7be4 kind:arm_call to:0x020631e4 module:overlay(0) from:0x020c7bec kind:arm_call to:0x02011ff4 module:main -from:0x020c7bf8 kind:load to:0x020d36d8 add:8 module:overlay(19) +from:0x020c7bf8 kind:load to:0x020d36d8 add:0x8 module:overlay(19) from:0x020c7c14 kind:arm_call to:0x020643cc module:overlay(0) from:0x020c7c3c kind:arm_call to:0x020643cc module:overlay(0) from:0x020c7c7c kind:arm_call to:0x0201e544 module:main @@ -718,7 +718,7 @@ from:0x020cd24c kind:arm_call to:0x02064948 module:overlay(0) from:0x020cd270 kind:arm_call to:0x020611a8 module:overlay(0) from:0x020cd29c kind:arm_call to:0x020611a8 module:overlay(0) from:0x020cd2e8 kind:arm_call to:0x02016664 module:main -from:0x020cd308 kind:load to:0x020d366c add:6 module:overlay(19) +from:0x020cd308 kind:load to:0x020d366c add:0x6 module:overlay(19) from:0x020cd31c kind:arm_call to:0x0201f520 module:main from:0x020cd324 kind:arm_call to:0x020cd360 module:overlay(19) from:0x020cd35c kind:load to:0x020b7ab8 module:overlay(0) @@ -763,7 +763,7 @@ from:0x020cdd20 kind:arm_call to:0x020643cc module:overlay(0) from:0x020cddb4 kind:arm_call to:0x0201aa68 module:main from:0x020cddc0 kind:load to:0x020b7ab8 module:overlay(0) from:0x020cddc4 kind:load to:0x0204c49c module:main -from:0x020cddc8 kind:load to:0x020d36b4 add:4 module:overlay(19) +from:0x020cddc8 kind:load to:0x020d36b4 add:0x4 module:overlay(19) from:0x020cddf8 kind:arm_call to:0x02011f3c module:main from:0x020cde0c kind:arm_call to:0x020cde14 module:overlay(19) from:0x020cde24 kind:arm_call to:0x020d0040 module:overlay(19) @@ -773,14 +773,14 @@ from:0x020cde60 kind:arm_call to:0x020d0064 module:overlay(19) from:0x020cde74 kind:arm_call to:0x02011f3c module:main from:0x020cde84 kind:arm_call to:0x020ce0a0 module:overlay(19) from:0x020cdea4 kind:arm_call to:0x02016664 module:main -from:0x020cdec0 kind:load to:0x020d3a3c add:8 module:overlay(19) +from:0x020cdec0 kind:load to:0x020d3a3c add:0x8 module:overlay(19) from:0x020cdf20 kind:arm_call to:0x020631e4 module:overlay(0) from:0x020cdf28 kind:arm_call to:0x020d0050 module:overlay(19) -from:0x020cdf34 kind:load to:0x020d3a3c add:8 module:overlay(19) +from:0x020cdf34 kind:load to:0x020d3a3c add:0x8 module:overlay(19) from:0x020cdf8c kind:arm_call to:0x020631e4 module:overlay(0) from:0x020cdf94 kind:arm_call to:0x020d0050 module:overlay(19) from:0x020cdf9c kind:arm_call to:0x02011ff4 module:main -from:0x020cdfa8 kind:load to:0x020d3a3c add:8 module:overlay(19) +from:0x020cdfa8 kind:load to:0x020d3a3c add:0x8 module:overlay(19) from:0x020ce000 kind:arm_call to:0x02016664 module:main from:0x020ce018 kind:arm_call to:0x020cf6bc module:overlay(19) from:0x020ce024 kind:arm_call to:0x02016644 module:main @@ -814,7 +814,7 @@ from:0x020ce2f4 kind:arm_call to:0x02063960 module:overlay(0) from:0x020ce304 kind:arm_call to:0x02063960 module:overlay(0) from:0x020ce314 kind:arm_call to:0x02063960 module:overlay(0) from:0x020ce31c kind:arm_call to:0x020ce560 module:overlay(19) -from:0x020ce32c kind:load to:0x020d3a18 add:8 module:overlay(19) +from:0x020ce32c kind:load to:0x020d3a18 add:0x8 module:overlay(19) from:0x020ce334 kind:load to:0x020b378c module:overlay(0) from:0x020ce350 kind:arm_call to:0x0201f288 module:main from:0x020ce35c kind:arm_call to:0x0201f288 module:main @@ -837,7 +837,7 @@ from:0x020ce41c kind:arm_call to:0x0201f0bc module:main from:0x020ce428 kind:arm_call to:0x02064168 module:overlay(0) from:0x020ce430 kind:arm_call to:0x020cfb34 module:overlay(19) from:0x020ce438 kind:arm_call to:0x020631e4 module:overlay(0) -from:0x020ce444 kind:load to:0x020d3a18 add:8 module:overlay(19) +from:0x020ce444 kind:load to:0x020d3a18 add:0x8 module:overlay(19) from:0x020ce460 kind:arm_call to:0x0201f288 module:main from:0x020ce46c kind:arm_call to:0x0201f288 module:main from:0x020ce478 kind:arm_call to:0x0201f288 module:main @@ -860,7 +860,7 @@ from:0x020ce538 kind:arm_call to:0x02064168 module:overlay(0) from:0x020ce540 kind:arm_call to:0x020cfb34 module:overlay(19) from:0x020ce548 kind:arm_call to:0x020631e4 module:overlay(0) from:0x020ce550 kind:arm_call to:0x02011ff4 module:main -from:0x020ce55c kind:load to:0x020d3a18 add:8 module:overlay(19) +from:0x020ce55c kind:load to:0x020d3a18 add:0x8 module:overlay(19) from:0x020ce594 kind:load to:0x020d39e0 module:overlay(19) from:0x020ce5cc kind:load to:0x020d39a8 module:overlay(19) from:0x020ce5dc kind:arm_call to:0x020cfcfc module:overlay(19) @@ -1071,7 +1071,7 @@ from:0x020d0144 kind:arm_call to:0x0201f520 module:main from:0x020d0154 kind:arm_call to:0x0201f520 module:main from:0x020d0164 kind:arm_call to:0x020643cc module:overlay(0) from:0x020d01a4 kind:arm_call to:0x020d0294 module:overlay(19) -from:0x020d01b4 kind:load to:0x020d3a9c add:8 module:overlay(19) +from:0x020d01b4 kind:load to:0x020d3a9c add:0x8 module:overlay(19) from:0x020d01b8 kind:load to:0x020b378c module:overlay(0) from:0x020d01c0 kind:load to:0x020d3a68 module:overlay(19) from:0x020d01d8 kind:arm_call to:0x0201f288 module:main @@ -1082,7 +1082,7 @@ from:0x020d01fc kind:arm_call to:0x02064168 module:overlay(0) from:0x020d0204 kind:arm_call to:0x020634e8 module:overlay(0) from:0x020d020c kind:arm_call to:0x0201f0bc module:main from:0x020d0214 kind:arm_call to:0x020631e4 module:overlay(0) -from:0x020d0220 kind:load to:0x020d3a9c add:8 module:overlay(19) +from:0x020d0220 kind:load to:0x020d3a9c add:0x8 module:overlay(19) from:0x020d0238 kind:arm_call to:0x0201f288 module:main from:0x020d0240 kind:arm_call to:0x0201f288 module:main from:0x020d024c kind:arm_call to:0x020634e8 module:overlay(0) @@ -1092,7 +1092,7 @@ from:0x020d0264 kind:arm_call to:0x020634e8 module:overlay(0) from:0x020d026c kind:arm_call to:0x0201f0bc module:main from:0x020d0274 kind:arm_call to:0x020631e4 module:overlay(0) from:0x020d027c kind:arm_call to:0x02011ff4 module:main -from:0x020d0288 kind:load to:0x020d3a9c add:8 module:overlay(19) +from:0x020d0288 kind:load to:0x020d3a9c add:0x8 module:overlay(19) from:0x020d02c8 kind:load to:0x020d3a7c module:overlay(19) from:0x020d030c kind:arm_call to:0x0201e664 module:main from:0x020d0364 kind:arm_call to:0x020611a8 module:overlay(0) @@ -1182,7 +1182,7 @@ from:0x020d0d64 kind:arm_call_thumb to:0x02015624 module:main from:0x020d0d6c kind:arm_call_thumb to:0x0201545c module:main from:0x020d0d7c kind:arm_call to:0x020d0f5c module:overlay(19) from:0x020d0d8c kind:arm_call to:0x020d0f5c module:overlay(19) -from:0x020d0d9c kind:load to:0x020d3ad0 add:8 module:overlay(19) +from:0x020d0d9c kind:load to:0x020d3ad0 add:0x8 module:overlay(19) from:0x020d0da0 kind:load to:0x020d3af4 module:overlay(19) from:0x020d0da4 kind:load to:0x020d3b0c module:overlay(19) from:0x020d0da8 kind:load to:0x020d3b24 module:overlay(19) @@ -1218,7 +1218,7 @@ from:0x020d10b0 kind:arm_call to:0x02061d8c module:overlay(0) from:0x020d1138 kind:arm_call to:0x02061db4 module:overlay(0) from:0x020d1140 kind:arm_call to:0x020621b0 module:overlay(0) from:0x020d1178 kind:arm_call to:0x02062160 module:overlay(0) -from:0x020d1210 kind:load to:0x020d3ac0 add:8 module:overlay(19) +from:0x020d1210 kind:load to:0x020d3ac0 add:0x8 module:overlay(19) from:0x020d1214 kind:load to:0x0204b164 module:main from:0x020d1218 kind:load to:0x020d33ec module:overlay(19) from:0x020d1244 kind:arm_call to:0x02061f4c module:overlay(0) @@ -1250,7 +1250,7 @@ from:0x020d1420 kind:arm_call_thumb to:0x02015414 module:main from:0x020d1428 kind:arm_call to:0x020631e4 module:overlay(0) from:0x020d1444 kind:arm_call to:0x02062bd0 module:overlay(0) from:0x020d1474 kind:arm_call to:0x02062764 module:overlay(0) -from:0x020d1480 kind:load to:0x020d3bf8 add:8 module:overlay(19) +from:0x020d1480 kind:load to:0x020d3bf8 add:0x8 module:overlay(19) from:0x020d1484 kind:load to:0x0204b608 module:main from:0x020d1490 kind:arm_call to:0x02062c50 module:overlay(0) from:0x020d14a4 kind:arm_call to:0x02062c50 module:overlay(0) @@ -1290,16 +1290,16 @@ from:0x020d1740 kind:arm_call to:0x02019614 module:main from:0x020d174c kind:load to:0x0204b690 module:main from:0x020d1760 kind:arm_call to:0x02062bd0 module:overlay(0) from:0x020d1788 kind:arm_call to:0x02062764 module:overlay(0) -from:0x020d1794 kind:load to:0x020d3c28 add:8 module:overlay(19) +from:0x020d1794 kind:load to:0x020d3c28 add:0x8 module:overlay(19) from:0x020d1798 kind:load to:0x0204b608 module:main from:0x020d17bc kind:arm_call to:0x020d1b14 module:overlay(19) from:0x020d17c4 kind:arm_call to:0x02062c50 module:overlay(0) -from:0x020d17d0 kind:load to:0x020d3c28 add:8 module:overlay(19) +from:0x020d17d0 kind:load to:0x020d3c28 add:0x8 module:overlay(19) from:0x020d17d4 kind:load to:0x020d3ce8 module:overlay(19) from:0x020d17f8 kind:arm_call to:0x020d1b14 module:overlay(19) from:0x020d1800 kind:arm_call to:0x02062c50 module:overlay(0) from:0x020d1808 kind:arm_call to:0x02011ff4 module:main -from:0x020d1814 kind:load to:0x020d3c28 add:8 module:overlay(19) +from:0x020d1814 kind:load to:0x020d3c28 add:0x8 module:overlay(19) from:0x020d1818 kind:load to:0x020d3ce8 module:overlay(19) from:0x020d183c kind:arm_call to:0x020ccf08 module:overlay(19) from:0x020d185c kind:arm_call to:0x02019614 module:main @@ -1345,7 +1345,7 @@ from:0x020d1b0c kind:load to:0x0204b690 module:main from:0x020d1b10 kind:load to:0x020b68c0 module:overlay(0) from:0x020d1b38 kind:load to:0x020d3ce8 module:overlay(19) from:0x020d1b50 kind:arm_call to:0x020687e0 module:overlay(0) -from:0x020d1b78 kind:load to:0x020d3c58 add:8 module:overlay(19) +from:0x020d1b78 kind:load to:0x020d3c58 add:0x8 module:overlay(19) from:0x020d1bb0 kind:arm_call to:0x0206929c module:overlay(0) from:0x020d1bc0 kind:load to:0x020b684c module:overlay(0) from:0x020d1c44 kind:arm_call to:0x0206929c module:overlay(0) @@ -1370,7 +1370,7 @@ from:0x020d1db0 kind:load to:0x020b6a14 module:overlay(0) from:0x020d1dbc kind:arm_call to:0x020688e0 module:overlay(0) from:0x020d1dc4 kind:arm_call to:0x02011ff4 module:main from:0x020d1de4 kind:arm_call to:0x020687e0 module:overlay(0) -from:0x020d1e18 kind:load to:0x020d3c8c add:8 module:overlay(19) +from:0x020d1e18 kind:load to:0x020d3c8c add:0x8 module:overlay(19) from:0x020d1e2c kind:load to:0x02067d7c module:overlay(0) from:0x020d1e64 kind:arm_call to:0x0206929c module:overlay(0) from:0x020d1e74 kind:load to:0x020b684c module:overlay(0) @@ -1465,17 +1465,17 @@ from:0x020d29e0 kind:arm_call to:0x020a2a78 module:overlay(0) from:0x020d29f0 kind:arm_call to:0x02033df8 module:main from:0x020d2a0c kind:arm_call to:0x0202a20c module:main from:0x020d2a54 kind:arm_call_thumb to:0x020a2268 module:overlay(0) -from:0x020d2a90 kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d2a90 kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d2b4c kind:arm_call to:0x020a28cc module:overlay(0) from:0x020d2b5c kind:arm_call to:0x02033df8 module:main from:0x020d2b78 kind:arm_call to:0x0202a20c module:main from:0x020d2b90 kind:arm_call_thumb to:0x020a2268 module:overlay(0) -from:0x020d2bd0 kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d2bd0 kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d2bf4 kind:arm_call to:0x020d2c20 module:overlay(19) from:0x020d2c18 kind:arm_call_thumb to:0x020a2268 module:overlay(0) from:0x020d2c34 kind:arm_call to:0x02033df8 module:main from:0x020d2c48 kind:arm_call to:0x0202a20c module:main -from:0x020d2c50 kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d2c50 kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d2c74 kind:arm_call to:0x020d2d1c module:overlay(19) from:0x020d2c8c kind:arm_call_thumb to:0x020a2268 module:overlay(0) from:0x020d2ca8 kind:arm_call to:0x020d2ce0 module:overlay(19) @@ -1483,10 +1483,10 @@ from:0x020d2cc4 kind:arm_call_thumb to:0x020a2268 module:overlay(0) from:0x020d2cd4 kind:arm_call to:0x020d2bd8 module:overlay(19) from:0x020d2cf4 kind:arm_call to:0x02033df8 module:main from:0x020d2d0c kind:arm_call to:0x0202a20c module:main -from:0x020d2d14 kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d2d14 kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d2d30 kind:arm_call to:0x02033df8 module:main from:0x020d2d48 kind:arm_call to:0x0202a20c module:main -from:0x020d2d50 kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d2d50 kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d2d7c kind:arm_call to:0x020d2e20 module:overlay(19) from:0x020d2d98 kind:arm_call_thumb to:0x020a2268 module:overlay(0) from:0x020d2db4 kind:arm_call to:0x020d2dec module:overlay(19) @@ -1494,10 +1494,10 @@ from:0x020d2dd0 kind:arm_call_thumb to:0x020a2268 module:overlay(0) from:0x020d2de0 kind:arm_call to:0x020d2c54 module:overlay(19) from:0x020d2e00 kind:arm_call to:0x02033df8 module:main from:0x020d2e14 kind:arm_call to:0x0202a20c module:main -from:0x020d2e1c kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d2e1c kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d2e34 kind:arm_call to:0x02033df8 module:main from:0x020d2e48 kind:arm_call to:0x0202a20c module:main -from:0x020d2e50 kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d2e50 kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d2ed8 kind:arm_call to:0x020327e8 module:main from:0x020d2f2c kind:arm_call to:0x0202a20c module:main from:0x020d2f40 kind:arm_call to:0x0202a20c module:main @@ -1517,7 +1517,7 @@ from:0x020d3168 kind:arm_call to:0x02033df8 module:main from:0x020d31a4 kind:arm_call to:0x02033df8 module:main from:0x020d3254 kind:arm_call to:0x0202a20c module:main from:0x020d32a4 kind:arm_call to:0x0202a20c module:main -from:0x020d32bc kind:load to:0x020b7ab8 add:4 module:overlay(0) +from:0x020d32bc kind:load to:0x020b7ab8 add:0x4 module:overlay(0) from:0x020d32c4 kind:load to:0x020d33f4 module:overlay(19) from:0x020d32c8 kind:load to:0x020d3408 module:overlay(19) from:0x020d32f4 kind:arm_call to:0x020376c8 module:main diff --git a/config/jp/arm9/overlays/ov020/delinks.txt b/config/jp/arm9/overlays/ov020/delinks.txt index 497c5fa7..a2effd0c 100644 --- a/config/jp/arm9/overlays/ov020/delinks.txt +++ b/config/jp/arm9/overlays/ov020/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020c6060 end:0x020dc598 kind:code align:32 .rodata start:0x020dc598 end:0x020dc738 kind:rodata align:4 .init start:0x020dc738 end:0x020dc894 kind:code align:4 - .ctor start:0x020dc894 end:0x020dc8ac kind:rodata align:4 + .ctor start:0x020dc894 end:0x020dc8a8 kind:rodata align:4 .data start:0x020dc8c0 end:0x020dd700 kind:data align:32 .bss start:0x020dd700 end:0x020eb2c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov021/delinks.txt b/config/jp/arm9/overlays/ov021/delinks.txt index 16b3eda3..f3484ece 100644 --- a/config/jp/arm9/overlays/ov021/delinks.txt +++ b/config/jp/arm9/overlays/ov021/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020eb2c0 end:0x02108818 kind:code align:32 .rodata start:0x02108818 end:0x0210951c kind:rodata align:4 .init start:0x0210951c end:0x02109a30 kind:code align:4 - .ctor start:0x02109a30 end:0x02109a6c kind:rodata align:4 + .ctor start:0x02109a30 end:0x02109a68 kind:rodata align:4 .data start:0x02109a80 end:0x0210ac60 kind:data align:32 .bss start:0x0210ac60 end:0x0210b780 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov021/relocs.txt b/config/jp/arm9/overlays/ov021/relocs.txt index 9dddea46..96d1081e 100644 --- a/config/jp/arm9/overlays/ov021/relocs.txt +++ b/config/jp/arm9/overlays/ov021/relocs.txt @@ -2140,7 +2140,7 @@ from:0x020fe274 kind:load to:0x027e09a4 module:dtcm from:0x020fe278 kind:load to:0x0204b690 module:main from:0x020fe298 kind:arm_call to:0x02071eec module:overlay(0) from:0x020fe2a0 kind:load to:0x027e09a4 module:dtcm -from:0x020fe2a4 kind:load to:0x0204b690 add:0xDF2 module:main +from:0x020fe2a4 kind:load to:0x0204b690 add:0xdf2 module:main from:0x020fe2c8 kind:arm_call to:0x02071ff0 module:overlay(0) from:0x020fe2e0 kind:arm_call to:0x020f7f44 module:overlay(21) from:0x020fe2f0 kind:arm_call to:0x020fc3d8 module:overlay(21) @@ -2164,7 +2164,7 @@ from:0x020fe5c4 kind:arm_call to:0x0201aa68 module:main from:0x020fe5cc kind:arm_call to:0x020cb1d4 module:overlay(20) from:0x020fe5d8 kind:load to:0x0204b608 module:main from:0x020fe5dc kind:load to:0x027e09a4 module:dtcm -from:0x020fe5e0 kind:load to:0x0204b690 add:0xDF2 module:main +from:0x020fe5e0 kind:load to:0x0204b690 add:0xdf2 module:main from:0x020fe5e4 kind:load to:0x0204c49c module:main from:0x020fe5e8 kind:load to:0x027e0cf4 module:dtcm from:0x020fe5ec kind:load to:0x027e0ce0 module:dtcm @@ -2954,7 +2954,7 @@ from:0x021051cc kind:arm_call to:0x0201a9dc module:main from:0x021051e4 kind:arm_call to:0x020cb1d4 module:overlay(20) from:0x021051f0 kind:load to:0x0204c49c module:main from:0x021051f4 kind:load to:0x0210b4ad module:overlay(21) -from:0x021051f8 kind:load to:0x0204b690 add:0xDF2 module:main +from:0x021051f8 kind:load to:0x0204b690 add:0xdf2 module:main from:0x02105244 kind:arm_call to:0x02106a74 module:overlay(21) from:0x02105290 kind:load to:0x02108f9c module:overlay(21) from:0x021053f8 kind:arm_call to:0x020c889c module:overlay(20) diff --git a/config/jp/arm9/overlays/ov022/delinks.txt b/config/jp/arm9/overlays/ov022/delinks.txt index 53008556..3347a94f 100644 --- a/config/jp/arm9/overlays/ov022/delinks.txt +++ b/config/jp/arm9/overlays/ov022/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020eb2c0 end:0x020ef8b4 kind:code align:32 .rodata start:0x020ef8b4 end:0x020ef980 kind:rodata align:4 .init start:0x020ef980 end:0x020ef9b0 kind:code align:4 - .ctor start:0x020ef9b0 end:0x020ef9bc kind:rodata align:4 + .ctor start:0x020ef9b0 end:0x020ef9b8 kind:rodata align:4 .data start:0x020ef9c0 end:0x020efc20 kind:data align:32 .bss start:0x020efc20 end:0x020fad60 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov023/delinks.txt b/config/jp/arm9/overlays/ov023/delinks.txt index 6b6060aa..af113f5f 100644 --- a/config/jp/arm9/overlays/ov023/delinks.txt +++ b/config/jp/arm9/overlays/ov023/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020eb2c0 end:0x020f30d4 kind:code align:32 .rodata start:0x020f30d4 end:0x020f31ac kind:rodata align:4 .init start:0x020f31ac end:0x020f322c kind:code align:4 - .ctor start:0x020f322c end:0x020f3240 kind:rodata align:4 + .ctor start:0x020f322c end:0x020f323c kind:rodata align:4 .data start:0x020f3240 end:0x020f3440 kind:data align:32 .bss start:0x020f3440 end:0x020fd7c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov024/delinks.txt b/config/jp/arm9/overlays/ov024/delinks.txt index cb4a2118..a7386085 100644 --- a/config/jp/arm9/overlays/ov024/delinks.txt +++ b/config/jp/arm9/overlays/ov024/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020c6060 end:0x020d8cbc kind:code align:32 .rodata start:0x020d8cbc end:0x020d928c kind:rodata align:4 .init start:0x020d928c end:0x020d94d8 kind:code align:4 - .ctor start:0x020d94d8 end:0x020d94f8 kind:rodata align:4 + .ctor start:0x020d94d8 end:0x020d94f4 kind:rodata align:4 .data start:0x020d9500 end:0x020da000 kind:data align:32 .bss start:0x020da000 end:0x020da0c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov024/relocs.txt b/config/jp/arm9/overlays/ov024/relocs.txt index c1d2ba55..72743d3c 100644 --- a/config/jp/arm9/overlays/ov024/relocs.txt +++ b/config/jp/arm9/overlays/ov024/relocs.txt @@ -37,7 +37,7 @@ from:0x020c6198 kind:load to:0x027e09a4 module:dtcm from:0x020c619c kind:load to:0x0204b690 module:main from:0x020c61a0 kind:load to:0x02071f90 module:overlay(0) from:0x020c61b8 kind:load to:0x027e09a4 module:dtcm -from:0x020c61bc kind:load to:0x0204b690 add:0xDF2 module:main +from:0x020c61bc kind:load to:0x0204b690 add:0xdf2 module:main from:0x020c61c0 kind:load to:0x02071eec module:overlay(0) from:0x020c61dc kind:arm_call to:0x02071ff0 module:overlay(0) from:0x020c6208 kind:load to:0x0204b690 module:main @@ -49,7 +49,7 @@ from:0x020c6234 kind:load to:0x02072104 module:overlay(0) from:0x020c6264 kind:arm_call to:0x020bd1b4 module:overlay(17) from:0x020c6290 kind:load to:0x0204b608 module:main from:0x020c6294 kind:load to:0x027e09a4 module:dtcm -from:0x020c6298 kind:load to:0x0204b690 add:0xDF2 module:main +from:0x020c6298 kind:load to:0x0204b690 add:0xdf2 module:main from:0x020c629c kind:load to:0x020da000 module:overlay(24) from:0x020c62b8 kind:arm_call to:0x02071bac module:overlay(0) from:0x020c62c0 kind:arm_call to:0x02011ff4 module:main diff --git a/config/jp/arm9/overlays/ov025/delinks.txt b/config/jp/arm9/overlays/ov025/delinks.txt index 5a9c4965..03bd86ab 100644 --- a/config/jp/arm9/overlays/ov025/delinks.txt +++ b/config/jp/arm9/overlays/ov025/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020c6060 end:0x020c7294 kind:code align:32 .rodata start:0x020c7294 end:0x020c7298 kind:rodata align:4 .init start:0x020c7298 end:0x020c72f0 kind:code align:4 - .ctor start:0x020c72f0 end:0x020c72f8 kind:rodata align:4 + .ctor start:0x020c72f0 end:0x020c72f4 kind:rodata align:4 .data start:0x020c7300 end:0x020c7420 kind:data align:32 .bss start:0x020c7420 end:0x020c7420 kind:bss align:32 @@ -19,5 +19,5 @@ src/025_Title/TitleScreenManager.cpp: src/025_Title/TitleScreen.cpp: .text start:0x020c6490 end:0x020c7294 .init start:0x020c7298 end:0x020c72f0 - .ctor start:0x020c72f0 end:0x020c72f8 + .ctor start:0x020c72f0 end:0x020c72f4 .data start:0x020c7380 end:0x020c7420 diff --git a/config/jp/arm9/overlays/ov025/relocs.txt b/config/jp/arm9/overlays/ov025/relocs.txt index 76024180..574cfab7 100644 --- a/config/jp/arm9/overlays/ov025/relocs.txt +++ b/config/jp/arm9/overlays/ov025/relocs.txt @@ -3,19 +3,19 @@ from:0x020c6074 kind:arm_call to:0x02016534 module:main from:0x020c6084 kind:arm_call to:0x02013370 module:main from:0x020c60a0 kind:arm_call_thumb to:0x020bed5c module:overlay(1) from:0x020c60a8 kind:arm_call_thumb to:0x020b7d40 module:overlays(1,2,6,10,12,14) -from:0x020c60b4 kind:load to:0x020c7300 add:8 module:overlay(25) +from:0x020c60b4 kind:load to:0x020c7300 add:0x8 module:overlay(25) from:0x020c60b8 kind:load to:0x0204afac module:main from:0x020c60bc kind:load to:0x0204b690 module:main from:0x020c60c0 kind:load to:0x020c62ac module:overlay(25) from:0x020c60d4 kind:arm_call to:0x020c6280 module:overlay(25) from:0x020c60d8 kind:arm_call to:0x0200e234 module:main from:0x020c60e0 kind:arm_call to:0x020182e4 module:main -from:0x020c60ec kind:load to:0x020c7300 add:8 module:overlay(25) +from:0x020c60ec kind:load to:0x020c7300 add:0x8 module:overlay(25) from:0x020c6100 kind:arm_call to:0x020c6280 module:overlay(25) from:0x020c6104 kind:arm_call to:0x0200e234 module:main from:0x020c610c kind:arm_call to:0x020182e4 module:main from:0x020c6114 kind:arm_call to:0x02011ff4 module:main -from:0x020c6120 kind:load to:0x020c7300 add:8 module:overlay(25) +from:0x020c6120 kind:load to:0x020c7300 add:0x8 module:overlay(25) from:0x020c612c kind:arm_call to:0x0201830c module:main from:0x020c6138 kind:arm_call to:0x020a902c module:overlay(0) from:0x020c6184 kind:arm_call_thumb to:0x02071e60 module:overlay(0) @@ -27,7 +27,7 @@ from:0x020c61d0 kind:load to:0x027e09a4 module:dtcm from:0x020c61d4 kind:load to:0x0204b690 module:main from:0x020c61d8 kind:load to:0x02071f90 module:overlay(0) from:0x020c61f0 kind:load to:0x027e09a4 module:dtcm -from:0x020c61f4 kind:load to:0x0204b690 add:0xDF2 module:main +from:0x020c61f4 kind:load to:0x0204b690 add:0xdf2 module:main from:0x020c61f8 kind:load to:0x02071eec module:overlay(0) from:0x020c6214 kind:load to:0x027e09a4 module:dtcm from:0x020c6218 kind:load to:0x0204b690 module:main @@ -38,7 +38,7 @@ from:0x020c6240 kind:load to:0x02072104 module:overlay(0) from:0x020c626c kind:arm_call to:0x020bd1b4 module:overlay(17) from:0x020c6274 kind:load to:0x0204b608 module:main from:0x020c6278 kind:load to:0x027e09a4 module:dtcm -from:0x020c627c kind:load to:0x0204b690 add:0xDF2 module:main +from:0x020c627c kind:load to:0x0204b690 add:0xdf2 module:main from:0x020c6298 kind:arm_call to:0x02071bac module:overlay(0) from:0x020c62a0 kind:arm_call to:0x02011ff4 module:main from:0x020c62a8 kind:load to:0x027e09a4 module:dtcm @@ -47,7 +47,7 @@ from:0x020c62d0 kind:arm_call to:0x020c62d8 module:overlay(25) from:0x020c62e0 kind:arm_call to:0x0206246c module:overlay(0) from:0x020c62fc kind:arm_call to:0x02024abc module:main from:0x020c6304 kind:arm_call to:0x02024b24 module:main -from:0x020c6328 kind:load to:0x020c7330 add:8 module:overlay(25) +from:0x020c6328 kind:load to:0x020c7330 add:0x8 module:overlay(25) from:0x020c6340 kind:arm_call_thumb to:0x020bef7c module:overlay(1) from:0x020c6354 kind:arm_call to:0x0201bdfc module:main from:0x020c6364 kind:arm_call to:0x02011f3c module:main @@ -85,8 +85,8 @@ from:0x020c6590 kind:arm_call to:0x0205a7f0 module:overlay(0) from:0x020c6598 kind:arm_call to:0x0205a7c0 module:overlay(0) from:0x020c65a4 kind:arm_call to:0x0201c284 module:main from:0x020c65b8 kind:arm_call to:0x0201edec module:main -from:0x020c65c8 kind:load to:0x020c73d8 add:8 module:overlay(25) -from:0x020c65cc kind:load to:0x020c73cc add:8 module:overlay(25) +from:0x020c65c8 kind:load to:0x020c73d8 add:0x8 module:overlay(25) +from:0x020c65cc kind:load to:0x020c73cc add:0x8 module:overlay(25) from:0x020c65d0 kind:load to:0x0204b15c module:main from:0x020c65d4 kind:load to:0x020c73fc module:overlay(25) from:0x020c65d8 kind:load to:0x020c7410 module:overlay(25) @@ -95,14 +95,14 @@ from:0x020c65fc kind:arm_call to:0x0206edf8 module:overlay(0) from:0x020c6604 kind:arm_call to:0x020c71ec module:overlay(25) from:0x020c660c kind:arm_call to:0x0201662c module:main from:0x020c6614 kind:arm_call to:0x020631e4 module:overlay(0) -from:0x020c6620 kind:load to:0x020c73d8 add:8 module:overlay(25) +from:0x020c6620 kind:load to:0x020c73d8 add:0x8 module:overlay(25) from:0x020c6624 kind:load to:0x020b6a14 module:overlay(0) from:0x020c6640 kind:arm_call to:0x0206edf8 module:overlay(0) from:0x020c6648 kind:arm_call to:0x020c71ec module:overlay(25) from:0x020c6650 kind:arm_call to:0x0201662c module:main from:0x020c6658 kind:arm_call to:0x020631e4 module:overlay(0) from:0x020c6660 kind:arm_call to:0x02011ff4 module:main -from:0x020c666c kind:load to:0x020c73d8 add:8 module:overlay(25) +from:0x020c666c kind:load to:0x020c73d8 add:0x8 module:overlay(25) from:0x020c6670 kind:load to:0x020b6a14 module:overlay(0) from:0x020c6688 kind:load to:0x020c66c0 module:overlay(25) from:0x020c66a8 kind:arm_call to:0x020c66c0 module:overlay(25) diff --git a/config/jp/arm9/overlays/ov026/delinks.txt b/config/jp/arm9/overlays/ov026/delinks.txt index a50016f2..1e881a37 100644 --- a/config/jp/arm9/overlays/ov026/delinks.txt +++ b/config/jp/arm9/overlays/ov026/delinks.txt @@ -1,7 +1,6 @@ .text start:0x020da0c0 end:0x0213470c kind:code align:32 .rodata start:0x0213470c end:0x02136144 kind:rodata align:4 .init start:0x02136144 end:0x02137508 kind:code align:4 - .ctor start:0x02137508 end:0x021375f0 kind:rodata align:4 + .ctor start:0x02137508 end:0x021375ec kind:rodata align:4 .data start:0x02137600 end:0x0213b060 kind:data align:32 .bss start:0x0213b060 end:0x02143d60 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov027/delinks.txt b/config/jp/arm9/overlays/ov027/delinks.txt index c6fb069a..48793dd5 100644 --- a/config/jp/arm9/overlays/ov027/delinks.txt +++ b/config/jp/arm9/overlays/ov027/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02143d60 end:0x0214a294 kind:code align:32 .rodata start:0x0214a294 end:0x0214a2d0 kind:rodata align:4 .init start:0x0214a2d0 end:0x0214a71c kind:code align:4 - .ctor start:0x0214a71c end:0x0214a754 kind:rodata align:4 + .ctor start:0x0214a71c end:0x0214a750 kind:rodata align:4 .data start:0x0214a760 end:0x0214b1a0 kind:data align:32 .bss start:0x0214b1a0 end:0x0214be00 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov028/delinks.txt b/config/jp/arm9/overlays/ov028/delinks.txt index a0de3df6..b3c971fe 100644 --- a/config/jp/arm9/overlays/ov028/delinks.txt +++ b/config/jp/arm9/overlays/ov028/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02143d60 end:0x02148d38 kind:code align:32 .rodata start:0x02148d38 end:0x02148dc4 kind:rodata align:4 .init start:0x02148dc4 end:0x02149350 kind:code align:4 - .ctor start:0x02149350 end:0x02149398 kind:rodata align:4 + .ctor start:0x02149350 end:0x02149394 kind:rodata align:4 .data start:0x021493a0 end:0x02149fe0 kind:data align:32 .bss start:0x02149fe0 end:0x0214ad60 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov029/delinks.txt b/config/jp/arm9/overlays/ov029/delinks.txt index 646f59fd..f7c6c407 100644 --- a/config/jp/arm9/overlays/ov029/delinks.txt +++ b/config/jp/arm9/overlays/ov029/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02143d60 end:0x0215321c kind:code align:32 .rodata start:0x0215321c end:0x02153310 kind:rodata align:4 .init start:0x02153310 end:0x02153a20 kind:code align:4 - .ctor start:0x02153a20 end:0x02153a70 kind:rodata align:4 + .ctor start:0x02153a20 end:0x02153a6c kind:rodata align:4 .data start:0x02153a80 end:0x02154ae0 kind:data align:32 .bss start:0x02154ae0 end:0x02155ca0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov030/delinks.txt b/config/jp/arm9/overlays/ov030/delinks.txt index 9eceb931..05a83ff0 100644 --- a/config/jp/arm9/overlays/ov030/delinks.txt +++ b/config/jp/arm9/overlays/ov030/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02143d60 end:0x02152c3c kind:code align:32 .rodata start:0x02152c3c end:0x02152d3c kind:rodata align:4 .init start:0x02152d3c end:0x02153324 kind:code align:4 - .ctor start:0x02153324 end:0x0215335c kind:rodata align:4 + .ctor start:0x02153324 end:0x02153358 kind:rodata align:4 .data start:0x02153360 end:0x02154120 kind:data align:32 .bss start:0x02154120 end:0x021550a0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov031/delinks.txt b/config/jp/arm9/overlays/ov031/delinks.txt index f4c83852..b9396c20 100644 --- a/config/jp/arm9/overlays/ov031/delinks.txt +++ b/config/jp/arm9/overlays/ov031/delinks.txt @@ -1,7 +1,7 @@ .text start:0x020da0c0 end:0x02111a8c kind:code align:32 .rodata start:0x02111a8c end:0x02112d40 kind:rodata align:4 .init start:0x02112d40 end:0x02114520 kind:code align:4 - .ctor start:0x02114520 end:0x02114624 kind:rodata align:4 + .ctor start:0x02114520 end:0x02114620 kind:rodata align:4 .data start:0x02114640 end:0x02118120 kind:data align:32 .bss start:0x02118120 end:0x0211ad60 kind:bss align:32 diff --git a/config/jp/arm9/overlays/ov031/relocs.txt b/config/jp/arm9/overlays/ov031/relocs.txt index 54438cc6..9e521d27 100644 --- a/config/jp/arm9/overlays/ov031/relocs.txt +++ b/config/jp/arm9/overlays/ov031/relocs.txt @@ -1767,14 +1767,14 @@ from:0x020ea6ac kind:load to:0x02118488 module:overlay(31) from:0x020ea6c0 kind:arm_call to:0x02011f3c module:main from:0x020ea6cc kind:arm_call to:0x020ea794 module:overlay(31) from:0x020ea6e0 kind:arm_call to:0x02098e24 module:overlay(0) -from:0x020ea714 kind:load to:0x02115240 add:8 module:overlay(31) +from:0x020ea714 kind:load to:0x02115240 add:0x8 module:overlay(31) from:0x020ea740 kind:arm_call to:0x02098dac module:overlay(0) from:0x020ea780 kind:arm_call to:0x02098ba8 module:overlay(0) from:0x020ea78c kind:load to:0x020b6ba4 module:overlay(0) from:0x020ea79c kind:arm_call to:0x02099b30 module:overlay(0) from:0x020ea7c4 kind:arm_call to:0x02099360 module:overlay(0) from:0x020ea7d8 kind:arm_call to:0x020eb8dc module:overlay(31) -from:0x020ea800 kind:load to:0x02115264 add:8 module:overlay(31) +from:0x020ea800 kind:load to:0x02115264 add:0x8 module:overlay(31) from:0x020ea814 kind:arm_call to:0x020eb740 module:overlay(31) from:0x020ea850 kind:arm_call to:0x0209a208 module:overlay(0) from:0x020ea880 kind:arm_call to:0x020eb2f0 module:overlay(31) @@ -1873,7 +1873,7 @@ from:0x020eb738 kind:load to:0x02115208 module:overlay(31) from:0x020eb788 kind:arm_call to:0x020eb848 module:overlay(31) from:0x020eb840 kind:arm_call to:0x02099c78 module:overlay(0) from:0x020eb8f0 kind:arm_call to:0x020f7d24 module:overlay(31) -from:0x020eb910 kind:load to:0x02115228 add:8 module:overlay(31) +from:0x020eb910 kind:load to:0x02115228 add:0x8 module:overlay(31) from:0x020eb938 kind:arm_call to:0x020eb2f0 module:overlay(31) from:0x020eb948 kind:arm_call to:0x020f7d84 module:overlay(31) from:0x020eb968 kind:arm_call to:0x020eb2f0 module:overlay(31) diff --git a/config/jp/arm9/overlays/ov032/delinks.txt b/config/jp/arm9/overlays/ov032/delinks.txt index a26da64a..547904c2 100644 --- a/config/jp/arm9/overlays/ov032/delinks.txt +++ b/config/jp/arm9/overlays/ov032/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x02123ea8 kind:code align:32 .rodata start:0x02123ea8 end:0x02123f0c kind:rodata align:4 .init start:0x02123f0c end:0x02124104 kind:code align:4 - .ctor start:0x02124104 end:0x0212411c kind:rodata align:4 + .ctor start:0x02124104 end:0x02124118 kind:rodata align:4 .data start:0x02124120 end:0x02124800 kind:data align:32 .bss start:0x02124800 end:0x02124ba0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov033/delinks.txt b/config/jp/arm9/overlays/ov033/delinks.txt index ff31c4c1..bee94447 100644 --- a/config/jp/arm9/overlays/ov033/delinks.txt +++ b/config/jp/arm9/overlays/ov033/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x0211f944 kind:code align:32 .rodata start:0x0211f944 end:0x02122e08 kind:rodata align:4 .init start:0x02122e08 end:0x02122f18 kind:code align:4 - .ctor start:0x02122f18 end:0x02122f28 kind:rodata align:4 + .ctor start:0x02122f18 end:0x02122f24 kind:rodata align:4 .data start:0x02122f40 end:0x021236a0 kind:data align:32 .bss start:0x021236a0 end:0x02124540 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov034/delinks.txt b/config/jp/arm9/overlays/ov034/delinks.txt index 96910091..c91bf525 100644 --- a/config/jp/arm9/overlays/ov034/delinks.txt +++ b/config/jp/arm9/overlays/ov034/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x021241f4 kind:code align:32 .rodata start:0x021241f4 end:0x021242a8 kind:rodata align:4 .init start:0x021242a8 end:0x02124588 kind:code align:4 - .ctor start:0x02124588 end:0x021245ac kind:rodata align:4 + .ctor start:0x02124588 end:0x021245a8 kind:rodata align:4 .data start:0x021245c0 end:0x02124c20 kind:data align:32 .bss start:0x02124c20 end:0x02125280 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov035/delinks.txt b/config/jp/arm9/overlays/ov035/delinks.txt index 7981feb1..01944e04 100644 --- a/config/jp/arm9/overlays/ov035/delinks.txt +++ b/config/jp/arm9/overlays/ov035/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x02122c60 kind:code align:32 .rodata start:0x02122c60 end:0x02122d34 kind:rodata align:4 .init start:0x02122d34 end:0x02122f18 kind:code align:4 - .ctor start:0x02122f18 end:0x02122f2c kind:rodata align:4 + .ctor start:0x02122f18 end:0x02122f28 kind:rodata align:4 .data start:0x02122f40 end:0x021238a0 kind:data align:32 .bss start:0x021238a0 end:0x02123ca0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov036/delinks.txt b/config/jp/arm9/overlays/ov036/delinks.txt index 863cd812..6aad0b86 100644 --- a/config/jp/arm9/overlays/ov036/delinks.txt +++ b/config/jp/arm9/overlays/ov036/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x02122a24 kind:code align:32 .rodata start:0x02122a24 end:0x02122c14 kind:rodata align:4 .init start:0x02122c14 end:0x02122ee4 kind:code align:4 - .ctor start:0x02122ee4 end:0x02122f0c kind:rodata align:4 + .ctor start:0x02122ee4 end:0x02122f08 kind:rodata align:4 .data start:0x02122f20 end:0x02124500 kind:data align:32 .bss start:0x02124500 end:0x02124ca0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov037/delinks.txt b/config/jp/arm9/overlays/ov037/delinks.txt index 413f8c68..20b9dd9c 100644 --- a/config/jp/arm9/overlays/ov037/delinks.txt +++ b/config/jp/arm9/overlays/ov037/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x02123964 kind:code align:32 .rodata start:0x02123964 end:0x021239f4 kind:rodata align:4 .init start:0x021239f4 end:0x02123b94 kind:code align:4 - .ctor start:0x02123b94 end:0x02123ba8 kind:rodata align:4 + .ctor start:0x02123b94 end:0x02123ba4 kind:rodata align:4 .data start:0x02123bc0 end:0x021245c0 kind:data align:32 .bss start:0x021245c0 end:0x021248c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov037/relocs.txt b/config/jp/arm9/overlays/ov037/relocs.txt index 07bf96fb..97dba111 100644 --- a/config/jp/arm9/overlays/ov037/relocs.txt +++ b/config/jp/arm9/overlays/ov037/relocs.txt @@ -194,7 +194,7 @@ from:0x0211cc0c kind:arm_call to:0x0206306c module:overlay(0) from:0x0211cc94 kind:arm_call to:0x02061d8c module:overlay(0) from:0x0211cca8 kind:arm_call to:0x02016614 module:main from:0x0211ccd8 kind:load to:0x02123c04 module:overlay(37) -from:0x0211ccdc kind:load to:0x020b3640 add:8 module:overlay(0) +from:0x0211ccdc kind:load to:0x020b3640 add:0x8 module:overlay(0) from:0x0211ccec kind:arm_call to:0x02063014 module:overlay(0) from:0x0211ccf4 kind:arm_call to:0x020631e4 module:overlay(0) from:0x0211cd0c kind:arm_call to:0x02063014 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov038/delinks.txt b/config/jp/arm9/overlays/ov038/delinks.txt index 701e20f8..4e3e9543 100644 --- a/config/jp/arm9/overlays/ov038/delinks.txt +++ b/config/jp/arm9/overlays/ov038/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x02122720 kind:code align:32 .rodata start:0x02122720 end:0x02122814 kind:rodata align:4 .init start:0x02122814 end:0x02122ad4 kind:code align:4 - .ctor start:0x02122ad4 end:0x02122af8 kind:rodata align:4 + .ctor start:0x02122ad4 end:0x02122af4 kind:rodata align:4 .data start:0x02122b00 end:0x02123220 kind:data align:32 .bss start:0x02123220 end:0x02123920 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov039/delinks.txt b/config/jp/arm9/overlays/ov039/delinks.txt index 45649814..11488129 100644 --- a/config/jp/arm9/overlays/ov039/delinks.txt +++ b/config/jp/arm9/overlays/ov039/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0211ad60 end:0x0211e84c kind:code align:32 .rodata start:0x0211e84c end:0x0211e920 kind:rodata align:4 .init start:0x0211e920 end:0x0211eba8 kind:code align:4 - .ctor start:0x0211eba8 end:0x0211ebc0 kind:rodata align:4 + .ctor start:0x0211eba8 end:0x0211ebbc kind:rodata align:4 .data start:0x0211ebc0 end:0x0211fb20 kind:data align:32 .bss start:0x0211fb20 end:0x02120080 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov040/delinks.txt b/config/jp/arm9/overlays/ov040/delinks.txt index 07d8f402..e37969f3 100644 --- a/config/jp/arm9/overlays/ov040/delinks.txt +++ b/config/jp/arm9/overlays/ov040/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02125280 end:0x0212f5d0 kind:code align:32 .rodata start:0x0212f5d0 end:0x0212f7d8 kind:rodata align:4 .init start:0x0212f7d8 end:0x0212feb0 kind:code align:4 - .ctor start:0x0212feb0 end:0x0212fed4 kind:rodata align:4 + .ctor start:0x0212feb0 end:0x0212fed0 kind:rodata align:4 .data start:0x0212fee0 end:0x02130dc0 kind:data align:32 .bss start:0x02130dc0 end:0x02131ec0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov041/delinks.txt b/config/jp/arm9/overlays/ov041/delinks.txt index 7c9c2d47..67588420 100644 --- a/config/jp/arm9/overlays/ov041/delinks.txt +++ b/config/jp/arm9/overlays/ov041/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02125280 end:0x0212f188 kind:code align:32 .rodata start:0x0212f188 end:0x0212f320 kind:rodata align:4 .init start:0x0212f320 end:0x0212f68c kind:code align:4 - .ctor start:0x0212f68c end:0x0212f6b8 kind:rodata align:4 + .ctor start:0x0212f68c end:0x0212f6b4 kind:rodata align:4 .data start:0x0212f6c0 end:0x02130060 kind:data align:32 .bss start:0x02130060 end:0x02130660 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov042/delinks.txt b/config/jp/arm9/overlays/ov042/delinks.txt index 42b6d165..f6655ca4 100644 --- a/config/jp/arm9/overlays/ov042/delinks.txt +++ b/config/jp/arm9/overlays/ov042/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02125280 end:0x0212ea40 kind:code align:32 .rodata start:0x0212ea40 end:0x0212eac8 kind:rodata align:4 .init start:0x0212eac8 end:0x0212ecf8 kind:code align:4 - .ctor start:0x0212ecf8 end:0x0212ed18 kind:rodata align:4 + .ctor start:0x0212ecf8 end:0x0212ed14 kind:rodata align:4 .data start:0x0212ed20 end:0x0212f7e0 kind:data align:32 .bss start:0x0212f7e0 end:0x0212fd80 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov043/delinks.txt b/config/jp/arm9/overlays/ov043/delinks.txt index 81dc0fbe..369e290a 100644 --- a/config/jp/arm9/overlays/ov043/delinks.txt +++ b/config/jp/arm9/overlays/ov043/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02125280 end:0x0212e7f4 kind:code align:32 .rodata start:0x0212e7f4 end:0x0212e938 kind:rodata align:4 .init start:0x0212e938 end:0x0212ebe0 kind:code align:4 - .ctor start:0x0212ebe0 end:0x0212ebf4 kind:rodata align:4 + .ctor start:0x0212ebe0 end:0x0212ebf0 kind:rodata align:4 .data start:0x0212ec00 end:0x0212f980 kind:data align:32 .bss start:0x0212f980 end:0x0212fcc0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov044/delinks.txt b/config/jp/arm9/overlays/ov044/delinks.txt index 9adb4d1e..3a61446c 100644 --- a/config/jp/arm9/overlays/ov044/delinks.txt +++ b/config/jp/arm9/overlays/ov044/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02125280 end:0x0212e7f4 kind:code align:32 .rodata start:0x0212e7f4 end:0x0212e8fc kind:rodata align:4 .init start:0x0212e8fc end:0x0212eb84 kind:code align:4 - .ctor start:0x0212eb84 end:0x0212ebac kind:rodata align:4 + .ctor start:0x0212eb84 end:0x0212eba8 kind:rodata align:4 .data start:0x0212ebc0 end:0x0212f380 kind:data align:32 .bss start:0x0212f380 end:0x0212fae0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov044/symbols.txt b/config/jp/arm9/overlays/ov044/symbols.txt index 33c7d05c..9c335282 100644 --- a/config/jp/arm9/overlays/ov044/symbols.txt +++ b/config/jp/arm9/overlays/ov044/symbols.txt @@ -233,7 +233,6 @@ __sinit_ov044_0212eae4 kind:function(arm,size=0x50) addr:0x0212eae4 __sinit_ov044_0212eb34 kind:function(arm,size=0x50) addr:0x0212eb34 .p__sinit_ov044_0212e8fc kind:data(word) addr:0x0212eb84 .p__sinit_ov044_0212e918 kind:data(word) addr:0x0212eb88 -data_ov044_0212eb89 kind:data(any) addr:0x0212eb89 ambiguous .p__sinit_ov044_0212e91c kind:data(word) addr:0x0212eb8c .p__sinit_ov044_0212e980 kind:data(word) addr:0x0212eb90 .p__sinit_ov044_0212e9f4 kind:data(word) addr:0x0212eb94 diff --git a/config/jp/arm9/overlays/ov045/delinks.txt b/config/jp/arm9/overlays/ov045/delinks.txt index b79a0481..0760fb8b 100644 --- a/config/jp/arm9/overlays/ov045/delinks.txt +++ b/config/jp/arm9/overlays/ov045/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02125280 end:0x0212b280 kind:code align:32 .rodata start:0x0212b280 end:0x0212b3e0 kind:rodata align:4 .init start:0x0212b3e0 end:0x0212b894 kind:code align:4 - .ctor start:0x0212b894 end:0x0212b8b0 kind:rodata align:4 + .ctor start:0x0212b894 end:0x0212b8ac kind:rodata align:4 .data start:0x0212b8c0 end:0x0212c000 kind:data align:32 .bss start:0x0212c000 end:0x0212c480 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov046/delinks.txt b/config/jp/arm9/overlays/ov046/delinks.txt index 8c922092..4e7d7290 100644 --- a/config/jp/arm9/overlays/ov046/delinks.txt +++ b/config/jp/arm9/overlays/ov046/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02125280 end:0x0212b838 kind:code align:32 .rodata start:0x0212b838 end:0x0212bae0 kind:rodata align:4 .init start:0x0212bae0 end:0x0212bd70 kind:code align:4 - .ctor start:0x0212bd70 end:0x0212bd88 kind:rodata align:4 + .ctor start:0x0212bd70 end:0x0212bd84 kind:rodata align:4 .data start:0x0212bda0 end:0x0212c520 kind:data align:32 .bss start:0x0212c520 end:0x0212c920 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov047/delinks.txt b/config/jp/arm9/overlays/ov047/delinks.txt index 9e2ddc1c..c2addbb8 100644 --- a/config/jp/arm9/overlays/ov047/delinks.txt +++ b/config/jp/arm9/overlays/ov047/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02131ec0 end:0x02137780 kind:code align:32 .rodata start:0x02137780 end:0x021377d4 kind:rodata align:4 .init start:0x021377d4 end:0x0213792c kind:code align:4 - .ctor start:0x0213792c end:0x02137944 kind:rodata align:4 + .ctor start:0x0213792c end:0x02137940 kind:rodata align:4 .data start:0x02137960 end:0x02137e00 kind:data align:32 .bss start:0x02137e00 end:0x02137fe0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov048/delinks.txt b/config/jp/arm9/overlays/ov048/delinks.txt index 24f891c7..e6d45b80 100644 --- a/config/jp/arm9/overlays/ov048/delinks.txt +++ b/config/jp/arm9/overlays/ov048/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02131ec0 end:0x02138f08 kind:code align:32 .rodata start:0x02138f08 end:0x02138f24 kind:rodata align:4 .init start:0x02138f24 end:0x0213904c kind:code align:4 - .ctor start:0x0213904c end:0x02139060 kind:rodata align:4 + .ctor start:0x0213904c end:0x0213905c kind:rodata align:4 .data start:0x02139060 end:0x02139500 kind:data align:32 .bss start:0x02139500 end:0x02139900 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov049/delinks.txt b/config/jp/arm9/overlays/ov049/delinks.txt index ea5f65c9..2cbd4532 100644 --- a/config/jp/arm9/overlays/ov049/delinks.txt +++ b/config/jp/arm9/overlays/ov049/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02131ec0 end:0x0213858c kind:code align:32 .rodata start:0x0213858c end:0x021385bc kind:rodata align:4 .init start:0x021385bc end:0x02138d14 kind:code align:4 - .ctor start:0x02138d14 end:0x02138d30 kind:rodata align:4 + .ctor start:0x02138d14 end:0x02138d2c kind:rodata align:4 .data start:0x02138d40 end:0x02139a40 kind:data align:32 .bss start:0x02139a40 end:0x02139f20 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov050/delinks.txt b/config/jp/arm9/overlays/ov050/delinks.txt index f12fbfee..d03e5e2b 100644 --- a/config/jp/arm9/overlays/ov050/delinks.txt +++ b/config/jp/arm9/overlays/ov050/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02131ec0 end:0x0213840c kind:code align:32 .rodata start:0x0213840c end:0x0213842c kind:rodata align:4 .init start:0x0213842c end:0x021385a0 kind:code align:4 - .ctor start:0x021385a0 end:0x021385b4 kind:rodata align:4 + .ctor start:0x021385a0 end:0x021385b0 kind:rodata align:4 .data start:0x021385c0 end:0x02138ca0 kind:data align:32 .bss start:0x02138ca0 end:0x02139060 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov051/delinks.txt b/config/jp/arm9/overlays/ov051/delinks.txt index d0895bef..ffab576b 100644 --- a/config/jp/arm9/overlays/ov051/delinks.txt +++ b/config/jp/arm9/overlays/ov051/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02131ec0 end:0x021386f4 kind:code align:32 .rodata start:0x021386f4 end:0x02138728 kind:rodata align:4 .init start:0x02138728 end:0x021387b4 kind:code align:4 - .ctor start:0x021387b4 end:0x021387bc kind:rodata align:4 + .ctor start:0x021387b4 end:0x021387b8 kind:rodata align:4 .data start:0x021387c0 end:0x02138bc0 kind:data align:32 .bss start:0x02138bc0 end:0x02138cc0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov052/delinks.txt b/config/jp/arm9/overlays/ov052/delinks.txt index 37788ba9..8b1b9089 100644 --- a/config/jp/arm9/overlays/ov052/delinks.txt +++ b/config/jp/arm9/overlays/ov052/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02131ec0 end:0x021377bc kind:code align:32 .rodata start:0x021377bc end:0x021377e4 kind:rodata align:4 .init start:0x021377e4 end:0x02137a8c kind:code align:4 - .ctor start:0x02137a8c end:0x02137aa0 kind:rodata align:4 + .ctor start:0x02137a8c end:0x02137a9c kind:rodata align:4 .data start:0x02137aa0 end:0x02138440 kind:data align:32 .bss start:0x02138440 end:0x02138760 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov053/delinks.txt b/config/jp/arm9/overlays/ov053/delinks.txt index 71ea1231..d3cc66dd 100644 --- a/config/jp/arm9/overlays/ov053/delinks.txt +++ b/config/jp/arm9/overlays/ov053/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02139f20 end:0x0213e750 kind:code align:32 .rodata start:0x0213e750 end:0x0213e790 kind:rodata align:4 .init start:0x0213e790 end:0x0213e8a8 kind:code align:4 - .ctor start:0x0213e8a8 end:0x0213e8b8 kind:rodata align:4 + .ctor start:0x0213e8a8 end:0x0213e8b4 kind:rodata align:4 .data start:0x0213e8c0 end:0x0213ede0 kind:data align:32 .bss start:0x0213ede0 end:0x0213efc0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov054/delinks.txt b/config/jp/arm9/overlays/ov054/delinks.txt index 996942b7..82851029 100644 --- a/config/jp/arm9/overlays/ov054/delinks.txt +++ b/config/jp/arm9/overlays/ov054/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02139f20 end:0x0213f458 kind:code align:32 .init start:0x0213f458 end:0x0213f6b0 kind:code align:4 - .ctor start:0x0213f6b0 end:0x0213f6c0 kind:rodata align:4 + .ctor start:0x0213f6b0 end:0x0213f6bc kind:rodata align:4 .data start:0x0213f6c0 end:0x0213ff60 kind:data align:32 .bss start:0x0213ff60 end:0x02140220 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov055/delinks.txt b/config/jp/arm9/overlays/ov055/delinks.txt index d2cf69e1..9aab1662 100644 --- a/config/jp/arm9/overlays/ov055/delinks.txt +++ b/config/jp/arm9/overlays/ov055/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02139f20 end:0x0213ec90 kind:code align:32 .rodata start:0x0213ec90 end:0x0213ecc0 kind:rodata align:4 .init start:0x0213ecc0 end:0x0213ee2c kind:code align:4 - .ctor start:0x0213ee2c end:0x0213ee3c kind:rodata align:4 + .ctor start:0x0213ee2c end:0x0213ee38 kind:rodata align:4 .data start:0x0213ee40 end:0x0213f600 kind:data align:32 .bss start:0x0213f600 end:0x0213f840 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov056/delinks.txt b/config/jp/arm9/overlays/ov056/delinks.txt index a5bc94e2..b47f95f6 100644 --- a/config/jp/arm9/overlays/ov056/delinks.txt +++ b/config/jp/arm9/overlays/ov056/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02139f20 end:0x0213fe14 kind:code align:32 .rodata start:0x0213fe14 end:0x0213ffac kind:rodata align:4 .init start:0x0213ffac end:0x0214009c kind:code align:4 - .ctor start:0x0214009c end:0x021400ac kind:rodata align:4 + .ctor start:0x0214009c end:0x021400a8 kind:rodata align:4 .data start:0x021400c0 end:0x02140a00 kind:data align:32 .bss start:0x02140a00 end:0x02140ba0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov057/delinks.txt b/config/jp/arm9/overlays/ov057/delinks.txt index 4fe6792a..a28c9776 100644 --- a/config/jp/arm9/overlays/ov057/delinks.txt +++ b/config/jp/arm9/overlays/ov057/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02139f20 end:0x0213d33c kind:code align:32 .rodata start:0x0213d33c end:0x0213d3c0 kind:rodata align:4 .init start:0x0213d3c0 end:0x0213d7c4 kind:code align:4 - .ctor start:0x0213d7c4 end:0x0213d7e4 kind:rodata align:4 + .ctor start:0x0213d7c4 end:0x0213d7e0 kind:rodata align:4 .data start:0x0213d800 end:0x0213dd20 kind:data align:32 .bss start:0x0213dd20 end:0x0213e1c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov058/delinks.txt b/config/jp/arm9/overlays/ov058/delinks.txt index 1304956b..d40414e2 100644 --- a/config/jp/arm9/overlays/ov058/delinks.txt +++ b/config/jp/arm9/overlays/ov058/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02140ba0 end:0x02154bf4 kind:code align:32 .rodata start:0x02154bf4 end:0x021551d8 kind:rodata align:4 .init start:0x021551d8 end:0x02155e60 kind:code align:4 - .ctor start:0x02155e60 end:0x02155ec8 kind:rodata align:4 + .ctor start:0x02155e60 end:0x02155ec4 kind:rodata align:4 .data start:0x02155ee0 end:0x02157be0 kind:data align:32 .bss start:0x02157be0 end:0x02159be0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov059/delinks.txt b/config/jp/arm9/overlays/ov059/delinks.txt index bb39d03f..f434023c 100644 --- a/config/jp/arm9/overlays/ov059/delinks.txt +++ b/config/jp/arm9/overlays/ov059/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x02164bb4 kind:code align:32 .rodata start:0x02164bb4 end:0x02164c18 kind:rodata align:4 .init start:0x02164c18 end:0x02165100 kind:code align:4 - .ctor start:0x02165100 end:0x0216513c kind:rodata align:4 + .ctor start:0x02165100 end:0x02165138 kind:rodata align:4 .data start:0x02165140 end:0x021660a0 kind:data align:32 .bss start:0x021660a0 end:0x02166c20 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov060/delinks.txt b/config/jp/arm9/overlays/ov060/delinks.txt index c9d3f09b..3ba2985d 100644 --- a/config/jp/arm9/overlays/ov060/delinks.txt +++ b/config/jp/arm9/overlays/ov060/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x021628d4 kind:code align:32 .rodata start:0x021628d4 end:0x02162a1c kind:rodata align:4 .init start:0x02162a1c end:0x0216312c kind:code align:4 - .ctor start:0x0216312c end:0x02163178 kind:rodata align:4 + .ctor start:0x0216312c end:0x02163174 kind:rodata align:4 .data start:0x02163180 end:0x02164c40 kind:data align:32 .bss start:0x02164c40 end:0x02165e80 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov061/delinks.txt b/config/jp/arm9/overlays/ov061/delinks.txt index 1cf82837..c96dacb0 100644 --- a/config/jp/arm9/overlays/ov061/delinks.txt +++ b/config/jp/arm9/overlays/ov061/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x0215bb5c kind:code align:32 .rodata start:0x0215bb5c end:0x0215bbd8 kind:rodata align:4 .init start:0x0215bbd8 end:0x0215c018 kind:code align:4 - .ctor start:0x0215c018 end:0x0215c048 kind:rodata align:4 + .ctor start:0x0215c018 end:0x0215c044 kind:rodata align:4 .data start:0x0215c060 end:0x0215ccc0 kind:data align:32 .bss start:0x0215ccc0 end:0x0215d880 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov062/delinks.txt b/config/jp/arm9/overlays/ov062/delinks.txt index 9e2a46a8..38b2b20f 100644 --- a/config/jp/arm9/overlays/ov062/delinks.txt +++ b/config/jp/arm9/overlays/ov062/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x021604c8 kind:code align:32 .rodata start:0x021604c8 end:0x0216060c kind:rodata align:4 .init start:0x0216060c end:0x02160cf4 kind:code align:4 - .ctor start:0x02160cf4 end:0x02160d4c kind:rodata align:4 + .ctor start:0x02160cf4 end:0x02160d48 kind:rodata align:4 .data start:0x02160d60 end:0x021626c0 kind:data align:32 .bss start:0x021626c0 end:0x021639a0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov063/delinks.txt b/config/jp/arm9/overlays/ov063/delinks.txt index 14becf95..2cc8168e 100644 --- a/config/jp/arm9/overlays/ov063/delinks.txt +++ b/config/jp/arm9/overlays/ov063/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x0216433c kind:code align:32 .rodata start:0x0216433c end:0x02164548 kind:rodata align:4 .init start:0x02164548 end:0x02164c58 kind:code align:4 - .ctor start:0x02164c58 end:0x02164c94 kind:rodata align:4 + .ctor start:0x02164c58 end:0x02164c90 kind:rodata align:4 .data start:0x02164ca0 end:0x02165980 kind:data align:32 .bss start:0x02165980 end:0x02166840 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov064/delinks.txt b/config/jp/arm9/overlays/ov064/delinks.txt index deeb9f1b..5eb4d07b 100644 --- a/config/jp/arm9/overlays/ov064/delinks.txt +++ b/config/jp/arm9/overlays/ov064/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x0215c018 kind:code align:32 .rodata start:0x0215c018 end:0x0215c084 kind:rodata align:4 .init start:0x0215c084 end:0x0215c32c kind:code align:4 - .ctor start:0x0215c32c end:0x0215c350 kind:rodata align:4 + .ctor start:0x0215c32c end:0x0215c34c kind:rodata align:4 .data start:0x0215c360 end:0x0215cb00 kind:data align:32 .bss start:0x0215cb00 end:0x0215d260 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov065/delinks.txt b/config/jp/arm9/overlays/ov065/delinks.txt index 53db1363..2741b733 100644 --- a/config/jp/arm9/overlays/ov065/delinks.txt +++ b/config/jp/arm9/overlays/ov065/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x0215bd14 kind:code align:32 .rodata start:0x0215bd14 end:0x0215bda4 kind:rodata align:4 .init start:0x0215bda4 end:0x0215c1e8 kind:code align:4 - .ctor start:0x0215c1e8 end:0x0215c21c kind:rodata align:4 + .ctor start:0x0215c1e8 end:0x0215c218 kind:rodata align:4 .data start:0x0215c220 end:0x0215cce0 kind:data align:32 .bss start:0x0215cce0 end:0x0215d740 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov066/delinks.txt b/config/jp/arm9/overlays/ov066/delinks.txt index ba9c052b..0cd34da6 100644 --- a/config/jp/arm9/overlays/ov066/delinks.txt +++ b/config/jp/arm9/overlays/ov066/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x0215f4e0 kind:code align:32 .rodata start:0x0215f4e0 end:0x0215f608 kind:rodata align:4 .init start:0x0215f608 end:0x0215fa00 kind:code align:4 - .ctor start:0x0215fa00 end:0x0215fa30 kind:rodata align:4 + .ctor start:0x0215fa00 end:0x0215fa2c kind:rodata align:4 .data start:0x0215fa40 end:0x02164360 kind:data align:32 .bss start:0x02164360 end:0x02164ea0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov067/delinks.txt b/config/jp/arm9/overlays/ov067/delinks.txt index 49d60c66..f018adb4 100644 --- a/config/jp/arm9/overlays/ov067/delinks.txt +++ b/config/jp/arm9/overlays/ov067/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x0215e24c kind:code align:32 .rodata start:0x0215e24c end:0x0215e358 kind:rodata align:4 .init start:0x0215e358 end:0x0215e7fc kind:code align:4 - .ctor start:0x0215e7fc end:0x0215e830 kind:rodata align:4 + .ctor start:0x0215e7fc end:0x0215e82c kind:rodata align:4 .data start:0x0215e840 end:0x0215f5c0 kind:data align:32 .bss start:0x0215f5c0 end:0x021601c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov068/delinks.txt b/config/jp/arm9/overlays/ov068/delinks.txt index 1076c0ed..5c9be2eb 100644 --- a/config/jp/arm9/overlays/ov068/delinks.txt +++ b/config/jp/arm9/overlays/ov068/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x02163e60 kind:code align:32 .rodata start:0x02163e60 end:0x02163ed0 kind:rodata align:4 .init start:0x02163ed0 end:0x021644c0 kind:code align:4 - .ctor start:0x021644c0 end:0x02164510 kind:rodata align:4 + .ctor start:0x021644c0 end:0x0216450c kind:rodata align:4 .data start:0x02164520 end:0x02165b20 kind:data align:32 .bss start:0x02165b20 end:0x02166b00 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov068/relocs.txt b/config/jp/arm9/overlays/ov068/relocs.txt index 7d7ef6f2..d6af8124 100644 --- a/config/jp/arm9/overlays/ov068/relocs.txt +++ b/config/jp/arm9/overlays/ov068/relocs.txt @@ -1198,7 +1198,7 @@ from:0x021637a0 kind:arm_call to:0x0209e19c module:overlay(0) from:0x021637b4 kind:arm_call to:0x0206306c module:overlay(0) from:0x02163838 kind:arm_call to:0x02016614 module:main from:0x02163860 kind:load to:0x02165b04 module:overlay(68) -from:0x02163864 kind:load to:0x020b3640 add:8 module:overlay(0) +from:0x02163864 kind:load to:0x020b3640 add:0x8 module:overlay(0) from:0x02163874 kind:arm_call to:0x02063014 module:overlay(0) from:0x0216387c kind:arm_call to:0x020631e4 module:overlay(0) from:0x02163894 kind:arm_call to:0x02063014 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov069/delinks.txt b/config/jp/arm9/overlays/ov069/delinks.txt index 254fe738..6ac27fb7 100644 --- a/config/jp/arm9/overlays/ov069/delinks.txt +++ b/config/jp/arm9/overlays/ov069/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02159be0 end:0x0215c7d4 kind:code align:32 .rodata start:0x0215c7d4 end:0x0215c7e8 kind:rodata align:4 .init start:0x0215c7e8 end:0x0215c978 kind:code align:4 - .ctor start:0x0215c978 end:0x0215c990 kind:rodata align:4 + .ctor start:0x0215c978 end:0x0215c98c kind:rodata align:4 .data start:0x0215c9a0 end:0x0215d140 kind:data align:32 .bss start:0x0215d140 end:0x0215d520 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov070/delinks.txt b/config/jp/arm9/overlays/ov070/delinks.txt index cd59c187..9037b94e 100644 --- a/config/jp/arm9/overlays/ov070/delinks.txt +++ b/config/jp/arm9/overlays/ov070/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02140ba0 end:0x0214fc24 kind:code align:32 .rodata start:0x0214fc24 end:0x0214fe10 kind:rodata align:4 .init start:0x0214fe10 end:0x02150794 kind:code align:4 - .ctor start:0x02150794 end:0x021507fc kind:rodata align:4 + .ctor start:0x02150794 end:0x021507f8 kind:rodata align:4 .data start:0x02150800 end:0x02151880 kind:data align:32 .bss start:0x02151880 end:0x02152c20 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov071/delinks.txt b/config/jp/arm9/overlays/ov071/delinks.txt index 815dcd99..d60bd777 100644 --- a/config/jp/arm9/overlays/ov071/delinks.txt +++ b/config/jp/arm9/overlays/ov071/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02165be4 kind:code align:32 .rodata start:0x02165be4 end:0x02165fa4 kind:rodata align:4 .init start:0x02165fa4 end:0x0216630c kind:code align:4 - .ctor start:0x0216630c end:0x02166344 kind:rodata align:4 + .ctor start:0x0216630c end:0x02166340 kind:rodata align:4 .data start:0x02166360 end:0x02167360 kind:data align:32 .bss start:0x02167360 end:0x02167b00 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov072/delinks.txt b/config/jp/arm9/overlays/ov072/delinks.txt index d5a6a660..50447664 100644 --- a/config/jp/arm9/overlays/ov072/delinks.txt +++ b/config/jp/arm9/overlays/ov072/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x0215450c kind:code align:32 .rodata start:0x0215450c end:0x021545c0 kind:rodata align:4 .init start:0x021545c0 end:0x02154660 kind:code align:4 - .ctor start:0x02154660 end:0x0215466c kind:rodata align:4 + .ctor start:0x02154660 end:0x02154668 kind:rodata align:4 .data start:0x02154680 end:0x021548a0 kind:data align:32 .bss start:0x021548a0 end:0x02154a80 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov073/delinks.txt b/config/jp/arm9/overlays/ov073/delinks.txt index 8be96186..7c4e611d 100644 --- a/config/jp/arm9/overlays/ov073/delinks.txt +++ b/config/jp/arm9/overlays/ov073/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02165c60 kind:code align:32 .rodata start:0x02165c60 end:0x02165d68 kind:rodata align:4 .init start:0x02165d68 end:0x02165edc kind:code align:4 - .ctor start:0x02165edc end:0x02165ee8 kind:rodata align:4 + .ctor start:0x02165edc end:0x02165ee4 kind:rodata align:4 .data start:0x02165f00 end:0x021667e0 kind:data align:32 .bss start:0x021667e0 end:0x021669c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov074/delinks.txt b/config/jp/arm9/overlays/ov074/delinks.txt index 0040c453..d81208d3 100644 --- a/config/jp/arm9/overlays/ov074/delinks.txt +++ b/config/jp/arm9/overlays/ov074/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x021640a0 kind:code align:32 .rodata start:0x021640a0 end:0x0216441c kind:rodata align:4 .init start:0x0216441c end:0x021647f8 kind:code align:4 - .ctor start:0x021647f8 end:0x0216481c kind:rodata align:4 + .ctor start:0x021647f8 end:0x02164818 kind:rodata align:4 .data start:0x02164820 end:0x02165580 kind:data align:32 .bss start:0x02165580 end:0x02165c40 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov075/delinks.txt b/config/jp/arm9/overlays/ov075/delinks.txt index 819ca428..336322f4 100644 --- a/config/jp/arm9/overlays/ov075/delinks.txt +++ b/config/jp/arm9/overlays/ov075/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02163fd8 kind:code align:32 .rodata start:0x02163fd8 end:0x0216433c kind:rodata align:4 .init start:0x0216433c end:0x02164670 kind:code align:4 - .ctor start:0x02164670 end:0x02164684 kind:rodata align:4 + .ctor start:0x02164670 end:0x02164680 kind:rodata align:4 .data start:0x021646a0 end:0x02165340 kind:data align:32 .bss start:0x02165340 end:0x021656e0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov076/delinks.txt b/config/jp/arm9/overlays/ov076/delinks.txt index 919ac470..f18da222 100644 --- a/config/jp/arm9/overlays/ov076/delinks.txt +++ b/config/jp/arm9/overlays/ov076/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02154ae0 kind:code align:32 .rodata start:0x02154ae0 end:0x02154b00 kind:rodata align:4 .init start:0x02154b00 end:0x02154b50 kind:code align:4 - .ctor start:0x02154b50 end:0x02154b58 kind:rodata align:4 + .ctor start:0x02154b50 end:0x02154b54 kind:rodata align:4 .data start:0x02154b60 end:0x02154dc0 kind:data align:32 .bss start:0x02154dc0 end:0x02154ec0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov077/delinks.txt b/config/jp/arm9/overlays/ov077/delinks.txt index 5871540a..8ec9b8af 100644 --- a/config/jp/arm9/overlays/ov077/delinks.txt +++ b/config/jp/arm9/overlays/ov077/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02154ec0 end:0x0215d0c4 kind:code align:32 .rodata start:0x0215d0c4 end:0x0215d140 kind:rodata align:4 .init start:0x0215d140 end:0x0215d424 kind:code align:4 - .ctor start:0x0215d424 end:0x0215d44c kind:rodata align:4 + .ctor start:0x0215d424 end:0x0215d448 kind:rodata align:4 .data start:0x0215d460 end:0x0215dda0 kind:data align:32 .bss start:0x0215dda0 end:0x0215e4c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov078/delinks.txt b/config/jp/arm9/overlays/ov078/delinks.txt index af920177..3ae78008 100644 --- a/config/jp/arm9/overlays/ov078/delinks.txt +++ b/config/jp/arm9/overlays/ov078/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02154ec0 end:0x0215f3c8 kind:code align:32 .rodata start:0x0215f3c8 end:0x0215f42c kind:rodata align:4 .init start:0x0215f42c end:0x0215f570 kind:code align:4 - .ctor start:0x0215f570 end:0x0215f580 kind:rodata align:4 + .ctor start:0x0215f570 end:0x0215f57c kind:rodata align:4 .data start:0x0215f580 end:0x0215fca0 kind:data align:32 .bss start:0x0215fca0 end:0x0215ff40 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov079/delinks.txt b/config/jp/arm9/overlays/ov079/delinks.txt index 72e8ed7c..0acc9778 100644 --- a/config/jp/arm9/overlays/ov079/delinks.txt +++ b/config/jp/arm9/overlays/ov079/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02159204 kind:code align:32 .rodata start:0x02159204 end:0x021592a4 kind:rodata align:4 .init start:0x021592a4 end:0x02159630 kind:code align:4 - .ctor start:0x02159630 end:0x0215965c kind:rodata align:4 + .ctor start:0x02159630 end:0x02159658 kind:rodata align:4 .data start:0x02159660 end:0x02159da0 kind:data align:32 .bss start:0x02159da0 end:0x0215a660 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov080/delinks.txt b/config/jp/arm9/overlays/ov080/delinks.txt index 83499367..f3150c12 100644 --- a/config/jp/arm9/overlays/ov080/delinks.txt +++ b/config/jp/arm9/overlays/ov080/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02160e50 kind:code align:32 .rodata start:0x02160e50 end:0x02160f0c kind:rodata align:4 .init start:0x02160f0c end:0x02161584 kind:code align:4 - .ctor start:0x02161584 end:0x02161598 kind:rodata align:4 + .ctor start:0x02161584 end:0x02161594 kind:rodata align:4 .data start:0x021615a0 end:0x02161fe0 kind:data align:32 .bss start:0x02161fe0 end:0x02162500 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov081/delinks.txt b/config/jp/arm9/overlays/ov081/delinks.txt index b87dc0ab..bf49f3f1 100644 --- a/config/jp/arm9/overlays/ov081/delinks.txt +++ b/config/jp/arm9/overlays/ov081/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02154608 kind:code align:32 .rodata start:0x02154608 end:0x02154658 kind:rodata align:4 .init start:0x02154658 end:0x02154774 kind:code align:4 - .ctor start:0x02154774 end:0x02154784 kind:rodata align:4 + .ctor start:0x02154774 end:0x02154780 kind:rodata align:4 .data start:0x021547a0 end:0x02154a40 kind:data align:32 .bss start:0x02154a40 end:0x02154be0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov082/delinks.txt b/config/jp/arm9/overlays/ov082/delinks.txt index 59101902..cf386d40 100644 --- a/config/jp/arm9/overlays/ov082/delinks.txt +++ b/config/jp/arm9/overlays/ov082/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02154be0 end:0x0215a784 kind:code align:32 .rodata start:0x0215a784 end:0x0215a798 kind:rodata align:4 .init start:0x0215a798 end:0x0215a888 kind:code align:4 - .ctor start:0x0215a888 end:0x0215a898 kind:rodata align:4 + .ctor start:0x0215a888 end:0x0215a894 kind:rodata align:4 .data start:0x0215a8a0 end:0x0215adc0 kind:data align:32 .bss start:0x0215adc0 end:0x0215afe0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov083/delinks.txt b/config/jp/arm9/overlays/ov083/delinks.txt index d7526011..434d27da 100644 --- a/config/jp/arm9/overlays/ov083/delinks.txt +++ b/config/jp/arm9/overlays/ov083/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02154be0 end:0x0215f0ac kind:code align:32 .rodata start:0x0215f0ac end:0x0215f2ac kind:rodata align:4 .init start:0x0215f2ac end:0x0215f6f4 kind:code align:4 - .ctor start:0x0215f6f4 end:0x0215f71c kind:rodata align:4 + .ctor start:0x0215f6f4 end:0x0215f718 kind:rodata align:4 .data start:0x0215f720 end:0x021602a0 kind:data align:32 .bss start:0x021602a0 end:0x02160a60 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov084/delinks.txt b/config/jp/arm9/overlays/ov084/delinks.txt index 4ed7439a..abe7b8af 100644 --- a/config/jp/arm9/overlays/ov084/delinks.txt +++ b/config/jp/arm9/overlays/ov084/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x021639e4 kind:code align:32 .rodata start:0x021639e4 end:0x0216407c kind:rodata align:4 .init start:0x0216407c end:0x02164c50 kind:code align:4 - .ctor start:0x02164c50 end:0x02164c90 kind:rodata align:4 + .ctor start:0x02164c50 end:0x02164c8c kind:rodata align:4 .data start:0x02164ca0 end:0x02165d60 kind:data align:32 .bss start:0x02165d60 end:0x02166a00 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov085/delinks.txt b/config/jp/arm9/overlays/ov085/delinks.txt index d586055b..900ae470 100644 --- a/config/jp/arm9/overlays/ov085/delinks.txt +++ b/config/jp/arm9/overlays/ov085/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02152c20 end:0x02155e64 kind:code align:32 .rodata start:0x02155e64 end:0x02155f08 kind:rodata align:4 .init start:0x02155f08 end:0x02155ff8 kind:code align:4 - .ctor start:0x02155ff8 end:0x02156008 kind:rodata align:4 + .ctor start:0x02155ff8 end:0x02156004 kind:rodata align:4 .data start:0x02156020 end:0x02156260 kind:data align:32 .bss start:0x02156260 end:0x021564a0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov086/delinks.txt b/config/jp/arm9/overlays/ov086/delinks.txt index 8f52cc86..3fc18415 100644 --- a/config/jp/arm9/overlays/ov086/delinks.txt +++ b/config/jp/arm9/overlays/ov086/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021564a0 end:0x02161160 kind:code align:32 .rodata start:0x02161160 end:0x021611e8 kind:rodata align:4 .init start:0x021611e8 end:0x02161634 kind:code align:4 - .ctor start:0x02161634 end:0x0216166c kind:rodata align:4 + .ctor start:0x02161634 end:0x02161668 kind:rodata align:4 .data start:0x02161680 end:0x021623a0 kind:data align:32 .bss start:0x021623a0 end:0x02162ee0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov087/delinks.txt b/config/jp/arm9/overlays/ov087/delinks.txt index b8c86bdd..53b4d5a0 100644 --- a/config/jp/arm9/overlays/ov087/delinks.txt +++ b/config/jp/arm9/overlays/ov087/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021564a0 end:0x02163f14 kind:code align:32 .rodata start:0x02163f14 end:0x02163fd0 kind:rodata align:4 .init start:0x02163fd0 end:0x021641d0 kind:code align:4 - .ctor start:0x021641d0 end:0x021641ec kind:rodata align:4 + .ctor start:0x021641d0 end:0x021641e8 kind:rodata align:4 .data start:0x02164200 end:0x02164b80 kind:data align:32 .bss start:0x02164b80 end:0x02165080 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov088/delinks.txt b/config/jp/arm9/overlays/ov088/delinks.txt index 57424011..c0cb8075 100644 --- a/config/jp/arm9/overlays/ov088/delinks.txt +++ b/config/jp/arm9/overlays/ov088/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02167b00 end:0x02176480 kind:code align:32 .rodata start:0x02176480 end:0x0217695c kind:rodata align:4 .init start:0x0217695c end:0x02176f8c kind:code align:4 - .ctor start:0x02176f8c end:0x02176fe0 kind:rodata align:4 + .ctor start:0x02176f8c end:0x02176fdc kind:rodata align:4 .data start:0x02176fe0 end:0x02178320 kind:data align:32 .bss start:0x02178320 end:0x02179480 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov089/delinks.txt b/config/jp/arm9/overlays/ov089/delinks.txt index 8a9c7dc7..e7a9da6e 100644 --- a/config/jp/arm9/overlays/ov089/delinks.txt +++ b/config/jp/arm9/overlays/ov089/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02167b00 end:0x02172888 kind:code align:32 .rodata start:0x02172888 end:0x02172fdc kind:rodata align:4 .init start:0x02172fdc end:0x02173044 kind:code align:4 - .ctor start:0x02173044 end:0x02173050 kind:rodata align:4 + .ctor start:0x02173044 end:0x0217304c kind:rodata align:4 .data start:0x02173060 end:0x02173780 kind:data align:32 .bss start:0x02173780 end:0x0217a9c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov090/delinks.txt b/config/jp/arm9/overlays/ov090/delinks.txt index ca105926..ab7502b6 100644 --- a/config/jp/arm9/overlays/ov090/delinks.txt +++ b/config/jp/arm9/overlays/ov090/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02167b00 end:0x021775fc kind:code align:32 .rodata start:0x021775fc end:0x02177760 kind:rodata align:4 .init start:0x02177760 end:0x02177ec0 kind:code align:4 - .ctor start:0x02177ec0 end:0x02177f14 kind:rodata align:4 + .ctor start:0x02177ec0 end:0x02177f10 kind:rodata align:4 .data start:0x02177f20 end:0x021791e0 kind:data align:32 .bss start:0x021791e0 end:0x0217a0a0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov091/delinks.txt b/config/jp/arm9/overlays/ov091/delinks.txt index 450a66f6..723f3f46 100644 --- a/config/jp/arm9/overlays/ov091/delinks.txt +++ b/config/jp/arm9/overlays/ov091/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02167b00 end:0x02178af4 kind:code align:32 .rodata start:0x02178af4 end:0x02178c04 kind:rodata align:4 .init start:0x02178c04 end:0x0217928c kind:code align:4 - .ctor start:0x0217928c end:0x021792e0 kind:rodata align:4 + .ctor start:0x0217928c end:0x021792dc kind:rodata align:4 .data start:0x021792e0 end:0x0217a320 kind:data align:32 .bss start:0x0217a320 end:0x0217b260 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov092/delinks.txt b/config/jp/arm9/overlays/ov092/delinks.txt index ec80dbd5..b0947126 100644 --- a/config/jp/arm9/overlays/ov092/delinks.txt +++ b/config/jp/arm9/overlays/ov092/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02167b00 end:0x0217cd14 kind:code align:32 .rodata start:0x0217cd14 end:0x0217d180 kind:rodata align:4 .init start:0x0217d180 end:0x0217ddac kind:code align:4 - .ctor start:0x0217ddac end:0x0217de0c kind:rodata align:4 + .ctor start:0x0217ddac end:0x0217de08 kind:rodata align:4 .data start:0x0217de20 end:0x0217f480 kind:data align:32 .bss start:0x0217f480 end:0x02180560 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov093/delinks.txt b/config/jp/arm9/overlays/ov093/delinks.txt index da3e08c3..996955f0 100644 --- a/config/jp/arm9/overlays/ov093/delinks.txt +++ b/config/jp/arm9/overlays/ov093/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02167b00 end:0x0217a628 kind:code align:32 .rodata start:0x0217a628 end:0x0217ac08 kind:rodata align:4 .init start:0x0217ac08 end:0x0217b144 kind:code align:4 - .ctor start:0x0217b144 end:0x0217b174 kind:rodata align:4 + .ctor start:0x0217b144 end:0x0217b170 kind:rodata align:4 .data start:0x0217b180 end:0x0217b7c0 kind:data align:32 .bss start:0x0217b7c0 end:0x0217bca0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov094/delinks.txt b/config/jp/arm9/overlays/ov094/delinks.txt index a2ee81f9..4f7bdf38 100644 --- a/config/jp/arm9/overlays/ov094/delinks.txt +++ b/config/jp/arm9/overlays/ov094/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02167b00 end:0x02178200 kind:code align:32 .rodata start:0x02178200 end:0x02178848 kind:rodata align:4 .init start:0x02178848 end:0x02179134 kind:code align:4 - .ctor start:0x02179134 end:0x0217919c kind:rodata align:4 + .ctor start:0x02179134 end:0x02179198 kind:rodata align:4 .data start:0x021791a0 end:0x0217a7e0 kind:data align:32 .bss start:0x0217a7e0 end:0x0217bde0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov095/delinks.txt b/config/jp/arm9/overlays/ov095/delinks.txt index 52506eb4..134a0023 100644 --- a/config/jp/arm9/overlays/ov095/delinks.txt +++ b/config/jp/arm9/overlays/ov095/delinks.txt @@ -1,6 +1,5 @@ .text start:0x0217bde0 end:0x021828d0 kind:code align:32 .rodata start:0x021828d0 end:0x02182950 kind:rodata align:4 - .ctor start:0x02182950 end:0x02182954 kind:rodata align:4 + .ctor start:0x02182950 end:0x02182950 kind:rodata align:4 .data start:0x02182960 end:0x02182bc0 kind:data align:32 .bss start:0x02182bc0 end:0x02182bc0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov096/delinks.txt b/config/jp/arm9/overlays/ov096/delinks.txt index c4e3ccfa..4ee8230a 100644 --- a/config/jp/arm9/overlays/ov096/delinks.txt +++ b/config/jp/arm9/overlays/ov096/delinks.txt @@ -1,7 +1,6 @@ .text start:0x0217bde0 end:0x0217fe6c kind:code align:32 .rodata start:0x0217fe6c end:0x0217fe98 kind:rodata align:4 .init start:0x0217fe98 end:0x02180028 kind:code align:4 - .ctor start:0x02180028 end:0x02180040 kind:rodata align:4 + .ctor start:0x02180028 end:0x0218003c kind:rodata align:4 .data start:0x02180040 end:0x02180500 kind:data align:32 .bss start:0x02180500 end:0x02180860 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov097/delinks.txt b/config/jp/arm9/overlays/ov097/delinks.txt index c892d901..1812924e 100644 --- a/config/jp/arm9/overlays/ov097/delinks.txt +++ b/config/jp/arm9/overlays/ov097/delinks.txt @@ -1,3 +1,2 @@ - .ctor start:0x02182bc0 end:0x02182bc4 kind:rodata align:4 + .ctor start:0x02182bc0 end:0x02182bc0 kind:rodata align:4 .bss start:0x02182be0 end:0x0218b7e0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov098/delinks.txt b/config/jp/arm9/overlays/ov098/delinks.txt index 7ac1e22c..1089e5be 100644 --- a/config/jp/arm9/overlays/ov098/delinks.txt +++ b/config/jp/arm9/overlays/ov098/delinks.txt @@ -1,7 +1,6 @@ .text start:0x02182bc0 end:0x02183d3c kind:code align:32 .rodata start:0x02183d3c end:0x02183d50 kind:rodata align:4 .init start:0x02183d50 end:0x02183ee0 kind:code align:4 - .ctor start:0x02183ee0 end:0x02183ef8 kind:rodata align:4 + .ctor start:0x02183ee0 end:0x02183ef4 kind:rodata align:4 .data start:0x02183f00 end:0x02184300 kind:data align:32 .bss start:0x02184300 end:0x021847a0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov099/delinks.txt b/config/jp/arm9/overlays/ov099/delinks.txt index 5f8f5d62..0680a707 100644 --- a/config/jp/arm9/overlays/ov099/delinks.txt +++ b/config/jp/arm9/overlays/ov099/delinks.txt @@ -1,6 +1,5 @@ .text start:0x02182bc0 end:0x02183c50 kind:code align:32 .init start:0x02183c50 end:0x02183d90 kind:code align:4 - .ctor start:0x02183d90 end:0x02183da4 kind:rodata align:4 + .ctor start:0x02183d90 end:0x02183da0 kind:rodata align:4 .data start:0x02183dc0 end:0x02184120 kind:data align:32 .bss start:0x02184120 end:0x021844c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov100/delinks.txt b/config/jp/arm9/overlays/ov100/delinks.txt index b5886628..c9dd10f9 100644 --- a/config/jp/arm9/overlays/ov100/delinks.txt +++ b/config/jp/arm9/overlays/ov100/delinks.txt @@ -1,3 +1,2 @@ - .ctor start:0x021847a0 end:0x021847a4 kind:rodata align:4 + .ctor start:0x021847a0 end:0x021847a0 kind:rodata align:4 .bss start:0x021847c0 end:0x0218b7c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov101/delinks.txt b/config/jp/arm9/overlays/ov101/delinks.txt index 5b00c352..2d184116 100644 --- a/config/jp/arm9/overlays/ov101/delinks.txt +++ b/config/jp/arm9/overlays/ov101/delinks.txt @@ -1,6 +1,5 @@ .text start:0x021847a0 end:0x02185450 kind:code align:32 .init start:0x02185450 end:0x02185468 kind:code align:4 - .ctor start:0x02185468 end:0x02185470 kind:rodata align:4 + .ctor start:0x02185468 end:0x0218546c kind:rodata align:4 .data start:0x02185480 end:0x02185580 kind:data align:32 .bss start:0x02185580 end:0x02185580 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov102/delinks.txt b/config/jp/arm9/overlays/ov102/delinks.txt index 58f77367..523c62e0 100644 --- a/config/jp/arm9/overlays/ov102/delinks.txt +++ b/config/jp/arm9/overlays/ov102/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021847a0 end:0x02186430 kind:code align:32 .rodata start:0x02186430 end:0x021864d0 kind:rodata align:4 .init start:0x021864d0 end:0x021864f4 kind:code align:4 - .ctor start:0x021864f4 end:0x021864fc kind:rodata align:4 + .ctor start:0x021864f4 end:0x021864f8 kind:rodata align:4 .data start:0x02186500 end:0x021865c0 kind:data align:32 .bss start:0x021865c0 end:0x021865c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov103/delinks.txt b/config/jp/arm9/overlays/ov103/delinks.txt index f6e747fb..8663abef 100644 --- a/config/jp/arm9/overlays/ov103/delinks.txt +++ b/config/jp/arm9/overlays/ov103/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021865c0 end:0x02187c68 kind:code align:32 .rodata start:0x02187c68 end:0x02187c8c kind:rodata align:4 .init start:0x02187c8c end:0x02187cd8 kind:code align:4 - .ctor start:0x02187cd8 end:0x02187ce0 kind:rodata align:4 + .ctor start:0x02187cd8 end:0x02187cdc kind:rodata align:4 .data start:0x02187ce0 end:0x02188180 kind:data align:32 .bss start:0x02188180 end:0x02188180 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov104/delinks.txt b/config/jp/arm9/overlays/ov104/delinks.txt index d0050069..8375d0ff 100644 --- a/config/jp/arm9/overlays/ov104/delinks.txt +++ b/config/jp/arm9/overlays/ov104/delinks.txt @@ -1,6 +1,5 @@ .text start:0x021865c0 end:0x02186c88 kind:code align:32 .init start:0x02186c88 end:0x02186cac kind:code align:4 - .ctor start:0x02186cac end:0x02186cb4 kind:rodata align:4 + .ctor start:0x02186cac end:0x02186cb0 kind:rodata align:4 .data start:0x02186cc0 end:0x02186d20 kind:data align:32 .bss start:0x02186d20 end:0x02186d20 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov105/delinks.txt b/config/jp/arm9/overlays/ov105/delinks.txt index babc64a7..fad596de 100644 --- a/config/jp/arm9/overlays/ov105/delinks.txt +++ b/config/jp/arm9/overlays/ov105/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021865c0 end:0x0218bc90 kind:code align:32 .rodata start:0x0218bc90 end:0x0218bd4c kind:rodata align:4 .init start:0x0218bd4c end:0x0218bdd4 kind:code align:4 - .ctor start:0x0218bdd4 end:0x0218bddc kind:rodata align:4 + .ctor start:0x0218bdd4 end:0x0218bdd8 kind:rodata align:4 .data start:0x0218bde0 end:0x0218bea0 kind:data align:32 .bss start:0x0218bea0 end:0x0218bf00 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov106/delinks.txt b/config/jp/arm9/overlays/ov106/delinks.txt index 3654d04f..6f74594f 100644 --- a/config/jp/arm9/overlays/ov106/delinks.txt +++ b/config/jp/arm9/overlays/ov106/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021865c0 end:0x02187624 kind:code align:32 .rodata start:0x02187624 end:0x021876a0 kind:rodata align:4 .init start:0x021876a0 end:0x021876c4 kind:code align:4 - .ctor start:0x021876c4 end:0x021876cc kind:rodata align:4 + .ctor start:0x021876c4 end:0x021876c8 kind:rodata align:4 .data start:0x021876e0 end:0x02187740 kind:data align:32 .bss start:0x02187740 end:0x02187740 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov107/delinks.txt b/config/jp/arm9/overlays/ov107/delinks.txt index 801c05c7..041efa68 100644 --- a/config/jp/arm9/overlays/ov107/delinks.txt +++ b/config/jp/arm9/overlays/ov107/delinks.txt @@ -1,7 +1,6 @@ .text start:0x021865c0 end:0x02188194 kind:code align:32 .rodata start:0x02188194 end:0x021881bc kind:rodata align:4 .init start:0x021881bc end:0x021881cc kind:code align:4 - .ctor start:0x021881cc end:0x021881d4 kind:rodata align:4 + .ctor start:0x021881cc end:0x021881d0 kind:rodata align:4 .data start:0x021881e0 end:0x02188220 kind:data align:32 .bss start:0x02188220 end:0x021882a0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov108/delinks.txt b/config/jp/arm9/overlays/ov108/delinks.txt index b7ad9fd7..cf3a06e7 100644 --- a/config/jp/arm9/overlays/ov108/delinks.txt +++ b/config/jp/arm9/overlays/ov108/delinks.txt @@ -1,6 +1,5 @@ .text start:0x021865c0 end:0x021879ec kind:code align:32 .rodata start:0x021879ec end:0x02187a58 kind:rodata align:4 - .ctor start:0x02187a58 end:0x02187a5c kind:rodata align:4 + .ctor start:0x02187a58 end:0x02187a58 kind:rodata align:4 .data start:0x02187a60 end:0x02187ba0 kind:data align:32 .bss start:0x02187ba0 end:0x021883c0 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov109/delinks.txt b/config/jp/arm9/overlays/ov109/delinks.txt index d8d75e4c..5d7357c5 100644 --- a/config/jp/arm9/overlays/ov109/delinks.txt +++ b/config/jp/arm9/overlays/ov109/delinks.txt @@ -1,5 +1,4 @@ .text start:0x021865c0 end:0x021868e0 kind:code align:32 - .ctor start:0x021868e0 end:0x021868e4 kind:rodata align:4 + .ctor start:0x021868e0 end:0x021868e0 kind:rodata align:4 .data start:0x02186900 end:0x02186940 kind:data align:32 .bss start:0x02186940 end:0x02186940 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov110/delinks.txt b/config/jp/arm9/overlays/ov110/delinks.txt index ecaa3a1d..3ab87ba7 100644 --- a/config/jp/arm9/overlays/ov110/delinks.txt +++ b/config/jp/arm9/overlays/ov110/delinks.txt @@ -1,14 +1,14 @@ .text start:0x021865c0 end:0x021879c4 kind:code align:32 .rodata start:0x021879c4 end:0x02187d90 kind:rodata align:4 .init start:0x02187d90 end:0x02187dbc kind:code align:4 - .ctor start:0x02187dbc end:0x02187dc4 kind:rodata align:4 + .ctor start:0x02187dbc end:0x02187dc0 kind:rodata align:4 .data start:0x02187de0 end:0x02187e40 kind:data align:32 .bss start:0x02187e40 end:0x0218bdc0 kind:bss align:32 src/110_PlayerGet/PlayerGet.cpp: .text start:0x021865c0 end:0x021879c4 - .init start:0x02187d90 end:0x02187dbc .rodata start:0x021879c4 end:0x02187d90 - .ctor start:0x02187dbc end:0x02187dc4 + .init start:0x02187d90 end:0x02187dbc + .ctor start:0x02187dbc end:0x02187dc0 .data start:0x02187de0 end:0x02187e40 .bss start:0x02187e40 end:0x0218bdc0 diff --git a/config/jp/arm9/overlays/ov110/relocs.txt b/config/jp/arm9/overlays/ov110/relocs.txt index 7605a521..21d4138a 100644 --- a/config/jp/arm9/overlays/ov110/relocs.txt +++ b/config/jp/arm9/overlays/ov110/relocs.txt @@ -30,8 +30,8 @@ from:0x02186990 kind:arm_call to:0x0208b7c4 module:overlay(0) from:0x021869ac kind:arm_call to:0x0205a664 module:overlay(0) from:0x021869c4 kind:arm_call_thumb to:0x020590f0 module:overlay(0) from:0x021869e0 kind:arm_call to:0x0203e690 module:main -from:0x021869ec kind:load to:0x02187e04 add:8 module:overlay(110) -from:0x021869f0 kind:load to:0x02187df8 add:8 module:overlay(110) +from:0x021869ec kind:load to:0x02187e04 add:0x8 module:overlay(110) +from:0x021869f0 kind:load to:0x02187df8 add:0x8 module:overlay(110) from:0x021869f4 kind:load to:0x020a1aac module:overlay(0) from:0x021869f8 kind:load to:0x02187930 module:overlay(110) from:0x02186a10 kind:arm_call to:0x0205dffc module:overlay(0) @@ -41,7 +41,7 @@ from:0x02186a8c kind:arm_call to:0x0203e740 module:main from:0x02186a94 kind:arm_call_thumb to:0x0205910c module:overlay(0) from:0x02186a9c kind:arm_call to:0x0208b838 module:overlay(0) from:0x02186aa4 kind:arm_call to:0x02090fa0 module:overlay(0) -from:0x02186ab0 kind:load to:0x02187e04 add:8 module:overlay(110) +from:0x02186ab0 kind:load to:0x02187e04 add:0x8 module:overlay(110) from:0x02186ab4 kind:load to:0x027e0cec module:dtcm from:0x02186abc kind:load to:0x020a1aac module:overlay(0) from:0x02186ad4 kind:arm_call to:0x0205dffc module:overlay(0) @@ -52,7 +52,7 @@ from:0x02186b58 kind:arm_call_thumb to:0x0205910c module:overlay(0) from:0x02186b60 kind:arm_call to:0x0208b838 module:overlay(0) from:0x02186b68 kind:arm_call to:0x02090fa0 module:overlay(0) from:0x02186b70 kind:arm_call to:0x02011ff4 module:main -from:0x02186b7c kind:load to:0x02187e04 add:8 module:overlay(110) +from:0x02186b7c kind:load to:0x02187e04 add:0x8 module:overlay(110) from:0x02186b80 kind:load to:0x027e0cec module:dtcm from:0x02186b88 kind:load to:0x020a1aac module:overlay(0) from:0x02186cf0 kind:arm_call to:0x020ab82c module:overlay(0) diff --git a/config/jp/arm9/overlays/ov111/delinks.txt b/config/jp/arm9/overlays/ov111/delinks.txt index 915c2eb8..5a3d5c66 100644 --- a/config/jp/arm9/overlays/ov111/delinks.txt +++ b/config/jp/arm9/overlays/ov111/delinks.txt @@ -1,6 +1,5 @@ .text start:0x021865c0 end:0x02187918 kind:code align:32 .rodata start:0x02187918 end:0x0218799c kind:rodata align:4 - .ctor start:0x0218799c end:0x021879a0 kind:rodata align:4 + .ctor start:0x0218799c end:0x0218799c kind:rodata align:4 .data start:0x021879a0 end:0x02187a20 kind:data align:32 .bss start:0x02187a20 end:0x02187a20 kind:bss align:32 - diff --git a/config/jp/arm9/overlays/ov112/delinks.txt b/config/jp/arm9/overlays/ov112/delinks.txt index b7193b7e..74cc9441 100644 --- a/config/jp/arm9/overlays/ov112/delinks.txt +++ b/config/jp/arm9/overlays/ov112/delinks.txt @@ -1,5 +1,5 @@ .text start:0x021865c0 end:0x02188060 kind:code align:32 - .ctor start:0x02188060 end:0x02188064 kind:rodata align:4 + .ctor start:0x02188060 end:0x02188060 kind:rodata align:4 .data start:0x02188080 end:0x021880e0 kind:data align:32 .bss start:0x021880e0 end:0x021880e0 kind:bss align:32 diff --git a/config/jp/arm9/overlays/ov112/relocs.txt b/config/jp/arm9/overlays/ov112/relocs.txt index 62eac31e..10b53fc1 100644 --- a/config/jp/arm9/overlays/ov112/relocs.txt +++ b/config/jp/arm9/overlays/ov112/relocs.txt @@ -1,14 +1,14 @@ from:0x021865c8 kind:arm_call to:0x02090efc module:overlay(0) -from:0x02186680 kind:load to:0x02188080 add:8 module:overlay(112) +from:0x02186680 kind:load to:0x02188080 add:0x8 module:overlay(112) from:0x021866b8 kind:arm_call to:0x0208b838 module:overlay(0) from:0x021866c0 kind:arm_call to:0x0205dffc module:overlay(0) from:0x021866c8 kind:arm_call to:0x02090fa0 module:overlay(0) -from:0x021866d4 kind:load to:0x02188080 add:8 module:overlay(112) +from:0x021866d4 kind:load to:0x02188080 add:0x8 module:overlay(112) from:0x02186710 kind:arm_call to:0x0208b838 module:overlay(0) from:0x02186718 kind:arm_call to:0x0205dffc module:overlay(0) from:0x02186720 kind:arm_call to:0x02090fa0 module:overlay(0) from:0x02186728 kind:arm_call to:0x02011ff4 module:main -from:0x02186734 kind:load to:0x02188080 add:8 module:overlay(112) +from:0x02186734 kind:load to:0x02188080 add:0x8 module:overlay(112) from:0x02186764 kind:arm_call to:0x01fff3b4 module:itcm from:0x02186790 kind:load to:0x027e0ce4 module:dtcm from:0x021867f0 kind:arm_call to:0x02081d10 module:overlay(0) @@ -72,7 +72,7 @@ from:0x02187b24 kind:arm_call to:0x020840e4 module:overlay(0) from:0x02187b80 kind:arm_call to:0x02091ea0 module:overlay(0) from:0x02187b88 kind:load to:0x027e0cdc module:dtcm from:0x02187b94 kind:arm_call to:0x02090efc module:overlay(0) -from:0x02187bc8 kind:load to:0x021880a8 add:8 module:overlay(112) +from:0x02187bc8 kind:load to:0x021880a8 add:0x8 module:overlay(112) from:0x02187c08 kind:arm_call to:0x0208d0e4 module:overlay(0) from:0x02187c28 kind:arm_call to:0x0208e5f8 module:overlay(0) from:0x02187c50 kind:arm_call to:0x020895bc module:overlay(0) diff --git a/config/jp/arm9/overlays/ov113/delinks.txt b/config/jp/arm9/overlays/ov113/delinks.txt index fb96bc3a..a90323a7 100644 --- a/config/jp/arm9/overlays/ov113/delinks.txt +++ b/config/jp/arm9/overlays/ov113/delinks.txt @@ -1,5 +1,4 @@ .text start:0x021865c0 end:0x0218716c kind:code align:32 - .ctor start:0x0218716c end:0x02187170 kind:rodata align:4 + .ctor start:0x0218716c end:0x0218716c kind:rodata align:4 .data start:0x02187180 end:0x02187220 kind:data align:32 .bss start:0x02187220 end:0x02187220 kind:bss align:32 - diff --git a/config/jp/arm9/relocs.txt b/config/jp/arm9/relocs.txt index 71ff6eff..a2c41df5 100644 --- a/config/jp/arm9/relocs.txt +++ b/config/jp/arm9/relocs.txt @@ -1942,19 +1942,19 @@ from:0x0201547c kind:thumb_call_arm to:0x0201535c module:main from:0x0201548c kind:thumb_call_arm to:0x020152d0 module:main from:0x020154a2 kind:thumb_call to:0x02012f08 module:main from:0x020154b8 kind:thumb_call_arm to:0x02011ff4 module:main -from:0x020154e4 kind:load to:0x02045444 add:8 module:main -from:0x02015500 kind:load to:0x02045444 add:8 module:main +from:0x020154e4 kind:load to:0x02045444 add:0x8 module:main +from:0x02015500 kind:load to:0x02045444 add:0x8 module:main from:0x02015514 kind:thumb_call to:0x020154c0 module:main -from:0x0201551c kind:load to:0x02045444 add:8 module:main +from:0x0201551c kind:load to:0x02045444 add:0x8 module:main from:0x02015530 kind:thumb_call to:0x020154c0 module:main from:0x02015536 kind:thumb_call_arm to:0x02011ff4 module:main -from:0x02015540 kind:load to:0x02045444 add:8 module:main +from:0x02015540 kind:load to:0x02045444 add:0x8 module:main from:0x02015562 kind:thumb_call to:0x02012ec8 module:main from:0x0201557c kind:thumb_call_arm to:0x02011ff4 module:main from:0x02015582 kind:thumb_call to:0x020154c4 module:main from:0x020155ae kind:thumb_call to:0x020010e0 module:main from:0x020155b8 kind:load to:0x0204af1c module:main -from:0x020155d8 kind:load to:0x02045460 add:8 module:main +from:0x020155d8 kind:load to:0x02045460 add:0x8 module:main from:0x020155e0 kind:thumb_call to:0x020154c0 module:main from:0x020155ec kind:thumb_call to:0x020154c0 module:main from:0x020155f2 kind:thumb_call_arm to:0x02011ff4 module:main @@ -2189,16 +2189,16 @@ from:0x0201820c kind:arm_call to:0x02019518 module:main from:0x0201823c kind:arm_call to:0x02058c08 module:overlay(0) from:0x02018260 kind:arm_call to:0x02058bc0 module:overlay(0) from:0x02018278 kind:load to:0x0204b690 module:main -from:0x02018288 kind:load to:0x02045554 add:8 module:main +from:0x02018288 kind:load to:0x02045554 add:0x8 module:main from:0x020182a0 kind:arm_call_thumb to:0x020bedd4 module:overlay(1) -from:0x020182ac kind:load to:0x02045554 add:8 module:main +from:0x020182ac kind:load to:0x02045554 add:0x8 module:main from:0x020182b0 kind:load to:0x0204b690 module:main from:0x020182c8 kind:arm_call_thumb to:0x020bedd4 module:overlay(1) from:0x020182d0 kind:arm_call to:0x02011ff4 module:main -from:0x020182dc kind:load to:0x02045554 add:8 module:main +from:0x020182dc kind:load to:0x02045554 add:0x8 module:main from:0x020182e0 kind:load to:0x0204b690 module:main from:0x020182f8 kind:arm_call_thumb to:0x020bedd4 module:overlay(1) -from:0x02018304 kind:load to:0x02045554 add:8 module:main +from:0x02018304 kind:load to:0x02045554 add:0x8 module:main from:0x02018308 kind:load to:0x0204b690 module:main from:0x02018318 kind:load to:0x0204b690 module:main from:0x0201831c kind:load to:0x02018ccc module:main @@ -2225,27 +2225,27 @@ from:0x0201843c kind:thumb_call_arm to:0x0201bca8 module:main from:0x0201844a kind:thumb_call_arm to:0x020630b4 module:overlay(0) from:0x02018454 kind:thumb_call_arm to:0x02013b14 module:main from:0x0201845e kind:thumb_call to:0x020141e0 module:main -from:0x02018484 kind:load to:0x020455a0 add:8 module:main +from:0x02018484 kind:load to:0x020455a0 add:0x8 module:main from:0x02018488 kind:load to:0x020b684c module:overlay(0) from:0x02018498 kind:thumb_call_arm to:0x0201bca8 module:main from:0x020184a6 kind:thumb_call_arm to:0x020630b4 module:overlay(0) from:0x020184b0 kind:thumb_call_arm to:0x02013b14 module:main from:0x020184ba kind:thumb_call to:0x020141e0 module:main -from:0x020184e0 kind:load to:0x020455a0 add:8 module:main +from:0x020184e0 kind:load to:0x020455a0 add:0x8 module:main from:0x020184e4 kind:load to:0x020b684c module:overlay(0) from:0x020184f8 kind:thumb_call_arm to:0x02018a24 module:main from:0x02018502 kind:thumb_call_arm to:0x020630fc module:overlay(0) from:0x02018508 kind:thumb_call_arm to:0x0201bcd8 module:main -from:0x02018510 kind:load to:0x020455a0 add:8 module:main +from:0x02018510 kind:load to:0x020455a0 add:0x8 module:main from:0x0201851c kind:thumb_call_arm to:0x02018a24 module:main from:0x02018526 kind:thumb_call_arm to:0x020630fc module:overlay(0) from:0x0201852c kind:thumb_call_arm to:0x0201bcd8 module:main from:0x02018532 kind:thumb_call_arm to:0x02011ff4 module:main -from:0x0201853c kind:load to:0x020455a0 add:8 module:main +from:0x0201853c kind:load to:0x020455a0 add:0x8 module:main from:0x02018548 kind:thumb_call_arm to:0x02018a24 module:main from:0x02018552 kind:thumb_call_arm to:0x020630fc module:overlay(0) from:0x02018558 kind:thumb_call_arm to:0x0201bcd8 module:main -from:0x02018560 kind:load to:0x020455a0 add:8 module:main +from:0x02018560 kind:load to:0x020455a0 add:0x8 module:main from:0x0201858c kind:arm_call to:0x0206b2e0 module:overlay(0) from:0x020185a0 kind:load to:0x020b68c0 module:overlay(0) from:0x020185b0 kind:arm_call to:0x0206b320 module:overlay(0) @@ -2924,19 +2924,19 @@ from:0x0201f424 kind:arm_call to:0x02063990 module:overlay(0) from:0x0201f42c kind:load to:0x0204b690 module:main from:0x0201f43c kind:arm_call to:0x0201f034 module:main from:0x0201f44c kind:arm_call to:0x020634b8 module:overlay(0) -from:0x0201f460 kind:load to:0x020458d8 add:8 module:main +from:0x0201f460 kind:load to:0x020458d8 add:0x8 module:main from:0x0201f464 kind:load to:0x020458ec module:main from:0x0201f474 kind:arm_call to:0x0201f034 module:main from:0x0201f484 kind:arm_call to:0x020634b8 module:overlay(0) -from:0x0201f498 kind:load to:0x020458d8 add:8 module:main +from:0x0201f498 kind:load to:0x020458d8 add:0x8 module:main from:0x0201f49c kind:load to:0x020458ec module:main from:0x0201f4b4 kind:arm_call to:0x0201f078 module:main from:0x0201f4c4 kind:arm_call to:0x020634b8 module:overlay(0) -from:0x0201f4d8 kind:load to:0x020458d8 add:8 module:main +from:0x0201f4d8 kind:load to:0x020458d8 add:0x8 module:main from:0x0201f4dc kind:load to:0x020458ec module:main from:0x0201f4f4 kind:arm_call to:0x0201f078 module:main from:0x0201f504 kind:arm_call to:0x020634b8 module:overlay(0) -from:0x0201f518 kind:load to:0x020458d8 add:8 module:main +from:0x0201f518 kind:load to:0x020458d8 add:0x8 module:main from:0x0201f51c kind:load to:0x020458ec module:main from:0x0201f538 kind:arm_call to:0x02068fc8 module:overlay(0) from:0x0201f570 kind:arm_call to:0x02019528 module:main @@ -5169,7 +5169,7 @@ from:0x020353ac kind:arm_call to:0x02028a28 module:main from:0x0203540c kind:arm_call to:0x02028910 module:main from:0x02035458 kind:arm_call to:0x02028990 module:main from:0x02035484 kind:arm_call to:0x02034c40 module:main -from:0x02035498 kind:load to:0x02052c48 add:0xA8 module:main +from:0x02035498 kind:load to:0x02052c48 add:0xa8 module:main from:0x0203549c kind:load to:0x027e0860 module:dtcm from:0x020354a0 kind:load to:0x02052c00 module:main from:0x020354a4 kind:load to:0x02052c24 module:main @@ -5711,7 +5711,7 @@ from:0x0203e27c kind:arm_call to:0x0203e150 module:main from:0x0203e294 kind:arm_call to:0x0203e988 module:main from:0x0203e2d0 kind:arm_call to:0x02011ff4 module:main from:0x0203e2e4 kind:load to:0x02046214 module:main -from:0x0203e314 kind:load to:0x0204470c module:main +from:0x0203e314 kind:link_time_const(ARM9_CTOR_START) from:0x0203e358 kind:load to:0x02053054 module:main from:0x0203e364 kind:load to:0x02034c18 module:main from:0x0203e370 kind:load to:0x0203e374 module:main diff --git a/tools/configure.py b/tools/configure.py index edd3d4ee..2e5e13c7 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -19,9 +19,9 @@ parser.add_argument("--version", "-v", help='Game version', required=False) args = parser.parse_args() config = ProjectConfig("st", args.compiler, "dsi/1.2p1", args.wine, args.dsd, Path(__file__).resolve()) -config.dsd_tag = "v0.10.2" -config.wibo_tag = "0.6.16" -config.objdiff_tag = "v3.0.0-beta.6" +config.dsd_tag = "v0.11.0" +config.wibo_tag = "1.1.0" +config.objdiff_tag = "v3.7.1" GAME_VERSIONS = [ "eur", diff --git a/tools/download_tool.py b/tools/download_tool.py index 755acd8f..33efb1e5 100644 --- a/tools/download_tool.py +++ b/tools/download_tool.py @@ -27,7 +27,7 @@ def mwccarm_url(tag: str) -> str: return 'http://decomp.aetias.com/files/mwccarm.zip' def wibo_url(tag: str) -> str: - return f'https://github.com/decompals/wibo/releases/download/{tag}/wibo' + return f'https://github.com/decompals/wibo/releases/download/{tag}/wibo-{platform.machine}' def objdiff_url(tag: str) -> str: return f'https://github.com/encounter/objdiff/releases/download/{tag}/objdiff-cli-{platform.system}-{platform.machine}{platform.exe}' diff --git a/tools/format_delinks.py b/tools/format_delinks.py deleted file mode 100644 index 5c29bc5c..00000000 --- a/tools/format_delinks.py +++ /dev/null @@ -1,190 +0,0 @@ -#!/usr/bin/env python - -import copy - -from pathlib import Path -from dataclasses import dataclass, field -from typing import Optional - - -INDENT = " " * 4 -SECTION_NAMES = [ - "text", - "exception", - "exceptix", - "init", - "rodata", - "ctor", - "data", - "bss", -] - - -@dataclass -class Section: - name: str - start: str = "0x00000000" - end: str = "0x00000000" - attributes: tuple[str] = field(default_factory=tuple) - - def is_used(self): - return int(self.start, base=16) > 0 - - def has_attributes(self): - return len(self.attributes) > 0 - - def to_txt(self): - extras = "\n" - - if self.has_attributes(): - extras = f" {' '.join(attr for attr in self.attributes)}\n" - - return INDENT + f"{self.name:11} start:{self.start} end:{self.end}" + extras - - -class Sections: - def __init__(self): - self.text = Section(".text") - self.exception = Section(".exception") - self.exceptix = Section(".exceptix") - self.init = Section(".init") - self.rodata = Section(".rodata") - self.ctor = Section(".ctor") - self.data = Section(".data") - self.bss = Section(".bss") - - def get_hash_key(self): - return ( - self.text, - self.exception, - self.exceptix, - self.init, - self.rodata, - self.ctor, - self.data, - self.bss - ) - - def to_txt(self): - data = "" - - for name in SECTION_NAMES: - section: Optional[Section] = getattr(self, name) - assert section is not None - - if section.is_used(): - data += section.to_txt() - - assert len(data) > 0 - return data - - -@dataclass -class Delink: - filename: str - sections: Sections - completed: bool - - def to_txt(self): - completed = (INDENT + "complete\n") if self.completed else "" - return f"{self.filename}:\n{completed}" + self.sections.to_txt() - - -class Delinks: - def __init__(self, file: Path): - self.header = "" - - # filename: sections - self.entries: list[Delink] = [] - - assert file.exists() - - with file.open("r") as f: - filedata = f.readlines() + [""] - - first_file = False - cur_delink: Optional[Delink] = None - for original_line in filedata: - line = original_line.strip() - - if cur_delink is not None: - if original_line not in {"", "\n"}: - if "complete" in line: - cur_delink.completed = True - else: - split = list(dict.fromkeys(line.split(" ")).keys()) - split.remove("") - - section: Section = getattr(cur_delink.sections, split[0].removeprefix(".")) - section.start = split[1].removeprefix("start:") - section.end = split[2].removeprefix("end:") - - if len(split) > 3: - section.attributes = tuple(split[3:]) - else: - self.entries.append(cur_delink) - cur_delink = None - elif line.endswith(".c:") or line.endswith(".cpp:"): - cur_delink = Delink(line.removesuffix(":"), Sections(), False) - - if not first_file: - first_file = True - - if not first_file: - self.header += original_line - - def to_txt(self): - return self.header + "\n".join(delink.to_txt() for delink in self.entries) - - def sort(self): - sorted_entries: list[Delink] = [] - - def get_section_map(section_name: str): - section_map = {} - - for delink in self.entries: - self_section: Optional[Section] = getattr(delink.sections, section_name) - assert self_section is not None - - if self_section.is_used(): - section_map[int(self_section.start, 16)] = delink - - return dict(sorted(section_map.items())) - - def sort_section(section_name: str): - section_map = get_section_map(section_name) - - if section_name == "text": - sorted_entries.extend(list(section_map.values())) - else: - index = None - - for delink in section_map.values(): - if delink in sorted_entries: - index = sorted_entries.index(delink) + 1 - elif index is not None: - sorted_entries.insert(index, delink) - index += 1 - else: - sorted_entries.append(delink) - - for name in SECTION_NAMES: - sort_section(name) - - assert len(self.entries) == len(sorted_entries) - self.entries.clear() - self.entries = copy.copy(sorted_entries) - - -def main(): - config_path = Path("config").resolve() - assert config_path.exists() - - for delinks_path in config_path.rglob("delinks.txt"): - delinks = Delinks(delinks_path) - delinks.sort() - delinks_path.write_text(delinks.to_txt()) - - -if __name__ == "__main__": - main() diff --git a/tools/project.py b/tools/project.py index cc99da13..75761f18 100644 --- a/tools/project.py +++ b/tools/project.py @@ -874,8 +874,8 @@ def process_project(cfg: ProjectConfig, args: Any): n.newline() n.rule( - name="format_delinks", - command=f"{cfg.python_path} tools/format_delinks.py" + name="format", + command=f"{cfg.dsd_path} format --config-path $config_path", ) n.newline() @@ -890,16 +890,47 @@ def process_project(cfg: ProjectConfig, args: Any): if cfg.check_can_run_dsd(): defaults = [] + cmds_map: dict[str, list] = { + "delink": list(), + "dis": list(), + "sha1": list(), + "check": list(), + "apply": list(), + "format": list(), + } for version in cfg.game_versions: add_extract_build(cfg, version, n, args) + add_delink_and_lcf_builds(cfg, version, n) + cmds_map["delink"].append(f"delink_{version}") + add_disassemble_builds(cfg, version, n) + cmds_map["dis"].append(f"dis_{version}") + add_mwcc_builds(cfg, version, objects, n, mwcc_implicit) + add_mwld_and_rom_builds(cfg, version, n) + cmds_map["sha1"].append(f"sha1_{version}") + add_check_builds(cfg, version, n) + cmds_map["check"].append(f"check_{version}") + add_objdiff_builds(cfg, version, n) + add_apply_build(cfg, version, n) + cmds_map["apply"].append(f"apply_{version}") + + n.build( + rule="format", + outputs=f"format_{version}", + variables={ + "config_path": str(cfg.arm9_config_yaml(version)), + } + ) + n.newline() + cmds_map["format"].append(f"format_{version}") + defaults.extend([f"check_{version}", f"sha1_{version}"]) n.build( @@ -909,12 +940,15 @@ def process_project(cfg: ProjectConfig, args: Any): ) n.newline() - n.build( - rule="format_delinks", - outputs="format_delinks" - ) - n.newline() + for rule, cmds in cmds_map.items(): + cmds.sort() - n.default(["format_delinks", "objdiff", *defaults]) + n.build( + rule="phony", + outputs=rule, + implicit=cmds, + ) + + n.default(["format", "objdiff", *defaults]) else: n.default(["download_tools"])