diff options
| author | lepelog <25211966+lepelog@users.noreply.github.com> | 2022-06-26 23:25:59 +0200 |
|---|---|---|
| committer | lepelog <25211966+lepelog@users.noreply.github.com> | 2022-06-26 23:25:59 +0200 |
| commit | afd940edbc28987bfc45b47a1c7a2f637099bf07 (patch) | |
| tree | 8882d1dfc8160c236e1eb3ce53e07fa86aa2c052 /src/d | |
| parent | f215e2d649064fdc73bf1e80f5de2999414ef335 (diff) | |
fixes, remove asm
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/d_demo.cpp | 4 | ||||
| -rw-r--r-- | src/d/event/d_event.cpp | 2 | ||||
| -rw-r--r-- | src/d/event/d_event_manager.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index bc2072fe75..4ba75c4d93 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -945,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]; @@ -984,7 +984,7 @@ f32 dDemo_c::m_rotationY; 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]; diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 025b6f7473..942fb09b8e 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -686,7 +686,7 @@ asm void* dEvt_control_c::convPId(unsigned int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::getStbDemoData(char* param_0) { +asm void* dEvt_control_c::getStbDemoData(char* param_0) { nofralloc #include "asm/d/event/d_event/getStbDemoData__14dEvt_control_cFPc.s" } diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index d3da00c8f6..38c9a59eda 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -797,7 +797,7 @@ int dEvent_manager_c::endCheckOld(char const* pName) { /* 80047B1C-80047D4C 04245C 0230+00 1/1 10/10 210/210 .text * getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci */ -s32 dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, int tagId) { +int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, int tagId) { int staffNum; int i; int evtIdx = -1; |