Skip to content

Commit 5f441e9

Browse files
foxtaclesfoxtacles
authored
Merge branch 'master' into AmberHaze0x20-methods
2 parents d410209 + 9606080 commit 5f441e9

49 files changed

Lines changed: 514 additions & 156 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎GolDP/include/gol.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class AmberLens0x344;
2323
class GolFontTable;
2424
class MagentaRibbon0x20;
2525
class WhiteBaffoon0x50;
26+
class AmberHaze0x1c;
2627

2728
struct GolImport {
2829
GolFileSource* m_fileSources; // 0x00
@@ -60,8 +61,8 @@ class GolExport {
6061
virtual AwakeKite0x20* VTable0x34() = 0; // vtable+0x34
6162
virtual GolFontTable* VTable0x38() = 0; // vtable+0x38
6263
virtual void VTable0x3c(undefined4*) = 0; // vtable+0x3c
63-
virtual void VTable0x40(undefined4*) = 0; // vtable+0x40
64-
virtual void VTable0x44(undefined4*) = 0; // vtable+0x44
64+
virtual void VTable0x40(MagentaRibbon0x20*) = 0; // vtable+0x40
65+
virtual void VTable0x44(AmberHaze0x1c*) = 0; // vtable+0x44
6566
virtual void VTable0x48(undefined4*) = 0; // vtable+0x48
6667
virtual void VTable0x4c(undefined4*) = 0; // vtable+0x4c
6768
virtual void VTable0x50(undefined4*) = 0; // vtable+0x50

‎GolDP/include/goldpexport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class GolDPExport : public GolExport {
3030
AwakeKite0x20* VTable0x34() override; // vtable+0x34
3131
GolFontTable* VTable0x38() override; // vtable+0x38
3232
void VTable0x3c(undefined4*) override; // vtable+0x3c
33-
void VTable0x40(undefined4*) override; // vtable+0x40
34-
void VTable0x44(undefined4*) override; // vtable+0x44
33+
void VTable0x40(MagentaRibbon0x20*) override; // vtable+0x40
34+
void VTable0x44(AmberHaze0x1c*) override; // vtable+0x44
3535
void VTable0x48(undefined4*) override; // vtable+0x48
3636
void VTable0x4c(undefined4*) override; // vtable+0x4c
3737
void VTable0x50(undefined4*) override; // vtable+0x50

‎GolDP/src/goldpexport.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void GolDPExport::VTable0x3c(undefined4* p_obj)
170170
}
171171

172172
// STUB: GOLDP 0x10015600 FOLDED
173-
void GolDPExport::VTable0x40(undefined4* p_obj)
173+
void GolDPExport::VTable0x40(MagentaRibbon0x20* p_obj)
174174
{
175175
#if 0
176176
if (p_obj != NULL) {
@@ -183,7 +183,7 @@ void GolDPExport::VTable0x40(undefined4* p_obj)
183183
}
184184

185185
// STUB: GOLDP 0x10015600 FOLDED
186-
void GolDPExport::VTable0x44(undefined4* p_obj)
186+
void GolDPExport::VTable0x44(AmberHaze0x1c* p_obj)
187187
{
188188
#if 0
189189
if (p_obj != NULL) {

‎LEGORacers/include/aquamarinespirit0x3c.h‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
class CmbTxtParser : public GolTxtParser {};
1313

1414
class GolExport;
15+
class AmberHaze0x1c;
16+
class MagentaRibbon0x20;
1517
class OpalHaven0xf4;
1618

1719
// VTABLE: LEGORACERS 0x004afe70
@@ -59,18 +61,18 @@ class AquamarineSpirit0x3c : public GolNameTable {
5961
void FUN_0041d980();
6062
void FUN_0041dae0();
6163

62-
GolExport* m_unk0x0c; // 0x0c
63-
undefined4 m_unk0x10; // 0x10
64-
Item0x104* m_unk0x14; // 0x14
65-
undefined4** m_unk0x18; // 0x18
66-
undefined4** m_unk0x1c; // 0x1c
67-
undefined4** m_unk0x20; // 0x20
68-
undefined4** m_unk0x24; // 0x24
69-
CmbModelPart0x34* m_unk0x28; // 0x28
70-
OpalHaven0xf4* m_unk0x2c; // 0x2c
71-
undefined4 m_unk0x30; // 0x30
72-
LegoU32 m_unk0x34; // 0x34
73-
undefined4 m_unk0x38; // 0x38
64+
GolExport* m_unk0x0c; // 0x0c
65+
undefined4 m_unk0x10; // 0x10
66+
Item0x104* m_unk0x14; // 0x14
67+
undefined4** m_unk0x18; // 0x18
68+
MagentaRibbon0x20** m_unk0x1c; // 0x1c
69+
AmberHaze0x1c** m_unk0x20; // 0x20
70+
undefined4** m_unk0x24; // 0x24
71+
CmbModelPart0x34* m_unk0x28; // 0x28
72+
OpalHaven0xf4* m_unk0x2c; // 0x2c
73+
undefined4 m_unk0x30; // 0x30
74+
LegoU32 m_unk0x34; // 0x34
75+
undefined4 m_unk0x38; // 0x38
7476
};
7577

7678
#endif // AQUAMARINESPIRIT0X3C_H

‎LEGORacers/include/championdefinitionlist.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include "types.h"
88

99
class GolExport;
10+
class AmberHaze0x1c;
11+
class MagentaRibbon0x20;
1012

1113
// VTABLE: LEGORACERS 0x004afde8
1214
// SIZE 0x34
@@ -44,8 +46,8 @@ class ChampionDefinitionList : public GolNameTable {
4446
undefined4 m_unk0x10; // 0x10
4547
ChampionDefinition* m_definitions; // 0x14
4648
undefined4** m_unk0x18; // 0x18
47-
undefined4** m_unk0x1c; // 0x1c
48-
undefined4** m_unk0x20; // 0x20
49+
MagentaRibbon0x20** m_unk0x1c; // 0x1c
50+
AmberHaze0x1c** m_unk0x20; // 0x20
4951
undefined* m_unk0x24; // 0x24
5052
undefined4 m_unk0x28; // 0x28
5153
LegoU32 m_entryCount; // 0x2c

‎LEGORacers/include/imaginaryaxe0x36c4.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ImaginaryAxe0x36c4 : public ImaginaryTool0x368 {
1616
void VTable0x4c() override; // vtable+0x4c
1717
void VTable0x54() override; // vtable+0x54
1818
~ImaginaryAxe0x36c4() override; // vtable+0x68
19-
void VTable0x74() override; // vtable+0x74
19+
LegoBool32 VTable0x74() override; // vtable+0x74
2020
void VTable0x80() override; // vtable+0x80
2121
void VTable0x84() override; // vtable+0x84
2222
LegoBool32 VTable0x8c(MenuToolContext0x4bc8*, MenuToolCreateParams0x30*) override; // vtable+0x8c

‎LEGORacers/include/imaginarybelt0x2548.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ImaginaryBelt0x2548 : public ImaginaryTool0x368 {
1414
void VTable0x38(undefined4) override; // vtable+0x38
1515
void VTable0x4c() override; // vtable+0x4c
1616
~ImaginaryBelt0x2548() override; // vtable+0x68
17-
void VTable0x74() override; // vtable+0x74
17+
LegoBool32 VTable0x74() override; // vtable+0x74
1818
LegoBool32 VTable0x78(undefined4) override; // vtable+0x78
1919
void VTable0x84() override; // vtable+0x84
2020
LegoBool32 VTable0x8c(MenuToolContext0x4bc8*, MenuToolCreateParams0x30*) override; // vtable+0x8c

‎LEGORacers/include/imaginarybolt0x4774.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ImaginaryBolt0x4774 : public ImaginaryTool0x368 {
2222
void VTable0x4c() override; // vtable+0x4c
2323
void VTable0x54() override; // vtable+0x54
2424
~ImaginaryBolt0x4774() override; // vtable+0x68
25-
void VTable0x74() override; // vtable+0x74
25+
LegoBool32 VTable0x74() override; // vtable+0x74
2626
LegoBool32 VTable0x78(undefined4) override; // vtable+0x78
2727
void VTable0x84() override; // vtable+0x84
2828
LegoBool32 VTable0x88() override; // vtable+0x88

‎LEGORacers/include/imaginarybrush0x6410.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ImaginaryBrush0x6410 : public ImaginaryTool0x368 {
1717
void VTable0x4c() override; // vtable+0x4c
1818
void VTable0x54() override; // vtable+0x54
1919
~ImaginaryBrush0x6410() override; // vtable+0x68
20-
void VTable0x74() override; // vtable+0x74
20+
LegoBool32 VTable0x74() override; // vtable+0x74
2121
LegoBool32 VTable0x78(undefined4) override; // vtable+0x78
2222
void VTable0x80() override; // vtable+0x80
2323
void VTable0x84() override; // vtable+0x84

‎LEGORacers/include/imaginarychisel0x658.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ class ImaginaryChisel0x658 : public ImaginaryTool0x368 {
4343
};
4444

4545
ImaginaryChisel0x658();
46-
4746
~ImaginaryChisel0x658() override; // vtable+0x68
48-
void VTable0x74() override; // vtable+0x74
47+
LegoBool32 VTable0x74() override; // vtable+0x74
4948
LegoBool32 VTable0x78(undefined4) override; // vtable+0x78
5049
void VTable0x84() override; // vtable+0x84
5150
LegoBool32 VTable0x8c(MenuToolContext0x4bc8*,

0 commit comments

Comments
 (0)