diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-06-27 17:23:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 17:23:08 -0700 |
| commit | cd5b02450cf278cbeb2c8bb90be1ad22518938c7 (patch) | |
| tree | d69e02aa4b1e45ae2865389a4d70c28969ebe475 /src/d/d_demo.cpp | |
| parent | fb9dd3cdee440e61d96ddd2efd0216a99df14997 (diff) | |
| parent | 0b060164da0da9062813792880eb1304652022f1 (diff) | |
Merge pull request #200 from lepelog/event_data
Event data
Diffstat (limited to 'src/d/d_demo.cpp')
| -rw-r--r-- | src/d/d_demo.cpp | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 4d8d7c3ad4..4ba75c4d93 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -221,38 +221,6 @@ struct dDemo_camera_c { /* 80039FFC */ ~dDemo_camera_c(); }; -struct dDemo_c { - /* 80039678 */ void create(); - /* 80039910 */ void remove(); - /* 80039B6C */ void start(u8 const*, cXyz*, f32); - /* 80039CF8 */ void end(); - /* 80039D4C */ void branch(); - /* 80039DA4 */ void update(); - /* 80039EDC */ void setBranchType(u16); - /* 80039EEC */ void setBranchId(u16, s16); - /* 80039F04 */ void reset(); - - static u16 m_branchId[1 + 3 /* padding */]; - static u8 m_system[4]; - static u8 m_control[4]; - static u8 m_stage[4]; - static u8 m_audio[4]; - static u8 m_particle[4]; - static u8 m_message[4]; - static u8 m_factory[4]; - static u8 m_mesgControl[4]; - static u8 m_object[4]; - static u8 m_data[4]; - static u8 m_frame[4]; - static u8 m_translation[4]; - static f32 m_rotationY; - static u8 m_frameNoMsg[4]; - static u8 m_mode[4]; - static u8 m_status[4]; - static u8 m_branchType[2 + 2 /* padding */]; - static u8 m_branchData[4]; -}; - struct dDemo_ambient_c { /* 80038DF0 */ void JSGSetColor(_GXColor); /* 800394C8 */ ~dDemo_ambient_c(); @@ -977,7 +945,7 @@ static u8 dummy[20]; u8 dDemo_c::m_system[4]; /* 80450E04-80450E08 000304 0004+00 6/6 3/3 0/0 .sbss m_control__7dDemo_c */ -u8 dDemo_c::m_control[4]; +JStudio::stb::TControl* dDemo_c::m_control; /* 80450E08-80450E0C 000308 0004+00 2/2 0/0 0/0 .sbss m_stage__7dDemo_c */ u8 dDemo_c::m_stage[4]; @@ -1013,10 +981,10 @@ u8 dDemo_c::m_translation[4]; f32 dDemo_c::m_rotationY; /* 80450E34-80450E38 000334 0004+00 2/2 1/1 0/0 .sbss m_frameNoMsg__7dDemo_c */ -u8 dDemo_c::m_frameNoMsg[4]; +u32 dDemo_c::m_frameNoMsg; /* 80450E38-80450E3C 000338 0004+00 4/4 4/4 0/0 .sbss m_mode__7dDemo_c */ -u8 dDemo_c::m_mode[4]; +s32 dDemo_c::m_mode; /* 80450E3C-80450E40 00033C 0004+00 2/2 1/1 0/0 .sbss m_status__7dDemo_c */ u8 dDemo_c::m_status[4]; |