This commit is contained in:
Yanis002
2025-02-12 20:20:34 +01:00
parent bfa8a9e376
commit 30bd3562ab
24 changed files with 495 additions and 550 deletions
+1 -1
View File
@@ -82,7 +82,7 @@ struct UnkStruct_027e103c {
void func_ov000_020cfae8(s32 param1, s32 param2);
//! TODO: find out if the type is always `UnkStruct_020397f8*`
void func_ov000_020cfb20(void*);
void func_ov000_020cfb20(void *);
void func_ov000_020cfb38();
void func_ov000_020cfb48();
+1 -1
View File
@@ -9,13 +9,13 @@ extern "C" {
#include "types.h"
#include "Actor/Navi/ActorNavi.hpp"
#include "DTCM/UnkStruct_027e0d38.hpp"
#include "Item/Item.hpp"
#include "Player/EquipItem.hpp"
#include "Render/ModelRender.hpp"
#include "Save/SaveItemManager.hpp"
#include "Sound/Sfx.hpp"
#include "System/SysNew.hpp"
#include "DTCM/UnkStruct_027e0d38.hpp"
#define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
#define MAX_AMMO_UPGRADE 2
+21 -20
View File
@@ -1,14 +1,15 @@
#pragma once
#include "System/SysNew.hpp"
#include "global.h"
#include "types.h"
#include "System/SysNew.hpp"
#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))
#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'),
@@ -96,14 +97,14 @@ struct SectionINF1 {
/* 0c */ u16 groupId;
/* 0e */ u8 colorId;
/* 0f */ u8 mUnk_0F[0x1]; // alignment padding?
/* 10 */ EntryINF1* entries;
/* 10 */ EntryINF1 *entries;
/* 14 */
};
enum InstrType {
/* 1 */ FLW1_TYPE_SHOW_MSG = 1,
/* 2 */ FLW1_TYPE_BRANCH = 2,
/* 3 */ FLW1_TYPE_EVENT = 3,
/* 2 */ FLW1_TYPE_BRANCH = 2,
/* 3 */ FLW1_TYPE_EVENT = 3,
/* 4 */
};
@@ -145,9 +146,9 @@ struct SectionFLW1 {
/* 04 */ u16 numInstructions;
/* 08 */ u16 numLabels;
/* 0c */ u32 mUnk_0c; // always zero?
/* 10 */ FLW1Instr* instructions;
/* 14 */ s16* flwEntries;
/* 18 */ s8* bmgFileIndices;
/* 10 */ FLW1Instr *instructions;
/* 14 */ s16 *flwEntries;
/* 18 */ s8 *bmgFileIndices;
/* 1c */
};
@@ -162,41 +163,41 @@ struct SectionFLI1 {
/* 04 */ u16 numEntries;
/* 08 */ u16 entrySize;
/* 0c */ u32 mUnk_0c; // always zero?
/* 10 */ EntryFLI1* entries;
/* 10 */ EntryFLI1 *entries;
/* 14 */
};
struct EntryDAT1 {
/* 00 */ char* text;
/* 00 */ char *text;
/* 04 */
};
struct SectionDAT1 {
/* 00 */ SectionBase base;
/* 08 */ EntryDAT1* entries;
/* 08 */ EntryDAT1 *entries;
/* 0c */
};
struct BMGFileInfo {
/* 00 */ BMGHeader* pHeader; // pointer to the file's header
/* 04 */ SectionINF1* pINF1; // pointer to the data informations (INF -> informations)
/* 08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow)
/* 0c */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table)
/* 10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data)
/* 14 */ BMGHeader* mUnk_14; // same as pHeader (?)
/* 00 */ BMGHeader *pHeader; // pointer to the file's header
/* 04 */ SectionINF1 *pINF1; // pointer to the data informations (INF -> informations)
/* 08 */ SectionFLW1 *pFLW1; // pointer to the message flow data (FLW -> flow)
/* 0c */ SectionFLI1 *pFLI1; // pointer to the message flow index table (FLI -> flow index table)
/* 10 */ SectionDAT1 *pDAT1; // pointer to the data (DAT -> data)
/* 14 */ BMGHeader *mUnk_14; // same as pHeader (?)
/* 18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose)
/* 1a */ s16 groupId; // stores the group id
/* 1c */
void func_020371b4();
u16 func_020371c8(u32* pFile, s16 unk_18);
EntryINF1* func_02037258(u16 param_2);
u16 func_020371c8(u32 *pFile, s16 unk_18);
EntryINF1 *func_02037258(u16 param_2);
u16 func_0203728c(unk32 param_2);
};
class BMGGroups : public SysObject {
public:
/* 00 */ BMGFileInfo* entries; // accessed with `groupId`
/* 00 */ BMGFileInfo *entries; // accessed with `groupId`
/* 04 */ s32 numEntries;
/* 08 */
+25 -25
View File
@@ -3,18 +3,18 @@
#include "global.h"
#include "types.h"
#include "System/SysNew.hpp"
#include "Message/BMG.hpp"
#include "Message/MsgProc.hpp"
#include "System/SysNew.hpp"
#include "nds/math.h"
#include "Unknown/UnkStruct_0202e1a0.hpp"
#include "Unknown/UnkStruct_0203dae0.hpp"
#include "Unknown/UnkStruct_02032f0c.hpp"
#include "Unknown/UnkStruct_02038aa0.hpp"
#include "Unknown/UnkStruct_020397f8.hpp"
#include "Unknown/UnkStruct_02035064.hpp"
#include "Unknown/UnkStruct_02037750.hpp"
#include "Unknown/UnkStruct_02038aa0.hpp"
#include "Unknown/UnkStruct_020397f8.hpp"
#include "Unknown/UnkStruct_0203dae0.hpp"
class UnkStruct_027E0C68 : public SysObject {
public:
@@ -24,27 +24,27 @@ public:
/* 0x04 */ u8 mUnk_04;
/* 0x05 */ u8 mUnk_05;
/* 0x06 */ unk16 mUnk_06;
/* 0x08 */ UnkStruct_020397f8* mUnk_08;
/* 0x08 */ UnkStruct_020397f8 *mUnk_08;
/* 0x0C */ u8 mUnk_0c;
/* 0x0C */ u8 mUnk_0d;
/* 0x0C */ unk16 mUnk_0e;
/* 0x10 */ unk16 mUnk_10;
/* 0x10 */ unk16 mUnk_12;
/* 0x14 */ BMGGroups* pGroups;
/* 0x18 */ UnkStruct_020386d8* mUnk_18[2];
/* 0x20 */ UnkStruct_02037750* mUnk_20[2];
/* 0x28 */ UnkStruct_02038aa0* mUnk_28[6]; //! TODO: is it the right type?
/* 0x40 */ UnkStruct_020397f8* mUnk_40[2]; // is array size 6?
/* 0x14 */ BMGGroups *pGroups;
/* 0x18 */ UnkStruct_020386d8 *mUnk_18[2];
/* 0x20 */ UnkStruct_02037750 *mUnk_20[2];
/* 0x28 */ UnkStruct_02038aa0 *mUnk_28[6]; //! TODO: is it the right type?
/* 0x40 */ UnkStruct_020397f8 *mUnk_40[2]; // is array size 6?
/* 0x48 */
static void func_0203643c(u32 *param_1, UnkStruct_027E0C68* param_2, u32 param_3);
static void func_0203643c(u32 *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();
~UnkStruct_027E0C68();
UnkStruct_020397f8* func_020366c4(void);
UnkStruct_020397f8* func_02036700(void);
UnkStruct_020386d8* func_0203673c(void);
UnkStruct_020397f8 *func_020366c4(void);
UnkStruct_020397f8 *func_02036700(void);
UnkStruct_020386d8 *func_0203673c(void);
bool func_02036770(u32 param_2);
unk32 func_02036798(void);
bool func_020367dc(int param_2);
@@ -52,23 +52,23 @@ public:
bool func_02036808(void);
bool func_02036824(void);
bool func_02036850(void);
void func_02036888(UnkStruct_020386d8* param_2);
bool func_020368f4(UnkStruct_02037750* param_2);
void func_02036888(UnkStruct_020386d8 *param_2);
bool func_020368f4(UnkStruct_02037750 *param_2);
void func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4);
void func_02036bbc(void);
void func_02036c50(unk32 param_2);
void func_02036ca4(unk32 param_2);
bool func_02036ce4(UnkStruct_020386d8* param_2, unk32 param_3);
bool func_02036d30(UnkStruct_02037750* param_2);
bool func_02036d4c(UnkStruct_02037750* param_2);
bool func_02036ce4(UnkStruct_020386d8 *param_2, unk32 param_3);
bool func_02036d30(UnkStruct_02037750 *param_2);
bool func_02036d4c(UnkStruct_02037750 *param_2);
void func_02036d6c(void);
UnkStruct_02038aa0* func_02036da8(u32 param_2, s16* param_3);
UnkStruct_02038aa0 *func_02036da8(u32 param_2, s16 *param_3);
void func_02036edc(u32 param_2, u8 param_3);
UnkStruct_020397f8* func_02036f68(u32 param_2, u8* param_3);
UnkStruct_020386d8* func_020370d0(unk32 param_2, unk32 param_3);
UnkStruct_020386d8* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5);
void func_02037158(UnkSubClass1_02256FF8* param_2);
UnkStruct_02038aa0* func_02037178(UnkSubClass1_02256FF8* param_2);
UnkStruct_020397f8 *func_02036f68(u32 param_2, u8 *param_3);
UnkStruct_020386d8 *func_020370d0(unk32 param_2, unk32 param_3);
UnkStruct_020386d8 *func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5);
void func_02037158(UnkSubClass1_02256FF8 *param_2);
UnkStruct_02038aa0 *func_02037178(UnkSubClass1_02256FF8 *param_2);
};
extern UnkStruct_027E0C68 data_027e0c68;
+25 -25
View File
@@ -1,7 +1,7 @@
#pragma once
#include "System/SysNew.hpp"
#include "Message/BMG.hpp"
#include "System/SysNew.hpp"
#include "Unknown/func_ov000_020d0644.hpp"
#include "nds/math.h"
@@ -19,41 +19,41 @@ typedef struct UnkStruct_0203b264 {
class UnkStruct_020397f8_410 {
public:
/* 0x00 */ struct UnkStruct_020397f8* mUnk_00;
/* 0x00 */ struct UnkStruct_020397f8 *mUnk_00;
/* 0x04 */
void func_0203ec34(void);
void func_0203ebe0(void);
void func_0203ebf8(void);
void func_0203ec4c(UnkStruct_0203b264* param_2, unk32 param_3, s32 param_4, s32 param_5);
void func_0203ec4c(UnkStruct_0203b264 *param_2, unk32 param_3, s32 param_4, s32 param_5);
};
// same as UnkStruct_020397f8_410?
class UnkStruct_020397f8_424 {
public:
/* 0x00 */ struct UnkStruct_020397f8* mUnk_00;
/* 0x00 */ struct UnkStruct_020397f8 *mUnk_00;
/* 0x04 */
void func_0203ee80(unk32);
void func_0203ef78(unk16, u16, unk8);
void func_0203ef78(unk16); // overload?
void func_0203ee48(void);
UnkStruct_0203b264* func_0203eeb0(unk32 param_2, unk32 param_3);
UnkStruct_0203b264 *func_0203eeb0(unk32 param_2, unk32 param_3);
};
class UnkStruct_0203dae0_114 : public SysObject {
public:
/* 0x00 (vtable) */
/* 0x04 */ unk32* mUnk_04;
/* 0x04 */ unk32 *mUnk_04;
/* 0x08 */
UnkStruct_0203dae0_114();
/* 0x00 */ virtual ~UnkStruct_0203dae0_114() override;
/* 0x08 */ virtual unk32 vfunc_08(void*);
/* 0x08 */ virtual unk32 vfunc_08(void *);
/* 0x08 */ virtual unk32 vfunc_0c(void);
/* 0x0C */
unk32* func_0203d1b4(void);
unk32 *func_0203d1b4(void);
};
struct func_02038f44_param4 {
@@ -75,15 +75,15 @@ extern "C" u32 func_01ff9b4c(unk32, unk32);
extern "C" unk32 func_0203c084(void);
extern "C" unk32 func_ov000_02079e04(void);
extern "C" unk32 func_02016fcc(unk32);
extern "C" void func_02032304(unk32*, char*, unk32, unk32, unk32);
extern "C" unk32 func_0202d5b4(char*, char*, unk32, unk32, unk32);
extern "C" void func_02032304(unk32 *, char *, unk32, unk32, unk32);
extern "C" unk32 func_0202d5b4(char *, char *, unk32, unk32, unk32);
extern unk32 data_020691a0;
extern unk32* data_02068894;
extern unk32 *data_02068894;
extern unk32 data_02056af0;
extern unk32* data_02056a00;
extern char* data_02057f08; // "MSP"
extern char* data_02057eec; // "Menu/UI_main/opening.bin"
extern char* data_02057ed8; // "MSP:opening.nclr"
extern unk32 *data_02056a00;
extern char *data_02057f08; // "MSP"
extern char *data_02057eec; // "Menu/UI_main/opening.bin"
extern char *data_02057ed8; // "MSP:opening.nclr"
struct Struct_027e0db0 {
/* 0x00 */ unk32 mUnk_00;
@@ -110,22 +110,22 @@ extern unk16 data_02056a10[];
extern unk16 data_02056a16[];
extern unk32 data_02056a04[];
extern unk32 data_027e0c38[];
extern "C" void func_0203489c(unk32, unk16, unk32*, unk32*);
extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32);
extern "C" void func_0203489c(unk32, unk16, unk32 *, unk32 *);
extern "C" void func_020347b0(unk32, unk16, unk32 *, unk32 *, unk32, unk32);
extern THUMB unk32 func_0202ab48(void);
extern "C" void func_02034984(unk32, u8, unk32, unk32);
extern "C" void func_02034698(unk32, unk32, unk32*, unk32*);
extern "C" void func_02034698(unk32, unk32, unk32 *, unk32 *);
extern struct TouchControl gTouchControl;
class UnkClass_027e0e28 {
public:
unk32 func_ov000_0207bc48();
};
extern UnkClass_027e0e28* data_027e0e28;
extern UnkClass_027e0e28 *data_027e0e28;
extern u8 data_027e0c54;
extern unk32* data_ov009_0211f5b4;
extern "C" unk32 func_ov003_020f3f94(unk32*);
extern unk32* data_02057ed4;
extern unk32 *data_ov009_0211f5b4;
extern "C" unk32 func_ov003_020f3f94(unk32 *);
extern unk32 *data_02057ed4;
// see Actor.cpp
typedef struct UnkStruct_01ffbe34 {
@@ -152,11 +152,11 @@ struct UnkClass_027e1054_unk_00_unk00 {
};
struct UnkClass_027e1054_unk_00 {
/* 0x00 */ unk32 mUnk_04;
/* 0x00 */ UnkClass_027e1054_unk_00_unk00* mUnk_00;
/* 0x00 */ UnkClass_027e1054_unk_00_unk00 *mUnk_00;
};
class UnkClass_027e1054 {
public:
UnkClass_027e1054_unk_00* mUnk_00;
UnkClass_027e1054_unk_00 *mUnk_00;
unk32 mUnk_04;
void func_ov003_020f4874(void);
@@ -181,6 +181,6 @@ extern UnkClass_ov000_027e0d04 data_027e0d04;
class UnkClass_data_027e0f7c {
public:
u8* func_ov000_0209d90c(s8, s8);
u8 *func_ov000_0209d90c(s8, s8);
};
extern UnkClass_data_027e0f7c data_027e0f7c;
+15 -14
View File
@@ -9,7 +9,7 @@
class UnkStruct_02032e7c : public SysObject {
public:
/* 00 (vtable) */
/* 04 */ u16* mUnk_04; // pointer to the current position in the message to display
/* 04 */ u16 *mUnk_04; // pointer to the current position in the message to display
/* 08 */ unk16 mUnk_08;
/* 0a */ unk16 mUnk_0a;
/* 0c */ unk16 mUnk_0c;
@@ -59,7 +59,7 @@ struct UnkStruct_MsgProc_Base_unk_2C {
/* 02 */ s8 mUnk_02;
/* 03 */ s8 mUnk_03;
/* 04 */ unk32 mUnk_04;
/* 08 */ u8* mUnk_08;
/* 08 */ u8 *mUnk_08;
/* 0c */
};
@@ -77,16 +77,16 @@ struct func_0203b410_param1 {
class UnkStruct_02032f0c : public SysObject {
public:
/* 00 (vtable) */
/* 04 */ unk32* mUnk_04;
/* 08 */ UnkSubClass1_02256FF8* mUnk_08;
/* 04 */ unk32 *mUnk_04;
/* 08 */ UnkSubClass1_02256FF8 *mUnk_08;
/* 0c */ u16 *mUnk_0c;
/* 10 */ unk32* mUnk_10;
/* 10 */ unk32 *mUnk_10;
/* 14 */ s32 mUnk_14;
/* 18 */ s32 mUnk_18;
/* 1c */ unk32 mUnk_1c;
/* 20 */ unk32 mUnk_20;
/* 24 */ unk32* mUnk_24;
/* 28 */ unk32* mUnk_28;
/* 24 */ unk32 *mUnk_24;
/* 28 */ unk32 *mUnk_28;
/* 2c */ UnkStruct_MsgProc_Base_unk_2C **mUnk_2c;
/* 30 */ s32 mUnk_30;
/* 34 */ s32 mUnk_34;
@@ -122,7 +122,8 @@ public:
// /* 0x10 */ /* func_020331c4 */ virtual void vfunc_10(u8 param_2, u8 param_3);
// /* 0x14 */ /* func_02032fcc */ virtual bool vfunc_14(u16 param_2, u8 param_3);
// /* 0x18 */ /* func_020332e4 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4);
// /* 0x1C */ /* func_02033360 */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
// /* 0x1C */ /* func_02033360 */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32
// param_5);
// /* 0x20 */ /* func_020333e0 */ virtual UNK_TYPE vfunc_20(UNK_TYPE);
// /* 0x24 */ /* func_02033af4 */ virtual UNK_TYPE vfunc_24(UNK_TYPE);
@@ -137,20 +138,20 @@ public:
/* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY);
/* 48 */ virtual void vfunc_48(void);
/* 4c */ virtual void vfunc_4C(void);
/* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5);
/* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5);
/* 54 */ virtual void vfunc_54(void);
/* 58 */ virtual void vfunc_58(void);
/* 5c */ virtual void vfunc_5C(void);
/* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4);
/* 64 */ virtual void vfunc_64(s16* param_2);
/* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4);
/* 64 */ virtual void vfunc_64(s16 *param_2);
/* 68 */ virtual unk32 vfunc_68(unk32 param_2);
/* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3);
/* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3);
/* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3);
/* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3);
/* 74 */
UnkStruct_02032f0c();
void func_02032f94();
unk32* func_02032f98(unk32 param_2);
unk32 *func_02032f98(unk32 param_2);
u16 **SetUnk_0c(u16 *value);
u8 func_02032fa4();
s32 func_02032fb4();
+6 -6
View File
@@ -10,19 +10,19 @@ public:
/* 00 (vtable) */
/* 04 */ unk16 mUnk_04;
/* 04 */ unk16 mUnk_06;
/* 08 */ u32* mUnk_08;
/* 08 */ u32 *mUnk_08;
/* 0c */ unk32 mUnk_0c;
/* 10 */ unk32 mUnk_10;
/* 14 */ u32 mUnk_14;
/* 18 */ unk32 mUnk_18;
/* 1c */ unk32 mUnk_1c;
/* 20 */ u32* mUnk_20;
/* 20 */ u32 *mUnk_20;
/* 24 */ unk32 mUnk_24;
/* 28 */ unk32 mUnk_28;
/* 2c */ unk32 mUnk_2c;
/* 30 */ unk32 mUnk_30;
/* 34 */ u32* mUnk_34;
/* 38 */ u32* mUnk_38;
/* 34 */ u32 *mUnk_34;
/* 38 */ u32 *mUnk_38;
/* 3c */ unk32 mUnk_3c;
/* 40 */ unk32 mUnk_40;
/* 44 */ unk32 mUnk_44;
@@ -34,7 +34,7 @@ public:
/* 58 */ unk32 mUnk_58;
/* 5c */ UnkStruct_0202e1a0 mUnk_5c;
/* 74 */ u16 *mUnk_74;
/* 78 */ s32* mUnk_78;
/* 78 */ s32 *mUnk_78;
/* 7c */ u32 mUnk_7c;
/* 80 */ u16 mUnk_80;
/* 82 */ unk16 mUnk_82;
@@ -52,7 +52,7 @@ public:
static u8 func_02035428(u8 param1);
void func_02034a1c(unk32, unk32, struct UnkStruct_01ffbe34*);
void func_02034a1c(unk32, unk32, struct UnkStruct_01ffbe34 *);
void func_02034b0c(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5, unk32 param_6);
void func_020350b0();
void func_020350b4(s32 param1, unk32 param2, unk8 param3, unk16 param4, unk16 param5);
+3 -3
View File
@@ -23,10 +23,10 @@ public:
/* 00 */ virtual ~UnkStruct_02037750();
/* 08 */ virtual void vfunc_08(u32 param1);
/* 0c */ virtual void vfunc_0c(class UnkStruct_020397f8* param1);
/* 0c */ virtual void vfunc_0c(class UnkStruct_020397f8 *param1);
/* 10 */ virtual void vfunc_10();
/* 14 */ virtual void vfunc_14();
/* 18 */ virtual void vfunc_18(unk32* param1);
/* 18 */ virtual void vfunc_18(unk32 *param1);
/* 1c */ virtual bool vfunc_1c();
/* 20 */ virtual void vfunc_20();
/* 24 */ virtual bool vfunc_24(unk32 param1);
@@ -48,7 +48,7 @@ public:
/* 00 */ u8 mUnk_03;
/* 04 */
void func_020376c0(const Vec3p* param_2);
void func_020376c0(const Vec3p *param_2);
};
// astruct_15
+23 -21
View File
@@ -3,13 +3,13 @@
#include "global.h"
#include "types.h"
#include "Unknown/UnkStruct_0203dae0.hpp"
#include "System/SysNew.hpp"
#include "nds/math.h"
#include "Message/MsgProc.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_0203dae0.hpp"
#include "nds/math.h"
class UnkStruct_02038aa0;
typedef bool (*UnknownCallback)(class UnkStruct_020397f8*);
typedef bool (*UnknownCallback)(class UnkStruct_020397f8 *);
class UnkStruct_0203881c : public UnkStruct_02032e7c {
public:
@@ -17,7 +17,7 @@ public:
/* 14 */ unk32 mUnk_14;
/* 18 */ unk32 mUnk_18;
/* 1c */ UnknownCallback mUnk_1c;
/* 20 */ class UnkStruct_020397f8* mUnk_20;
/* 20 */ class UnkStruct_020397f8 *mUnk_20;
/* 24 */ unk32 mUnk_24;
/* 28 */
@@ -33,7 +33,7 @@ public:
class UnkSubClass1_unk_124 {
public:
/* 00 */ void* mUnk_00; // pointer to MsgProc_Main (well, the first members of the base class)
/* 00 */ void *mUnk_00; // pointer to MsgProc_Main (well, the first members of the base class)
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0c */ unk32 mUnk_0c;
@@ -49,7 +49,7 @@ public:
/* 2b */ unk8 mUnk_2b;
/* 2c */
void func_0203f020(s16*, unk32);
void func_0203f020(s16 *, unk32);
};
struct UnkStruct_0203b264;
@@ -60,10 +60,10 @@ class UnkStruct_02038aa0 : public UnkStruct_0203dae0 {
public:
/* 000 (base) */
/* 123 */ unk8 mUnk_123;
/* 124 */ UnkSubClass1_unk_124* mUnk_124;
/* 124 */ UnkSubClass1_unk_124 *mUnk_124;
/* 128 */ UnkStruct_0203881c mUnk_128;
/* 150 */ u8 mUnk_150[4];
/* 154 */ EntryINF1* pInfoEntry;
/* 154 */ EntryINF1 *pInfoEntry;
/* 158 */ Vec2s mUnk_158; // textbox position?
/* 15c */ s16 mUnk_15c;
/* 15e */ s8 mUnk_15e;
@@ -72,7 +72,7 @@ public:
/* 161 */
/* 00 */ virtual ~UnkStruct_02038aa0();
/* 08 */ virtual void vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4);
/* 08 */ virtual void vfunc_08(s32 param1, unk32 *param2, s16 *param3, unk32 param4);
/* 0c */ virtual void vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5);
/* 10 */ virtual void vfunc_10();
/* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4);
@@ -86,10 +86,10 @@ public:
/* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY);
/* 48 */ virtual void vfunc_48();
/* 4c */ virtual void vfunc_4c(u32 param1, unk32 param2);
/* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4);
/* 50 */ virtual void vfunc_50(EntryINF1 *param1, u32 param2, s16 *param3, UnkSubClass1_02256FF8 *param4);
/* 54 */ virtual void vfunc_54();
/* 58 */ virtual void vfunc_58();
/* 5c */ virtual void vfunc_5c(u16* param_2, struct UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
/* 5c */ virtual void vfunc_5c(u16 *param_2, struct UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5);
/* 60 */ virtual void vfunc_60();
/* 64 */ virtual void vfunc_64();
/* 68 */ virtual s32 vfunc_68(unk32 param1);
@@ -102,7 +102,8 @@ public:
// /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
// /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
// /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override;
// /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override;
// /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32
// param_5) override;
// /* 0x20 */ /* func_020390a4 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override;
// /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override;
// /* 0x28 */ virtual bool vfunc_28(void) override;
@@ -123,20 +124,21 @@ public:
void func_02039440(unk32 param1, unk32 param2);
bool func_0203951c();
static void func_020387e0(u8* param_2);
static void func_020387e0(u8 *param_2);
unk32 func_02032fb4(void);
u16* func_02037604(u16**);
u16 *func_02037604(u16 **);
void func_02038b28(void);
void func_02038b74(void); // is this a dtor?
void func_02038f40(void);
void func_02038f44(EntryINF1* param_2, u32 param_3, struct func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6);
void func_02038f44(EntryINF1 *param_2, u32 param_3, struct func_02038f44_param4 *param_4, UnkSubClass1_02256FF8 *param_5,
unk32 param_6);
void func_02039058(void);
unk32 func_0203905c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
unk32 func_0203905c(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5);
void func_02038d20(void);
void func_020392b4(void);
void func_02039398(void);
void func_020393a8(s16* param_2);
void func_020393a8(s16 *param_2);
void func_0203a188(unk32, unk32);
unk32 func_0203a3e0(void);
unk32 func_0203cb5c(unk8, s16);
@@ -147,12 +149,12 @@ public:
void func_0203e1b0(unk32, unk32, unk32);
//! TODO: not sure it belongs to this class:
void func_02033190(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5);
void func_020331c4(unk32, unk32);
void func_0203947c(void);
void func_0203cabc(unk32);
unk32 func_0203e284(UnkStruct_0203b264*, unk32, unk32);
void func_0203e2ac(unk32* param_2);
unk32 func_0203e284(UnkStruct_0203b264 *, unk32, unk32);
void func_0203e2ac(unk32 *param_2);
s16 func_0203d318(s16, s16);
};
+18 -18
View File
@@ -3,14 +3,14 @@
#include "global.h"
#include "types.h"
#include "Message/MsgProc.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_02035064.hpp"
#include "Unknown/UnkStruct_02038aa0.hpp"
#include "System/SysNew.hpp"
#include "Message/MsgProc.hpp"
// does it host both choices?
struct UnknownMsgChoiceStruct {
/* 00 */ UnkStruct_0203b264* mUnk_00;
/* 00 */ UnkStruct_0203b264 *mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */
};
@@ -22,7 +22,7 @@ class UnkStruct_020397f8 : public UnkStruct_02038aa0 {
public:
/* 000 (base) */
/* 161 */ unk8 mUnk_161[0x3];
/* 164 */ UnkStruct_020397f8* mUnk_164;
/* 164 */ UnkStruct_020397f8 *mUnk_164;
/* 168 */ UnkStruct_02035064 mUnk_168;
/* 1f0 */ UnkStruct_02035064 mUnk_1f0;
/* 278 */ UnkStruct_02035064 mUnk_278;
@@ -30,7 +30,7 @@ public:
/* 388 */ UnkStruct_02035064 mUnk_388;
/* 410 */ UnkStruct_020397f8_410 mUnk_410;
/* 414 */ unk32 mUnk_414;
/* 418 */ UnkStruct_02038aa0* mUnk_418;
/* 418 */ UnkStruct_02038aa0 *mUnk_418;
/* 41c */ unk16 mUnk_41c;
/* 41e */ unk16 mUnk_41e;
/* 420 */ unk16 mUnk_420;
@@ -100,16 +100,16 @@ public:
bool func_0203a3e0();
/* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY);
bool func_0203a6d0(unk32 param1, unk32 param2);
/* 50 */ virtual void vfunc_50(EntryINF1* param1, unk32 param2, s32* param3, unk32 param4);
/* 50 */ virtual void vfunc_50(EntryINF1 *param1, unk32 param2, s32 *param3, unk32 param4);
/* 54 */ virtual void vfunc_54();
/* 5c */ virtual void vfunc_5c();
/* 58 */ virtual void vfunc_58();
bool func_0203b0bc();
s32 func_0203b0ec(u32 param1);
/* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param1, unk32 param2, unk32 param3);
/* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param1, unk32 param2, unk32 param3);
/* 1c */ virtual unk32 vfunc_1c(u16 *param1, UnkStruct_0203b264 *param2, unk8 param3, unk32 param4);
/* 60 */ virtual void vfunc_60(func_0203b410_param1* param1, unk32 param2, unk32 param3);
/* 64 */ virtual void vfunc_64(s16* param1);
/* 60 */ virtual void vfunc_60(func_0203b410_param1 *param1, unk32 param2, unk32 param3);
/* 64 */ virtual void vfunc_64(s16 *param1);
void func_0203b764();
/* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2);
void func_0203bd8c(s32 param1); // void func_0203bd8c(u16 param_2);
@@ -119,7 +119,7 @@ public:
bool func_0203c084();
bool func_0203c13c();
bool func_0203c1a0();
static bool func_0203c25c(class UnkStruct_020397f8* param1);
static bool func_0203c25c(class UnkStruct_020397f8 *param1);
/* 00 */ virtual ~UnkStruct_020397f8();
/* 38 */ virtual bool vfunc_38();
/* 74 */
@@ -152,12 +152,12 @@ public:
MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4);
//! TODO: remove the function declarations that are not overridden
/* 00 */ virtual ~MsgProc_Type3();
/* 08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override;
/* 08 */ virtual void vfunc_08(unk32 *param_2, unk32 *param_3) override;
/* 0c */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
/* 10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
/* 14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
/* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override;
/* 1c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override;
/* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264 *param_2, unk32 param_3, unk32 param_4) override;
/* 1c */ virtual unk32 vfunc_1C(u16 *param_2, UnkStruct_0203b264 *param_3, unk8 param_4, unk32 param_5) override;
/* 20 */ virtual void vfunc_20(void) override;
/* 24 */ virtual void vfunc_24(void) override;
/* 28 */ virtual bool vfunc_28(void) override;
@@ -170,15 +170,15 @@ public:
/* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
/* 48 */ virtual void vfunc_48(void) override;
/* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c?
/* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
/* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5) override;
/* 54 */ virtual void vfunc_54(void) override;
/* 58 */ virtual void vfunc_58(void) override;
/* 5c */ virtual void vfunc_5C(void) override;
/* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override;
/* 64 */ virtual void vfunc_64(s16* param_2) override;
/* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4) override;
/* 64 */ virtual void vfunc_64(s16 *param_2) override;
/* 68 */ virtual unk32 vfunc_68(unk32 param_2) override;
/* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
/* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
/* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3) override;
/* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3) override;
/* 74 */
static void func_0203c83c(void);
+9 -8
View File
@@ -3,8 +3,8 @@
#include "global.h"
#include "types.h"
#include "Unknown/UnkStruct_02032f0c.hpp"
#include "Message/MsgProc.hpp"
#include "Unknown/UnkStruct_02032f0c.hpp"
class UnkStruct_0203dae0_114;
@@ -90,7 +90,8 @@ public:
// /* 0x0C */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
// /* 0x10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
// /* 0x14 */ /* func_0203dcb4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
// /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override;
// /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4)
// override;
// /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override;
// /* 0x20 */ virtual UNK_TYPE vfunc_20(UNK_TYPE) override;
// /* 0x24 */ virtual UNK_TYPE vfunc_24(UNK_TYPE) override;
@@ -106,15 +107,15 @@ public:
/* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
/* 48 */ virtual void vfunc_48(void) override;
/* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c?
/* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
/* 50 */ virtual void vfunc_50(EntryINF1 *param_2, u32 param_3, s16 *param_4, UnkSubClass1_02256FF8 *param_5) override;
/* 54 */ virtual void vfunc_54(void) override;
/* 58 */ virtual void vfunc_58(void) override;
/* 5c */ virtual void vfunc_5C(void) override;
/* 60 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override;
/* 64 */ virtual void vfunc_64(s16* param_2) override;
/* 60 */ virtual void vfunc_60(func_0203b410_param1 *param_2, unk32 param_3, unk32 param_4) override;
/* 64 */ virtual void vfunc_64(s16 *param_2) override;
/* 68 */ virtual unk32 vfunc_68(unk32 param_2) override;
/* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
/* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
/* 6c */ virtual void vfunc_6C(unk32 *param_2, unk32 *param_3) override;
/* 70 */ virtual void vfunc_70(unk32 *param_2, unk32 *param_3) override;
/* 74 */
UnkStruct_0203dae0(u8 param1);
@@ -122,7 +123,7 @@ public:
void func_0203dc10(unk32 param_2, unk32 param_3);
bool func_0203dc74(s32 param1, s32 param2);
void func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4);
unk32* func_0203ddec();
unk32 *func_0203ddec();
void func_0203ddfc();
void func_0203de14();
s32 func_0203de24();
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
#include "global.h"
#include "System/SysNew.hpp"
#include "global.h"
class UnkClass_func_ov000_020d0644 {
public: