From 2794641461bd5b02d69d0dac0a8d5f102a7ff945 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 18 Jan 2025 13:47:34 +0100 Subject: [PATCH] Fix build --- config/eur/arm9/symbols.txt | 6 +++--- config/usa/arm9/symbols.txt | 6 +++--- include/Unknown/UnkStruct_02032f0c.hpp | 1 + src/Main/DTCM/UnkStruct_027e05f8_2.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 654d8099..69505224 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1449,7 +1449,7 @@ _ZN9SysObjectdaEPv kind:function(arm,size=0xc) addr:0x202ea18 _ZN18UnkStruct_027e0fe04InitEv kind:function(thumb,size=0x10) addr:0x202ea24 _ZN18UnkStruct_027e0fe07DisposeEv kind:function(thumb,size=0x1c) addr:0x202ea34 _ZN18UnkStruct_027e0fe013func_0202ea50Eiii kind:function(thumb,size=0x48) addr:0x202ea50 -_ZN18UnkStruct_027e0fe07DisposeEv kind:function(thumb,size=0x24) addr:0x202ea98 +_ZN18UnkStruct_027e0fe013func_0202ea98Ev kind:function(thumb,size=0x24) addr:0x202ea98 func_0202eabc kind:function(arm,size=0x80) addr:0x202eabc func_0202eb3c kind:function(arm,size=0x58) addr:0x202eb3c func_0202eb94 kind:function(arm,size=0x28) addr:0x202eb94 @@ -1862,7 +1862,7 @@ _ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038758 _ZN18UnkStruct_020386d88vfunc_24Ei kind:function(arm,size=0x1c) addr:0x2038770 _ZN18UnkStruct_020386d88vfunc_28Ev kind:function(arm,size=0x18) addr:0x203878c _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x20387a4 -_ZN18UnkStruct_02037750D0Ev kind:function(arm,size=0x14) addr:0x20387cc +_ZN18UnkStruct_020386d88D0Ev kind:function(arm,size=0x14) addr:0x20387cc func_020387e0 kind:function(thumb,size=0xc) addr:0x20387e0 func_020387ec kind:function(arm,size=0x18) addr:0x20387ec func_02038804 kind:function(arm,size=0x18) addr:0x2038804 @@ -2703,7 +2703,7 @@ data_02057994 kind:data(any) addr:0x2057994 data_02057998 kind:data(any) addr:0x2057998 data_0205799c kind:data(any) addr:0x205799c _ZTV18UnkStruct_02032f0c kind:data(any) addr:0x20579c8 -_ZTV18UnkStruct_02032f0c kind:data(any) addr:0x20579f8 +_ZTV18UnkStruct_02032e7c kind:data(any) addr:0x20579f8 data_02057a00 kind:data(any) addr:0x2057a00 data_02057a08 kind:data(any) addr:0x2057a08 data_02057a10 kind:data(any) addr:0x2057a10 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 041c2860..197b2bb9 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1449,7 +1449,7 @@ _ZN9SysObjectdaEPv kind:function(arm,size=0xc) addr:0x202ea14 _ZN18UnkStruct_027e0fe04InitEv kind:function(thumb,size=0x10) addr:0x202ea20 _ZN18UnkStruct_027e0fe07DisposeEv kind:function(thumb,size=0x1c) addr:0x202ea30 _ZN18UnkStruct_027e0fe013func_0202ea50Eiii kind:function(thumb,size=0x48) addr:0x202ea4c -_ZN18UnkStruct_027e0fe07DisposeEv kind:function(thumb,size=0x24) addr:0x202ea94 +_ZN18UnkStruct_027e0fe013func_0202ea98Ev kind:function(thumb,size=0x24) addr:0x202ea94 func_0202eabc kind:function(arm,size=0x80) addr:0x202eab8 func_0202eb3c kind:function(arm,size=0x58) addr:0x202eb38 func_0202eb94 kind:function(arm,size=0x28) addr:0x202eb90 @@ -1862,7 +1862,7 @@ _ZN18UnkStruct_020386d88vfunc_08Ei kind:function(arm,size=0x18) addr:0x2038714 _ZN18UnkStruct_020386d88vfunc_24Ei kind:function(arm,size=0x1c) addr:0x203872c _ZN18UnkStruct_020386d88vfunc_28Ev kind:function(arm,size=0x18) addr:0x2038748 _ZN18UnkStruct_020386d88vfunc_30Ev kind:function(arm,size=0x28) addr:0x2038760 -_ZN18UnkStruct_02037750D0Ev kind:function(arm,size=0x14) addr:0x2038788 +_ZN18UnkStruct_020386d88D0Ev kind:function(arm,size=0x14) addr:0x2038788 func_020387e0 kind:function(thumb,size=0xc) addr:0x203879c func_020387ec kind:function(arm,size=0x18) addr:0x20387a8 func_02038804 kind:function(arm,size=0x18) addr:0x20387c0 @@ -2704,7 +2704,7 @@ data_02057994 kind:data(any) addr:0x205794c data_02057998 kind:data(any) addr:0x2057950 data_0205799c kind:data(any) addr:0x2057954 _ZTV18UnkStruct_02032f0c kind:data(any) addr:0x2057980 -_ZTV18UnkStruct_02032f0c kind:data(any) addr:0x20579b0 +_ZTV18UnkStruct_02032e7c kind:data(any) addr:0x20579b0 data_02057a00 kind:data(any) addr:0x20579b8 data_02057a08 kind:data(any) addr:0x20579c0 data_02057a10 kind:data(any) addr:0x20579c8 diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp index f0e59367..602861bd 100644 --- a/include/Unknown/UnkStruct_02032f0c.hpp +++ b/include/Unknown/UnkStruct_02032f0c.hpp @@ -21,6 +21,7 @@ public: }; class UnkStruct_02032f0c { +public: /* 00 (vtable) */ /* 04 */ unk32 mUnk_04; /* 08 */ unk32 mUnk_08; diff --git a/src/Main/DTCM/UnkStruct_027e05f8_2.cpp b/src/Main/DTCM/UnkStruct_027e05f8_2.cpp index b44d3fd6..7a4c76da 100644 --- a/src/Main/DTCM/UnkStruct_027e05f8_2.cpp +++ b/src/Main/DTCM/UnkStruct_027e05f8_2.cpp @@ -3,4 +3,4 @@ UnkStruct_027e05f8::UnkStruct_027e05f8() {} void UnkStruct_027e05f8::func_02037458(u16 param1) {} void UnkStruct_027e05f8::func_02037480() {} -unk32 UnkStruct_027e05f8::func_020374b4(unk32 param1) {} +unk32 UnkStruct_027e05f8::func_02037490(unk32 param1) {}