fixes, remove asm

This commit is contained in:
lepelog
2022-06-26 23:25:59 +02:00
parent f215e2d649
commit afd940edbc
18 changed files with 4 additions and 1165 deletions
+2 -2
View File
@@ -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];
+1 -1
View File
@@ -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"
}
+1 -1
View File
@@ -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;