diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index bb758291..96f4d244 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1399,7 +1399,7 @@ _Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3bc func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d474 _Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d550 func_0202d56c kind:function(thumb,size=0x24) addr:0x202d56c -func_0202d590 kind:function(thumb,size=0x8) addr:0x202d590 +_Z13func_0202d590P9BMGHeader kind:function(thumb,size=0x8) addr:0x202d590 func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d598 func_0202d5b4 kind:function(thumb,size=0x28) addr:0x202d5b4 func_0202d5dc kind:function(thumb,size=0x10) addr:0x202d5dc @@ -1801,33 +1801,33 @@ func_02036798 kind:function(arm,size=0x44) addr:0x2036798 func_020367dc kind:function(arm,size=0x10) addr:0x20367dc func_020367ec kind:function(arm,size=0x1c) addr:0x20367ec func_02036808 kind:function(arm,size=0x1c) addr:0x2036808 -func_02036824 kind:function(arm,size=0x2c) addr:0x2036824 -func_02036850 kind:function(arm,size=0x38) addr:0x2036850 +_Z13func_02036824v kind:function(arm,size=0x2c) addr:0x2036824 +_Z13func_02036850P15Struct_027E0C68 kind:function(arm,size=0x38) addr:0x2036850 func_02036888 kind:function(arm,size=0x6c) addr:0x2036888 func_020368f4 kind:function(arm,size=0x18) addr:0x20368f4 func_0203690c kind:function(arm,size=0x2b0) addr:0x203690c func_02036bbc kind:function(arm,size=0x94) addr:0x2036bbc func_02036c50 kind:function(arm,size=0x54) addr:0x2036c50 func_02036ca4 kind:function(arm,size=0x40) addr:0x2036ca4 -func_02036ce4 kind:function(arm,size=0x4c) addr:0x2036ce4 +_Z13func_02036ce4P15Struct_027E0C68P22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ce4 func_02036d30 kind:function(arm,size=0x1c) addr:0x2036d30 func_02036d4c kind:function(arm,size=0x20) addr:0x2036d4c func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d6c func_02036da8 kind:function(arm,size=0x134) addr:0x2036da8 func_02036edc kind:function(arm,size=0x8c) addr:0x2036edc func_02036f68 kind:function(arm,size=0x168) addr:0x2036f68 -func_020370d0 kind:function(arm,size=0x18) addr:0x20370d0 -func_020370e8 kind:function(arm,size=0x70) addr:0x20370e8 -func_02037158 kind:function(arm,size=0x20) addr:0x2037158 -func_02037178 kind:function(arm,size=0x38) addr:0x2037178 +_Z13func_020370d0P15Struct_027E0C68ii kind:function(arm,size=0x18) addr:0x20370d0 +_Z13func_020370e8P15Struct_027E0C68issi kind:function(arm,size=0x70) addr:0x20370e8 +_Z13func_02037158P15Struct_027E0C68j kind:function(arm,size=0x20) addr:0x2037158 +_Z13func_02037178P15Struct_027E0C68j kind:function(arm,size=0x38) addr:0x2037178 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x20371b0 _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x20371b4 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x20371c8 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037258 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x203728c _Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372f0 -func_020373b4 kind:function(thumb,size=0x38) addr:0x20373b4 -func_020373ec kind:function(arm,size=0x60) addr:0x20373ec +_Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x20373b4 +_Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373ec func_0203744c kind:function(thumb,size=0xc) addr:0x203744c func_02037458 kind:function(arm,size=0x28) addr:0x2037458 func_02037480 kind:function(arm,size=0x10) addr:0x2037480 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index 37c20980..30f06274 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1399,7 +1399,7 @@ _Z13func_0202d3bciPjPciibii kind:function(thumb,size=0xb8) addr:0x202d3b8 func_0202d474 kind:function(thumb,size=0xdc) addr:0x202d470 _Z13func_0202d550iPjPciii kind:function(thumb,size=0x1c) addr:0x202d54c func_0202d56c kind:function(thumb,size=0x24) addr:0x202d568 -func_0202d590 kind:function(thumb,size=0x8) addr:0x202d58c +_Z13func_0202d590P9BMGHeader kind:function(thumb,size=0x8) addr:0x202d58c func_0202d598 kind:function(thumb,size=0x1c) addr:0x202d594 func_0202d5b4 kind:function(thumb,size=0x28) addr:0x202d5b0 func_0202d5dc kind:function(thumb,size=0x10) addr:0x202d5d8 @@ -1801,33 +1801,33 @@ func_02036798 kind:function(arm,size=0x44) addr:0x2036754 func_020367dc kind:function(arm,size=0x10) addr:0x2036798 func_020367ec kind:function(arm,size=0x1c) addr:0x20367a8 func_02036808 kind:function(arm,size=0x1c) addr:0x20367c4 -func_02036824 kind:function(arm,size=0x2c) addr:0x20367e0 -func_02036850 kind:function(arm,size=0x38) addr:0x203680c +_Z13func_02036824v kind:function(arm,size=0x2c) addr:0x20367e0 +_Z13func_02036850P15Struct_027E0C68 kind:function(arm,size=0x38) addr:0x203680c func_02036888 kind:function(arm,size=0x6c) addr:0x2036844 func_020368f4 kind:function(arm,size=0x18) addr:0x20368b0 func_0203690c kind:function(arm,size=0x2b0) addr:0x20368c8 func_02036bbc kind:function(arm,size=0x94) addr:0x2036b78 func_02036c50 kind:function(arm,size=0x54) addr:0x2036c0c func_02036ca4 kind:function(arm,size=0x40) addr:0x2036c60 -func_02036ce4 kind:function(arm,size=0x4c) addr:0x2036ca0 +_Z13func_02036ce4P15Struct_027E0C68P22Struct_027E0C68_unk_18i kind:function(arm,size=0x4c) addr:0x2036ca0 func_02036d30 kind:function(arm,size=0x1c) addr:0x2036cec func_02036d4c kind:function(arm,size=0x20) addr:0x2036d08 func_02036d6c kind:function(arm,size=0x3c) addr:0x2036d28 func_02036da8 kind:function(arm,size=0x134) addr:0x2036d64 func_02036edc kind:function(arm,size=0x8c) addr:0x2036e98 func_02036f68 kind:function(arm,size=0x168) addr:0x2036f24 -func_020370d0 kind:function(arm,size=0x18) addr:0x203708c -func_020370e8 kind:function(arm,size=0x70) addr:0x20370a4 -func_02037158 kind:function(arm,size=0x20) addr:0x2037114 -func_02037178 kind:function(arm,size=0x38) addr:0x2037134 +_Z13func_020370d0P15Struct_027E0C68ii kind:function(arm,size=0x18) addr:0x203708c +_Z13func_020370e8P15Struct_027E0C68issi kind:function(arm,size=0x70) addr:0x20370a4 +_Z13func_02037158P15Struct_027E0C68j kind:function(arm,size=0x20) addr:0x2037114 +_Z13func_02037178P15Struct_027E0C68j kind:function(arm,size=0x38) addr:0x2037134 _Z13func_020371b0v kind:function(arm,size=0x4) addr:0x203716c _Z13func_020371b4P11BMGFileInfo kind:function(thumb,size=0x14) addr:0x2037170 _Z13func_020371c8P11BMGFileInfoPjs kind:function(thumb,size=0x90) addr:0x2037184 _Z13func_02037258P11BMGFileInfoi kind:function(arm,size=0x34) addr:0x2037214 _Z13func_0203728cP11BMGFileInfoi kind:function(arm,size=0x64) addr:0x2037248 _Z13func_020372f0P9BMGGroups12BMGFileIndexsi kind:function(thumb,size=0xc4) addr:0x20372ac -func_020373b4 kind:function(thumb,size=0x38) addr:0x2037370 -func_020373ec kind:function(arm,size=0x60) addr:0x20373a8 +_Z13func_020373b4P9BMGGroupss kind:function(thumb,size=0x38) addr:0x2037370 +_Z13func_020373ecP9BMGGroupsi kind:function(arm,size=0x60) addr:0x20373a8 func_0203744c kind:function(thumb,size=0xc) addr:0x2037408 func_02037458 kind:function(arm,size=0x28) addr:0x2037414 func_02037480 kind:function(arm,size=0x10) addr:0x203743c diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index d128838d..08c7a7fa 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -170,5 +170,82 @@ typedef struct BMGFileInfo { // 0x027E0C68 + 0x14 typedef struct BMGGroups { /* 0x00 */ BMGFileInfo* entries; // accessed with `groupId` - /* 0x04 */ u32 numEntries; + /* 0x04 */ s32 numEntries; } BMGGroups; // size = 0x8 + +typedef void (*Struct_027E0C68_unk_28_unk_58)(struct Struct_027E0C68_unk_28*); + +typedef struct Struct_027E0C68_unk_28_unk_00 { + /* 0x00 */ unk32 unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + /* 0x0C */ unk32 unk_0C; + /* 0x10 */ unk32 unk_10; + /* 0x14 */ unk32 unk_14; + /* 0x18 */ unk32 unk_18; + /* 0x1C */ unk32 unk_1C; + /* 0x20 */ unk32 unk_20; + /* 0x24 */ unk32 unk_24; + /* 0x28 */ unk32 unk_28; + /* 0x2C */ unk32 unk_2C; + /* 0x30 */ unk32 unk_30; + /* 0x34 */ unk32 unk_34; + /* 0x38 */ unk32 unk_38; + /* 0x3C */ unk32 unk_3C; + /* 0x40 */ unk32 unk_40; + /* 0x44 */ unk32 unk_44; + /* 0x48 */ unk32 unk_48; + /* 0x4C */ unk32 unk_4C; + /* 0x50 */ unk32 unk_50; + /* 0x54 */ unk32 unk_54; + /* 0x58 */ Struct_027E0C68_unk_28_unk_58 unk_58; + /* 0x5C */ unk32 unk_5C; +} Struct_027E0C68_unk_28_unk_00; + +typedef struct Struct_027E0C68_unk_28 { + /* 0x00 */ Struct_027E0C68_unk_28_unk_00* unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + /* 0x0C */ unk32 unk_0C; +} Struct_027E0C68_unk_28; + +typedef struct Struct_027E0C68_unk_18 { + /* 0x00 */ unk32 unk_00; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + /* 0x0C */ unk32 unk_0C; + /* 0x10 */ unk32 unk_10; + /* 0x14 */ unk32 unk_14; + /* 0x18 */ unk32 unk_18; + /* 0x1C */ unk32 unk_1C; + /* 0x20 */ unk32 unk_20; + /* 0x24 */ unk32 unk_24; + /* 0x28 */ unk32 unk_28; + /* 0x2C */ unk32 unk_2C; + /* 0x30 */ unk32 unk_30; + /* 0x34 */ unk16 unk_34; + /* 0x36 */ unk16 unk_36; + /* 0x38 */ unk32 unk_38; + /* 0x3C */ unk32 unk_3C; + /* 0x40 */ unk32 unk_40; + /* 0x44 */ unk32 unk_44; + /* 0x48 */ unk32 unk_48; +} Struct_027E0C68_unk_18; // size = 0x4C + +typedef struct Struct_027E0C68 { + /* 0x00 */ unk16 unk_00; + /* 0x02 */ unk16 unk_02; + /* 0x04 */ unk32 unk_04; + /* 0x08 */ unk32 unk_08; + /* 0x0C */ unk32 unk_0C; + /* 0x10 */ unk32 unk_10; + /* 0x14 */ BMGGroups* pGroups; + /* 0x18 */ Struct_027E0C68_unk_18* unk_18; + /* 0x1C */ Struct_027E0C68_unk_18* unk_1C; + /* 0x20 */ unk32 unk_20; + /* 0x24 */ unk32 unk_24; + /* 0x28 */ Struct_027E0C68_unk_28* unk_28[6]; // 022172B0 +} Struct_027E0C68; + +Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5); +Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2); diff --git a/include/global.h b/include/global.h index 617f672f..8d6635dd 100644 --- a/include/global.h +++ b/include/global.h @@ -7,7 +7,8 @@ #define SET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] |= 1 << ((pos) & 0x1f)) #define RESET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] &= ~(1 << ((pos) & 0x1f))) -#define ARRAY_LEN(arr) ((sizeof(arr) / sizeof(*arr))) +#define ARRAY_LEN_U(arr) (u32)((sizeof(arr) / sizeof(*arr))) +#define ARRAY_LEN(arr) (s32)(sizeof(arr) / sizeof(*arr)) // Prevent the IDE from reporting errors that the compiler/linker won't report #ifdef __INTELLISENSE__ diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp index 73ab6bbb..7e735381 100644 --- a/src/00_Core/Actor/ActorManager.cpp +++ b/src/00_Core/Actor/ActorManager.cpp @@ -313,7 +313,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) { if (param2 != NULL) *param2 = 0; AABB boxes[8]; - s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes)); + s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes)); if (numBoxes <= 0) return 0; s32 i; @@ -350,7 +350,7 @@ ARM s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) { ARM void ActorManager::func_ov00_020c3ce8(unk32 param1, bool param2) { AABB boxes[8]; - s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN(boxes)); + s32 numBoxes = gMapManager->GetTriggerBoundingBoxes(param1, boxes, ARRAY_LEN_U(boxes)); if (numBoxes <= 0) return; s32 i; diff --git a/src/Main/BMG.cpp b/src/Main/BMG.cpp index f4f65a72..e6cf6808 100644 --- a/src/Main/BMG.cpp +++ b/src/Main/BMG.cpp @@ -5,12 +5,13 @@ extern "C" { char* func_0202ab38(u32* lang); u32* func_0202d550(int, u32*, char* path, int, int, int); +void func_0202d590(BMGHeader*); extern u32 *data_027e0ce0[]; extern u32 data_027e05f4; // language extern u32* data_ov002_0210016c; -static char* sBMGFiles[BMG_FILE_INDEX_MAX] = { +static char* sBMGFileNames[BMG_FILE_INDEX_MAX] = { "system", // BMG_FILE_INDEX_SYSTEM "regular", // BMG_FILE_INDEX_REGULAR "battle", // BMG_FILE_INDEX_BATTLE @@ -47,6 +48,66 @@ static char* sBMGFiles[BMG_FILE_INDEX_MAX] = { "kaitei_F", // BMG_FILE_INDEX_KAITEI_F }; +s32 func_02036824(void); +s32 func_02036850(Struct_027E0C68*); + +ARM s32 func_02036ce4(Struct_027E0C68*, Struct_027E0C68_unk_18*, unk32) { + // TODO +} + +ARM Struct_027E0C68_unk_18* func_020370d0(Struct_027E0C68* param_1, unk32 param_2, unk32 param_3) { + return func_020370e8(param_1, param_2, -1, -1, param_3); +} + +ARM Struct_027E0C68_unk_18* func_020370e8(Struct_027E0C68* param_1, unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5) { + Struct_027E0C68_unk_18* puVar2; + + if (func_02036824() != 0) { + puVar2 = param_1->unk_18; + } else { + if (func_02036850(param_1) != 0) { + puVar2 = param_1->unk_1C; + } else { + return NULL; + } + } + + puVar2->unk_30 = param_5; + puVar2->unk_34 = param_3; + puVar2->unk_36 = param_4; + + if (func_02036ce4(param_1, puVar2, param_2) != 0) { + return puVar2; + } + + return NULL; +} + +ARM void func_02037158(Struct_027E0C68* param_1, u32 param_2) { + Struct_027E0C68_unk_28* pSVar1; + + pSVar1 = func_02037178(param_1, param_2); + + if (pSVar1 != NULL) { + pSVar1->unk_00->unk_58(pSVar1); + } +} + +ARM Struct_027E0C68_unk_28* func_02037178(Struct_027E0C68* param_1, u32 param_2) { + Struct_027E0C68_unk_28* piVar1; + s32 iVar2; + + for (iVar2 = 0; iVar2 < ARRAY_LEN(param_1->unk_28); iVar2++) { + piVar1 = param_1->unk_28[iVar2]; + + if (piVar1 != NULL && piVar1->unk_08 == param_2) { + return piVar1; + } + } + + return NULL; +} + ARM void func_020371b0(void) { } @@ -125,9 +186,9 @@ ARM u16 func_0203728c(BMGFileInfo* pFileInfo, unk32 param_2) { return -1; } - for (i = 0; i < pFLI1->entrySize; i++) { - if (param_2 == pFLI1->entries[i * 8].msgFlowID) { - return pFLI1->entries[i * 8].msgFlowNodeIndex; + for (i = 0; i < pFLI1->numEntries; i++) { + if (param_2 == pFLI1->entries[i * 2].msgFlowID) { + return pFLI1->entries[i].msgFlowNodeIndex; } } @@ -143,7 +204,7 @@ THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18, in // path to the bmg file for the current language (i.e.: "English/Message/battle.bmg") strcpy(bmgPath, func_0202ab38(&data_027e05f4)); strcat(bmgPath, "/Message/"); - strcat(bmgPath, sBMGFiles[eIndex]); + strcat(bmgPath, sBMGFileNames[eIndex]); strcat(bmgPath, ".bmg"); pFile = data_027e0ce0[1]; @@ -158,12 +219,44 @@ THUMB void func_020372f0(BMGGroups* pGroups, BMGFileIndex eIndex, s16 unk_18, in // pFile = data_027e0ce0[0]; } + // get file data pFile = func_0202d550(0xC4, pFile, bmgPath, 0, 0x10, 0); + // initialize file info bmgFile.groupId = 0; func_020371b4(&bmgFile); + // assign sections and set the file info in the groups entries groupId = func_020371c8(&bmgFile, pFile, unk_18); pGroups->entries[groupId] = bmgFile; pGroups->entries[groupId].groupId = groupId; } + +THUMB void func_020373b4(BMGGroups* pGroups, s16 unk_18) { + s32 i; + + for (i = 0; i < pGroups->numEntries; i++) { + if (pGroups->entries[i].unk_18 == unk_18) { + func_0202d590(pGroups->entries[i].unk_14); + func_020371b4(&pGroups->entries[i]); + } + } +} + +ARM u32 func_020373ec(BMGGroups* pGroups, unk32 param_2) { + u16 dVar1; + u16 uVar2; + s32 i; + + dVar1 = -1; + + for (i = 0; i < pGroups->numEntries; i++) { + uVar2 = func_0203728c(&pGroups->entries[i], param_2); + + if (uVar2 != dVar1) { + return uVar2 | i << 0x10; + } + } + + return -1; +}