diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 7736304d..ac98082e 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1877,7 +1877,7 @@ _ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038afc _ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038b08 _ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038b1c _ZN18UnkStruct_02038aa013func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038b28 -_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038b34 +_ZN18UnkStruct_02038aa08vfunc_4cEji kind:function(arm,size=0xc) addr:0x2038b34 _ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038b40 _ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b74 _ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b78 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 667b34f9..125495a0 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1877,7 +1877,7 @@ _ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038ab8 _ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038ac4 _ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038ad8 _ZN18UnkStruct_02038aa013func_02038b28Ev kind:function(thumb,size=0xc) addr:0x2038ae4 -_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038af0 +_ZN18UnkStruct_02038aa08vfunc_4cEji kind:function(arm,size=0xc) addr:0x2038af0 _ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038afc _ZN18UnkStruct_02038aa013func_02038b74Ev kind:function(arm,size=0x4) addr:0x2038b30 _ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b34 diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp index fcb9ae0d..f9904674 100644 --- a/include/Unknown/UnkStruct_02038aa0.hpp +++ b/include/Unknown/UnkStruct_02038aa0.hpp @@ -85,7 +85,7 @@ public: /* 40 */ virtual void vfunc_40(); /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY); /* 48 */ virtual void vfunc_48(); - /* 4c */ virtual void vfunc_4c(); + /* 4c */ virtual void vfunc_4c(u32 param1, unk32 param2); /* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4); /* 54 */ virtual void vfunc_54(); /* 58 */ virtual void vfunc_58(); @@ -112,7 +112,6 @@ public: // /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override; UnkStruct_02038aa0(u8 param1, u8 param2); - void func_02038b34(u32 param1, unk32 param2); void func_02038b40(); bool func_02038b78(); s32 func_02038cb8(s32 param1); diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp index 0c199b1a..ca626fec 100644 --- a/include/Unknown/UnkStruct_020397f8.hpp +++ b/include/Unknown/UnkStruct_020397f8.hpp @@ -125,7 +125,6 @@ public: /* 74 */ //! TODO: check if this is really here - static void func_0203e060(UnkStruct_02038aa0* param_1, u8 param_2, u8 param_3); void func_02039a3c(void); unk32 func_02039250(void); }; diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp index 899d77f3..55f0af77 100644 --- a/src/Main/Unknown/UnkStruct_02038aa0.cpp +++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp @@ -35,11 +35,10 @@ THUMB void UnkStruct_02038aa0::func_02038b28(void) { this->mUnk_114->mUnk_04 = NULL; } -ARM void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) { - UnkStruct_020397f8::func_0203e060(this, param1, param2); +ARM void UnkStruct_02038aa0::vfunc_4c(u32 param1, unk32 param2) { + this->UnkStruct_0203dae0::vfunc_10(param1, param2); } -ARM void UnkStruct_02038aa0::vfunc_4c() {} ARM void UnkStruct_02038aa0::vfunc_10(unk32 param1) {} ARM void UnkStruct_02038aa0::func_02038b40() { diff --git a/tools/configure.py b/tools/configure.py index 26f7e86e..7f2c5b26 100644 --- a/tools/configure.py +++ b/tools/configure.py @@ -32,6 +32,7 @@ CC_FLAGS = " ".join([ "-Cpp_exceptions off", # Disable C++ exceptions "-RTTI off", # Disable runtime type information "-interworking", # Enable ARM/Thumb interworking + "-w off", # Disable warnings "-sym on", # Debug info, including line numbers "-gccinc", # Interpret #include "..." and #include <...> equally "-nolink", # Do not link