Skip to content

Commit c271fa8

Browse files
foxtaclesfoxtacles
authored
Merge branch 'master' into implement-BronzeFalcon0xc8770-FUN_1000a2c0
2 parents 1261a79 + d006ec8 commit c271fa8

25 files changed

Lines changed: 192 additions & 124 deletions

‎GolDP/include/bronzefalcon0xc8770.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ class BronzeFalcon0xc8770 : public WhiteFalcon0x140 {
6868
undefined4 VTable0x7c(
6969
UtopianPan0xa4* p_image,
7070
undefined4 p_unk0x08,
71-
SilverDune0x30::Rect* p_destRect,
72-
SilverDune0x30::Rect* p_sourceRect,
71+
Rect* p_destRect,
72+
Rect* p_sourceRect,
7373
undefined4 p_unk0x14
7474
) override; // vtable+0x7c
7575
void DrawRectangle(
76-
const IntRectangle0x10& p_rect,
76+
const Rect& p_rect,
7777
LegoFloat p_z,
7878
const ColorRGBA& p_color1,
7979
const ColorRGBA& p_color2,

‎GolDP/include/rectangle.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#ifndef RECTANGLE_H
22
#define RECTANGLE_H
33

4+
#include "types.h"
5+
46
// SIZE 0x10
5-
struct IntRectangle0x10 {
7+
struct Rect {
68
LegoS32 m_left; // 0x00
79
LegoS32 m_top; // 0x04
810
LegoS32 m_right; // 0x08

‎GolDP/include/silverdune0x30.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "decomp.h"
55
#include "falcontextureformat.h"
6+
#include "rectangle.h"
67
#include "types.h"
78

89
class PearlDew0x0c;
@@ -13,13 +14,6 @@ class BronzeFalcon0xc8770;
1314
// SIZE 0x30
1415
class SilverDune0x30 {
1516
public:
16-
struct Rect {
17-
LegoS32 m_left; // 0x00
18-
LegoS32 m_top; // 0x04
19-
LegoS32 m_right; // 0x08
20-
LegoS32 m_bottom; // 0x0c
21-
};
22-
2317
enum {
2418
c_lockRequestRead = 0x01,
2519
c_lockRequestWrite = 0x02,

‎GolDP/include/whitefalcon0x140.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class GolFont0xa0;
1717
class GolCommonDrawState;
1818
class GolNameTable;
1919
class HypnoticNoise0x1c;
20-
struct IntRectangle0x10;
20+
struct Rect;
2121
class MagentaRibbon0x20;
2222
class SlatePeak0x58;
2323
class UtopianPan0xa4;
@@ -94,12 +94,12 @@ class WhiteFalcon0x140 {
9494
virtual undefined4 VTable0x7c(
9595
UtopianPan0xa4* p_image,
9696
undefined4 p_unk0x08,
97-
SilverDune0x30::Rect* p_destRect,
98-
SilverDune0x30::Rect* p_sourceRect,
97+
Rect* p_destRect,
98+
Rect* p_sourceRect,
9999
undefined4 p_unk0x14
100100
) = 0; // vtable+0x7c
101101
virtual void DrawRectangle(
102-
const IntRectangle0x10& p_rect,
102+
const Rect& p_rect,
103103
LegoFloat p_z,
104104
const ColorRGBA& p_color1,
105105
const ColorRGBA& p_color2,

‎GolDP/src/bronzefalcon0xc8770.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DECOMP_SIZE_ASSERT(BronzeFalcon0xc8770, 0xc8770)
1313
DECOMP_SIZE_ASSERT(BronzeFalcon0xc8770::TextureFormat, 0x18)
1414
DECOMP_SIZE_ASSERT(BronzeFalcon0xc8770::Field0xc83b4, 0x10)
1515
DECOMP_SIZE_ASSERT(ColorRGBA, 0x4)
16-
DECOMP_SIZE_ASSERT(IntRectangle0x10, 0x10)
16+
DECOMP_SIZE_ASSERT(Rect, 0x10)
1717

1818
// GLOBAL: GOLDP 0x10056540
1919
const D3DCMPFUNC g_d3dCmpFuncLookup[] = {
@@ -516,13 +516,7 @@ const SlatePeak0x58* BronzeFalcon0xc8770::GetRenderTargetInfo()
516516
}
517517

518518
// STUB: GOLDP 0x10009960
519-
undefined4 BronzeFalcon0xc8770::VTable0x7c(
520-
UtopianPan0xa4*,
521-
undefined4,
522-
SilverDune0x30::Rect*,
523-
SilverDune0x30::Rect*,
524-
undefined4
525-
)
519+
undefined4 BronzeFalcon0xc8770::VTable0x7c(UtopianPan0xa4*, undefined4, Rect*, Rect*, undefined4)
526520
{
527521
STUB(0x10009960);
528522
return 0;
@@ -572,7 +566,7 @@ void BronzeFalcon0xc8770::VTable0x6c()
572566

573567
// FUNCTION: GOLDP 0x10009bd0
574568
void BronzeFalcon0xc8770::DrawRectangle(
575-
const IntRectangle0x10& p_rect,
569+
const Rect& p_rect,
576570
LegoFloat p_z,
577571
const ColorRGBA& p_color1,
578572
const ColorRGBA& p_color2,

‎LEGORacers/include/coppercrest0x40.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class CopperCrest0x40 {
5353
GolExport* m_golExport; // 0x04
5454
BronzeFalcon0xc8770* m_renderer; // 0x08
5555
UtopianPan0xa4* m_rendererObject; // 0x0c
56-
SilverDune0x30::Rect* m_bounds; // 0x10
56+
Rect* m_bounds; // 0x10
5757
undefined4 m_unk0x14; // 0x14
5858
undefined4 m_unk0x18; // 0x18
5959
undefined4 m_unk0x1c; // 0x1c
@@ -69,19 +69,19 @@ class CopperCrest0x40 {
6969
LegoS32 FUN_00467d80(undefined4 p_elapsedMs);
7070
LegoS32 FUN_00467e00();
7171

72-
InputManager* m_inputManager; // 0x00
73-
GolExport* m_golExport; // 0x04
74-
BronzeFalcon0xc8770* m_renderer; // 0x08
75-
UtopianPan0xa4* m_rendererObject; // 0x0c
76-
SilverDune0x30::Rect m_bounds; // 0x10
77-
SilverDune0x30::Rect m_sourceRect; // 0x20
78-
LegoS32 m_unk0x30; // 0x30
79-
LegoS32 m_unk0x34; // 0x34
80-
LegoS32 m_unk0x38; // 0x38
81-
LegoS32 m_unk0x3c; // 0x3c
82-
LegoU8 m_unk0x40; // 0x40
83-
LegoU8 m_unk0x41; // 0x41
84-
undefined m_unk0x42[0x44 - 0x42]; // 0x42
72+
InputManager* m_inputManager; // 0x00
73+
GolExport* m_golExport; // 0x04
74+
BronzeFalcon0xc8770* m_renderer; // 0x08
75+
UtopianPan0xa4* m_rendererObject; // 0x0c
76+
Rect m_bounds; // 0x10
77+
Rect m_sourceRect; // 0x20
78+
LegoS32 m_unk0x30; // 0x30
79+
LegoS32 m_unk0x34; // 0x34
80+
LegoS32 m_unk0x38; // 0x38
81+
LegoS32 m_unk0x3c; // 0x3c
82+
LegoU8 m_unk0x40; // 0x40
83+
LegoU8 m_unk0x41; // 0x41
84+
undefined m_unk0x42[0x44 - 0x42]; // 0x42
8585
};
8686

8787
CopperCrest0x40();

‎LEGORacers/include/imaginarychisel0x658.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ImaginaryChisel0x658 : public ImaginaryTool0x368 {
2929
undefined4 VTable0x2c(void*, undefined4, undefined4) override; // vtable+0x2c
3030
undefined4 VTable0x30(OnyxCircularBuffer0x1c::Item*, undefined4, undefined4) override; // vtable+0x30
3131
undefined4 VTable0x34(OnyxCircularBuffer0x1c::Item*, undefined4, undefined4) override; // vtable+0x34
32-
undefined4 VTable0x38(undefined4, undefined4) override; // vtable+0x38
32+
undefined4 VTable0x38(Rect*, Rect*) override; // vtable+0x38
3333
undefined4 VTable0x3c(undefined4) override; // vtable+0x3c
3434

3535
// SYNTHETIC: LEGORACERS 0x00466a80

‎LEGORacers/include/imaginarynotion0x290.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,31 +54,31 @@ class ImaginaryNotion0x290 : public ImaginaryInterface {
5454
OnyxCircularBuffer0x1c::Item*,
5555
undefined4,
5656
undefined4
57-
) override; // vtable+0x1c
58-
void VTable0x20(undefined4) override; // vtable+0x20
59-
void VTable0x24(undefined4) override; // vtable+0x24
60-
undefined4 VTable0x28(ObscureIcon0x1a8*, void*, undefined4, undefined4) override; // vtable+0x28
61-
void VTable0x2c(undefined4) override; // vtable+0x2c
62-
void VTable0x30(undefined4) override; // vtable+0x30
63-
void VTable0x34(undefined4) override; // vtable+0x34
64-
void VTable0x38(undefined4) override; // vtable+0x38
65-
void VTable0x3c(undefined4) override; // vtable+0x3c
66-
void VTable0x40(undefined4) override; // vtable+0x40
67-
void VTable0x44(undefined4) override; // vtable+0x44
68-
void VTable0x48(undefined4) override; // vtable+0x48
69-
virtual void VTable0x4c() = 0; // vtable+0x4c
70-
virtual undefined4 VTable0x50(); // vtable+0x50
71-
virtual void VTable0x54(); // vtable+0x54
72-
virtual LegoBool32 VTable0x58(MenuToolCreateParams0x30*); // vtable+0x58
73-
virtual CeruleanEmperor0x4c* VTable0x5c(); // vtable+0x5c
74-
virtual void VTable0x60(); // vtable+0x60
75-
virtual CeruleanQueen0x58* VTable0x64(); // vtable+0x64
76-
virtual ~ImaginaryNotion0x290(); // vtable+0x68
77-
virtual void VTable0x6c(); // vtable+0x6c
78-
virtual LegoBool32 VTable0x70(MenuToolCreateParams0x30*); // vtable+0x70
79-
virtual void VTable0x74(); // vtable+0x74
80-
virtual LegoBool32 VTable0x78(undefined4); // vtable+0x78
81-
virtual LegoBool32 VTable0x7c(SilverDune0x30::Rect* p_arg1, SilverDune0x30::Rect* p_arg2); // vtable+0x7c
57+
) override; // vtable+0x1c
58+
void VTable0x20(undefined4) override; // vtable+0x20
59+
void VTable0x24(undefined4) override; // vtable+0x24
60+
undefined4 VTable0x28(ObscureIcon0x1a8*, void*, undefined4, undefined4) override; // vtable+0x28
61+
void VTable0x2c(undefined4) override; // vtable+0x2c
62+
void VTable0x30(undefined4) override; // vtable+0x30
63+
void VTable0x34(undefined4) override; // vtable+0x34
64+
void VTable0x38(undefined4) override; // vtable+0x38
65+
void VTable0x3c(undefined4) override; // vtable+0x3c
66+
void VTable0x40(undefined4) override; // vtable+0x40
67+
void VTable0x44(undefined4) override; // vtable+0x44
68+
void VTable0x48(undefined4) override; // vtable+0x48
69+
virtual void VTable0x4c() = 0; // vtable+0x4c
70+
virtual undefined4 VTable0x50(); // vtable+0x50
71+
virtual void VTable0x54(); // vtable+0x54
72+
virtual LegoBool32 VTable0x58(MenuToolCreateParams0x30*); // vtable+0x58
73+
virtual CeruleanEmperor0x4c* VTable0x5c(); // vtable+0x5c
74+
virtual void VTable0x60(); // vtable+0x60
75+
virtual CeruleanQueen0x58* VTable0x64(); // vtable+0x64
76+
virtual ~ImaginaryNotion0x290(); // vtable+0x68
77+
virtual void VTable0x6c(); // vtable+0x6c
78+
virtual LegoBool32 VTable0x70(MenuToolCreateParams0x30*); // vtable+0x70
79+
virtual void VTable0x74(); // vtable+0x74
80+
virtual LegoBool32 VTable0x78(undefined4); // vtable+0x78
81+
virtual LegoBool32 VTable0x7c(Rect* p_arg1, Rect* p_arg2); // vtable+0x7c
8282

8383
LegoBool32 FUN_0046b630();
8484
LegoBool32 FUN_0046b6e0(MenuToolCreateParams0x30*);

‎LEGORacers/include/imaginaryshape0x2b20.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ class ImaginaryShape0x2b20 : public ImaginaryTool0x368 {
2424
OnyxCircularBuffer0x1c::Item*,
2525
undefined4,
2626
undefined4
27-
) override; // vtable+0x1c
28-
void VTable0x38(undefined4) override; // vtable+0x38
29-
void VTable0x44(undefined4) override; // vtable+0x44
30-
void VTable0x4c() override; // vtable+0x4c
31-
void VTable0x54() override; // vtable+0x54
32-
~ImaginaryShape0x2b20() override; // vtable+0x68
33-
LegoBool32 VTable0x78(undefined4) override; // vtable+0x78
34-
LegoBool32 VTable0x7c(SilverDune0x30::Rect* p_arg1, SilverDune0x30::Rect* p_arg2) override; // vtable+0x7c
35-
void VTable0x80() override; // vtable+0x80
36-
void VTable0x84() override; // vtable+0x84
27+
) override; // vtable+0x1c
28+
void VTable0x38(undefined4) override; // vtable+0x38
29+
void VTable0x44(undefined4) override; // vtable+0x44
30+
void VTable0x4c() override; // vtable+0x4c
31+
void VTable0x54() override; // vtable+0x54
32+
~ImaginaryShape0x2b20() override; // vtable+0x68
33+
LegoBool32 VTable0x78(undefined4) override; // vtable+0x78
34+
LegoBool32 VTable0x7c(Rect* p_arg1, Rect* p_arg2) override; // vtable+0x7c
35+
void VTable0x80() override; // vtable+0x80
36+
void VTable0x84() override; // vtable+0x84
3737
LegoBool32 VTable0x8c(MenuToolContext0x4bc8*,
3838
MenuToolCreateParams0x30*) override; // vtable+0x8c
3939

‎LEGORacers/include/obscureanchor0x5c.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ class ObscureAnchor0x5c : public ObscureAnthem0x58 {
1111
public:
1212
ObscureAnchor0x5c();
1313

14-
void VTable0x00() override; // vtable+0x00
15-
~ObscureAnchor0x5c() override; // vtable+0x04
16-
undefined4 VTable0x38(undefined4, undefined4) override; // vtable+0x38
14+
void VTable0x00() override; // vtable+0x00
15+
~ObscureAnchor0x5c() override; // vtable+0x04
16+
undefined4 VTable0x38(Rect*, Rect*) override; // vtable+0x38
1717

1818
// SYNTHETIC: LEGORACERS 0x0046f0d0
1919
// ObscureAnchor0x5c::`scalar deleting destructor'

0 commit comments

Comments
 (0)