Skip to content

Commit 39c490b

Browse files
madebrmadebr
authored
Merge branch 'master' into GolDPExport-VTable0x0c
2 parents 893e9fe + 7658d4a commit 39c490b

6 files changed

Lines changed: 227 additions & 104 deletions

File tree

‎GolDP/include/golfontbase0x40.h‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifndef GOLFONTBASE0X40_H
22
#define GOLFONTBASE0X40_H
33

4+
#include "color.h"
45
#include "compat.h"
56
#include "decomp.h"
67
#include "types.h"
@@ -27,6 +28,16 @@ class GolFontBase0x40 {
2728
// GolFontBase0x40::`scalar deleting destructor'
2829

2930
LegoBool32 HasLoadedData() const { return m_unk0x28 != NULL; }
31+
void SetColor(LegoU8 p_red, LegoU8 p_green, LegoU8 p_blue, LegoU8 p_alpha)
32+
{
33+
ColorRGBA color;
34+
35+
color.m_red = p_red;
36+
color.m_grn = p_green;
37+
color.m_blu = p_blue;
38+
color.m_alp = p_alpha;
39+
m_color = color;
40+
}
3041

3142
protected:
3243
undefined4 m_unk0x04; // 0x04
@@ -44,7 +55,7 @@ class GolFontBase0x40 {
4455
undefined m_unk0x31[0x34 - 0x31]; // 0x31
4556
undefined4 m_unk0x34; // 0x34
4657
undefined4 m_unk0x38; // 0x38
47-
undefined m_unk0x3c[0x40 - 0x3c]; // 0x3c
58+
ColorRGBA m_color; // 0x3c
4859
};
4960

5061
#endif // GOLFONTBASE0X40_H

‎GolDP/src/golfontbase0x40.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ GolFontBase0x40::GolFontBase0x40()
1212
m_unk0x24 = 0;
1313
m_unk0x28 = NULL;
1414
m_unk0x18 = 0;
15-
m_unk0x3c[0] = 0xff;
16-
m_unk0x3c[1] = 0xff;
17-
m_unk0x3c[2] = 0xff;
18-
m_unk0x3c[3] = 0xff;
15+
m_color.m_red = 0xff;
16+
m_color.m_grn = 0xff;
17+
m_color.m_blu = 0xff;
18+
m_color.m_alp = 0xff;
1919
m_unk0x30 = 0;
2020
m_unk0x2c = 0;
2121
m_unk0x20 = 0;
@@ -40,10 +40,10 @@ void GolFontBase0x40::Clear()
4040
m_unk0x24 = 0;
4141
m_unk0x28 = NULL;
4242
m_unk0x18 = 0;
43-
m_unk0x3c[0] = 0xff;
44-
m_unk0x3c[1] = 0xff;
45-
m_unk0x3c[2] = 0xff;
46-
m_unk0x3c[3] = 0xff;
43+
m_color.m_red = 0xff;
44+
m_color.m_grn = 0xff;
45+
m_color.m_blu = 0xff;
46+
m_color.m_alp = 0xff;
4747
}
4848

4949
// STUB: GOLDP 0x1001e070

‎LEGORacers/include/crimsonpebble0x228.h‎

Lines changed: 84 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -32,93 +32,97 @@ class CrimsonPebble0x228 : public BluebellFog0x4 {
3232

3333
void Reset();
3434
void FUN_004a12e0(GolFileParser* p_unk0x04);
35+
void FUN_004a24e0();
36+
37+
undefined4 GetUnk0x118() const { return m_unk0x118; }
38+
void SetStringTable(GolStringTable* p_stringTable) { m_stringTable = p_stringTable; }
3539

3640
// SYNTHETIC: LEGORACERS 0x004a0390
3741
// CrimsonPebble0x228::`scalar deleting destructor'
3842

3943
private:
4044
void FUN_004a0bf0();
4145

42-
undefined4* m_unk0x04; // 0x004
43-
undefined4 m_unk0x08; // 0x008
44-
undefined4* m_unk0x0c; // 0x00c
45-
undefined4 m_unk0x10; // 0x010
46-
SoundNode m_unk0x14; // 0x014
47-
undefined4* m_unk0x64; // 0x064
48-
undefined4 m_unk0x68; // 0x068
49-
undefined4* m_unk0x6c; // 0x06c
50-
undefined4* m_unk0x70; // 0x070
51-
undefined4* m_unk0x74; // 0x074
52-
LegoU32 m_unk0x78; // 0x078
53-
GolStringTable* m_unk0x7c; // 0x07c
54-
LegoChar* m_unk0x80; // 0x080
55-
undefined4 m_unk0x84; // 0x084
56-
undefined4* m_unk0x88; // 0x088
57-
undefined4* m_unk0x8c; // 0x08c
58-
undefined4 m_unk0x90; // 0x090
59-
undefined4* m_unk0x94; // 0x094
60-
undefined4* m_unk0x98; // 0x098
61-
undefined4 m_unk0x9c; // 0x09c
62-
undefined4* m_unk0xa0; // 0x0a0
63-
undefined4* m_unk0xa4; // 0x0a4
64-
GolNameTable m_unk0xa8; // 0x0a8
65-
undefined4 m_unk0xb4; // 0x0b4
66-
undefined4* m_unk0xb8; // 0x0b8
67-
GolNameTable m_unk0xbc; // 0x0bc
68-
undefined4 m_unk0xc8; // 0x0c8
69-
undefined4* m_unk0xcc; // 0x0cc
70-
GolNameTable m_unk0xd0; // 0x0d0
71-
undefined4 m_unk0xdc; // 0x0dc
72-
undefined4* m_unk0xe0; // 0x0e0
73-
GolNameTable m_unk0xe4; // 0x0e4
74-
undefined4 m_unk0xf0; // 0x0f0
75-
undefined4* m_unk0xf4; // 0x0f4
76-
GolNameTable m_unk0xf8; // 0x0f8
77-
undefined4 m_unk0x104; // 0x104
78-
undefined4* m_unk0x108; // 0x108
79-
GolNameTable m_unk0x10c; // 0x10c
80-
undefined4 m_unk0x118; // 0x118
81-
undefined4* m_unk0x11c; // 0x11c
82-
GolNameTable m_unk0x120; // 0x120
83-
undefined4 m_unk0x12c; // 0x12c
84-
undefined4* m_unk0x130; // 0x130
85-
undefined4 m_unk0x134; // 0x134
86-
undefined4* m_unk0x138; // 0x138
87-
GolNameTable m_unk0x13c; // 0x13c
88-
undefined4 m_unk0x148; // 0x148
89-
undefined4* m_unk0x14c; // 0x14c
90-
GolNameTable m_unk0x150; // 0x150
91-
undefined4 m_unk0x15c; // 0x15c
92-
undefined4* m_unk0x160; // 0x160
93-
GolNameTable m_unk0x164; // 0x164
94-
undefined4 m_unk0x170; // 0x170
95-
undefined4* m_unk0x174; // 0x174
96-
GolNameTable m_unk0x178; // 0x178
97-
undefined4 m_unk0x184; // 0x184
98-
undefined4* m_unk0x188; // 0x188
99-
GolNameTable m_unk0x18c; // 0x18c
100-
undefined4 m_unk0x198; // 0x198
101-
undefined4* m_unk0x19c; // 0x19c
102-
GolNameTable m_unk0x1a0; // 0x1a0
103-
undefined4 m_unk0x1ac; // 0x1ac
104-
undefined4* m_unk0x1b0; // 0x1b0
105-
GolNameTable m_unk0x1b4; // 0x1b4
106-
undefined4 m_unk0x1c0; // 0x1c0
107-
undefined4* m_unk0x1c4; // 0x1c4
108-
GolNameTable m_unk0x1c8; // 0x1c8
109-
undefined4 m_unk0x1d4; // 0x1d4
110-
undefined4* m_unk0x1d8; // 0x1d8
111-
GolNameTable m_unk0x1dc; // 0x1dc
112-
undefined4 m_unk0x1e8; // 0x1e8
113-
undefined4* m_unk0x1ec; // 0x1ec
114-
GolNameTable m_unk0x1f0; // 0x1f0
115-
undefined4 m_unk0x1fc; // 0x1fc
116-
undefined4* m_unk0x200; // 0x200
117-
GolNameTable m_unk0x204; // 0x204
118-
undefined4 m_unk0x210; // 0x210
119-
undefined4* m_unk0x214; // 0x214
120-
GolNameTable m_unk0x218; // 0x218
121-
undefined4 m_unk0x224; // 0x224
46+
undefined4* m_unk0x04; // 0x004
47+
undefined4 m_unk0x08; // 0x008
48+
undefined4* m_unk0x0c; // 0x00c
49+
undefined4 m_unk0x10; // 0x010
50+
SoundNode m_unk0x14; // 0x014
51+
undefined4* m_unk0x64; // 0x064
52+
undefined4 m_unk0x68; // 0x068
53+
undefined4* m_unk0x6c; // 0x06c
54+
undefined4* m_unk0x70; // 0x070
55+
undefined4* m_unk0x74; // 0x074
56+
LegoU32 m_unk0x78; // 0x078
57+
GolStringTable* m_unk0x7c; // 0x07c
58+
LegoChar* m_unk0x80; // 0x080
59+
undefined4 m_unk0x84; // 0x084
60+
undefined4* m_unk0x88; // 0x088
61+
undefined4* m_unk0x8c; // 0x08c
62+
undefined4 m_unk0x90; // 0x090
63+
undefined4* m_unk0x94; // 0x094
64+
undefined4* m_unk0x98; // 0x098
65+
undefined4 m_unk0x9c; // 0x09c
66+
undefined4* m_unk0xa0; // 0x0a0
67+
undefined4* m_unk0xa4; // 0x0a4
68+
GolNameTable m_unk0xa8; // 0x0a8
69+
undefined4 m_unk0xb4; // 0x0b4
70+
undefined4* m_unk0xb8; // 0x0b8
71+
GolNameTable m_unk0xbc; // 0x0bc
72+
undefined4 m_unk0xc8; // 0x0c8
73+
undefined4* m_unk0xcc; // 0x0cc
74+
GolNameTable m_unk0xd0; // 0x0d0
75+
undefined4 m_unk0xdc; // 0x0dc
76+
undefined4* m_unk0xe0; // 0x0e0
77+
GolNameTable m_unk0xe4; // 0x0e4
78+
undefined4 m_unk0xf0; // 0x0f0
79+
undefined4* m_unk0xf4; // 0x0f4
80+
GolNameTable m_unk0xf8; // 0x0f8
81+
undefined4 m_unk0x104; // 0x104
82+
undefined4* m_unk0x108; // 0x108
83+
GolNameTable m_unk0x10c; // 0x10c
84+
undefined4 m_unk0x118; // 0x118
85+
undefined4* m_unk0x11c; // 0x11c
86+
GolNameTable m_unk0x120; // 0x120
87+
undefined4 m_unk0x12c; // 0x12c
88+
undefined4* m_unk0x130; // 0x130
89+
undefined4 m_unk0x134; // 0x134
90+
undefined4* m_unk0x138; // 0x138
91+
GolNameTable m_unk0x13c; // 0x13c
92+
undefined4 m_unk0x148; // 0x148
93+
undefined4* m_unk0x14c; // 0x14c
94+
GolNameTable m_unk0x150; // 0x150
95+
undefined4 m_unk0x15c; // 0x15c
96+
undefined4* m_unk0x160; // 0x160
97+
GolNameTable m_unk0x164; // 0x164
98+
undefined4 m_unk0x170; // 0x170
99+
undefined4* m_unk0x174; // 0x174
100+
GolNameTable m_unk0x178; // 0x178
101+
undefined4 m_unk0x184; // 0x184
102+
undefined4* m_unk0x188; // 0x188
103+
GolNameTable m_unk0x18c; // 0x18c
104+
undefined4 m_unk0x198; // 0x198
105+
undefined4* m_unk0x19c; // 0x19c
106+
GolNameTable m_unk0x1a0; // 0x1a0
107+
undefined4 m_unk0x1ac; // 0x1ac
108+
undefined4* m_unk0x1b0; // 0x1b0
109+
GolNameTable m_unk0x1b4; // 0x1b4
110+
undefined4 m_unk0x1c0; // 0x1c0
111+
undefined4* m_unk0x1c4; // 0x1c4
112+
GolNameTable m_unk0x1c8; // 0x1c8
113+
undefined4 m_unk0x1d4; // 0x1d4
114+
undefined4* m_unk0x1d8; // 0x1d8
115+
GolNameTable m_unk0x1dc; // 0x1dc
116+
undefined4 m_unk0x1e8; // 0x1e8
117+
undefined4* m_unk0x1ec; // 0x1ec
118+
GolNameTable m_unk0x1f0; // 0x1f0
119+
undefined4 m_unk0x1fc; // 0x1fc
120+
undefined4* m_unk0x200; // 0x200
121+
GolNameTable m_unk0x204; // 0x204
122+
undefined4 m_unk0x210; // 0x210
123+
undefined4* m_unk0x214; // 0x214
124+
GolNameTable m_unk0x218; // 0x218
125+
GolStringTable* m_stringTable; // 0x224
122126
};
123127

124128
#endif // CRIMSONPEBBLE0X228_H

‎LEGORacers/include/imaginarychisel0x658.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define IMAGINARYCHISEL0X658_H
33

44
#include "compat.h"
5+
#include "crimsonpebble0x228.h"
56
#include "decomp.h"
67
#include "golstringtable.h"
78
#include "imaginarytool0x368.h"
@@ -34,9 +35,11 @@ class ImaginaryChisel0x658 : public ImaginaryTool0x368 {
3435
// SYNTHETIC: LEGORACERS 0x00466a80
3536
// ImaginaryChisel0x658::HelperAt0x368::`scalar deleting destructor'
3637

37-
undefined m_unk0x58[0x2c8 - 0x58]; // 0x058
38-
undefined4 m_unk0x2c8; // 0x2c8
39-
undefined4 m_unk0x2cc; // 0x2cc
38+
undefined m_unk0x58[0x84 - 0x58]; // 0x058
39+
CrimsonPebble0x228 m_unk0x84; // 0x084
40+
undefined m_unk0x2ac[0x2c8 - 0x2ac]; // 0x2ac
41+
undefined4 m_unk0x2c8; // 0x2c8
42+
undefined4 m_unk0x2cc; // 0x2cc
4043
};
4144

4245
ImaginaryChisel0x658();

‎LEGORacers/src/crimsonpebble0x228.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void CrimsonPebble0x228::Reset()
8282
m_unk0x200 = NULL;
8383
m_unk0x210 = 0;
8484
m_unk0x214 = NULL;
85-
m_unk0x224 = 0;
85+
m_stringTable = NULL;
8686
}
8787

8888
// STUB: LEGORACERS 0x004a0bf0
@@ -134,6 +134,12 @@ void CrimsonPebble0x228::FUN_004a12e0(GolFileParser* p_unk0x04)
134134
p_unk0x04->ReadRightCurly();
135135
}
136136

137+
// STUB: LEGORACERS 0x004a24e0
138+
void CrimsonPebble0x228::FUN_004a24e0()
139+
{
140+
STUB(0x004a24e0);
141+
}
142+
137143
// STUB: LEGORACERS 0x004a2ac0
138144
void CrimsonPebble0x228::VTable0x00(undefined4, undefined4, undefined4)
139145
{

0 commit comments

Comments
 (0)