mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* Consolidate fopAcM_STATUS into fopAc_Status_e

* Add _e suffix to fopAcStts enums

* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h

* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile

* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums

* Fix borked merge

* Rename item number enums and move to d_item_data.h

* Rename process profile name & draw priority enums

* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h

* ACTUALLY (whoops) stage merge

* Correct item mistranslation

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 30e839c28b
commit 0b0fdd1f60
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/c/c_damagereaction.cpp
+3 -3
View File
@@ -49,9 +49,9 @@ BOOL cDmrNowMidnaTalk() {
if (dComIfGp_event_runCheck()) {
fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_getTalkEventPartner(daPy_getLinkPlayerActorClass());
if (actor) {
if (fopAcM_GetName(actor) == PROC_MIDNA || fopAcM_GetName(actor) == PROC_Tag_Mhint ||
fopAcM_GetName(actor) == PROC_Tag_Mstop || fopAcM_GetName(actor) == PROC_Tag_Hstop ||
fopAcM_GetName(actor) == PROC_Tag_Mwait || fopAcM_GetName(actor) == PROC_Tag_Wljump) {
if (fopAcM_GetName(actor) == fpcNm_MIDNA_e || fopAcM_GetName(actor) == fpcNm_Tag_Mhint_e ||
fopAcM_GetName(actor) == fpcNm_Tag_Mstop_e || fopAcM_GetName(actor) == fpcNm_Tag_Hstop_e ||
fopAcM_GetName(actor) == fpcNm_Tag_Mwait_e || fopAcM_GetName(actor) == fpcNm_Tag_Wljump_e) {
return 1;
}
}
src/c/c_dylink.cpp
+760 -760
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_L7demo_dr.cpp
+16 -16
View File
@@ -192,7 +192,7 @@ void daDr_c::bridge_destroy() {
camera->mCamera.Set(mDemoCamCenter, mDemoCamEye);
} else if (156.0f == mpModelMorf->getFrame()) {
cXyz sp5C;
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(PROC_Obj_Lv7Bridge);
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(fpcNm_Obj_Lv7Bridge_e);
if (brg != NULL) {
brg->setDestroyAnmA();
}
@@ -221,7 +221,7 @@ void daDr_c::bridge_destroy2() {
daPy_getPlayerActorClass();
if (field_0x654 == 0) {
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(PROC_Obj_Lv7Bridge);
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(fpcNm_Obj_Lv7Bridge_e);
if (brg != NULL) {
brg->setDestroyAnmB();
}
@@ -408,18 +408,18 @@ static actor_method_class l_daDr_Method = {
};
actor_process_profile_definition g_profile_DR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daDr_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
206, // mPriority
&l_daDr_Method, // sub_method
0x00040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDr_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DR_e,
/* Actor SubMtd */ &l_daDr_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_L7low_dr.cpp
+14 -14
View File
@@ -198,18 +198,18 @@ static actor_method_class l_daL7lowDr_Method = {
};
actor_process_profile_definition g_profile_L7lowDr = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L7lowDr, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daL7lowDr_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
207, // mPriority
&l_daL7lowDr_Method, // sub_method
0x00040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_L7lowDr_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daL7lowDr_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_L7lowDr_e,
/* Actor SubMtd */ &l_daL7lowDr_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_L7op_demo_dr.cpp
+14 -14
View File
@@ -840,18 +840,18 @@ static actor_method_class l_daL7ODR_Method = {
};
actor_process_profile_definition g_profile_L7ODR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L7ODR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daL7ODR_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
222, // mPriority
&l_daL7ODR_Method, // sub_method
0x00040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_L7ODR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daL7ODR_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_L7ODR_e,
/* Actor SubMtd */ &l_daL7ODR_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_alink.cpp
+241 -241
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_alink_boom.inc
+8 -8
View File
@@ -73,7 +73,7 @@ fopAc_ac_c* daAlink_c::getBoomerangActor() {
return mThrowBoomerangAcKeep.getActor();
}
if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
if (mEquipItem == dItemNo_BOOMERANG_e) {
return mItemAcKeep.getActor();
}
@@ -130,7 +130,7 @@ BOOL daAlink_c::checkBoomerangAnime() const {
}
BOOL daAlink_c::checkBoomerangThrowAnime() const {
return (mEquipItem == fpcNm_ITEM_BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) &&
return (mEquipItem == dItemNo_BOOMERANG_e || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) &&
checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e);
}
@@ -163,7 +163,7 @@ void daAlink_c::setBoomerangCatchAnime() {
setFacePriBck(dRes_ID_ALANM_BCK_FAT_e);
field_0x2f97 = 254;
if (mEquipItem != fpcNm_ITEM_COPY_ROD) {
if (mEquipItem != dItemNo_COPY_ROD_e) {
seStartOnlyReverb(JA_SE_LK_BOOM_CATCH);
}
}
@@ -173,7 +173,7 @@ void daAlink_c::throwBoomerang() {
onNoResetFlg1(FLG1_UNK_2);
//! @bug `item` pointer is being accessed without checking if NULL first
BOOL boomerang_item = fopAcM_GetName(item) == PROC_BOOMERANG;
BOOL boomerang_item = fopAcM_GetName(item) == fpcNm_BOOMERANG_e;
if (boomerang_item) {
item->setThrow();
item->current.angle.y = shape_angle.y + mBodyAngle.y;
@@ -197,13 +197,13 @@ void daAlink_c::throwBoomerang() {
fopAcM_cancelCarryNow(item);
item = NULL;
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
field_0x2f94 = 0xFF;
field_0x2f96 = 0xFE;
}
mItemAcKeep.clearData();
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
field_0x2f94 = 0xFF;
field_0x2f96 = 0xFE;
@@ -235,7 +235,7 @@ void daAlink_c::throwBoomerang() {
int daAlink_c::returnBoomerang(int param_0) {
dComIfGp_clearPlayerStatus0(0, 0x400000);
if (mEquipItem == fpcNm_ITEM_NONE
if (mEquipItem == dItemNo_NONE_e
&& !checkMagneBootsOn()
&& mItemAcKeep.getActor() == NULL
#if !PLATFORM_SHIELD
@@ -252,7 +252,7 @@ int daAlink_c::returnBoomerang(int param_0) {
mItemAcKeep = mThrowBoomerangAcKeep;
mThrowBoomerangAcKeep.clearData();
mEquipItem = fpcNm_ITEM_BOOMERANG;
mEquipItem = dItemNo_BOOMERANG_e;
field_0x2f94 = 2;
onNoResetFlg0(FLG0_UNK_20);
src/d/actor/d_a_alink_bottle.inc
+75 -75
View File
@@ -63,21 +63,21 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
field_0x0718 = loadAramItemBtk(dRes_ID_ALANM_BTK_BOTTLE_YURE_e, mHeldItemModel);
if (i_itemNo == fpcNm_ITEM_FAIRY) {
if (i_itemNo == dItemNo_FAIRY_e) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(dRes_ID_ALANM_BCK_O_GD_NV_e, 0xC00);
mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_NV_e, 0x1400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(142, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_WORM) {
} else if (i_itemNo == dItemNo_WORM_e) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(dRes_ID_ALANM_BCK_O_GD_WORM_e, 0xC00);
mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_WORM_e, 0x2400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(151, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) {
} else if (i_itemNo == dItemNo_BEE_CHILD_e) {
mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_HK_e, 0x1000), 0);
}
@@ -96,40 +96,40 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
mItemMode = 0;
}
if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_BEE_CHILD) || checkOilBottleItem(i_itemNo)) {
if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != dItemNo_BEE_CHILD_e) || checkOilBottleItem(i_itemNo)) {
item_model_data->getMaterialNodePointer(0)->getShape()->hide();
if (i_itemNo == fpcNm_ITEM_RED_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_RED || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2) {
if (i_itemNo == dItemNo_RED_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_RED_e || i_itemNo == dItemNo_RED_BOTTLE_2_e) {
field_0x0724->setFrame(0.0f);
} else if (i_itemNo == fpcNm_ITEM_GREEN_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_GREEN) {
} else if (i_itemNo == dItemNo_GREEN_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_GREEN_e) {
field_0x0724->setFrame(1.0f);
} else if (i_itemNo == fpcNm_ITEM_BLUE_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_BLUE) {
} else if (i_itemNo == dItemNo_BLUE_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_BLUE_e) {
field_0x0724->setFrame(2.0f);
} else if (checkOilBottleItem(i_itemNo)) {
field_0x0724->setFrame(4.0f);
} else if (i_itemNo == fpcNm_ITEM_HOT_SPRING) {
} else if (i_itemNo == dItemNo_HOT_SPRING_e) {
field_0x0724->setFrame(5.0f);
} else if (i_itemNo == fpcNm_ITEM_CHUCHU_PURPLE) {
} else if (i_itemNo == dItemNo_CHUCHU_PURPLE_e) {
field_0x0724->setFrame(6.0f);
} else if (i_itemNo == fpcNm_ITEM_CHUCHU_RARE) {
} else if (i_itemNo == dItemNo_CHUCHU_RARE_e) {
field_0x0724->setFrame(7.0f);
} else if (i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK) {
} else if (i_itemNo == dItemNo_UGLY_SOUP_e || i_itemNo == dItemNo_CHUCHU_BLACK_e) {
field_0x0724->setFrame(8.0f);
} else if (i_itemNo == fpcNm_ITEM_LV1_SOUP) {
} else if (i_itemNo == dItemNo_LV1_SOUP_e) {
field_0x0724->setFrame(9.0f);
} else if (i_itemNo == fpcNm_ITEM_LV2_SOUP || i_itemNo == fpcNm_ITEM_LV3_SOUP) {
} else if (i_itemNo == dItemNo_LV2_SOUP_e || i_itemNo == dItemNo_LV3_SOUP_e) {
field_0x0724->setFrame(10.0f);
} else if (i_itemNo == fpcNm_ITEM_FAIRY_DROP) {
} else if (i_itemNo == dItemNo_FAIRY_DROP_e) {
field_0x0724->setFrame(11.0f);
} else {
field_0x0724->setFrame(3.0f);
if (i_itemNo == fpcNm_ITEM_HALF_MILK_BOTTLE) {
if (i_itemNo == dItemNo_HALF_MILK_BOTTLE_e) {
field_0x072c->setFrame(1.0f);
}
}
} else if (checkOpenBottleItem(i_itemNo)) {
if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) {
if (i_itemNo == dItemNo_WATER_BOTTLE_e) {
field_0x0724->setFrame(5.0f);
} else {
field_0x072c->setFrame(2.0f);
@@ -167,29 +167,29 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
mItemVar0.mBottleItemHealAmount = 0;
if (mEquipItem != fpcNm_ITEM_UGLY_SOUP && mEquipItem != fpcNm_ITEM_CHUCHU_BLACK &&
mEquipItem != fpcNm_ITEM_CHUCHU_PURPLE)
if (mEquipItem != dItemNo_UGLY_SOUP_e && mEquipItem != dItemNo_CHUCHU_BLACK_e &&
mEquipItem != dItemNo_CHUCHU_PURPLE_e)
{
if (mEquipItem == fpcNm_ITEM_LV1_SOUP) {
if (mEquipItem == dItemNo_LV1_SOUP_e) {
dComIfGp_setItemLifeCount(8, 0);
} else if (mEquipItem == fpcNm_ITEM_LV2_SOUP) {
} else if (mEquipItem == dItemNo_LV2_SOUP_e) {
dComIfGp_setItemLifeCount(16, 0);
} else if (mEquipItem == fpcNm_ITEM_LV3_SOUP) {
} else if (mEquipItem == dItemNo_LV3_SOUP_e) {
dComIfGp_setItemLifeCount(32, 0);
} else if (mEquipItem == fpcNm_ITEM_BEE_CHILD) {
} else if (mEquipItem == dItemNo_BEE_CHILD_e) {
field_0x2fd3 = 3;
dComIfGp_setItemLifeCount(dComIfGp_getSelectItemNum(mSelectItemId), 0);
} else if (mEquipItem == fpcNm_ITEM_RED_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_RED ||
mEquipItem == fpcNm_ITEM_RED_BOTTLE_2)
} else if (mEquipItem == dItemNo_RED_BOTTLE_e || mEquipItem == dItemNo_CHUCHU_RED_e ||
mEquipItem == dItemNo_RED_BOTTLE_2_e)
{
dComIfGp_setItemLifeCount(32, 0);
} else if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE || mEquipItem == fpcNm_ITEM_HALF_MILK_BOTTLE) {
} else if (mEquipItem == dItemNo_MILK_BOTTLE_e || mEquipItem == dItemNo_HALF_MILK_BOTTLE_e) {
dComIfGp_setItemLifeCount(12, 0);
} else if (mEquipItem == fpcNm_ITEM_BLUE_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_BLUE ||
mEquipItem == fpcNm_ITEM_HOT_SPRING)
} else if (mEquipItem == dItemNo_BLUE_BOTTLE_e || mEquipItem == dItemNo_CHUCHU_BLUE_e ||
mEquipItem == dItemNo_HOT_SPRING_e)
{
dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0);
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) {
} else if (mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_FAIRY_DROP_e) {
dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0);
}
}
@@ -202,7 +202,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
if (dComIfGp_getItemNowLife() == dComIfGs_getLife()) {
mpHookTipModel = NULL;
if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE) {
if (mEquipItem == dItemNo_MILK_BOTTLE_e) {
if (param_0) {
setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_END)->m_upperID, UPPER_2,
&mpHIO->mItem.mBottle.m.mEndDrinkAnm);
@@ -214,13 +214,13 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
field_0x072c->setFrame(1.0f);
if (mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SPECIAL_e) {
dComIfGs_setEquipBottleItemIn(mSelectItemId, fpcNm_ITEM_HALF_MILK_BOTTLE);
dComIfGs_setEquipBottleItemIn(mSelectItemId, dItemNo_HALF_MILK_BOTTLE_e);
}
} else if (mProcVar2.field_0x300c == 0) {
mProcVar2.field_0x300c = 1;
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0720);
} else if (simpleAnmPlay(field_0x0720)) {
if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) {
if (mEquipItem == dItemNo_UGLY_SOUP_e) {
if (dComIfGs_getLife() <= 2) {
mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge();
} else if (dComIfGs_getLife() <= 4) {
@@ -230,7 +230,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
} else {
mItemVar0.mBottleItemHealAmount = 4;
}
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_PURPLE) {
} else if (mEquipItem == dItemNo_CHUCHU_PURPLE_e) {
f32 rnd = cM_rndF(6.0f);
if (rnd < 1.0f) {
mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge();
@@ -244,11 +244,11 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
} else {
mItemVar0.mBottleItemHealAmount = 4;
}
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_BLACK) {
} else if (mEquipItem == dItemNo_CHUCHU_BLACK_e) {
mItemVar0.mBottleItemHealAmount = -4;
}
if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == fpcNm_ITEM_BEE_CHILD) {
if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == dItemNo_BEE_CHILD_e) {
if (param_0) {
setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_NASTY)->m_upperID,
UPPER_2, &mpHIO->mItem.mBottle.m.mDrinkNastyAnm);
@@ -271,7 +271,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
dComIfGs_setEquipBottleItemEmpty(mSelectItemId);
}
if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) {
if (mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_FAIRY_DROP_e) {
mSwordUpTimer = 510;
}
}
@@ -283,7 +283,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) {
setSingleAnimeParam(ANM_PICK_UP, &mpHIO->mItem.mPickUp.m.mPlaceAnm);
} else {
allUnequip(mKeepItem == fpcNm_ITEM_KANTERA);
allUnequip(mKeepItem == dItemNo_KANTERA_e);
}
} else if (frameCtrl_p->checkPass(11.0f)) {
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0718);
@@ -314,9 +314,9 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
} else if (frameCtrl_p->checkPass(9.0f)) {
returnKeepItemData();
}
} else if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == fpcNm_ITEM_KANTERA) {
} else if (mEquipItem == dItemNo_NONE_e || mEquipItem == dItemNo_KANTERA_e) {
resetUpperAnime(UPPER_2, 3.0f);
if (mEquipItem == fpcNm_ITEM_NONE) {
if (mEquipItem == dItemNo_NONE_e) {
returnKeepItemData();
}
@@ -342,7 +342,7 @@ fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) {
i_pos = &fairy_pos;
}
field_0x285c.setData(fopAcM_fastCreate(PROC_Obj_Yousei, i_params, i_pos, fopAcM_GetRoomNo(this),
field_0x285c.setData(fopAcM_fastCreate(fpcNm_Obj_Yousei_e, i_params, i_pos, fopAcM_GetRoomNo(this),
&shape_angle, NULL, -1, NULL, NULL));
onResetFlg0(RFLG0_UNK_400);
@@ -414,13 +414,13 @@ int daAlink_c::procBottleOpenInit(u16 i_itemNo) {
field_0x32cc = -1;
mProcVar0.field_0x3008 = 1;
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
field_0x3194 = 3;
} else {
field_0x3194 = 2;
if (mEquipItem == fpcNm_ITEM_WORM) {
field_0x32cc = fopAcM_create(PROC_NPC_WORM, 2, &current.pos, fopAcM_GetRoomNo(this),
if (mEquipItem == dItemNo_WORM_e) {
field_0x32cc = fopAcM_create(fpcNm_NPC_WORM_e, 2, &current.pos, fopAcM_GetRoomNo(this),
NULL, NULL, -1);
mProcVar0.field_0x3008 = 0;
mProcVar1.field_0x300a = 1;
@@ -434,7 +434,7 @@ int daAlink_c::procBottleOpenInit(u16 i_itemNo) {
field_0x27c8.initialize(current.pos.y + mHeight);
if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) {
if (i_itemNo == dItemNo_WATER_BOTTLE_e) {
setCylAtParam(AT_TYPE_LANTERN_SWING, dCcG_At_Spl_UNK_0, 0, dCcD_SE_NONE, 0, 30.0f, 30.0f);
}
@@ -459,12 +459,12 @@ int daAlink_c::procBottleOpen() {
if (checkUnderMove0BckNoArc(ANM_BOTTLE_OPEN)) {
if (checkAnmEnd(frameCtrl_p)) {
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
setSingleAnimeBaseMorf(ANM_BOTTLE_FAIRY, -1.0f);
} else {
setSingleAnimeParam(ANM_BOTTLE_POUR, &mpHIO->mItem.mBottle.m.mPourAnm);
if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
if (mEquipItem == dItemNo_WATER_BOTTLE_e) {
if (mWaterY > mLeftHandPos.y) {
mProcVar3.field_0x300e = 0;
} else {
@@ -477,7 +477,7 @@ int daAlink_c::procBottleOpen() {
mProcVar2.field_0x300c = 1;
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x071c);
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
cXyz fairyPos;
mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTop, &fairyPos);
@@ -499,7 +499,7 @@ int daAlink_c::procBottleOpen() {
mProcVar2.field_0x300c = 2;
dComIfGs_setEquipBottleItemEmpty(mSelectItemId);
if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar3.field_0x300e != 0) {
if (mEquipItem == dItemNo_WATER_BOTTLE_e && mProcVar3.field_0x300e != 0) {
seStartOnlyReverb(Z2SE_LK_SPRINKLE_WATER);
}
} else if (frameCtrl_p->getFrame() > 16.0f && frameCtrl_p->getFrame() < 31.0f) {
@@ -527,11 +527,11 @@ int daAlink_c::procBottleOpen() {
}
int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) {
if (i_catchActor != NULL && mEquipItem != fpcNm_ITEM_KANTERA) {
if (i_catchActor != NULL && mEquipItem != dItemNo_KANTERA_e) {
return procPreActionUnequipInit(PROC_BOTTLE_SWING, NULL);
}
if (i_catchActor == NULL && getReadyItem() != fpcNm_ITEM_EMPTY_BOTTLE) {
if (i_catchActor == NULL && getReadyItem() != dItemNo_EMPTY_BOTTLE_e) {
return checkWaitAction();
}
@@ -566,15 +566,15 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) {
temp_r3 = false;
}
catchActorName = PROC_ALINK;
catchActorName = fpcNm_ALINK_e;
}
if (catchActorName == PROC_TAG_SSDRINK || catchActorName == PROC_OBJ_OILTUBO ||
catchActorName == PROC_TAG_BTLITM || mEquipItem == fpcNm_ITEM_KANTERA)
if (catchActorName == fpcNm_TAG_SSDRINK_e || catchActorName == fpcNm_OBJ_OILTUBO_e ||
catchActorName == fpcNm_TAG_BTLITM_e || mEquipItem == dItemNo_KANTERA_e)
{
setSingleAnimeParam(ANM_BOTTLE_SCOOP, &mpHIO->mItem.mBottle.m.mScoopAnm);
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
onNoResetFlg2(FLG2_KANDELAAR_LIGHT_OFF);
JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x31c4);
@@ -594,7 +594,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) {
current.pos.z = catchActor->current.pos.z - cM_scos(shape_angle.y) * 70.0f;
}
if (catchActorName == PROC_OBJ_OILTUBO) {
if (catchActorName == fpcNm_OBJ_OILTUBO_e) {
onModeFlg(0x2000);
}
} else if (temp_r3) {
@@ -636,25 +636,25 @@ int daAlink_c::procBottleSwing() {
mProcVar2.field_0x300c = 1;
offModeFlg(4);
if (mEquipItem != fpcNm_ITEM_KANTERA) {
if (mEquipItem != dItemNo_KANTERA_e) {
u16 bottle_item = dComIfGp_event_getPreItemNo();
if (bottle_item == fpcNm_ITEM_WATER_BOTTLE &&
getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == PROC_Obj_Onsen)
if (bottle_item == dItemNo_WATER_BOTTLE_e &&
getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == fpcNm_Obj_Onsen_e)
{
bottle_item = fpcNm_ITEM_HOT_SPRING;
bottle_item = dItemNo_HOT_SPRING_e;
}
dComIfGs_setEquipBottleItemIn(mSelectItemId, bottle_item);
if (bottle_item == fpcNm_ITEM_BEE_CHILD) {
if (bottle_item == dItemNo_BEE_CHILD_e) {
dComIfGp_setSelectItemNum(mSelectItemId, dComIfGs_getBottleMax());
} else if (bottle_item == fpcNm_ITEM_WATER_BOTTLE) {
} else if (bottle_item == dItemNo_WATER_BOTTLE_e) {
seStartOnlyReverb(Z2SE_LK_SCOOP_WATER);
} else if (checkOilBottleItem(bottle_item)) {
seStartOnlyReverb(Z2SE_AL_SCOOP_OIL);
} else if (bottle_item == fpcNm_ITEM_LV1_SOUP || bottle_item == fpcNm_ITEM_LV2_SOUP ||
bottle_item == fpcNm_ITEM_LV3_SOUP)
} else if (bottle_item == dItemNo_LV1_SOUP_e || bottle_item == dItemNo_LV2_SOUP_e ||
bottle_item == dItemNo_LV3_SOUP_e)
{
seStartOnlyReverb(Z2SE_AL_SCOOP_SOUP);
}
@@ -666,12 +666,12 @@ int daAlink_c::procBottleSwing() {
mDemo.setSpecialDemoType();
}
} else if (frameCtrl_p->getFrame() <= field_0x347c) {
if (getReadyItem() == fpcNm_ITEM_EMPTY_BOTTLE &&
if (getReadyItem() == dItemNo_EMPTY_BOTTLE_e &&
(dComIfGp_att_getCatghTarget() != NULL ||
(field_0x2fbc != 11 && field_0x2fbc != 6 && mWaterY > current.pos.y + 10.0f)))
{
fopAcM_orderCatchEvent(this, dComIfGp_att_getCatghTarget(), 0, 0);
} else if (mEquipItem == fpcNm_ITEM_KANTERA) {
} else if (mEquipItem == dItemNo_KANTERA_e) {
if (field_0x280c.getActor() != NULL) {
fopAcM_orderCatchEvent(this, field_0x280c.getActor(), 0, 0);
}
@@ -698,23 +698,23 @@ int daAlink_c::procBottleGetInit(BOOL param_0) {
commonProcInit(PROC_BOTTLE_GET);
int var_r30;
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
setSingleAnime(ANM_BOTTLE_GET, mpHIO->mItem.mBottle.m.mGetAnm.mSpeed, 40.0f,
mpHIO->mItem.mBottle.m.mGetAnm.mEndFrame,
mpHIO->mItem.mBottle.m.mGetAnm.mInterpolation);
mRightHandIndex = 0xFE;
if (isPrevPickUp) {
execItemGet(fpcNm_ITEM_KANTERA);
var_r30 = fpcNm_ITEM_KANTERA2;
execItemGet(dItemNo_KANTERA_e);
var_r30 = dItemNo_KANTERA2_e;
dComIfGp_setItemOilCount(-dComIfGs_getMaxOil());
} else {
dComIfGp_setItemOilCount(dComIfGs_getMaxOil());
if (param_0) {
var_r30 = fpcNm_ITEM_CHUCHU_YELLOW2;
var_r30 = dItemNo_CHUCHU_YELLOW2_e;
} else {
var_r30 = fpcNm_ITEM_OIL2;
var_r30 = dItemNo_OIL2_e;
}
}
@@ -729,25 +729,25 @@ int daAlink_c::procBottleGetInit(BOOL param_0) {
field_0x3194 = 0;
field_0x32cc = var_r30 + 0x65;
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
field_0x3194 = 12;
}
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
resetBasAnime();
}
u32 id = fopAcM_GetID(this);
dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0);
if (mEquipItem == fpcNm_ITEM_FAIRY_DROP || mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_WORM) {
if (mEquipItem == dItemNo_FAIRY_DROP_e || mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_WORM_e) {
setFaceBasicTexture(FTANM_I_BINGET);
setFaceBasicBck(dRes_ID_ALANM_BCK_FI_e);
} else if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) {
} else if (mEquipItem == dItemNo_UGLY_SOUP_e) {
setFaceBasicBck(dRes_ID_ALANM_BCK_FJ_e);
}
if (mEquipItem == fpcNm_ITEM_BEE_CHILD && dComIfGs_isEventBit(dSv_event_flag_c::F_0700)) {
if (mEquipItem == dItemNo_BEE_CHILD_e && dComIfGs_isEventBit(dSv_event_flag_c::F_0700)) {
dComIfGs_onEventBit(dSv_event_flag_c::F_0618);
}
@@ -761,7 +761,7 @@ int daAlink_c::procBottleGet() {
if (checkAnmEnd(frameCtrl) && checkEndMessage(field_0x32cc)) {
resetFairyEffect();
if (mEquipItem != fpcNm_ITEM_KANTERA) {
if (mEquipItem != dItemNo_KANTERA_e) {
deleteEquipItem(FALSE, FALSE);
}
src/d/actor/d_a_alink_bow.inc
+23 -23
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_horse.h"
void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, BOOL i_forceCharge) const {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
*o_distance = mpHIO->mItem.mBow.m.mSlingshotDistance;
*o_speed = mpHIO->mItem.mBow.m.mSlingshotSpeed;
} else if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
@@ -49,7 +49,7 @@ f32 daAlink_c::getArrowIncAtMax() const {
}
BOOL daAlink_c::checkBowAndSlingItem(int i_itemNo) {
return checkBowItem(i_itemNo) || i_itemNo == fpcNm_ITEM_PACHINKO;
return checkBowItem(i_itemNo) || i_itemNo == dItemNo_PACHINKO_e;
}
void daAlink_c::setSlingModel() {
@@ -68,7 +68,7 @@ void daAlink_c::setSlingModel() {
}
cXyz* daAlink_c::checkBowCameraArrowPosP(s16* o_angleX, s16* o_angleY) {
if (!checkBowAnime() || mEquipItem == fpcNm_ITEM_PACHINKO) {
if (!checkBowAnime() || mEquipItem == dItemNo_PACHINKO_e) {
return NULL;
}
@@ -128,7 +128,7 @@ void daAlink_c::makeArrow() {
void daAlink_c::deleteArrow() {
daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor();
if (arrow_p != NULL && fopAcM_GetName(arrow_p) == PROC_ARROW) {
if (arrow_p != NULL && fopAcM_GetName(arrow_p) == fpcNm_ARROW_e) {
if (arrow_p->checkBombArrow() &&
(mDamageTimer == mpHIO->mDamage.m.mInvincibleTime || checkModeFlg(8)))
{
@@ -143,7 +143,7 @@ void daAlink_c::deleteArrow() {
}
void daAlink_c::setBowOrSlingStatus() {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
dComIfGp_setPlayerStatus0(0, 0x40);
} else {
dComIfGp_setPlayerStatus0(0, 0x1000);
@@ -151,10 +151,10 @@ void daAlink_c::setBowOrSlingStatus() {
}
void daAlink_c::changeArrowType() {
if (checkCanoeSlider() || (mEquipItem == fpcNm_ITEM_BOW && field_0x301e == 0) ||
(mEquipItem == fpcNm_ITEM_BOMB_ARROW && field_0x301e == 0 &&
if (checkCanoeSlider() || (mEquipItem == dItemNo_BOW_e && field_0x301e == 0) ||
(mEquipItem == dItemNo_BOMB_ARROW_e && field_0x301e == 0 &&
dComIfGp_getSelectItemNum(mSelectItemId) == 0) ||
(mEquipItem == fpcNm_ITEM_HAWK_ARROW && checkAttentionLock()))
(mEquipItem == dItemNo_HAWK_ARROW_e && checkAttentionLock()))
{
return;
}
@@ -162,7 +162,7 @@ void daAlink_c::changeArrowType() {
setItemActionButtonStatus(BUTTON_STATUS_SWITCH);
if (arrowChangeTrigger()) {
if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
if (mEquipItem == dItemNo_HAWK_ARROW_e) {
if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
dComIfGp_clearPlayerStatus0(0, 0x200000);
seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF);
@@ -203,7 +203,7 @@ BOOL daAlink_c::cancelBowMove() {
void daAlink_c::setBowReadyAnime() {
if (!checkBowAnime()) {
if (mEquipItem == fpcNm_ITEM_BOMB_ARROW) {
if (mEquipItem == dItemNo_BOMB_ARROW_e) {
if (dComIfGp_getSelectItemNum(mSelectItemId) != 0) {
field_0x301e = 1;
} else {
@@ -225,7 +225,7 @@ void daAlink_c::setBowReadyAnime() {
field_0x2f97 = 5;
field_0x2f96 = 4;
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_PSHOOT_e, -1.0f);
} else {
changeItemBck(dRes_ID_ALANM_BCK_BASHOOT_e, -1.0f);
@@ -237,7 +237,7 @@ void daAlink_c::setBowReloadAnime() {
setFacePriTexture(FTANM_FINISHA);
setFacePriBck(dRes_ID_ALANM_BCK_FARELORD_e);
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_PRELORD_e, mpHIO->mItem.mBow.m.mLoadAnm.mStartFrame);
field_0x2f97 = 5;
seStartOnlyReverb(Z2SE_AL_PACHINKO_DRAW);
@@ -254,7 +254,7 @@ void daAlink_c::setBowReloadAnime() {
BOOL daAlink_c::checkUpperItemActionBow() {
daPy_frameCtrl_c* frameCtrl_p = &mUpperFrameCtrl[2];
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
static const Vec slingLocalPos = {10.0f, 10.0f, 0.0f};
mDoMtx_multVec(getLeftItemMatrix(), &slingLocalPos, &mHeldItemRootPos);
}
@@ -262,7 +262,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
if (checkBowChargeWaitAnime()) {
daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor();
if (mEquipItem != fpcNm_ITEM_PACHINKO) {
if (mEquipItem != dItemNo_PACHINKO_e) {
if (field_0x301c > 0) {
field_0x301c--;
@@ -284,7 +284,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
field_0x2f96 = 0;
u16 bck_res_id;
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
bck_res_id = dRes_ID_ALANM_BCK_PSHOOT_e;
if (dComIfGs_getPachinkoNum() != 0 &&
daArrow_c::makeSlingStone(this, &mHeldItemRootPos) != NULL)
@@ -299,7 +299,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
changeItemBck(bck_res_id, mpHIO->mItem.mBow.m.mShootAnm.mStartFrame);
mItemVar0.field_0x3018 = 0;
} else if (mEquipItem == fpcNm_ITEM_PACHINKO) {
} else if (mEquipItem == dItemNo_PACHINKO_e) {
if (!itemButton()) {
dComIfGp_getVibration().StartShock(VIBMODE_S_POWER1, 1, cXyz(0.0f, 1.0f, 0.0f));
seStartOnlyReverb(Z2SE_AL_PACHINKO_SHOT);
@@ -349,7 +349,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
mItemVar0.field_0x3018 = 1;
resetFacePriAnime();
if (mEquipItem == fpcNm_ITEM_BOW) {
if (mEquipItem == dItemNo_BOW_e) {
field_0x301e = 0;
}
(void)0;
@@ -363,7 +363,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
setFacePriTexture(FTANM_ARELORD);
setFacePriBck(dRes_ID_ALANM_BCK_FARELORDTAME_e);
if (mEquipItem != fpcNm_ITEM_PACHINKO) {
if (mEquipItem != dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_BARELORDTAME_e, 0.0f);
dComIfGp_getVibration().StartQuake(VIBMODE_Q_POWER1, 1, cXyz(0.0f, 1.0f, 0.0f));
onNoResetFlg3(FLG3_UNK_4);
@@ -384,12 +384,12 @@ BOOL daAlink_c::checkUpperItemActionBow() {
{
setBowReloadAnime();
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
mItemVar0.field_0x3018 = 0;
} else {
makeArrow();
}
} else if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
} else if (mEquipItem == dItemNo_HAWK_ARROW_e) {
changeArrowType();
}
@@ -421,7 +421,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
}
}
if (checkBowWaitAnime() || (mEquipItem == fpcNm_ITEM_PACHINKO && checkBowChargeWaitAnime())) {
if (checkBowWaitAnime() || (mEquipItem == dItemNo_PACHINKO_e && checkBowChargeWaitAnime())) {
field_0x33dc += mpHIO->mItem.mBow.m.mShootAnm.mSpeed;
} else {
field_0x33dc = mUpperFrameCtrl[2].getFrame();
@@ -457,7 +457,7 @@ int daAlink_c::checkNextActionBow() {
mItemMode = 0;
mItemVar0.field_0x3018 = 1;
if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
if (mEquipItem == dItemNo_HAWK_ARROW_e) {
is_hawk_arrow = true;
mFastShotTime = 0;
}
@@ -537,7 +537,7 @@ void daAlink_c::setBowHangAnime() {
void daAlink_c::setBowNormalAnime() {
if (checkBowItem(mEquipItem)) {
changeItemBck(dRes_ID_ALANM_BCK_BVJMPCL_e, -1.0f);
} else if (mEquipItem == fpcNm_ITEM_PACHINKO) {
} else if (mEquipItem == dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_PWAIT_e, -1.0f);
}
}
src/d/actor/d_a_alink_canoe.inc
+24 -24
View File
@@ -55,7 +55,7 @@ cXyz* daAlink_c::getCanoeLocalPaddleTop() {
static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_CANOE && ((daCanoe_c*)i_actor)->getModel() != NULL) {
if (fopAcM_GetName(i_actor) == fpcNm_CANOE_e && ((daCanoe_c*)i_actor)->getModel() != NULL) {
return i_actor;
}
@@ -81,9 +81,9 @@ void daAlink_c::initFishingRodHand() {
field_0x2f95 = 0x65;
mItemVar0.field_0x3018 = 1;
if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_WORM_ROD) {
if (mEquipItem == dItemNo_JEWEL_WORM_ROD_e || mEquipItem == dItemNo_WORM_ROD_e) {
mItemMode = 0x74;
} else if (mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD || mEquipItem == fpcNm_ITEM_BEE_ROD) {
} else if (mEquipItem == dItemNo_JEWEL_BEE_ROD_e || mEquipItem == dItemNo_BEE_ROD_e) {
mItemMode = 0x76;
} else {
mItemMode = 0xFF;
@@ -129,7 +129,7 @@ BOOL daAlink_c::checkCanoeJumpRide() {
if (speed.y < 0.0f &&
canoe != NULL &&
fopAcM_GetName(canoe) == PROC_CANOE &&
fopAcM_GetName(canoe) == fpcNm_CANOE_e &&
canoe->checkJumpRideFlg() &&
!checkDeadHP() &&
(mProcID != PROC_FALL || mProcVar4.field_0x3010 != 0))
@@ -592,7 +592,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) {
morf = 3.0f;
mProcVar0.field_0x3008 = 0;
if (mEquipItem == fpcNm_ITEM_NONE || (mEquipItem != 0x10B && !checkFisingRodLure())) {
if (mEquipItem == dItemNo_NONE_e || (mEquipItem != 0x10B && !checkFisingRodLure())) {
anm = ANM_WAIT_SIT;
} else if (mProcVar5.field_0x3012 == 0) {
anm = ANM_WAIT_CANOE_LEFT;
@@ -604,7 +604,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) {
setSyncCanoePos();
setSingleAnimeBaseMorf(anm, morf);
if (param_0 && mEquipItem != 0x10B && mEquipItem != fpcNm_ITEM_NONE && !checkFisingRodLure()) {
if (param_0 && mEquipItem != 0x10B && mEquipItem != dItemNo_NONE_e && !checkFisingRodLure()) {
allUnequip(0);
}
@@ -638,7 +638,7 @@ int daAlink_c::procCanoeWait() {
return procCanoePaddlePutInit(1);
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
}
@@ -648,7 +648,7 @@ int daAlink_c::procCanoeWait() {
if (checkFisingRodLure()) {
procCanoeFishingWaitInit();
} else if (mEquipItem == fpcNm_ITEM_NONE && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) {
} else if (mEquipItem == dItemNo_NONE_e && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) {
field_0x2fde = 0xFF;
if (mThrowBoomerangAcKeep.getActor() != NULL || mProcVar1.field_0x300a != 0) {
@@ -662,7 +662,7 @@ int daAlink_c::procCanoeWait() {
procCanoePaddleGrabInit();
} else if (checkInputOnR() && mEquipItem == 0x10B) {
procCanoeRowInit(-1);
} else if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B) {
} else if (mEquipItem != dItemNo_NONE_e && mEquipItem != 0x10B) {
if (!checkUnderMove0BckNoArc(ANM_WAIT_SIT) && getNowAnmPackUnder(UNDER_0) != getNowAnmPackUpper(UPPER_0)) {
setSingleAnimeBase(ANM_WAIT_SIT);
} else if (checkInputOnR()) {
@@ -939,7 +939,7 @@ int daAlink_c::procCanoePaddleShift() {
int daAlink_c::procCanoePaddlePutInit(int param_0) {
if (checkCanoeSlider() && mEquipItem == 0x10B) {
if (checkEquipAnime() && checkBowItem(field_0x2fde)) {
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
mRightHandIndex = 0xFE;
mLeftHandIndex = 0xFE;
return procCanoeWaitInit(0);
@@ -1006,7 +1006,7 @@ int daAlink_c::procCanoePaddlePut() {
mEquipItem = 0x105;
mRightHandIndex = 5;
} else {
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
mRightHandIndex = 0xFE;
}
@@ -1077,7 +1077,7 @@ int daAlink_c::procCanoePaddleGrab() {
int daAlink_c::procCanoeRodGrabInit() {
commonProcInit(PROC_CANOE_ROD_GRAB);
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
mProcVar0.field_0x3008 = 1;
} else {
@@ -1627,7 +1627,7 @@ int daAlink_c::procCanoeKandelaarPour() {
}
void daAlink_c::setGroundFishingRodActor() {
mItemAcKeep.setID(fopAcM_create(PROC_MG_ROD, 0xFFFF011D, &mLeftHandPos, -1, NULL, NULL, -1));
mItemAcKeep.setID(fopAcM_create(fpcNm_MG_ROD_e, 0xFFFF011D, &mLeftHandPos, -1, NULL, NULL, -1));
initFishingRodHand();
}
@@ -1667,10 +1667,10 @@ int daAlink_c::procFishingCast() {
mItemMode = 0xFF;
dComIfGs_setBaitItem(0xFF);
if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD) {
mEquipItem = fpcNm_ITEM_JEWEL_ROD;
if (mEquipItem == dItemNo_JEWEL_WORM_ROD_e || mEquipItem == dItemNo_JEWEL_BEE_ROD_e) {
mEquipItem = dItemNo_JEWEL_ROD_e;
} else {
mEquipItem = fpcNm_ITEM_FISHING_ROD_1;
mEquipItem = dItemNo_FISHING_ROD_1_e;
}
}
@@ -1741,15 +1741,15 @@ int daAlink_c::procFishingFood() {
mProcVar2.field_0x300c = 1;
u16 item = dComIfGp_getSelectItem(mProcVar3.field_0x300e);
if (item == fpcNm_ITEM_WORM || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) {
if (item == dItemNo_WORM_e || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) {
dComIfGs_setEquipBottleItemEmpty(mProcVar3.field_0x300e);
} else {
dComIfGp_addSelectItemNum(mProcVar3.field_0x300e, -1);
}
if (mItemMode != fpcNm_ITEM_NONE) {
if (mItemMode != dItemNo_NONE_e) {
dComIfGs_setEquipBottleItemIn(mProcVar3.field_0x300e, mItemMode);
if (mItemMode == fpcNm_ITEM_BEE_CHILD) {
if (mItemMode == dItemNo_BEE_CHILD_e) {
dComIfGp_setSelectItemNum(mProcVar3.field_0x300e, 1);
}
}
@@ -1757,16 +1757,16 @@ int daAlink_c::procFishingFood() {
mItemMode = item;
BOOL is_jewl = checkFisingRodJewl();
if (item == fpcNm_ITEM_WORM) {
if (item == dItemNo_WORM_e) {
if (is_jewl) {
mEquipItem = fpcNm_ITEM_JEWEL_WORM_ROD;
mEquipItem = dItemNo_JEWEL_WORM_ROD_e;
} else {
mEquipItem = fpcNm_ITEM_WORM_ROD;
mEquipItem = dItemNo_WORM_ROD_e;
}
} else if (is_jewl) {
mEquipItem = fpcNm_ITEM_JEWEL_BEE_ROD;
mEquipItem = dItemNo_JEWEL_BEE_ROD_e;
} else {
mEquipItem = fpcNm_ITEM_BEE_ROD;
mEquipItem = dItemNo_BEE_ROD_e;
}
dComIfGs_setBaitItem(item);
src/d/actor/d_a_alink_copyrod.inc
+5 -5
View File
@@ -178,7 +178,7 @@ int daAlink_c::returnCopyRod() {
offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER);
BOOL rt;
if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
if (mEquipItem == dItemNo_COPY_ROD_e) {
mItemAcKeep = mCopyRodAcKeep;
onNoResetFlg0(FLG0_UNK_20);
rt = TRUE;
@@ -347,8 +347,8 @@ int daAlink_c::procCopyRodSwingInit() {
daCstatue_c* statue = (daCstatue_c*)getCopyRodControllActor();
if (statue != NULL &&
((fopAcM_GetName(statue) == PROC_CSTATUE && statue->checkNotSmallType()) ||
fopAcM_GetName(statue) != PROC_CSTATUE))
((fopAcM_GetName(statue) == fpcNm_CSTATUE_e && statue->checkNotSmallType()) ||
fopAcM_GetName(statue) != fpcNm_CSTATUE_e))
{
setSingleAnimeParam(ANM_COPYROD_SWING_LARGE, &mpHIO->mItem.mCopyRod.m.mBigSwingAnm);
field_0x3478 = 13.0f;
@@ -408,9 +408,9 @@ int daAlink_c::procCopyRodReviveInit() {
}
if (mDemo.getParam0() == 0) {
if (mEquipItem != fpcNm_ITEM_COPY_ROD) {
if (mEquipItem != dItemNo_COPY_ROD_e) {
deleteEquipItem(FALSE, FALSE);
mEquipItem = fpcNm_ITEM_COPY_ROD;
mEquipItem = dItemNo_COPY_ROD_e;
setCopyRodModel();
}
field_0x0724->setFrame(0.0f);
src/d/actor/d_a_alink_crawl.inc
+1 -1
View File
@@ -476,7 +476,7 @@ void daAlink_c::setCrawlAutoMoveAimPos() {
}
int daAlink_c::procCrawlStartInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_CRAWL_START, NULL);
}
src/d/actor/d_a_alink_cut.inc
+10 -10
View File
@@ -26,14 +26,14 @@ enum daAlink_CutFinishParamType {
static fopAc_ac_c* daAlink_searchNightStalker(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_E_S1) {
if (fopAcM_GetName(i_actor) == fpcNm_E_S1_e) {
daPy_py_c* player_p = daPy_getLinkPlayerActorClass();
if (player_p->current.pos.abs2XZ(i_actor->current.pos) < SQUARE(500.0f) &&
fabsf(player_p->current.pos.y - i_actor->current.pos.y) < 300.0f)
{
return i_actor;
}
} else if (fopAcM_GetName(i_actor) == PROC_B_GND && static_cast<b_gnd_class*>(i_actor)->checkAttackChance()) {
} else if (fopAcM_GetName(i_actor) == fpcNm_B_GND_e && static_cast<b_gnd_class*>(i_actor)->checkAttackChance()) {
return i_actor;
}
@@ -113,7 +113,7 @@ bool daAlink_c::checkCutFastReady() {
fopAc_ac_c* target_p = mAttention->LockonTarget(0);
if (mEquipItem == fpcNm_ITEM_NONE && (dComIfGs_isEventBit(dSv_event_flag_c::F_0342) || checkNoResetFlg3(FLG3_TRANING_CUT_FAST)))
if (mEquipItem == dItemNo_NONE_e && (dComIfGs_isEventBit(dSv_event_flag_c::F_0342) || checkNoResetFlg3(FLG3_TRANING_CUT_FAST)))
{
if (checkModeFlg(1) && !checkRideOn() && checkSwordGet() && checkModeFlg(4) &&
!checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p))
@@ -229,7 +229,7 @@ void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8
} else {
mtrl = dCcD_MTRL_NONE;
}
} else if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
} else if (mEquipItem == dItemNo_WATER_BOTTLE_e) {
mtrl = dCcD_MTRL_UNK_6;
} else {
mtrl = dCcD_MTRL_NONE;
@@ -309,7 +309,7 @@ void daAlink_c::setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int
BOOL daAlink_c::notSwordHitVibActor(fopAc_ac_c* i_actor) {
if (i_actor != NULL && fopAcM_GetGroup(i_actor) == fopAc_NPC_e) {
s16 name = fopAcM_GetName(i_actor);
if (!checkSpecialNpc(i_actor) && name != PROC_NI && name != PROC_NPC_BLUENS) {
if (!checkSpecialNpc(i_actor) && name != fpcNm_NI_e && name != fpcNm_NPC_BLUENS_e) {
return true;
}
}
@@ -365,11 +365,11 @@ BOOL daAlink_c::checkCutReverseAt(dCcD_GObjInf* i_gobj) {
}
BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM i_anmID) {
if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != fpcNm_ITEM_COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) {
if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != dItemNo_COPY_ROD_e && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) {
return procCutReverseInit(i_anmID);
}
if (checkNoResetFlg0(FLG0_CUT_AT_FLG) || mEquipItem == fpcNm_ITEM_COPY_ROD) {
if (checkNoResetFlg0(FLG0_CUT_AT_FLG) || mEquipItem == dItemNo_COPY_ROD_e) {
cXyz sp28;
Vec sp1C;
@@ -793,8 +793,8 @@ BOOL daAlink_c::checkDownAttackState() {
&& enemy->getDownPos().abs2(current.pos) < SQUARE(800.0f)
)
|| (checkWolf()
&& (fopAcM_GetName(mTargetedActor) == PROC_E_PO
|| fopAcM_GetName(mTargetedActor) == PROC_E_HP
&& (fopAcM_GetName(mTargetedActor) == fpcNm_E_PO_e
|| fopAcM_GetName(mTargetedActor) == fpcNm_E_HP_e
)
&& enemy->getDownPos().abs2(current.pos) < SQUARE(800.0f)
)
@@ -2042,7 +2042,7 @@ int daAlink_c::procCutDownInit() {
sp2C = static_cast<fopEn_enemy_c*>(mTargetedActor)->getDownPos();
field_0x280c.setData(mTargetedActor);
if (fopAcM_GetName(mTargetedActor) == PROC_B_GND) {
if (fopAcM_GetName(mTargetedActor) == fpcNm_B_GND_e) {
mProcVar3.field_0x300e = 1;
}
} else {
src/d/actor/d_a_alink_damage.inc
+5 -5
View File
@@ -585,7 +585,7 @@ BOOL daAlink_c::checkDamageAction() {
if (tghit_ac != NULL) {
tghit_ac_name = fopAcM_GetName(tghit_ac);
} else {
tghit_ac_name = PROC_ALINK;
tghit_ac_name = fpcNm_ALINK_e;
}
dCcD_GObjInf* tghit_gobj = var_r29->GetTgHitGObj();
@@ -621,7 +621,7 @@ BOOL daAlink_c::checkDamageAction() {
seStartOnlyReverb(Z2SE_AL_BURN_START);
}
if ((mProcID != PROC_GUARD_ATTACK || (tghit_ac_name != PROC_E_TK_BALL && tghit_ac_name != PROC_KN_BULLET)) && !checkModeFlg(0x4000000)) {
if ((mProcID != PROC_GUARD_ATTACK || (tghit_ac_name != fpcNm_E_TK_BALL_e && tghit_ac_name != fpcNm_KN_BULLET_e)) && !checkModeFlg(0x4000000)) {
if (at_spl == 10 || at_spl == 11 || at_spl == 9) {
return procGuardBreakInit();
}
@@ -633,7 +633,7 @@ BOOL daAlink_c::checkDamageAction() {
return procHorseHangInit(var_r29, 0);
}
} else if (at_spl == 8 || checkModeFlg(0x70C52)) {
if (!checkModeFlg(0x400) && mEquipItem != fpcNm_ITEM_IRONBALL) {
if (!checkModeFlg(0x400) && mEquipItem != dItemNo_IRONBALL_e) {
setSmallGuard(var_r29);
}
} else {
@@ -1624,7 +1624,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* i_tgHitActor, dCcD_GObjInf* i_tg
}
if (i_tgHitActor != NULL) {
i_tgHitActor->actor_status |= 0x800;
i_tgHitActor->actor_status |= fopAcStts_STAFF_EXTRA_e;
}
commonProcInit(PROC_ELEC_DAMAGE);
@@ -1634,7 +1634,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* i_tgHitActor, dCcD_GObjInf* i_tg
daAlink_ANM anm;
daAlink_WANM wolf_anm;
if ((mLinkAcch.ChkGroundHit() && !temp_r27) || checkMagneBootsOn()) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
setIronBallWaitUpperAnime(1);
}
anm = ANM_ELEC_STUN_GND;
src/d/actor/d_a_alink_demo.inc
+326 -326
View File
@@ -31,7 +31,7 @@ void daAlink_c::createNpcTks(cXyz* i_basePos, int i_roomNo, u32 i_parameters) {
cXyz pos(i_basePos->x + cM_ssin(shape_angle.y) * 200.0f, i_basePos->y,
i_basePos->z + cM_scos(shape_angle.y) * 200.0f);
csXyz angle(0, shape_angle.y + 0x8000, 0);
fopAcM_create(PROC_NPC_TKS, i_parameters, &pos, i_roomNo, &angle, NULL, -1);
fopAcM_create(fpcNm_NPC_TKS_e, i_parameters, &pos, i_roomNo, &angle, NULL, -1);
}
bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
@@ -41,8 +41,8 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
if (param_2 != 0 && checkDungeon() &&
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != dStage_SaveTbl_LV8 &&
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != dStage_SaveTbl_LV9 &&
(checkItemGet(fpcNm_ITEM_TKS_LETTER, TRUE) ||
(checkItemGet(fpcNm_ITEM_DUNGEON_BACK, TRUE) && !checkLv7DungeonShop())) &&
(checkItemGet(dItemNo_TKS_LETTER_e, TRUE) ||
(checkItemGet(dItemNo_DUNGEON_BACK_e, TRUE) && !checkLv7DungeonShop())) &&
dComIfGs_isDungeonItemWarp())
{
if (!dComIfGs_isStageBossEnemy()) {
@@ -152,7 +152,7 @@ int daAlink_c::checkDemoAction() {
checkBoarRide() || checkCanoeRide())
{
if (demoMode == daPy_demo_c::DEMO_UNK_6_e && (checkHorseRide() || checkBoarRide())) {
if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != fpcNm_ITEM_KANTERA && !checkEquipAnime()) {
if (mEquipItem != dItemNo_NONE_e && mEquipItem != dItemNo_KANTERA_e && !checkEquipAnime()) {
allUnequip(1);
}
}
@@ -208,13 +208,13 @@ int daAlink_c::checkDemoAction() {
} else if (mDemo.getParam0() == 4) {
if (!checkFishingRodItem(mEquipItem)) {
deleteEquipItem(FALSE, TRUE);
mEquipItem = fpcNm_ITEM_FISHING_ROD_1;
mEquipItem = dItemNo_FISHING_ROD_1_e;
setGroundFishingRodActor();
}
} else if (mDemo.getParam0() == 3) {
if (!checkCanoeRide()) {
daCanoe_c* canoe_p = (daCanoe_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCanoe, NULL);
canoe_p->onRodID(fopAcM_create(PROC_MG_ROD, 0xD, &mLeftHandPos, -1, NULL, NULL, -1));
canoe_p->onRodID(fopAcM_create(fpcNm_MG_ROD_e, 0xD, &mLeftHandPos, -1, NULL, NULL, -1));
return procCanoeJumpRideInit(NULL);
}
return 1;
@@ -632,7 +632,7 @@ void daAlink_c::setDemoData() {
freeGrabItem();
if (dComIfGp_evmng_startCheck("R22-opening")) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
deleteEquipItem(FALSE, FALSE);
}
} else {
@@ -746,7 +746,7 @@ void daAlink_c::setDemoData() {
}
}
if ((mEquipItem == fpcNm_ITEM_IRONBALL || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e &&
if ((mEquipItem == dItemNo_IRONBALL_e || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e &&
demo_mode != daPy_demo_c::DEMO_UNK_31_e && (mAlinkStaffId != -1 || mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_ORIGINAL_e) &&
(demo_mode != daPy_demo_c::DEMO_UNK_6_e || (!var_r28 && !checkEquipAnime())))
{
@@ -1004,45 +1004,45 @@ BOOL daAlink_c::checkFlyAtnWait() {
}
void daAlink_c::setGetItemFace(u16 i_itemNo) {
if (i_itemNo == fpcNm_ITEM_SILVER_RUPEE
|| i_itemNo == fpcNm_ITEM_ORANGE_RUPEE
|| i_itemNo == fpcNm_ITEM_KAKERA_HEART
|| i_itemNo == fpcNm_ITEM_UTAWA_HEART
|| i_itemNo == fpcNm_ITEM_WEAR_ZORA
|| i_itemNo == fpcNm_ITEM_WALLET_LV3
|| (i_itemNo >= fpcNm_ITEM_BOOMERANG && i_itemNo <= fpcNm_ITEM_W_HOOKSHOT)
|| i_itemNo == fpcNm_ITEM_FISHING_ROD_1
|| i_itemNo == fpcNm_ITEM_ARROW_LV3
|| i_itemNo == fpcNm_ITEM_LINKS_SAVINGS
|| i_itemNo == fpcNm_ITEM_FAIRY_DROP
|| i_itemNo == fpcNm_ITEM_DROP_BOTTLE
|| i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2
|| i_itemNo == fpcNm_ITEM_DROP_CONTAINER
|| i_itemNo == fpcNm_ITEM_DROP_CONTAINER02
|| i_itemNo == fpcNm_ITEM_DROP_CONTAINER03)
if (i_itemNo == dItemNo_SILVER_RUPEE_e
|| i_itemNo == dItemNo_ORANGE_RUPEE_e
|| i_itemNo == dItemNo_KAKERA_HEART_e
|| i_itemNo == dItemNo_UTAWA_HEART_e
|| i_itemNo == dItemNo_WEAR_ZORA_e
|| i_itemNo == dItemNo_WALLET_LV3_e
|| (i_itemNo >= dItemNo_BOOMERANG_e && i_itemNo <= dItemNo_W_HOOKSHOT_e)
|| i_itemNo == dItemNo_FISHING_ROD_1_e
|| i_itemNo == dItemNo_ARROW_LV3_e
|| i_itemNo == dItemNo_LINKS_SAVINGS_e
|| i_itemNo == dItemNo_FAIRY_DROP_e
|| i_itemNo == dItemNo_DROP_BOTTLE_e
|| i_itemNo == dItemNo_ANCIENT_DOCUMENT2_e
|| i_itemNo == dItemNo_DROP_CONTAINER_e
|| i_itemNo == dItemNo_DROP_CONTAINER02_e
|| i_itemNo == dItemNo_DROP_CONTAINER03_e)
{
setFaceBasicBck(dRes_ID_ALANM_BCK_FI_e);
} else if (i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_LV7_DUNGEON_EXIT) {
} else if (i_itemNo == dItemNo_DUNGEON_EXIT_e || i_itemNo == dItemNo_LV7_DUNGEON_EXIT_e) {
setFaceBasicTexture(FTANM_K_A);
setFaceBasicBck(dRes_ID_ALANM_BCK_FK_e);
} else if (i_itemNo == fpcNm_ITEM_TOMATO_PUREE || i_itemNo == fpcNm_ITEM_TASTE) {
} else if (i_itemNo == dItemNo_TOMATO_PUREE_e || i_itemNo == dItemNo_TASTE_e) {
setFaceBasicBck(dRes_ID_ALANM_BCK_FJ_e);
}
}
BOOL daAlink_c::checkGrabTalkActor(fopAc_ac_c* i_actor) {
s16 name = fopAcM_GetName(i_actor);
return name == PROC_NPC_KYURY || name == PROC_MYNA || name == PROC_OBJ_SSITEM ||
name == PROC_TAG_MSG;
return name == fpcNm_NPC_KYURY_e || name == fpcNm_MYNA_e || name == fpcNm_OBJ_SSITEM_e ||
name == fpcNm_TAG_MSG_e;
}
int daAlink_c::setTalkStartBack(cXyz* param_0) {
fopAc_ac_c* partner_p = fopAcM_getTalkEventPartner(this);
if (partner_p != NULL) {
s16 partner_name = fopAcM_GetName(partner_p);
if (partner_name == PROC_MIDNA || partner_name == PROC_Tag_Wljump ||
partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop ||
partner_name == PROC_Tag_Mwait)
if (partner_name == fpcNm_MIDNA_e || partner_name == fpcNm_Tag_Wljump_e ||
partner_name == fpcNm_Tag_Mhint_e || partner_name == fpcNm_Tag_Mstop_e ||
partner_name == fpcNm_Tag_Mwait_e)
{
return 0;
}
@@ -1073,14 +1073,14 @@ void daAlink_c::setShapeAngleToTalkActor() {
if (partner_p != NULL) {
s16 partner_name = fopAcM_GetName(partner_p);
if (partner_name != PROC_MYNA &&
(partner_name != PROC_Tag_Mwait || !static_cast<daTagMwait_c*>(partner_p)->checkEndMessage()) &&
(partner_name != PROC_Tag_Mhint || !static_cast<daTagMhint_c*>(partner_p)->checkNoAttention()) &&
(partner_name != PROC_Tag_Mstop || !static_cast<daTagMstop_c*>(partner_p)->checkNoAttention()) &&
partner_name != PROC_MIDNA)
if (partner_name != fpcNm_MYNA_e &&
(partner_name != fpcNm_Tag_Mwait_e || !static_cast<daTagMwait_c*>(partner_p)->checkEndMessage()) &&
(partner_name != fpcNm_Tag_Mhint_e || !static_cast<daTagMhint_c*>(partner_p)->checkNoAttention()) &&
(partner_name != fpcNm_Tag_Mstop_e || !static_cast<daTagMstop_c*>(partner_p)->checkNoAttention()) &&
partner_name != fpcNm_MIDNA_e)
{
s16 target;
if (partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop) {
if (partner_name == fpcNm_Tag_Mhint_e || partner_name == fpcNm_Tag_Mstop_e) {
target = cLib_targetAngleY(&current.pos, &partner_p->eyePos);
} else {
target = fopAcM_searchActorAngleY(this, partner_p);
@@ -1092,7 +1092,7 @@ void daAlink_c::setShapeAngleToTalkActor() {
}
void daAlink_c::setTalkAnime() {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == fpcNm_ITEM_KANTERA ||
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == dItemNo_KANTERA_e ||
(checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48))
{
setDoubleAnime(0.0f, mpHIO->mMove.m.mWaitAnmSpeed,
@@ -1238,7 +1238,7 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, BOOL i_checkZoraMag) {
i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1);
if (mProcID != PROC_DEAD && i_dmgAmount >= dComIfGs_getLife() && !checkMagicArmorNoDamage() &&
!dComIfGs_checkBottle(fpcNm_ITEM_FAIRY))
!dComIfGs_checkBottle(dItemNo_FAIRY_e))
{
onNoResetFlg2(FLG2_FORCE_GAMEOVER);
procCoDeadInit(0);
@@ -1261,7 +1261,7 @@ void daAlink_c::setDeadRideSyncPos() {
}
BOOL daAlink_c::checkDeadHP() {
return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) ||
return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(dItemNo_FAIRY_e)) ||
checkNoResetFlg2(FLG2_FORCE_GAMEOVER) ||
(dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0);
}
@@ -1294,9 +1294,9 @@ BOOL daAlink_c::checkDeadAction(int param_0) {
return commonFallInit(1);
}
} else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) {
} else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(dItemNo_FAIRY_e)) {
makeFairy(&current.pos, 0);
dComIfGs_setBottleItemIn(fpcNm_ITEM_FAIRY, fpcNm_ITEM_EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(dItemNo_FAIRY_e, dItemNo_EMPTY_BOTTLE_e);
}
}
@@ -1707,7 +1707,7 @@ int daAlink_c::procCoTalkInit() {
commonProcInit(PROC_TALK);
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_6_e) {
if (mEquipItem != fpcNm_ITEM_KANTERA && mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_KANTERA_e && mEquipItem != dItemNo_NONE_e) {
allUnequip(1);
}
}
@@ -1790,7 +1790,7 @@ int daAlink_c::procCoTalk() {
mNormalSpeed = 0.0f;
}
} else {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
if (mUpperAnmHeap[0].getIdx() != getMainBckData(ANM_WAIT)->m_upperID) {
setSingleAnimeBaseSpeed(ANM_WAIT, mpHIO->mMove.m.mWaitAnmSpeed, 3.0f);
}
@@ -1896,7 +1896,7 @@ int daAlink_c::procCoUnequipInit() {
setBlendMoveAnime(mpHIO->mBasic.m.mBasicInterpolation);
if (mDemo.getParam1() == 0) {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
}
} else if (mDemo.getParam1() == 1) {
@@ -1917,7 +1917,7 @@ int daAlink_c::procCoUnequip() {
if (mProcVar2.field_0x300c != 0) {
if (checkAnmEnd(mUnderFrameCtrl)) {
setBlendMoveAnime(3.0f);
itemEquip(fpcNm_ITEM_COPY_ROD);
itemEquip(dItemNo_COPY_ROD_e);
mUpperFrameCtrl[2].setFrame(6.0f);
getNowAnmPackUpper(UPPER_2)->setFrame(6.0f);
@@ -1951,265 +1951,265 @@ void daAlink_c::setGetSubBgm(int i_itemNo) {
};
static const u8 getSeType[255] = {
/* fpcNm_ITEM_HEART */ SETYPE_NONE,
/* fpcNm_ITEM_GREEN_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BLUE_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_YELLOW_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_RED_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_PURPLE_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ORANGE_RUPEE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_SILVER_RUPEE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_S_MAGIC */ SETYPE_NONE,
/* fpcNm_ITEM_L_MAGIC */ SETYPE_NONE,
/* fpcNm_ITEM_BOMB_5 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_1 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_PACHINKO_SHOT */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_NOENTRY_19 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_20 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_21 */ SETYPE_NONE,
/* fpcNm_ITEM_WATER_BOMB_5 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_WATER_BOMB_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_WATER_BOMB_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_WATER_BOMB_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_5 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_RECOVERY_FAILY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_TRIPLE_HEART */ SETYPE_NONE,
/* fpcNm_ITEM_SMALL_KEY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_KAKERA_HEART */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_UTAWA_HEART */ SETYPE_HEART,
/* fpcNm_ITEM_MAP */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_COMPUS */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DUNGEON_EXIT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BOSS_KEY */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DUNGEON_BACK */ SETYPE_NONE,
/* fpcNm_ITEM_SWORD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_MASTER_SWORD */ SETYPE_NONE,
/* fpcNm_ITEM_WOOD_SHIELD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SHIELD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HYLIA_SHIELD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_TKS_LETTER */ SETYPE_NONE,
/* fpcNm_ITEM_WEAR_CASUAL */ SETYPE_NONE,
/* fpcNm_ITEM_WEAR_KOKIRI */ SETYPE_NONE,
/* fpcNm_ITEM_ARMOR */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WEAR_ZORA */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_MAGIC_LV1 */ SETYPE_NONE,
/* fpcNm_ITEM_DUNGEON_EXIT_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_WALLET_LV1 */ SETYPE_NONE,
/* fpcNm_ITEM_WALLET_LV2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WALLET_LV3 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_55 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_56 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_57 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_58 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_59 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_60 */ SETYPE_NONE,
/* fpcNm_ITEM_ZORAS_JEWEL */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HAWK_EYE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WOOD_STICK */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BOOMERANG */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SPINNER */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_IRONBALL */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BOW */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HOOKSHOT */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HVY_BOOTS */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_COPY_ROD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_W_HOOKSHOT */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_KANTERA */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_LIGHT_SWORD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_FISHING_ROD_1 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_PACHINKO */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_COPY_ROD_2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_77 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_78 */ SETYPE_NONE,
/* fpcNm_ITEM_BOMB_BAG_LV2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BOMB_BAG_LV1 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BOMB_IN_BAG */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_82 */ SETYPE_NONE,
/* fpcNm_ITEM_LIGHT_ARROW */ SETYPE_NONE,
/* fpcNm_ITEM_ARROW_LV1 */ SETYPE_NONE,
/* fpcNm_ITEM_ARROW_LV2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_ARROW_LV3 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_87 */ SETYPE_NONE,
/* fpcNm_ITEM_LURE_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_BOMB_ARROW */ SETYPE_NONE,
/* fpcNm_ITEM_HAWK_ARROW */ SETYPE_NONE,
/* fpcNm_ITEM_BEE_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_JEWEL_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_WORM_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_JEWEL_BEE_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_JEWEL_WORM_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_EMPTY_BOTTLE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_RED_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_GREEN_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BLUE_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HEART_e */ SETYPE_NONE,
/* dItemNo_GREEN_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BLUE_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_YELLOW_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_RED_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_PURPLE_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ORANGE_RUPEE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_SILVER_RUPEE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_S_MAGIC_e */ SETYPE_NONE,
/* dItemNo_L_MAGIC_e */ SETYPE_NONE,
/* dItemNo_BOMB_5_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_1_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_PACHINKO_SHOT_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_NOENTRY_19_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_20_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_21_e */ SETYPE_NONE,
/* dItemNo_WATER_BOMB_5_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_WATER_BOMB_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_WATER_BOMB_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_WATER_BOMB_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_5_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_RECOVERY_FAILY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_TRIPLE_HEART_e */ SETYPE_NONE,
/* dItemNo_SMALL_KEY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_KAKERA_HEART_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_UTAWA_HEART_e */ SETYPE_HEART,
/* dItemNo_MAP_e */ SETYPE_ITEM_GET,
/* dItemNo_COMPUS_e */ SETYPE_ITEM_GET,
/* dItemNo_DUNGEON_EXIT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BOSS_KEY_e */ SETYPE_ITEM_GET,
/* dItemNo_DUNGEON_BACK_e */ SETYPE_NONE,
/* dItemNo_SWORD_e */ SETYPE_ITEM_GET,
/* dItemNo_MASTER_SWORD_e */ SETYPE_NONE,
/* dItemNo_WOOD_SHIELD_e */ SETYPE_ITEM_GET,
/* dItemNo_SHIELD_e */ SETYPE_ITEM_GET,
/* dItemNo_HYLIA_SHIELD_e */ SETYPE_ITEM_GET,
/* dItemNo_TKS_LETTER_e */ SETYPE_NONE,
/* dItemNo_WEAR_CASUAL_e */ SETYPE_NONE,
/* dItemNo_WEAR_KOKIRI_e */ SETYPE_NONE,
/* dItemNo_ARMOR_e */ SETYPE_ITEM_GET,
/* dItemNo_WEAR_ZORA_e */ SETYPE_ITEM_GET,
/* dItemNo_MAGIC_LV1_e */ SETYPE_NONE,
/* dItemNo_DUNGEON_EXIT_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_WALLET_LV1_e */ SETYPE_NONE,
/* dItemNo_WALLET_LV2_e */ SETYPE_ITEM_GET,
/* dItemNo_WALLET_LV3_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_55_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_56_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_57_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_58_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_59_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_60_e */ SETYPE_NONE,
/* dItemNo_ZORAS_JEWEL_e */ SETYPE_ITEM_GET,
/* dItemNo_HAWK_EYE_e */ SETYPE_ITEM_GET,
/* dItemNo_WOOD_STICK_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BOOMERANG_e */ SETYPE_ITEM_GET,
/* dItemNo_SPINNER_e */ SETYPE_ITEM_GET,
/* dItemNo_IRONBALL_e */ SETYPE_ITEM_GET,
/* dItemNo_BOW_e */ SETYPE_ITEM_GET,
/* dItemNo_HOOKSHOT_e */ SETYPE_ITEM_GET,
/* dItemNo_HVY_BOOTS_e */ SETYPE_ITEM_GET,
/* dItemNo_COPY_ROD_e */ SETYPE_ITEM_GET,
/* dItemNo_W_HOOKSHOT_e */ SETYPE_ITEM_GET,
/* dItemNo_KANTERA_e */ SETYPE_ITEM_GET,
/* dItemNo_LIGHT_SWORD_e */ SETYPE_ITEM_GET,
/* dItemNo_FISHING_ROD_1_e */ SETYPE_ITEM_GET,
/* dItemNo_PACHINKO_e */ SETYPE_ITEM_GET,
/* dItemNo_COPY_ROD_2_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_77_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_78_e */ SETYPE_NONE,
/* dItemNo_BOMB_BAG_LV2_e */ SETYPE_ITEM_GET,
/* dItemNo_BOMB_BAG_LV1_e */ SETYPE_ITEM_GET,
/* dItemNo_BOMB_IN_BAG_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_82_e */ SETYPE_NONE,
/* dItemNo_LIGHT_ARROW_e */ SETYPE_NONE,
/* dItemNo_ARROW_LV1_e */ SETYPE_NONE,
/* dItemNo_ARROW_LV2_e */ SETYPE_ITEM_GET,
/* dItemNo_ARROW_LV3_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_87_e */ SETYPE_NONE,
/* dItemNo_LURE_ROD_e */ SETYPE_NONE,
/* dItemNo_BOMB_ARROW_e */ SETYPE_NONE,
/* dItemNo_HAWK_ARROW_e */ SETYPE_NONE,
/* dItemNo_BEE_ROD_e */ SETYPE_NONE,
/* dItemNo_JEWEL_ROD_e */ SETYPE_NONE,
/* dItemNo_WORM_ROD_e */ SETYPE_NONE,
/* dItemNo_JEWEL_BEE_ROD_e */ SETYPE_NONE,
/* dItemNo_JEWEL_WORM_ROD_e */ SETYPE_NONE,
/* dItemNo_EMPTY_BOTTLE_e */ SETYPE_ITEM_GET,
/* dItemNo_RED_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_GREEN_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BLUE_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
#if PLATFORM_SHIELD
/* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET,
/* dItemNo_MILK_BOTTLE_e */ SETYPE_ITEM_GET,
#else
/* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* dItemNo_MILK_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
#endif
/* fpcNm_ITEM_HALF_MILK_BOTTLE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_OIL_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_WATER_BOTTLE */ SETYPE_NONE,
/* fpcNm_ITEM_OIL_BOTTLE_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_RED_BOTTLE_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_UGLY_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_HOT_SPRING */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_FAIRY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_HOT_SPRING_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_OIL2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_OIL */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_NORMAL_BOMB */ SETYPE_NONE,
/* fpcNm_ITEM_WATER_BOMB */ SETYPE_NONE,
/* fpcNm_ITEM_POKE_BOMB */ SETYPE_NONE,
/* fpcNm_ITEM_FAIRY_DROP */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WORM */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_DROP_BOTTLE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BEE_CHILD */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_RARE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_CHUCHU_RED */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_BLUE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_GREEN */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_YELLOW */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_PURPLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV1_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV2_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV3_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LETTER */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BILL */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_WOOD_STATUE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_IRIAS_PENDANT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_HORSE_FLUTE */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_133 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_134 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_135 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_136 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_137 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_138 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_139 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_140 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_141 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_142 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_143 */ SETYPE_NONE,
/* fpcNm_ITEM_RAFRELS_MEMO */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_ASHS_SCRIBBLING */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_NOENTRY_146 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_147 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_148 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_149 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_150 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_151 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_152 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_153 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_154 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_155 */ SETYPE_NONE,
/* fpcNm_ITEM_CHUCHU_YELLOW2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_OIL_BOTTLE3 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SHOP_BEE_CHILD */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_BLACK */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LIGHT_DROP */ SETYPE_NONE,
/* fpcNm_ITEM_DROP_CONTAINER */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DROP_CONTAINER02 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DROP_CONTAINER03 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_FILLED_CONTAINER */ SETYPE_NONE,
/* fpcNm_ITEM_MIRROR_PIECE_2 */ SETYPE_NONE,
/* fpcNm_ITEM_MIRROR_PIECE_3 */ SETYPE_NONE,
/* fpcNm_ITEM_MIRROR_PIECE_4 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_168 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_169 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_170 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_171 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_172 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_173 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_174 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_175 */ SETYPE_NONE,
/* fpcNm_ITEM_SMELL_YELIA_POUCH */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_PUMPKIN */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_POH */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_FISH */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_CHILDREN */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_MEDICINE */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_NOENTRY_182 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_183 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_184 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_185 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_186 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_187 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_188 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_189 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_190 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_191 */ SETYPE_NONE,
/* fpcNm_ITEM_M_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_BUTTERFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_BUTTERFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_STAG_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_STAG_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_GRASSHOPPER */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_GRASSHOPPER */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_NANAFUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_NANAFUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_DANGOMUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_DANGOMUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_MANTIS */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_MANTIS */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_LADYBUG */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_LADYBUG */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_SNAIL */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_SNAIL */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_DRAGONFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_DRAGONFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_ANT */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_ANT */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_MAYFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_MAYFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_NOENTRY_216 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_217 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_218 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_219 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_220 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_221 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_222 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_223 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_SPIRIT */ SETYPE_ITEM_GET_POU,
/* fpcNm_ITEM_NOENTRY_225 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_226 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_227 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_228 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_229 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_230 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_231 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_232 */ SETYPE_NONE,
/* fpcNm_ITEM_ANCIENT_DOCUMENT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_AIR_LETTER */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_ANCIENT_DOCUMENT2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_LV7_DUNGEON_EXIT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LINKS_SAVINGS */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_SMALL_KEY2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_POU_FIRE1 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_FIRE2 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_FIRE3 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_FIRE4 */ SETYPE_NONE,
/* fpcNm_ITEM_BOSSRIDER_KEY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_TOMATO_PUREE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_TASTE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_LV5_BOSS_KEY */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SURFBOARD */ SETYPE_NONE,
/* fpcNm_ITEM_KANTERA2 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_L2_KEY_PIECES1 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_L2_KEY_PIECES2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_L2_KEY_PIECES3 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_KEY_OF_CARAVAN */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV2_BOSS_KEY */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_KEY_OF_FILONE */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HALF_MILK_BOTTLE_e */ SETYPE_ITEM_GET,
/* dItemNo_OIL_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_WATER_BOTTLE_e */ SETYPE_NONE,
/* dItemNo_OIL_BOTTLE_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_RED_BOTTLE_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_UGLY_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HOT_SPRING_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_FAIRY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HOT_SPRING_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_OIL2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_OIL_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_NORMAL_BOMB_e */ SETYPE_NONE,
/* dItemNo_WATER_BOMB_e */ SETYPE_NONE,
/* dItemNo_POKE_BOMB_e */ SETYPE_NONE,
/* dItemNo_FAIRY_DROP_e */ SETYPE_ITEM_GET,
/* dItemNo_WORM_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_DROP_BOTTLE_e */ SETYPE_ITEM_GET,
/* dItemNo_BEE_CHILD_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_RARE_e */ SETYPE_ITEM_GET,
/* dItemNo_CHUCHU_RED_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_BLUE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_GREEN_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_YELLOW_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_PURPLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV1_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV2_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV3_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LETTER_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BILL_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_WOOD_STATUE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_IRIAS_PENDANT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HORSE_FLUTE_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_133_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_134_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_135_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_136_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_137_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_138_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_139_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_140_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_141_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_142_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_143_e */ SETYPE_NONE,
/* dItemNo_RAFRELS_MEMO_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_ASHS_SCRIBBLING_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_NOENTRY_146_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_147_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_148_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_149_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_150_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_151_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_152_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_153_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_154_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_155_e */ SETYPE_NONE,
/* dItemNo_CHUCHU_YELLOW2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_OIL_BOTTLE3_e */ SETYPE_ITEM_GET,
/* dItemNo_SHOP_BEE_CHILD_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_BLACK_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LIGHT_DROP_e */ SETYPE_NONE,
/* dItemNo_DROP_CONTAINER_e */ SETYPE_ITEM_GET,
/* dItemNo_DROP_CONTAINER02_e */ SETYPE_ITEM_GET,
/* dItemNo_DROP_CONTAINER03_e */ SETYPE_ITEM_GET,
/* dItemNo_FILLED_CONTAINER_e */ SETYPE_NONE,
/* dItemNo_MIRROR_PIECE_2_e */ SETYPE_NONE,
/* dItemNo_MIRROR_PIECE_3_e */ SETYPE_NONE,
/* dItemNo_MIRROR_PIECE_4_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_168_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_169_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_170_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_171_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_172_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_173_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_174_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_175_e */ SETYPE_NONE,
/* dItemNo_SMELL_YELIA_POUCH_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_PUMPKIN_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_POH_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_FISH_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_CHILDREN_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_MEDICINE_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_NOENTRY_182_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_183_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_184_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_185_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_186_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_187_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_188_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_189_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_190_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_191_e */ SETYPE_NONE,
/* dItemNo_M_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_BUTTERFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_BUTTERFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_STAG_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_STAG_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_GRASSHOPPER_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_GRASSHOPPER_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_NANAFUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_NANAFUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_DANGOMUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_DANGOMUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_MANTIS_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_MANTIS_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_LADYBUG_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_LADYBUG_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_SNAIL_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_SNAIL_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_DRAGONFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_DRAGONFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_ANT_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_ANT_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_MAYFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_MAYFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_NOENTRY_216_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_217_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_218_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_219_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_220_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_221_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_222_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_223_e */ SETYPE_NONE,
/* dItemNo_POU_SPIRIT_e */ SETYPE_ITEM_GET_POU,
/* dItemNo_NOENTRY_225_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_226_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_227_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_228_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_229_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_230_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_231_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_232_e */ SETYPE_NONE,
/* dItemNo_ANCIENT_DOCUMENT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_AIR_LETTER_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_ANCIENT_DOCUMENT2_e */ SETYPE_ITEM_GET,
/* dItemNo_LV7_DUNGEON_EXIT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LINKS_SAVINGS_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_SMALL_KEY2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_POU_FIRE1_e */ SETYPE_NONE,
/* dItemNo_POU_FIRE2_e */ SETYPE_NONE,
/* dItemNo_POU_FIRE3_e */ SETYPE_NONE,
/* dItemNo_POU_FIRE4_e */ SETYPE_NONE,
/* dItemNo_BOSSRIDER_KEY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_TOMATO_PUREE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_TASTE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_LV5_BOSS_KEY_e */ SETYPE_ITEM_GET,
/* dItemNo_SURFBOARD_e */ SETYPE_NONE,
/* dItemNo_KANTERA2_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_L2_KEY_PIECES1_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_L2_KEY_PIECES2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_L2_KEY_PIECES3_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_KEY_OF_CARAVAN_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV2_BOSS_KEY_e */ SETYPE_ITEM_GET,
/* dItemNo_KEY_OF_FILONE_e */ SETYPE_ITEM_GET_MINI,
};
static u32 const bgmLabel[8] = {
@@ -2232,8 +2232,8 @@ void daAlink_c::setGetSubBgm(int i_itemNo) {
BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const {
static const int dummy = 0;
if (i_itemNo == fpcNm_ITEM_LINKS_SAVINGS) {
i_itemNo = fpcNm_ITEM_PURPLE_RUPEE;
if (i_itemNo == dItemNo_LINKS_SAVINGS_e) {
i_itemNo = dItemNo_PURPLE_RUPEE_e;
}
i_itemNo -= 4;
@@ -2264,9 +2264,9 @@ int daAlink_c::procCoGetItemInit() {
mLinkAcch.ClrWallNone();
if (!checkWolf() && mEquipItem != fpcNm_ITEM_NONE && var_r30 == 0) {
if (!checkWolf() && mEquipItem != dItemNo_NONE_e && var_r30 == 0) {
if (checkModeFlg(0x400) ||
(checkStageName("D_MN05B") && mEquipItem == fpcNm_ITEM_BOOMERANG && !dComIfGs_isItemFirstBit(fpcNm_ITEM_BOOMERANG)))
(checkStageName("D_MN05B") && mEquipItem == dItemNo_BOOMERANG_e && !dComIfGs_isItemFirstBit(dItemNo_BOOMERANG_e)))
{
deleteEquipItem(FALSE, FALSE);
} else {
@@ -2426,8 +2426,8 @@ int daAlink_c::procCoGetItem() {
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
#if DEBUG
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM &&
fopAcM_GetName(item_partner_p) != PROC_Demo_Item)
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != fpcNm_ITEM_e &&
fopAcM_GetName(item_partner_p) != fpcNm_Demo_Item_e)
{
// "Get Item is not an item!!! %d\n"
OSReport("ゲットするアイテムがアイテムじゃない！！！　%d\n",
@@ -2559,7 +2559,7 @@ int daAlink_c::procCoGetItem() {
if (checkWolf()) {
setBlendWolfMoveAnime(mpHIO->mWolf.mWlMove.m.mNormalInterpolation);
} else {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
field_0x2f94 = 0;
}
@@ -2889,7 +2889,7 @@ int daAlink_c::procDemoBoomerangCatchInit() {
mNormalSpeed = 0.0f;
deleteEquipItem(FALSE, FALSE);
mEquipItem = fpcNm_ITEM_BOOMERANG;
mEquipItem = dItemNo_BOOMERANG_e;
setItemActor();
setSingleAnimeParam(ANM_BOOMERANG_CATCH, &mpHIO->mItem.mBoomerang.m.mCatchAnm);
return 1;
@@ -3511,7 +3511,7 @@ int daAlink_c::procCoGetReadySitInit() {
return 1;
}
if (mEquipItem != fpcNm_ITEM_NONE && !checkWolf()) {
if (mEquipItem != dItemNo_NONE_e && !checkWolf()) {
return procPreActionUnequipInit(PROC_GET_READY_SIT, NULL);
}
@@ -3795,8 +3795,8 @@ int daAlink_c::procTradeItemOut() {
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
if (item_partner_p != NULL) {
if (!fpcM_IsCreating(fpcM_GetID(item_partner_p))) {
if (fopAcM_GetName(item_partner_p) == PROC_ITEM ||
fopAcM_GetName(item_partner_p) == PROC_Demo_Item)
if (fopAcM_GetName(item_partner_p) == fpcNm_ITEM_e ||
fopAcM_GetName(item_partner_p) == fpcNm_Demo_Item_e)
{
field_0x280c.setData(item_partner_p);
item_partner_p->show();
@@ -3828,8 +3828,8 @@ int daAlink_c::procTradeItemOut() {
}
BOOL daAlink_c::checkLetterItem(int i_itemNo) {
return i_itemNo == fpcNm_ITEM_LETTER || i_itemNo == fpcNm_ITEM_BILL || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO ||
i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING;
return i_itemNo == dItemNo_LETTER_e || i_itemNo == dItemNo_BILL_e || i_itemNo == dItemNo_RAFRELS_MEMO_e ||
i_itemNo == dItemNo_TKS_LETTER_e || i_itemNo == dItemNo_ASHS_SCRIBBLING_e;
}
int daAlink_c::procNotUseItemInit(int i_itemNo) {
@@ -3871,8 +3871,8 @@ int daAlink_c::procNotUseItem() {
if (mProcVar3.field_0x300e != 0) {
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
#if DEBUG
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM &&
fopAcM_GetName(item_partner_p) != PROC_Demo_Item)
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != fpcNm_ITEM_e &&
fopAcM_GetName(item_partner_p) != fpcNm_Demo_Item_e)
{
// "Present Item is not this Item!!! %d\n"
OSReport("差し出すアイテムがアイテムじゃない！！！　%d\n",
@@ -4102,11 +4102,11 @@ int daAlink_c::procDungeonWarpReadyInit() {
}
fpc_ProcID id;
if (checkItemSetButton(fpcNm_ITEM_DUNGEON_EXIT) != 2) {
id = fopAcM_create(PROC_OBJ_TKS, 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
if (checkItemSetButton(dItemNo_DUNGEON_EXIT_e) != 2) {
id = fopAcM_create(fpcNm_OBJ_TKS_e, 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
NULL, -1);
} else {
id = fopAcM_create(PROC_NPC_TKC, 2, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
id = fopAcM_create(fpcNm_NPC_TKC_e, 2, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
NULL, -1);
}
@@ -4132,7 +4132,7 @@ int daAlink_c::procDungeonWarpReady() {
if (warpActor != NULL) {
field_0x280c.setData(warpActor);
if (fopAcM_GetName(warpActor) == PROC_OBJ_TKS) {
if (fopAcM_GetName(warpActor) == fpcNm_OBJ_TKS_e) {
((daObjTks_c*)warpActor)->setStart();
} else {
((daNpcTkc_c*)warpActor)->setStart();
@@ -4190,7 +4190,7 @@ int daAlink_c::procDungeonWarp() {
if (scale.x < 0.01f) {
onNoResetFlg0(FLG0_PLAYER_NO_DRAW);
if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) {
if (checkItemGet(dItemNo_DUNGEON_EXIT_e, 1)) {
dStage_changeScene(dStage_stagInfo_GetEscapeWarp(dComIfGp_getStage()->getStagInfo()), 0.0f, 12, -1, shape_angle.y, -1);
dMeter2Info_warpOutProc();
} else {
@@ -4280,7 +4280,7 @@ int daAlink_c::procDungeonWarpSceneStart() {
static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* i_actor, void* i_data) {
cXyz* pos = (cXyz*)i_data;
if (fopAcM_GetName(i_actor) == PROC_KYTAG04) {
if (fopAcM_GetName(i_actor) == fpcNm_KYTAG04_e) {
if (i_actor->current.pos.abs2XZ(*pos) < 1.0f) {
return i_actor;
}
@@ -4521,11 +4521,11 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
}
}
if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1) ||
(checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) &&
if (checkItemGet(dItemNo_DUNGEON_EXIT_e, 1) ||
(checkItemGet(dItemNo_DUNGEON_BACK_e, 1) &&
strcmp(stageName, dComIfGs_getWarpStageName()) == 0))
{
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE);
dComIfGs_setItem(SLOT_18, dItemNo_NONE_e);
dComIfGs_resetLastWarpAcceptStage();
}
}
src/d/actor/d_a_alink_effect.inc
+4 -4
View File
@@ -1393,7 +1393,7 @@ void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& i_linchk) {
const u16* effNames;
s16 movebg_name = getMoveBGActorName(i_linchk, TRUE);
if (movebg_name == PROC_Obj_GanonWall2 || movebg_name == PROC_OBJ_GB) {
if (movebg_name == fpcNm_Obj_GanonWall2_e || movebg_name == fpcNm_OBJ_GB_e) {
effNames = ganonNameID;
} else {
effNames = normalNameID;
@@ -1664,7 +1664,7 @@ void daAlink_c::setBottleEffect() {
JPABaseEmitter* emitter;
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
if (mpHookTipModel != NULL) {
cXyz pos;
mDoMtx_multVecZero(mpHookTipModel->getAnmMtx(2), &pos);
@@ -1676,7 +1676,7 @@ void daAlink_c::setBottleEffect() {
emitter = setEmitter(&field_0x325c, ID_ZF_J_FAIRYITEM02_STAR, &pos, NULL);
}
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE && mProcID == PROC_BOTTLE_GET) {
} else if (mEquipItem == dItemNo_CHUCHU_RARE_e && mProcID == PROC_BOTTLE_GET) {
if (field_0x072c != NULL && field_0x072c->getFrame() < 2.0f) {
cXyz pos;
mDoMtx_multVec(mHeldItemModel->getAnmMtx(0), &chuchuLocalOffset, &pos);
@@ -1686,7 +1686,7 @@ void daAlink_c::setBottleEffect() {
emitter->setGlobalScale(chuchuScale);
}
}
} else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
} else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == dItemNo_WATER_BOTTLE_e) {
emitter = setEmitter(&field_0x325c, ID_ZI_J_LK_BINWATERN_A, &current.pos, NULL);
if (emitter != NULL) {
emitter->setGlobalRTMatrix(mHeldItemModel->getBaseTRMtx());
src/d/actor/d_a_alink_grab.inc
+66 -66
View File
@@ -11,7 +11,7 @@
static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor) {
daObjCarry_c* carry = (daObjCarry_c*)i_actor;
if (fopAcM_GetName(carry) == PROC_Obj_Carry &&
if (fopAcM_GetName(carry) == fpcNm_Obj_Carry_e &&
carry->getType() == daObjCarry_c::TYPE_BALL_S)
{
return true;
@@ -23,7 +23,7 @@ static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor) {
static bool daAlink_checkLightBallB(fopAc_ac_c* i_actor) {
daObjCarry_c* carry = (daObjCarry_c*)i_actor;
if (fopAcM_GetName(carry) == PROC_Obj_Carry &&
if (fopAcM_GetName(carry) == fpcNm_Obj_Carry_e &&
carry->getType() == daObjCarry_c::TYPE_BALL_S_2)
{
return true;
@@ -85,7 +85,7 @@ BOOL daAlink_c::exchangeGrabActor(fopAc_ac_c* i_actor) {
BOOL daAlink_c::setForceGrab(fopAc_ac_c* i_actor, BOOL param_1, BOOL param_2) {
if (((param_1 || !checkEventRun()) && !checkWolf())
&& ((mEquipItem == fpcNm_ITEM_NONE || (param_2 && checkHookshotItem(mEquipItem)))
&& ((mEquipItem == dItemNo_NONE_e || (param_2 && checkHookshotItem(mEquipItem)))
&& ((checkModeFlg(MODE_UNK_10000000)
&& (checkHorseNoUpperAnime() || checkHorseTurnAnime())
)
@@ -133,7 +133,7 @@ BOOL daAlink_c::checkGrabSlowMoveActor() {
daObjCarry_c* carry = (daObjCarry_c*)mGrabItemAcKeep.getActor();
return carry != NULL &&
(fopAcM_CheckCarryType(carry, fopAcM_CARRY_HEAVY) ||
(fopAcM_GetName(carry) == PROC_Obj_Carry
(fopAcM_GetName(carry) == fpcNm_Obj_Carry_e
&& (carry->getType() == daObjCarry_c::TYPE_OOTSUBO || carry->getType() == daObjCarry_c::TYPE_AOTSUBO || carry->getType() == daObjCarry_c::TYPE_TARU)));
}
@@ -177,8 +177,8 @@ void daAlink_c::setGrabUpperAnime(f32 param_0) {
BOOL daAlink_c::checkGrabRooster() {
if (mGrabItemAcKeep.getActor() != NULL &&
(fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NI ||
fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NPC_TKJ2))
(fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NI_e ||
fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NPC_TKJ2_e))
{
return true;
}
@@ -200,7 +200,7 @@ void daAlink_c::setGrabItemPos() {
grabActor->tevStr.room_no = roomNo;
grabActor->tevStr.YukaCol = tevStr.YukaCol;
fopAcM_SetRoomNo(grabActor, roomNo);
BOOL isGrabCarryActor = checkGrabCarryActor();
s16 spE;
s16 spC;
@@ -211,7 +211,7 @@ void daAlink_c::setGrabItemPos() {
spE = shape_angle.y;
spC = (field_0x2fee + field_0x3082);
}
if (checkGrabSideThrowAnime()) {
mDoMtx_multVecZero(mpLinkModel->getAnmMtx(10), &grabActor->current.pos);
grabActor->shape_angle.y = spE;
@@ -232,7 +232,7 @@ void daAlink_c::setGrabItemPos() {
mDoMtx_stack_c::transM(78.0f, 42.0f, 0.0f);
mDoMtx_stack_c::ZrotM(cM_deg2s(138.0f));
} else {
if (fopAcM_GetName(grabActor) == PROC_OBJ_FOOD) {
if (fopAcM_GetName(grabActor) == fpcNm_OBJ_FOOD_e) {
mDoMtx_stack_c::transM(32.0f, 7.0f, 0.0f);
} else {
mDoMtx_stack_c::transM(30.0f, 12.0f, 0.0f);
@@ -244,7 +244,7 @@ void daAlink_c::setGrabItemPos() {
mDoMtx_stack_c::multVecZero(&grabActor->current.pos);
mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &grabActor->shape_angle);
} else {
BOOL sp14 = fopAcM_GetName(grabActor) == PROC_NPC_TKJ2;
BOOL sp14 = fopAcM_GetName(grabActor) == fpcNm_NPC_TKJ2_e;
if (mProcID == PROC_GRAB_UP) {
cLib_chaseAngleS(&grabActor->shape_angle.y, spE, 0x1000);
@@ -306,7 +306,7 @@ void daAlink_c::setGrabItemPos() {
}
mDoMtx_stack_c::multVec(&sp140, &grabActor->current.pos);
if (checkGrabAnimeSide()) {
static Vec const localSidePos = {2.3f, -15.5f, 15.6f};
mDoMtx_multVec(mpLinkModel->getAnmMtx(10), &localSidePos, &sp140);
@@ -398,7 +398,7 @@ void daAlink_c::freeGrabItem() {
if (grabActor != NULL) {
if (dComIfGp_event_runCheck() || mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SPECIAL_e) {
fopAcM_OnStatus(grabActor, fopAcM_STATUS_UNK_0x800);
fopAcM_OnStatus(grabActor, fopAcStts_STAFF_EXTRA_e);
}
fopAcM_cancelCarryNow(grabActor);
@@ -474,7 +474,7 @@ void daAlink_c::setGrabUpperSpeedRate() {
}
cLib_chaseF(&field_0x33e8, var_f31, 0.15f);
daPy_frameCtrl_c* framectrl = &mUpperFrameCtrl[2];
framectrl->setFrame(field_0x33e8 * framectrl->getEnd());
getNowAnmPackUpper(UPPER_2)->setFrame(framectrl->getFrame());
@@ -490,7 +490,7 @@ void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) {
field_0x312a[1].set(0, temp_r29 + (2000.0f * param_1), temp_r29 + (2000.0f * param_1));
field_0x3136[1].set(0, 0, temp_r29 - (3500.0f * param_1));
if (param_1 < 0.0f) {
ANGLE_ADD(field_0x312a[0].z, 2500.0f * param_1);
ANGLE_ADD(field_0x3136[0].y, 2000.0f * param_1);
@@ -516,7 +516,7 @@ BOOL daAlink_c::checkNextActionGrab() {
setCarryArmAngle(0.0f, 1.0f);
if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == fopAc_attn_DOOR_e && fopAcM_CheckStatus(grabActor, fopAcM_STATUS_UNK_0x2000000)) {
if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == fopAc_attn_DOOR_e && fopAcM_CheckStatus(grabActor, fopAcStts_UNK_0x2000000_e)) {
setDoStatus(BUTTON_STATUS_OPEN);
} else if ((field_0x27f4 == NULL) || !checkGrabTalkActor(field_0x27f4) || !setTalkStatus()) {
if (checkModeFlg(0x400)) {
@@ -539,7 +539,7 @@ BOOL daAlink_c::checkNextActionGrab() {
daNbomb_c* var_r28 = (daNbomb_c*)grabActor;
if (doTrigger()
|| (fopAcM_GetName(grabActor) == PROC_NBOMB
|| (fopAcM_GetName(grabActor) == fpcNm_NBOMB_e
&& var_r28->checkPlayerMake()
&& (checkSetItemTrigger(0x50) || (var_r28->checkWaterBomb() && checkSetItemTrigger(0x71)) || (!var_r28->checkWaterBomb() && checkSetItemTrigger(0x70)))
)
@@ -688,13 +688,13 @@ void daAlink_c::setGrabItemActor(fopAc_ac_c* i_actor) {
mObjGndChk.ClrLink();
s16 name = fopAcM_GetName(i_actor);
if (dBomb_c::checkBombActor(i_actor) || name == PROC_Obj_Stone) {
if (dBomb_c::checkBombActor(i_actor) || name == fpcNm_Obj_Stone_e) {
mObjLinChk.SetBomb();
mObjGndChk.SetBomb();
} else if (name == PROC_CSTATUE) {
} else if (name == fpcNm_CSTATUE_e) {
mObjLinChk.SetStatue();
mObjGndChk.SetStatue();
} else if (name == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_ironball()) {
} else if (name == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->prm_chk_type_ironball()) {
mObjLinChk.SetLink();
mObjGndChk.SetLink();
} else {
@@ -708,7 +708,7 @@ int daAlink_c::procGrabReadyInit() {
return checkWaitAction();
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_GRAB_READY, field_0x27f4);
}
@@ -734,7 +734,7 @@ int daAlink_c::procGrabReadyInit() {
field_0x347c = 1.0f / (9.0f - mpHIO->mGrab.m.mFailAnm.mStartFrame);
f32 var_f31;
if (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_DO) {
if (fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_DO_e) {
var_f31 = 0.93f;
} else {
var_f31 = 1.0f;
@@ -1182,7 +1182,7 @@ int daAlink_c::procInsectCatchInit() {
return checkWaitAction();
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_INSECT_CATCH, field_0x27f4);
}
@@ -1220,12 +1220,12 @@ int daAlink_c::procPickUpInit() {
return checkWaitAction();
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_PICK_UP, field_0x27f4);
}
s16 temp_r3 = fopAcM_GetName(field_0x27f4);
if (temp_r3 == PROC_NPC_KS && !dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
if (temp_r3 == fpcNm_NPC_KS_e && !dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
return checkWaitAction();
}
@@ -1248,13 +1248,13 @@ int daAlink_c::procPickUpInit() {
}
BOOL var_r29;
if (temp_r3 == PROC_Obj_Kantera) {
if (temp_r3 == fpcNm_Obj_Kantera_e) {
setSingleAnimeParam(ANM_BOTTLE_SWING, &mpHIO->mItem.mBottle.m.mSwingSideAnm);
mProcVar3.field_0x300e = 1;
field_0x3478 = 7.0f;
mProcVar4.field_0x3010 = 0;
var_r29 = FALSE;
} else if (temp_r3 == PROC_NPC_KS) {
} else if (temp_r3 == fpcNm_NPC_KS_e) {
setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &mpHIO->mItem.mBottle.m.mSwingDownAnm);
mProcVar3.field_0x300e = 1;
field_0x3478 = 7.0f;
@@ -1290,7 +1290,7 @@ int daAlink_c::procPickUp() {
onResetFlg0(RFLG0_GRAB_UP_START);
if (mProcVar4.field_0x3010 != 0) {
mEquipItem = fpcNm_ITEM_KANTERA;
mEquipItem = dItemNo_KANTERA_e;
setKandelaarModel();
}
}
@@ -1311,7 +1311,7 @@ int daAlink_c::procPickUp() {
}
int daAlink_c::procPickPutInit(int param_0) {
if (param_0 != 0 && mEquipItem != fpcNm_ITEM_NONE) {
if (param_0 != 0 && mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_PICK_PUT, NULL);
}
@@ -1329,7 +1329,7 @@ int daAlink_c::procPickPutInit(int param_0) {
mProcVar2.field_0x300c = param_0;
if (mProcVar2.field_0x300c != 0) {
mEquipItem = fpcNm_ITEM_POKE_BOMB;
mEquipItem = dItemNo_POKE_BOMB_e;
} else {
onResetFlg0(RFLG0_GRAB_PUT_START);
}
@@ -1362,7 +1362,7 @@ int daAlink_c::procPickPut() {
dComIfGp_addSelectItemNum(mSelectItemId, -1);
field_0x2fcf++;
}
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
} else {
field_0x3198 = 0;
itemActor->speedF = 0.0f;
@@ -1391,7 +1391,7 @@ s16 daAlink_c::getChainStickAngleY(s16 param_0) const {
u8 daAlink_c::checkChainEmphasys() {
fopAc_ac_c* temp_r3 = field_0x2844.getActor();
if (temp_r3 != NULL && fopAcM_GetName(temp_r3) == PROC_Obj_SwChain && !((daObjSwChain_c*)temp_r3)->checkDispEmphasis()) {
if (temp_r3 != NULL && fopAcM_GetName(temp_r3) == fpcNm_Obj_SwChain_e && !((daObjSwChain_c*)temp_r3)->checkDispEmphasis()) {
return BUTTON_STATUS_FLAG_NONE;
}
@@ -1435,8 +1435,8 @@ bool daAlink_c::checkChainBlockPushPull() {
fopAc_ac_c* actor = field_0x2844.getActor();
if (actor != NULL) {
s16 name = fopAcM_GetName(actor);
if (name == PROC_Obj_ChainBlock || name == PROC_Obj_SwChain ||
name == PROC_Obj_ChainWall)
if (name == fpcNm_Obj_ChainBlock_e || name == fpcNm_Obj_SwChain_e ||
name == fpcNm_Obj_ChainWall_e)
{
return true;
}
@@ -1446,7 +1446,7 @@ bool daAlink_c::checkChainBlockPushPull() {
}
int daAlink_c::procFmChainUpInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_CHAIN_UP, NULL);
}
@@ -1574,7 +1574,7 @@ int daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel i_label, BOOL param_
BOOL daAlink_c::checkPushPullTurnBlock() {
s16 name = getMoveBGActorName(mPolyInfo1, 1);
return name == PROC_Obj_SwTurn || name == PROC_Obj_Lv6SwTurn || name == PROC_Obj_PushDoor || name == PROC_PushDoor || name == PROC_Obj_Ytaihou;
return name == fpcNm_Obj_SwTurn_e || name == fpcNm_Obj_Lv6SwTurn_e || name == fpcNm_Obj_PushDoor_e || name == fpcNm_PushDoor_e || name == fpcNm_Obj_Ytaihou_e;
}
BOOL daAlink_c::checkPullBehindWall() {
@@ -1619,12 +1619,12 @@ void daAlink_c::offGoatStopGame() {
BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* i_actor) {
s16 name = fopAcM_GetName(i_actor);
return name == PROC_E_GOB || (name == PROC_OBJ_GRA && checkSpecialNpc(i_actor)) ||
name == PROC_COW;
return name == fpcNm_E_GOB_e || (name == fpcNm_OBJ_GRA_e && checkSpecialNpc(i_actor)) ||
name == fpcNm_COW_e;
}
f32 daAlink_c::getGoatCatchDistance2() {
if (fopAcM_GetName(field_0x27f4) == PROC_B_MGN) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_B_MGN_e) {
return SQUARE(1000.0f);
}
@@ -1637,8 +1637,8 @@ int daAlink_c::endPushPull() {
f32 daAlink_c::getPushPullAnimeSpeed() {
f32 speed;
if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) ||
getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Bemos)
if ((getMoveBGActorName(mPolyInfo1, 0) == fpcNm_Obj_Movebox_e && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) ||
getMoveBGActorName(mPolyInfo1, 0) == fpcNm_Obj_Bemos_e)
{
if (checkWolf()) {
speed = mpHIO->mWolf.mWlPush.m.mHeavyPushAnmSpeed;
@@ -1655,7 +1655,7 @@ f32 daAlink_c::getPushPullAnimeSpeed() {
}
int daAlink_c::procCoPushPullWaitInit(int param_0) {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_PUSH_PULL_WAIT, NULL);
}
@@ -1703,7 +1703,7 @@ int daAlink_c::procCoPushPullWait() {
f32 temp_f31 = cLib_addCalc(&current.pos.x, field_0x37c8.x, 0.5f, 10.0f, 1.0f);
temp_f31 += cLib_addCalc(&current.pos.z, field_0x37c8.z, 0.5f, 10.0f, 1.0f);
if (temp_r28 == 0 && temp_f31 < 5.0f && checkNoUpperAnime()) {
current.pos.x = field_0x37c8.x;
current.pos.z = field_0x37c8.z;
@@ -1717,7 +1717,7 @@ int daAlink_c::procCoPushPullWait() {
} else if (checkInputOnR()) {
int direction = getDirectionFromShapeAngle();
if (direction == DIR_FORWARD) {
procCoPushMoveInit(0, getMoveBGActorName(mPolyInfo1, 1) == PROC_Obj_IceBlock);
procCoPushMoveInit(0, getMoveBGActorName(mPolyInfo1, 1) == fpcNm_Obj_IceBlock_e);
} else if (!checkWolf() && direction == DIR_BACKWARD) {
procPullMoveInit(0);
}
@@ -1968,7 +1968,7 @@ int daAlink_c::procPullMove() {
static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_COW) {
if (fopAcM_GetName(i_actor) == fpcNm_COW_e) {
return i_actor;
}
@@ -1984,9 +1984,9 @@ void daAlink_c::cancelGoronThrowEvent() {
void daAlink_c::setGoatStopGameFail(fopAc_ac_c* i_actor) {
s16 actor_name = fopAcM_GetName(i_actor);
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)i_actor)->setCrazyDash();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)i_actor)->setCrazyDash();
} else {
((fopEn_enemy_c*)i_actor)->setThrowModeDash();
@@ -2004,9 +2004,9 @@ void daAlink_c::setGoatStopGameFail(fopAc_ac_c* i_actor) {
if (checkGoatStopGame()) {
onNoResetFlg0(FLG0_GORON_UP_STOP_CANCEL);
} else {
if (!checkBootsOrArmorHeavy() && actor_name == PROC_OBJ_GRA) {
if (!checkBootsOrArmorHeavy() && actor_name == fpcNm_OBJ_GRA_e) {
setDamagePointNormal(2);
} else if (actor_name != PROC_COW) {
} else if (actor_name != fpcNm_COW_e) {
setDamagePointNormal(1);
}
@@ -2148,7 +2148,7 @@ int daAlink_c::procGoatMove() {
var_f30 = 1.0f;
framectrl->setLoop(framectrl->getStart());
}
framectrl->setRate(var_f30 * (mNormalSpeed / mMaxSpeed));
initBasAnime();
}
@@ -2172,15 +2172,15 @@ int daAlink_c::procGoatCatchInit(fopAc_ac_c* i_actor, f32 param_1) {
setDoStatus(BUTTON_STATUS_NONE);
return 0;
}
deleteEquipItem(TRUE, FALSE);
if (!dComIfGp_event_compulsory(this, NULL, 0xFFEF)) {
return 0;
}
mDemo.setSpecialDemoType();
i_actor->actor_status |= 0x800;
i_actor->actor_status |= fopAcStts_STAFF_EXTRA_e;
}
commonProcInit(PROC_GOAT_CATCH);
@@ -2215,9 +2215,9 @@ int daAlink_c::procGoatCatchInit(fopAc_ac_c* i_actor, f32 param_1) {
setSingleAnimeBase(ANM_COW_CATCH_START);
s16 actor_name = fopAcM_GetName(i_actor);
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)i_actor)->setCrazyCatch();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)i_actor)->setCrazyCatch();
} else {
((fopEn_enemy_c*)i_actor)->setThrowModeCatch();
@@ -2299,7 +2299,7 @@ int daAlink_c::procGoatCatch() {
field_0x2fe4 = shape_angle.y;
}
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
field_0x2f99 = 0x30;
setSingleAnimeBaseSpeed(ANM_WAIT_B, mpHIO->mMove.m.mWaitAnmSpeed, 3.0f);
offModeFlg(0x8000);
@@ -2351,16 +2351,16 @@ int daAlink_c::procGoatCatch() {
if (checkAnmEnd(framectrl)) {
setSingleAnimeBase(ANM_COW_CATCH);
}
field_0x2f9d = 0x60;
anm = ANM_COW_CATCH;
if (field_0x3198 > 0) {
field_0x3198 += 1;
cLib_chaseF(&mNormalSpeed, 30.0f, 1.0f);
} else {
f32 speed_step = 1.0f;
if ((actor_name == PROC_OBJ_GRA || actor_name == PROC_E_GOB) && !checkBootsOrArmorHeavy()) {
if ((actor_name == fpcNm_OBJ_GRA_e || actor_name == fpcNm_E_GOB_e) && !checkBootsOrArmorHeavy()) {
field_0x3198++;
} else if (checkInputOnR() && direction == DIR_FORWARD) {
speed_step += 1.0f;
@@ -2396,7 +2396,7 @@ int daAlink_c::procGoatCatch() {
field_0x2f99 = 4;
if (checkAnmEnd(framectrl)) {
if (actor_name == PROC_E_GOB && !checkBootsOrArmorHeavy()) {
if (actor_name == fpcNm_E_GOB_e && !checkBootsOrArmorHeavy()) {
setGoatStopGameFail(temp_r3);
return 1;
}
@@ -2406,18 +2406,18 @@ int daAlink_c::procGoatCatch() {
}
if (mProcVar3.field_0x300e == 2) {
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)temp_r3)->setCrazyThrowLeft();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)temp_r3)->setCrazyThrowLeft();
} else {
((fopEn_enemy_c*)temp_r3)->setThrowModeThrowLeft();
}
anm = ANM_COW_THROW_LEFT;
} else {
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)temp_r3)->setCrazyThrowRight();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)temp_r3)->setCrazyThrowRight();
} else {
((fopEn_enemy_c*)temp_r3)->setThrowModeThrowRight();
@@ -2436,7 +2436,7 @@ int daAlink_c::procGoatCatch() {
}
int daAlink_c::procGoatStrokeInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_GOAT_STROKE, field_0x27f4);
}
@@ -2469,7 +2469,7 @@ int daAlink_c::procGoatStroke() {
}
int daAlink_c::procGoronMoveInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_GORON_MOVE, NULL);
}
@@ -2510,7 +2510,7 @@ int daAlink_c::procGoronMove() {
current.angle.y = shape_angle.y + 0x4000;
}
if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) {
if (checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) {
return procBootsEquipInit();
}
src/d/actor/d_a_alink_guard.inc
+14 -14
View File
@@ -10,15 +10,15 @@
BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* i_actor) {
return i_actor != NULL
&& (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e || fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor));
&& (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e || fopAcM_GetName(i_actor) == fpcNm_E_ZH_e || checkSpecialNpc(i_actor));
}
BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) {
s16 name = fopAcM_GetName(i_actor);
return name == PROC_NPC_KAKASHI ||
(name == PROC_NPC_KN && static_cast<daNpc_Kn_c*>(i_actor)->checkBattleMode()) ||
(name == PROC_OBJ_GRA && !static_cast<daObj_GrA_c*>(i_actor)->checkNpcObjGra());
return name == fpcNm_NPC_KAKASHI_e ||
(name == fpcNm_NPC_KN_e && static_cast<daNpc_Kn_c*>(i_actor)->checkBattleMode()) ||
(name == fpcNm_OBJ_GRA_e && !static_cast<daObj_GrA_c*>(i_actor)->checkNpcObjGra());
}
BOOL daAlink_c::checkShieldAttackEmphasys() {
@@ -53,15 +53,15 @@ void daAlink_c::stickArrowIncrement(int param_0) {
if (arrow_num != 0) {
if (checkShieldGet()
#if !PLATFORM_SHIELD
&& checkItemGet(fpcNm_ITEM_BOW, true)
&& checkItemGet(dItemNo_BOW_e, true)
#endif
)
{
int arrow_type;
if (arrow_num == 1) {
arrow_type = fpcNm_ITEM_ARROW_1;
arrow_type = dItemNo_ARROW_1_e;
} else {
arrow_type = fpcNm_ITEM_ARROW_10;
arrow_type = dItemNo_ARROW_10_e;
}
dComIfGp_setItemArrowNumCount(arrow_num);
@@ -101,7 +101,7 @@ void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) {
field_0x2f7c[arrow_num] = 10;
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, fpcNm_ITEM_ARROW_10, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, dItemNo_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f);
}
if (param_1 && field_0x2fcb == 0 && !checkMagicArmorNoDamage()) {
@@ -186,7 +186,7 @@ void daAlink_c::setUpperGuardAnime(f32 param_0) {
void daAlink_c::setShieldGuard() {
f32 var_f31 = mNowAnmPackUpper[2].getRatio();
if ((mProcID == PROC_GUARD_SLIP && mEquipItem != fpcNm_ITEM_IRONBALL) || checkSmallUpperGuardAnime() ||
if ((mProcID == PROC_GUARD_SLIP && mEquipItem != dItemNo_IRONBALL_e) || checkSmallUpperGuardAnime() ||
(checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() &&
!checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() &&
!checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) &&
@@ -255,7 +255,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) {
const daAlinkHIO_anm_c* anmParams;
daAlink_ANM anm;
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
setSingleAnimeBase(ANM_IRONBALL_DEF);
setIronBallWaitUpperAnime(1);
mNowAnmPackUpper[2].setRatio(0.0f);
@@ -294,7 +294,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) {
mProcVar4.field_0x3010 = 0;
mProcVar5.field_0x3012 = 0;
if (i_objinf != NULL && i_objinf->GetTgHitAc() != NULL && fopAcM_GetName(i_objinf->GetTgHitAc()) == PROC_E_MM_MT && i_objinf->GetTgHitAc()->argument == 1) {
if (i_objinf != NULL && i_objinf->GetTgHitAc() != NULL && fopAcM_GetName(i_objinf->GetTgHitAc()) == fpcNm_E_MM_MT_e && i_objinf->GetTgHitAc()->argument == 1) {
if (checkBootsOrArmorHeavy()) {
mNormalSpeed = mpHIO->mGuard.m.mMagneHvyGuardSpeed;
mProcVar5.field_0x3012 = 1;
@@ -322,7 +322,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) {
}
int daAlink_c::procGuardSlip() {
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
if (mEquipItem != dItemNo_IRONBALL_e) {
setUpperGuardAnime(-1.0f);
}
@@ -356,7 +356,7 @@ int daAlink_c::procGuardSlip() {
onEndResetFlg1(ERFLG1_UNK_20);
}
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
mNowAnmPackUpper[2].setRatio(1.0f);
}
@@ -495,7 +495,7 @@ int daAlink_c::procGuardBreakInit() {
commonProcInit(PROC_GUARD_BREAK);
setSingleAnimeParam(ANM_GUARD_BREAK, &mpHIO->mGuard.m.mGuardBreakAnm);
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
deleteEquipItem(FALSE, FALSE);
}
src/d/actor/d_a_alink_hang.inc
+7 -7
View File
@@ -776,7 +776,7 @@ int daAlink_c::procHangWallCatch() {
}
int daAlink_c::procHangReadyInit() {
if (field_0x2f91 == 3 && mEquipItem != fpcNm_ITEM_NONE) {
if (field_0x2f91 == 3 && mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_HANG_READY, NULL);
} else if (mProcID == PROC_PREACTION_UNEQUIP) {
setFrontWallType();
@@ -822,7 +822,7 @@ int daAlink_c::procHangReady() {
}
int daAlink_c::procHangLeverDownInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_HANG_LEVER_DOWN, field_0x27f4);
}
@@ -881,7 +881,7 @@ int daAlink_c::procHangLeverDown() {
}
void daAlink_c::changeDragonActor(fopAc_ac_c* i_actor) {
if (field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == PROC_B_DR) {
if (field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == fpcNm_B_DR_e) {
field_0x280c.setData(i_actor);
}
}
@@ -892,7 +892,7 @@ int daAlink_c::setDragonHangPos() {
return 0;
}
if (fopAcM_GetName(dragon) == PROC_B_DR) {
if (fopAcM_GetName(dragon) == fpcNm_B_DR_e) {
mDoMtx_stack_c::copy(((daB_DR_c*)dragon)->getMtx());
} else {
mDoMtx_stack_c::copy(((daB_DRE_c*)dragon)->getMtx());
@@ -936,7 +936,7 @@ int daAlink_c::setBossBodyHangPos() {
int daAlink_c::procBossBodyHangInit(fopAc_ac_c* i_actor) {
commonProcInit(PROC_BOSS_BODY_HANG);
if (fopAcM_GetName(i_actor) == PROC_B_DR) {
if (fopAcM_GetName(i_actor) == fpcNm_B_DR_e) {
field_0x32cc = 1;
setSingleAnimeBase(ANM_DRAGON_HANG);
setJumpMode();
@@ -1294,7 +1294,7 @@ int daAlink_c::checkLadderFall() {
}
int daAlink_c::procLadderUpStartInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_LADDER_UP_START, NULL);
}
@@ -1400,7 +1400,7 @@ int daAlink_c::procLadderUpEnd() {
int daAlink_c::procLadderDownStartInit() {
onNoResetFlg3(FLG3_UNK_400000);
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_LADDER_DOWN_START, NULL);
}
src/d/actor/d_a_alink_hook.inc
+21 -21
View File
@@ -305,7 +305,7 @@ void daAlink_c::cancelHookshotCarry() {
}
void daAlink_c::changeHookshotDrawModel() {
if (mEquipItem == fpcNm_ITEM_HOOKSHOT && field_0x3020 == 1) {
if (mEquipItem == dItemNo_HOOKSHOT_e && field_0x3020 == 1) {
J3DModel* tmp = mHeldItemModel;
mHeldItemModel = field_0x0710;
field_0x0710 = tmp;
@@ -318,7 +318,7 @@ void daAlink_c::changeHookshotDrawModel() {
BOOL daAlink_c::checkHookshotRoofLv7Boss() {
return mCargoCarryAcKeep.getActor() != NULL &&
fopAcM_GetName(mCargoCarryAcKeep.getActor()) == PROC_B_DR;
fopAcM_GetName(mCargoCarryAcKeep.getActor()) == fpcNm_B_DR_e;
}
BOOL daAlink_c::checkChaseHookshot() {
@@ -335,8 +335,8 @@ BOOL daAlink_c::checkChaseHookshot() {
if (mTargetedActor != NULL) {
s16 actorName = fopAcM_GetName(mTargetedActor);
return field_0x2804 == mTargetedActor &&
(checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj ||
actorName == PROC_B_DR || actorName == PROC_E_PH);
(checkBossOctaIealRoom() || actorName == fpcNm_Obj_FallObj_e ||
actorName == fpcNm_B_DR_e || actorName == fpcNm_E_PH_e);
}
return false;
@@ -416,7 +416,7 @@ void daAlink_c::setHookshotModel() {
resetHookshotMode();
mpHookChain->setUserArea((uintptr_t)this);
field_0x2f94 = 1;
if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT) {
if (mEquipItem == dItemNo_W_HOOKSHOT_e) {
field_0x2f95 = 6;
}
@@ -462,7 +462,7 @@ void daAlink_c::setHookshotSight() {
mSight.onLockFlg();
if (mHookTargetAcKeep.getActor() != NULL &&
fopAcM_GetName(mHookTargetAcKeep.getActor()) == PROC_B_DR)
fopAcM_GetName(mHookTargetAcKeep.getActor()) == fpcNm_B_DR_e)
{
((daB_DR_c*)mHookTargetAcKeep.getActor())->onTarget();
}
@@ -757,14 +757,14 @@ int daAlink_c::setHookshotHangMoveBGCollect() {
field_0x3022 = sp8.y;
s16 movebg_name = getMoveBGActorName(*polyinfo, 1);
if (movebg_name == PROC_Obj_SwHang) {
if (movebg_name == fpcNm_Obj_SwHang_e) {
daObjSwHang_c* swhang = (daObjSwHang_c*)dComIfG_Bgsp().GetActorPointer(*polyinfo);
swhang->setHangPlayer();
f32 prev_y = mIronBallBgChkPos.y;
mIronBallBgChkPos.y = swhang->getHangPos().y;
current.pos.y += mIronBallBgChkPos.y - prev_y;
} else if (movebg_name == PROC_Obj_Chandelier) {
} else if (movebg_name == fpcNm_Obj_Chandelier_e) {
((daObjChandelier_c*)dComIfG_Bgsp().GetActorPointer(*polyinfo))->moveHookOn();
}
}
@@ -991,12 +991,12 @@ void daAlink_c::setHookshotPos() {
mHookshotTopPos = field_0x381c;
targetAc_p = mHookTargetAcKeep.getActor();
if (targetAc_p != NULL && (targetAc_p->actor_status & 0x280000)) {
if (targetAc_p != NULL && (targetAc_p->actor_status & (fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x80000_e))) {
mHookTargetAcKeep.setData(targetAc_p);
mIronBallCenterPos = mHookshotTopPos - targetAc_p->current.pos;
setHookshotCatchNow();
if (targetAc_p->actor_status & 0x200000) {
if (targetAc_p->actor_status & fopAcStts_UNK_0x200000_e) {
mItemMode = 5;
field_0x316c.set(field_0x301c, field_0x301e, 0);
mDoMtx_stack_c::ZrotS(-targetAc_p->shape_angle.z);
@@ -1338,7 +1338,7 @@ int daAlink_c::checkLandHookshotHang() {
((mProcID != PROC_HOOKSHOT_ROOF_SHOOT && mProcID != PROC_HOOKSHOT_WALL_SHOOT) ||
checkHookshotWait()) &&
(!checkHookshotRoofLv7Boss() || !checkEquipHeavyBoots()) &&
checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS))
checkSetItemTrigger(dItemNo_HVY_BOOTS_e))
{
if (dComIfGp_checkPlayerStatus1(0, 0x10000)) {
return procHookshotRoofBootsInit(mCargoCarryAcKeep.getActor());
@@ -1522,11 +1522,11 @@ int daAlink_c::procHookshotFly() {
if (targetAc_p != NULL) {
targetAc_name = fopAcM_GetName(targetAc_p);
} else {
targetAc_name = PROC_ALINK;
targetAc_name = fpcNm_ALINK_e;
}
BOOL var_r29 = FALSE;
if (targetAc_name == PROC_Obj_SwHang) {
if (targetAc_name == fpcNm_Obj_SwHang_e) {
int swhang_type = static_cast<daObjSwHang_c*>(targetAc_p)->getType();
if (swhang_type == 3 || swhang_type == 4) {
var_r29 = TRUE;
@@ -1557,15 +1557,15 @@ int daAlink_c::procHookshotFly() {
}
current.pos += field_0x37d4;
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) != 0) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) != 0) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
}
if (mItemMode != 5 && mItemMode != HS_MODE_FLY_e) {
if (targetAc_name == PROC_B_OB ||
(targetAc_name == PROC_B_DR && static_cast<daB_DR_c*>(targetAc_p)->isBack()))
if (targetAc_name == fpcNm_B_OB_e ||
(targetAc_name == fpcNm_B_DR_e && static_cast<daB_DR_c*>(targetAc_p)->isBack()))
{
dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f));
return procBossBodyHangInit(targetAc_p);
@@ -1619,7 +1619,7 @@ int daAlink_c::procHookshotFly() {
} else if (is_force_fall) {
procFallInit(1, 5.0f);
field_0x2f99 = 0x70;
} else if (targetAc_name == PROC_E_PH || targetAc_name == PROC_B_DR || var_r29) {
} else if (targetAc_name == fpcNm_E_PH_e || targetAc_name == fpcNm_B_DR_e || var_r29) {
procHookshotRoofWaitInit(1, targetAc_p, mProcVar5.field_0x3012);
} else if (var_r28 && dComIfG_Bgsp().GetMonkeyBarsCode(mPolyInfo2)) {
cXyz sp88;
@@ -1739,7 +1739,7 @@ int daAlink_c::procHookshotRoofWait() {
setShapeAngleToAtnActor(0);
if (mProcVar2.field_0x300c == 0) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e)) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
@@ -1754,7 +1754,7 @@ int daAlink_c::procHookshotRoofWait() {
mProcVar2.field_0x300c = 1;
}
} else if (!checkHookshotRoofLv7Boss()) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) || mProcVar5.field_0x3012 != 0) {
return procHookshotRoofShootInit(mCargoCarryAcKeep.getActor());
}
hookshotRoofTurn();
@@ -2000,7 +2000,7 @@ int daAlink_c::procHookshotWallWait() {
}
if (mProcVar2.field_0x300c == 0) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e)) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
@@ -2014,7 +2014,7 @@ int daAlink_c::procHookshotWallWait() {
setHookshotWallWaitAnime();
mProcVar2.field_0x300c = 1;
}
} else if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
} else if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) || mProcVar5.field_0x3012 != 0) {
return procHookshotWallShootInit();
}
src/d/actor/d_a_alink_horse.inc
+9 -9
View File
@@ -13,7 +13,7 @@
static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_E_WB) {
if (fopAcM_GetName(i_actor) == fpcNm_E_WB_e) {
if (((e_wb_class*)i_actor)->getModel() != NULL) {
return i_actor;
}
@@ -25,7 +25,7 @@ static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void* i_data) {
static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_NPC_COACH) {
if (fopAcM_GetName(i_actor) == fpcNm_NPC_COACH_e) {
return i_actor;
}
@@ -64,7 +64,7 @@ BOOL daAlink_c::checkCowGame() {
int daAlink_c::getReinRideDirection() {
s16 angle = fopAcM_searchActorAngleY(field_0x27f4, this) - field_0x27f4->shape_angle.y;
if (fopAcM_GetName(field_0x27f4) == PROC_HORSE && abs(angle) > 0x6800) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e && abs(angle) > 0x6800) {
return DIR_BACKWARD;
} else if (angle > 0) {
return DIR_LEFT;
@@ -99,7 +99,7 @@ int daAlink_c::checkReinRideBgCheck() {
int direction = getReinRideDirection();
const Vec* offset_p;
if (fopAcM_GetName(field_0x27f4) == PROC_HORSE) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) {
if (direction == DIR_BACKWARD) {
offset_p = &horseLocalBack;
} else if (direction == DIR_LEFT) {
@@ -206,7 +206,7 @@ void daAlink_c::rideGetOff() {
seStartOnlyReverb(Z2SE_AL_SPINNER_END);
} else if (checkCanoeRide()) {
if (mEquipItem == 0x10B) {
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
}
} else if (checkBoardRide()) {
static_cast<daObjIceLeaf_c*>(mRideAcKeep.getActor())->offRide();
@@ -1220,7 +1220,7 @@ int daAlink_c::checkHorseGetOffAndSetDoStatus() {
setDoStatus(BUTTON_STATUS_UNK_140);
}
} else if ((checkHorseNoUpperAnime() || checkEquipAnime()) && mMidnaTalkDelayTimer == 0 && !checkInputOnR() && isGetOff) {
if (mEquipItem == fpcNm_ITEM_NONE) {
if (mEquipItem == dItemNo_NONE_e) {
off_direction = checkHorseGetOffDirection();
if ((off_direction != DIR_LEFT || (checkHorseRide() && horse->checkEnemySearch())) && field_0x2fb4 == 0) {
if (!checkSpecialHorseRide()) {
@@ -1259,7 +1259,7 @@ int daAlink_c::setHorseGetOff(int param_0) {
int daAlink_c::procHorseRideInit() {
BOOL var_r25 = FALSE;
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
if (mEquipItem == 0x103) {
var_r25 = 1;
}
@@ -1272,7 +1272,7 @@ int daAlink_c::procHorseRideInit() {
MtxP rideMtx;
Vec* localRidePos_p;
u32 mode;
if (fopAcM_GetName(field_0x27f4) == PROC_HORSE) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) {
daHorse_c* horse = (daHorse_c*)field_0x27f4;
horse->onRideStartFlg();
rideMtx = horse->getRootMtx();
@@ -1519,7 +1519,7 @@ int daAlink_c::procHorseGetOffInit(int param_0) {
commonProcInit(PROC_HORSE_GETOFF);
resetUnderAnime(UNDER_2, -1.0f);
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
}
src/d/actor/d_a_alink_hvyboots.inc
+1 -1
View File
@@ -133,7 +133,7 @@ void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* i_polyinfo, int param_1) {
}
} else {
// D_MN54 is the E3 Goron Mines Demo map
if (checkStageName("D_MN54") && getMoveBGActorName(*i_polyinfo, TRUE) == PROC_Obj_MagneArm) {
if (checkStageName("D_MN54") && getMoveBGActorName(*i_polyinfo, TRUE) == fpcNm_Obj_MagneArm_e) {
fopAcM_onSwitch(this, 0x93);
}
src/d/actor/d_a_alink_iceleaf.inc
+2 -2
View File
@@ -10,7 +10,7 @@
static fopAc_ac_c* daAlink_searchIceLeaf(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_Obj_IceLeaf) {
if (fopAcM_GetName(i_actor) == fpcNm_Obj_IceLeaf_e) {
return i_actor;
}
@@ -29,7 +29,7 @@ bool daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& i_polyinfo) {
bool daAlink_c::checkBoardRestart() {
return (mRideStatus == 0 && mRideAcKeep.getActor() != NULL) &&
fopAcM_GetName(mRideAcKeep.getActor()) == PROC_Obj_IceLeaf;
fopAcM_GetName(mRideAcKeep.getActor()) == fpcNm_Obj_IceLeaf_e;
}
int daAlink_c::boardCommon(BOOL i_canMove) {
src/d/actor/d_a_alink_ironball.inc
+8 -8
View File
@@ -6,7 +6,7 @@
#include "d/actor/d_a_alink.h"
cXyz* daAlink_c::getIronBallCenterPos() {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
return &mIronBallCenterPos;
}
@@ -14,7 +14,7 @@ cXyz* daAlink_c::getIronBallCenterPos() {
}
int daAlink_c::getIronBallBgHit() const {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
return field_0x301c;
}
@@ -22,21 +22,21 @@ int daAlink_c::getIronBallBgHit() const {
}
bool daAlink_c::checkIronBallThrowMode() const {
return mEquipItem == fpcNm_ITEM_IRONBALL &&
return mEquipItem == dItemNo_IRONBALL_e &&
(mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 3);
}
bool daAlink_c::checkIronBallThrowReturnMode() const {
return mEquipItem == fpcNm_ITEM_IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 ||
return mEquipItem == dItemNo_IRONBALL_e && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 ||
mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 3);
}
bool daAlink_c::checkIronBallReturn() const {
return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 == 7;
return mEquipItem == dItemNo_IRONBALL_e && mItemVar0.field_0x3018 == 7;
}
bool daAlink_c::checkIronBallGroundStop() const {
return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 &&
return mEquipItem == dItemNo_IRONBALL_e && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 &&
field_0x301e < 10;
}
@@ -1003,7 +1003,7 @@ int daAlink_c::procIronBallThrowInit() {
int daAlink_c::procIronBallThrow() {
daPy_frameCtrl_c* framectrl = &mUnderFrameCtrl[0];
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
if (mEquipItem != dItemNo_IRONBALL_e) {
return checkWaitAction();
}
@@ -1061,7 +1061,7 @@ int daAlink_c::procIronBallReturnInit() {
int daAlink_c::procIronBallReturn() {
daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
if (mEquipItem != dItemNo_IRONBALL_e) {
return checkWaitAction();
}
src/d/actor/d_a_alink_kandelaar.inc
+10 -10
View File
@@ -13,7 +13,7 @@
static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_TAG_LANTERN) {
if (fopAcM_GetName(i_actor) == fpcNm_TAG_LANTERN_e) {
return i_actor;
}
@@ -24,7 +24,7 @@ static fopAc_ac_c* daAlink_searchTagKtOnFire(fopAc_ac_c* i_actor, void* i_data)
UNUSED(i_data);
daAlink_c* player_p = daAlink_getAlinkActorClass();
if (fopAcM_GetName(i_actor) == PROC_Tag_KtOnFire &&
if (fopAcM_GetName(i_actor) == fpcNm_Tag_KtOnFire_e &&
i_actor->current.pos.abs2(player_p->current.pos) < SQUARE(150.0f) &&
fopAcM_seenActorAngleY(player_p, i_actor) < 0x3000)
{
@@ -66,7 +66,7 @@ BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) {
void daAlink_c::checkWaterInKandelaar(f32 param_0) {
if (checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
deleteEquipItem(TRUE, TRUE);
} else {
offKandelaarModel();
@@ -82,7 +82,7 @@ void daAlink_c::offKandelaarModel() {
bool daAlink_c::checkUseKandelaar(int param_0) {
return (param_0 == 0 && checkNoResetFlg2(FLG2_UNK_1)) ||
(param_0 != 0 && mEquipItem == fpcNm_ITEM_KANTERA);
(param_0 != 0 && mEquipItem == dItemNo_KANTERA_e);
}
bool daAlink_c::checkKandelaarSwing(int param_0) const {
@@ -236,7 +236,7 @@ void daAlink_c::resetOilBottleModel() {
if (mProcVar3.field_0x300e != 0) {
setKandelaarModel();
mEquipItem = fpcNm_ITEM_KANTERA;
mEquipItem = dItemNo_KANTERA_e;
}
returnKeepItemData();
@@ -321,7 +321,7 @@ int daAlink_c::commonKandelaarPour(int param_0) {
}
void daAlink_c::initKandelaarSwing() {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
if (dComIfGs_getOil() != 0) {
mZ2Link.getKantera().startSound(Z2SE_AL_KANTERA_SWING, 0, mVoiceReverbIntensity);
} else {
@@ -349,10 +349,10 @@ int daAlink_c::procKandelaarSwingInit() {
fopAc_ac_c* catch_target_p = dComIfGp_att_getCatghTarget();
if (catch_target_p != NULL) {
s16 name = fopAcM_GetName(catch_target_p);
BOOL is_sm2 = name == PROC_E_SM2;
BOOL is_sm2 = name == fpcNm_E_SM2_e;
if (name == PROC_OBJ_OILTUBO ||
(name == PROC_TAG_SSDRINK && ((daTag_SSDrink_c*)catch_target_p)->checkShopOil()) ||
if (name == fpcNm_OBJ_OILTUBO_e ||
(name == fpcNm_TAG_SSDRINK_e && ((daTag_SSDrink_c*)catch_target_p)->checkShopOil()) ||
(is_sm2 && ((e_sm2_class*)catch_target_p)->checkYellow()))
{
return procBottleSwingInit(catch_target_p, is_sm2);
@@ -366,7 +366,7 @@ int daAlink_c::procKandelaarSwingInit() {
mNormalSpeed = 0.0f;
current.angle.y = shape_angle.y;
if ((mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_OBJ_WEB1) ||
if ((mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == fpcNm_OBJ_WEB1_e) ||
(checkStageName("F_SP108") &&
fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchTagKtOnFire, NULL) != NULL))
{
src/d/actor/d_a_alink_link.inc
+4 -4
View File
@@ -130,7 +130,7 @@ BOOL daAlink_c::setBodyAngleToCamera() {
}
s16 var_r29;
if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == fpcNm_ITEM_IRONBALL) {
if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == dItemNo_IRONBALL_e) {
var_r29 = -10000;
} else {
var_r29 = mpHIO->mItem.m.mItemFPUpMaxUnk;
@@ -164,7 +164,7 @@ BOOL daAlink_c::subjectCancelTrigger() {
BOOL daAlink_c::checkSubjectEnd(BOOL i_isPlaySe) {
setDoStatus(BUTTON_STATUS_BACK);
if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) {
if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(dItemNo_HAWK_EYE_e) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) {
if (i_isPlaySe) {
seStartSystem(Z2SE_SUBJ_VIEW_OUT);
}
@@ -177,7 +177,7 @@ BOOL daAlink_c::checkSubjectEnd(BOOL i_isPlaySe) {
}
void daAlink_c::searchPeepObj(fopAc_ac_c* i_actor, void* i_data) {
if (fopAcM_GetName(i_actor) == PROC_KYTAG05) {
if (fopAcM_GetName(i_actor) == fpcNm_KYTAG05_e) {
f32 var_f31 = current.pos.abs2(i_actor->current.pos);
if (var_f31 < field_0x3478) {
field_0x3478 = var_f31;
@@ -220,7 +220,7 @@ int daAlink_c::procCoSubjectivity() {
return 1;
}
if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE))) {
if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(dItemNo_HAWK_EYE_e))) {
seStartSystem(Z2SE_SUBJ_VIEW_OUT);
checkWaitAction();
} else if (!checkWolf() && (checkItemAction() || checkItemChangeFromButton())) {
src/d/actor/d_a_alink_spinner.inc
+3 -3
View File
@@ -96,7 +96,7 @@ void daAlink_c::setSpinnerSyncPos() {
int daAlink_c::procSpinnerReadyInit() {
fopAc_ac_c* spinner = (fopAc_ac_c*)fopAcM_fastCreate(
PROC_SPINNER, daSpinner_c::getWaitArg(), &current.pos, fopAcM_GetRoomNo(this),
fpcNm_SPINNER_e, daSpinner_c::getWaitArg(), &current.pos, fopAcM_GetRoomNo(this),
&shape_angle, NULL, -1, NULL, NULL);
if (spinner == NULL) {
@@ -191,7 +191,7 @@ int daAlink_c::procSpinnerWait() {
return procSmallJumpInit(2);
}
int itemSetBtn = checkItemSetButton(fpcNm_ITEM_SPINNER);
int itemSetBtn = checkItemSetButton(dItemNo_SPINNER_e);
if (mProcVar2.field_0x300c == 0) {
if (!itemButton()) {
mProcVar2.field_0x300c = 1;
@@ -211,7 +211,7 @@ int daAlink_c::procSpinnerWait() {
mProcVar3.field_0x300e = shape_angle.y;
}
} else {
if (checkSetItemTrigger(fpcNm_ITEM_SPINNER) || swordSwingTrigger() || itemSetBtn == 2) {
if (checkSetItemTrigger(dItemNo_SPINNER_e) || swordSwingTrigger() || itemSetBtn == 2) {
if (swordSwingTrigger()) {
swordEquip(0);
}
src/d/actor/d_a_alink_swim.inc
+7 -7
View File
@@ -12,7 +12,7 @@ BOOL daAlink_c::checkZoraWearMaskDraw() {
}
BOOL daAlink_c::checkAcceptUseItemInWater(u16 i_itemNo) const {
return i_itemNo == fpcNm_ITEM_HVY_BOOTS || i_itemNo == fpcNm_ITEM_WATER_BOMB || checkHookshotItem(i_itemNo);
return i_itemNo == dItemNo_HVY_BOOTS_e || i_itemNo == dItemNo_WATER_BOMB_e || checkHookshotItem(i_itemNo);
}
void daAlink_c::swimDeleteItem() {
@@ -324,7 +324,7 @@ int daAlink_c::checkNextActionSwim() {
}
if (mAttList != NULL && mAttList->mType == fopAc_attn_ETC_e && checkNoResetFlg0(FLG0_SWIM_UP) &&
fopAcM_GetName(field_0x27f4) == PROC_CANOE)
fopAcM_GetName(field_0x27f4) == fpcNm_CANOE_e)
{
setDoStatus(BUTTON_STATUS_GET_ON);
@@ -346,7 +346,7 @@ int daAlink_c::checkNextActionSwim() {
int daAlink_c::checkSwimAction(int param_0) {
f32 var_f31;
if (checkWolf()) {
if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_Obj_ITA) {
if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == fpcNm_Obj_ITA_e) {
var_f31 = 200.0f;
} else {
var_f31 = mpHIO->mWolf.mWlSwim.m.mStartHeight;
@@ -761,7 +761,7 @@ void daAlink_c::setSwimMoveAnime() {
if (checkBootsOrArmorHeavy()) {
anm = ANM_SWIM_WAIT;
mMaxSpeed = mpHIO->mSwim.m.mUnderwaterFallMaxSpeed;
if (mEquipItem != fpcNm_ITEM_NONE && !checkHookshotAnime()) {
if (mEquipItem != dItemNo_NONE_e && !checkHookshotAnime()) {
setDoStatus(BUTTON_STATUS_PUT_AWAY);
}
}
@@ -921,7 +921,7 @@ int daAlink_c::procSwimUp() {
setNormalSpeedF(0.0f, mpHIO->mSwim.m.mDeceleration);
if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) {
if (checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) {
setHeavyBoots(1);
}
@@ -1014,7 +1014,7 @@ int daAlink_c::procSwimWait() {
setSwimUpDownOffset();
if (checkEquipHeavyBoots() && mEquipItem != fpcNm_ITEM_NONE) {
if (checkEquipHeavyBoots() && mEquipItem != dItemNo_NONE_e) {
setDoStatus(BUTTON_STATUS_PUT_AWAY);
}
@@ -1373,7 +1373,7 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* i_hitObj) {
BOOL bvar4 = checkNoResetFlg0(FLG0_SWIM_UP)
|| ((i_hitObj != NULL && i_hitObj->GetTgHitAc() != NULL)
&& fopAcM_GetName(i_hitObj->GetTgHitAc()) == PROC_E_SG);
&& fopAcM_GetName(i_hitObj->GetTgHitAc()) == fpcNm_E_SG_e);
if (!getZoraSwim() && bvar4 && mProcID != PROC_SWIM_WAIT) {
return 1;
src/d/actor/d_a_alink_whistle.inc
+6 -6
View File
@@ -5,7 +5,7 @@
#include "d/actor/d_a_alink.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "d/actor/d_a_horse.h"
#include "d/actor/d_a_npc_tk.h"
#include "d/actor/d_a_obj_yobikusa.h"
@@ -23,7 +23,7 @@ static fopAc_ac_c* daAlink_searchWhistle(fopAc_ac_c* i_actor, void* i_data) {
static fopAc_ac_c* daAlink_searchHawk(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_NPC_TK) {
if (fopAcM_GetName(i_actor) == fpcNm_NPC_TK_e) {
return i_actor;
}
@@ -57,12 +57,12 @@ void daAlink_c::setHorseWhistleModel() {
mHeldItemModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_AL_PEND_e, 0x3000), 0);
mDoExt_setCurrentHeap(prev_heap);
mEquipItem = fpcNm_ITEM_HORSE_FLUTE;
mEquipItem = dItemNo_HORSE_FLUTE_e;
field_0x2f94 = 2;
}
int daAlink_c::procGrassWhistleGetInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_GRASS_WHISTLE_GET, field_0x27f4);
}
@@ -93,7 +93,7 @@ int daAlink_c::procGrassWhistleGet() {
if (checkAnmEnd(frameCtrl_p)) {
procGrassWhistleWaitInit(mProcVar2.field_0x300c, mProcVar3.field_0x300e,
mProcVar4.field_0x3010, mProcVar5.field_0x3012, &field_0x37c8);
} else if (mEquipItem == fpcNm_ITEM_NONE && frameCtrl_p->getFrame() >= 9.0f) {
} else if (mEquipItem == dItemNo_NONE_e && frameCtrl_p->getFrame() >= 9.0f) {
setGrassWhistleModel(mProcVar2.field_0x300c);
if (field_0x280c.getActor() != NULL) {
@@ -129,7 +129,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
field_0x32cc = 0x532;
} else {
setSingleAnimeBase(ANM_WAIT);
mKeepItem = fpcNm_ITEM_NONE;
mKeepItem = dItemNo_NONE_e;
if (param_0 == 0) {
field_0x3198 = 0x100;
src/d/actor/d_a_alink_wolf.inc
+54 -54
View File
@@ -824,7 +824,7 @@ void daAlink_c::setSpeedAndAngleWolfAtn() {
BOOL daAlink_c::checkWolfAtnWait() {
if ((checkEnemyGroup(mTargetedActor) || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e) ||
(mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == PROC_NPC_MOI &&
(mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == fpcNm_NPC_MOI_e &&
((daNpc_Moi_c*)mTargetedActor)->chkSFight()))
{
return true;
@@ -1586,7 +1586,7 @@ BOOL daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& i_polyinfo) {
}
s16 bg_name = getMoveBGActorName(i_polyinfo, TRUE);
if (bg_name == PROC_OBJ_TP || bg_name == PROC_OBJ_GB || bg_name == PROC_Obj_GanonWall2) {
if (bg_name == fpcNm_OBJ_TP_e || bg_name == fpcNm_OBJ_GB_e || bg_name == fpcNm_Obj_GanonWall2_e) {
return true;
}
@@ -3813,7 +3813,7 @@ int daAlink_c::procWolfSlopeStart() {
static fopAc_ac_c* daAlink_searchGoldWolf(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_NPC_GWOLF) {
if (fopAcM_GetName(i_actor) == fpcNm_NPC_GWOLF_e) {
return i_actor;
}
@@ -3825,10 +3825,10 @@ static void* daAlink_searchWolfHowl(fopAc_ac_c* i_actor, void* i_data) {
fopAc_ac_c** var_r30 = (fopAc_ac_c**)i_data;
daAlink_c* player_p = daAlink_getAlinkActorClass();
if ((actor_name == PROC_KAGO && dComIfGs_isEventBit(dSv_event_flag_c::M_051)) ||
(actor_name == PROC_E_PM &&
if ((actor_name == fpcNm_KAGO_e && dComIfGs_isEventBit(dSv_event_flag_c::M_051)) ||
(actor_name == fpcNm_E_PM_e &&
player_p->current.pos.abs2XZ(i_actor->current.pos) < SQUARE(3000.0f)) ||
actor_name == PROC_OBJ_SEKIZOA ||
actor_name == fpcNm_OBJ_SEKIZOA_e ||
(*var_r30 == NULL && actor_name == player_p->getGrassHowlEventActor()))
{
*var_r30 = i_actor;
@@ -3869,10 +3869,10 @@ int daAlink_c::procWolfHowlDemoInit() {
if (field_0x27f4 != NULL) {
name = fopAcM_GetName(field_0x27f4);
} else {
name = PROC_ALINK;
name = fpcNm_ALINK_e;
}
if (name == PROC_Tag_WaraHowl) {
if (name == fpcNm_Tag_WaraHowl_e) {
shape_angle.y = field_0x27f4->shape_angle.y;
current.angle.y = shape_angle.y;
} else {
@@ -3916,8 +3916,8 @@ int daAlink_c::procWolfHowlDemoInit() {
mProcVar4.field_0x3010 = 0;
mProcVar0.field_0x3008 = -1;
if (name != PROC_ALINK) {
if (name == PROC_Obj_Yobikusa) {
if (name != fpcNm_ALINK_e) {
if (name == fpcNm_Obj_Yobikusa_e) {
daObjYobikusa_c* yobikusa_p = (daObjYobikusa_c*)field_0x27f4;
mZ2WolfHowlMgr.setCorrectCurve(yobikusa_p->getType());
@@ -3930,16 +3930,16 @@ int daAlink_c::procWolfHowlDemoInit() {
} else if (yobikusa_p->getType() == 1) {
field_0x3198 = 0xEE;
}
} else if (name == PROC_TAG_HOWL) {
} else if (name == fpcNm_TAG_HOWL_e) {
mZ2WolfHowlMgr.setCorrectCurve(static_cast<daTag_Howl_c*>(field_0x27f4)->getCurveID());
} else if (name == PROC_Obj_WindStone) {
} else if (name == fpcNm_Obj_WindStone_e) {
mZ2WolfHowlMgr.setCorrectCurve(static_cast<daWindStone_c*>(field_0x27f4)->getTuneId());
mProcVar0.field_0x3008 = static_cast<daWindStone_c*>(field_0x27f4)->getNextSceneId();
mProcVar4.field_0x3010 = 1;
} else if (name == PROC_Obj_SmWStone) {
} else if (name == fpcNm_Obj_SmWStone_e) {
mZ2WolfHowlMgr.setCorrectCurve(static_cast<daSmWStone_c*>(field_0x27f4)->getTuneId());
mProcVar4.field_0x3010 = 1;
} else if (name == PROC_Tag_WaraHowl) {
} else if (name == fpcNm_Tag_WaraHowl_e) {
mZ2WolfHowlMgr.setCorrectCurve(static_cast<daTagWrHowl_c*>(field_0x27f4)->getTuneId());
} else {
mZ2WolfHowlMgr.setCorrectCurve(-1);
@@ -4101,14 +4101,14 @@ int daAlink_c::procWolfHowlDemo() {
fopAcM_OnStatus(actor_p, 0x800);
s16 actorName = fopAcM_GetName(actor_p);
if (actorName == PROC_KAGO) {
if (actorName == fpcNm_KAGO_e) {
static_cast<daKago_c*>(actor_p)->setEvent();
static_cast<daKago_c*>(actor_p)->setKagoPath(mProcVar5.field_0x3012);
} else if (actorName == PROC_OBJ_SEKIZOA) {
} else if (actorName == fpcNm_OBJ_SEKIZOA_e) {
static_cast<daObj_Sekizoa_c*>(actor_p)->setWolfHowling();
} else if (actorName == PROC_E_PM) {
} else if (actorName == fpcNm_E_PM_e) {
static_cast<daE_PM_c*>(actor_p)->AppearSet();
} else if (actorName == PROC_HORSE) {
} else if (actorName == fpcNm_HORSE_e) {
daHorse_c* horse = static_cast<daHorse_c*>(actor_p);
int ret = horse->callHorse(&current.pos);
if (ret == 1 || ret == 2) {
@@ -4120,7 +4120,7 @@ int daAlink_c::procWolfHowlDemo() {
setWolfHowlNotHappen(isSkipEdge);
return 1;
}
} else if (actorName == PROC_NPC_TK) {
} else if (actorName == fpcNm_NPC_TK_e) {
static_cast<daNPC_TK_c*>(actor_p)->setEventWolf();
static_cast<daNPC_TK_c*>(actor_p)->setHawkPath(mProcVar5.field_0x3012);
}
@@ -4176,14 +4176,14 @@ int daAlink_c::procWolfHowlDemo() {
BOOL daAlink_c::checkWolfRope() {
return checkModeFlg(0x20000) && field_0x280c.getActor() != NULL &&
fopAcM_GetName(field_0x280c.getActor()) == PROC_Obj_Crope;
fopAcM_GetName(field_0x280c.getActor()) == fpcNm_Obj_Crope_e;
}
fopAc_ac_c* daAlink_c::checkWolfRopeHit(dCcD_GObjInf* i_collider, cXyz const* param_1,
int param_2) const {
daObjCrope_c* rope_p = (daObjCrope_c*)i_collider->GetCoHitAc();
if (i_collider->ChkCoHit() && rope_p != NULL && fopAcM_GetName(rope_p) == PROC_Obj_Crope) {
if (i_collider->ChkCoHit() && rope_p != NULL && fopAcM_GetName(rope_p) == fpcNm_Obj_Crope_e) {
if (param_2) {
if (rope_p->getRopeStartPos()->abs2XZ(*param_1) > SQUARE(100.0f)) {
if (rope_p->getRopeEndPos()->abs2XZ(*param_1) > SQUARE(100.0f)) {
@@ -4987,9 +4987,9 @@ const cXyz* daAlink_c::checkMidnaLockJumpPoint() const {
if (mProcID == PROC_WOLF_TAG_JUMP && field_0x280c.getActorConst() != NULL) {
wljump_p = field_0x280c.getActorConst();
} else if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Tag_Wljump) {
} else if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Tag_Wljump_e) {
wljump_p = field_0x27f4;
} else if (partner_p != NULL && fopAcM_GetName(partner_p) == PROC_Tag_Wljump) {
} else if (partner_p != NULL && fopAcM_GetName(partner_p) == fpcNm_Tag_Wljump_e) {
wljump_p = partner_p;
}
@@ -5225,7 +5225,7 @@ int daAlink_c::procWolfTagJumpLand() {
static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) {
cXyz* gnd_chk_pos = static_cast<cXyz*>(i_data);
if (fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA &&
if (fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e &&
i_actor->current.pos.abs2(*gnd_chk_pos) < SQUARE(200.0f))
{
return i_actor;
@@ -5237,7 +5237,7 @@ static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) {
static void* daAlink_searchGiantTalk(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA &&
if (fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e &&
static_cast<daObj_Sekizoa_c*>(i_actor)->getType() == 0)
{
return i_actor;
@@ -6039,8 +6039,8 @@ BOOL daAlink_c::checkWolfLieContinue(int param_0) {
if ((param_0 ||
((mTargetedActor != NULL && (mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000)) &&
(fopAcM_GetName(mTargetedActor) == PROC_NPC_JAGAR ||
fopAcM_GetName(mTargetedActor) == PROC_NPC_BOU))) &&
(fopAcM_GetName(mTargetedActor) == fpcNm_NPC_JAGAR_e ||
fopAcM_GetName(mTargetedActor) == fpcNm_NPC_BOU_e))) &&
!getSlidePolygon(&slide_poly) && !checkWolfLieWaterIn())
{
return true;
@@ -6485,7 +6485,7 @@ int daAlink_c::decideDoStatusSwimWolf() {
return 1;
}
if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Drop) {
if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Drop_e) {
setDoStatus(BUTTON_STATUS_UNK_57);
if (doTrigger()) {
fopAcM_setCarryNow(field_0x27f4, 0);
@@ -7946,7 +7946,7 @@ int daAlink_c::procWolfLockAttackInit(int param_0) {
commonProcInit(PROC_WOLF_LOCK_ATTACK);
setSingleAnimeWolfParam(WANM_ATTACK_A_START, &mpHIO->mWolf.mWlAttack.mWlAtNjump.m.mAerialAttackAnm);
if (fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == PROC_E_YMB) {
if (fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == fpcNm_E_YMB_e) {
mProcVar5.field_0x3012 = 1;
if (param_0 == 0) {
@@ -8019,7 +8019,7 @@ int daAlink_c::procWolfLockAttack() {
// early return checks for colliding with at shields or if the actor hit is not freezard
if (isAtShieldHit || (checkAtShieldHit(mAtCyl) && (mAtCyl.GetAtHitAc() == NULL ||
fopAcM_GetName(mAtCyl.GetAtHitAc()) != PROC_E_FB)))
fopAcM_GetName(mAtCyl.GetAtHitAc()) != fpcNm_E_FB_e)))
{
return procCoLargeDamageInit(-4, TRUE, 0, 0, NULL, 2);
}
@@ -8082,7 +8082,7 @@ int daAlink_c::procWolfLockAttackTurnInit(int param_0) {
}
if (mWolfLockAcKeep[0].getActor() != NULL &&
fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == PROC_E_YMB)
fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == fpcNm_E_YMB_e)
{
mProcVar5.field_0x3012 = 1;
} else {
@@ -8344,7 +8344,7 @@ int daAlink_c::procWolfGrabUpInit() {
return checkNextActionWolf(0);
}
if (fopAcM_GetName(field_0x27f4) == PROC_Obj_MasterSword) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_Obj_MasterSword_e) {
setGrabItemActor(field_0x27f4);
return 1;
}
@@ -8371,8 +8371,8 @@ int daAlink_c::procWolfGrabUpInit() {
field_0x37c8 = field_0x27f4->current.pos - field_0x3510;
mProcVar3.field_0x300e = 0;
if (fopAcM_GetName(field_0x27f4) != PROC_Obj_Drop &&
fopAcM_GetName(field_0x27f4) != PROC_Obj_Sword)
if (fopAcM_GetName(field_0x27f4) != fpcNm_Obj_Drop_e &&
fopAcM_GetName(field_0x27f4) != fpcNm_Obj_Sword_e)
{
f32 prev_x = current.pos.x;
f32 prev_z = current.pos.z;
@@ -8577,7 +8577,7 @@ int daAlink_c::procWolfPush() {
static fopAc_ac_c* daAlink_searchEnemyCargo(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_E_YC) {
if (fopAcM_GetName(i_actor) == fpcNm_E_YC_e) {
return i_actor;
}
@@ -8699,7 +8699,7 @@ int daAlink_c::procWolfGanonCatchInit() {
}
mDemo.setSpecialDemoType();
field_0x27f4->actor_status |= 0x800;
field_0x27f4->actor_status |= fopAcStts_STAFF_EXTRA_e;
commonProcInit(PROC_WOLF_GANON_CATCH);
field_0x280c.setData(field_0x27f4);
@@ -8952,7 +8952,7 @@ int daAlink_c::procWolfChainWait() {
int daAlink_c::procWolfDigInit() {
BOOL var_r28 = TRUE;
if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Digpl) {
if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Digpl_e) {
int type = ((daObjDigpl_c*)field_0x27f4)->getType();
if (type == 0 || type == 2 || type == 3) {
var_r28 = FALSE;
@@ -8977,11 +8977,11 @@ int daAlink_c::procWolfDigInit() {
if (field_0x27f4 != NULL) {
mProcVar1.mDigActorName = fopAcM_GetName(field_0x27f4);
} else {
mProcVar1.mDigActorName = PROC_ALINK;
mProcVar1.mDigActorName = fpcNm_ALINK_e;
}
fopAc_ac_c* var_r29;
if (checkEndResetFlg1(ERFLG1_UNK_100000) && mProcVar1.mDigActorName != PROC_Obj_Lv4DigSand && mProcVar1.mDigActorName != PROC_Obj_DigSnow) {
if (checkEndResetFlg1(ERFLG1_UNK_100000) && mProcVar1.mDigActorName != fpcNm_Obj_Lv4DigSand_e && mProcVar1.mDigActorName != fpcNm_Obj_DigSnow_e) {
var_r29 = field_0x27f4;
} else {
var_r29 = NULL;
@@ -8991,7 +8991,7 @@ int daAlink_c::procWolfDigInit() {
mProcVar4.mDigExitID = 0;
if (var_r29 != NULL) {
if (fopAcM_GetName(var_r29) == PROC_Obj_Digpl) {
if (fopAcM_GetName(var_r29) == fpcNm_Obj_Digpl_e) {
mProcVar2.mDigType = ((daObjDigpl_c*)var_r29)->getType();
mProcVar4.mDigExitID = ((daObjDigpl_c*)var_r29)->getSceneNum();
field_0x280c.setData(var_r29);
@@ -9015,9 +9015,9 @@ int daAlink_c::procWolfDigInit() {
mProcVar2.mDigType = 4;
if (checkEndResetFlg1(ERFLG1_UNK_100000)) {
if (mProcVar1.mDigActorName == PROC_Obj_DigSnow) {
if (mProcVar1.mDigActorName == fpcNm_Obj_DigSnow_e) {
((daObjDigSnow_c* )field_0x27f4)->startDig();
} else if (mProcVar1.mDigActorName == PROC_Obj_Lv4DigSand) {
} else if (mProcVar1.mDigActorName == fpcNm_Obj_Lv4DigSand_e) {
((daObjL4DigSand_c*)field_0x27f4)->startDig();
}
field_0x280c.setData(field_0x27f4);
@@ -9119,9 +9119,9 @@ int daAlink_c::procWolfDig() {
setWolfDigEffect();
} else {
if (field_0x280c.getActor() != NULL) {
if (mProcVar1.mDigActorName == PROC_Obj_DigSnow) {
if (mProcVar1.mDigActorName == fpcNm_Obj_DigSnow_e) {
((daObjDigSnow_c*)field_0x280c.getActor())->endDig();
} else if (mProcVar1.mDigActorName == PROC_Obj_Lv4DigSand) {
} else if (mProcVar1.mDigActorName == fpcNm_Obj_Lv4DigSand_e) {
((daObjL4DigSand_c*)field_0x280c.getActor())->endDig();
}
}
@@ -9284,21 +9284,21 @@ int daAlink_c::procWolfDigThrough() {
}
void daAlink_c::setSmellSave() {
if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE) {
if (dComIfGs_getCollectSmell() == dItemNo_SMELL_MEDICINE_e) {
dComIfGs_offEventBit(dSv_event_flag_c::F_0387);
}
dMsgObject_setSmellType(mProcVar5.field_0x3012);
if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_MEDICINE) {
if (mProcVar5.field_0x3012 == dItemNo_SMELL_MEDICINE_e) {
dComIfGs_onEventBit(dSv_event_flag_c::F_0387);
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) {
} else if (mProcVar5.field_0x3012 == dItemNo_SMELL_CHILDREN_e) {
fopAcM_onSwitch(this, 102);
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) {
} else if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) {
fopAcM_onSwitch(this, 103);
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_FISH) {
} else if (mProcVar5.field_0x3012 == dItemNo_SMELL_FISH_e) {
dComIfGs_onEventBit(dSv_event_flag_c::F_0801);
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_POH) {
} else if (mProcVar5.field_0x3012 == dItemNo_SMELL_POH_e) {
dComIfGs_onEventBit(dSv_event_flag_c::F_0810);
}
@@ -9331,7 +9331,7 @@ int daAlink_c::procWolfGetSmellInit() {
dComIfGp_setPlayerStatus1(0, 0x4000000);
mProcVar2.field_0x300c = 0;
if (dComIfGs_getCollectSmell() == fpcNm_ITEM_NONE) {
if (dComIfGs_getCollectSmell() == dItemNo_NONE_e) {
field_0x3198 = 0xBBC;
} else {
field_0x3198 = 0xBBB;
@@ -9339,9 +9339,9 @@ int daAlink_c::procWolfGetSmellInit() {
field_0x319c = -1;
if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) {
if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) {
field_0x319c = 0x2220;
} else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) {
} else if (mProcVar5.field_0x3012 == dItemNo_SMELL_CHILDREN_e) {
field_0x319c = 0x2240;
}
@@ -9364,7 +9364,7 @@ int daAlink_c::procWolfGetSmell() {
dComIfGp_getEvent()->reset(this);
dComIfGp_clearPlayerStatus1(0, 0x4000000);
if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) {
if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) {
fopAcM_orderOtherEvent(this, "SMELL_1st", 0xFFFF, 0x400, 1);
} else {
fopAcM_orderOtherEvent(this, "SMELL_Child", 0xFFFF, 0x400, 1);
src/d/actor/d_a_alldie.cpp
+14 -14
View File
@@ -188,18 +188,18 @@ static actor_method_class l_daAlldie_Method = {
};
actor_process_profile_definition g_profile_ALLDIE = {
fpcLy_CURRENT_e,
2,
fpcPi_CURRENT_e,
PROC_ALLDIE,
&g_fpcLf_Method.base,
sizeof(daAlldie_c),
0,
0,
&g_fopAc_Method.base,
278,
&l_daAlldie_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 2,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ALLDIE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAlldie_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_ALLDIE_e,
/* Actor SubMtd */ &l_daAlldie_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_andsw.cpp
+15 -15
View File
@@ -6,7 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_andsw.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#if DEBUG
daAndsw_HIO_c l_HIO;
@@ -113,18 +113,18 @@ static actor_method_class l_daAndsw_Method = {
};
actor_process_profile_definition g_profile_ANDSW = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ANDSW, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daAndsw_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
302, // mPriority
&l_daAndsw_Method, // sub_method
0x40000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ANDSW_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAndsw_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_ANDSW_e,
/* Actor SubMtd */ &l_daAndsw_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_andsw2.cpp
+15 -15
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_andsw2.h"
#include "d/d_com_inf_game.h"
#include "d/d_lib.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
u8 daAndsw2_c::getEventNo() {
return home.angle.x & 0xFF;
@@ -343,18 +343,18 @@ static actor_method_class l_daAndsw2_Method = {
};
actor_process_profile_definition g_profile_ANDSW2 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ANDSW2, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daAndsw2_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
303, // mPriority
&l_daAndsw2_Method, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ANDSW2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAndsw2_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_ANDSW2_e,
/* Actor SubMtd */ &l_daAndsw2_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_arrow.cpp
+18 -18
View File
@@ -82,7 +82,7 @@ const static dCcD_SrcSph l_coSphSrc = {
void daArrow_c::atHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) {
if (i_tgObjInf->ChkTgArrowThrough()) {
if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_E_PZ) {
if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == fpcNm_E_PZ_e) {
((daE_PZ_c*)i_tgActor)->onBombArrowHit();
}
} else if (i_tgActor != NULL && fopAcM_IsActor(i_tgActor)) {
@@ -457,7 +457,7 @@ void daArrow_c::setBombMoveEffect() {
bool daArrow_c::checkReget() {
if (field_0x7cc.ChkCoHit()) {
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, dItemNo_ARROW_1_e, -1, NULL, NULL, 0.0f, 0.0f);
mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, 0, 0, 0);
field_0x93f = 1;
return true;
@@ -632,7 +632,7 @@ int daArrow_c::procMove() {
}
if (mArrowType == 4) {
if (field_0x688.GetAtHitAc() != NULL && fopAcM_GetName(field_0x688.GetAtHitAc()) == PROC_E_PZ) {
if (field_0x688.GetAtHitAc() != NULL && fopAcM_GetName(field_0x688.GetAtHitAc()) == fpcNm_E_PZ_e) {
iVar3 = 0;
} else {
procSlingHitInit(field_0x688.GetAtHitPosP(), &field_0x688);
@@ -1125,7 +1125,7 @@ static int daArrow_draw(daArrow_c* i_this) {
}
static void* daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) {
if (fopAcM_GetName(param_0) == PROC_HOZELDA) {
if (fopAcM_GetName(param_0) == fpcNm_HOZELDA_e) {
return param_0;
}
@@ -1221,18 +1221,18 @@ static actor_method_class l_daArrowMethodTable = {
};
actor_process_profile_definition g_profile_ARROW = {
fpcLy_CURRENT_e, // mLayerID
9, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ARROW, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daArrow_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
750, // mPriority
&l_daArrowMethodTable, // sub_method
0x00060000, // mStatus
fopAc_UNK_GROUP_5_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 9,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ARROW_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daArrow_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_ARROW_e,
/* Actor SubMtd */ &l_daArrowMethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_UNK_GROUP_5_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_bh.cpp
+14 -14
View File
@@ -1577,20 +1577,20 @@ static actor_method_class l_daB_BH_Method = {
};
actor_process_profile_definition g_profile_B_BH = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_BH, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(b_bh_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
211, // mPriority
&l_daB_BH_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_BH_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_bh_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_BH_e,
/* Actor SubMtd */ &l_daB_BH_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_bq.cpp
+28 -28
View File
@@ -335,7 +335,7 @@ static int daB_BQ_Draw(b_bq_class* i_this) {
}
static void* s_fw_sub0(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) {
static_cast<obj_fw_class*>(i_actor)->field_0x58c = 0.0f;
}
@@ -345,7 +345,7 @@ static void* s_fw_sub0(void* i_actor, void* i_data) {
static void* s_fw_sub1(void* i_actor, void* i_data) {
fopAc_ac_c* data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) {
obj_fw_class* fw = static_cast<obj_fw_class*>(i_actor);
fw->field_0x567 = 1;
@@ -382,7 +382,7 @@ static s8 data_805BAD70;
static void* s_fw_sub2(void* i_actor, void* i_data) {
fopAc_ac_c* data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) {
obj_fw_class* fw = static_cast<obj_fw_class*>(i_actor);
fw->field_0x567 = 2;
@@ -409,7 +409,7 @@ static void* s_fw_sub2(void* i_actor, void* i_data) {
}
static void* s_fw_del_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) {
fopAcM_delete((fopAc_ac_c*)i_actor);
}
@@ -418,7 +418,7 @@ static void* s_fw_del_sub(void* i_actor, void* i_data) {
static void* s_bi_del_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) &&
(fopAcM_GetName(i_actor) == PROC_E_BI || fopAcM_GetName(i_actor) == PROC_E_BI_LEAF))
(fopAcM_GetName(i_actor) == fpcNm_E_BI_e || fopAcM_GetName(i_actor) == fpcNm_E_BI_LEAF_e))
{
fopAcM_delete((fopAc_ac_c*)i_actor);
}
@@ -1189,7 +1189,7 @@ static void fish_set(b_bq_class* i_this) {
pos.y = -200.0f;
pos.z = lf_pos[i].pos_z;
fopAcM_create(PROC_NPC_LF, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1);
fopAcM_create(fpcNm_NPC_LF_e, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1);
}
}
@@ -1921,7 +1921,7 @@ static void demo_camera(b_bq_class* i_this) {
dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f));
cXyz sp120(1.0f, 1.0f, 1.0f);
fopAcM_createItemForBoss(&i_this->field_0x5cc, fpcNm_ITEM_UTAWA_HEART,
fopAcM_createItemForBoss(&i_this->field_0x5cc, dItemNo_UTAWA_HEART_e,
fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &sp120,
0.0f, 0.0f, -1);
@@ -2079,13 +2079,13 @@ static void demo_camera(b_bq_class* i_this) {
spFC += player->current.pos;
OS_REPORT("///YSTONE POS %d,%d,%d\n", (int)spFC.x, (int)spFC.y, (int)spFC.z);
fopAcM_create(PROC_OBJ_YSTONE, 0, &spFC, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &spFC, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
}
if (i_this->mDemoModeTimer == 120) {
i_this->field_0x1151 = 1;
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
if (ystone != NULL) {
ystone->field_0x59b = 0;
}
@@ -2111,7 +2111,7 @@ static void demo_camera(b_bq_class* i_this) {
cLib_addCalc2(&i_this->field_0x1298, 210.0f, 0.05f, 0.5f);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
if (ystone != NULL) {
ystone->setCurrentPos(spFC);
}
@@ -2378,7 +2378,7 @@ static int daB_BQ_Execute(b_bq_class* i_this) {
if (i_this->field_0x1394 == 10) {
fpcM_Search(s_fw_del_sub, i_this);
} else if (i_this->field_0x1394 == 0) {
fopAcM_createChild(PROC_E_BI, fopAcM_GetID(a_this), 0xFFFFFF35, &a_this->current.pos,
fopAcM_createChild(fpcNm_E_BI_e, fopAcM_GetID(a_this), 0xFFFFFF35, &a_this->current.pos,
fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL);
}
}
@@ -2497,7 +2497,7 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) {
if (!dComIfGs_isStageLife()) {
cXyz scale(1.0f, 1.0f, 1.0f);
pos.set(60.0f, 0.0f, 1778.0f);
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this),
fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this),
&i_this->shape_angle, &scale, 0.0f, 0.0f, -1);
}
@@ -2626,13 +2626,13 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) {
tentacle_pos += i_this->current.pos;
a_this->mTentacleIDs[i] =
fopAcM_createChild(PROC_B_BH, fopAcM_GetID(i_this), params | i, &tentacle_pos,
fopAcM_createChild(fpcNm_B_BH_e, fopAcM_GetID(i_this), params | i, &tentacle_pos,
fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL);
offset.x *= -1.0f;
}
a_this->mMonkeyBombID =
fopAcM_createChild(PROC_E_MB, fopAcM_GetID(i_this), 0xFFFFFFFF, &i_this->current.pos,
fopAcM_createChild(fpcNm_E_MB_e, fopAcM_GetID(i_this), 0xFFFFFFFF, &i_this->current.pos,
fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL);
if (dComIfG_play_c::getLayerNo(0) == 4) {
@@ -2673,18 +2673,18 @@ static actor_method_class l_daB_BQ_Method = {
};
actor_process_profile_definition g_profile_B_BQ = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_B_BQ,
&g_fpcLf_Method.base,
sizeof(b_bq_class),
0,
0,
&g_fopAc_Method.base,
212,
&l_daB_BQ_Method,
0x44000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_BQ_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_bq_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_BQ_e,
/* Actor SubMtd */ &l_daB_BQ_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_dr.cpp
+27 -27
View File
@@ -527,18 +527,18 @@ void daB_DR_c::mStatusONOFF(int i_status) {
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_OffStatus(this, 0);
fopAcM_OffStatus(this, 0x200000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
return;
case 1:
attention_info.distances[fopAc_attn_BATTLE_e] = 85;
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
fopAcM_OnStatus(this, 0);
fopAcM_OnStatus(this, 0x200000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e);
return;
case 2:
attention_info.distances[fopAc_attn_BATTLE_e] = 60;
fopAcM_OnStatus(this, 0);
fopAcM_OffStatus(this, 0x200000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
return;
}
@@ -842,7 +842,7 @@ void daB_DR_c::chkPartCreate(bool param_0) {
prm |= (BREAK_PARTS_DT[part_no].prm << 8);
size.x = size.y = size.z = BREAK_PARTS_DT[part_no].size;
fopAcM_create(PROC_B_DR, prm, &pos, fopAcM_GetRoomNo(this), &rot, &size, -1);
fopAcM_create(fpcNm_B_DR_e, prm, &pos, fopAcM_GetRoomNo(this), &rot, &size, -1);
field_0x7e0++;
part_no++;
@@ -988,7 +988,7 @@ void daB_DR_c::tail_hit_check() {
if (health > 0) {
daPy_getPlayerActorClass()->onBossRoomWait();
if (fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) {
if (fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) {
if (mTailCc.ChkTgHit()) {
speedF = 0.0f;
dComIfGs_onZoneSwitch(21, fopAcM_GetRoomNo(this));
@@ -1004,7 +1004,7 @@ void daB_DR_c::week_hit_check() {
if (mWeekCc.ChkTgSet()) {
daPy_getPlayerActorClass()->onBossRoomWait();
if (health > 0 && fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) {
if (health > 0 && fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e) && cLib_calcTimer<u8>(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) {
if (mWeekCc.ChkTgHit() && mWeekCc.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) {
speedF = 0.0f;
Z2GetAudioMgr()->changeBgmStatus(2);
@@ -1624,7 +1624,7 @@ void daB_DR_c::executeTailHit() {
mMoveMode++;
case 15:
ato = current.pos + mBoot_c_trance;
parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 1, &ato, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 1, &ato, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
Z2GetAudioMgr()->subBgmStart(Z2BGM_DRAGON_D02);
dComIfGs_onZoneSwitch(23, fopAcM_GetRoomNo(this));
@@ -1836,7 +1836,7 @@ void daB_DR_c::executeWeekHit() {
sp44.z = 0.0f;
sp44.x = 0.0f;
parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 0, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 0, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
mTimer[0] = BREG_S(3) + 20;
mMoveMode = 1000;
return;
@@ -2008,7 +2008,7 @@ void daB_DR_c::mBreathSet() {
sp1C.x = NREG_S(8) - 1000;
mTimer[1] = 3;
fopAcM_createChild(PROC_B_DR, fopAcM_GetID(this), 10, &field_0x760, fopAcM_GetRoomNo(this), &sp1C, NULL, -1, NULL);
fopAcM_createChild(fpcNm_B_DR_e, fopAcM_GetID(this), 10, &field_0x760, fopAcM_GetRoomNo(this), &sp1C, NULL, -1, NULL);
}
}
@@ -4085,7 +4085,7 @@ int daB_DR_c::create() {
mSound.init(&current.pos, &eyePos, 3, 1);
mColliderStts.Init(0x19, 0, this);
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
if (arg0 == 0x14) {
setActionMode(0xF, 0);
@@ -4108,7 +4108,7 @@ int daB_DR_c::create() {
angle.x = angle.y = angle.z = 0;
pos.set(224.0f, 0.0f, 762.0f);
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &size, 0.0f, 0.0f, -1);
fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &angle, &size, 0.0f, 0.0f, -1);
}
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -4248,10 +4248,10 @@ int daB_DR_c::create() {
mTimer[0] = 2;
if (BREG_S(5) == 0) {
parentActorID = fopAcM_createChild(PROC_L7ODR, fopAcM_GetID(this), 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
parentActorID = fopAcM_createChild(fpcNm_L7ODR_e, fopAcM_GetID(this), 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
mStatusONOFF(0);
} else if (BREG_S(0) != 0) {
parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
}
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -4294,20 +4294,20 @@ static actor_method_class l_daB_DR_Method = {
};
actor_process_profile_definition g_profile_B_DR = {
fpcLy_CURRENT_e, // mLayerID
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_DR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_DR_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
221, // mPriority
&l_daB_DR_Method, // sub_method
0x04040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_DR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_DR_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_DR_e,
/* Actor SubMtd */ &l_daB_DR_Method,
/* Status */ fopAcStts_BOSS_e | fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_dre.cpp
+18 -18
View File
@@ -564,14 +564,14 @@ void daB_DRE_c::DrAction() {
sp90 = current.pos;
sp1C.set(0, shape_angle.y + 0x1000, 0);
fopAcM_createItemForBoss(&sp90, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &sp1C,
fopAcM_createItemForBoss(&sp90, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &sp1C,
NULL, 6.0f + TREG_F(9), 20.0f + TREG_F(10), -1);
mTimers[0] = 30;
}
break;
case 6:
fopAc_ac_c* lifecon;
fopAcM_SearchByName(PROC_Obj_LifeContainer, &lifecon);
fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e, &lifecon);
if (lifecon != NULL) {
dComIfGp_event_setTalkPartner(lifecon);
player->changeDemoMode(0x2F, 3, 0, 0);
@@ -597,7 +597,7 @@ void daB_DRE_c::DrAction() {
cXyz sp6C(0.0f, 0.0f, 0.0f);
sp90.set(150.0f + aREG_F(0), 400.0f + XREG_F(4), 800.0f);
cLib_offsetPos(&sp90, &sp90, shape_angle.y + 0x5000, &sp6C);
fopAcM_create(PROC_OBJ_YSTONE, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1);
sp90.set(-325.0f, 0.0f, 215.0f);
sp1C.set(0, 0, 0);
@@ -618,7 +618,7 @@ void daB_DRE_c::DrAction() {
}
fopAc_ac_c* ystone;
fopAcM_SearchByName(PROC_OBJ_YSTONE, &ystone);
fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e, &ystone);
if (ystone != NULL && field_0x638 == 0) {
field_0x638 = 1;
@@ -944,20 +944,20 @@ static actor_method_class l_daB_DRE_Method = {
};
actor_process_profile_definition g_profile_B_DRE = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_DRE, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_DRE_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
231, // mPriority
&l_daB_DRE_Method, // sub_method
0x00044100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_DRE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_DRE_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_DRE_e,
/* Actor SubMtd */ &l_daB_DRE_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_ds.cpp
+26 -26
View File
@@ -773,7 +773,7 @@ void daB_DS_c::mCreateTrap(bool param_0) {
angle.x = 0;
angle.y = 0;
angle.z = 0;
mTrapID[i] = fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), params,
mTrapID[i] = fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), params,
&current.pos, fopAcM_GetRoomNo(this), &angle,
&trap_scale, -1, NULL);
trap_count++;
@@ -810,7 +810,7 @@ void daB_DS_c::mCreateTrap(bool param_0) {
}
mTrapID[i] =
fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), 0x27104DFF, &pos,
fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), 0x27104DFF, &pos,
fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL);
if (mBackboneLevel == 2) {
angle.y += 0x2AAA;
@@ -833,7 +833,7 @@ void daB_DS_c::mCreateTrap(bool param_0) {
angle.y = mBirthAngle02_dt[i] + mBirthAngle01_dt[j * 2];
pos.y = mBirthYpos02_dt[i];
mTrapID[idx] =
fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), params, &pos,
fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), params, &pos,
fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL);
}
}
@@ -1282,7 +1282,7 @@ void daB_DS_c::executeOpeningDemo() {
dComIfGp_event_reset();
dComIfGs_onZoneSwitch(0, fopAcM_GetRoomNo(this));
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
mMode++;
// fallthrough
}
@@ -2062,7 +2062,7 @@ void daB_DS_c::executeDamage() {
if (mStaltroopID[i] == 0) {
mStaltroopID[i] =
fopAcM_createChild(PROC_E_ZS, fopAcM_GetID(this), 1, &sp1B0,
fopAcM_createChild(fpcNm_E_ZS_e, fopAcM_GetID(this), 1, &sp1B0,
fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL);
}
}
@@ -2071,7 +2071,7 @@ void daB_DS_c::executeDamage() {
for (int i = 0; i < 5; i++) {
if (mStaltroop2ID[i] == 0) {
mStaltroop2ID[i] =
fopAcM_createChild(PROC_E_ZS, fopAcM_GetID(this), 2, &current.pos,
fopAcM_createChild(fpcNm_E_ZS_e, fopAcM_GetID(this), 2, &current.pos,
fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL);
}
}
@@ -2298,7 +2298,7 @@ void daB_DS_c::executeDamage() {
p2_angle.y = 0;
p2_angle.x = 0;
fopAcM_create(PROC_B_DS, param | TYPE_BATTLE_2, &current.pos, fopAcM_GetRoomNo(this),
fopAcM_create(fpcNm_B_DS_e, param | TYPE_BATTLE_2, &current.pos, fopAcM_GetRoomNo(this),
&p2_angle, NULL, 0xff);
mMode = 101;
// fallthrough
@@ -2413,7 +2413,7 @@ void daB_DS_c::breath_smokeSet() {
cXyz bullet_pos = mBulletPos;
fopAcM_create(PROC_B_DS, TYPE_BULLET_A, &bullet_pos, fopAcM_GetRoomNo(this), &bullet_angle,
fopAcM_create(fpcNm_B_DS_e, TYPE_BULLET_A, &bullet_pos, fopAcM_GetRoomNo(this), &bullet_angle,
NULL, 0xff);
}
}
@@ -2919,7 +2919,7 @@ void daB_DS_c::mFuwafuwaSet(bool param_0) {
}
void daB_DS_c::mBattle2BreathFireSet(u32 i_params) {
fopAcM_createChild(PROC_B_DS, fopAcM_GetID(this), i_params, &mMouthPos, fopAcM_GetRoomNo(this),
fopAcM_createChild(fpcNm_B_DS_e, fopAcM_GetID(this), i_params, &mMouthPos, fopAcM_GetRoomNo(this),
&shape_angle, NULL, -1, NULL);
mCreateFireBreath = false;
}
@@ -5447,7 +5447,7 @@ cPhs_Step daB_DS_c::create() {
angle.x = angle.y = angle.z = 0;
pos.set(-400.0f, 1775.0f, -4132.0f);
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &scale,
fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &angle, &scale,
0.0f, 0.0f, -1);
}
@@ -5492,7 +5492,7 @@ cPhs_Step daB_DS_c::create() {
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1,
&mAcchCir, fopAcM_GetSpeed_p(this), NULL, NULL);
mAcch.CrrPos(dComIfG_Bgsp());
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
}
setActionMode(8, 0);
@@ -5603,7 +5603,7 @@ cPhs_Step daB_DS_c::create() {
fopAcM_onSwitch(this, bitSw);
}
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
if (cDmr_SkipInfo == 0 && !dComIfGs_isZoneSwitch(5, fopAcM_GetRoomNo(this))) {
mDrawZant = false;
@@ -5687,20 +5687,20 @@ static actor_method_class l_daB_DS_Method = {
};
actor_process_profile_definition g_profile_B_DS = {
fpcLy_CURRENT_e,
4,
fpcPi_CURRENT_e,
PROC_B_DS,
&g_fpcLf_Method.base,
sizeof(daB_DS_c),
0,
0,
&g_fopAc_Method.base,
0xDC,
&l_daB_DS_Method,
0x4040000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_DS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_DS_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_DS_e,
/* Actor SubMtd */ &l_daB_DS_Method,
/* Status */ fopAcStts_BOSS_e | fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_gg.cpp
+35 -35
View File
@@ -1191,8 +1191,8 @@ void daB_GG_c::Md_DemoAction() {
} else if (mpModelMorf->getFrame() > 18.0f && mAnm == BCK_GGB_TAKE_OFF) {
var_r29 = 1;
} else if (mAnm == BCK_GGB_WAIT_B && mTimers[0] == 0) {
fopAcM_OffStatus(this, 0x200000);
fopAcM_OnStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
SetAnm(BCK_GGB_TAKE_OFF, 0, 5.0f, 1.0f);
mSound.startCreatureVoice(Z2SE_EN_GG_V_TAKE_OFF, -1);
@@ -1802,7 +1802,7 @@ void daB_GG_c::F_AttackAction() {
speedF = field_0x5bc;
field_0x5c0 = (100.0f + (s_LinkPos->y - current.pos.y)) / ((0.9f * var_f31) / speedF);
speed.y = field_0x5c0;
fopAcM_OffStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e);
}
break;
case 1: {
@@ -1842,7 +1842,7 @@ void daB_GG_c::F_AttackAction() {
}
} else if (current.pos.y - field_0x648 > 500.0f || (field_0x650 == current.pos.y - field_0x648 && mAnm == BCK_GGA_ATTACK_4)) {
mCcHookCyl.OnTgSetBit();
fopAcM_OnStatus(this, 0x80000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
if (field_0x5b6 != 0) {
SetAnm(BCK_GGA_ATTACK_2, 2, 5.0f, 1.0f);
@@ -1887,8 +1887,8 @@ void daB_GG_c::F_AttackAction() {
mCcHookCyl.OnTgSetBit();
SetAnm(BCK_GGA_PREPARATION, 2, 5.0f, 1.0f);
fopAcM_OffStatus(this, 0x200000);
fopAcM_OnStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
if (field_0x6ba != 0) {
mTimers[0] = l_HIO.fly_attack_wait_time * 0.5f;
@@ -2002,8 +2002,8 @@ void daB_GG_c::F_DamageAction() {
if (mTimers[0] == 1 && mAnm == BCK_GGA_PULL) {
mMode++;
fopAcM_cancelHookCarryNow(this);
fopAcM_OffStatus(this, 0x80000);
fopAcM_OnStatus(this, 0x200000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e);
mTimers[0] = 5;
}
break;
@@ -2031,8 +2031,8 @@ void daB_GG_c::F_DamageAction() {
s_M_Action = 0;
s_W_Action = 0;
fopAcM_OffStatus(this, 0x80000);
fopAcM_OnStatus(this, 0x200000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e);
} else {
cXyz* hookshot_top = player->getHookshotTopPos();
cXyz sp24(0.0f, 0.0f, 0.0f);
@@ -2046,8 +2046,8 @@ void daB_GG_c::F_DamageAction() {
if (mAcch.ChkWallHit() && mTimers[0] == 0) {
SetAction(ACTION_FLY, SUBACT_MOVE, 0);
fopAcM_OffStatus(this, 0x200000);
fopAcM_OnStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f);
@@ -2084,8 +2084,8 @@ void daB_GG_c::F_DamageAction() {
}
} else if (current.pos.y < (field_0x648 - 50.0f)) {
SetAction(ACTION_FLY, SUBACT_MOVE, 0);
fopAcM_OffStatus(this, 0x200000);
fopAcM_OnStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f);
@@ -2546,8 +2546,8 @@ void daB_GG_c::G_MoveAction() {
mTimers[1] = 0;
gravity = 0.0f;
fopAcM_OffStatus(this, 0x200000);
fopAcM_OnStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
SetAnm(BCK_GGA_WAIT, 2, 5.0f, 1.0f);
@@ -2576,8 +2576,8 @@ void daB_GG_c::FallChk() {
if (current.pos.y < (field_0x648 - 10.0f) && field_0x5b6 != 0) {
if (!mAcch.ChkGroundHit()) {
SetAction(ACTION_FLY, SUBACT_MOVE, 0);
fopAcM_OffStatus(this, 0x200000);
fopAcM_OnStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f);
@@ -2615,8 +2615,8 @@ void daB_GG_c::FallChk() {
} else if (current.pos.y < (field_0x648 - 10.0f)) {
SpeedClear();
SetAction(ACTION_FLY, SUBACT_MOVE, 0);
fopAcM_OffStatus(this, 0x200000);
fopAcM_OnStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f);
@@ -4409,7 +4409,7 @@ int daB_GG_c::Create() {
mMode = 0;
SetAnm(BCK_GG_WAIT, 2, 5.0f, 1.0f);
fopAcM_OnStatus(this, 0x200000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e);
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
current.pos.y = mAcch.GetGroundH();
@@ -4462,20 +4462,20 @@ static actor_method_class l_daB_GG_Method = {
};
actor_process_profile_definition g_profile_B_GG = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_GG, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_GG_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
230, // mPriority
&l_daB_GG_Method, // sub_method
0x000C0100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_GG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_GG_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_GG_e,
/* Actor SubMtd */ &l_daB_GG_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES
src/d/actor/d_a_b_gm.cpp
+25 -25
View File
@@ -221,7 +221,7 @@ static int daB_GM_Draw(b_gm_class* i_this) {
}
static void* s_ko_del(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 0) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 0) {
((daE_GM_c*)i_actor)->InstantKill();
}
@@ -341,7 +341,7 @@ static BOOL bg_check(b_gm_class* i_this) {
static int ko_ct;
static void* s_ko_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e) {
ko_ct++;
}
@@ -349,7 +349,7 @@ static void* s_ko_sub(void* i_actor, void* i_data) {
}
static void* s_ko2_move(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 3) {
((daE_GM_c*)i_actor)->MoveStart(0);
return i_actor;
}
@@ -358,7 +358,7 @@ static void* s_ko2_move(void* i_actor, void* i_data) {
}
static void* s_ko2_get(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 3) {
return i_actor;
}
@@ -366,7 +366,7 @@ static void* s_ko2_get(void* i_actor, void* i_data) {
}
static void* s_ko_move(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 1) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 1) {
((daE_GM_c*)i_actor)->MoveStart(cM_rndF(15.0f));
}
@@ -615,7 +615,7 @@ static void b_gm_kogoma(b_gm_class* i_this) {
fpcM_Search(s_ko_sub, a_this);
if (ko_ct < 100) {
csXyz angle(0, a_this->shape_angle.y, 0);
fopAcM_createChild(PROC_E_GM, fopAcM_GetID(a_this), 0, &kogoma_pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, 0);
fopAcM_createChild(fpcNm_E_GM_e, fopAcM_GetID(a_this), 0, &kogoma_pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, 0);
}
}
@@ -1343,7 +1343,7 @@ static void demo_camera(b_gm_class* i_this) {
spBC += a_this->eyePos;
csXyz angle(0, cM_rndF(0x10000), 0);
fopAcM_createChild(PROC_E_GM, fopAcM_GetID(a_this), params, &spBC, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL);
fopAcM_createChild(fpcNm_E_GM_e, fopAcM_GetID(a_this), params, &spBC, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL);
}
if (i_this->mDemoModeTimer == 90) {
@@ -1447,12 +1447,12 @@ static void demo_camera(b_gm_class* i_this) {
if (i_this->mDemoModeTimer == 160) {
csXyz angle(0, player->shape_angle.y - 0x4000, 0);
fopAcM_createItemForBoss(&i_this->field_0x1cec, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &angle, NULL, 10.0f, 30.0f, -1);
fopAcM_createItemForBoss(&i_this->field_0x1cec, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &angle, NULL, 10.0f, 30.0f, -1);
}
if (i_this->mDemoModeTimer == 190) {
i_this->field_0x1cec.y += 600.0f;
fopAcM_create(PROC_OBJ_YSTONE, 0, &i_this->field_0x1cec, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &i_this->field_0x1cec, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
i_this->mDemoMode = 42;
i_this->mDemoModeTimer = 0;
}
@@ -1479,7 +1479,7 @@ static void demo_camera(b_gm_class* i_this) {
cLib_addCalc2(&i_this->field_0x1cec.y, 100.0f, 0.05f, 0.7f);
}
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
if (ystone != NULL) {
if (i_this->mDemoModeTimer > 200) {
cLib_addCalc2(&i_this->field_0x1cec.y, 100.0f, 0.05f, 1.0f);
@@ -2103,7 +2103,7 @@ static int daB_GM_Create(fopAc_ac_c* i_this) {
if (!dComIfGs_isStageLife()) {
cXyz size(1.0f, 1.0f, 1.0f);
pos.set(400.0f, 0.0f, 0.0f);
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1);
fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1);
}
return phase_state;
@@ -2232,20 +2232,20 @@ static actor_method_class l_daB_GM_Method = {
};
actor_process_profile_definition g_profile_B_GM = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_GM, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(b_gm_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
213, // mPriority
&l_daB_GM_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_GM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_gm_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_GM_e,
/* Actor SubMtd */ &l_daB_GM_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_gnd.cpp
+23 -23
View File
@@ -372,7 +372,7 @@ static int daB_GND_Draw(b_gnd_class* i_this) {
}
static void* shot_s_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW &&
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e &&
(fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2))
{
cXyz vec_to_arrow = ((fopAc_ac_c*)i_data)->current.pos - ((fopAc_ac_c*)i_actor)->current.pos;
@@ -1235,7 +1235,7 @@ static void b_gnd_g_wait(b_gnd_class* i_this) {
s16 angle_step = 0x400;
mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID);
dmg_rod_class* mgrod_p = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD);
dmg_rod_class* mgrod_p = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e);
if (mgrod_p != NULL && mgrod_p->action != 0) {
if (i_this->mMoveMode < 5 && i_this->mPlayerDistXZ < 600.0f) {
@@ -2331,7 +2331,7 @@ static void eff_set(b_gnd_class* i_this) {
}
static void* s_fkdel_sub(void* i_actor, void* i_data) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FK) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FK_e) {
fopAcM_delete((fopAc_ac_c*)i_actor);
}
@@ -2339,7 +2339,7 @@ static void* s_fkdel_sub(void* i_actor, void* i_data) {
}
static void* s_objgbdel_sub(void* i_actor, void* i_data) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_GB) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_GB_e) {
fopAcM_delete((fopAc_ac_c*)i_actor);
}
@@ -3184,7 +3184,7 @@ static void demo_camera(b_gnd_class* i_this) {
i_this->mDemoCamMode = 45;
i_this->mDemoCamTimer = 0;
sp108.set(0.0f, 1100.0f, 0.0f);
fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), 0, 0, -1);
fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), 0, 0, -1);
}
cLib_addCalc0(&a_this->speedF, 1.0f, 0.7f);
@@ -3645,7 +3645,7 @@ static void demo_camera(b_gnd_class* i_this) {
case 92:
if (i_this->mDemoCamTimer == 1) {
sp108.set(0.0f, 1100.0f, 0.0f);
fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
}
if (i_this->mDemoCamTimer == 5) {
@@ -3681,7 +3681,7 @@ static void demo_camera(b_gnd_class* i_this) {
a_this->shape_angle.y = a_this->current.angle.y = 0x37FE;
sp108.set(0.0f, 1100.0f, 0.0f);
fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
break;
case 96:
i_this->mDemoCamTimer++;
@@ -4440,7 +4440,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) {
sp118 = (player->current.pos - i_this->mLightBallPos[i]);
fk_angle.y = (s16)cM_atan2s(sp118.x, sp118.z);
fopAcM_create(PROC_E_FK, i | 0xFFFFFF00, &i_this->mLightBallPos[i], fopAcM_GetRoomNo(a_this), &fk_angle, NULL, -1);
fopAcM_create(fpcNm_E_FK_e, i | 0xFFFFFF00, &i_this->mLightBallPos[i], fopAcM_GetRoomNo(a_this), &fk_angle, NULL, -1);
i_this->mLightBallSound[i].startSound(Z2SE_EN_GND_LIGHTBALL_SUB_HIT, 0, -1);
}
} else if (i_this->field_0x1e56[i] == 2) {
@@ -4811,7 +4811,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) {
b_path[i].z = sp30.z;
}
i_this->mMantChildID = fopAcM_createChild(PROC_MANT, fopAcM_GetID(a_this),
i_this->mMantChildID = fopAcM_createChild(fpcNm_MANT_e, fopAcM_GetID(a_this),
0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, 0);
a_this->health = 24;
i_this->field_0x560 = 24;
@@ -4957,20 +4957,20 @@ static actor_method_class l_daB_GND_Method = {
};
actor_process_profile_definition g_profile_B_GND = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_GND, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(b_gnd_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
214, // mPriority
&l_daB_GND_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_GND_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_gnd_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_GND_e,
/* Actor SubMtd */ &l_daB_GND_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
static int unk_bss_0xF0;
src/d/actor/d_a_b_go.cpp
+15 -15
View File
@@ -274,7 +274,7 @@ static int daB_GO_Create(fopAc_ac_c* i_this) {
child_angle.y = cM_rndF(0x10000);
a_this->mGoronChildIDs[i] =
fopAcM_createChild(PROC_B_GOS, fopAcM_GetID(a_this), i, &child_pos,
fopAcM_createChild(fpcNm_B_GOS_e, fopAcM_GetID(a_this), i, &child_pos,
fopAcM_GetRoomNo(a_this), &child_angle, NULL, -1, NULL);
}
}
@@ -291,18 +291,18 @@ static actor_method_class l_daB_GO_Method = {
};
actor_process_profile_definition g_profile_B_GO = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_B_GO,
&g_fpcLf_Method.base,
sizeof(b_go_class),
0,
0,
&g_fopAc_Method.base,
215,
&l_daB_GO_Method,
0x40100,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_GO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_go_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_GO_e,
/* Actor SubMtd */ &l_daB_GO_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_gos.cpp
+14 -14
View File
@@ -418,18 +418,18 @@ static actor_method_class l_daB_GOS_Method = {
};
actor_process_profile_definition g_profile_B_GOS = {
fpcLy_CURRENT_e,
8,
fpcPi_CURRENT_e,
PROC_B_GOS,
&g_fpcLf_Method.base,
sizeof(b_gos_class),
0,
0,
&g_fopAc_Method.base,
216,
&l_daB_GOS_Method,
0x40100,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_GOS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_gos_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_GOS_e,
/* Actor SubMtd */ &l_daB_GOS_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_mgn.cpp
+20 -20
View File
@@ -351,7 +351,7 @@ static int daB_MGN_Draw(daB_MGN_c* i_this) {
static void* s_obj_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor)) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) {
if (fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < 1500.0f + nREG_F(9)) {
if (fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) {
s16 var_r29 = ((fopAc_ac_c*)i_actor)->current.angle.y;
@@ -919,7 +919,7 @@ void daB_MGN_c::offBodySlideAt() {
bool daB_MGN_c::checkHitSlideAt() {
for (int i = 0; i < 15; i++) {
if (mBodyCcSph[i].ChkAtHit() && !mBodyCcSph[i].ChkAtShieldHit()) {
if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == PROC_ALINK) {
if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) {
return true;
}
}
@@ -1526,7 +1526,7 @@ void daB_MGN_c::executeDash() {
if (dComIfG_Bgsp().LineCross(&spE8)) {
var_r27 = dComIfG_Bgsp().GetActorPointer(spE8);
if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) {
if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) {
attention_info.flags = 0;
field_0x20f4[0].OffTgSetBit();
mAtSph.OffAtSetBit();
@@ -1537,7 +1537,7 @@ void daB_MGN_c::executeDash() {
} else {
if (mAcch.ChkWallHit()) {
var_r27 = dComIfG_Bgsp().GetActorPointer(mAcchCir);
if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) {
if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) {
if (abs((s16)(mAcchCir.GetWallAngleY() - shape_angle.y)) > 0x6000) {
field_0x20f4[0].OffTgSetBit();
mAtSph.OffAtSetBit();
@@ -2548,7 +2548,7 @@ void daB_MGN_c::executeOpening() {
return;
}
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
player->changeOriginalDemo();
player->setPlayerPosAndAngle(&pos, 0, 0);
@@ -3169,7 +3169,7 @@ void daB_MGN_c::action() {
if (mBodyCcSph[0].ChkAtSPrm(1) && mAcch.ChkWallHit()) {
daObjBHASHI_c* pillar = (daObjBHASHI_c*)dComIfG_Bgsp().GetActorPointer(mAcchCir);
if (pillar != NULL && fopAcM_GetName(pillar) == PROC_Obj_BHASHI) {
if (pillar != NULL && fopAcM_GetName(pillar) == fpcNm_Obj_BHASHI_e) {
pillar->Obj_Damage(current.pos);
}
}
@@ -3582,18 +3582,18 @@ static actor_method_class l_daB_MGN_Method = {
};
actor_process_profile_definition g_profile_B_MGN = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_MGN, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_MGN_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
232, // mPriority
&l_daB_MGN_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_MGN_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_MGN_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_MGN_e,
/* Actor SubMtd */ &l_daB_MGN_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_ob.cpp
+28 -28
View File
@@ -595,7 +595,7 @@ static void core_hand_move(b_ob_class* i_this) {
static int bf_ct;
static void* s_bf_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) {
bf_ct++;
}
@@ -603,7 +603,7 @@ static void* s_bf_sub(void* i_this, void* i_data) {
}
static void* s_bfdel_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) {
fopAcM_delete((fopAc_ac_c*)i_this);
}
@@ -611,7 +611,7 @@ static void* s_bfdel_sub(void* i_this, void* i_data) {
}
static void* s_kaisoudel_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_Obj_Kaisou) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_Obj_Kaisou_e) {
fopAcM_delete((fopAc_ac_c*)i_this);
}
@@ -647,7 +647,7 @@ static void bombfishset(b_ob_class* i_this) {
csXyz angle(-0x3800, 0, 0);
angle.y = cM_rndF(0x10000);
fopAcM_createChild(PROC_E_OctBg, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos,
fopAcM_createChild(fpcNm_E_OctBg_e, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos,
fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_BG_APPEAR, -1);
}
@@ -862,7 +862,7 @@ static void core_end(b_ob_class* i_this) {
for (int i = 0; i < 8; i++) {
i_this->mTentacleActorIDs[i] =
fopAcM_createChild(PROC_B_OH2, fopAcM_GetID(a_this), i, &a_this->current.pos,
fopAcM_createChild(fpcNm_B_OH2_e, fopAcM_GetID(a_this), i, &a_this->current.pos,
fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL);
}
}
@@ -1493,7 +1493,7 @@ static int fish_end(b_ob_class* i_this) {
i_this->mDemoActionTimer = 1;
obj_lv3WaterB_class* water =
(obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB);
(obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e);
water->mAction = LV3WATERB_ACT_REMOVE;
a_this->home.pos.set(0.0f, -23580.0f, 10300.0f);
@@ -1986,7 +1986,7 @@ static void cam_3d_morf(b_ob_class* i_this, f32 i_scale) {
}
static void* s_hasidel_sub(void* i_this, void* i_data) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_OCTHASHI) {
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_OCTHASHI_e) {
fopAcM_delete((fopAc_ac_c*)i_this);
}
@@ -2602,7 +2602,7 @@ static void demo_camera(b_ob_class* i_this) {
i_this->mDemoActionTimer = 0;
i_this->field_0x5dd8 = 4;
obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB);
obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e);
water->mAction = LV3WATERB_ACT_END;
water->field_0x586 = 0;
var_r27 = 2;
@@ -2645,7 +2645,7 @@ static void demo_camera(b_ob_class* i_this) {
csXyz sp17C(player->shape_angle);
sp17C.y += KREG_S(3) + -0x7060;
fopAcM_createItemForBoss(&a_this->eyePos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &sp17C,
fopAcM_createItemForBoss(&a_this->eyePos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &sp17C,
NULL, KREG_F(19) + 10.0f, 10.0f, -1);
dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f));
}
@@ -2749,11 +2749,11 @@ static void demo_camera(b_ob_class* i_this) {
sp64 += player->current.pos;
OS_REPORT("///YSTONE POS %d,%d,%d\n", sp64.x, sp64.y, sp64.z);
fopAcM_create(PROC_OBJ_YSTONE, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);
}
if (i_this->mDemoActionTimer == 120) {
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
if (ystone != NULL) {
ystone->field_0x59b = 0;
}
@@ -2782,7 +2782,7 @@ static void demo_camera(b_ob_class* i_this) {
cLib_addCalc2(&i_this->field_0x5cd8, 210.0f, 0.05f, 0.5f);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
if (ystone != NULL) {
ystone->setCurrentPos(sp64);
}
@@ -3494,7 +3494,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) {
if (!dComIfGs_isStageLife()) {
cXyz scale(1.0f, 1.0f, 1.0f);
pos.set(-916.0f, -23954.0f, 8916.0f);
fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this),
fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this),
&a_this->shape_angle, &scale, 0.0f, 0.0f, -1);
}
@@ -3610,7 +3610,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) {
for (int i = 0; i < 8; i++) {
a_this->mTentacleActorIDs[i] =
fopAcM_createChild(PROC_B_OH, fopAcM_GetID(i_this), i, &i_this->current.pos,
fopAcM_createChild(fpcNm_B_OH_e, fopAcM_GetID(i_this), i, &i_this->current.pos,
fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL);
}
@@ -3649,18 +3649,18 @@ static actor_method_class l_daB_OB_Method = {
};
actor_process_profile_definition g_profile_B_OB = {
fpcLy_CURRENT_e,
4,
fpcPi_CURRENT_e,
PROC_B_OB,
&g_fpcLf_Method.base,
sizeof(b_ob_class),
0,
0,
&g_fopAc_Method.base,
217,
&l_daB_OB_Method,
0xC4000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_OB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_ob_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_OB_e,
/* Actor SubMtd */ &l_daB_OB_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_oh.cpp
+15 -15
View File
@@ -263,7 +263,7 @@ static void attack(b_oh_class* i_this) {
for (int i = 7; i < 15; i++) {
if (i_this->mColliders[i].ChkCoHit()) {
cCcD_Obj* obj_p = i_this->mColliders[i].GetCoHitObj();
if (fopAcM_GetName(obj_p->GetAc()) == PROC_ALINK &&
if (fopAcM_GetName(obj_p->GetAc()) == fpcNm_ALINK_e &&
!dComIfGp_event_runCheck())
{
if (!player_p->checkHookshotShootReturnMode() &&
@@ -831,18 +831,18 @@ static actor_method_class l_daB_OH_Method = {
};
actor_process_profile_definition g_profile_B_OH = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
PROC_B_OH,
&g_fpcLf_Method.base,
sizeof(b_oh_class),
0,
0,
&g_fopAc_Method.base,
218,
&l_daB_OH_Method,
0x00044000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_OH_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_oh_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_OH_e,
/* Actor SubMtd */ &l_daB_OH_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_oh2.cpp
+15 -15
View File
@@ -10,7 +10,7 @@
#include "SSystem/SComponent/c_math.h"
#include "c/c_damagereaction.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "f_op/f_op_actor_mng.h"
static int nodeCallBack(J3DJoint* i_joint, int param_1) {
@@ -300,18 +300,18 @@ static actor_method_class l_daB_OH2_Method = {
};
actor_process_profile_definition g_profile_B_OH2 = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_B_OH2,
&g_fpcLf_Method.base,
sizeof(b_oh2_class),
0,
0,
&g_fopAc_Method.base,
219,
&l_daB_OH2_Method,
0x44000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_OH2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(b_oh2_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_OH2_e,
/* Actor SubMtd */ &l_daB_OH2_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_tn.cpp
+20 -20
View File
@@ -1594,16 +1594,16 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
f32 mActorDistance =
fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data);
if (mActorDistance < 300.0f && fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) {
if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) {
if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) {
return i_actor;
}
if (fopAcM_GetName((fopAc_ac_c*)i_actor) == PROC_NBOMB) {
if (fopAcM_GetName((fopAc_ac_c*)i_actor) == fpcNm_NBOMB_e) {
return i_actor;
}
}
if (mActorDistance < 300.0f && fopAcM_GetName(i_actor) == PROC_NBOMB) {
if (mActorDistance < 300.0f && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) {
daNbomb_c* mNBomb = (daNbomb_c*)i_actor;
if (mNBomb->checkInsectBombMove((fopAc_ac_c*)i_actor)) {
return i_actor;
@@ -1614,7 +1614,7 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
}
}
if ((mActorDistance < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW) &&
if ((mActorDistance < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) &&
fopAcM_GetSpeedF((fopAc_ac_c*)i_actor))
{
s16 mAngleY = ((fopAc_ac_c*)i_actor)->current.angle.y;
@@ -1690,7 +1690,7 @@ void daB_TN_c::executeRoomDemo() {
}
mBlendStatus = 0;
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
camera->mCamera.Stop();
camera->mCamera.SetTrimSize(3);
@@ -5147,7 +5147,7 @@ int daB_TN_c::create() {
}
}
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
setActionMode(ACT_WAITH, ACTION2_0_e);
}
@@ -5175,20 +5175,20 @@ static actor_method_class l_daB_TN_Method = {
};
actor_process_profile_definition g_profile_B_TN = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_TN, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_TN_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
225, // mPriority
&l_daB_TN_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_TN_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_TN_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_TN_e,
/* Actor SubMtd */ &l_daB_TN_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_yo.cpp
+28 -28
View File
@@ -454,7 +454,7 @@ void daB_YO_c::damage_check() {
mCcIronStts.Move();
if (mAction == ACT_CHASE && mAtCyl.ChkAtHit()
&& fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == PROC_ALINK)
&& fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == fpcNm_ALINK_e)
{
reflectFreeMove();
mActionTimer2 = 90;
@@ -537,7 +537,7 @@ void daB_YO_c::setBreakFrizad() {
angle.set(0, shape_angle.y + cM_rndFX(4000.0f), 0);
pos.set(current.pos.x + cM_rndF(50.0f), current.pos.y + (cM_rndF(100.0f) + 100.0f),
current.pos.z + cM_rndF(50.0f));
fopAcM_createChild(PROC_E_FZ, fopAcM_GetID(this), mFreezardNo << 8 | 3, &pos,
fopAcM_createChild(fpcNm_E_FZ_e, fopAcM_GetID(this), mFreezardNo << 8 | 3, &pos,
fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL);
}
}
@@ -715,7 +715,7 @@ void daB_YO_c::setApperEffect2() {
static void* s_frizad_delete(void* param_0, void* param_1) {
if (fopAcM_IsActor(param_0) && !fpcM_IsCreating(fopAcM_GetID(param_0))
&& fopAcM_GetName(param_0) == PROC_E_FZ) {
&& fopAcM_GetName(param_0) == fpcNm_E_FZ_e) {
static_cast<daE_FZ_c*>(param_0)->demoDelete();
}
return NULL;
@@ -771,7 +771,7 @@ void daB_YO_c::executeOpening() {
return;
}
Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_OP1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
field_0xfb5 = 3;
setBck(ANM_WAIT_A, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 1;
@@ -788,7 +788,7 @@ void daB_YO_c::executeOpening() {
shape_angle.y = -0x1000;
setYoMessage(0x234E);
ystone_pos.set(0.0f, 0.0f, 3000.0f);
mYstoneID = fopAcM_create(PROC_OBJ_YSTONE, 5, &ystone_pos, fopAcM_GetRoomNo(this),
mYstoneID = fopAcM_create(fpcNm_OBJ_YSTONE_e, 5, &ystone_pos, fopAcM_GetRoomNo(this),
NULL, NULL, 0xff);
Z2GetAudioMgr()->subBgmStart(Z2BGM_BOSS_SNOWWOMAN_D1);
mAcch.CrrPos(dComIfG_Bgsp());
@@ -1653,7 +1653,7 @@ void daB_YO_c::executeSeriousDemo() {
mIceCenterPos.y -= 100.0f;
mIceAngle = 0;
for (int i = 0; i < 10; i++) {
mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i, &current.pos,
mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i, &current.pos,
fopAcM_GetRoomNo(this), &shape_angle,
NULL, -1, NULL);
}
@@ -1750,7 +1750,7 @@ void daB_YO_c::createIcecleRevival(u8 param_0) {
}
if (icicle == NULL) {
if (param_0 != 0) {
mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i | 0x10000,
mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i | 0x10000,
&current.pos, fopAcM_GetRoomNo(this),
&shape_angle, NULL, -1, NULL);
}
@@ -1985,7 +1985,7 @@ void daB_YO_c::executeAttackYose() {
void daB_YO_c::checkDamageWithIceBreak() {
s16 player_angle = fopAcM_searchPlayerAngleY(this);
if (mAtCyl.ChkAtHit() && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == PROC_ALINK) {
if (mAtCyl.ChkAtHit() && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == fpcNm_ALINK_e) {
for (int i = 0; i < 10; i++) {
s16 angle_diff = mIceAngle + 0x1999 * i - player_angle;
if (abs(angle_diff) < 0xccc && mIcicleID[i] != -1) {
@@ -2160,11 +2160,11 @@ void daB_YO_c::executeDemoRevival() {
fopAcM_SearchByID(mIcicleID[i], (fopAc_ac_c**)&icicle);
}
if (icicle == NULL) {
mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i | 0x20000,
mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i | 0x20000,
&current.pos, fopAcM_GetRoomNo(this),
&shape_angle, NULL, -1, NULL);
} else {
fopAcM_OnStatus(icicle, 0x4000);
fopAcM_OnStatus(icicle, fopAcStts_UNK_0x4000_e);
}
field_0xfb0++;
}
@@ -2184,7 +2184,7 @@ void daB_YO_c::executeDemoRevival() {
if (mIcicleID[i] != -1) {
fopAcM_SearchByID(mIcicleID[i], (fopAc_ac_c**)&icicle);
if (icicle != NULL) {
fopAcM_OffStatus(icicle, 0x4000);
fopAcM_OffStatus(icicle, fopAcStts_UNK_0x4000_e);
}
}
}
@@ -2292,7 +2292,7 @@ void daB_YO_c::executeDeath() {
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
gravity = 0.0f;
speed.y = 0.0f;
camera->mCamera.Stop();
@@ -3371,7 +3371,7 @@ cPhs_Step daB_YO_c::create() {
}
cXyz pos(0.0f, 0.0f, 3000.0f);
mYstoneID = fopAcM_create(PROC_OBJ_YSTONE, 5, &pos, fopAcM_GetRoomNo(this),
mYstoneID = fopAcM_create(fpcNm_OBJ_YSTONE_e, 5, &pos, fopAcM_GetRoomNo(this),
NULL, NULL, 0xff);
mRoomType = 1;
@@ -3388,7 +3388,7 @@ cPhs_Step daB_YO_c::create() {
g_env_light.mColpatWeather = 2;
g_env_light.wether_pat0 = 2;
g_env_light.wether_pat1 = 2;
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
} else {
mRoomType = 0;
@@ -3435,20 +3435,20 @@ static actor_method_class l_daB_YO_Method = {
};
actor_process_profile_definition g_profile_B_YO = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_YO, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_YO_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
223, // mPriority
&l_daB_YO_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_YO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_YO_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_YO_e,
/* Actor SubMtd */ &l_daB_YO_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_yo_ice.cpp
+19 -19
View File
@@ -158,7 +158,7 @@ void daB_YOI_c::damage_check() {
if (pos.y < 50.0f) {
pos.y = 50.0f;
}
fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0);
}
}
}
@@ -175,7 +175,7 @@ void daB_YOI_c::setOperate(int param_0) {
setActionMode(ACT_RISE_UP, 1);
break;
case 3:
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
setActionMode(ACT_RISE_UP, 8);
break;
case 4:
@@ -197,7 +197,7 @@ void daB_YOI_c::setOperate(int param_0) {
if (pos.y < 50.0f) {
pos.y = 50.0f;
}
fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0);
}
break;
case 8:
@@ -207,7 +207,7 @@ void daB_YOI_c::setOperate(int param_0) {
setActionMode(ACT_DAMAGE, 0);
break;
case 10:
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
setActionMode(ACT_DEATH, 0);
break;
}
@@ -1069,7 +1069,7 @@ cPhs_Step daB_YOI_c::create() {
setActionMode(ACT_FIRST, 0);
break;
case 1:
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
setActionMode(ACT_RISE_UP, 9);
break;
case 2:
@@ -1100,18 +1100,18 @@ static actor_method_class l_daB_YOI_Method = {
};
actor_process_profile_definition g_profile_B_YOI = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_YOI, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_YOI_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
224, // mPriority
&l_daB_YOI_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_YOI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_YOI_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_YOI_e,
/* Actor SubMtd */ &l_daB_YOI_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_zant.cpp
+28 -28
View File
@@ -379,7 +379,7 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) {
BOOL var_r29;
u8 at_se = ((dCcD_GObjInf*)mAtInfo.mpCollider)->GetAtSe();
if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_CheckStatus(this, 0x280000)) {
if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x80000_e)) {
var_r29 = 1;
} else {
var_r29 = 0;
@@ -745,20 +745,20 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor)) {
f32 obj_dist = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data);
if (obj_dist < 300.0f && fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) {
if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) {
if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) {
return i_actor;
}
if (fopAcM_GetName(i_actor) == PROC_NBOMB) {
if (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) {
return i_actor;
}
}
if (obj_dist < 300.0f && fopAcM_GetName(i_actor) == PROC_NBOMB && ((daNbomb_c*)i_actor)->getExTime() < 10) {
if (obj_dist < 300.0f && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && ((daNbomb_c*)i_actor)->getExTime() < 10) {
return i_actor;
}
if (obj_dist < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) {
if (obj_dist < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) {
s16 actor_angle = ((fopAc_ac_c*)i_actor)->current.angle.y;
s16 angle_to_boss = fopAcM_searchActorAngleY((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data);
if (abs((s16)(actor_angle - angle_to_boss)) < 0x2000) {
@@ -946,7 +946,7 @@ static int target_info_count;
static void* s_pillar_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor)) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) {
if (((daPillar_c*)i_actor)->getMdlType() != 0) {
((daB_ZANT_c*)i_data)->mPillarIDs[8] = fopAcM_GetID(i_actor);
} else {
@@ -1051,7 +1051,7 @@ void daB_ZANT_c::executeSmallAttack() {
parameter = 6;
}
fopAcM_createChild(PROC_B_ZANTM, fopAcM_GetID(this), parameter, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
fopAcM_createChild(fpcNm_B_ZANTM_e, fopAcM_GetID(this), parameter, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
dComIfGp_particle_set(0x886B, &sp44, &shape_angle, NULL);
field_0x6fd++;
@@ -1343,7 +1343,7 @@ void daB_ZANT_c::executeOpening() {
}
Z2GetAudioMgr()->setDemoName("force_start");
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
sp34.set(0.0f, 0.0f, -700.0f);
player->setPlayerPosAndAngle(&sp34, 0, 0);
@@ -1886,7 +1886,7 @@ void daB_ZANT_c::executeHook() {
setBck(BCK_ZAN_HOOK_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
case 3:
if (!fopAcM_CheckStatus(this, 0x100000)) {
if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) {
setTgHitBit(TRUE);
setCoHitBit(TRUE);
setActionMode(ACT_SWIM, 10);
@@ -4049,7 +4049,7 @@ void daB_ZANT_c::executeLastAttack() {
mRollCc.ClrAtHit();
}
if (sp48 != NULL && fopAcM_GetName(dCc_GetAc(sp48->GetAc())) == PROC_ALINK) {
if (sp48 != NULL && fopAcM_GetName(dCc_GetAc(sp48->GetAc())) == fpcNm_ALINK_e) {
sp3C = 1;
field_0x6fd++;
@@ -4335,7 +4335,7 @@ void daB_ZANT_c::executeLastDamage() {
static void* s_del_tp(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor)) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_TP) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_TP_e) {
fopAcM_delete((fopAc_ac_c*)i_actor);
}
}
@@ -4589,18 +4589,18 @@ void daB_ZANT_c::initNextRoom() {
fopAcM_SearchByID(mMobileIDs[0], &pmobile);
if (mFightPhase == PHASE_OI) {
fopAcM_OnStatus(this, 0x80000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
if (pmobile == NULL) {
cXyz pos(0.0f, -3300.0f, 0.0f);
for (int i = 0; i < 4; i++) {
mMobileIDs[i] = fopAcM_create(PROC_B_ZANTZ, i | 0xFFFFFF00, &pos, warp_next_room[mFightPhase], &shape_angle, NULL, -1);
mMobileIDs[i] = fopAcM_create(fpcNm_B_ZANTZ_e, i | 0xFFFFFF00, &pos, warp_next_room[mFightPhase], &shape_angle, NULL, -1);
}
mCorrectMobileNo = 0;
}
} else {
fopAcM_OffStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e);
if (pmobile != NULL) {
fopAcM_delete(pmobile);
@@ -5600,20 +5600,20 @@ static actor_method_class l_daB_ZANT_Method = {
};
actor_process_profile_definition g_profile_B_ZANT = {
fpcLy_CURRENT_e, // mLayerID
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_ZANT, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_ZANT_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
226, // mPriority
&l_daB_ZANT_Method, // sub_method
0x00040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_ZANT_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_ZANT_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_ZANT_e,
/* Actor SubMtd */ &l_daB_ZANT_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_b_zant_magic.cpp
+14 -14
View File
@@ -277,18 +277,18 @@ static actor_method_class l_daB_ZANTM_Method = {
};
actor_process_profile_definition g_profile_B_ZANTM = {
fpcLy_CURRENT_e, // mLayerID
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_ZANTM, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_ZANTM_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
227, // mPriority
&l_daB_ZANTM_Method, // sub_method
0x00040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_ZANTM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_ZANTM_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_ZANTM_e,
/* Actor SubMtd */ &l_daB_ZANTM_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_zant_mobile.cpp
+15 -15
View File
@@ -109,7 +109,7 @@ void daB_ZANTZ_c::calcSnortEffect() {
}
if (var_r28 != NULL) {
if (fopAcM_GetName(dCc_GetAc(var_r28->GetAc())) == PROC_ALINK) {
if (fopAcM_GetName(dCc_GetAc(var_r28->GetAc())) == fpcNm_ALINK_e) {
daPy_py_c* player = daPy_getPlayerActorClass();
s16 var_r26 = cLib_targetAngleY(&current.pos, &player->current.pos);
player->setThrowDamage(var_r26, 30.0f, 10.0f, 0, 0, 2);
@@ -509,18 +509,18 @@ static actor_method_class l_daB_ZANTZ_Method = {
};
actor_process_profile_definition g_profile_B_ZANTZ = {
fpcLy_CURRENT_e, // mLayerID
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_ZANTZ, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_ZANTZ_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
228, // mPriority
&l_daB_ZANTZ_Method, // sub_method
0x00040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_ZANTZ_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_ZANTZ_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_ZANTZ_e,
/* Actor SubMtd */ &l_daB_ZANTZ_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_b_zant_sima.cpp
+16 -16
View File
@@ -31,10 +31,10 @@ static int daB_ZANTS_Draw(daB_ZANTS_c* i_this) {
}
static void zants_ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_target) {
if (fopAcM_GetName(i_target) == PROC_ALINK) {
if (fopAcM_GetName(i_target) == fpcNm_ALINK_e) {
((daB_ZANTS_c*)i_this)->mPlayerID = fopAcM_GetID(i_target);
((daB_ZANTS_c*)i_this)->mSinkTimers[TIMER_PLAYER] = 3;
} else if (fopAcM_GetName(i_target) == PROC_B_ZANT) {
} else if (fopAcM_GetName(i_target) == fpcNm_B_ZANT_e) {
((daB_ZANTS_c*)i_this)->mBossID = fopAcM_GetID(i_target);
((daB_ZANTS_c*)i_this)->mSinkTimers[TIMER_ZANT] = 3;
}
@@ -228,18 +228,18 @@ static actor_method_class l_daB_ZANTS_Method = {
};
actor_process_profile_definition g_profile_B_ZANTS = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
PROC_B_ZANTS,
&g_fpcLf_Method.base,
sizeof(daB_ZANTS_c),
0,
0,
&g_fopAc_Method.base,
229,
&l_daB_ZANTS_Method,
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_ZANTS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_ZANTS_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_ZANTS_e,
/* Actor SubMtd */ &l_daB_ZANTS_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_balloon_2D.cpp
+15 -15
View File
@@ -671,18 +671,18 @@ static actor_method_class daBalloon2D_METHODS = {
};
actor_process_profile_definition g_profile_BALLOON2D = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BALLOON2D, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daBalloon2D_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
765, // mPriority
&daBalloon2D_METHODS, // sub_method
0x00040000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
};
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BALLOON2D_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBalloon2D_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BALLOON2D_e,
/* Actor SubMtd */ &daBalloon2D_METHODS,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bd.cpp
+19 -19
View File
@@ -130,8 +130,8 @@ static void* s_a_sub(void* i_target, void* i_bird) {
fopEn_enemy_c* a_bird = (fopEn_enemy_c*)i_bird;
if ((fopAcM_IsActor(i_target) && fopAcM_GetGroup(a_target) == fopAc_ENEMY_e) ||
fopAcM_GetGroup(a_target) == fopAc_NPC_e || fopAcM_GetName(i_target) == PROC_OBJ_KANBAN2 ||
fopAcM_GetName(i_target) == PROC_OBJ_FOOD)
fopAcM_GetGroup(a_target) == fopAc_NPC_e || fopAcM_GetName(i_target) == fpcNm_OBJ_KANBAN2_e ||
fopAcM_GetName(i_target) == fpcNm_OBJ_FOOD_e)
{
cXyz distance = a_bird->current.pos - a_target->current.pos;
if (distance.abs() < l_HIO.mLinkDetectRange + 10.0f * fabsf(a_target->speedF)) {
@@ -862,7 +862,7 @@ static int daBd_Execute(bd_class* i_this) {
i_this->field_0x642--;
}
fopAcM_SearchByName(PROC_NPC_KKRI, (fopAc_ac_c**)&kkri);
fopAcM_SearchByName(fpcNm_NPC_KKRI_e, (fopAc_ac_c**)&kkri);
if (kkri != NULL && i_this->field_0x642 == 0) {
if (i_this->field_0x5B6 == 1) {
MTXCopy(kkri->getBd1Mtx(), *calc_mtx);
@@ -908,7 +908,7 @@ static int daBd_Execute(bd_class* i_this) {
i_this->mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
if (i_this->field_0x656 == 0 && dComIfGp_event_runCheck()) {
cow = (daCow_c*)fopAcM_SearchByName(PROC_COW);
cow = (daCow_c*)fopAcM_SearchByName(fpcNm_COW_e);
if (cow != NULL && cow->speedF > 1.0f) {
i_this->field_0x656 = 1;
i_this->mActionID = ACT_GROUND;
@@ -1038,7 +1038,7 @@ static int daBd_Create(fopAc_ac_c* i_act_this) {
if (i_this->field_0x5B4 != 0xFF && i_this->field_0x5B4 != 0 && i_this->field_0x5B4 != 1) {
for (int i = 0; i < i_this->field_0x5B4 - 1; i++) {
fopAcM_createChild(
PROC_BD, fopAcM_GetID(i_act_this), fopAcM_GetParam(i_act_this) & 0xFFFFFF00,
fpcNm_BD_e, fopAcM_GetID(i_act_this), fopAcM_GetParam(i_act_this) & 0xFFFFFF00,
&i_act_this->current.pos, fopAcM_GetRoomNo(i_act_this), &sp1C, NULL, -1, NULL);
}
}
@@ -1053,20 +1053,20 @@ static actor_method_class l_daBd_Method = {
};
actor_process_profile_definition g_profile_BD = {
fpcLy_CURRENT_e, // mLayerID
8, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BD, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(bd_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
718, // mPriority
&l_daBd_Method, // sub_method
0x000C4100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BD_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bd_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BD_e,
/* Actor SubMtd */ &l_daBd_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
AUDIO_INSTANCES
src/d/actor/d_a_bg.cpp
+15 -15
View File
@@ -626,19 +626,19 @@ static actor_method_class l_daBg_Method = {
};
actor_process_profile_definition2 g_profile_BG = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BG, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daBg_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
753, // mPriority
&l_daBg_Method, // sub_method
0x00060000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
0,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBg_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BG_e,
/* Actor SubMtd */ &l_daBg_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
/* Unknown */ 0,
};
src/d/actor/d_a_bg_obj.cpp
+15 -15
View File
@@ -317,7 +317,7 @@ void daBgObj_c::initAtt() {
(ce5_val << 2) |
(cd3_val);
fopAc_ac_c* actor = fopAcM_fastCreate(PROC_Tag_Attp, actor_params, &current.pos, fopAcM_GetRoomNo(this),
fopAc_ac_c* actor = fopAcM_fastCreate(fpcNm_Tag_Attp_e, actor_params, &current.pos, fopAcM_GetRoomNo(this),
&current.angle, &scale, -1, NULL, NULL);
if (actor != NULL) {
@@ -1363,18 +1363,18 @@ static actor_method_class daBgObj_METHODS = {
};
actor_process_profile_definition g_profile_BG_OBJ = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_BG_OBJ,
&g_fpcLf_Method.base,
sizeof(daBgObj_c),
0,
0,
&g_fopAc_Method.base,
752,
&daBgObj_METHODS,
0x10044100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BG_OBJ_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBgObj_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BG_OBJ_e,
/* Actor SubMtd */ &daBgObj_METHODS,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_boomerang.cpp
+16 -16
View File
@@ -495,8 +495,8 @@ static int daBoomerang_Draw(daBoomerang_c* i_this) {
}
void daBoomerang_c::lockLineCallback(fopAc_ac_c* i_actor) {
if (i_actor != NULL && fopAcM_GetName(i_actor) != PROC_Obj_glowSphere &&
fopAcM_GetName(i_actor) != PROC_E_VT && fopAcM_GetName(i_actor) != PROC_OBJ_BRG)
if (i_actor != NULL && fopAcM_GetName(i_actor) != fpcNm_Obj_glowSphere_e &&
fopAcM_GetName(i_actor) != fpcNm_E_VT_e && fopAcM_GetName(i_actor) != fpcNm_OBJ_BRG_e)
{
setLockActor(i_actor, TRUE);
}
@@ -1498,20 +1498,20 @@ static actor_method_class l_daBoomerang_Method = {
};
actor_process_profile_definition g_profile_BOOMERANG = {
fpcLy_CURRENT_e, // mLayerID
6, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BOOMERANG, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daBoomerang_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
686, // mPriority
&l_daBoomerang_Method, // sub_method
0x00060000, // mStatus
fopAc_UNK_GROUP_5_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 6,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BOOMERANG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBoomerang_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BOOMERANG_e,
/* Actor SubMtd */ &l_daBoomerang_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_UNK_GROUP_5_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_bullet.cpp
+14 -14
View File
@@ -276,18 +276,18 @@ static actor_method_class daBullet_MethodTable = {
};
actor_process_profile_definition g_profile_BULLET = {
fpcLy_CURRENT_e, // mLayerID
8, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BULLET, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daBullet_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
751, // mPriority
&daBullet_MethodTable, // sub_method
0x00044000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BULLET_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBullet_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BULLET_e,
/* Actor SubMtd */ &daBullet_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_canoe.cpp
+16 -16
View File
@@ -21,7 +21,7 @@ static BOOL l_debugMode;
#endif
static BOOL daCanoe_searchTagWaterFall(fopAc_ac_c* i_actor, void* i_data) {
if (fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) {
if (fopAcM_GetName(i_actor) == fpcNm_Tag_WaterFall_e) {
if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(*(cXyz*)i_data)) {
daAlink_getAlinkActorClass()->onWaterFallFrontHit();
}
@@ -328,7 +328,7 @@ void daCanoe_c::posMove() {
}
void daCanoe_c::checkGomikabe(cBgS_PolyInfo& i_polyinfo) {
if (daAlink_c::getMoveBGActorName(i_polyinfo, 1) == PROC_Obj_GOMIKABE) {
if (daAlink_c::getMoveBGActorName(i_polyinfo, 1) == fpcNm_Obj_GOMIKABE_e) {
((daObjGOMIKABE_c*)dComIfG_Bgsp().GetActorPointer(i_polyinfo))->BreakSet();
}
}
@@ -918,20 +918,20 @@ static actor_method_class l_daCanoe_Method = {
};
actor_process_profile_definition g_profile_CANOE = {
fpcLy_CURRENT_e, // mLayerID
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_CANOE, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daCanoe_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
724, // mPriority
&l_daCanoe_Method, // sub_method
0x00044100, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 4,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_CANOE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daCanoe_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_CANOE_e,
/* Actor SubMtd */ &l_daCanoe_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES
src/d/actor/d_a_coach_2D.cpp
+14 -14
View File
@@ -356,18 +356,18 @@ static actor_method_class daCoach2D_METHODS = {
};
actor_process_profile_definition g_profile_COACH2D = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_COACH2D, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daCoach2D_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
764, // mPriority
&daCoach2D_METHODS, // sub_method
0x00040000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_COACH2D_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daCoach2D_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_COACH2D_e,
/* Actor SubMtd */ &daCoach2D_METHODS,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_coach_fire.cpp
+14 -14
View File
@@ -164,18 +164,18 @@ static actor_method_class l_daCoachFire_Method = {
};
actor_process_profile_definition g_profile_COACH_FIRE = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_COACH_FIRE, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daCoachFire_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
332, // mPriority
&l_daCoachFire_Method, // sub_method
0x00044000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_COACH_FIRE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daCoachFire_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_COACH_FIRE_e,
/* Actor SubMtd */ &l_daCoachFire_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_cow.cpp
+30 -30
View File
@@ -445,7 +445,7 @@ static s16 m_view_angle_wide;
static s16 m_view_angle;
#define IS_COW(actor) (fopAcM_GetName((actor)) == PROC_COW)
#define IS_COW(actor) (fopAcM_GetName((actor)) == fpcNm_COW_e)
#define IS_VALID_COW_INTERACTION(cow_1, actor) \
(fopAcM_IsActor((cow_1)) && !fpcM_IsCreating(fopAcM_GetID((cow_1))) && IS_COW((cow_1)) && \
(cow_1) != (actor))
@@ -965,7 +965,7 @@ void daCow_c::checkBeforeBg() {
if (cLib_calcTimer(&mTimer6)) {
return;
}
s16 sVar2;
if (planeTri[1] && planeTri[2]) {
switch (mAction) {
@@ -1458,7 +1458,7 @@ void daCow_c::action_enter() {
mEnterTimerDone)
{
daNpc_Aru_c* aru;
fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru);
fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru);
if (aru) {
aru->setLastIn();
}
@@ -1660,7 +1660,7 @@ void daCow_c::action_angry() {
if (!mDealDamageTimer) {
if (!player->checkHorseRide() && mSph[0].ChkCoHit()) {
fopAc_ac_c* a = dCc_GetAc(mSph[0].GetCoHitObj()->GetAc());
if (fopAcM_GetName(a) == PROC_ALINK) {
if (fopAcM_GetName(a) == fpcNm_ALINK_e) {
// if touched link who is not on a horse
s16 sangle = shape_angle.y;
cXyz pos = daPy_getPlayerActorClass()->current.pos;
@@ -1893,7 +1893,7 @@ void daCow_c::executeCrazyWait() {
mAcchCir.SetWall(100.0f, 110.0f);
mTimer1 = 30;
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
}
}
@@ -2392,7 +2392,7 @@ void daCow_c::executeCrazyBack() {
}
break;
case daCow_c::Action_4:
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
fopAcM_OnStatus(this, fopAcStts_CULL_e);
if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) {
fopAcM_delete(this);
}
@@ -2464,19 +2464,19 @@ void daCow_c::action_crazy() {
dComIfGoat_SetThrow(this);
mMode = daCow_c::Mode_1;
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100);
fopAcM_OnStatus(this, fopAcStts_CULL_e);
break;
case daCow_c::Mode_1:
TICK_TIMER(mForgetCowPTimer);
TICK_TIMER(mTimer1);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
if (dComIfGp_event_runCheck() &&
strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT") &&
strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_SUCCESS") &&
strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_FAILURE"))
{
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
}
switch (mCrazy) {
@@ -2648,7 +2648,7 @@ bool daCow_c::checkWolfBusters() {
}
daNpc_Aru_c* aru;
fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru);
fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru);
if (!aru) {
return false;
}
@@ -2675,7 +2675,7 @@ void daCow_c::action_wolf() {
daPy_py_c* player = daPy_getPlayerActorClass();
daNpc_Aru_c* aru;
fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru);
fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru);
if (!aru) {
return;
}
@@ -2684,7 +2684,7 @@ void daCow_c::action_wolf() {
s16 aruAngle = cLib_targetAngleY(&current.pos, &aru->current.pos);
s16 sp14;
s16 ang2;
switch (mMode) {
case daCow_c::Mode_0:
mMode = daCow_c::Mode_1;
@@ -2693,7 +2693,7 @@ void daCow_c::action_wolf() {
attention_info.flags |= fopAc_AttnFlag_LOCK_e;
mSound.startCreatureVoice(Z2SE_GOAT_V_ANGRY, -1);
mTimer10 = cM_rndF(90.0f) + 90.0f;
break;
case daCow_c::Mode_1:
sp14 = 0;
@@ -2807,7 +2807,7 @@ void daCow_c::action_damage() {
mChangeRedTev = 0;
speedF = 0.0f;
break;
case daCow_c::Mode_1:
setRedTev();
if (mpMorf->isStop()) {
@@ -3030,7 +3030,7 @@ bool daCow_c::initialize() {
}
fopAcM_setCullSizeBox(this, -100.0f, -100.0f, -200.0f, 100.0f, 250.0f, 200.0f);
fopAcM_OnStatus(this, 0x8000000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
mAcch.CrrPos(dComIfG_Bgsp());
@@ -3050,7 +3050,7 @@ bool daCow_c::initialize() {
mPrm0 = 4;
setCowInCage();
}
u8 prm1;
switch (mPrm0) {
case 3: {
@@ -3288,20 +3288,20 @@ static actor_method_class daCow_MethodTable = {
};
actor_process_profile_definition g_profile_COW = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_COW, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daCow_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
692, // mPriority
&daCow_MethodTable, // sub_method
0x00040100, // mStatus
fopAc_NPC_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_COW_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daCow_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_COW_e,
/* Actor SubMtd */ &daCow_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_crod.cpp
+18 -18
View File
@@ -221,15 +221,15 @@ int daCrod_c::execute() {
fopAc_ac_c* hit_ac = mAtCps.GetAtHitAc();
if (player->checkCopyRodEquip() && hit_ac != NULL &&
(fopAcM_GetName(hit_ac) == PROC_CSTATUE ||
fopAcM_GetName(hit_ac) == PROC_CSTAF))
(fopAcM_GetName(hit_ac) == fpcNm_CSTATUE_e ||
fopAcM_GetName(hit_ac) == fpcNm_CSTAF_e))
{
fopAcM_SetParam(this, 4);
mControllActorKeep.setData(hit_ac);
mCameraActorKeep.setData(hit_ac);
u16 anm_id;
if (fopAcM_GetName(hit_ac) == PROC_CSTATUE &&
if (fopAcM_GetName(hit_ac) == fpcNm_CSTATUE_e &&
static_cast<daCstatue_c*>(hit_ac)->checkBossType())
{
anm_id = ANM_WAIT_C;
@@ -322,7 +322,7 @@ int daCrod_c::execute() {
if (fopAcM_GetParam(this) == 4) {
fopAc_ac_c* control_actor = mControllActorKeep.getActor();
if (fopAcM_GetName(control_actor) == PROC_CSTATUE) {
if (fopAcM_GetName(control_actor) == fpcNm_CSTATUE_e) {
current.pos = static_cast<daCstatue_c*>(control_actor)->getBallPos();
} else {
current.pos = static_cast<daCstaF_c*>(control_actor)->getBallPos();
@@ -383,18 +383,18 @@ static actor_method_class l_daCrod_Method = {
};
actor_process_profile_definition g_profile_CROD = {
fpcLy_CURRENT_e,
8,
fpcPi_CURRENT_e,
PROC_CROD,
&g_fpcLf_Method.base,
sizeof(daCrod_c),
0,
0,
&g_fopAc_Method.base,
688,
&l_daCrod_Method,
0x60000,
5,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_CROD_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daCrod_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_CROD_e,
/* Actor SubMtd */ &l_daCrod_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_UNK_GROUP_5_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_cstaF.cpp
+14 -14
View File
@@ -580,18 +580,18 @@ static actor_method_class l_daCstaF_Method = {
};
actor_process_profile_definition g_profile_CSTAF = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_CSTAF, // mProcName
&g_fpcLf_Method.base, // sub_method
0x00000B38, // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
272, // mPriority
&l_daCstaF_Method, // sub_method
0x00040520, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_CSTAF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ 0x00000B38,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_CSTAF_e,
/* Actor SubMtd */ &l_daCstaF_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_cstatue.cpp
+18 -18
View File
@@ -122,7 +122,7 @@ static dCcD_SrcSph l_sphSrc = {
};
void daCstatue_c::atHitCallback(fopAc_ac_c* actor) {
if (fopAcM_GetName(actor) == PROC_B_GM) {
if (fopAcM_GetName(actor) == fpcNm_B_GM_e) {
onStateFlg0(daCstatue_FLG0_100);
}
}
@@ -358,7 +358,7 @@ int daCstatue_c::create() {
mControlDistanceOffset = JMAFastSqrt(4825.0f);
mTargetFrame = 21.0f;
} else {
fopAcM_OffStatus(this, 0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
mCyl1.SetR(300.0f);
mCyl1.SetH(600.0f);
mAcchCir[0].SetWall(30.01f, 300.0f);
@@ -1156,10 +1156,10 @@ int daCstatue_c::execute() {
fopAcM_GetRoomNo(this), 1.0f, speedF);
if (fopAcM_checkCarryNow(this)) {
onStateFlg0(daCstatue_FLG0_2);
fopAcM_OffStatus(this, 0x400);
fopAcM_OffStatus(this, fopAcStts_FREEZE_e);
} else {
offStateFlg0(daCstatue_FLG0_2);
fopAcM_OnStatus(this, 0x400);
fopAcM_OnStatus(this, fopAcStts_FREEZE_e);
}
if (mParam2 != 0x3f) {
dTres_c::setIconPositionOfCstatue(mParam2, &current.pos);
@@ -1215,20 +1215,20 @@ static actor_method_class l_daCstatue_Method = {
};
actor_process_profile_definition g_profile_CSTATUE = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_CSTATUE, // mProcName
&g_fpcLf_Method.base, // sub_method
0x00000B2C, // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
271, // mPriority
&l_daCstatue_Method, // sub_method
0x00060520, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_CSTATUE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ 0x00000B2C,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_CSTATUE_e,
/* Actor SubMtd */ &l_daCstatue_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_demo00.cpp
+15 -15
View File
@@ -1096,7 +1096,7 @@ inline int daDemo00_c::execute() {
case 2: {
u16 sp0A = sp0E & 0x3FFF;
if ((sp0E & 0xC000) == 0) {
fopAcM_create(PROC_MOVIE_PLAYER, sp0A, NULL, fopAcM_GetRoomNo(this), NULL, NULL, 0xFF);
fopAcM_create(fpcNm_MOVIE_PLAYER_e, sp0A, NULL, fopAcM_GetRoomNo(this), NULL, NULL, 0xFF);
mDoGph_gInf_c::fadeOut(1.0f);
} else {
switch (sp0A) {
@@ -1896,18 +1896,18 @@ static actor_method_class l_daDemo00_Method = {
};
actor_process_profile_definition g_profile_DEMO00 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DEMO00, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daDemo00_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
685, // mPriority
&l_daDemo00_Method, // sub_method
0x00044000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DEMO00_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDemo00_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DEMO00_e,
/* Actor SubMtd */ &l_daDemo00_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_demo_item.cpp
+31 -31
View File
@@ -113,11 +113,11 @@ void daDitem_c::actionStart() {
OS_REPORT("ゲットアイテム：エフェクトライトセット＆表示スタート！\n");
}
if (m_itemNo == fpcNm_ITEM_DUNGEON_EXIT || m_itemNo == fpcNm_ITEM_DUNGEON_EXIT_2) {
if (m_itemNo == dItemNo_DUNGEON_EXIT_e || m_itemNo == dItemNo_DUNGEON_EXIT_2_e) {
current.angle.y = dComIfGp_getPlayer(0)->shape_angle.y;
}
if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) {
JPABaseEmitter* emitter = field_0x96c.getEmitter();
if (emitter == NULL) {
dComIfGp_particle_set(0x8DE, &current.pos, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL);
@@ -131,22 +131,22 @@ void daDitem_c::actionStart() {
mParticleAlpha = 0xFF;
}
if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && field_0x96c.getEmitter() == NULL) {
if ((m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) && field_0x96c.getEmitter() == NULL) {
cXyz scale(0.55f, 0.55f, 0.55f);
dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL);
}
if (m_itemNo == fpcNm_ITEM_WALLET_LV3 && field_0x96c.getEmitter() == NULL) {
if (m_itemNo == dItemNo_WALLET_LV3_e && field_0x96c.getEmitter() == NULL) {
cXyz scale(1.2f, 1.2f, 1.2f);
dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL);
}
if (m_itemNo == fpcNm_ITEM_CHUCHU_RARE && field_0x96c.getEmitter() == NULL) {
if (m_itemNo == dItemNo_CHUCHU_RARE_e && field_0x96c.getEmitter() == NULL) {
cXyz scale(0.8f, 0.8f, 0.8f);
dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL);
}
if ((m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) && field_0x96c.getEmitter() == NULL) {
if ((m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e) && field_0x96c.getEmitter() == NULL) {
dComIfGp_particle_set(0x8C15, &field_0x99c, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL);
}
@@ -164,7 +164,7 @@ void daDitem_c::actionEvent() {
cLib_addCalc2(&mLight.mPow, mLightStrength, 0.1f, 1.0f);
}
if (m_itemNo == fpcNm_ITEM_POU_SPIRIT) {
if (m_itemNo == dItemNo_POU_SPIRIT_e) {
mSound.startLevelSound(Z2SE_EN_PO_SOUL, 0, -1);
}
@@ -173,7 +173,7 @@ void daDitem_c::actionEvent() {
execItemGet(m_itemNo);
}
if (m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
if (m_itemNo == dItemNo_KAKERA_HEART_e) {
int room_no = dComIfGp_roomControl_getStayNo();
if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0 && room_no == 2) {
@@ -266,7 +266,7 @@ void daDitem_c::actionEvent() {
void daDitem_c::actionWaitLightEnd() {
BOOL particle_hidden = TRUE;
if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) {
particle_hidden = cLib_chaseUC(&mParticleAlpha, 0, 26);
JPABaseEmitter* emitter = field_0x96c.getEmitter();
@@ -403,7 +403,7 @@ void daDitem_c::settingEffectLight() {
void daDitem_c::set_mtx() {
mpModel->setBaseScale(scale);
if (m_itemNo != fpcNm_ITEM_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_BACK && m_itemNo != fpcNm_ITEM_LV7_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_EXIT_2) {
if (m_itemNo != dItemNo_DUNGEON_EXIT_e && m_itemNo != dItemNo_DUNGEON_BACK_e && m_itemNo != dItemNo_LV7_DUNGEON_EXIT_e && m_itemNo != dItemNo_DUNGEON_EXIT_2_e) {
s16 var_r28 = 0xFFFF / 250;
fopAcM_addAngleY(this, current.angle.y + var_r28, var_r28);
}
@@ -438,12 +438,12 @@ int daDitem_c::Delete() {
dKy_efplight_cut(&mLight);
}
if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) {
if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) {
field_0x96c.remove();
field_0x980.remove();
}
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE || m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) {
if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e || m_itemNo == dItemNo_WALLET_LV3_e || m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e || m_itemNo == dItemNo_CHUCHU_RARE_e) {
field_0x96c.remove();
}
@@ -475,7 +475,7 @@ int daDitem_c::create() {
OS_REPORT_ERROR("ゲット用モデルのアーカイブ名がありません！[%d]\n", m_itemNo);
}
m_itemNo = fpcNm_ITEM_GREEN_RUPEE;
m_itemNo = dItemNo_GREEN_RUPEE_e;
}
int phase_state = dComIfG_resLoad(&mPhase, dItem_data::getArcName(m_itemNo));
@@ -519,13 +519,13 @@ int daDitem_c::execute() {
eyePos = current.pos;
eyePos.y += mpModel->getModelData()->getJointNodePointer(0)->getMax()->y * 0.5f;
if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) {
if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) {
field_0x99c = current.pos;
field_0x99c.y += 10.0f;
} else if (m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) {
} else if (m_itemNo == dItemNo_WALLET_LV3_e || m_itemNo == dItemNo_CHUCHU_RARE_e) {
field_0x99c = current.pos;
field_0x99c.y += 15.0f;
} else if (m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) {
} else if (m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e) {
field_0x99c = current.pos;
}
@@ -539,7 +539,7 @@ static int daDitem_Execute(daDitem_c* i_this) {
int daDitem_c::draw() {
switch (m_itemNo) {
case fpcNm_ITEM_WOOD_STICK:
case dItemNo_WOOD_STICK_e:
draw_WOOD_STICK();
break;
}
@@ -561,20 +561,20 @@ static actor_method_class l_daDitem_Method = {
};
actor_process_profile_definition g_profile_Demo_Item = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Demo_Item, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daDitem_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
241, // mPriority
&l_daDitem_Method, // sub_method
0x00060000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Demo_Item_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDitem_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Demo_Item_e,
/* Actor SubMtd */ &l_daDitem_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_disappear.cpp
+16 -16
View File
@@ -7,7 +7,7 @@
#include "d/actor/d_a_disappear.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
static int daDisappear_Draw(disappear_class* i_this) {
return 1;
@@ -16,7 +16,7 @@ static int daDisappear_Draw(disappear_class* i_this) {
static void* s_ks_sub(void* i_actor, void*) {
fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor;
if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == PROC_NPC_KS) {
if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == fpcNm_NPC_KS_e) {
actor_p->health = 1;
}
@@ -123,18 +123,18 @@ static actor_method_class l_daDisappear_Method = {
};
actor_process_profile_definition g_profile_DISAPPEAR = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_DISAPPEAR,
&g_fpcLf_Method.base,
sizeof(disappear_class),
0,
0,
&g_fopAc_Method.base,
725,
&l_daDisappear_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DISAPPEAR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(disappear_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DISAPPEAR_e,
/* Actor SubMtd */ &l_daDisappear_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_dmidna.cpp
+14 -14
View File
@@ -89,18 +89,18 @@ static actor_method_class l_daDmidna_Method = {
};
actor_process_profile_definition g_profile_DMIDNA = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_DMIDNA,
&g_fpcLf_Method.base,
sizeof(daDmidna_c),
0,
0,
&g_fopAc_Method.base,
93,
&l_daDmidna_Method,
0x60000,
fopAc_ENV_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DMIDNA_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDmidna_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DMIDNA_e,
/* Actor SubMtd */ &l_daDmidna_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_do.cpp
+30 -30
View File
@@ -152,7 +152,7 @@ static BOOL target_bgc[5];
static void* s_w_sub(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) &&
(fopAcM_GetName(i_proc) == PROC_OBJ_FOOD || fopAcM_GetName(i_proc) == PROC_OBJ_KANBAN2) &&
(fopAcM_GetName(i_proc) == fpcNm_OBJ_FOOD_e || fopAcM_GetName(i_proc) == fpcNm_OBJ_KANBAN2_e) &&
fopAcM_checkCarryNow(static_cast<fopAc_ac_c*>(i_proc)) && target_info_count < 5)
{
target_info[target_info_count] = static_cast<fopAc_ac_c*>(i_proc);
@@ -978,7 +978,7 @@ static s16 hang_set(do_class* i_this) {
cXyz vec1, vec2, vec3[2];
vec1 = _this->old.pos - _this->current.pos;
cMtx_YrotS(*calc_mtx, cM_atan2s(vec1.x, vec1.z));
vec1.x = 0.0f;
vec1.y = 0.0f;
vec1.z = -100.0f;
@@ -1198,7 +1198,7 @@ case1and2:
i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed);
cLib_addCalc2(&i_this->speedF, i_this->mAnmSpeed * l_HIO.mRunSpeed, 1.0f,
0.2f * l_HIO.mRunSpeed);
vec = food->current.pos - i_this->current.pos;
angle_step = 0x1000;
if (vec.abs() < 120.0f * i_this->mScale.z) {
@@ -1235,15 +1235,15 @@ case1and2:
if (get_item) {
int item_no;
if (dComIfGs_getLife() <= 4) {
item_no = fpcNm_ITEM_HEART;
item_no = dItemNo_HEART_e;
} else {
int rnd = cM_rndF(11.0f);
if (rnd <= 5) {
item_no = fpcNm_ITEM_HEART;
item_no = dItemNo_HEART_e;
} else if (rnd <= 9) {
item_no = fpcNm_ITEM_GREEN_RUPEE;
item_no = dItemNo_GREEN_RUPEE_e;
} else {
item_no = fpcNm_ITEM_BLUE_RUPEE;
item_no = dItemNo_BLUE_RUPEE_e;
}
}
@@ -1342,7 +1342,7 @@ static void do_swim(do_class* i_this) {
}
static void* s_c_sub(void* param_0, void* param_1) {
if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_CANOE) {
if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_CANOE_e) {
return param_0;
}
return 0;
@@ -1412,7 +1412,7 @@ static void do_help(do_class* i_this) {
}
cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 2.0f);
if (!daPy_getLinkPlayerActorClass()->checkCanoeRide() && i_this->mDistFromPlayer < 200.0f) {
i_this->mAction = ACT_WAIT_1;
i_this->mMode = 0;
@@ -1492,7 +1492,7 @@ static s8 do_boat(do_class* i_this) {
fabsf(i_this->field_0x698.x) + 2.0f);
cLib_addCalc2(&i_this->current.pos.z, i_this->field_0x68c.z, 1.0f,
fabsf(i_this->field_0x698.z) + 2.0f);
if (_this->speed.y <= -80.0f) {
_this->speed.y = -80.0f;
}
@@ -1699,7 +1699,7 @@ static s8 do_carry(do_class* i_this) {
i_this->mCcDisableTimer = 5;
_this->speed.y = 0.0f;
_this->speedF = 0.0f;
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_TO_CARRY_B, 1.0f, 0,
@@ -1726,7 +1726,7 @@ static s8 do_carry(do_class* i_this) {
if (!fopAcM_checkCarryNow(_this)) {
i_this->mAction = ACT_WAIT_1;
i_this->mMode = 0;
dBgS_GndChk gnd_chk;
cXyz vec = _this->current.pos;
vec.y += 50.0f;
@@ -2266,7 +2266,7 @@ static int daDo_Execute(do_class* i_this) {
MtxPosition(&vec, &i_this->eyePos);
i_this->attention_info.position = i_this->eyePos;
i_this->attention_info.position.y += i_this->mScale.y * 16.0f;
vec.set(-15.0f, -15.0f, 0.0f);
MtxPosition(&vec, &center);
if (i_this->mCcDisableTimer != 0) {
@@ -2300,7 +2300,7 @@ static int daDo_Execute(do_class* i_this) {
MtxTrans(20.0f, -24.0f, 0.0f, 1);
vec.set(0.0f, 0.0f, 0.0f);
MtxPosition(&vec, &item->current.pos);
item->shape_angle = i_this->shape_angle;
item->current.angle = item->shape_angle;
item->speed.zero();
@@ -2312,7 +2312,7 @@ static int daDo_Execute(do_class* i_this) {
obj_food_class* food =
static_cast<obj_food_class*>(fopAcM_SearchByID(i_this->mFoodActorID));
if (food != NULL) {
if (fopAcM_GetName(food) == PROC_OBJ_FOOD) {
if (fopAcM_GetName(food) == fpcNm_OBJ_FOOD_e) {
MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(10), *calc_mtx);
cMtx_YrotM(*calc_mtx, 0x4000);
MtxTrans(0.0f, -7.0f, 25.0f, 1);
@@ -2482,7 +2482,7 @@ static cPhs_Step daDo_Create(fopAc_ac_c* i_this) {
noFallCheck = true;
_this->mParam2 = 200;
}
_this->mItemActorID = -1;
daDo_Execute(_this);
}
@@ -2501,18 +2501,18 @@ static actor_method_class l_daDo_Method = {
};
actor_process_profile_definition g_profile_DO = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_DO,
&g_fpcLf_Method.base,
sizeof(do_class),
0,
0,
&g_fopAc_Method.base,
0x2BB,
&l_daDo_Method,
0x8044000,
fopAc_NPC_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(do_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DO_e,
/* Actor SubMtd */ &l_daDo_Method,
/* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_door_boss.cpp
+16 -16
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_door_boss.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "d/d_door_param2.h"
#include "SSystem/SComponent/c_math.h"
@@ -338,7 +338,7 @@ int daBdoor_c::execute() {
&daBdoor_c::actionOpen,
&daBdoor_c::actionEnd,
};
if (fopAcM_CheckStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
} else {
@@ -417,18 +417,18 @@ static actor_method_class l_daBdoor_Method = {
};
actor_process_profile_definition g_profile_BOSS_DOOR = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_BOSS_DOOR,
&g_fpcLf_Method.base,
sizeof(daBdoor_c),
0,
0,
&g_fopAc_Method.base,
0x129,
&l_daBdoor_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BOSS_DOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBdoor_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BOSS_DOOR_e,
/* Actor SubMtd */ &l_daBdoor_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_door_bossL1.cpp
+16 -16
View File
@@ -775,7 +775,7 @@ int daBdoorL1_c::createKey() {
int actorParams = getNowLevel();
int flags = ~0xFF;
flags |= actorParams;
mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), flags,
mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), flags,
&cStack_30, fopAcM_GetRoomNo(this), 0,
&scale, -1, 0);
current.pos = cStack_24;
@@ -907,7 +907,7 @@ int daBdoorL1_c::actionEnd() {
int daBdoorL1_c::execute() {
static actionFunc l_action[4] = {&daBdoorL1_c::actionWait, &daBdoorL1_c::actionCloseWait, &daBdoorL1_c::actionOpen, &daBdoorL1_c::actionEnd};
if (fopAcM_CheckStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
dMeter2Info_onGameStatus(2);
demoProc();
@@ -977,18 +977,18 @@ static actor_method_class l_daBdoorL1_Method = {
};
actor_process_profile_definition g_profile_L1BOSS_DOOR = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_L1BOSS_DOOR,
&g_fpcLf_Method.base,
sizeof(daBdoorL1_c),
0,
0,
&g_fopAc_Method.base,
0x12A,
&l_daBdoorL1_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_L1BOSS_DOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBdoorL1_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_L1BOSS_DOOR_e,
/* Actor SubMtd */ &l_daBdoorL1_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_door_bossL5.cpp
+16 -16
View File
@@ -325,7 +325,7 @@ int daBdoorL5_c::createKey() {
cXyz prevPos(current.pos);
current.pos = home.pos;
cXyz pos(0.0f, 0.0f, 50.0f);
mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffff05,
mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffff05,
&pos, fopAcM_GetRoomNo(this), &shape_angle,
&scale, -1, 0);
current.pos = prevPos;
@@ -443,7 +443,7 @@ int daBdoorL5_c::actionEnd() {
int daBdoorL5_c::execute() {
static actionFunc l_action[4] = {&daBdoorL5_c::actionWait, &daBdoorL5_c::actionCloseWait, &daBdoorL5_c::actionOpen, &daBdoorL5_c::actionEnd};
field_0x59c = -1;
if (fopAcM_CheckStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
dMeter2Info_onGameStatus(2);
demoProc();
@@ -503,18 +503,18 @@ static actor_method_class l_daBdoorL5_Method = {
};
actor_process_profile_definition g_profile_L5BOSS_DOOR = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_L5BOSS_DOOR,
&g_fpcLf_Method.base,
sizeof(daBdoorL5_c),
0,
0,
&g_fopAc_Method.base,
0x12C,
&l_daBdoorL5_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_L5BOSS_DOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBdoorL5_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_L5BOSS_DOOR_e,
/* Actor SubMtd */ &l_daBdoorL5_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_door_dbdoor00.cpp
+14 -14
View File
@@ -415,18 +415,18 @@ static actor_method_class l_daDbdoor00_Method = {
};
actor_process_profile_definition g_profile_DBDOOR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DBDOOR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daDbDoor00_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
295, // mPriority
&l_daDbdoor00_Method, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DBDOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDbDoor00_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DBDOOR_e,
/* Actor SubMtd */ &l_daDbdoor00_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_door_knob00.cpp
+15 -15
View File
@@ -646,7 +646,7 @@ int daKnob20_c::execute() {
setActionFromFlow();
field_0x60f = frontCheck();
if (fopAcM_CheckStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
startDemoProc();
demoProc();
dMeter2Info_onGameStatus(2);
@@ -701,18 +701,18 @@ static actor_method_class l_daKnob20_Method = {
};
actor_process_profile_definition g_profile_KNOB20 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_KNOB20, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daKnob20_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
293, // mPriority
&l_daKnob20_Method, // sub_method
0x44100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_KNOB20_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daKnob20_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_KNOB20_e,
/* Actor SubMtd */ &l_daKnob20_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_door_mbossL1.cpp
+19 -19
View File
@@ -21,7 +21,7 @@ static int getNowLevel(fopAc_ac_c* i_this) {
static void* searchStop(void* param_1, void* param_2) {
if (param_1 != NULL && fopAcM_IsActor(param_1) &&
fopAcM_GetProfName(param_1) == PROC_Obj_Stopper)
fopAcM_GetProfName(param_1) == fpcNm_Obj_Stopper_e)
{
return param_1;
}
@@ -414,7 +414,7 @@ int daMBdoorL1_c::createKey() {
cStack_30.y = 0;
unaff_r29 = (u8)door_param2_c::getFRoomNo(this);
}
mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff,
mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffffff,
&cStack_28, unaff_r29, &cStack_30, &scale,
-1, NULL);
current.pos = cStack_1c;
@@ -953,7 +953,7 @@ int daMBdoorL1_c::openInit() {
}
}
}
if (fopAcM_CheckStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
fopAcM_onSwitch(this, swBit3);
}
field_0x5e1 = 1;
@@ -1598,7 +1598,7 @@ int daMBdoorL1_c::actionOpen() {
}
int daMBdoorL1_c::actionInit() {
if (fopAcM_CheckStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
setAction(ACTION_START_DEMO);
actionStartDemo();
} else {
@@ -1623,7 +1623,7 @@ int daMBdoorL1_c::actionInit() {
int daMBdoorL1_c::actionStartDemo() {
field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
if (!fopAcM_CheckStatus(this, 0x1000)) {
if (!fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
setAction(ACTION_CLOSE_WAIT);
}
return 1;
@@ -1728,18 +1728,18 @@ static actor_method_class l_daMBdoorL1_Method = {
};
actor_process_profile_definition g_profile_L1MBOSS_DOOR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L1MBOSS_DOOR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daMBdoorL1_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
299, // mPriority
&l_daMBdoorL1_Method, // sub_method
0x00044000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_L1MBOSS_DOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daMBdoorL1_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_L1MBOSS_DOOR_e,
/* Actor SubMtd */ &l_daMBdoorL1_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_door_push.cpp
+15 -15
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_door_push.h"
#include "SSystem/SComponent/c_math.h"
#include "d/d_bg_w.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "f_op/f_op_actor_mng.h"
static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
@@ -367,18 +367,18 @@ static actor_method_class daDoorPush_METHODS = {
};
actor_process_profile_definition g_profile_PushDoor = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
PROC_PushDoor,
&g_fpcLf_Method.base,
sizeof(daDoorPush_c),
0,
0,
&g_fopAc_Method.base,
578,
&daDoorPush_METHODS,
0x40100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_PushDoor_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDoorPush_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_PushDoor_e,
/* Actor SubMtd */ &daDoorPush_METHODS,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_door_shutter.cpp
+17 -17
View File
@@ -1379,7 +1379,7 @@ int daDoor20_c::createKey() {
roomNo = door_param2_c::getBRoomNo(this);
}
field_0x5ec =
fopAcM_createChildFromOffset(PROC_Obj_Lv5Key, fopAcM_GetID(this), 0xffffffff,
fopAcM_createChildFromOffset(fpcNm_Obj_Lv5Key_e, fopAcM_GetID(this), 0xffffffff,
&cStack_28, roomNo, &cStack_30, &scale, -1, 0);
break;
default:
@@ -1398,7 +1398,7 @@ int daDoor20_c::createKey() {
}
}
field_0x5ec =
fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff,
fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffffff,
&cStack_28, roomNo, &cStack_30, &scale, -1, 0);
}
@@ -1492,7 +1492,7 @@ int daDoor20_c::drawCheck(int param_1) {
int daDoor20_c::checkExecute() {
field_0x68c = frontCheck();
if (fopAcM_CheckStatus(this, 0x1000)) {
if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) {
return 1;
}
if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) {
@@ -2147,18 +2147,18 @@ static actor_method_class l_daDoor20_Method = {
};
actor_process_profile_definition g_profile_DOOR20 = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DOOR20, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daDoor20_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
294, // mPriority
&l_daDoor20_Method, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DOOR20_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDoor20_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DOOR20_e,
/* Actor SubMtd */ &l_daDoor20_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_door_spiral.cpp
+16 -16
View File
@@ -47,7 +47,7 @@ void* searchSpiralSub(void* i_actor, void* i_data) {
fopAc_ac_c* other = (fopAc_ac_c*)i_data;
if (actor != NULL && fopAcM_IsActor(actor)) {
if (fopAcM_GetProfName(actor) == PROC_SPIRAL_DOOR && actor != other) {
if (fopAcM_GetProfName(actor) == fpcNm_SPIRAL_DOOR_e && actor != other) {
if (door_param2_c::getBRoomNo(actor) == door_param2_c::getBRoomNo(other)) {
return actor;
}
@@ -637,7 +637,7 @@ void daSpiral_c::setPartner() {
JUT_ASSERT(1065, actor);
dComIfGp_event_setDoorPartner(actor);
fopAcM_OnStatus(actor, 0x8000);
fopAcM_OnStatus(actor, fopAcStts_STAFF_PRIMARY_e);
}
void daSpiral_c::clrPartner() {
@@ -1193,18 +1193,18 @@ static actor_method_class l_daSpiral_Method = {
#endif
actor_process_profile_definition g_profile_SPIRAL_DOOR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_SPIRAL_DOOR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daSpiral_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
301, // mPriority
DASPIRAL_METHODS, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_SPIRAL_DOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daSpiral_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_SPIRAL_DOOR_e,
/* Actor SubMtd */ DASPIRAL_METHODS,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_dshutter.cpp
+15 -17
View File
@@ -246,21 +246,19 @@ static actor_method_class l_daDsh_Method = {
};
actor_process_profile_definition2 g_profile_DSHUTTER = {
{
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DSHUTTER, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daDsh_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
296, // mPriority
&l_daDsh_Method, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
},
0,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DSHUTTER_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDsh_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DSHUTTER_e,
/* Actor SubMtd */ &l_daDsh_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
/* Unknown */ 0,
};
src/d/actor/d_a_e_ai.cpp
+14 -14
View File
@@ -951,18 +951,18 @@ static actor_method_class l_daE_AI_Method = {
};
actor_process_profile_definition g_profile_E_AI = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_AI, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_ai_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
112, // mPriority
&l_daE_AI_Method, // sub_method
0x00040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_AI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_ai_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_AI_e,
/* Actor SubMtd */ &l_daE_AI_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_arrow.cpp
+20 -20
View File
@@ -161,7 +161,7 @@ static void hit_check(e_arrow_class* i_this) {
dComIfG_Ccsp()->Set(&i_this->mCcTgSph);
if (i_this->mCcAtSph.ChkAtShieldHit() && i_this->mCcAtSph.GetAtHitAc() != NULL &&
fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == PROC_ALINK &&
fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == fpcNm_ALINK_e &&
daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall())
{
i_this->mAction = ACTION_ARROW_SHIELD;
@@ -253,7 +253,7 @@ static void e_arrow_shot(e_arrow_class* i_this) {
}
case 1:
if (i_this->mFlags & 0x20) {
fopAc_ac_c* coach_p = fopAcM_SearchByName(PROC_NPC_COACH);
fopAc_ac_c* coach_p = fopAcM_SearchByName(fpcNm_NPC_COACH_e);
if (coach_p != NULL) {
cXyz sp30;
@@ -291,9 +291,9 @@ static void e_arrow_bg(e_arrow_class* i_this) {
i_this->mMode = 1;
i_this->mTimers[0] = 100;
case 1:
if (checkItemGet(fpcNm_ITEM_BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) {
if (checkItemGet(dItemNo_BOW_e, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) {
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&i_this->current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f,
fopAcM_createItemForSimpleDemo(&i_this->current.pos, dItemNo_ARROW_1_e, -1, NULL, NULL, 0.0f,
0.0f);
mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0);
@@ -331,7 +331,7 @@ static void e_arrow_spin(e_arrow_class* i_this) {
static void* s_limit_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) != FALSE && i_actor != i_data &&
fopAcM_GetName(i_actor) == PROC_E_ARROW &&
fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e &&
static_cast<e_arrow_class*>(i_actor)->mAction == ACTION_ARROW_FIRE &&
fabsf(static_cast<e_arrow_class*>(i_actor)->field_0xa00.z -
static_cast<e_arrow_class*>(i_data)->field_0xa00.z) < 300.0f)
@@ -429,7 +429,7 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) {
static void atHit_CB(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor,
dCcD_GObjInf* i_tgObjInf) {
if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_ALINK) {
if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == fpcNm_ALINK_e) {
if (daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall()) {
daAlink_getAlinkActorClass()->getArrowShieldOffset(
&i_atActor->current.pos, &i_atActor->shape_angle,
@@ -754,20 +754,20 @@ static actor_method_class l_daE_ARROW_Method = {
};
actor_process_profile_definition g_profile_E_ARROW = {
fpcLy_CURRENT_e,
8,
fpcPi_CURRENT_e,
PROC_E_ARROW,
&g_fpcLf_Method.base,
sizeof(e_arrow_class),
0,
0,
&g_fopAc_Method.base,
163,
&l_daE_ARROW_Method,
0x44100,
fopAc_ENEMY_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_ARROW_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_arrow_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_ARROW_e,
/* Actor SubMtd */ &l_daE_ARROW_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_e_ba.cpp
+18 -18
View File
@@ -11,7 +11,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "f_op/f_op_actor_enemy.h"
class daE_BA_HIO_c {
@@ -67,7 +67,7 @@ static int daE_BA_Draw(e_ba_class* i_this) {
}
static void* shot_b_sub(void* i_proc, void* i_this) {
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_BOOMERANG
if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_BOOMERANG_e
&& !dComIfGp_checkPlayerStatus0(0, 0x80000) && daPy_py_c::checkBoomerangCharge()
&& fopAcM_GetParam(i_proc) == 1)
{
@@ -818,7 +818,7 @@ static void action(e_ba_class* i_this) {
if (i_this->mKnockbackSpeed <= 1.0f || i_this->mAcch.ChkWallHit()) {
fopAcM_delete(a_this);
if (i_this->mHomeType == e_ba_class::HOME_APPEAR) {
// should be fpcNm_ITEM_HEART : fpcNm_ITEM_ARROW_10 but that gives incorrect code
// should be dItemNo_HEART_e : dItemNo_ARROW_10_e but that gives incorrect code
int item_no = dComIfGs_getLife() <= 4 ? 0 : 0xE;
fopAcM_createItem(&a_this->current.pos, item_no, -1, -1, NULL, NULL, 0);
fopAcM_createDisappear(a_this, &a_this->current.pos, 6, 0, 0xff);
@@ -1032,7 +1032,7 @@ static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) {
}
_this->mFightFlyDistance = (f32)_this->mDistanceParam * 100.0f;
if (fopAcM_SearchByName(PROC_E_PZ) != NULL) {
if (fopAcM_SearchByName(fpcNm_E_PZ_e) != NULL) {
_this->mFightFlyDistance = 100000.0f;
}
@@ -1105,18 +1105,18 @@ static actor_method_class l_daE_BA_Method = {
};
actor_process_profile_definition g_profile_E_BA = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_E_BA,
&g_fpcLf_Method.base,
sizeof(e_ba_class),
0,
0,
&g_fopAc_Method.base,
0xB4,
&l_daE_BA_Method,
0x10050100,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BA_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_ba_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BA_e,
/* Actor SubMtd */ &l_daE_BA_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_bee.cpp
+18 -18
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_e_nest.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "d/d_s_play.h"
#include "f_op/f_op_camera_mng.h"
#include "SSystem/SComponent/c_math.h"
@@ -135,12 +135,12 @@ static int bee_fly_action(e_bee_class* i_this, bee_s* i_bee) {
i_bee->mTarget.z = cM_rndFX(100.0f);
i_bee->mSpeedF = cM_rndF(5.0f) + 17.0f;
}
if (fopAcM_GetName(hit_actor) != PROC_ALINK) {
if (fopAcM_GetName(hit_actor) != fpcNm_ALINK_e) {
vec = hit_actor->current.pos - i_bee->mPos;
vec.y += 125.0f;
vec += i_bee->mTarget;
if (i_bee->mHomeTimer == 0) {
if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) {
if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) {
i_bee->mAction = bee_s::ACT_DEAD;
} else {
i_bee->mAction = bee_s::ACT_FLY_HOME_A;
@@ -616,7 +616,7 @@ static void bee_control(e_bee_class* i_this) {
if (i_this->mCcSph.ChkAtHit()) {
cCcD_Obj* hitObj = i_this->mCcSph.GetAtHitObj();
fopAc_ac_c* hit_actor = dCc_GetAc(hitObj->GetAc());
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_ALINK) {
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) {
dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
}
}
@@ -816,20 +816,20 @@ static actor_method_class l_daE_Bee_Method = {
};
actor_process_profile_definition g_profile_E_BEE = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_E_BEE,
&g_fpcLf_Method.base,
sizeof(e_bee_class),
0,
0,
&g_fopAc_Method.base,
0xB7,
&l_daE_Bee_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BEE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_bee_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BEE_e,
/* Actor SubMtd */ &l_daE_Bee_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;
src/d/actor/d_a_e_bg.cpp
+25 -25
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_e_bg.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -227,7 +227,7 @@ void daE_BG_c::setSparkEffect() {
}
fopAc_ac_c* daE_BG_c::search_esa() {
dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD);
dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e);
if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->is_hook_in_water != 0 &&
rod->actor.current.pos.y < rod->water_surface_y - 20.0f) {
return &rod->actor;
@@ -286,7 +286,7 @@ void daE_BG_c::executeBorn() {
}
if (field_0x68f == 0) {
mBgId = fopAcM_createChild(PROC_E_BG, fopAcM_GetID(this), 0xffffff02, &current.pos,
mBgId = fopAcM_createChild(fpcNm_E_BG_e, fopAcM_GetID(this), 0xffffff02, &current.pos,
fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL);
mMoveMode = 3;
}
@@ -328,7 +328,7 @@ void daE_BG_c::executeSwim() {
setActionMode(2, 0);
return;
}
} else if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) {
} else if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) {
setActionMode(2, 0);
return;
}
@@ -446,7 +446,7 @@ void daE_BG_c::executeAttack() {
return;
}
} else {
if (!dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) {
if (!dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) {
setActionMode(1, 0);
return;
}
@@ -471,7 +471,7 @@ void daE_BG_c::executeAttack() {
cLib_chaseF(&speedF, l_HIO.mTrackingSpeed * cM_scos(shape_angle.x), 1.0f);
cLib_chaseF(&speed.y, l_HIO.mTrackingSpeed * cM_ssin(shape_angle.x), 1.0f);
if (!dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) {
if (!dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) {
if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) {
mMoveMode = 1;
field_0x69a = cM_rndFX(8192.0f);
@@ -480,7 +480,7 @@ void daE_BG_c::executeAttack() {
if (mAtSphere.ChkAtHit()) {
fopAc_ac_c* hitActor = dCc_GetAc(mAtSphere.GetAtHitObj()->GetAc());
if (fopAcM_GetName(hitActor) == PROC_ALINK) {
if (fopAcM_GetName(hitActor) == fpcNm_ALINK_e) {
mMoveMode = 10;
field_0x68f = 30;
speedF = cM_rndFX(1.0f) + -5.0f;
@@ -542,7 +542,7 @@ void daE_BG_c::executeAttack() {
field_0x6ae = 0;
}
if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) {
if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) {
mMoveMode = 0;
break;
}
@@ -583,7 +583,7 @@ void daE_BG_c::executeAttack() {
cLib_chaseF(&speedF, 0.0f, 1.0f);
cLib_chaseF(&speed.y, 0.0f, 1.0f);
if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) {
if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) {
mMoveMode = 0;
} else {
if (field_0x68f == 0) {
@@ -635,7 +635,7 @@ void daE_BG_c::executeAttack() {
if (mAtSphere.ChkAtHit()) {
fopAc_ac_c* hitActor = dCc_GetAc(mAtSphere.GetAtHitObj()->GetAc());
if (fopAcM_GetName(hitActor) == PROC_ALINK) {
if (fopAcM_GetName(hitActor) == fpcNm_ALINK_e) {
mMoveMode = 5;
field_0x68f = 30;
@@ -1420,18 +1420,18 @@ static actor_method_class l_daE_BG_Method = {
};
actor_process_profile_definition g_profile_E_BG = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BG, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daE_BG_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
204, // mPriority
&l_daE_BG_Method, // sub_method
0x000D0100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daE_BG_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BG_e,
/* Actor SubMtd */ &l_daE_BG_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_bi.cpp
+25 -25
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_e_bi.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -76,7 +76,7 @@ static int daE_BI_Draw(e_bi_class* i_this) {
if (i_this->ride_time == 0) {
return 1;
}
g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr);
J3DModel* model = i_this->anm_p->getModel();
g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr);
@@ -403,7 +403,7 @@ static void e_bi_ex(e_bi_class* i_this) {
i_this->ex_eff[i] = dComIfGp_particle_set(i_this->ex_eff[i], ex_eff_id[i], &actor->current.pos, &actor->tevStr,
&actor->shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->ex_eff[i]);
if (emitter != NULL) {
MTXCopy(i_this->anm_p->getModel()->getAnmMtx(0), *calc_mtx);
emitter->setGlobalRTMatrix(*calc_mtx);
@@ -646,7 +646,7 @@ static void action(e_bi_class* i_this) {
}
static void* s_fw_sub(void* i_actor, void* i_data) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) {
cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos;
if (sp28.abs() < XREG_F(18) + 500.0f) {
return i_actor;
@@ -705,7 +705,7 @@ static int daE_BI_Execute(e_bi_class* i_this) {
}
cXyz mae, ato;
i_this->counter++;
for (int i = 0; i < 3; i++) {
@@ -787,7 +787,7 @@ static int daE_BI_Execute(e_bi_class* i_this) {
actor->attention_info.position.y += KREG_F(3) + 45.0f;
f32 center = 0.0f;
if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_0x80000)) {
if (dComIfGp_checkPlayerStatus0(0, fopAcStts_UNK_0x80000_e)) {
center = 100.0f;
}
@@ -838,9 +838,9 @@ static int daE_BI_IsDelete(e_bi_class* i_this) {
static int daE_BI_Delete(e_bi_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
dComIfG_resDelete(&i_this->phase, "E_BI");
if (i_this->hio_init != 0) {
hio_set = 0;
}
@@ -881,7 +881,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) {
if (!fopAcM_entrySolidHeap(actor, useHeapInit, 0x27A0)) {
OS_REPORT("//////////////E_BI SET NON !!\n");
return cPhs_ERROR_e;
}
@@ -950,7 +950,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) {
i_this->at_info.mpSound = &i_this->sound;
i_this->at_info.mPowerType = 1;
i_this->sound.setEnemyName("E_bi");
i_this->counter = cM_rndF(65535.0f);
actor->attention_info.distances[fopAc_attn_CARRY_e] = 42;
@@ -967,7 +967,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) {
}
}
i_this->child_no = fopAcM_createChild(PROC_E_BI_LEAF, fopAcM_GetID(actor), i_this->arg1, &actor->current.pos,
i_this->child_no = fopAcM_createChild(fpcNm_E_BI_LEAF_e, fopAcM_GetID(actor), i_this->arg1, &actor->current.pos,
fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL);
} else {
i_this->mode = -2;
@@ -996,18 +996,18 @@ static actor_method_class l_daE_BI_Method = {
};
actor_process_profile_definition g_profile_E_BI = {
fpcLy_CURRENT_e, // mLayerID
9, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BI, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_bi_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
147, // mPriority
&l_daE_BI_Method, // sub_method
0x100D0100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 9,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_bi_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BI_e,
/* Actor SubMtd */ &l_daE_BI_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_bi_leaf.cpp
+15 -15
View File
@@ -42,7 +42,7 @@ static void action(e_bi_leaf_class* i_this) {
i_this->action = 0;
i_this->parentActorID =
fopAcM_createChild(PROC_E_BI, fopAcM_GetID(i_this), (i_this->type << 8) | 1,
fopAcM_createChild(fpcNm_E_BI_e, fopAcM_GetID(i_this), (i_this->type << 8) | 1,
&i_this->current.pos, fopAcM_GetRoomNo(i_this),
&i_this->current.angle, NULL, -1, NULL);
i_this->timer = 20;
@@ -123,18 +123,18 @@ static actor_method_class l_daE_BI_LEAF_Method = {
};
actor_process_profile_definition g_profile_E_BI_LEAF = {
fpcLy_CURRENT_e,
9,
fpcPi_CURRENT_e,
PROC_E_BI_LEAF,
&g_fpcLf_Method.base,
sizeof(e_bi_leaf_class),
0,
0,
&g_fopAc_Method.base,
148,
&l_daE_BI_LEAF_Method,
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 9,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BI_LEAF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_bi_leaf_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BI_LEAF_e,
/* Actor SubMtd */ &l_daE_BI_LEAF_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_e_bs.cpp
+15 -15
View File
@@ -403,7 +403,7 @@ static void e_bs_attack(e_bs_class* i_this) {
if (i_this->is_wep_attack) {
fopAc_ac_c* at_hit_actor = at_hit_check(i_this);
if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) {
if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) {
i_this->modelMorf->setPlaySpeed(0.0f);
i_this->action = ACTION_FIGHT_RUN;
i_this->mode = 0;
@@ -929,18 +929,18 @@ static actor_method_class l_daE_BS_Method = {
};
actor_process_profile_definition g_profile_E_BS = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BS, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_bs_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
124, // mPriority
&l_daE_BS_Method, // sub_method
0x10040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_bs_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BS_e,
/* Actor SubMtd */ &l_daE_BS_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_e_bu.cpp
+14 -14
View File
@@ -1137,18 +1137,18 @@ static actor_method_class l_daE_BU_Method = {
};
actor_process_profile_definition g_profile_E_BU = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BU, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_bu_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
181, // mPriority
&l_daE_BU_Method, // sub_method
0x100C0120, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BU_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_bu_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BU_e,
/* Actor SubMtd */ &l_daE_BU_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_bug.cpp
+15 -15
View File
@@ -686,7 +686,7 @@ static void bug_control(e_bug_class* a_this) {
}
static void* s_boom_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) {
data_80697E8D = 1;
at_pos = ((fopAc_ac_c*)i_actor)->current.pos;
return i_actor;
@@ -902,18 +902,18 @@ static actor_method_class l_daE_Bug_Method = {
};
actor_process_profile_definition g_profile_E_BUG = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BUG, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_bug_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
182, // mPriority
&l_daE_Bug_Method, // sub_method
0x00044000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_BUG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_bug_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_BUG_e,
/* Actor SubMtd */ &l_daE_Bug_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_cr.cpp
+16 -16
View File
@@ -228,7 +228,7 @@ static void e_cr_move(e_cr_class* a_this) {
cXyz egg_pos(actor->current.pos);
egg_pos.y += 35.0f * l_HIO.base_size;
fopAcM_createChild(PROC_E_CR_EGG, fopAcM_GetID(actor), 0, &egg_pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL);
fopAcM_createChild(fpcNm_E_CR_EGG_e, fopAcM_GetID(actor), 0, &egg_pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL);
a_this->sound.startCreatureSound(Z2SE_EN_CR_LAYEGG, 0, -1);
}
break;
@@ -309,7 +309,7 @@ static void e_cr_damage(e_cr_class* a_this) {
if (a_this->timers[0] == 0) {
fopAcM_createDisappear(actor, &actor->eyePos, 6, 0, 0xFF);
fopAcM_create(PROC_NPC_WORM, 0xFFFFFF01, &actor->eyePos, fopAcM_GetRoomNo(actor), NULL, NULL, -1);
fopAcM_create(fpcNm_NPC_WORM_e, 0xFFFFFF01, &actor->eyePos, fopAcM_GetRoomNo(actor), NULL, NULL, -1);
fopAcM_delete(actor);
}
}
@@ -546,18 +546,18 @@ static actor_method_class l_daE_CR_Method = {
};
actor_process_profile_definition g_profile_E_CR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_CR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_cr_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
113, // mPriority
&l_daE_CR_Method, // sub_method
0x10040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_CR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_cr_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_CR_e,
/* Actor SubMtd */ &l_daE_CR_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_e_cr_egg.cpp
+14 -14
View File
@@ -224,18 +224,18 @@ static actor_method_class l_daE_CR_EGG_Method = {
};
actor_process_profile_definition g_profile_E_CR_EGG = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_CR_EGG, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_cr_egg_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
114, // mPriority
&l_daE_CR_EGG_Method, // sub_method
0x00040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_CR_EGG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_cr_egg_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_CR_EGG_e,
/* Actor SubMtd */ &l_daE_CR_EGG_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_e_db.cpp
+16 -16
View File
@@ -1752,7 +1752,7 @@ static void action(e_db_class* i_this) {
spA = TRUE;
actor->field_0x566 = 1;
sound_pl_search = TRUE;
fopAcM_OffStatus(actor, 0x10000);
fopAcM_OffStatus(actor, fopAcStts_UNK_0x10000_e);
break;
case ACTION_E_DEAD:
e_db_e_dead(i_this);
@@ -2190,7 +2190,7 @@ static int daE_DB_Create(fopAc_ac_c* i_this) {
a_this->field_0x850 = 1;
}
a_this->leaf_actor_id = fopAcM_createChild(PROC_E_DB_LEAF, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL);
a_this->leaf_actor_id = fopAcM_createChild(fpcNm_E_DB_LEAF_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL);
daE_DB_Execute(a_this);
}
@@ -2206,18 +2206,18 @@ static actor_method_class l_daE_DB_Method = {
};
actor_process_profile_definition g_profile_E_DB = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DB, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_db_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
136, // mPriority
&l_daE_DB_Method, // sub_method
0x10050120, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_DB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_db_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_DB_e,
/* Actor SubMtd */ &l_daE_DB_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_db_leaf.cpp
+15 -15
View File
@@ -3,7 +3,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_e_db_leaf.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
static int daE_DB_LEAF_Draw(e_db_leaf_class* i_this) {
g_env_light.settingTevStruct(0,&i_this->current.pos,&i_this->tevStr);
@@ -68,18 +68,18 @@ static actor_method_class l_daE_DB_LEAF_Method = {
};
actor_process_profile_definition g_profile_E_DB_LEAF = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_E_DB_LEAF,
&g_fpcLf_Method.base,
sizeof(e_db_leaf_class),
0,
0,
&g_fopAc_Method.base,
137,
&l_daE_DB_LEAF_Method,
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_DB_LEAF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_db_leaf_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_DB_LEAF_e,
/* Actor SubMtd */ &l_daE_DB_LEAF_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_e_dd.cpp
+14 -14
View File
@@ -1784,18 +1784,18 @@ actor_method_class l_daE_DD_Method = {
};
actor_process_profile_definition g_profile_E_DD = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DD, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_dd_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
117, // mPriority
&l_daE_DD_Method, // sub_method
0x10040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_DD_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_dd_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_DD_e,
/* Actor SubMtd */ &l_daE_DD_Method,
/* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_df.cpp
+18 -18
View File
@@ -492,7 +492,7 @@ void daE_DF_c::SearchAction() {
daObjCarry_c* obj_carry = (daObjCarry_c*)fpcM_Search(s_obj_sub, this);
if (obj_carry != NULL) {
if (fopAcM_GetName(obj_carry) == PROC_Obj_Carry) {
if (fopAcM_GetName(obj_carry) == fpcNm_Obj_Carry_e) {
mEatObjType = EAT_TYPE_OBJ;
mCarryType = obj_carry->getType();
fopAcM_delete(obj_carry);
@@ -500,14 +500,14 @@ void daE_DF_c::SearchAction() {
Set_Angle(obj_pos);
mAction = ACT_EAT;
} else if (fopAcM_GetName(obj_carry) == PROC_ALINK && mTimer == 0) {
} else if (fopAcM_GetName(obj_carry) == fpcNm_ALINK_e && mTimer == 0) {
mEatObjType = EAT_TYPE_LINK;
Set_Angle(player_pos);
mTargetAngle = cLib_targetAngleY(&current.pos, player_pos);
mAction = ACT_EAT;
dComIfGp_getVibration().StartShock(5, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
} else if (fopAcM_GetName(obj_carry) == PROC_NBOMB) {
} else if (fopAcM_GetName(obj_carry) == fpcNm_NBOMB_e) {
cXyz* obj_pos = &fopAcM_GetPosition(obj_carry);
Set_Angle(obj_pos);
mEatObjType = EAT_TYPE_BOMB;
@@ -697,7 +697,7 @@ int daE_DF_c::Create() {
}
}
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
daE_DF_Execute(this);
}
@@ -717,18 +717,18 @@ static actor_method_class l_daE_DF_Method = {
};
actor_process_profile_definition g_profile_E_DF = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DF, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daE_DF_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
130, // mPriority
&l_daE_DF_Method, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_DF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daE_DF_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_DF_e,
/* Actor SubMtd */ &l_daE_DF_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_e_dk.cpp
+18 -18
View File
@@ -550,7 +550,7 @@ void daE_DK_c::executeAttack() {
mCoreSphere.SetTgSpl(1);
setElectricEffect();
field_0x6a3 = 1;
fopAcM_OffStatus(this, 0x80000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e);
if (mMoveMode == 2) {
if (field_0x698 == 0) {
field_0x69c = 150;
@@ -652,7 +652,7 @@ void daE_DK_c::executeDeath() {
mSphere.OffCoSetBit();
mSphere.OffTgSetBit();
mCoreSphere.OffTgSetBit();
fopAcM_OffStatus(this, 0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
field_0x68e = 0;
@@ -697,7 +697,7 @@ void daE_DK_c::executeDeath() {
BodyDeathMove();
if (fopAcM_CheckStatus(this, 0x100000) == 0) {
if (fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e) == 0) {
mMoveMode = 3;
mpMorfSO->setPlaySpeed(1.0f);
@@ -764,7 +764,7 @@ void daE_DK_c::action() {
damage_check();
fopAcM_OnStatus(this, 0x80000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e);
if (fopAcM_searchPlayerDistance(this) > l_HIO.first_attack_range) {
field_0x690 = 0x0;
@@ -1082,18 +1082,18 @@ static actor_method_class l_daE_DK_Method = {
};
actor_process_profile_definition g_profile_E_DK = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DK, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daE_DK_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
755, // mPriority
&l_daE_DK_Method, // sub_method
0x000C0100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_DK_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daE_DK_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_DK_e,
/* Actor SubMtd */ &l_daE_DK_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};

Some files were not shown because too many files have changed in this diff Show More