diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index faed4006..ffcae4b3 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -69,3 +69,10 @@ src/Main/Game/GameMode.cpp: complete .text start:0x0202c0a8 end:0x0202c0cc .data start:0x0205762c end:0x02057650 + +src/Main/DTCM/UnkStruct_027e05f8_2.cpp: + complete + .text start:0x0203744c end:0x020374b4 + .init start:0x02050cb4 end:0x02050ce0 + .ctor start:0x02057260 end:0x02057264 + .dtcm start:0x027e05f8 end:0x027e060c diff --git a/config/eur/arm9/dtcm/delinks.txt b/config/eur/arm9/dtcm/delinks.txt index 177b6050..ff5522be 100644 --- a/config/eur/arm9/dtcm/delinks.txt +++ b/config/eur/arm9/dtcm/delinks.txt @@ -1,3 +1,3 @@ .data start:0x027e0000 end:0x027e0200 kind:data align:32 - .bss start:0x027e0200 end:0x027e10c0 kind:bss align:32 + .dtcm start:0x027e0200 end:0x027e10c0 kind:bss align:32 diff --git a/config/eur/arm9/dtcm/symbols.txt b/config/eur/arm9/dtcm/symbols.txt index 0036a26b..64ded89b 100644 --- a/config/eur/arm9/dtcm/symbols.txt +++ b/config/eur/arm9/dtcm/symbols.txt @@ -64,7 +64,7 @@ data_027e05ec kind:bss addr:0x027e05ec data_027e05f0 kind:bss addr:0x027e05f0 data_027e05f4 kind:bss addr:0x027e05f4 data_027e05f8 kind:bss addr:0x027e05f8 -data_027e0600 kind:bss addr:0x027e0600 +@4 kind:bss addr:0x027e0600 local data_027e060c kind:bss addr:0x027e060c gGame kind:bss addr:0x027e0618 data_027e0698 kind:bss addr:0x027e0698 diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index 3b4be288..d93b2567 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -2241,7 +2241,7 @@ from:0x0208fa64 kind:load to:0x02050f54 module:main from:0x0208fa88 kind:arm_call to:0x0202e9dc module:main from:0x0208fa94 kind:arm_call to:0x020c1554 module:overlay(0) from:0x0208fae0 kind:load to:0x027e0fe0 module:dtcm -from:0x0208fae4 kind:load to:0x020e2930 module:overlay(0) +from:0x0208fae4 kind:load to:0x020e2928 add:8 module:overlay(0) from:0x0208faf0 kind:arm_call to:0x020c1734 module:overlay(0) from:0x0208faf8 kind:arm_call to:0x0208fc7c module:overlay(0) from:0x0208fb18 kind:arm_call to:0x020c1bfc module:overlay(0) @@ -2296,7 +2296,7 @@ from:0x0209039c kind:arm_call to:0x0202ea0c module:main from:0x020903c0 kind:arm_call to:0x0202e9dc module:main from:0x020903cc kind:arm_call to:0x020c1554 module:overlay(0) from:0x020903e0 kind:load to:0x027e0fe0 module:dtcm -from:0x020903e4 kind:load to:0x020e29ec module:overlay(0) +from:0x020903e4 kind:load to:0x020e29e4 add:8 module:overlay(0) from:0x020903f0 kind:arm_call to:0x020c1734 module:overlay(0) from:0x0209040c kind:arm_call to:0x020c313c module:overlay(0) from:0x02090444 kind:arm_call to:0x020c3bb0 module:overlay(0) @@ -5895,8 +5895,8 @@ from:0x020b14bc kind:arm_call to:0x0202bbbc module:main from:0x020b1518 kind:arm_call to:0x02034984 module:main from:0x020b1520 kind:load to:0x020dc6ec module:overlay(0) from:0x020b1524 kind:load to:0x02050f54 module:main -from:0x020b1538 kind:load to:0x020e6158 module:overlay(0) -from:0x020b154c kind:load to:0x020e6158 module:overlay(0) +from:0x020b1538 kind:load to:0x020e6150 add:8 module:overlay(0) +from:0x020b154c kind:load to:0x020e6150 add:8 module:overlay(0) from:0x020b1554 kind:thumb_call_arm to:0x02081f4c module:overlay(0) from:0x020b1560 kind:thumb_call_arm to:0x02081f4c module:overlay(0) from:0x020b1566 kind:thumb_call_arm to:0x0202ea0c module:main @@ -7123,8 +7123,8 @@ from:0x020bd5a4 kind:arm_call to:0x020c3674 module:overlay(0) from:0x020bd5e4 kind:load to:0x027e0fb4 module:dtcm from:0x020bd5e8 kind:load to:0x027e0f94 module:dtcm from:0x020bd5ec kind:load to:0x027e0fe4 module:dtcm -from:0x020bd614 kind:load to:0x020e6d18 module:overlay(0) -from:0x020bd628 kind:load to:0x020e6d18 module:overlay(0) +from:0x020bd614 kind:load to:0x020e6d10 add:8 module:overlay(0) +from:0x020bd628 kind:load to:0x020e6d10 add:8 module:overlay(0) from:0x020bd658 kind:arm_call to:0x02023548 module:main from:0x020bd66c kind:arm_call to:0x02023548 module:main from:0x020bd67c kind:arm_call_thumb to:0x020b3ea8 module:overlay(0) @@ -7179,7 +7179,7 @@ from:0x020be1b0 kind:arm_call to:0x0202e9dc module:main from:0x020be1bc kind:arm_call to:0x020be1c8 module:overlay(0) from:0x020be1c4 kind:load to:0x027e0fe0 module:dtcm from:0x020be1d0 kind:arm_call to:0x020c1554 module:overlay(0) -from:0x020be1e4 kind:load to:0x020e6d44 module:overlay(0) +from:0x020be1e4 kind:load to:0x020e6d3c add:8 module:overlay(0) from:0x020be1f0 kind:arm_call to:0x020c1730 module:overlay(0) from:0x020be204 kind:arm_call to:0x020c1730 module:overlay(0) from:0x020be20c kind:arm_call to:0x0202ea0c module:main @@ -7443,7 +7443,7 @@ from:0x020c0bbc kind:arm_call to:0x0202ea0c module:main from:0x020c0bd0 kind:arm_call_thumb to:0x02107994 module:overlay(4) from:0x020c0c00 kind:arm_call to:0x0201e544 module:main from:0x020c0c18 kind:thumb_call_arm to:0x0202e1a0 module:main -from:0x020c0c2c kind:load to:0x020e7198 module:overlay(0) +from:0x020c0c2c kind:load to:0x020e7190 add:8 module:overlay(0) from:0x020c0c38 kind:thumb_call_arm to:0x0202ea0c module:main from:0x020c0c5c kind:arm_call to:0x020c0cc8 module:overlay(0) from:0x020c0c68 kind:arm_call to:0x020c0cc8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index c9c6efa3..5ad4b0a3 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -3723,6 +3723,7 @@ data_ov000_020dc574 kind:data(any) addr:0x020dc574 data_ov000_020dc674 kind:data(any) addr:0x020dc674 sQuiverSizes kind:data(any) addr:0x020dc6c4 local sBombBagSizes kind:data(any) addr:0x020dc6cc local +data_ov000_020dc6d4 kind:data(any) addr:0x020dc6d4 data_ov000_020dc6e0 kind:data(any) addr:0x020dc6e0 data_ov000_020dc6e4 kind:data(any) addr:0x020dc6e4 data_ov000_020dc6e8 kind:data(any) addr:0x020dc6e8 @@ -3763,6 +3764,7 @@ data_ov000_020dd29c kind:data(any) addr:0x020dd29c data_ov000_020dd2a0 kind:data(any) addr:0x020dd2a0 data_ov000_020dd364 kind:data(any) addr:0x020dd364 sUnkTable kind:data(any) addr:0x020dd370 +data_ov000_020dd3f8 kind:data(any) addr:0x020dd3f8 data_ov000_020dd408 kind:data(any) addr:0x020dd408 data_ov000_020dd410 kind:data(any) addr:0x020dd410 data_ov000_020dd418 kind:data(any) addr:0x020dd418 @@ -3979,6 +3981,62 @@ __sinit_ov000_020e1e38 kind:function(arm,size=0x14) addr:0x020e1e38 __sinit_ov000_020e1e4c kind:function(arm,size=0x14) addr:0x020e1e4c __sinit_ov000_020e1e60 kind:function(arm,size=0x14) addr:0x020e1e60 __sinit_ov000_020e1e74 kind:function(arm,size=0x14) addr:0x020e1e74 +.p__sinit_ov000_020df338 kind:data(word) addr:0x020e1e88 +.p__sinit_ov000_020df34c kind:data(word) addr:0x020e1e8c +.p__sinit_ov000_020df378 kind:data(word) addr:0x020e1e90 +.p__sinit_ov000_020df38c kind:data(word) addr:0x020e1e94 +.p__sinit_ov000_020df3b8 kind:data(word) addr:0x020e1e98 +.p__sinit_ov000_020df3cc kind:data(word) addr:0x020e1e9c +.p__sinit_ov000_020df3e0 kind:data(word) addr:0x020e1ea0 +.p__sinit_ov000_020df3f4 kind:data(word) addr:0x020e1ea4 +.p__sinit_ov000_020df420 kind:data(word) addr:0x020e1ea8 +.p__sinit_ov000_020df45c kind:data(word) addr:0x020e1eac +.p__sinit_ov000_020df470 kind:data(word) addr:0x020e1eb0 +.p__sinit_ov000_020df4a4 kind:data(word) addr:0x020e1eb4 +.p__sinit_ov000_020df4b8 kind:data(word) addr:0x020e1eb8 +.p__sinit_ov000_020df4cc kind:data(word) addr:0x020e1ebc +.p__sinit_ov000_020df640 kind:data(word) addr:0x020e1ec0 +.p__sinit_ov000_020df678 kind:data(word) addr:0x020e1ec4 +.p__sinit_ov000_020df6b8 kind:data(word) addr:0x020e1ec8 +.p__sinit_ActorEventIcon.cpp kind:data(word) addr:0x020e1ecc local +.p__sinit_ov000_020df738 kind:data(word) addr:0x020e1ed0 +.p__sinit_ov000_020df770 kind:data(word) addr:0x020e1ed4 +.p__sinit_ov000_020df790 kind:data(word) addr:0x020e1ed8 +.p__sinit_ov000_020e0ea8 kind:data(word) addr:0x020e1edc +.p__sinit_ov000_020e1030 kind:data(word) addr:0x020e1ee0 +.p__sinit_ov000_020e105c kind:data(word) addr:0x020e1ee4 +.p__sinit_ov000_020e109c kind:data(word) addr:0x020e1ee8 +.p__sinit_ov000_020e10d4 kind:data(word) addr:0x020e1eec +.p__sinit_ov000_020e1114 kind:data(word) addr:0x020e1ef0 +.p__sinit_ov000_020e1128 kind:data(word) addr:0x020e1ef4 +.p__sinit_ov000_020e11d8 kind:data(word) addr:0x020e1ef8 +.p__sinit_ov000_020e120c kind:data(word) addr:0x020e1efc +.p__sinit_ov000_020e1250 kind:data(word) addr:0x020e1f00 +.p__sinit_ov000_020e1290 kind:data(word) addr:0x020e1f04 +.p__sinit_ov000_020e12d8 kind:data(word) addr:0x020e1f08 +.p__sinit_ActorForceNavi.cpp kind:data(word) addr:0x020e1f0c local +.p__sinit_ov000_020e137c kind:data(word) addr:0x020e1f10 +.p__sinit_ov000_020e1b14 kind:data(word) addr:0x020e1f14 +.p__sinit_ActorWisdomNavi.cpp kind:data(word) addr:0x020e1f18 local +.p__sinit_ov000_020e1b94 kind:data(word) addr:0x020e1f1c +.p__sinit_ov000_020e1bd4 kind:data(word) addr:0x020e1f20 +.p__sinit_ov000_020e1c14 kind:data(word) addr:0x020e1f24 +.p__sinit_ov000_020e1c54 kind:data(word) addr:0x020e1f28 +.p__sinit_ov000_020e1c68 kind:data(word) addr:0x020e1f2c +.p__sinit_ov000_020e1c8c kind:data(word) addr:0x020e1f30 +.p__sinit_ov000_020e1ccc kind:data(word) addr:0x020e1f34 +.p__sinit_ov000_020e1d0c kind:data(word) addr:0x020e1f38 +.p__sinit_ov000_020e1d4c kind:data(word) addr:0x020e1f3c +.p__sinit_ov000_020e1d7c kind:data(word) addr:0x020e1f40 +.p__sinit_ov000_020e1da8 kind:data(word) addr:0x020e1f44 +.p__sinit_ov000_020e1de8 kind:data(word) addr:0x020e1f48 +.p__sinit_ov000_020e1dfc kind:data(word) addr:0x020e1f4c +.p__sinit_ov000_020e1e10 kind:data(word) addr:0x020e1f50 +.p__sinit_ov000_020e1e24 kind:data(word) addr:0x020e1f54 +.p__sinit_ov000_020e1e38 kind:data(word) addr:0x020e1f58 +.p__sinit_ov000_020e1e4c kind:data(word) addr:0x020e1f5c +.p__sinit_ov000_020e1e60 kind:data(word) addr:0x020e1f60 +.p__sinit_ov000_020e1e74 kind:data(word) addr:0x020e1f64 data_ov000_020e1f80 kind:data(any) addr:0x020e1f80 data_ov000_020e1fa4 kind:data(any) addr:0x020e1fa4 data_ov000_020e1fb4 kind:data(any) addr:0x020e1fb4 @@ -4029,7 +4087,7 @@ data_ov000_020e233c kind:data(any) addr:0x020e233c _ZTV7MapBase kind:data(any) addr:0x020e2348 data_ov000_020e240c kind:data(any) addr:0x020e240c data_ov000_020e2410 kind:data(any) addr:0x020e2410 -data_ov000_020e242c kind:data(any) addr:0x020e242c +vtable_ov000_020e242c kind:data(any) addr:0x020e2424 data_ov000_020e2484 kind:data(any) addr:0x020e2484 data_ov000_020e2488 kind:data(any) addr:0x020e2488 data_ov000_020e248c kind:data(any) addr:0x020e248c @@ -4039,6 +4097,7 @@ data_ov000_020e2498 kind:data(any) addr:0x020e2498 data_ov000_020e249c kind:data(any) addr:0x020e249c data_ov000_020e24a0 kind:data(any) addr:0x020e24a0 data_ov000_020e24a4 kind:data(any) addr:0x020e24a4 +data_ov000_020e24c4 kind:data(any) addr:0x020e24c4 data_ov000_020e24c8 kind:data(any) addr:0x020e24c8 data_ov000_020e24cc kind:data(any) addr:0x020e24cc data_ov000_020e24d0 kind:data(any) addr:0x020e24d0 @@ -4055,7 +4114,7 @@ data_ov000_020e2510 kind:data(any) addr:0x020e2510 data_ov000_020e2520 kind:data(any) addr:0x020e2520 data_ov000_020e2524 kind:data(any) addr:0x020e2524 @1495 kind:data(any) addr:0x020e2528 -data_ov000_020e2544 kind:data(any) addr:0x020e2544 +data_ov000_020e253c kind:data(any) addr:0x020e253c data_ov000_020e2568 kind:data(any) addr:0x020e2568 data_ov000_020e2588 kind:data(any) addr:0x020e2588 data_ov000_020e25b0 kind:data(any) addr:0x020e25b0 @@ -4064,10 +4123,10 @@ data_ov000_020e2748 kind:data(any) addr:0x020e2748 data_ov000_020e27dc kind:data(any) addr:0x020e27dc data_ov000_020e2870 kind:data(any) addr:0x020e2870 data_ov000_020e289c kind:data(any) addr:0x020e289c -_ZTV17ActorSwitchObject kind:data(any) addr:0x020e2930 -data_ov000_020e29ec kind:data(any) addr:0x020e29ec +_ZTV17ActorSwitchObject kind:data(any) addr:0x020e2928 +vtable_ov000_020e29ec kind:data(any) addr:0x020e29e4 _ZTV14ActorEventIcon kind:data(any) addr:0x020e2aa0 -data_ov000_020e2b64 kind:data(any) addr:0x020e2b64 +data_ov000_020e2b64 kind:data(any) addr:0x020e2b5c data_ov000_020e2bb4 kind:data(any) addr:0x020e2bb4 data_ov000_020e2c04 kind:data(any) addr:0x020e2c04 data_ov000_020e2c54 kind:data(any) addr:0x020e2c54 @@ -4907,7 +4966,7 @@ _ZTV13LinkStateRoll kind:data(any) addr:0x020e60c0 sShipTypes kind:data(any) addr:0x020e6124 local data_ov000_020e6144 kind:data(any) addr:0x020e6144 @1556 kind:data(any) addr:0x020e6148 -data_ov000_020e6158 kind:data(any) addr:0x020e6158 +vtable_ov000_020e6158 kind:data(any) addr:0x020e6150 data_ov000_020e6174 kind:data(any) addr:0x020e6174 data_ov000_020e6178 kind:data(any) addr:0x020e6178 data_ov000_020e617c kind:data(any) addr:0x020e617c @@ -4973,8 +5032,8 @@ data_ov000_020e678c kind:data(any) addr:0x020e678c data_ov000_020e67ac kind:data(any) addr:0x020e67ac data_ov000_020e67b8 kind:data(any) addr:0x020e67b8 data_ov000_020e67d8 kind:data(any) addr:0x020e67d8 -data_ov000_020e67e4 kind:data(any) addr:0x020e67e4 -data_ov000_020e68dc kind:data(any) addr:0x020e68dc +vtable_ov000_020e67e4 kind:data(any) addr:0x020e67dc +vtable_ov000_020e68dc kind:data(any) addr:0x020e68d4 data_ov000_020e691c kind:data(any) addr:0x020e691c data_ov000_020e6934 kind:data(any) addr:0x020e6934 data_ov000_020e6974 kind:data(any) addr:0x020e6974 @@ -5018,8 +5077,8 @@ data_ov000_020e6c54 kind:data(any) addr:0x020e6c54 data_ov000_020e6c58 kind:data(any) addr:0x020e6c58 data_ov000_020e6c5c kind:data(any) addr:0x020e6c5c _ZTV14PlayerLinkBase kind:data(any) addr:0x020e6c88 -data_ov000_020e6d18 kind:data(any) addr:0x020e6d18 -_ZTV17ActorActionObject kind:data(any) addr:0x020e6d44 +vtable_ov000_020e6d18 kind:data(any) addr:0x020e6d10 +_ZTV17ActorActionObject kind:data(any) addr:0x020e6d3c data_ov000_020e6df8 kind:data(any) addr:0x020e6df8 data_ov000_020e6dfc kind:data(any) addr:0x020e6dfc data_ov000_020e6e08 kind:data(any) addr:0x020e6e08 @@ -5060,7 +5119,7 @@ data_ov000_020e7018 kind:data(any) addr:0x020e7018 data_ov000_020e701c kind:data(any) addr:0x020e701c data_ov000_020e7048 kind:data(any) addr:0x020e7048 _ZTV15ActorWisdomNavi kind:data(any) addr:0x020e7098 -data_ov000_020e7198 kind:data(any) addr:0x020e7198 +vtable_ov000_020e7198 kind:data(any) addr:0x020e7190 data_ov000_020e71a0 kind:data(any) addr:0x020e71a0 data_ov000_020e71a4 kind:data(any) addr:0x020e71a4 data_ov000_020e71a8 kind:data(any) addr:0x020e71a8 @@ -5081,7 +5140,7 @@ _ZTV5Actor kind:data(any) addr:0x020e71f4 @1032 kind:data(any) addr:0x020e72c0 local @1031 kind:data(any) addr:0x020e72c4 local _ZTV11FilterActor kind:data(any) addr:0x020e72e8 -data_ov000_020e72fc kind:data(any) addr:0x020e72fc +vtable_ov000_020e72fc kind:data(any) addr:0x020e72f4 data_ov000_020e7300 kind:data(any) addr:0x020e7300 data_ov000_020e7304 kind:data(any) addr:0x020e7304 data_ov000_020e7308 kind:data(any) addr:0x020e7308 @@ -5799,6 +5858,7 @@ data_ov000_020e9f10 kind:bss addr:0x020e9f10 data_ov000_020ea110 kind:bss addr:0x020ea110 data_ov000_020eaa98 kind:bss addr:0x020eaa98 data_ov000_020eaac4 kind:bss addr:0x020eaac4 +data_ov000_020eaac8 kind:bss addr:0x020eaac8 data_ov000_020eaad8 kind:bss addr:0x020eaad8 data_ov000_020eaaf8 kind:bss addr:0x020eaaf8 data_ov000_020eab04 kind:bss addr:0x020eab04 diff --git a/config/eur/arm9/overlays/ov002/symbols.txt b/config/eur/arm9/overlays/ov002/symbols.txt index b8b31716..f127abb4 100644 --- a/config/eur/arm9/overlays/ov002/symbols.txt +++ b/config/eur/arm9/overlays/ov002/symbols.txt @@ -213,6 +213,7 @@ data_ov002_020f6840 kind:data(any) addr:0x020f6840 data_ov002_020f6844 kind:data(any) addr:0x020f6844 data_ov002_020f6898 kind:data(any) addr:0x020f6898 __sinit_ov002_020f6978 kind:function(arm,size=0x2c) addr:0x020f6978 +.p__sinit_ov002_020f6978 kind:data(word) addr:0x020f69a4 data_ov002_020f69c0 kind:data(any) addr:0x020f69c0 data_ov002_020f69c4 kind:data(any) addr:0x020f69c4 data_ov002_020f69c8 kind:data(any) addr:0x020f69c8 diff --git a/config/eur/arm9/overlays/ov003/symbols.txt b/config/eur/arm9/overlays/ov003/symbols.txt index 8c395677..c805e540 100644 --- a/config/eur/arm9/overlays/ov003/symbols.txt +++ b/config/eur/arm9/overlays/ov003/symbols.txt @@ -512,6 +512,15 @@ __sinit_ov003_020fff04 kind:function(arm,size=0x28) addr:0x020fff04 __sinit_ov003_020fff2c kind:function(arm,size=0x28) addr:0x020fff2c __sinit_ov003_020fff54 kind:function(arm,size=0x40) addr:0x020fff54 __sinit_ov003_020fff94 kind:function(arm,size=0x38) addr:0x020fff94 +.p__sinit_ov003_020ffe28 kind:data(word) addr:0x020fffcc +.p__sinit_ov003_020ffe68 kind:data(word) addr:0x020fffd0 +.p__sinit_ov003_020ffe80 kind:data(word) addr:0x020fffd4 +.p__sinit_ov003_020ffebc kind:data(word) addr:0x020fffd8 +.p__sinit_ov003_020ffedc kind:data(word) addr:0x020fffdc +.p__sinit_ov003_020fff04 kind:data(word) addr:0x020fffe0 +.p__sinit_ov003_020fff2c kind:data(word) addr:0x020fffe4 +.p__sinit_ov003_020fff54 kind:data(word) addr:0x020fffe8 +.p__sinit_ov003_020fff94 kind:data(word) addr:0x020fffec data_ov003_02100000 kind:data(any) addr:0x02100000 data_ov003_02100004 kind:data(any) addr:0x02100004 data_ov003_02100008 kind:data(any) addr:0x02100008 diff --git a/config/eur/arm9/overlays/ov004/delinks.txt b/config/eur/arm9/overlays/ov004/delinks.txt index 4263b532..08cdd6f0 100644 --- a/config/eur/arm9/overlays/ov004/delinks.txt +++ b/config/eur/arm9/overlays/ov004/delinks.txt @@ -5,6 +5,6 @@ .data start:0x0210fda0 end:0x021113e0 kind:data align:32 .bss start:0x021113e0 end:0x021113e0 kind:bss align:32 -src/04_Load/Player/LinkStateMove.cpp: +src/04_Load/Player/LinkStateMove_04.cpp: complete .text start:0x0210aed4 end:0x0210af14 diff --git a/config/eur/arm9/overlays/ov004/relocs.txt b/config/eur/arm9/overlays/ov004/relocs.txt index 5b9dcff4..e8ac99e5 100644 --- a/config/eur/arm9/overlays/ov004/relocs.txt +++ b/config/eur/arm9/overlays/ov004/relocs.txt @@ -481,9 +481,9 @@ from:0x02103160 kind:thumb_call_arm to:0x0202e9dc module:main from:0x0210319a kind:thumb_call_arm to:0x0202e9dc module:main from:0x021031d0 kind:thumb_call_arm to:0x0202e9dc module:main from:0x021031fc kind:load to:0x020d8aa8 module:overlay(0) -from:0x02103208 kind:load to:0x020e2544 module:overlay(0) +from:0x02103208 kind:load to:0x020e253c add:8 module:overlay(0) from:0x0210320c kind:load to:0x027e0ce0 module:dtcm -from:0x02103210 kind:load to:0x020e2b64 module:overlay(0) +from:0x02103210 kind:load to:0x020e2b5c add:8 module:overlay(0) from:0x02103214 kind:load to:0x020e2ca4 module:overlay(0) from:0x02103218 kind:load to:0x020e4b18 module:overlay(0) from:0x0210321c kind:load to:0x020e2c04 module:overlay(0) @@ -500,7 +500,7 @@ from:0x02103324 kind:thumb_call_arm to:0x0202e9dc module:main from:0x0210336c kind:thumb_call_arm to:0x0202e9dc module:main from:0x021033a4 kind:thumb_call_arm to:0x0202e9dc module:main from:0x021033d8 kind:thumb_call_arm to:0x0202e9dc module:main -from:0x02103418 kind:load to:0x020e2b64 module:overlay(0) +from:0x02103418 kind:load to:0x020e2b5c add:8 module:overlay(0) from:0x0210341c kind:load to:0x020e4b68 module:overlay(0) from:0x02103420 kind:load to:0x027e0ce0 module:dtcm from:0x02103424 kind:load to:0x020e4c00 module:overlay(0) @@ -519,7 +519,7 @@ from:0x021034c0 kind:thumb_call_arm to:0x0202ea0c module:main from:0x021034da kind:thumb_call_arm to:0x0209da44 module:overlay(0) from:0x021034e0 kind:thumb_call_arm to:0x0202ea0c module:main from:0x021034ee kind:thumb_call_arm to:0x0208dec8 module:overlay(0) -from:0x021034f8 kind:load to:0x020e2544 module:overlay(0) +from:0x021034f8 kind:load to:0x020e253c add:8 module:overlay(0) from:0x02103512 kind:thumb_call_arm to:0x020a04ac module:overlay(0) from:0x02103518 kind:thumb_call_arm to:0x0202ea0c module:main from:0x02103558 kind:thumb_call_arm to:0x0202ea18 module:main @@ -529,7 +529,7 @@ from:0x02103592 kind:thumb_call_arm to:0x0209da44 module:overlay(0) from:0x02103598 kind:thumb_call_arm to:0x0202ea0c module:main from:0x021035a6 kind:thumb_call_arm to:0x0208dec8 module:overlay(0) from:0x021035ac kind:thumb_call_arm to:0x0202ea0c module:main -from:0x021035b4 kind:load to:0x020e2544 module:overlay(0) +from:0x021035b4 kind:load to:0x020e253c add:8 module:overlay(0) from:0x021035d2 kind:thumb_call_arm to:0x0202e9dc module:main from:0x021035dc kind:thumb_call_arm to:0x020a036c module:overlay(0) from:0x021035e8 kind:thumb_call_arm to:0x020a0330 module:overlay(0) @@ -1531,7 +1531,7 @@ from:0x02107850 kind:thumb_call to:0x020c0c08 module:overlay(0) from:0x0210785e kind:thumb_call_arm to:0x020c0c44 module:overlay(0) from:0x02107878 kind:thumb_call_arm to:0x0204f614 module:main from:0x0210788e kind:thumb_call_arm to:0x020d18f4 module:overlay(0) -from:0x021078f4 kind:load to:0x020e67e4 module:overlay(0) +from:0x021078f4 kind:load to:0x020e67dc add:8 module:overlay(0) from:0x021078f8 kind:load to:0x020ee1f8 module:overlay(0) from:0x021078fc kind:load to:0x020e67ac module:overlay(0) from:0x02107900 kind:load to:0x02110540 module:overlay(4) @@ -1562,7 +1562,7 @@ from:0x02107a74 kind:load to:0x027e0d0c module:dtcm from:0x02107a7c kind:load to:0x027e0d38 module:dtcm from:0x02107a84 kind:thumb_call to:0x020a956c module:overlay(0) from:0x02107a92 kind:thumb_call_arm to:0x020a9998 module:overlay(0) -from:0x02107a9c kind:load to:0x020e68dc module:overlay(0) +from:0x02107a9c kind:load to:0x020e68d4 add:8 module:overlay(0) from:0x02107aa4 kind:thumb_call to:0x02107810 module:overlay(4) from:0x02107ab2 kind:thumb_call_arm to:0x020ad52c module:overlay(0) from:0x02107abe kind:thumb_call to:0x020a9588 module:overlay(0) @@ -2461,7 +2461,7 @@ from:0x0210c0e8 kind:thumb_call_arm to:0x02080edc module:overlay(0) from:0x0210c0f0 kind:load to:0x027e0d38 module:dtcm from:0x0210c0f4 kind:load to:0x027e0fe4 module:dtcm from:0x0210c108 kind:load to:0x0210f9a4 module:overlay(4) -from:0x0210c10c kind:load to:0x020e72fc module:overlay(0) +from:0x0210c10c kind:load to:0x020e72f4 add:8 module:overlay(0) from:0x0210c110 kind:load to:0x02110d38 module:overlay(4) from:0x0210c12c kind:thumb_call_arm to:0x02078b40 module:overlay(0) from:0x0210c13a kind:thumb_call_arm to:0x020a5e9c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov004/symbols.txt b/config/eur/arm9/overlays/ov004/symbols.txt index 48033dc3..49be325a 100644 --- a/config/eur/arm9/overlays/ov004/symbols.txt +++ b/config/eur/arm9/overlays/ov004/symbols.txt @@ -467,6 +467,8 @@ data_ov004_0210fcd8 kind:data(any) addr:0x0210fcd8 data_ov004_0210fcf8 kind:data(any) addr:0x0210fcf8 __sinit_ov004_0210fd58 kind:function(arm,size=0x24) addr:0x0210fd58 __sinit_ov004_0210fd7c kind:function(arm,size=0x14) addr:0x0210fd7c +.p__sinit_ov004_0210fd58 kind:data(word) addr:0x0210fd90 +.p__sinit_ov004_0210fd7c kind:data(word) addr:0x0210fd94 data_ov004_0210fda0 kind:data(any) addr:0x0210fda0 data_ov004_0210fdb4 kind:data(any) addr:0x0210fdb4 data_ov004_0210fdc8 kind:data(any) addr:0x0210fdc8 diff --git a/config/eur/arm9/overlays/ov005/delinks.txt b/config/eur/arm9/overlays/ov005/delinks.txt index 2dc0f7d5..b13dfc06 100644 --- a/config/eur/arm9/overlays/ov005/delinks.txt +++ b/config/eur/arm9/overlays/ov005/delinks.txt @@ -5,7 +5,7 @@ .data start:0x02112480 end:0x02112c20 kind:data align:32 .bss start:0x02112c20 end:0x02112c20 kind:bss align:32 -src/05/Player/LinkStateMove.cpp: +src/05/Player/LinkStateMove_05.cpp: complete .text start:0x021113d0 end:0x02111bc0 .rodata start:0x021123ac end:0x021123bc diff --git a/config/eur/arm9/overlays/ov005/symbols.txt b/config/eur/arm9/overlays/ov005/symbols.txt index ce09a288..9db27826 100644 --- a/config/eur/arm9/overlays/ov005/symbols.txt +++ b/config/eur/arm9/overlays/ov005/symbols.txt @@ -335,6 +335,10 @@ __sinit_ov005_021123bc kind:function(arm,size=0x24) addr:0x021123bc __sinit_ov005_021123e0 kind:function(arm,size=0x1c) addr:0x021123e0 __sinit_ov005_021123fc kind:function(arm,size=0x24) addr:0x021123fc __sinit_ov005_02112420 kind:function(arm,size=0x44) addr:0x02112420 +.p__sinit_ov005_021123bc kind:data(word) addr:0x02112464 +.p__sinit_ov005_021123e0 kind:data(word) addr:0x02112468 +.p__sinit_ov005_021123fc kind:data(word) addr:0x0211246c +.p__sinit_ov005_02112420 kind:data(word) addr:0x02112470 data_ov005_02112480 kind:data(any) addr:0x02112480 data_ov005_02112484 kind:data(any) addr:0x02112484 data_ov005_02112488 kind:data(any) addr:0x02112488 diff --git a/config/eur/arm9/overlays/ov009/symbols.txt b/config/eur/arm9/overlays/ov009/symbols.txt index f33840eb..9ccdaa66 100644 --- a/config/eur/arm9/overlays/ov009/symbols.txt +++ b/config/eur/arm9/overlays/ov009/symbols.txt @@ -600,6 +600,13 @@ __sinit_ov009_0211e5c8 kind:function(arm,size=0x2c) addr:0x0211e5c8 __sinit_ov009_0211e5f4 kind:function(arm,size=0x2c) addr:0x0211e5f4 __sinit_ov009_0211e620 kind:function(arm,size=0x2c) addr:0x0211e620 __sinit_ov009_0211e64c kind:function(arm,size=0x14) addr:0x0211e64c +.p__sinit_ov009_0211e4a4 kind:data(word) addr:0x0211e660 +.p__sinit_ov009_0211e4b8 kind:data(word) addr:0x0211e664 +.p__sinit_ov009_0211e5b0 kind:data(word) addr:0x0211e668 +.p__sinit_ov009_0211e5c8 kind:data(word) addr:0x0211e66c +.p__sinit_ov009_0211e5f4 kind:data(word) addr:0x0211e670 +.p__sinit_ov009_0211e620 kind:data(word) addr:0x0211e674 +.p__sinit_ov009_0211e64c kind:data(word) addr:0x0211e678 data_ov009_0211e680 kind:data(any) addr:0x0211e680 data_ov009_0211e684 kind:data(any) addr:0x0211e684 data_ov009_0211e688 kind:data(any) addr:0x0211e688 diff --git a/config/eur/arm9/overlays/ov012/symbols.txt b/config/eur/arm9/overlays/ov012/symbols.txt index c089527e..046b6572 100644 --- a/config/eur/arm9/overlays/ov012/symbols.txt +++ b/config/eur/arm9/overlays/ov012/symbols.txt @@ -1091,6 +1091,16 @@ __sinit_ov012_02135828 kind:function(arm,size=0x38) addr:0x02135828 __sinit_ov012_02135860 kind:function(arm,size=0x40) addr:0x02135860 __sinit_ov012_021358a0 kind:function(arm,size=0x40) addr:0x021358a0 __sinit_ov012_021358e0 kind:function(arm,size=0x14) addr:0x021358e0 +.p__sinit_ov012_021354cc kind:data(word) addr:0x021358f4 +.p__sinit_ov012_02135688 kind:data(word) addr:0x021358f8 +.p__sinit_ov012_021356b4 kind:data(word) addr:0x021358fc +.p__sinit_ov012_021356e0 kind:data(word) addr:0x02135900 +.p__sinit_ov012_02135720 kind:data(word) addr:0x02135904 +.p__sinit_ov012_021357c0 kind:data(word) addr:0x02135908 +.p__sinit_ov012_02135828 kind:data(word) addr:0x0213590c +.p__sinit_ov012_02135860 kind:data(word) addr:0x02135910 +.p__sinit_ov012_021358a0 kind:data(word) addr:0x02135914 +.p__sinit_ov012_021358e0 kind:data(word) addr:0x02135918 data_ov012_02135920 kind:data(any) addr:0x02135920 data_ov012_02135924 kind:data(any) addr:0x02135924 data_ov012_02135928 kind:data(any) addr:0x02135928 diff --git a/config/eur/arm9/overlays/ov013/symbols.txt b/config/eur/arm9/overlays/ov013/symbols.txt index 6b50645c..c1d9fe2e 100644 --- a/config/eur/arm9/overlays/ov013/symbols.txt +++ b/config/eur/arm9/overlays/ov013/symbols.txt @@ -50,7 +50,7 @@ func_ov013_021149bc kind:function(arm,size=0x24) addr:0x021149bc func_ov013_021149e0 kind:function(arm,size=0x34) addr:0x021149e0 func_ov013_02114a14 kind:function(arm,size=0x20) addr:0x02114a14 func_ov013_02114a34 kind:function(arm,size=0xd0) addr:0x02114a34 -func_ov013_02114b04 kind:function(arm,size=0x14) addr:0x02114b04 +__sinit_ov013_02114b04 kind:function(arm,size=0x14) addr:0x02114b04 func_ov013_02114b18 kind:function(arm,size=0x4) addr:0x02114b18 func_ov013_02114b1c kind:function(arm,size=0x8) addr:0x02114b1c func_ov013_02114b24 kind:function(arm,size=0xc0) addr:0x02114b24 @@ -104,6 +104,7 @@ data_ov013_02116094 kind:data(any) addr:0x02116094 data_ov013_021160b4 kind:data(any) addr:0x021160b4 data_ov013_021160bc kind:data(any) addr:0x021160bc data_ov013_021160d4 kind:data(any) addr:0x021160d4 +.p__sinit_ov013_02114b04 kind:data(word) addr:0x021160ec data_ov013_02116100 kind:data(any) addr:0x02116100 data_ov013_02116128 kind:data(any) addr:0x02116128 data_ov013_02116130 kind:data(any) addr:0x02116130 diff --git a/config/eur/arm9/overlays/ov014/delinks.txt b/config/eur/arm9/overlays/ov014/delinks.txt index df6a203b..533b842d 100644 --- a/config/eur/arm9/overlays/ov014/delinks.txt +++ b/config/eur/arm9/overlays/ov014/delinks.txt @@ -10,7 +10,7 @@ src/14_Land/Actor/ActorRupee.cpp: .rodata start:0x02153e28 end:0x02153e48 .init start:0x0215517c end:0x021551d8 .ctor start:0x0215591c end:0x02155920 - .data start:0x02158994 end:0x02158a94 + .data start:0x02158994 end:0x02158a98 .bss start:0x0215b1f4 end:0x0215b214 src/14_Land/Actor/Player/ActorRefill.cpp: diff --git a/config/eur/arm9/overlays/ov014/relocs.txt b/config/eur/arm9/overlays/ov014/relocs.txt index 99f8055c..2916d174 100644 --- a/config/eur/arm9/overlays/ov014/relocs.txt +++ b/config/eur/arm9/overlays/ov014/relocs.txt @@ -2880,7 +2880,7 @@ from:0x0213895c kind:arm_call to:0x02081f4c module:overlay(0) from:0x021389b4 kind:arm_call to:0x02138a50 module:overlay(14) from:0x021389bc kind:arm_call to:0x02081f4c module:overlay(0) from:0x021389c8 kind:load to:0x027e0fc8 module:dtcm -from:0x021389cc kind:load to:0x020e242c module:overlay(0) +from:0x021389cc kind:load to:0x020e2424 add:8 module:overlay(0) from:0x021389d0 kind:load to:0x027e0e60 module:dtcm from:0x021389d4 kind:load to:0x027e0f6c module:dtcm from:0x021389f8 kind:arm_call to:0x020bc854 module:overlay(0) @@ -3291,7 +3291,7 @@ from:0x0213b9d4 kind:load to:0x027e0fe0 module:dtcm from:0x0213b9e8 kind:arm_call to:0x0213844c module:overlay(14) from:0x0213ba04 kind:arm_call to:0x0208ccdc module:overlay(0) from:0x0213ba18 kind:arm_call_thumb to:0x020b7ec4 module:overlay(0) -from:0x0213ba50 kind:load to:0x02158aa0 module:overlay(14) +from:0x0213ba50 kind:load to:0x02158a98 add:8 module:overlay(14) from:0x0213ba54 kind:load to:0x027e0f68 module:dtcm from:0x0213ba64 kind:arm_call_thumb to:0x020b3ea8 module:overlay(0) from:0x0213ba6c kind:arm_call to:0x02138528 module:overlay(14) diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index e6c0368c..ec7ab67d 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/config/eur/arm9/overlays/ov014/symbols.txt @@ -846,7 +846,7 @@ func_ov014_0213ccd8 kind:function(arm,size=0xe8) addr:0x0213ccd8 func_ov014_0213cdc0 kind:function(arm,size=0x3c) addr:0x0213cdc0 func_ov014_0213cdfc kind:function(arm,size=0x5c) addr:0x0213cdfc func_ov014_0213ce58 kind:function(arm,size=0x18) addr:0x0213ce58 -_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0xbc) addr:0x0213ce70 local +func_ov014_0213ce70 kind:function(arm,size=0xbc) addr:0x0213ce70 func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x0213cf2c _ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x0213cf88 _ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x0213cf9c @@ -1711,6 +1711,85 @@ __sinit_ov014_02155764 kind:function(arm,size=0x38) addr:0x02155764 __sinit_ov014_0215579c kind:function(arm,size=0x40) addr:0x0215579c __sinit_ov014_021557dc kind:function(arm,size=0x38) addr:0x021557dc __sinit_ov014_02155814 kind:function(arm,size=0x38) addr:0x02155814 +.p__sinit_ov014_021541ec kind:data(word) addr:0x0215584c +.p__sinit_ov014_02154254 kind:data(word) addr:0x02155850 +.p__sinit_ov014_02154294 kind:data(word) addr:0x02155854 +.p__sinit_ov014_021542f4 kind:data(word) addr:0x02155858 +.p__sinit_ov014_02154334 kind:data(word) addr:0x0215585c +.p__sinit_ov014_02154374 kind:data(word) addr:0x02155860 +.p__sinit_ov014_021543f8 kind:data(word) addr:0x02155864 +.p__sinit_ov014_02154430 kind:data(word) addr:0x02155868 +.p__sinit_ov014_02154468 kind:data(word) addr:0x0215586c +.p__sinit_ov014_021544a0 kind:data(word) addr:0x02155870 +.p__sinit_ov014_021544d8 kind:data(word) addr:0x02155874 +.p__sinit_ov014_02154510 kind:data(word) addr:0x02155878 +.p__sinit_ov014_02154548 kind:data(word) addr:0x0215587c +.p__sinit_ov014_02154580 kind:data(word) addr:0x02155880 +.p__sinit_ov014_02154598 kind:data(word) addr:0x02155884 +.p__sinit_ov014_021545d0 kind:data(word) addr:0x02155888 +.p__sinit_ov014_0215461c kind:data(word) addr:0x0215588c +.p__sinit_ov014_02154654 kind:data(word) addr:0x02155890 +.p__sinit_ov014_0215468c kind:data(word) addr:0x02155894 +.p__sinit_ov014_021546c4 kind:data(word) addr:0x02155898 +.p__sinit_ov014_021546fc kind:data(word) addr:0x0215589c +.p__sinit_ov014_02154734 kind:data(word) addr:0x021558a0 +.p__sinit_ov014_0215476c kind:data(word) addr:0x021558a4 +.p__sinit_ov014_021547a4 kind:data(word) addr:0x021558a8 +.p__sinit_ov014_021547dc kind:data(word) addr:0x021558ac +.p__sinit_ov014_02154814 kind:data(word) addr:0x021558b0 +.p__sinit_ov014_0215484c kind:data(word) addr:0x021558b4 +.p__sinit_ov014_02154884 kind:data(word) addr:0x021558b8 +.p__sinit_ov014_021548bc kind:data(word) addr:0x021558bc +.p__sinit_ov014_021548f4 kind:data(word) addr:0x021558c0 +.p__sinit_ov014_0215492c kind:data(word) addr:0x021558c4 +.p__sinit_ov014_02154964 kind:data(word) addr:0x021558c8 +.p__sinit_ov014_0215499c kind:data(word) addr:0x021558cc +.p__sinit_ov014_02154a8c kind:data(word) addr:0x021558d0 +.p__sinit_ov014_02154ac4 kind:data(word) addr:0x021558d4 +.p__sinit_ov014_02154afc kind:data(word) addr:0x021558d8 +.p__sinit_ov014_02154b34 kind:data(word) addr:0x021558dc +.p__sinit_ov014_02154b6c kind:data(word) addr:0x021558e0 +.p__sinit_ov014_02154ba4 kind:data(word) addr:0x021558e4 +.p__sinit_ov014_02154bdc kind:data(word) addr:0x021558e8 +.p__sinit_ActorRefill.cpp kind:data(word) addr:0x021558ec local +.p__sinit_ov014_02154d24 kind:data(word) addr:0x021558f0 +.p__sinit_ov014_02154efc kind:data(word) addr:0x021558f4 +.p__sinit_ov014_02154f3c kind:data(word) addr:0x021558f8 +.p__sinit_ov014_02154f7c kind:data(word) addr:0x021558fc +.p__sinit_ov014_02154fbc kind:data(word) addr:0x02155900 +.p__sinit_ov014_02154ffc kind:data(word) addr:0x02155904 +.p__sinit_ov014_0215503c kind:data(word) addr:0x02155908 +.p__sinit_ov014_0215507c kind:data(word) addr:0x0215590c +.p__sinit_ov014_021550bc kind:data(word) addr:0x02155910 +.p__sinit_ov014_021550fc kind:data(word) addr:0x02155914 +.p__sinit_ov014_0215513c kind:data(word) addr:0x02155918 +.p__sinit_ov014_0215517c kind:data(word) addr:0x0215591c +.p__sinit_ov014_021551d8 kind:data(word) addr:0x02155920 +.p__sinit_ov014_02155218 kind:data(word) addr:0x02155924 +.p__sinit_ov014_02155250 kind:data(word) addr:0x02155928 +.p__sinit_ov014_0215528c kind:data(word) addr:0x0215592c +.p__sinit_ov014_021552ac kind:data(word) addr:0x02155930 +.p__sinit_ov014_021552e4 kind:data(word) addr:0x02155934 +.p__sinit_ov014_0215531c kind:data(word) addr:0x02155938 +.p__sinit_ov014_02155398 kind:data(word) addr:0x0215593c +.p__sinit_ov014_021553e4 kind:data(word) addr:0x02155940 +.p__sinit_ov014_02155424 kind:data(word) addr:0x02155944 +.p__sinit_ov014_0215545c kind:data(word) addr:0x02155948 +.p__sinit_ov014_021554d0 kind:data(word) addr:0x0215594c +.p__sinit_ov014_02155510 kind:data(word) addr:0x02155950 +.p__sinit_ov014_02155548 kind:data(word) addr:0x02155954 +.p__sinit_ov014_02155588 kind:data(word) addr:0x02155958 +.p__sinit_ov014_021555c0 kind:data(word) addr:0x0215595c +.p__sinit_ov014_021555f8 kind:data(word) addr:0x02155960 +.p__sinit_ov014_02155630 kind:data(word) addr:0x02155964 +.p__sinit_ov014_02155668 kind:data(word) addr:0x02155968 +.p__sinit_ov014_021556a0 kind:data(word) addr:0x0215596c +.p__sinit_ov014_021556ec kind:data(word) addr:0x02155970 +.p__sinit_ov014_0215572c kind:data(word) addr:0x02155974 +.p__sinit_ov014_02155764 kind:data(word) addr:0x02155978 +.p__sinit_ov014_0215579c kind:data(word) addr:0x0215597c +.p__sinit_ov014_021557dc kind:data(word) addr:0x02155980 +.p__sinit_ov014_02155814 kind:data(word) addr:0x02155984 data_ov014_021559a0 kind:data(any) addr:0x021559a0 data_ov014_021559a4 kind:data(any) addr:0x021559a4 data_ov014_021559a8 kind:data(any) addr:0x021559a8 @@ -1906,7 +1985,7 @@ data_ov014_021589b4 kind:data(any) addr:0x021589b4 data_ov014_021589d4 kind:data(any) addr:0x021589d4 data_ov014_021589d8 kind:data(any) addr:0x021589d8 _ZTV10ActorRupee kind:data(any) addr:0x021589dc -data_ov014_02158aa0 kind:data(any) addr:0x02158aa0 +vtable_ov014_02158aa0 kind:data(any) addr:0x02158a98 data_ov014_02158b60 kind:data(any) addr:0x02158b60 data_ov014_02158b64 kind:data(any) addr:0x02158b64 data_ov014_02158b68 kind:data(any) addr:0x02158b68 diff --git a/config/eur/arm9/overlays/ov015/symbols.txt b/config/eur/arm9/overlays/ov015/symbols.txt index 54077dbc..a25e3131 100644 --- a/config/eur/arm9/overlays/ov015/symbols.txt +++ b/config/eur/arm9/overlays/ov015/symbols.txt @@ -613,7 +613,7 @@ func_ov015_0213cc98 kind:function(arm,size=0x14) addr:0x0213cc98 func_ov015_0213ccac kind:function(arm,size=0x38) addr:0x0213ccac func_ov015_0213cce4 kind:function(arm,size=0x78) addr:0x0213cce4 func_ov015_0213cd5c kind:function(arm,size=0xf0) addr:0x0213cd5c -_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0x10) addr:0x0213ce4c +func_ov015_0213ce4c kind:function(arm,size=0x10) addr:0x0213ce4c func_ov015_0213ce5c kind:function(arm,size=0xb4) addr:0x0213ce5c func_ov015_0213cf10 kind:function(arm,size=0x20) addr:0x0213cf10 func_ov015_0213cf30 kind:function(arm,size=0x48) addr:0x0213cf30 @@ -2367,6 +2367,89 @@ __sinit_ov015_021891fc kind:function(arm,size=0x60) addr:0x021891fc __sinit_ov015_0218925c kind:function(arm,size=0x40) addr:0x0218925c __sinit_ov015_0218929c kind:function(arm,size=0x14) addr:0x0218929c __sinit_ov015_021892b0 kind:function(arm,size=0x20) addr:0x021892b0 +.p__sinit_ov015_02187384 kind:data(word) addr:0x021892d0 +.p__sinit_ov015_021873c8 kind:data(word) addr:0x021892d4 +.p__sinit_ov015_02187408 kind:data(word) addr:0x021892d8 +.p__sinit_ov015_02187448 kind:data(word) addr:0x021892dc +.p__sinit_ov015_02187488 kind:data(word) addr:0x021892e0 +.p__sinit_ov015_021874c8 kind:data(word) addr:0x021892e4 +.p__sinit_ov015_02187544 kind:data(word) addr:0x021892e8 +.p__sinit_ov015_0218757c kind:data(word) addr:0x021892ec +.p__sinit_ov015_021875b4 kind:data(word) addr:0x021892f0 +.p__sinit_ov015_021875ec kind:data(word) addr:0x021892f4 +.p__sinit_ov015_02187624 kind:data(word) addr:0x021892f8 +.p__sinit_ov015_0218765c kind:data(word) addr:0x021892fc +.p__sinit_ov015_02187694 kind:data(word) addr:0x02189300 +.p__sinit_ov015_021876cc kind:data(word) addr:0x02189304 +.p__sinit_ov015_02187704 kind:data(word) addr:0x02189308 +.p__sinit_ov015_0218773c kind:data(word) addr:0x0218930c +.p__sinit_ov015_02187774 kind:data(word) addr:0x02189310 +.p__sinit_ov015_021877ac kind:data(word) addr:0x02189314 +.p__sinit_ov015_021877e4 kind:data(word) addr:0x02189318 +.p__sinit_ov015_0218781c kind:data(word) addr:0x0218931c +.p__sinit_ov015_02187884 kind:data(word) addr:0x02189320 +.p__sinit_ov015_021878f8 kind:data(word) addr:0x02189324 +.p__sinit_ov015_0218793c kind:data(word) addr:0x02189328 +.p__sinit_ov015_0218798c kind:data(word) addr:0x0218932c +.p__sinit_ov015_021879cc kind:data(word) addr:0x02189330 +.p__sinit_ov015_021879e0 kind:data(word) addr:0x02189334 +.p__sinit_ov015_02187a38 kind:data(word) addr:0x02189338 +.p__sinit_ov015_02187a78 kind:data(word) addr:0x0218933c +.p__sinit_ov015_02187ab8 kind:data(word) addr:0x02189340 +.p__sinit_ov015_02187b40 kind:data(word) addr:0x02189344 +.p__sinit_ov015_02187b80 kind:data(word) addr:0x02189348 +.p__sinit_ov015_02187bf4 kind:data(word) addr:0x0218934c +.p__sinit_ov015_02187c34 kind:data(word) addr:0x02189350 +.p__sinit_ov015_02187c78 kind:data(word) addr:0x02189354 +.p__sinit_ov015_02187d20 kind:data(word) addr:0x02189358 +.p__sinit_ov015_02187d58 kind:data(word) addr:0x0218935c +.p__sinit_ov015_02187d98 kind:data(word) addr:0x02189360 +.p__sinit_ov015_02187ed4 kind:data(word) addr:0x02189364 +.p__sinit_ov015_02187f0c kind:data(word) addr:0x02189368 +.p__sinit_ov015_02187f48 kind:data(word) addr:0x0218936c +.p__sinit_ov015_02187f88 kind:data(word) addr:0x02189370 +.p__sinit_ov015_02187fc8 kind:data(word) addr:0x02189374 +.p__sinit_ov015_02188008 kind:data(word) addr:0x02189378 +.p__sinit_ov015_02188084 kind:data(word) addr:0x0218937c +.p__sinit_ov015_021880c4 kind:data(word) addr:0x02189380 +.p__sinit_ov015_02188108 kind:data(word) addr:0x02189384 +.p__sinit_ov015_02188148 kind:data(word) addr:0x02189388 +.p__sinit_ov015_021881d8 kind:data(word) addr:0x0218938c +.p__sinit_ov015_02188270 kind:data(word) addr:0x02189390 +.p__sinit_ov015_021882b0 kind:data(word) addr:0x02189394 +.p__sinit_ov015_02188304 kind:data(word) addr:0x02189398 +.p__sinit_ov015_0218835c kind:data(word) addr:0x0218939c +.p__sinit_ov015_0218839c kind:data(word) addr:0x021893a0 +.p__sinit_ov015_021883d4 kind:data(word) addr:0x021893a4 +.p__sinit_ov015_0218840c kind:data(word) addr:0x021893a8 +.p__sinit_ov015_02188444 kind:data(word) addr:0x021893ac +.p__sinit_ov015_0218847c kind:data(word) addr:0x021893b0 +.p__sinit_ov015_021884f4 kind:data(word) addr:0x021893b4 +.p__sinit_ov015_02188534 kind:data(word) addr:0x021893b8 +.p__sinit_ov015_02188574 kind:data(word) addr:0x021893bc +.p__sinit_ov015_021885b8 kind:data(word) addr:0x021893c0 +.p__sinit_ov015_021885f8 kind:data(word) addr:0x021893c4 +.p__sinit_ov015_02188630 kind:data(word) addr:0x021893c8 +.p__sinit_ov015_02188668 kind:data(word) addr:0x021893cc +.p__sinit_ov015_021886a8 kind:data(word) addr:0x021893d0 +.p__sinit_ov015_02188718 kind:data(word) addr:0x021893d4 +.p__sinit_ov015_02188758 kind:data(word) addr:0x021893d8 +.p__sinit_ov015_021887cc kind:data(word) addr:0x021893dc +.p__sinit_ov015_02188878 kind:data(word) addr:0x021893e0 +.p__sinit_ov015_021888b8 kind:data(word) addr:0x021893e4 +.p__sinit_ov015_021888f8 kind:data(word) addr:0x021893e8 +.p__sinit_ov015_02188938 kind:data(word) addr:0x021893ec +.p__sinit_ov015_02188978 kind:data(word) addr:0x021893f0 +.p__sinit_ov015_02188a54 kind:data(word) addr:0x021893f4 +.p__sinit_ov015_02188b58 kind:data(word) addr:0x021893f8 +.p__sinit_ov015_02188ec0 kind:data(word) addr:0x021893fc +.p__sinit_ov015_02188f00 kind:data(word) addr:0x02189400 +.p__sinit_ov015_02188f40 kind:data(word) addr:0x02189404 +.p__sinit_ov015_02188f80 kind:data(word) addr:0x02189408 +.p__sinit_ov015_021891fc kind:data(word) addr:0x0218940c +.p__sinit_ov015_0218925c kind:data(word) addr:0x02189410 +.p__sinit_ov015_0218929c kind:data(word) addr:0x02189414 +.p__sinit_ov015_021892b0 kind:data(word) addr:0x02189418 data_ov015_02189420 kind:data(any) addr:0x02189420 data_ov015_02189448 kind:data(any) addr:0x02189448 data_ov015_0218946c kind:data(any) addr:0x0218946c diff --git a/config/eur/arm9/overlays/ov016/delinks.txt b/config/eur/arm9/overlays/ov016/delinks.txt index 9257c878..788e75e6 100644 --- a/config/eur/arm9/overlays/ov016/delinks.txt +++ b/config/eur/arm9/overlays/ov016/delinks.txt @@ -4,5 +4,5 @@ .data start:0x02120160 end:0x021201a0 kind:data align:32 .bss start:0x021201a0 end:0x021201a0 kind:bss align:32 -src/16_Startup/Game/Game.cpp: +src/16_Startup/Game/Game_16.cpp: .text start:0x0211fcf8 end:0x0211fddc diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index 681338e6..78b24538 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -498,6 +498,33 @@ __sinit_ov017_0216b870 kind:function(arm,size=0x38) addr:0x0216b870 __sinit_ov017_0216b8a8 kind:function(arm,size=0x38) addr:0x0216b8a8 __sinit_ov017_0216b8e0 kind:function(arm,size=0x4c) addr:0x0216b8e0 __sinit_ov017_0216b92c kind:function(arm,size=0x38) addr:0x0216b92c +.p__sinit_ov017_0216b2c4 kind:data(word) addr:0x0216b964 +.p__sinit_ov017_0216b308 kind:data(word) addr:0x0216b968 +.p__sinit_ov017_0216b340 kind:data(word) addr:0x0216b96c +.p__sinit_ov017_0216b378 kind:data(word) addr:0x0216b970 +.p__sinit_ov017_0216b3b8 kind:data(word) addr:0x0216b974 +.p__sinit_ov017_0216b3f8 kind:data(word) addr:0x0216b978 +.p__sinit_ov017_0216b438 kind:data(word) addr:0x0216b97c +.p__sinit_ov017_0216b460 kind:data(word) addr:0x0216b980 +.p__sinit_ov017_0216b4a0 kind:data(word) addr:0x0216b984 +.p__sinit_ov017_0216b4ec kind:data(word) addr:0x0216b988 +.p__sinit_ov017_0216b538 kind:data(word) addr:0x0216b98c +.p__sinit_ov017_0216b5ac kind:data(word) addr:0x0216b990 +.p__sinit_ov017_0216b5e4 kind:data(word) addr:0x0216b994 +.p__sinit_ov017_0216b61c kind:data(word) addr:0x0216b998 +.p__sinit_ov017_0216b668 kind:data(word) addr:0x0216b99c +.p__sinit_ov017_0216b6a0 kind:data(word) addr:0x0216b9a0 +.p__sinit_ov017_0216b6d8 kind:data(word) addr:0x0216b9a4 +.p__sinit_ov017_0216b710 kind:data(word) addr:0x0216b9a8 +.p__sinit_ov017_0216b748 kind:data(word) addr:0x0216b9ac +.p__sinit_ov017_0216b788 kind:data(word) addr:0x0216b9b0 +.p__sinit_ov017_0216b7c8 kind:data(word) addr:0x0216b9b4 +.p__sinit_ov017_0216b800 kind:data(word) addr:0x0216b9b8 +.p__sinit_ov017_0216b838 kind:data(word) addr:0x0216b9bc +.p__sinit_ov017_0216b870 kind:data(word) addr:0x0216b9c0 +.p__sinit_ov017_0216b8a8 kind:data(word) addr:0x0216b9c4 +.p__sinit_ov017_0216b8e0 kind:data(word) addr:0x0216b9c8 +.p__sinit_ov017_0216b92c kind:data(word) addr:0x0216b9cc data_ov017_0216b9e8 kind:data(any) addr:0x0216b9e8 data_ov017_0216ba00 kind:data(any) addr:0x0216ba00 data_ov017_0216badc kind:data(any) addr:0x0216badc diff --git a/config/eur/arm9/overlays/ov018/symbols.txt b/config/eur/arm9/overlays/ov018/symbols.txt index 2e404878..985cc241 100644 --- a/config/eur/arm9/overlays/ov018/symbols.txt +++ b/config/eur/arm9/overlays/ov018/symbols.txt @@ -513,6 +513,29 @@ __sinit_ov018_0216bf14 kind:function(arm,size=0x40) addr:0x0216bf14 __sinit_ov018_0216bf54 kind:function(arm,size=0x38) addr:0x0216bf54 __sinit_ov018_0216bf8c kind:function(arm,size=0x80) addr:0x0216bf8c __sinit_ov018_0216c00c kind:function(arm,size=0x40) addr:0x0216c00c +.p__sinit_ov018_0216b780 kind:data(word) addr:0x0216c04c +.p__sinit_ov018_0216b8b0 kind:data(word) addr:0x0216c050 +.p__sinit_ov018_0216bb54 kind:data(word) addr:0x0216c054 +.p__sinit_ov018_0216bb8c kind:data(word) addr:0x0216c058 +.p__sinit_ov018_0216bbc4 kind:data(word) addr:0x0216c05c +.p__sinit_ov018_0216bbfc kind:data(word) addr:0x0216c060 +.p__sinit_ov018_0216bc34 kind:data(word) addr:0x0216c064 +.p__sinit_ov018_0216bc6c kind:data(word) addr:0x0216c068 +.p__sinit_ov018_0216bca4 kind:data(word) addr:0x0216c06c +.p__sinit_ov018_0216bcdc kind:data(word) addr:0x0216c070 +.p__sinit_ov018_0216bd14 kind:data(word) addr:0x0216c074 +.p__sinit_ov018_0216bd4c kind:data(word) addr:0x0216c078 +.p__sinit_ov018_0216bd84 kind:data(word) addr:0x0216c07c +.p__sinit_ov018_0216bdbc kind:data(word) addr:0x0216c080 +.p__sinit_ov018_0216bdf4 kind:data(word) addr:0x0216c084 +.p__sinit_ov018_0216be2c kind:data(word) addr:0x0216c088 +.p__sinit_ov018_0216be64 kind:data(word) addr:0x0216c08c +.p__sinit_ov018_0216be9c kind:data(word) addr:0x0216c090 +.p__sinit_ov018_0216bed4 kind:data(word) addr:0x0216c094 +.p__sinit_ov018_0216bf14 kind:data(word) addr:0x0216c098 +.p__sinit_ov018_0216bf54 kind:data(word) addr:0x0216c09c +.p__sinit_ov018_0216bf8c kind:data(word) addr:0x0216c0a0 +.p__sinit_ov018_0216c00c kind:data(word) addr:0x0216c0a4 data_ov018_0216c0c0 kind:data(any) addr:0x0216c0c0 _ZTV12MapOverworld kind:data(any) addr:0x0216c0e0 data_ov018_0216c1a4 kind:data(any) addr:0x0216c1a4 diff --git a/config/eur/arm9/overlays/ov019/symbols.txt b/config/eur/arm9/overlays/ov019/symbols.txt index a4ed8c51..8d79eaec 100644 --- a/config/eur/arm9/overlays/ov019/symbols.txt +++ b/config/eur/arm9/overlays/ov019/symbols.txt @@ -250,6 +250,15 @@ __sinit_ov019_02176118 kind:function(arm,size=0x38) addr:0x02176118 __sinit_ov019_02176150 kind:function(arm,size=0x38) addr:0x02176150 __sinit_ov019_02176188 kind:function(arm,size=0x10c) addr:0x02176188 __sinit_ov019_02176294 kind:function(arm,size=0x40) addr:0x02176294 +.p__sinit_ov019_02175f04 kind:data(word) addr:0x021762d4 +.p__sinit_ov019_02176020 kind:data(word) addr:0x021762d8 +.p__sinit_ov019_02176060 kind:data(word) addr:0x021762dc +.p__sinit_ov019_021760a0 kind:data(word) addr:0x021762e0 +.p__sinit_ov019_021760e0 kind:data(word) addr:0x021762e4 +.p__sinit_ov019_02176118 kind:data(word) addr:0x021762e8 +.p__sinit_ov019_02176150 kind:data(word) addr:0x021762ec +.p__sinit_ov019_02176188 kind:data(word) addr:0x021762f0 +.p__sinit_ov019_02176294 kind:data(word) addr:0x021762f4 data_ov019_02176300 kind:data(any) addr:0x02176300 data_ov019_02176304 kind:data(any) addr:0x02176304 data_ov019_02176308 kind:data(any) addr:0x02176308 diff --git a/config/eur/arm9/overlays/ov020/symbols.txt b/config/eur/arm9/overlays/ov020/symbols.txt index 17804bee..e7dd555a 100644 --- a/config/eur/arm9/overlays/ov020/symbols.txt +++ b/config/eur/arm9/overlays/ov020/symbols.txt @@ -302,6 +302,23 @@ __sinit_ov020_021781a0 kind:function(arm,size=0x40) addr:0x021781a0 __sinit_ov020_021781e0 kind:function(arm,size=0x40) addr:0x021781e0 __sinit_ov020_02178220 kind:function(arm,size=0x38) addr:0x02178220 __sinit_ov020_02178258 kind:function(arm,size=0x40) addr:0x02178258 +.p__sinit_ov020_02177af4 kind:data(word) addr:0x02178298 +.p__sinit_ov020_02177c18 kind:data(word) addr:0x0217829c +.p__sinit_ov020_02177d24 kind:data(word) addr:0x021782a0 +.p__sinit_ov020_02177d64 kind:data(word) addr:0x021782a4 +.p__sinit_ov020_02177da4 kind:data(word) addr:0x021782a8 +.p__sinit_ov020_02177de4 kind:data(word) addr:0x021782ac +.p__sinit_ov020_02177efc kind:data(word) addr:0x021782b0 +.p__sinit_ov020_02177f3c kind:data(word) addr:0x021782b4 +.p__sinit_ov020_02177f7c kind:data(word) addr:0x021782b8 +.p__sinit_ov020_021780a8 kind:data(word) addr:0x021782bc +.p__sinit_ov020_021780e0 kind:data(word) addr:0x021782c0 +.p__sinit_ov020_02178120 kind:data(word) addr:0x021782c4 +.p__sinit_ov020_02178160 kind:data(word) addr:0x021782c8 +.p__sinit_ov020_021781a0 kind:data(word) addr:0x021782cc +.p__sinit_ov020_021781e0 kind:data(word) addr:0x021782d0 +.p__sinit_ov020_02178220 kind:data(word) addr:0x021782d4 +.p__sinit_ov020_02178258 kind:data(word) addr:0x021782d8 data_ov020_021782e0 kind:data(any) addr:0x021782e0 data_ov020_021782e4 kind:data(any) addr:0x021782e4 data_ov020_021782e8 kind:data(any) addr:0x021782e8 diff --git a/config/eur/arm9/overlays/ov021/symbols.txt b/config/eur/arm9/overlays/ov021/symbols.txt index 1a4495bd..4786759d 100644 --- a/config/eur/arm9/overlays/ov021/symbols.txt +++ b/config/eur/arm9/overlays/ov021/symbols.txt @@ -147,6 +147,13 @@ __sinit_ov021_02170e74 kind:function(arm,size=0x40) addr:0x02170e74 __sinit_ov021_02170eb4 kind:function(arm,size=0x38) addr:0x02170eb4 __sinit_ov021_02170eec kind:function(arm,size=0x40) addr:0x02170eec __sinit_ov021_02170f2c kind:function(arm,size=0x38) addr:0x02170f2c +.p__sinit_ov021_02170cec kind:data(word) addr:0x02170f64 +.p__sinit_ov021_02170d24 kind:data(word) addr:0x02170f68 +.p__sinit_ov021_02170d64 kind:data(word) addr:0x02170f6c +.p__sinit_ov021_02170e74 kind:data(word) addr:0x02170f70 +.p__sinit_ov021_02170eb4 kind:data(word) addr:0x02170f74 +.p__sinit_ov021_02170eec kind:data(word) addr:0x02170f78 +.p__sinit_ov021_02170f2c kind:data(word) addr:0x02170f7c data_ov021_02170fa0 kind:data(any) addr:0x02170fa0 data_ov021_02170fa4 kind:data(any) addr:0x02170fa4 data_ov021_02170fa8 kind:data(any) addr:0x02170fa8 diff --git a/config/eur/arm9/overlays/ov022/symbols.txt b/config/eur/arm9/overlays/ov022/symbols.txt index 336359b1..af0d8e38 100644 --- a/config/eur/arm9/overlays/ov022/symbols.txt +++ b/config/eur/arm9/overlays/ov022/symbols.txt @@ -372,6 +372,23 @@ __sinit_ov022_02178e80 kind:function(arm,size=0x90) addr:0x02178e80 __sinit_ov022_02178f10 kind:function(arm,size=0x38) addr:0x02178f10 __sinit_ov022_02178f48 kind:function(arm,size=0x38) addr:0x02178f48 __sinit_ov022_02178f80 kind:function(arm,size=0x74) addr:0x02178f80 +.p__sinit_ov022_021789c8 kind:data(word) addr:0x02178ff4 +.p__sinit_ov022_02178a08 kind:data(word) addr:0x02178ff8 +.p__sinit_ov022_02178a40 kind:data(word) addr:0x02178ffc +.p__sinit_ov022_02178a78 kind:data(word) addr:0x02179000 +.p__sinit_ov022_02178b68 kind:data(word) addr:0x02179004 +.p__sinit_ov022_02178c98 kind:data(word) addr:0x02179008 +.p__sinit_ov022_02178cd8 kind:data(word) addr:0x0217900c +.p__sinit_ov022_02178d18 kind:data(word) addr:0x02179010 +.p__sinit_ov022_02178d58 kind:data(word) addr:0x02179014 +.p__sinit_ov022_02178d90 kind:data(word) addr:0x02179018 +.p__sinit_ov022_02178dd0 kind:data(word) addr:0x0217901c +.p__sinit_ov022_02178e10 kind:data(word) addr:0x02179020 +.p__sinit_ov022_02178e48 kind:data(word) addr:0x02179024 +.p__sinit_ov022_02178e80 kind:data(word) addr:0x02179028 +.p__sinit_ov022_02178f10 kind:data(word) addr:0x0217902c +.p__sinit_ov022_02178f48 kind:data(word) addr:0x02179030 +.p__sinit_ov022_02178f80 kind:data(word) addr:0x02179034 data_ov022_02179048 kind:data(any) addr:0x02179048 data_ov022_02179104 kind:data(any) addr:0x02179104 data_ov022_02179198 kind:data(any) addr:0x02179198 diff --git a/config/eur/arm9/overlays/ov023/symbols.txt b/config/eur/arm9/overlays/ov023/symbols.txt index d3ad83e1..2ed12c71 100644 --- a/config/eur/arm9/overlays/ov023/symbols.txt +++ b/config/eur/arm9/overlays/ov023/symbols.txt @@ -338,6 +338,19 @@ __sinit_ov023_02179bf8 kind:function(arm,size=0x40) addr:0x02179bf8 __sinit_ov023_02179c38 kind:function(arm,size=0x38) addr:0x02179c38 __sinit_ov023_02179c70 kind:function(arm,size=0x38) addr:0x02179c70 __sinit_ov023_02179ca8 kind:function(arm,size=0x38) addr:0x02179ca8 +.p__sinit_ov023_02179698 kind:data(word) addr:0x02179ce0 +.p__sinit_ov023_021797ec kind:data(word) addr:0x02179ce4 +.p__sinit_ov023_0217984c kind:data(word) addr:0x02179ce8 +.p__sinit_ov023_02179978 kind:data(word) addr:0x02179cec +.p__sinit_ov023_02179998 kind:data(word) addr:0x02179cf0 +.p__sinit_ov023_021799d8 kind:data(word) addr:0x02179cf4 +.p__sinit_ov023_02179b08 kind:data(word) addr:0x02179cf8 +.p__sinit_ov023_02179b48 kind:data(word) addr:0x02179cfc +.p__sinit_ov023_02179b80 kind:data(word) addr:0x02179d00 +.p__sinit_ov023_02179bf8 kind:data(word) addr:0x02179d04 +.p__sinit_ov023_02179c38 kind:data(word) addr:0x02179d08 +.p__sinit_ov023_02179c70 kind:data(word) addr:0x02179d0c +.p__sinit_ov023_02179ca8 kind:data(word) addr:0x02179d10 data_ov023_02179d20 kind:data(any) addr:0x02179d20 data_ov023_02179db8 kind:data(any) addr:0x02179db8 data_ov023_02179dc4 kind:data(any) addr:0x02179dc4 diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index ea9ce832..61d8f5e4 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -362,6 +362,21 @@ __sinit_ov024_02179d34 kind:function(arm,size=0x38) addr:0x02179d34 __sinit_ov024_02179d6c kind:function(arm,size=0x40) addr:0x02179d6c __sinit_ov024_02179dac kind:function(arm,size=0x38) addr:0x02179dac __sinit_ov024_02179de4 kind:function(arm,size=0x38) addr:0x02179de4 +.p__sinit_ov024_021795d0 kind:data(word) addr:0x02179e1c +.p__sinit_ov024_02179608 kind:data(word) addr:0x02179e20 +.p__sinit_ov024_02179714 kind:data(word) addr:0x02179e24 +.p__sinit_ov024_02179788 kind:data(word) addr:0x02179e28 +.p__sinit_ov024_021797c0 kind:data(word) addr:0x02179e2c +.p__sinit_ov024_02179868 kind:data(word) addr:0x02179e30 +.p__sinit_ov024_02179974 kind:data(word) addr:0x02179e34 +.p__sinit_ov024_02179a8c kind:data(word) addr:0x02179e38 +.p__sinit_ov024_02179ba4 kind:data(word) addr:0x02179e3c +.p__sinit_ov024_02179cbc kind:data(word) addr:0x02179e40 +.p__sinit_ov024_02179cfc kind:data(word) addr:0x02179e44 +.p__sinit_ov024_02179d34 kind:data(word) addr:0x02179e48 +.p__sinit_ov024_02179d6c kind:data(word) addr:0x02179e4c +.p__sinit_ov024_02179dac kind:data(word) addr:0x02179e50 +.p__sinit_ov024_02179de4 kind:data(word) addr:0x02179e54 data_ov024_02179e68 kind:data(any) addr:0x02179e68 data_ov024_02179ef4 kind:data(any) addr:0x02179ef4 data_ov024_02179efc kind:data(any) addr:0x02179efc diff --git a/config/eur/arm9/overlays/ov025/symbols.txt b/config/eur/arm9/overlays/ov025/symbols.txt index 5f304a58..317e460d 100644 --- a/config/eur/arm9/overlays/ov025/symbols.txt +++ b/config/eur/arm9/overlays/ov025/symbols.txt @@ -291,7 +291,17 @@ __sinit_ov025_021799cc kind:function(arm,size=0x40) addr:0x021799cc __sinit_ov025_02179a0c kind:function(arm,size=0x40) addr:0x02179a0c __sinit_ov025_02179a4c kind:function(arm,size=0x40) addr:0x02179a4c __sinit_ov025_02179a8c kind:function(arm,size=0x10c) addr:0x02179a8c -data_ov025_02179bb0 kind:data(any) addr:0x02179bb0 ambiguous +.p__sinit_ov025_02179680 kind:data(word) addr:0x02179b98 +.p__sinit_ov025_02179784 kind:data(word) addr:0x02179b9c +.p__sinit_ov025_021797c4 kind:data(word) addr:0x02179ba0 +.p__sinit_ov025_02179804 kind:data(word) addr:0x02179ba4 +.p__sinit_ov025_02179844 kind:data(word) addr:0x02179ba8 +.p__sinit_ov025_02179884 kind:data(word) addr:0x02179bac +.p__sinit_ov025_021798bc kind:data(word) addr:0x02179bb0 +.p__sinit_ov025_021799cc kind:data(word) addr:0x02179bb4 +.p__sinit_ov025_02179a0c kind:data(word) addr:0x02179bb8 +.p__sinit_ov025_02179a4c kind:data(word) addr:0x02179bbc +.p__sinit_ov025_02179a8c kind:data(word) addr:0x02179bc0 data_ov025_02179be0 kind:data(any) addr:0x02179be0 data_ov025_02179bf8 kind:data(any) addr:0x02179bf8 ambiguous data_ov025_02179c18 kind:data(any) addr:0x02179c18 ambiguous diff --git a/config/eur/arm9/overlays/ov026/symbols.txt b/config/eur/arm9/overlays/ov026/symbols.txt index fb8b287b..ca251856 100644 --- a/config/eur/arm9/overlays/ov026/symbols.txt +++ b/config/eur/arm9/overlays/ov026/symbols.txt @@ -464,6 +464,21 @@ __sinit_ov026_02179de4 kind:function(arm,size=0x18c) addr:0x02179de4 __sinit_ov026_02179f70 kind:function(arm,size=0x40) addr:0x02179f70 __sinit_ov026_02179fb0 kind:function(arm,size=0x38) addr:0x02179fb0 __sinit_ov026_02179fe8 kind:function(arm,size=0x38) addr:0x02179fe8 +.p__sinit_ov026_021797dc kind:data(word) addr:0x0217a020 +.p__sinit_ov026_02179a58 kind:data(word) addr:0x0217a024 +.p__sinit_ov026_02179a90 kind:data(word) addr:0x0217a028 +.p__sinit_ov026_02179bac kind:data(word) addr:0x0217a02c +.p__sinit_ov026_02179be4 kind:data(word) addr:0x0217a030 +.p__sinit_ov026_02179c1c kind:data(word) addr:0x0217a034 +.p__sinit_ov026_02179c54 kind:data(word) addr:0x0217a038 +.p__sinit_ov026_02179c8c kind:data(word) addr:0x0217a03c +.p__sinit_ov026_02179d20 kind:data(word) addr:0x0217a040 +.p__sinit_ov026_02179d58 kind:data(word) addr:0x0217a044 +.p__sinit_ov026_02179d90 kind:data(word) addr:0x0217a048 +.p__sinit_ov026_02179de4 kind:data(word) addr:0x0217a04c +.p__sinit_ov026_02179f70 kind:data(word) addr:0x0217a050 +.p__sinit_ov026_02179fb0 kind:data(word) addr:0x0217a054 +.p__sinit_ov026_02179fe8 kind:data(word) addr:0x0217a058 data_ov026_0217a068 kind:data(any) addr:0x0217a068 data_ov026_0217a0cc kind:data(any) addr:0x0217a0cc ambiguous data_ov026_0217a0ec kind:data(any) addr:0x0217a0ec ambiguous diff --git a/config/eur/arm9/overlays/ov027/symbols.txt b/config/eur/arm9/overlays/ov027/symbols.txt index 9e38ff89..8420d670 100644 --- a/config/eur/arm9/overlays/ov027/symbols.txt +++ b/config/eur/arm9/overlays/ov027/symbols.txt @@ -266,6 +266,14 @@ __sinit_ov027_021792a0 kind:function(arm,size=0x40) addr:0x021792a0 __sinit_ov027_021792e0 kind:function(arm,size=0xdc) addr:0x021792e0 __sinit_ov027_021793bc kind:function(arm,size=0x80) addr:0x021793bc __sinit_ov027_0217943c kind:function(arm,size=0x38) addr:0x0217943c +.p__sinit_ov027_0217913c kind:data(word) addr:0x02179474 +.p__sinit_ov027_02179190 kind:data(word) addr:0x02179478 +.p__sinit_ov027_021791d0 kind:data(word) addr:0x0217947c +.p__sinit_ov027_02179210 kind:data(word) addr:0x02179480 +.p__sinit_ov027_021792a0 kind:data(word) addr:0x02179484 +.p__sinit_ov027_021792e0 kind:data(word) addr:0x02179488 +.p__sinit_ov027_021793bc kind:data(word) addr:0x0217948c +.p__sinit_ov027_0217943c kind:data(word) addr:0x02179490 data_ov027_021794a0 kind:data(any) addr:0x021794a0 data_ov027_021794a4 kind:data(any) addr:0x021794a4 data_ov027_021794a8 kind:data(any) addr:0x021794a8 diff --git a/config/eur/arm9/overlays/ov028/symbols.txt b/config/eur/arm9/overlays/ov028/symbols.txt index c5b07e77..d998f528 100644 --- a/config/eur/arm9/overlays/ov028/symbols.txt +++ b/config/eur/arm9/overlays/ov028/symbols.txt @@ -369,6 +369,18 @@ __sinit_ov028_02178790 kind:function(arm,size=0x40) addr:0x02178790 __sinit_ov028_021787d0 kind:function(arm,size=0x40) addr:0x021787d0 __sinit_ov028_02178810 kind:function(arm,size=0x44) addr:0x02178810 __sinit_ov028_02178854 kind:function(arm,size=0x40) addr:0x02178854 +.p__sinit_ov028_02178504 kind:data(word) addr:0x02178894 +.p__sinit_ov028_02178544 kind:data(word) addr:0x02178898 +.p__sinit_ov028_02178620 kind:data(word) addr:0x0217889c +.p__sinit_ov028_02178660 kind:data(word) addr:0x021788a0 +.p__sinit_ov028_02178698 kind:data(word) addr:0x021788a4 +.p__sinit_ov028_021786d0 kind:data(word) addr:0x021788a8 +.p__sinit_ov028_02178710 kind:data(word) addr:0x021788ac +.p__sinit_ov028_02178750 kind:data(word) addr:0x021788b0 +.p__sinit_ov028_02178790 kind:data(word) addr:0x021788b4 +.p__sinit_ov028_021787d0 kind:data(word) addr:0x021788b8 +.p__sinit_ov028_02178810 kind:data(word) addr:0x021788bc +.p__sinit_ov028_02178854 kind:data(word) addr:0x021788c0 data_ov028_021788e0 kind:data(any) addr:0x021788e0 data_ov028_021788e4 kind:data(any) addr:0x021788e4 data_ov028_021788e8 kind:data(any) addr:0x021788e8 diff --git a/config/eur/arm9/overlays/ov029/symbols.txt b/config/eur/arm9/overlays/ov029/symbols.txt index d8c94325..130e5ad0 100644 --- a/config/eur/arm9/overlays/ov029/symbols.txt +++ b/config/eur/arm9/overlays/ov029/symbols.txt @@ -300,6 +300,19 @@ __sinit_ov029_02179744 kind:function(arm,size=0x18) addr:0x02179744 __sinit_ov029_0217975c kind:function(arm,size=0x40) addr:0x0217975c __sinit_ov029_0217979c kind:function(arm,size=0x40) addr:0x0217979c __sinit_ov029_021797dc kind:function(arm,size=0x48) addr:0x021797dc +.p__sinit_ov029_021794b0 kind:data(word) addr:0x02179824 +.p__sinit_ov029_021794dc kind:data(word) addr:0x02179828 +.p__sinit_ov029_0217958c kind:data(word) addr:0x0217982c +.p__sinit_ov029_021795cc kind:data(word) addr:0x02179830 +.p__sinit_ov029_0217960c kind:data(word) addr:0x02179834 +.p__sinit_ov029_0217964c kind:data(word) addr:0x02179838 +.p__sinit_ov029_0217968c kind:data(word) addr:0x0217983c +.p__sinit_ov029_021796cc kind:data(word) addr:0x02179840 +.p__sinit_ov029_02179704 kind:data(word) addr:0x02179844 +.p__sinit_ov029_02179744 kind:data(word) addr:0x02179848 +.p__sinit_ov029_0217975c kind:data(word) addr:0x0217984c +.p__sinit_ov029_0217979c kind:data(word) addr:0x02179850 +.p__sinit_ov029_021797dc kind:data(word) addr:0x02179854 data_ov029_02179868 kind:data(any) addr:0x02179868 data_ov029_02179878 kind:data(any) addr:0x02179878 data_ov029_0217987c kind:data(any) addr:0x0217987c diff --git a/config/eur/arm9/overlays/ov030/symbols.txt b/config/eur/arm9/overlays/ov030/symbols.txt index 7708b7b3..1402b90a 100644 --- a/config/eur/arm9/overlays/ov030/symbols.txt +++ b/config/eur/arm9/overlays/ov030/symbols.txt @@ -310,6 +310,8 @@ data_ov030_021887f0 kind:data(any) addr:0x021887f0 data_ov030_021887fc kind:data(any) addr:0x021887fc __sinit_ov030_02188824 kind:function(arm,size=0x1c8) addr:0x02188824 __sinit_ov030_021889ec kind:function(arm,size=0x40) addr:0x021889ec +.p__sinit_ov030_02188824 kind:data(word) addr:0x02188a2c +.p__sinit_ov030_021889ec kind:data(word) addr:0x02188a30 data_ov030_02188a48 kind:data(any) addr:0x02188a48 data_ov030_02188a68 kind:data(any) addr:0x02188a68 data_ov030_02188a7c kind:data(any) addr:0x02188a7c diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index afadccf8..8113abda 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -310,6 +310,10 @@ __sinit_ov031_02181b6c kind:function(arm,size=0x3ec) addr:0x02181b6c __sinit_ov031_02181f58 kind:function(arm,size=0xa8) addr:0x02181f58 __sinit_ov031_02182000 kind:function(arm,size=0x40) addr:0x02182000 __sinit_ov031_02182040 kind:function(arm,size=0x40) addr:0x02182040 +.p__sinit_ov031_02181b6c kind:data(word) addr:0x02182080 +.p__sinit_ov031_02181f58 kind:data(word) addr:0x02182084 +.p__sinit_ov031_02182000 kind:data(word) addr:0x02182088 +.p__sinit_ov031_02182040 kind:data(word) addr:0x0218208c data_ov031_021820a0 kind:data(any) addr:0x021820a0 data_ov031_021820a4 kind:data(any) addr:0x021820a4 data_ov031_021820a8 kind:data(any) addr:0x021820a8 diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt index 6e7b8419..ec660255 100644 --- a/config/eur/arm9/overlays/ov032/symbols.txt +++ b/config/eur/arm9/overlays/ov032/symbols.txt @@ -274,6 +274,14 @@ __sinit_ov032_02185130 kind:function(arm,size=0x38) addr:0x02185130 __sinit_ov032_02185168 kind:function(arm,size=0x110) addr:0x02185168 __sinit_ov032_02185278 kind:function(arm,size=0x110) addr:0x02185278 __sinit_ov032_02185388 kind:function(arm,size=0x40) addr:0x02185388 +.p__sinit_ov032_02184d3c kind:data(word) addr:0x021853c8 +.p__sinit_ov032_02184e68 kind:data(word) addr:0x021853cc +.p__sinit_ov032_02184f90 kind:data(word) addr:0x021853d0 +.p__sinit_ov032_021850b8 kind:data(word) addr:0x021853d4 +.p__sinit_ov032_02185130 kind:data(word) addr:0x021853d8 +.p__sinit_ov032_02185168 kind:data(word) addr:0x021853dc +.p__sinit_ov032_02185278 kind:data(word) addr:0x021853e0 +.p__sinit_ov032_02185388 kind:data(word) addr:0x021853e4 data_ov032_02185400 kind:data(any) addr:0x02185400 data_ov032_02185410 kind:data(any) addr:0x02185410 data_ov032_02185420 kind:data(any) addr:0x02185420 diff --git a/config/eur/arm9/overlays/ov033/symbols.txt b/config/eur/arm9/overlays/ov033/symbols.txt index 9e0ef6ee..17cd00b6 100644 --- a/config/eur/arm9/overlays/ov033/symbols.txt +++ b/config/eur/arm9/overlays/ov033/symbols.txt @@ -119,6 +119,11 @@ __sinit_ov033_0217fcb0 kind:function(arm,size=0x40) addr:0x0217fcb0 __sinit_ov033_0217fcf0 kind:function(arm,size=0x40) addr:0x0217fcf0 __sinit_ov033_0217fd30 kind:function(arm,size=0x124) addr:0x0217fd30 __sinit_ov033_0217fe54 kind:function(arm,size=0x40) addr:0x0217fe54 +.p__sinit_ov033_0217fb90 kind:data(word) addr:0x0217fe94 +.p__sinit_ov033_0217fcb0 kind:data(word) addr:0x0217fe98 +.p__sinit_ov033_0217fcf0 kind:data(word) addr:0x0217fe9c +.p__sinit_ov033_0217fd30 kind:data(word) addr:0x0217fea0 +.p__sinit_ov033_0217fe54 kind:data(word) addr:0x0217fea4 data_ov033_0217fec0 kind:data(any) addr:0x0217fec0 data_ov033_0217ff48 kind:data(any) addr:0x0217ff48 data_ov033_02180058 kind:data(any) addr:0x02180058 diff --git a/config/eur/arm9/overlays/ov034/symbols.txt b/config/eur/arm9/overlays/ov034/symbols.txt index 9d10e733..e43bc0f9 100644 --- a/config/eur/arm9/overlays/ov034/symbols.txt +++ b/config/eur/arm9/overlays/ov034/symbols.txt @@ -159,6 +159,9 @@ data_ov034_021857b4 kind:data(any) addr:0x021857b4 __sinit_ov034_02185818 kind:function(arm,size=0x15c) addr:0x02185818 __sinit_ov034_02185974 kind:function(arm,size=0x68) addr:0x02185974 __sinit_ov034_021859dc kind:function(arm,size=0x88) addr:0x021859dc +.p__sinit_ov034_02185818 kind:data(word) addr:0x02185a64 +.p__sinit_ov034_02185974 kind:data(word) addr:0x02185a68 +.p__sinit_ov034_021859dc kind:data(word) addr:0x02185a6c data_ov034_02185a80 kind:data(any) addr:0x02185a80 data_ov034_02185a84 kind:data(any) addr:0x02185a84 data_ov034_02185a88 kind:data(any) addr:0x02185a88 diff --git a/config/eur/arm9/overlays/ov035/symbols.txt b/config/eur/arm9/overlays/ov035/symbols.txt index eecdb891..6d07e28e 100644 --- a/config/eur/arm9/overlays/ov035/symbols.txt +++ b/config/eur/arm9/overlays/ov035/symbols.txt @@ -183,6 +183,10 @@ __sinit_ov035_02185668 kind:function(arm,size=0x88) addr:0x02185668 __sinit_ov035_021856f0 kind:function(arm,size=0x40) addr:0x021856f0 __sinit_ov035_02185730 kind:function(arm,size=0x190) addr:0x02185730 __sinit_ov035_021858c0 kind:function(arm,size=0x40) addr:0x021858c0 +.p__sinit_ov035_02185668 kind:data(word) addr:0x02185900 +.p__sinit_ov035_021856f0 kind:data(word) addr:0x02185904 +.p__sinit_ov035_02185730 kind:data(word) addr:0x02185908 +.p__sinit_ov035_021858c0 kind:data(word) addr:0x0218590c data_ov035_02185920 kind:data(any) addr:0x02185920 data_ov035_02185934 kind:data(any) addr:0x02185934 data_ov035_02185948 kind:data(any) addr:0x02185948 diff --git a/config/eur/arm9/overlays/ov036/symbols.txt b/config/eur/arm9/overlays/ov036/symbols.txt index 44419703..7eb2ec82 100644 --- a/config/eur/arm9/overlays/ov036/symbols.txt +++ b/config/eur/arm9/overlays/ov036/symbols.txt @@ -164,6 +164,8 @@ data_ov036_02186b94 kind:data(any) addr:0x02186b94 data_ov036_02186ba8 kind:data(any) addr:0x02186ba8 __sinit_ov036_02186bb4 kind:function(arm,size=0x40) addr:0x02186bb4 __sinit_ov036_02186bf4 kind:function(arm,size=0x40) addr:0x02186bf4 +.p__sinit_ov036_02186bb4 kind:data(word) addr:0x02186c34 +.p__sinit_ov036_02186bf4 kind:data(word) addr:0x02186c38 data_ov036_02186c40 kind:data(any) addr:0x02186c40 data_ov036_02186c44 kind:data(any) addr:0x02186c44 data_ov036_02186c48 kind:data(any) addr:0x02186c48 diff --git a/config/eur/arm9/overlays/ov037/symbols.txt b/config/eur/arm9/overlays/ov037/symbols.txt index 02565bda..e1a88854 100644 --- a/config/eur/arm9/overlays/ov037/symbols.txt +++ b/config/eur/arm9/overlays/ov037/symbols.txt @@ -311,6 +311,11 @@ __sinit_ov037_021887b4 kind:function(arm,size=0x68) addr:0x021887b4 __sinit_ov037_0218881c kind:function(arm,size=0x40) addr:0x0218881c __sinit_ov037_0218885c kind:function(arm,size=0x40) addr:0x0218885c __sinit_ov037_0218889c kind:function(arm,size=0x118) addr:0x0218889c +.p__sinit_ov037_02188690 kind:data(word) addr:0x021889b4 +.p__sinit_ov037_021887b4 kind:data(word) addr:0x021889b8 +.p__sinit_ov037_0218881c kind:data(word) addr:0x021889bc +.p__sinit_ov037_0218885c kind:data(word) addr:0x021889c0 +.p__sinit_ov037_0218889c kind:data(word) addr:0x021889c4 data_ov037_021889e0 kind:data(any) addr:0x021889e0 data_ov037_021889e4 kind:data(any) addr:0x021889e4 data_ov037_021889e8 kind:data(any) addr:0x021889e8 diff --git a/config/eur/arm9/overlays/ov038/symbols.txt b/config/eur/arm9/overlays/ov038/symbols.txt index a9125778..38b831d8 100644 --- a/config/eur/arm9/overlays/ov038/symbols.txt +++ b/config/eur/arm9/overlays/ov038/symbols.txt @@ -171,6 +171,8 @@ data_ov038_02188ac4 kind:data(any) addr:0x02188ac4 data_ov038_02188ad8 kind:data(any) addr:0x02188ad8 __sinit_ov038_02188ae4 kind:function(arm,size=0x13c) addr:0x02188ae4 __sinit_ov038_02188c20 kind:function(arm,size=0x40) addr:0x02188c20 +.p__sinit_ov038_02188ae4 kind:data(word) addr:0x02188c60 +.p__sinit_ov038_02188c20 kind:data(word) addr:0x02188c64 data_ov038_02188c80 kind:data(any) addr:0x02188c80 data_ov038_02188c84 kind:data(any) addr:0x02188c84 data_ov038_02188c88 kind:data(any) addr:0x02188c88 diff --git a/config/eur/arm9/overlays/ov039/symbols.txt b/config/eur/arm9/overlays/ov039/symbols.txt index cad5d3b6..35ac565d 100644 --- a/config/eur/arm9/overlays/ov039/symbols.txt +++ b/config/eur/arm9/overlays/ov039/symbols.txt @@ -236,6 +236,7 @@ data_ov039_0218692c kind:data(any) addr:0x0218692c data_ov039_02186940 kind:data(any) addr:0x02186940 data_ov039_02186954 kind:data(any) addr:0x02186954 __sinit_ov039_02186968 kind:function(arm,size=0x54) addr:0x02186968 +.p__sinit_ov039_02186968 kind:data(word) addr:0x021869bc data_ov039_021869e0 kind:data(any) addr:0x021869e0 data_ov039_021869e4 kind:data(any) addr:0x021869e4 data_ov039_021869e8 kind:data(any) addr:0x021869e8 diff --git a/config/eur/arm9/overlays/ov040/symbols.txt b/config/eur/arm9/overlays/ov040/symbols.txt index 8fd114d8..0fbac34d 100644 --- a/config/eur/arm9/overlays/ov040/symbols.txt +++ b/config/eur/arm9/overlays/ov040/symbols.txt @@ -477,6 +477,16 @@ __sinit_ov040_021884ec kind:function(arm,size=0x40) addr:0x021884ec __sinit_ov040_0218852c kind:function(arm,size=0x4c) addr:0x0218852c __sinit_ov040_02188578 kind:function(arm,size=0x4c) addr:0x02188578 __sinit_ov040_021885c4 kind:function(arm,size=0x40) addr:0x021885c4 +.p__sinit_ov040_02188360 kind:data(word) addr:0x02188604 +.p__sinit_ov040_021883a0 kind:data(word) addr:0x02188608 +.p__sinit_ov040_021883e0 kind:data(word) addr:0x0218860c +.p__sinit_ov040_02188420 kind:data(word) addr:0x02188610 +.p__sinit_ov040_02188460 kind:data(word) addr:0x02188614 +.p__sinit_ov040_021884ac kind:data(word) addr:0x02188618 +.p__sinit_ov040_021884ec kind:data(word) addr:0x0218861c +.p__sinit_ov040_0218852c kind:data(word) addr:0x02188620 +.p__sinit_ov040_02188578 kind:data(word) addr:0x02188624 +.p__sinit_ov040_021885c4 kind:data(word) addr:0x02188628 data_ov040_02188640 kind:data(any) addr:0x02188640 data_ov040_02188644 kind:data(any) addr:0x02188644 data_ov040_02188648 kind:data(any) addr:0x02188648 diff --git a/config/eur/arm9/overlays/ov041/symbols.txt b/config/eur/arm9/overlays/ov041/symbols.txt index 4525391c..37c02a7b 100644 --- a/config/eur/arm9/overlays/ov041/symbols.txt +++ b/config/eur/arm9/overlays/ov041/symbols.txt @@ -142,6 +142,12 @@ __sinit_ov041_0218e138 kind:function(arm,size=0x40) addr:0x0218e138 __sinit_ov041_0218e178 kind:function(arm,size=0x40) addr:0x0218e178 __sinit_ov041_0218e1b8 kind:function(arm,size=0x40) addr:0x0218e1b8 __sinit_ov041_0218e1f8 kind:function(arm,size=0x114) addr:0x0218e1f8 +.p__sinit_ov041_0218e098 kind:data(word) addr:0x0218e30c +.p__sinit_ov041_0218e0d8 kind:data(word) addr:0x0218e310 +.p__sinit_ov041_0218e138 kind:data(word) addr:0x0218e314 +.p__sinit_ov041_0218e178 kind:data(word) addr:0x0218e318 +.p__sinit_ov041_0218e1b8 kind:data(word) addr:0x0218e31c +.p__sinit_ov041_0218e1f8 kind:data(word) addr:0x0218e320 data_ov041_0218e348 kind:data(any) addr:0x0218e348 data_ov041_0218e444 kind:data(any) addr:0x0218e444 data_ov041_0218e47c kind:data(any) addr:0x0218e47c diff --git a/config/eur/arm9/overlays/ov042/symbols.txt b/config/eur/arm9/overlays/ov042/symbols.txt index 09fc74b4..975bcf89 100644 --- a/config/eur/arm9/overlays/ov042/symbols.txt +++ b/config/eur/arm9/overlays/ov042/symbols.txt @@ -101,6 +101,8 @@ data_ov042_0218c728 kind:data(any) addr:0x0218c728 data_ov042_0218c73c kind:data(any) addr:0x0218c73c __sinit_ov042_0218c744 kind:function(arm,size=0x40) addr:0x0218c744 __sinit_ov042_0218c784 kind:function(arm,size=0x74) addr:0x0218c784 +.p__sinit_ov042_0218c744 kind:data(word) addr:0x0218c7f8 +.p__sinit_ov042_0218c784 kind:data(word) addr:0x0218c7fc data_ov042_0218c820 kind:data(any) addr:0x0218c820 data_ov042_0218c824 kind:data(any) addr:0x0218c824 data_ov042_0218c828 kind:data(any) addr:0x0218c828 diff --git a/config/eur/arm9/overlays/ov043/symbols.txt b/config/eur/arm9/overlays/ov043/symbols.txt index 4b5c1861..c5a6a2f2 100644 --- a/config/eur/arm9/overlays/ov043/symbols.txt +++ b/config/eur/arm9/overlays/ov043/symbols.txt @@ -69,6 +69,8 @@ data_ov043_0218d340 kind:data(any) addr:0x0218d340 data_ov043_0218d3c4 kind:data(any) addr:0x0218d3c4 __sinit_ov043_0218d414 kind:function(arm,size=0x16c) addr:0x0218d414 __sinit_ov043_0218d580 kind:function(arm,size=0x40) addr:0x0218d580 +.p__sinit_ov043_0218d414 kind:data(word) addr:0x0218d5c0 +.p__sinit_ov043_0218d580 kind:data(word) addr:0x0218d5c4 data_ov043_0218d5e0 kind:data(any) addr:0x0218d5e0 data_ov043_0218d668 kind:data(any) addr:0x0218d668 data_ov043_0218d778 kind:data(any) addr:0x0218d778 diff --git a/config/eur/arm9/overlays/ov044/symbols.txt b/config/eur/arm9/overlays/ov044/symbols.txt index 5f8f3a19..d311d748 100644 --- a/config/eur/arm9/overlays/ov044/symbols.txt +++ b/config/eur/arm9/overlays/ov044/symbols.txt @@ -171,6 +171,14 @@ __sinit_ov044_0218ef0c kind:function(arm,size=0x40) addr:0x0218ef0c __sinit_ov044_0218ef4c kind:function(arm,size=0x124) addr:0x0218ef4c __sinit_ov044_0218f070 kind:function(arm,size=0x11c) addr:0x0218f070 __sinit_ov044_0218f18c kind:function(arm,size=0x40) addr:0x0218f18c +.p__sinit_ov044_0218ea9c kind:data(word) addr:0x0218f1cc +.p__sinit_ov044_0218ebc8 kind:data(word) addr:0x0218f1d0 +.p__sinit_ov044_0218ece4 kind:data(word) addr:0x0218f1d4 +.p__sinit_ov044_0218ed24 kind:data(word) addr:0x0218f1d8 +.p__sinit_ov044_0218ef0c kind:data(word) addr:0x0218f1dc +.p__sinit_ov044_0218ef4c kind:data(word) addr:0x0218f1e0 +.p__sinit_ov044_0218f070 kind:data(word) addr:0x0218f1e4 +.p__sinit_ov044_0218f18c kind:data(word) addr:0x0218f1e8 data_ov044_0218f200 kind:data(any) addr:0x0218f200 data_ov044_0218f288 kind:data(any) addr:0x0218f288 data_ov044_0218f398 kind:data(any) addr:0x0218f398 diff --git a/config/eur/arm9/overlays/ov045/symbols.txt b/config/eur/arm9/overlays/ov045/symbols.txt index 5bca2fa5..d6d17a35 100644 --- a/config/eur/arm9/overlays/ov045/symbols.txt +++ b/config/eur/arm9/overlays/ov045/symbols.txt @@ -225,6 +225,9 @@ data_ov045_0218e3d4 kind:data(any) addr:0x0218e3d4 __sinit_ov045_0218e3e8 kind:function(arm,size=0x40) addr:0x0218e3e8 __sinit_ov045_0218e428 kind:function(arm,size=0x40) addr:0x0218e428 __sinit_ov045_0218e468 kind:function(arm,size=0x40) addr:0x0218e468 +.p__sinit_ov045_0218e3e8 kind:data(word) addr:0x0218e4a8 +.p__sinit_ov045_0218e428 kind:data(word) addr:0x0218e4ac +.p__sinit_ov045_0218e468 kind:data(word) addr:0x0218e4b0 data_ov045_0218e4c0 kind:data(any) addr:0x0218e4c0 data_ov045_0218e4c4 kind:data(any) addr:0x0218e4c4 data_ov045_0218e4d4 kind:data(any) addr:0x0218e4d4 diff --git a/config/eur/arm9/overlays/ov046/symbols.txt b/config/eur/arm9/overlays/ov046/symbols.txt index da6954b6..0879cb60 100644 --- a/config/eur/arm9/overlays/ov046/symbols.txt +++ b/config/eur/arm9/overlays/ov046/symbols.txt @@ -103,6 +103,10 @@ __sinit_ov046_021944ac kind:function(arm,size=0x40) addr:0x021944ac __sinit_ov046_021944ec kind:function(arm,size=0x40) addr:0x021944ec __sinit_ov046_0219452c kind:function(arm,size=0x80) addr:0x0219452c __sinit_ov046_021945ac kind:function(arm,size=0x90) addr:0x021945ac +.p__sinit_ov046_021944ac kind:data(word) addr:0x0219463c +.p__sinit_ov046_021944ec kind:data(word) addr:0x02194640 +.p__sinit_ov046_0219452c kind:data(word) addr:0x02194644 +.p__sinit_ov046_021945ac kind:data(word) addr:0x02194648 data_ov046_02194660 kind:data(any) addr:0x02194660 data_ov046_02194664 kind:data(any) addr:0x02194664 data_ov046_0219466c kind:data(any) addr:0x0219466c diff --git a/config/eur/arm9/overlays/ov047/symbols.txt b/config/eur/arm9/overlays/ov047/symbols.txt index 8b3ae144..c9328195 100644 --- a/config/eur/arm9/overlays/ov047/symbols.txt +++ b/config/eur/arm9/overlays/ov047/symbols.txt @@ -104,6 +104,10 @@ __sinit_ov047_021942f0 kind:function(arm,size=0x40) addr:0x021942f0 __sinit_ov047_02194330 kind:function(arm,size=0x40) addr:0x02194330 __sinit_ov047_02194370 kind:function(arm,size=0x138) addr:0x02194370 __sinit_ov047_021944a8 kind:function(arm,size=0x40) addr:0x021944a8 +.p__sinit_ov047_021942f0 kind:data(word) addr:0x021944e8 +.p__sinit_ov047_02194330 kind:data(word) addr:0x021944ec +.p__sinit_ov047_02194370 kind:data(word) addr:0x021944f0 +.p__sinit_ov047_021944a8 kind:data(word) addr:0x021944f4 data_ov047_02194508 kind:data(any) addr:0x02194508 data_ov047_021945c4 kind:data(any) addr:0x021945c4 data_ov047_02194680 kind:data(any) addr:0x02194680 diff --git a/config/eur/arm9/overlays/ov048/symbols.txt b/config/eur/arm9/overlays/ov048/symbols.txt index d628df5d..9711977b 100644 --- a/config/eur/arm9/overlays/ov048/symbols.txt +++ b/config/eur/arm9/overlays/ov048/symbols.txt @@ -103,6 +103,12 @@ __sinit_ov048_021948f8 kind:function(arm,size=0x11c) addr:0x021948f8 __sinit_ov048_02194a14 kind:function(arm,size=0x40) addr:0x02194a14 __sinit_ov048_02194a54 kind:function(arm,size=0x40) addr:0x02194a54 __sinit_ov048_02194a94 kind:function(arm,size=0x40) addr:0x02194a94 +.p__sinit_ov048_021946c0 kind:data(word) addr:0x02194ad4 +.p__sinit_ov048_021947d0 kind:data(word) addr:0x02194ad8 +.p__sinit_ov048_021948f8 kind:data(word) addr:0x02194adc +.p__sinit_ov048_02194a14 kind:data(word) addr:0x02194ae0 +.p__sinit_ov048_02194a54 kind:data(word) addr:0x02194ae4 +.p__sinit_ov048_02194a94 kind:data(word) addr:0x02194ae8 data_ov048_02194b00 kind:data(any) addr:0x02194b00 data_ov048_02194b04 kind:data(any) addr:0x02194b04 data_ov048_02194b08 kind:data(any) addr:0x02194b08 diff --git a/config/eur/arm9/overlays/ov049/symbols.txt b/config/eur/arm9/overlays/ov049/symbols.txt index 1a844f29..7c2b64ec 100644 --- a/config/eur/arm9/overlays/ov049/symbols.txt +++ b/config/eur/arm9/overlays/ov049/symbols.txt @@ -69,6 +69,9 @@ data_ov049_021982b4 kind:data(any) addr:0x021982b4 __sinit_ov049_021982c8 kind:function(arm,size=0x12c) addr:0x021982c8 __sinit_ov049_021983f4 kind:function(arm,size=0x40) addr:0x021983f4 __sinit_ov049_02198434 kind:function(arm,size=0x40) addr:0x02198434 +.p__sinit_ov049_021982c8 kind:data(word) addr:0x02198474 +.p__sinit_ov049_021983f4 kind:data(word) addr:0x02198478 +.p__sinit_ov049_02198434 kind:data(word) addr:0x0219847c data_ov049_021984a0 kind:data(any) addr:0x021984a0 data_ov049_021984a4 kind:data(any) addr:0x021984a4 data_ov049_021984a8 kind:data(any) addr:0x021984a8 diff --git a/config/eur/arm9/overlays/ov050/symbols.txt b/config/eur/arm9/overlays/ov050/symbols.txt index a11e8397..ef13e7b2 100644 --- a/config/eur/arm9/overlays/ov050/symbols.txt +++ b/config/eur/arm9/overlays/ov050/symbols.txt @@ -74,6 +74,8 @@ func_ov050_021987c4 kind:function(arm,size=0x8) addr:0x021987c4 data_ov050_021987cc kind:data(any) addr:0x021987cc __sinit_ov050_0219882c kind:function(arm,size=0x64) addr:0x0219882c __sinit_ov050_02198890 kind:function(arm,size=0x118) addr:0x02198890 +.p__sinit_ov050_0219882c kind:data(word) addr:0x021989a8 +.p__sinit_ov050_02198890 kind:data(word) addr:0x021989ac data_ov050_021989c0 kind:data(any) addr:0x021989c0 data_ov050_021989d0 kind:data(any) addr:0x021989d0 data_ov050_021989f0 kind:data(any) addr:0x021989f0 diff --git a/config/eur/arm9/overlays/ov051/symbols.txt b/config/eur/arm9/overlays/ov051/symbols.txt index 88093248..0c389815 100644 --- a/config/eur/arm9/overlays/ov051/symbols.txt +++ b/config/eur/arm9/overlays/ov051/symbols.txt @@ -89,6 +89,11 @@ __sinit_ov051_021982e0 kind:function(arm,size=0x40) addr:0x021982e0 __sinit_ov051_02198320 kind:function(arm,size=0x110) addr:0x02198320 __sinit_ov051_02198430 kind:function(arm,size=0x40) addr:0x02198430 __sinit_ov051_02198470 kind:function(arm,size=0x40) addr:0x02198470 +.p__sinit_ov051_021982a0 kind:data(word) addr:0x021984b0 +.p__sinit_ov051_021982e0 kind:data(word) addr:0x021984b4 +.p__sinit_ov051_02198320 kind:data(word) addr:0x021984b8 +.p__sinit_ov051_02198430 kind:data(word) addr:0x021984bc +.p__sinit_ov051_02198470 kind:data(word) addr:0x021984c0 data_ov051_021984e8 kind:data(any) addr:0x021984e8 data_ov051_0219859c kind:data(any) addr:0x0219859c data_ov051_021985a0 kind:data(any) addr:0x021985a0 diff --git a/config/eur/arm9/overlays/ov052/symbols.txt b/config/eur/arm9/overlays/ov052/symbols.txt index 4638f9b1..63dd6180 100644 --- a/config/eur/arm9/overlays/ov052/symbols.txt +++ b/config/eur/arm9/overlays/ov052/symbols.txt @@ -80,6 +80,8 @@ data_ov052_021978b8 kind:data(any) addr:0x021978b8 data_ov052_021978c8 kind:data(any) addr:0x021978c8 __sinit_ov052_021978d4 kind:function(arm,size=0x40) addr:0x021978d4 __sinit_ov052_02197914 kind:function(arm,size=0x40) addr:0x02197914 +.p__sinit_ov052_021978d4 kind:data(word) addr:0x02197954 +.p__sinit_ov052_02197914 kind:data(word) addr:0x02197958 data_ov052_02197960 kind:data(any) addr:0x02197960 data_ov052_02197964 kind:data(any) addr:0x02197964 data_ov052_02197968 kind:data(any) addr:0x02197968 diff --git a/config/eur/arm9/overlays/ov053/symbols.txt b/config/eur/arm9/overlays/ov053/symbols.txt index 82d371c5..8b129bbc 100644 --- a/config/eur/arm9/overlays/ov053/symbols.txt +++ b/config/eur/arm9/overlays/ov053/symbols.txt @@ -38,6 +38,7 @@ func_ov053_02199f88 kind:function(arm,size=0x14) addr:0x02199f88 func_ov053_02199f9c kind:function(arm,size=0x1c) addr:0x02199f9c data_ov053_02199fb8 kind:data(any) addr:0x02199fb8 __sinit_ov053_02199fc4 kind:function(arm,size=0xac) addr:0x02199fc4 +.p__sinit_ov053_02199fc4 kind:data(word) addr:0x0219a070 data_ov053_0219a080 kind:data(any) addr:0x0219a080 data_ov053_0219a084 kind:data(any) addr:0x0219a084 data_ov053_0219a088 kind:data(any) addr:0x0219a088 diff --git a/config/eur/arm9/overlays/ov054/symbols.txt b/config/eur/arm9/overlays/ov054/symbols.txt index c1a4f3ea..db52395f 100644 --- a/config/eur/arm9/overlays/ov054/symbols.txt +++ b/config/eur/arm9/overlays/ov054/symbols.txt @@ -17,6 +17,7 @@ _ZN13LinkStateItem14StopUsingScoopEv kind:function(arm,size=0xe4) addr:0x021997f _Z19func_ov054_021998d4iiij kind:function(arm,size=0x40) addr:0x021998d4 data_ov054_02199914 kind:data(any) addr:0x02199914 __sinit_EquipScoop.cpp kind:function(arm,size=0x30) addr:0x02199924 +.p__sinit_ov054_02199924 kind:data(word) addr:0x02199954 data_ov054_02199960 kind:data(any) addr:0x02199960 data_ov054_02199964 kind:data(any) addr:0x02199964 data_ov054_02199968 kind:data(any) addr:0x02199968 diff --git a/config/eur/arm9/overlays/ov055/symbols.txt b/config/eur/arm9/overlays/ov055/symbols.txt index 948b57ac..ff886505 100644 --- a/config/eur/arm9/overlays/ov055/symbols.txt +++ b/config/eur/arm9/overlays/ov055/symbols.txt @@ -19,6 +19,7 @@ data_ov055_021997b0 kind:data(any) addr:0x021997b0 data_ov055_021997c4 kind:data(any) addr:0x021997c4 data_ov055_021997d8 kind:data(any) addr:0x021997d8 __sinit_EquipBomb.cpp kind:function(arm,size=0x30) addr:0x021997ec +.p__sinit_ov055_021997ec kind:data(word) addr:0x0219981c data_ov055_02199840 kind:data(any) addr:0x02199840 data_ov055_02199850 kind:data(any) addr:0x02199850 data_ov055_02199854 kind:data(any) addr:0x02199854 diff --git a/config/eur/arm9/overlays/ov056/symbols.txt b/config/eur/arm9/overlays/ov056/symbols.txt index b81ca79e..cd52ad94 100644 --- a/config/eur/arm9/overlays/ov056/symbols.txt +++ b/config/eur/arm9/overlays/ov056/symbols.txt @@ -12,6 +12,7 @@ _Z11GetEquipBowv kind:function(arm,size=0x10) addr:0x021992e8 _ZN13LinkStateItem19func_ov056_021992f8Ev kind:function(arm,size=0x24) addr:0x021992f8 data_ov056_0219931c kind:data(any) addr:0x0219931c __sinit_EquipBow.cpp kind:function(arm,size=0x54) addr:0x02199328 +.p__sinit_ov056_02199328 kind:data(word) addr:0x0219937c data_ov056_021993a0 kind:data(any) addr:0x021993a0 data_ov056_021993a4 kind:data(any) addr:0x021993a4 data_ov056_021993a8 kind:data(any) addr:0x021993a8 diff --git a/config/eur/arm9/overlays/ov057/symbols.txt b/config/eur/arm9/overlays/ov057/symbols.txt index 46412e9c..9161aee7 100644 --- a/config/eur/arm9/overlays/ov057/symbols.txt +++ b/config/eur/arm9/overlays/ov057/symbols.txt @@ -45,6 +45,8 @@ _ZN22ActorRope_Unk_0219a3b0D0Ev kind:function(arm,size=0x14) addr:0x0219a980 data_ov057_0219a994 kind:data(any) addr:0x0219a994 __sinit_EquipRope.cpp kind:function(arm,size=0x2c) addr:0x0219a9a0 local __sinit_ActorRope.cpp kind:function(arm,size=0x44) addr:0x0219a9cc local +.p__sinit_ov057_0219a9a0 kind:data(word) addr:0x0219aa10 +.p__sinit_ov057_0219a9cc kind:data(word) addr:0x0219aa14 _ZTV22EquipRope_Unk_02198dd0 kind:data(any) addr:0x0219aa28 data_ov057_0219aa40 kind:data(any) addr:0x0219aa40 data_ov057_0219aa50 kind:data(any) addr:0x0219aa50 diff --git a/config/eur/arm9/overlays/ov058/symbols.txt b/config/eur/arm9/overlays/ov058/symbols.txt index 5118e403..36785ef8 100644 --- a/config/eur/arm9/overlays/ov058/symbols.txt +++ b/config/eur/arm9/overlays/ov058/symbols.txt @@ -36,6 +36,7 @@ func_ov058_0219acac kind:function(thumb,size=0x88) addr:0x0219acac func_ov058_0219ad34 kind:function(thumb,size=0x32) addr:0x0219ad34 data_ov058_0219ad68 kind:data(any) addr:0x0219ad68 __sinit_EquipBombchu.cpp kind:function(arm,size=0xfc) addr:0x0219ad80 +.p__sinit_ov058_0219ad80 kind:data(word) addr:0x0219ae7c data_ov058_0219aea0 kind:data(any) addr:0x0219aea0 data_ov058_0219aea4 kind:data(any) addr:0x0219aea4 data_ov058_0219aea8 kind:data(any) addr:0x0219aea8 diff --git a/config/eur/arm9/overlays/ov059/delinks.txt b/config/eur/arm9/overlays/ov059/delinks.txt index 630335cc..0989c042 100644 --- a/config/eur/arm9/overlays/ov059/delinks.txt +++ b/config/eur/arm9/overlays/ov059/delinks.txt @@ -10,6 +10,6 @@ src/59_Hammer/Player/EquipHammer.cpp: .text start:0x02198d00 end:0x0219933c .data start:0x0219b140 end:0x0219b1c0 -src/59_Hammer/Actor/Navi/ActorNaviBase.cpp: +src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp: .text start:0x0219933c end:0x0219b110 .rodata start:0x0219b110 end:0x0219b124 diff --git a/config/eur/arm9/relocs.txt b/config/eur/arm9/relocs.txt index 94217569..1c28854d 100644 --- a/config/eur/arm9/relocs.txt +++ b/config/eur/arm9/relocs.txt @@ -3743,7 +3743,7 @@ from:0x0202f8b0 kind:thumb_call_arm to:0x0200f248 module:main from:0x0202f8c0 kind:load to:0x0206322c module:main from:0x0202f8c4 kind:load to:0x027e05f8 module:dtcm from:0x0202f8c8 kind:load to:0x027e08f8 module:dtcm -from:0x0202f8cc kind:load to:0x020562e2 module:main +from:0x0202f8cc kind:load to:0x020562e0 add:2 module:main from:0x0202f8dc kind:load to:0x027e0618 module:dtcm from:0x0202f8e0 kind:load to:0x027e0900 module:dtcm from:0x0202f8e4 kind:load to:0x020ee734 module:overlay(0) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 4be3fe36..c1757bca 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1316,7 +1316,7 @@ _ZN11FadeControl13func_0202abf4Eii kind:function(thumb,size=0x16) addr:0x0202abf _ZN11FadeControl13func_0202ac0cEitii kind:function(thumb,size=0x54) addr:0x0202ac0c _ZN11FadeControl10UpdateFadeEi kind:function(arm,size=0x194) addr:0x0202ac60 _ZN18UnkStruct_027e05f813func_0202adf4Eii kind:function(arm,size=0x74) addr:0x0202adf4 -_ZN18UnkStruct_027e05f8D2Ev kind:function(arm,size=0x4) addr:0x0202ae68 +_ZN18UnkStruct_027e05f8D1Ev kind:function(arm,size=0x4) addr:0x0202ae68 LoadOverlay16 kind:function(thumb,size=0x44) addr:0x0202ae6c Vec3p_RotateX kind:function(arm,size=0x9c) addr:0x0202aeb0 Vec3p_RotateY kind:function(arm,size=0xa4) addr:0x0202af4c @@ -1828,10 +1828,10 @@ _ZN11BMGFileInfo13func_0203728cEi kind:function(arm,size=0x64) addr:0x0203728c _ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x020372f0 _ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x36) addr:0x020373b4 _ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x020373ec -_ZN18UnkStruct_027e05f84InitEv kind:function(thumb,size=0xa) addr:0x0203744c +_ZN18UnkStruct_027e05f8C1Ev kind:function(thumb,size=0xa) addr:0x0203744c _ZN18UnkStruct_027e05f813func_02037458Et kind:function(arm,size=0x28) addr:0x02037458 _ZN18UnkStruct_027e05f813func_02037480Ev kind:function(arm,size=0x10) addr:0x02037480 -_ZN18UnkStruct_027e05f813func_02037490Ei kind:function(arm,size=0x24) addr:0x02037490 +_ZN18UnkStruct_027e05f813func_02037490Ev kind:function(arm,size=0x24) addr:0x02037490 func_020374b4 kind:function(arm,size=0x74) addr:0x020374b4 func_02037528 kind:function(arm,size=0x74) addr:0x02037528 func_0203759c kind:function(arm,size=0x68) addr:0x0203759c @@ -2214,14 +2214,14 @@ Overlay_FileSize kind:function(thumb,size=0x14) addr:0x020421fc Overlay_ClearCacheAndBss kind:function(thumb,size=0x26) addr:0x02042210 Overlay_func_02042238 kind:function(thumb,size=0x18) addr:0x02042238 Overlay_func_02042250 kind:function(thumb,size=0x9c) addr:0x02042250 -Overlay_func_020422ec kind:function(thumb,size=0xa0) addr:0x020422ec -Overlay_func_0204238c kind:function(thumb,size=0x5a) addr:0x0204238c +FS_LoadOverlayInfo kind:function(thumb,size=0xa0) addr:0x020422ec +FS_LoadOverlayFile kind:function(thumb,size=0x5a) addr:0x0204238c Overlay_func_020423e8 kind:function(thumb,size=0x58) addr:0x020423e8 -Overlay_Init kind:function(thumb,size=0x94) addr:0x02042440 +FS_StartOverlay kind:function(thumb,size=0x94) addr:0x02042440 Overlay_RunGlobalDestructors kind:function(thumb,size=0xa4) addr:0x020424d4 -Overlay_Destroy kind:function(thumb,size=0xa) addr:0x02042578 -Overlay_Load kind:function(thumb,size=0x30) addr:0x02042584 -Overlay_Unload kind:function(thumb,size=0x2a) addr:0x020425b4 +FS_StopOverlay kind:function(thumb,size=0xa) addr:0x02042578 +FS_LoadOverlay kind:function(thumb,size=0x30) addr:0x02042584 +FS_UnloadOverlay kind:function(thumb,size=0x2a) addr:0x020425b4 func_020425e0 kind:function(thumb,size=0x40) addr:0x020425e0 func_02042620 kind:function(thumb,size=0x48) addr:0x02042620 func_02042668 kind:function(thumb,size=0x24) addr:0x02042668 @@ -2452,8 +2452,9 @@ func_020506b8 kind:function(thumb,size=0xd4) addr:0x020506b8 func_0205078c kind:function(thumb,size=0x138) addr:0x0205078c func_020508c4 kind:function(thumb,size=0x54) addr:0x020508c4 func_02050918 kind:function(thumb,size=0xf2) addr:0x02050918 +func_02050a20 kind:function(arm,size=0x280) addr:0x02050a20 __sinit_02050ca0 kind:function(arm,size=0x14) addr:0x02050ca0 -__sinit_02050cb4 kind:function(arm,size=0x2c) addr:0x02050cb4 +__sinit_UnkStruct_027e05f8_2.cpp kind:function(arm,size=0x2c) addr:0x02050cb4 local __sinit_02050ce0 kind:function(arm,size=0x2c) addr:0x02050ce0 __sinit_02050d0c kind:function(arm,size=0x14) addr:0x02050d0c __sinit_02050d20 kind:function(arm,size=0x14) addr:0x02050d20 @@ -2538,7 +2539,7 @@ data_020561dc kind:data(any) addr:0x020561dc data_020561f0 kind:data(any) addr:0x020561f0 gGameModes kind:data(any) addr:0x020561f4 data_020562d4 kind:data(any) addr:0x020562d4 -data_020562e2 kind:data(any) addr:0x020562e2 +data_020562e0 kind:data(any) addr:0x020562e0 data_02056300 kind:data(any) addr:0x02056300 data_02056308 kind:data(any) addr:0x02056308 data_02056324 kind:data(any) addr:0x02056324 @@ -2600,7 +2601,31 @@ data_020571e0 kind:data(any) addr:0x020571e0 data_020571f0 kind:data(any) addr:0x020571f0 data_02057200 kind:data(any) addr:0x02057200 data_02057208 kind:data(any) addr:0x02057208 -data_0205725c kind:data(any) addr:0x0205725c +.p__sinit_02050ca0 kind:data(word) addr:0x0205725c +.p__sinit_UnkStruct_027e05f8_2.cpp kind:data(word) addr:0x02057260 local +.p__sinit_02050ce0 kind:data(word) addr:0x02057264 +.p__sinit_02050d0c kind:data(word) addr:0x02057268 +.p__sinit_02050d20 kind:data(word) addr:0x0205726c +.p__sinit_02050d34 kind:data(word) addr:0x02057270 +.p__sinit_02050d48 kind:data(word) addr:0x02057274 +.p__sinit_02050d5c kind:data(word) addr:0x02057278 +.p__sinit_02050d70 kind:data(word) addr:0x0205727c +.p__sinit_02050d88 kind:data(word) addr:0x02057280 +.p__sinit_02050d9c kind:data(word) addr:0x02057284 +.p__sinit_02050db8 kind:data(word) addr:0x02057288 +.p__sinit_02050dcc kind:data(word) addr:0x0205728c +.p__sinit_02050de0 kind:data(word) addr:0x02057290 +.p__sinit_02050df4 kind:data(word) addr:0x02057294 +.p__sinit_02050e10 kind:data(word) addr:0x02057298 +.p__sinit_02050e24 kind:data(word) addr:0x0205729c +.p__sinit_02050e38 kind:data(word) addr:0x020572a0 +.p__sinit_02050e64 kind:data(word) addr:0x020572a4 +.p__sinit_02050e90 kind:data(word) addr:0x020572a8 +.p__sinit_02050ea4 kind:data(word) addr:0x020572ac +.p__sinit_02050eb8 kind:data(word) addr:0x020572b0 +.p__sinit_02050ee4 kind:data(word) addr:0x020572b4 +.p__sinit_02050f00 kind:data(word) addr:0x020572b8 +.p__sinit_02050f40 kind:data(word) addr:0x020572bc data_020572e0 kind:data(any) addr:0x020572e0 data_020572e4 kind:data(any) addr:0x020572e4 data_020572e8 kind:data(any) addr:0x020572e8 @@ -3085,7 +3110,7 @@ data_02068ec4 kind:bss addr:0x02068ec4 data_02068ed0 kind:bss addr:0x02068ed0 data_02068ed8 kind:bss addr:0x02068ed8 data_0206902c kind:bss addr:0x0206902c -sActorTypeList kind:bss addr:0x02069180 +sActorTypeList kind:bss(size=0x8) addr:0x02069180 data_020691a0 kind:bss addr:0x020691a0 data_02075da0 kind:bss addr:0x02075da0 data_02075dac kind:bss addr:0x02075dac diff --git a/config/usa/arm9/delinks.txt b/config/usa/arm9/delinks.txt index 7b78a04d..640d7195 100644 --- a/config/usa/arm9/delinks.txt +++ b/config/usa/arm9/delinks.txt @@ -69,3 +69,10 @@ src/Main/Game/GameMode.cpp: complete .text start:0x0202c090 end:0x0202c0b4 .data start:0x020575cc end:0x020575f0 + +src/Main/DTCM/UnkStruct_027e05f8_2.cpp: + complete + .text start:0x02037408 end:0x02037470 + .init start:0x02050c70 end:0x02050c9c + .ctor start:0x02057218 end:0x0205721c + .dtcm start:0x027e05f8 end:0x027e060c diff --git a/config/usa/arm9/dtcm/delinks.txt b/config/usa/arm9/dtcm/delinks.txt index 177b6050..ff5522be 100644 --- a/config/usa/arm9/dtcm/delinks.txt +++ b/config/usa/arm9/dtcm/delinks.txt @@ -1,3 +1,3 @@ .data start:0x027e0000 end:0x027e0200 kind:data align:32 - .bss start:0x027e0200 end:0x027e10c0 kind:bss align:32 + .dtcm start:0x027e0200 end:0x027e10c0 kind:bss align:32 diff --git a/config/usa/arm9/dtcm/symbols.txt b/config/usa/arm9/dtcm/symbols.txt index 018efdc8..d67b9691 100644 --- a/config/usa/arm9/dtcm/symbols.txt +++ b/config/usa/arm9/dtcm/symbols.txt @@ -64,7 +64,7 @@ data_027e05ec kind:bss addr:0x027e05ec data_027e05f0 kind:bss addr:0x027e05f0 data_027e05f4 kind:bss addr:0x027e05f4 data_027e05f8 kind:bss addr:0x027e05f8 -data_027e0600 kind:bss addr:0x027e0600 +@4 kind:bss addr:0x027e0600 local data_027e060c kind:bss addr:0x027e060c gGame kind:bss addr:0x027e0618 data_027e0698 kind:bss addr:0x027e0698 diff --git a/config/usa/arm9/overlays/ov000/delinks.txt b/config/usa/arm9/overlays/ov000/delinks.txt index 963fb43f..25e7b6b7 100644 --- a/config/usa/arm9/overlays/ov000/delinks.txt +++ b/config/usa/arm9/overlays/ov000/delinks.txt @@ -87,7 +87,7 @@ src/00_Core/Map/Course.cpp: src/00_Core/Map/MapBase.cpp: .text start:0x0207d9d8 end:0x02080ec0 - .data start:0x020e229c end:0x020e23b4 + .data start:0x020e229c end:0x020e23c4 .sbss start:0x020ec7bc end:0x020ec904 src/00_Core/Map/MapManager.cpp: @@ -110,7 +110,7 @@ src/00_Core/Player/LinkStateDamage.cpp: src/00_Core/Player/LinkStateFollow.cpp: .text start:0x020a8f14 end:0x020a9244 - .data start:0x020e56fc end:0x020e5788 + .data start:0x020e56fc end:0x020e5888 src/00_Core/Player/LinkStateInteract.cpp: .text start:0x020aa2cc end:0x020abd18 diff --git a/config/usa/arm9/overlays/ov000/relocs.txt b/config/usa/arm9/overlays/ov000/relocs.txt index 444265ad..be06569d 100644 --- a/config/usa/arm9/overlays/ov000/relocs.txt +++ b/config/usa/arm9/overlays/ov000/relocs.txt @@ -2241,7 +2241,7 @@ from:0x0208fa04 kind:load to:0x02050f10 module:main from:0x0208fa28 kind:arm_call to:0x0202e9d8 module:main from:0x0208fa34 kind:arm_call to:0x020c14f4 module:overlay(0) from:0x0208fa80 kind:load to:0x027e0fe0 module:dtcm -from:0x0208fa84 kind:load to:0x020e28d0 module:overlay(0) +from:0x0208fa84 kind:load to:0x020e28c8 add:8 module:overlay(0) from:0x0208fa90 kind:arm_call to:0x020c16d4 module:overlay(0) from:0x0208fa98 kind:arm_call to:0x0208fc1c module:overlay(0) from:0x0208fab8 kind:arm_call to:0x020c1b9c module:overlay(0) @@ -2296,7 +2296,7 @@ from:0x0209033c kind:arm_call to:0x0202ea08 module:main from:0x02090360 kind:arm_call to:0x0202e9d8 module:main from:0x0209036c kind:arm_call to:0x020c14f4 module:overlay(0) from:0x02090380 kind:load to:0x027e0fe0 module:dtcm -from:0x02090384 kind:load to:0x020e298c module:overlay(0) +from:0x02090384 kind:load to:0x020e2984 add:8 module:overlay(0) from:0x02090390 kind:arm_call to:0x020c16d4 module:overlay(0) from:0x020903ac kind:arm_call to:0x020c30dc module:overlay(0) from:0x020903e4 kind:arm_call to:0x020c3b50 module:overlay(0) @@ -5895,8 +5895,8 @@ from:0x020b145c kind:arm_call to:0x0202bba4 module:main from:0x020b14b8 kind:arm_call to:0x02034940 module:main from:0x020b14c0 kind:load to:0x020dc68c module:overlay(0) from:0x020b14c4 kind:load to:0x02050f10 module:main -from:0x020b14d8 kind:load to:0x020e60f8 module:overlay(0) -from:0x020b14ec kind:load to:0x020e60f8 module:overlay(0) +from:0x020b14d8 kind:load to:0x020e60f0 add:8 module:overlay(0) +from:0x020b14ec kind:load to:0x020e60f0 add:8 module:overlay(0) from:0x020b14f4 kind:thumb_call_arm to:0x02081eec module:overlay(0) from:0x020b1500 kind:thumb_call_arm to:0x02081eec module:overlay(0) from:0x020b1506 kind:thumb_call_arm to:0x0202ea08 module:main @@ -7123,8 +7123,8 @@ from:0x020bd544 kind:arm_call to:0x020c3614 module:overlay(0) from:0x020bd584 kind:load to:0x027e0fb4 module:dtcm from:0x020bd588 kind:load to:0x027e0f94 module:dtcm from:0x020bd58c kind:load to:0x027e0fe4 module:dtcm -from:0x020bd5b4 kind:load to:0x020e6cb8 module:overlay(0) -from:0x020bd5c8 kind:load to:0x020e6cb8 module:overlay(0) +from:0x020bd5b4 kind:load to:0x020e6cb0 add:8 module:overlay(0) +from:0x020bd5c8 kind:load to:0x020e6cb0 add:8 module:overlay(0) from:0x020bd5f8 kind:arm_call to:0x02023548 module:main from:0x020bd60c kind:arm_call to:0x02023548 module:main from:0x020bd61c kind:arm_call_thumb to:0x020b3e48 module:overlay(0) @@ -7179,7 +7179,7 @@ from:0x020be150 kind:arm_call to:0x0202e9d8 module:main from:0x020be15c kind:arm_call to:0x020be168 module:overlay(0) from:0x020be164 kind:load to:0x027e0fe0 module:dtcm from:0x020be170 kind:arm_call to:0x020c14f4 module:overlay(0) -from:0x020be184 kind:load to:0x020e6ce4 module:overlay(0) +from:0x020be184 kind:load to:0x020e6cdc add:8 module:overlay(0) from:0x020be190 kind:arm_call to:0x020c16d0 module:overlay(0) from:0x020be1a4 kind:arm_call to:0x020c16d0 module:overlay(0) from:0x020be1ac kind:arm_call to:0x0202ea08 module:main @@ -7443,7 +7443,7 @@ from:0x020c0b5c kind:arm_call to:0x0202ea08 module:main from:0x020c0b70 kind:arm_call_thumb to:0x02107914 module:overlay(4) from:0x020c0ba0 kind:arm_call to:0x0201e544 module:main from:0x020c0bb8 kind:thumb_call_arm to:0x0202e19c module:main -from:0x020c0bcc kind:load to:0x020e7138 module:overlay(0) +from:0x020c0bcc kind:load to:0x020e7130 add:8 module:overlay(0) from:0x020c0bd8 kind:thumb_call_arm to:0x0202ea08 module:main from:0x020c0bfc kind:arm_call to:0x020c0c68 module:overlay(0) from:0x020c0c08 kind:arm_call to:0x020c0c68 module:overlay(0) diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 86737deb..a555eb80 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -3723,6 +3723,7 @@ data_ov000_020dc574 kind:data(any) addr:0x020dc514 data_ov000_020dc674 kind:data(any) addr:0x020dc614 sQuiverSizes kind:data(any) addr:0x020dc664 local sBombBagSizes kind:data(any) addr:0x020dc66c local +data_ov000_020dc6d4 kind:data(any) addr:0x020dc674 data_ov000_020dc6e0 kind:data(any) addr:0x020dc680 data_ov000_020dc6e4 kind:data(any) addr:0x020dc684 data_ov000_020dc6e8 kind:data(any) addr:0x020dc688 @@ -3763,6 +3764,7 @@ data_ov000_020dd29c kind:data(any) addr:0x020dd23c data_ov000_020dd2a0 kind:data(any) addr:0x020dd240 data_ov000_020dd364 kind:data(any) addr:0x020dd304 sUnkTable kind:data(any) addr:0x020dd310 +data_ov000_020dd3f8 kind:data(any) addr:0x020dd398 data_ov000_020dd408 kind:data(any) addr:0x020dd3a8 data_ov000_020dd410 kind:data(any) addr:0x020dd3b0 data_ov000_020dd418 kind:data(any) addr:0x020dd3b8 @@ -3979,6 +3981,62 @@ __sinit_ov000_020e1e38 kind:function(arm,size=0x14) addr:0x020e1dd8 __sinit_ov000_020e1e4c kind:function(arm,size=0x14) addr:0x020e1dec __sinit_ov000_020e1e60 kind:function(arm,size=0x14) addr:0x020e1e00 __sinit_ov000_020e1e74 kind:function(arm,size=0x14) addr:0x020e1e14 +.p__sinit_ov000_020df338 kind:data(word) addr:0x020e1e28 +.p__sinit_ov000_020df34c kind:data(word) addr:0x020e1e2c +.p__sinit_ov000_020df378 kind:data(word) addr:0x020e1e30 +.p__sinit_ov000_020df38c kind:data(word) addr:0x020e1e34 +.p__sinit_ov000_020df3b8 kind:data(word) addr:0x020e1e38 +.p__sinit_ov000_020df3cc kind:data(word) addr:0x020e1e3c +.p__sinit_ov000_020df3e0 kind:data(word) addr:0x020e1e40 +.p__sinit_ov000_020df3f4 kind:data(word) addr:0x020e1e44 +.p__sinit_ov000_020df420 kind:data(word) addr:0x020e1e48 +.p__sinit_ov000_020df45c kind:data(word) addr:0x020e1e4c +.p__sinit_ov000_020df470 kind:data(word) addr:0x020e1e50 +.p__sinit_ov000_020df4a4 kind:data(word) addr:0x020e1e54 +.p__sinit_ov000_020df4b8 kind:data(word) addr:0x020e1e58 +.p__sinit_ov000_020df4cc kind:data(word) addr:0x020e1e5c +.p__sinit_ov000_020df640 kind:data(word) addr:0x020e1e60 +.p__sinit_ov000_020df678 kind:data(word) addr:0x020e1e64 +.p__sinit_ov000_020df6b8 kind:data(word) addr:0x020e1e68 +.p__sinit_ActorEventIcon.cpp kind:data(word) addr:0x020e1e6c local +.p__sinit_ov000_020df738 kind:data(word) addr:0x020e1e70 +.p__sinit_ov000_020df770 kind:data(word) addr:0x020e1e74 +.p__sinit_ov000_020df790 kind:data(word) addr:0x020e1e78 +.p__sinit_ov000_020e0ea8 kind:data(word) addr:0x020e1e7c +.p__sinit_ov000_020e1030 kind:data(word) addr:0x020e1e80 +.p__sinit_ov000_020e105c kind:data(word) addr:0x020e1e84 +.p__sinit_ov000_020e109c kind:data(word) addr:0x020e1e88 +.p__sinit_ov000_020e10d4 kind:data(word) addr:0x020e1e8c +.p__sinit_ov000_020e1114 kind:data(word) addr:0x020e1e90 +.p__sinit_ov000_020e1128 kind:data(word) addr:0x020e1e94 +.p__sinit_ov000_020e11d8 kind:data(word) addr:0x020e1e98 +.p__sinit_ov000_020e120c kind:data(word) addr:0x020e1e9c +.p__sinit_ov000_020e1250 kind:data(word) addr:0x020e1ea0 +.p__sinit_ov000_020e1290 kind:data(word) addr:0x020e1ea4 +.p__sinit_ov000_020e12d8 kind:data(word) addr:0x020e1ea8 +.p__sinit_ActorForceNavi.cpp kind:data(word) addr:0x020e1eac local +.p__sinit_ov000_020e137c kind:data(word) addr:0x020e1eb0 +.p__sinit_ov000_020e1b14 kind:data(word) addr:0x020e1eb4 +.p__sinit_ActorWisdomNavi.cpp kind:data(word) addr:0x020e1eb8 local +.p__sinit_ov000_020e1b94 kind:data(word) addr:0x020e1ebc +.p__sinit_ov000_020e1bd4 kind:data(word) addr:0x020e1ec0 +.p__sinit_ov000_020e1c14 kind:data(word) addr:0x020e1ec4 +.p__sinit_ov000_020e1c54 kind:data(word) addr:0x020e1ec8 +.p__sinit_ov000_020e1c68 kind:data(word) addr:0x020e1ecc +.p__sinit_ov000_020e1c8c kind:data(word) addr:0x020e1ed0 +.p__sinit_ov000_020e1ccc kind:data(word) addr:0x020e1ed4 +.p__sinit_ov000_020e1d0c kind:data(word) addr:0x020e1ed8 +.p__sinit_ov000_020e1d4c kind:data(word) addr:0x020e1edc +.p__sinit_ov000_020e1d7c kind:data(word) addr:0x020e1ee0 +.p__sinit_ov000_020e1da8 kind:data(word) addr:0x020e1ee4 +.p__sinit_ov000_020e1de8 kind:data(word) addr:0x020e1ee8 +.p__sinit_ov000_020e1dfc kind:data(word) addr:0x020e1eec +.p__sinit_ov000_020e1e10 kind:data(word) addr:0x020e1ef0 +.p__sinit_ov000_020e1e24 kind:data(word) addr:0x020e1ef4 +.p__sinit_ov000_020e1e38 kind:data(word) addr:0x020e1ef8 +.p__sinit_ov000_020e1e4c kind:data(word) addr:0x020e1efc +.p__sinit_ov000_020e1e60 kind:data(word) addr:0x020e1f00 +.p__sinit_ov000_020e1e74 kind:data(word) addr:0x020e1f04 data_ov000_020e1f80 kind:data(any) addr:0x020e1f20 data_ov000_020e1fa4 kind:data(any) addr:0x020e1f44 data_ov000_020e1fb4 kind:data(any) addr:0x020e1f54 @@ -4029,7 +4087,7 @@ data_ov000_020e233c kind:data(any) addr:0x020e22dc _ZTV7MapBase kind:data(any) addr:0x020e22e8 data_ov000_020e240c kind:data(any) addr:0x020e23ac data_ov000_020e2410 kind:data(any) addr:0x020e23b0 -data_ov000_020e242c kind:data(any) addr:0x020e23cc +vtable_ov000_020e242c kind:data(any) addr:0x020e23c4 data_ov000_020e2484 kind:data(any) addr:0x020e2424 data_ov000_020e2488 kind:data(any) addr:0x020e2428 data_ov000_020e248c kind:data(any) addr:0x020e242c @@ -4039,6 +4097,7 @@ data_ov000_020e2498 kind:data(any) addr:0x020e2438 data_ov000_020e249c kind:data(any) addr:0x020e243c data_ov000_020e24a0 kind:data(any) addr:0x020e2440 data_ov000_020e24a4 kind:data(any) addr:0x020e2444 +data_ov000_020e24c4 kind:data(any) addr:0x020e2464 data_ov000_020e24c8 kind:data(any) addr:0x020e2468 data_ov000_020e24cc kind:data(any) addr:0x020e246c data_ov000_020e24d0 kind:data(any) addr:0x020e2470 @@ -4055,7 +4114,7 @@ data_ov000_020e2510 kind:data(any) addr:0x020e24b0 data_ov000_020e2520 kind:data(any) addr:0x020e24c0 data_ov000_020e2524 kind:data(any) addr:0x020e24c4 data_ov000_020e2528 kind:data(any) addr:0x020e24c8 -data_ov000_020e2544 kind:data(any) addr:0x020e24e4 +data_ov000_020e253c kind:data(any) addr:0x020e24dc data_ov000_020e2568 kind:data(any) addr:0x020e2508 data_ov000_020e2588 kind:data(any) addr:0x020e2528 data_ov000_020e25b0 kind:data(any) addr:0x020e2550 @@ -4064,10 +4123,10 @@ data_ov000_020e2748 kind:data(any) addr:0x020e26e8 data_ov000_020e27dc kind:data(any) addr:0x020e277c data_ov000_020e2870 kind:data(any) addr:0x020e2810 data_ov000_020e289c kind:data(any) addr:0x020e283c -_ZTV17ActorSwitchObject kind:data(any) addr:0x020e28d0 -data_ov000_020e29ec kind:data(any) addr:0x020e298c +_ZTV17ActorSwitchObject kind:data(any) addr:0x020e28c8 +vtable_ov000_020e29ec kind:data(any) addr:0x020e2984 _ZTV14ActorEventIcon kind:data(any) addr:0x020e2a40 -data_ov000_020e2b64 kind:data(any) addr:0x020e2b04 +data_ov000_020e2b64 kind:data(any) addr:0x020e2afc data_ov000_020e2bb4 kind:data(any) addr:0x020e2b54 data_ov000_020e2c04 kind:data(any) addr:0x020e2ba4 data_ov000_020e2c54 kind:data(any) addr:0x020e2bf4 @@ -4906,7 +4965,7 @@ _ZTV13LinkStateRoll kind:data(any) addr:0x020e6060 @1498 kind:data(any) addr:0x020e60c0 sShipTypes kind:data(any) addr:0x020e60c4 local @1556 kind:data(any) addr:0x020e60e8 -data_ov000_020e6158 kind:data(any) addr:0x020e60f8 +vtable_ov000_020e6158 kind:data(any) addr:0x020e60f0 data_ov000_020e6174 kind:data(any) addr:0x020e6114 data_ov000_020e6178 kind:data(any) addr:0x020e6118 data_ov000_020e617c kind:data(any) addr:0x020e611c @@ -4973,8 +5032,8 @@ data_ov000_020e678c kind:data(any) addr:0x020e672c data_ov000_020e67ac kind:data(any) addr:0x020e674c data_ov000_020e67b8 kind:data(any) addr:0x020e6758 data_ov000_020e67d8 kind:data(any) addr:0x020e6778 -data_ov000_020e67e4 kind:data(any) addr:0x020e6784 -data_ov000_020e68dc kind:data(any) addr:0x020e687c +vtable_ov000_020e67e4 kind:data(any) addr:0x020e677c +vtable_ov000_020e68dc kind:data(any) addr:0x020e6874 data_ov000_020e691c kind:data(any) addr:0x020e68bc data_ov000_020e6934 kind:data(any) addr:0x020e68d4 data_ov000_020e6974 kind:data(any) addr:0x020e6914 @@ -5018,8 +5077,8 @@ data_ov000_020e6c54 kind:data(any) addr:0x020e6bf4 data_ov000_020e6c58 kind:data(any) addr:0x020e6bf8 data_ov000_020e6c5c kind:data(any) addr:0x020e6bfc _ZTV14PlayerLinkBase kind:data(any) addr:0x020e6c28 -data_ov000_020e6d18 kind:data(any) addr:0x020e6cb8 -_ZTV17ActorActionObject kind:data(any) addr:0x020e6ce4 +vtable_ov000_020e6d18 kind:data(any) addr:0x020e6cb0 +_ZTV17ActorActionObject kind:data(any) addr:0x020e6cdc data_ov000_020e6df8 kind:data(any) addr:0x020e6d98 data_ov000_020e6dfc kind:data(any) addr:0x020e6d9c data_ov000_020e6e08 kind:data(any) addr:0x020e6da8 @@ -5060,7 +5119,7 @@ data_ov000_020e7018 kind:data(any) addr:0x020e6fb8 data_ov000_020e701c kind:data(any) addr:0x020e6fbc data_ov000_020e7048 kind:data(any) addr:0x020e6fe8 _ZTV15ActorWisdomNavi kind:data(any) addr:0x020e7038 -data_ov000_020e7198 kind:data(any) addr:0x020e7138 +vtable_ov000_020e7198 kind:data(any) addr:0x020e7130 data_ov000_020e71a0 kind:data(any) addr:0x020e7140 data_ov000_020e71a4 kind:data(any) addr:0x020e7144 data_ov000_020e71a8 kind:data(any) addr:0x020e7148 @@ -5081,7 +5140,7 @@ _ZTV5Actor kind:data(any) addr:0x020e7194 @1032 kind:data(any) addr:0x020e7260 local @1031 kind:data(any) addr:0x020e7264 local _ZTV11FilterActor kind:data(any) addr:0x020e7288 -data_ov000_020e72fc kind:data(any) addr:0x020e729c +vtable_ov000_020e72fc kind:data(any) addr:0x020e7294 data_ov000_020e7300 kind:data(any) addr:0x020e72a0 data_ov000_020e7304 kind:data(any) addr:0x020e72a4 data_ov000_020e7308 kind:data(any) addr:0x020e72a8 @@ -5799,6 +5858,7 @@ data_ov000_020e9f10 kind:bss addr:0x020e9eb0 data_ov000_020ea110 kind:bss addr:0x020ea0b0 data_ov000_020eaa98 kind:bss addr:0x020eaa38 data_ov000_020eaac4 kind:bss addr:0x020eaa64 +data_ov000_020eaac8 kind:bss addr:0x020eaa68 data_ov000_020eaad8 kind:bss addr:0x020eaa78 data_ov000_020eaaf8 kind:bss addr:0x020eaa98 data_ov000_020eab04 kind:bss addr:0x020eaaa4 diff --git a/config/usa/arm9/overlays/ov002/symbols.txt b/config/usa/arm9/overlays/ov002/symbols.txt index 49478e5d..4fdd5471 100644 --- a/config/usa/arm9/overlays/ov002/symbols.txt +++ b/config/usa/arm9/overlays/ov002/symbols.txt @@ -213,6 +213,7 @@ data_ov002_020f6840 kind:data(any) addr:0x020f67e0 data_ov002_020f6844 kind:data(any) addr:0x020f67e4 data_ov002_020f6898 kind:data(any) addr:0x020f6838 __sinit_ov002_020f6978 kind:function(arm,size=0x2c) addr:0x020f6918 +.p__sinit_ov002_020f6978 kind:data(word) addr:0x020f6944 data_ov002_020f69c0 kind:data(any) addr:0x020f6960 data_ov002_020f69c4 kind:data(any) addr:0x020f6964 data_ov002_020f69c8 kind:data(any) addr:0x020f6968 diff --git a/config/usa/arm9/overlays/ov003/symbols.txt b/config/usa/arm9/overlays/ov003/symbols.txt index 832e33c1..ce78bf0e 100644 --- a/config/usa/arm9/overlays/ov003/symbols.txt +++ b/config/usa/arm9/overlays/ov003/symbols.txt @@ -512,6 +512,15 @@ __sinit_ov003_020fff04 kind:function(arm,size=0x28) addr:0x020ffe78 __sinit_ov003_020fff2c kind:function(arm,size=0x28) addr:0x020ffea0 __sinit_ov003_020fff54 kind:function(arm,size=0x40) addr:0x020ffec8 __sinit_ov003_020fff94 kind:function(arm,size=0x38) addr:0x020fff08 +.p__sinit_ov003_020ffd9c kind:data(word) addr:0x020fff40 +.p__sinit_ov003_020ffddc kind:data(word) addr:0x020fff44 +.p__sinit_ov003_020ffdf4 kind:data(word) addr:0x020fff48 +.p__sinit_ov003_020ffe30 kind:data(word) addr:0x020fff4c +.p__sinit_ov003_020ffe50 kind:data(word) addr:0x020fff50 +.p__sinit_ov003_020ffe78 kind:data(word) addr:0x020fff54 +.p__sinit_ov003_020ffea0 kind:data(word) addr:0x020fff58 +.p__sinit_ov003_020ffec8 kind:data(word) addr:0x020fff5c +.p__sinit_ov003_020fff08 kind:data(word) addr:0x020fff60 data_ov003_02100000 kind:data(any) addr:0x020fff80 data_ov003_02100004 kind:data(any) addr:0x020fff84 data_ov003_02100008 kind:data(any) addr:0x020fff88 diff --git a/config/usa/arm9/overlays/ov004/delinks.txt b/config/usa/arm9/overlays/ov004/delinks.txt index 78def35b..65e120c9 100644 --- a/config/usa/arm9/overlays/ov004/delinks.txt +++ b/config/usa/arm9/overlays/ov004/delinks.txt @@ -5,6 +5,6 @@ .data start:0x0210fd20 end:0x02111360 kind:data align:32 .bss start:0x02111360 end:0x02111360 kind:bss align:32 -src/04_Load/Player/LinkStateMove.cpp: +src/04_Load/Player/LinkStateMove_04.cpp: complete .text start:0x0210ae54 end:0x0210ae94 diff --git a/config/usa/arm9/overlays/ov004/relocs.txt b/config/usa/arm9/overlays/ov004/relocs.txt index 21d9b0c8..e10e9eb5 100644 --- a/config/usa/arm9/overlays/ov004/relocs.txt +++ b/config/usa/arm9/overlays/ov004/relocs.txt @@ -481,9 +481,9 @@ from:0x021030e0 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x0210311a kind:thumb_call_arm to:0x0202e9d8 module:main from:0x02103150 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x0210317c kind:load to:0x020d8a48 module:overlay(0) -from:0x02103188 kind:load to:0x020e24e4 module:overlay(0) +from:0x02103188 kind:load to:0x020e24dc add:8 module:overlay(0) from:0x0210318c kind:load to:0x027e0ce0 module:dtcm -from:0x02103190 kind:load to:0x020e2b04 module:overlay(0) +from:0x02103190 kind:load to:0x020e2afc add:8 module:overlay(0) from:0x02103194 kind:load to:0x020e2c44 module:overlay(0) from:0x02103198 kind:load to:0x020e4ab8 module:overlay(0) from:0x0210319c kind:load to:0x020e2ba4 module:overlay(0) @@ -500,7 +500,7 @@ from:0x021032a4 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x021032ec kind:thumb_call_arm to:0x0202e9d8 module:main from:0x02103324 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x02103358 kind:thumb_call_arm to:0x0202e9d8 module:main -from:0x02103398 kind:load to:0x020e2b04 module:overlay(0) +from:0x02103398 kind:load to:0x020e2afc add:8 module:overlay(0) from:0x0210339c kind:load to:0x020e4b08 module:overlay(0) from:0x021033a0 kind:load to:0x027e0ce0 module:dtcm from:0x021033a4 kind:load to:0x020e4ba0 module:overlay(0) @@ -519,7 +519,7 @@ from:0x02103440 kind:thumb_call_arm to:0x0202ea08 module:main from:0x0210345a kind:thumb_call_arm to:0x0209d9e4 module:overlay(0) from:0x02103460 kind:thumb_call_arm to:0x0202ea08 module:main from:0x0210346e kind:thumb_call_arm to:0x0208de68 module:overlay(0) -from:0x02103478 kind:load to:0x020e24e4 module:overlay(0) +from:0x02103478 kind:load to:0x020e24dc add:8 module:overlay(0) from:0x02103492 kind:thumb_call_arm to:0x020a044c module:overlay(0) from:0x02103498 kind:thumb_call_arm to:0x0202ea08 module:main from:0x021034d8 kind:thumb_call_arm to:0x0202ea14 module:main @@ -529,7 +529,7 @@ from:0x02103512 kind:thumb_call_arm to:0x0209d9e4 module:overlay(0) from:0x02103518 kind:thumb_call_arm to:0x0202ea08 module:main from:0x02103526 kind:thumb_call_arm to:0x0208de68 module:overlay(0) from:0x0210352c kind:thumb_call_arm to:0x0202ea08 module:main -from:0x02103534 kind:load to:0x020e24e4 module:overlay(0) +from:0x02103534 kind:load to:0x020e24dc add:8 module:overlay(0) from:0x02103552 kind:thumb_call_arm to:0x0202e9d8 module:main from:0x0210355c kind:thumb_call_arm to:0x020a030c module:overlay(0) from:0x02103568 kind:thumb_call_arm to:0x020a02d0 module:overlay(0) @@ -1531,7 +1531,7 @@ from:0x021077d0 kind:thumb_call to:0x020c0ba8 module:overlay(0) from:0x021077de kind:thumb_call_arm to:0x020c0be4 module:overlay(0) from:0x021077f8 kind:thumb_call_arm to:0x0204f5d0 module:main from:0x0210780e kind:thumb_call_arm to:0x020d1894 module:overlay(0) -from:0x02107874 kind:load to:0x020e6784 module:overlay(0) +from:0x02107874 kind:load to:0x020e677c add:8 module:overlay(0) from:0x02107878 kind:load to:0x020ee198 module:overlay(0) from:0x0210787c kind:load to:0x020e674c module:overlay(0) from:0x02107880 kind:load to:0x021104c0 module:overlay(4) @@ -1562,7 +1562,7 @@ from:0x021079f4 kind:load to:0x027e0d0c module:dtcm from:0x021079fc kind:load to:0x027e0d38 module:dtcm from:0x02107a04 kind:thumb_call to:0x020a950c module:overlay(0) from:0x02107a12 kind:thumb_call_arm to:0x020a9938 module:overlay(0) -from:0x02107a1c kind:load to:0x020e687c module:overlay(0) +from:0x02107a1c kind:load to:0x020e6874 add:8 module:overlay(0) from:0x02107a24 kind:thumb_call to:0x02107790 module:overlay(4) from:0x02107a32 kind:thumb_call_arm to:0x020ad4cc module:overlay(0) from:0x02107a3e kind:thumb_call to:0x020a9528 module:overlay(0) @@ -2461,7 +2461,7 @@ from:0x0210c068 kind:thumb_call_arm to:0x02080e7c module:overlay(0) from:0x0210c070 kind:load to:0x027e0d38 module:dtcm from:0x0210c074 kind:load to:0x027e0fe4 module:dtcm from:0x0210c088 kind:load to:0x0210f924 module:overlay(4) -from:0x0210c08c kind:load to:0x020e729c module:overlay(0) +from:0x0210c08c kind:load to:0x020e7294 add:8 module:overlay(0) from:0x0210c090 kind:load to:0x02110cb8 module:overlay(4) from:0x0210c0ac kind:thumb_call_arm to:0x02078ae0 module:overlay(0) from:0x0210c0ba kind:thumb_call_arm to:0x020a5e3c module:overlay(0) diff --git a/config/usa/arm9/overlays/ov004/symbols.txt b/config/usa/arm9/overlays/ov004/symbols.txt index 15aeacdc..cad402f7 100644 --- a/config/usa/arm9/overlays/ov004/symbols.txt +++ b/config/usa/arm9/overlays/ov004/symbols.txt @@ -467,6 +467,8 @@ data_ov004_0210fcd8 kind:data(any) addr:0x0210fc58 data_ov004_0210fcf8 kind:data(any) addr:0x0210fc78 __sinit_ov004_0210fd58 kind:function(arm,size=0x24) addr:0x0210fcd8 __sinit_ov004_0210fd7c kind:function(arm,size=0x14) addr:0x0210fcfc +.p__sinit_ov004_0210fd58 kind:data(word) addr:0x0210fd10 +.p__sinit_ov004_0210fd7c kind:data(word) addr:0x0210fd14 data_ov004_0210fda0 kind:data(any) addr:0x0210fd20 data_ov004_0210fdb4 kind:data(any) addr:0x0210fd34 data_ov004_0210fdc8 kind:data(any) addr:0x0210fd48 diff --git a/config/usa/arm9/overlays/ov005/delinks.txt b/config/usa/arm9/overlays/ov005/delinks.txt index 6908bc9e..8cbdddd4 100644 --- a/config/usa/arm9/overlays/ov005/delinks.txt +++ b/config/usa/arm9/overlays/ov005/delinks.txt @@ -5,7 +5,7 @@ .data start:0x02112400 end:0x02112ba0 kind:data align:32 .bss start:0x02112ba0 end:0x02112ba0 kind:bss align:32 -src/05/Player/LinkStateMove.cpp: +src/05/Player/LinkStateMove_05.cpp: complete .text start:0x02111350 end:0x02111b40 .rodata start:0x0211232c end:0x0211233c diff --git a/config/usa/arm9/overlays/ov005/symbols.txt b/config/usa/arm9/overlays/ov005/symbols.txt index 2c4e1df0..941eb12b 100644 --- a/config/usa/arm9/overlays/ov005/symbols.txt +++ b/config/usa/arm9/overlays/ov005/symbols.txt @@ -335,6 +335,10 @@ __sinit_ov005_021123bc kind:function(arm,size=0x24) addr:0x0211233c __sinit_ov005_021123e0 kind:function(arm,size=0x1c) addr:0x02112360 __sinit_ov005_021123fc kind:function(arm,size=0x24) addr:0x0211237c __sinit_ov005_02112420 kind:function(arm,size=0x44) addr:0x021123a0 +.p__sinit_ov005_021123bc kind:data(word) addr:0x021123e4 +.p__sinit_ov005_021123e0 kind:data(word) addr:0x021123e8 +.p__sinit_ov005_021123fc kind:data(word) addr:0x021123ec +.p__sinit_ov005_02112420 kind:data(word) addr:0x021123f0 data_ov005_02112480 kind:data(any) addr:0x02112400 data_ov005_02112484 kind:data(any) addr:0x02112404 data_ov005_02112488 kind:data(any) addr:0x02112408 diff --git a/config/usa/arm9/overlays/ov009/symbols.txt b/config/usa/arm9/overlays/ov009/symbols.txt index 5f6b1ae2..01d80f08 100644 --- a/config/usa/arm9/overlays/ov009/symbols.txt +++ b/config/usa/arm9/overlays/ov009/symbols.txt @@ -600,6 +600,13 @@ __sinit_ov009_0211e5c8 kind:function(arm,size=0x2c) addr:0x0211e548 __sinit_ov009_0211e5f4 kind:function(arm,size=0x2c) addr:0x0211e574 __sinit_ov009_0211e620 kind:function(arm,size=0x2c) addr:0x0211e5a0 __sinit_ov009_0211e64c kind:function(arm,size=0x14) addr:0x0211e5cc +.p__sinit_ov009_0211e4a4 kind:data(word) addr:0x0211e5e0 +.p__sinit_ov009_0211e4b8 kind:data(word) addr:0x0211e5e4 +.p__sinit_ov009_0211e5b0 kind:data(word) addr:0x0211e5e8 +.p__sinit_ov009_0211e5c8 kind:data(word) addr:0x0211e5ec +.p__sinit_ov009_0211e5f4 kind:data(word) addr:0x0211e5f0 +.p__sinit_ov009_0211e620 kind:data(word) addr:0x0211e5f4 +.p__sinit_ov009_0211e64c kind:data(word) addr:0x0211e5f8 data_ov009_0211e680 kind:data(any) addr:0x0211e600 data_ov009_0211e684 kind:data(any) addr:0x0211e604 data_ov009_0211e688 kind:data(any) addr:0x0211e608 diff --git a/config/usa/arm9/overlays/ov012/symbols.txt b/config/usa/arm9/overlays/ov012/symbols.txt index 25616797..050711f2 100644 --- a/config/usa/arm9/overlays/ov012/symbols.txt +++ b/config/usa/arm9/overlays/ov012/symbols.txt @@ -1091,6 +1091,16 @@ __sinit_ov012_02135828 kind:function(arm,size=0x38) addr:0x021357a8 __sinit_ov012_02135860 kind:function(arm,size=0x40) addr:0x021357e0 __sinit_ov012_021358a0 kind:function(arm,size=0x40) addr:0x02135820 __sinit_ov012_021358e0 kind:function(arm,size=0x14) addr:0x02135860 +.p__sinit_ov012_021354cc kind:data(word) addr:0x02135874 +.p__sinit_ov012_02135688 kind:data(word) addr:0x02135878 +.p__sinit_ov012_021356b4 kind:data(word) addr:0x0213587c +.p__sinit_ov012_021356e0 kind:data(word) addr:0x02135880 +.p__sinit_ov012_02135720 kind:data(word) addr:0x02135884 +.p__sinit_ov012_021357c0 kind:data(word) addr:0x02135888 +.p__sinit_ov012_02135828 kind:data(word) addr:0x0213588c +.p__sinit_ov012_02135860 kind:data(word) addr:0x02135890 +.p__sinit_ov012_021358a0 kind:data(word) addr:0x02135894 +.p__sinit_ov012_021358e0 kind:data(word) addr:0x02135898 data_ov012_02135920 kind:data(any) addr:0x021358a0 data_ov012_02135924 kind:data(any) addr:0x021358a4 data_ov012_02135928 kind:data(any) addr:0x021358a8 diff --git a/config/usa/arm9/overlays/ov013/symbols.txt b/config/usa/arm9/overlays/ov013/symbols.txt index 20038235..54b30306 100644 --- a/config/usa/arm9/overlays/ov013/symbols.txt +++ b/config/usa/arm9/overlays/ov013/symbols.txt @@ -50,7 +50,7 @@ func_ov013_021149bc kind:function(arm,size=0x24) addr:0x0211493c func_ov013_021149e0 kind:function(arm,size=0x34) addr:0x02114960 func_ov013_02114a14 kind:function(arm,size=0x20) addr:0x02114994 func_ov013_02114a34 kind:function(arm,size=0xd0) addr:0x021149b4 -func_ov013_02114b04 kind:function(arm,size=0x14) addr:0x02114a84 +__sinit_ov013_02114a84 kind:function(arm,size=0x14) addr:0x02114a84 func_ov013_02114b18 kind:function(arm,size=0x4) addr:0x02114a98 func_ov013_02114b1c kind:function(arm,size=0x8) addr:0x02114a9c func_ov013_02114b24 kind:function(arm,size=0xc0) addr:0x02114aa4 @@ -104,6 +104,7 @@ data_ov013_02116094 kind:data(any) addr:0x02116014 data_ov013_021160b4 kind:data(any) addr:0x02116034 data_ov013_021160bc kind:data(any) addr:0x0211603c data_ov013_021160d4 kind:data(any) addr:0x02116054 +.p__sinit_ov013_02114a84 kind:data(word) addr:0x0211606c data_ov013_02116100 kind:data(any) addr:0x02116080 data_ov013_02116128 kind:data(any) addr:0x021160a8 data_ov013_02116130 kind:data(any) addr:0x021160b0 diff --git a/config/usa/arm9/overlays/ov014/relocs.txt b/config/usa/arm9/overlays/ov014/relocs.txt index 42a2431a..71735c51 100644 --- a/config/usa/arm9/overlays/ov014/relocs.txt +++ b/config/usa/arm9/overlays/ov014/relocs.txt @@ -2880,7 +2880,7 @@ from:0x021388b8 kind:arm_call to:0x02081eec module:overlay(0) from:0x02138910 kind:arm_call to:0x021389ac module:overlay(14) from:0x02138918 kind:arm_call to:0x02081eec module:overlay(0) from:0x02138924 kind:load to:0x027e0fc8 module:dtcm -from:0x02138928 kind:load to:0x020e23cc module:overlay(0) +from:0x02138928 kind:load to:0x020e23c4 add:8 module:overlay(0) from:0x0213892c kind:load to:0x027e0e60 module:dtcm from:0x02138930 kind:load to:0x027e0f6c module:dtcm from:0x02138954 kind:arm_call to:0x020bc7f4 module:overlay(0) @@ -3291,7 +3291,7 @@ from:0x0213b930 kind:load to:0x027e0fe0 module:dtcm from:0x0213b944 kind:arm_call to:0x021383a8 module:overlay(14) from:0x0213b960 kind:arm_call to:0x0208cc7c module:overlay(0) from:0x0213b974 kind:arm_call_thumb to:0x020b7e64 module:overlay(0) -from:0x0213b9ac kind:load to:0x02158a00 module:overlay(14) +from:0x0213b9ac kind:load to:0x021589f8 add:8 module:overlay(14) from:0x0213b9b0 kind:load to:0x027e0f68 module:dtcm from:0x0213b9c0 kind:arm_call_thumb to:0x020b3e48 module:overlay(0) from:0x0213b9c8 kind:arm_call to:0x02138484 module:overlay(14) diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index 89287082..05811477 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/config/usa/arm9/overlays/ov014/symbols.txt @@ -846,7 +846,7 @@ func_ov014_0213ccd8 kind:function(arm,size=0xe8) addr:0x0213cc34 func_ov014_0213cdc0 kind:function(arm,size=0x3c) addr:0x0213cd1c func_ov014_0213cdfc kind:function(arm,size=0x5c) addr:0x0213cd58 func_ov014_0213ce58 kind:function(arm,size=0x18) addr:0x0213cdb4 -_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0xbc) addr:0x0213cdcc local +func_ov014_0213ce70 kind:function(arm,size=0xbc) addr:0x0213cdcc func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x0213ce88 _ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x0213cee4 _ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x0213cef8 @@ -1711,6 +1711,85 @@ __sinit_ov014_02155764 kind:function(arm,size=0x38) addr:0x021556c0 __sinit_ov014_0215579c kind:function(arm,size=0x40) addr:0x021556f8 __sinit_ov014_021557dc kind:function(arm,size=0x38) addr:0x02155738 __sinit_ov014_02155814 kind:function(arm,size=0x38) addr:0x02155770 +.p__sinit_ActorArrow kind:data(word) addr:0x021557a8 +.p__sinit_ActorBlast kind:data(word) addr:0x021557ac +.p__sinit_ActorBomb kind:data(word) addr:0x021557b0 +.p__sinit_ov014_021542f4 kind:data(word) addr:0x021557b4 +.p__sinit_ActorRope kind:data(word) addr:0x021557b8 +.p__sinit_ov014_02154374 kind:data(word) addr:0x021557bc +.p__sinit_ov014_021543f8 kind:data(word) addr:0x021557c0 +.p__sinit_ov014_02154430 kind:data(word) addr:0x021557c4 +.p__sinit_ov014_02154468 kind:data(word) addr:0x021557c8 +.p__sinit_ov014_021544a0 kind:data(word) addr:0x021557cc +.p__sinit_ov014_021544d8 kind:data(word) addr:0x021557d0 +.p__sinit_ov014_02154510 kind:data(word) addr:0x021557d4 +.p__sinit_ov014_02154548 kind:data(word) addr:0x021557d8 +.p__sinit_ov014_02154580 kind:data(word) addr:0x021557dc +.p__sinit_ov014_02154598 kind:data(word) addr:0x021557e0 +.p__sinit_ov014_021545d0 kind:data(word) addr:0x021557e4 +.p__sinit_ov014_0215461c kind:data(word) addr:0x021557e8 +.p__sinit_ov014_02154654 kind:data(word) addr:0x021557ec +.p__sinit_ov014_0215468c kind:data(word) addr:0x021557f0 +.p__sinit_ov014_021546c4 kind:data(word) addr:0x021557f4 +.p__sinit_ov014_021546fc kind:data(word) addr:0x021557f8 +.p__sinit_ov014_02154734 kind:data(word) addr:0x021557fc +.p__sinit_ov014_0215476c kind:data(word) addr:0x02155800 +.p__sinit_ov014_021547a4 kind:data(word) addr:0x02155804 +.p__sinit_ov014_021547dc kind:data(word) addr:0x02155808 +.p__sinit_ov014_02154814 kind:data(word) addr:0x0215580c +.p__sinit_ov014_0215484c kind:data(word) addr:0x02155810 +.p__sinit_ov014_02154884 kind:data(word) addr:0x02155814 +.p__sinit_ov014_021548bc kind:data(word) addr:0x02155818 +.p__sinit_ov014_021548f4 kind:data(word) addr:0x0215581c +.p__sinit_ov014_0215492c kind:data(word) addr:0x02155820 +.p__sinit_ov014_02154964 kind:data(word) addr:0x02155824 +.p__sinit_ov014_0215499c kind:data(word) addr:0x02155828 +.p__sinit_ov014_02154a8c kind:data(word) addr:0x0215582c +.p__sinit_ov014_02154ac4 kind:data(word) addr:0x02155830 +.p__sinit_ov014_02154afc kind:data(word) addr:0x02155834 +.p__sinit_ov014_02154b34 kind:data(word) addr:0x02155838 +.p__sinit_ov014_02154b6c kind:data(word) addr:0x0215583c +.p__sinit_ov014_02154ba4 kind:data(word) addr:0x02155840 +.p__sinit_ov014_02154bdc kind:data(word) addr:0x02155844 +.p__sinit_ActorRefill.cpp kind:data(word) addr:0x02155848 local +.p__sinit_ov014_02154d24 kind:data(word) addr:0x0215584c +.p__sinit_ov014_02154efc kind:data(word) addr:0x02155850 +.p__sinit_ov014_02154f3c kind:data(word) addr:0x02155854 +.p__sinit_ov014_02154f7c kind:data(word) addr:0x02155858 +.p__sinit_ov014_02154fbc kind:data(word) addr:0x0215585c +.p__sinit_ov014_02154ffc kind:data(word) addr:0x02155860 +.p__sinit_ov014_0215503c kind:data(word) addr:0x02155864 +.p__sinit_ov014_0215507c kind:data(word) addr:0x02155868 +.p__sinit_ov014_021550bc kind:data(word) addr:0x0215586c +.p__sinit_ov014_021550fc kind:data(word) addr:0x02155870 +.p__sinit_ov014_0215513c kind:data(word) addr:0x02155874 +.p__sinit_ActorRupee.cpp kind:data(word) addr:0x02155878 +.p__sinit_ov014_021551d8 kind:data(word) addr:0x0215587c +.p__sinit_ov014_02155218 kind:data(word) addr:0x02155880 +.p__sinit_ov014_02155250 kind:data(word) addr:0x02155884 +.p__sinit_ov014_0215528c kind:data(word) addr:0x02155888 +.p__sinit_ov014_021552ac kind:data(word) addr:0x0215588c +.p__sinit_ov014_021552e4 kind:data(word) addr:0x02155890 +.p__sinit_ov014_0215531c kind:data(word) addr:0x02155894 +.p__sinit_ov014_02155398 kind:data(word) addr:0x02155898 +.p__sinit_ov014_021553e4 kind:data(word) addr:0x0215589c +.p__sinit_ov014_02155424 kind:data(word) addr:0x021558a0 +.p__sinit_ov014_0215545c kind:data(word) addr:0x021558a4 +.p__sinit_ov014_021554d0 kind:data(word) addr:0x021558a8 +.p__sinit_ov014_02155510 kind:data(word) addr:0x021558ac +.p__sinit_ov014_02155548 kind:data(word) addr:0x021558b0 +.p__sinit_ov014_02155588 kind:data(word) addr:0x021558b4 +.p__sinit_ov014_021555c0 kind:data(word) addr:0x021558b8 +.p__sinit_ov014_021555f8 kind:data(word) addr:0x021558bc +.p__sinit_ov014_02155630 kind:data(word) addr:0x021558c0 +.p__sinit_ov014_02155668 kind:data(word) addr:0x021558c4 +.p__sinit_ov014_021556a0 kind:data(word) addr:0x021558c8 +.p__sinit_ov014_021556ec kind:data(word) addr:0x021558cc +.p__sinit_ov014_0215572c kind:data(word) addr:0x021558d0 +.p__sinit_ov014_02155764 kind:data(word) addr:0x021558d4 +.p__sinit_ov014_0215579c kind:data(word) addr:0x021558d8 +.p__sinit_ov014_021557dc kind:data(word) addr:0x021558dc +.p__sinit_ov014_02155814 kind:data(word) addr:0x021558e0 data_ov014_021559a0 kind:data(any) addr:0x02155900 data_ov014_021559a4 kind:data(any) addr:0x02155904 data_ov014_021559a8 kind:data(any) addr:0x02155908 @@ -1906,7 +1985,7 @@ data_ov014_021589b4 kind:data(any) addr:0x02158914 data_ov014_021589d4 kind:data(any) addr:0x02158934 data_ov014_021589d8 kind:data(any) addr:0x02158938 _ZTV10ActorRupee kind:data(any) addr:0x0215893c -data_ov014_02158aa0 kind:data(any) addr:0x02158a00 +vtable_ov014_02158aa0 kind:data(any) addr:0x021589f8 data_ov014_02158b60 kind:data(any) addr:0x02158ac0 data_ov014_02158b64 kind:data(any) addr:0x02158ac4 data_ov014_02158b68 kind:data(any) addr:0x02158ac8 diff --git a/config/usa/arm9/overlays/ov015/symbols.txt b/config/usa/arm9/overlays/ov015/symbols.txt index 6a81474f..5f4ef353 100644 --- a/config/usa/arm9/overlays/ov015/symbols.txt +++ b/config/usa/arm9/overlays/ov015/symbols.txt @@ -2368,6 +2368,89 @@ __sinit_ov015_021891fc kind:function(arm,size=0x60) addr:0x0218917c __sinit_ov015_0218925c kind:function(arm,size=0x40) addr:0x021891dc __sinit_ov015_0218929c kind:function(arm,size=0x14) addr:0x0218921c __sinit_ov015_021892b0 kind:function(arm,size=0x20) addr:0x02189230 +.p__sinit_ov015_02187384 kind:data(word) addr:0x02189250 +.p__sinit_ov015_021873c8 kind:data(word) addr:0x02189254 +.p__sinit_ov015_02187408 kind:data(word) addr:0x02189258 +.p__sinit_ov015_02187448 kind:data(word) addr:0x0218925c +.p__sinit_ov015_02187488 kind:data(word) addr:0x02189260 +.p__sinit_ov015_021874c8 kind:data(word) addr:0x02189264 +.p__sinit_ov015_02187544 kind:data(word) addr:0x02189268 +.p__sinit_ov015_0218757c kind:data(word) addr:0x0218926c +.p__sinit_ov015_021875b4 kind:data(word) addr:0x02189270 +.p__sinit_ov015_021875ec kind:data(word) addr:0x02189274 +.p__sinit_ov015_02187624 kind:data(word) addr:0x02189278 +.p__sinit_ov015_0218765c kind:data(word) addr:0x0218927c +.p__sinit_ov015_02187694 kind:data(word) addr:0x02189280 +.p__sinit_ov015_021876cc kind:data(word) addr:0x02189284 +.p__sinit_ov015_02187704 kind:data(word) addr:0x02189288 +.p__sinit_ov015_0218773c kind:data(word) addr:0x0218928c +.p__sinit_ov015_02187774 kind:data(word) addr:0x02189290 +.p__sinit_ov015_021877ac kind:data(word) addr:0x02189294 +.p__sinit_ov015_021877e4 kind:data(word) addr:0x02189298 +.p__sinit_ov015_0218781c kind:data(word) addr:0x0218929c +.p__sinit_ov015_02187884 kind:data(word) addr:0x021892a0 +.p__sinit_ov015_021878f8 kind:data(word) addr:0x021892a4 +.p__sinit_ov015_0218793c kind:data(word) addr:0x021892a8 +.p__sinit_ov015_0218798c kind:data(word) addr:0x021892ac +.p__sinit_ov015_021879cc kind:data(word) addr:0x021892b0 +.p__sinit_ov015_021879e0 kind:data(word) addr:0x021892b4 +.p__sinit_ov015_02187a38 kind:data(word) addr:0x021892b8 +.p__sinit_ov015_02187a78 kind:data(word) addr:0x021892bc +.p__sinit_ov015_02187ab8 kind:data(word) addr:0x021892c0 +.p__sinit_ov015_02187b40 kind:data(word) addr:0x021892c4 +.p__sinit_ov015_02187b80 kind:data(word) addr:0x021892c8 +.p__sinit_ov015_02187bf4 kind:data(word) addr:0x021892cc +.p__sinit_ov015_02187c34 kind:data(word) addr:0x021892d0 +.p__sinit_ov015_02187c78 kind:data(word) addr:0x021892d4 +.p__sinit_ov015_02187d20 kind:data(word) addr:0x021892d8 +.p__sinit_ov015_02187d58 kind:data(word) addr:0x021892dc +.p__sinit_ov015_02187d98 kind:data(word) addr:0x021892e0 +.p__sinit_ov015_02187ed4 kind:data(word) addr:0x021892e4 +.p__sinit_ov015_02187f0c kind:data(word) addr:0x021892e8 +.p__sinit_ov015_02187f48 kind:data(word) addr:0x021892ec +.p__sinit_ov015_02187f88 kind:data(word) addr:0x021892f0 +.p__sinit_ov015_02187fc8 kind:data(word) addr:0x021892f4 +.p__sinit_ov015_02188008 kind:data(word) addr:0x021892f8 +.p__sinit_ov015_02188084 kind:data(word) addr:0x021892fc +.p__sinit_ov015_021880c4 kind:data(word) addr:0x02189300 +.p__sinit_ov015_02188108 kind:data(word) addr:0x02189304 +.p__sinit_ov015_02188148 kind:data(word) addr:0x02189308 +.p__sinit_ov015_021881d8 kind:data(word) addr:0x0218930c +.p__sinit_ov015_02188270 kind:data(word) addr:0x02189310 +.p__sinit_ov015_021882b0 kind:data(word) addr:0x02189314 +.p__sinit_ov015_02188304 kind:data(word) addr:0x02189318 +.p__sinit_ov015_0218835c kind:data(word) addr:0x0218931c +.p__sinit_ov015_0218839c kind:data(word) addr:0x02189320 +.p__sinit_ov015_021883d4 kind:data(word) addr:0x02189324 +.p__sinit_ov015_0218840c kind:data(word) addr:0x02189328 +.p__sinit_ov015_02188444 kind:data(word) addr:0x0218932c +.p__sinit_ov015_0218847c kind:data(word) addr:0x02189330 +.p__sinit_ov015_021884f4 kind:data(word) addr:0x02189334 +.p__sinit_ov015_02188534 kind:data(word) addr:0x02189338 +.p__sinit_ov015_02188574 kind:data(word) addr:0x0218933c +.p__sinit_ov015_021885b8 kind:data(word) addr:0x02189340 +.p__sinit_ov015_021885f8 kind:data(word) addr:0x02189344 +.p__sinit_ov015_02188630 kind:data(word) addr:0x02189348 +.p__sinit_ov015_02188668 kind:data(word) addr:0x0218934c +.p__sinit_ov015_021886a8 kind:data(word) addr:0x02189350 +.p__sinit_ov015_02188718 kind:data(word) addr:0x02189354 +.p__sinit_ov015_02188758 kind:data(word) addr:0x02189358 +.p__sinit_ov015_021887cc kind:data(word) addr:0x0218935c +.p__sinit_ov015_02188878 kind:data(word) addr:0x02189360 +.p__sinit_ov015_021888b8 kind:data(word) addr:0x02189364 +.p__sinit_ov015_021888f8 kind:data(word) addr:0x02189368 +.p__sinit_ov015_02188938 kind:data(word) addr:0x0218936c +.p__sinit_ov015_02188978 kind:data(word) addr:0x02189370 +.p__sinit_ov015_02188a54 kind:data(word) addr:0x02189374 +.p__sinit_ov015_02188b58 kind:data(word) addr:0x02189378 +.p__sinit_ov015_02188ec0 kind:data(word) addr:0x0218937c +.p__sinit_ov015_02188f00 kind:data(word) addr:0x02189380 +.p__sinit_ov015_02188f40 kind:data(word) addr:0x02189384 +.p__sinit_ov015_02188f80 kind:data(word) addr:0x02189388 +.p__sinit_ov015_021891fc kind:data(word) addr:0x0218938c +.p__sinit_ov015_0218925c kind:data(word) addr:0x02189390 +.p__sinit_ov015_0218929c kind:data(word) addr:0x02189394 +.p__sinit_ov015_021892b0 kind:data(word) addr:0x02189398 data_ov015_02189420 kind:data(any) addr:0x021893a0 data_ov015_02189448 kind:data(any) addr:0x021893c8 data_ov015_02189450 kind:data(any) addr:0x021893d0 ambiguous diff --git a/config/usa/arm9/overlays/ov016/delinks.txt b/config/usa/arm9/overlays/ov016/delinks.txt index 48290893..f2cdf13c 100644 --- a/config/usa/arm9/overlays/ov016/delinks.txt +++ b/config/usa/arm9/overlays/ov016/delinks.txt @@ -4,5 +4,5 @@ .data start:0x021200e0 end:0x02120120 kind:data align:32 .bss start:0x02120120 end:0x02120120 kind:bss align:32 -src/16_Startup/Game/Game.cpp: +src/16_Startup/Game/Game_16.cpp: .text start:0x0211fc78 end:0x0211fd5c diff --git a/config/usa/arm9/overlays/ov017/symbols.txt b/config/usa/arm9/overlays/ov017/symbols.txt index abb00a22..2471fa83 100644 --- a/config/usa/arm9/overlays/ov017/symbols.txt +++ b/config/usa/arm9/overlays/ov017/symbols.txt @@ -498,6 +498,33 @@ __sinit_ov017_0216b870 kind:function(arm,size=0x38) addr:0x0216b7d0 __sinit_ov017_0216b8a8 kind:function(arm,size=0x38) addr:0x0216b808 __sinit_ov017_0216b8e0 kind:function(arm,size=0x4c) addr:0x0216b840 __sinit_ov017_0216b92c kind:function(arm,size=0x38) addr:0x0216b88c +.p__sinit_ov017_0216b2c4 kind:data(word) addr:0x0216b8c4 +.p__sinit_ov017_0216b308 kind:data(word) addr:0x0216b8c8 +.p__sinit_ov017_0216b340 kind:data(word) addr:0x0216b8cc +.p__sinit_ov017_0216b378 kind:data(word) addr:0x0216b8d0 +.p__sinit_ov017_0216b3b8 kind:data(word) addr:0x0216b8d4 +.p__sinit_ov017_0216b3f8 kind:data(word) addr:0x0216b8d8 +.p__sinit_ov017_0216b438 kind:data(word) addr:0x0216b8dc +.p__sinit_ov017_0216b460 kind:data(word) addr:0x0216b8e0 +.p__sinit_ov017_0216b4a0 kind:data(word) addr:0x0216b8e4 +.p__sinit_ov017_0216b4ec kind:data(word) addr:0x0216b8e8 +.p__sinit_ov017_0216b538 kind:data(word) addr:0x0216b8ec +.p__sinit_ov017_0216b5ac kind:data(word) addr:0x0216b8f0 +.p__sinit_ov017_0216b5e4 kind:data(word) addr:0x0216b8f4 +.p__sinit_ov017_0216b61c kind:data(word) addr:0x0216b8f8 +.p__sinit_ov017_0216b668 kind:data(word) addr:0x0216b8fc +.p__sinit_ov017_0216b6a0 kind:data(word) addr:0x0216b900 +.p__sinit_ov017_0216b6d8 kind:data(word) addr:0x0216b904 +.p__sinit_ov017_0216b710 kind:data(word) addr:0x0216b908 +.p__sinit_ov017_0216b748 kind:data(word) addr:0x0216b90c +.p__sinit_ov017_0216b788 kind:data(word) addr:0x0216b910 +.p__sinit_ov017_0216b7c8 kind:data(word) addr:0x0216b914 +.p__sinit_ov017_0216b800 kind:data(word) addr:0x0216b918 +.p__sinit_ov017_0216b838 kind:data(word) addr:0x0216b91c +.p__sinit_ov017_0216b870 kind:data(word) addr:0x0216b920 +.p__sinit_ov017_0216b8a8 kind:data(word) addr:0x0216b924 +.p__sinit_ov017_0216b8e0 kind:data(word) addr:0x0216b928 +.p__sinit_ov017_0216b92c kind:data(word) addr:0x0216b92c data_ov017_0216b9e8 kind:data(any) addr:0x0216b948 data_ov017_0216ba00 kind:data(any) addr:0x0216b960 data_ov017_0216badc kind:data(any) addr:0x0216ba3c diff --git a/config/usa/arm9/overlays/ov018/symbols.txt b/config/usa/arm9/overlays/ov018/symbols.txt index a539167b..dd47a49e 100644 --- a/config/usa/arm9/overlays/ov018/symbols.txt +++ b/config/usa/arm9/overlays/ov018/symbols.txt @@ -513,6 +513,29 @@ __sinit_ov018_0216bf14 kind:function(arm,size=0x40) addr:0x0216be74 __sinit_ov018_0216bf54 kind:function(arm,size=0x38) addr:0x0216beb4 __sinit_ov018_0216bf8c kind:function(arm,size=0x80) addr:0x0216beec __sinit_ov018_0216c00c kind:function(arm,size=0x40) addr:0x0216bf6c +.p__sinit_ov018_0216b780 kind:data(word) addr:0x0216bfac +.p__sinit_ov018_0216b8b0 kind:data(word) addr:0x0216bfb0 +.p__sinit_ov018_0216bb54 kind:data(word) addr:0x0216bfb4 +.p__sinit_ov018_0216bb8c kind:data(word) addr:0x0216bfb8 +.p__sinit_ov018_0216bbc4 kind:data(word) addr:0x0216bfbc +.p__sinit_ov018_0216bbfc kind:data(word) addr:0x0216bfc0 +.p__sinit_ov018_0216bc34 kind:data(word) addr:0x0216bfc4 +.p__sinit_ov018_0216bc6c kind:data(word) addr:0x0216bfc8 +.p__sinit_ov018_0216bca4 kind:data(word) addr:0x0216bfcc +.p__sinit_ov018_0216bcdc kind:data(word) addr:0x0216bfd0 +.p__sinit_ov018_0216bd14 kind:data(word) addr:0x0216bfd4 +.p__sinit_ov018_0216bd4c kind:data(word) addr:0x0216bfd8 +.p__sinit_ov018_0216bd84 kind:data(word) addr:0x0216bfdc +.p__sinit_ov018_0216bdbc kind:data(word) addr:0x0216bfe0 +.p__sinit_ov018_0216bdf4 kind:data(word) addr:0x0216bfe4 +.p__sinit_ov018_0216be2c kind:data(word) addr:0x0216bfe8 +.p__sinit_ov018_0216be64 kind:data(word) addr:0x0216bfec +.p__sinit_ov018_0216be9c kind:data(word) addr:0x0216bff0 +.p__sinit_ov018_0216bed4 kind:data(word) addr:0x0216bff4 +.p__sinit_ov018_0216bf14 kind:data(word) addr:0x0216bff8 +.p__sinit_ov018_0216bf54 kind:data(word) addr:0x0216bffc +.p__sinit_ov018_0216bf8c kind:data(word) addr:0x0216c000 +.p__sinit_ov018_0216c00c kind:data(word) addr:0x0216c004 data_ov018_0216c0c0 kind:data(any) addr:0x0216c020 _ZTV12MapOverworld kind:data(any) addr:0x0216c040 data_ov018_0216c1a4 kind:data(any) addr:0x0216c104 diff --git a/config/usa/arm9/overlays/ov019/symbols.txt b/config/usa/arm9/overlays/ov019/symbols.txt index 00428058..b466877d 100644 --- a/config/usa/arm9/overlays/ov019/symbols.txt +++ b/config/usa/arm9/overlays/ov019/symbols.txt @@ -250,6 +250,15 @@ __sinit_ov019_02176118 kind:function(arm,size=0x38) addr:0x02176078 __sinit_ov019_02176150 kind:function(arm,size=0x38) addr:0x021760b0 __sinit_ov019_02176188 kind:function(arm,size=0x10c) addr:0x021760e8 __sinit_ov019_02176294 kind:function(arm,size=0x40) addr:0x021761f4 +.p__sinit_ov019_02175f04 kind:data(word) addr:0x02176234 +.p__sinit_ov019_02176020 kind:data(word) addr:0x02176238 +.p__sinit_ov019_02176060 kind:data(word) addr:0x0217623c +.p__sinit_ov019_021760a0 kind:data(word) addr:0x02176240 +.p__sinit_ov019_021760e0 kind:data(word) addr:0x02176244 +.p__sinit_ov019_02176118 kind:data(word) addr:0x02176248 +.p__sinit_ov019_02176150 kind:data(word) addr:0x0217624c +.p__sinit_ov019_02176188 kind:data(word) addr:0x02176250 +.p__sinit_ov019_02176294 kind:data(word) addr:0x02176254 data_ov019_02176300 kind:data(any) addr:0x02176260 data_ov019_02176304 kind:data(any) addr:0x02176264 data_ov019_02176308 kind:data(any) addr:0x02176268 diff --git a/config/usa/arm9/overlays/ov020/symbols.txt b/config/usa/arm9/overlays/ov020/symbols.txt index 021d1f54..566af3b1 100644 --- a/config/usa/arm9/overlays/ov020/symbols.txt +++ b/config/usa/arm9/overlays/ov020/symbols.txt @@ -302,6 +302,23 @@ __sinit_ov020_021781a0 kind:function(arm,size=0x40) addr:0x02178100 __sinit_ov020_021781e0 kind:function(arm,size=0x40) addr:0x02178140 __sinit_ov020_02178220 kind:function(arm,size=0x38) addr:0x02178180 __sinit_ov020_02178258 kind:function(arm,size=0x40) addr:0x021781b8 +.p__sinit_ov020_02177af4 kind:data(word) addr:0x021781f8 +.p__sinit_ov020_02177c18 kind:data(word) addr:0x021781fc +.p__sinit_ov020_02177d24 kind:data(word) addr:0x02178200 +.p__sinit_ov020_02177d64 kind:data(word) addr:0x02178204 +.p__sinit_ov020_02177da4 kind:data(word) addr:0x02178208 +.p__sinit_ov020_02177de4 kind:data(word) addr:0x0217820c +.p__sinit_ov020_02177efc kind:data(word) addr:0x02178210 +.p__sinit_ov020_02177f3c kind:data(word) addr:0x02178214 +.p__sinit_ov020_02177f7c kind:data(word) addr:0x02178218 +.p__sinit_ov020_021780a8 kind:data(word) addr:0x0217821c +.p__sinit_ov020_021780e0 kind:data(word) addr:0x02178220 +.p__sinit_ov020_02178120 kind:data(word) addr:0x02178224 +.p__sinit_ov020_02178160 kind:data(word) addr:0x02178228 +.p__sinit_ov020_021781a0 kind:data(word) addr:0x0217822c +.p__sinit_ov020_021781e0 kind:data(word) addr:0x02178230 +.p__sinit_ov020_02178220 kind:data(word) addr:0x02178234 +.p__sinit_ov020_02178258 kind:data(word) addr:0x02178238 data_ov020_021782e0 kind:data(any) addr:0x02178240 data_ov020_021782e4 kind:data(any) addr:0x02178244 data_ov020_021782e8 kind:data(any) addr:0x02178248 diff --git a/config/usa/arm9/overlays/ov021/symbols.txt b/config/usa/arm9/overlays/ov021/symbols.txt index 54b3d275..4cb3c2dd 100644 --- a/config/usa/arm9/overlays/ov021/symbols.txt +++ b/config/usa/arm9/overlays/ov021/symbols.txt @@ -147,6 +147,13 @@ __sinit_ov021_02170e74 kind:function(arm,size=0x40) addr:0x02170dd4 __sinit_ov021_02170eb4 kind:function(arm,size=0x38) addr:0x02170e14 __sinit_ov021_02170eec kind:function(arm,size=0x40) addr:0x02170e4c __sinit_ov021_02170f2c kind:function(arm,size=0x38) addr:0x02170e8c +.p__sinit_ov021_02170cec kind:data(word) addr:0x02170ec4 +.p__sinit_ov021_02170d24 kind:data(word) addr:0x02170ec8 +.p__sinit_ov021_02170d64 kind:data(word) addr:0x02170ecc +.p__sinit_ov021_02170e74 kind:data(word) addr:0x02170ed0 +.p__sinit_ov021_02170eb4 kind:data(word) addr:0x02170ed4 +.p__sinit_ov021_02170eec kind:data(word) addr:0x02170ed8 +.p__sinit_ov021_02170f2c kind:data(word) addr:0x02170edc data_ov021_02170fa0 kind:data(any) addr:0x02170f00 data_ov021_02170fa4 kind:data(any) addr:0x02170f04 data_ov021_02170fa8 kind:data(any) addr:0x02170f08 diff --git a/config/usa/arm9/overlays/ov022/symbols.txt b/config/usa/arm9/overlays/ov022/symbols.txt index eafda48b..46537865 100644 --- a/config/usa/arm9/overlays/ov022/symbols.txt +++ b/config/usa/arm9/overlays/ov022/symbols.txt @@ -372,6 +372,23 @@ __sinit_ov022_02178e80 kind:function(arm,size=0x90) addr:0x02178de0 __sinit_ov022_02178f10 kind:function(arm,size=0x38) addr:0x02178e70 __sinit_ov022_02178f48 kind:function(arm,size=0x38) addr:0x02178ea8 __sinit_ov022_02178f80 kind:function(arm,size=0x74) addr:0x02178ee0 +.p__sinit_ov022_021789c8 kind:data(word) addr:0x02178f54 +.p__sinit_ov022_02178a08 kind:data(word) addr:0x02178f58 +.p__sinit_ov022_02178a40 kind:data(word) addr:0x02178f5c +.p__sinit_ov022_02178a78 kind:data(word) addr:0x02178f60 +.p__sinit_ov022_02178b68 kind:data(word) addr:0x02178f64 +.p__sinit_ov022_02178c98 kind:data(word) addr:0x02178f68 +.p__sinit_ov022_02178cd8 kind:data(word) addr:0x02178f6c +.p__sinit_ov022_02178d18 kind:data(word) addr:0x02178f70 +.p__sinit_ov022_02178d58 kind:data(word) addr:0x02178f74 +.p__sinit_ov022_02178d90 kind:data(word) addr:0x02178f78 +.p__sinit_ov022_02178dd0 kind:data(word) addr:0x02178f7c +.p__sinit_ov022_02178e10 kind:data(word) addr:0x02178f80 +.p__sinit_ov022_02178e48 kind:data(word) addr:0x02178f84 +.p__sinit_ov022_02178e80 kind:data(word) addr:0x02178f88 +.p__sinit_ov022_02178f10 kind:data(word) addr:0x02178f8c +.p__sinit_ov022_02178f48 kind:data(word) addr:0x02178f90 +.p__sinit_ov022_02178f80 kind:data(word) addr:0x02178f94 data_ov022_02179048 kind:data(any) addr:0x02178fa8 data_ov022_02179104 kind:data(any) addr:0x02179064 data_ov022_02179198 kind:data(any) addr:0x021790f8 diff --git a/config/usa/arm9/overlays/ov023/symbols.txt b/config/usa/arm9/overlays/ov023/symbols.txt index 4986a396..4b44b61d 100644 --- a/config/usa/arm9/overlays/ov023/symbols.txt +++ b/config/usa/arm9/overlays/ov023/symbols.txt @@ -338,6 +338,19 @@ __sinit_ov023_02179bf8 kind:function(arm,size=0x40) addr:0x02179b58 __sinit_ov023_02179c38 kind:function(arm,size=0x38) addr:0x02179b98 __sinit_ov023_02179c70 kind:function(arm,size=0x38) addr:0x02179bd0 __sinit_ov023_02179ca8 kind:function(arm,size=0x38) addr:0x02179c08 +.p__sinit_ov023_02179698 kind:data(word) addr:0x02179c40 +.p__sinit_ov023_021797ec kind:data(word) addr:0x02179c44 +.p__sinit_ov023_0217984c kind:data(word) addr:0x02179c48 +.p__sinit_ov023_02179978 kind:data(word) addr:0x02179c4c +.p__sinit_ov023_02179998 kind:data(word) addr:0x02179c50 +.p__sinit_ov023_021799d8 kind:data(word) addr:0x02179c54 +.p__sinit_ov023_02179b08 kind:data(word) addr:0x02179c58 +.p__sinit_ov023_02179b48 kind:data(word) addr:0x02179c5c +.p__sinit_ov023_02179b80 kind:data(word) addr:0x02179c60 +.p__sinit_ov023_02179bf8 kind:data(word) addr:0x02179c64 +.p__sinit_ov023_02179c38 kind:data(word) addr:0x02179c68 +.p__sinit_ov023_02179c70 kind:data(word) addr:0x02179c6c +.p__sinit_ov023_02179ca8 kind:data(word) addr:0x02179c70 data_ov023_02179d20 kind:data(any) addr:0x02179c80 data_ov023_02179db8 kind:data(any) addr:0x02179d18 data_ov023_02179dc4 kind:data(any) addr:0x02179d24 diff --git a/config/usa/arm9/overlays/ov024/symbols.txt b/config/usa/arm9/overlays/ov024/symbols.txt index 19b64bfb..1943e478 100644 --- a/config/usa/arm9/overlays/ov024/symbols.txt +++ b/config/usa/arm9/overlays/ov024/symbols.txt @@ -362,6 +362,21 @@ __sinit_ov024_02179d34 kind:function(arm,size=0x38) addr:0x02179c94 __sinit_ov024_02179d6c kind:function(arm,size=0x40) addr:0x02179ccc __sinit_ov024_02179dac kind:function(arm,size=0x38) addr:0x02179d0c __sinit_ov024_02179de4 kind:function(arm,size=0x38) addr:0x02179d44 +.p__sinit_ov024_021795d0 kind:data(word) addr:0x02179d7c +.p__sinit_ov024_02179608 kind:data(word) addr:0x02179d80 +.p__sinit_ov024_02179714 kind:data(word) addr:0x02179d84 +.p__sinit_ov024_02179788 kind:data(word) addr:0x02179d88 +.p__sinit_ov024_021797c0 kind:data(word) addr:0x02179d8c +.p__sinit_ov024_02179868 kind:data(word) addr:0x02179d90 +.p__sinit_ov024_02179974 kind:data(word) addr:0x02179d94 +.p__sinit_ov024_02179a8c kind:data(word) addr:0x02179d98 +.p__sinit_ov024_02179ba4 kind:data(word) addr:0x02179d9c +.p__sinit_ov024_02179cbc kind:data(word) addr:0x02179da0 +.p__sinit_ov024_02179cfc kind:data(word) addr:0x02179da4 +.p__sinit_ov024_02179d34 kind:data(word) addr:0x02179da8 +.p__sinit_ov024_02179d6c kind:data(word) addr:0x02179dac +.p__sinit_ov024_02179dac kind:data(word) addr:0x02179db0 +.p__sinit_ov024_02179de4 kind:data(word) addr:0x02179db4 data_ov024_02179e68 kind:data(any) addr:0x02179dc8 data_ov024_02179ef4 kind:data(any) addr:0x02179e54 data_ov024_02179efc kind:data(any) addr:0x02179e5c diff --git a/config/usa/arm9/overlays/ov025/symbols.txt b/config/usa/arm9/overlays/ov025/symbols.txt index ff03c236..4b51b0c3 100644 --- a/config/usa/arm9/overlays/ov025/symbols.txt +++ b/config/usa/arm9/overlays/ov025/symbols.txt @@ -291,7 +291,17 @@ __sinit_ov025_021799cc kind:function(arm,size=0x40) addr:0x0217992c __sinit_ov025_02179a0c kind:function(arm,size=0x40) addr:0x0217996c __sinit_ov025_02179a4c kind:function(arm,size=0x40) addr:0x021799ac __sinit_ov025_02179a8c kind:function(arm,size=0x10c) addr:0x021799ec -data_ov025_02179bb0 kind:data(any) addr:0x02179b10 ambiguous +.p__sinit_ov025_02179680 kind:data(word) addr:0x02179af8 +.p__sinit_ov025_02179784 kind:data(word) addr:0x02179afc +.p__sinit_ov025_021797c4 kind:data(word) addr:0x02179b00 +.p__sinit_ov025_02179804 kind:data(word) addr:0x02179b04 +.p__sinit_ov025_02179844 kind:data(word) addr:0x02179b08 +.p__sinit_ov025_02179884 kind:data(word) addr:0x02179b0c +.p__sinit_ov025_021798bc kind:data(word) addr:0x02179b10 +.p__sinit_ov025_021799cc kind:data(word) addr:0x02179b14 +.p__sinit_ov025_02179a0c kind:data(word) addr:0x02179b18 +.p__sinit_ov025_02179a4c kind:data(word) addr:0x02179b1c +.p__sinit_ov025_02179a8c kind:data(word) addr:0x02179b20 data_ov025_02179be0 kind:data(any) addr:0x02179b40 data_ov025_02179bf8 kind:data(any) addr:0x02179b58 ambiguous data_ov025_02179c18 kind:data(any) addr:0x02179b78 ambiguous diff --git a/config/usa/arm9/overlays/ov026/symbols.txt b/config/usa/arm9/overlays/ov026/symbols.txt index 18e880ba..23d3e893 100644 --- a/config/usa/arm9/overlays/ov026/symbols.txt +++ b/config/usa/arm9/overlays/ov026/symbols.txt @@ -464,6 +464,21 @@ __sinit_ov026_02179de4 kind:function(arm,size=0x18c) addr:0x02179d44 __sinit_ov026_02179f70 kind:function(arm,size=0x40) addr:0x02179ed0 __sinit_ov026_02179fb0 kind:function(arm,size=0x38) addr:0x02179f10 __sinit_ov026_02179fe8 kind:function(arm,size=0x38) addr:0x02179f48 +.p__sinit_ov026_021797dc kind:data(word) addr:0x02179f80 +.p__sinit_ov026_02179a58 kind:data(word) addr:0x02179f84 +.p__sinit_ov026_02179a90 kind:data(word) addr:0x02179f88 +.p__sinit_ov026_02179bac kind:data(word) addr:0x02179f8c +.p__sinit_ov026_02179be4 kind:data(word) addr:0x02179f90 +.p__sinit_ov026_02179c1c kind:data(word) addr:0x02179f94 +.p__sinit_ov026_02179c54 kind:data(word) addr:0x02179f98 +.p__sinit_ov026_02179c8c kind:data(word) addr:0x02179f9c +.p__sinit_ov026_02179d20 kind:data(word) addr:0x02179fa0 +.p__sinit_ov026_02179d58 kind:data(word) addr:0x02179fa4 +.p__sinit_ov026_02179d90 kind:data(word) addr:0x02179fa8 +.p__sinit_ov026_02179de4 kind:data(word) addr:0x02179fac +.p__sinit_ov026_02179f70 kind:data(word) addr:0x02179fb0 +.p__sinit_ov026_02179fb0 kind:data(word) addr:0x02179fb4 +.p__sinit_ov026_02179fe8 kind:data(word) addr:0x02179fb8 data_ov026_0217a068 kind:data(any) addr:0x02179fc8 data_ov026_0217a0cc kind:data(any) addr:0x0217a02c ambiguous data_ov026_0217a0ec kind:data(any) addr:0x0217a04c ambiguous diff --git a/config/usa/arm9/overlays/ov027/symbols.txt b/config/usa/arm9/overlays/ov027/symbols.txt index f5266cf8..aa671788 100644 --- a/config/usa/arm9/overlays/ov027/symbols.txt +++ b/config/usa/arm9/overlays/ov027/symbols.txt @@ -266,6 +266,14 @@ __sinit_ov027_021792a0 kind:function(arm,size=0x40) addr:0x02179200 __sinit_ov027_021792e0 kind:function(arm,size=0xdc) addr:0x02179240 __sinit_ov027_021793bc kind:function(arm,size=0x80) addr:0x0217931c __sinit_ov027_0217943c kind:function(arm,size=0x38) addr:0x0217939c +.p__sinit_ov027_0217913c kind:data(word) addr:0x021793d4 +.p__sinit_ov027_02179190 kind:data(word) addr:0x021793d8 +.p__sinit_ov027_021791d0 kind:data(word) addr:0x021793dc +.p__sinit_ov027_02179210 kind:data(word) addr:0x021793e0 +.p__sinit_ov027_021792a0 kind:data(word) addr:0x021793e4 +.p__sinit_ov027_021792e0 kind:data(word) addr:0x021793e8 +.p__sinit_ov027_021793bc kind:data(word) addr:0x021793ec +.p__sinit_ov027_0217943c kind:data(word) addr:0x021793f0 data_ov027_021794a0 kind:data(any) addr:0x02179400 data_ov027_021794a4 kind:data(any) addr:0x02179404 data_ov027_021794a8 kind:data(any) addr:0x02179408 diff --git a/config/usa/arm9/overlays/ov028/symbols.txt b/config/usa/arm9/overlays/ov028/symbols.txt index d7d25037..5eafba92 100644 --- a/config/usa/arm9/overlays/ov028/symbols.txt +++ b/config/usa/arm9/overlays/ov028/symbols.txt @@ -369,6 +369,18 @@ __sinit_ov028_02178790 kind:function(arm,size=0x40) addr:0x021786f0 __sinit_ov028_021787d0 kind:function(arm,size=0x40) addr:0x02178730 __sinit_ov028_02178810 kind:function(arm,size=0x44) addr:0x02178770 __sinit_ov028_02178854 kind:function(arm,size=0x40) addr:0x021787b4 +.p__sinit_ov028_02178504 kind:data(word) addr:0x021787f4 +.p__sinit_ov028_02178544 kind:data(word) addr:0x021787f8 +.p__sinit_ov028_02178620 kind:data(word) addr:0x021787fc +.p__sinit_ov028_02178660 kind:data(word) addr:0x02178800 +.p__sinit_ov028_02178698 kind:data(word) addr:0x02178804 +.p__sinit_ov028_021786d0 kind:data(word) addr:0x02178808 +.p__sinit_ov028_02178710 kind:data(word) addr:0x0217880c +.p__sinit_ov028_02178750 kind:data(word) addr:0x02178810 +.p__sinit_ov028_02178790 kind:data(word) addr:0x02178814 +.p__sinit_ov028_021787d0 kind:data(word) addr:0x02178818 +.p__sinit_ov028_02178810 kind:data(word) addr:0x0217881c +.p__sinit_ov028_02178854 kind:data(word) addr:0x02178820 data_ov028_021788e0 kind:data(any) addr:0x02178840 data_ov028_021788e4 kind:data(any) addr:0x02178844 data_ov028_021788e8 kind:data(any) addr:0x02178848 diff --git a/config/usa/arm9/overlays/ov029/symbols.txt b/config/usa/arm9/overlays/ov029/symbols.txt index c57f80cc..53afb7e0 100644 --- a/config/usa/arm9/overlays/ov029/symbols.txt +++ b/config/usa/arm9/overlays/ov029/symbols.txt @@ -300,6 +300,19 @@ __sinit_ov029_02179744 kind:function(arm,size=0x18) addr:0x021796a4 __sinit_ov029_0217975c kind:function(arm,size=0x40) addr:0x021796bc __sinit_ov029_0217979c kind:function(arm,size=0x40) addr:0x021796fc __sinit_ov029_021797dc kind:function(arm,size=0x48) addr:0x0217973c +.p__sinit_ov029_021794b0 kind:data(word) addr:0x02179784 +.p__sinit_ov029_021794dc kind:data(word) addr:0x02179788 +.p__sinit_ov029_0217958c kind:data(word) addr:0x0217978c +.p__sinit_ov029_021795cc kind:data(word) addr:0x02179790 +.p__sinit_ov029_0217960c kind:data(word) addr:0x02179794 +.p__sinit_ov029_0217964c kind:data(word) addr:0x02179798 +.p__sinit_ov029_0217968c kind:data(word) addr:0x0217979c +.p__sinit_ov029_021796cc kind:data(word) addr:0x021797a0 +.p__sinit_ov029_02179704 kind:data(word) addr:0x021797a4 +.p__sinit_ov029_02179744 kind:data(word) addr:0x021797a8 +.p__sinit_ov029_0217975c kind:data(word) addr:0x021797ac +.p__sinit_ov029_0217979c kind:data(word) addr:0x021797b0 +.p__sinit_ov029_021797dc kind:data(word) addr:0x021797b4 data_ov029_02179868 kind:data(any) addr:0x021797c8 data_ov029_02179878 kind:data(any) addr:0x021797d8 data_ov029_0217987c kind:data(any) addr:0x021797dc diff --git a/config/usa/arm9/overlays/ov030/symbols.txt b/config/usa/arm9/overlays/ov030/symbols.txt index aaf1383c..387220b5 100644 --- a/config/usa/arm9/overlays/ov030/symbols.txt +++ b/config/usa/arm9/overlays/ov030/symbols.txt @@ -310,6 +310,8 @@ data_ov030_021887f0 kind:data(any) addr:0x02188750 data_ov030_021887fc kind:data(any) addr:0x0218875c __sinit_ov030_02188824 kind:function(arm,size=0x1c8) addr:0x02188784 __sinit_ov030_021889ec kind:function(arm,size=0x40) addr:0x0218894c +.p__sinit_ov030_02188824 kind:data(word) addr:0x0218898c +.p__sinit_ov030_021889ec kind:data(word) addr:0x02188990 data_ov030_02188a48 kind:data(any) addr:0x021889a8 data_ov030_02188a68 kind:data(any) addr:0x021889c8 data_ov030_02188a7c kind:data(any) addr:0x021889dc diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt index 5bb8c8a1..7c07e509 100644 --- a/config/usa/arm9/overlays/ov031/symbols.txt +++ b/config/usa/arm9/overlays/ov031/symbols.txt @@ -310,6 +310,10 @@ __sinit_ov031_02181b6c kind:function(arm,size=0x3ec) addr:0x02181acc __sinit_ov031_02181f58 kind:function(arm,size=0xa8) addr:0x02181eb8 __sinit_ov031_02182000 kind:function(arm,size=0x40) addr:0x02181f60 __sinit_ov031_02182040 kind:function(arm,size=0x40) addr:0x02181fa0 +.p__sinit_ov031_02181b6c kind:data(word) addr:0x02181fe0 +.p__sinit_ov031_02181f58 kind:data(word) addr:0x02181fe4 +.p__sinit_ov031_02182000 kind:data(word) addr:0x02181fe8 +.p__sinit_ov031_02182040 kind:data(word) addr:0x02181fec data_ov031_021820a0 kind:data(any) addr:0x02182000 data_ov031_021820a4 kind:data(any) addr:0x02182004 data_ov031_021820a8 kind:data(any) addr:0x02182008 diff --git a/config/usa/arm9/overlays/ov032/symbols.txt b/config/usa/arm9/overlays/ov032/symbols.txt index 47a394f4..f3465568 100644 --- a/config/usa/arm9/overlays/ov032/symbols.txt +++ b/config/usa/arm9/overlays/ov032/symbols.txt @@ -274,6 +274,14 @@ __sinit_ov032_02185130 kind:function(arm,size=0x38) addr:0x02185090 __sinit_ov032_02185168 kind:function(arm,size=0x110) addr:0x021850c8 __sinit_ov032_02185278 kind:function(arm,size=0x110) addr:0x021851d8 __sinit_ov032_02185388 kind:function(arm,size=0x40) addr:0x021852e8 +.p__sinit_ov032_02184d3c kind:data(word) addr:0x02185328 +.p__sinit_ov032_02184e68 kind:data(word) addr:0x0218532c +.p__sinit_ov032_02184f90 kind:data(word) addr:0x02185330 +.p__sinit_ov032_021850b8 kind:data(word) addr:0x02185334 +.p__sinit_ov032_02185130 kind:data(word) addr:0x02185338 +.p__sinit_ov032_02185168 kind:data(word) addr:0x0218533c +.p__sinit_ov032_02185278 kind:data(word) addr:0x02185340 +.p__sinit_ov032_02185388 kind:data(word) addr:0x02185344 data_ov032_02185400 kind:data(any) addr:0x02185360 data_ov032_02185410 kind:data(any) addr:0x02185370 data_ov032_02185420 kind:data(any) addr:0x02185380 diff --git a/config/usa/arm9/overlays/ov033/symbols.txt b/config/usa/arm9/overlays/ov033/symbols.txt index ea6586bd..a0887953 100644 --- a/config/usa/arm9/overlays/ov033/symbols.txt +++ b/config/usa/arm9/overlays/ov033/symbols.txt @@ -119,6 +119,11 @@ __sinit_ov033_0217fcb0 kind:function(arm,size=0x40) addr:0x0217fc10 __sinit_ov033_0217fcf0 kind:function(arm,size=0x40) addr:0x0217fc50 __sinit_ov033_0217fd30 kind:function(arm,size=0x124) addr:0x0217fc90 __sinit_ov033_0217fe54 kind:function(arm,size=0x40) addr:0x0217fdb4 +.p__sinit_ov033_0217fb90 kind:data(word) addr:0x0217fdf4 +.p__sinit_ov033_0217fcb0 kind:data(word) addr:0x0217fdf8 +.p__sinit_ov033_0217fcf0 kind:data(word) addr:0x0217fdfc +.p__sinit_ov033_0217fd30 kind:data(word) addr:0x0217fe00 +.p__sinit_ov033_0217fe54 kind:data(word) addr:0x0217fe04 data_ov033_0217fec0 kind:data(any) addr:0x0217fe20 data_ov033_0217ff48 kind:data(any) addr:0x0217fea8 data_ov033_02180058 kind:data(any) addr:0x0217ffb8 diff --git a/config/usa/arm9/overlays/ov034/symbols.txt b/config/usa/arm9/overlays/ov034/symbols.txt index 32fb857a..7c0a14d8 100644 --- a/config/usa/arm9/overlays/ov034/symbols.txt +++ b/config/usa/arm9/overlays/ov034/symbols.txt @@ -159,6 +159,9 @@ data_ov034_021857b4 kind:data(any) addr:0x02185714 __sinit_ov034_02185818 kind:function(arm,size=0x15c) addr:0x02185778 __sinit_ov034_02185974 kind:function(arm,size=0x68) addr:0x021858d4 __sinit_ov034_021859dc kind:function(arm,size=0x88) addr:0x0218593c +.p__sinit_ov034_02185818 kind:data(word) addr:0x021859c4 +.p__sinit_ov034_02185974 kind:data(word) addr:0x021859c8 +.p__sinit_ov034_021859dc kind:data(word) addr:0x021859cc data_ov034_02185a80 kind:data(any) addr:0x021859e0 data_ov034_02185a84 kind:data(any) addr:0x021859e4 data_ov034_02185a88 kind:data(any) addr:0x021859e8 diff --git a/config/usa/arm9/overlays/ov035/symbols.txt b/config/usa/arm9/overlays/ov035/symbols.txt index b4167014..9d802656 100644 --- a/config/usa/arm9/overlays/ov035/symbols.txt +++ b/config/usa/arm9/overlays/ov035/symbols.txt @@ -183,6 +183,10 @@ __sinit_ov035_02185668 kind:function(arm,size=0x88) addr:0x021855c8 __sinit_ov035_021856f0 kind:function(arm,size=0x40) addr:0x02185650 __sinit_ov035_02185730 kind:function(arm,size=0x190) addr:0x02185690 __sinit_ov035_021858c0 kind:function(arm,size=0x40) addr:0x02185820 +.p__sinit_ov035_02185668 kind:data(word) addr:0x02185860 +.p__sinit_ov035_021856f0 kind:data(word) addr:0x02185864 +.p__sinit_ov035_02185730 kind:data(word) addr:0x02185868 +.p__sinit_ov035_021858c0 kind:data(word) addr:0x0218586c data_ov035_02185920 kind:data(any) addr:0x02185880 data_ov035_02185934 kind:data(any) addr:0x02185894 data_ov035_02185948 kind:data(any) addr:0x021858a8 diff --git a/config/usa/arm9/overlays/ov036/symbols.txt b/config/usa/arm9/overlays/ov036/symbols.txt index 18094bf9..a8699579 100644 --- a/config/usa/arm9/overlays/ov036/symbols.txt +++ b/config/usa/arm9/overlays/ov036/symbols.txt @@ -164,6 +164,8 @@ data_ov036_02186b94 kind:data(any) addr:0x02186af4 data_ov036_02186ba8 kind:data(any) addr:0x02186b08 __sinit_ov036_02186bb4 kind:function(arm,size=0x40) addr:0x02186b14 __sinit_ov036_02186bf4 kind:function(arm,size=0x40) addr:0x02186b54 +.p__sinit_ov036_02186bb4 kind:data(word) addr:0x02186b94 +.p__sinit_ov036_02186bf4 kind:data(word) addr:0x02186b98 data_ov036_02186c40 kind:data(any) addr:0x02186ba0 data_ov036_02186c44 kind:data(any) addr:0x02186ba4 data_ov036_02186c48 kind:data(any) addr:0x02186ba8 diff --git a/config/usa/arm9/overlays/ov037/symbols.txt b/config/usa/arm9/overlays/ov037/symbols.txt index 8c7a0017..9bf58a80 100644 --- a/config/usa/arm9/overlays/ov037/symbols.txt +++ b/config/usa/arm9/overlays/ov037/symbols.txt @@ -311,6 +311,11 @@ __sinit_ov037_021887b4 kind:function(arm,size=0x68) addr:0x02188714 __sinit_ov037_0218881c kind:function(arm,size=0x40) addr:0x0218877c __sinit_ov037_0218885c kind:function(arm,size=0x40) addr:0x021887bc __sinit_ov037_0218889c kind:function(arm,size=0x118) addr:0x021887fc +.p__sinit_ov037_02188690 kind:data(word) addr:0x02188914 +.p__sinit_ov037_021887b4 kind:data(word) addr:0x02188918 +.p__sinit_ov037_0218881c kind:data(word) addr:0x0218891c +.p__sinit_ov037_0218885c kind:data(word) addr:0x02188920 +.p__sinit_ov037_0218889c kind:data(word) addr:0x02188924 data_ov037_021889e0 kind:data(any) addr:0x02188940 data_ov037_021889e4 kind:data(any) addr:0x02188944 data_ov037_021889e8 kind:data(any) addr:0x02188948 diff --git a/config/usa/arm9/overlays/ov038/symbols.txt b/config/usa/arm9/overlays/ov038/symbols.txt index 85de027d..0655235c 100644 --- a/config/usa/arm9/overlays/ov038/symbols.txt +++ b/config/usa/arm9/overlays/ov038/symbols.txt @@ -171,6 +171,8 @@ data_ov038_02188ac4 kind:data(any) addr:0x02188a24 data_ov038_02188ad8 kind:data(any) addr:0x02188a38 __sinit_ov038_02188ae4 kind:function(arm,size=0x13c) addr:0x02188a44 __sinit_ov038_02188c20 kind:function(arm,size=0x40) addr:0x02188b80 +.p__sinit_ov038_02188ae4 kind:data(word) addr:0x02188bc0 +.p__sinit_ov038_02188c20 kind:data(word) addr:0x02188bc4 data_ov038_02188c80 kind:data(any) addr:0x02188be0 data_ov038_02188c84 kind:data(any) addr:0x02188be4 data_ov038_02188c88 kind:data(any) addr:0x02188be8 diff --git a/config/usa/arm9/overlays/ov039/symbols.txt b/config/usa/arm9/overlays/ov039/symbols.txt index dd42a580..c7015111 100644 --- a/config/usa/arm9/overlays/ov039/symbols.txt +++ b/config/usa/arm9/overlays/ov039/symbols.txt @@ -236,6 +236,7 @@ data_ov039_0218692c kind:data(any) addr:0x0218688c data_ov039_02186940 kind:data(any) addr:0x021868a0 data_ov039_02186954 kind:data(any) addr:0x021868b4 __sinit_ov039_02186968 kind:function(arm,size=0x54) addr:0x021868c8 +.p__sinit_ov039_02186968 kind:data(word) addr:0x0218691c data_ov039_021869e0 kind:data(any) addr:0x02186940 data_ov039_021869e4 kind:data(any) addr:0x02186944 data_ov039_021869e8 kind:data(any) addr:0x02186948 diff --git a/config/usa/arm9/overlays/ov040/symbols.txt b/config/usa/arm9/overlays/ov040/symbols.txt index 8b2e525e..3f148ca4 100644 --- a/config/usa/arm9/overlays/ov040/symbols.txt +++ b/config/usa/arm9/overlays/ov040/symbols.txt @@ -477,6 +477,16 @@ __sinit_ov040_021884ec kind:function(arm,size=0x40) addr:0x0218845c __sinit_ov040_0218852c kind:function(arm,size=0x5c) addr:0x0218849c __sinit_ov040_02188578 kind:function(arm,size=0x5c) addr:0x021884f8 __sinit_ov040_021885c4 kind:function(arm,size=0x40) addr:0x02188554 +.p__sinit_ov040_02188360 kind:data(word) addr:0x02188594 +.p__sinit_ov040_021883a0 kind:data(word) addr:0x02188598 +.p__sinit_ov040_021883e0 kind:data(word) addr:0x0218859c +.p__sinit_ov040_02188420 kind:data(word) addr:0x021885a0 +.p__sinit_ov040_02188460 kind:data(word) addr:0x021885a4 +.p__sinit_ov040_021884ac kind:data(word) addr:0x021885a8 +.p__sinit_ov040_021884ec kind:data(word) addr:0x021885ac +.p__sinit_ov040_0218852c kind:data(word) addr:0x021885b0 +.p__sinit_ov040_02188578 kind:data(word) addr:0x021885b4 +.p__sinit_ov040_021885c4 kind:data(word) addr:0x021885b8 data_ov040_02188640 kind:data(any) addr:0x021885c0 data_ov040_02188644 kind:data(any) addr:0x021885c4 data_ov040_02188648 kind:data(any) addr:0x021885c8 diff --git a/config/usa/arm9/overlays/ov041/symbols.txt b/config/usa/arm9/overlays/ov041/symbols.txt index a84fbe57..4edfe7fc 100644 --- a/config/usa/arm9/overlays/ov041/symbols.txt +++ b/config/usa/arm9/overlays/ov041/symbols.txt @@ -142,6 +142,12 @@ __sinit_ov041_0218e138 kind:function(arm,size=0x40) addr:0x0218e098 __sinit_ov041_0218e178 kind:function(arm,size=0x40) addr:0x0218e0d8 __sinit_ov041_0218e1b8 kind:function(arm,size=0x40) addr:0x0218e118 __sinit_ov041_0218e1f8 kind:function(arm,size=0x114) addr:0x0218e158 +.p__sinit_ov041_0218e098 kind:data(word) addr:0x0218e26c +.p__sinit_ov041_0218e0d8 kind:data(word) addr:0x0218e270 +.p__sinit_ov041_0218e138 kind:data(word) addr:0x0218e274 +.p__sinit_ov041_0218e178 kind:data(word) addr:0x0218e278 +.p__sinit_ov041_0218e1b8 kind:data(word) addr:0x0218e27c +.p__sinit_ov041_0218e1f8 kind:data(word) addr:0x0218e280 data_ov041_0218e348 kind:data(any) addr:0x0218e2a8 data_ov041_0218e444 kind:data(any) addr:0x0218e3a4 data_ov041_0218e47c kind:data(any) addr:0x0218e3dc diff --git a/config/usa/arm9/overlays/ov042/symbols.txt b/config/usa/arm9/overlays/ov042/symbols.txt index 3c97bbee..e36bec7a 100644 --- a/config/usa/arm9/overlays/ov042/symbols.txt +++ b/config/usa/arm9/overlays/ov042/symbols.txt @@ -101,6 +101,8 @@ data_ov042_0218c728 kind:data(any) addr:0x0218c688 data_ov042_0218c73c kind:data(any) addr:0x0218c69c __sinit_ov042_0218c744 kind:function(arm,size=0x40) addr:0x0218c6a4 __sinit_ov042_0218c784 kind:function(arm,size=0x74) addr:0x0218c6e4 +.p__sinit_ov042_0218c744 kind:data(word) addr:0x0218c758 +.p__sinit_ov042_0218c784 kind:data(word) addr:0x0218c75c data_ov042_0218c820 kind:data(any) addr:0x0218c780 data_ov042_0218c824 kind:data(any) addr:0x0218c784 data_ov042_0218c828 kind:data(any) addr:0x0218c788 diff --git a/config/usa/arm9/overlays/ov043/symbols.txt b/config/usa/arm9/overlays/ov043/symbols.txt index 03078e99..3c306999 100644 --- a/config/usa/arm9/overlays/ov043/symbols.txt +++ b/config/usa/arm9/overlays/ov043/symbols.txt @@ -69,6 +69,8 @@ data_ov043_0218d340 kind:data(any) addr:0x0218d2a0 data_ov043_0218d3c4 kind:data(any) addr:0x0218d324 __sinit_ov043_0218d414 kind:function(arm,size=0x16c) addr:0x0218d374 __sinit_ov043_0218d580 kind:function(arm,size=0x40) addr:0x0218d4e0 +.p__sinit_ov043_0218d414 kind:data(word) addr:0x0218d520 +.p__sinit_ov043_0218d580 kind:data(word) addr:0x0218d524 data_ov043_0218d5e0 kind:data(any) addr:0x0218d540 data_ov043_0218d668 kind:data(any) addr:0x0218d5c8 data_ov043_0218d778 kind:data(any) addr:0x0218d6d8 diff --git a/config/usa/arm9/overlays/ov044/symbols.txt b/config/usa/arm9/overlays/ov044/symbols.txt index acc9e1c4..b9daccab 100644 --- a/config/usa/arm9/overlays/ov044/symbols.txt +++ b/config/usa/arm9/overlays/ov044/symbols.txt @@ -171,6 +171,14 @@ __sinit_ov044_0218ef0c kind:function(arm,size=0x40) addr:0x0218ee6c __sinit_ov044_0218ef4c kind:function(arm,size=0x124) addr:0x0218eeac __sinit_ov044_0218f070 kind:function(arm,size=0x11c) addr:0x0218efd0 __sinit_ov044_0218f18c kind:function(arm,size=0x40) addr:0x0218f0ec +.p__sinit_ov044_0218ea9c kind:data(word) addr:0x0218f12c +.p__sinit_ov044_0218ebc8 kind:data(word) addr:0x0218f130 +.p__sinit_ov044_0218ece4 kind:data(word) addr:0x0218f134 +.p__sinit_ov044_0218ed24 kind:data(word) addr:0x0218f138 +.p__sinit_ov044_0218ef0c kind:data(word) addr:0x0218f13c +.p__sinit_ov044_0218ef4c kind:data(word) addr:0x0218f140 +.p__sinit_ov044_0218f070 kind:data(word) addr:0x0218f144 +.p__sinit_ov044_0218f18c kind:data(word) addr:0x0218f148 data_ov044_0218f200 kind:data(any) addr:0x0218f160 data_ov044_0218f288 kind:data(any) addr:0x0218f1e8 data_ov044_0218f398 kind:data(any) addr:0x0218f2f8 diff --git a/config/usa/arm9/overlays/ov045/symbols.txt b/config/usa/arm9/overlays/ov045/symbols.txt index bfdcbdf9..38d42024 100644 --- a/config/usa/arm9/overlays/ov045/symbols.txt +++ b/config/usa/arm9/overlays/ov045/symbols.txt @@ -225,6 +225,9 @@ data_ov045_0218e3d4 kind:data(any) addr:0x0218e334 __sinit_ov045_0218e3e8 kind:function(arm,size=0x40) addr:0x0218e348 __sinit_ov045_0218e428 kind:function(arm,size=0x40) addr:0x0218e388 __sinit_ov045_0218e468 kind:function(arm,size=0x40) addr:0x0218e3c8 +.p__sinit_ov045_0218e348 kind:data(word) addr:0x0218e408 +.p__sinit_ov045_0218e388 kind:data(word) addr:0x0218e40c +.p__sinit_ov045_0218e3c8 kind:data(word) addr:0x0218e410 data_ov045_0218e4c0 kind:data(any) addr:0x0218e420 data_ov045_0218e4c4 kind:data(any) addr:0x0218e424 data_ov045_0218e4d4 kind:data(any) addr:0x0218e434 diff --git a/config/usa/arm9/overlays/ov046/symbols.txt b/config/usa/arm9/overlays/ov046/symbols.txt index 588c140b..ee87c98f 100644 --- a/config/usa/arm9/overlays/ov046/symbols.txt +++ b/config/usa/arm9/overlays/ov046/symbols.txt @@ -103,6 +103,10 @@ __sinit_ov046_021944ac kind:function(arm,size=0x40) addr:0x0219440c __sinit_ov046_021944ec kind:function(arm,size=0x40) addr:0x0219444c __sinit_ov046_0219452c kind:function(arm,size=0x80) addr:0x0219448c __sinit_ov046_021945ac kind:function(arm,size=0x90) addr:0x0219450c +.p__sinit_ov046_021944ac kind:data(word) addr:0x0219459c +.p__sinit_ov046_021944ec kind:data(word) addr:0x021945a0 +.p__sinit_ov046_0219452c kind:data(word) addr:0x021945a4 +.p__sinit_ov046_021945ac kind:data(word) addr:0x021945a8 data_ov046_02194660 kind:data(any) addr:0x021945c0 data_ov046_02194664 kind:data(any) addr:0x021945c4 data_ov046_0219466c kind:data(any) addr:0x021945cc diff --git a/config/usa/arm9/overlays/ov047/symbols.txt b/config/usa/arm9/overlays/ov047/symbols.txt index fc5152b7..0193fd57 100644 --- a/config/usa/arm9/overlays/ov047/symbols.txt +++ b/config/usa/arm9/overlays/ov047/symbols.txt @@ -104,6 +104,10 @@ __sinit_ov047_021942f0 kind:function(arm,size=0x40) addr:0x02194250 __sinit_ov047_02194330 kind:function(arm,size=0x40) addr:0x02194290 __sinit_ov047_02194370 kind:function(arm,size=0x138) addr:0x021942d0 __sinit_ov047_021944a8 kind:function(arm,size=0x40) addr:0x02194408 +.p__sinit_ov047_021942f0 kind:data(word) addr:0x02194448 +.p__sinit_ov047_02194330 kind:data(word) addr:0x0219444c +.p__sinit_ov047_02194370 kind:data(word) addr:0x02194450 +.p__sinit_ov047_021944a8 kind:data(word) addr:0x02194454 data_ov047_02194508 kind:data(any) addr:0x02194468 data_ov047_021945c4 kind:data(any) addr:0x02194524 data_ov047_02194680 kind:data(any) addr:0x021945e0 diff --git a/config/usa/arm9/overlays/ov048/symbols.txt b/config/usa/arm9/overlays/ov048/symbols.txt index 077cf056..b93528d7 100644 --- a/config/usa/arm9/overlays/ov048/symbols.txt +++ b/config/usa/arm9/overlays/ov048/symbols.txt @@ -103,6 +103,12 @@ __sinit_ov048_021948f8 kind:function(arm,size=0x11c) addr:0x02194858 __sinit_ov048_02194a14 kind:function(arm,size=0x40) addr:0x02194974 __sinit_ov048_02194a54 kind:function(arm,size=0x40) addr:0x021949b4 __sinit_ov048_02194a94 kind:function(arm,size=0x40) addr:0x021949f4 +.p__sinit_ov048_021946c0 kind:data(word) addr:0x02194a34 +.p__sinit_ov048_021947d0 kind:data(word) addr:0x02194a38 +.p__sinit_ov048_021948f8 kind:data(word) addr:0x02194a3c +.p__sinit_ov048_02194a14 kind:data(word) addr:0x02194a40 +.p__sinit_ov048_02194a54 kind:data(word) addr:0x02194a44 +.p__sinit_ov048_02194a94 kind:data(word) addr:0x02194a48 data_ov048_02194b00 kind:data(any) addr:0x02194a60 data_ov048_02194b04 kind:data(any) addr:0x02194a64 data_ov048_02194b08 kind:data(any) addr:0x02194a68 diff --git a/config/usa/arm9/overlays/ov049/symbols.txt b/config/usa/arm9/overlays/ov049/symbols.txt index 7cf81fc1..61c949eb 100644 --- a/config/usa/arm9/overlays/ov049/symbols.txt +++ b/config/usa/arm9/overlays/ov049/symbols.txt @@ -69,6 +69,9 @@ data_ov049_021982b4 kind:data(any) addr:0x02198214 __sinit_ov049_021982c8 kind:function(arm,size=0x12c) addr:0x02198228 __sinit_ov049_021983f4 kind:function(arm,size=0x40) addr:0x02198354 __sinit_ov049_02198434 kind:function(arm,size=0x40) addr:0x02198394 +.p__sinit_ov049_021982c8 kind:data(word) addr:0x021983d4 +.p__sinit_ov049_021983f4 kind:data(word) addr:0x021983d8 +.p__sinit_ov049_02198434 kind:data(word) addr:0x021983dc data_ov049_021984a0 kind:data(any) addr:0x02198400 data_ov049_021984a4 kind:data(any) addr:0x02198404 data_ov049_021984a8 kind:data(any) addr:0x02198408 diff --git a/config/usa/arm9/overlays/ov050/symbols.txt b/config/usa/arm9/overlays/ov050/symbols.txt index 92c4698d..cc9a3c93 100644 --- a/config/usa/arm9/overlays/ov050/symbols.txt +++ b/config/usa/arm9/overlays/ov050/symbols.txt @@ -74,6 +74,8 @@ func_ov050_021987c4 kind:function(arm,size=0x8) addr:0x02198724 data_ov050_021987cc kind:data(any) addr:0x0219872c __sinit_ov050_0219882c kind:function(arm,size=0x64) addr:0x0219878c __sinit_ov050_02198890 kind:function(arm,size=0x118) addr:0x021987f0 +.p__sinit_ov050_0219882c kind:data(word) addr:0x02198908 +.p__sinit_ov050_02198890 kind:data(word) addr:0x0219890c data_ov050_021989c0 kind:data(any) addr:0x02198920 data_ov050_021989d0 kind:data(any) addr:0x02198930 data_ov050_021989f0 kind:data(any) addr:0x02198950 diff --git a/config/usa/arm9/overlays/ov051/symbols.txt b/config/usa/arm9/overlays/ov051/symbols.txt index 1adbb112..39978ccf 100644 --- a/config/usa/arm9/overlays/ov051/symbols.txt +++ b/config/usa/arm9/overlays/ov051/symbols.txt @@ -89,6 +89,11 @@ __sinit_ov051_021982e0 kind:function(arm,size=0x40) addr:0x02198240 __sinit_ov051_02198320 kind:function(arm,size=0x110) addr:0x02198280 __sinit_ov051_02198430 kind:function(arm,size=0x40) addr:0x02198390 __sinit_ov051_02198470 kind:function(arm,size=0x40) addr:0x021983d0 +.p__sinit_ov051_021982a0 kind:data(word) addr:0x02198410 +.p__sinit_ov051_021982e0 kind:data(word) addr:0x02198414 +.p__sinit_ov051_02198320 kind:data(word) addr:0x02198418 +.p__sinit_ov051_02198430 kind:data(word) addr:0x0219841c +.p__sinit_ov051_02198470 kind:data(word) addr:0x02198420 data_ov051_021984e8 kind:data(any) addr:0x02198448 data_ov051_0219859c kind:data(any) addr:0x021984fc data_ov051_021985a0 kind:data(any) addr:0x02198500 diff --git a/config/usa/arm9/overlays/ov052/symbols.txt b/config/usa/arm9/overlays/ov052/symbols.txt index c7e00eaa..55c1add2 100644 --- a/config/usa/arm9/overlays/ov052/symbols.txt +++ b/config/usa/arm9/overlays/ov052/symbols.txt @@ -80,6 +80,8 @@ data_ov052_021978b8 kind:data(any) addr:0x02197818 data_ov052_021978c8 kind:data(any) addr:0x02197828 __sinit_ov052_021978d4 kind:function(arm,size=0x40) addr:0x02197834 __sinit_ov052_02197914 kind:function(arm,size=0x40) addr:0x02197874 +.p__sinit_ov052_021978d4 kind:data(word) addr:0x021978b4 +.p__sinit_ov052_02197914 kind:data(word) addr:0x021978b8 data_ov052_02197960 kind:data(any) addr:0x021978c0 data_ov052_02197964 kind:data(any) addr:0x021978c4 data_ov052_02197968 kind:data(any) addr:0x021978c8 diff --git a/config/usa/arm9/overlays/ov053/symbols.txt b/config/usa/arm9/overlays/ov053/symbols.txt index 2c01d645..ef560576 100644 --- a/config/usa/arm9/overlays/ov053/symbols.txt +++ b/config/usa/arm9/overlays/ov053/symbols.txt @@ -38,6 +38,7 @@ func_ov053_02199f88 kind:function(arm,size=0x14) addr:0x02199ee8 func_ov053_02199f9c kind:function(arm,size=0x1c) addr:0x02199efc data_ov053_02199fb8 kind:data(any) addr:0x02199f18 __sinit_ov053_02199fc4 kind:function(arm,size=0xac) addr:0x02199f24 +.p__sinit_ov053_02199fc4 kind:data(word) addr:0x02199fd0 data_ov053_0219a080 kind:data(any) addr:0x02199fe0 data_ov053_0219a084 kind:data(any) addr:0x02199fe4 data_ov053_0219a088 kind:data(any) addr:0x02199fe8 diff --git a/config/usa/arm9/overlays/ov054/symbols.txt b/config/usa/arm9/overlays/ov054/symbols.txt index 8134352c..be32bdce 100644 --- a/config/usa/arm9/overlays/ov054/symbols.txt +++ b/config/usa/arm9/overlays/ov054/symbols.txt @@ -17,6 +17,7 @@ _ZN13LinkStateItem14StopUsingScoopEv kind:function(arm,size=0xe4) addr:0x0219975 _Z19func_ov054_021998d4iiij kind:function(arm,size=0x40) addr:0x02199834 data_ov054_02199914 kind:data(any) addr:0x02199874 __sinit_EquipScoop.cpp kind:function(arm,size=0x30) addr:0x02199884 +.p__sinit_EquipScoop.cpp kind:data(word) addr:0x021998b4 data_ov054_02199960 kind:data(any) addr:0x021998c0 data_ov054_02199964 kind:data(any) addr:0x021998c4 data_ov054_02199968 kind:data(any) addr:0x021998c8 diff --git a/config/usa/arm9/overlays/ov055/symbols.txt b/config/usa/arm9/overlays/ov055/symbols.txt index a40e8315..b84ae3b5 100644 --- a/config/usa/arm9/overlays/ov055/symbols.txt +++ b/config/usa/arm9/overlays/ov055/symbols.txt @@ -19,6 +19,7 @@ data_ov055_021997b0 kind:data(any) addr:0x02199710 data_ov055_021997c4 kind:data(any) addr:0x02199724 data_ov055_021997d8 kind:data(any) addr:0x02199738 __sinit_EquipBomb.cpp kind:function(arm,size=0x30) addr:0x0219974c +.p__sinit_EquipBomb.cpp kind:data(word) addr:0x0219977c data_ov055_02199840 kind:data(any) addr:0x021997a0 data_ov055_02199850 kind:data(any) addr:0x021997b0 data_ov055_02199854 kind:data(any) addr:0x021997b4 diff --git a/config/usa/arm9/overlays/ov056/symbols.txt b/config/usa/arm9/overlays/ov056/symbols.txt index 79fe7dbf..d966e43f 100644 --- a/config/usa/arm9/overlays/ov056/symbols.txt +++ b/config/usa/arm9/overlays/ov056/symbols.txt @@ -12,6 +12,7 @@ _Z11GetEquipBowv kind:function(arm,size=0x10) addr:0x02199248 _ZN13LinkStateItem19func_ov056_021992f8Ev kind:function(arm,size=0x24) addr:0x02199258 data_ov056_0219931c kind:data(any) addr:0x0219927c __sinit_EquipBow.cpp kind:function(arm,size=0x54) addr:0x02199288 +.p__sinit_EquipBow.cpp kind:data(word) addr:0x021992dc data_ov056_021993a0 kind:data(any) addr:0x02199300 data_ov056_021993a4 kind:data(any) addr:0x02199304 data_ov056_021993a8 kind:data(any) addr:0x02199308 diff --git a/config/usa/arm9/overlays/ov057/symbols.txt b/config/usa/arm9/overlays/ov057/symbols.txt index aa38d46d..ceee50fd 100644 --- a/config/usa/arm9/overlays/ov057/symbols.txt +++ b/config/usa/arm9/overlays/ov057/symbols.txt @@ -45,6 +45,8 @@ _ZN22ActorRope_Unk_0219a3b0D0Ev kind:function(arm,size=0x14) addr:0x0219a8e0 data_ov057_0219a994 kind:data(any) addr:0x0219a8f4 __sinit_EquipRope.cpp kind:function(arm,size=0x2c) addr:0x0219a900 local __sinit_ActorRope.cpp kind:function(arm,size=0x44) addr:0x0219a92c local +.p__sinit_EquipRope.cpp kind:data(word) addr:0x0219a970 +.p__sinit_ActorRope.cpp kind:data(word) addr:0x0219a974 _ZTV22EquipRope_Unk_02198dd0 kind:data(any) addr:0x0219a988 data_ov057_0219aa40 kind:data(any) addr:0x0219a9a0 data_ov057_0219aa50 kind:data(any) addr:0x0219a9b0 diff --git a/config/usa/arm9/overlays/ov058/symbols.txt b/config/usa/arm9/overlays/ov058/symbols.txt index 99aa447e..dbbf2ab1 100644 --- a/config/usa/arm9/overlays/ov058/symbols.txt +++ b/config/usa/arm9/overlays/ov058/symbols.txt @@ -36,6 +36,7 @@ func_ov058_0219acac kind:function(thumb,size=0x88) addr:0x0219ac0c func_ov058_0219ad34 kind:function(thumb,size=0x32) addr:0x0219ac94 data_ov058_0219ad68 kind:data(any) addr:0x0219acc8 __sinit_EquipBombchu.cpp kind:function(arm,size=0xfc) addr:0x0219ace0 +.p__sinit_EquipBombchu.cpp kind:data(word) addr:0x0219addc data_ov058_0219aea0 kind:data(any) addr:0x0219ae00 data_ov058_0219aea4 kind:data(any) addr:0x0219ae04 data_ov058_0219aea8 kind:data(any) addr:0x0219ae08 diff --git a/config/usa/arm9/overlays/ov059/delinks.txt b/config/usa/arm9/overlays/ov059/delinks.txt index febe3396..257be2e1 100644 --- a/config/usa/arm9/overlays/ov059/delinks.txt +++ b/config/usa/arm9/overlays/ov059/delinks.txt @@ -9,6 +9,6 @@ src/59_Hammer/Player/EquipHammer.cpp: .text start:0x02198c60 end:0x0219929c .data start:0x0219b0a0 end:0x0219b120 -src/59_Hammer/Actor/Navi/ActorNaviBase.cpp: +src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp: .text start:0x0219929c end:0x0219b070 .rodata start:0x0219b070 end:0x0219b084 diff --git a/config/usa/arm9/relocs.txt b/config/usa/arm9/relocs.txt index afde4238..d00330f4 100644 --- a/config/usa/arm9/relocs.txt +++ b/config/usa/arm9/relocs.txt @@ -3745,7 +3745,7 @@ from:0x0202f8ac kind:thumb_call_arm to:0x0200f248 module:main from:0x0202f8bc kind:load to:0x020631cc module:main from:0x0202f8c0 kind:load to:0x027e05f8 module:dtcm from:0x0202f8c4 kind:load to:0x027e08f8 module:dtcm -from:0x0202f8c8 kind:load to:0x0205629e module:main +from:0x0202f8c8 kind:load to:0x0205629c add:2 module:main from:0x0202f8d8 kind:load to:0x027e0618 module:dtcm from:0x0202f8dc kind:load to:0x027e0900 module:dtcm from:0x0202f8e0 kind:load to:0x020ee6d4 module:overlay(0) diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 14c1bb5a..cc04e899 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1316,7 +1316,7 @@ _ZN11FadeControl13func_0202abf4Eii kind:function(thumb,size=0x16) addr:0x0202abd _ZN11FadeControl13func_0202ac0cEitii kind:function(thumb,size=0x54) addr:0x0202abf4 _ZN11FadeControl10UpdateFadeEi kind:function(arm,size=0x194) addr:0x0202ac48 _ZN18UnkStruct_027e05f813func_0202adf4Eii kind:function(arm,size=0x74) addr:0x0202addc -_ZN18UnkStruct_027e05f8D2Ev kind:function(arm,size=0x4) addr:0x0202ae50 +_ZN18UnkStruct_027e05f8D1Ev kind:function(arm,size=0x4) addr:0x0202ae50 LoadOverlay16 kind:function(thumb,size=0x44) addr:0x0202ae54 Vec3p_RotateX kind:function(arm,size=0x9c) addr:0x0202ae98 Vec3p_RotateY kind:function(arm,size=0xa4) addr:0x0202af34 @@ -1828,10 +1828,10 @@ _ZN11BMGFileInfo13func_0203728cEi kind:function(arm,size=0x64) addr:0x02037248 _ZN9BMGGroups13func_020372f0E12BMGFileIndexs kind:function(thumb,size=0xc4) addr:0x020372ac _ZN9BMGGroups13func_020373b4Es kind:function(thumb,size=0x36) addr:0x02037370 _ZN9BMGGroups13func_020373ecEi kind:function(arm,size=0x60) addr:0x020373a8 -_ZN18UnkStruct_027e05f84InitEv kind:function(thumb,size=0xa) addr:0x02037408 +_ZN18UnkStruct_027e05f8C1Ev kind:function(thumb,size=0xa) addr:0x02037408 _ZN18UnkStruct_027e05f813func_02037458Et kind:function(arm,size=0x28) addr:0x02037414 _ZN18UnkStruct_027e05f813func_02037480Ev kind:function(arm,size=0x10) addr:0x0203743c -_ZN18UnkStruct_027e05f813func_02037490Ei kind:function(arm,size=0x24) addr:0x0203744c +_ZN18UnkStruct_027e05f813func_02037490Ev kind:function(arm,size=0x24) addr:0x0203744c func_020374b4 kind:function(arm,size=0x74) addr:0x02037470 func_02037528 kind:function(arm,size=0x74) addr:0x020374e4 func_0203759c kind:function(arm,size=0x68) addr:0x02037558 @@ -2214,14 +2214,14 @@ Overlay_FileSize kind:function(thumb,size=0x14) addr:0x020421b8 Overlay_ClearCacheAndBss kind:function(thumb,size=0x26) addr:0x020421cc Overlay_func_02042238 kind:function(thumb,size=0x18) addr:0x020421f4 Overlay_func_02042250 kind:function(thumb,size=0x9c) addr:0x0204220c -Overlay_func_020422ec kind:function(thumb,size=0xa0) addr:0x020422a8 -Overlay_func_0204238c kind:function(thumb,size=0x5a) addr:0x02042348 +FS_LoadOverlayInfo kind:function(thumb,size=0xa0) addr:0x020422a8 +FS_LoadOverlayFile kind:function(thumb,size=0x5a) addr:0x02042348 Overlay_func_020423e8 kind:function(thumb,size=0x58) addr:0x020423a4 -Overlay_Init kind:function(thumb,size=0x94) addr:0x020423fc +FS_StartOverlay kind:function(thumb,size=0x94) addr:0x020423fc Overlay_RunGlobalDestructors kind:function(thumb,size=0xa4) addr:0x02042490 -Overlay_Destroy kind:function(thumb,size=0xa) addr:0x02042534 -Overlay_Load kind:function(thumb,size=0x30) addr:0x02042540 -Overlay_Unload kind:function(thumb,size=0x2a) addr:0x02042570 +FS_StopOverlay kind:function(thumb,size=0xa) addr:0x02042534 +FS_LoadOverlay kind:function(thumb,size=0x30) addr:0x02042540 +FS_UnloadOverlay kind:function(thumb,size=0x2a) addr:0x02042570 func_020425e0 kind:function(thumb,size=0x40) addr:0x0204259c func_02042620 kind:function(thumb,size=0x48) addr:0x020425dc func_02042668 kind:function(thumb,size=0x24) addr:0x02042624 @@ -2452,8 +2452,9 @@ func_020506b8 kind:function(thumb,size=0xd4) addr:0x02050674 func_0205078c kind:function(thumb,size=0x138) addr:0x02050748 func_020508c4 kind:function(thumb,size=0x54) addr:0x02050880 func_02050918 kind:function(thumb,size=0xf2) addr:0x020508d4 +func_02050a20 kind:function(arm,size=0x280) addr:0x020509dc __sinit_02050ca0 kind:function(arm,size=0x14) addr:0x02050c5c -__sinit_02050cb4 kind:function(arm,size=0x2c) addr:0x02050c70 +__sinit_UnkStruct_027e05f8_2.cpp kind:function(arm,size=0x2c) addr:0x02050c70 local __sinit_02050ce0 kind:function(arm,size=0x2c) addr:0x02050c9c __sinit_02050d0c kind:function(arm,size=0x14) addr:0x02050cc8 __sinit_02050d20 kind:function(arm,size=0x14) addr:0x02050cdc @@ -2538,7 +2539,7 @@ data_020561dc kind:data(any) addr:0x02056198 data_020561f0 kind:data(any) addr:0x020561ac gGameModes kind:data(any) addr:0x020561b0 data_020562d4 kind:data(any) addr:0x02056290 -data_020562e2 kind:data(any) addr:0x0205629e +data_020562e0 kind:data(any) addr:0x0205629c data_02056300 kind:data(any) addr:0x020562bc data_02056308 kind:data(any) addr:0x020562c4 data_02056324 kind:data(any) addr:0x020562e0 @@ -2599,7 +2600,31 @@ data_020571e0 kind:data(any) addr:0x02057198 data_020571f0 kind:data(any) addr:0x020571a8 data_02057200 kind:data(any) addr:0x020571b8 data_02057208 kind:data(any) addr:0x020571c0 -data_0205725c kind:data(any) addr:0x02057214 +.p__sinit_02050ca0 kind:data(word) addr:0x02057214 +.p__sinit_UnkStruct_027e05f8_2.cpp kind:data(word) addr:0x02057218 local +.p__sinit_02050ce0 kind:data(word) addr:0x0205721c +.p__sinit_02050d0c kind:data(word) addr:0x02057220 +.p__sinit_02050d20 kind:data(word) addr:0x02057224 +.p__sinit_02050d34 kind:data(word) addr:0x02057228 +.p__sinit_02050d48 kind:data(word) addr:0x0205722c +.p__sinit_02050d5c kind:data(word) addr:0x02057230 +.p__sinit_02050d70 kind:data(word) addr:0x02057234 +.p__sinit_02050d88 kind:data(word) addr:0x02057238 +.p__sinit_02050d9c kind:data(word) addr:0x0205723c +.p__sinit_02050db8 kind:data(word) addr:0x02057240 +.p__sinit_02050dcc kind:data(word) addr:0x02057244 +.p__sinit_02050de0 kind:data(word) addr:0x02057248 +.p__sinit_02050df4 kind:data(word) addr:0x0205724c +.p__sinit_02050e10 kind:data(word) addr:0x02057250 +.p__sinit_02050e24 kind:data(word) addr:0x02057254 +.p__sinit_02050e38 kind:data(word) addr:0x02057258 +.p__sinit_02050e64 kind:data(word) addr:0x0205725c +.p__sinit_02050e90 kind:data(word) addr:0x02057260 +.p__sinit_02050ea4 kind:data(word) addr:0x02057264 +.p__sinit_02050eb8 kind:data(word) addr:0x02057268 +.p__sinit_02050ee4 kind:data(word) addr:0x0205726c +.p__sinit_02050f00 kind:data(word) addr:0x02057270 +.p__sinit_02050f40 kind:data(word) addr:0x02057274 data_020572e0 kind:data(any) addr:0x02057280 data_020572e4 kind:data(any) addr:0x02057284 data_020572e8 kind:data(any) addr:0x02057288 @@ -3085,7 +3110,7 @@ data_02068ec4 kind:bss addr:0x02068e64 data_02068ed0 kind:bss addr:0x02068e70 data_02068ed8 kind:bss addr:0x02068e78 data_0206902c kind:bss addr:0x02068fcc -sActorTypeList kind:bss addr:0x02069120 +sActorTypeList kind:bss(size=0x8) addr:0x02069120 data_020691a0 kind:bss addr:0x02069140 data_02075da0 kind:bss addr:0x02075d40 data_02075dac kind:bss addr:0x02075d4c diff --git a/include/DTCM/UnkStruct_027e05f8.hpp b/include/DTCM/UnkStruct_027e05f8.hpp index 721c1be9..17794f09 100644 --- a/include/DTCM/UnkStruct_027e05f8.hpp +++ b/include/DTCM/UnkStruct_027e05f8.hpp @@ -13,10 +13,10 @@ struct UnkStruct_027e05f8 { ~UnkStruct_027e05f8(); // Big gap to next TU - void Init(); + UnkStruct_027e05f8(); void func_02037458(u16 param1); void func_02037480(); - static unk32 func_02037490(unk32 param1); + static bool func_02037490(); }; extern UnkStruct_027e05f8 data_027e05f8; diff --git a/include/global.h b/include/global.h index ca961164..a12885e7 100644 --- a/include/global.h +++ b/include/global.h @@ -18,6 +18,10 @@ // `override` was added in C++11 before the DS, so we only use the keyword to indicate overriden functions #define override +// Puts variables in the DTCM module by using #pragma section dtcm begin|end +#pragma define_section dtcm ".dtcm" \ + ".dtcm" + // Define .sbss variables by using #pragma section sbss begin|end #pragma define_section sbss ".data" \ ".sbss" diff --git a/libs/nds/include/nds/overlay.h b/libs/nds/include/nds/overlay.h index 254253bd..c5972f7a 100644 --- a/libs/nds/include/nds/overlay.h +++ b/libs/nds/include/nds/overlay.h @@ -31,8 +31,8 @@ bool Overlay_func_020423e8(s32 param1, unk32 param2, unk32 param3); void Overlay_Init(Overlay *overlay); void Overlay_RunGlobalDestructors(Overlay *overlay); bool Overlay_Destroy(Overlay *overlay); -bool Overlay_Load(Overlay *overlay, unk32 param2); -bool Overlay_Unload(Overlay *overlay, unk32 param2); +bool FS_LoadOverlay(Overlay *overlay, unk32 param2); +bool FS_UnloadOverlay(Overlay *overlay, unk32 param2); #ifdef __cplusplus } diff --git a/src/04_Load/Player/LinkStateMove.cpp b/src/04_Load/Player/LinkStateMove_04.cpp similarity index 100% rename from src/04_Load/Player/LinkStateMove.cpp rename to src/04_Load/Player/LinkStateMove_04.cpp diff --git a/src/05/Player/LinkStateMove.cpp b/src/05/Player/LinkStateMove_05.cpp similarity index 100% rename from src/05/Player/LinkStateMove.cpp rename to src/05/Player/LinkStateMove_05.cpp index e51e33f9..dbf69656 100644 --- a/src/05/Player/LinkStateMove.cpp +++ b/src/05/Player/LinkStateMove_05.cpp @@ -1,10 +1,10 @@ -#include "Player/LinkStateMove.hpp" #include "DTCM/UnkStruct_027e0d38.hpp" #include "Game/Game.hpp" #include "Player/LinkStateDamage.hpp" #include "Player/LinkStateFollow.hpp" #include "Player/LinkStateInteract.hpp" #include "Player/LinkStateItem.hpp" +#include "Player/LinkStateMove.hpp" #include "Player/LinkStateRoll.hpp" #include "Player/PlayerControl.hpp" #include "Save/AdventureFlags.hpp" diff --git a/src/16_Startup/Game/Game.cpp b/src/16_Startup/Game/Game_16.cpp similarity index 100% rename from src/16_Startup/Game/Game.cpp rename to src/16_Startup/Game/Game_16.cpp diff --git a/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp b/src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp similarity index 100% rename from src/59_Hammer/Actor/Navi/ActorNaviBase.cpp rename to src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp index 8d6ae373..7fac2ba5 100644 --- a/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp +++ b/src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp @@ -1,5 +1,5 @@ -#include "Actor/Navi/ActorNaviBase.hpp" #include "Actor/Navi/ActorNavi.hpp" +#include "Actor/Navi/ActorNaviBase.hpp" #include "DTCM/UnkStruct_027e0fd4.hpp" #include "Item/ItemManager.hpp" #include "Map/MapManager.hpp" diff --git a/src/Main/DTCM/UnkStruct_027e05f8_2.cpp b/src/Main/DTCM/UnkStruct_027e05f8_2.cpp index f4c6c079..df31e1d3 100644 --- a/src/Main/DTCM/UnkStruct_027e05f8_2.cpp +++ b/src/Main/DTCM/UnkStruct_027e05f8_2.cpp @@ -1,6 +1,27 @@ #include "DTCM/UnkStruct_027e05f8.hpp" -void UnkStruct_027e05f8::Init() {} -void UnkStruct_027e05f8::func_02037458(u16 param1) {} -void UnkStruct_027e05f8::func_02037480() {} -unk32 UnkStruct_027e05f8::func_02037490(unk32 param1) {} +#pragma section dtcm begin +UnkStruct_027e05f8 data_027e05f8; +#pragma section dtcm end + +#define REG_027fffa8 (*(volatile u16 *) 0x027fffa8) + +THUMB UnkStruct_027e05f8::UnkStruct_027e05f8() : + mUnk_0(0), + mUnk_2(0), + mUnk_4(0) {} + +ARM void UnkStruct_027e05f8::func_02037458(u16 param1) { + mUnk_2 = param1 & (param1 ^ mUnk_0); + mUnk_4 = mUnk_0 & (param1 ^ mUnk_0); + mUnk_0 = param1; +} + +ARM void UnkStruct_027e05f8::func_02037480() { + mUnk_2 = 0; + mUnk_4 = 0; +} + +ARM bool UnkStruct_027e05f8::func_02037490() { + return ((REG_027fffa8 & 0x8000) >> 15) == 1; +} diff --git a/src/Main/Game/Game.cpp b/src/Main/Game/Game.cpp index fcbd4097..6519614f 100644 --- a/src/Main/Game/Game.cpp +++ b/src/Main/Game/Game.cpp @@ -196,7 +196,7 @@ THUMB bool Game::StartGameMode() { data_027e077c.Init(0); Fill16(0, (u16 *) &data_027e0d04, 6); func_02033d40(&data_027e0c38); - data_027e05f8.Init(); + data_027e05f8 = UnkStruct_027e05f8(); if (gOverlayManager.mLoadedOverlays[0] != OverlayId_None) { data_ov000_020ec7dc.func_ov000_0207c0f0(mModeId); gTouchControl.Init(); diff --git a/src/Main/System/OverlayManager.cpp b/src/Main/System/OverlayManager.cpp index 8454e27b..3f78516e 100644 --- a/src/Main/System/OverlayManager.cpp +++ b/src/Main/System/OverlayManager.cpp @@ -10,7 +10,7 @@ extern "C" void func_ov007_021028a0(u32 **); THUMB void OverlayManager::Load(OverlayIndex index, OverlayId id) { if (id != OverlayId_None) { - Overlay_Load(NULL, id); + FS_LoadOverlay(NULL, id); } this->mLoadedOverlays[index] = id; @@ -27,7 +27,7 @@ THUMB void OverlayManager::LoadIfNotLoaded(OverlayIndex index, OverlayId id) { THUMB void OverlayManager::Unload(OverlayIndex index) { if (this->mLoadedOverlays[index] != OverlayId_None) { - Overlay_Unload(NULL, this->mLoadedOverlays[index]); + FS_UnloadOverlay(NULL, this->mLoadedOverlays[index]); this->mLoadedOverlays[index] = OverlayId_None; } } diff --git a/tools/configure.py b/tools/configure.py index 3cba9d45..f7da7237 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -26,7 +26,7 @@ args = parser.parse_args() # Config GAME = "ph" -DSD_VERSION = 'v0.9.1' +DSD_VERSION = 'v0.10.1' WIBO_VERSION = '0.6.16' OBJDIFF_VERSION = 'v3.0.0-beta.6' MWCC_VERSION = "2.0/sp1p5" @@ -164,10 +164,11 @@ class Project: return self.game_build / "build" / "rom_config.yaml" def source_object_files(self) -> list[str]: - return [ - str(self.game_build / source_file.with_suffix(".o")) - for source_file in get_c_cpp_files([src_path, libs_path]) - ] + files: list[str] = [] + for source_file in get_c_cpp_files([src_path, libs_path]): + src_obj_path = self.game_build / source_file + files.append(str(src_obj_path.with_suffix(".o"))) + return files def arm9_o(self) -> Path: return self.game_build / "arm9.o" @@ -178,28 +179,27 @@ class Project: def objdiff_report(self) -> Path: return self.game_build / "report.json" - def modules(self) -> list[Any]: + def files(self) -> list[dict[str, str]]: if self.delinks_json is None: return [] - return self.delinks_json['modules'] + return self.delinks_json['files'] def delink_files(self) -> list[str]: - if self.delinks_json is None: - return [] - return [file['delink_file'] for module in self.delinks_json['modules'] for file in module['files']] + delink_files = [file['delink_file'] for file in self.files()] + return list(set(delink_files)) def arm9_lcf_file(self) -> str: if self.delinks_json is None: return "" return self.delinks_json['arm9_lcf_file'] - def module_lcf_files(self) -> list[str]: + def arm9_objects_file(self) -> str: if self.delinks_json is None: - return [] - return [module['lcf_file'] for module in self.delinks_json['modules']] + return "" + return self.delinks_json['arm9_objects_file'] -def can_run_dsd() -> bool: +def check_can_run_dsd() -> bool: try: output = subprocess.run([DSD, "--version"], capture_output=True, text=True, check=True) version = output.stdout.strip().split(" ")[-1] @@ -215,10 +215,12 @@ def can_run_dsd() -> bool: def main(): - if platform is None: return + if platform is None: + return delinks_json = None - if can_run_dsd(): + can_run_dsd = check_can_run_dsd() + if can_run_dsd: out = subprocess.run([ DSD, "--force-color", @@ -274,6 +276,8 @@ def main(): transform_dep = "tools/transform_dep.py" mwcc_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" mwcc_implicit.append(transform_dep) + if WINE == DEFAULT_WIBO_PATH: + mwcc_implicit.append(WINE) n.rule( name="mwcc", command=mwcc_cmd, @@ -289,7 +293,7 @@ def main(): n.rule( name="mwld", - command=f'{WINE} "{LD}" {LD_FLAGS} $extra_ld_flags $in -o $out' + command=f'{WINE} "{LD}" {LD_FLAGS} $extra_ld_flags @$objects_file $lcf_file -o $out' ) n.newline() @@ -356,21 +360,28 @@ def main(): n.newline() add_download_tool_builds(n, project) - add_extract_build(n, project) - add_delink_and_lcf_builds(n, project) - add_disassemble_builds(n, project) - add_mwcc_builds(n, project, mwcc_implicit) - add_mwld_and_rom_builds(n, project) - add_check_builds(n, project) - add_objdiff_builds(n, project) add_configure_build(n, project) - add_apply_build(n, project) - n.default(["objdiff", "check", "sha1"]) + if can_run_dsd: + add_extract_build(n, project) + add_delink_and_lcf_builds(n, project) + add_disassemble_builds(n, project) + add_mwcc_builds(n, project, mwcc_implicit) + add_mwld_and_rom_builds(n, project) + add_check_builds(n, project) + add_objdiff_builds(n, project) + add_apply_build(n, project) + + n.default(["objdiff", "check", "sha1"]) + else: + n.default(["download_tools"]) def add_download_tool_builds(n: ninja_syntax.Writer, project: Project): + downloads: list[str] = [] + if args.dsd is None: + downloads.append(DSD) n.build( rule="download_tool", outputs=DSD, @@ -382,6 +393,7 @@ def add_download_tool_builds(n: ninja_syntax.Writer, project: Project): ) n.newline() + downloads.append(OBJDIFF) n.build( rule="download_tool", outputs=OBJDIFF, @@ -394,6 +406,7 @@ def add_download_tool_builds(n: ninja_syntax.Writer, project: Project): n.newline() if args.compiler is None: + downloads.extend([CC, LD]) n.build( rule="download_tool", outputs=[CC, LD], @@ -406,6 +419,7 @@ def add_download_tool_builds(n: ninja_syntax.Writer, project: Project): n.newline() if project.platform.system != "windows" and WINE == DEFAULT_WIBO_PATH: + downloads.append(WINE) n.build( rule="download_tool", outputs=WINE, @@ -417,6 +431,13 @@ def add_download_tool_builds(n: ninja_syntax.Writer, project: Project): ) n.newline() + n.build( + inputs=downloads, + rule="phony", + outputs="download_tools", + ) + n.newline + def add_extract_build(n: ninja_syntax.Writer, project: Project): if not args.no_extract: @@ -433,34 +454,21 @@ def add_extract_build(n: ninja_syntax.Writer, project: Project): def add_mwld_and_rom_builds(n: ninja_syntax.Writer, project: Project): - n.comment("Link each module separately") - for module in project.modules(): - lcf_file = module['lcf_file'] - objects_to_link = [file['object_to_link'] for file in module['files']] - elf_file = module['elf_file'] - n.build( - inputs=objects_to_link + [lcf_file], - implicit=LD, - rule="mwld", - outputs=elf_file, - variables={ - 'extra_ld_flags': MODULE_LD_FLAGS, - } - ) - n.newline() - - n.comment("Link all modules together") - module_elf_files = [module['elf_file'] for module in project.modules()] + n.comment("Run linker") + objects_to_link = [file['object_to_link'] for file in project.files()] elf_file = str(project.arm9_o()) lcf_file = project.arm9_lcf_file() - if len(module_elf_files) > 0: + objects_file = project.arm9_objects_file() + if len(objects_to_link) > 0: n.build( - inputs=module_elf_files + [lcf_file], + inputs=[*objects_to_link, lcf_file, objects_file], implicit=LD, rule="mwld", outputs=elf_file, variables={ 'extra_ld_flags': ARM9_LD_FLAGS, + 'lcf_file': str(lcf_file), + 'objects_file': str(objects_file), } ) n.newline() @@ -515,8 +523,10 @@ def add_mwcc_builds(n: ninja_syntax.Writer, project: Project, mwcc_implicit: lis for source_file in get_c_cpp_files([src_path, libs_path]): src_obj_path = project.game_build / source_file cc_flags: list[str] = [] - if is_cpp(source_file): cc_flags.append("-lang=c++") - elif is_c(source_file): cc_flags.append("-lang=c") + if is_cpp(source_file): + cc_flags.append("-lang=c++") + elif is_c(source_file): + cc_flags.append("-lang=c") n.build( inputs=str(source_file), implicit=mwcc_implicit, @@ -532,7 +542,7 @@ def add_mwcc_builds(n: ninja_syntax.Writer, project: Project, mwcc_implicit: lis n.newline() extension = source_file.suffix - ctx_file = str(project.game_build / source_file.with_suffix(f".ctx{extension}")) + ctx_file = str(src_obj_path.with_suffix(f".ctx{extension}")) n.build( inputs=str(source_file), rule="m2ctx", @@ -581,18 +591,18 @@ def add_delink_and_lcf_builds(n: ninja_syntax.Writer, project: Project): ) n.newline() - lcf_files = project.module_lcf_files() + [project.arm9_lcf_file()] - if len(lcf_files) > 1: - n.build( - inputs=project.delinks_files + [str(rom_config)], - implicit=DSD, - rule="lcf", - outputs=lcf_files, - variables={ - "config_path": str(project.arm9_config_yaml()), - } - ) - n.newline() + lcf_file = project.arm9_lcf_file() + objects_file = project.arm9_objects_file() + n.build( + inputs=project.delinks_files + [str(rom_config)], + implicit=DSD, + rule="lcf", + outputs=[lcf_file, objects_file], + variables={ + "config_path": str(project.arm9_config_yaml()), + } + ) + n.newline() def add_disassemble_builds(n: ninja_syntax.Writer, project: Project): @@ -658,7 +668,7 @@ def add_objdiff_builds(n: ninja_syntax.Writer, project: Project): ) n.newline() - delink_files = [file['delink_file'] for module in project.modules() for file in module['files']] + delink_files = project.delink_files() n.build( inputs=["objdiff.json"], implicit=[OBJDIFF] + delink_files + project.source_object_files(), @@ -712,4 +722,5 @@ def get_config_files(game_config: Path, name: str) -> list[str]: ] -if __name__ == "__main__": main() +if __name__ == "__main__": + main()