diff options
| author | Aetias <aetias@outlook.com> | 2025-07-01 00:01:30 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2025-07-01 00:01:30 +0200 |
| commit | 8003089294daef5ccb9b3a73eac8a4496457f178 (patch) | |
| tree | 88dae48164d17c26052eb48b502d0ed422c90416 /include | |
| parent | 1c4c64fc08ad0b266345b21dc177b470fdeadb70 (diff) | |
Fix match
Diffstat (limited to 'include')
| -rw-r--r-- | include/Item/ItemManager.hpp | 1 | ||||
| -rw-r--r-- | include/Message/BMG.hpp | 13 | ||||
| -rw-r--r-- | include/Unknown/UnkStruct_02037750.hpp | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 3d32bbbe..3de57def 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -207,4 +207,3 @@ public: };
extern ItemManager *gItemManager;
-extern UnkStruct_027e0d38 *data_027e0d38;
diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index b438a0da..c3d4479d 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -5,19 +5,18 @@ #include "types.h" #define BMG_MAGIC "MESGbmg1" -#define BMG_TAG(a, b, c, d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) #define BMG_GET_INF1(pGroups, flags) ((pGroups)->entries[(flags) >> 0x10].func_02037258((flags) & 0xFFFF)) #define BMG_GET_MSG_OFFSET(pGroups, flags) (BMG_GET_INF1((pGroups), (flags))->offset) #define BMG_GET_MSG_ADDR(pGroups, flags) \ ((u32) (pGroups)->entries[(flags) >> 0x10].pDAT1 + (BMG_GET_MSG_OFFSET((pGroups), (flags)) & ~1)) enum BMGTag { - /* "INF1" */ BMG_TAG_INF1 = BMG_TAG('I', 'N', 'F', '1'), - /* "FLW1" */ BMG_TAG_FLW1 = BMG_TAG('F', 'L', 'W', '1'), - /* "FLI1" */ BMG_TAG_FLI1 = BMG_TAG('F', 'L', 'I', '1'), - /* "DAT1" */ BMG_TAG_DAT1 = BMG_TAG('D', 'A', 'T', '1'), - /* "MID1" */ BMG_TAG_MID1 = BMG_TAG('M', 'I', 'D', '1'), - /* "MID1" */ BMG_TAG_STR1 = BMG_TAG('S', 'T', 'R', '1'), + /* "INF1" */ BMG_TAG_INF1 = '1FNI', + /* "FLW1" */ BMG_TAG_FLW1 = '1WLF', + /* "FLI1" */ BMG_TAG_FLI1 = '1ILF', + /* "DAT1" */ BMG_TAG_DAT1 = '1TAD', + /* "MID1" */ BMG_TAG_MID1 = '1DIM', + /* "STR1" */ BMG_TAG_STR1 = '1RTS', }; enum BMGEncoding { diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp index 359d5fd2..a480c1a3 100644 --- a/include/Unknown/UnkStruct_02037750.hpp +++ b/include/Unknown/UnkStruct_02037750.hpp @@ -37,7 +37,7 @@ public: UnkStruct_02037750(unk32 param1, unk32 param2); static LinkStateInteract *GetLinkStateInteract(); - void func_020385d0(s32 param1, u8 *param2); + unk32 func_020385d0(s32 param1, u8 *param2); }; class UnkStruct_020386d8_24 { |