diff options
Diffstat (limited to 'config/eur/arm9')
| -rw-r--r-- | config/eur/arm9/overlays/ov000/symbols.txt | 6 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov014/symbols.txt | 4 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov018/symbols.txt | 2 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov031/delinks.txt | 6 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov031/relocs.txt | 2 | ||||
| -rw-r--r-- | config/eur/arm9/overlays/ov031/symbols.txt | 16 | ||||
| -rw-r--r-- | config/eur/arm9/symbols.txt | 8 |
7 files changed, 24 insertions, 20 deletions
diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 91e423f4..11aae8bf 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -215,7 +215,7 @@ func_ov000_0207b90c kind:function(arm,size=0x7c) addr:0x0207b90c _ZN18UnkStruct_027e0dbc19func_ov000_0207b988Ei kind:function(thumb,size=0x40) addr:0x0207b988 _ZN18UnkStruct_027e0dbc19func_ov000_0207b9c8Ev kind:function(thumb,size=0x14) addr:0x0207b9c8 _ZN18UnkStruct_027e0dbc19func_ov000_0207b9dcEv kind:function(arm,size=0xb4) addr:0x0207b9dc -func_ov000_0207ba90 kind:function(thumb,size=0x4) addr:0x0207ba90 +_ZN18UnkStruct_027e0dbc9GetUnk_24Ev kind:function(thumb,size=0x4) addr:0x0207ba90 func_ov000_0207ba94 kind:function(thumb,size=0x20) addr:0x0207ba94 func_ov000_0207bab4 kind:function(arm,size=0x5c) addr:0x0207bab4 func_ov000_0207bb10 kind:function(arm,size=0x4) addr:0x0207bb10 @@ -696,7 +696,7 @@ func_ov000_0208708c kind:function(arm,size=0x14) addr:0x0208708c func_ov000_020870a0 kind:function(arm,size=0x24) addr:0x020870a0 func_ov000_020870c4 kind:function(arm,size=0xc) addr:0x020870c4 func_ov000_020870d0 kind:function(arm,size=0x19c) addr:0x020870d0 -func_ov000_0208726c kind:function(arm,size=0x7c) addr:0x0208726c +_ZN21UnkStruct_027e0f64_0419func_ov000_0208726cEi kind:function(arm,size=0x7c) addr:0x0208726c func_ov000_020872e8 kind:function(arm,size=0x50) addr:0x020872e8 func_ov000_02087338 kind:function(arm,size=0xc8) addr:0x02087338 func_ov000_02087400 kind:function(arm,size=0x184) addr:0x02087400 @@ -2752,7 +2752,7 @@ _ZN5Actor4DropEP5Vec3p kind:function(arm,size=0x38) addr:0x020c18c4 _ZN5Actor8vfunc_60Ev kind:function(arm,size=0x8) addr:0x020c18fc _ZN5Actor8vfunc_64Ev kind:function(arm,size=0x4) addr:0x020c1904 _ZN5Actor10SetUnk_11cEb kind:function(arm,size=0x8) addr:0x020c1908 -_ZN5Actor8vfunc_68Ev kind:function(arm,size=0x4) addr:0x020c1910 +_ZN5Actor8vfunc_68EiP18UnkStruct_020397f8 kind:function(arm,size=0x4) addr:0x020c1910 _ZN5Actor8vfunc_6cEv kind:function(arm,size=0x8) addr:0x020c1914 _ZN5Actor8vfunc_70Ev kind:function(arm,size=0x8) addr:0x020c191c _ZN5Actor8vfunc_74EP8ActorRef kind:function(arm,size=0x4) addr:0x020c1924 diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index 17f4d1bf..2d7d3ff0 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/config/eur/arm9/overlays/ov014/symbols.txt @@ -1087,7 +1087,7 @@ _ZN18ActorCharacterBase8vfunc_84Ev kind:function(arm,size=0xc) addr:0x02144d58 _ZN18ActorCharacterBase8vfunc_ccEv kind:function(arm,size=0x4) addr:0x02144d64 _ZN18ActorCharacterBase8vfunc_c8Ev kind:function(arm,size=0x4) addr:0x02144d68 _ZN18ActorCharacterBase8vfunc_d0Ev kind:function(arm,size=0x4) addr:0x02144d6c -_ZN18ActorCharacterBase8vfunc_68Ev kind:function(arm,size=0x4) addr:0x02144d70 +_ZN18ActorCharacterBase8vfunc_68EiP18UnkStruct_020397f8 kind:function(arm,size=0x4) addr:0x02144d70 _ZN18ActorCharacterBase8vfunc_bcEv kind:function(arm,size=0x20) addr:0x02144d74 _ZN14ActorCharacter19func_ov014_02144d94Ev kind:function(arm,size=0x58) addr:0x02144d94 _ZN14ActorCharacter19func_ov014_02144decEv kind:function(arm,size=0x28) addr:0x02144dec @@ -1137,7 +1137,7 @@ func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145b18 func_ov014_02145bcc kind:function(arm,size=0xb0) addr:0x02145bcc func_ov014_02145c7c kind:function(arm,size=0x30) addr:0x02145c7c _ZN18ActorCharacter_1d819func_ov014_02145cacEv kind:function(arm,size=0x19c) addr:0x02145cac -func_ov014_02145e48 kind:function(arm,size=0xc4) addr:0x02145e48 +_ZN18ActorCharacter_1d819func_ov014_02145e48Ei kind:function(arm,size=0xc4) addr:0x02145e48 _ZN18ActorCharacter_1d819func_ov014_02145f0cEi kind:function(arm,size=0x1ac) addr:0x02145f0c func_ov014_021460b8 kind:function(arm,size=0x54) addr:0x021460b8 func_ov014_0214610c kind:function(arm,size=0x14) addr:0x0214610c diff --git a/config/eur/arm9/overlays/ov018/symbols.txt b/config/eur/arm9/overlays/ov018/symbols.txt index 985cc241..137ee419 100644 --- a/config/eur/arm9/overlays/ov018/symbols.txt +++ b/config/eur/arm9/overlays/ov018/symbols.txt @@ -155,7 +155,7 @@ func_ov018_02160958 kind:function(arm,size=0x10) addr:0x02160958 func_ov018_02160968 kind:function(arm,size=0xa8) addr:0x02160968 func_ov018_02160a10 kind:function(arm,size=0x44) addr:0x02160a10 func_ov018_02160a54 kind:function(arm,size=0x10) addr:0x02160a54 -func_ov018_02160a64 kind:function(arm,size=0x10) addr:0x02160a64 +_ZN17UnkClass_027e0e2819func_ov018_02160a64Eii kind:function(arm,size=0x10) addr:0x02160a64 func_ov018_02160a74 kind:function(arm,size=0x10) addr:0x02160a74 func_ov018_02160a84 kind:function(arm,size=0x1c) addr:0x02160a84 func_ov018_02160aa0 kind:function(arm,size=0x38) addr:0x02160aa0 diff --git a/config/eur/arm9/overlays/ov031/delinks.txt b/config/eur/arm9/overlays/ov031/delinks.txt index cf7a6053..a3cb0bf0 100644 --- a/config/eur/arm9/overlays/ov031/delinks.txt +++ b/config/eur/arm9/overlays/ov031/delinks.txt @@ -6,7 +6,11 @@ .bss start:0x02183e80 end:0x02184200 kind:bss align:32 src/31_Shop/Actor/ActorItemSellerBase.cpp: - .text start:0x0217cf2c end:0x0217dbdc + complete + .text start:0x0217cf1c end:0x0217dbdc + .rodata start:0x021818a0 end:0x021818e8 + .data start:0x02182168 end:0x02182290 + .bss start:0x02183e84 end:0x02183e88 src/31_Shop/Actor/ActorShopItem.cpp: .text start:0x0217dbdc end:0x02180708 diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index 5d23e731..32e0c7c3 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -177,7 +177,7 @@ from:0x0217cf08 kind:arm_call_thumb to:0x02030294 module:main from:0x0217cf10 kind:arm_call to:0x0202ea0c module:main from:0x0217cf28 kind:load to:0x02183e84 module:overlay(31) from:0x0217cf34 kind:arm_call to:0x02144ed8 module:overlay(14) -from:0x0217cf58 kind:load to:0x02182170 module:overlay(31) +from:0x0217cf58 kind:load to:0x02182168 module:overlay(31) add:0x8 from:0x0217cf5c kind:load to:0x02183e84 module:overlay(31) from:0x0217cf74 kind:arm_call to:0x021450a8 module:overlay(14) from:0x0217cf80 kind:load to:0x02183e84 module:overlay(31) diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 64f71d4b..71bfb654 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -3,7 +3,7 @@ func_ov031_0217bd88 kind:function(arm,size=0x18) addr:0x0217bd88 func_ov031_0217bda0 kind:function(arm,size=0xc) addr:0x0217bda0 func_ov031_0217bdac kind:function(arm,size=0x8) addr:0x0217bdac func_ov031_0217bdb4 kind:function(arm,size=0x4) addr:0x0217bdb4 -func_ov031_0217bdb8 kind:function(arm,size=0x10) addr:0x0217bdb8 +_ZN24UnkStruct_ov031_02183e8011GetInstanceEv kind:function(arm,size=0x10) addr:0x0217bdb8 func_ov031_0217bdc8 kind:function(arm,size=0x194) addr:0x0217bdc8 func_ov031_0217bf5c kind:function(arm,size=0x14) addr:0x0217bf5c func_ov031_0217bf70 kind:function(arm,size=0x44) addr:0x0217bf70 @@ -27,14 +27,14 @@ func_ov031_0217ca10 kind:function(arm,size=0x160) addr:0x0217ca10 func_ov031_0217cb70 kind:function(arm,size=0x1a0) addr:0x0217cb70 func_ov031_0217cd10 kind:function(arm,size=0x74) addr:0x0217cd10 func_ov031_0217cd84 kind:function(arm,size=0x54) addr:0x0217cd84 -func_ov031_0217cdd8 kind:function(arm,size=0x20) addr:0x0217cdd8 +_ZN24UnkStruct_ov031_02183e8019func_ov031_0217cdd8Ei kind:function(arm,size=0x20) addr:0x0217cdd8 func_ov031_0217cdf8 kind:function(arm,size=0x20) addr:0x0217cdf8 -func_ov031_0217ce18 kind:function(arm,size=0x54) addr:0x0217ce18 +_ZN24UnkStruct_ov031_02183e8019func_ov031_0217ce18Ev kind:function(arm,size=0x54) addr:0x0217ce18 func_ov031_0217ce6c kind:function(arm,size=0x24) addr:0x0217ce6c HasFreebieCard kind:function(arm,size=0x30) addr:0x0217ce90 _ZN24UnkStruct_ov031_02183e8019func_ov031_0217cec0Ev kind:function(arm,size=0x40) addr:0x0217cec0 func_ov031_0217cf00 kind:function(arm,size=0x1c) addr:0x0217cf00 -_Z19func_ov031_0217cf1cv kind:function(arm,size=0x10) addr:0x0217cf1c +_ZN19ActorItemSellerBase16GetCurrentSellerEv kind:function(arm,size=0x10) addr:0x0217cf1c _ZN19ActorItemSellerBaseC2Ev kind:function(arm,size=0x34) addr:0x0217cf2c _ZN19ActorItemSellerBaseD1Ev kind:function(arm,size=0x24) addr:0x0217cf60 _ZN19ActorItemSellerBaseD0Ev kind:function(arm,size=0x2c) addr:0x0217cf84 @@ -65,7 +65,7 @@ _ZN19ActorItemSellerBase19func_ov031_0217d974Ev kind:function(arm,size=0x14) add _ZN19ActorItemSellerBase8vfunc_d4Ev kind:function(arm,size=0xc) addr:0x0217d988 _ZN19ActorItemSellerBase8vfunc_8cEv kind:function(arm,size=0x8c) addr:0x0217d994 _ZN19ActorItemSellerBase19func_ov031_0217da20Ei kind:function(arm,size=0x60) addr:0x0217da20 -_ZN19ActorItemSellerBase8vfunc_68Ev kind:function(arm,size=0x38) addr:0x0217da80 +_ZN19ActorItemSellerBase8vfunc_68EiP18UnkStruct_020397f8 kind:function(arm,size=0x38) addr:0x0217da80 _ZN19ActorItemSellerBase16CollidesWithLinkEv kind:function(arm,size=0x90) addr:0x0217dab8 _ZN19ActorItemSellerBase9vfunc_11cEv kind:function(arm,size=0x8) addr:0x0217db48 _ZN19ActorItemSellerBase15IsHitboxTouchedEb kind:function(arm,size=0x8c) addr:0x0217db50 @@ -289,7 +289,7 @@ _ZN14ActorTetra_4b019func_ov031_02181798Ev kind:function(arm,size=0xd4) addr:0x0 _ZN10ActorTetraD1Ev kind:function(arm,size=0x1c) addr:0x0218186c _ZN10ActorTetraD0Ev kind:function(arm,size=0x14) addr:0x02181888 _ZN10ActorTetra8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x0218189c -data_ov031_021818a0 kind:data(any) addr:0x021818a0 +sShopItemActorTypes kind:data(any) addr:0x021818a0 local sShopItemBaseNames kind:data(any) addr:0x021818e8 local unk$1534 kind:data(any) addr:0x02181a58 local unk$1554 kind:data(any) addr:0x02181a6c local @@ -327,7 +327,7 @@ data_ov031_02182138 kind:data(any) addr:0x02182138 data_ov031_0218213c kind:data(any) addr:0x0218213c data_ov031_02182140 kind:data(any) addr:0x02182140 data_ov031_02182144 kind:data(any) addr:0x02182144 -data_ov031_02182170 kind:data(any) addr:0x02182170 +_ZTV19ActorItemSellerBase kind:data(any) addr:0x02182168 @1183 kind:data(any) addr:0x02182290 local @1184 kind:data(any) addr:0x02182294 local @1185 kind:data(any) addr:0x02182298 local @@ -428,7 +428,7 @@ data_ov031_02183d68 kind:data(any) addr:0x02183d68 data_ov031_02183d6c kind:data(any) addr:0x02183d6c data_ov031_02183d7c kind:data(any) addr:0x02183d7c data_ov031_02183e80 kind:bss addr:0x02183e80 -data_ov031_02183e84 kind:bss addr:0x02183e84 +sCurrentSeller kind:bss addr:0x02183e84 local @792 kind:bss addr:0x02183e88 local _ZN15ActorShopItemDM5gTypeE kind:bss addr:0x02183e94 @794 kind:bss addr:0x02183ea8 local diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 7a47943d..f765415a 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1806,14 +1806,14 @@ _ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size= _ZN14MessageManager13func_0203690cEi kind:function(arm,size=0x2b0) addr:0x0203690c _ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x02036bbc _ZN14MessageManager13func_02036c50EPt kind:function(arm,size=0x54) addr:0x02036c50 -_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x02036ca4 +_ZN14MessageManager13func_02036ca4EPt kind:function(arm,size=0x40) addr:0x02036ca4 _ZN14MessageManager13func_02036ce4EP18UnkStruct_02037750i kind:function(arm,size=0x4c) addr:0x02036ce4 _ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x02036d30 _ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x02036d4c _ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x02036d6c _ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x02036da8 _ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x02036edc -_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x02036f68 +_ZN14MessageManager13func_02036f68EjP18UnkStruct_02037628P24UnkStruct_ov000_020d18f4 kind:function(arm,size=0x168) addr:0x02036f68 _ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x020370d0 _ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x020370e8 _ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x02037158 @@ -1834,8 +1834,8 @@ 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 func_02037604 kind:function(arm,size=0x24) addr:0x02037604 -func_02037628 kind:function(arm,size=0x98) addr:0x02037628 -func_020376c0 kind:function(arm,size=0x64) addr:0x020376c0 +_ZN18UnkStruct_0203762813func_02037628Ev kind:function(arm,size=0x98) addr:0x02037628 +_ZN18UnkStruct_0203762813func_020376c0EP5Vec3p kind:function(arm,size=0x64) addr:0x020376c0 func_02037724 kind:function(arm,size=0x2c) addr:0x02037724 _ZN18UnkStruct_02037750C2EiPv kind:function(arm,size=0x44) addr:0x02037750 _ZN18UnkStruct_02037750D1Ev kind:function(arm,size=0x38) addr:0x02037794 |