From 5b8beb79d7a44014aa0ed490a1eca726c2c3310b Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:36:33 +0100 Subject: [PATCH] make func_0203643c static --- config/eur/arm9/symbols.txt | 2 +- config/usa/arm9/symbols.txt | 2 +- include/Message/MessageManager.hpp | 1 + src/Main/Message/MessageManager.cpp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 1e028ee1..24db99a4 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1789,7 +1789,7 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x20361d0 func_02036240 kind:function(arm,size=0x170) addr:0x2036240 func_020363b0 kind:function(arm,size=0x18) addr:0x20363b0 func_020363c8 kind:function(arm,size=0x74) addr:0x20363c8 -_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x203643c +_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x203643c _ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x2036490 _ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x203665c _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x20366a8 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index cbebf461..d54c59f4 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1789,7 +1789,7 @@ func_020361d0 kind:function(arm,size=0x70) addr:0x203618c func_02036240 kind:function(arm,size=0x170) addr:0x20361fc func_020363b0 kind:function(arm,size=0x18) addr:0x203636c func_020363c8 kind:function(arm,size=0x74) addr:0x2036384 -_Z13func_0203643cPiP18UnkStruct_027E0C68j kind:function(arm,size=0x54) addr:0x20363f8 +_ZN18UnkStruct_027E0C6813func_0203643cEPiPS_j kind:function(arm,size=0x54) addr:0x20363f8 _ZN18UnkStruct_027E0C6813func_02036490Eiii kind:function(thumb,size=0x1cc) addr:0x203644c _ZN18UnkStruct_027E0C6813func_0203665cEv kind:function(thumb,size=0x4c) addr:0x2036618 _ZN18UnkStruct_027E0C68D2Ev kind:function(arm,size=0x1c) addr:0x2036664 diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp index 7b7155dd..596124ce 100644 --- a/include/Message/MessageManager.hpp +++ b/include/Message/MessageManager.hpp @@ -155,6 +155,7 @@ public: /* 0x28 */ UnkStruct_027E0C68_UnkSubClass1* unk_28[6]; /* 0x40 */ UnkStruct_027E0C68_UnkSubClass1* unk_40[2]; // is array size 6? + static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3); void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4); void func_0203665c(void); ~UnkStruct_027E0C68(); diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp index 6e0cb0d8..b84af893 100644 --- a/src/Main/Message/MessageManager.cpp +++ b/src/Main/Message/MessageManager.cpp @@ -31,7 +31,7 @@ extern u8 data_027e0c54; extern u32* data_027e0ffc; extern void func_ov000_020cec60(u32*, u16, Vec3p*, Actor*, unk32); -ARM void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { +ARM void UnkStruct_027E0C68::func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3) { BMGGroups *pBVar2 = param_2->pGroups; *param_1 = BMG_GET_MSG_ADDR(pBVar2, param_3); }