mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-21 22:41:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

most of TRK done / some misc work (#2030)

Browse Source 
* 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
2024-01-12 18:43:52 -08:00
committed by GitHub
parent f342bd7171
commit 4bd825e76c
123 changed files with 2835 additions and 6647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/event/d_event_manager.cpp
+12 -25
View File
@@ -1,33 +1,20 @@
//
// Generated By: dol2asm
// Translation Unit: d/event/d_event_manager
//
/**
* d_event_manager.cpp
* Event System Manager
*/
#include "d/event/d_event_manager.h"
#include "SSystem/SComponent/c_math.h"
#include "stdio.h"
#include "d/a/d_a_player.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#include "global.h"
#include "m_Do/m_Do_audio.h"
//
// Forward References:
//
//
// External References:
//
#include "stdio.h"
BOOL daPy_py_c::checkNowWolf() {
return dComIfGp_getLinkPlayer()->i_checkWolf();
}
//
// Declarations:
//
void dEvent_exception_c::init() {
mEventInfoIdx = -1;
mState = 0;
@@ -39,7 +26,8 @@ s32 dEvent_exception_c::setStartDemo(int mapToolID) {
dStage_MapEvent_dt_c* eventData = dEvt_control_c::searchMapEventData(mapToolID, roomNo);
if (eventData != NULL && eventData->mSwitch != 0xFF &&
dComIfGs_isSwitch(eventData->mSwitch, roomNo)) {
dComIfGs_isSwitch(eventData->mSwitch, roomNo))
{
return 0xFF;
} else if (mEventInfoIdx != mapToolID) {
mEventInfoIdx = mapToolID;
@@ -391,8 +379,7 @@ void dEvent_manager_c::Sequencer() {
int cutType = dStage_MapEvent_dt_c_getEventSCutType(mapEvent);
if (iVar5 && cutType != 1) {
bVar1 = true;
cXyz attentionPos(
dComIfGp_getPlayer(0)->mAttentionInfo.mPosition);
cXyz attentionPos(dComIfGp_getPlayer(0)->mAttentionInfo.mPosition);
cXyz camCenter = dCam_getBody()->Center();
f32 distance = cXyz((attentionPos - camCenter)).abs();
@@ -757,7 +744,8 @@ int dEvent_manager_c::getMyStaffId(char const* staffName, fopAc_ac_c* pActor, in
}
if (strcmp(staffName, "Alink") == 0 && strcmp("Link", buf) == 0 &&
tagId == staff->mTagID) {
tagId == staff->mTagID)
{
return staffNum;
}
}
@@ -932,7 +920,8 @@ int dEvent_manager_c::getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId) {
dEvDtEvent_c* event = NULL;
dEvDtBase_c eventBase;
if (getTypeCompositId(eventCompositId) == 2 && pActor != NULL &&
pActor->mEvtInfo.getArchiveName() != NULL) {
pActor->mEvtInfo.getArchiveName() != NULL)
{
char* data = (char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName);
eventBase.init(data, -1);
event = eventBase.mEventP;
@@ -1118,5 +1107,3 @@ int dEvent_manager_c::checkStartDemo() {
}
return 1;
}
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */