mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 04:31:37 -04:00
most of TRK done / some misc work (#2030)
* work on d_file_sel_warning * various cleanup * attempt to fix d_gameover * event cleanup * trk work * most of TRK done * remove asm
This commit is contained in:
TakaRikka
+12
-344
@@ -1,131 +1,16 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d/event/d_event_data
|
||||
//
|
||||
/**
|
||||
* d_event_data.cpp
|
||||
* Event Data Processor
|
||||
*/
|
||||
|
||||
#include "d/event/d_event_data.h"
|
||||
#include "d/a/d_a_player.h"
|
||||
#include "d/d_demo.h"
|
||||
#include "d/d_gameover.h"
|
||||
#include "d/msg/d_msg_object.h"
|
||||
#include "dol2asm.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "f_op/f_op_msg_mng.h"
|
||||
#include "m_Do/m_Do_graphic.h"
|
||||
#include "global.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" static void getTelopNo__FPCc();
|
||||
extern "C" static void getTelopNo__Fv();
|
||||
extern "C" static void getStartTelopNo__Fv();
|
||||
extern "C" static void dEvDt_Next_Stage__Fii();
|
||||
extern "C" void flagCheck__11dEvDtFlag_cFi();
|
||||
extern "C" void flagSet__11dEvDtFlag_cFi();
|
||||
extern "C" void flagMaxCheck__11dEvDtFlag_cFi();
|
||||
extern "C" void init__11dEvDtFlag_cFv();
|
||||
extern "C" void finishCheck__12dEvDtEvent_cFv();
|
||||
extern "C" void forceFinish__12dEvDtEvent_cFv();
|
||||
extern "C" void specialStaffProc__12dEvDtEvent_cFP12dEvDtStaff_c();
|
||||
extern "C" void specialProc_WaitStart__12dEvDtStaff_cFi();
|
||||
extern "C" void specialProc_WaitProc__12dEvDtStaff_cFi();
|
||||
extern "C" void specialProc__12dEvDtStaff_cFv();
|
||||
extern "C" void init__12dEvDtStaff_cFv();
|
||||
extern "C" void advanceCut__12dEvDtStaff_cFi();
|
||||
extern "C" void specialProcLight__12dEvDtStaff_cFv();
|
||||
extern "C" void specialProcMessage__12dEvDtStaff_cFv();
|
||||
extern "C" void specialProcSound__12dEvDtStaff_cFv();
|
||||
extern "C" void specialProcCreate__12dEvDtStaff_cFv();
|
||||
extern "C" void specialProcDirector__12dEvDtStaff_cFv();
|
||||
extern "C" void specialProcPackage__12dEvDtStaff_cFv();
|
||||
extern "C" void specialProcTimekeeper__12dEvDtStaff_cFv();
|
||||
extern "C" void specialProcEffect__12dEvDtStaff_cFv();
|
||||
extern "C" void startCheck__10dEvDtCut_cFv();
|
||||
extern "C" void init__11dEvDtBase_cFv();
|
||||
extern "C" void init__11dEvDtBase_cFPci();
|
||||
extern "C" void advanceCut__11dEvDtBase_cFP12dEvDtEvent_c();
|
||||
extern "C" void advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c();
|
||||
extern "C" extern char const* const d_event_d_event_data__stringBase0;
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor();
|
||||
extern "C" void fadeOut__13mDoGph_gInf_cFf();
|
||||
extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc();
|
||||
extern "C" void fopAcM_searchFromName4Event__FPCcs();
|
||||
extern "C" void fopMsgM_SearchByID__FUi();
|
||||
extern "C" void fopMsgM_messageSet__FUlUl();
|
||||
extern "C" void fopMsgM_messageSetDemo__FUl();
|
||||
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
|
||||
extern "C" void dStage_searchName__FPCc();
|
||||
extern "C" void dComIfGp_setNextStage__FPCcsScScfUliScsii();
|
||||
extern "C" void dComIfGs_onStageSwitch__Fii();
|
||||
extern "C" void dComIfGs_offStageSwitch__Fii();
|
||||
extern "C" void dComIfGs_isStageSwitch__Fii();
|
||||
extern "C" void onEventBit__11dSv_event_cFUs();
|
||||
extern "C" void offEventBit__11dSv_event_cFUs();
|
||||
extern "C" void isEventBit__11dSv_event_cCFUs();
|
||||
extern "C" void start__7dDemo_cFPCUcP4cXyzf();
|
||||
extern "C" void end__7dDemo_cFv();
|
||||
extern "C" void dEv_defaultSkipProc__FPvi();
|
||||
extern "C" void setSkipProc__14dEvt_control_cFPvPFPvi_ii();
|
||||
extern "C" void setSkipZev__14dEvt_control_cFPvPc();
|
||||
extern "C" void getStageEventDt__14dEvt_control_cFv();
|
||||
extern "C" void convPId__14dEvt_control_cFUi();
|
||||
extern "C" void getStbDemoData__14dEvt_control_cFPc();
|
||||
extern "C" void searchMapEventData__14dEvt_control_cFUc();
|
||||
extern "C" void setPt2__14dEvt_control_cFPv();
|
||||
extern "C" void setPtT__14dEvt_control_cFPv();
|
||||
extern "C" void setPtI__14dEvt_control_cFPv();
|
||||
extern "C" void setPtD__14dEvt_control_cFPv();
|
||||
extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci();
|
||||
extern "C" void getIsAddvance__16dEvent_manager_cFi();
|
||||
extern "C" void getMyNowCutName__16dEvent_manager_cFi();
|
||||
extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci();
|
||||
extern "C" void getMySubstanceNum__16dEvent_manager_cFiPCc();
|
||||
extern "C" void cutEnd__16dEvent_manager_cFi();
|
||||
extern "C" void wipeIn__12dDlst_list_cFf();
|
||||
extern "C" void StartShock__12dVibration_cFii4cXyz();
|
||||
extern "C" void StartQuake__12dVibration_cFii4cXyz();
|
||||
extern "C" void StartQuake__12dVibration_cFPCUcii4cXyz();
|
||||
extern "C" void StopQuake__12dVibration_cFi();
|
||||
extern "C" void StartBlure__9dCamera_cFiP10fopAc_ac_cff();
|
||||
extern "C" void dCam_getBody__Fv();
|
||||
extern "C" void d_GameOver_Create__FUc();
|
||||
extern "C" void d_GameOver_Delete__FRUi();
|
||||
extern "C" void dKy_set_nexttime__Ff();
|
||||
extern "C" void dKy_instant_timechg__Ff();
|
||||
extern "C" void dKy_instant_rainchg__Fv();
|
||||
extern "C" void demoMessageGroup__12dMsgObject_cFv();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void bgmStop__8Z2SeqMgrFUll();
|
||||
extern "C" void bgmStreamPlay__8Z2SeqMgrFv();
|
||||
extern "C" void _savegpr_19();
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _savegpr_25();
|
||||
extern "C" void _savegpr_26();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_19();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void _restgpr_25();
|
||||
extern "C" void _restgpr_26();
|
||||
extern "C" void _restgpr_28();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
|
||||
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
|
||||
extern "C" f32 mFadeRate__13mDoGph_gInf_c;
|
||||
extern "C" u8 m_control__7dDemo_c[4];
|
||||
extern "C" u8 m_frameNoMsg__7dDemo_c[4];
|
||||
extern "C" u8 m_mode__7dDemo_c[4];
|
||||
extern "C" f32 mWipeRate__12dDlst_list_c;
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
inline BOOL dEvDtFlagCheck(int flag) {
|
||||
return i_dComIfGp_getEventManager().flagCheck(flag);
|
||||
@@ -207,10 +92,12 @@ static u16 getStartTelopNo() {
|
||||
if (telopData == NULL || telopData->_8 == 0) {
|
||||
return 0xFFFF;
|
||||
} else if (telopData->_8 == 2 && telopData->_6 != 0xFFFF &&
|
||||
!i_dComIfGs_isEventBit(telopData->_6)) {
|
||||
!i_dComIfGs_isEventBit(telopData->_6))
|
||||
{
|
||||
return 0xFFFF;
|
||||
} else if (telopData->_8 == 3 && telopData->_6 != 0xFFFF &&
|
||||
!dComIfGs_isStageSwitch(telopData->_6 >> 8, telopData->_6 & 0xFF)) {
|
||||
!dComIfGs_isStageSwitch(telopData->_6 >> 8, telopData->_6 & 0xFF))
|
||||
{
|
||||
return 0xFFFF;
|
||||
} else {
|
||||
TelopDataStruct* lastTelopData = NULL;
|
||||
@@ -232,39 +119,7 @@ static u16 getStartTelopNo() {
|
||||
}
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379DD0 = "ID";
|
||||
SECTION_DEAD static char const* const stringBase_80379DD3 = "Stage";
|
||||
SECTION_DEAD static char const* const stringBase_80379DD9 = "StartCode";
|
||||
SECTION_DEAD static char const* const stringBase_80379DE3 = "RoomNo";
|
||||
SECTION_DEAD static char const* const stringBase_80379DEA = "Layer";
|
||||
SECTION_DEAD static char const* const stringBase_80379DF0 = "Wipe";
|
||||
SECTION_DEAD static char const* const stringBase_80379DF5 = "Mode";
|
||||
SECTION_DEAD static char const* const stringBase_80379DFA = "Speed";
|
||||
SECTION_DEAD static char const* const stringBase_80379E00 = "Hour";
|
||||
SECTION_DEAD static char const* const stringBase_80379E05 = "NoVisit";
|
||||
#pragma pop
|
||||
|
||||
/* 80451ED0-80451ED4 0004D0 0004+00 4/4 0/0 0/0 .sdata2 @4264 */
|
||||
SECTION_SDATA2 static u8 lit_4264[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
|
||||
/* 80451ED4-80451ED8 0004D4 0004+00 2/2 0/0 0/0 .sdata2 @4265 */
|
||||
SECTION_SDATA2 static f32 lit_4265 = 15.0f;
|
||||
|
||||
/* 80451ED8-80451EE0 0004D8 0008+00 1/1 0/0 0/0 .sdata2 @4267 */
|
||||
SECTION_SDATA2 static f64 lit_4267 = 4503601774854144.0 /* cast s32 to float */;
|
||||
|
||||
/* 80043A14-80043D60 03E354 034C+00 1/1 0/0 0/0 .text dEvDt_Next_Stage__Fii */
|
||||
#ifdef NONMATCHING
|
||||
// matches besides floats
|
||||
static int dEvDt_Next_Stage(int index, int wipe_type) {
|
||||
char* stage;
|
||||
s16 point;
|
||||
@@ -372,16 +227,6 @@ static int dEvDt_Next_Stage(int index, int wipe_type) {
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm int dEvDt_Next_Stage(int param_0, int param_1) {
|
||||
nofralloc
|
||||
#include "asm/d/event/d_event_data/dEvDt_Next_Stage__Fii.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80043D60-80043DC8 03E6A0 0068+00 3/3 0/0 0/0 .text flagCheck__11dEvDtFlag_cFi */
|
||||
BOOL dEvDtFlag_c::flagCheck(int flag) {
|
||||
@@ -446,7 +291,7 @@ int dEvDtEvent_c::forceFinish() {
|
||||
if (flag == -1) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
i_dComIfGp_getEventManager().setFlag(flag);
|
||||
}
|
||||
return 1;
|
||||
@@ -532,28 +377,8 @@ void dEvDtStaff_c::advanceCut(int cut) {
|
||||
field_0x3c = -1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379E13 = "LIGHT";
|
||||
SECTION_DEAD static char const* const stringBase_80379E19 = "Weather";
|
||||
#pragma pop
|
||||
|
||||
/* 80451EE0-80451EE8 0004E0 0004+04 1/1 0/0 0/0 .sdata2 @4460 */
|
||||
SECTION_SDATA2 static f32 lit_4460[1 + 1 /* padding */] = {
|
||||
1.0f / 15.0f,
|
||||
/* padding */
|
||||
0.0f,
|
||||
};
|
||||
|
||||
/* 80451EE8-80451EF0 0004E8 0008+00 1/1 0/0 0/0 .sdata2 @4461 */
|
||||
SECTION_SDATA2 static f64 lit_4461 = 24.0;
|
||||
|
||||
/* 80044190-80044324 03EAD0 0194+00 1/1 0/0 0/0 .text specialProcLight__12dEvDtStaff_cFv
|
||||
*/
|
||||
#ifdef NONMATCHING
|
||||
// matches besides floats
|
||||
void dEvDtStaff_c::specialProcLight() {
|
||||
int staffId = i_dComIfGp_evmng_getMyStaffId("LIGHT", NULL, 0);
|
||||
if (staffId != -1) {
|
||||
@@ -593,16 +418,6 @@ void dEvDtStaff_c::specialProcLight() {
|
||||
dComIfGp_evmng_cutEnd(staffId);
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dEvDtStaff_c::specialProcLight() {
|
||||
nofralloc
|
||||
#include "asm/d/event/d_event_data/specialProcLight__12dEvDtStaff_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80044324-80044A58 03EC64 0734+00 1/1 0/0 0/0 .text specialProcMessage__12dEvDtStaff_cFv */
|
||||
void dEvDtStaff_c::specialProcMessage() {
|
||||
@@ -786,23 +601,8 @@ void dEvDtStaff_c::specialProcMessage() {
|
||||
}
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379E40 = "SOUND";
|
||||
#pragma pop
|
||||
|
||||
/* 80451EF0-80451EF4 0004F0 0004+00 4/4 0/0 0/0 .sdata2 @4668 */
|
||||
SECTION_SDATA2 static f32 lit_4668 = 1.0f;
|
||||
|
||||
/* 80451EF4-80451EF8 0004F4 0004+00 2/2 0/0 0/0 .sdata2 @4669 */
|
||||
SECTION_SDATA2 static f32 lit_4669 = -1.0f;
|
||||
|
||||
/* 80044A58-80044CB8 03F398 0260+00 1/1 0/0 0/0 .text specialProcSound__12dEvDtStaff_cFv
|
||||
*/
|
||||
#ifdef NONMATCHING
|
||||
// matches besides floats
|
||||
void dEvDtStaff_c::specialProcSound() {
|
||||
SoundData* data = (SoundData*)&mData;
|
||||
|
||||
@@ -852,33 +652,9 @@ void dEvDtStaff_c::specialProcSound() {
|
||||
dComIfGp_evmng_cutEnd(staffId);
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dEvDtStaff_c::specialProcSound() {
|
||||
nofralloc
|
||||
#include "asm/d/event/d_event_data/specialProcSound__12dEvDtStaff_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379E46 = "CREATER";
|
||||
SECTION_DEAD static char const* const stringBase_80379E4E = "MAKECAST";
|
||||
SECTION_DEAD static char const* const stringBase_80379E57 = "ARG";
|
||||
SECTION_DEAD static char const* const stringBase_80379E5B = "POS";
|
||||
SECTION_DEAD static char const* const stringBase_80379E5F = "ANGLE";
|
||||
SECTION_DEAD static char const* const stringBase_80379E65 = "SCALE";
|
||||
#pragma pop
|
||||
|
||||
/* 80044CB8-80044EE4 03F5F8 022C+00 1/1 0/0 0/0 .text specialProcCreate__12dEvDtStaff_cFv
|
||||
*/
|
||||
// matches with literals
|
||||
#ifdef NONMATCHING
|
||||
void dEvDtStaff_c::specialProcCreate() {
|
||||
char* name;
|
||||
u32 arg;
|
||||
@@ -935,44 +711,8 @@ void dEvDtStaff_c::specialProcCreate() {
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dEvDtStaff_c::specialProcCreate() {
|
||||
nofralloc
|
||||
#include "asm/d/event/d_event_data/specialProcCreate__12dEvDtStaff_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379E6B = "DIRECTOR";
|
||||
SECTION_DEAD static char const* const stringBase_80379E74 = "EventFlag";
|
||||
SECTION_DEAD static char const* const stringBase_80379E7E = "EventFlagOff";
|
||||
SECTION_DEAD static char const* const stringBase_80379E8B = "SwitchTable";
|
||||
SECTION_DEAD static char const* const stringBase_80379E97 = "SwitchBit";
|
||||
SECTION_DEAD static char const* const stringBase_80379EA1 = "SwitchOff";
|
||||
SECTION_DEAD static char const* const stringBase_80379EAB = "TmpBit";
|
||||
SECTION_DEAD static char const* const stringBase_80379EB2 = "TmpBitOff";
|
||||
SECTION_DEAD static char const* const stringBase_80379EBC = "PLAYER_NODRAW";
|
||||
SECTION_DEAD static char const* const stringBase_80379ECA = "PLAYER_DRAW";
|
||||
SECTION_DEAD static char const* const stringBase_80379ED6 = "Zev";
|
||||
SECTION_DEAD static char const* const stringBase_80379EDA = "Rate";
|
||||
SECTION_DEAD static char const* const stringBase_80379EDF = "Color";
|
||||
SECTION_DEAD static char const* const stringBase_80379EE5 = "Pattern";
|
||||
SECTION_DEAD static char const* const stringBase_80379EED = "Pt2";
|
||||
SECTION_DEAD static char const* const stringBase_80379EF1 = "PtT";
|
||||
SECTION_DEAD static char const* const stringBase_80379EF5 = "PtI";
|
||||
SECTION_DEAD static char const* const stringBase_80379EF9 = "PtD";
|
||||
#pragma pop
|
||||
|
||||
/* 80044EE4-80045878 03F824 0994+00 1/1 0/0 0/0 .text specialProcDirector__12dEvDtStaff_cFv */
|
||||
#ifdef NONMATCHING
|
||||
// matches besides floats
|
||||
void dEvDtStaff_c::specialProcDirector() {
|
||||
DirectorData* data = (DirectorData*)mData;
|
||||
daPy_py_c* player = dComIfGp_getLinkPlayer();
|
||||
@@ -1208,33 +948,8 @@ void dEvDtStaff_c::specialProcDirector() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dEvDtStaff_c::specialProcDirector() {
|
||||
nofralloc
|
||||
#include "asm/d/event/d_event_data/specialProcDirector__12dEvDtStaff_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379EFD = "PACKAGE";
|
||||
SECTION_DEAD static char const* const stringBase_80379F05 = "FileName";
|
||||
SECTION_DEAD static char const* const stringBase_80379F0E = "OffsetPos";
|
||||
SECTION_DEAD static char const* const stringBase_80379F18 = "OffsetAngY";
|
||||
#pragma pop
|
||||
|
||||
/* 80451EF8-80451EFC 0004F8 0004+00 1/1 0/0 0/0 .sdata2 @5057 */
|
||||
SECTION_SDATA2 static f32 lit_5057 = 10.0f;
|
||||
|
||||
/* 80045878-80045AFC 0401B8 0284+00 1/1 0/0 0/0 .text specialProcPackage__12dEvDtStaff_cFv */
|
||||
// Matches without literals
|
||||
#ifdef NONMATCHING
|
||||
void dEvDtStaff_c::specialProcPackage() {
|
||||
dMsgObject_c* msgObj = dComIfGp_getMsgObjectClass();
|
||||
if (!!msgObj) {
|
||||
@@ -1301,23 +1016,6 @@ void dEvDtStaff_c::specialProcPackage() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dEvDtStaff_c::specialProcPackage() {
|
||||
nofralloc
|
||||
#include "asm/d/event/d_event_data/specialProcPackage__12dEvDtStaff_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379F23 = "TIMEKEEPER";
|
||||
#pragma pop
|
||||
|
||||
/* 80045AFC-80045C34 04043C 0138+00 1/1 0/0 0/0 .text specialProcTimekeeper__12dEvDtStaff_cFv */
|
||||
void dEvDtStaff_c::specialProcTimekeeper() {
|
||||
@@ -1352,26 +1050,8 @@ void dEvDtStaff_c::specialProcTimekeeper() {
|
||||
}
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80379F2E = "EFFECT";
|
||||
SECTION_DEAD static char const* const stringBase_80379F35 = "Power";
|
||||
SECTION_DEAD static char const* const stringBase_80379F3B = "Random";
|
||||
SECTION_DEAD static char const* const stringBase_80379F42 = "Alpha";
|
||||
SECTION_DEAD static char const* const stringBase_80379F48 = "Scale";
|
||||
/* @stringBase0 padding */
|
||||
SECTION_DEAD static char const* const pad_80379F4E = "\0";
|
||||
#pragma pop
|
||||
|
||||
/* 80451EFC-80451F00 0004FC 0004+00 1/1 0/0 0/0 .sdata2 @5200 */
|
||||
SECTION_SDATA2 static f32 lit_5200 = 4.0f / 5.0f;
|
||||
|
||||
/* 80045C34-800460A8 040574 0474+00 1/1 0/0 0/0 .text specialProcEffect__12dEvDtStaff_cFv
|
||||
*/
|
||||
#ifdef NONMATCHING
|
||||
// matches besides floats
|
||||
void dEvDtStaff_c::specialProcEffect() {
|
||||
EffectData* data = (EffectData*)mData;
|
||||
int staffId = i_dComIfGp_evmng_getMyStaffId("EFFECT", NULL, 0);
|
||||
@@ -1476,7 +1156,7 @@ void dEvDtStaff_c::specialProcEffect() {
|
||||
if (scaleP != NULL) {
|
||||
scale = *scaleP;
|
||||
} else {
|
||||
scale = 0.8f;
|
||||
scale = 1.0f;
|
||||
}
|
||||
dCam_getBody()->StartBlure(timer2, NULL, alpha, scale);
|
||||
} break;
|
||||
@@ -1507,16 +1187,6 @@ void dEvDtStaff_c::specialProcEffect() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dEvDtStaff_c::specialProcEffect() {
|
||||
nofralloc
|
||||
#include "asm/d/event/d_event_data/specialProcEffect__12dEvDtStaff_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 800460A8-80046138 0409E8 0090+00 1/1 0/0 0/0 .text startCheck__10dEvDtCut_cFv */
|
||||
int dEvDtCut_c::startCheck() {
|
||||
@@ -1617,5 +1287,3 @@ BOOL dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* p_staff) {
|
||||
p_staff->field_0x40 = false;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user