From c42637697a6b74fb00daa714dbfe2d6a71cdcea0 Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Tue, 22 Jul 2025 22:45:36 +0200 Subject: [PATCH] fix build issues --- config/eur/arm9/overlays/ov000/symbols.txt | 4 +-- config/eur/arm9/overlays/ov110/symbols.txt | 34 +++++++++++----------- config/jp/arm9/overlays/ov110/relocs.txt | 8 ++--- config/jp/arm9/overlays/ov110/symbols.txt | 34 +++++++++++----------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index aa0ae95f..2f7398b4 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2326,13 +2326,13 @@ _ZN5Actor8vfunc_30Ev kind:function(arm,size=0x4) addr:0x020984c4 _ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x020984c8 _ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x020984d0 _ZN5Actor19func_ov000_020984f0Ev kind:function(arm,size=0x28) addr:0x020984f0 -_ZN5Actor8vfunc_00EP18UnkStruct_vfunc_00 kind:function(arm,size=0x24) addr:0x02098518 +_ZN5Actor8vfunc_00EP5Vec3p kind:function(arm,size=0x24) addr:0x02098518 _ZN5Actor19func_ov000_0209853cEv kind:function(arm,size=0x18) addr:0x0209853c _ZN5Actor8vfunc_04Ev kind:function(arm,size=0x18) addr:0x02098554 _ZN5Actor8vfunc_08Ev kind:function(arm,size=0xc) addr:0x0209856c _ZN5Actor8vfunc_0cEv kind:function(arm,size=0xc) addr:0x02098578 _ZN5Actor8vfunc_38Ei kind:function(arm,size=0x6c) addr:0x02098584 -_ZN5Actor8vfunc_3cEP5Vec3p kind:function(arm,size=0x3c) addr:0x020985f0 +_ZN5Actor8vfunc_3cEiP5Vec3p kind:function(arm,size=0x3c) addr:0x020985f0 _ZN5Actor19func_ov000_0209862cEi kind:function(arm,size=0x28) addr:0x0209862c func_ov000_02098654 kind:function(arm,size=0x28) addr:0x02098654 func_ov000_0209867c kind:function(arm,size=0x38) addr:0x0209867c diff --git a/config/eur/arm9/overlays/ov110/symbols.txt b/config/eur/arm9/overlays/ov110/symbols.txt index a70b1e92..e9aa6e0e 100644 --- a/config/eur/arm9/overlays/ov110/symbols.txt +++ b/config/eur/arm9/overlays/ov110/symbols.txt @@ -1,26 +1,26 @@ -func_ov110_02184a40 kind:function(arm,size=0x36c) addr:0x02184a40 -func_ov110_02184dac kind:function(arm,size=0x30) addr:0x02184dac -func_ov110_02184ddc kind:function(arm,size=0xa0) addr:0x02184ddc -func_ov110_02184e7c kind:function(arm,size=0xc4) addr:0x02184e7c -func_ov110_02184f40 kind:function(arm,size=0xcc) addr:0x02184f40 -func_ov110_0218500c kind:function(arm,size=0x5d8) addr:0x0218500c -func_ov110_021855e4 kind:function(arm,size=0x6d0) addr:0x021855e4 -func_ov110_02185cb4 kind:function(arm,size=0x7c) addr:0x02185cb4 -func_ov110_02185d30 kind:function(arm,size=0xc) addr:0x02185d30 -func_ov110_02185d3c kind:function(thumb,size=0x66) addr:0x02185d3c -func_ov110_02185da4 kind:function(arm,size=0x10) addr:0x02185da4 -func_ov110_02185db4 kind:function(arm,size=0x10) addr:0x02185db4 +_ZN9PlayerGet19func_ov110_02184a40Ev kind:function(arm,size=0x36c) addr:0x02184a40 +_ZN9PlayerGet19func_ov110_02184dacEiii kind:function(arm,size=0x30) addr:0x02184dac +_ZN9PlayerGetC2Ev kind:function(arm,size=0xa0) addr:0x02184ddc +_ZN9PlayerGetD1Ev kind:function(arm,size=0xc4) addr:0x02184e7c +_ZN9PlayerGetD0Ev kind:function(arm,size=0xcc) addr:0x02184f40 +_ZN9PlayerGet8vfunc_0cEv kind:function(arm,size=0x5d8) addr:0x0218500c +_ZN9PlayerGet8vfunc_10Ev kind:function(arm,size=0x6d0) addr:0x021855e4 +_ZN9PlayerGet8vfunc_18Eiii kind:function(arm,size=0x7c) addr:0x02185cb4 +_ZN22UnkStruct_PlayerGet_ecC1Ev kind:function(arm,size=0xc) addr:0x02185d30 +_ZN18UnkStruct_027e0ce019func_ov110_02185d3cEi kind:function(thumb,size=0x66) addr:0x02185d3c +_ZN9PlayerGet19func_ov110_02185da4Ei kind:function(arm,size=0x10) addr:0x02185da4 +_ZN9PlayerGet19func_ov110_02185db4Ei kind:function(arm,size=0x10) addr:0x02185db4 +data_ov110_02185dc4 kind:data(any) addr:0x02185dc4 data_ov110_02185dc8 kind:data(any) addr:0x02185dc8 -data_ov110_02185dca kind:data(any) addr:0x02185dca data_ov110_02185de8 kind:data(any) addr:0x02185de8 data_ov110_02185fbc kind:data(any) addr:0x02185fbc data_ov110_021860c4 kind:data(any) addr:0x021860c4 ambiguous -__sinit_ov110_02186190 kind:function(arm,size=0x2c) addr:0x02186190 -.p__sinit_ov110_02186190 kind:data(word) addr:0x021861bc +__sinit_PlayerGet.cpp kind:function(arm,size=0x2c) addr:0x02186190 +.p__sinit_PlayerGet.cpp kind:data(word) addr:0x021861bc data_ov110_021861e0 kind:data(any) addr:0x021861e0 data_ov110_021861ec kind:data(any) addr:0x021861ec -data_ov110_02186200 kind:data(any) addr:0x02186200 -data_ov110_0218620c kind:data(any) addr:0x0218620c +_ZTV22UnkStruct_PlayerGet_74 kind:data(any) addr:0x021861f8 +_ZTV9PlayerGet kind:data(any) addr:0x02186204 data_ov110_02186240 kind:bss addr:0x02186240 data_ov110_02188e48 kind:bss addr:0x02188e48 ambiguous data_ov110_02188f08 kind:bss addr:0x02188f08 ambiguous diff --git a/config/jp/arm9/overlays/ov110/relocs.txt b/config/jp/arm9/overlays/ov110/relocs.txt index 608fc4f1..b3622cfa 100644 --- a/config/jp/arm9/overlays/ov110/relocs.txt +++ b/config/jp/arm9/overlays/ov110/relocs.txt @@ -30,8 +30,8 @@ from:0x02186990 kind:arm_call to:0x0208b7c4 module:overlay(0) from:0x021869ac kind:arm_call to:0x0205a664 module:overlay(0) from:0x021869c4 kind:arm_call_thumb to:0x020590f0 module:overlay(0) from:0x021869e0 kind:arm_call to:0x0203e690 module:main -from:0x021869ec kind:load to:0x02187e0c module:overlay(110) -from:0x021869f0 kind:load to:0x02187e00 module:overlay(110) +from:0x021869ec kind:load to:0x02187e04 add:8 module:overlay(110) +from:0x021869f0 kind:load to:0x02187df8 add:8 module:overlay(110) from:0x021869f4 kind:load to:0x020a1aac module:overlay(0) from:0x021869f8 kind:load to:0x02187930 module:overlay(110) from:0x02186a10 kind:arm_call to:0x0205dffc module:overlay(0) @@ -41,7 +41,7 @@ from:0x02186a8c kind:arm_call to:0x0203e740 module:main from:0x02186a94 kind:arm_call_thumb to:0x0205910c module:overlay(0) from:0x02186a9c kind:arm_call to:0x0208b838 module:overlay(0) from:0x02186aa4 kind:arm_call to:0x02090fa0 module:overlay(0) -from:0x02186ab0 kind:load to:0x02187e0c module:overlay(110) +from:0x02186ab0 kind:load to:0x02187e04 add:8 module:overlay(110) from:0x02186ab4 kind:load to:0x027e0cec module:dtcm from:0x02186abc kind:load to:0x020a1aac module:overlay(0) from:0x02186ad4 kind:arm_call to:0x0205dffc module:overlay(0) @@ -52,7 +52,7 @@ from:0x02186b58 kind:arm_call_thumb to:0x0205910c module:overlay(0) from:0x02186b60 kind:arm_call to:0x0208b838 module:overlay(0) from:0x02186b68 kind:arm_call to:0x02090fa0 module:overlay(0) from:0x02186b70 kind:arm_call to:0x02011ff4 module:main -from:0x02186b7c kind:load to:0x02187e0c module:overlay(110) +from:0x02186b7c kind:load to:0x02187e04 add:8 module:overlay(110) from:0x02186b80 kind:load to:0x027e0cec module:dtcm from:0x02186b88 kind:load to:0x020a1aac module:overlay(0) from:0x02186cf0 kind:arm_call to:0x020ab82c module:overlay(0) diff --git a/config/jp/arm9/overlays/ov110/symbols.txt b/config/jp/arm9/overlays/ov110/symbols.txt index 36f4d7ff..7eec4604 100644 --- a/config/jp/arm9/overlays/ov110/symbols.txt +++ b/config/jp/arm9/overlays/ov110/symbols.txt @@ -1,27 +1,27 @@ -func_ov110_021865c0 kind:function(arm,size=0x36c) addr:0x021865c0 -func_ov110_0218692c kind:function(arm,size=0x30) addr:0x0218692c -func_ov110_0218695c kind:function(arm,size=0xa0) addr:0x0218695c -func_ov110_021869fc kind:function(arm,size=0xc4) addr:0x021869fc -func_ov110_02186ac0 kind:function(arm,size=0xcc) addr:0x02186ac0 -func_ov110_02186b8c kind:function(arm,size=0x54) addr:0x02186b8c -func_ov110_02186be0 kind:function(arm,size=0x5d8) addr:0x02186be0 -func_ov110_021871b8 kind:function(arm,size=0x6fc) addr:0x021871b8 -func_ov110_021878b4 kind:function(arm,size=0x7c) addr:0x021878b4 -func_ov110_02187930 kind:function(arm,size=0xc) addr:0x02187930 -func_ov110_0218793c kind:function(thumb,size=0x66) addr:0x0218793c -func_ov110_021879a4 kind:function(arm,size=0x10) addr:0x021879a4 -func_ov110_021879b4 kind:function(arm,size=0x10) addr:0x021879b4 +_ZN9PlayerGet19func_ov110_02184a40Ev kind:function(arm,size=0x36c) addr:0x021865c0 +_ZN9PlayerGet19func_ov110_02184dacEiii kind:function(arm,size=0x30) addr:0x0218692c +_ZN9PlayerGetC2Ev kind:function(arm,size=0xa0) addr:0x0218695c +_ZN9PlayerGetD1Ev kind:function(arm,size=0xc4) addr:0x021869fc +_ZN9PlayerGetD0Ev kind:function(arm,size=0xcc) addr:0x02186ac0 +_ZN9PlayerGet19func_ov110_02186b8cEv kind:function(arm,size=0x54) addr:0x02186b8c +_ZN9PlayerGet8vfunc_0cEv kind:function(arm,size=0x5d8) addr:0x02186be0 +_ZN9PlayerGet8vfunc_10Ev kind:function(arm,size=0x6fc) addr:0x021871b8 +_ZN9PlayerGet8vfunc_18Eiii kind:function(arm,size=0x7c) addr:0x021878b4 +_ZN22UnkStruct_PlayerGet_ecC1Ev kind:function(arm,size=0xc) addr:0x02187930 +_ZN18UnkStruct_027e0ce019func_ov110_02185d3cEi kind:function(thumb,size=0x66) addr:0x0218793c +_ZN9PlayerGet19func_ov110_02185da4Ei kind:function(arm,size=0x10) addr:0x021879a4 +_ZN9PlayerGet19func_ov110_02185db4Ei kind:function(arm,size=0x10) addr:0x021879b4 data_ov110_021879c8 kind:data(any) addr:0x021879c8 data_ov110_021879ca kind:data(any) addr:0x021879ca data_ov110_021879e8 kind:data(any) addr:0x021879e8 data_ov110_02187bbc kind:data(any) addr:0x02187bbc data_ov110_02187c44 kind:data(any) addr:0x02187c44 ambiguous -__sinit_ov110_02187d90 kind:function(arm,size=0x2c) addr:0x02187d90 -.p__sinit_ov110_02187d90 kind:data(word) addr:0x02187dbc +__sinit_PlayerGet.cpp kind:function(arm,size=0x2c) addr:0x02187d90 +.p__sinit_PlayerGet.cpp kind:data(word) addr:0x02187dbc data_ov110_02187de0 kind:data(any) addr:0x02187de0 data_ov110_02187dec kind:data(any) addr:0x02187dec -data_ov110_02187e00 kind:data(any) addr:0x02187e00 -data_ov110_02187e0c kind:data(any) addr:0x02187e0c +_ZTV22UnkStruct_PlayerGet_74 kind:data(any) addr:0x02187df8 +_ZTV9PlayerGet kind:data(any) addr:0x02187e04 data_ov110_02187e40 kind:bss addr:0x02187e40 data_ov110_0218a9c8 kind:bss addr:0x0218a9c8 ambiguous data_ov110_0218aa88 kind:bss addr:0x0218aa88 ambiguous