mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-05-28 00:16:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile Title overlay (#20)

Browse Source 
* Decompile Title overlay

* math structs as cpp when applicable

* fixes and improvements

* regressions fix 1

* regressions fix 2
This commit is contained in:
Yanis
2026-01-15 19:04:43 +01:00
committed by GitHub
parent 76c1ec9acf
commit ed672be03f
57 changed files with 1788 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/FileSelect/Common.hpp
-519
View File
@@ -1,519 +0,0 @@
#pragma once
#include "Game/GameModeManager.hpp"
#include "System/SysNew.hpp"
#include "global.h"
#include "nitro/math.h"
#include "types.h"
extern "C" void func_0201e8d4(void *param1, void *param2);
struct Vec2s_cpp {
/* 0 */ s16 x;
/* 1 */ s16 y;
/* 2 */
Vec2s_cpp() {};
Vec2s_cpp(s16 __x, s16 __y) {
x = __x;
y = __y;
}
void operator=(Vec2s_cpp &from) {
x = from.x;
y = from.y;
}
void operator+=(Vec2s_cpp &from) {
x = from.x + x;
y = from.y + y;
}
Vec2s_cpp &operator+(Vec2s_cpp &from) {
Vec2s_cpp vec(x + from.x, y + from.y);
return vec;
}
Vec2s_cpp *operator&() {
return this;
}
};
struct Vec2us_cpp {
/* 0 */ u16 x;
/* 1 */ u16 y;
/* 2 */
Vec2us_cpp() {};
Vec2us_cpp(u16 __x, u16 __y) {
x = __x;
y = __y;
}
void operator=(Vec2us_cpp &from) {
x = from.x;
y = from.y;
}
void operator+=(Vec2us_cpp &from) {
x += from.x;
y += from.y;
}
Vec2us_cpp &operator+(Vec2us_cpp &from) {
Vec2us_cpp vec(x + from.x, y + from.y);
return vec;
}
Vec2us_cpp *operator&() {
return this;
}
};
class UnkSubStruct1 : public SysObject {
public:
/* 00 (vtable) */
/* 04 */ u16 mUnk_04;
/* 06 */ u16 mUnk_06;
/* 08 */ u16 mUnk_08;
/* 0A */ bool mUnk_0A;
/* 0B */ bool mUnk_0B;
/* 0C */ bool mUnk_0C;
/* 0D */ bool mUnk_0D;
/* 0E */ unk8 mUnk_0E;
/* 0F */ unk8 mUnk_0F;
/* 10 */ unk32 mUnk_10; // brightness (in this context: of the background)
/* 14 */ unk32 mUnk_14;
/* 18 */ unk32 mUnk_18;
/* 1C */ unk32 mUnk_1C;
/* 20 */ unk32 mUnk_20;
/* 24 */ unk32 mUnk_24;
/* 28 */ unk32 mUnk_28;
/* 2C */ unk32 mUnk_2C;
/* 30 */
UnkSubStruct1();
void func_0201ea68(unk32 param1, unk32 param2, unk32 param3, unk32 param4);
u16 func_0201eaa0();
// data_02044330 vtable
/* 00 */ virtual void vfunc_00();
/* 04 */ virtual void vfunc_04();
/* 08 */ virtual void vfunc_08();
/* 0C */
bool UnkCheck1() {
bool value = true;
if (mUnk_0A == false && mUnk_0B == false) {
value = false;
}
return value;
}
void UnkOperations(Vec2s *pPos, bool doSetPos) {
int iVar1;
if (this->mUnk_08 != 0) {
iVar1 = this->mUnk_08 - this->mUnk_0D;
this->mUnk_08 = CLAMP(iVar1, 0, 0xFFFF);
} else {
if (this->mUnk_0A) {
if (this->mUnk_04 < this->mUnk_06) {
iVar1 = this->mUnk_04 + this->mUnk_0D;
if (iVar1 > this->mUnk_06) {
iVar1 = this->mUnk_06;
} else if (iVar1 < 0) {
iVar1 = 0;
}
this->mUnk_04 = iVar1;
this->vfunc_00();
if (this->mUnk_04 >= this->mUnk_06) {
this->mUnk_10 = this->mUnk_20;
this->mUnk_14 = this->mUnk_24;
this->mUnk_0A = false;
this->mUnk_0C = true;
}
}
} else {
if (this->mUnk_0B && this->mUnk_04 != 0) {
iVar1 = this->mUnk_04 - this->mUnk_0D;
if (iVar1 > this->mUnk_06) {
iVar1 = this->mUnk_06;
} else if (iVar1 < 0) {
iVar1 = 0;
}
this->mUnk_04 = iVar1;
this->vfunc_04();
if (this->mUnk_04 == 0) {
this->mUnk_10 = this->mUnk_18;
this->mUnk_14 = this->mUnk_1C;
this->mUnk_0B = false;
this->mUnk_0C = true;
}
}
}
}
if (doSetPos) {
Vec2us local_4c_copy;
Vec2us local_4c;
func_0201e8d4(&local_4c_copy, this);
local_4c.x = local_4c_copy.y;
local_4c.y = local_4c_copy.x;
pPos->x = local_4c.x;
pPos->y = local_4c.y;
}
}
};
class UnkSystem2_UnkSubSystem1_Base {
public:
/* 04 */ GameModeManagerBase_104_04 mUnk_04;
/* 0C */ void *mUnk_0C;
/* 10 */ unk32 mUnk_10;
/* 14 */ Vec2s mPos; // image position (among other things)
/* 18 */ STRUCT_PAD(0x18, 0x24);
/* 24 */ Vec2us mPosOffset; // used to shift the button when selected
/* 28 */ bool mUnk_28; // selected highlight effect when set to true
/* 29 */ bool mUnk_29; // related to having the button selected
/* 2A */ bool mUnk_2A; // disables button action
/* 2A */ bool mUnk_2B;
/* 2C */ bool mUnk_2C;
/* 2D */ unk8 mUnk_2D;
/* 2E */ unk8 mUnk_2E;
/* 2F */ unk8 mUnk_2F;
UnkSystem2_UnkSubSystem1_Base();
// data_ov000_020b1ecc vtable
/* 00 */ virtual ~UnkSystem2_UnkSubSystem1_Base();
/* 08 */ virtual void vfunc_08();
/* 0C */ virtual void vfunc_0C();
};
// this class is related to the selectable buttons (actually more related to texture with things on top)
class UnkSystem2_UnkSubSystem1_Derived1 : public UnkSystem2_UnkSubSystem1_Base {
public:
/* 00 (vtable) */
/* 30 */ void *mUnk_30; // related to the background texture draw (idle)
/* 34 */ unk32 mUnk_34; // related to the texture draw
/* 38 */ unk16 mUnk_38; // related to the texture draw
/* 3C */ Vec2us mUnk_3A; // overlaid elements position (text, icons etc...), relative to background position
/* 40 */ unk16 mUnk_3E;
/* 40 */ unk32 mUnk_40;
/* 44 */ unk32 mUnk_44;
/* 48 */ void *mUnk_48; // related to the background texture draw (selected)
/* 4C */ unk32 mUnk_4C;
/* 50 */ unk16 mUnk_50; // related to the texture draw
/* 50 */ unk16 mUnk_52;
/* 54 */ unk32 mUnk_54;
/* 58 */ unk32 mUnk_58;
/* 5C */ unk32 mUnk_5C;
/* 60 */
UnkSystem2_UnkSubSystem1_Derived1();
UnkSystem2_UnkSubSystem1_Derived1(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
void func_ov000_020633c0(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
// data_ov000_020b1efc vtable
/* 00 */ virtual ~UnkSystem2_UnkSubSystem1_Derived1() override {}
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0C() override;
};
class UnkSystem2_UnkSubSystem7 {
public:
/* 00 */ unk32 mUnk_00;
~UnkSystem2_UnkSubSystem7();
};
//! TODO: conflicts with UnkSystem2_UnkSubSystem1_Derived1? mUnk_34 type differs for some reasons
class UnkSystem2_UnkSubSystem1_Derived2 : public UnkSystem2_UnkSubSystem1_Base {
public:
/* 00 (vtable) */
/* 30 */ void *mUnk_30; // related to the background texture draw (idle)
/* 34 */ UnkSystem2_UnkSubSystem7 mUnk_34; // related to the texture draw
/* 38 */ unk16 mUnk_38; // related to the texture draw
/* 3C */ Vec2us mUnk_3A; // overlaid elements position (text, icons etc...), relative to background position
/* 40 */ unk16 mUnk_3E;
/* 40 */ unk32 mUnk_40;
/* 44 */ unk32 mUnk_44;
/* 48 */ void *mUnk_48; // related to the background texture draw (selected)
/* 4C */ unk32 mUnk_4C;
/* 50 */ unk16 mUnk_50; // related to the texture draw
/* 50 */ unk16 mUnk_52;
/* 54 */ unk32 mUnk_54;
/* 58 */ unk32 mUnk_58;
/* 5C */ unk32 mUnk_5C;
/* 60 */
UnkSystem2_UnkSubSystem1_Derived2(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
void func_ov000_020633c0(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
// data_ov000_020b1efc vtable
/* 00 */ virtual ~UnkSystem2_UnkSubSystem1_Derived2() override {}
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0C() override;
};
class UnkSystem2_UnkSubSystem3 {
public:
/* 00 */ UnkSystem2_UnkSubSystem1_Base *mUnk_00;
/* 04 */
UnkSystem2_UnkSubSystem3(UnkSystem2_UnkSubSystem1_Base *param1, unk32 param2, unk32 param3, unk32 param4);
void func_ov000_02062f30();
};
class UnkSystem2_UnkSubSystem5_Base_10 {
public:
/* 000 (vtable) */
/* 014 */ void *mUnk_014;
/* 018 */ unk32 mUnk_018;
/* 01C */ void *mUnk_01C;
/* 020 */ unk32 mUnk_020;
/* 024 */ unk32 mUnk_024;
/* 028 */ unk8 mUnk_028;
/* 029 */ unk8 mUnk_029;
/* 02A */ unk8 mUnk_02A;
/* 02B */ unk8 mUnk_02B;
/* 02C */ unk32 mUnk_02C;
/* 030 */ unk32 mUnk_030;
/* 034 */ unk32 mUnk_034;
/* 038 */ unk32 mUnk_038;
/* 03C */ unk32 mUnk_03C;
/* 040 */ unk32 mUnk_040;
/* 044 */ unk32 mUnk_044;
/* 048 */ unk32 mUnk_048;
/* 04C */ unk32 mUnk_04C;
/* 050 */ STRUCT_PAD(0x50, 0x130);
// data_ov000_020b20fc (vtable)
/* 00 */ virtual ~UnkSystem2_UnkSubSystem5_Base_10();
/* 08 */ virtual void vfunc_08();
/* 0C */ virtual void vfunc_0C();
/* 10 */ virtual void vfunc_10();
/* 14 */ virtual void vfunc_14();
/* 18 */ virtual void vfunc_18();
/* 1C */ virtual void vfunc_1C();
/* 20 */ virtual void vfunc_20();
/* 24 */ virtual void vfunc_24();
/* 28 */ virtual void vfunc_28();
/* 2C */ virtual void vfunc_2C();
/* 30 */ virtual void vfunc_30();
/* 34 */ virtual void vfunc_34();
/* 38 */ virtual void vfunc_38();
/* 3C */ virtual void vfunc_3C();
/* 40 */ virtual void vfunc_40();
/* 44 */ virtual void vfunc_44();
/* 48 */ virtual void vfunc_48();
/* 4C */
};
class UnkSystem2_UnkSubSystem5_Base {
public:
/* 000 (vtable) */
/* 004 */ wchar_t *mpString; // in this context it points to the player's name
/* 008 */ unk16 mUnk_008;
/* 00A */ unk16 mUnk_00A;
/* 00C */ void *mUnk_00C;
/* 010 */ UnkSystem2_UnkSubSystem5_Base_10 mUnk_010;
~UnkSystem2_UnkSubSystem5_Base();
/* 00 */ virtual void vfunc_00();
/* 04 */
};
class UnkSystem2_UnkSubSystem11 {
public:
/* 00 (vtable) */
/* 04 */ void *mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */ unk32 mUnk_10;
/* 14 */ unk32 mUnk_14;
/* 18 */ void *mUnk_18;
/* 1C */ void *mUnk_1C;
/* 20 */
void func_ov000_02061f60();
~UnkSystem2_UnkSubSystem11();
// data_ov000_020b1e9c vtable
/* 00 */ virtual void vfunc_00();
/* 04 */ virtual void vfunc_04();
/* 08 */ virtual void vfunc_08();
/* 0C */ virtual void vfunc_0C();
};
// this class seems related to drawing strings?
class UnkSystem2_UnkSubSystem5 : public UnkSystem2_UnkSubSystem5_Base {
public:
/* 000 (base) */
/* 130 */ STRUCT_PAD(0x130, 0x140);
/* 140 */ unk16 mUnk_140;
/* 142 */ unk16 mUnk_142;
/* 144 */ unk16 mUnk_144;
/* 146 */ unk16 mUnk_146;
/* 148 */ unk32 mUnk_148;
/* 14C */ unk8 mUnk_14C; // 0x544
/* 14D */ unk8 mUnk_14D; // 0x545
/* 14E */ unk8 mUnk_14E; // 0x546
/* 14F */ unk8 mUnk_14F; // 0x547
/* 150 */ UnkSystem2_UnkSubSystem11 mUnk_150;
/* 170 */ void *mUnk_170;
/* 144 */ STRUCT_PAD(0x174, 0x238);
/* 238 */
UnkSystem2_UnkSubSystem5() {}
UnkSystem2_UnkSubSystem5(unk32 param1, unk32 param2);
~UnkSystem2_UnkSubSystem5() {}
void func_0201f498();
void func_0201f4b4(unk32 param1);
void func_0201f500(void *param1);
void func_0201f730(unk32 param1);
void func_0201f9c4();
void func_0201fb78(wchar_t *param1);
void func_0201fa70(unk32 param1);
// data_0204439c vtable
/* 00 */ virtual void vfunc_00() override;
/* 04 */
};
class UnkSystem2_UnkSubSystem8_Base {
public:
/* 00 (vtable) */
/* 04 */ UnkSystem2_UnkSubSystem1_Derived2 *mUnk_04;
/* 08 */ bool mUnk_08;
/* 09 */ unk8 mUnk_09;
/* 0A */ unk8 mUnk_0A;
/* 0B */ unk8 mUnk_0B;
/* 0C */
UnkSystem2_UnkSubSystem8_Base(UnkSystem2_UnkSubSystem1_Derived2 *param1);
// data_ov000_020b1fac vtable
/* 00 */ virtual void vfunc_00() = 0;
/* 04 */ virtual void vfunc_04() = 0;
};
// seems to be related to the animations of the ui elements
class UnkSystem2_UnkSubSystem9 : public UnkSubStruct1 {
public:
/* 00 (base) */
/* 30 */ unk32 mUnk_30;
/* 34 */ unk32 mUnk_34;
/* 38 */ unk32 mUnk_38;
/* 3C */ unk32 mUnk_3C;
/* 40 */ unk32 mUnk_40;
/* 44 */
UnkSystem2_UnkSubSystem9();
// data_020442f4 vtable
/* 00 */ virtual void vfunc_00() override;
/* 04 */ virtual void vfunc_04() override;
/* 08 */ virtual void vfunc_08() override;
/* 0C */
//! TODO: conflict with UnkStruct_ov019_020d24c8_28_304
void func_0201e874(unk32 param1, void *param2, void *param3, unk32 param4);
};
class UnkSystem2_UnkSubSystem8 : public UnkSystem2_UnkSubSystem8_Base {
public:
/* 00 (base) */
/* 0C */ UnkSystem2_UnkSubSystem9 mUnk_0C;
/* 50 */
UnkSystem2_UnkSubSystem8() :
UnkSystem2_UnkSubSystem8_Base(NULL) {}
UnkSystem2_UnkSubSystem8(UnkSystem2_UnkSubSystem1_Derived2 *param1) :
UnkSystem2_UnkSubSystem8_Base(param1) {}
UnkSystem2_UnkSubSystem8(UnkSystem2_UnkSubSystem1_Derived1 *param1) :
UnkSystem2_UnkSubSystem8_Base((UnkSystem2_UnkSubSystem1_Derived2 *) param1) {}
void func_ov000_02064080(void *param1, void *param2, unk32 param3, u16 param4);
void func_ov000_0206415c(void *param1, unk32 param2, unk32 param3, unk32 param4);
void func_ov000_02063f64();
// data_ov000_020b1f8c vtable
/* 00 */ virtual void vfunc_00() override;
/* 04 */ virtual void vfunc_04() override;
};
class UnkSystem3 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */
UnkSystem3(const char *path, unk32 param2);
~UnkSystem3();
void func_02015410(const char *path, unk32 param2);
void func_02015460(const char *param1, void *param2, unk32 param3);
};
class UnkSystem4 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */
~UnkSystem4();
};
class UnkSystem5 {
public:
/* 00 */ char *mUnk_00;
/* 04 */ char *mUnk_04;
/* 08 */ char *mUnk_08;
/* 10 */ UnkSystem4 mUnk_0F00;
/* 20 */ UnkSystem4 mUnk_0F10;
/* 30 */ UnkSystem4 mUnk_0F20;
/* 40 */
UnkSystem5() {}
~UnkSystem5() {}
void func_020171e4();
void func_02017520(const char *nscrPath, const char *ncgrPath, const char *nclrPath);
};
class UnkStruct2 {
public:
/* 00 */ unk8 pad[0x10];
/* 10 */
UnkStruct2(const char *path, unk32 param2);
~UnkStruct2();
void func_020154ec(const char *param1);
};
struct UnkResult {
void *mUnk_00;
void *mUnk_04;
void *mUnk_08;
UnkSystem4 mUnk_0C;
UnkSystem4 mUnk_1C;
UnkSystem4 mUnk_2C;
UnkResult(const char *path);
};
include/FileSelect/FileSelect.hpp
+3 -37
View File
@@ -14,40 +14,6 @@
extern const unk16 data_ov019_020d1bb0[];
extern "C" void func_ov001_020bd6a8();
class UnkStructSub2 {
public:
UnkStructSub2();
/* 00 */ virtual void vfunc_00();
/* 04 */ virtual void vfunc_04();
};
class UnkStructSub4 {
public:
/* 00 */ unk8 mUnk_00[0x18];
/* 18 */ unk32 mUnk_0018;
/* 1C */ unk32 mUnk_001C;
/* 20 */ unk32 mUnk_0020;
/* 20 */ unk32 mUnk_0024;
/* 28 */ u8 mUnk_0028; // bool?
/* 28 */ unk8 mUnk_0029;
/* 28 */ unk8 mUnk_002A;
/* 28 */ unk8 mUnk_002B;
/* 2C */ UnkStructSub2 mUnk_002C;
/* 30 */ STRUCT_PAD(0x30, 0x5C);
/* 5C */ unk16 mUnk_5C;
/* 5C */ unk16 mUnk_5E;
/* 60 */ STRUCT_PAD(0x60, 0x6E);
/* 6E */ unk8 mUnk_6E;
/* 6F */ unk8 mUnk_6F;
/* 70 */ unk32 mUnk_70;
/* 74 */ unk16 mUnk_74;
/* 76 */ unk16 mUnk_76;
/* 78 */
void func_ov000_02060b64(void);
};
// related to UnkStructSub2 but unsure how
class FileSelect_UnkClass7 {
public:
@@ -58,7 +24,7 @@ public:
};
/* 0000 (vtable) */
/* 0004 */ UnkStructSub4 mUnk_0004[30];
/* 0004 */ UnkSubStruct19 mUnk_0004[30];
/* 0E14 */ Sub5 mUnk_0E14[30];
// data_ov019_020d22a8 vtable
@@ -104,8 +70,8 @@ public:
// data_ov019_020d22b8 vtable
/* 00 */ virtual ~FileSelectSubScreen() override {}
/* 08 */ virtual void vfunc_08() override;
/* 10 */ virtual void vfunc_10() override;
/* 08 */ virtual void vfunc_08(GameModePTMFParam2Struct *param1, TouchControl *pTouchControl) override;
/* 10 */ virtual void vfunc_10(unk8 *param1) override;
};
class FileSelectManager : public GameModeManagerBase { // 0x02262dbc
include/FileSelect/FileSelectMain.hpp
+2 -40
View File
@@ -55,44 +55,6 @@ enum FileSelectExitMode_ {
/* 0x03 */ FileSelectExitMode_Unk_3 = 3,
};
// used to draw the swords from the adventure and battle buttons
class UnkSubStruct19 {
public:
/* 00 */ void *mUnk_00;
/* 04 */ void *mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C; // pause the animation timer (in this context: pause the shiny animation on the sword)
/* 10 */ unk32 mUnk_10; // animation timer
/* 14 */ unk32 mUnk_14; // animation speed (also affects above timer)
/* 18 */ unk32 mUnk_18;
/* 1C */ void *mUnk_1C; // pointer to animation bank ("ABNK")
/* 20 */ unk32 mUnk_20;
/* 24 */ unk32 mUnk_24;
/* 28 */ unk32 mUnk_28;
/* 2C */ unk32 mUnk_2C;
/* 30 */ void *mUnk_30; // pointer to somewhere inside "CEBK"
/* 34 */ void *mUnk_34;
/* 38 */ unk32 mUnk_38;
/* 3C */ unk32 mUnk_3C;
/* 40 */ unk32 mUnk_40; // related to the width of the texture (scaling matrix?)
/* 44 */ unk32 mUnk_44; // related to the height of the texture
/* 48 */ Vec2us mUnk_48;
/* 4C */ unk32 mUnk_4C;
/* 50 */ unk32 mUnk_50;
/* 54 */ unk32 mUnk_54;
/* 58 */ unk32 mUnk_58; // another timer?
/* 5C */ Vec2us mUnk_5C; // position of the animated texture
/* 60 */ unk32 mUnk_60;
/* 64 */ unk32 mUnk_64;
/* 68 */ unk32 mUnk_68;
/* 6C */ unk32 mUnk_6C;
/* 70 */ unk32 mUnk_70;
/* 74 */ unk32 mUnk_74;
/* 78 */
UnkSubStruct19();
};
class FileSelectMain : public GameModeManagerBase_104 { // 022E5F70
public:
/* 0000 (base) */
@@ -293,7 +255,7 @@ public:
// data_ov019_020d1ec0 vtable
/* 00 */ virtual ~FileSelectMain() override;
/* 08 */ virtual void vfunc_08() override;
/* 10 */ virtual void vfunc_10() override;
/* 08 */ virtual void vfunc_08(GameModePTMFParam2Struct *param1, TouchControl *pTouchControl) override;
/* 10 */ virtual void vfunc_10(unk8 *param1) override;
/* 18 */ virtual void vfunc_18(void) override;
};
include/FileSelect/FileSelectMicTest.hpp
+4 -39
View File
@@ -1,7 +1,7 @@
#pragma once
#include "FileSelect/Common.hpp"
#include "Game/GameModeManager.hpp"
#include "Unknown/Common.hpp"
#include "global.h"
#include "nitro/math.h"
#include "types.h"
@@ -21,41 +21,6 @@ enum FSMicTestState_ {
/* 0x04 */ FSMicTestState_Max = 4
};
class UnkStruct_ov019_020d24c8_28_258 {
public:
/* 00 */ void *mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk16 mUnk_08;
/* 0A */ Vec2us_cpp mPos;
/* 0E */ unk16 mUnk_0E;
/* 10 */ unk16 mUnk_10;
/* 12 */ unk16 mUnk_12;
/* 14 */ unk16 mUnk_14;
/* 16 */ unk16 mUnk_16;
/* 18 */
UnkStruct_ov019_020d24c8_28_258() {
mUnk_00 = NULL;
mUnk_04 = 0;
mPos.x = 0;
mPos.y = 0;
};
UnkStruct_ov019_020d24c8_28_258(unk32 param1, unk32 param2) :
mUnk_00(0),
mUnk_04(0) {
this->UnknownAction(param1, param2);
}
void UnknownAction(unk32 param1, unk32 param2) {
this->func_ov000_0205fc20(param1, param2, &this->mPos, &this->mUnk_0E);
this->mUnk_12 = param1;
this->mUnk_14 = param2;
}
void func_ov000_0205fc20(unk32 param1, unk32 param2, void *param3, void *param4);
};
class UnkStruct_ov019_020d24c8_28_270_18 {
public:
/* 00 */ UnkStruct_ov019_020d24c8_28_258 mUnk_00[MAX_MIC_LEVELS];
@@ -122,7 +87,7 @@ public:
// data_ov019_020d2284 vtable
/* 00 */ virtual ~FileSelectMicTest() override;
/* 08 */ virtual void vfunc_08() override;
/* 10 */ virtual void vfunc_10() override;
/* 14 */ virtual void vfunc_14() override;
/* 08 */ virtual void vfunc_08(GameModePTMFParam2Struct *param1, TouchControl *pTouchControl) override;
/* 10 */ virtual void vfunc_10(unk8 *param1) override;
/* 14 */ virtual void vfunc_14(unk8 *param1) override;
};
include/FileSelect/FileSelectOptions.hpp
+3 -3
View File
@@ -1,9 +1,9 @@
#pragma once
#include "FileSelect/Common.hpp"
#include "FileSelect/FileSelectMicTest.hpp"
#include "Game/GameModeManager.hpp"
#include "System/SysNew.hpp"
#include "Unknown/Common.hpp"
#include "global.h"
#include "types.h"
@@ -166,8 +166,8 @@ public:
// data_ov019_020d2200 vtable
/* 00 */ virtual ~FileSelectOptions() override;
/* 08 */ virtual void vfunc_08() override;
/* 10 */ virtual void vfunc_10() override;
/* 08 */ virtual void vfunc_08(GameModePTMFParam2Struct *param1, TouchControl *pTouchControl) override;
/* 10 */ virtual void vfunc_10(unk8 *param1) override;
static GameModeManagerBase_104 *Create(void *param1, s32 saveSlotIndex);
};
include/FileSelect/FileSelectOptionsManager.hpp
+2 -2
View File
@@ -1,7 +1,7 @@
#pragma once
#include "FileSelect/Common.hpp"
#include "System/SysNew.hpp"
#include "Unknown/Common.hpp"
#include "global.h"
#include "nitro/math.h"
#include "types.h"
@@ -35,7 +35,7 @@ public:
// data_ov019_020d2224 vtable
/* 00 */ virtual ~FileSelectOptionsManager() override;
/* 08 */ virtual void vfunc_08() override;
/* 08 */ virtual void vfunc_08(GameModePTMFParam2Struct *param1, TouchControl *pTouchControl) override;
static GameModeManagerBase_104 *Create(void *param1, s32 saveSlotIndex);
};
include/FileSelect/UnkSubStruct9.hpp
+10 -41
View File
@@ -7,37 +7,6 @@
#include "nitro/math.h"
#include "types.h"
class UnkStructSub4_2 {
public:
/* 00 */ void *mUnk_00;
/* 04 */ void *mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 08 */ unk32 mUnk_0C;
/* 10 */ unk32 mUnk_10;
/* 14 */ unk32 mUnk_14;
/* 18 */ unk32 mUnk_18;
/* 1C */ unk32 mUnk_1C;
/* 20 */ unk32 mUnk_20;
/* 24 */ unk32 mUnk_24;
/* 28 */ u8 mUnk_28; // bool?
/* 29 */ unk8 mUnk_29;
/* 2A */ unk8 mUnk_2A;
/* 2B */ unk8 mUnk_2B;
/* 2C */ unk32 mUnk_2C;
/* 30 */ STRUCT_PAD(0x30, 0x5C);
/* 5C */ unk16 mUnk_5C;
/* 5E */ unk16 mUnk_5E;
/* 60 */ STRUCT_PAD(0x60, 0x6E);
/* 6E */ unk8 mUnk_6E;
/* 6F */ unk8 mUnk_6F;
/* 70 */ unk32 mUnk_70;
/* 74 */ unk16 mUnk_74;
/* 76 */ unk16 mUnk_76;
/* 78 */
void func_ov000_02060b64(void);
};
// file tab manager?
class UnkSubStruct9 : public SysObject {
public:
@@ -49,16 +18,16 @@ public:
/* 064 */ UnkSystem2_UnkSubSystem5 mUnk_064;
/* 29C */ UnkStruct_ov019_020d24c8_28_258 mUnk_29C; // top-left 1 and 2 icons
/* 2B4 */ UnkStruct_ov019_020d24c8_28_258 mUnk_2B4; // static hearts (hearts before beating heart)
/* 2CC */ UnkStructSub4_2 mUnk_2CC;
/* 344 */ UnkStructSub4_2 mUnk_344;
/* 3BC */ UnkStructSub4_2 mUnk_3BC;
/* 434 */ UnkStructSub4_2 mUnk_434;
/* 4AC */ UnkStructSub4_2 mUnk_4AC;
/* 524 */ UnkStructSub4_2 mUnk_524; // forest dungeon icon
/* 59C */ UnkStructSub4_2 mUnk_59C; // snow dungeon icon
/* 614 */ UnkStructSub4_2 mUnk_614; // ocean dungeon icon
/* 68C */ UnkStructSub4_2 mUnk_68C; // fire dungeon icon
/* 704 */ UnkStructSub4_2 mUnk_704; // desert dungeon icon
/* 2CC */ UnkSubStruct19 mUnk_2CC;
/* 344 */ UnkSubStruct19 mUnk_344;
/* 3BC */ UnkSubStruct19 mUnk_3BC;
/* 434 */ UnkSubStruct19 mUnk_434;
/* 4AC */ UnkSubStruct19 mUnk_4AC;
/* 524 */ UnkSubStruct19 mUnk_524; // forest dungeon icon
/* 59C */ UnkSubStruct19 mUnk_59C; // snow dungeon icon
/* 614 */ UnkSubStruct19 mUnk_614; // ocean dungeon icon
/* 68C */ UnkSubStruct19 mUnk_68C; // fire dungeon icon
/* 704 */ UnkSubStruct19 mUnk_704; // desert dungeon icon
/* 77C */ Vec2us mUnk_77C;
// int pad[10];
/* 780 */