From a3170e5d69e1a62bd2103634ba97f681ac47ed77 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 8 Dec 2023 16:25:12 -0500 Subject: [PATCH] add default params to a lot more functions --- include/d/actor/d_a_obj_buoyflag.h | 6 +--- include/d/d_bg_s_acch.h | 4 +-- include/d/d_com_inf_game.h | 11 +++--- include/d/d_event_data.h | 2 +- include/f_op/f_op_actor_mng.h | 47 ++++++++++++------------- include/f_op/f_op_kankyo_mng.h | 5 +-- include/m_Do/m_Do_audio.h | 2 +- src/c/c_damagereaction.cpp | 2 +- src/d/actor/d_a_agb.cpp | 9 +++-- src/d/actor/d_a_agbsw0.cpp | 8 ++--- src/d/actor/d_a_am.cpp | 5 ++- src/d/actor/d_a_am2.cpp | 5 ++- src/d/actor/d_a_andsw0.cpp | 2 +- src/d/actor/d_a_andsw2.cpp | 2 +- src/d/actor/d_a_arrow.cpp | 8 ++--- src/d/actor/d_a_bomb.cpp | 4 +-- src/d/actor/d_a_bomb2.cpp | 2 +- src/d/actor/d_a_disappear.cpp | 7 ++-- src/d/actor/d_a_fan.cpp | 2 +- src/d/actor/d_a_ghostship.cpp | 6 ++-- src/d/actor/d_a_ib.cpp | 2 +- src/d/actor/d_a_item.cpp | 55 +++++++++++++++--------------- src/d/actor/d_a_kytag05.cpp | 2 +- src/d/actor/d_a_mbdoor.cpp | 8 ++--- src/d/actor/d_a_npc_kamome.cpp | 8 ++--- src/d/actor/d_a_npc_md.cpp | 2 +- src/d/actor/d_a_obj_Ygush00.cpp | 4 +-- src/d/actor/d_a_obj_barrier.cpp | 2 +- src/d/actor/d_a_obj_hole.cpp | 8 ++--- src/d/actor/d_a_obj_mknjd.cpp | 4 +-- src/d/actor/d_a_obj_movebox.cpp | 8 ++--- src/d/actor/d_a_obj_pbka.cpp | 10 +++--- src/d/actor/d_a_obj_toripost.cpp | 10 +++--- src/d/actor/d_a_player_food.inc | 6 ++-- src/d/actor/d_a_player_main.cpp | 18 +++++----- src/d/actor/d_a_player_npc.cpp | 2 +- src/d/actor/d_a_race_item.cpp | 2 +- src/d/actor/d_a_rd.cpp | 6 ++-- src/d/actor/d_a_swhit0.cpp | 8 ++--- src/d/actor/d_a_switem.cpp | 2 +- src/d/actor/d_a_tag_ghostship.cpp | 12 +++---- src/d/actor/d_a_tbox.cpp | 14 ++++---- src/d/d_a_race_item_static.cpp | 36 +++++++++---------- src/d/d_com_inf_game.cpp | 6 ++-- src/d/d_com_static.cpp | 2 +- src/d/d_event_data.cpp | 22 ++++++------ src/d/d_kankyo.cpp | 2 +- src/d/d_kankyo_rain.cpp | 4 +-- src/d/d_kankyo_wether.cpp | 4 +-- src/d/d_ky_thunder.cpp | 4 +-- src/d/d_level_se.cpp | 4 +-- src/d/d_lib.cpp | 2 +- src/d/d_npc_event_cut.inc | 2 +- src/d/d_s_logo.cpp | 8 ++--- src/d/d_s_room.cpp | 2 +- src/d/d_s_title.cpp | 2 +- src/d/d_shop.cpp | 8 ++--- src/d/d_stage.cpp | 35 +++++++++---------- src/f_op/f_op_actor_mng.cpp | 14 ++++---- 59 files changed, 241 insertions(+), 248 deletions(-) diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index 68be49bcf..0b8581934 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -18,11 +18,7 @@ namespace daObjBuoyflag { public: static s32 make_norm(unsigned int parentPId, cXyz* pos, int roomNo, csXyz* angle) { u32 params = prm_make(static_cast(0), static_cast(0), false); // TODO: placeholder - return fopAcM_createChild( - PROC_Obj_Buoyflag, parentPId, - params, pos, - roomNo, angle, NULL, -1, NULL - ); + return fopAcM_createChild(PROC_Obj_Buoyflag, parentPId, params, pos, roomNo, angle); } static u32 prm_make(Type_e, Texture_e, bool) { // TODO: placeholder function diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 944a0fa45..b683f52e1 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -83,8 +83,8 @@ public: dBgS_Acch(); void Init(); void Set(fopAc_ac_c*, int, dBgS_AcchCir*); - void Set(cXyz* pos, cXyz* old_pos, fopAc_ac_c* actor, int tbl_size, dBgS_AcchCir* acchCir, cXyz* speed, - csXyz* angle, csXyz* shape_angle); + void Set(cXyz* pos, cXyz* old_pos, fopAc_ac_c* actor, int tbl_size, dBgS_AcchCir* acchCir, + cXyz* speed = NULL, csXyz* angle = NULL, csXyz* shape_angle = NULL); void GroundCheckInit(dBgS&); void GroundCheck(dBgS&); f32 GroundRoofProc(dBgS&); diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 9d1d5b234..bf2337bf4 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -1545,8 +1545,9 @@ BOOL dComIfGs_checkSeaLandingEvent(s8 i_roomNo); * === PLAY === */ -void dComIfGp_setNextStage(const char* i_stageName, s16 i_point, s8 i_roomNo, s8 i_layer, - f32 i_lastSpeed, u32 i_lastMode, int, s8 i_wipe); +void dComIfGp_setNextStage(const char* i_stageName, s16 i_point, s8 i_roomNo, s8 i_layer = -1, + f32 i_lastSpeed = 0.0f, u32 i_lastMode = 0, BOOL i_setPoint = TRUE, + s8 i_wipe = 0); dStage_Ship_data* dComIfGp_getShip(int i_roomNo, int param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); @@ -2217,7 +2218,7 @@ inline s32 dComIfGp_event_moveApproval(void* actor) { return g_dComIfG_gameInfo.play.getEvent().moveApproval(actor); } -inline BOOL dComIfGp_event_compulsory(void* param_1, const char* param_2, u16 param_3) { +inline BOOL dComIfGp_event_compulsory(void* param_1, const char* param_2 = NULL, u16 param_3 = -1) { return g_dComIfG_gameInfo.play.getEvent().compulsory(param_1, param_2, param_3); } @@ -2276,8 +2277,8 @@ inline s16 dComIfGp_evmng_getEventIdx(const char* pName, u8 evNo) { return g_dComIfG_gameInfo.play.getEvtManager().getEventIdx(pName, evNo); } -inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_3) { - return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_3); +inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor = NULL, int staffType = 0) { + return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, staffType); } inline int dComIfGp_evmng_getMyActIdx(int staffIdx, char** pActions, int actionCount, int force, int param_5) { diff --git a/include/d/d_event_data.h b/include/d/d_event_data.h index 8ed2d51d4..d631f281e 100644 --- a/include/d/d_event_data.h +++ b/include/d/d_event_data.h @@ -91,7 +91,7 @@ public: /* 0x46 */ u8 mAdvance; /* 0x47 */ u8 mbNeedsAction; /* 0x48 */ u8 field_48[0x50 - 0x48]; -}; +}; // Size: 0x50 class dEvDtEvent_c { public: diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index ea2560b28..f937a48b3 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -359,27 +359,27 @@ void fopAcM_Log(fopAc_ac_c* p_actor, char* str); s32 fopAcM_delete(fopAc_ac_c* p_actor); s32 fopAcM_delete(unsigned int actorID); -s32 fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos, int i_roomNo, +s32 fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, csXyz* i_angle = NULL, cXyz* i_scale = NULL, s8 i_subType = -1, createFunc i_createFunc = NULL); -s32 fopAcM_create(char*, u32 i_parameter, cXyz* i_pos, int i_roomNo, +s32 fopAcM_create(char*, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, csXyz* i_angle = NULL, cXyz* i_scale = NULL, createFunc i_createFunc = NULL); inline s32 fopAcM_create(s16 i_procName, createFunc i_createFunc, void*); -void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* p_pos, int roomNo, +void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* p_pos = NULL, int roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL, s8 subType = -1, createFunc p_createFunc = NULL, void* p_createFuncData = NULL); -void* fopAcM_fastCreate(char* p_actorName, u32 parameter, cXyz* pActorPos, int roomNo, +void* fopAcM_fastCreate(char* p_actorName, u32 parameter, cXyz* pActorPos = NULL, int roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL, createFunc p_createFunc = NULL, void* p_createFuncData = NULL); s32 fopAcM_createChild(s16 procName, unsigned int parentPId, u32 parameters, cXyz* p_pos, - int roomNo, csXyz* p_angle, cXyz* p_scale, s8 subType, - createFunc p_createFunc); + int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 subType = -1, + createFunc p_createFunc = NULL); s32 fopAcM_createChildFromOffset(s16 procName, unsigned int parentProcID, u32 actorParams, cXyz* p_pos, int roomNo, csXyz* p_angle, @@ -435,11 +435,11 @@ s32 fopAcM_orderTalkEvent(fopAc_ac_c*, fopAc_ac_c*); s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor); s32 fopAcM_orderDoorEvent(fopAc_ac_c*, fopAc_ac_c*); s32 fopAcM_orderCatchEvent(fopAc_ac_c*, fopAc_ac_c*); -s32 fopAcM_orderOtherEvent2(fopAc_ac_c*, char*, u16, u16); +s32 fopAcM_orderOtherEvent2(fopAc_ac_c* i_this, char* pEventName, u16 flag, u16 hind = -1); s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, s16 eventIdx, u16 flag, u16 hind); s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_this, fopAc_ac_c* i_partner, s16 eventIdx, u16 flag, u16 hind); -s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3, - u16 priority, u16 flag); +s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventIdx, u8 mapToolID = -1, u16 hind = -1, + u16 priority = 0, u16 flag = 1); s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16); s32 fopAcM_orderItemEvent(fopAc_ac_c*); s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*); @@ -447,17 +447,17 @@ fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c*); fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c*); fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c*); -s32 fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo, - int i_roomNo, csXyz* p_angle, cXyz* p_scale); +s32 fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 argFlag = 0x00, int i_itemBitNo = -1, + int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); -s32 fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, - csXyz* p_angle, cXyz* p_scale); +s32 fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo = -1, + int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, int, - csXyz* p_angle, int, cXyz* p_scale); + csXyz* p_angle, int, cXyz* p_scale = NULL); -s32 fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale, - createFunc createFunc); +s32 fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale = NULL, + createFunc createFunc = NULL); s32 fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_angle, int roomNo, cXyz* scale, int param_7); @@ -465,28 +465,29 @@ s32 fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_a s32 fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int roomNo, csXyz* p_angle, int itemStealNum); s32 fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle, - int roomNo, cXyz* scale, u8 param_7); + int roomNo, cXyz* scale, u8 argFlag); s32 fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle, - cXyz* p_scale, int param_8); + cXyz* p_scale = NULL, int param_8 = 0); -daItem_c* fopAcM_createItemForSimpleDemo(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_angle, cXyz* p_scale, f32 speedF, f32 speedY); +daItem_c* fopAcM_createItemForSimpleDemo(cXyz* p_pos, int i_itemNo, int i_roomNo, + csXyz* p_angle, cXyz* p_scale, f32 speedF, f32 speedY); s32 fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int type, csXyz* p_angle, - int action, cXyz* p_scale); + int action, cXyz* p_scale = NULL); void* fopAcM_fastCreateItem2(cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5, - csXyz* p_angle, int, cXyz* p_scale); + csXyz* p_angle, int, cXyz* p_scale = NULL); void* fopAcM_fastCreateItem(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_angle, cXyz* p_scale, f32 p_speedF, f32 p_speedY, f32 param_8, - int param_9, createFunc p_createFunc); + int param_9 = -1, createFunc p_createFunc = NULL); BOOL stealItem_CB(void* actor); fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo); -s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_switchNo); +s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_switchNo = -1); void fopAcM_setCarryNow(fopAc_ac_c* i_this, int stageLayer); void fopAcM_cancelCarryNow(fopAc_ac_c* i_this); s32 fopAcM_otoCheck(fopAc_ac_c*, f32); diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index 8b611d56a..bfb89d90b 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -15,8 +15,9 @@ struct fopKyM_prm_class { typedef int (*fopKyM_CreateFunc)(void*); void fopKyM_Delete(void* param_1); -int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3); -int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, fopKyM_CreateFunc i_createFunc); +int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2 = NULL, void* param_3 = NULL); +int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos = NULL, cXyz* i_scale = NULL, + fopKyM_CreateFunc i_createFunc = NULL); kankyo_class* fopKyM_SearchByID(unsigned int id); base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, fopKyM_CreateFunc); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 44ae07407..cd5546a04 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -93,7 +93,7 @@ inline void mDoAud_resetProcess() { } } -inline void mDoAud_seStart(u32 i_sfxID, Vec* i_sePos, u32 param_2, s8 i_reverb) { +inline void mDoAud_seStart(u32 i_sfxID, Vec* i_sePos = NULL, u32 param_2 = 0, s8 i_reverb = 0) { mDoAud_zelAudio_c::getInterface()->seStart(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0); } diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 7c6776bf2..53251e78f 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -181,7 +181,7 @@ BOOL enemy_ice(enemyice* ei) { ei->mCyl.SetStts(&ei->mStts); ei->mCyl.SetR(ei->mWallRadius); ei->mCyl.SetH(ei->mCylHeight); - ei->mBgAcch.Set(&ac->current.pos, &ac->next.pos, ac, 1, &ei->mBgAcchCir, &ei->mSpeed, NULL, NULL); + ei->mBgAcch.Set(&ac->current.pos, &ac->next.pos, ac, 1, &ei->mBgAcchCir, &ei->mSpeed); ei->mBgAcchCir.SetWall(40.0f, ei->mWallRadius); if (ei->mParticleScale < 0.1f) { diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 329200cc3..473eaa204 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -428,7 +428,7 @@ void daAgb_c::modeLookAttention() { } } } else { - fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", 4, 0xFFFF); + fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", 4); } } @@ -721,7 +721,7 @@ void daAgb_c::GbaItemUse() { temp_r29 = 15; } - fopAcM_create(0x128, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos, -1); + fopAcM_create(0x128, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); field_0x65c = 0x78; } else { temp_r29 = 0xe; @@ -732,7 +732,7 @@ void daAgb_c::GbaItemUse() { break; case 0x15: resetCursor(false); - fopAcM_create(0x128, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos, -1); + fopAcM_create(0x128, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); field_0x65c = 0x78; break; case 0x11: @@ -1126,8 +1126,7 @@ static int daAgb_Create(fopAc_ac_c* i_this) { a_this->mCrrPos.SetGndUpY(170.0f); a_this->mCrrPos.ClrNoRoof(); - a_this->mAcch.Set(&a_this->current.pos, &a_this->next.pos, a_this, 1, &a_this->mAcchCir, - NULL, NULL, NULL); + a_this->mAcch.Set(&a_this->current.pos, &a_this->next.pos, a_this, 1, &a_this->mAcchCir); a_this->mAcch.OnLineCheck(); a_this->mAcch.SetGrndNone(); a_this->mAcchCir.SetWall(171.01f, 40.0f); diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index a39f64ef6..f288e0b28 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -1042,7 +1042,7 @@ BOOL daAgbsw0_c::ExeSubMW() { se_flag = 1; } - dComIfGp_evmng_getMyStaffId("AGB_SW0", 0, 0); + dComIfGp_evmng_getMyStaffId("AGB_SW0"); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz diff = mEyePos - player->current.pos; f32 dist = diff.absXZ(); @@ -1062,7 +1062,7 @@ BOOL daAgbsw0_c::ExeSubMW() { } } else { - fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", 4, -1); + fopAcM_orderOtherEvent2(this, "DEFAULT_AGB_LOOK_ATTENTION", 4); } } @@ -1197,7 +1197,7 @@ BOOL daAgbsw0_c::ExeSubR() { current.pos.y += mScale.y / 2.0f; } - fopAcM_fastCreateItem(¤t.pos, itemNo, fopAcM_GetHomeRoomNo(this), 0, 0, 0.0f, cM_rndF(10.0f) + 40.0f, -7.0f, -1, 0); + fopAcM_fastCreateItem(¤t.pos, itemNo, fopAcM_GetHomeRoomNo(this), 0, 0, 0.0f, cM_rndF(10.0f) + 40.0f, -7.0f); fopAcM_seStart(agb, JA_SE_CV_CHI_MEGAHORN, 0); MailSend(-1, 0, 0xFF, 0xFF, 0); @@ -1462,7 +1462,7 @@ BOOL daAgbsw0_c::ExeSubD() { if(0 <= itemNo && itemNo < 0x1F && itemNo != KAKERA_HEART && itemNo != UTUWA_HEART && itemNo != SMALL_KEY) { s8 roomNo = fopAcM_GetHomeRoomNo(this); f32 rnd = cM_rndF(10.0f) + 40.0f; - fopAcM_fastCreateItem(¤t.pos, itemNo, roomNo, 0, 0, 0.0f, rnd, -7.0f, -1, 0); + fopAcM_fastCreateItem(¤t.pos, itemNo, roomNo, 0, 0, 0.0f, rnd, -7.0f); MailSend(-1, 0, 0xFF, 0xFF, 0x11); } diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 185c9421c..6087140f8 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -979,7 +979,7 @@ static void action_itai_move(am_class* i_this) { mDoAud_seStart(JA_SE_CM_AM_EXPLODE, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); mDoAud_seStart(JA_SE_LK_LAST_HIT, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); - fopAcM_createDisappear(i_this, ¢erPos, 5, 0, 0xFF); + fopAcM_createDisappear(i_this, ¢erPos, 5); fopAcM_onActor(i_this); fopAcM_delete(i_this); break; @@ -1243,8 +1243,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { i_this->mAcch.Set( &fopAcM_GetPosition_p(i_this), &fopAcM_GetOldPosition_p(i_this), - i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this), - NULL, NULL + i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this) ); i_this->mStts.Init(0xFE, 1, i_this); diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 398da9d33..663e948f4 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -987,7 +987,7 @@ static void action_itai(am2_class* i_this) { dComIfGp_particle_set(0x81AF, &i_this->current.pos, &i_this->shape_angle); dComIfGp_particle_set(0x81B0, &i_this->current.pos, &i_this->shape_angle); mDoAud_seStart(JA_SE_CM_AM2_EXPLODE, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); - fopAcM_createDisappear(i_this, ¢erPos, 5, 0, 0xFF); + fopAcM_createDisappear(i_this, ¢erPos, 5); fopAcM_onActor(i_this); fopAcM_delete(i_this); break; @@ -1349,8 +1349,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { i_this->mAcch.Set( &fopAcM_GetPosition_p(i_this), &fopAcM_GetOldPosition_p(i_this), - i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this), - NULL, NULL + i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this) ); i_this->mStts.Init(0xFE, 1, i_this); diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index d6e54ab0b..09d291d72 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -270,7 +270,7 @@ static void event_start_check(andsw0_class* i_this) { if (actor->mEvtInfo.checkCommandDemoAccrpt()) { i_this->mEventState++; } else { - fopAcM_orderOtherEventId(actor, i_this->mEventIdx, i_this->mEventNo, 0xFFFF, 0, 1); + fopAcM_orderOtherEventId(actor, i_this->mEventIdx, i_this->mEventNo); } } diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 87e07e7ab..f4c8f09cd 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -138,7 +138,7 @@ static BOOL daAndsw2_actionOrder(daAndsw2_c* i_this) { } else if (i_this->getType() == TYPE_CONTINUOUS && !i_this->chkAllSw2()) { i_this->setActio(ACT_ON_ALL); } else { - fopAcM_orderOtherEventId(i_this, i_this->mEventIdx, i_this->getEventNo(), 0xFFFF, 0, 1); + fopAcM_orderOtherEventId(i_this, i_this->mEventIdx, i_this->getEventNo()); } return TRUE; } diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index b9f37c56b..81dc28b04 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -157,7 +157,7 @@ void daArrow_c::setLightEffect() { mLightEffPID = fopAcM_createChild( PROC_ARROW_LIGHTEFF, fopAcM_GetID(this), mArrowType, &field_0x6a8, - current.roomNo, &shape_angle, NULL, -1, NULL + current.roomNo, &shape_angle ); if (mLightEffPID != fpcM_ERROR_PROCESS_ID_e) { mbHasLightEff = true; @@ -403,7 +403,7 @@ bool daArrow_c::check_water_in() { mInWaterTimer = 10*30; fopAcM_createChild( PROC_ARROW_ICEEFF, fopAcM_GetID(this), mArrowType, - &waterHitPos, current.roomNo, ¤t.angle, NULL, -1, NULL + &waterHitPos, current.roomNo, ¤t.angle ); if (!field_0x6e4) { dKy_arrowcol_chg_on(¤t.pos, 1); @@ -807,7 +807,7 @@ BOOL daArrow_c::procMove() { fopAcM_createChild( PROC_ARROW_ICEEFF, fopAcM_GetID(this), mArrowType, &field_0x6a8, - current.roomNo, &field_0x6e6, NULL, -1, NULL + current.roomNo, &field_0x6e6 ); fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARW_EFF, 0); @@ -989,7 +989,7 @@ BOOL daArrow_c::procStop_BG() { if (mCoSph.ChkCoHit()) { dComIfGp_setItemArrowNumCount(1); fopAcM_createItemForSimpleDemo(¤t.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); - mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); fopAcM_delete(this); return TRUE; } diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp index a767bf955..a1aab243d 100644 --- a/src/d/actor/d_a_bomb.cpp +++ b/src/d/actor/d_a_bomb.cpp @@ -1083,7 +1083,7 @@ void daBomb_c::init_mtx() { } void daBomb_c::se_cannon_fly_set() { - mDoAud_seStart(JA_SE_LK_SHIP_CANNON_FLY, ¤t.pos, 0, 0); + mDoAud_seStart(JA_SE_LK_SHIP_CANNON_FLY, ¤t.pos); field_0x77F = 1; } @@ -1200,7 +1200,7 @@ dCcD_SrcSph l_sph_src = {}; void daBomb_c::create_init() { mCir.SetWall(30.0f, 30.0f); - mAcch.Set(¤t.pos, &next.pos, this, true, &mCir, &speed, ¤t.angle, &shape_angle); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mCir, &speed, ¤t.angle, &shape_angle); mAcch.ClrWaterNone(); mAcch.ClrRoofNone(); mAcch.m_roof_height = 50.0f; diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index f12e023c9..fa31eed12 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -214,7 +214,7 @@ namespace daBomb2 { void Act_c::crr_init() { mCir.SetWall(30.0f, 30.0f); - mAcch.Set(¤t.pos, &next.pos, this, true, &mCir, &speed, ¤t.angle, &shape_angle); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mCir, &speed, ¤t.angle, &shape_angle); mAcch.ClrWaterNone(); mAcch.ClrRoofNone(); mAcch.m_roof_crr_height = 50.0f; diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 62d6ce92a..5d82b6adf 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -28,7 +28,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) { if (health != 1 && health != 3) { if (health == 2) { - fopAcM_createItemForBoss(&i_this->current.pos, 0, i_this->current.roomNo, &i_this->current.angle, NULL, 0); + fopAcM_createItemForBoss(&i_this->current.pos, 0, i_this->current.roomNo, &i_this->current.angle); } else if (health >= 0x0A && health <= 0x0D) { if (health < 0x0D) { @@ -36,7 +36,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) { 0, 10, 16 }; - fopAcM_createItem(&i_this->current.pos, ki_item_d[health - 0xA], -1, -1, 0, NULL, 4, NULL); + fopAcM_createItem(&i_this->current.pos, ki_item_d[health - 0xA], -1, -1, 0, NULL, 4); } } else { @@ -64,8 +64,7 @@ static BOOL daDisappear_Delete(disappear_class*) { /* 800E7AD0-800E7DBC .text set_disappear__FP15disappear_classf */ void set_disappear(disappear_class* i_this, float scale) { - s8 rev = dComIfGp_getReverb(i_this->current.roomNo); - mDoAud_seStart(JA_SE_CM_MONS_EXPLODE, &i_this->mEyePos, 0, rev); + fopAcM_seStart(i_this, JA_SE_CM_MONS_EXPLODE, 0); cXyz particleScale(scale, scale, scale); i_this->mTimer = 58 + g_regHIO.mChild[8].mShortRegs[0]; diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 1dd13e718..3a698ae22 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -130,7 +130,7 @@ int daFan_c::Create() { } mModel->calc(); - mWindSePId = fopKyM_create(PROC_LEVEL_SE, JA_SE_OBJ_WIND_TAG, &mEyePos, NULL, NULL); + mWindSePId = fopKyM_create(PROC_LEVEL_SE, JA_SE_OBJ_WIND_TAG, &mEyePos); return TRUE; } diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index da85a9ada..425c43263 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -206,7 +206,7 @@ void daGhostship_c::createInit() { } mCir.SetWall(30.0f, 30.0f); - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, true, &mCir, &fopAcM_GetSpeed_p(this), 0, 0); + mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mCir, &fopAcM_GetSpeed_p(this)); mAcch.SetWallNone(); mAcch.SetRoofNone(); dLib_waveRot(¤t.pos, 0.0f, &mWave); @@ -353,14 +353,14 @@ bool daGhostship_c::_execute() { } if(mAlpha == l_HIO.shipAlpha && dist < l_HIO.shipEnterDist && dComIfGs_getEventReg(0x8803) < 3 && !mbEnteredShip) { - mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP, 0, 0, 0); + mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP); stage_scls_info_class* scls_data = dComIfGd_getMeshSceneList(current.pos); JUT_ASSERT(463, scls_data != 0) u8 startCode = scls_data->mStart; dComIfGs_setEventReg(0xC3FF, scls_data->mRoom); dComIfGs_setEventReg(0x85FF, startCode); - dComIfGp_setNextStage("PShip", 0, 2, 0xFF, 0.0f, 0, 1, 0); + dComIfGp_setNextStage("PShip", 0, 2); mbEnteredShip = true; } diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index a4bbb53ce..0114b17ed 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -375,7 +375,7 @@ void daIball_c::CreateInit() { mCyl.Set(m_cyl_src); mCyl.SetStts(&mStts); mAcchCir.SetWall(30.0f, 30.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed); mAcch.OnSeaCheckOn(); mAcch.OnSeaWaterHeight(); diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index d5d3d2585..7208cf205 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -135,8 +135,7 @@ void itemGetCallBack(fopAc_ac_c* item_actor, dCcD_GObjInf*, fopAc_ac_c* collided /* 800F5044-800F53EC .text CreateInit__8daItem_cFv */ void daItem_c::CreateInit() { mAcchCir.SetWall(30.0f, 30.0f); - cXyz* speedPtr; - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, speedPtr = &speed, NULL, NULL); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this)); mAcch.m_flags &= ~0x400; mAcch.m_flags &= ~0x8; mCullMtx = mpModel->mBaseTransformMtx; @@ -159,7 +158,7 @@ void daItem_c::CreateInit() { mDisappearTimer = getData()->mDuration; field_0x65a = getData()->field_0x18; - field_0x650 = speedPtr->y; + field_0x650 = fopAcM_GetSpeed_p(this).y; mItemStatus = 0; mType = daItem_prm::getType(this); @@ -403,7 +402,7 @@ void daItem_c::execInitGetDemoDirection() { if (player == link) { fopAcM_orderItemEvent(this); mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e); - mDemoItemBsPcId = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, current.roomNo, NULL, NULL); + mDemoItemBsPcId = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, current.roomNo); mItemStatus = STATUS_WAIT_GET_DEMO; } } @@ -585,51 +584,51 @@ void daItem_c::itemGetExecute() { switch (m_itemNo) { case HEART: - mDoAud_seStart(JA_SE_HEART_PIECE, NULL, 0, 0); + mDoAud_seStart(JA_SE_HEART_PIECE); execItemGet(m_itemNo); break; case GREEN_RUPEE: - mDoAud_seStart(JA_SE_LUPY_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET); execItemGet(m_itemNo); break; case BLUE_RUPEE: - mDoAud_seStart(JA_SE_BLUE_LUPY_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_BLUE_LUPY_GET); execItemGet(m_itemNo); break; case YELLOW_RUPEE: - mDoAud_seStart(JA_SE_BLUE_LUPY_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_BLUE_LUPY_GET); execItemGet(m_itemNo); break; case RED_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; case PURPLE_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; case ORANGE_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; case SILVER_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; case KAKERA_HEART: - mDoAud_seStart(JA_SE_HEART_PIECE, NULL, 0, 0); + mDoAud_seStart(JA_SE_HEART_PIECE); mItemStatus = STATUS_INIT_GET_DEMO; break; case UTUWA_HEART: - mDoAud_seStart(JA_SE_HEART_PIECE, NULL, 0, 0); + mDoAud_seStart(JA_SE_HEART_PIECE); mItemStatus = STATUS_INIT_GET_DEMO; break; case S_MAGIC: - mDoAud_seStart(JA_SE_MAGIC_POT_GET_S, NULL, 0, 0); + mDoAud_seStart(JA_SE_MAGIC_POT_GET_S); execItemGet(m_itemNo); break; case L_MAGIC: - mDoAud_seStart(JA_SE_MAGIC_POT_GET_L, NULL, 0, 0); + mDoAud_seStart(JA_SE_MAGIC_POT_GET_L); execItemGet(m_itemNo); break; case BOMB_5: @@ -639,18 +638,18 @@ void daItem_c::itemGetExecute() { case ARROW_10: case ARROW_20: case ARROW_30: - mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); execItemGet(m_itemNo); break; case SMALL_KEY: mItemStatus = STATUS_INIT_GET_DEMO; break; case TRIPLE_HEART: - mDoAud_seStart(JA_SE_HEART_PIECE, NULL, 0, 0); + mDoAud_seStart(JA_SE_HEART_PIECE); execItemGet(m_itemNo); break; case PENDANT: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(7)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(7); @@ -679,7 +678,7 @@ void daItem_c::itemGetExecute() { mItemStatus = STATUS_INIT_GET_DEMO; break; case SKULL_NECKLACE: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(0)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(0); @@ -688,7 +687,7 @@ void daItem_c::itemGetExecute() { } break; case BOKOBABA_SEED: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(1)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(1); @@ -697,7 +696,7 @@ void daItem_c::itemGetExecute() { } break; case GOLDEN_FEATHER: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(2)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(2); @@ -706,7 +705,7 @@ void daItem_c::itemGetExecute() { } break; case BOKO_BELT: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(3)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(3); @@ -715,7 +714,7 @@ void daItem_c::itemGetExecute() { } break; case RED_JELLY: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(4)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(4); @@ -724,7 +723,7 @@ void daItem_c::itemGetExecute() { } break; case GREEN_JELLY: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(5)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(5); @@ -733,7 +732,7 @@ void daItem_c::itemGetExecute() { } break; case BLUE_JELLY: - mDoAud_seStart(JA_SE_SPOILS_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(6)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBeast(6); @@ -742,7 +741,7 @@ void daItem_c::itemGetExecute() { } break; case BIRD_ESA_5: - mDoAud_seStart(JA_SE_ESA_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_ESA_GET); if (!dComIfGs_isGetItemBait(0)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBait(0); @@ -751,7 +750,7 @@ void daItem_c::itemGetExecute() { } break; case ANIMAL_ESA: - mDoAud_seStart(JA_SE_ESA_GET, NULL, 0, 0); + mDoAud_seStart(JA_SE_ESA_GET); if (!dComIfGs_isGetItemBait(1)) { mItemStatus = STATUS_INIT_GET_DEMO; dComIfGs_onGetItemBait(1); diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index af2df86af..5b056ac8f 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -105,7 +105,7 @@ static BOOL daKytag05_Execute(kytag05_class* a_this) { dKyw_evt_wind_set(0, -0x32C8); } - mDoAud_seStart(JA_SE_ATM_WIND_VAR, 0, windPow * 100.0f, 0); + mDoAud_seStart(JA_SE_ATM_WIND_VAR, NULL, windPow * 100.0f, 0); return TRUE; } diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index 36dfc671a..7453fe2cf 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -439,7 +439,7 @@ BOOL daMbdoor_actionWait(daMbdoor_c* i_this) { BOOL daMbdoor_actionLockWait(daMbdoor_c* i_this) { if (i_this->checkUnlock()) { i_this->setAction(2); - fopAcM_orderOtherEvent2(i_this, "MBDOOR_STOP_OPEN", 1, -1); + fopAcM_orderOtherEvent2(i_this, "MBDOOR_STOP_OPEN", 1); } return TRUE; } @@ -447,11 +447,11 @@ BOOL daMbdoor_actionLockWait(daMbdoor_c* i_this) { /* 0000121C-000012AC .text daMbdoor_actionLockOff__FP10daMbdoor_c */ BOOL daMbdoor_actionLockOff(daMbdoor_c* i_this) { if (i_this->mEvtInfo.checkCommandDemoAccrpt()) { - i_this->mEvtStaffId = dComIfGp_evmng_getMyStaffId("MBDOOR", NULL, 0); + i_this->mEvtStaffId = dComIfGp_evmng_getMyStaffId("MBDOOR"); i_this->demoProc(); i_this->setAction(3); } else { - fopAcM_orderOtherEvent2(i_this, "MBDOOR_STOP_OPEN", 1, -1); + fopAcM_orderOtherEvent2(i_this, "MBDOOR_STOP_OPEN", 1); } return TRUE; } @@ -470,7 +470,7 @@ BOOL daMbdoor_actionLockDemo(daMbdoor_c* i_this) { /* 00001324-000013E4 .text daMbdoor_actionCloseWait__FP10daMbdoor_c */ BOOL daMbdoor_actionCloseWait(daMbdoor_c* i_this) { if (i_this->mEvtInfo.checkCommandDoor()) { - i_this->mEvtStaffId = dComIfGp_evmng_getMyStaffId("MBDOOR", NULL, 0); + i_this->mEvtStaffId = dComIfGp_evmng_getMyStaffId("MBDOOR"); i_this->demoProc(); i_this->setAction(5); dComIfG_Bgsp()->Release(i_this->mpBgW); diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 13793607c..2c1f010c0 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -423,7 +423,7 @@ BOOL daNpc_kam_c::init() { mAcchCirs[0].SetWall(20.0f, 50.0f); mAcchCirs[1].SetWall(-20.0f, 50.0f); - mAcch.Set(¤t.pos, &next.pos, this, ARRAY_SIZE(mAcchCirs), mAcchCirs, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &next.pos, this, ARRAY_SIZE(mAcchCirs), mAcchCirs, &speed); mAcch.ClrRoofNone(); mAcch.SetRoofCrrHeight(20.0f); mAcch.OnLineCheck(); @@ -881,7 +881,7 @@ void daNpc_kam_c::eventOrder() { } } else if (mEventState != -1 && mEventState < 3) { mCurrEventIdxIdx = mEventState; - fopAcM_orderOtherEventId(this, mEventIdxs[mCurrEventIdxIdx], -1, -1, 0, 1); + fopAcM_orderOtherEventId(this, mEventIdxs[mCurrEventIdxIdx]); } } @@ -945,7 +945,7 @@ BOOL daNpc_kam_c::eventProc() { if (mEventState == 0) { if (dComIfGp_evmng_startCheck("OPTION_CHAR_END") || dComIfGp_evmng_endCheck("OPTION_CHAR_END")) { dComIfGp_event_setTalkPartner(dComIfGp_getLinkPlayer()); - mDoAud_seStart(JA_SE_CTRL_NPC_TO_LINK, NULL, 0, 0); + mDoAud_seStart(JA_SE_CTRL_NPC_TO_LINK); } else { offReturnLink(); mEventState = -1; @@ -958,7 +958,7 @@ BOOL daNpc_kam_c::eventProc() { } } - int staffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId(l_staff_name); // The dComIfGp_event_runCheck inline breaks the codegen here. // if (dComIfGp_event_runCheck() && !checkCommandTalk()) { if (g_dComIfG_gameInfo.play.getEvent().runCheck() && !checkCommandTalk()) { diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index e2fab0b5a..17b3b0765 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -889,7 +889,7 @@ BOOL daNpc_Md_c::createHeap() { mAcchCir[0].SetWall(20.0f, 20.0f); mAcchCir[1].SetWall(60.0f, 20.0f); - mAcch.Set(¤t.pos, &next.pos, this, ARRAY_SIZE(mAcchCir), mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &next.pos, this, ARRAY_SIZE(mAcchCir), mAcchCir, &speed); mAcch.ClrRoofNone(); mAcch.SetRoofCrrHeight(120.0f); mAcch.OnLineCheck(); diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 15042a4ae..fc0a18468 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -104,13 +104,13 @@ bool daObjYgush00_c::_execute() { if (mType == 1) { if (mpGryw00 != NULL) { if (mpGryw00->get_draw_water_lv(mpGryw00) <= current.pos.y) { - fopAcM_seStartCurrent(this, 0x61fe, 0); + fopAcM_seStartCurrent(this, JA_SE_OBJ_SPRING, 0); } } else { mpGryw00 = (daObjGryw00_c*)fopAcM_SearchByName(PROC_Obj_Gryw00); } } else { - fopAcM_seStartCurrent(this, 0x61fe, 0); + fopAcM_seStartCurrent(this, JA_SE_OBJ_SPRING, 0); } return true; diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index e6ec3b50a..80240e6b6 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -258,7 +258,7 @@ void daObjBarrier_c::break_order_proc() { if (mEvtInfo.checkCommandDemoAccrpt()) { mBarrierProc = PROC_BREAK_END_WAIT; } else { - fopAcM_orderOtherEventId(this, mEventID, 0xFF, 0xFFFF, 0, 1); + fopAcM_orderOtherEventId(this, mEventID); mEvtInfo.onCondition(2); } } diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 5f1979af1..6217bdb52 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -129,19 +129,19 @@ void daObj_Hole_c::modeEventInit() { /* 000004F4-000005D0 .text modeEvent__12daObj_Hole_cFv */ void daObj_Hole_c::modeEvent() { if (mEvtInfo.checkCommandDemoAccrpt()) { - int staffId = dComIfGp_evmng_getMyStaffId("Ypit00", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("Ypit00"); if (dComIfGp_evmng_endCheck("DEFAULT_PITFALL")) { if (mExitIdx != 0xFF) { dLib_setNextStageBySclsNum(mExitIdx, current.roomNo); } else { - dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0, current.roomNo, 0xFF, 0.0f, 0, 1, 0); + dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0, current.roomNo); } } } else { - fopAcM_orderOtherEvent2(this, "DEFAULT_PITFALL", 1, 0xFFFF); + fopAcM_orderOtherEvent2(this, "DEFAULT_PITFALL", 1); } } @@ -214,7 +214,7 @@ void daObj_Hole_c::createInit() { fopAcM_setCullSizeFar(this, 10.0f); mAcchCir.SetWall(100.0f, 10.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed); mAcch.SetWallNone(); mAcch.SetRoofNone(); diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index aae40933d..1c09c20e1 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -455,7 +455,7 @@ void daObjMknjD::Act_c::privateCut() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - int staffIdx = dComIfGp_evmng_getMyStaffId("MknjD", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("MknjD"); if (staffIdx != -1) { mActionIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_table, ARRAY_SIZE(cut_name_table), 1, 0); @@ -474,7 +474,7 @@ void daObjMknjD::Act_c::privateCut() { setPlayerAngle(staffIdx); break; case ACT_BREAK: - mDoAud_seStart(JA_SE_READ_RIDDLE_1, NULL, 0, 0); + mDoAud_seStart(JA_SE_READ_RIDDLE_1); int switchId = prm_get_swSave(); fopAcM_onSwitch(this, switchId); diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 6875b6c5d..6434d060e 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1432,13 +1432,13 @@ namespace daObjMovebox { mChildPID = fopAcM_createChild( PROC_Obj_Jump, fopAcM_GetID(this), jumpParams, ¤t.pos, - fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL + fopAcM_GetRoomNo(this), &shape_angle ); } else if (mType == TYPE_MIRROR) { mChildPID = fopAcM_createChild( PROC_Obj_Mmrr, fopAcM_GetID(this), 0, ¤t.pos, - fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL + fopAcM_GetRoomNo(this), &shape_angle ); } else if (mType == TYPE_BLACK_BOX_WITH_MKIE) { cXyz mkiePos(current.pos.x, current.pos.y + 150.0f, current.pos.z); @@ -1790,7 +1790,7 @@ namespace daObjMovebox { void Act_c::make_item() { s32 itemTableNo = prm_get_itemNo(); s32 itemBitNo = prm_get_itemSave(); - fopAcM_createItemFromTable(¤t.pos, itemTableNo, itemBitNo, fopAcM_GetHomeRoomNo(this), 0, ¤t.angle, 7, NULL); + fopAcM_createItemFromTable(¤t.pos, itemTableNo, itemBitNo, fopAcM_GetHomeRoomNo(this), 0, ¤t.angle, 7); } /* 00003450-00003570 .text eff_break__Q212daObjMovebox5Act_cFv */ @@ -1806,7 +1806,7 @@ namespace daObjMovebox { emitter->setLifeTime(30); emitter->setAwayFromAxisSpeed(30.0f); } - fopAcM_create(PROC_Obj_Eff, 0x5, &particlePos, -1); + fopAcM_create(PROC_Obj_Eff, 0x5, &particlePos); // TODO daObjEff::Act_c::make_woodBox_smoke(cXyz*) } diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 571205e30..07bcca256 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -83,11 +83,11 @@ static BOOL daObjPbka_Draw(void* i_this) { static BOOL daObjPbka_Execute(void* i_this) { daObjPbka_c* a_this = (daObjPbka_c*)i_this; - a_this->current.angle.y += 0x500; - a_this->shape_angle.y = a_this->current.angle.y; - mDoAud_seStart(JA_SE_OBJ_BOMB_SHOP_FAN, &a_this->current.pos, 0 , dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); - a_this->set_mtx(); - return TRUE; + a_this->current.angle.y += 0x500; + a_this->shape_angle.y = a_this->current.angle.y; + fopAcM_seStartCurrent(a_this, JA_SE_OBJ_BOMB_SHOP_FAN, 0); + a_this->set_mtx(); + return TRUE; } static BOOL daObjPbka_IsDelete(void*) { diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 5aaea4eea..ebf374c87 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -141,7 +141,7 @@ void daObjTpost_c::cutProc() { "DISP_LETTER" }; - int staffIdx = dComIfGp_evmng_getMyStaffId("Tpost", 0, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("Tpost"); if(staffIdx != -1) { int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, action_table, ARRAY_SIZE(action_table), 1, 0); if(actIdx == -1) { @@ -182,7 +182,7 @@ void daObjTpost_c::cutPresentStart(int staffIdx) { } void daObjTpost_c::cutPresentProc(int staffIdx) { - u32 itemPID = fopAcM_createItemForPresentDemo(¤t.pos, m_letter[mNumReadable].mItemNo, 0, -1, -1, 0, 0); + u32 itemPID = fopAcM_createItemForPresentDemo(¤t.pos, m_letter[mNumReadable].mItemNo); if(itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); dComIfGp_evmng_cutEnd(staffIdx); @@ -618,7 +618,7 @@ void daObjTpost_c::setAnm(s8 param_1, bool param_2) { } if(field_0x6C8 == 0 && mMorf->getFrame() == 1.0f) { - mDoAud_seStart(JA_SE_OBJ_POST_EAT_LUGGAGE, 0, 0, 0); + mDoAud_seStart(JA_SE_OBJ_POST_EAT_LUGGAGE); } if(field_0x6C8 == 1) { @@ -626,7 +626,7 @@ void daObjTpost_c::setAnm(s8 param_1, bool param_2) { scale.setall(1.0f); if(mMorf->getFrame() == 1.0f) { dComIfGp_particle_set(0x8190, ¤t.pos, ¤t.angle, &scale); - mDoAud_seStart(JA_SE_OBJ_POST_LUGGAGE_OUT, 0, 0, 0); + mDoAud_seStart(JA_SE_OBJ_POST_LUGGAGE_OUT); } } @@ -930,7 +930,7 @@ void daObjTpost_c::createInit() { modeProc(PROC_INIT, 0); mAcchCir.SetWall(30.0f, 30.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, 0, 0); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed); mAcch.SetRoofNone(); mGravity = -4.5f; diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index c633943a2..b51cfad43 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -32,14 +32,14 @@ BOOL daPy_lk_c::procFoodThrow_init() { return TRUE; } if (m3630 != -1) { - mDoAud_seStart(JA_SE_ITEM_TARGET_OUT, NULL, 0, 0); + mDoAud_seStart(JA_SE_ITEM_TARGET_OUT); return FALSE; } dBgS* bgs = dComIfG_Bgsp(); // This is kinda weird, maybe fakematch if (!dComIfGp_event_runCheck()) { - if (!dComIfGp_event_compulsory(this, NULL, -1)) { + if (!dComIfGp_event_compulsory(this)) { return FALSE; } else { mDemo.setSpecialDemoType(); @@ -168,7 +168,7 @@ BOOL daPy_lk_c::procFoodSet_init() { } if (!dComIfGp_event_runCheck()) { - if (!dComIfGp_event_compulsory(this, NULL, -1)) { + if (!dComIfGp_event_compulsory(this)) { return FALSE; } mDemo.setDemoType(5); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index ba19f140b..780445cd9 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -4137,7 +4137,7 @@ BOOL daPy_lk_c::checkFallCode() { /* 80120724-80120BBC .text startRestartRoom__9daPy_lk_cFUlifi */ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int i_point) { /* Nonmatching - npc_sarace */ - if (!checkNoResetFlg0(daPyFlg0_UNK4000) && (i_point != 0 || dComIfGp_event_compulsory(this, NULL, -1))) { + if (!checkNoResetFlg0(daPyFlg0_UNK4000) && (i_point != 0 || dComIfGp_event_compulsory(this))) { mDemo.setOriginalDemoType(); if (i_point == 0) { mDemo.setDemoMode(1); @@ -4146,8 +4146,8 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int changePlayer(this); if (dComIfGp_getMiniGameType() == 1) { - dComIfGp_setNextStage("sea", 1, 48, -1, 0.0f, 0, 1, 0); - mDoAud_seStart(JA_SE_FORCE_BACK, NULL, 0, 0); + dComIfGp_setNextStage("sea", 1, 48); + mDoAud_seStart(JA_SE_FORCE_BACK); // daNpc_Sarace_c::ship_race_result = 3; mTinkleShieldTimer = 0; return TRUE; @@ -4157,10 +4157,10 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int mTinkleShieldTimer = 0; if (stageType == 7 && !dComIfGs_isEventBit(0x2A08) && (current.roomNo == 11 || current.roomNo == 44) && dStage_chkPlayerId(0x80, current.roomNo)) { - dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0x80, current.roomNo, -1, 0.0f, param_1, 1, 0); + dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0x80, current.roomNo, -1, 0.0f, param_1); u32 roomParam = setParamData(-1, 0, eventInfoIdx, 0); dComIfGs_setRestartRoomParam(roomParam); - mDoAud_seStart(JA_SE_FORCE_BACK, NULL, 0, 0); + mDoAud_seStart(JA_SE_FORCE_BACK); return TRUE; } @@ -4210,20 +4210,20 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int int roomNo = dComIfGs_getRestartRoomNo(); u32 roomParam = setParamData(roomNo, 0, eventInfoIdx, 0); dStage_restartRoom(roomParam, param_1); - mDoAud_seStart(JA_SE_FORCE_BACK, NULL, 0, 0); + mDoAud_seStart(JA_SE_FORCE_BACK); } return TRUE; } } else if (checkNoResetFlg0(daPyFlg0_DEKU_SP_RETURN_FLG)) { - dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, 41, -1, 0.0f, param_1, 1, 0); + dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, 41, -1, 0.0f, param_1); } else { - dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, current.roomNo, -1, 0.0f, param_1, 1, 0); + dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, current.roomNo, -1, 0.0f, param_1); } if (mCurProcID != DPROC_DEAD_e) { u32 roomParam = setParamData(-1, 0, eventInfoIdx, 0); dComIfGs_setRestartRoomParam(roomParam); - mDoAud_seStart(JA_SE_FORCE_BACK, NULL, 0, 0); + mDoAud_seStart(JA_SE_FORCE_BACK); } return TRUE; diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp index 948c11b01..4c5b31cac 100644 --- a/src/d/actor/d_a_player_npc.cpp +++ b/src/d/actor/d_a_player_npc.cpp @@ -171,7 +171,7 @@ BOOL daPy_npc_c::checkNowPosMove(const char* pName) { return TRUE; } - int evtStaffId = dComIfGp_evmng_getMyStaffId(pName, NULL, 0); + int evtStaffId = dComIfGp_evmng_getMyStaffId(pName); if (evtStaffId != -1) { return TRUE; } diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index f51acebcf..571adb251 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -95,7 +95,7 @@ BOOL daRaceItem_c::CreateInit() { mCyl.SetH(height); mAcchCir.SetWall(30.0f, 30.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, 0, 0); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed); mAcch.ClrWaterNone(); mAcch.ClrRoofNone(); diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 24d5d9d08..84a07b6e5 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -843,7 +843,7 @@ void daRd_c::modeDeath() { mGroup = fopAc_ENV_e; if (cLib_calcTimer(&mTimer1) == 0) { - fopAcM_createDisappear(this, ¤t.pos, 5, 0, 0xFF); + fopAcM_createDisappear(this, ¤t.pos, 5); fopAcM_delete(this); } } @@ -963,7 +963,7 @@ void daRd_c::modeCryInit() { if (dComIfGp_evmng_startCheck("DEFAULT_RD_CRY")) { dComIfGp_event_reset(); } - fopAcM_orderOtherEvent2(this, "DEFAULT_RD_CRY", 1, -1); + fopAcM_orderOtherEvent2(this, "DEFAULT_RD_CRY", 1); fopAcM_monsSeStart(this, JA_SE_CV_RD_SCREAM, 0); mTimer1 = l_HIO.m54; mBreakFreeCounter = l_HIO.m78; @@ -1774,7 +1774,7 @@ void daRd_c::createInit() { mCyl.Set(m_cyl_src); mCyl.SetStts(&mStts); mAcchCir.SetWall(30.0f, 30.0f); - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this), NULL, NULL); + mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this)); mAcch.SetRoofNone(); J3DModelData* modelData = mpMorf->getModel()->getModelData(); mJntCtrl.setHeadJntNum(0x0A); // ree_kubi_1 diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 0aeac82db..7a93dee16 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -249,7 +249,7 @@ s32 daSwhit0_c::actionOffWait() { case 3: mState = 2; - fopAcM_orderOtherEventId(this, mEventIdx, getEvNo(), 0xFFFF, 0, 1); + fopAcM_orderOtherEventId(this, mEventIdx, getEvNo()); mEvtInfo.onCondition(0x02); break; @@ -279,7 +279,7 @@ s32 daSwhit0_c::actionToOnReady() { else { mState = 2; - fopAcM_orderOtherEventId(this, mEventIdx, getEvNo(), 0xFFFF, 0, 1); + fopAcM_orderOtherEventId(this, mEventIdx, getEvNo()); mEvtInfo.onCondition(0x02); } @@ -290,12 +290,12 @@ s32 daSwhit0_c::actionToOnReady() { s32 daSwhit0_c::actionToOnOrder() { if (mEvtInfo.checkCommandDemoAccrpt()) { mState = 3; - mStaffId = dComIfGp_evmng_getMyStaffId("SWITCH", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("SWITCH"); DemoProc(); } else { - fopAcM_orderOtherEventId(this, mEventIdx, getEvNo(), 0xFFFF, 0, 1); + fopAcM_orderOtherEventId(this, mEventIdx, getEvNo()); mEvtInfo.onCondition(0x02); } diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index fa5ef044b..c99789b72 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -138,7 +138,7 @@ bool daSwItem_c::_execute() { csXyz angle(0, orig.angle.y, 0); u32 itemProcId = fopAcM_createItemFromTable( ¤t.pos, itemTbl, itemBitNo, - fopAcM_GetHomeRoomNo(this), 0, &angle, 1, NULL + fopAcM_GetHomeRoomNo(this), 0, &angle, 1 ); daItem_c* item = (daItem_c*)fopAcM_SearchByID(itemProcId); diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index 266d953cf..44aa63de7 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -43,28 +43,28 @@ void daTag_Gship_c::modeClearEventInit() { /* 00000214-00000418 .text modeClearEvent__13daTag_Gship_cFv */ void daTag_Gship_c::modeClearEvent() { if(mEvtInfo.checkCommandDemoAccrpt()) { - int staffIdx = dComIfGp_evmng_getMyStaffId("PScnChg", 0, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("PScnChg"); if(dEvmng_strcmp(dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx), "WARAIGOE") == 0) { if(dComIfGs_getEventReg(0x8803) == 3) { - mDoAud_seStart(JA_SE_CV_G_SHIP_SCREAM, 0, 0, 0); + mDoAud_seStart(JA_SE_CV_G_SHIP_SCREAM); } else { - mDoAud_seStart(JA_SE_CV_G_SHIP_LAUGH, 0, 0, 0); + mDoAud_seStart(JA_SE_CV_G_SHIP_LAUGH); } dComIfGp_evmng_cutEnd(staffIdx); } if(dComIfGp_evmng_endCheck("PSHIP_CLEAR")) { - mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP, 0, 0, 0); + mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP); s8 room = dComIfGs_getEventReg(0xC3FF); s8 spawn = dComIfGs_getEventReg(0x85FF); dKy_set_nexttime(120.0f); - dComIfGp_setNextStage("sea", spawn, room, 0xFF, 0.0f, 5, 1, 0); + dComIfGp_setNextStage("sea", spawn, room, 0xFF, 0.0f, 5); } } else { - fopAcM_orderOtherEvent2(this, "PSHIP_CLEAR", 1, 0xFFFF); + fopAcM_orderOtherEvent2(this, "PSHIP_CLEAR", 1); } } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 8156f4419..e76b19cbe 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -530,7 +530,7 @@ void daTbox_c::CreateInit() { if (funcType == FUNC_TYPE_GRAVITY) { mAcchCir.SetWall(30.0f, 0.0f); - mObjAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mObjAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed); mGravity = -2.5f; } @@ -942,7 +942,7 @@ BOOL daTbox_c::actionOpenWait() { dComIfGp_event_onEventFlag(0x04); u8 itemNo = getItemNo(); - u32 itemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, itemNo, -1, -1, NULL, NULL); + u32 itemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, itemNo); if (itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); @@ -965,7 +965,7 @@ BOOL daTbox_c::actionOpenWait() { setAction(&daTbox_c::actionDemo); - mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE"); demoProc(); } else { @@ -989,12 +989,12 @@ BOOL daTbox_c::actionSwOnWait() { if (mEvtInfo.checkCommandDemoAccrpt()) { setAction(&daTbox_c::actionDemo2); - mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE"); demoProc(); } else { if (dComIfGs_isSwitch(getSwNo(), mRoomNo)) { - fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1, 0xFFFF); + fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1); mEvtInfo.mCondition |= 2; } } @@ -1017,7 +1017,7 @@ BOOL daTbox_c::actionGenocide() { if (mEvtInfo.checkCommandDemoAccrpt()) { setAction(&daTbox_c::actionDemo2); - mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE"); demoProc(); } else { @@ -1026,7 +1026,7 @@ BOOL daTbox_c::actionGenocide() { mGenocideDelayTimer--; } else { - fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1, 0xFFFF); + fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1); mEvtInfo.mCondition |= 2; dComIfGs_onSwitch(getSwNo(), mRoomNo); diff --git a/src/d/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp index 0b3a5d7d1..9978c6e68 100644 --- a/src/d/d_a_race_item_static.cpp +++ b/src/d/d_a_race_item_static.cpp @@ -24,31 +24,31 @@ void daRaceItem_c::raceItemForceGet() { void daRaceItem_c::raceItemGet() { switch(m_itemNo) { case GREEN_RUPEE: - mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(1); break; case BLUE_RUPEE: - mDoAud_seStart(JA_SE_BLUE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_BLUE_LUPY_GET); dComIfGp_plusMiniGameRupee(5); break; case YELLOW_RUPEE: - mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(10); break; case RED_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); dComIfGp_plusMiniGameRupee(20); break; case PURPLE_RUPEE: - mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(50); break; case ORANGE_RUPEE: - mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(100); break; case SILVER_RUPEE: - mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(200); break; } @@ -63,31 +63,31 @@ void daRaceItem_c::normalItemGet() { switch(m_itemNo) { case GREEN_RUPEE: - mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET); break; case BLUE_RUPEE: - mDoAud_seStart(JA_SE_BLUE_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_BLUE_LUPY_GET); break; case YELLOW_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); break; case RED_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); break; case PURPLE_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); break; case ORANGE_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); break; case SILVER_RUPEE: - mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET); break; case S_MAGIC: - mDoAud_seStart(JA_SE_MAGIC_POT_GET_S, 0, 0, 0); + mDoAud_seStart(JA_SE_MAGIC_POT_GET_S); break; case L_MAGIC: - mDoAud_seStart(JA_SE_MAGIC_POT_GET_L, 0, 0, 0); + mDoAud_seStart(JA_SE_MAGIC_POT_GET_L); break; case BOMB_5: case BOMB_10: @@ -96,10 +96,10 @@ void daRaceItem_c::normalItemGet() { case ARROW_10: case ARROW_20: case ARROW_30: - mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET, 0, 0, 0); + mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); break; case TRIPLE_HEART: - mDoAud_seStart(JA_SE_HEART_PIECE, 0, 0, 0); + mDoAud_seStart(JA_SE_HEART_PIECE); break; } } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 70a813b1f..60adbd92e 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -481,7 +481,7 @@ void dComIfG_inf_c::ct() { int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) { dComIfGp_offEnableNextStage(); - dComIfGp_setNextStage("sea_T", 0, 44, 0, 0.0f, 0, 1, 0); + dComIfGp_setNextStage("sea_T", 0, 44, 0); mDoAud_setSceneName(dComIfGp_getNextStageName(), dComIfGp_getNextStageRoomNo(), dComIfGp_getNextStageLayer()); dComIfGs_setRestartRoomParam(0); @@ -641,7 +641,7 @@ stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) { /* 800537C8-8005388C .text dComIfGp_setNextStage__FPCcsScScfUliSc */ void dComIfGp_setNextStage(const char* i_stageName, s16 i_point, s8 i_roomNo, s8 i_layer, - f32 i_lastSpeed, u32 i_lastMode, int i_setPoint, s8 i_wipe) { + f32 i_lastSpeed, u32 i_lastMode, BOOL i_setPoint, s8 i_wipe) { g_dComIfG_gameInfo.play.setNextStage(i_stageName, i_roomNo, i_point, i_layer, i_wipe); if (daPy_getPlayerLinkActorClass() != NULL) { @@ -1213,7 +1213,7 @@ void dComIfGs_gameStart() { s8 roomNo = g_dComIfG_gameInfo.save.getPlayer().getPlayerReturnPlace().getRoomNo(); s16 point = g_dComIfG_gameInfo.save.getPlayer().getPlayerReturnPlace().getPoint(); char* name = g_dComIfG_gameInfo.save.getPlayer().getPlayerReturnPlace().getName(); - dComIfGp_setNextStage(name, point, roomNo, -1, 0.0f, 0, 1, 0); + dComIfGp_setNextStage(name, point, roomNo); } /* 80054CC0-80054E9C .text dComIfGs_copyPlayerRecollectionData__Fv */ diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 1556b406c..d9fef76af 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -233,7 +233,7 @@ void daTagKbItem_c::dig_main() { f32 speedF = cM_rndF(5.0f); daItem_c* item = (daItem_c*)fopAcM_fastCreateItem( &mpActor->current.pos, field_0x2a0, roomNo, &angle, - &scale, speedF, speedY, -6.0f, field_0x29c, NULL + &scale, speedF, speedY, -6.0f, field_0x29c ); if (item) { fopAcM_OnStatus(item, fopAcStts_UNK4000_e); diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 5deffb587..0d5bee765 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -50,7 +50,7 @@ BOOL dEvDt_Next_Stage(int staffIdx, int wipePrm) { if (pStageName != NULL && pStartCode != NULL) { if (pHour != NULL) dKy_set_nexttime(*pHour * 15.0f); - dComIfGp_setNextStage(pStageName, *pStartCode, roomNo, layerNo, 0.0f, mode, 1, wipe); + dComIfGp_setNextStage(pStageName, *pStartCode, roomNo, layerNo, 0.0f, mode, TRUE, wipe); } else { JUT_ASSERT(0x88, 0); } @@ -202,7 +202,7 @@ void dEvDtStaff_c::advanceCut(int cutIdx) { /* 80071D88-80071F58 .text specialProcLight__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcLight() { - int staffIdx = dComIfGp_evmng_getMyStaffId("LIGHT", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("LIGHT"); if (staffIdx == -1) { JUT_ASSERT(0x16a, 0); return; @@ -253,7 +253,7 @@ void dEvDtStaff_c::specialProcLight() { /* 80071F58-80072458 .text specialProcMessage__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcMessage() { - int staffIdx = dComIfGp_evmng_getMyStaffId("MESSAGE", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("MESSAGE"); if (staffIdx == -1) { JUT_ASSERT(0x1C2, 0); return; @@ -378,7 +378,7 @@ void dEvDtStaff_c::specialProcMessage() { /* 80072458-80072748 .text specialProcSound__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcSound() { - int staffIdx = dComIfGp_evmng_getMyStaffId("SOUND", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("SOUND"); if (staffIdx == -1) { JUT_ASSERT(0x254, 0); return; @@ -414,7 +414,7 @@ void dEvDtStaff_c::specialProcSound() { specialProc_WaitStart(staffIdx); break; case 5: // RIDDLE - mDoAud_seStart(JA_SE_READ_RIDDLE_1, NULL, 0, 0); + mDoAud_seStart(JA_SE_READ_RIDDLE_1); break; case 6: // LANDING_DEMO { @@ -463,7 +463,7 @@ void dEvDtStaff_c::specialProcSound() { /* 80072748-80072A28 .text specialProcCreate__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcCreate() { - int staffIdx = dComIfGp_evmng_getMyStaffId("CREATER", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("CREATER"); if (staffIdx == -1) { JUT_ASSERT(0x2d3, 0); return; @@ -534,7 +534,7 @@ void dEvDtStaff_c::specialProcCreate() { /* 80072A28-80073064 .text specialProcDirector__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcDirector() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getLinkPlayer(); - int staffIdx = dComIfGp_evmng_getMyStaffId("DIRECTOR", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("DIRECTOR"); if (staffIdx == -1) { JUT_ASSERT(0x330, 0); return; @@ -628,7 +628,7 @@ void dEvDtStaff_c::specialProcDirector() { }; if (*pSE < (s32)ARRAY_SIZE(se_table)) { - mDoAud_seStart(se_table[*pSE], NULL, 0, 0); + mDoAud_seStart(se_table[*pSE]); } } } @@ -646,7 +646,7 @@ void dEvDtStaff_c::specialProcDirector() { if (sound != NULL) { switch (*sound) { case 0: - mDoAud_seStart(JA_SE_CHUYA_SWITCH, NULL, 0, 0); + mDoAud_seStart(JA_SE_CHUYA_SWITCH); break; } } @@ -709,7 +709,7 @@ void dEvDtStaff_c::specialProcDirector() { /* 80073064-800733CC .text specialProcPackage__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcPackage() { - int staffIdx = dComIfGp_evmng_getMyStaffId("PACKAGE", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("PACKAGE"); if (staffIdx == -1) { JUT_ASSERT(0x3f2, 0); return; @@ -787,7 +787,7 @@ void dEvDtStaff_c::specialProcPackage() { /* 800733CC-800735BC .text specialProcTimekeeper__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcTimekeeper() { - int staffIdx = dComIfGp_evmng_getMyStaffId("TIMEKEEPER", NULL, 0); + int staffIdx = dComIfGp_evmng_getMyStaffId("TIMEKEEPER"); if (staffIdx == -1) { JUT_ASSERT(0x471, 0); return; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 5da4948df..cc47efe03 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -3380,7 +3380,7 @@ void dKy_itudemo_se() { int roomNo = dComIfGp_roomControl_getStayNo(); if (env_light.mMoyaSE != 0) { - mDoAud_seStart(env_light.mMoyaSE, NULL, 0, 0); + mDoAud_seStart(env_light.mMoyaSE); } if (strcmp(dComIfGp_getStartStageName(), "M_NewD2") == 0 && roomNo == 3) { diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index f0563af2c..4d3ccba86 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1841,12 +1841,12 @@ void dKyr_thunder_move() { cLib_addCalc(&pThunder->mFlashTimer, 1.0f, 0.3f, 0.2f, 0.001f); if (pThunder->mFlashTimer >= 1.0f) { if (pThunder->mState < 10) - mDoAud_seStart(0x69f7, NULL, 0, 0); + mDoAud_seStart(JA_SE_OBJ_THUNDER_NEAR); pThunder->mState++; } if (cM_rndF(1.0f) < 0.18f) - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(PROC_KY_THUNDER, -1); } break; case 2: diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index a6d8578d4..0a2b15a71 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -535,7 +535,7 @@ void wether_move_rain() { g_env_light.mbRainInitialized = true; if (g_env_light.mRainCount != 250) { - mDoAud_seStart(JA_SE_ATM_RAIN_START, NULL, 0, 0); + mDoAud_seStart(JA_SE_ATM_RAIN_START); } } break; @@ -552,7 +552,7 @@ void wether_move_rain() { if (g_env_light.mRainCount == 0) { g_env_light.mbRainInitialized = false; - mDoAud_seStart(JA_SE_ATM_RAIN_END, NULL, 0, 0); + mDoAud_seStart(JA_SE_ATM_RAIN_END); delete g_env_light.mpRainPacket; } break; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index e327e205a..b1f67226b 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -45,7 +45,7 @@ dThunder_c::~dThunder_c() { BOOL dThunder_c::execute() { mBrk.setPlaySpeed(1.0f); if (mBrk.play()) { - mDoAud_seStart(JA_SE_OBJ_THUNDER_FAR, &mPos, 0, 0); + mDoAud_seStart(JA_SE_OBJ_THUNDER_FAR, &mPos); fopKyM_Delete(this); } return TRUE; @@ -191,7 +191,7 @@ s32 dThunder_c::create() { mPosNeg.x = -mPos.x; mPosNeg.y = -mPos.y; mPosNeg.z = -mPos.z; - mDoAud_seStart(JA_SE_OBJ_THUNDER_FAR, &mPosNeg, 0, 0); + mDoAud_seStart(JA_SE_OBJ_THUNDER_FAR, &mPosNeg); } return cPhs_COMPLEATE_e; diff --git a/src/d/d_level_se.cpp b/src/d/d_level_se.cpp index 3641b2453..5765140e9 100644 --- a/src/d/d_level_se.cpp +++ b/src/d/d_level_se.cpp @@ -15,11 +15,11 @@ BOOL dLevelSe_Execute(dLevelSe_c* i_this) { if (i_this->mFlag & 0x08) { } else if (i_this->mFlag & 0x01) { - mDoAud_seStart(soundId, &i_this->mPos, i_this->field_0xf8, 0); + mDoAud_seStart(soundId, &i_this->mPos, i_this->field_0xf8); } else if (i_this->mFlag & 0x04) { mDoAud_seStart(soundId, &i_this->mPos, i_this->field_0xf8, i_this->mReverb); } else { - mDoAud_seStart(soundId, &i_this->mPos, 0, 0); + mDoAud_seStart(soundId, &i_this->mPos); } return TRUE; diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index 1dc96eee3..5c51c0897 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -205,7 +205,7 @@ void dLib_setNextStageBySclsNum(u8 i_sclsnum, s8 room_no) { stage_scls_info_class* scls_entry = &scls_data[i_sclsnum]; s32 wipe = dStage_sclsInfo_getWipe(scls_entry); wipe = wipe == 0xFF ? 0 : wipe; - dComIfGp_setNextStage(scls_entry->mStage, scls_entry->mStart, scls_entry->mRoom, -1, 0.0f, 0, 1, wipe); + dComIfGp_setNextStage(scls_entry->mStage, scls_entry->mStart, scls_entry->mRoom, -1, 0.0f, 0, TRUE, wipe); } /* 80057EC0-80057F30 .text dLib_setFirstMsg__FUsUlUl */ diff --git a/src/d/d_npc_event_cut.inc b/src/d/d_npc_event_cut.inc index b1ee94b58..ddb162c1a 100644 --- a/src/d/d_npc_event_cut.inc +++ b/src/d/d_npc_event_cut.inc @@ -20,7 +20,7 @@ bool dNpc_EventCut_c::cutProc() { return false; } else { - mEvtStaffId = dComIfGp_evmng_getMyStaffId(mpEvtStaffName, 0, 0); + mEvtStaffId = dComIfGp_evmng_getMyStaffId(mpEvtStaffName); if(mEvtStaffId == -1) { return false; } diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 1f8e00912..c61d4704e 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -253,7 +253,7 @@ BOOL progSelDraw(dScnLogo_c* i_this) { if (i_this->field_0x1eb == 0) { if (i_this->mInterFlag == 0) { if (CPad_CHECK_HOLD_RIGHT(0) || g_mDoCPd_cpadInfo[0].mMainStickPosX > 0.5f) { - mDoAud_seStart(JA_SE_TALK_CURSOR, NULL, 0, 0); + mDoAud_seStart(JA_SE_TALK_CURSOR); i_this->mInterFlag = 1; i_this->field_0x1ee = 30; i_this->field_0x1f0 = i_this->field_0x1ee; @@ -261,7 +261,7 @@ BOOL progSelDraw(dScnLogo_c* i_this) { } } else { if (CPad_CHECK_HOLD_LEFT(0) || g_mDoCPd_cpadInfo[0].mMainStickPosX < -0.5f) { - mDoAud_seStart(JA_SE_TALK_CURSOR, NULL, 0, 0); + mDoAud_seStart(JA_SE_TALK_CURSOR); i_this->mInterFlag = 0; i_this->field_0x1ee = 30; i_this->field_0x1f0 = i_this->field_0x1ee; @@ -271,9 +271,9 @@ BOOL progSelDraw(dScnLogo_c* i_this) { if (CPad_CHECK_TRIG_A(0) || i_this->mTimer == 0) { if (i_this->mInterFlag == 0) - mDoAud_seStart(JA_SE_TALK_WIN_CLOSE, NULL, 0, 0); + mDoAud_seStart(JA_SE_TALK_WIN_CLOSE); else - mDoAud_seStart(JA_SE_TALK_SEL_CANCEL, NULL, 0, 0); + mDoAud_seStart(JA_SE_TALK_SEL_CANCEL); const int temp = VERSION_SELECT(240, 540, 540); if (i_this->mTimer > temp) { diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index f4a7d5a3d..c68b28f4a 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -84,7 +84,7 @@ void objectSetCheck(room_of_scene_class* i_this) { if (!i_this->mbReLoaded) { if (!hiddenFlag) { - fopAcM_create(PROC_BG, roomNo, NULL, -1); + fopAcM_create(PROC_BG, roomNo); dStage_dt_c_roomReLoader(i_this->mpRoomData, i_this->mpRoomDt, roomNo); i_this->mbReLoaded = true; } diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index aa76c0b95..e6f534286 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -119,7 +119,7 @@ s32 dScnTitle_Create(scene_class* i_scn) { dComIfGp_offEnableNextStage(); u32 parameter = fpcM_GetName(i_this) == PROC_TITLE_SCENE ? 0 : 1; - i_this->mMoviePId = fopAcM_create(PROC_MP, parameter, NULL, -1); + i_this->mMoviePId = fopAcM_create(PROC_MP, parameter); #if VERSION == VERSION_PAL dScnTitle_c::mMp = NULL; diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index b8635b930..4e4348dfa 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -1032,14 +1032,14 @@ void ShopItems_c::createItem(int numItems, int roomNo) { mItemActorProcessIds[0] = fopAcM_createShopItem( &pos, Item_set_data_tbl[mItemSetListGlobalIdx][0]->mpItemData->mItemNo, - &angle, roomNo, NULL, NULL + &angle, roomNo ); pos.x += 75.0f; if (dComIfGs_isEventBit(0x0D04)) { mItemActorProcessIds[1] = fopAcM_createShopItem( &pos, Item_set_data_tbl[mItemSetListGlobalIdx][1]->mpItemData->mItemNo, - &angle, roomNo, NULL, NULL + &angle, roomNo ); pos.x += 75.0f; } @@ -1047,7 +1047,7 @@ void ShopItems_c::createItem(int numItems, int roomNo) { if (dComIfGs_isEventBit(0x0D02)) { mItemActorProcessIds[2] = fopAcM_createShopItem( &pos, Item_set_data_tbl[mItemSetListGlobalIdx][2]->mpItemData->mItemNo, - &angle, roomNo, NULL, NULL + &angle, roomNo ); } } else { @@ -1055,7 +1055,7 @@ void ShopItems_c::createItem(int numItems, int roomNo) { mItemActorProcessIds[i] = fopAcM_createShopItem( (cXyz*)&Item_set_pos_data_tbl[mItemSetListGlobalIdx][i], Item_set_data_tbl[mItemSetListGlobalIdx][i]->mpItemData->mItemNo, - &angle, roomNo, NULL, NULL + &angle, roomNo ); } } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 74d1bdaaf..bc3529e48 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1489,13 +1489,13 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file) JUT_ASSERT(1842, stageProc != 0); if (stageProc->mBase.mBase.mProcName != PROC_PLAY_SCENE) { - fopAcM_create(PROC_TITLE, 0, NULL, -1); + fopAcM_create(PROC_TITLE, 0); } fopMsgM_Create(PROC_METER, NULL, NULL); cXyz agb_pos(appen->mPos.x, appen->mPos.y + 10.0f, appen->mPos.z); - fopAcM_create(PROC_AGB, 0, &agb_pos, -1); + fopAcM_create(PROC_AGB, 0, &agb_pos); dComIfGp_setAgb(NULL); return 1; } @@ -1962,10 +1962,10 @@ int dStage_roomDrtgInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void* /* 80042EB8-80042F14 .text dKankyo_create__Fv */ void dKankyo_create() { - fopKyM_Create(PROC_KANKYO, NULL, NULL); - fopKyM_Create(PROC_KYEFF, NULL, NULL); - fopKyM_Create(PROC_KYEFF2, NULL, NULL); - fopKyM_Create(PROC_ENVSE, NULL, NULL); + fopKyM_Create(PROC_KANKYO); + fopKyM_Create(PROC_KYEFF); + fopKyM_Create(PROC_KYEFF2); + fopKyM_Create(PROC_ENVSE); } /* 80042F14-80042FC4 .text dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei */ @@ -2262,9 +2262,9 @@ int dStage_changeSceneExitId(cBgS_PolyInfo& i_poly, f32 i_speed, u32 i_mode, s8 s16 point = IkadaGetLinkIdArg1(actor_p); if (exit_id == 0x3E) { - dComIfGp_setNextStage("Obshop", point, roomNo, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("Obshop", point, roomNo, -1, i_speed, i_mode); } else if (exit_id == 0x3B) { - dComIfGp_setNextStage("Abship", point, roomNo, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("Abship", point, roomNo, -1, i_speed, i_mode); } dComIfGp_setIkadaShipBeforeRoomId(i_roomNo); @@ -2274,22 +2274,21 @@ int dStage_changeSceneExitId(cBgS_PolyInfo& i_poly, f32 i_speed, u32 i_mode, s8 } else if (exit_id == 0x3D) { JUT_ASSERT(4134, dComIfGp_getIkadaShipBeforeRoomId() >= 0 && dComIfGp_getIkadaShipBeforeRoomId() < 64); - dComIfGp_setNextStage("sea", -2, dComIfGp_getIkadaShipBeforeRoomId(), -1, i_speed, i_mode, - 1, 0); + dComIfGp_setNextStage("sea", -2, dComIfGp_getIkadaShipBeforeRoomId(), -1, i_speed, i_mode); return 1; } else if (exit_id == 0x3C) { if (strcmp(dComIfGp_getStartStageName(), "Asoko") == 0) { if (dComIfGs_isEventBit(0x808)) { if (dComIfGs_isEventBit(0x520)) { - dComIfGp_setNextStage("sea", 5, 11, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("sea", 5, 11, -1, i_speed, i_mode); } else { - dComIfGp_setNextStage("MajyuE", 18, 0, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("MajyuE", 18, 0, -1, i_speed, i_mode); } } else { - dComIfGp_setNextStage("A_umikz", 0, 0, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("A_umikz", 0, 0, -1, i_speed, i_mode); } } else { - dComIfGp_setNextStage("Asoko", 0, 0, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("Asoko", 0, 0, -1, i_speed, i_mode); } return 1; } @@ -2318,14 +2317,14 @@ int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no) { s32 wipe = dStage_sclsInfo_getWipe(scls_info); dComIfGp_setNextStage(scls_info->mStage, scls_info->mStart, scls_info->mRoom, -1, speed, mode, - 1, wipe == 15 ? 0 : wipe); + TRUE, wipe == 15 ? 0 : wipe); return 1; } /* 80043AB0-80043B10 .text dStage_restartRoom__FUlUl */ void dStage_restartRoom(u32 roomParam, u32 mode) { dComIfGp_setNextStage(dComIfGp_getStartStageName(), -1, dComIfGs_getRestartRoomNo(), -1, 0.0f, - mode, 0, 0); + mode, FALSE); dComIfGs_setRestartRoomParam(roomParam); } @@ -2335,7 +2334,7 @@ void dStage_turnRestart() { if (layerNo >= 0) layerNo ^= 1; - dComIfGp_setNextStage(dComIfGp_getStartStageName(), -3, dComIfGs_getTurnRestartRoomNo(), layerNo, 0.0f, 0, 0, 6); + dComIfGp_setNextStage(dComIfGp_getStartStageName(), -3, dComIfGs_getTurnRestartRoomNo(), layerNo, 0.0f, 0, FALSE, 6); s32 hour = dKy_getdaytime_hour(); f32 nextTime = 180.0f; @@ -2361,7 +2360,7 @@ void dStage_escapeRestart() { } dComIfGp_setNextStage(dComIfGp_getStartStageName(), -3, dComIfGs_getTurnRestartRoomNo(), -1, - 0.0f, 0, 0, 9); + 0.0f, 0, FALSE, 9); } /* 80043C84-80043CD0 .text dStage_checkRestart__Fv */ diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 7568a33c5..30f569155 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -779,7 +779,7 @@ fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c* i_this) { } /* 80026118-800261E8 .text fopAcM_createItemForPresentDemo__FP4cXyziUciiP5csXyzP4cXyz */ -s32 fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 param_3, int roomNo, int param_5, csXyz* rot, cXyz* scale) { +s32 fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roomNo, int param_5, csXyz* rot, cXyz* scale) { JUT_ASSERT(2413, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); @@ -788,7 +788,7 @@ s32 fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 param_3, int roo return -1; } - return fopAcM_createDemoItem(pos, i_itemNo, roomNo, rot, param_5, scale, param_3); + return fopAcM_createDemoItem(pos, i_itemNo, roomNo, rot, param_5, scale, argFlag); } /* 800261E8-800262B4 .text fopAcM_createItemForTrBoxDemo__FP4cXyziiiP5csXyzP4cXyz */ @@ -801,7 +801,7 @@ s32 fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param return -1; } - return fopAcM_createDemoItem(pos, i_itemNo, roomNo, rot, param_5, scale, 0); + return fopAcM_createDemoItem(pos, i_itemNo, roomNo, rot, param_5, scale, 0x00); } /* 800262B4-80026694 .text fopAcM_createItemFromTable__FP4cXyziiiiP5csXyziP4cXyz */ @@ -871,7 +871,7 @@ s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int r } itemNo = getItemNoByLife((s8)itemNo); - daItem_c* item = (daItem_c*)fopAcM_fastCreateItem2(&pos, itemNo, i_itemBitNo, roomNo, type, &angle, 8, NULL); + daItem_c* item = (daItem_c*)fopAcM_fastCreateItem2(&pos, itemNo, i_itemBitNo, roomNo, type, &angle, 8); lastItemPID = fopAcM_GetID(item); if (lastItemPID == fpcM_ERROR_PROCESS_ID_e) { @@ -923,13 +923,13 @@ s32 fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, } /* 80026980-80026A68 .text fopAcM_createDemoItem__FP4cXyziiP5csXyziP4cXyzUc */ -s32 fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 param_7) { +s32 fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 argFlag) { JUT_ASSERT(2813, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); if (i_itemNo == NO_ITEM) { return -1; } - u32 params = i_itemNo & 0xFF | (i_itemBitNo & 0x7F) << 0x08 | (param_7 & 0xFF) << 0x10; + u32 params = i_itemNo & 0xFF | (i_itemBitNo & 0x7F) << 0x08 | (argFlag & 0xFF) << 0x10; return fopAcM_create(PROC_Demo_Item, params, pos, roomNo, rot, scale); } @@ -1001,7 +1001,7 @@ fopAc_ac_c* fopAcM_createItemForKP2(cXyz* pos, int i_itemNo, int roomNo, csXyz* /* 80026F5C-80026F98 .text fopAcM_createItemForSimpleDemo__FP4cXyziiP5csXyzP4cXyzff */ daItem_c* fopAcM_createItemForSimpleDemo(cXyz* pos, int i_itemNo, int roomNo, csXyz* rot, cXyz* scale, f32 speedF, f32 speedY) { - daItem_c* item = (daItem_c*)fopAcM_fastCreateItem(pos, i_itemNo, roomNo, rot, scale, speedF, speedY, -7.0f, 0xFFFFFFFF, NULL); + daItem_c* item = (daItem_c*)fopAcM_fastCreateItem(pos, i_itemNo, roomNo, rot, scale, speedF, speedY, -7.0f); if (item != NULL) item->setStatus(5); return item;